minor fix

2026-06-01 20:29:29 +00:00 · 2026-04-21 11:23:17 +02:00 · 2026-04-21 11:21:50 +02:00 · 2026-04-20 11:40:26 +02:00 · 2026-04-20 09:50:41 +02:00 · 2026-04-20 09:24:51 +02:00
29 changed files with 785 additions and 1119 deletions
@@ -1,27 +1,11 @@
 <?php
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+// Header menu

-$root = CIS_ROOT;
-
-if (defined('CIS4') && CIS4) $root = APP_ROOT;
-
-// --------------------------------------------------------------------------------------------------------------------
-// Head menu
+if(defined('CIS4') && CIS4) {
+	$root = APP_ROOT;
+} else {
+	$root = CIS_ROOT;
+}

 $config['navigation_header'] = array(
 	'*' => array(
@@ -218,20 +202,13 @@ $config['navigation_header'] = array(
 					'sort' => 20,
 					'requiredPermissions' => 'system/developer:r'
 				),
-				'anrechnungen' => array(
-					'link' => site_url('lehre/anrechnung/AdminAnrechnung'),
-					'description' => 'Anrechnungen',
-					'expand' => true,
-					'sort' => 30,
-					'requiredPermissions' => 'lehre/anrechnungszeitfenster:rw'
-				),
-				'loginas' => array(
-					'link' => site_url('system/Login/loginAs'),
-					'description' => 'Login as',
-					'expand' => true,
-					'sort' => 40,
-					'requiredPermissions' => 'admin:rw'
-				),
+                'anrechnungen' => array(
+                    'link' => site_url('lehre/anrechnung/AdminAnrechnung'),
+                    'description' => 'Anrechnungen',
+                    'expand' => true,
+                    'sort' => 30,
+                    'requiredPermissions' => 'lehre/anrechnungszeitfenster:rw'
+                ),
 				'dashboardadmin' => array(
 					'link' => site_url('dashboard/Admin'),
 					'description' => 'Dashboard Admin',
@@ -259,12 +236,12 @@ $config['navigation_menu']['Vilesci/index'] = array(
 );

 $config['navigation_menu']['Vilesci/index'] = array(
-	'dashboard' => array(
-		'link' => '#',
-		'description' => 'Dashboard',
-		'icon' => 'dashboard',
-		'sort' => 1
-	 )
+    'dashboard' => array(
+        'link' => '#',
+        'description' => 'Dashboard',
+        'icon' => 'dashboard',
+        'sort' => 1
+    )
 );

 $config['navigation_menu']['organisation/Reihungstest/index'] = array(
@@ -406,4 +383,3 @@ $config['navigation_menu']['apps'] = [
 		'requiredPermissions' => array('lehre/lehrauftrag_bestellen:r', 'lehre/lehrauftrag_erteilen:r')
 	]
 ];
-
@@ -1,137 +0,0 @@
-<?php
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class Login extends FHCAPI_Controller
-{
-	/**
-	 * Object initialization
-	 */
-	public function __construct()
-	{
-		parent::__construct(array(
-			'loginLDAP' => self::PERM_ANONYMOUS,
-			'loginASByUid' => 'admin:rw',
-			'loginASByPersonId' => 'admin:rw',
-			'whoAmI' => self::PERM_ANONYMOUS,
-			'searchUser' => 'admin:rw'
-		));
-	}
-
-	/**
-	 * Called with HTTP POST via ajax to login using the LDAP authentication
-	 */
-	public function loginLDAP()
-	{
-		$username = $this->input->post('username');
-		$password = $this->input->post('password');
-
-		$this->load->library('AuthLib', array(false)); // without authentication otherwise loooooop!
-
-		$login = $this->authlib->loginLDAP($username, $password);
-
-		// If login is success then retrieves the desired page
-		if (isSuccess($login)) $this->terminateWithSuccess($this->authlib->getLandingPage());
-
-		$this->terminateWithError(getError($login)); // returns the error code
-	}
-
-	/**
-	 * Called with HTTP POST via ajax to login as another user specified by uid
-	 */
-	public function loginASByUid()
-	{
-		$uid = $this->input->post('uid');
-
-		// With authentication -> you must be already logged to gain another identity
-		$this->load->library('AuthLib');
-
-		$loginAS = $this->authlib->loginASByUID($uid);
-
-		// Got it!
-		if (isSuccess($loginAS)) $this->terminateWithSuccess(true);
-
-		// Returns the error code
-		$this->terminateWithError(getError($loginAS));
-	}
-
-	/**
-	 * Called with HTTP POST via ajax to login as another user specified by person id
-	 */
-	public function loginASByPersonId()
-	{
-		$person_id = $this->input->post('person_id');
-
-		// With authentication -> you must be already logged to gain another identity
-		$this->load->library('AuthLib');
-
-		$loginAS = $this->authlib->loginASByPersonId($person_id);
-
-		// Got it!
-		if (isSuccess($loginAS)) $this->terminateWithSuccess(true);
-	
-		// Returns the error code
-		$this->terminateWithError(getError($loginAS));
-	}
-
-	/**
-	 * Called with HTTP GET via ajax to show which login cretentials are in use
-	 */
-	public function whoAmI()
-	{
-		// With authentication -> you must be already logged to gain another identity
-		$this->load->library('AuthLib');
-
-		$this->terminateWithSuccess($this->authlib->getAuthObj());
-	}
-
-	/**
-	 * Search for a user in database checking the name, surname or uid
-	 */
-	public function searchUser()
-	{
-		$query = strtolower('%'.$this->input->get('query').'%');
-
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-
-		$dataset = $this->BenutzerModel->execReadOnlyQuery('
-			SELECT p.person_id,
-				b.uid,
-				p.nachname,
-				p.vorname,
-				b.uid,
-				p.person_id || \' - \' || b.uid || \' - \' || p.nachname || \' \' || p.vorname AS label
-			  FROM public.tbl_person p
-		     LEFT JOIN public.tbl_benutzer b ON(b.person_id = p.person_id)
-			 WHERE b.aktiv = TRUE
-			   AND (p.nachname ILIKE ? OR p.vorname ILIKE ? OR b.uid ILIKE ? OR p.person_id::text LIKE ?)
-		      ORDER BY p.nachname, p.vorname
-		',
-			array($query, $query, $query, $query)
-		);
-
-		if (isError($dataset)) $this->terminateWithError(getError($dataset));
-
-		$this->terminateWithSuccess($dataset);
-	}
-}
-
@@ -1,20 +1,4 @@
 <?php
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */

 if (!defined('BASEPATH')) exit('No direct script access allowed');

@@ -24,14 +8,12 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
 class Login extends FHC_Controller
 {
 	/**
-	 * Object initialization
+	 *
 	 */
 	public function __construct()
-	{
-		parent::__construct(array(
-			'loginAs' => 'admin:rw'
-		));
-	}
+    {
+        parent::__construct();
+    }

 	/**
 	 * Displays a login page with username and password
@@ -42,11 +24,72 @@ class Login extends FHC_Controller
 	}

 	/**
-	 * Displays a login page with username and password
+	 * Called with HTTP POST via ajax to login using the LDAP authentication
 	 */
-	public function loginAs()
+	public function loginLDAP()
+	{
+		$username = $this->input->post('username');
+		$password = $this->input->post('password');
+
+		$this->load->library('AuthLib', array(false)); // without authentication otherwise loooooop!
+
+		$login = $this->authlib->loginLDAP($username, $password);
+		if (isSuccess($login))
+		{
+			$this->outputJsonSuccess($this->authlib->getLandingPage()); // if login is success then retrieves the desired page
+		}
+		else
+		{
+			$this->outputJsonError(getCode($login)); // returns the error code
+		}
+	}
+
+	/**
+	 * Called with HTTP POST via ajax to login as another user specified by uid
+	 */
+	public function loginASByUid()
+	{
+		$uid = $this->input->get('uid');
+
+		// With authentication -> you must be already logged to gain another identity
+		$this->load->library('AuthLib');
+
+		$loginAS = $this->authlib->loginASByUID($uid);
+		$this->outputJson($loginAS); // returns the error code
+	}
+
+	/**
+	 * Called with HTTP POST via ajax to login as another user specified by person id
+	 */
+	public function loginASByPersonId()
+	{
+		$person_id = $this->input->get('person_id');
+
+		// With authentication -> you must be already logged to gain another identity
+		$this->load->library('AuthLib');
+
+		$loginAS = $this->authlib->loginASByPersonId($person_id);
+		if (isSuccess($loginAS))
+		{
+			$this->outputJsonSuccess(true); // obtained!
+		}
+		else
+		{
+			$this->outputJsonSuccess(getCode($loginAS)); // returns the error code
+		};
+	}
+
+	/**
+	 * To login into the system with email and code as credentials
+	 */
+	public function emailCode()
+	{
+	}
+
+	/**
+	 * To login into the system using SSO
+	 */
+	public function sso()
 	{
-		$this->load->view('system/login/loginAs');
 	}
 }
-
@@ -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', 'DESC');
+		$this->_ci->StudierendenantragstatusModel->addOrder('insertamum');
 		$this->_ci->StudierendenantragstatusModel->addLimit(1);
 		$result = $this->_ci->StudierendenantragstatusModel->loadWhere([
 			'studierendenantrag_id' => $antrag_id,
@@ -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::date = CURRENT_DATE - INTERVAL ?
-			OR campus.tbl_paabgabe.updateamum::date = CURRENT_DATE - INTERVAL ?)
-			AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
-		
+		WHERE (campus.tbl_paabgabe.insertamum >= NOW() - INTERVAL ?
+		   OR campus.tbl_paabgabe.updateamum >= NOW() - 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 = CURRENT_DATE - INTERVAL ?";
+				AND campus.tbl_paabgabe.abgabedatum >= NOW() - INTERVAL ?";
 		
 		if($relevantTypes !== null) {
 			$query .= " AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
@@ -594,10 +594,7 @@ class Studiengang_model extends DB_Model
 		$this->addSelect('p.prestudent_id');
 		$this->addSelect('pers.vorname');
 		$this->addSelect('pers.nachname');
-		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', "
-			. $this->dbTable . ".bezeichnung, ', ', "
-			. "UPPER(" . $this->dbTable . ".typ), "
-			. "UPPER(" . $this->dbTable . ".kurzbz),')') AS name");
+		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', " . $this->dbTable . ".bezeichnung, ')') AS name");

 		$this->addJoin('public.tbl_prestudent p', 'studiengang_kz');
 		$this->addJoin(
@@ -1,37 +0,0 @@
-<?php
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-$includesArray = array(
-	'title' => 'Login',
-	'axios027' => true,
-	'bootstrap5' => true,
-	'fontawesome6' => true,
-	'vue3' => true,
-	'primevue3' => true,
-	'phrases' => array('uid', 'global'),
-	'navigationcomponent' => true,
-	'customJSModules' => array('public/js/LoginAs.js'),
-);
-
-$this->load->view('templates/FHC-Header', $includesArray);
-?>
-
-	<div id="main"></div>
-
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
-
@@ -1,39 +1,44 @@
 <?php
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-$includesArray = array(
-	'title' => 'Login',
-	'axios027' => true,
-	'bootstrap5' => true,
-	'fontawesome6' => true,
-	'vue3' => true,
-	'filtercomponent' => true,
-	'navigationcomponent' => true,
-	'tabulator5' => true,
-	'primevue3' => true,
-	'phrases' => array('uid', 'global'),
-	'customJSModules' => array('public/js/Login.js'),
-);
-
-$this->load->view('templates/FHC-Header', $includesArray);
+	$this->load->view(
+		'templates/FHC-Header',
+		array(
+			'title' => 'Login',
+			'jquery3' => true,
+			'jqueryui1' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'sbadmintemplate3' => true,
+			'ajaxlib' => true,
+			'dialoglib' => true,
+			'customCSSs' => 'public/css/Login.css',
+			'customJSs' => 'public/js/Login.js'
+		)
+	);
 ?>

-	<div id="main"></div>

-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+	<div class="login-form">

+		<p class="text-center">
+			<img src="<?php echo base_url('public/images/logo-300x160.png'); ?>" >
+		</p>
+
+		<br>
+
+		<div class="form-group">
+			<input id="username" type="text" class="form-control" placeholder="Username" required="required">
+		</div>
+
+		<div class="form-group">
+			<input id="password" type="password" class="form-control" placeholder="Password" required="required">
+		</div>
+
+		<div class="form-group">
+			<button id="btnLogin" ype="submit" class="btn btn-primary btn-block">Log in</button>
+		</div>
+
+		<p class="text-center"><a href="#">Forgot Password?</a></p>
+
+	</div>
+
+<?php $this->load->view('templates/FHC-Footer'); ?>
@@ -46,13 +46,12 @@ 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
@@ -72,7 +71,7 @@ echo '
 			    $("#myTable").tablesorter(
 				{
 					sortList: [[0,0],[1,0]],
-					widgets: [\'zebra\',\'filter\']
+					widgets: [\'zebra\']
 				});
 			}
 		);
@@ -152,9 +151,8 @@ 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>',$oeBez->bezeichnung,'</td>';
+		echo '<td>',$row->oe_kurzbz,'</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>';
@@ -293,7 +293,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; margin-top: 5px;">';
+			echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px;">';
 			echo '<tr><td class="HeaderTesttool">'. ($row->semester == '1' ? $p->t('testtool/basisgebiete') : $p->t('testtool/quereinstiegsgebiete')).'</td></tr>';
 		}

@@ -342,8 +342,6 @@ 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">
@@ -1708,7 +1708,6 @@ 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);
 }

@@ -1726,7 +1725,6 @@ 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=='')
 	{
@@ -3555,14 +3555,6 @@ 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;
 			
@@ -364,10 +364,9 @@ class entwicklungsteam extends basis_db
 		$bismeldung_jahr = $datetime->format('Y');

 		//laden des Datensatzes
-			$qry = "SELECT tbl_entwicklungsteam.*, tbl_besqual.*, tbl_studiengang.studiengang_kz, tbl_studiengang.melderelevant
+			$qry = "SELECT *
 					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))";
@@ -395,7 +394,6 @@ 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;
 			}
@@ -584,9 +584,8 @@ 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, stg.melderelevant
+				SELECT DISTINCT lehreinheit_id, studiensemester_kurzbz, lema.semesterstunden,
+					stg.studiengang_kz, stg.melde_studiengang_kz, stg.lgartcode
 				FROM lehre.tbl_lehreinheitmitarbeiter lema
 					JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 					JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
@@ -599,7 +598,6 @@ 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
 			)
@@ -1,79 +1,55 @@
+
 /**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * To login via LDAP
 */
+function loginLDAP()
+{
+	// Ajax call to login with LDAP
+	FHC_AjaxClient.ajaxCallPost(
+		"system/Login/loginLDAP",
+		{
+			username: $("#username").val(),
+			password: $("#password").val()
+		},
+		{
+			successCallback: function(data, textStatus, jqXHR) {

-import PluginsPhrasen from '../js/plugins/Phrasen.js';
-import ApiLogin from '../js/api/factory/login.js';
-
-const loginApp = Vue.createApp({
-	data: function() {
-		return {
-			username: '',
-			password: ''
-		};
-	},
-	components: {
-	},
-	methods: {
-		loginLDAP: function() {
-			this.$api
-				.call(ApiLogin.loginLDAP({
-					username: this.username,
-					password: this.password
-				}))
-				.then((response) => {
-					// If property data exists
-					if (Object.hasOwn(response, 'data'))
+				if (FHC_AjaxClient.isError(data))
+				{
+					if (FHC_AjaxClient.getError(data) == 10)
 					{
-						// If property data is a string 
-						if (typeof response.data === 'string' || response.data instanceof String)
-						{
-							// If property data is a valid URL
-							try {
-								let url = new URL(response.data);
-								// If here the URL contained in response.data is fine
-								// and can be used to switch to the landing page
-								document.location.href = response.data;
-							} catch (_) {}
-						}
+						FHC_DialogLib.alertError("Username not foud");
 					}
-				})
-				.catch((error) => {
-				        console.error(error);
-				});
-	}
-},
-	template: `
-		<div class="d-flex align-items-center justify-content-center">
-			<div>
-			<div class="mb-3">
-				<label for="username" class="form-label">Username</label>
-				<input type="text" class="form-control" name="username" id="username" v-model="username">
-			</div>
-			<div class="mb-3">
-				<label for="password" class="form-label">Password</label>
-				<input type="password" class="form-control" name="password" id="password" v-model="password">
-			</div>
-			<div class="d-flex align-items-center justify-content-center">
-				<button type="button" class="btn btn-primary" @click="loginLDAP">Login</button>
-			</div>
-			</div>
-		</div>
-	`
+					if (FHC_AjaxClient.getError(data) == 2)
+					{
+						FHC_DialogLib.alertError("Wrong password");
+					}
+				}
+				else
+				{
+					$(location).attr("href", FHC_AjaxClient.getData(data));
+				}
+			},
+			errorCallback: function(jqXHR, textStatus, errorThrown) {
+				FHC_DialogLib.alertError(textStatus);
+			}
+		}
+	);
+}
+
+/**
+ * When JQuery is up
+ */
+$(document).ready(function() {
+
+	$("#btnLogin").click(loginLDAP);
+
+	$("#username").keydown(function(e) {
+	    if (e.keyCode == 13) loginLDAP();
+	})
+
+	$("#password").keydown(function(e) {
+	    if (e.keyCode == 13) loginLDAP();
+	})
+
 });
-
-loginApp.use(PluginsPhrasen).mount('#main');
-
@@ -1,168 +0,0 @@
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import PluginsPhrasen from '../js/plugins/Phrasen.js';
-import ApiLogin from '../js/api/factory/login.js';
-
-import {CoreNavigationCmpt} from '../js/components/navigation/Navigation.js';
-import PvAutoComplete from "../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
-
-const loginAsApp = Vue.createApp({
-	data: function() {
-		return {
-			person_id: '',
-			username: '',
-			surname: '',
-			name: '',
-			selectedUser: null,
-			filteredUsers: [],
-			appSideMenuEntries: {}
-		};
-	},
-	components: {
-		CoreNavigationCmpt,
-		PvAutoComplete
-	},
-	methods: {
-		loginAs: function() {
-			if (this.selectedUser != null)
-			{
-				this.$api
-					.call(ApiLogin.loginASByUid({
-						uid: this.selectedUser.uid
-					}))
-					.then((response) => {
-						location.reload();
-					})
-					.catch((error) => {
-						console.error(error);
-					});
-			}
-		},
-		logout: function() {
-			this.$api
-				.call(ApiLogin.logout())
-				.then((response) => {
-					location.reload();
-				})
-				.catch((error) => {
-					console.error(error);
-				});
-		},
-		searchUser: function(event) {
-			if (event.query.length >= 3)
-			{
-				this.$api
-					.call(ApiLogin.searchUser(event.query))
-					.then(result => {
-						this.filteredUsers = result.data.retval;
-					})
-					.catch((error) => {
-						console.error(error);
-					});
-			}
-		}
-	},
-	mounted: function() {
-		this.$api
-			.call(ApiLogin.whoAmI())
-			.then((response) => {
-				// If property data exists
-				if (Object.hasOwn(response, 'data'))
-				{
-					if (response.data != null && Object.hasOwn(response.data, 'person_id'))
-					{
-						this.person_id = response.data.person_id;
-						this.username = response.data.username;
-						this.surname = response.data.surname;
-						this.name = response.data.name;
-					}
-					else
-					{
-						this.person_id = 'Not logged';
-						this.username = 'Not logged';
-						this.surname = 'Not logged';
-						this.name = 'Not logged';
-					}
-				}
-			})
-			.catch((error) => {
-				console.error(error);
-			});
-	},
-	template: `
-		<!-- Navigation component -->
-		<core-navigation-cmpt v-bind:add-side-menu-entries="appSideMenuEntries"></core-navigation-cmpt>
-		<div style="width: 700px !important">
-			<div class="card" style="padding: 20px;">
-				<div class="mb-3">
-					Who am I?
-				</div>
-				<div class="mb-3">
-					<div class="d-inline-flex align-items-center">
-						<label for="person_id" class="form-label" style="width: 150px !important">Person ID</label>
-						<input type="text" style="width: 400px !important" disabled="disabled" class="form-control" id="person_id" v-model="person_id">
-					</div>
-				</div>
-				<div class="mb-3">
-					<div class="d-inline-flex align-items-center">
-						<label for="username" class="form-label" style="width: 150px !important">UID</label>
-						<input type="text" style="width: 400px !important" disabled="disabled" class="form-control" id="username" v-model="username">
-					</div>
-				</div>
-				<div class="mb-3">
-					<div class="d-inline-flex align-items-center">
-						<label for="surname" class="form-label" style="width: 150px !important">Surname</label>
-						<input type="text" style="width: 400px !important" disabled="disabled" class="form-control" id="surname" v-model="surname">
-					</div>
-				</div>
-				<div class="mb-3">
-					<div class="d-inline-flex align-items-center">
-						<label for="name" class="form-label" style="width: 150px !important">Name</label>
-						<input type="text" style="width: 400px !important" disabled="disabled" class="form-control" id="name" v-model="name">
-					</div>
-				</div>
-				<div class="d-flex align-items-center justify-content-center">
-					<button type="button" class="btn btn-primary" @click="logout">Logout</button>
-				</div>
-			</div>
-			<div class="card" style="padding: 20px;">
-				<div class="mb-3">
-					Who I want to be?
-				</div>
-				<div class="mb-3">
-					<div class="d-inline-flex align-items-center">
-						<PvAutoComplete inputStyle="width: 600px;" v-model="selectedUser" optionLabel="label" :suggestions="filteredUsers" @complete="searchUser" placeholder="Search user..." />
-					</div>
-				</div>
-				<div class="d-flex align-items-center justify-content-center">
-					<button type="button" class="btn btn-primary" @click="loginAs">Login as</button>
-				</div>
-			</div>
-		</div>
-	`
-});
-
-loginAsApp.
-	use(PluginsPhrasen).
-	use(primevue.config.default, {
-		zIndex: {
-			overlay: 1100
-		}
-	}).
-	mount('#main');
-
@@ -1,59 +0,0 @@
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-export default {
-	loginLDAP(params) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/Login/loginLDAP',
-			params
-		};
-	},
-	loginASByUid(params) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/Login/loginASByUid',
-			params
-		};
-	},
-	loginASByPersonId(params) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/Login/loginASByPersonId',
-			params
-		};
-	},
-	whoAmI() {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/Login/whoAmI'
-		};
-	},
-	logout() {
-		return {
-			method: 'get',
-			url: '/system/Logout'
-		};
-	},
-	searchUser(query) {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/Login/searchUser?query=' + encodeURIComponent(query)
-		};
-	}
-};
-
@@ -136,6 +136,18 @@ const app = Vue.createApp({
            }
        };
    },
+	computed: {
+		isMobile() {
+			const smallScreen = window.matchMedia("(max-width: 767px)").matches;
+			const touchCapable = ("ontouchstart" in window) || navigator.maxTouchPoints > 0;
+			return smallScreen;// && touchCapable;
+		},
+	},
+	provide() {
+		return {
+			isMobile: this.isMobile
+		}
+	},
    methods: {
        searchfunction: function(searchsettings) {
        	return this.$api.call(ApiSearchbar.searchCis(searchsettings));
@@ -238,13 +238,13 @@ const app = Vue.createApp({
 			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
+			isMobile: this.isMobile,
 		}	
 	},
 	methods: {
@@ -30,6 +30,7 @@ export default {
 			menuOpen:true,
        };
    },
+	inject: ["isMobile"],
 	provide(){
 		return{
 			setActiveEntry: this.setActiveEntry,
@@ -58,7 +59,7 @@ export default {
 		},
 		site_url(){
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
-		}
+		},
 	},
 	methods: {
 		fetchMenu() {
@@ -112,10 +113,26 @@ export default {
 		});
 	},
    template: /*html*/`
-	<button id="nav-main-btn" class="navbar-toggler rounded-0" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-    </button>
-	<fhc-searchbar ref="searchbar" id="nav-search" class="fhc-searchbar w-100 py-1 py-lg-2" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
+	<div
+		id="header-options-collapsible"
+		class="collapse multi-collapse collapse-horizontal show"
+	>
+		<div class="d-flex flex-row align-items-center gap-2 h-100" style="width: 79px">
+			<button id="nav-main-btn" class="navbar-toggler rounded-0 px-2 border-0" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
+				<span class="navbar-toggler-icon"></span>
+			</button>
+			<span v-if="isMobile" class="d-flex flex-row align-items-center">
+				<theme-switch></theme-switch>
+			</span>
+		</div>
+	</div>
+	<fhc-searchbar
+		:searchoptions="searchbaroptions"
+		:searchfunction="searchfunction"
+		ref="searchbar"
+		id="nav-search"
+		class="fhc-searchbar w-100 py-1 py-lg-2"
+	></fhc-searchbar>
    <div id="nav-logo" class="d-none d-lg-block">
 		<div class="d-flex h-100 justify-content-between">
 			<a :href="rootUrl">
@@ -124,22 +141,32 @@ export default {
 			<theme-switch></theme-switch>
 		</div>
    </div>
-	<div id="nav-user">
-		<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
-			<img :src="avatarUrl" :alt="$p.t('profilUpdate/profilBild')" class="bg-dark avatar rounded-circle border border-dark"/>
-		</button>
-		<ul ref="navUserDropdown"
-		@[\`shown.bs.collapse\`]="handleShowNavUser"
-		@[\`hide.bs.collapse\`]="handleHideNavUser"
-		id="nav-user-menu" class="top-100 end-0 collapse list-unstyled" aria-labelledby="nav-user-btn">
-			<li><a class="fhc-dark-bg btn rounded-0 d-block" :href="site_url + '/Cis/Profil'" id="menu-profil">Profil</a></li>
-			<li >
-				<cis-sprachen @languageChanged="fetchMenu"></cis-sprachen>
-			</li>
-			<li><hr class="dropdown-divider m-0 "></li>
-			<li ><a class="fhc-dark-bg btn rounded-0 d-block" :href="logoutUrl">Logout</a></li>
-		</ul>
+
+	<div
+		id="header-usermenu-collapsible"
+		class="collapse multi-collapse collapse-horizontal show"
+	>
+		<div
+			:style="!isMobile ? '' : 'width: 51px'"
+			id="nav-user"
+		>
+			<button id="nav-user-btn" class="btn btn-link rounded-0" type="button" data-bs-toggle="collapse" data-bs-target="#nav-user-menu" aria-expanded="false" aria-controls="nav-user-menu">
+				<img :src="avatarUrl" :alt="$p.t('profilUpdate/profilBild')" class="bg-dark avatar rounded-circle border border-dark"/>
+			</button>
+			<ul ref="navUserDropdown"
+			@[\`shown.bs.collapse\`]="handleShowNavUser"
+			@[\`hide.bs.collapse\`]="handleHideNavUser"
+			id="nav-user-menu" class="top-100 end-0 collapse list-unstyled" aria-labelledby="nav-user-btn">
+				<li><a class="fhc-dark-bg btn rounded-0 d-block" :href="site_url + '/Cis/Profil'" id="menu-profil">Profil</a></li>
+				<li >
+					<cis-sprachen @languageChanged="fetchMenu"></cis-sprachen>
+				</li>
+				<li><hr class="dropdown-divider m-0 "></li>
+				<li ><a class="fhc-dark-bg btn rounded-0 d-block" :href="logoutUrl">Logout</a></li>
+			</ul>
+		</div>
 	</div>
+
    <nav id="nav-main" class="offcanvas offcanvas-start" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
 		<div id="nav-main-sticky">
 			<div id="nav-main-toggle" class="position-static d-none d-lg-block ">
@@ -84,14 +84,6 @@ 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: {}
@@ -21,69 +21,71 @@ export default {
 		dms,
 		cms,
 		mergedStudent,
-		mergedPerson
+		mergedPerson,
 	},
-    props: {
-    	searchoptions: {
-    		type: Object,
-    		required: true
-    	},
-    	searchfunction: {
-    		type: Function,
-    		required: true
-    	},
-    	showBtnSubmit: Boolean
-    },
-    provide() {
-        return {
-            query: Vue.computed(() => this.lastQuery)
-        };
-    },
-    data: function() {
-      return {
-        searchtimer: null,
-        hidetimer: null,
-        searchsettings: {
-            searchstr: this.getSearchStr(),
-            types: this.getInitiallySelectedTypes(),
-        },
-        searchresult: [],
-        searchmode: '',
-        showresult: false,  
-        searching: false,
-        error: null,
-            abortController: null,
+	props: {
+		searchoptions: {
+			type: Object,
+			required: true,
+		},
+		searchfunction: {
+			type: Function,
+			required: true,
+		},
+		showBtnSubmit: Boolean,
+	},
+	provide() {
+		return {
+			query: Vue.computed(() => this.lastQuery),
+		};
+	},
+	inject: ["isMobile"],
+	data: function () {
+		return {
+			searchtimer: null,
+			hidetimer: null,
+			searchsettings: {
+				searchstr: this.getSearchStr(),
+				types: this.getInitiallySelectedTypes(),
+			},
+			searchresult: [],
+			searchmode: "",
+			showresult: false,
+			searching: false,
+			error: null,
+			abortController: null,
 			settingsDropdown: null,
-            lastQuery: ''
-      };
-    },
+			lastQuery: "",
+			isSearchShownInMobileView: false,
+		};
+	},
 	computed: {
 		searchTypesPlaceholder() {
 			if (!this.searchsettings.types.length) {
-				return Object.values(this.typeLabels).join(' / ');
+				return Object.values(this.typeLabels).join(" / ");
 			}
-			return this.searchsettings.types.map(type => this.typeLabels[type]).join(' / ');
+			return this.searchsettings.types
+				.map((type) => this.typeLabels[type])
+				.join(" / ");
 		},
 		types() {
-			if (!this.searchoptions.types)
-				return [];
+			if (!this.searchoptions.types) return [];
 			if (Array.isArray(this.searchoptions.types))
 				return this.searchoptions.types;
 			return Object.keys(this.searchoptions.types);
 		},
 		typeLabels() {
-			if (!this.searchoptions.types)
-				return {};
+			if (!this.searchoptions.types) return {};
 			if (Array.isArray(this.searchoptions.types)) {
 				return this.searchoptions.types.reduce((res, type) => {
 					res[type] = type;
-					return res
+					return res;
 				}, {});
 			}
 			return this.searchoptions.types;
-		}
+		},
 	},
-	template: /*html*/`
+	template: /*html*/ `
 		<form
 			ref="searchform"
 			class="d-flex me-3"
@@ -92,80 +94,91 @@ export default {
 			@focusin="searchfocusin"
 			@focusout="searchfocusout"
 		>
-			<div
-				ref="searchbox"
-				class="h-100 input-group me-2 searchbar_searchbox"
-				:class="showresult ? 'open' : 'closed'"
+			<span
+				v-if="isMobile"
+				type="button"
+				data-bs-toggle="collapse"
+				data-bs-target=".multi-collapse"
+				aria-controls="header-searchbar-collapsible header-options-collapsible header-usermenu-collapsible"
+				aria-expanded="false"
+			 	class="d-flex flex-row align-items-center ps-3 pe-1"
 			>
-				<span class="input-group-text">
-					<i class="fa-solid fa-magnifying-glass"></i>
-				</span>
-                <input
-                	ref="input"
-                    @keyup="search"
-                    @focus="showsearchresult"
-                    v-model="searchsettings.searchstr"
-                    class="form-control searchbar_input"
-                    type="search"
-                    :placeholder="$p.t('search/input_search_label', { types: searchTypesPlaceholder })"
-                    :aria-label="$p.t('search/input_search_label', { types: searchTypesPlaceholder })"
-                >
-				<button
-					v-if="searchsettings.searchstr"
-					type="button"
-					class="searchbar_input_clear btn btn-outline-secondary"
-					@click="clearInput"
-					@focusin.stop
-				>
-					<i class="fas fa-close"></i>
-				</button>
-				<button
-					v-if="showBtnSubmit"
-					type="submit"
-					class="btn btn-primary"
-					:title="$p.t('search/submit')"
-					:aria-label="$p.t('search/submit')"
-				>
-					<i class="fas fa-search"></i>
-				</button>
-                <button
-                    data-bs-toggle="collapse"
-                    data-bs-target="#searchSettings"
-                    aria-expanded="false"
-                    aria-controls="searchSettings"
-                    ref="settingsbutton"
-                    class="searchbar_setting_btn btn btn-secondary"
-                    type="button"
-                    :title="$p.t('search/button_filter_label')"
-                    :aria-label="$p.t('search/button_filter_label')"
-                >
-                    <i class="fas fa-cog"></i>
-                </button>
-            </div>
+				<i v-if="isSearchShownInMobileView" class="fa-solid fa-chevron-left"></i>
+				<i v-else class="fa-solid fa-magnifying-glass"></i>
+			</span>

-            <div v-show="showresult"
-                 class="searchbar_results" tabindex="-1">
-              <div class="searchbar_results_scroller" ref="result">
-                <div class="searchbar_results_wrapper" ref="results">
-                  <div v-if="searching">
-                    <i class="fas fa-spinner fa-spin fa-2x"></i>
-                  </div>
-                  <div v-else-if="this.error !== null">{{ error }}</div>
-                  <div v-else-if="searchresult.length < 1">{{  $p.t('search/error_no_results') }}</div>
-                  <template v-else v-for="res in searchresult">
-                    <component
-                        v-if="isValidRenderer(res.renderer)"
-                        :is="res.renderer"
-                        :mode="searchmode"
-                        :res="res"
-                        :actions="getActions(res)"
-                        @actionexecuted="hideresult"
-                    ></component>
-                    <div v-else class="searchbar-result text-danger fw-bold">{{ $p.t('search/error_unknown_type', res) }}</div>
-                  </template>
-                </div>
-              </div>
-            </div>
+			<div
+				:class="{'flex-grow-1': !isMobile, 'collapse multi-collapse collapse-horizontal': isMobile}"
+				id="header-searchbar-collapsible"
+				@[\`show.bs.collapse\`]="isSearchShownInMobileView = true"
+				@[\`hidden.bs.collapse\`]="isSearchShownInMobileView = false"
+			>
+				<div
+					:class="{open: showresult, closed: showresult, 'px-3': isMobile}"
+					ref="searchbox"
+					class="h-100 input-group me-2 searchbar_searchbox"
+					:style="isMobile ? 'width: ' + getMaxWidthOfSearchbarInMobileView() : ''"
+				>
+					<span class="input-group-text">
+						<i class="fa-solid fa-magnifying-glass color-white"></i>
+					</span>
+            	    <input
+            	    	ref="input"
+            	        @keyup="search"
+            	        @focus="showsearchresult"
+            	        v-model="searchsettings.searchstr"
+            	        class="form-control searchbar_input"
+            	        type="search"
+            	        :placeholder="$p.t('search/input_search_label', { types: searchTypesPlaceholder })"
+            	        :aria-label="$p.t('search/input_search_label', { types: searchTypesPlaceholder })"
+            	    >
+					<button
+						v-if="showBtnSubmit"
+						type="submit"
+						class="btn btn-primary"
+						:title="$p.t('search/submit')"
+						:aria-label="$p.t('search/submit')"
+					>
+						<i class="fas fa-search"></i>
+					</button>
+            	    <button
+            	        data-bs-toggle="collapse"
+            	        data-bs-target="#searchSettings"
+            	        aria-expanded="false"
+            	        aria-controls="searchSettings"
+            	        ref="settingsbutton"
+            	        class="searchbar_setting_btn btn btn-secondary"
+            	        type="button"
+            	        :title="$p.t('search/button_filter_label')"
+            	        :aria-label="$p.t('search/button_filter_label')"
+            	    >
+            	        <i class="fas fa-filter"></i>
+            	    </button>
+            	</div>
+            	<div v-show="showresult"
+            	     class="searchbar_results" tabindex="-1">
+            	  <div class="searchbar_results_scroller" ref="result">
+            	    <div class="searchbar_results_wrapper" ref="results">
+            	      <div v-if="searching">
+            	        <i class="fas fa-spinner fa-spin fa-2x"></i>
+            	      </div>
+            	      <div v-else-if="this.error !== null">{{ error }}</div>
+            	      <div v-else-if="searchresult.length < 1">{{  $p.t('search/error_no_results') }}</div>
+            	      <template v-else v-for="res in searchresult">
+            	        <component
+            	            v-if="isValidRenderer(res.renderer)"
+            	            :is="res.renderer"
+            	            :mode="searchmode"
+            	            :res="res"
+            	            :actions="getActions(res)"
+            	            @actionexecuted="hideresult"
+            	        ></component>
+            	        <div v-else class="searchbar-result text-danger fw-bold">{{ $p.t('search/error_unknown_type', res) }}</div>
+            	      </template>
+            	    </div>
+            	  </div>
+            	</div>
+			</div>

 			<div
 				id="searchSettings"
@@ -207,34 +220,42 @@ export default {
            </div>
 		</form>
    `,
-    watch:{
-		'searchsettings.searchstr': function (newSearchValue) {
-			if(this.searchoptions.origin){
-				sessionStorage.setItem(`${this.searchoptions.origin}_searchstr`,newSearchValue);
+	watch: {
+		"searchsettings.searchstr": function (newSearchValue) {
+			if (this.searchoptions.origin) {
+				sessionStorage.setItem(
+					`${this.searchoptions.origin}_searchstr`,
+					newSearchValue,
+				);
 			}
 		},
-		'searchsettings.types'(newValue) {
+		"searchsettings.types"(newValue) {
 			if (Array.isArray(newValue) && newValue.length === 0) {
 				this.searchsettings.types = [...this.types];
 			}
 			// stores the search types in the localstorage, only if the newValue is also an array
 			if (Array.isArray(newValue) && this.searchoptions.origin) {
-				localStorage.setItem(`${this.searchoptions.origin}_searchtypes`, JSON.stringify(newValue));
+				localStorage.setItem(
+					`${this.searchoptions.origin}_searchtypes`,
+					JSON.stringify(newValue),
+				);
 			}
 			this.search();
-		}
-    },
-	mounted(){
+		},
+	},
+	mounted() {
 		this.settingsDropdown = new bootstrap.Collapse(this.$refs.settings, {
-			toggle: false
+			toggle: false,
 		});

-		if (!this.searchoptions.origin){
-			console.warn("No origin defined in the searchoptions for the searchbar, please define the origin property in the searchbaroptions to allow reliable storage of searchstr and searchtypes accross applications.");
+		if (!this.searchoptions.origin) {
+			console.warn(
+				"No origin defined in the searchoptions for the searchbar, please define the origin property in the searchbaroptions to allow reliable storage of searchstr and searchtypes accross applications.",
+			);
 		}
 	},
 	updated() {
-		if(this.showresult) {
+		if (this.showresult) {
 			Vue.nextTick(() => {
 				this.calcSearchResultHeight();
 			});
@@ -249,32 +270,34 @@ export default {
 		getInitiallySelectedTypes() {
 			let result = false;
 			if (this.searchoptions.origin) {
-				let localStorageValue = localStorage.getItem(`${this.searchoptions.origin}_searchtypes`);
+				let localStorageValue = localStorage.getItem(
+					`${this.searchoptions.origin}_searchtypes`,
+				);
 				if (localStorageValue) {
 					result = JSON.parse(localStorageValue);
 				}
 			}
-			if (result)
-				return result;
-			if (!this.searchoptions.types)
-				return [];
+			if (result) return result;
+			if (!this.searchoptions.types) return [];
 			if (Array.isArray(this.searchoptions.types))
 				return [...this.searchoptions.types];
 			return Object.keys(this.searchoptions.types);
 		},
-		getSearchStr: function(){
-			if (!this.searchoptions.origin)
-				return '';
-			return sessionStorage.getItem(`${this.searchoptions.origin}_searchstr`) ?? '';
+		getSearchStr: function () {
+			if (!this.searchoptions.origin) return "";
+			return (
+				sessionStorage.getItem(
+					`${this.searchoptions.origin}_searchstr`,
+				) ?? ""
+			);
 		},
-		checkSettingsVisibility: function(event) {
+		checkSettingsVisibility: function (event) {
 			// hides the settings collapsible if the user clicks somewhere else
-			if (!this.$refs.settings.contains(event.target))
-			{
+			if (!this.$refs.settings.contains(event.target)) {
 				this.settingsDropdown.hide();
 			}
 		},
-		handleShowSettings: function() {
+		handleShowSettings: function () {
 			// adds the event listener checkSettingsVisibility only when the collapsible is shown
 			document.addEventListener("click", this.checkSettingsVisibility);
 		},
@@ -282,183 +305,208 @@ export default {
 			// removes the event listener checkSettingsVisibility when the collapsible is hidden
 			document.removeEventListener("click", this.checkSettingsVisibility);
 		},
-		calcSearchResultHeight: function() {
+		calcSearchResultHeight: function () {
 			const rect = this.$refs.results.getBoundingClientRect();
-			if( rect.height > 0 && rect.height < (window.innerHeight * 0.8) ) {
-				this.$refs.result.style.height = Math.ceil(rect.height + 16) + 'px';
+			if (rect.height > 0 && rect.height < window.innerHeight * 0.8) {
+				this.$refs.result.style.height =
+					Math.ceil(rect.height + 16) + "px";
 			} else {
-				this.$refs.result.style.height = Math.floor(window.innerHeight * 0.8) + 'px';
+				this.$refs.result.style.height =
+					Math.floor(window.innerHeight * 0.8) + "px";
 			}
 		},
-        calcSearchResultExtent: function() {
-			if(!this.showresult) {
+		calcSearchResultExtent: function () {
+			if (!this.showresult) {
 				return;
 			}
-			if(this.searchoptions?.calcheightonly === undefined 
-				|| this.searchoptions.calcheightonly === false) {
+			if (
+				this.searchoptions?.calcheightonly === undefined ||
+				this.searchoptions.calcheightonly === false
+			) {
 				var rect = this.$refs.searchbox.getBoundingClientRect();
-				this.$refs.result.style.top = Math.floor(rect.bottom + 3) + 'px';
-				this.$refs.result.style.right = Math.floor(rect.right) + 'px';
-				this.$refs.result.style.width = Math.floor(rect.width) + 'px';
+				this.$refs.result.style.top =
+					Math.floor(rect.bottom + 3) + "px";
+				this.$refs.result.style.right = Math.floor(rect.right) + "px";
+				this.$refs.result.style.width = Math.floor(rect.width) + "px";
 			}
-            this.calcSearchResultHeight();
-        },
-        search: function() {
-            if(this.searchoptions?.nolivesearch === true) return;
+			this.calcSearchResultHeight();
+		},
+		search: function () {
+			if (this.searchoptions?.nolivesearch === true) return;

-            this.abort();
-            if( this.searchsettings.searchstr.length >= 2 ) {
-                this.calcSearchResultExtent();
-                this.searchtimer = setTimeout(
-                    this.callsearchapi,
-                    500
-                );
-            } else {                
-                this.showresult = false;
-            }
-        },
-        abort() {
-            if (this.searchtimer !== null) {
-                clearTimeout(this.searchtimer);
-            }
-            if (this.abortController) {
-                this.abortController.abort();
-                this.abortController = null;
-            }
-            this.searchresult = [];
-        },
-        callsearchapi: function() {
-            this.error = null;
-            this.searchresult.splice(0, this.searchresult.length);
-            this.searching = true;
-            this.showsearchresult();
-            if(this.searchsettings.types.length === 0) {
-                this.error = this.$p.t('search/error_missing_type');
-                this.searching = false;
-                return;
-            }
-
-            if (this.abortController)
-                this.abortController.abort();
-            this.abortController = new AbortController();
-
-            this.searchfunction(this.searchsettings, { timeout: 50000, signal: this.abortController.signal })
-            .then(response=>{
-                if (!response.data) {
-                    this.error = this.$p.t('search/error_general');
-                } else {
-                    let res = response.data.map(el => el.data ? {...el, ...JSON.parse(el.data)} : el);
-                    this.lastQuery = response.meta.searchstring;
-                    if (this.searchoptions.mergeResults) {
-                        let counter = 0;
-                        let mergeTypes = [];
-                        let mergedType = 'merged-';
-                        let mergeKey = '';
-
-                        switch (this.searchoptions.mergeResults) {
-                        case 'student':
-                            mergeTypes = ['student', 'prestudent'];
-                            mergedType += this.searchoptions.mergeResults;
-                            mergeKey = 'uid';
-                            break;
-                        case 'person':
-                            mergeTypes = ['person', 'employee', 'student', 'prestudent'];
-                            mergedType += this.searchoptions.mergeResults;
-                            mergeKey = 'person_id';
-                            break;
-                        }
-
-                        if (mergeTypes.length) {
-                            res = Object.values(res.reduce((a, c) => {
-                                if (!mergeTypes.includes(c.renderer)) {
-                                    a['nomerge' + counter++] = c;
-                                } else if (c[mergeKey] === null) {
-                                    a['nomerge' + counter++] = c;
-                                } else if (a[c[mergeKey]] === undefined) {
-                                    a[c[mergeKey]] = {
-                                        rank: c.rank,
-                                        renderer: mergedType,
-                                        type: mergedType,
-                                        list: [c]
-                                    };
-                                } else {
-                                    a[c[mergeKey]].list.push(c);
-                                    if (c.rank > a[c[mergeKey]].rank)
-                                        a[c[mergeKey]].rank = c.rank;
-                                }
-                                return a;
-                            }, {})).sort((a, b) => b.rank - a.rank);
-                        }
-                    }
-                    this.searchresult = res;
-                    this.searchmode = response.meta.mode;
-                }
-                this.searching = false;
-                this.retry = 0;
-            })
-            .catch(error=> {
-                if (error.code == "ERR_CANCELED") {
-                    return this.retry = 0;
-                }
-                if (error.code == "ECONNABORTED" && this.retry) {
-                    this.retry--;
-                    return this.callsearchapi();
-                }
-
-                this.error = this.$p.t('search/error_general', error);
-                this.searching = false;
-                this.retry = 0;
-            });
-        },
-        refreshsearch: function() {
-          this.search();
-          this.togglesettings();
-        },
-        hideresult: function() {
-            this.showresult = false;
-            window.removeEventListener('resize', this.calcSearchResultExtent);
-        },
-        showsearchresult: function() {
-            if(this.searchoptions?.nolivesearch === true) return;
-
-            if( this.searchsettings.searchstr.length >= 2 ) {
-                this.showresult = true;
-                window.addEventListener('resize', this.calcSearchResultExtent);
+			this.abort();
+			if (this.searchsettings.searchstr.length >= 2) {
 				this.calcSearchResultExtent();
-            }
-        },
-        searchfocusin: function(e) {
-            e.preventDefault();
-            e.stopPropagation();
-            if( this.hidetimer !== null ) {
-                clearTimeout(this.hidetimer);
-            }
-			if (this.searchsettings.searchstr.length >= 2
-				&& this.searchresult.length === 0) {
+				this.searchtimer = setTimeout(this.callsearchapi, 500);
+			} else {
+				this.showresult = false;
+			}
+		},
+		abort() {
+			if (this.searchtimer !== null) {
+				clearTimeout(this.searchtimer);
+			}
+			if (this.abortController) {
+				this.abortController.abort();
+				this.abortController = null;
+			}
+			this.searchresult = [];
+		},
+		callsearchapi: function () {
+			this.error = null;
+			this.searchresult.splice(0, this.searchresult.length);
+			this.searching = true;
+			this.showsearchresult();
+			if (this.searchsettings.types.length === 0) {
+				this.error = this.$p.t("search/error_missing_type");
+				this.searching = false;
+				return;
+			}
+
+			if (this.abortController) this.abortController.abort();
+			this.abortController = new AbortController();
+
+			this.searchfunction(this.searchsettings, {
+				timeout: 50000,
+				signal: this.abortController.signal,
+			})
+				.then((response) => {
+					if (!response.data) {
+						this.error = this.$p.t("search/error_general");
+					} else {
+						let res = response.data.map((el) =>
+							el.data ? { ...el, ...JSON.parse(el.data) } : el,
+						);
+						this.lastQuery = response.meta.searchstring;
+						if (this.searchoptions.mergeResults) {
+							let counter = 0;
+							let mergeTypes = [];
+							let mergedType = "merged-";
+							let mergeKey = "";
+
+							switch (this.searchoptions.mergeResults) {
+								case "student":
+									mergeTypes = ["student", "prestudent"];
+									mergedType +=
+										this.searchoptions.mergeResults;
+									mergeKey = "uid";
+									break;
+								case "person":
+									mergeTypes = [
+										"person",
+										"employee",
+										"student",
+										"prestudent",
+									];
+									mergedType +=
+										this.searchoptions.mergeResults;
+									mergeKey = "person_id";
+									break;
+							}
+
+							if (mergeTypes.length) {
+								res = Object.values(
+									res.reduce((a, c) => {
+										if (!mergeTypes.includes(c.renderer)) {
+											a["nomerge" + counter++] = c;
+										} else if (c[mergeKey] === null) {
+											a["nomerge" + counter++] = c;
+										} else if (
+											a[c[mergeKey]] === undefined
+										) {
+											a[c[mergeKey]] = {
+												rank: c.rank,
+												renderer: mergedType,
+												type: mergedType,
+												list: [c],
+											};
+										} else {
+											a[c[mergeKey]].list.push(c);
+											if (c.rank > a[c[mergeKey]].rank)
+												a[c[mergeKey]].rank = c.rank;
+										}
+										return a;
+									}, {}),
+								).sort((a, b) => b.rank - a.rank);
+							}
+						}
+						this.searchresult = res;
+						this.searchmode = response.meta.mode;
+					}
+					this.searching = false;
+					this.retry = 0;
+				})
+				.catch((error) => {
+					if (error.code == "ERR_CANCELED") {
+						return (this.retry = 0);
+					}
+					if (error.code == "ECONNABORTED" && this.retry) {
+						this.retry--;
+						return this.callsearchapi();
+					}
+
+					this.error = this.$p.t("search/error_general", error);
+					this.searching = false;
+					this.retry = 0;
+				});
+		},
+		refreshsearch: function () {
+			this.search();
+			this.togglesettings();
+		},
+		hideresult: function () {
+			this.showresult = false;
+			window.removeEventListener("resize", this.calcSearchResultExtent);
+		},
+		showsearchresult: function () {
+			if (this.searchoptions?.nolivesearch === true) return;
+
+			if (this.searchsettings.searchstr.length >= 2) {
+				this.showresult = true;
+				window.addEventListener("resize", this.calcSearchResultExtent);
+				this.calcSearchResultExtent();
+			}
+		},
+		searchfocusin: function (e) {
+			e.preventDefault();
+			e.stopPropagation();
+			if (this.hidetimer !== null) {
+				clearTimeout(this.hidetimer);
+			}
+			if (
+				this.searchsettings.searchstr.length >= 2 &&
+				this.searchresult.length === 0
+			) {
 				this.search();
 			}
-        },
-        searchfocusout: function(e) {
-            e.preventDefault();
-            e.stopPropagation();
-            this.hidetimer = setTimeout(
-                this.hideresult,
-                100
-            );
-        },
-        dash2camelCase(string) {
-            return string.replace(/-([a-z])/g, g => g[1].toUpperCase());
-        },
-        isValidRenderer(renderer) {
-            const camelCaseRenderer = this.dash2camelCase(renderer);
-            return Object.keys(this.$.components).includes(camelCaseRenderer);
-        },
+		},
+		searchfocusout: function (e) {
+			e.preventDefault();
+			e.stopPropagation();
+			this.hidetimer = setTimeout(this.hideresult, 100);
+		},
+		dash2camelCase(string) {
+			return string.replace(/-([a-z])/g, (g) => g[1].toUpperCase());
+		},
+		isValidRenderer(renderer) {
+			const camelCaseRenderer = this.dash2camelCase(renderer);
+			return Object.keys(this.$.components).includes(camelCaseRenderer);
+		},
 		getActions(res) {
-			let actions = this.searchoptions.actions[this.dash2camelCase(res.renderer)];
+			let actions =
+				this.searchoptions.actions[this.dash2camelCase(res.renderer)];
 			if (actions) {
 				return actions;
 			}
 			return this.searchoptions.actions[res.type];
-		}
-    }
+		},
+		getMaxWidthOfSearchbarInMobileView() {
+			// body width - hardcoded chevron width; necessary for accurate collapse transition transition
+			return (
+				document.querySelector("body").getBoundingClientRect().width -
+				27 +
+				"px"
+			);
+		},
+	},
 };
@@ -450,18 +450,18 @@ td.MarkLine
 td.HeaderTesttool /*fuer die Button-Optik beim Testtool*/
 {
 	color: #FFFFFF;
-	background-color: #71787D;
+	background-color: #00639C;
 	white-space:nowrap;
 	line-height: 25px;
 	box-shadow: inset 0 0 2px #FFFFFF;
-	padding: 0 10px;
+	padding: 10px;
 	width: 170px;
 }
 td.HeaderTesttoolSTG /*fuer die Button-Optik der Quereinstiegs-Studiengänge beim Testtool*/
 {
 	color: white;
 	border: 2px solid #73a9d6;
-	padding: 0 10px;
+	padding: 10px;
 	max-width: 100px;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -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()),
-('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())
+('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())
 ON CONFLICT (jobfamilie_kurzbz) DO NOTHING;
 		";

@@ -59,33 +59,38 @@ 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
-('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()),
+('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()),
 /* Technik */
-('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())
+('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())
 ON CONFLICT (modellfunktion_kurzbz) DO NOTHING;


@@ -106,7 +111,6 @@ 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,
@@ -121,94 +125,132 @@ 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;

-- 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;
+-- 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;

-- 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;
+-- 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;

-- 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;
+-- 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;

-- 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;
+-- 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;

-- 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;
+-- 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;

-- 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;
+-- 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;

 		";

@@ -238,7 +280,16 @@ 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())
+('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())
 ON CONFLICT (fachrichtung_kurzbz) DO NOTHING;

 		";
@@ -247,7 +298,6 @@ 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>';
-	
 	}
 }

@@ -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) || !$studiengang->melderelevant)
+			if (in_array($studiengang->studiengang_kz, BIS_EXCLUDE_STG))
 			{
 				continue;
 			}
@@ -825,7 +825,6 @@ 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;
 		});
@@ -890,7 +889,7 @@ function _getLehrecontainer($sws_proStg_arr)
 			$kennzeichen_name = $is_lehrgang ? 'LehrgangNr' : 'StgKz';

 			// Lehreobjekt generieren
-			if (empty($lehre_arr) || !lehre_stg_exists($sws_proStg->melde_studiengang_kz, $lehre_arr))
+			if (empty($lehre_arr) || !lehre_stg_exists($sws_proStg->studiengang_kz, $lehre_arr))
 			{
 				$lehre_obj = new StdClass();

@@ -905,8 +904,8 @@ function _getLehrecontainer($sws_proStg_arr)
 			}
 			else	// Lehrecontainer mit STG schon vorhanden
 			{
-				$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;
+				$lehre_obj_arr = array_filter($lehre_arr, function (&$obj) use ($sws_proStg) {
+					return $obj->StgKz == $sws_proStg->studiengang_kz;
 				});

 				// SWS ergaenzen
@@ -1360,15 +1359,15 @@ function verwendung_exists($bisverwendung, $verwendung_arr)

 /**
 * Prueft ob ein Studiengang bereits im Lehre Container vorhanden ist
- * @param $melde_studiengang_kz Studiengangskennzahl
+ * @param $studiengang_kz Studiengangskennzahl
 * @param $lehre_arr Array mit Lehre Objekten
 * @return true wenn der Studiengang bereits existiert
 */
-function lehre_stg_exists($melde_studiengang_kz, $lehre_arr)
+function lehre_stg_exists($studiengang_kz, $lehre_arr)
 {
 	foreach($lehre_arr as $row)
 	{
-		$kennzeichenName = isset($row->LehrgangNr) ? 'LehrgangNr' : 'StgKz';
+		$kennzeichenName = $row->LehrgangNr ?? $row->StgKz;
 		if(isset($row->{$kennzeichenName}) && $row->{$kennzeichenName} == $melde_studiengang_kz)
 			return true;
 	}
@@ -227,8 +227,7 @@ if (isset($_GET['sendform']))
 	<table class="tablesorter" id="t1">
 	<thead>
 		<tr>
-			<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"/>
+			<th><span class="tooltip"><img src="../../skin/images/information.png" height="20px" name="infoicon"/>
 				'.$tooltiptext.'
 				</span>
 			</th>
@@ -365,10 +364,9 @@ if (isset($_GET['sendform']))
 		$("#t1").tablesorter(
 		{
 			sortList: [[3,0]],
-			widgets: ["saveSort", "zebra", "filter", "stickyHeaders"],
+			widgets: ["zebra", "filter", "stickyHeaders"],
 			headers: { 	0: { filter: false,  sorter: false }},
-			widgetOptions : {	filter_saveFilters : true,
-								filter_functions : {
+			widgetOptions : {	filter_functions : {
 									// Add select menu to this column
 									8 : {
 									"True" : function(e, n, f, i, $r, c, data) { return /t/.test(e); },
@@ -383,13 +381,6 @@ 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;
 		});
 	});
 		
@@ -588,9 +588,7 @@ 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, tbl_frage.frage_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
 				FROM testtool.tbl_antwort
 				JOIN testtool.tbl_vorschlag USING(vorschlag_id)
 				JOIN testtool.tbl_frage USING (frage_id)
@@ -617,7 +615,6 @@ if(isset($_POST['testergebnisanzeigen']) && isset($_POST['prestudent_id']))
 						<th>Level</th>
 						<th>Antwort #</th>
 						<th>Punkte</th>
-						<th>FrageID</th>
 					</tr>
 					</thead>
 					<tbody>';
@@ -635,7 +632,6 @@ 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>';
@@ -837,25 +837,6 @@ 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
@@ -1026,7 +1007,7 @@ if(isset($_GET['excel']))
 						{
 							widgets: ["zebra", "filter", "stickyHeaders"],
 							sortList: [[2,0],[3,0]],
-							headers: {0: { sorter: false},10: { sorter: "customDate"},11: { sorter: "customDate"}},
+							headers: {0: { sorter: false}},
 							widgetOptions: {filter_cssFilter: [
 									"filter_clm_null",
 									"filter_clm_prestudent_id",
@@ -1039,7 +1020,6 @@ if(isset($_GET['excel']))
 									"filter_clm_studienplan",
 									"filter_clm_einstiegssemester",
 									"filter_clm_geburtsdatum",
-									"filter_clm_anmeldedatum",
 									"filter_clm_email",
 									"filter_clm_absolviert"]}
 						});
@@ -1092,7 +1072,6 @@ if(isset($_GET['excel']))
 							'clm_studienplan',
 							'clm_einstiegssemester',
 							'clm_geburtsdatum',
-							"filter_clm_anmeldedatum",
 							'clm_email',
 							'clm_absolviert'];
 						for (var i in arr)
@@ -2718,8 +2697,7 @@ if($reihungstest_id!='')
 					WHERE prestudent_id = tbl_prestudent.prestudent_id
 						AND status_kurzbz = 'Interessent'
 					) LIMIT 1
-			) AS orgform_kurzbz,
-       tbl_rt_person.anmeldedatum
+			) AS orgform_kurzbz
 	FROM PUBLIC.tbl_rt_person
 	JOIN PUBLIC.tbl_person USING (person_id)
 	JOIN PUBLIC.tbl_reihungstest rt ON (rt_id = rt.reihungstest_id)
@@ -2808,7 +2786,6 @@ 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>';
@@ -2850,7 +2827,6 @@ 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>
@@ -2970,7 +2946,6 @@ 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>';
@@ -3034,7 +3009,6 @@ 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>
@@ -3154,7 +3128,6 @@ 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>
Author	SHA1	Message	Date
adisposkofh	b90dabeb2c	minor fix	2026-04-21 11:23:17 +02:00
adisposkofh	2f1edfeeab	minor fix	2026-04-21 11:21:50 +02:00
adisposkofh	414d8bd383	minor fix	2026-04-20 11:40:26 +02:00
adisposkofh	1a813e52ce	minor fix	2026-04-20 09:50:41 +02:00
adisposkofh	16b238124a	cleaned up search icon conditional render	2026-04-20 09:24:51 +02:00
adisposkofh	4def45907b	reworked searchbar animation	2026-04-17 18:10:05 +02:00
adisposkofh	202e6e88d2	redid searchbar animation with handmade transitions	2026-04-17 17:44:23 +02:00
adisposkofh	3b2473039f	code formatting	2026-04-17 16:37:58 +02:00
adisposkofh	59d1ca3409	animated searchbar display in header	2026-04-17 16:36:54 +02:00
adisposkofh	1d26303333	fixed mobile header/searchbar appearance	2026-04-17 15:59:32 +02:00