Merge branch 'rc_reihungstest'

To make headings stand out more clearly from the buttons

application/controllers/Cis/Auth.php

@@ -40,7 +40,7 @@ class Auth extends FHC_Controller
 
 		if ($this->form_validation->run())
 		{
-			redirect($this->authlib->getLandingPage('/Cis4'));
+			redirect($this->authlib->getLandingPage('/CisVue/Dashboard'));
 		}
 		else
 		{

application/controllers/CisVue/Dashboard.php

@@ -0,0 +1,43 @@
+<?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->model('person/Person_model','PersonModel');
+		$personData = getData($this->PersonModel->getByUid(getAuthUID()))[0];
+
+		$viewData = array(
+			'uid' => getAuthUID(),
+			'name' => $personData->vorname,
+			'person_id' => $personData->person_id
+		);
+		
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData]);
+
+	}
+}

application/controllers/api/frontend/v1/dashboard/Board.php

@@ -40,32 +40,11 @@ class Board extends FHCAPI_Controller
 
 	public function list()
 	{
-		$this->DashboardModel->addSelect('dashboard_id');
-		$this->DashboardModel->addSelect('dashboard_kurzbz');
-		$this->DashboardModel->addSelect('tbl_dashboard.beschreibung');
-		$this->DashboardModel->addSelect("(
-			SELECT json_agg(w.*) 
-			FROM dashboard.tbl_widget w 
-			JOIN dashboard.tbl_dashboard_widget dw 
-			USING(widget_id) 
-			WHERE dw.dashboard_id=tbl_dashboard.dashboard_id
-		) AS \"widgetSetup\"");
-
 		$result = $this->DashboardModel->load();
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$data = array_map(function ($dashboard) {
-			$tmpSetups = json_decode($dashboard->widgetSetup);
-			$tmpSetups = array_map(function ($widget) {
-				$widget->setup->file = absoluteJsImportUrl($widget->setup->file);
-				return $widget;
-			}, $tmpSetups);
-			$dashboard->widgetSetup = $tmpSetups;
-			return $dashboard;
-		}, $data);
-
-		$this->terminateWithSuccess($data);
+		$this->terminateWithSuccess($result);
 	}
 
 	public function create()
@@ -103,7 +82,7 @@ class Board extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess($data);
+		$this->terminateWithSuccess($result);
 	}
 
 	public function delete()
@@ -137,6 +116,6 @@ class Board extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess($data);
+		$this->terminateWithSuccess($result);
 	}
 }

application/controllers/api/frontend/v1/dashboard/Preset.php

@@ -120,7 +120,10 @@ class Preset extends FHCAPI_Controller
 			$conf = $this->dashboardlib->getPreset($db, $funktion);
 			if ($conf) {
 				$preset = json_decode($conf->preset, true);
-				$result[$funktion] = $preset;
+				if (!isset($preset[$funktion]) || !isset($preset[$funktion]['widgets']))
+					$result[$funktion] = [];
+				else
+					$result[$funktion] = $preset[$funktion]['widgets'];
 			} else {
 				$result[$funktion] = [];
 			}
@@ -151,7 +154,7 @@ class Preset extends FHCAPI_Controller
 
 		$preset_decoded = json_decode($preset->preset, true);
 		
-		$preset_decoded[$widget['widgetid']] = $widget;
+		$this->dashboardlib->addWidgetsToWidgets($preset_decoded, $dashboard_kurzbz, $funktion_kurzbz, [$widget]);
 
 		$preset->preset = json_encode($preset_decoded);
 
@@ -183,10 +186,8 @@ class Preset extends FHCAPI_Controller
 
 		$preset_decoded = json_decode($preset->preset, true);
 
-		if (!isset($preset_decoded[$widgetid]))
+		if (!$this->dashboardlib->removeWidgetFromWidgets($preset_decoded, $funktion_kurzbz, $widgetid))
 			show_404();
-		
-		unset($preset_decoded[$widgetid]);
 
 		$preset->preset = json_encode($preset_decoded);
 

application/controllers/api/frontend/v1/dashboard/User.php

@@ -48,9 +48,25 @@ class User extends FHCAPI_Controller
 		
 		$uid = $this->authlib->getAuthObj()->username;
 
-		$mergedconfig = $this->dashboardlib->getMergedUserConfig($dashboard->dashboard_id, $uid);
+		/*$mergedconfig = $this->dashboardlib->getMergedConfig($dashboard->dashboard_id, $uid);
 
-		$this->terminateWithSuccess($mergedconfig);
+		$this->terminateWithSuccess([
+			'general' => call_user_func_array(
+				'array_merge_recursive',
+				$mergedconfig
+			)
+		]);*/
+		$defaultconfig = $this->dashboardlib->getDefaultConfig($dashboard->dashboard_id);
+		$userconfig = $this->dashboardlib->getUserConfig($dashboard->dashboard_id, $uid);
+
+		$defaultconfig_squashed = $defaultconfig ? call_user_func_array('array_replace_recursive', $defaultconfig) : [];
+		$userconfig_squashed = $userconfig ? call_user_func_array('array_replace_recursive', $userconfig) : [];
+
+		$mergedconfig = array_replace_recursive($defaultconfig_squashed, $userconfig_squashed);
+
+		$this->terminateWithSuccess([
+			DashboardLib::SECTION_IF_FUNKTION_KURZBZ_IS_NULL => $mergedconfig
+		]);
 	}
 
 	public function addWidget()
@@ -70,15 +86,26 @@ class User extends FHCAPI_Controller
 		if (!isset($widget['widgetid']))
 			$widget['widgetid'] = $this->dashboardlib->generateWidgetId($dashboard_kurzbz);
 
-		if (isset($widget['source']))
-			unset($widget['source']);
-
 		$override = $this->dashboardlib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);
-
+		
 		$override_decoded = json_decode($override->override, true);
 
-		$override_decoded[$widget['widgetid']] = $widget;
+		if (!isset($override_decoded['general']) || !is_array($override_decoded['general']))
+			$override_decoded['general'] = [];
 
+		 if (!isset($override_decoded['general']['widgets']))
+				$override_decoded['general']['widgets'] = [];
+
+		$override_decoded['general']['widgets'][$widget['widgetid']] = $widget;
+
+		// NOTE(chris): remove doubles in other funktionen
+		foreach ($override_decoded as $funktion => $array) {
+			if ($funktion == 'general')
+				continue;
+			if (isset($array['widgets']) && isset($array['widgets'][$widget['widgetid']]))
+				unset($override_decoded[$funktion]['widgets'][$widget['widgetid']]);
+		}
+		
 		$override->override = json_encode($override_decoded);
 				
 		$result = $this->dashboardlib->insertOrUpdateOverride($override);
@@ -108,10 +135,18 @@ class User extends FHCAPI_Controller
 		
 		$override_decoded = json_decode($override->override, true);
 
-		if (!isset($override_decoded[$widget_id]))
-			show_404();
-		
-		unset($override_decoded[$widget_id]);
+		foreach (array_keys($override_decoded) as $k) {
+			if (!isset($override_decoded[$k]["widgets"])) {
+				unset($override_decoded[$k]);
+				continue;
+			}
+			if (isset($override_decoded[$k]["widgets"][$widget_id])) {
+				unset($override_decoded[$k]["widgets"][$widget_id]);
+			}
+			if (!$override_decoded[$k]["widgets"]) {
+				unset($override_decoded[$k]);
+			}
+		}
 
 		$override->override = json_encode($override_decoded);
 				

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

@@ -78,52 +78,32 @@ class Dokumente extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiengang_kz']), self::ERROR_TYPE_GENERAL);
 
 		$resultPreDoc = $this->_getPrestudentDokumente($prestudent_id);
-
-		$arrayAccepted = [];
 		$person_id = $this->_getPersonId($prestudent_id);
 
-		$docNames = array_map(function ($item) {
-			return $item->dokument_kurzbz;
-		}, $resultPreDoc);
+		$mergedArray = [];
 
-		foreach($docNames as $doc)
+		foreach ($resultPreDoc as $pre)
 		{
-			$result = $this->AkteModel->getAktenFAS($person_id, $doc, $studiengang_kz, $prestudent_id, true);
+			$result = $this->AkteModel->getAktenFAS($person_id, $pre->dokument_kurzbz, $studiengang_kz, $prestudent_id, true);
 
 			if (isError($result))
-			{
 				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
+
 			if (hasData($result))
 			{
-				$data = getData($result);
-				foreach ($data as $value)
+				foreach (getData($result) as $doc)
 				{
-					array_push($arrayAccepted, $value);
+					$merged = clone $doc;
+					$merged->docdatum = $pre->docdatum;
+					$merged->insertvonma = $pre->insertvonma;
+					$merged->bezeichnung = $pre->bezeichnung;
+					$mergedArray[] = $merged;
 				}
 			}
-		}
-
-		//Mapping with document_kurzbz
-		$preDocMap = [];
-		foreach ($resultPreDoc as $pre) {
-			$preDocMap[$pre->dokument_kurzbz] = $pre;
-		}
-
-		$mergedArray = [];
-		foreach ($arrayAccepted as $doc) {
-			$merged = clone $doc;
-
-			if (isset($preDocMap[$doc->dokument_kurzbz])) {
-				$merged->docdatum = $preDocMap[$doc->dokument_kurzbz]->docdatum;
-				$merged->insertvonma = $preDocMap[$doc->dokument_kurzbz]->insertvonma;
-				$merged->bezeichnung = $preDocMap[$doc->dokument_kurzbz]->bezeichnung;
-			} else {
-				$merged->akzeptiertdatum = null;
-				$merged->akzeptiertvon = null;
+			else
+			{
+				$mergedArray[] = $pre;
 			}
-
-			$mergedArray[] = $merged;
 		}
 
 		$this->terminateWithSuccess($mergedArray);

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

@@ -48,7 +48,8 @@ class Konto extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'konto'
+			'konto',
+			'lehre'
 		]);
 	}
 
@@ -112,7 +113,7 @@ class Konto extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	public function getBuchungstypen()
+	public function getBuchungstypen($studiensemester_kurzbz = null)
 	{
 		$this->load->model('crm/Buchungstyp_model', 'BuchungstypModel');
 
@@ -122,6 +123,7 @@ class Konto extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
+		$this->_getOEHBeitrag($data, $studiensemester_kurzbz);
 		$this->terminateWithSuccess($data);
 	}
 
@@ -494,4 +496,43 @@ class Konto extends FHCAPI_Controller
 
 		$this->terminateWithSuccess();
 	}
+
+	private function _getOEHBeitrag(&$data, $studiensemester_kurzbz = null)
+	{
+		if (is_null($studiensemester_kurzbz))
+		{
+			$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+			$studiensemester_akt = $this->variablelib->getVar('semester_aktuell');
+		}
+		else
+		{
+			$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+			if ($this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+				$studiensemester_akt = $studiensemester_kurzbz;
+			else
+				$this->terminateWithError($this->p->t('lehre', 'error_noStudiensemester'));
+		}
+
+		$this->load->model('codex/Oehbeitrag_model', 'OehbeitragModel');
+		$oehBeitrag = $this->OehbeitragModel->getByStudiensemester($studiensemester_akt);
+
+		$oehStandardbetrag = null;
+		if (hasData($oehBeitrag))
+		{
+			$oeh = getData($oehBeitrag)[0];
+			$summe = ($oeh->studierendenbeitrag + $oeh->versicherung) * -1;
+			$oehStandardbetrag = number_format((float)$summe, 2, '.', '');
+		}
+
+		if ($oehStandardbetrag !== null)
+		{
+			$data = array_map(function ($buchungstyp) use ($oehStandardbetrag) {
+				if (isset($buchungstyp->buchungstyp_kurzbz) && (strtolower($buchungstyp->buchungstyp_kurzbz) === 'oeh'))
+				{
+					$buchungstyp->standardbetrag = $oehStandardbetrag;
+				}
+				return $buchungstyp;
+			}, $data);
+		}
+	}
 }

application/core/Notiz_Controller.php

@@ -417,6 +417,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$notiz_id = $this->input->post('notiz_id');
 
 		$this->NotizModel->addSelect('campus.tbl_dms_version.*');
+		$this->NotizModel->addSelect($this->NotizModel->escape(base_url('content/notizdokdownload.php?id=')) . ' || public.tbl_notiz_dokument.dms_id AS preview');
 
 		$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)');

application/libraries/AntragLib.php

@@ -128,7 +128,7 @@ class AntragLib
 			return $this->_ci->StudierendenantragstatusModel->resumeAntraegeForAbmeldungStgl($antrag_id);
 		}
 		// NOTE(chris): get last status that is not pause
-		$this->_ci->StudierendenantragstatusModel->addOrder('insertamum');
+		$this->_ci->StudierendenantragstatusModel->addOrder('insertamum', 'DESC');
 		$this->_ci->StudierendenantragstatusModel->addLimit(1);
 		$result = $this->_ci->StudierendenantragstatusModel->loadWhere([
 			'studierendenantrag_id' => $antrag_id,

application/libraries/dashboard/DashboardLib.php

@@ -37,9 +37,7 @@ class DashboardLib
 	
 	public function getDashboardByKurzbz($dashboard_kurzbz)
 	{
-		$result = $this->_ci->DashboardModel->loadWhere([
-			'dashboard_kurzbz' => $dashboard_kurzbz
-		]);
+		$result = $this->_ci->DashboardModel->getDashboardByKurzbz($dashboard_kurzbz);
 
 		if (hasData($result))
 		{
@@ -49,21 +47,17 @@ class DashboardLib
 		return null;
 	}
 	
-	public function getMergedUserConfig($dashboard_id, $uid)
+	public function getMergedConfig($dashboard_id, $uid)
 	{
-		$defaultconfig = $this->getUserBaseConfig($dashboard_id);
-		$userconfig = $this->getUserOverrideConfig($dashboard_id, $uid);
+		$defaultconfig = $this->getDefaultConfig($dashboard_id);
+		$userconfig = $this->getUserConfig($dashboard_id, $uid);
 		
-		$sourceconfig = array_map(function ($value) {
-			return ['source' => $value['source']];
-		}, $defaultconfig);
-		
-		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig, $sourceconfig);
+		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig);
 		
 		return $mergedconfig;
 	}
 	
-	protected function getUserBaseConfig($dashboard_id)
+	public function getDefaultConfig($dashboard_id)
 	{
 		$funktion_kurzbzs = [];
 		$rights = $this->_ci->permissionlib->getAccessRights();
@@ -93,11 +87,7 @@ class DashboardLib
 				$preset = json_decode($presetobj->preset, true);
 				if (null !== $preset)
 				{
-					$preset = array_map(function ($value) use ($presetobj) {
-						$value['source'] = $presetobj->funktion_kurzbz ?: self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-						return $value;
-					}, $preset);
-					$defaultconfig = array_merge_recursive($defaultconfig, $preset);
+					$defaultconfig = array_replace_recursive($defaultconfig, $preset);
 				}
 			}
 		}
@@ -105,7 +95,7 @@ class DashboardLib
 		return $defaultconfig;
 	}
 	
-	protected function getUserOverrideConfig($dashboard_id, $uid)
+	public function getUserConfig($dashboard_id, $uid)
 	{
 		$res_userconfig = $this->_ci->DashboardOverrideModel->getOverride($dashboard_id, $uid);
 		
@@ -134,7 +124,7 @@ class DashboardLib
 		$emptyoverride = new stdClass();
 		$emptyoverride->dashboard_id = $dashboard->dashboard_id;
 		$emptyoverride->uid = $uid;
-		$emptyoverride->override = '[]';
+		$emptyoverride->override = '{"' . self::USEROVERRIDE_SECTION . '": {"widgets":{}}, "custom": { "widgets" : {}}}';
 		
 		return $emptyoverride;
 	}
@@ -153,7 +143,8 @@ class DashboardLib
 		$emptypreset = new stdClass();
 		$emptypreset->dashboard_id = $dashboard->dashboard_id;
 		$emptypreset->funktion_kurzbz = $funktion_kurzbz;
-		$emptypreset->preset = '[]';
+		$section = ($funktion_kurzbz !== null) ? $funktion_kurzbz : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
+		$emptypreset->preset = '{"' . $section . '": { "widgets" : {}},"custom": { "widgets" : {}}}';
 		
 		return $emptypreset;
 	}
@@ -218,4 +209,44 @@ 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;
+		if (!isset($widgets[$section]) || !isset($widgets[$section]["widgets"]) || !is_array($widgets[$section]))
+		{
+			$widgets[$section] = array();
+			$widgets[$section]["widgets"] = array();
+		}
+		
+		$widgets[$section]["widgets"][$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]["widgets"][$widgetid]))
+		{
+			unset($widgets[$section]["widgets"][$widgetid]);
+			if(empty($widgets[$section]["widgets"]) && $section !== self::USEROVERRIDE_SECTION) {
+				unset($widgets[$section]);
+			}
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
 }

application/libraries/vertragsbestandteil/AbstractBestandteil.php

@@ -40,7 +40,9 @@ abstract class AbstractBestandteil implements IValidation
 		
 		if( is_bool($new_value) && ($old_value !== $new_value) ) {
 			$this->modifiedcolumns[$columnname] = $columnname;
-		} else if($old_value != $new_value) {		
+		} else if(is_null($old_value) xor is_null($new_value)) {
+			$this->modifiedcolumns[$columnname] = $columnname;
+		} else if($old_value != $new_value) {
 			$this->modifiedcolumns[$columnname] = $columnname;
 		}
 	}

application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php

@@ -137,19 +137,25 @@ EOTXT;
 		return parent::__toString() . $txt;
 	}
 
-	/* public function validate()
+	public function validate()
 	{
-		if( !(filter_var($this->tage, FILTER_VALIDATE_INT, 
-				array(
-					'options' => array(
-						'min_range' => 1,
-						'max_range' => 50
-					)
-				)
-			)) ) {
-			$this->validationerrors[] = 'Urlaubsanspruch muss eine Tagesanzahl im Bereich 1 bis 50 sein.';
+		$value = $this->vordienstzeit;
+
+		if ($value === null || $value === '') {
+			$result = null;   // allow null value 
+		} else {
+			$result = filter_var($value, FILTER_VALIDATE_INT, [
+				'options' => [
+					'min_range' => 0,
+					'max_range' => 100
+				]
+			]);
+
+			if ($result === false) {				
+				$this->validationerrors[] = 'Vordienstjahre muss eine ganze Zahl (0 bis 100) enthalten oder leer sein.';
+			}
 		}
 		
 		return parent::validate();
-	} */
+	} 
 }

application/models/dashboard/Dashboard_model.php

@@ -11,4 +11,15 @@ class Dashboard_model extends DB_Model
 		$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));
+	}
 }

application/models/education/Paabgabe_model.php

@@ -79,10 +79,10 @@ class Paabgabe_model extends DB_Model
 				 JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
 				 JOIN public.tbl_person USING (person_id)
 		
-		WHERE (campus.tbl_paabgabe.insertamum >= NOW() - INTERVAL ?
-		   OR campus.tbl_paabgabe.updateamum >= NOW() - INTERVAL ?)
-		   AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
-
+		WHERE (campus.tbl_paabgabe.insertamum::date = CURRENT_DATE - INTERVAL ?
+			OR campus.tbl_paabgabe.updateamum::date = CURRENT_DATE - INTERVAL ?)
+			AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
+		
 		return $this->execQuery($query, [$interval, $interval, $relevantTypes]);
 	}
 
@@ -108,7 +108,7 @@ class Paabgabe_model extends DB_Model
 						 JOIN public.tbl_person ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
 				
 				WHERE campus.tbl_paabgabe.abgabedatum IS NOT NULL 
-				AND campus.tbl_paabgabe.abgabedatum >= NOW() - INTERVAL ?";
+				AND campus.tbl_paabgabe.abgabedatum = CURRENT_DATE - INTERVAL ?";
 		
 		if($relevantTypes !== null) {
 			$query .= " AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";

application/views/CisRouterView/CisRouterView.php

@@ -39,7 +39,7 @@ $includesArray = array(
 		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
-		'public/js/apps/Cis.js',
+		'public/js/apps/Dashboard/Fhc.js',
 	),
 
 );

application/views/system/infocenter/infocenterData.php

@@ -315,22 +315,15 @@
 				 WHERE tpl.app = '.$APP.'
 			) pl USING(person_id)
 	LEFT JOIN (
-				SELECT
+				SELECT DISTINCT ON (tbl_rueckstellung.person_id)
 					tbl_rueckstellung.person_id,
 					tbl_rueckstellung.datum_bis,
 					tbl_rueckstellung.status_kurzbz,
 					array_to_json(bezeichnung_mehrsprachig::varchar[])->>0 as bezeichnung
 				FROM public.tbl_rueckstellung
 				JOIN public.tbl_rueckstellung_status USING(status_kurzbz)
-				JOIN public.tbl_person sp ON tbl_rueckstellung.person_id = sp.person_id
-				WHERE tbl_rueckstellung.rueckstellung_id =
-				(
-					SELECT srueck.rueckstellung_id
-					FROM public.tbl_rueckstellung srueck
-					WHERE srueck.person_id = tbl_rueckstellung.person_id
-						AND datum_bis >= NOW()
-					ORDER BY srueck.datum_bis DESC LIMIT 1
-				)
+				WHERE tbl_rueckstellung.datum_bis >= NOW()
+				ORDER BY tbl_rueckstellung.person_id, tbl_rueckstellung.datum_bis DESC
 			) rueck ON rueck.person_id = p.person_id
 		 WHERE
 			EXISTS (

application/views/system/infocenter/onboardingData.php

@@ -24,22 +24,15 @@ $query = '
 					 WHERE tpl.app = '.$APP.'
 				 ) pl ON p.person_id = pl.person_id
 			LEFT JOIN (
-				SELECT
+					SELECT DISTINCT ON (tbl_rueckstellung.person_id)
 					tbl_rueckstellung.person_id,
 					tbl_rueckstellung.datum_bis,
 					tbl_rueckstellung.status_kurzbz,
 					array_to_json(bezeichnung_mehrsprachig::varchar[])->>0 as bezeichnung
 				FROM public.tbl_rueckstellung
-					JOIN public.tbl_rueckstellung_status USING(status_kurzbz)
-					JOIN public.tbl_person sp ON tbl_rueckstellung.person_id = sp.person_id
-				WHERE tbl_rueckstellung.rueckstellung_id =
-				(
-					SELECT srueck.rueckstellung_id
-					FROM public.tbl_rueckstellung srueck
-					WHERE srueck.person_id = tbl_rueckstellung.person_id
-						AND datum_bis >= NOW()
-					ORDER BY srueck.datum_bis DESC LIMIT 1
-				)
+				JOIN public.tbl_rueckstellung_status USING(status_kurzbz)
+				WHERE tbl_rueckstellung.datum_bis >= NOW()
+				ORDER BY tbl_rueckstellung.person_id, tbl_rueckstellung.datum_bis DESC
 			) rueck ON rueck.person_id = p.person_id
 		WHERE p.person_id NOT IN (SELECT person_id FROM public.tbl_prestudent)';
 

application/views/templates/CISVUE-Footer.php

@@ -6,7 +6,7 @@ $includesArray = array(
 	'fontawesome6' => true,
 	'axios027' => true,
 	'customJSModules' => array_merge([
-		'public/js/apps/Cis/Menu.js'
+		'public/js/apps/Cis.js'
 	], $customJSModules ?? []),
 	'customCSSs' => array_merge([
 		'public/css/Cis4/Cis.css'

application/views/templates/CISVUE-Header.php

@@ -8,7 +8,7 @@ $includesArray = array(
 	'axios027' => true,
 	'primevue3' => true,
 	'customJSModules' => array_merge([
-		'public/js/apps/Cis/Menu.js'
+		'public/js/apps/Cis.js'
 	], $customJSModules ?? []),
 	'customCSSs' => array_merge([
 		'public/css/Cis4/Cis.css',

cis/private/info/service_uebersicht.php

@@ -46,12 +46,13 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 	<link rel="stylesheet" href="../../../skin/tablesort.css" type="text/css"/>
 	<link rel="stylesheet" href="../../../skin/style.css.php" 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>';
 
+	include('../../../include/meta/jquery.php');
+	include('../../../include/meta/jquery-tablesorter.php');
+
 const MOODLE_ADDON_KURZBZ = 'moodle';
 
 // Load Addons to get Moodle_Path
@@ -71,7 +72,7 @@ echo '
 			    $("#myTable").tablesorter(
 				{
 					sortList: [[0,0],[1,0]],
-					widgets: [\'zebra\']
+					widgets: [\'zebra\',\'filter\']
 				});
 			}
 		);
@@ -151,8 +152,9 @@ foreach($service->result as $row)
 		$person = new person();
 		$person->getPersonFromBenutzer($row->operativ_uid);
 		$operativ = $person->nachname.' '.$person->vorname;
+		$oeBez = new organisationseinheit($row->oe_kurzbz);
 		echo '<tr>';
-		echo '<td>',$row->oe_kurzbz,'</td>';
+		echo '<td>',$oeBez->bezeichnung,'</td>';
 		echo '<td><b>'.$row->bezeichnung.'</b></td>';
 		echo '<td>',$row->beschreibung,'</td>';
 		echo '<td><nobr><a href="../profile/index.php?uid='.$row->design_uid.'">',$design,'</a></nobr></td>';

cis/testtool/frage.php

@@ -80,9 +80,17 @@ echo '
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8" />
+	<link rel="stylesheet" href="../../vendor/components/jqueryui/themes/base/jquery-ui.min.css" type="text/css" />
 	<link rel="stylesheet" href="../../vendor/twbs/bootstrap3/dist/css/bootstrap.min.css" type="text/css"/>
 	<link href="../../skin/style.css.php" rel="stylesheet" type="text/css" />
+	<style>
+		.ui-dialog-titlebar-close
+		{
+			visibility: hidden !important;
+		}
+	</style>
 	<script type="text/javascript" src="../../vendor/components/jquery/jquery.min.js"></script>
+	<script type="text/javascript" src="../../vendor/components/jqueryui/jquery-ui.min.js"></script>
 	<script type="text/javascript" src="../../vendor/twbs/bootstrap3/dist/js/bootstrap.min.js"></script>
 	<script language="Javascript" type="text/javascript">
 	//<![CDATA[
@@ -131,22 +139,78 @@ echo '
 		}
 	}
 
-	function GebietStarten(bezeichnung,stunde,minute,sekunde,gebiet_id)
+	function GebietStarten(bezeichnung, stunde, minute, sekunde, gebiet_id)
 	{
-		var check = confirm(<?php echo "'".$p->t('testtool/okKlickenUmZuStarten')."'"?>+' '+stunde+'h '+minute+'m '+sekunde+'s');
-		if (check == true) {
-			var sprache_user = <?php echo "'".$sprache_user."'"?>;
-			document.location.href = 'frage.php?gebiet_id='+gebiet_id+'&start=true';
-		}
-		else {
-			return false;
+		let message = <?php echo "'".$p->t('testtool/okKlickenUmZuStarten')."'"?> + ' ' + stunde + 'h ' + minute + 'm ' + sekunde + 's';
+		let title = <?php echo "'".$p->t('testtool/startGebiet')."'"?>;
+		let abbrechen = <?php echo "'".$p->t('testtool/abbrechen')."'"?>;
+
+		if ($('#gebiet-dialog').length === 0)
+		{
+			$('body').append(
+				'<div id="gebiet-dialog" title="' + title + '">' +
+					'<p id="gebiet-dialog-msg">' + message + '</p>' +
+				'</div>'
+			);
 		}
+
+		$('#gebiet-dialog').dialog({
+			modal: true,
+			width: 400,
+			resizable: false,
+			buttons: [
+				{
+					text: 'OK',
+					click: function() {
+						$(this).dialog('close');
+						document.location.href = 'frage.php?gebiet_id=' + gebiet_id + '&start=true';
+					}
+				},
+				{
+					text: abbrechen,
+					click: function() {
+						$(this).dialog('close');
+					}
+				}
+			]
+		});
 	}
 
+	let letzteFrageBestaetigt = false;
+
 	function letzteFrage()
 	{
-		alert(<?php echo "'".$p->t("testtool/alleFragenBeantwortet")."'"?>);
-		return true;
+		if (letzteFrageBestaetigt)
+			return true;
+
+		let message = <?php echo "'".$p->t("testtool/alleFragenBeantwortet")."'"?>;
+
+		if ($('#fertig-dialog').length === 0)
+		{
+			$('body').append(
+				'<div id="fertig-dialog">' +
+					'<p>' + message + '</p>' +
+				'</div>'
+			);
+		}
+
+		$('#fertig-dialog').dialog({
+			modal: true,
+			width: 400,
+			resizable: false,
+			buttons: [
+				{
+					text: 'OK',
+					click: function() {
+						$(this).dialog('close');
+						letzteFrageBestaetigt = true;
+						$('[name="submitantwort"]').click();
+					}
+				}
+			]
+		});
+
+		return false;
 	}
 
 	$(document).ready(function () {
@@ -647,7 +711,7 @@ if($frage->frage_id!='')
 	}
 
 	$letzte = $frage->getNextFrage($gebiet_id, $_SESSION['pruefling_id'], $frage_id, $demo);
-	echo "<form action=\"$PHP_SELF?gebiet_id=$gebiet_id&amp;frage_id=$frage->frage_id\" method=\"POST\" ".(!$letzte && !$levelgebiet?"onsubmit=\"letzteFrage()\"":"").">";
+	echo "<form action=\"$PHP_SELF?gebiet_id=$gebiet_id&amp;frage_id=$frage->frage_id\" method=\"POST\" ".(!$letzte && !$levelgebiet?"onsubmit=\"return letzteFrage()\"":"").">";
 	echo '
 		<div class="row text-center">
 			<table class="table" style="width: 600px; margin-left: auto; margin-right: auto;">

cis/testtool/gebietfertig.php

@@ -44,6 +44,27 @@ if (isset($_GET['sprache_user']) && !empty($_GET['sprache_user']))
 $sprache_user = (isset($_SESSION['sprache_user']) && !empty($_SESSION['sprache_user'])) ? $_SESSION['sprache_user'] : DEFAULT_LANGUAGE;
 $p = new phrasen($sprache_user);
 
+$showInfo = false;
+if (isset($_SESSION['alleGebiete']))
+{
+	$alleGebiete = array_map('intval', $_SESSION['alleGebiete']);
+	$pruefling_id = $_SESSION['pruefling_id'];
+
+	$qry = "SELECT COUNT(DISTINCT gebiet_id)  as anzahl
+			FROM testtool.tbl_pruefling_frage
+			JOIN testtool.tbl_frage USING(frage_id)
+			WHERE gebiet_id IN (". implode(',', $alleGebiete) .")
+			AND pruefling_id = ". $pruefling_id ."
+	";
+
+	$result = $db->db_query($qry);
+	$anzahlGebiete = $db->db_fetch_object($result);
+
+
+	if ((int)$anzahlGebiete->anzahl === count($alleGebiete))
+		$showInfo = true;
+}
+
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
@@ -69,6 +90,7 @@ $p = new phrasen($sprache_user);
 <body>
 <br><br><br><br><br>
 <center><h2><?php echo $p->t('testtool/zeitAbgelaufen');?></h2>
+	<h3><?php echo ($showInfo ? ($p->t('testtool/alleGebietGestartet') . "<br />" . $p->t('testtool/alleGebieteGestartetInfo')) : ''); ?></h3>
 </center>
 </body>
 </html>

cis/testtool/login.php

@@ -142,7 +142,9 @@ if (isset($_REQUEST['prestudent']))
 		}
 		if ($reihungstest_id != '' && $rt->load($reihungstest_id))
 		{
-			if ($rt->freigeschaltet)
+			$pruefling_exist = new Pruefling();
+			$alreadyInRT = $pruefling_exist->personAlreadyInRT($ps->person_id, $rt->reihungstest_id, $ps->prestudent_id);
+			if ($rt->freigeschaltet && !$alreadyInRT)
 			{
 				// regenerate Session ID after Login
 				session_regenerate_id();
@@ -282,7 +284,14 @@ if (isset($_REQUEST['prestudent']))
 			}
 			else
 			{
-				$alertmsg .= '<div class="alert alert-danger">'.$p->t('testtool/reihungstestNichtFreigeschalten').'</div>';
+				if ($alreadyInRT)
+				{
+					$alertmsg .= '<div class="alert alert-danger">'.$p->t('testtool/reihungstestNichtRegistriert').'</div>';
+				}
+				else
+				{
+					$alertmsg .= '<div class="alert alert-danger">'.$p->t('testtool/reihungstestNichtFreigeschalten').'</div>';
+				}
 			}
 		}
 		else

cis/testtool/menu.php

@@ -187,6 +187,7 @@ else if (isset($_SESSION['pruefling_id']))
 			}
 
 			$qry .= "
+				AND ps_status.bewerbung_abgeschicktamum IS NOT NULL
 
 		/* Order to get last semester when using distinct on */
 		ORDER BY
@@ -293,7 +294,7 @@ else if (isset($_SESSION['pruefling_id']))
 			}
 			$lastsemester = $row->semester;
 
-			echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px;">';
+			echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
 			echo '<tr><td class="HeaderTesttool">'. ($row->semester == '1' ? $p->t('testtool/basisgebiete') : $p->t('testtool/quereinstiegsgebiete')).'</td></tr>';
 		}
 
@@ -405,6 +406,29 @@ else if (isset($_SESSION['pruefling_id']))
 		echo '</table>';
 	}
 
+	if (isset($_SESSION['pruefling_id']) && !empty($_SESSION['alleGebiete']))
+	{
+		$alleGebiete = array_map('intval', $_SESSION['alleGebiete']);
+		$pruefling_id = (int)$_SESSION['pruefling_id'];
+
+		$qry = "SELECT COUNT(DISTINCT gebiet_id) AS anzahl
+				FROM testtool.tbl_pruefling_frage
+					JOIN testtool.tbl_frage USING(frage_id)
+				WHERE gebiet_id IN (". implode(',', $alleGebiete) .")
+					AND pruefling_id = ". $pruefling_id;
+
+		$result_check = $db->db_query($qry);
+		$row_check = $db->db_fetch_object($result_check);
+
+		if ((int)$row_check->anzahl === count($alleGebiete))
+		{
+			echo '<tr><td>
+					<div class="alert alert-success small" style="margin-left: 20px; width: 170px; margin-top: 3px;" role="alert">
+						<strong>'.$p->t('testtool/alleGebietGestartet').'</strong>
+					</div>
+				</td></tr>';
+		}
+	}
 	// Link zum Logout
 
 	echo '<tr><td class="ItemTesttool" style="margin-left: 20px;" nowrap>

composer.json

@@ -70,18 +70,6 @@
 				}
 			}
 		},
-		{
-			"type": "package",
-			"package": {
-				"name": "drag-drop-touch-js/dragdroptouch",
-				"version": "2.0.3",
-				"source": {
-					"url": "https://github.com/drag-drop-touch-js/dragdroptouch.git",
-					"type": "git",
-					"reference": "master"
-				}
-			}
-		},
 		{
 			"type": "package",
 			"package": {
@@ -464,8 +452,6 @@
 
 		"easyrdf/easyrdf": "0.9.*",
 
-		"drag-drop-touch-js/dragdroptouch": "*",
-
 		"fgelinas/timepicker": "0.3.3",
 		"fortawesome/font-awesome4": "4.7.*",
 		"fortawesome/font-awesome6": "6.1.*",

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": "869cbc35bd1ba90ab90934fcb41b0f51",
+    "content-hash": "f4f0af4586f46f97d8b6092c1ac0fb3a",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -804,16 +804,6 @@
             "abandoned": true,
             "time": "2018-03-09T06:07:41+00:00"
         },
-        {
-            "name": "drag-drop-touch-js/dragdroptouch",
-            "version": "2.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/drag-drop-touch-js/dragdroptouch.git",
-                "reference": "master"
-            },
-            "type": "library"
-        },
         {
             "name": "easyrdf/easyrdf",
             "version": "0.9.1",

content/mitarbeiter/mitarbeiterfunktionoverlay.xul.php

@@ -342,6 +342,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 		<vbox>
 			<checkbox id="mitarbeiter-entwicklungsteam-detail-checkbox-neu" checked="true" hidden="true" />
 			<textbox id="mitarbeiter-entwicklungsteam-detail-textbox-studiengang" hidden="true" />
+			<textbox id="mitarbeiter-entwicklungsteam-detail-entwicklungsteam_id" hidden="true" />
+
 			<groupbox id="mitarbeiter-entwicklungsteam-detail-groupbox" flex="1">
 				<caption label="Details" />
 				<grid id="mitarbeiter-entwicklungsteam-detail-grid" style="margin:4px;" flex="1">

content/mitarbeiter/mitarbeiteroverlay.js.php

@@ -1708,6 +1708,7 @@ function MitarbeiterEntwicklungsteamSelect()
 	document.getElementById('mitarbeiter-entwicklungsteam-detail-textbox-studiengang').value=studiengang_kz;
 	document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-beginn').value=beginn;
 	document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-ende').value=ende;
+	document.getElementById('mitarbeiter-entwicklungsteam-detail-entwicklungsteam_id').value=entwicklungsteam_id;
 	MitarbeiterEntwicklungsteamDetailDisableFields(false);
 }
 
@@ -1725,6 +1726,7 @@ function MitarbeiterEntwicklungsteamSpeichern()
 	studiengang_kz_old = document.getElementById('mitarbeiter-entwicklungsteam-detail-textbox-studiengang').value;
 	beginn = document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-beginn').value;
 	ende = document.getElementById('mitarbeiter-entwicklungsteam-detail-datum-ende').value;
+	entwicklungsteam_id = document.getElementById('mitarbeiter-entwicklungsteam-detail-entwicklungsteam_id').value;
 
 	if(studiengang_kz=='')
 	{

content/student/studentoverlay.js.php

@@ -3555,6 +3555,14 @@ function StudentZeugnisDokumentArchivieren()
 		case 'microcredential_2':
 		case 'microcredential_3':
 		case 'microcredential_4':
+		case 'microdegree_1':
+		case 'microdegree_2':
+		case 'microdegree_3':
+		case 'microdegree_4':
+		case 'microdegreeabschluss_1':
+		case 'microdegreeabschluss_2':
+		case 'microdegreeabschluss_3':
+		case 'microdegreeabschluss_4':
 			xml = 'microcredential.xml.php';
 			break;
 			

include/entwicklungsteam.class.php

@@ -364,9 +364,10 @@ class entwicklungsteam extends basis_db
 		$bismeldung_jahr = $datetime->format('Y');
 
 		//laden des Datensatzes
-			$qry = "SELECT *
+			$qry = "SELECT tbl_entwicklungsteam.*, tbl_besqual.*, tbl_studiengang.studiengang_kz, tbl_studiengang.melderelevant
 					FROM bis.tbl_entwicklungsteam
 					JOIN bis.tbl_besqual USING(besqualcode)
+					JOIN public.tbl_studiengang USING(studiengang_kz)
 					WHERE mitarbeiter_uid=".$this->db_add_param($mitarbeiter_uid)."
 					AND (beginn is NULL OR beginn <= make_date(". $this->db_add_param($bismeldung_jahr). "::INTEGER, 12, 31))
 					AND (ende is NULL OR ende >= make_date(". $this->db_add_param($bismeldung_jahr). "::INTEGER, 1, 1))";
@@ -394,6 +395,7 @@ class entwicklungsteam extends basis_db
 				$obj->insertvon = $row->insertvon;
 				$obj->ext_id = $row->ext_id;
 				$obj->besqual = $row->besqualbez;
+				$obj->melderelevant = $this->db_parse_bool($row->melderelevant);
 
 				$this->result[] = $obj;
 			}

include/konto.class.php

@@ -25,6 +25,7 @@
  */
 require_once(dirname(__FILE__).'/basis_db.class.php');
 require_once(dirname(__FILE__).'/'.EXT_FKT_PATH.'/generateZahlungsreferenz.inc.php');
+require_once(dirname(__FILE__).'/variable.class.php');
 
 class konto extends basis_db
 {
@@ -432,6 +433,8 @@ class konto extends basis_db
 
 		$qry.=" ORDER BY beschreibung";
 
+		$oehBeitrag = $this->_getOEHBeitrag();
+
 		if($this->db_query($qry))
 		{
 			while($row = $this->db_fetch_object())
@@ -440,7 +443,15 @@ class konto extends basis_db
 
 				$typ->buchungstyp_kurzbz = $row->buchungstyp_kurzbz;
 				$typ->beschreibung = $row->beschreibung;
-				$typ->standardbetrag = $row->standardbetrag;
+				if (strtolower($typ->buchungstyp_kurzbz) === 'oeh' && $oehBeitrag)
+				{
+					$typ->standardbetrag = $oehBeitrag;
+				}
+				else
+				{
+					$typ->standardbetrag = $row->standardbetrag;
+				}
+
 				$typ->standardtext = $row->standardtext;
 				$typ->credit_points = $row->credit_points;
 				$typ->aktiv = $this->db_parse_bool($row->aktiv);
@@ -990,6 +1001,43 @@ class konto extends basis_db
 			return false;
 		}
 	}
+
+	private function _getOEHBeitrag()
+	{
+		if(!is_user_logged_in())
+		{
+			return false;
+		}
+
+		$variablen_obj = new variable();
+		$variablen_obj->loadVariables(get_uid());
+
+		$qry = "WITH semstart AS (
+					SELECT start FROM public.tbl_studiensemester
+					WHERE studiensemester_kurzbz = '". $this->db_escape($variablen_obj->variable->semester_aktuell) . "'
+				)
+				SELECT * FROM bis.tbl_oehbeitrag oehb
+				JOIN public.tbl_studiensemester semvon ON oehb.von_studiensemester_kurzbz = semvon.studiensemester_kurzbz
+				LEFT JOIN public.tbl_studiensemester sembis ON oehb.bis_studiensemester_kurzbz = sembis.studiensemester_kurzbz
+				JOIN semstart ON semstart.start::date >= semvon.start::date AND (sembis.studiensemester_kurzbz IS NULL OR semstart.start::date <= sembis.start::date)
+				ORDER BY semvon.start
+				LIMIT 1";
+
+		if ($this->db_query($qry))
+		{
+			if($row = $this->db_fetch_object())
+			{
+				$summe = ($row->studierendenbeitrag + $row->versicherung) * -1;
+				return number_format((float)$summe, 2, '.', '');
+			}
+			return false;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+			return false;
+		}
+	}
 }
 
 ?>

include/lehreinheitmitarbeiter.class.php

@@ -584,8 +584,9 @@ class lehreinheitmitarbeiter extends basis_db
 
 		$qry = '
 			WITH semester_sws_tbl AS (
-				SELECT DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden,
-					stg.studiengang_kz, stg.melde_studiengang_kz, stg.lgartcode
+				SELECT
+					DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden,
+					stg.studiengang_kz, stg.melde_studiengang_kz, stg.lgartcode, stg.melderelevant
 				FROM lehre.tbl_lehreinheitmitarbeiter lema
 					JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 					JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
@@ -598,6 +599,7 @@ class lehreinheitmitarbeiter extends basis_db
 					AND ss.studiensemester_kurzbz IN ('.$this->implode4SQL($studiensemester_kurzbz_arr).')
 				-- nur lehre, die bisgemeldet wird
 					AND lema.bismelden
+					AND stg.melderelevant
 				-- keine lehreinheiten ohne semesterstunden
 					AND lema.semesterstunden != 0
 			)

include/pruefling.class.php

@@ -584,6 +584,32 @@ class pruefling extends basis_db
 		
 		$qry .= " LIMIT 1";
 
+		if($result = $this->db_query($qry))
+		{
+			if ($this->db_num_rows($result) == 0)
+				return false;
+			else
+				return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler bei einer Abfrage';
+			return false;
+		}
+	}
+	public function personAlreadyInRT($person_id, $reihungstest_id, $prestudent_id)
+	{
+		$qry = "SELECT tbl_prestudent.prestudent_id
+				FROM public.tbl_rt_person
+					JOIN public.tbl_prestudent ON tbl_prestudent.person_id = tbl_rt_person.person_id
+					JOIN public.tbl_prestudentstatus ON tbl_prestudent.prestudent_id = tbl_prestudentstatus.prestudent_id AND status_kurzbz = 'Bewerber'
+						AND tbl_prestudentstatus.studienplan_id = tbl_rt_person.studienplan_id
+				WHERE tbl_rt_person.person_id = " . $this->db_add_param($person_id) . "
+					AND tbl_rt_person.rt_id = " . $this->db_add_param($reihungstest_id) . "
+					AND tbl_prestudent.prestudent_id != " . $this->db_add_param($prestudent_id) . "
+					AND get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) = 'Bewerber'
+				LIMIT 1";
+
 		if($result = $this->db_query($qry))
 		{
 			if ($this->db_num_rows($result) == 0)

locale/de-AT/testtool.php

@@ -17,6 +17,7 @@ $this->phrasen['testtool/basic']='Basic';
 $this->phrasen['testtool/basisgebiete']='Basisgebiete';
 $this->phrasen['testtool/semester']='Semester';
 $this->phrasen['testtool/reihungstestNichtFreigeschalten']='Der zuteilte Reihungstest ist noch nicht freigeschaltet';
+$this->phrasen['testtool/reihungstestNichtRegistriert']='Sie sind für den Reihungstest nicht registriert';
 $this->phrasen['testtool/reihungstestKannNichtGeladenWerden']='Der Reihungstest dem Sie zugeteilt sind, kann nicht geladen werden. Melden Sie sich bitte bei der Reihungstestaufsicht.';
 $this->phrasen['testtool/geburtsdatumStimmtNichtUeberein']='Ihr Geburtsdatum stimmt nicht mit unseren Daten überein. Bitte wenden Sie sich an die Aufsichtsperson';
 $this->phrasen['testtool/home']='Home';
@@ -31,10 +32,14 @@ $this->phrasen['testtool/keineAntwort']='Keine Antwort';
 $this->phrasen['testtool/speichernUndWeiter']='Speichern und weiter';
 $this->phrasen['testtool/alleFragenBeantwortet']='GLÜCKWUNSCH! \n\nSie haben alle Fragen in der zur Verfügung stehenden Zeit beantwortet. \nNutzen Sie die verbleibende Zeit, um Ihre Antworten zu kontrollieren oder fahren Sie mit dem nächsten Teilgebiet fort.';
 $this->phrasen['testtool/zeitAbgelaufen']='Die Maximalzeit für dieses Gebiet ist abgelaufen, oder alle Fragen wurden beantwortet';
+$this->phrasen['testtool/alleGebietGestartet']='Sie haben alle Gebiete bearbeitet.';
+$this->phrasen['testtool/alleGebieteGestartetInfo']='Sie können sich nun ausloggen und den Browser schließen.';
 $this->phrasen['testtool/spracheDerTestfragen']='Gewünschte Sprache der Testfragen';
 $this->phrasen['testtool/einleitung']='Einleitung';
 $this->phrasen['testtool/blaettern']='Blättern';
 $this->phrasen['testtool/demo']='Demobeispiel ansehen';
+$this->phrasen['testtool/abbrechen']='Abbrechen';
+$this->phrasen['testtool/startGebiet']='Gebiet starten';
 $this->phrasen['testtool/okKlickenUmZuStarten']='Klicken Sie OK um dieses Gebiet zu starten. \nSie haben für die Bearbeitung ein Zeitlimit von';
 $this->phrasen['testtool/bitteZuerstAnmelden']='Bitte zuerst anmelden!';
 $this->phrasen['testtool/fehlerBeimGenerierenDesFragenpools']='Fehler beim generieren des Fragenpools';

locale/en-US/testtool.php

@@ -17,6 +17,7 @@ $this->phrasen['testtool/basic']='Basic';
 $this->phrasen['testtool/basisgebiete']='Basic test';
 $this->phrasen['testtool/semester']='Semester';
 $this->phrasen['testtool/reihungstestNichtFreigeschalten']='The entrance examination assigned has not yet been activated.';
+$this->phrasen['testtool/reihungstestNichtRegistriert']='You are not registered for the placement test.';
 $this->phrasen['testtool/reihungstestKannNichtGeladenWerden']='The placement test you are assigned to could not be loaded. Please contact the placement test supervisior.';
 $this->phrasen['testtool/geburtsdatumStimmtNichtUeberein']='Your date of birth does not correspond to the data we have. Please speak to the supervisor. ';
 $this->phrasen['testtool/home']='Home';
@@ -31,10 +32,14 @@ $this->phrasen['testtool/keineAntwort']='No Answer';
 $this->phrasen['testtool/speichernUndWeiter']='Save and next';
 $this->phrasen['testtool/alleFragenBeantwortet']='CONGRATULATIONS!\n\nYou have answered all the questions in the time allowed.\n Use the remaining time to check your answers or continue to the next section.';
 $this->phrasen['testtool/zeitAbgelaufen']='The time for this part has expired or you have answered all the questions.';
+$this->phrasen['testtool/alleGebietGestartet']='You have worked on all sections.';
+$this->phrasen['testtool/alleGebieteGestartetInfo']='You can now log out and close the browser.';
 $this->phrasen['testtool/spracheDerTestfragen']='Desired language of questions';
 $this->phrasen['testtool/einleitung']='Introduction';
 $this->phrasen['testtool/blaettern']='Browse';
 $this->phrasen['testtool/demo']='See an example';
+$this->phrasen['testtool/abbrechen']='Cancel';
+$this->phrasen['testtool/startGebiet']='Start the section';
 $this->phrasen['testtool/okKlickenUmZuStarten']='Click OK to start this section. \nYou have a timelimit of';
 $this->phrasen['testtool/bitteZuerstAnmelden']='Please log in first!';
 $this->phrasen['testtool/fehlerBeimGenerierenDesFragenpools']='Error in generating the pool of questions.';

public/css/Studentenverwaltung.css

@@ -197,10 +197,6 @@ html.fs_huge {
 	margin-bottom: -1px;
 }
 
-.tiny-90 div.tox.tox-tinymce {
-	height: 90% !important;
-}
-
 /* slim begin */
 .stv .form-label {
 	margin-bottom: .15rem;

public/css/components/dashboard.css

@@ -2,7 +2,7 @@
 @import './dashboard/news.css';
 @import './dashboard/LvPlan.css';
 
-:root {
+:root{
 	--fhc-dashboard-danger: var(--fhc-danger, #842029);
 	--fhc-dashboard-grid-size: 4;
 	--fhc-dashboard-link: var(--fhc-link, #0a57ca);
@@ -17,16 +17,22 @@
 	--fhc-dashboard-section-info-color-hover: var(--fhc-primary-highlight, #005585);
 }
 
-.core-dashboard a {
+@media(max-width: 577px) {
+	:root {
+		--fhc-dashboard-grid-size: 1;
+	}
+}
+
+.core-dashboard a{
 	color: var(--fhc-dashboard-link);
 }
 
-@media (max-width: 576px) {
+@media (max-width: 576px){
 	.widget-icon {
 		max-height: 250px;
 		object-fit: cover;
 	}
-	.widget-icon-container {
+	.widget-icon-container{
 		max-width: 250px;
 		margin-left: auto;
 		margin-right: auto;
@@ -40,36 +46,27 @@
 	background-repeat: no-repeat;
 	background-position: center;
 	background-size: cover;
-	cursor: pointer;
+	cursor:pointer;
 }
 
-.dashboard-section.edit-active {
-	/**
-	 * replaces margin for extra row
-	 * 10% equals 0.1 of 100%
-	 * 1rem equals the padding of pb-3 that is overwritten here
-	 */
-	padding-bottom: calc(10% / var(--fhc-dashboard-grid-size) + 1rem) !important;
-}
-
-.dashboard-section > .newGridRow {
-	position: absolute;
-	width: 20px;
-	height: 20px;
-	padding: 0;
-	bottom: 0;
-	left: 50%;
-	transform: translate(-50%, 50%);
+.dashboard-section > .newGridRow{
+	position:absolute;
+	width:20px;
+	height:20px;
+	padding:0;
+	bottom:0;
+	left:50%;
+	transform:translate(-50%, 50%);
 	background-color: var(--fhc-dashboard-gridrow-background);
 }
 
 .newGridRow:hover {
-	color: white;
+	color:white;
 	background-color: var(--fhc-dashboard-gridrow-background-highlight);
 }
 
 .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>');
+		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>');
 }
 
 .alert-danger .form-check-input:checked {
@@ -77,6 +74,16 @@
 	background-color: var(--fhc-dashboard-danger);
 }
 
+:root {
+	--fhc-dashboard-grid-size: 4;
+}
+
+@media(max-width: 1400px) {
+	:root {
+		--fhc-dashboard-grid-size: 4;
+	}
+}
+
 @media(max-width: 1200px) {
 	:root {
 		--fhc-dashboard-grid-size: 3;
@@ -98,7 +105,6 @@
 @media(max-width: 577px) {
 	:root {
 		--fhc-dashboard-grid-size: 1;
-		--fhc-dg-item-py: .75rem;
 	}
 }
 
@@ -126,64 +132,50 @@
 	cursor: move !important;
 }
 
-.drop-grid-item-resize > .dashboard-item,
-.drop-grid-item-move > .dashboard-item {
+.draggedItem {
 	height: 100%;
 	width: 100%;
 	background-color: var(--fhc-dashboard-draggeditem-background);
 	position: relative;
 }
 
-.drop-grid-item-resize > .dashboard-item > *,
-.drop-grid-item-move > .dashboard-item > * {
-	display: none;
-}
-
-.drop-grid-item-sizechanged > .dashboard-item,
-.drop-grid-item-move > .dashboard-item {
+.dashboard-item-overlay{
 	background-color: var(--fhc-dashboard-item-overlay-background);
 }
 
-.drop-grid-item-sizechanged > .dashboard-item::before,
-.drop-grid-item-move > .dashboard-item::before {
-	position: absolute;
-	content: "";
-	top: .25rem;
-	left: .25rem;
-	right: .25rem;
-	bottom: .25rem;
-	border: 4px dashed var(--fhc-dashboard-item-overly-border-color);
-	opacity: .5;
+.dashboard-item-overlay::before{
+	position:absolute;
+	content:"";
+	top:0.25rem;
+	left:0.25rem;
+	right:0.25rem;
+	bottom:0.25rem;
+	border:4px dashed var(--fhc-dashboard-item-overly-border-color);
+	opacity: 0.5;
 }
 
-.drop-grid-item-oversized > .dashboard-item {
-	/* Bootstrap: border-danger */
-	--bs-border-opacity: 1;
-	border-color: rgba(var(--bs-danger-rgb), var(--bs-border-opacity)) !important;
-}
-
-#deleteBookmark i {
+#deleteBookmark i{
 	color: var(--fhc-dashboard-danger);
 }
 
-.pin:hover {
+.pin:hover{
 	cursor: pointer;
 }
 
-.pin[pinned]:hover {
+.pin[pinned]:hover{
 	color: var(--fhc-dashboard-pin-pinned-hover-color);
 }
 
-.section-info {
+.section-info{
 	color: var(--fhc-dashboard-section-info-color);
-	cursor: pointer;
+	cursor:pointer;
 }
 
 .section-info:hover {
 	color: var(--fhc-dashboard-section-info-color-hover);
 }
 
-.drop-grid-item-blocker [pinned='true'] {
+.denied-dragging-animation {
 	animation: wiggle 0.5s linear;
 	color: var(--fhc-dashboard-denied-dragging-animation-color) !important;
 }
@@ -212,13 +204,13 @@
 
 }
 
-.hidden-widget {
+.hiddenWidget{
 	background: var(--fhc-disabled-background);
 	opacity: 40%;
 }
 
-.hidden-widget .card,
-.hidden-widget .card-body,
-.hidden-widget .card-body * {
+.hiddenWidget .card,
+.hiddenWidget .card-body,
+.hiddenWidget .card-body *{
 	background: inherit !important;
 }

public/js/api/factory/stv/konto.js

@@ -38,6 +38,10 @@ export default {
 		};
 	},
 	insert(params) {
+		if(params.betrag)
+		{
+			params.betrag = params.betrag.replace(',', '.');
+		}
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/stv/konto/insert',
@@ -52,6 +56,10 @@ export default {
 		};
 	},
 	edit(params) {
+		if(params.betrag)
+		{
+			params.betrag = params.betrag.replace(',', '.');
+		}
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/stv/konto/update',
@@ -65,10 +73,14 @@ export default {
 			params: { buchungsnr }
 		};
 	},
-	getBuchungstypen() {
+	getBuchungstypen(studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/konto/getBuchungstypen'
+		if (!!studiensemester_kurzbz)
+			url = url + '/' + encodeURIComponent(studiensemester_kurzbz);
+
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/konto/getBuchungstypen'
+			url: url
 		};
-	}
+	},
 };

public/js/apps/Cis.js

@@ -1,313 +1,156 @@
-import FhcDashboard from '../components/Dashboard/Dashboard.js';
+import FhcSearchbar from "../components/searchbar/searchbar.js";
+import CisMenu from "../components/Cis/Menu.js";
 import PluginsPhrasen from '../plugins/Phrasen.js';
-import Theme from '../plugins/Theme.js';
-import contrast from '../directives/contrast.js';
-import {setScrollbarWidth} from "../helpers/CssVarCalcHelpers.js";
-import LvPlan from "../components/Cis/LvPlan/Lehrveranstaltung.js";
-import MyLvPlan from "../components/Cis/LvPlan/Personal.js";
-import MylvStudent from "../components/Cis/Mylv/Student.js";
-import Profil from "../components/Cis/Profil/Profil.js";
-import Raumsuche from "../components/Cis/Raumsuche/Raumsuche.js";
-import CmsNews from "../components/Cis/Cms/News.js";
-import CmsContent from "../components/Cis/Cms/Content.js";
-import Info from "../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
-import RoomInformation, {DEFAULT_MODE_RAUMINFO} from "../components/Cis/Mylv/RoomInformation.js";
-import AbgabetoolStudent from "../components/Cis/Abgabetool/AbgabetoolStudent.js";
-import AbgabetoolMitarbeiter from "../components/Cis/Abgabetool/AbgabetoolMitarbeiter.js";
-import AbgabetoolAssistenz from "../components/Cis/Abgabetool/AbgabetoolAssistenz.js";
-import DeadlineOverview from "../components/Cis/Abgabetool/DeadlineOverview.js";
-import Studium from "../components/Cis/Studium/Studium.js";
-
-import ApiRouteInfo from '../api/factory/routeinfo.js';
-import {capitalize} from "../helpers/StringHelpers.js";
-
-const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
-
-const router = VueRouter.createRouter({
-	history: VueRouter.createWebHistory(`/${ciPath}`),
-	routes: [
-		{
-			path: `/Cis/Studium`,
-			name: 'Studium',
-			component: Studium,
-			props: true
-		},
-		{
-			path: `/Cis/Profil/View/:uid`,
-			name: 'ProfilView',
-			component: Profil,
-			props: true
-		},
-		{
-			path: `/Cis/Profil`,
-			name: 'Profil',
-			component: Profil,
-			props: true
-		},
-		{
-			path: `/Cis/Abgabetool/Student/:student_uid_prop?`,
-			name: 'AbgabetoolStudent',
-			component: AbgabetoolStudent,
-			props: true
-		},
-		{
-			path: `/Cis/Abgabetool/Mitarbeiter`,
-			name: 'AbgabetoolMitarbeiter',
-			component: AbgabetoolMitarbeiter,
-			props: true
-		},
-		{
-			path: `/Cis/Abgabetool/Assistenz/:stg_kz_prop?`,
-			name: 'AbgabetoolAssistenz',
-			component: AbgabetoolAssistenz,
-			props: true
-		},
-		{
-			path: `/Cis/Abgabetool/Deadlines/:person_uid_prop?`,
-			name: 'DeadlineOverview',
-			component: DeadlineOverview,
-			props: true
-		},
-		{
-			path: `/Cis/Raumsuche`,
-			name: 'Raumsuche',
-			component: Raumsuche,
-			props: true
-		},
-		// Redirect old links to new format
-		{
-			path: "/CisVue/Cms/getRoomInformation/:ort_kurzbz",
-			name: "RoomInformationOld",
-			component: RoomInformation,
-			redirect: (to) => {
-				return { // redirect to longer Rauminfo url and map params
-					name: "RoomInformation",
-					params: { // in this case always populate other params since they are not optional
-						ort_kurzbz: to.params.ort_kurzbz,
-						mode: DEFAULT_MODE_RAUMINFO,
-						focus_date: new Date().toISOString().split("T")[0]
-					},
-				};
-			},
-		},
-		{
-			path: `/CisVue/Cms/getRoomInformation/:mode/:focus_date/:ort_kurzbz`,
-			name: 'RoomInformation',
-			component: RoomInformation,
-			props: (route) => { // validate and set mode/focus date if for some reason missing
-				const validModes = ["Month", "Week", "Day"];
-
-				// check mode string
-				const mode = route.params.mode &&
-				validModes.includes(route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase())
-					? route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase()
-					: DEFAULT_MODE_RAUMINFO;
-
-				// default to today date if not provided
-				const d = new Date(route.params.focus_date)
-				const focus_date = !isNaN(d) ? route.params.focus_date : new Date().toISOString().split("T")[0];
-
-				// for consistency reasons format the props into one object but actually use a new name to we dont collide with
-				// existing viewData declaration written from codeigniter 3 into routerview tag
-				return {
-					propsViewData: {
-						mode,
-						focus_date,
-						ort_kurzbz: route.params.ort_kurzbz
-					}
-				};
-			},
-			beforeEnter: (to, from, next) => {
-				//  missing mode or focus_date -> set defaults
-				if (!to.params.mode || !to.params.focus_date) {
-					next({
-						name: "RoomInformation",
-						params: {
-							mode: to.params.mode || DEFAULT_MODE_RAUMINFO,
-							focus_date: to.params.focus_date || new Date().toISOString().split("T")[0],
-							ort_kurzbz: route.params.ort_kurzbz
-						}
-					});
-				} else {
-					next();
-				}
-			}
-		},
-		{
-			path: `/CisVue/Cms/Content/:content_id`,
-			name: 'Content',
-			component: CmsContent,
-			props: true
-		},
-		{
-			path: `/CisVue/Cms/News`,
-			name: 'News',
-			component: CmsNews,
-			props: true
-		},
-		{
-			path: `/Cis/MyLv/:studiensemester?`,
-			name: 'MyLv',
-			component: MylvStudent,
-			props: true,
-		},
-		{
-			path: `/Cis/MyLv/Info/:studien_semester/:lehrveranstaltung_id`,
-			name: 'LvInfo',
-			component: Info,
-			props: true
-		},
-		// Redirect old links to new format
-		{
-			// only trigger on first param being numeric to avoid paths like "LvPlan/Month" entering here
-			path: "/Cis/LvPlan/:lv_id(\\d+)", 
-			name: "LvPlanOld",
-			component: LvPlan,
-			redirect(to) {
-				const route = Vue.unref(router.currentRoute);
-				const { mode, focus_date } = route.params; // keep mode and focus_date if available
-				return { // redirect to longer LvPlan url and map params
-					name: "LvPlan",
-					params: {
-						mode,
-						focus_date,
-						lv_id: to.params.lv_id
-					},
-				};
-			},
-		},
-		{
-			path: `/Cis/LvPlan/:mode?/:focus_date?/:lv_id?`,
-			name: 'LvPlan',
-			component: LvPlan,
-			props(route) {
-				return {
-					propsViewData: route.params
-				};
-			}
-		},
-		{
-			path: `/Cis/MyLvPlan/:mode?/:focus_date?`,
-			name: 'MyLvPlan',
-			component: MyLvPlan,
-			props(route) {
-				return {
-					propsViewData: route.params
-				};
-			}
-		},
-		{
-			path: `/Cis4`,
-			name: 'Cis4',
-			component: FhcDashboard,
-			props: {dashboard: 'CIS'},
-		},
-		{
-			path: `/`,
-			name: 'FhcDashboard',
-			component: FhcDashboard,
-			props: {dashboard: 'CIS'},
-		},
-		{
-			path: '/:pathMatch(.*)*',
-			name: 'Fallback',
-			component: FhcDashboard,
-			props: {dashboard: 'CIS'},
-			redirect: () => {
-				return {
-					name: "Cis4",
-					params: {
-						dashboard: 'CIS'
-					},
-				};
-			},
-		},
-	]
-})
+import ApiSearchbar from '../api/factory/searchbar.js';
+import Theme from "../plugins/Theme.js";
 
 const app = Vue.createApp({
-	name: 'CisApp',
-	data: () => ({
-		appSideMenuEntries: {}
-	}),
-	components: {},
-	computed: {
-		isMobile() {
-			const smallScreen = window.matchMedia("(max-width: 767px)").matches;
-			const touchCapable = ("ontouchstart" in window) || navigator.maxTouchPoints > 0;
-			return smallScreen;// && touchCapable;
-		}	
-	},
-	provide() {
-		return { // provide injectable & watchable language property
-			language: Vue.computed(() => this.$p.user_language),
-			isMobile: this.isMobile
-		}	
-	},
-	methods: {
-		isInternalRoute(href) {
-			const internalBase = window.location.origin
-			return href.startsWith(internalBase);
-		},
-		handleClick(event) {
-			const target = event.target.closest('a');
+    name: 'CisApp',
+    components: {
+        FhcSearchbar,
+        CisMenu
+    },
+    data: function() {
+        return {
+            searchbaroptions: {
+				origin: "cis",
+				cssclass: "",
+				calcheightonly: true,
+				types: {
+					employee: Vue.computed(() => this.$p.t("search/type_employee")),
+					student: Vue.computed(() => this.$p.t("search/type_student")),
+					room: Vue.computed(() => this.$p.t("search/type_room")),
+					organisationunit: Vue.computed(() => this.$p.t("search/type_organisationunit")),
+					cms: Vue.computed(() => this.$p.t("search/type_cms")),
+					dms: Vue.computed(() => this.$p.t("search/type_dms"))
+				},
+                actions: {
+                    employee: {
+                        defaultaction: {
+                            type: "link",
+                            action: function(data) {
+									return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
+										"/Cis/Profil/View/"+data.uid;
+							}
+						},
+                        childactions: []
+					},
+					student: {
+						defaultaction: {
+							type: "link",
+							action: function (data) {
+								return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+									"/Cis/Profil/View/" + data.uid;
 
-			if(target?.id == 'skiplink') return
-			if (target && this.isInternalRoute(target.href)) {
-				const url = new URL(target.href)
-				
-				const path = url.pathname
-				const base = this.$router.options.history.base
-				const route = path.replace(base, '') || '/'
-
-				// let click event propagate normally if we dont route internally
-				const res = this.$router.resolve(route)
-				if(!res?.matched?.length || res.name === 'Fallback') return
-				
-				event.preventDefault(); // Prevent browser navigation
-				
-				if(this.isMobile) { // toggle the menu
-					const navMain = document.getElementById('nav-main');
-					// fix unwanted toggle from off to on for some links on mobile
-					if(navMain.classList.contains('show')){
-						document.getElementById('nav-main-btn').click();
-					} 
-				}
-				
-				this.$router.push(route);
-				
-			}
-		}
-	},
-	mounted() {
-		document.addEventListener('click', this.handleClick);
-		
-	},
-	beforeUnmount() {
-		document.removeEventListener('click', this.handleClick);
-	},
+							}
+						},
+						childactions: []
+					},
+                    room: {
+                        defaultaction: {
+                            type: "link",
+							renderif: function(data) {
+								if(data.content_id === null){
+									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;
+                            }
+                        },
+                        childactions: [
+                            {
+                                label: "LV-Plan",
+                                icon: "fas fa-bookmark",
+                                type: "link",
+                                action: function(data) {
+									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 === null){
+										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;
+                                }
+                            },
+                        ]
+                    },
+                    organisationunit: {
+                        defaultaction: {
+                            type: "link",
+							renderif: function(data) {
+								if(data.mailgroup) {
+									return true;
+								}
+								return false;
+							},
+                            action: function(data) {
+                                const link = 'mailto:' + data.mailgroup;
+								return link;
+                            }
+                        },
+                        childactions: []
+                    },
+					cms: {
+						defaultaction: {
+							type: "link",
+							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;
+							}
+						},
+						childactions: []
+					},
+					dms: {
+						defaultaction: {
+							type: "link",
+							action: function (data) {
+								const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+									'cms/dms.php?id=' + data.dms_id;
+								return link;
+							}
+						},
+						childactions: []
+					}
+                }
+            }
+        };
+    },
+    methods: {
+        searchfunction: function(searchsettings) {
+        	return this.$api.call(ApiSearchbar.searchCis(searchsettings));
+        }
+    }
 });
 
-// kind of a bandaid for bad css on some pages to avoid horizontal scroll
-setScrollbarWidth();
-app.config.globalProperties.$capitalize = capitalize;
-
-FhcApps.router.makeExtendable(router);
 FhcApps.makeExtendable(app);
 
-app.use(router);
 app.use(primevue.config.default, {
 	zIndex: {
 		overlay: 9000,
 		tooltip: 8000
 	}
 })
-app.directive('tooltip', primevue.tooltip);
 app.use(PluginsPhrasen);
 app.use(Theme);
-app.directive('contrast', contrast);
-app.mount('#fhccontent');
-
-router.afterEach((to, from, failure) => {
-	app.config.globalProperties.$api.call(ApiRouteInfo.info('cis4', to.fullPath));
-});
+app.mount('#cis-header');

public/js/apps/Cis/Menu.js

@@ -1,156 +0,0 @@
-import FhcSearchbar from "../../components/searchbar/searchbar.js";
-import CisMenu from "../../components/Cis/Menu.js";
-import PluginsPhrasen from '../../plugins/Phrasen.js';
-import ApiSearchbar from '../../api/factory/searchbar.js';
-import Theme from "../../plugins/Theme.js";
-
-const app = Vue.createApp({
-    name: 'CisMenuApp',
-    components: {
-        FhcSearchbar,
-        CisMenu
-    },
-    data: function() {
-        return {
-            searchbaroptions: {
-				origin: "cis",
-				cssclass: "",
-				calcheightonly: true,
-				types: {
-					employee: Vue.computed(() => this.$p.t("search/type_employee")),
-					student: Vue.computed(() => this.$p.t("search/type_student")),
-					room: Vue.computed(() => this.$p.t("search/type_room")),
-					organisationunit: Vue.computed(() => this.$p.t("search/type_organisationunit")),
-					cms: Vue.computed(() => this.$p.t("search/type_cms")),
-					dms: Vue.computed(() => this.$p.t("search/type_dms"))
-				},
-                actions: {
-                    employee: {
-                        defaultaction: {
-                            type: "link",
-                            action: function(data) {
-									return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router+
-										"/Cis/Profil/View/"+data.uid;
-							}
-						},
-                        childactions: []
-					},
-					student: {
-						defaultaction: {
-							type: "link",
-							action: function (data) {
-								return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-									"/Cis/Profil/View/" + data.uid;
-
-							}
-						},
-						childactions: []
-					},
-                    room: {
-                        defaultaction: {
-                            type: "link",
-							renderif: function(data) {
-								if(data.content_id === null){
-									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;
-                            }
-                        },
-                        childactions: [
-                            {
-                                label: "LV-Plan",
-                                icon: "fas fa-bookmark",
-                                type: "link",
-                                action: function(data) {
-									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 === null){
-										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;
-                                }
-                            },
-                        ]
-                    },
-                    organisationunit: {
-                        defaultaction: {
-                            type: "link",
-							renderif: function(data) {
-								if(data.mailgroup) {
-									return true;
-								}
-								return false;
-							},
-                            action: function(data) {
-                                const link = 'mailto:' + data.mailgroup;
-								return link;
-                            }
-                        },
-                        childactions: []
-                    },
-					cms: {
-						defaultaction: {
-							type: "link",
-							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;
-							}
-						},
-						childactions: []
-					},
-					dms: {
-						defaultaction: {
-							type: "link",
-							action: function (data) {
-								const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
-									'cms/dms.php?id=' + data.dms_id;
-								return link;
-							}
-						},
-						childactions: []
-					}
-                }
-            }
-        };
-    },
-    methods: {
-        searchfunction: function(searchsettings) {
-        	return this.$api.call(ApiSearchbar.searchCis(searchsettings));
-        }
-    }
-});
-
-FhcApps.makeExtendable(app);
-
-app.use(primevue.config.default, {
-	zIndex: {
-		overlay: 9000,
-		tooltip: 8000
-	}
-})
-app.use(PluginsPhrasen);
-app.use(Theme);
-app.mount('#cis-header');

public/js/apps/Dashboard/Admin.js

@@ -3,10 +3,13 @@ import DashboardAdmin from '../../components/Dashboard/Admin.js';
 
 import PluginsPhrasen from '../../plugins/Phrasen.js';
 
+import ApiRenderers from '../../api/factory/renderers.js';
+
 const app = Vue.createApp({
 	name: 'DashboardAdminApp',
 	data: () => ({
-		appSideMenuEntries: {}
+		appSideMenuEntries: {},
+		renderers: null
 	}),
 	components: {
 		CoreNavigationCmpt,
@@ -14,8 +17,49 @@ const app = Vue.createApp({
 	},
 	provide() {
 		return {
+			// TODO(chris): move those two into the components that need it
+			renderers: Vue.computed(() => this.renderers),
 			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone
 		};
+	},
+	created() {
+		this.$api
+			.call(ApiRenderers.loadRenderers())
+			.then(res => {
+				for (let rendertype of Object.keys(res.data)) {
+					let modalTitle = null;
+					let modalContent = null;
+					let calendarEvent = null;
+					if (res.data[rendertype].modalTitle)
+						modalTitle = Vue.markRaw(Vue.defineAsyncComponent(() => import(res.data[rendertype].modalTitle)));
+					if (res.data[rendertype].modalContent) 	
+						modalContent = Vue.markRaw(Vue.defineAsyncComponent(() => import(res.data[rendertype].modalContent)));
+					if (res.data[rendertype].calendarEvent) 	
+						calendarEvent = Vue.markRaw(Vue.defineAsyncComponent(() => import(res.data[rendertype].calendarEvent)));
+
+					if (res.data[rendertype].calendarEventStyles) {
+						var head = document.head;
+						if (!head.querySelector(`link[href="${res.data[rendertype].calendarEventStyles}"]`)) {
+							var link = document.createElement("link");
+							link.type = "text/css";
+							link.rel = "stylesheet";
+							link.href = res.data[rendertype].calendarEventStyles;
+							head.appendChild(link);
+						}
+					}
+
+					if (this.renderers === null) {
+						this.renderers = {};
+					}
+					if (!this.renderers[rendertype]) {
+						this.renderers[rendertype] = {}
+					}
+					this.renderers[rendertype].modalTitle = modalTitle;
+					this.renderers[rendertype].modalContent = modalContent;
+					this.renderers[rendertype].calendarEvent = calendarEvent;
+				}
+			})
+			.catch(this.$fhcAlert.handleSystemErrors);
 	}
 });
 app.use(PluginsPhrasen);

public/js/apps/Dashboard/Fhc.js

@@ -0,0 +1,356 @@
+import FhcDashboard from '../../components/Dashboard/Dashboard.js';
+import PluginsPhrasen from '../../plugins/Phrasen.js';
+import Theme from '../../plugins/Theme.js';
+import contrast from '../../directives/contrast.js';
+import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers.js";
+import LvPlan from "../../components/Cis/LvPlan/Lehrveranstaltung.js";
+import MyLvPlan from "../../components/Cis/LvPlan/Personal.js";
+import MylvStudent from "../../components/Cis/Mylv/Student.js";
+import Profil from "../../components/Cis/Profil/Profil.js";
+import Raumsuche from "../../components/Cis/Raumsuche/Raumsuche.js";
+import CmsNews from "../../components/Cis/Cms/News.js";
+import CmsContent from "../../components/Cis/Cms/Content.js";
+import Info from "../../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
+import RoomInformation, {DEFAULT_MODE_RAUMINFO} from "../../components/Cis/Mylv/RoomInformation.js";
+import AbgabetoolStudent from "../../components/Cis/Abgabetool/AbgabetoolStudent.js";
+import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMitarbeiter.js";
+import AbgabetoolAssistenz from "../../components/Cis/Abgabetool/AbgabetoolAssistenz.js";
+import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.js";
+import Studium from "../../components/Cis/Studium/Studium.js";
+
+import ApiRenderers from '../../api/factory/renderers.js';
+import ApiRouteInfo from '../../api/factory/routeinfo.js';
+import {capitalize} from "../../helpers/StringHelpers.js";
+
+const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+
+const router = VueRouter.createRouter({
+	history: VueRouter.createWebHistory(`/${ciPath}`),
+	routes: [
+		{
+			path: `/Cis/Studium`,
+			name: 'Studium',
+			component: Studium,
+			props: true
+		},
+		{
+			path: `/Cis/Profil/View/:uid`,
+			name: 'ProfilView',
+			component: Profil,
+			props: true
+		},
+		{
+			path: `/Cis/Profil`,
+			name: 'Profil',
+			component: Profil,
+			props: true
+		},
+		{
+			path: `/Cis/Abgabetool/Student/:student_uid_prop?`,
+			name: 'AbgabetoolStudent',
+			component: AbgabetoolStudent,
+			props: true
+		},
+		{
+			path: `/Cis/Abgabetool/Mitarbeiter`,
+			name: 'AbgabetoolMitarbeiter',
+			component: AbgabetoolMitarbeiter,
+			props: true
+		},
+		{
+			path: `/Cis/Abgabetool/Assistenz/:stg_kz_prop?`,
+			name: 'AbgabetoolAssistenz',
+			component: AbgabetoolAssistenz,
+			props: true
+		},
+		{
+			path: `/Cis/Abgabetool/Deadlines/:person_uid_prop?`,
+			name: 'DeadlineOverview',
+			component: DeadlineOverview,
+			props: true
+		},
+		{
+			path: `/Cis/Raumsuche`,
+			name: 'Raumsuche',
+			component: Raumsuche,
+			props: true
+		},
+		// Redirect old links to new format
+		{
+			path: "/CisVue/Cms/getRoomInformation/:ort_kurzbz",
+			name: "RoomInformationOld",
+			component: RoomInformation,
+			redirect: (to) => {
+				return { // redirect to longer Rauminfo url and map params
+					name: "RoomInformation",
+					params: { // in this case always populate other params since they are not optional
+						ort_kurzbz: to.params.ort_kurzbz,
+						mode: DEFAULT_MODE_RAUMINFO,
+						focus_date: new Date().toISOString().split("T")[0]
+					},
+				};
+			},
+		},
+		{
+			path: `/CisVue/Cms/getRoomInformation/:mode/:focus_date/:ort_kurzbz`,
+			name: 'RoomInformation',
+			component: RoomInformation,
+			props: (route) => { // validate and set mode/focus date if for some reason missing
+				const validModes = ["Month", "Week", "Day"];
+
+				// check mode string
+				const mode = route.params.mode &&
+				validModes.includes(route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase())
+					? route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase()
+					: DEFAULT_MODE_RAUMINFO;
+
+				// default to today date if not provided
+				const d = new Date(route.params.focus_date)
+				const focus_date = !isNaN(d) ? route.params.focus_date : new Date().toISOString().split("T")[0];
+
+				// for consistency reasons format the props into one object but actually use a new name to we dont collide with
+				// existing viewData declaration written from codeigniter 3 into routerview tag
+				return {
+					propsViewData: {
+						mode,
+						focus_date,
+						ort_kurzbz: route.params.ort_kurzbz
+					}
+				};
+			},
+			beforeEnter: (to, from, next) => {
+				//  missing mode or focus_date -> set defaults
+				if (!to.params.mode || !to.params.focus_date) {
+					next({
+						name: "RoomInformation",
+						params: {
+							mode: to.params.mode || DEFAULT_MODE_RAUMINFO,
+							focus_date: to.params.focus_date || new Date().toISOString().split("T")[0],
+							ort_kurzbz: route.params.ort_kurzbz
+						}
+					});
+				} else {
+					next();
+				}
+			}
+		},
+		{
+			path: `/CisVue/Cms/Content/:content_id`,
+			name: 'Content',
+			component: CmsContent,
+			props: true
+		},
+		{
+			path: `/CisVue/Cms/News`,
+			name: 'News',
+			component: CmsNews,
+			props: true
+		},
+		{
+			path: `/Cis/MyLv/:studiensemester?`,
+			name: 'MyLv',
+			component: MylvStudent,
+			props: true,
+		},
+		{
+			path: `/Cis/MyLv/Info/:studien_semester/:lehrveranstaltung_id`,
+			name: 'LvInfo',
+			component: Info,
+			props: true
+		},
+		// Redirect old links to new format
+		{
+			// only trigger on first param being numeric to avoid paths like "LvPlan/Month" entering here
+			path: "/Cis/LvPlan/:lv_id(\\d+)", 
+			name: "LvPlanOld",
+			component: LvPlan,
+			redirect(to) {
+				const route = Vue.unref(router.currentRoute);
+				const { mode, focus_date } = route.params; // keep mode and focus_date if available
+				return { // redirect to longer LvPlan url and map params
+					name: "LvPlan",
+					params: {
+						mode,
+						focus_date,
+						lv_id: to.params.lv_id
+					},
+				};
+			},
+		},
+		{
+			path: `/Cis/LvPlan/:mode?/:focus_date?/:lv_id?`,
+			name: 'LvPlan',
+			component: LvPlan,
+			props(route) {
+				return {
+					propsViewData: route.params
+				};
+			}
+		},
+		{
+			path: `/Cis/MyLvPlan/:mode?/:focus_date?`,
+			name: 'MyLvPlan',
+			component: MyLvPlan,
+			props(route) {
+				return {
+					propsViewData: route.params
+				};
+			}
+		},
+		{
+			path: `/Cis4`,
+			name: 'Cis4',
+			component: FhcDashboard,
+			props: {dashboard: 'CIS'},
+		},
+		{
+			path: `/`,
+			name: 'FhcDashboard',
+			component: FhcDashboard,
+			props: {dashboard: 'CIS'},
+		},
+		{
+			path: '/:pathMatch(.*)*',
+			name: 'Fallback',
+			component: FhcDashboard,
+			props: {dashboard: 'CIS'},
+			redirect: () => {
+				return {
+					name: "Cis4",
+					params: {
+						dashboard: 'CIS'
+					},
+				};
+			},
+		},
+	]
+})
+
+const app = Vue.createApp({
+	name: 'FhcApp',
+	data: () => ({
+		appSideMenuEntries: {},
+		renderers: null,
+	}),
+	components: {},
+	computed: {
+		isMobile() {
+			const smallScreen = window.matchMedia("(max-width: 767px)").matches;
+			const touchCapable = ("ontouchstart" in window) || navigator.maxTouchPoints > 0;
+			return smallScreen;// && touchCapable;
+		}	
+	},
+	provide() {
+		return { // provide injectable & watchable language property
+			language: Vue.computed(() => this.$p.user_language),
+			renderers: Vue.computed(() => this.renderers),
+			isMobile: this.isMobile
+		}	
+	},
+	methods: {
+		isInternalRoute(href) {
+			const internalBase = window.location.origin
+			return href.startsWith(internalBase);
+		},
+		handleClick(event) {
+			const target = event.target.closest('a');
+
+			if(target?.id == 'skiplink') return
+			if (target && this.isInternalRoute(target.href)) {
+				const url = new URL(target.href)
+				
+				const path = url.pathname
+				const base = this.$router.options.history.base
+				const route = path.replace(base, '') || '/'
+
+				// let click event propagate normally if we dont route internally
+				const res = this.$router.resolve(route)
+				if(!res?.matched?.length || res.name === 'Fallback') return
+				
+				event.preventDefault(); // Prevent browser navigation
+				
+				if(this.isMobile) { // toggle the menu
+					const navMain = document.getElementById('nav-main');
+					// fix unwanted toggle from off to on for some links on mobile
+					if(navMain.classList.contains('show')){
+						document.getElementById('nav-main-btn').click();
+					} 
+				}
+				
+				this.$router.push(route);
+				
+			}
+		}
+	},
+	async created(){
+		
+		await this.$api
+			.call(ApiRenderers.loadRenderers())
+			.then(res => res.data)
+			.then(data => {
+				for (let rendertype of Object.keys(data)) {
+					let modalTitle = null;
+					let modalContent = null;
+					let calendarEvent = null;
+					if (data[rendertype].modalTitle)
+						modalTitle = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].modalTitle)));
+					if (data[rendertype].modalContent) 	
+						modalContent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].modalContent)));
+					if (data[rendertype].calendarEvent) 	
+						calendarEvent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].calendarEvent)));
+
+					if (data[rendertype].calendarEventStyles){
+						var head = document.head;
+						if(!head.querySelector(`link[href="${data[rendertype].calendarEventStyles}"]`)){
+							var link = document.createElement("link");
+							link.type = "text/css";
+							link.rel = "stylesheet";
+							link.href = data[rendertype].calendarEventStyles;
+							head.appendChild(link);
+						}
+					}
+
+					if(this.renderers === null) {
+						this.renderers = {};
+					}
+					if (!this.renderers[rendertype]) {
+						this.renderers[rendertype] = {}
+					}
+					this.renderers[rendertype].modalTitle = modalTitle;
+					this.renderers[rendertype].modalContent = modalContent;
+					this.renderers[rendertype].calendarEvent = calendarEvent;
+				}
+			});
+	},
+	mounted() {
+		document.addEventListener('click', this.handleClick);
+		
+	},
+	beforeUnmount() {
+		document.removeEventListener('click', this.handleClick);
+	},
+});
+
+// kind of a bandaid for bad css on some pages to avoid horizontal scroll
+setScrollbarWidth();
+app.config.globalProperties.$capitalize = capitalize;
+
+FhcApps.router.makeExtendable(router);
+FhcApps.makeExtendable(app);
+
+app.use(router);
+app.use(primevue.config.default, {
+	zIndex: {
+		overlay: 9000,
+		tooltip: 8000
+	}
+})
+app.directive('tooltip', primevue.tooltip);
+app.use(PluginsPhrasen);
+app.use(Theme);
+app.directive('contrast', contrast);
+app.mount('#fhccontent');
+
+router.afterEach((to, from, failure) => {
+	app.config.globalProperties.$api.call(ApiRouteInfo.info('cis4', to.fullPath));
+});

public/js/apps/DashboardAdmin_DEPR.js

@@ -0,0 +1,16 @@
+import {CoreNavigationCmpt} from '../components/navigation/Navigation.js';
+import DashboardAdmin from '../components/Dashboard/Admin.js';
+import Phrases from "../plugin/Phrasen.js"
+
+Vue.createApp({
+  name: 'DashboardAdminApp',
+  data: () => ({
+      appSideMenuEntries: {}
+    }),
+  components: {
+    CoreNavigationCmpt,
+    DashboardAdmin
+  },
+  mounted() {
+  }
+}).use(Phrases).mount('#main');

public/js/components/Calendar/Base/DragAndDrop.js

@@ -20,8 +20,7 @@ export default {
 	},
 	inject: {
 		mode: "mode",
-		dropableEvents: "dropableEvents",
-		timezone: "timezone"
+		dropableEvents: "dropableEvents"
 	},
 	props: {
 		events: Array,

public/js/components/Calendar/LvPlan.js

@@ -3,7 +3,6 @@ import FhcCalendar from "./Base.js";
 import ApiLvPlan from '../../api/factory/lvPlan.js';
 
 import { useEventLoader } from '../../composables/EventLoader.js';
-import { useRenderers } from '../../composables/Renderers.js';
 
 import ModeDay from './Mode/Day.js';
 import ModeWeek from './Mode/Week.js';
@@ -14,7 +13,14 @@ export default {
 	components: {
 		FhcCalendar
 	},
+	inject: [
+		"renderers"
+	],
 	props: {
+		timezone: {
+			type: String,
+			required: true
+		},
 		date: {
 			type: [Date, String, Number, luxon.DateTime],
 			default: luxon.DateTime.local()
@@ -35,7 +41,6 @@ export default {
 	],
 	data() {
 		return {
-			timezone: FHC_JS_DATA_STORAGE_OBJECT.timezone,
 			modes: {
 				day: Vue.markRaw(ModeDay),
 				week: Vue.markRaw(ModeWeek),
@@ -94,13 +99,10 @@ export default {
 			context.emit('update:lv', newValue);
 		});
 
-		const { renderers } = useRenderers();
-
 		return {
 			rangeInterval,
 			events,
-			lv,
-			renderers
+			lv
 		};
 	},
 	created() {

public/js/components/Calendar/Widget.js

@@ -1,7 +1,6 @@
 import FhcCalendar from "./Base.js";
 
 import { useEventLoader } from '../../composables/EventLoader.js';
-import { useRenderers } from '../../composables/Renderers.js';
 
 import ModeList from '../Calendar/Mode/List.js';
 
@@ -10,17 +9,22 @@ export default {
 	components: {
 		FhcCalendar
 	},
+	inject: [
+		"renderers"
+	],
 	props: {
+		timezone: {
+			type: String,
+			required: true
+		},
 		getPromiseFunc: {
 			type: Function,
 			required: true
 		}
 	},
 	data() {
-		const timezone = FHC_JS_DATA_STORAGE_OBJECT.timezone;
 		return {
-			timezone,
-			now: luxon.DateTime.now().setZone(timezone),
+			now: luxon.DateTime.now().setZone(this.timezone),
 			modes: {
 				list: Vue.markRaw(ModeList)
 			},
@@ -55,12 +59,10 @@ export default {
 		const rangeInterval = Vue.ref(null);
 		
 		const { events } = useEventLoader(rangeInterval, props.getPromiseFunc);
-		const { renderers } = useRenderers();
 
 		return {
 			rangeInterval,
-			events,
-			renderers
+			events
 		};
 	},
 	template: /* html */`

public/js/components/Cis/LvPlan/Lehrveranstaltung.js

@@ -22,7 +22,7 @@ export default {
 	computed:{
 		currentDay() {
 			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
-				return luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate();
+				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
 			return this.propsViewData?.focus_date;
 		},
 		currentMode() {
@@ -95,6 +95,7 @@ export default {
 		<fhc-calendar
 			v-else-if="lv"
 			ref="calendar"
+			:timezone="viewData.timezone"
 			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
 			:mode="currentMode"

public/js/components/Cis/LvPlan/LvPlan.js

@@ -15,6 +15,7 @@ export default {
 		propsViewData: Object
 	},
 	data() {
+		const now = luxon.DateTime.now().setZone(this.viewData.timezone);
 		return {
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
@@ -25,7 +26,7 @@ export default {
 	},
 	computed:{
 		currentDay() {
-			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate();
+			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
 		},
 		currentMode() {
 			return this.propsViewData?.mode || DEFAULT_MODE_LVPLAN;
@@ -34,7 +35,7 @@ export default {
 			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
 				return false;
 			
-			const opts = { zone: FHC_JS_DATA_STORAGE_OBJECT.timezone };
+			const opts = { zone: this.viewData.timezone };
 			const start = luxon.DateTime
 				.fromISO(this.studiensemester_start, opts)
 				.toUnixInteger();
@@ -114,6 +115,7 @@ export default {
 		<fhc-calendar
 			ref="calendar"
 			v-model:lv="lv"
+			:timezone="viewData.timezone"
 			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
 			:mode="currentMode"

public/js/components/Cis/LvPlan/Personal.js

@@ -27,7 +27,7 @@ export default {
 	computed:{
 		currentDay() {
 			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
-				return luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate();
+				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
 			return this.propsViewData?.focus_date;
 		},
 		currentMode() {
@@ -47,7 +47,7 @@ export default {
 				return;
 			}
 
-			const opts = { zone: FHC_JS_DATA_STORAGE_OBJECT.timezone };
+			const opts = { zone: this.viewData.timezone };
 			const start = luxon.DateTime
 				.fromISO(this.studiensemester_start, opts)
 				.toUnixInteger();
@@ -124,6 +124,7 @@ export default {
 		<hr>
 		<fhc-calendar
 			ref="calendar"
+			:timezone="viewData.timezone"
 			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
 			:mode="currentMode"

public/js/components/Cis/Mylv/RoomInformation.js

@@ -15,7 +15,7 @@ export default {
 	},
 	computed: {
 		currentDay() {
-			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate();
+			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
 		},
 		currentMode() {
 			return this.propsViewData?.mode || DEFAULT_MODE_RAUMINFO;
@@ -51,6 +51,7 @@ export default {
 		<hr>
 		<fhc-calendar 
 			ref="calendar"
+			:timezone="viewData.timezone"
 			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
 			:mode="currentMode"

public/js/components/Dashboard/Admin.js

@@ -4,6 +4,7 @@ import DashboardAdminWidgets from "./Admin/Widgets.js";
 import DashboardAdminPresets from "./Admin/Presets.js";
 
 import ApiDashboardBoard from "../../api/factory/dashboard/board.js";
+import ApiDashboardWidget from "../../api/factory/dashboard/widget.js";
 
 export default {
 	name: 'DashboardAdmin',
@@ -15,7 +16,7 @@ export default {
 	provide() {
 		return {
 			adminMode: true,
-			widgetsSetup: Vue.computed(() => this.dashboard ? this.dashboard.widgetSetup : null)
+			widgetsSetup: Vue.computed(() => this.dashboards[this.current] ? this.dashboards[this.current].widgetSetup : null)
 		};
 	},
 	data() {
@@ -33,32 +34,33 @@ export default {
 	methods: {
 		dashboardAdd() {
 			let _name = '';
-			BsPrompt
-				.popup('New Dashboard name')
-				.then(dashboard_kurzbz => {
+			BsPrompt.popup('New Dashboard name').then(
+				name => {
+					_name = name;
 					const params = {
-						dashboard_kurzbz
+						dashboard_kurzbz: name
 					};
 					return this.$api
 						.call(ApiDashboardBoard.add(params))
-						.then(response => {
+						.then(response =>{
 							this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 
 							let newDashboard = {
 								dashboard_id: response.data,
-								dashboard_kurzbz,
+								dashboard_kurzbz: _name,
 								beschreibung: ''
 							};
 							this.dashboards.push(newDashboard);
 							this.current = newDashboard.dashboard_id;
 						})
 						.catch(this.$fhcAlert.handleSystemError);
-				});
+					});
 		},
 		dashboardUpdate(dashboard) {
-			this.$api
+			return this.$api
 				.call(ApiDashboardBoard.update(dashboard))
-				.then(response => {
+				.then(response =>{
+
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 
 					let old = this.dashboards.find(el => el.dashboard_id == dashboard.dashboard_id);
@@ -68,122 +70,73 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		dashboardDelete(dashboard_id) {
-			this.$api
+			return this.$api
 				.call(ApiDashboardBoard.delete(dashboard_id))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
 					this.current = -1;
 					this.dashboards = this.dashboards.filter(el => el.dashboard_id != dashboard_id);
-				})
-				.catch(this.$fhcAlert.handleSystemError);
+				});
 		},
 		assignWidgets(widgets) {
 			this.widgets = widgets;
+			/*while (this.widgets.length)
+				this.widgets.pop();
+			for (var i in widgets)
+				this.widgets.push(widgets[i]);*/
 		}
 	},
 	created() {
 		this.$api
 			.call(ApiDashboardBoard.list())
 			.then(result => {
-				this.dashboards = result.data;
+				this.dashboards = result.data.retval;
+				for (const dashboard of this.dashboards) {
+					this.$api
+						.call(ApiDashboardWidget.list(dashboard.dashboard_id))
+						.then(res => {
+							dashboard.widgetSetup = res.data;
+						})
+						.catch(this.$fhcAlert.handleSystemError);
+				}
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
-	template: /* html */`
-	<div class="dashboard-admin">
+	template: `<div class="dashboard-admin">
+
 		<div class="input-group">
-			<label for="dashboard-select" class="input-group-text">
-				Dashboard:
-			</label>
-			<select id="dashboard-select" v-model="current" class="form-select">
-				<option
-					v-for="dashboard in dashboards"
-					:key="dashboard.dashboard_id"
-					:value="dashboard.dashboard_id"
-				>{{ dashboard.dashboard_kurzbz }}</option>
+			<label for="dashboard-select" class="input-group-text">Dashboard:</label>
+			<select id="dashboard-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>
+			<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
-						id="edit-tab"
-						class="nav-link"
-						data-bs-toggle="tab"
-						data-bs-target="#edit"
-						type="button"
-						role="tab"
-						aria-controls="edit"
-						aria-selected="false"
-					>{{ this.$p.t('ui', 'bearbeiten') }}</button>
+					<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">{{this.$p.t('ui', 'bearbeiten')}}</button>
 				</li>
 				<li class="nav-item" role="presentation">
-					<button
-						id="widgets-tab"
-						class="nav-link active"
-						data-bs-toggle="tab"
-						data-bs-target="#widgets"
-						type="button"
-						role="tab"
-						aria-controls="widgets"
-						aria-selected="true"
-					>Widgets</button>
+					<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>
+					<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
-					id="edit"
-					class="tab-pane fade"
-					role="tabpanel"
-					aria-labelledby="edit-tab"
-				>
-					<dashboard-admin-edit
-						v-bind="dashboard"
-						@change="dashboardUpdate($event)"
-						@delete="dashboardDelete($event)"
-					></dashboard-admin-edit>
+				<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
-					id="widgets"
-					class="tab-pane fade show active"
-					role="tabpanel"
-					aria-labelledby="widgets-tab"
-				>
-					<dashboard-admin-widgets
-						:dashboard_id="dashboard.dashboard_id"
-						:widgets="widgets"
-						@assign-widgets="assignWidgets"
-					></dashboard-admin-widgets>
+				<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" @assign-widgets="assignWidgets"></dashboard-admin-widgets>
 				</div>
-				<div
-					id="presets"
-					class="tab-pane fade"
-					role="tabpanel"
-					aria-labelledby="presets-tab"
-				>
-					<dashboard-admin-presets
-						:dashboard="dashboard.dashboard_kurzbz"
-						:widgets="widgets"
-					></dashboard-admin-presets>
+				<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>

public/js/components/Dashboard/Admin/Edit.js

@@ -1,15 +1,15 @@
 import BsConfirm from '../../Bootstrap/Confirm.js';
 
 export default {
+	emits: [
+		"change",
+		"delete"
+	],
 	props: {
 		dashboard_id: Number,
 		dashboard_kurzbz: String,
 		beschreibung: String
 	},
-	emits: [
-		"change",
-		"delete"
-	],
 	data() {
 		return {
 			kurzbz: this.dashboard_kurzbz,
@@ -18,43 +18,22 @@ export default {
 	},
 	methods: {
 		sendDelete() {
-			BsConfirm
-				.popup(this.$p.t('ui', 'confirm_delete') + " " + this.$p.t('ui', 'deleteInfo'))
-				.then(() => this.$emit('delete', this.dashboard_id))
-				.catch();
+			BsConfirm.popup(this.$p.t('ui', 'confirm_delete') + " " + this.$p.t('ui', 'deleteInfo'))
+				.then(() => this.$emit('delete', this.dashboard_id)).catch();
 		}
 	},
-	template: /* html */`
-	<div class="dashboard-admin-edit px-3">
+	template: `<div class="dashboard-admin-edit px-3">
 		<div class="mb-3">
-			<label for="dashboard-admin-edit-kurzbz">{{ $p.t('dashboard/kurzbz') }}</label>
-			<input
-				id="dashboard-admin-edit-kurzbz"
-				v-model="kurzbz"
-				type="text"
-				class="form-control"
-			>
+			<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">{{ $p.t('global/beschreibung') }}</label>
-			<textarea
-				id="dashboard-admin-edit-beschreibung"
-				v-model="desc"
-				class="form-control"
-			></textarea>
+			<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">
-				{{ this.$p.t('ui', 'loeschen') }}
-			</button>
-			<button
-				class="btn btn-primary"
-				@click="$emit('change', {
-					dashboard_id,
-					dashboard_kurzbz: kurzbz,
-					beschreibung: desc
-				})"
-			>{{ this.$p.t('ui', 'btnAktualisieren') }}</button>
+			<button class="btn btn-danger" @click="sendDelete">{{this.$p.t('ui', 'loeschen')}}</button>
+			<button class="btn btn-primary" @click="$emit('change', {dashboard_id,dashboard_kurzbz:kurzbz,beschreibung:desc})">{{this.$p.t('ui', 'btnAktualisieren')}}</button>
 		</div>
 	</div>`
 }

public/js/components/Dashboard/Admin/Presets.js

@@ -12,27 +12,18 @@ export default {
 		dashboard: String,
 		widgets: Array
 	},
-	data() {
-		return {
-			funktionen: {},
-			sections: [],
-			selectedFunktionen: [],
-			abortController: null
-		};
-	},
+	data: () => ({
+		funktionen: {},
+		sections: [],
+		tmpLoading: ''
+	}),
 	computed: {
 		pickerWidgets() {
 			return this.widgets.filter(widget => widget.allowed);
 		}
 	},
-	watch: {
-		dashboard() {
-			this.loadSections();
-			this.loadFunktionen();
-		}
-	},
 	methods: {
-		widgetAdd(widget, section_name) {
+		widgetAdd(section_name, widget) {
 			this.$refs.widgetpicker.getWidget().then(widget_id => {
 				widget.widget = widget_id;
 				widget.id = 'loading_' + String((new Date()).valueOf());
@@ -73,26 +64,22 @@ export default {
 			})
 			.catch(() => {});
 		},
-		widgetUpdate(payload, section_name) {
+		widgetUpdate(section_name, payload) {
+			payload = payload[section_name];
 			for (var k in payload) {
 				const section = this.sections.find(section => section.name == section_name);
 				for (var wid in section.widgets) {
 					if (section.widgets[wid].id == k) {
 						payload[k] = ObjectUtils.mergeDeep(section.widgets[wid], payload[k]);
 						// NOTE(chris): remove internal props
-						for (var prop of ['_x', '_y', '_w', '_h', 'index', 'id', 'custom'])
+						for (var prop of ['_x', '_y', '_w', '_h', 'index', 'id'])
 							if (payload[k][prop])
 								delete payload[k][prop];
 						break;
 					}
 				}
-				if (payload[k].place) {
-					Object.values(payload[k].place).forEach(place => {
-						if (place.pinned === false)
-							delete place.pinned;
-					});
-				}
 				payload[k].widgetid = k;
+				delete payload[k].custom;
 			}
 			this.$api
 				.call(Object.entries(payload).map(([key, widget]) => [
@@ -119,7 +106,7 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		widgetRemove(id, section_name) {
+		widgetRemove(section_name, id) {
 			const params = {
 				db: this.dashboard,
 				funktion_kurzbz: section_name,
@@ -135,22 +122,21 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		loadSections() {
+		loadSections(evt) {
+			let funktionen = Array.from(evt.target.querySelectorAll("option:checked"),e=>e.value);
+			this.sections = [];
+			this.tmpLoading = funktionen.join('###');
+
 			const params = {
 				db: this.dashboard,
-				funktionen: this.selectedFunktionen
+				funktionen
 			};
 
-			if (this.abortController)
-				this.abortController.abort();
-			this.abortController = new AbortController();
-			const signal = this.abortController.signal;
-
-			this.sections = [];
-			
 			return this.$api
-				.call(ApiDashboardPreset.getBatch(params), { signal })
+				.call(ApiDashboardPreset.getBatch(params))
 				.then(result => {
+					if (this.tmpLoading !== funktionen.join('###'))
+						return; // NOTE(chris): prevent race condition
 					for (var section in result.data) {
 						let widgets = [];
 						for (var wid in result.data[section]) {
@@ -165,6 +151,7 @@ export default {
 					}
 				})
 				.catch(this.$fhcAlert.handleSystemError);
+
 		},
 		loadFunktionen() {
 			this.$api
@@ -178,17 +165,17 @@ export default {
 	created() {
 		this.loadFunktionen();
 	},
-	template: /* html */`
-	<div class="dashboard-admin-presets">
+	watch: {
+		dashboard() {
+			// TODO(chris): this should be done without a watcher
+			this.loadSections({target:this.$refs.funktionenList});
+			this.loadFunktionen();
+		}
+	},
+	template: `<div class="dashboard-admin-presets">
 		<div class="row">
 			<div class="col-3">
-				<select
-					v-model="selectedFunktionen"
-					class="form-control"
-					style="height:30em"
-					multiple
-					@change="loadSections"
-				>
+				<select ref="funktionenList" style="height:30em" class="form-control" multiple @input="loadSections">
 					<option
 						v-for="funktion in funktionen"
 						:key="funktion.funktion_kurzbz"
@@ -198,20 +185,9 @@ export default {
 				</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>
+				<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>
+		<dashboard-widget-picker ref="widgetpicker" :widgets="pickerWidgets"></dashboard-widget-picker>
 	</div>`
 }

public/js/components/Dashboard/Admin/Widgets.js

@@ -1,14 +1,14 @@
 import ApiDashboardWidget from "../../../api/factory/dashboard/widget.js";
 
 export default {
-	props: {
-		dashboard_id: Number,
-		widgets: Array
-	},
 	emits: [
 		"change",
 		"assignWidgets"
 	],
+	props: {
+		dashboard_id: Number,
+		widgets: Array
+	},
 	methods: {
 		sendChange(widget_id) {
 			let allow = !this.widgets.find(el => el.widget_id == widget_id).allowed;
@@ -29,27 +29,11 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
-	template: /* html */`
+	template: `
 	<div class="dashboard-admin-widgets">
-		<div
-			v-for="widget in widgets"
-			:key="widget.widget_id"
-			class="form-check form-switch"
-		>
-			<input
-				:id="'dashboard-admin-widgets-' + widget.widget_id"
-				v-model="widget.allowed"
-				class="form-check-input"
-				type="checkbox"
-				role="switch"
-				@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 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>`
 }

public/js/components/Dashboard/Dashboard.js

@@ -21,7 +21,7 @@ export default {
 			type: Object,
 			required: true,
 			validator(value) {
-				return value && value.name
+				return value && value.name && value.timezone
 			}
 		}
 	},
@@ -35,12 +35,14 @@ export default {
 	},
 	provide() {
 		return {
-			editMode: Vue.computed(() => this.editMode),
-			widgetsSetup: Vue.computed(() => this.widgetsSetup)
+			editMode: Vue.computed(()=>this.editMode),
+			widgetsSetup: Vue.computed(() => this.widgetsSetup),
+			timezone: Vue.computed(() => this.viewData.timezone)
 		}
 	},
 	methods: {
-		widgetAdd(widget) {
+		widgetAdd(section_name, widget) {
+			// TODO(chris): remove section_name? (change order of params => get rid of it)
 			this.$refs.widgetpicker
 				.getWidget()
 				.then(widget_id => {
@@ -62,24 +64,19 @@ export default {
 				})
 				.catch(() => {});
 		},
-		widgetUpdate(payload) {
+		widgetUpdate(section_name, payload) {
+			payload = payload[section_name];
 			for (var k in payload) {
 				for (var wid in this.widgets) {
 					if (this.widgets[wid].id == k) {
 						payload[k] = ObjectUtils.mergeDeep(this.widgets[wid], payload[k]);
 						// NOTE(chris): remove internal props
-						for (var prop of ['_x', '_y', '_w', '_h', 'index', 'id', 'preset'])
+						for (var prop of ['_x','_y','_w','_h','index','id','preset'])
 							if (payload[k][prop])
 								delete payload[k][prop];
 						break;
 					}
 				}
-				if (payload[k].place) {
-					Object.values(payload[k].place).forEach(place => {
-						if (place.pinned === false)
-							delete place.pinned;
-					});
-				}
 				payload[k].widgetid = k;
 			}
 			this.$api
@@ -116,7 +113,7 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		widgetRemove(id) {
+		widgetRemove(section_name, id) {
 			this.$api
 				.call(ApiDashboardUser.removeWidget(this.dashboard, id))
 				.then(() => {
@@ -141,8 +138,8 @@ export default {
 				const widgets = [];
 				const remove = [];
 
-				for (var wid in res.data) {
-					let widget = res.data[wid];
+				for (var wid in res.data.general.widgets) {
+					let widget = res.data.general.widgets[wid];
 					widget.id = wid;
 					if (widget.custom || widget.preset) {
 						widgets.push(widget);
@@ -152,33 +149,19 @@ export default {
 					}
 				}
 
-				remove.forEach(wid => this.widgetRemove(wid));
+				remove.forEach(wid => this.widgetRemove('general', wid));
 
 				this.widgets = widgets;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
-	template: /* html */`
+	template: `
 	<div class="core-dashboard">
 		<h3>
 			{{ $p.t('global/personalGreeting', [ viewData?.name ]) }}
-			<button
-				class="btn ms-2"
-				aria-label="edit dashboard"
-				v-tooltip="{ showDelay: 1000, value: $p.t('dashboard/edit') }"
-				@click="editMode = !editMode"
-			><i class="fa-solid fa-gear" aria-hidden="true"></i></button>
+			<button style="margin-left: 8px;" class="btn" @click="editMode = !editMode" aria-label="edit dashboard" v-tooltip="{showDelay:1000,value:'edit dashboard'}"><i class="fa-solid fa-gear" aria-hidden="true"></i></button>
 		</h3>
-		<dashboard-section
-			name="general"
-			:widgets="widgets"
-			@widget-add="widgetAdd"
-			@widget-update="widgetUpdate"
-			@widget-remove="widgetRemove"
-		></dashboard-section>
-		<dashboard-widget-picker
-			ref="widgetpicker"
-			:widgets="widgetsSetup"
-		></dashboard-widget-picker>
+		<dashboard-section :seperator="0" name="general" :widgets="widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>
+		<dashboard-widget-picker ref="widgetpicker" :widgets="widgetsSetup"></dashboard-widget-picker>
 	</div>`
 }

public/js/components/Dashboard/Item.js

@@ -1,13 +1,7 @@
 import BsModal from "../Bootstrap/Modal.js";
+import { useCachedWidgetLoader } from "../../composables/Dashboard/CachedWidgetLoader.js";
 import HeightTransition from "../Tranistion/HeightTransition.js";
 
-import { enableDragDropTouch } from "../../../../vendor/drag-drop-touch-js/dragdroptouch/dist/drag-drop-touch.esm.min.js";
-
-if (!document.dragDropTouchActive) {
-	enableDragDropTouch();
-	document.dragDropTouchActive = true;
-}
-
 export default {
 	name: 'Item',
 	components: {
@@ -17,14 +11,18 @@ export default {
 	data: () => ({
 		component: "",
 		arguments: null,
+		target: false,
+		widget: null,
 		tmpConfig: {},
 		isLoading: false,
 		hasConfig: false,
-		sharedData: null
+		sharedData: null,
 	}),
 	emits: [
 		"change",
 		"remove",
+		"dragstart",
+		"resizestart",
 		"configOpened",
 		"configClosed",
 		"pinItem",
@@ -32,85 +30,41 @@ export default {
 	],
 	props: [
 		"id",
+		"widgetID",
 		"config",
 		"width",
 		"height",
 		"custom",
 		"hidden",
 		"editMode",
-		"loading", // widget got added and is waiting for backend to save in db
+		"loading",
 		"item_data",
 		"place",
-		"widgetTemplate",
-		"source"
+		"setup",
+		"dragstate",
+		"resizeOverlay",
+		"additionalRow"
 	],
 	computed: {
-		sourceInfoTooltip() {
-			switch (this.source) {
-				case null:
-					return '';
-				case 'general':
-					return this.$p.t('dashboard', 'widgetFromGeneralSection');
-				case 'custom':
-					return this.$p.t('dashboard', 'widgetFromCustomSection');
-				default:
-					return this.$p.t('dashboard', 'widgetFromFunktionSection', [this.source]);
+		maxHeight(){
+			return this.setup?.height?.max;
+		},
+		maxWidth(){
+			if (Object.prototype.toString.call(this.setup?.width) == "[object Number]"){
+				return this.setup?.width;
 			}
+			return this.setup?.width?.max;
 		},
-		isResizeableHorizontal() {
-			if (this.widgetTemplate.setup.width === undefined)
-				return true;
-
-			if (Object.prototype.toString.call(this.widgetTemplate.setup.width) == "[object Number]")
-				return false;
-
-			if (this.widgetTemplate.setup.width.min === undefined) {
-				if (this.widgetTemplate.setup.width.max === undefined)
-					return true;
-				return this.widgetTemplate.setup.width.max > 1;
-			}
-
-			if (this.widgetTemplate.setup.width.max === undefined)
-				return true;
-
-			return this.widgetTemplate.setup.width.max > this.widgetTemplate.setup.width.min;
+		minHeight() {
+			return this.setup?.height?.min;
 		},
-		isResizeableVertical() {
-			if (this.widgetTemplate.setup.height === undefined)
-				return true;
-
-			if (Object.prototype.toString.call(this.widgetTemplate.setup.height) == "[object Number]")
-				return false;
-
-			if (this.widgetTemplate.setup.height.min === undefined) {
-				if (this.widgetTemplate.setup.height.max === undefined)
-					return true;
-				return this.widgetTemplate.setup.height.max > 1;
-			}
-
-			if (this.widgetTemplate.setup.height.max === undefined)
-				return true;
-
-			return this.widgetTemplate.setup.height.max > this.widgetTemplate.setup.height.min;
+		minWidth() {
+			return this.setup?.width?.min;
 		},
-		isResizeable() {
-			return this.isResizeableVertical || this.isResizeableHorizontal;
+		isResizeable(){
+			return this.maxWidth >1 || this.maxHeight >1;
 		},
-		resizeClasses() {
-			const classes = {
-				icon: 'fa-up-right-and-down-left-from-center mirror-x',
-				button: 'cursor-nw-resize'
-			};
-			if (!this.isResizeableHorizontal) {
-				classes.icon = 'fa-up-down pe-2';
-				classes.button = 'cursor-ns-resize';
-			} else if (!this.isResizeableVertical) {
-				classes.icon = 'fa-left-right pe-2';
-				classes.button = 'cursor-ew-resize';
-			}
-			return classes;
-		},
-		isPinned() {
+		isPinned(){
 			return this.place?.pinned ? true : false;
 		},
 		ready() {
@@ -126,16 +80,16 @@ export default {
 		}
 	},
 	methods: {
-		unpin() {
+		unpin(){
 			// Unpinning is only possible in edit mode
-			if (!this.editMode)
+			if(!this.editMode)
 				return;
-			let result = { item: this.item_data, pinned: false };
+			let result = { item: this.item_data, x: this.item_data.x, y: this.item_data.y };
 			this.$emit('unPinItem', [result]);
 		},
-		pinItem() {
-			let result = { item: this.item_data, pinned: true };
-			this.$emit('pinItem', [result]);
+		pinItem(){
+			let result = { item: this.item_data, x: this.item_data.x, y: this.item_data.y};
+			this.$emit('pinItem',[result]);
 		},
 		getWidgetC4Link(widget) {
 			return (FHC_JS_DATA_STORAGE_OBJECT.app_root +
@@ -147,6 +101,22 @@ export default {
 		handleHideBsModal() {
 			this.$emit('configClosed')
 		},
+		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();
@@ -165,240 +135,110 @@ export default {
 		},
 		sendChangeConfig(config) {
 			for (var k in config) {
-				if (this.widgetTemplate.arguments[k] == config[k]) {
-					delete config[k];
+				if (this.widget.arguments[k] == config[k]) {
+				delete config[k];
 				}
 			}
 			this.$emit("change", config);
 		},
-		async initializeComponent() {
-			if (
-				this.widgetTemplate
-				&& this.widgetTemplate.setup
-				&& this.widgetTemplate.widget_id
-				&& this.widgetTemplate.arguments
-			) {
-				let component = (await import(this.widgetTemplate.setup.file)).default;
-				this.$options.components["widget" + this.widgetTemplate.widget_id] = component;
-				this.component = "widget" + this.widgetTemplate.widget_id;
-				this.arguments = { ...this.widgetTemplate.arguments, ...this.config };
-				this.tmpConfig = { ...this.arguments };
-			}
-		}
 	},
 	watch: {
 		config() {
-			this.arguments = { ...this.widgetTemplate?.arguments, ...this.config };
+			this.arguments = { ...this.widget?.arguments, ...this.config };
 			this.tmpConfig = { ...this.arguments };
 			this.$refs.config && this.$refs.config.hide();
 			this.isLoading = false;
 		},
-		widgetTemplate() {
-			this.initializeComponent();
-		}
 	},
-	created() {
-		this.initializeComponent();
+	setup() {
+		const { actions } = useCachedWidgetLoader();
+		return {
+			loadWidget: actions.load
+		};
+	},
+	async created() {
+		this.widget = await this.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*/ `
-	<article
-		v-if="!hidden || editMode"
-		class="dashboard-item card overflow-hidden h-100 position-relative"
-		:class="{
-			'hidden-widget': hidden,
-			[arguments?.className]: arguments && arguments.className
-		}"
-	>
-		<div v-if="loading" class="d-flex justify-content-center align-items-center h-100">
+	<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>
-		<template v-else>
-			<header
-				v-if="widgetTemplate"
-				class="card-header d-flex ps-0 pe-2 align-items-center"
-			>
-				<!-- move handle -->
-				<Transition>
-					<span
-						v-if="editMode && !isPinned"
-						type="button"
-						drag-action="move"
-						class="col-auto mx-2 px-2 cursor-move"
-						draggable="true"
-						aria-hidden="true"
-						:aria-label="$p.t('dashboard/widget_move')"
-						v-tooltip="{ showDelay: 1000, value: $p.t('dashboard/widget_move') }"
-					>
-						<i class="fa-solid fa-grip-vertical" aria-hidden="true"></i>
-					</span>
-				</Transition>
-				<!-- TITLE -->
-				<h4 class="col mb-0 mx-2 px-2 fs-6 lh-base">
-					{{ widgetTemplate.setup.name }}
-				</h4>
-				<!-- source info -->
-				<div
-					v-if="source"
-					class="col-auto me-2"
-					:aria-label="sourceInfoTooltip"
-					v-tooltip="{ class: 'w-100', value: sourceInfoTooltip }"
-				>
-					<i class="fa-solid fa-circle-info" aria-hidden="true"></i>
+	</div>
+	<div v-else-if="!hidden || editMode" :id="widgetID" class="dashboard-item card overflow-hidden h-100 position-relative" :class="{'hiddenWidget':hidden, 'draggedItem':dragstate, 'dashboard-item-overlay':resizeOverlay, [arguments?.className]:arguments && arguments.className}">
+	<div v-show="!dragstate" class="h-100 card border-0">
+		<div v-if="widget" class="card-header d-flex ps-0 pe-2 align-items-center">
+			<Transition>
+				<span type="button" v-if="editMode && !isPinned" drag-action="move" class="col-auto mx-2 px-2 cursor-move" aria-label="move widget" v-tooltip="{showDelay:1000, value:'move widget'}"><i class="fa-solid fa-grip-vertical" aria-hidden="true"></i></span>
+			</Transition>
+			<span class="col mx-2 px-2">{{ widget.setup.name }}</span>
+			<template v-if="isPinned">
+				<div type="button" role="button" v-if="editMode" pinned="true" @click="unpin" title="unpin item" aria-label="unpin item" class="pin cursor-pointer col-auto me-2">
+					<i class="fa-solid fa-thumbtack " aria-hidden="true"></i>
 				</div>
-				<!-- pin button -->
-				<template v-if="isPinned">
-					<div
-						v-if="editMode"
-						type="button"
-						role="button"
-						class="pin cursor-pointer col-auto me-2"
-						:title="$p.t('dashboard/widget_unpin')"
-						aria-hidden="true"
-						:aria-label="$p.t('dashboard/widget_unpin')"
-						pinned="true"
-						@click="unpin"
-					>
-						<i class="fa-solid fa-thumbtack" aria-hidden="true"></i>
-					</div>
-					<div v-else class="col-auto me-2" aria-hidden="true">
-						<i class="fa-solid fa-thumbtack"></i>
-					</div>
+				<div v-else class="col-auto me-2">
+					<i class="fa-solid fa-thumbtack "></i>
+				</div>
+			</template>
+			<template v-else>
+				<div type="button" role="button" v-if="editMode"  class="col-auto me-2 pin" @click="pinItem" aria-label="pin item" title="pin item">
+					<i class="fa-solid fa-thumbtack" aria-hidden="true" style="color:lightgray;"></i>
+				</div>
+			</template>
+			<a type="button" v-if="widget.setup.cis4link" :href="getWidgetC4Link(widget)" aria-label="widget link" v-tooltip="{showDelay:1000, value:'widget link'}" class="col-auto ms-auto ">
+          		<i class="fa fa-arrow-up-right-from-square me-1" aria-hidden="true"></i>
+          	</a>
+			<a type="button" v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig" aria-label="configure widget" v-tooltip="{showDelay:1000,value:'configure widget'}"><i class="fa-solid fa-gear" aria-hidden="true"></i></a>
+			<a type="button" v-if="custom && editMode" class="col-auto px-1" aria-label="delete widget" v-tooltip="{showDelay:1000,value:'delete widget'}" href="#" @click.prevent="$emit('remove')">
+				<i class="fa-solid fa-trash" aria-hidden="true"></i>
+			</a>
+			<Transition>
+				<div v-if="!custom && editMode" class="col-auto px-1 form-switch">
+					<input class="form-check-input ms-0" type="checkbox" role="switch" aria-label="toggle widget" id="flexSwitchCheckChecked" v-model="visible" :value="true">
+				</div>
+			</Transition>
+		</div>
+		<div v-if="ready" class="card-body overflow-hidden p-0">
+			<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">
+			<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>
+		<height-transition>
+			<div v-if="editMode && isResizeable && !isPinned " class="card-footer d-flex justify-content-end p-0">
+				<template v-if="maxWidth < 2">
+					<span type="button" drag-action="resize" class="col-auto px-1 cursor-ns-resize" aria-label="resize widget" v-tooltip="{showDelay:1000, value:'resize widget'}">
+						<i  class="fa-solid fa-up-down pe-2" aria-hidden="true"></i>
+					</span>
+				</template>
+				<template v-else-if="maxHeight < 2">
+					<span type="button" drag-action="resize" class="col-auto px-1 cursor-ew-resize" aria-label="resize widget" v-tooltip="{showDelay:1000, value:'resize widget'}">
+						<i class="fa-solid fa-left-right pe-2" aria-hidden="true"></i>
+					</span>
 				</template>
 				<template v-else>
-					<div
-						v-if="editMode"
-						type="button"
-						role="button"
-						class="col-auto me-2 pin"
-						:title="$p.t('dashboard/widget_pin')"
-						aria-hidden="true"
-						:aria-label="$p.t('dashboard/widget_pin')"
-						@click="pinItem"
-					>
-						<i class="fa-solid fa-thumbtack" aria-hidden="true" style="color:lightgray;"></i>
-					</div>
-				</template>
-				<!-- widget link -->
-				<a
-					v-if="widgetTemplate.setup.cis4link"
-					:href="getWidgetC4Link(widgetTemplate)"
-					class="col-auto ms-auto"
-					:aria-label="$p.t('dashboard/widget_link')"
-					v-tooltip="{ showDelay: 1000, value: $p.t('dashboard/widget_link') }"
-				>
-					<i class="fa fa-arrow-up-right-from-square me-1" aria-hidden="true"></i>
-				</a>
-				<!-- config button -->
-				<a
-					v-if="hasConfig"
-					href="#"
-					class="col-auto px-1"
-					:aria-label="$p.t('dashboard/widget_configure')"
-					v-tooltip="{ showDelay: 1000, value: $p.t('dashboard/widget_configure') }"
-					@click.prevent="openConfig"
-				>
-					<i class="fa-solid fa-gear" aria-hidden="true"></i>
-				</a>
-				<!-- delete button -->
-				<a
-					v-if="custom && editMode"
-					href="#"
-					class="col-auto px-1"
-					:aria-label="$p.t('dashboard/widget_delete')"
-					v-tooltip="{ showDelay: 1000, value: $p.t('dashboard/widget_delete') }"
-					@click.prevent="$emit('remove')"
-				>
-					<i class="fa-solid fa-trash" aria-hidden="true"></i>
-				</a>
-				<!-- hide button -->
-				<Transition>
-					<div v-if="!custom && editMode" class="col-auto px-1 form-switch">
-						<input
-							type="checkbox"
-							role="switch"
-							v-model="visible"
-							class="form-check-input ms-0"
-							:value="true"
-							:aria-label="$p.t('dashboard/widget_toggle_visibility')"
-						>
-					</div>
-				</Transition>
-			</header>
-			<div v-if="ready" class="card-body overflow-hidden p-0">
-				<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"
-			>
-				<template v-slot:title>
-					{{ widgetTemplate ? $p.t('dashboard/widget_config_title', widgetTemplate.setup) : '' }}
-				</template>
-				<template v-slot:default>
-					<component
-						:is="component"
-						v-if="ready && !isLoading"
-						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="!widgetTemplate?.setup?.hideFooter" v-slot:footer>
-					<button
-						type="button"
-						class="btn btn-secondary"
-						data-bs-dismiss="modal"
-					>{{ $p.t('ui/schliessen') }}</button>
-					<button
-						type="button"
-						class="btn btn-primary"
-						@click="changeConfig"
-					>{{ $p.t('ui/speichern') }}</button>
-				</template>
-			</bs-modal>
-			<height-transition>
-				<footer
-					v-if="editMode && isResizeable && !isPinned"
-					class="card-footer d-flex justify-content-end p-0"
-				>
-					<span
-						type="button"
-						drag-action="resize"
-						class="col-auto px-1"
-						:class="resizeClasses.button"
-						draggable="true"
-						aria-hidden="true"
-						:aria-label="$p.t('dashboard/widget_resize')"
-						v-tooltip="{ showDelay: 1000, value: $p.t('dashboard/widget_resize') }"
-					>
-						<i
-							class="fa-solid"
-							:class="resizeClasses.icon"
-							aria-hidden="true"
-						></i>
+					<span type="button" drag-action="resize" class="col-auto px-1 cursor-nw-resize" aria-label="resize widget" v-tooltip="{showDelay:1000, value:'resize widget'}">
+						<i  class="fa-solid fa-up-right-and-down-left-from-center mirror-x" aria-hidden="true"></i>
 					</span>
-				</footer>
-			</height-transition>
-		</template>
-	</article>`,
+				</template>
+			</div>
+		</height-transition>
+		</div>
+	</div>`,
 };

public/js/components/Dashboard/Section.js

@@ -1,12 +1,9 @@
 import BsConfirm from "../Bootstrap/Confirm.js";
 import DropGrid from '../Drop/Grid.js'
 import DashboardItem from "./Item.js";
+import { useCachedWidgetLoader } from "../../composables/Dashboard/CachedWidgetLoader.js";
 import WidgetIcon from "./Widget/WidgetIcon.js"
 
-import dragClick from '../../directives/dragClick.js';
-
-import ObjectUtils from "../../helpers/ObjectUtils.js";
-
 export default {
 	name: 'Section',
 	components: {
@@ -14,11 +11,8 @@ export default {
 		DashboardItem,
 		WidgetIcon,
 	},
-	directives: {
-		dragClick
-	},
 	inject: {
-		widgetsSetup: {
+		widgetsSetup:{
 			type: Array,
 			default: [],
 		},
@@ -45,8 +39,9 @@ export default {
 			configOpened: false,
 			gridWidth: 1,
 			gridHeight: null,
-			additionalRow: false
-		};
+			draggedItem:null,
+			additionalRow:false,
+		}
 	},
 	provide() {
 		return {
@@ -54,40 +49,22 @@ export default {
 				this.editModeIsActive
 			),	
 			sectionName: Vue.computed(() => this.name),	
-		};
+		}
 	},
 	computed: {
-		sectionNameTranslation() {
-			switch (this.name) {
-				case "general": 
-					return this.$p.t('dashboard', this.name); 
-				case "custom":
-					return this.$p.t('dashboard', this.name);
-				default:
-					return this.name;
-			}
-		},
-		showSectionInformation() {
-			switch (this.name) {
-				case "general": 
-					return this.$p.t('dashboard', 'dashboardGeneralSectionDescription'); 
-				case "custom":
-					return this.$p.t('dashboard', 'dashboardCustomSectionDescription');
-				default:
-					return this.$p.t('dashboard', 'dashboardSectionDescription', [this.name]);
-			}
-		},
-		indexedWidgetsTemplates() {
-			if (!this.widgetsSetup)
-				return {};
-			return this.widgetsSetup.reduce((acc, setup) => {
-				acc[setup.widget_id] = setup;
+		computedWidgetsSetup(){
+			if(!this.widgetsSetup) return {};
+			return this.widgetsSetup.reduce((acc, setup)=>{
+				acc[setup.widget_id] = setup.setup;
 				return acc;
-			}, {});
+			},{})
 		},
 		editModeIsActive() {
 			return (this.editMode || this.adminMode) && !this.configOpened	
 		},
+		getSectionStyle() {
+			return 'margin-bottom: 8px;';
+		},
 		items() {
 			// reuses the nearest placement of the widget from another viewport 
 			/* const computeNearestPlace = (item, gridWidth) =>{
@@ -108,55 +85,76 @@ export default {
 				if(!item?.widgetid && item?.id){
 					item.widgetid = item.id;
 				}
-
-				let weight = 5;
-				if (!item.source)
-					weight = 6;
-				else if (item.source == 'general')
-					weight = 4;
-
-				let placement = item.place[this.gridWidth];
-				if (!placement) {
-					weight -= 3;
-					placement = {};
-				}
-
-				return { ...item, ...placement, weight };
+				return { ...item, reorder: false, ...(item.place[this.gridWidth] || { reorder: true, ...{ x: 0, y: 0, w: 1, h: 1 } })};
 			});
-
-			if (this.editModeIsActive)
-				return placedItems;
-			return placedItems.filter(item => !item.hidden);
-		}
-	},
-	watch: {
-		items() {
-			this.additionalRow = false;
-		}
+			return placedItems;
+			
+		},
+		
 	},
 	methods: {
+		sectionNameTranslation(){
+			switch(this.name){
+				case "general": 
+					return this.$p.t('dashboard',this.name); 
+					break;
+				case "custom":
+					return this.$p.t('dashboard',this.name);
+					break;
+				default:
+					return this.name;
+					break;
+			}
+		},
+		showSectionInformation(){
+			if (this.name == "general"){
+				return this.$p.t('dashboard', 'dashboardGeneralSectionDescription'); 
+			}
+			else if(this.name == "custom"){
+				return this.$p.t('dashboard', 'dashboardCustomSectionDescription');
+			}
+			else{
+				return this.$p.t('dashboard', 'dashboardSectionDescription', [this.name]);
+			}
+		},
 		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 = this.widgetState[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;
+			}
+			return [w, h];
+		},
 		removeWidget(item, revert) {
 			if (item.custom) {
-				BsConfirm.popup(this.$p.t('dashboard', 'alert_deleteWidget')).then(() => this.$emit('widgetRemove', item.id, this.name));
+				BsConfirm.popup(this.$p.t('dashboard', 'alert_deleteWidget')).then(() => this.$emit('widgetRemove', this.name, item.id));
 			} else {
 				let update = {};
 				update[item.id] = { hidden: !revert };
-				
-				if (!revert) {
-					// NOTE(chris): move to last line
-					update[item.id].place = [];
-					let y = this.gridHeight;
-					if (this.additionalRow)
-						y--;
-					update[item.id].place[this.gridWidth] = { x: 0, y };
-				}
-				
 				this.updatePreset(update);
 			}
 		},
@@ -165,42 +163,49 @@ export default {
 			payload[item.id] = { config };
 			this.updatePreset(payload);
 		},
-		updatePositions(updated) {
+		updatePositions(updated, pinned=false) {
 			let result = {};
 			updated.forEach(update => {
-				let item = structuredClone(ObjectUtils.deepToRaw(update.item));
-
+				
+				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;
-					delete item.y;
-					delete item.w;
-					delete item.h;
-					delete item.pinned;
-					delete item.weight;
+				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;
+				delete item.place[this.gridWidth].pinned;
+				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;
+				if (pinned){
+					item.place[this.gridWidth].pinned = true;
+				}
 
-					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;
-					if (update.pinned !== undefined)
-						item.place[this.gridWidth].pinned = update.pinned;
-
-					result[item.id] = item;
+				result[item.id] = item;
 				}
 			});
 			this.updatePreset(result);
 		},
 		updatePreset(update) {
-			this.$emit('widgetUpdate', update, this.name);
+			let payload = {};
+			payload[this.name] = update;
+			this.$emit('widgetUpdate', this.name, payload);
 		}
 	},
+	setup() {
+		const { state: widgetState } = useCachedWidgetLoader();
+
+		return {
+			widgetState
+		};
+	},
 	mounted() {
 		let self = this;
 		let cont = self.$refs.container;
@@ -210,62 +215,44 @@ export default {
 			self.gridWidth = parseInt(window.getComputedStyle(cont).getPropertyValue('--fhc-dashboard-grid-size'));
 		});
 	},
-	template: /* html */`
-	<section
-		class="dashboard-section position-relative pb-3 mb-3 border-bottom"
-		ref="container"
-		:class="{ 'edit-active': editModeIsActive }"
-	>
-		<h3 v-if="adminMode" class="h4">
-			<i v-tooltip="showSectionInformation" class="fa-solid fa-circle-info section-info"></i>
-			{{ sectionNameTranslation }}:
-		</h3>
-		<button
-			v-tooltip="$p.t('dashboard/addLine')"
-			v-if="!additionalRow && editModeIsActive"
-			class="btn btn-outline-secondary rounded-circle newGridRow d-flex justify-content-center align-items-center"
-			@click="additionalRow=true"
-			v-drag-click="() => additionalRow=true"
-		>+</button>
-		<drop-grid
-			v-model:cols="gridWidth"
-			:additional-row="additionalRow"
-			:items="items"
-			:items-setup="indexedWidgetsTemplates"
-			:active="editModeIsActive"
-			@rearrange-items="updatePositions"
-			@grid-height="gridHeight=$event"
-		>
+	template: `
+	<div class="dashboard-section position-relative pb-3 border-bottom" ref="container" :style="getSectionStyle">
+		<h4 v-if="editModeIsActive" class=" mb-2">
+			<i v-tooltip="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>
+			{{sectionNameTranslation()}}:
+		</h4>
+		<button v-tooltip="$p.t('dashboard','addLine')" v-if="!additionalRow && editModeIsActive" @click="additionalRow=true" class="btn btn-outline-secondary rounded-circle newGridRow d-flex justify-content-center align-items-center">+</button>
+		<drop-grid v-model:cols="gridWidth" v-model:additionalRow="additionalRow" :items="items" :itemsSetup="computedWidgetsSetup" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
-				<div
-					v-if="item.placeholder"
-					class="empty-tile-hover"
-					@click="$emit('widgetAdd', { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 }, name)"
-				></div>
+				<div v-if="item.placeholder" class="empty-tile-hover" @pointerdown="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
 				<dashboard-item 
 					v-else
 					:id="item.widget"
+					:dragstate="item.blank || (item.widgetid && item.widgetid == draggedItem?.data.widgetid)"
+					:resizeOverlay="item.resizeOverlay"
+					:widgetID="item.id"
 					:width="item.w"
 					:height="item.h"
-					:item_data="{config:item.config, custom:item.custom, h:item.h, w:item.w,id:item.id,place:item.place,widget:item.widget,widgetid:item.widgetid,x:item.x,y:item.y}"
+					:item_data="{config:item.config, custom:item.custom, h:item.h, w:item.w,id:item.id,reorder:item.reorder,place:item.place,widget:item.widget,widgetid:item.widgetid,x:item.x,y:item.y}"
 					:loading="item.loading"
 					:config="item.config"
 					:custom="item.custom"
 					:hidden="item.hidden"
 					:editMode="editModeIsActive"
 					:place="item.place[gridWidth]"
-					:widget-template="indexedWidgetsTemplates[item.widget]"
-					:source="adminMode ? null : item.source || 'custom'"
+					:setup="computedWidgetsSetup[item.widget]"
 					@change="saveConfig($event, item)"
 					@remove="removeWidget(item, $event)"
 					@config-opened="handleConfigOpened"
 					@config-closed="handleConfigClosed"
-					@pin-item="updatePositions"
-					@un-pin-item="updatePositions"
-				></dashboard-item>
+					@pinItem="updatePositions($event,true)"
+					@unPinItem="updatePositions">
+				</dashboard-item>
+				
 			</template>
+			
 		</drop-grid>
-	</section>`
+	</div>`
 }
 
 /*

public/js/components/Dashboard/Widget/Picker.js

@@ -32,31 +32,19 @@ export default {
 		},
 		
 	},
-	template: /* html */`
-	<div class="dashboard-widget-picker">
-		<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>{{ $p.t('dashboard/createWidget') }}</template>
+	template: `<div class="dashboard-widget-picker">
+		<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 g-2">
 					<div v-if="!widgets.length">
-						{{ $p.t('dashboard/noWidgetsAvailable') }}
+						No Widgets available
 					</div>
-					<div
-						v-for="widget in widgets"
-						:key="widget.widget_id"
-						class="widget-icon-container col-sm-6 col-md-4 col-lg-3 col-xl-2"
-					>
-						<widget-icon @select="pick" :widget="widget"></widget-icon>
+					<div v-for="widget in widgets" :key="widget.widget_id" class="widget-icon-container col-sm-6 col-md-4 col-lg-3 col-xl-2">
+						<widget-icon @select="pick" :widget="widget" ></widget-icon>
 					</div>
 				</div>
-				<div v-else class="text-center">
-					<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
-				</div>
+				<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
 			</template>
 		</bs-modal>
 	</div>`

public/js/components/DashboardWidget/LvPlan.js

@@ -11,6 +11,9 @@ export default {
 	mixins: [
 		AbstractWidget
 	],
+	inject: [
+		"timezone"
+	],
 	methods: {
 		getPromiseFunc(start, end) {
 			return [
@@ -24,6 +27,6 @@ export default {
 	},
 	template: /*html*/`
 	<div class="dashboard-widget-lvplan d-flex flex-column h-100">
-		<fhc-calendar :get-promise-func="getPromiseFunc" />
+		<fhc-calendar :timezone="timezone" :get-promise-func="getPromiseFunc" />
 	</div>`
 }

public/js/components/Drop/Grid/Item.js

@@ -1,26 +1,88 @@
 export default {
 	name:'GridItem',
+	components: {
+	},
+	inject: {
+	},
 	props: {
-		item: Object
+		item: Object,
+		active: Boolean
 	},
 	emits: [
+		"mouseDown",
+		"mouseUp",
 		"startMove",
-		"startResize"
+		"startResize",
+		"dragging",
+		"endDrag",
+		"dropDrag",
+		"item",
+		"touchStart",
+		"touchEnd",
 	],
+	data() {
+		return {
+			dragAction: '',
+			dragging: false
+		}
+	},
+	computed: {
+	},
 	methods: {
-		tryDragStart(evt) {
-			let dragAction = evt.target.getAttribute('drag-action');
+		registerDragAction(evt) {
+			this.$emit('mouseDown', 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, this.item);
+					return this.$emit('startMove', evt, item);
 				else if (dragAction == 'resize')
-					return this.$emit('startResize', evt, this.item);
+					return this.$emit('startResize', evt, item);
+			}
+			//evt.preventDefault();
+		},
+		touchDragEnd(evt) {
+			if (!this.dragging)
+				return;
+			this.dragging = false;
+			this.$emit('touchEnd', evt);
+		},
+		touchStart(event){
+			this.$emit('touchStart', event); 
+			this.registerDragAction(event); 
+			this.tryDragStart(event, this.item);
+		},
+		touchMove(event){
+			if(this.dragging){
+				event.preventDefault();
+				this.$emit('dragging', event);
 			}
 		}
 		
 	},
-	template: /* html */`
-	<li class="drop-grid-item" @dragstart="tryDragStart">
+	template: `
+	<div class="drop-grid-item"
+		@mousedown="registerDragAction"
+		@mouseup="$emit('mouseUp', $event)"
+		@touchstart="touchStart"
+		@touchend="touchDragEnd"
+		@dragstart="tryDragStart($event, item)"
+		@drag="$emit('dragging',$event)"
+		@touchmove="touchMove"
+		@dragend="$emit('endDrag', $event); dragging = false"
+		:draggable="active && !item.placeholder">
 		<slot v-bind="item"></slot>
-	</li>`
+	</div>`
 }

public/js/components/Messages/Details/NewMessage/Modal.js

@@ -63,7 +63,7 @@ export default {
 			const vm = this;
 			tinymce.init({
 				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
-				//height: 800,
+				min_height: 300,
 				//plugins: ['lists'],
 				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify | link',
 				plugins: 'link',
@@ -313,7 +313,7 @@ export default {
 
 				<div class="row">
 					<div class="col-sm-8">
-						<form-form class="row g-3 mt-2 h-100" ref="formMessage">
+						<form-form class="row g-3 mt-2 align-content-start" ref="formMessage">
 
 							<div class="row mb-3">
 
@@ -338,7 +338,7 @@ export default {
 							</div>
 
 							<!--Tiny MCE-->
-							<div class="row mb-3 h-100 tiny-90">
+							<div class="row mb-3 tiny-90">
 								<form-input
 									ref="editor"
 									:label="$p.t('global','nachricht')  + ' *'"

public/js/components/Messages/Details/NewMessage/NewDiv.js

@@ -62,7 +62,7 @@ export default {
 			const vm = this;
 			tinymce.init({
 				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
-				//height: 800,
+				min_height: 300,
 				//plugins: ['lists'],
 				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify | link',
 				plugins: 'link',

public/js/components/Messages/Details/TableMessages.js

@@ -30,6 +30,7 @@ export default {
 			personId: null,
 			layoutColumnsOnNewData:	false,
 			height: '400',
+			arePhrasesLoaded: false
 		}
 	},
 	methods: {
@@ -195,7 +196,7 @@ export default {
 						],
 						formatter: (cell, formatterParams) => {
 							const key = formatterParams[cell.getValue()];
-							return this.$p.t('messages', key);
+							return this.$p?.t?.('messages', key) || key;
 						},
 					},
 					{
@@ -305,8 +306,6 @@ export default {
 				{
 					event: 'tableBuilt',
 					handler: async() => {
-						await this.$p.loadCategory(['global', 'person', 'stv', 'messages', 'ui', 'notiz']);
-
 						const setHeader = (field, text) => {
 							const col = this.$refs.table.tabulator.getColumn(field);
 							if (!col) return;
@@ -357,6 +356,12 @@ export default {
 				});*/
 	},
 	created(){
+		this.$p
+			.loadCategory(['global', 'person', 'stv', 'messages', 'ui', 'notiz'])
+			.then(() => {
+				this.arePhrasesLoaded = true;
+			});
+
 		if(this.typeId != 'person_id' && Array.isArray(this.id) && this.id.length === 1) {
 			const params = {
 				id: this.id,
@@ -381,6 +386,7 @@ export default {
 				<!--table-->
 				<div class="col-sm-6 pt-1">
 					<core-filter-cmpt
+						v-if="arePhrasesLoaded"
 						ref="table"
 						:tabulator-options="tabulatorOptions"
 						:tabulator-events="tabulatorEvents"
@@ -413,6 +419,7 @@ export default {
 				<div class="col-sm-12 pt-6">
 					<core-filter-cmpt
 						ref="table"
+						v-if="arePhrasesLoaded"
 						:tabulator-options="tabulatorOptions"
 						:tabulator-events="tabulatorEvents"
 						table-only

public/js/components/Stv/Studentenverwaltung/Details/Archiv.js

@@ -84,6 +84,14 @@ export default {
 					'microcredential_2',
 					'microcredential_3',
 					'microcredential_4',
+					'microdegree_1',
+					'microdegree_2',
+					'microdegree_3',
+					'microdegree_4',
+					'microdegreeabschluss_1',
+					'microdegreeabschluss_2',
+					'microdegreeabschluss_3',
+					'microdegreeabschluss_4',
 				]
 			},
 			documentDropdownObject: {}

public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js

@@ -83,6 +83,8 @@ export default {
 				});
 		},
 		open() {
+
+			this.getBuchungstypen(this.currentSemester);
 			this.data = {
 				buchungstyp_kurzbz: '',
 				betrag: '-0.00',
@@ -105,7 +107,7 @@ export default {
 			const text = typ.standardtext || '';
 			const creditpoints = typ.credit_points || '';
 
-			if (!this.data.betrag || this.data.betrag == '-0.00')
+			if (!this.data.betrag || this.data.betrag == '-0.00' || this.data.betrag !== amount)
 				this.data.betrag = amount;
 
 			if (!this.data.buchungstext)
@@ -113,7 +115,18 @@ export default {
 
 			if (this.config.showCreditpoints && (this.data.credit_points == '0.00' || this.data.credit_points === null))
 				this.data.credit_points = creditpoints;
-		}
+		},
+		getBuchungstypen(studiensemester_kurzbz)
+		{
+			this.$api
+				.call(ApiKonto.getBuchungstypen(studiensemester_kurzbz))
+				.then(result => {
+					this.lists.buchungstypen = result.data;
+					if (this.data.buchungstyp_kurzbz)
+						this.checkDefaultBetrag(this.data.buchungstyp_kurzbz);
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
 	},
 	template: `
 	<core-form ref="form" class="stv-details-konto-edit" @submit.prevent="save">
@@ -166,6 +179,7 @@ export default {
 				<form-input
 					type="select"
 					v-model="data.studiensemester_kurzbz"
+					@change="getBuchungstypen(data.studiensemester_kurzbz)"
 					name="studiensemester_kurzbz"
 					:label="$p.t('lehre/studiensemester')"
 					>

public/js/components/Vertraege/List/Details.js

@@ -41,8 +41,8 @@ export default {
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "Typ", field: "type"},
-					{title: "Betrag", field: "betrag",
+					{title: "Typ", field: "type", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
+					{title: "Betrag", field: "betrag", headerFilter: true,
 						formatter: function(cell) {
 							let value = cell.getValue();
 							if (value == null) {
@@ -51,14 +51,14 @@ export default {
 							return parseFloat(value).toFixed(2);
 						}
 					},
-					{title: "Bezeichnung", field: "bezeichnung"},
-					{title: "Studiensemester", field: "studiensemester_kurzbz"},
-					{title: "Pruefung_id", field: "pruefung_id", visible: false},
-					{title: "mitarbeiter_uid", field: "mitarbeiter_uid", visible: false},
-					{title: "projektarbeit_id", field: "projektarbeit_id", visible: false},
-					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true},
-					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false},
-					{title: "vertrag_id", field: "vertrag_id", visible: false}, //just for testing
+					{title: "Bezeichnung", field: "bezeichnung", headerFilter: true},
+					{title: "Studiensemester", field: "studiensemester_kurzbz", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
+					{title: "Pruefung_id", field: "pruefung_id", visible: false, headerFilter: true},
+					{title: "mitarbeiter_uid", field: "mitarbeiter_uid", visible: false, headerFilter: true},
+					{title: "projektarbeit_id", field: "projektarbeit_id", visible: false, headerFilter: true},
+					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true, headerFilter: true},
+					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false, headerFilter: true},
+					{title: "vertrag_id", field: "vertrag_id", visible: false, headerFilter: true}, //just for testing
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 50,
@@ -110,10 +110,10 @@ export default {
 				],
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
-				height: '200',
+				height: '250',
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
-				persistenceID: 'core-contracts-details-2026021701'
+				persistenceID: 'core-contracts-details-2026050501'
 			},
 			tabulatorEvents: [
 				{
@@ -137,7 +137,7 @@ export default {
 
 						setHeader('type', this.$p.t('global', 'typ'));
 						setHeader('bezeichnung', this.$p.t('ui', 'bezeichnung'));
-						setHeader('lehreinheit_id', this.$p.t('ui', 'lehreinheit_id'));
+						setHeader('lehreinheit_id', this.$p.t('lehre', 'lehreinheit_id'));
 						setHeader('betrag', this.$p.t('ui', 'betrag'));
 						setHeader('studiensemester_kurzbz', this.$p.t('lehre', 'studiensemester'));
 						setHeader('mitarbeiter_uid', this.$p.t('ui', 'mitarbeiter_uid'));

public/js/components/Vertraege/List/Status.js

@@ -47,12 +47,13 @@ export default {
 					this.endpoint.getStatiOfContract(this.person_id, this.vertrag_id)
 				),
 				ajaxResponse: (url, params, response) => response.data,
-				persistenceID: 'core-contracts-status-2026021701',
+				persistenceID: 'core-contracts-status-2026050501',
 				columns: [
-					{title: "Status", field: "bezeichnung"},
+					{title: "Status", field: "bezeichnung", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
 					{
 						title: "Datum",
 						field: "datum",
+						headerFilter: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr); // Convert to Date object
@@ -66,14 +67,15 @@ export default {
 							});
 						}
 					},
-					{title: "vertrag_id", field: "vertrag_id", visible: false},
-					{title: "Vertragsstatus", field: "vertragsstatus_kurzbz", visible: false},
-					{title: "User", field: "mitarbeiter_uid", visible: false},
-					{title: "insertvon", field: "insertvon", visible: false},
+					{title: "vertrag_id", field: "vertrag_id", visible: false, headerFilter: true},
+					{title: "Vertragsstatus", field: "vertragsstatus_kurzbz", visible: false, headerFilter: true},
+					{title: "User", field: "mitarbeiter_uid", visible: false, headerFilter: true},
+					{title: "insertvon", field: "insertvon", visible: false, headerFilter: true},
 					{
 						title: "insertamum",
 						field: "insertamum",
 						visible: false,
+						headerFilter: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr);
@@ -87,11 +89,12 @@ export default {
 							});
 						}
 					},
-					{title: "updatevon", field: "updatevon", visible: false},
+					{title: "updatevon", field: "updatevon", visible: false, headerFilter: true},
 					{
 						title: "updateamum",
 						field: "updateamum",
 						visible: false,
+						headerFilter: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr);
@@ -148,7 +151,7 @@ export default {
 				],
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
-				height: '200',
+				height: '250',
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
 			},

public/js/components/Vertraege/List/Unassigned.js

@@ -30,10 +30,11 @@ export default {
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "Typ", field: "type", width: 100},
+					{title: "Typ", field: "type", width: 100, headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
 					{
 						title: "Betrag",
 						field: "betrag1",
+						headerFilter: true,
 						formatter: function(cell) {
 							let value = cell.getValue();
 							if (value == null) {
@@ -41,28 +42,29 @@ export default {
 							}
 							return parseFloat(value).toFixed(2);
 						}},
-					{title: "Bezeichnung", field: "bezeichnung", width: 150},
-					{title: "Studiensemester", field: "studiensemester_kurzbz",  width: 160},
-					{title: "mitarbeiter_uid", field: "mitarbeiter_uid", visible: false},
-					{title: "projektarbeit_id", field: "projektarbeit_id", visible: false},
-					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true},
-					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false},
-					{title: "Vertragsstunden", field: "vertragsstunden", visible: false},
-					{title: "vertrag_id", field: "vertrag_id", visible: false}, //just for testing
+					{title: "Bezeichnung", field: "bezeichnung", width: 150, headerFilter: true},
+					{title: "Studiensemester", field: "studiensemester_kurzbz",  width: 160, headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
+					{title: "mitarbeiter_uid", field: "mitarbeiter_uid", visible: false, headerFilter: true},
+					{title: "projektarbeit_id", field: "projektarbeit_id", visible: false, headerFilter: true},
+					{title: "lehreinheit_id", field: "lehreinheit_id", visible: true, headerFilter: true},
+					{title: "betreuerart_kurzbz", field: "betreuerart_kurzbz", visible: false, headerFilter: true},
+					{title: "Vertragsstunden", field: "vertragsstunden", visible: false, headerFilter: true},
+					{title: "vertrag_id", field: "vertrag_id", visible: false, headerFilter: true}, //just for testing
 					{
 						title: "VertragsstundenStudiensemester",
 						field: "vertragsstunden_studiensemester_kurzbz",
-						visible: false
+						visible: false,
+						headerFilter: true
 					},
 				],
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
-				height: 150,
+				height: 250,
 				selectableRowsRangeMode: 'click',
 				selectableRows: true,
 				selectableRowsRollingSelection: false, //only allow multiselect with STRG
 				index: "lehreinheit_id",
-				persistenceID: 'core-contracts-unassigned-2026021701'
+				persistenceID: 'core-contracts-unassigned-2026050501'
 			},
 			tabulatorEvents: [
 				{
@@ -100,7 +102,7 @@ export default {
 
 							setHeader('type', this.$p.t('global', 'typ'));
 							setHeader('bezeichnung', this.$p.t('ui', 'bezeichnung'));
-							setHeader('lehreinheit_id', this.$p.t('ui', 'lehreinheit_id'));
+							setHeader('lehreinheit_id', this.$p.t('lehre', 'lehreinheit_id'));
 							setHeader('betrag1', this.$p.t('ui', 'betrag'));
 							setHeader('studiensemester_kurzbz', this.$p.t('lehre', 'studiensemester'));
 							setHeader('mitarbeiter_uid', this.$p.t('ui', 'mitarbeiter_uid'));

public/js/components/Vertraege/Vertraege.js

@@ -20,9 +20,6 @@ export default {
 		ContractStati
 	},
 	inject: {
-/*		cisRoot: {
-			from: 'cisRoot'
-		},*/
 		hasSchreibrechte: {
 			from: 'hasSchreibrechte',
 			default: false
@@ -54,9 +51,9 @@ export default {
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "Bezeichnung", field: "bezeichnung", width: 300},
+					{title: "Bezeichnung", field: "bezeichnung", width: 300, headerFilter: true},
 					{
-						title: "Betrag", field: "betrag", width: 100,
+						title: "Betrag", field: "betrag", width: 100, headerFilter: true,
 						formatter: function (cell) {
 							let value = cell.getValue();
 
@@ -66,12 +63,13 @@ export default {
 							return parseFloat(value).toFixed(2);
 						}
 					},
-					{title: "Vertragstyp", field: "vertragstyp_bezeichnung", width: 125},
-					{title: "Status", field: "status", width: 100},
+					{title: "Vertragstyp", field: "vertragstyp_bezeichnung", width: 125, headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
+					{title: "Status", field: "status", width: 100, headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}},
 					{
 						title: "Vertragsdatum",
 						field: "vertragsdatum",
 						width: 128,
+						headerFilter: true,
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
 							const date = new Date(dateStr);
@@ -82,11 +80,11 @@ export default {
 							});
 						}
 					},
-					{title: "VertragId", field: "vertrag_id", visible: false},
-					{title: "Vertragsstunden", field: "vertragsstunden", visible: false},
-					{title: "VertragsstundenStudiensemester", field: "vertragsstunden_studiensemester_kurzbz", visible: false},
-					{title: "Anmerkung", field: "anmerkung", visible: false},
-					{title: "isAbgerechnet", field: "isabgerechnet", visible: false},
+					{title: "VertragId", field: "vertrag_id", visible: false, headerFilter: true},
+					{title: "Vertragsstunden", field: "vertragsstunden", visible: false, headerFilter: true},
+					{title: "VertragsstundenStudiensemester", field: "vertragsstunden_studiensemester_kurzbz", visible: false, headerFilter: true},
+					{title: "Anmerkung", field: "anmerkung", visible: false, headerFilter: true},
+					{title: "isAbgerechnet", field: "isabgerechnet", visible: false, headerFilter: true},
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 150,
@@ -140,11 +138,13 @@ export default {
 					columns: true,
 					filter: false //to avoids js errors
 				},
-				persistenceID: 'core-contracts-2026021701',
+				persistenceID: 'core-contracts-2026050501',
 			};
 			return options;
 		},
 		tabulatorEvents() {
+			const vm = this;
+
 			const events = [
 				{
 					event: 'tableBuilt',
@@ -177,28 +177,11 @@ export default {
 						setHeader('actions', this.$p.t('global', 'aktionen'));
 					}
 				},
-/*				{
-					//is just enabled for ADDON Injection KU: MultiprintHonorarvertrag
-					//(maybe enable also for ADDON FH Burgenland: MultiAccept later)
-					event: 'rowClick',
-					handler: (e, row) => {
-						if (this.dataPrintHonorar != null && this.dataPrintHonorar.multiselect != null) {
-							const selectedContract = row.getData().vertrag_id;
-							const status = row.getData().status;
-							const bezeichnung =	row.getData().bezeichnung;
-
-							this.toggleRowClick(selectedContract, status, bezeichnung);
-						}
-					}
-				},*/
 				{
 					event: 'rowClick',
-					handler: (e, row) => {
-						if (!this.dataPrintHonorar?.multiselect) return;
-
+					handler: function (e, row) {
 						const { vertrag_id, status, bezeichnung, vertragstyp_bezeichnung } = row.getData();
-
-						this.toggleRowClick(e, vertrag_id, status, bezeichnung, vertragstyp_bezeichnung);
+						vm.toggleRowClick(e, vertrag_id, status, bezeichnung, vertragstyp_bezeichnung);
 					}
 				},
 				{
@@ -242,8 +225,6 @@ export default {
 		person_id() {
 			this.$refs.table.reloadTable();
 			this.arraySelectedContracts = [];
-/*			if(this.dataPrintHonorar?.multiselect)
-				this.dataPrintHonorar.multiselect = [];*/
 		},
 	},
 	methods: {
@@ -270,7 +251,6 @@ export default {
 				)
 				.then(result => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-					//window.scrollTo(0, 0);
 					this.reload();
 					this.contractSelected.vertrag_id = null;
 				})
@@ -518,19 +498,9 @@ export default {
 					'content/pdfExport.php?xml=' + this.dataPrintHonorar.xml + '&xsl=' + this.dataPrintHonorar.xsl + '&mitarbeiter_uid=' + this.mitarbeiter_uid + vertragString + '&output=pdf&uid=' + this.mitarbeiter_uid;
 			window.open(linkToPdf, '_blank');
 		},
-/*		toggleRowClick(contractId, status, bezeichnung) {
-			const index = this.arraySelectedContracts.findIndex(
-				([id]) => id === contractId
-			);
-			if (index !== -1) {
-				this.arraySelectedContracts.splice(index, 1);
-			} else {
-				this.arraySelectedContracts.push([contractId, status, bezeichnung]);
-			}
-		},*/
 		toggleRowClick(event, vertrag_id, status, bezeichnung, vertragstyp_bezeichnung) {
-			if (!this.dataPrintHonorar?.multiselect) return;
 
+			const isMulti = this.dataPrintHonorar?.multiselect === true;
 			const isCtrl = event.ctrlKey || event.metaKey;
 
 			const entry = {
@@ -540,28 +510,29 @@ export default {
 				vertragstyp_bezeichnung
 			};
 
-			// Single click
-			if (!isCtrl) {
+			// allow MultiSelect just in case event multiActionPrintHonorarvertrag
+			const allowMultiClick = isMulti && isCtrl;
+
+			if (!allowMultiClick) {
 				this.arraySelectedContracts = [entry];
+
+				//just mark last selected row as selected
+				this.$refs.table.tabulator.deselectRow();
+				this.$refs.table.tabulator.selectRow(vertrag_id);
 				return;
 			}
 
-			// CTRL / CMD → toggle
 			const index = this.arraySelectedContracts.findIndex(
 				e => e.vertrag_id === vertrag_id
 			);
 
 			if (index === -1) {
 				this.arraySelectedContracts.push(entry);
-				//this.arraySelectedContracts.push([entry.vertrag_id, entry.status, entry.bezeichnung, entry.vertragstyp_bezeichnung]);
 			} else {
 				this.arraySelectedContracts.splice(index, 1);
 			}
-		},
-/*		clearSelection(){
-			this.arraySelectedContracts = [];
-			this.$refs.table.tabulator.deselectRow();
-		}*/
+
+		}
 	},
 	created() {
 		Promise.all([
@@ -587,88 +558,6 @@ export default {
 		});
 		this.getFormattedDate();
 	},
-	/*
-	TODO(Manu) delete after check
-
-		<div class="row mb-3">
-			<form-input
-				type="DatePicker"
-				:label="$p.t('vertrag/datum_vertrag')"
-				name="vertragsdatum"
-				v-model="formData.vertragsdatum"
-				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="text"
-				:label="$p.t('ui/bezeichnung')"
-				name="bezeichnung"
-				v-model="formData.bezeichnung"
-				>
-			</form-input>
-		</div>
-		<div class="row mb-3">
-			<form-input
-				type="select"
-				:label="$p.t('global/typ')"
-				v-model="formData.vertragstyp_kurzbz"
-				name="vertragstyp_kurzbz"
-				>
-				<option :value="null">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
-				<option
-					v-for="entry in listContractTypes"
-					:key="entry.vertragstyp_kurzbz"
-					:value="entry.vertragstyp_kurzbz"
-					>
-					{{entry.bezeichnung}}
-				</option>
-			</form-input>
-		</div>
-		<div class="row mb-3">
-			<form-input
-				:label="$p.t('ui/betrag')"
-				name="betrag"
-				v-model="formData.betrag"
-				>
-			</form-input>
-		</div>
-		<div class="row mb-3" v-if="!statusNew">
-			<form-input
-				type="text"
-				:label="$p.t('ui/stunden') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
-				name="vertragsstunden"
-				v-model="formData.vertragsstunden"
-				disabled
-				>
-			</form-input>
-		</div>
-		<div class="row mb-3" v-if="!statusNew">
-			<form-input
-				type="text"
-				:label="$p.t('lehre/studiensemester') + ' (' + $p.t('vertrag/vertrag_urfassung')+ ')'"
-				name="vertragsstunden_studiensemester_kurzbz"
-				v-model="formData.vertragsstunden_studiensemester_kurzbz"
-				disabled
-				>
-			</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>
-	 */
 	template: `
 	<div class="core-contracts h-100 d-flex flex-column">
 

public/js/composables/Dashboard/CachedWidgetLoader.js

@@ -0,0 +1,36 @@
+import ApiWidget from "../../api/factory/dashboard/widget.js";
+
+const promises = Vue.ref([]);
+const stateRef = Vue.ref([]);
+const state = Vue.readonly(stateRef);
+
+export function useCachedWidgetLoader() {
+	const $api = Vue.inject('$api');
+	const $fhcAlert = Vue.inject('$fhcAlert');
+
+	function load(id) {
+		if (state.value[id])
+			return Promise.resolve(state.value[id]);
+
+		if (!promises.value[id])
+			promises.value[id] = new Promise((resolve, reject) => {
+				$api
+					.call(ApiWidget.get(id))
+					.then(res => {
+						stateRef.value[id] = res.data;
+						promises.value[id] = undefined;
+						resolve(state.value[id]);
+					})
+					.catch($fhcAlert.handleSystemError);
+			});
+
+		return promises.value[id];
+	}
+
+	return {
+		state,
+		actions: {
+			load
+		}
+	};
+}

public/js/composables/GridLogic.js

@@ -1,10 +1,4 @@
-/**
- * This class arranges rectangular items on a grid with a defined width and
- * a potential infinite height. It calculates repositioning of already placed
- * items if a new item would overlap one or more of said placed items.
- * This can be manipulated by adding weights to the items or by defining an
- * item as pinned.
- */
+// TODO(chris): Comments
 
 const DIR_UP = 0;
 const DIR_LEFT = 1;
@@ -29,23 +23,33 @@ class GridLogic {
 		const i = y*this.w + x;
 		return !this.grid[i] && this.grid[i] !== 0;
 	}
+	getMaxY(){
+		return this.data.reduce((acc, item) => { 
+			if (item?.y > acc) {
+				 acc = item.y; 
+			} 
+			return acc; 
+		}, 0);
+	}
 	getFreeSlots() {
 		const freeSlots = [];
-		let i = this.w * this.h;
-
-		while (i--) {
-			if (!this.grid[i] && this.grid[i] !== 0) {
+		let biggestY = this.getMaxY();
+		let totalSpaces = this.w * (biggestY+1);
+		for(let i=0; i < totalSpaces; i++){
+			if (!this.grid[i] && this.grid[i] !== 0){
+				this.grid[i] = undefined;
+			}
+		}
+		for(let i =0; i < this.grid.length; i++){
+			if (!this.grid[i] && this.grid[i] !== 0){
 				let x = i % this.w;
 				let y = Math.floor(i / this.w);
 				freeSlots.push({x, y});
 			}
 		}
-
 		return freeSlots;
 	}
 	add(item, prefer) {
-		if (!item.frame)
-			item.frame = this.getItemFrame(item);
 		let occupiers = this.getItemsInFrame(item.frame);
 		if (!occupiers.length) {
 			item.frame.forEach(f => this.grid[f] = item.index);
@@ -57,14 +61,6 @@ class GridLogic {
 			
 			item.frame.forEach(f => intermGrid.grid[f] = -1);
 
-			intermGrid.data.forEach(currItem => {
-				if (currItem.pinned) {
-					if (!currItem.frame)
-						currItem.frame = intermGrid.getItemFrame(currItem);
-					currItem.frame.forEach(f => intermGrid.grid[f] = -1);
-				}
-			});
-
 			const possiblities = intermGrid.tryMoving(occupiers, prefer);
 			if (possiblities.length) {
 				const bestOption = possiblities.sort((a,b) => {
@@ -87,9 +83,7 @@ class GridLogic {
 					result[move.index] = {
 						index: currItem.index,
 						x: currItem.x,
-						y: currItem.y,
-						w: currItem.w,
-						h: currItem.h
+						y: currItem.y
 					};
 				});
 				item.frame.forEach(f => this.grid[f] = item.index);
@@ -97,12 +91,12 @@ class GridLogic {
 
 				return result;
 			} else {
-				return null;
+				console.error('FATAL', "can't arrange item on grid");
 			}
 		}
 	}
 	move(item, x, y) {
-		if (item.pinned)
+		if (item.data.place[this.w]?.pinned)
 			return [];
 		if (item.x == x && item.y == y)
 			return [];
@@ -122,6 +116,8 @@ class GridLogic {
 				prefer = DIR_RIGHT;
 		}
 
+		const originalFrame = Array.isArray(item.frame) ? [...item.frame] : [item.frame];
+
 		const currItem = {...item};
 		currItem.x = x;
 		currItem.y = y;
@@ -129,60 +125,33 @@ class GridLogic {
 		let occupiers = this.getItemsInFrame(currItem.frame);
 		
 		// does not update if the target conatins pinned widgets
-		if (occupiers.some(frame => this.data[frame]?.pinned)) {
+		if (occupiers.some(frame => this.data[frame]?.data.place[this.w]?.pinned)) {
 			return [];
 		}
-
-		// checks if target contains moving widgets start position
-		// so swapping should be avoided
-		const targetAndItemOverlap = this.getItemFrame(item).some(frame => currItem.frame.includes(frame))
-		if (!targetAndItemOverlap) {
-
-			// checks if target contains widget with the same high and width
-			// so swapping is possible
-			const occupiersFrame = occupiers.map(occupier => this.data[occupier].frame).flat();
-			const occupiersInsideMovingItem = occupiersFrame.every(frame => currItem.frame.includes(frame));
-
-			if (occupiersInsideMovingItem) {
-				// every slot of all items in the target zone is inside said zone
-				const replaceUpdate = [];
-			
-				const diffX = item.x - x;
-				const diffY = item.y - y;
-
-				occupiers.forEach(occupier => {
-					const data = { ...this.data[occupier] };
-					data.x += diffX;
-					data.y += diffY;
-					data.frame = this.getItemFrame(data);
-					this.remove(data);
-					this.add(data);
-					replaceUpdate[occupier] = {
-						index: data.index,
-						x: data.x,
-						y: data.y,
-						w: data.w,
-						h: data.h
-					};
-				});
-
-				this.add({ ...item, x, y });
-				replaceUpdate[item.index] = {
-					index: item.index,
-					x,
-					y,
-					w: item.w,
-					h: item.h
-				};
-				
-				return replaceUpdate;
+		
+		// checks if target contains widget with the same high and width
+		let occupiersData = occupiers.map(occupier => this.data[occupier]);
+		let occupiersFrame = occupiersData.map(occupier => occupier.frame).flat();
+		if (!occupiersFrame.some(frame => !currItem.frame.includes(frame)) && !occupiersFrame.some(frame => originalFrame.includes(frame))){
+			let replaceUpdate = [];
+			let newOccupierFrames = [];
+			for(let f of originalFrame){
+				if(newOccupierFrames.includes(f)){
+					continue;
+				}
+				let occ = occupiersData.shift();
+				if(occ){
+					newOccupierFrames = [...newOccupierFrames, ...this.getItemFrame({ ...occ, ...this.getSingleFramePosition(f) })];
+					replaceUpdate[occ.index] = { index: occ.index, ...this.getSingleFramePosition(f)}
+				}
 			}
+			replaceUpdate[item.index] = { index: item.index, x, y };
+			
+			return replaceUpdate;
 		}
 		
 		const updates = this.add(currItem, prefer);
-		if (updates)
-			updates[item.index] = { index: item.index, x, y, w: item.w, h: item.h };
-		
+		updates[item.index] = {index: item.index, x, y};
 		return updates;
 	}
 	resize(item, w, h) {
@@ -197,7 +166,7 @@ class GridLogic {
 		
 		const updates = this.add(currItem);
 		if(updates)
-			updates[item.index] = { index: item.index, w, h, x: item.x, y: item.y };
+			updates[item.index] = {index: item.index, w, h, x:item.x, y:item.y, resize:true};
 
 		return updates;
 	}
@@ -236,13 +205,13 @@ class GridLogic {
 		let targetframe;
 		switch(dir) {
 			case DIR_UP:
-				if (this.data[index].pinned || this.data[index].y - amount < 0)
+				if (this.data[index].data?.place[this.w]?.pinned || 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].pinned)
+				if (this.data[index].data?.place[this.w]?.pinned)
 					return false;
 				if (this.data[index].y + this.data[index].h + amount > this.h)
 					cost += .4;
@@ -250,13 +219,13 @@ class GridLogic {
 				move.y = amount;
 				break;
 			case DIR_LEFT:
-				if (this.data[index].pinned || this.data[index].x - amount < 0)
+				if (this.data[index].data?.place[this.w]?.pinned || 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].pinned || this.data[index].x + this.data[index].w + amount > this.w)
+				if (this.data[index].data?.place[this.w]?.pinned || 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;
@@ -293,6 +262,9 @@ class GridLogic {
 				frame.push(i + item.x + (j + item.y) * this.w);
 		return frame;
 	}
+	getSingleFramePosition(frame){
+		return { x: frame % this.w, y: Math.floor(frame / this.w)};
+	}
 	debug() {
 		return this.grid;
 	}

public/js/composables/Renderers.js

@@ -1,50 +0,0 @@
-import ApiRenderers from '../api/factory/renderers.js';
-
-/**
- * @return object						{ renderers: Object }
- */
-export function useRenderers() {
-	/* Result Vars */
-	const renderers = Vue.ref(null);
-
-	/* Helper Vars */
-	const $api = Vue.inject('$api');
-	const $fhcAlert = Vue.inject('$fhcAlert');
-
-	/* Main Logic */
-	$api
-		.call(ApiRenderers.loadRenderers())
-		.then(res => {
-			const head = document.head;
-			for (const rendertype of Object.keys(res.data)) {
-				const renderersForType = {};
-				for (const name of Object.keys(res.data[rendertype])) {
-					const rendererUrl = res.data[rendertype][name];
-					if (rendererUrl.substr(-4) == ".css") {
-						// add to head
-						if (!head.querySelector(`link[href="${rendererUrl}"]`)) {
-							var link = document.createElement("link");
-							link.type = "text/css";
-							link.rel = "stylesheet";
-							link.href = rendererUrl;
-							head.appendChild(link);
-						}
-					} else {
-						renderersForType[name] = Vue.markRaw(
-							Vue.defineAsyncComponent(() => import(rendererUrl))
-						);
-					}
-				}
-				if (Object.keys(renderersForType).length) {
-					if (renderers.value === null)
-						renderers.value = {};
-					renderers.value[rendertype] = renderersForType;
-				}
-			}
-		})
-		.catch($fhcAlert.handleSystemErrors);
-
-	return {
-		renderers
-	};
-}

public/js/directives/dragClick.js

@@ -1,12 +1,5 @@
 import { bindDragEnterLeave } from '../helpers/DragAndDrop.js';
 
-import { enableDragDropTouch } from "../../../vendor/drag-drop-touch-js/dragdroptouch/dist/drag-drop-touch.esm.min.js";
-
-if (!document.dragDropTouchActive) {
-	enableDragDropTouch();
-	document.dragDropTouchActive = true;
-}
-
 export default {
 	mounted(el, binding) {
 		const delay = parseInt(binding.arg) || 300;

public/js/directives/draggable.js

@@ -1,12 +1,5 @@
 import { setTransferData, convertToValidDragObject } from '../helpers/DragAndDrop.js';
 
-import { enableDragDropTouch } from "../../../vendor/drag-drop-touch-js/dragdroptouch/dist/drag-drop-touch.esm.min.js";
-
-if (!document.dragDropTouchActive) {
-	enableDragDropTouch();
-	document.dragDropTouchActive = true;
-}
-
 const EFFECTS = [
 	'none',
 	'copy',

public/js/directives/drop.js

@@ -1,12 +1,5 @@
 import { getValidTransferData, eventHasTypes, bindDragEnterLeave } from '../helpers/DragAndDrop.js';
 
-import { enableDragDropTouch } from "../../../vendor/drag-drop-touch-js/dragdroptouch/dist/drag-drop-touch.esm.min.js";
-
-if (!document.dragDropTouchActive) {
-	enableDragDropTouch();
-	document.dragDropTouchActive = true;
-}
-
 const EFFECTS = [
 	'move',
 	'copy',

skin/styles/tw.css

@@ -450,18 +450,18 @@ td.MarkLine
 td.HeaderTesttool /*fuer die Button-Optik beim Testtool*/
 {
 	color: #FFFFFF;
-	background-color: #00639C;
+	background-color: #71787D;
 	white-space:nowrap;
 	line-height: 25px;
 	box-shadow: inset 0 0 2px #FFFFFF;
-	padding: 10px;
+	padding: 0 10px;
 	width: 170px;
 }
 td.HeaderTesttoolSTG /*fuer die Button-Optik der Quereinstiegs-Studiengänge beim Testtool*/
 {
 	color: white;
 	border: 2px solid #73a9d6;
-	padding: 10px;
+	padding: 0 10px;
 	max-width: 100px;
 	overflow: hidden;
 	text-overflow: ellipsis;

system/dbupdate_3.4.php

@@ -94,7 +94,7 @@ require_once('dbupdate_3.4/71399_dashboard_update_widget_paths.php');
 require_once('dbupdate_3.4/71645_studvw_messagetab_ladezeit.php');
 require_once('dbupdate_3.4/71566_studienordnungsdokument_neuer_organisationseinheitstyp_programm.php');
 require_once('dbupdate_3.4/70376_lohnguide.php');
-require_once('dbupdate_3.4/68530_Dashboard_Cleanup.php');
+require_once('dbupdate_3.4/75888_reihungstest_mehrfachdurchfuehrung.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';

system/dbupdate_3.4/68530_Dashboard_Cleanup.php

@@ -1,91 +0,0 @@
-<?php
-/* Copyright (C) 2026 fhcomplete.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 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: Christopher Hacker <christopher.hacker@technikum-wien.at>,
- *
- * Description:
- * Cleanup Dashboard DB data
- */
-if (! defined('DB_NAME')) exit('No direct script access allowed');
-
-// Cleanup presets
-if ($result = @$db->db_query("
-	SELECT 1 
-	FROM dashboard.tbl_dashboard_preset 
-	WHERE preset ? COALESCE(funktion_kurzbz, 'general') 
-	OR preset ? 'custom' 
-	LIMIT 1
-")) {
-	if ($db->db_num_rows($result)) {
-		$qry = "
-			UPDATE dashboard.tbl_dashboard_preset 
-			SET preset = COALESCE(preset->COALESCE(funktion_kurzbz, 'general'), preset->'custom')->'widgets'
-			WHERE preset ? COALESCE(funktion_kurzbz, 'general') 
-			OR preset ? 'custom' 
-		";
-
-		$result = $db->db_query($qry);
-
-		if (!$result) {
-			echo '<strong>dashboard.tbl_dashboard_preset '.$db->db_last_error().'</strong><br>';
-		} else {
-			$affected_rows = $db->db_affected_rows($result);
-			echo 'dashboard.tbl_dashboard_preset: ' . $affected_rows . ' rows migrated<br>';
-		}
-	}
-}
-
-// Cleanup user overrides
-if ($result = @$db->db_query("
-	SELECT 1
-	FROM dashboard.tbl_dashboard_benutzer_override
-	WHERE EXISTS (
-		SELECT 1
-		FROM jsonb_each(override)
-		WHERE value ? 'widgets'
-		LIMIT 1
-	) AND override <> '[]'::jsonb
-	LIMIT 1
-")) {
-	if ($db->db_num_rows($result)) {
-		$qry = "
-			UPDATE dashboard.tbl_dashboard_benutzer_override 
-			SET override = COALESCE((
-				SELECT json_object_agg(key, value) FROM (
-					SELECT value->'widgets' AS widgets 
-					FROM jsonb_each(override) 
-					WHERE jsonb_typeof(value->'widgets') = 'object'
-				) x, jsonb_each(widgets)
-			), '[]')
-			WHERE EXISTS (
-			    SELECT 1
-			    FROM jsonb_each(override)
-			    WHERE value ? 'widgets'
-			    LIMIT 1
-			) AND override <> '[]'::jsonb
-		";
-
-		$result = $db->db_query($qry);
-
-		if (!$result) {
-			echo '<strong>dashboard.tbl_dashboard_benutzer_override '.$db->db_last_error().'</strong><br>';
-		} else {
-			$affected_rows = $db->db_affected_rows($result);
-			echo 'dashboard.tbl_dashboard_benutzer_override: ' . $affected_rows . ' rows migrated<br>';
-		}
-	}
-}

system/dbupdate_3.4/70376_lohnguide.php

@@ -22,11 +22,11 @@ GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE hr.tbl_lohnguide_jobfamilie TO vilesc
 
 INSERT INTO hr.tbl_lohnguide_jobfamilie(jobfamilie_kurzbz, bezeichnung,aktiv, sort, insertvon, insertamum) VALUES
 ('FÜHRUNG','Führung',true,1,'system',NOW()),
-('ALLGEMEIN','Allgemein',true,2,'system',NOW()),
-('TECHNIK','Technik',true,3,'system',NOW()),
-('IT','IT',true,4,'system',NOW()),
-('PRODUKTION','Produktion',true,5,'system',NOW()),
-('HANDW_IH_LOG','Handwerk, Instandhaltung + Logistik',true,6,'system',NOW())
+('AKADEMIA','Akademia',true,2,'system',NOW()),
+('VERWALTUNG','Verwaltung',true,3,'system',NOW()),
+('TECHNIK','Technik',true,4,'system',NOW()),
+('IT_SOFTWARE','IT & Software',true,5,'system',NOW()),
+('TECHN_DIENSTE','Technische Dienste',true,6,'system',NOW())
 ON CONFLICT (jobfamilie_kurzbz) DO NOTHING;
 		";
 
@@ -59,38 +59,33 @@ CREATE TABLE IF NOT EXISTS hr.tbl_lohnguide_modellfunktion (
 GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE hr.tbl_lohnguide_modellfunktion TO vilesci;
 
 INSERT INTO hr.tbl_lohnguide_modellfunktion(modellfunktion_kurzbz, bezeichnung, jobfamilie_kurzbz, aktiv, sort, insertvon, insertamum) VALUES
-('FÜHRUNG_I','Führung I','FÜHRUNG',true,1,'system',NOW()),
-('FÜHRUNG_II','Führung I','FÜHRUNG',true,2,'system',NOW()),
-('FÜHRUNG_III','Führung I','FÜHRUNG',true,3,'system',NOW()),
-('GF','Geschäftsführung','FÜHRUNG',true,4,'system',NOW()),
-/* Allgemein */
-('FK_ALLGM','Fachkraft Allgemein','ALLGEMEIN',true,5,'system',NOW()),
-('SFK_ALLGM','Spezial-Fachkraft Allgemein','ALLGEMEIN',true,6,'system',NOW()),
-('SP_ALLGM','Spezialist:in Allgemein','ALLGEMEIN',true,7,'system',NOW()),
-('EXP_ALLGM','Expert:in Allgemein','ALLGEMEIN',true,8,'system',NOW()),
-('TOP_EXP_ALLGM','Top-Expert:in Allgemein','ALLGEMEIN',true,9,'system',NOW()),
+('ABTEILUNGSLEITUNG','Abteilungsleitung','FÜHRUNG',true,1,'system',NOW()),
+('GF','Geschäftsführung','FÜHRUNG',true,2,'system',NOW()),
+('KOMPETENZFELDLEITER','Kompetenzfeldleiter*in','FÜHRUNG',true,3,'system',NOW()),
+('DEPARTMENTSLEITER','Departmentsleiter*in','FÜHRUNG',true,4,'system',NOW()),
+('FAKULTÄTSLEITER','Fakultätsleiter*in','FÜHRUNG',true,5,'system',NOW()),
+/* Akademia */
+('STUDENTISCHE_MA','Studentische MA','AKADEMIA',true,6,'system',NOW()),
+('JUNIOR_LEC_RES','Junior Lecturer/Researcher','AKADEMIA',true,7,'system',NOW()),
+('LEC_RES','Lecturer/Researcher','AKADEMIA',true,8,'system',NOW()),
+('SEN_LEC_RES','Senior Lecturer/Researcher','AKADEMIA',true,9,'system',NOW()),
+('STUDIENGANGSLEITUNG','Studiengangsleitung','AKADEMIA',true,10,'system',NOW()),
+/* Verwaltung */
+('FK_VERWALTUNG','Fachkraft Verwaltung','VERWALTUNG',true,11,'system',NOW()),
+('SFK_VERWALTUNG','Spezial-Fachkraft Verwaltung','VERWALTUNG',true,12,'system',NOW()),
+('SP_VERWALTUNG','Spezialist:in Verwaltung','VERWALTUNG',true,13,'system',NOW()),
+('EXP_VERWALTUNG','Expert:in Verwaltung','VERWALTUNG',true,14,'system',NOW()),
 /* Technik */
-('FK_TECH','Fachkraft Technik','TECHNIK',true,10,'system',NOW()),
-('SFK_TECH','Spezial-Fachkraft Technik','TECHNIK',true,11,'system',NOW()),
-('SP_TECH','Spezialist:in Technik','TECHNIK',true,12,'system',NOW()),
-('EXP_TECH','Expert:in Technik','TECHNIK',true,13,'system',NOW()),
-('TOP_EXP_TECH','Top-Expert:in Technik','TECHNIK',true,14,'system',NOW()),
-/* IT */
-('FK_IT','Fachkraft IT','IT',true,15,'system',NOW()),
-('SFK_IT','Spezial-Fachkraft IT','IT',true,16,'system',NOW()),
-('SP_IT','Spezialist:in IT','IT',true,17,'system',NOW()),
-('EXP_IT','Expert:in IT','IT',true,18,'system',NOW()),
-('TOP_EXP_IT','Top-Expert:in IT','IT',true,19,'system',NOW()),
-/* Produktion */
-('HK_PROD','Hilfskraft Produktion','PRODUKTION',true,20,'system',NOW()),
-('FK_PROD','Fachkraft Produktion','PRODUKTION',true,21,'system',NOW()),
-('SFK_PROD','Spezial-Fachkraft Produktion','PRODUKTION',true,22,'system',NOW()),
-('SP_PROD','Spezialist:in Produktion','PRODUKTION',true,23,'system',NOW()),
-/* Handwerk, Instandhaltung, Logistik */
-('HK_HIL','Hilfskraft Handwerk, Instandhaltung + Logistik','HANDW_IH_LOG',true,24,'system',NOW()),
-('FK_HIL','Fachkraft Handwerk, Instandhaltung + Logistik','HANDW_IH_LOG',true,25,'system',NOW()),
-('SFK_HIL','Spezial-Fachkraft Handwerk, Instandhaltung + Logistik','HANDW_IH_LOG',true,26,'system',NOW()),
-('SP_HIL','Spezialist:in Handwerk, Instandhaltung + Logistik','HANDW_IH_LOG',true,27,'system',NOW())
+('FK_TECHNIK','Fachkraft Technik','TECHNIK',true,15,'system',NOW()),
+/* IT & Software */
+('FK_IT','Fachkraft IT & Software','IT_SOFTWARE',true,16,'system',NOW()),
+('SFK_IT','Spezial-Fachkraft IT & Software','IT_SOFTWARE',true,17,'system',NOW()),
+('SP_IT','Spezialist:in IT & Software','IT_SOFTWARE',true,18,'system',NOW()),
+('EXP_IT','Expert:in IT & Software','IT_SOFTWARE',true,19,'system',NOW()),
+/* Technische Dienste */
+('HK_TECHN_DIENSTE','Hilfskraft Technische Dienste','TECHN_DIENSTE',true,20,'system',NOW()),
+('FK_TECHN_DIENSTE','Fachkraft Technische Dienste','TECHN_DIENSTE',true,21,'system',NOW()),
+('SFK_TECHN_DIENSTE','Spezial-Fachkraft Technische Dienste','TECHN_DIENSTE',true,22,'system',NOW())
 ON CONFLICT (modellfunktion_kurzbz) DO NOTHING;
 
 
@@ -111,6 +106,7 @@ if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table
 CREATE TABLE IF NOT EXISTS hr.tbl_lohnguide_modellstelle (
     modellstelle_kurzbz character varying(32) NOT NULL,
     bezeichnung varchar(128) NOT NULL,
+	code character varying(32) NOT NULL,
     grade int NOT NULL,
     modellfunktion_kurzbz character varying(32) NOT NULL,
     aktiv boolean DEFAULT FALSE,
@@ -125,132 +121,94 @@ CREATE TABLE IF NOT EXISTS hr.tbl_lohnguide_modellstelle (
 
 GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE hr.tbl_lohnguide_modellstelle TO vilesci;
 
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('111','Führung III 1/5',9,'FÜHRUNG_III',true,13,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('112','Führung III 2/5',10,'FÜHRUNG_III',true,14,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('113','Führung III 3/5',11,'FÜHRUNG_III',true,15,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('114','Führung III 4/5',12,'FÜHRUNG_III',true,16,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('115','Führung III 5/5',13,'FÜHRUNG_III',true,17,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('121','Führung II 1/4',14,'FÜHRUNG_II',true,7,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('122a','Führung II 2a/4',15,'FÜHRUNG_II',true,8,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('122b','Führung II 2b/4',15,'FÜHRUNG_II',true,9,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('123a','Führung II 3a/4',16,'FÜHRUNG_II',true,10,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('123b','Führung II 3b/4',16,'FÜHRUNG_II',true,11,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('124','Führung II 4/4',17,'FÜHRUNG_II',true,12,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('131','Führung I 1/4',18,'FÜHRUNG_I',true,1,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('132a','Führung I 2a/4',19,'FÜHRUNG_I',true,2,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('132b','Führung I 2b/4',19,'FÜHRUNG_I',true,3,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('133a','Führung I 3a/4',20,'FÜHRUNG_I',true,4,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('133b','Führung I 3b/4',20,'FÜHRUNG_I',true,5,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('134','Führung I 4/4',21,'FÜHRUNG_I',true,6,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
 
--- GF
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('141','Geschäftsführung 1/5',22,'GF',true,18,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('142a','Geschäftsführung 2a/5',23,'GF',true,19,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('142b','Geschäftsführung 2b/5',23,'GF',true,20,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('143a','Geschäftsführung 3a/5',24,'GF',true,21,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('143b','Geschäftsführung 3b/5',24,'GF',true,22,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('144a','Geschäftsführung 4a/5',25,'GF',true,23,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('144b','Geschäftsführung 4b/5',25,'GF',true,24,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('145','Geschäftsführung 5/5',26,'GF',true,25,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+-- FÜHRUNG
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz,bezeichnung, code, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES
+('ABTL_1_4', 'Abteilungsleitung 1/4',  '111',  16, 'ABTEILUNGSLEITUNG', true,  1, 'system', NOW()),
+('ABTL_2A_4', 'Abteilungsleitung 2a/4', '112a', 17, 'ABTEILUNGSLEITUNG', true,  2, 'system', NOW()),
+('ABTL_2B_4', 'Abteilungsleitung 2b/4', '112b', 17, 'ABTEILUNGSLEITUNG', true,  3, 'system', NOW()),
+('ABTL_3A_4', 'Abteilungsleitung 3a/4', '113a', 18, 'ABTEILUNGSLEITUNG', true,  4, 'system', NOW()),
+('ABTL_3B_4', 'Abteilungsleitung 3b/4', '113b', 18, 'ABTEILUNGSLEITUNG', true,  5, 'system', NOW()),
+('ABTL_4_4', 'Abteilungsleitung 4/4',  '114',  19, 'ABTEILUNGSLEITUNG', true,  6, 'system', NOW()),
+('GF_1_2', 'Geschäftsführung 1/2',   '121',  22, 'GF',                true,  7, 'system', NOW()),
+('GF_2_2', 'Geschäftsführung 2/2',   '122',  23, 'GF',                true,  8, 'system', NOW()),
+('KOMFL_1_1', 'Kompetenzfeldleiter*in 1/1', '131', 15, 'KOMPETENZFELDLEITER', true,  9, 'system', NOW()),
+('DEPL_1_1', 'Departmentleiter*in 1/1',    '141', 18, 'DEPARTMENTSLEITER',   true, 10, 'system', NOW()),
+('FAKL_1_1', 'Fakultätsleiter*in 1/1',     '151', 20, 'FAKULTÄTSLEITER',     true, 11, 'system', NOW())
+ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
 
--- Allgemein
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('211','Fachkraft Allgemein 1/3',4,'FK_ALLGM',true,26,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('212a','Fachkraft Allgemein 2a/3',5,'FK_ALLGM',true,27,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('212b','Fachkraft Allgemein 2b/3',5,'FK_ALLGM',true,28,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('213','Fachkraft Allgemein 3/3',6,'FK_ALLGM',true,29,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('221','Spezial-Fachkraft Allgemein 1/4', 7,'SFK_ALLGM',true,30,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('222a','Spezial-Fachkraft Allgemein 2a/4',8,'SFK_ALLGM',true,31,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('222b','Spezial-Fachkraft Allgemein 2b/4',8,'SFK_ALLGM',true,32,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('223a','Spezial-Fachkraft Allgemein 3a/4',9,'SFK_ALLGM',true,33,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('223b','Spezial-Fachkraft Allgemein 3b/4',9,'SFK_ALLGM',true,34,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('224','Spezial-Fachkraft Allgemein 4/4',10,'SFK_ALLGM',true,35,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('231','Spezialist:in Allgemein 1/4',11,'SP_ALLGM',true,36,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('232a','Spezialist:in Allgemein 2a/4',12,'SP_ALLGM',true,37,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('232b','Spezialist:in Allgemein 2b/4',12,'SP_ALLGM',true,38,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('233a','Spezialist:in Allgemein 3a/4',13,'SP_ALLGM',true,39,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('233b','Spezialist:in Allgemein 3b/4',13,'SP_ALLGM',true,40,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('234','Spezialist:in Allgemein 4/4',14,'SP_ALLGM',true,41,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('241','Expert:in Allgemein 1/4',15,'EXP_ALLGM',true,42,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('242a','Expert:in Allgemein 2a/4',16,'EXP_ALLGM',true,43,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('242b','Expert:in Allgemein 2b/4',16,'EXP_ALLGM',true,44,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('243a','Expert:in Allgemein 3a/4',17,'EXP_ALLGM',true,45,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('243b','Expert:in Allgemein 3b/4',17,'EXP_ALLGM',true,46,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('244','Expert:in Allgemein 4/4',18,'EXP_ALLGM',true,47,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('251','Top-Expert:in Allgemein 1/1',19,'TOP_EXP_ALLGM',true,48,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+-- AKADEMIA
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, code, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES
+('STUDENTISCHE_MA_1_1', 'Studentische MA 1/1',            '211',  5,  'STUDENTISCHE_MA',  true, 12, 'system', NOW()),
+('JUNIOR_LEC_RES_1_2', 'Junior Lecturer/Researcher 1/2', '221',  8,  'JUNIOR_LEC_RES',   true, 13, 'system', NOW()),
+('JUNIOR_LEC_RES_2_2', 'Junior Lecturer/Researcher 2/2', '222',  9,  'JUNIOR_LEC_RES',   true, 14, 'system', NOW()),
+('LEC_RES_1_2', 'Lecturer/Researcher 1/2',        '231',  11, 'LEC_RES',          true, 15, 'system', NOW()),
+('LEC_RES_2_2', 'Lecturer/Researcher 2/2',        '232',  12, 'LEC_RES',          true, 16, 'system', NOW()),
+('SEN_LEC_RES_1_2', 'Senior Lecturer/Researcher 1/2', '241',  13, 'SEN_LEC_RES',      true, 17, 'system', NOW()),
+('SEN_LEC_RES_2_2', 'Senior Lecturer/Researcher 2/2', '242',  14, 'SEN_LEC_RES',      true, 18, 'system', NOW()),
+('STGL_1_2', 'Studiengangsleitung 1/2',        '251',  15, 'STUDIENGANGSLEITUNG', true, 19, 'system', NOW()),
+('STGL_2_2', 'Studiengangsleitung 2/2',        '252',  16, 'STUDIENGANGSLEITUNG', true, 20, 'system', NOW())
+ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
 
--- Technik
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('311','Fachkraft Technik 1/3',4,'FK_TECH',true,49,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('312a','Fachkraft Technik 2a/3',5,'FK_TECH',true,50,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('312b','Fachkraft Technik 2b/3',5,'FK_TECH',true,51,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('313','Fachkraft Technik 3/3',6,'FK_TECH',true,52,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('321','Spezial-Fachkraft Technik 1/4',7,'SFK_TECH',true,53,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('322a','Spezial-Fachkraft Technik 2a/4',8,'SFK_TECH',true,54,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('322b','Spezial-Fachkraft Technik 2b/4',8,'SFK_TECH',true,55,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('323a','Spezial-Fachkraft Technik 3a/4',9,'SFK_TECH',true,56,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('323b','Spezial-Fachkraft Technik 3b/4',9,'SFK_TECH',true,57,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('324','Spezial-Fachkraft Technik 4/4',10,'SFK_TECH',true,58,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('331','Spezialist:in Technik 1/4',11,'SP_TECH',true,59,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('332a','Spezialist:in Technik 2a/4',12,'SP_TECH',true,60,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('332b','Spezialist:in Technik 2b/4',12,'SP_TECH',true,61,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('333a','Spezialist:in Technik 3a/4',13,'SP_TECH',true,62,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('333b','Spezialist:in Technik 3b/4',13,'SP_TECH',true,63,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('334','Spezialist:in Technik 4/4',14,'SP_TECH',true,64,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('341','Expert:in Technik 1/4',15,'EXP_TECH',true,65,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('342a','Expert:in Technik 2a/4',16,'EXP_TECH',true,66,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('342b','Expert:in Technik 2b/4',16,'EXP_TECH',true,67,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('343a','Expert:in Technik 3a/4',17,'EXP_TECH',true,68,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('343b','Expert:in Technik 3b/4',17,'EXP_TECH',true,69,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('344','Expert:in Technik 4/4',18,'EXP_TECH',true,70,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('351','Top-Expert:in Technik 1/1',19,'TOP_EXP_TECH',true,71,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+-- VERWALTUNG
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, code, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES
+('FK_VERWALTUNG_1_3', 'Fachkraft Verwaltung 1/3',            '311',  4,  'FK_VERWALTUNG',  true, 21, 'system', NOW()),
+('FK_VERWALTUNG_2A_3', 'Fachkraft Verwaltung 2a/3',           '312a', 5,  'FK_VERWALTUNG',  true, 22, 'system', NOW()),
+('FK_VERWALTUNG_2B_3', 'Fachkraft Verwaltung 2b/3',           '312b', 5,  'FK_VERWALTUNG',  true, 23, 'system', NOW()),
+('FK_VERWALTUNG_3_3', 'Fachkraft Verwaltung 3/3',            '313',  6,  'FK_VERWALTUNG',  true, 24, 'system', NOW()),
+('SFK_VERWALTUNG_1_4', 'Spezial-Fachkraft Verwaltung 1/4',   '321',  7,  'SFK_VERWALTUNG', true, 25, 'system', NOW()),
+('SFK_VERWALTUNG_2A_4', 'Spezial-Fachkraft Verwaltung 2a/4',  '322a', 8,  'SFK_VERWALTUNG', true, 26, 'system', NOW()),
+('SFK_VERWALTUNG_2B_4', 'Spezial-Fachkraft Verwaltung 2b/4',  '322b', 8,  'SFK_VERWALTUNG', true, 27, 'system', NOW()),
+('SFK_VERWALTUNG_3A_4', 'Spezial-Fachkraft Verwaltung 3a/4',  '323a', 9,  'SFK_VERWALTUNG', true, 28, 'system', NOW()),
+('SFK_VERWALTUNG_3B_4', 'Spezial-Fachkraft Verwaltung 3b/4',  '323b', 9,  'SFK_VERWALTUNG', true, 29, 'system', NOW()),
+('SFK_VERWALTUNG_4_4', 'Spezial-Fachkraft Verwaltung 4/4',   '324',  10, 'SFK_VERWALTUNG', true, 30, 'system', NOW()),
+('SP_VERWATLTUNG_1_4', 'Spezialist:in Verwaltung 1/4',       '331',  11, 'SP_VERWALTUNG',  true, 31, 'system', NOW()),
+('SP_VERWATLTUNG_2A_4', 'Spezialist:in Verwaltung 2a/4',      '332a', 12, 'SP_VERWALTUNG',  true, 32, 'system', NOW()),
+('SP_VERWATLTUNG_2B_4', 'Spezialist:in Verwaltung 2b/4',      '332b', 12, 'SP_VERWALTUNG',  true, 33, 'system', NOW()),
+('SP_VERWATLTUNG_3A_4', 'Spezialist:in Verwaltung 3a/4',      '333a', 13, 'SP_VERWALTUNG',  true, 34, 'system', NOW()),
+('SP_VERWATLTUNG_3B_4', 'Spezialist:in Verwaltung 3b/4',      '333b', 13, 'SP_VERWALTUNG',  true, 35, 'system', NOW()),
+('SP_VERWATLTUNG_4_4', 'Spezialist:in Verwaltung 4/4',       '334',  14, 'SP_VERWALTUNG',  true, 36, 'system', NOW()),
+('EXP_VERWALTUNG_1_1', 'Expert:in Verwaltung 1/1',           '341',  15, 'EXP_VERWALTUNG', true, 37, 'system', NOW())
+ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
 
--- IT
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('411','Fachkraft IT 1/2',5,'FK_IT',true,72,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('412','Fachkraft IT 2/2',6,'FK_IT',true,73,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('421','Spezial-Fachkraft IT 1/4',7,'SFK_IT',true,74,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('422','Spezial-Fachkraft IT 2/4',8,'SFK_IT',true,75,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('423','Spezial-Fachkraft IT 3/4',9,'SFK_IT',true,76,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('424','Spezial-Fachkraft IT 4/4',10,'SFK_IT',true,77,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('431','Spezialist:in IT 1/4',11,'SP_IT',true,78,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('432a','Spezialist:in IT 2a/4',12,'SP_IT',true,79,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('432b','Spezialist:in IT 2b/4',12,'SP_IT',true,80,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('433a','Spezialist:in IT 3a/4',13,'SP_IT',true,81,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('433b','Spezialist:in IT 3b/4',13,'SP_IT',true,82,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('434','Spezialist:in IT 4/4',14,'SP_IT',true,83,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('441','Expert:in IT 1/4',15,'EXP_IT',true,84,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('442','Expert:in IT 2/4',16,'EXP_IT',true,85,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('443','Expert:in IT 3/4',17,'EXP_IT',true,86,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('444','Expert:in IT 4/4',18,'EXP_IT',true,87,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('451','Top-Expert:in IT 1/1',19,'TOP_EXP_IT',true,88,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+-- TECHNIK
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, code, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES
+('FK_TECHNIK_1_3', 'Fachkraft Technik 1/3',  '311',  4, 'FK_TECHNIK', true, 38, 'system', NOW()),
+('FK_TECHNIK_2a_3', 'Fachkraft Technik 2a/3', '312a', 5, 'FK_TECHNIK', true, 39, 'system', NOW()),
+('FK_TECHNIK_2b_3','Fachkraft Technik 2b/3', '312b', 5, 'FK_TECHNIK', true, 40, 'system', NOW()),
+('FK_TECHNIK_3_3', 'Fachkraft Technik 3/3',  '313',  6, 'FK_TECHNIK', true, 41, 'system', NOW())
+ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
 
--- Produktion
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('511','Hilfskraft Produktion 1/4',1,'HK_PROD',true,89,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('512','Hilfskraft Produktion 2/4',2,'HK_PROD',true,90,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('513','Hilfskraft Produktion 3/4',3,'HK_PROD',true,91,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('514','Hilfskraft Produktion 4/4',4,'HK_PROD',true,92,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('521','Fachkraft Produktion 1/2',5,'FK_PROD',true,93,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('522','Fachkraft Produktion 2/2',6,'FK_PROD',true,94,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('531','Spezial-Fachkraft Produktion 1/4',7,'SFK_PROD',true,95,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('532','Spezial-Fachkraft Produktion 2/4',8,'SFK_PROD',true,96,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('533','Spezial-Fachkraft Produktion 3/4',9,'SFK_PROD',true,97,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('534','Spezial-Fachkraft Produktion 4/4',10,'SFK_PROD',true,98,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('541','Spezialist:in Produktion 1/4',11,'SP_PROD',true,99,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('542a','Spezialist:in Produktion 2a/4',12,'SP_PROD',true,100,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('542b','Spezialist:in Produktion 2b/4',12,'SP_PROD',true,101,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('543a','Spezialist:in Produktion 3a/4',13,'SP_PROD',true,102,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('543b','Spezialist:in Produktion 3b/4',13,'SP_PROD',true,103,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('544','Spezialist:in Produktion 4/4',14,'SP_PROD',true,104,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+-- IT & Software
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, code, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES
+('FK_IT_1_2', 'Fachkraft IT & Software 1/2',          '411',  5,  'FK_IT',  true, 42, 'system', NOW()),
+('FK_IT_2_2', 'Fachkraft IT & Software 2/2',          '412',  6,  'FK_IT',  true, 43, 'system', NOW()),
+('SFK_IT_1_4', 'Spezial-Fachkraft IT & Software 1/4',  '421',  7,  'SFK_IT', true, 44, 'system', NOW()),
+('SFK_IT_2_4', 'Spezial-Fachkraft IT & Software 2/4',  '422',  8,  'SFK_IT', true, 45, 'system', NOW()),
+('SFK_IT_3_4', 'Spezial-Fachkraft IT & Software 3/4',  '423',  9,  'SFK_IT', true, 46, 'system', NOW()),
+('SFK_IT_4_4', 'Spezial-Fachkraft IT & Software 4/4',  '424',  10, 'SFK_IT', true, 47, 'system', NOW()),
+('SP_IT_1_4', 'Spezialist:in IT & Software 1/4',      '431',  11, 'SP_IT',  true, 48, 'system', NOW()),
+('SP_IT_2A_4', 'Spezialist:in IT & Software 2a/4',     '432a', 12, 'SP_IT',  true, 49, 'system', NOW()),
+('SP_IT_2B_4', 'Spezialist:in IT & Software 2b/4',     '432b', 12, 'SP_IT',  true, 50, 'system', NOW()),
+('SP_IT_3A_4', 'Spezialist:in IT & Software 3a/4',     '433a', 13, 'SP_IT',  true, 51, 'system', NOW()),
+('SP_IT_3B_4', 'Spezialist:in IT & Software 3b/4',     '433b', 13, 'SP_IT',  true, 52, 'system', NOW()),
+('SP_IT_4_4', 'Spezialist:in IT & Software 4/4',      '434',  14, 'SP_IT',  true, 53, 'system', NOW()),
+('EXP_IT_1_1', 'Expert:in IT & Software 1/1',          '441',  15, 'EXP_IT', true, 54, 'system', NOW())
+ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
 
--- Handwerk, Logistik, ..
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('611','Hilfskraft Handwerk, Instandhaltung + Logistik 1/4',1,'HK_HIL',true,105,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('612','Hilfskraft Handwerk, Instandhaltung + Logistik 2/4',2,'HK_HIL',true,106,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('613','Hilfskraft Handwerk, Instandhaltung + Logistik 3/4',3,'HK_HIL',true,107,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('614','Hilfskraft Handwerk, Instandhaltung + Logistik 4/4',4,'HK_HIL',true,108,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('621','Fachkraft Handwerk, Instandhaltung + Logistik 1/2',5,'FK_HIL',true,109,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('622','Fachkraft Handwerk, Instandhaltung + Logistik 2/2',6,'FK_HIL',true,110,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('631','Spezial-Fachkraft Handwerk, Instandhaltung + Logistik 1/4',7,'SFK_HIL',true,111,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('632','Spezial-Fachkraft Handwerk, Instandhaltung + Logistik 2/4',8,'SFK_HIL',true,112,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('633','Spezial-Fachkraft Handwerk, Instandhaltung + Logistik 3/4',9,'SFK_HIL',true,113,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
-INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES('634','Spezial-Fachkraft Handwerk, Instandhaltung + Logistik 4/4',10,'SFK_HIL',true,114,'system',NOW()) ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
+-- TECHNISCHE DIENSTE
+INSERT INTO hr.tbl_lohnguide_modellstelle(modellstelle_kurzbz, bezeichnung, code, grade, modellfunktion_kurzbz, aktiv, sort, insertvon, insertamum) VALUES
+('HK_TECHN_DIENSTE_1_4', 'Hilfskraft Technische Dienste 1/4',        '511',  1,  'HK_TECHN_DIENSTE',  true, 55, 'system', NOW()),
+('HK_TECHN_DIENSTE_2_4', 'Hilfskraft Technische Dienste 2/4',        '512',  2,  'HK_TECHN_DIENSTE',  true, 56, 'system', NOW()),
+('HK_TECHN_DIENSTE_3_4', 'Hilfskraft Technische Dienste 3/4',        '513',  3,  'HK_TECHN_DIENSTE',  true, 57, 'system', NOW()),
+('HK_TECHN_DIENSTE_4_4', 'Hilfskraft Technische Dienste 4/4',        '514',  4,  'HK_TECHN_DIENSTE',  true, 58, 'system', NOW()),
+('FK_TECHN_DIENSTE_1_2', 'Fachkraft Technische Dienste 1/2',         '521',  5,  'FK_TECHN_DIENSTE',  true, 59, 'system', NOW()),
+('FK_TECHN_DIENSTE_2_2', 'Fachkraft Technische Dienste 2/2',         '522',  6,  'FK_TECHN_DIENSTE',  true, 60, 'system', NOW()),
+('SFK_TECHN_DIENSTE_1_4', 'Spezial-Fachkraft Technische Dienste 1/4', '531',  7,  'SFK_TECHN_DIENSTE', true, 61, 'system', NOW()),
+('SFK_TECHN_DIENSTE_2_4', 'Spezial-Fachkraft Technische Dienste 2/4', '532',  8,  'SFK_TECHN_DIENSTE', true, 62, 'system', NOW()),
+('SFK_TECHN_DIENSTE_3_4', 'Spezial-Fachkraft Technische Dienste 3/4', '533',  9,  'SFK_TECHN_DIENSTE', true, 63, 'system', NOW()),
+('SFK_TECHN_DIENSTE_4_4', 'Spezial-Fachkraft Technische Dienste 4/4', '534',  10, 'SFK_TECHN_DIENSTE', true, 64, 'system', NOW())
+ON CONFLICT (modellstelle_kurzbz) DO NOTHING;
 
 		";
 
@@ -280,16 +238,7 @@ CREATE TABLE IF NOT EXISTS hr.tbl_lohnguide_fachrichtung (
 GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE hr.tbl_lohnguide_fachrichtung TO vilesci;
 
 INSERT INTO hr.tbl_lohnguide_fachrichtung(fachrichtung_kurzbz,bezeichnung,aktiv,insertvon,insertamum) VALUES
-('FA00','Keine Berücksichtigung',true,'system',NOW()),
-('FA01','Administration allgemein',true,'system',NOW()),
-('FA02','Dienste Infrastruktur',true,'system',NOW()),
-('FA03','Finanzwesen & Controlling',true,'system',NOW()),
-('FA04','IT',true,'system',NOW()),
-('FA05','Logistik',true,'system',NOW()),
-('FA06','Marketing & Digitales Marketing',true,'system',NOW()),
-('FA07','Produktion',true,'system',NOW()),
-('FA08','Technik',true,'system',NOW()),
-('FA09','Verkauf',true,'system',NOW())
+('FA00','Keine Berücksichtigung',true,'system',NOW())
 ON CONFLICT (fachrichtung_kurzbz) DO NOTHING;
 
 		";
@@ -298,6 +247,7 @@ ON CONFLICT (fachrichtung_kurzbz) DO NOTHING;
 			echo '<strong>Lohnguide Fachrichtung: ' . $db->db_last_error() . '</strong><br>';
 		else
 			echo 'hr.tbl_lohnguide_fachrichtung wurde neu erstellt<br>';
+	
 	}
 }
 
@@ -314,8 +264,8 @@ CREATE TABLE IF NOT EXISTS hr.tbl_vertragsbestandteil_lohnguide (
     stellenbezeichnung varchar(255),
     fachrichtung_kurzbz character varying(32) NOT NULL,
     modellstelle_kurzbz character varying(32) NOT NULL,
-    kommentar_person varchar(255),
-    kommentar_modellstelle varchar(255),
+    kommentar_person text,
+    kommentar_modellstelle text,
     CONSTRAINT tbl_vertragsbestandteil_lohnguide_pk PRIMARY KEY (vertragsbestandteil_id),
 	CONSTRAINT tbl_vertragsbestandteil_fk FOREIGN KEY (vertragsbestandteil_id) REFERENCES hr.tbl_vertragsbestandteil (vertragsbestandteil_id) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,
 	CONSTRAINT tbl_vertragsbestandteil_lohnguide_fachrichtung_fk FOREIGN KEY (fachrichtung_kurzbz) REFERENCES hr.tbl_lohnguide_fachrichtung (fachrichtung_kurzbz) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,

system/dbupdate_3.4/75888_reihungstest_mehrfachdurchfuehrung.php

@@ -0,0 +1,15 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+if ($result = $db->db_query("SELECT * FROM pg_class WHERE relname='idx_tbl_benutzerfunktion_uid'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "CREATE INDEX idx_tbl_benutzerfunktion_uid ON public.tbl_benutzerfunktion USING btree (uid)";
+
+		if (! $db->db_query($qry))
+			echo '<strong>idx_tbl_benutzerfunktion_uid: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'Index idx_tbl_benutzerfunktion_uid angelegt<br>';
+	}
+}

system/phrasesupdate.php

@@ -41761,7 +41761,7 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
-		'phrase' => 'c4fehlerAktualitaetProjektarbeit ',
+		'phrase' => 'c4fehlerAktualitaetProjektarbeit',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -47126,26 +47126,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'dashboard',
-		'phrase' => 'edit',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Dashboard bearbeiten',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Edit dashboard',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'core',
 		'category' => 'dashboard',
@@ -47166,46 +47146,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'dashboard',
-		'phrase' => 'createWidget',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Neues Widget hinzufügen',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Create new widget',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'dashboard',
-		'phrase' => 'noWidgetsAvailable',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Keine Widgets verfügbar',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'No Widgets available',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'core',
 		'category' => 'dashboard',
@@ -47286,266 +47226,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'dashboard',
-		'phrase' => 'widgetFromGeneralSection',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Dieses Widget ist für das Dashboard vordefiniert',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'This is a predefined widget of this dashboard',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'dashboard',
-		'phrase' => 'widgetFromCustomSection',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Dieses Widget wurde von Ihnen hinzugefügt',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'This widget has been added by you',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'dashboard',
-		'phrase' => 'widgetFromFunktionSection',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Dieses Widget wurde hinzugefügt weil Sie der "{0}" Funktion zugewiesen wurden',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'This widget has been added because you have been assigned to the "{0}" function',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'dashboard',
-		'phrase' => 'widget_pin',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Pin Widget',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Pin widget',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'dashboard',
-		'phrase' => 'widget_unpin',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Unpin Widget',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Unpin widget',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'dashboard',
-		'phrase' => 'widget_toggle_visiblity',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Sichtbarkeit des Widgets umschalten',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Toggle widget visibility',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'dashboard',
-		'phrase' => 'widget_move',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Widget verschieben',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Move widget',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'dashboard',
-		'phrase' => 'widget_resize',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Widgetgröße anpassen',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Resize widget',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'dashboard',
-		'phrase' => 'widget_delete',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Widget löschen',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Delete widget',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'dashboard',
-		'phrase' => 'widget_configure',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Widget konfigurieren',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Configure widget',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'dashboard',
-		'phrase' => 'widget_config_title',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => '"{name}" konfigurieren',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Configure "{name}"',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'dashboard',
-		'phrase' => 'widget_link',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Widget link',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Widget link',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'dashboard',
-		'phrase' => 'kurzbz',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Name',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Identifier',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 // CIS4 phrases from legacy code end
 // FHC4 Phrases Abschlusspruefung
 	array(

vilesci/bis/personalmeldung.php

@@ -742,7 +742,7 @@ function _getFunktionscontainer_Funktionscode123456($bisfunktion_arr)
 			$has_oe_lehrgang = !($studiengang->studiengang_kz > 0 && $studiengang->studiengang_kz < 10000);
 
 			// STG, die nicht BIS-bemeldet werden, ueberspringen
-			if (in_array($studiengang->studiengang_kz, BIS_EXCLUDE_STG))
+			if (in_array($studiengang->studiengang_kz, BIS_EXCLUDE_STG) || !$studiengang->melderelevant)
 			{
 				continue;
 			}
@@ -825,6 +825,7 @@ function _addFunktionscontainer_Funktionscode7($uid, $funktion_arr, $stichtag)
 		$entwicklungsteam_arr = array_filter($entwicklungsteam_arr, function ($obj) {
 			return
 				!in_array($obj->studiengang_kz, BIS_EXCLUDE_STG) &&
+				$obj->melderelevant &&
 				$obj->studiengang_kz > 0 &&
 				$obj->studiengang_kz < 10000;
 		});
@@ -889,7 +890,7 @@ function _getLehrecontainer($sws_proStg_arr)
 			$kennzeichen_name = $is_lehrgang ? 'LehrgangNr' : 'StgKz';
 
 			// Lehreobjekt generieren
-			if (empty($lehre_arr) || !lehre_stg_exists($sws_proStg->studiengang_kz, $lehre_arr))
+			if (empty($lehre_arr) || !lehre_stg_exists($sws_proStg->melde_studiengang_kz, $lehre_arr))
 			{
 				$lehre_obj = new StdClass();
 
@@ -904,8 +905,8 @@ function _getLehrecontainer($sws_proStg_arr)
 			}
 			else	// Lehrecontainer mit STG schon vorhanden
 			{
-				$lehre_obj_arr = array_filter($lehre_arr, function (&$obj) use ($sws_proStg) {
-					return $obj->StgKz == $sws_proStg->studiengang_kz;
+				$lehre_obj_arr = array_filter($lehre_arr, function (&$obj) use ($sws_proStg, $kennzeichen_name) {
+					return isset($obj->{$kennzeichen_name}) && $obj->{$kennzeichen_name} == $sws_proStg->melde_studiengang_kz;
 				});
 
 				// SWS ergaenzen
@@ -1359,15 +1360,15 @@ function verwendung_exists($bisverwendung, $verwendung_arr)
 
 /**
  * Prueft ob ein Studiengang bereits im Lehre Container vorhanden ist
- * @param $studiengang_kz Studiengangskennzahl
+ * @param $melde_studiengang_kz Studiengangskennzahl
  * @param $lehre_arr Array mit Lehre Objekten
  * @return true wenn der Studiengang bereits existiert
  */
-function lehre_stg_exists($studiengang_kz, $lehre_arr)
+function lehre_stg_exists($melde_studiengang_kz, $lehre_arr)
 {
 	foreach($lehre_arr as $row)
 	{
-		$kennzeichenName = $row->LehrgangNr ?? $row->StgKz;
+		$kennzeichenName = isset($row->LehrgangNr) ? 'LehrgangNr' : 'StgKz';
 		if(isset($row->{$kennzeichenName}) && $row->{$kennzeichenName} == $melde_studiengang_kz)
 			return true;
 	}

vilesci/stammdaten/raum_uebersicht.php

@@ -227,7 +227,8 @@ if (isset($_GET['sendform']))
 	<table class="tablesorter" id="t1">
 	<thead>
 		<tr>
-			<th><span class="tooltip"><img src="../../skin/images/information.png" height="20px" name="infoicon"/>
+			<th><button type="button" class="resetsaved" title="Reset Filter">Reset Filter</button>
+				<span class="tooltip"><img src="../../skin/images/information.png" height="20px" name="infoicon"/>
 				'.$tooltiptext.'
 				</span>
 			</th>
@@ -364,9 +365,10 @@ if (isset($_GET['sendform']))
 		$("#t1").tablesorter(
 		{
 			sortList: [[3,0]],
-			widgets: ["zebra", "filter", "stickyHeaders"],
+			widgets: ["saveSort", "zebra", "filter", "stickyHeaders"],
 			headers: { 	0: { filter: false,  sorter: false }},
-			widgetOptions : {	filter_functions : {
+			widgetOptions : {	filter_saveFilters : true,
+								filter_functions : {
 									// Add select menu to this column
 									8 : {
 									"True" : function(e, n, f, i, $r, c, data) { return /t/.test(e); },
@@ -381,6 +383,13 @@ if (isset($_GET['sendform']))
 									"False" : function(e, n, f, i, $r, c, data) { return /f/.test(e); }
 									}
 				}}
+		}); 
+
+		$('.resetsaved').click(function()
+		{
+			$("#t1").trigger("filterReset");
+			location.reload(forceGet);
+			return false;
 		});
 	});
 		

vilesci/stammdaten/reihungstest_administration.php

@@ -588,7 +588,9 @@ if(isset($_POST['testergebnisanzeigen']) && isset($_POST['prestudent_id']))
 {
 	if(is_numeric($_POST['prestudent_id']) && $_POST['prestudent_id']!='')
 	{
-		$qry="SELECT nachname,vorname,person_id,prestudent_id,tbl_pruefling.pruefling_id,tbl_pruefling_frage.begintime,bezeichnung,kurzbz,tbl_frage.nummer,level, tbl_vorschlag.nummer as antwortnummer, tbl_vorschlag.punkte
+		$qry="SELECT nachname,vorname,person_id,prestudent_id,tbl_pruefling.pruefling_id,
+       				tbl_pruefling_frage.begintime,bezeichnung,kurzbz,tbl_frage.nummer,level, 
+       				tbl_vorschlag.nummer as antwortnummer, tbl_vorschlag.punkte, tbl_frage.frage_id
 				FROM testtool.tbl_antwort
 				JOIN testtool.tbl_vorschlag USING(vorschlag_id)
 				JOIN testtool.tbl_frage USING (frage_id)
@@ -615,6 +617,7 @@ if(isset($_POST['testergebnisanzeigen']) && isset($_POST['prestudent_id']))
 						<th>Level</th>
 						<th>Antwort #</th>
 						<th>Punkte</th>
+						<th>FrageID</th>
 					</tr>
 					</thead>
 					<tbody>';
@@ -632,6 +635,7 @@ if(isset($_POST['testergebnisanzeigen']) && isset($_POST['prestudent_id']))
 				echo "<td>$row->level</td>";
 				echo "<td>$row->antwortnummer</td>";
 				echo "<td>$row->punkte</td>";
+				echo "<td>$row->frage_id</td>";
 				echo '</tr>';
 			}
 			echo '</tbody></table>';

vilesci/stammdaten/reihungstestverwaltung.php

@@ -837,6 +837,25 @@ if(isset($_GET['excel']))
 		<script src="../../vendor/fgelinas/timepicker/jquery.ui.timepicker.js" type="text/javascript" ></script>
 
 		<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()
 			{
 				// Check, ob Räume zugeteilt sind oder max_teilnehmer gesetzt ist, wenn "öffentlich" gesetzt wird
@@ -1007,7 +1026,7 @@ if(isset($_GET['excel']))
 						{
 							widgets: ["zebra", "filter", "stickyHeaders"],
 							sortList: [[2,0],[3,0]],
-							headers: {0: { sorter: false}},
+							headers: {0: { sorter: false},10: { sorter: "customDate"},11: { sorter: "customDate"}},
 							widgetOptions: {filter_cssFilter: [
 									"filter_clm_null",
 									"filter_clm_prestudent_id",
@@ -1020,6 +1039,7 @@ if(isset($_GET['excel']))
 									"filter_clm_studienplan",
 									"filter_clm_einstiegssemester",
 									"filter_clm_geburtsdatum",
+									"filter_clm_anmeldedatum",
 									"filter_clm_email",
 									"filter_clm_absolviert"]}
 						});
@@ -1072,6 +1092,7 @@ if(isset($_GET['excel']))
 							'clm_studienplan',
 							'clm_einstiegssemester',
 							'clm_geburtsdatum',
+							"filter_clm_anmeldedatum",
 							'clm_email',
 							'clm_absolviert'];
 						for (var i in arr)
@@ -2697,7 +2718,8 @@ if($reihungstest_id!='')
 					WHERE prestudent_id = tbl_prestudent.prestudent_id
 						AND status_kurzbz = 'Interessent'
 					) LIMIT 1
-			) AS orgform_kurzbz
+			) AS orgform_kurzbz,
+       tbl_rt_person.anmeldedatum
 	FROM PUBLIC.tbl_rt_person
 	JOIN PUBLIC.tbl_person USING (person_id)
 	JOIN PUBLIC.tbl_reihungstest rt ON (rt_id = rt.reihungstest_id)
@@ -2786,6 +2808,7 @@ if($reihungstest_id!='')
 	echo '<div id="clm_studienplan" class="active" onclick="hideColumn(\'clm_studienplan\')">Studienplan</div>';
 	echo '<div id="clm_einstiegssemester" class="active" onclick="hideColumn(\'clm_einstiegssemester\')">Einstiegssemester</div>';
 	echo '<div id="clm_geburtsdatum" class="active" onclick="hideColumn(\'clm_geburtsdatum\')">Geburtsdatum</div>';
+	echo '<div id="clm_anmeldedatum" class="active" onclick="hideColumn(\'clm_anmeldedatum\')">Geburtsdatum</div>';
 	echo '<div id="clm_email" class="active" onclick="hideColumn(\'clm_email\')">EMail</div>';
 	echo '<div id="clm_absolviert" class="active" onclick="hideColumn(\'clm_absolviert\')">Absolvierte Tests <span class="wait"></span></div>';
 	//echo '<div id="clm_ergebnis" class="active" onclick="hideColumn(\'clm_ergebnis\')">Ergebnis <span class="wait"></span></div>';
@@ -2827,6 +2850,7 @@ if($reihungstest_id!='')
 					<th style="display: table-cell" class="clm_studienplan">Studienplan</th>
 					<th style="display: table-cell" class="clm_einstiegssemester">Einstiegssemester</th>
 					<th style="display: table-cell" class="clm_geburtsdatum">Geburtsdatum</th>
+					<th style="display: table-cell" class="clm_anmeldedatum">Anmeldedatum</th>
 					<th style="display: table-cell" class="clm_email">EMail</th>
 					<th style="display: table-cell" class="clm_absolviert">bereits absolvierte Verfahren</th>
 					<!--<th style="display: table-cell" class="clm_ergebnis">Ergebnis</th>
@@ -2946,6 +2970,7 @@ if($reihungstest_id!='')
 										<td style="display: table-cell" class="clm_studienplan">'.$db->convert_html_chars($studienplan_bezeichnung).' ('.$row->studienplan_id.')</td>
 										<td style="display: table-cell" class="clm_einstiegssemester">'.$db->convert_html_chars($row->ausbildungssemester).'</td>
 										<td style="display: table-cell" class="clm_geburtsdatum">'.$db->convert_html_chars($row->gebdatum!=''?$datum_obj->convertISODate($row->gebdatum):' ').'</td>
+										<td style="display: table-cell" class="clm_anmeldedatum">'.$db->convert_html_chars($row->anmeldedatum!=''?$datum_obj->convertISODate($row->anmeldedatum):' ').'</td>
 										<td style="display: table-cell; text-align: center" class="clm_email"><a href="mailto:'.$db->convert_html_chars($row->email).'"><img src="../../skin/images/button_mail.gif" name="mail"></a></td>
 										<td style="display: table-cell;" class="clm_absolviert">'.$rt_in_anderen_stg.'</td>
 									</tr>';
@@ -3009,6 +3034,7 @@ if($reihungstest_id!='')
 							<th style="display: table-cell" class="clm_studienplan">Studienplan</th>
 							<th style="display: table-cell" class="clm_einstiegssemester">Einstiegssemester</th>
 							<th style="display: table-cell" class="clm_geburtsdatum">Geburtsdatum</th>
+							<th style="display: table-cell" class="clm_anmeldedatum">Anmeldedatum</th>
 							<th style="display: table-cell" class="clm_email">EMail</th>
 							<th style="display: table-cell" class="clm_absolviert">bereits absolvierte Verfahren</th>
 							<!--<th style="display: table-cell" class="clm_ergebnis">Ergebnis</th>
@@ -3128,6 +3154,7 @@ if($reihungstest_id!='')
 									<td style="display: table-cell" class="clm_studienplan">'.$db->convert_html_chars($studienplan_bezeichnung).' ('.$row->studienplan_id.')</td>
 									<td style="display: table-cell" class="clm_einstiegssemester">'.$db->convert_html_chars($row->ausbildungssemester).'</td>
 									<td style="display: table-cell" class="clm_geburtsdatum">'.$db->convert_html_chars($row->gebdatum!=''?$datum_obj->convertISODate($row->gebdatum):' ').'</td>
+									<td style="display: table-cell" class="clm_anmeldedatum">'.$db->convert_html_chars($row->anmeldedatum!=''?$datum_obj->convertISODate($row->anmeldedatum):' ').'</td>
 									<td style="display: table-cell; text-align: center" class="clm_email"><a href="mailto:'.$db->convert_html_chars($row->email).'"><img src="../../skin/images/button_mail.gif" name="mail"></a></td>
 									<td style="display: table-cell;" class="clm_absolviert">'.$rt_in_anderen_stg.'</td>';
 							/*echo	'<td style="display: table-cell; align: right" class="clm_ergebnis">'.($rtergebnis==0?'-':number_format($rtergebnis,2,'.','')).' %</td>