From 6c08741450589e3b3a82465b9c90f79358de1810 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 20 Sep 2024 14:31:25 +0200
Subject: [PATCH 001/572] Fist Draft

---
 application/config/search.php                 |  664 +++++++++
 application/config/searchfunctions.php        |   31 +
 .../controllers/api/frontend/v1/Searchbar.php |   13 +-
 application/core/FHCAPI_Controller.php        |    9 +-
 application/helpers/hlp_common_helper.php     |   17 +
 application/libraries/SearchBarLib.php        | 1307 ++++++++++++-----
 public/css/components/searchbar.css           |   38 +
 public/js/api/search.js                       |    4 +-
 .../components/searchbar/result/employee.js   |   59 +
 .../searchbar/result/mergedperson.js          |  166 +++
 .../searchbar/result/mergedstudent.js         |   35 +
 .../searchbar/result/organisationunit.js      |   63 +
 .../js/components/searchbar/result/person.js  |   46 +
 .../components/searchbar/result/prestudent.js |   70 +
 public/js/components/searchbar/result/room.js |   74 +
 .../js/components/searchbar/result/student.js |   58 +
 .../searchbar/result/template/action.js       |   28 +
 .../searchbar/result/template/actions.js      |   26 +
 .../searchbar/result/template/frame.js        |   59 +
 public/js/components/searchbar/searchbar.js   |  438 ++++--
 public/js/plugin/FhcApi.js                    |    2 +
 system/dbupdate_3.4.php                       |    1 +
 system/dbupdate_3.4/40128_search.php          |  171 +++
 23 files changed, 2838 insertions(+), 541 deletions(-)
 create mode 100644 application/config/search.php
 create mode 100644 application/config/searchfunctions.php
 create mode 100644 public/js/components/searchbar/result/employee.js
 create mode 100644 public/js/components/searchbar/result/mergedperson.js
 create mode 100644 public/js/components/searchbar/result/mergedstudent.js
 create mode 100644 public/js/components/searchbar/result/organisationunit.js
 create mode 100644 public/js/components/searchbar/result/person.js
 create mode 100644 public/js/components/searchbar/result/prestudent.js
 create mode 100644 public/js/components/searchbar/result/room.js
 create mode 100644 public/js/components/searchbar/result/student.js
 create mode 100644 public/js/components/searchbar/result/template/action.js
 create mode 100644 public/js/components/searchbar/result/template/actions.js
 create mode 100644 public/js/components/searchbar/result/template/frame.js
 create mode 100644 system/dbupdate_3.4/40128_search.php

diff --git a/application/config/search.php b/application/config/search.php
new file mode 100644
index 000000000..ac6189527
--- /dev/null
+++ b/application/config/search.php
@@ -0,0 +1,664 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+// TODO(chris): permissions
+// TODO(chris): foto
+
+
+$config['person'] = [
+	'primarykey' => 'person_id',
+	'table' => 'public.tbl_person',
+	'searchfields' => [
+		'uid' => [
+			'comparison' => 'equals',
+			'field' => 'uid',
+			'join' => [
+				'table' => "public.tbl_benutzer",
+				'using' => "person_id"
+			],
+			'1-n' => true
+		],
+		'vorname' => [
+			'alias' => ['firstname'],
+			'comparison' => 'similar',
+			'field' => 'vorname'
+		],
+		'nachname' => [
+			'alias' => ['lastname', 'surename'],
+			'comparison' => 'similar',
+			'field' => 'nachname'
+		],
+		'name' => [
+			'comparison' => 'similar',
+			'field' => "(vorname || ' ' || nachname)"
+		],
+		'email' => [
+			'comparison' => 'similar',
+			'field' => 'kontakt',
+			'join' => [
+				'table' => "public.tbl_kontakt",
+				'on' => "kontakttyp = 'email' AND tbl_kontakt.person_id = tbl_person.person_id"
+			],
+			"1-n" => true
+		],
+		'tel' => [
+			'alias' => ['phone', 'telefon'],
+			'comparison' => 'similar',
+			'field' => 'kontakt',
+			'join' => [
+				'table' => "public.tbl_kontakt",
+				'on' => "kontakttyp IN ('telefon', 'so.tel', 'mobil') AND tbl_kontakt.person_id = tbl_person.person_id"
+			],
+			"1-n" => true
+		],
+		'preid' => [
+			'alias' => ['prestudent_id'],
+			'comparison' => 'equal-int',
+			'field' => 'prestudent_id',
+			'join' => [
+				'table' => "public.tbl_prestudent",
+				'using' => "person_id"
+			],
+			'1-n' => true
+		],
+		'pid' => [
+			'alias' => ['person_id'],
+			'comparison' => 'equal-int',
+			'field' => 'person_id'
+		]
+	],
+	'resultfields' => [
+		"b.uid",
+		"p.person_id",
+		"(p.vorname || ' ' || p.nachname) AS name",
+		"ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
+		"p.foto"
+	],
+	'resultjoin' => "
+		JOIN public.tbl_person p USING (person_id)
+		LEFT JOIN public.tbl_benutzer b USING (person_id)"
+];
+
+$config['student'] = [
+	'primarykey' => 'student_uid',
+	'table' => 'public.tbl_student',
+	'searchfields' => [
+		'uid' => [
+			'comparison' => 'equals',
+			'field' => 'student_uid'
+		],
+		'vorname' => [
+			'alias' => ['firstname'],
+			'comparison' => 'similar',
+			'field' => 'vorname',
+			'join' => [
+				[
+					'table' => "public.tbl_prestudent",
+					'using' => "prestudent_id"
+				],
+				[
+					'table' => "public.tbl_person",
+					'using' => "person_id"
+				]
+			]
+		],
+		'nachname' => [
+			'alias' => ['lastname', 'surename'],
+			'comparison' => 'similar',
+			'field' => 'nachname',
+			'join' => [
+				[
+					'table' => "public.tbl_prestudent",
+					'using' => "prestudent_id"
+				],
+				[
+					'table' => "public.tbl_person",
+					'using' => "person_id"
+				]
+			]
+		],
+		'name' => [
+			'comparison' => 'similar',
+			'field' => "(vorname || ' ' || nachname)",
+			'join' => [
+				[
+					'table' => "public.tbl_prestudent",
+					'using' => "prestudent_id"
+				],
+				[
+					'table' => "public.tbl_person",
+					'using' => "person_id"
+				]
+			]
+		],
+		'email' => [
+			'comparison' => 'similar',
+			'field' => 'kontakt',
+			'join' => [
+				[
+					'table' => "public.tbl_prestudent",
+					'using' => "prestudent_id"
+				],
+				[
+					'table' => "public.tbl_kontakt",
+					'on' => "kontakttyp = 'email' AND tbl_kontakt.person_id = tbl_prestudent.person_id"
+				]
+			],
+			"1-n" => true
+		],
+		'tel' => [
+			'alias' => ['phone', 'telefon'],
+			'comparison' => 'similar',
+			'field' => 'kontakt',
+			'join' => [
+				[
+					'table' => "public.tbl_prestudent",
+					'using' => "prestudent_id"
+				],
+				[
+					'table' => "public.tbl_kontakt",
+					'on' => "kontakttyp IN ('telefon', 'so.tel', 'mobil') AND tbl_kontakt.person_id = tbl_prestudent.person_id"
+				]
+			],
+			"1-n" => true
+		],
+		'stg' => [
+			'alias' => ['studiengang'],
+			'comparison' => 'equals',
+			'field' => "typ || kurzbz",
+			'join' => [
+				[
+					'table' => "public.tbl_prestudent",
+					'using' => "prestudent_id"
+				],
+				[
+					'table' => "public.tbl_studiengang",
+					'on' => "tbl_studiengang.studiengang_kz = tbl_prestudent.studiengang_kz"
+				]
+			]
+		],
+		'preid' => [
+			'alias' => ['prestudent_id'],
+			'comparison' => 'equal-int',
+			'field' => 'prestudent_id'
+		],
+		'pid' => [
+			'alias' => ['person_id'],
+			'comparison' => 'equal-int',
+			'field' => 'person_id',
+			'join' => [
+				'table' => "public.tbl_prestudent",
+				'using' => "prestudent_id"
+			]
+		]
+	],
+	'resultfields' => [
+		"s.student_uid AS uid",
+		"s.matrikelnr",
+		"p.person_id",
+		"(p.vorname || ' ' || p.nachname) AS name",
+		"ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
+		"p.foto"
+	],
+	'resultjoin' => "
+		JOIN public.tbl_student s USING (student_uid)
+		JOIN public.tbl_benutzer b ON(b.uid = s.student_uid)
+		JOIN public.tbl_person p USING(person_id)"
+];
+
+// TODO(chris): "ref"
+$config['prestudent'] = [
+	'primarykey' => 'prestudent_id',
+	'table' => 'public.tbl_prestudent',
+	'searchfields' => [
+		'uid' => [
+			'comparison' => 'equals',
+			'field' => 'student_uid',
+			'join' => [
+				'table' => "public.tbl_student",
+				'using' => "prestudent_id"
+			]
+		],
+		'vorname' => [
+			'alias' => ['firstname'],
+			'comparison' => 'similar',
+			'field' => 'vorname',
+			'join' => [
+				'table' => "public.tbl_person",
+				'using' => "person_id"
+			]
+		],
+		'nachname' => [
+			'alias' => ['lastname', 'surename'],
+			'comparison' => 'similar',
+			'field' => 'nachname',
+			'join' => [
+				'table' => "public.tbl_person",
+				'using' => "person_id"
+			]
+		],
+		'name' => [
+			'comparison' => 'similar',
+			'field' => "(vorname || ' ' || nachname)",
+			'join' => [
+				'table' => "public.tbl_person",
+				'using' => "person_id"
+			]
+		],
+		'email' => [
+			'comparison' => 'similar',
+			'field' => 'kontakt',
+			'join' => [
+				'table' => "public.tbl_kontakt",
+				'on' => "kontakttyp = 'email' AND tbl_kontakt.person_id = tbl_prestudent.person_id"
+			],
+			"1-n" => true
+		],
+		'tel' => [
+			'alias' => ['phone', 'telefon'],
+			'comparison' => 'similar',
+			'field' => 'kontakt',
+			'join' => [
+				'table' => "public.tbl_kontakt",
+				'on' => "kontakttyp IN ('telefon', 'so.tel', 'mobil') AND tbl_kontakt.person_id = tbl_prestudent.person_id"
+			],
+			"1-n" => true
+		],
+		'stg' => [
+			'alias' => ['studiengang'],
+			'comparison' => 'equals',
+			'field' => "typ || kurzbz",
+			'join' => [
+				'table' => "public.tbl_studiengang",
+				'using' => "studiengang_kz"
+			]
+		],
+		'preid' => [
+			'alias' => ['prestudent_id'],
+			'comparison' => 'equal-int',
+			'field' => 'prestudent_id'
+		],
+		'pid' => [
+			'alias' => ['person_id'],
+			'comparison' => 'equal-int',
+			'field' => 'person_id',
+			'join' => [
+				'table' => "public.tbl_person",
+				'using' => "person_id"
+			]
+		]
+	],
+	'resultfields' => [
+		"ps.prestudent_id",
+		"ps.studiengang_kz",
+		"s.matrikelnr",
+		"p.person_id",
+		"b.uid",
+		"(p.vorname || ' ' || p.nachname) AS name",
+		"ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
+		"p.foto",
+		"UPPER(sg.typ || sg.kurzbz) AS stg_kuerzel",
+		"sg.bezeichnung",
+		"(
+			SELECT bezeichnung_mehrsprachig[(TABLE lang)]
+			FROM public.tbl_status
+			WHERE status_kurzbz = public.get_rolle_prestudent(ps.prestudent_id, NULL)
+			LIMIT 1
+		) as status"
+	],
+	'resultjoin' => "
+		LEFT JOIN public.tbl_prestudent ps USING (prestudent_id)
+		LEFT JOIN public.tbl_student s ON (ps.prestudent_id = s.prestudent_id)
+		LEFT JOIN public.tbl_benutzer b ON (b.uid = s.student_uid)
+		JOIN public.tbl_person p ON (p.person_id = ps.person_id)
+		LEFT JOIN public.tbl_studiengang sg ON (sg.studiengang_kz = ps.studiengang_kz)"
+];
+
+$config['employee'] = [
+	'alias' => ['ma', 'mitarbeiter'],
+	'primarykey' => 'mitarbeiter_uid',
+	'table' => 'public.tbl_mitarbeiter',
+	'searchfields' => [
+		'uid' => [
+			'alias' => ['mitarbeiter_uid'],
+			'comparison' => 'equals',
+			'field' => "mitarbeiter_uid"
+		],
+		'vorname' => [
+			'alias' => ['firstname'],
+			'comparison' => 'similar',
+			'field' => "vorname",
+			'join' => [
+				[
+					'table' => "public.tbl_benutzer",
+					'on' => "uid = mitarbeiter_uid"
+				],
+				[
+					'table' => "public.tbl_person",
+					'using' => "person_id"
+				]
+			]
+		],
+		'nachname' => [
+			'alias' => ['lastname', 'surename'],
+			'comparison' => 'similar',
+			'field' => "nachname",
+			'join' => [
+				[
+					'table' => "public.tbl_benutzer",
+					'on' => "uid = mitarbeiter_uid"
+				],
+				[
+					'table' => "public.tbl_person",
+					'using' => "person_id"
+				]
+			]
+		],
+		'name' => [
+			'comparison' => 'similar',
+			'field' => "(vorname || ' ' || nachname)",
+			'join' => [
+				[
+					'table' => "public.tbl_benutzer",
+					'on' => "uid = mitarbeiter_uid"
+				],
+				[
+					'table' => "public.tbl_person",
+					'using' => "person_id"
+				]
+			]
+		],
+		'email' => [
+			'comparison' => 'similar',
+			'field' => "COALESCE(alias, uid) || '" . '@' . DOMAIN . "'",
+			'join' => [
+				'table' => "public.tbl_benutzer",
+				'on' => "uid = mitarbeiter_uid"
+			]
+		],
+		'tel' => [
+			'alias' => ['phone', 'telefon'],
+			'comparison' => 'similar',
+			'field' => "TRIM(COALESCE(kontakt, '') || ' ' || COALESCE(telefonklappe, ''))",
+			'join' => [
+				'table' => "public.tbl_kontakt",
+				'on' => "kontakttyp = 'telefon' AND tbl_kontakt.standort_id = tbl_mitarbeiter.standort_id"
+			],
+			"1-n" => true
+		],
+		'pid' => [
+			'alias' => ['person_id'],
+			'comparison' => 'equal-int',
+			'field' => "person_id"
+		],
+		'oe' => [
+			'alias' => ['ou', 'organisationseinheit', 'organisationunit'],
+			'comparison' => 'vector',
+			'field' => "fts_bezeichnung",
+			'join' => [
+				[
+					'table' => "public.tbl_benutzerfunktion",
+					'on' => "mitarbeiter_uid = uid
+						AND funktion_kurzbz = 'oezuordnung'
+						AND (datum_von IS NULL OR datum_von <= NOW())
+						AND (datum_bis IS NULL OR datum_bis >= NOW())"
+				],
+				[
+					'table' => "public.tbl_organisationseinheit",
+					'using' => "oe_kurzbz"
+				]
+			],
+			'1-n' => true
+		],
+		'kst' => [
+			'comparison' => 'vector',
+			'field' => "fts_bezeichnung",
+			'join' => [
+				[
+					'table' => "public.tbl_benutzerfunktion",
+					'on' => "mitarbeiter_uid = uid
+						AND funktion_kurzbz = 'kstzuordnung'
+						AND (datum_von IS NULL OR datum_von <= NOW())
+						AND (datum_bis IS NULL OR datum_bis >= NOW())"
+				],
+				[
+					'table' => "public.tbl_organisationseinheit",
+					'using' => "oe_kurzbz"
+				]
+			],
+			'1-n' => true
+		]
+	],
+	'resultfields' => [
+		"b.uid",
+		"p.person_id",
+		"(p.vorname || ' ' || p.nachname) AS name",
+		"ARRAY(
+			SELECT
+				'[' || ot.bezeichnung || '] ' || o.bezeichnung AS bezeichnung
+			FROM public.tbl_benutzerfunktion bf
+			JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
+			JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
+			WHERE bf.funktion_kurzbz = 'oezuordnung'
+				AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
+				AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
+				AND bf.uid = b.uid
+			GROUP BY o.bezeichnung, ot.bezeichnung
+		) AS organisationunit_name",
+		"COALESCE(b.alias, b.uid) || '" . '@' . DOMAIN . "' AS email",
+		"TRIM(COALESCE(k.kontakt, '') || ' ' || COALESCE(m.telefonklappe, '')) AS phone",
+		"'" . base_url("/cis/public/bild.php?src=person&person_id=") . "' || p.person_id AS photo_url",
+		"ARRAY(
+			SELECT
+				'[' || ot.bezeichnung || '] ' || o.bezeichnung AS bezeichnung
+			FROM public.tbl_benutzerfunktion bf
+			JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
+			JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
+			WHERE bf.funktion_kurzbz = 'kstzuordnung'
+				AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
+				AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
+				AND bf.uid = b.uid
+			GROUP BY o.bezeichnung, ot.bezeichnung
+		) AS standardkostenstelle"
+	],
+	'resultjoin' => "
+		JOIN public.tbl_mitarbeiter m USING (mitarbeiter_uid)
+		JOIN public.tbl_benutzer b ON (b.uid = m.mitarbeiter_uid)
+		JOIN public.tbl_person p USING(person_id)
+		LEFT JOIN (
+			SELECT kontakt, standort_id
+			FROM public.tbl_kontakt
+			WHERE kontakttyp = 'telefon'
+		) k ON (k.standort_id = m.standort_id)"
+];
+
+$config['unassigned_employee'] = $config['employee'];
+$config['unassigned_employee']['alias'] = ['mitarbeiter_ohne_zuordnung'];
+$config['unassigned_employee']['prepare'] = "unassigned_employee AS (
+	SELECT tbl_mitarbeiter.*
+	FROM public.tbl_mitarbeiter
+	LEFT JOIN public.tbl_benutzerfunktion ON (
+		uid = mitarbeiter_uid
+		AND funktion_kurzbz = 'kstzuordnung'
+		AND (datum_von IS NULL OR datum_von <= NOW())
+		AND (datum_bis IS NULL OR datum_bis >= NOW())
+	)
+	WHERE tbl_benutzerfunktion.bezeichnung IS NULL
+	UNION
+	SELECT tbl_mitarbeiter.*
+	FROM public.tbl_mitarbeiter
+	LEFT JOIN public.tbl_benutzerfunktion ON (
+		uid = mitarbeiter_uid
+		AND funktion_kurzbz = 'oezuordnung'
+		AND (datum_von IS NULL OR datum_von <= NOW())
+		AND (datum_bis IS NULL OR datum_bis >= NOW())
+	)
+	WHERE tbl_benutzerfunktion.bezeichnung IS NULL
+)";
+$config['unassigned_employee']['table'] = "unassigned_employee";
+$config['unassigned_employee']['searchfields']['tel']['join']['on'] = "kontakttyp = 'telefon' AND tbl_kontakt.standort_id = unassigned_employee.standort_id";
+
+$config['organisationunit'] = [
+	'alias' => ['ou', 'organisationseinheit', 'oe'],
+	'primarykey' => 'oe_kurzbz',
+	'table' => 'public.tbl_organisationseinheit',
+	'searchfields' => [
+		'uid' => [
+			'comparison' => 'equals',
+			'field' => 'uid',
+			'prepare' => "organisationunit_leader(oe_kurzbz, uid, vorname, nachname) AS (
+				SELECT oe_kurzbz, vorname, nachname, uid
+				FROM public.tbl_benutzerfunktion
+				JOIN public.tbl_benutzer USING (uid)
+				JOIN public.tbl_person USING (person_id)
+				WHERE funktion_kurzbz = 'Leitung'
+				   AND (datum_von IS NULL OR datum_von <= NOW())
+				   AND (datum_bis IS NULL OR datum_bis >= NOW())
+				   AND tbl_benutzer.aktiv = TRUE
+			)",
+			'join' => [
+				'table' => "organisationunit_leader",
+				'using' => "oe_kurzbz"
+			],
+			'1-n' => true
+		],
+		'vorname' => [
+			'alias' => ['firstname'],
+			'comparison' => 'similar',
+			'field' => 'vorname',
+			'prepare' => "organisationunit_leader(oe_kurzbz, uid, vorname, nachname) AS (
+				SELECT oe_kurzbz, vorname, nachname, uid
+				FROM public.tbl_benutzerfunktion
+				JOIN public.tbl_benutzer USING (uid)
+				JOIN public.tbl_person USING (person_id)
+				WHERE funktion_kurzbz = 'Leitung'
+				   AND (datum_von IS NULL OR datum_von <= NOW())
+				   AND (datum_bis IS NULL OR datum_bis >= NOW())
+				   AND tbl_benutzer.aktiv = TRUE
+			)",
+			'join' => [
+				'table' => "organisationunit_leader",
+				'using' => "oe_kurzbz"
+			],
+			'1-n' => true
+		],
+		'nachname' => [
+			'alias' => ['lastname', 'surename'],
+			'comparison' => 'similar',
+			'field' => 'nachname',
+			'prepare' => "organisationunit_leader(oe_kurzbz, uid, vorname, nachname) AS (
+				SELECT oe_kurzbz, vorname, nachname, uid
+				FROM public.tbl_benutzerfunktion
+				JOIN public.tbl_benutzer USING (uid)
+				JOIN public.tbl_person USING (person_id)
+				WHERE funktion_kurzbz = 'Leitung'
+				   AND (datum_von IS NULL OR datum_von <= NOW())
+				   AND (datum_bis IS NULL OR datum_bis >= NOW())
+				   AND tbl_benutzer.aktiv = TRUE
+			)",
+			'join' => [
+				'table' => "organisationunit_leader",
+				'using' => "oe_kurzbz"
+			],
+			'1-n' => true
+		],
+		'name' => [
+			'comparison' => 'similar',
+			'field' => "(vorname || ' ' || nachname)",
+			'prepare' => "organisationunit_leader(oe_kurzbz, uid, vorname, nachname) AS (
+				SELECT oe_kurzbz, vorname, nachname, uid
+				FROM public.tbl_benutzerfunktion
+				JOIN public.tbl_benutzer USING (uid)
+				JOIN public.tbl_person USING (person_id)
+				WHERE funktion_kurzbz = 'Leitung'
+				   AND (datum_von IS NULL OR datum_von <= NOW())
+				   AND (datum_bis IS NULL OR datum_bis >= NOW())
+				   AND tbl_benutzer.aktiv = TRUE
+			)",
+			'join' => [
+				'table' => "organisationunit_leader",
+				'using' => "oe_kurzbz"
+			],
+			'1-n' => true
+		],
+		'oe' => [
+			'alias' => ['ou', 'organisationseinheit', 'organisationunit'],
+			'comparison' => 'vector',
+			'field' => "fts_bezeichnung"
+		],
+		'kurzbz' => [
+			'alias' => ['oe_kurzbz'],
+			'comparison' => 'equals',
+			'field' => "oe_kurzbz"
+		]
+	],
+	'resultfields' => [
+		"oe.oe_kurzbz",
+		"('[' || type.bezeichnung || '] ' || oe.bezeichnung) AS name",
+		"oe_parent.oe_kurzbz AS parentoe_kurzbz",
+		"(CASE WHEN oe_parent.bezeichnung IS NOT NULL THEN '[' || type_parent.bezeichnung || '] ' || oe_parent.bezeichnung END) AS parentoe_name",
+		"ARRAY(
+			SELECT JSON_BUILD_OBJECT('uid', b.uid, 'vorname', p.vorname, 'nachname', p.nachname, 'name', (p.vorname || ' ' || p.nachname))
+			FROM public.tbl_benutzerfunktion bf
+			JOIN public.tbl_benutzer b USING (uid)
+			JOIN public.tbl_person p USING (person_id)
+			WHERE funktion_kurzbz = 'Leitung'
+			AND (datum_von IS NULL OR datum_von <= NOW())
+			AND (datum_bis IS NULL OR datum_bis >= NOW())
+			AND b.aktiv = TRUE
+			AND oe_kurzbz = oe.oe_kurzbz
+		) AS leaders",
+		"(
+			SELECT COUNT(*)
+			FROM public.tbl_benutzerfunktion
+			WHERE funktion_kurzbz = 'oezuordnung'
+			AND (datum_von IS NULL OR datum_von <= NOW())
+			AND (datum_bis IS NULL OR datum_bis >= NOW())
+			AND oe_kurzbz = oe.oe_kurzbz
+		) AS number_of_people",
+		"(CASE WHEN oe.mailverteiler THEN oe.oe_kurzbz || '" . '@' . DOMAIN . "' END) AS mailgroup"
+	],
+	'resultjoin' => "
+		JOIN public.tbl_organisationseinheit oe
+			USING (oe_kurzbz)
+		JOIN public.tbl_organisationseinheittyp type
+			USING (organisationseinheittyp_kurzbz)
+		LEFT JOIN public.tbl_organisationseinheit oe_parent
+			ON (oe_parent.oe_kurzbz = oe.oe_parent_kurzbz)
+		LEFT JOIN public.tbl_organisationseinheittyp type_parent
+			ON (oe_parent.organisationseinheittyp_kurzbz = type_parent.organisationseinheittyp_kurzbz)"
+];
+
+$config['room'] = [
+	'alias' => ['raum'],
+	'primarykey' => 'ort_kurzbz',
+	'table' => 'public.tbl_ort',
+	'searchfields' => [
+		'name' => [
+			'comparison' => 'similar',
+			'field' => 'ort_kurzbz'
+		]
+	],
+	'resultfields' => [
+		"ort.ort_kurzbz",
+		"ort.gebteil AS building",
+		"ort.ausstattung AS equipment",
+		"ort.stockwerk AS floor",
+		"ort.dislozierung AS room_number",
+		"ort.content_id",
+		"address.ort AS city",
+		"address.plz AS zip",
+		"address.strasse AS street",
+		"ort.max_person",
+		"ort.arbeitsplaetze AS workplaces"
+	],
+	'resultjoin' => "
+		JOIN public.tbl_ort ort
+			USING (ort_kurzbz)
+		LEFT JOIN public.tbl_standort
+			USING (standort_id)
+		LEFT JOIN public.tbl_adresse address
+			USING (adresse_id)"
+];
diff --git a/application/config/searchfunctions.php b/application/config/searchfunctions.php
new file mode 100644
index 000000000..c8244e9a3
--- /dev/null
+++ b/application/config/searchfunctions.php
@@ -0,0 +1,31 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+$config['equal-int'] = [
+	'priority' => 4,
+	'rank' => "0",
+	'compare' => "{field} = {word}",
+	'force_integer' => true
+];
+
+$config['equals'] = [
+	'priority' => 3,
+	'rank' => "0",
+	'compare' => "LOWER({field}) = {word}"
+];
+
+$config['similar'] = [
+	'priority' => 2,
+	'rank' => "(COALESCE({field}, '') <->> {word})",
+	'compare' => "COALESCE({field}, '') %> {word}",
+	'compare_boolean' => "COALESCE({field}, '') ILIKE {like:word}"
+];
+
+$config['vector'] = [
+	'priority' => 1,
+	'rank' => "ts_rank_cd({field}, to_tsquery('simple', {word}))",
+	'compare' => "to_tsquery('simple', {word}) @@ {field}"
+];
+
diff --git a/application/controllers/api/frontend/v1/Searchbar.php b/application/controllers/api/frontend/v1/Searchbar.php
index 8b383e042..2d5b06063 100644
--- a/application/controllers/api/frontend/v1/Searchbar.php
+++ b/application/controllers/api/frontend/v1/Searchbar.php
@@ -50,6 +50,7 @@ class Searchbar extends FHCAPI_Controller
 	 */
 	public function search()
 	{
+		#$searchstrings = ['pid:71995', 'email:eder.iris', 'schnabl', 'schnabl thomas', 'schnabl thomas sarim', 'schnabl -thomas', 'nachname:schnabl -vorname:thomas', 'schnabl thomas -sarim', 'schnabl or hacker', '-ali', '-ali -baba', '-ali -baba -raub', '-ali -honig', '-ali -baba ali', 'hofer martin'];
 		$this->load->library('form_validation');
 
 		// Checks if the searchstr and the types parameters are in the POSTed JSON
@@ -57,13 +58,17 @@ class Searchbar extends FHCAPI_Controller
 		$this->form_validation->set_rules(self::TYPES_PARAM . '[]', null, 'required');
 
 		if (!$this->form_validation->run())
-			$this->terminateWithError(SearchBarLib::ERROR_WRONG_JSON, self::ERROR_TYPE_GENERAL);
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
 		// Convert to json the result from searchbarlib->search
 		$result = $this->searchbarlib->search($this->input->post(self::SEARCHSTR_PARAM), $this->input->post(self::TYPES_PARAM));
-		if (property_exists($result, 'error'))
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		$this->terminateWithSuccess($result);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->addMeta('time', $result->meta['time']);
+		$this->addMeta('searchstring', $result->meta['searchstring']);
+		
+		$this->terminateWithSuccess($data);
 	}
 }
 
diff --git a/application/core/FHCAPI_Controller.php b/application/core/FHCAPI_Controller.php
index 36388e271..197f4757f 100644
--- a/application/core/FHCAPI_Controller.php
+++ b/application/core/FHCAPI_Controller.php
@@ -106,10 +106,15 @@ class FHCAPI_Controller extends Auth_Controller
 		$error = [];
 		
 		if (is_array($data)) {
-			if ($type == self::ERROR_TYPE_VALIDATION)
+			if ($type == self::ERROR_TYPE_VALIDATION) {
 				$error['messages'] = $data;
-			else
+			} elseif (array_is_list($data)) {
+				foreach ($data as $d)
+					$this->addError($d, $type);
+				return;
+			} else {
 				$error = $data;
+			}
 		} elseif (is_object($data)) {
 			$error = (array)$data;
 		} else {
diff --git a/application/helpers/hlp_common_helper.php b/application/helpers/hlp_common_helper.php
index 40aed007c..00c0a1b93 100644
--- a/application/helpers/hlp_common_helper.php
+++ b/application/helpers/hlp_common_helper.php
@@ -424,6 +424,23 @@ function isValidDate($dateString)
 }
 
 
+// ------------------------------------------------------------------------
+// PHP functions that don't exist in older versions
+// ------------------------------------------------------------------------
+
+/**
+ * Returns true if the given array is sequential
+ */
+if (!function_exists('array_is_list')) {
+    function array_is_list(array $arr)
+    {
+        if ($arr === []) {
+            return true;
+        }
+        return array_keys($arr) === range(0, count($arr) - 1);
+    }
+}
+
 // ------------------------------------------------------------------------
 // Collection of utility functions for form validation purposes
 // ------------------------------------------------------------------------
diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index b725f6e90..6547cd107 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -39,6 +39,10 @@ class SearchBarLib
 
 	private $_ci; // Code igniter instance
 
+	private $_searchfunction_priorities = [];
+	private $_numeric_searchfunctions = [];
+	private $_allowed_searchfunctions = [];
+	
 	/**
 	 * Gets the CI instance and loads model
 	 */
@@ -46,8 +50,22 @@ class SearchBarLib
 	{
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		// It is loaded only to have the DB_Model available
+		// It is loaded only to have the DB functions available
 		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
+
+		// Load Config
+		$this->_ci->load->config('search', true);
+		$this->_ci->load->config('searchfunctions', true);
+
+		$this->_ci->load->library('PhrasesLib', [['search'], null], 'search_phrases');
+
+		// Precompute helper arrays
+		foreach ($this->_ci->config->item('searchfunctions') as $key => $arr) {
+			$this->_searchfunction_priorities[$key] = $arr['priority'];
+			if ($arr['force_integer'] ?? false)
+				$this->_numeric_searchfunctions[] = $key;
+			$this->_allowed_searchfunctions[] = $key;
+		}
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -55,384 +73,612 @@ class SearchBarLib
 
 	/**
 	 * It performes the search of the given search string using the specified search types
+	 * TODO(chris): permissions
+	 *
+	 * @param string							$searchstring
+	 * @param array								$types (optional)
+	 *
+	 * @return stdClass		containing an array with the result on index 0
+	 * 						and the overall query time on index 1.
 	 */
-	public function search($searchstr, $types)
+	public function search($searchstring, $types = [])
 	{
-		// Checks if the given parameters are fine
-		$search = $this->_checkParameters($searchstr, $types);
+		if (!$types) {
+			$types = $this->_ci->config->item('search');
+		} else {
+			$tmp = [];
+			$missing = [];
+			foreach ($types as $type) {
+				$typeconfig = $this->_ci->config->item($type, 'search');
+				if (!$typeconfig) {
+					$missing[] = $type;
+				} else {
+					$tmp[$type] = $typeconfig;
+				}
+			}
+			if ($missing) {
+				$p = $this->_ci->search_phrases;
+				return error(array_map(function ($type) use ($p) {
+					return $p->t('search', 'error_missing_config', [
+						'type' => $type
+					]); // TODO(chris): phrase
+				}, $missing));
+			}
+			$types = $tmp;
+		}
 
-		// If the check was successful then perform the search
-		if (isSuccess($search)) $search = $this->_search($searchstr, $types);
 
-		return $search; // return the result
+		// Convert searchstring into array
+		list($searchArray, $searchstring) = $this->_convertQuery($searchstring, $types);
+
+
+		$sql = $this->getDynamicSearchSqls($searchArray, array_keys($types));
+		if (isError($sql))
+			return $sql;
+		if (!hasData($sql)) {
+			$retval = success([]);
+			$retval->meta = ['time' => 0, 'searchstring' => $searchstring];
+			return $retval;
+		}
+
+		$msc = microtime(true);
+		$result = $this->_ci->BenutzerModel->execReadOnlyQuery(getData($sql));
+		$msc = microtime(true) - $msc;
+
+		if (isError($result))
+			return $result;
+
+		$retval = success($result->retval);
+		$retval->meta = [
+			'time' => $msc,
+			'searchstring' => $searchstring
+		];
+
+		return $retval;
+	}
+
+	/**
+	 * Generates the search query for the given search string and the
+	 * specified search type.
+	 *
+	 * @param array								$searchArray
+	 * @param string							$table
+	 *
+	 * @return stdClass		containing the query string.
+	 */
+	public function getDynamicSearchSql($searchArray, $table)
+	{
+		$res = $this->checkConfig($table);
+		if (isError($res))
+			return $res;
+		$table_config = getData($res);
+
+		$sql_with = [];
+		
+		$sql_select = $this->prepareDynamicSearchSql($sql_with, $searchArray, $table);
+
+		if (!$sql_select)
+			return success("");
+
+		$lang = getUserLanguage();
+
+		$output = "
+			WITH lang (index) AS (
+				SELECT index
+				FROM public.tbl_sprache
+				WHERE sprache=" . $this->_ci->db->escape($lang) . "
+				LIMIT 1
+			)";
+
+		if ($sql_with) {
+			$sql_with = array_unique($sql_with);
+			$output .= ", " . implode(", ", $sql_with);
+		}
+
+		$other_selects = "";
+		if (isset($table_config['resultfields']))
+			$other_selects = implode(", ", $table_config['resultfields']);
+		if ($other_selects)
+			$other_selects = ", " . $other_selects;
+
+		$output .= "
+			, q (" . $table_config['primarykey'] . ", rank) AS (
+				SELECT " . $table_config['primarykey'] . ", MAX(rank)
+				FROM (" . implode(" UNION ", $sql_select) . ") q
+				GROUP BY " . $table_config['primarykey'] . "
+			)
+			SELECT
+				" . $this->_ci->db->escape($table) . " AS type,
+				q.rank
+				" . $other_selects . "
+			FROM q
+			" . ($table_config['resultjoin'] ?? "") . "
+			ORDER BY rank DESC
+		";
+
+		return success($output);
+	}
+
+	/**
+	 * Generates the search query for the given search string and the
+	 * specified search types.
+	 *
+	 * @param array								$searchArray
+	 * @param array								$types
+	 *
+	 * @return stdClass		containing the query string.
+	 */
+	public function getDynamicSearchSqls($searchArray, $types)
+	{
+		$with = [];
+		$selects = [];
+		foreach ($types as $type) {
+			$res = $this->checkConfig($type);
+			if (isError($res))
+				return $res;
+			$table_config = getData($res);
+
+			$select = $this->prepareDynamicSearchSql($with, $searchArray, $type);
+			if (!$select)
+				continue;
+
+			$with[] = "final_" . $type . " (" . $table_config['primarykey'] . ", rank) AS (
+				SELECT " . $table_config['primarykey'] . ", MAX(rank)
+				FROM (" . implode(" UNION ", $select) . ") q
+				GROUP BY " . $table_config['primarykey'] . "
+			)";
+
+			$other_selects = 
+			$selects[] = "
+				SELECT
+					" . $this->_ci->db->escape($type) . " AS type,
+					rank,
+					TO_JSONB((SELECT x FROM (SELECT " . implode(", ", $table_config['resultfields'] ?? ['*']) . ") x)) AS data
+				FROM final_" . $type  . ($table_config['resultjoin'] ?? "");
+		}
+
+		if (!$selects)
+			return success("");
+
+		$with = array_unique($with);
+
+		$lang = getUserLanguage();
+		array_unshift($with, "lang (index) AS (
+			SELECT index
+			FROM public.tbl_sprache
+			WHERE sprache=" . $this->_ci->db->escape($lang) . "
+			LIMIT 1
+		)");
+
+		return success("
+			WITH " . implode(", ", $with) . "
+			SELECT *
+			FROM (" . implode(" UNION ", $selects) . ") q
+			ORDER BY rank DESC
+			LIMIT 100
+		");
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Protected methods
+
+	/**
+	 * Check config
+	 *
+	 * @param string							$name
+	 *
+	 * @return stdClass
+	 */
+	protected function checkConfig($name)
+	{
+		$table_config = $this->_ci->config->item($name, 'search');
+
+		if (!$table_config)
+			return error($this->_ci->search_phrases->t('search', 'error_missing_config', [
+				'type' => $name
+			])); // TODO(chris): phrase
+
+		$errors = [];
+		if (!isset($table_config['table'])
+			|| !is_string($table_config['table'])
+			|| !$table_config['table']
+		) {
+			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
+				'type' => $name,
+				'field' => 'table'
+			]); // TODO(chris): phrase
+		}
+		if (!isset($table_config['primarykey'])
+			|| !is_string($table_config['primarykey'])
+			|| !$table_config['primarykey']
+		) {
+			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
+				'type' => $name,
+				'field' => 'primarykey'
+			]);
+		}
+		if (!isset($table_config['resultfields'])
+			|| !is_array($table_config['resultfields'])
+			|| !$table_config['resultfields']
+		) {
+			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
+				'type' => $name,
+				'field' => 'resultfields'
+			]);
+		}
+		if (!isset($table_config['searchfields'])
+			|| !is_array($table_config['searchfields'])
+			|| !$table_config['searchfields']
+		) {
+			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
+				'type' => $name,
+				'field' => 'searchfields'
+			]);
+		} else {
+			foreach ($table_config['searchfields'] as $searchfield => $config) {
+				if (!isset($config['field'])
+					|| !is_string($config['field'])
+					|| !$config['field']
+				) {
+					$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config_searchfield', [
+						'type' => $name,
+						'searchfield' => $searchfield,
+						'field' => 'field'
+					]); // TODO(chris): phrase
+				}
+				if (!isset($config['comparison'])
+					|| !is_string($config['comparison'])
+					|| !in_array($config['comparison'], $this->_allowed_searchfunctions)
+				) {
+					$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config_searchfield', [
+						'type' => $name,
+						'searchfield' => $searchfield,
+						'field' => 'comparison'
+					]);
+				}
+			}
+		}
+
+		if ($errors)
+			return error($errors);
+
+		return success($table_config);
+	}
+
+	/**
+	 * Generates the with statements for the given search string and the
+	 * specified search type.
+	 *
+	 * @param array								&$sqlWith
+	 * @param array								$searchArray
+	 * @param string							$table
+	 *
+	 * @return string	a query string or the name of the prepared select.
+	 */
+	protected function prepareDynamicSearchSql(&$sqlWith, $searchArray, $table)
+	{
+		$table_config = $this->_ci->config->item($table, 'search');
+
+		$id_offset = count($sqlWith);
+
+
+		$allowed_codes_w_order = ['' => 0, '!' => -1];
+		$max = max($this->_searchfunction_priorities);
+		foreach ($table_config['searchfields'] as $code => $config) {
+			$allowed_codes_w_order[$code] = $this->_searchfunction_priorities[$config['comparison']];
+			$allowed_codes_w_order['!' . $code] = $this->_searchfunction_priorities[$config['comparison']] - $max - 2;
+		}
+
+		$check_order = $this->_searchfunction_priorities;
+		uasort($table_config['searchfields'], function ($a, $b) use ($check_order) {
+			return $check_order[$b['comparison']] - $check_order[$a['comparison']];
+		});
+
+		$integer_functions = $this->_numeric_searchfunctions;
+		$integer_fields = array_keys(array_filter($table_config['searchfields'], function ($a) use ($integer_functions) {
+				return in_array($a['comparison'], $integer_functions);
+		}));
+
+		$only_integer_fields = count($integer_fields) == count($table_config['searchfields']);
+
+		$aliases = [];
+		foreach ($table_config['searchfields'] as $field => $config) {
+			if (isset($config['alias'])) {
+				foreach ($config['alias'] as $alias) {
+					$aliases[$alias] = $field;
+					$aliases['!' . $alias] = '!' . $field;
+				}
+			}
+		}
+
+		$sql_select = [];
+
+		if (isset($table_config['prepare'])) {
+			if (is_array($table_config['prepare']))
+				$sqlWith = $table_config['prepare'];
+			else
+				$sqlWith[] = $table_config['prepare'];
+		}
+
+		foreach ($searchArray as $or_search) {
+			if (isset($or_search['-filter']) && !in_array($table, $or_search['-filter']))
+				continue;
+			unset($or_search['-filter']);
+			
+			foreach ($aliases as $alias => $field) {
+				if (isset($or_search[$alias])) {
+					$or_search[$field] = array_merge($or_search[$alias], $or_search[$field] ?? []);
+					unset($or_search[$alias]);
+				}
+			}
+
+			// NOTE(chris): early out if not allowed fields are in the search array
+			$used_codes = array_keys($or_search);
+			if (count(array_intersect($used_codes, array_keys($allowed_codes_w_order))) != count($used_codes))
+				continue;
+
+			// NOTE(chris): expand general excludes to all fields
+			if (isset($or_search['!'])) {
+				$not = $or_search['!'];
+				unset($or_search['!']);
+				foreach ($table_config['searchfields'] as $code => $config) {
+					if (isset($or_search['!' . $code]))
+						$or_search['!' . $code] = array_unique(array_merge($or_search['!' . $code], $not));
+					else
+						$or_search['!' . $code] = $not;
+				}
+			}
+
+			// NOTE(chris): early out if all searchfields require an integer and at least one searchword is not a number
+			if ($only_integer_fields
+				&& isset($or_search[""])
+				&& $this->_hasAtLeastOneNaN($or_search[""])
+			) {
+				continue;
+			}
+
+			$skip = false;
+			foreach ($integer_fields as $code) {
+				// NOTE(chris): filter non integer for integer fields
+				if (isset($or_search['!' . $code])) {
+					$or_search['!' . $code] = array_filter($or_search['!' . $code], function ($a) {
+						return is_numeric($a);
+					});
+					if (!$or_search['!' . $code])
+						unset($or_search['!' . $code]);
+				}
+				// NOTE(chris): early out if a searchword that is not a number is compared to a searchfield that requires an integer
+				if (isset($or_search[$code])
+					&& $this->_hasAtLeastOneNaN($or_search[$code])
+				) {
+					$skip = true;
+					break;
+				}
+			}
+			if ($skip)
+				continue;
+
+			// NOTE(chris): sort for performance reasons
+			uksort($or_search, function ($a, $b) use ($allowed_codes_w_order) {
+				return $allowed_codes_w_order[$b] - $allowed_codes_w_order[$a];
+			});
+
+			$or_with = [];
+			$or_select = [];
+			$or_prepare = [];
+
+			if (substr(key($or_search), 0, 1) == '!') {
+				// NOTE(chris): only negative searchwords
+				$sql = [];
+				foreach ($or_search as $code => $words) {
+					$code = substr($code, 1);
+					// NOTE(chris): sort for performance reasons
+					usort($words, function ($a, $b) {
+						return strlen($b) - strlen($a);
+					});
+					$field_config = $table_config['searchfields'][$code];
+
+					if (isset($field_config['prepare'])) {
+						if (is_array($field_config['prepare']))
+							$or_with = array_merge($or_with, $field_config['prepare']);
+						else
+							$or_with[] = $field_config['prepare'];
+						$or_prepare[$code] = $field_config['prepare'];
+						unset($table_config['searchfields'][$code]['prepare']);
+						unset($field_config['prepare']);
+					}
+					$field_sql = "
+						SELECT
+							" . $table_config['table'] . "." . $table_config['primarykey'] . "
+							FROM " . $table_config['table'] . "
+							" . $this->_makeJoin($field_config['join']) . "
+							WHERE ";
+					// TODO(chris): equals and equal-int could be IN () statement???
+					foreach ($words as $word) {
+						$sql[] = $field_sql . $this->_makeCompareBool($field_config['comparison'], $field_config['field'], $word);
+					}
+				}
+
+				$or_select[] = "
+					SELECT 
+						" . $table_config['primarykey'] . ",
+						1.0 AS rank
+					FROM " . $table_config['table'] . "
+					WHERE prestudent_id NOT IN (" . implode(" UNION ", $sql) . ")";
+			} else {
+				$current_select = false;
+				$count = 0;
+				$skip = false;
+				foreach ($or_search as $code => $words) {
+					// NOTE(chris): sort for performance reasons
+					if ($code && substr($code, 0, 1) == '!') {
+						usort($words, function ($a, $b) {
+							return strlen($a) - strlen($b);
+						});
+					} else {
+						usort($words, function ($a, $b) {
+							return strlen($b) - strlen($a);
+						});
+					}
+					if ($code == '') {
+						foreach ($words as $i => $word) {
+							$field_sql = [];
+							foreach ($table_config['searchfields'] as $c => $field_config) {
+								if (in_array($field_config['comparison'], $integer_functions) && !is_numeric($word))
+									continue;
+
+								$word_from = $table_config['table'];
+								$word_join = "";
+								$word_rank = "0";
+								if ($current_select) {
+									$word_from = $current_select;
+									if ($field_config['field'] != $table_config['primarykey']) {
+										$word_join .= " " . $this->_makeJoin($table_config);
+									}
+									$word_rank = "rank";
+								}
+								if (isset($field_config['prepare'])) {
+									if (is_array($field_config['prepare']))
+										$or_with = array_merge($or_with, $field_config['prepare']);
+									else
+										$or_with[] = $field_config['prepare'];
+									$or_prepare[$c] = $field_config['prepare'];
+									unset($table_config['searchfields'][$c]['prepare']);
+									unset($field_config['prepare']);
+								}
+								if (isset($field_config['join'])) {
+									$word_join .= " " . $this->_makeJoin($field_config['join']);
+								}
+								$field_sql[] = "
+									SELECT
+										" . $word_from . "." . $table_config['primarykey'] . ",
+										" . $word_rank . " AS w_rank,
+										" . $this->_makeRank($field_config['comparison'], $field_config['field'], $word) . " AS rank
+										FROM " . $word_from . "
+										" . $word_join . "
+										WHERE " . $this->_makeCompare($field_config['comparison'], $field_config['field'], $word);
+							}
+							// NOTE(chris): skip because the word is not numeric but all searchfields require integers
+							if (!$field_sql) {
+								$or_with = [];
+								$or_select = [];
+								$count = 0;
+								$skip = true;
+								foreach ($or_prepare as $k => $v)
+									$table_config['searchfields'][$k]['prepare'] = $v;
+								break;
+							}
+
+							$id = "w" . ($id_offset + count($or_with));
+							$or_with[] = "
+								" . $id . " (" . $table_config['primarykey'] . ", rank) AS (
+								SELECT
+									" . $table_config['primarykey'] . ",
+									(w_rank + 1.0 - CASE " .
+										"WHEN MIN(rank) = 0 THEN 0 " .
+										"ELSE EXP(SUM(LN(CASE WHEN rank = 0 THEN 1 ELSE rank " .
+										"END))) END) AS rank
+									FROM (" . implode(' UNION ALL ', $field_sql) . ") " . $id . "
+									GROUP BY " . $table_config['primarykey'] . ", w_rank
+								)";
+							$current_select = $id;
+						}
+					} else {
+						foreach ($words as $i => $word) {
+							$where = "";
+							$rank = "";
+							$jointype = "";
+							if (substr($code, 0, 1) == '!') {
+								$c = substr($code, 1);
+								$field_config = $table_config['searchfields'][$c];
+								
+								$rank = "1";
+
+								$jointype = "LEFT";
+
+								$where = $field_config['field'] .
+									" IS NULL OR NOT (" .
+									$this->_makeCompareBool(
+										$field_config['comparison'],
+										$field_config['field'],
+										$word
+									) .
+									")";
+								if ($field_config['1-n'] ?? false) {
+									$where = "GROUP BY " .
+										$table_config['primarykey'] .
+										", rank HAVING MIN(CASE WHEN " .
+										$where .
+										" THEN 1 ELSE 0 END) = 1";
+								} else {
+									$where = "WHERE " . $where;
+								}
+							} else {
+								$field_config = $table_config['searchfields'][$code];
+
+								$rank = $this->_makeRank($field_config['comparison'], $field_config['field'], $word);
+
+								$where = $this->_makeCompare($field_config['comparison'], $field_config['field'], $word);
+								$where = "WHERE " . $where;
+							}
+							$word_from = $table_config['table'];
+							$word_join = "";
+							$word_rank = "";
+							if ($current_select) {
+								$word_from = $current_select;
+								if ($field_config['field'] != $table_config['primarykey']) {
+									$word_join .= " " . $this->_makeJoin($table_config);
+								}
+								$word_rank = "rank + ";
+							}
+							if (isset($field_config['prepare'])) {
+								if (is_array($field_config['prepare']))
+									$or_with = array_merge($or_with, $field_config['prepare']);
+								else
+									$or_with[] = $field_config['prepare'];
+								$or_prepare[$code] = $field_config['prepare'];
+								unset($table_config['searchfields'][$code]['prepare']);
+								unset($field_config['prepare']);
+							}
+							if (isset($field_config['join'])) {
+								$word_join .= " " . $this->_makeJoin($field_config['join'], $jointype);
+							}
+
+							$id = "w" . ($id_offset + count($or_with));
+							$or_with[] = "
+								" . $id . " (" . $table_config['primarykey'] . ", rank) AS (
+								SELECT
+									" . $word_from . "." . $table_config['primarykey'] . ",
+									" . $word_rank . $rank . " AS rank
+									FROM " . $word_from . "
+									" . $word_join . "
+									" . $where . "
+								)";
+							$current_select = $id;
+						}
+					}
+					if ($skip)
+						break;
+					$count += count($words);
+				}
+
+				if (!$count || !$current_select)
+					continue;
+
+				$or_select[] = "
+					SELECT " . $table_config['primarykey'] . ", rank / " . $count . " AS rank FROM " . $current_select;
+			}
+
+			$sqlWith = array_merge($sqlWith, $or_with);
+			$sql_select = array_merge($sql_select, $or_select);
+		}
+
+		return $sql_select;
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods
 
-	/**
-	 * Checks:
-	 * - The given searchstr is a not empty string
-	 * - The given types is a not empty array and contains allowed search types
-	 */
-	private function _checkParameters($searchstr, $types)
-	{
-		// If searchstr is empty
-		if (isEmptyString($searchstr)) return error(self::ERROR_WRONG_SEARCHSTR);
-
-		// If types is not an array or it is empty
-		if (isEmptyArray($types)) return error(self::ERROR_NO_TYPES);
-
-		// If all the elements in types are allowed search types
-		if (!isEmptyArray(array_diff($types, self::ALLOWED_TYPES))) return error(self::ERROR_WRONG_TYPES);
-
-		return success(); // The check is fine!
-	}
-
-	/**
-	 * Loops on types and perform the search of that type using searchstr
-	 * Then it collects all the returned data into an array as property of an object
-	 */
-	private function _search($searchstr, $types)
-	{
-		// Object to be returned
-		$result = new stdClass();
-		$result->data = array();
-
-		// For each search type
-		foreach ($types as $type)
-		{
-			// Perform the search and then add the result to data
-			$result->data = array_merge($result->data, $this->{'_'.$type}($searchstr, $type));
-		}
-
-		return $result;
-	}
-
-	private function _mitarbeiter_ohne_zuordnung($searchstr, $type) 
-	{
-		$dbModel = new DB_Model();
-
-		$sql = '
-			SELECT
-				\''.$type.'\' AS type,
-				b.uid AS uid,
-				p.person_id AS person_id,
-				p.vorname || \' \' || p.nachname AS name,
-				ARRAY_AGG(DISTINCT(org.bezeichnung)) AS organisationunit_name,
-				COALESCE(b.alias, b.uid) || \''.'@'.DOMAIN.'\' AS email,
-				TRIM(COALESCE(k.kontakt, \'\') || \' \' || COALESCE(m.telefonklappe, \'\')) AS phone,
-				\''.base_url(self::PHOTO_IMG_URL).'\' || p.person_id AS photo_url, 
-				ARRAY_AGG(DISTINCT(stdkst.bezeichnung)) AS standardkostenstelle 
-			  FROM public.tbl_mitarbeiter m
-			  JOIN public.tbl_benutzer b ON(b.uid = m.mitarbeiter_uid)
-			  LEFT JOIN (
-				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
-				  FROM public.tbl_benutzerfunktion bf
-				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
-				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
-				 WHERE bf.funktion_kurzbz = \'kstzuordnung\'
-				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
-				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
-				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
-			) stdkst ON stdkst.uid = b.uid 
-			  JOIN public.tbl_person p USING(person_id)
-			  LEFT JOIN (
-				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
-				  FROM public.tbl_benutzerfunktion bf
-				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
-				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
-				 WHERE bf.funktion_kurzbz = \'oezuordnung\'
-				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
-				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
-				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
-			) org ON org.uid = b.uid 
-		     LEFT JOIN (
-				SELECT kontakt, standort_id
-				  FROM public.tbl_kontakt
-				 WHERE kontakttyp = \'telefon\'
-			) k ON(k.standort_id = m.standort_id)
-			 WHERE 
-				(stdkst.bezeichnung IS NULL 
-				OR org.bezeichnung IS NULL) 
-				AND (
-			' .
-			$this->buildSearchClause(
-				$dbModel, 
-				array('b.uid', 'p.vorname', 'p.nachname'), 
-				$searchstr
-			) .
-			'
-				)
-		      GROUP BY type, b.uid, p.person_id, name, email, m.telefonklappe, phone
-		';
-
-		$employees = $dbModel->execReadOnlyQuery($sql);
-		
-		// If something has been found then return it
-		if (hasData($employees)) return getData($employees);
-
-		// Otherwise return an empty array
-		return array();
-	}
-
-	protected function buildSearchClause(DB_Model $dbModel, array $columns, $searchstr)
-	{
-		$document			 = implode(' || \' \' || ', $columns);
-		$query				 = '\'' . implode(':* & ', explode(' ', trim($searchstr))) . ':*\'';
-		$reversequery		 = '\'*:' . implode(' & *:', explode(' ', trim($searchstr))) . '\'';
-		$nospacequery		 = '\'' . implode('', explode(' ', trim($searchstr))) . ':*\'';
-
-		$searchclause = <<<EOSC
-			to_tsvector(lower(regexp_replace({$document}, '[[:punct:]]', ' ', 'g'))) @@ to_tsquery(lower({$query}))
-			OR
-			to_tsvector(reverse(lower(regexp_replace({$document}, '[[:punct:]]', ' ', 'g')))) @@ to_tsquery(reverse(lower({$reversequery})))
-			OR
-			to_tsvector(lower(regexp_replace({$document}, '[[:punct:]]', ' ', 'g'))) @@ to_tsquery(lower({$nospacequery}))
-	
-EOSC;
-
-		return $searchclause;
-	}
-
-	/**
-	 * Search for employees
-	 */
-	private function _mitarbeiter($searchstr, $type)
-	{
-		$dbModel = new DB_Model();
-
-		$employees = $dbModel->execReadOnlyQuery('
-			SELECT
-				\''.$type.'\' AS type,
-				b.uid AS uid,
-				p.person_id AS person_id,
-				p.vorname || \' \' || p.nachname AS name,
-				ARRAY_AGG(DISTINCT(org.bezeichnung)) AS organisationunit_name,
-				COALESCE(b.alias, b.uid) || \''.'@'.DOMAIN.'\' AS email,
-				TRIM(COALESCE(k.kontakt, \'\') || \' \' || COALESCE(m.telefonklappe, \'\')) AS phone,
-				\''.base_url(self::PHOTO_IMG_URL).'\' || p.person_id AS photo_url, 
-				ARRAY_AGG(DISTINCT(stdkst.bezeichnung)) AS standardkostenstelle 
-			  FROM public.tbl_mitarbeiter m
-			  JOIN public.tbl_benutzer b ON(b.uid = m.mitarbeiter_uid)
-			  JOIN (
-				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
-				  FROM public.tbl_benutzerfunktion bf
-				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
-				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
-				 WHERE bf.funktion_kurzbz = \'kstzuordnung\'
-				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
-				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
-				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
-			) stdkst ON stdkst.uid = b.uid 
-			  JOIN public.tbl_person p USING(person_id)
-			  JOIN (
-				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
-				  FROM public.tbl_benutzerfunktion bf
-				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
-				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
-				 WHERE bf.funktion_kurzbz = \'oezuordnung\'
-				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
-				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
-				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
-			) org ON org.uid = b.uid 
-		     LEFT JOIN (
-				SELECT kontakt, standort_id
-				  FROM public.tbl_kontakt
-				 WHERE kontakttyp = \'telefon\'
-			) k ON(k.standort_id = m.standort_id)
-			 WHERE ' .
-			$this->buildSearchClause(
-				$dbModel, 
-				array('b.uid', 'p.vorname', 'p.nachname', 'org.bezeichnung', 'stdkst.bezeichnung'), 
-				$searchstr
-			) .
-			'
-		      GROUP BY type, b.uid, p.person_id, name, email, m.telefonklappe, phone
-		');
-
-		// If something has been found then return it
-		if (hasData($employees)) return getData($employees);
-
-		// Otherwise return an empty array
-		return array();
-	}
-
-	/**
-	 * Seach for organisation units
-	 */
-	private function _organisationunit($searchstr, $type)
-	{
-		$dbModel = new DB_Model();
-
-		$ous = $dbModel->execReadOnlyQuery('
-			SELECT
-				\''.$type.'\' AS type,
-				o.oe_kurzbz AS oe_kurzbz,
-				\'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS name,
-				oParent.oe_kurzbz AS parentoe_kurzbz,
-				(CASE WHEN oParent.bezeichnung IS NOT NULL THEN \'[\' || otParent.bezeichnung || \'] \' || oParent.bezeichnung END) AS parentoe_name,
-				ARRAY_AGG(DISTINCT(bfLeader.uid)) AS leader_uid,
-				ARRAY_AGG(DISTINCT(bfLeader.vorname || \' \' || bfLeader.nachname)) AS leader_name,
-				COUNT(bfCount.benutzerfunktion_id) AS number_of_people,
-				(CASE WHEN o.mailverteiler = TRUE THEN o.oe_kurzbz || \''.'@'.DOMAIN.'\' END) AS mailgroup
-			  FROM public.tbl_organisationseinheit o
-			  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
-		     LEFT JOIN public.tbl_organisationseinheit oParent ON(oParent.oe_kurzbz = o.oe_parent_kurzbz)
-			 LEFT JOIN public.tbl_organisationseinheittyp otParent ON(oParent.organisationseinheittyp_kurzbz = otParent.organisationseinheittyp_kurzbz)
-		     LEFT JOIN (
-				SELECT benutzerfunktion_id, oe_kurzbz
-				  FROM public.tbl_benutzerfunktion
-				 WHERE funktion_kurzbz = \'oezuordnung\'
-				   AND (datum_von IS NULL OR datum_von <= NOW())
-				   AND (datum_bis IS NULL OR datum_bis >= NOW())
-			) bfCount ON(bfCount.oe_kurzbz = o.oe_kurzbz)
-		     LEFT JOIN (
-				SELECT bf.oe_kurzbz, bf.uid, p.vorname, p.nachname
-				  FROM public.tbl_benutzerfunktion bf
-				  JOIN public.tbl_benutzer b USING(uid)
-				  JOIN public.tbl_person p USING(person_id)
-				 WHERE funktion_kurzbz = \'Leitung\'
-				   AND (datum_von IS NULL OR datum_von <= NOW())
-				   AND (datum_bis IS NULL OR datum_bis >= NOW())
-				   AND b.aktiv = TRUE
-			) bfLeader ON(bfLeader.oe_kurzbz = o.oe_kurzbz)
-			 WHERE ' .
-			$this->buildSearchClause(
-				$dbModel, 
-				array('o.oe_kurzbz', 'o.bezeichnung', 'ot.bezeichnung'), 
-				$searchstr
-			) .
-			'
-		      GROUP BY type, o.oe_kurzbz, o.bezeichnung, ot.bezeichnung, oParent.oe_kurzbz, oParent.bezeichnung, otParent.bezeichnung
-		');
-
-		// If something has been found
-		if (hasData($ous))
-		{
-			// Loop through the returned dataset
-			foreach (getData($ous) as $ou)
-			{
-				// Create the new property leaders as an empty array
-				$ou->leaders = array();
-
-				// Loop through the found leaders for this organisation unit
-				for ($i = 0; $i < count($ou->leader_uid); $i++)
-				{
-					// If a leader exists for this organisationunit and has a name :D
-					if (!isEmptyString($ou->leader_uid[$i]) && !isEmptyString($ou->leader_name[$i]))
-					{
-						// Empty object that will contains the leader uid and name
-						$leader = new stdClass();
-						// Set the properties name and uid
-						$leader->uid = $ou->leader_uid[$i];
-						$leader->name = $ou->leader_name[$i];
-						// Add the leader object to the leaders array
-						$ou->leaders[] = $leader;
-					}
-				}
-
-				// Remove the not needed properties leader_uid and leader_name
-				unset($ou->leader_uid);
-				unset($ou->leader_name);
-			}
-
-			// Returns the changed dataset
-			return getData($ous);
-		}
-
-		// Otherwise return an empty array
-		return array();
-	}
-
-	/**
-	 * Search for persons
-	 */
-	private function _person($searchstr, $type)
-	{
-		return array();
-	}
-
-	/**
-	 * Search for students
-	 */
-	private function _student($searchstr, $type)
-	{
-		$dbModel = new DB_Model();
-
-		$students = $dbModel->execReadOnlyQuery('
-		SELECT
-			\''.$type.'\' AS type,
-			s.student_uid AS uid,
-			s.matrikelnr,
-			p.person_id AS person_id,
-			p.vorname || \' \' || p.nachname AS name,
-			k.kontakt as email ,
-			p.foto
-			FROM public.tbl_student s
-			JOIN public.tbl_benutzer b ON(b.uid = s.student_uid)
-			JOIN public.tbl_person p USING(person_id)
-			LEFT JOIN (
-				SELECT kontakt, person_id
-				FROM public.tbl_kontakt
-					WHERE kontakttyp = \'email\'
-			) as k USING(person_id)
-				WHERE b.uid ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
-			OR p.vorname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
-			OR p.nachname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
-					GROUP BY type, s.student_uid, s.matrikelnr, p.person_id, name, email, p.foto
-	');
-
-		// If something has been found then return it
-		if (hasData($students)) return getData($students);
-
-		// Otherwise return an empty array
-		return array();
-	}
-
-	/**
-	 * Search for prestudents
-	 */
-	private function _prestudent($searchstr, $type)
-	{
-		$dbModel = new DB_Model();
-
-		$prestudent = $dbModel->execReadOnlyQuery('
-		SELECT
-			\''.$type.'\' AS type,
-			ps.prestudent_id,
-			ps.studiengang_kz,
-			p.person_id AS person_id,
-			b.uid,
-			p.vorname || \' \' || p.nachname AS name,
-			(
-				SELECT kontakt
-				FROM public.tbl_kontakt
-				WHERE kontakttyp = \'email\'
-				AND person_id = p.person_id
-				LIMIT 1
-			) as email,
-			p.foto,
-			sg.bezeichnung
-			FROM public.tbl_prestudent ps
-			LEFT JOIN public.tbl_student s USING (prestudent_id)
-			LEFT JOIN public.tbl_benutzer b ON (b.uid = s.student_uid)
-			JOIN public.tbl_person p ON (p.person_id = ps.person_id)
-			LEFT JOIN public.tbl_studiengang sg ON (sg.studiengang_kz = ps.studiengang_kz)
-			WHERE b.uid ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
-				OR p.vorname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
-				OR p.nachname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
-				or cast(ps.prestudent_id as text) ILIKE \'%'.$dbModel->escapeLIKE($searchstr).'%\'
-			GROUP BY type, b.uid, ps.prestudent_id, ps.studiengang_kz, sg.bezeichnung, s.student_uid, s.matrikelnr, p.person_id, name, email, p.foto
-			');
-
-		// If something has been found then return it
-		if (hasData($prestudent)) return getData($prestudent);
-
-		// Otherwise return an empty array
-		return array();
-	}
-
 	/**
 	 * Search for documents
 	 */
@@ -456,5 +702,324 @@ EOSC;
 	{
 		return array();
 	}
-}
 
+	/**
+	 * Checks if an array has at least on non numeric value.
+	 *
+	 * @param array								$arr
+	 *
+	 * @return boolean
+	 */
+	private function _hasAtLeastOneNaN($arr)
+	{
+		foreach ($arr as $value)
+			if (!is_numeric($value))
+				return true;
+		return false;
+	}
+
+	/**
+	 * Helper function for getDynamicSearchSql
+	 *
+	 * @param array								$join
+	 * @param string							$prefix
+	 *
+	 * @return string
+	 */
+	private function _makeJoin($join, $prefix = "")
+	{
+		if (!is_array($join))
+			return "";
+		if (!isset($join['table'])) {
+			$output = [];
+			foreach ($join as $j)
+				$output[] = trim($this->_makeJoin($j, $prefix));
+			return implode(" ", $output);
+		}
+		if (!isset($join['on']) && !isset($join['using']) && !isset($join['primarykey']))
+			return "";
+		$output = $prefix . " JOIN " . $join['table'];
+
+		if (isset($join['using']))
+			return $output . " USING (" . $join['using'] . ")";
+
+		if (isset($join['primarykey']))
+			return $output . " USING (" . $join['primarykey'] . ")";
+
+		return $output . " ON (" . $join['on'] . ")";
+	}
+
+	/**
+	 * Helper function for _makeRank, _makeCompare and _makeCompareBool
+	 *
+	 * @param string							$function
+	 * @param string							$mode
+	 * @param string							$field
+	 * @param string							$word
+	 *
+	 * @return string
+	 */
+	private function _makeFunction($function, $mode, $field, $word)
+	{
+		$searchfunction = $this->_ci->config->item($mode, 'searchfunctions');
+
+		if (!$searchfunction)
+			return "";
+		$tpl = $searchfunction[$function] ?? "";
+		
+		if (strstr($tpl, '{field}'))
+			$tpl = str_replace('{field}', $field, $tpl);
+
+		if (strstr($tpl, '{word}'))
+			$tpl = str_replace('{word}', $this->_ci->db->escape($word), $tpl);
+		if (strstr($tpl, '{like:word}'))
+			$tpl = str_replace('{like:word}', "'%" . $this->_ci->db->escapeLike($word) . "%'", $tpl);
+		
+		return $tpl;
+	}
+
+	/**
+	 * Helper function for getDynamicSearchSql
+	 *
+	 * @param string							$mode
+	 * @param string							$field
+	 * @param string							$word
+	 *
+	 * @return string
+	 */
+	private function _makeRank($mode, $field, $word)
+	{
+		return $this->_makeFunction('rank', $mode, $field, $word);
+	}
+
+	/**
+	 * Helper function for getDynamicSearchSql
+	 *
+	 * @param string							$mode
+	 * @param string							$field
+	 * @param string							$word
+	 *
+	 * @return string
+	 */
+	private function _makeCompare($mode, $field, $word)
+	{
+		return $this->_makeFunction('compare', $mode, $field, $word);
+	}
+
+	/**
+	 * Helper function for getDynamicSearchSql
+	 *
+	 * @param string							$mode
+	 * @param string							$field
+	 * @param string							$word
+	 *
+	 * @return string
+	 */
+	private function _makeCompareBool($mode, $field, $word)
+	{
+		$searchfunction = $this->_ci->config->item($mode, 'searchfunctions');
+
+		if (!$searchfunction)
+			return "";
+		$function = isset($searchfunction['compare_boolean']) ? 'compare_boolean' : 'compare';
+		return $this->_makeFunction($function, $mode, $field, $word);
+	}
+
+	/**
+	 * Converts the search string to an array.
+	 * First level should be joined with an OR.
+	 * Second level should be joined with an AND or AND NOT.
+	 * It is an associative array where the key is a code for the field
+	 * which the words should be compared with and the value is the array
+	 * of words.
+	 * Use AND NOT if the first letter in the key is "!".
+	 * Use AND if the first letter in the key is not "!".
+	 * E.g:
+	 * If the key is:
+	 * "": the words should be compared to all fields with AND.
+	 * "!": the words should be compared to all fields with AND NOT.
+	 * "somefield": the words should be compared to the field somefield with
+	 * AND.
+	 * "!somefield": the words should be compared to the field somefield with
+	 * AND NOT.
+	 *
+	 * @param string							$searchstring
+	 * @param array								$types
+	 *
+	 * @return array
+	 */
+	private function _convertQuery($searchstring, $types)
+	{
+		$searchAllTypes = count($types) == count($this->_ci->config->item('search'));
+		$allowedTypes = array_keys($types);
+
+		$currentArray = [];
+		$outputArray = [];
+		$cleanStrings = [];
+		$cleanSearchstring = '';
+		$filter = ['+' => [], '-' => []];
+		$typeAliases = [];
+
+		$tmp = explode(' ', strtolower($searchstring));
+		while ($tmp) {
+			$chunk = trim(array_shift($tmp));
+			if ($chunk == '')
+				continue;
+
+			if (strpos($chunk, '"') !== false) {
+				$test = explode('"', $chunk);
+				if (count($test) > 2) {
+					$rest = implode('"', array_slice($test, 2));
+					if ($rest) {
+						array_unshift($tmp, $rest);
+						$chunk = implode('"', array_slice($test, 0, 2)) . '"';
+					}
+				}
+				if (count($test) == 2) {
+					while ($tmp && strpos($test[1], '"') === false) {
+						$test[1] .= ' ' . trim(array_shift($tmp));
+					}
+					if (strpos($test[1], '"') === false) {
+						$chunk = implode('"', $test) . '"';
+					} else {
+						$test2 = explode('"', $test[1], 2);
+						$chunk = $test[0] . '"' . $test2[0] . '"';
+						if ($test2[1]) {
+							array_unshift($tmp, $test2[1]);
+						}
+					}
+				}
+				if (strpos($chunk, ' ') === false) {
+					$chunk = str_replace('"', '', $chunk);
+				}
+			}
+
+			if ($chunk == 'or') {
+				$this->_convertQueryCleanupOr($currentArray, $cleanStrings, $filter, $searchAllTypes, $allowedTypes);
+				$filter = ['+' => [], '-' => []];
+				if ($currentArray) {
+					$cleanSearchstring .= ($cleanSearchstring ? ' or ' : '') . implode(' ', $cleanStrings);
+					$cleanStrings = [];
+					$outputArray[] = $currentArray;
+					$currentArray = [];
+				}
+				continue;
+			}
+
+			if ($chunk == ':' || $chunk == '-' || substr($chunk, -1) == ':')
+				continue;
+
+			if ($chunk[0] == ':' || ($chunk[0] == '-' && $chunk[1] == ':')) {
+				if (!$typeAliases) {
+					foreach ($types as $type => $config) {
+						$typeAliases[$type] = $type;
+						if (isset($config['alias'])) {
+							foreach ($config['alias'] as $alias) {
+								if (!isset($typeAliases[$alias]))
+									$typeAliases[$alias] = $type;
+							}
+						}
+					}
+				}
+
+				$test = explode(':', $chunk, 2);
+				if (isset($typeAliases[$test[1]]))
+					$chunk = $test[0] . ':' . $typeAliases[$test[1]];
+				elseif ($test[0] == '-')
+					continue;
+			}
+
+			if (in_array($chunk, $cleanStrings))
+				continue;
+
+			$cleanStrings[] = $chunk;
+
+			$chunk = str_replace('"', '', $chunk);
+			$code = '';
+
+			if ($chunk[0] == '-') {
+				$code = '!';
+				$chunk = substr($chunk, 1);
+			}
+			if (strpos($chunk, ':') !== false) {
+				$chunk = explode(':', $chunk, 2);
+				if (!$chunk[0]) {
+					$filter[$code ? '-' : '+'][] = $chunk[1];
+					continue;
+				}
+				$code .= $chunk[0];
+				$chunk = $chunk[1];
+			}
+
+			if (!isset($currentArray[$code]))
+				$currentArray[$code] = [];
+			
+			$currentArray[$code][] = $chunk;
+		}
+
+		$this->_convertQueryCleanupOr($currentArray, $cleanStrings, $filter, $searchAllTypes, $allowedTypes);
+		if ($currentArray) {
+			$cleanSearchstring .= ($cleanSearchstring ? ' or ' : '') . implode(' ', $cleanStrings);
+			$outputArray[] = $currentArray;
+		}
+		return [$outputArray, $cleanSearchstring];
+	}
+
+	private function _convertQueryCleanupOr(&$currentArray, &$cleanStrings, $filter, $searchAllTypes, $allowedTypes)
+	{
+		if ($filter['+'] && $filter['-']) {
+			$double = array_intersect($filter['+'], $filter['-']);
+			if ($double) {
+				foreach ($double as $type) {
+					array_splice($cleanStrings, array_search(':' . $type, $cleanStrings), 1);
+					array_splice($cleanStrings, array_search('-:' . $type, $cleanStrings), 1);
+				}
+				$filter['+'] = array_diff($filter['+'], $double);
+				$filter['-'] = array_diff($filter['-'], $double);
+			}
+			if (!$filter['+'] && !$filter['-']) {
+				// All filters cancel each other out
+				$currentArray = [];
+				$cleanStrings = [];
+				return;
+			}
+			if ($filter['+']) {
+				foreach ($filter['-'] as $type) {
+					array_splice($cleanStrings, array_search('-:' . $type, $cleanStrings), 1);
+				}
+				$filter['-'] = [];
+			}
+		}
+		if ($filter['+']) {
+			$cleanFilter = array_intersect($allowedTypes, $filter['+']);
+			if (!$cleanFilter) {
+				// All filters are forbidden
+				$currentArray = [];
+				$cleanStrings = [];
+				return;
+			}
+			$forbiddenFilter = array_diff($cleanFilter, $filter['+']);
+			foreach ($forbiddenFilter as $type) {
+				array_splice($cleanStrings, array_search(':' . $type, $cleanStrings), 1);
+			}
+			$filter['+'] = $cleanFilter;
+		} elseif ($filter['-']) {
+			$filter['+'] = array_diff($allowedTypes, $filter['-']);
+			if (!$searchAllTypes) {
+				foreach ($filter['+'] as $type)
+					$cleanStrings[] = ':' . $type;
+				foreach ($filter['-'] as $type)
+					array_splice($cleanStrings, array_search('-:' . $type, $cleanStrings), 1);
+			}
+		} else {
+			if (!$searchAllTypes) {
+				foreach ($allowedTypes as $type)
+					$cleanStrings[] = ':' . $type;
+			}
+		}
+
+		if ($filter['+']) {
+			$currentArray['-filter'] = $filter['+'];
+		}
+	}
+}
diff --git a/public/css/components/searchbar.css b/public/css/components/searchbar.css
index 2bbaf9d67..61032d227 100644
--- a/public/css/components/searchbar.css
+++ b/public/css/components/searchbar.css
@@ -92,4 +92,42 @@
 
 .searchbar_inline_ul li {
     list-style: none;
+}
+
+/* new variant with template/frame */
+
+.searchbar-result {
+    border-bottom: 1px solid lightgrey;
+    margin-bottom: 1rem;
+    padding-bottom: 1rem;
+}
+
+.searchbar-actions {
+    display: flex;
+    flex-wrap: wrap;
+    gap: .5rem;
+    padding: 0;
+    margin: 1rem 0 0;
+}
+
+.searchbar-square-image {
+    position: relative;
+    display: block;
+    height: 0;
+    padding-bottom: 100%;
+}
+
+.searchbar-square-image > * {
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: 100%;
+    width: 100%;
+}
+.searchbar-square-image img {
+    object-fit: cover;
+}
+
+.no-margin-paragraphs p {
+    margin: 0;
 }
\ No newline at end of file
diff --git a/public/js/api/search.js b/public/js/api/search.js
index 4655d8fa8..c6a5d77a5 100644
--- a/public/js/api/search.js
+++ b/public/js/api/search.js
@@ -16,9 +16,9 @@
  */
 
 export default {
-	search(searchsettings) {
+	search(searchsettings, config) {
 		const url = '/api/frontend/v1/searchbar/search';
-		return this.$fhcApi.post(url, searchsettings);
+		return this.$fhcApi.post(url, searchsettings, config);
 	},
 	searchdummy(searchsettings) {
 		const url = 'public/js/apps/api/dummyapi.php/Search';
diff --git a/public/js/components/searchbar/result/employee.js b/public/js/components/searchbar/result/employee.js
new file mode 100644
index 000000000..1c4da075a
--- /dev/null
+++ b/public/js/components/searchbar/result/employee.js
@@ -0,0 +1,59 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+	components: {
+		TemplateFrame
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object
+	},
+	template: `
+	<template-frame
+		class="searchbar-result-student"
+		:res="res"
+		:actions="actions"
+		:title="res.name"
+		:image="res.photo_url"
+		image-fallback="fas fa-user-circle fa-7x"
+		@actionexecuted="$emit('actionexecuted')"
+		>
+		<div class="searchbar_table">
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Standard-Kostenstelle</div>
+				<div class="searchbar_tablecell">
+					<ul class="searchbar_inline_ul" v-if="res.standardkostenstelle.length > 0">
+						<li v-for="(stdkst, idx) in res.standardkostenstelle" :key="idx">{{ stdkst }}</li>
+					</ul>
+					<span v-else="">keine</span>
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Organisations-Einheit</div>
+				<div class="searchbar_tablecell">
+					<ul class="searchbar_inline_ul" v-if="res.organisationunit_name.length > 0">
+						<li v-for="(oe, idx) in res.organisationunit_name" :key="idx">{{ oe }}</li>
+					</ul>
+					<span v-else="">keine</span>
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">EMails</div>
+				<div class="searchbar_tablecell">
+					<a :href="'mailto:' + res.email" class="d-block">
+						{{ res.email }}
+					</a>
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Telefon</div>
+				<div class="searchbar_tablecell">
+					<a :href="'tel:' + res.phone" class="d-block">
+						{{ res.phone }}
+					</a>
+				</div>
+			</div>
+		</div>
+	</template-frame>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
new file mode 100644
index 000000000..f6b07f3d2
--- /dev/null
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -0,0 +1,166 @@
+import TemplateFrame from "./template/frame.js";
+import TemplateAction from "./template/action.js";
+
+export default {
+	components: {
+		TemplateFrame,
+		TemplateAction
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object
+	},
+	computed: {
+		telurl() {
+			return 'tel:' + this.employee?.phone;
+		},
+		person() {
+			const person = this.res.list.filter(item => item.type == 'person');
+			if (person.length)
+				return person.pop();
+
+			const { person_id, name, foto, photo_url, email } = this.res.list[0];
+			return { person_id, name, foto, photo_url, email };
+		},
+		employee() {
+			const ma = this.res.list.filter(item => [
+				'employee',
+				'unassigned_employee'
+			].includes(item.type));
+			return ma.length ? ma.pop() : null;
+		},
+		students() {
+			const students = this.res.list.filter(item => item.type == 'prestudent');
+			return students.length ? students : null;
+		},
+		foto() {
+			if (this.person.foto)
+				return 'data:image/jpeg;base64,' + this.person.foto;
+			return this.person.photo_url;
+		},
+		emails() {
+			if (Array.isArray(this.person.email))
+				return this.person.email;
+			return [this.person.email];
+		}
+	},
+	template: `
+	<template-frame
+		class="searchbar-result-mergedperson"
+		:res="person"
+		:actions="actions"
+		:title="person.name"
+		:image="foto"
+		image-fallback="fas fa-user-circle fa-7x"
+		@actionexecuted="$emit('actionexecuted')"
+		>
+		<div class="searchbar_table">
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Person ID</div>
+				<div class="searchbar_tablecell">
+					{{ person.person_id }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">EMails</div>
+				<div class="searchbar_tablecell">
+					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
+						{{ email }}
+					</a>
+				</div>
+			</div>
+
+			<template v-if="employee">
+				<div class="searchbar_tablerow">
+					<div class="searchbar_tablecell">
+						<template-action
+							:res="employee"
+							:action="actions.defaultactionemployee || actions.defaultaction"
+							@actionexecuted="$emit('actionexecuted')"
+							>
+							Mitarbeiter
+						</template-action>
+					</div>
+				</div>
+				<div class="searchbar_tablerow">
+					<div class="searchbar_tablecell ps-3">Standard-Kostenstelle</div>
+					<div class="searchbar_tablecell">
+						<ul class="searchbar_inline_ul" v-if="employee.standardkostenstelle.length > 0">
+							<li
+								v-for="(stdkst, idx) in employee.standardkostenstelle"
+								:key="idx"
+								>
+								{{ stdkst }}
+							</li>
+						</ul>
+						<span v-else="">keine</span>
+					</div>
+				</div>
+				<div class="searchbar_tablerow">
+					<div class="searchbar_tablecell ps-3">Organisations-Einheit</div>
+					<div class="searchbar_tablecell">
+						<ul class="searchbar_inline_ul" v-if="employee.organisationunit_name.length > 0">
+							<li
+								v-for="(oe, idx) in employee.organisationunit_name"
+								:key="idx"
+								>
+								{{ oe }}
+							</li>
+						</ul>
+						<span v-else="">keine</span>
+					</div>
+				</div>
+				<div class="searchbar_tablerow">
+					<div class="searchbar_tablecell ps-3">Telefon</div>
+					<div class="searchbar_tablecell">
+						<a :href="telurl">
+							{{ employee.phone }}
+						</a>
+					</div>
+				</div>
+			</template>
+
+			<template v-if="students">
+				<template v-for="student in students">
+					<div class="searchbar_tablerow">
+						<div class="searchbar_tablecell">
+							<template-action
+								v-if="actions.defaultaction"
+								:res="student"
+								:action="actions.defaultactionstudent || actions.defaultaction"
+								@actionexecuted="$emit('actionexecuted')"
+								>
+								{{ student.status }} ({{ student.stg_kuerzel }})
+							</template-action>
+						</div>
+					</div>
+					<div class="searchbar_tablerow">
+						<div class="searchbar_tablecell ps-3">Studiengang</div>
+						<div class="searchbar_tablecell">
+							{{ student.bezeichnung }}
+						</div>
+					</div>
+					<div class="searchbar_tablerow">
+						<div class="searchbar_tablecell ps-3">Prestudent ID</div>
+						<div class="searchbar_tablecell">
+							{{ student.prestudent_id }}
+						</div>
+					</div>
+					<div v-if="student.uid" class="searchbar_tablerow">
+						<div class="searchbar_tablecell ps-3">Student UID</div>
+						<div class="searchbar_tablecell">
+							{{ student.uid }}
+						</div>
+					</div>
+					<div v-if="student.matrikelnr" class="searchbar_tablerow">
+						<div class="searchbar_tablecell ps-3">Matrikelnummer</div>
+						<div class="searchbar_tablecell">
+							{{ student.matrikelnr }}
+						</div>
+					</div>
+				</template>
+			</template>
+		</div>
+	</template-frame>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/mergedstudent.js b/public/js/components/searchbar/result/mergedstudent.js
new file mode 100644
index 000000000..aa5d7739f
--- /dev/null
+++ b/public/js/components/searchbar/result/mergedstudent.js
@@ -0,0 +1,35 @@
+import ResultPrestudent from "./prestudent.js";
+import ResultStudent from "./student.js";
+
+export default {
+	components: {
+		ResultPrestudent,
+		ResultStudent
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object
+	},
+	computed: {
+		prestudent() {
+			const prestudent = this.res.list.filter(item => item.type == 'prestudent');
+			return prestudent.pop();
+		}
+	},
+	template: `
+	<result-prestudent
+		v-if="prestudent"
+		:res="prestudent"
+		:actions="actions"
+		@actionexecuted="$emit('actionexecuted')"
+		class="searchbar-result-mergedstudent"
+	></result-prestudent>
+	<result-student
+		v-else
+		:res="res.list[0]"
+		:actions="actions"
+		@actionexecuted="$emit('actionexecuted')"
+		class="searchbar-result-mergedstudent"
+	></result-student>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/organisationunit.js b/public/js/components/searchbar/result/organisationunit.js
new file mode 100644
index 000000000..f9b6870e0
--- /dev/null
+++ b/public/js/components/searchbar/result/organisationunit.js
@@ -0,0 +1,63 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+	components: {
+		TemplateFrame
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object
+	},
+	computed: {
+		foto() {
+			if (this.res.foto)
+				return 'data:image/jpeg;base64,' + this.res.foto;
+			return null;
+		}
+	},
+	template: `
+	<template-frame
+		class="searchbar-result-organisationunit"
+		:res="res"
+		:actions="actions"
+		:title="res.name"
+		image-fallback="fas fa-sitemap fa-4x p-4 text-white bg-primary"
+		@actionexecuted="$emit('actionexecuted')"
+		>
+		<div class="searchbar_table">
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">übergeordnete OrgEinheit</div>
+				<div class="searchbar_tablecell">
+					{{ res.parentoe_name }}
+				</div>
+			</div>
+
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Gruppen-EMail</div>
+				<div class="searchbar_tablecell">
+					<a :href="'mailto:' + res.mailgroup">
+						{{ res.mailgroup }}
+					</a>
+				</div>
+			</div>
+
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Leiter</div>
+				<div class="searchbar_tablecell">
+					<ul class="searchbar_inline_ul" v-if="res.leaders.length > 0">
+						<li v-for="(leader, idx) in res.leaders" :key="idx">{{ leader.name }}</li>
+					</ul>
+					<span v-else="">N.N.</span>
+				</div>
+			</div>
+
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Mitarbeiter-Anzahl</div>
+				<div class="searchbar_tablecell">
+					{{ res.number_of_people }}
+				</div>
+			</div>
+		</div>
+	</template-frame>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/person.js b/public/js/components/searchbar/result/person.js
new file mode 100644
index 000000000..f8adee56e
--- /dev/null
+++ b/public/js/components/searchbar/result/person.js
@@ -0,0 +1,46 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+	components: {
+		TemplateFrame
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object
+	},
+	computed: {
+		foto() {
+			if (this.res.foto)
+				return 'data:image/jpeg;base64,' + this.res.foto;
+			return null;
+		}
+	},
+	template: `
+	<template-frame
+		class="searchbar-result-student"
+		:res="res"
+		:actions="actions"
+		:title="res.name"
+		:image="foto"
+		image-fallback="fas fa-user-circle fa-7x"
+		@actionexecuted="$emit('actionexecuted')"
+		>
+		<div class="searchbar_table">
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Person ID</div>
+				<div class="searchbar_tablecell">
+					{{ res.person_id }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">EMails</div>
+				<div class="searchbar_tablecell">
+					<a v-for="email in res.email" :key="email" :href="'mailto:' + email" class="d-block">
+						{{ email }}
+					</a>
+				</div>
+			</div>
+		</div>
+	</template-frame>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/prestudent.js b/public/js/components/searchbar/result/prestudent.js
new file mode 100644
index 000000000..8c174d3c0
--- /dev/null
+++ b/public/js/components/searchbar/result/prestudent.js
@@ -0,0 +1,70 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+	components: {
+		TemplateFrame
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object
+	},
+	computed: {
+		foto() {
+			if (this.res.foto)
+				return 'data:image/jpeg;base64,' + this.res.foto;
+			return null;
+		}
+	},
+	template: `
+	<template-frame
+		class="searchbar-result-prestudent"
+		:res="res"
+		:actions="actions"
+		:title="res.name + ' (' + res.status + ' ' + res.stg_kuerzel + ')'"
+		:image="foto"
+		image-fallback="fas fa-user-circle fa-7x"
+		@actionexecuted="$emit('actionexecuted')"
+		>
+		<div class="searchbar_table">
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Person ID</div>
+				<div class="searchbar_tablecell">
+					{{ res.person_id }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">EMails</div>
+				<div class="searchbar_tablecell">
+					<a v-for="email in res.email" :key="email" :href="'mailto:' + email" class="d-block">
+						{{ email }}
+					</a>
+				</div>
+			</div>
+			<div v-if="res.uid" class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Student UID</div>
+				<div class="searchbar_tablecell">
+					{{ res.uid }}
+				</div>
+			</div>
+			<div v-if="res.matrikelnr" class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Matrikelnummer</div>
+				<div class="searchbar_tablecell">
+					{{ res.matrikelnr }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Prestudent ID</div>
+				<div class="searchbar_tablecell">
+					{{ res.prestudent_id }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Studiengang</div>
+				<div class="searchbar_tablecell">
+					{{ res.bezeichnung }}
+				</div>
+			</div>
+		</div>
+	</template-frame>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/room.js b/public/js/components/searchbar/result/room.js
new file mode 100644
index 000000000..6da1e970a
--- /dev/null
+++ b/public/js/components/searchbar/result/room.js
@@ -0,0 +1,74 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+	components: {
+		TemplateFrame
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object
+	},
+	computed: {
+		equipment() {
+			if (!this.res.equipment)
+				return "";
+			return this.res.equipment.replace(new RegExp('<br />', 'ig'), '');
+		},
+		address() {
+			let address = this.res.zip || '';
+			if (this.res.city)
+				address += (address ? ' ' : '') + this.res.city;
+			if (this.res.street)
+				address += (address ? ', ' : '') + this.res.street;
+			if (this.res.floor)
+				address += (address ? ' / ' : '') + this.res.floor + ' Stockwerk';
+
+			return address || 'N/A';
+		}
+	},
+	template: `
+	<template-frame
+		class="searchbar-result-room"
+		:res="res"
+		:actions="actions"
+		:title="res.ort_kurzbz"
+		image-fallback="fas fa-door-open fa-4x p-4 text-white bg-primary"
+		@actionexecuted="$emit('actionexecuted')"
+		>
+		<div class="searchbar_table">
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Standort</div>
+				<div class="searchbar_tablecell">
+					{{ address }}
+				</div>
+			</div>
+
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Sitzplätze</div>
+				<div class="searchbar_tablecell">
+					<template v-if="res.max_person !== null && res.workplaces !== null">
+						{{ res.max_person }}, davon {{ res.workplaces }} PC-Plätze
+					</template>
+					<template v-else>
+						N/A
+					</template>
+				</div>
+			</div>
+
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Gebäude</div>
+				<div class="searchbar_tablecell">
+					{{ res.building }}
+				</div>
+			</div>
+
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Zusatz Informationen</div>
+				<div class="searchbar_tablecell">
+					<div class="no-margin-paragraphs" v-html="equipment"></div>
+				</div>
+			</div>
+		</div>
+	</template-frame>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/student.js b/public/js/components/searchbar/result/student.js
new file mode 100644
index 000000000..8d8c4894b
--- /dev/null
+++ b/public/js/components/searchbar/result/student.js
@@ -0,0 +1,58 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+	components: {
+		TemplateFrame
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object
+	},
+	computed: {
+		foto() {
+			if (this.res.foto)
+				return 'data:image/jpeg;base64,' + this.res.foto;
+			return null;
+		}
+	},
+	template: `
+	<template-frame
+		class="searchbar-result-student"
+		:res="res"
+		:actions="actions"
+		:title="res.name"
+		:image="foto"
+		image-fallback="fas fa-user-circle fa-7x"
+		@actionexecuted="$emit('actionexecuted')"
+		>
+		<div class="searchbar_table">
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Student UID</div>
+				<div class="searchbar_tablecell">
+					{{ res.uid }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Person ID</div>
+				<div class="searchbar_tablecell">
+					{{ res.person_id }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Matrikelnummer</div>
+				<div class="searchbar_tablecell">
+					{{ res.matrikelnr }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">EMails</div>
+				<div class="searchbar_tablecell">
+					<a v-for="email in res.email" :key="email" :href="'mailto:' + email" class="d-block">
+						{{ email }}
+					</a>
+				</div>
+			</div>
+		</div>
+	</template-frame>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/template/action.js b/public/js/components/searchbar/result/template/action.js
new file mode 100644
index 000000000..a7654df59
--- /dev/null
+++ b/public/js/components/searchbar/result/template/action.js
@@ -0,0 +1,28 @@
+export default {
+	emits: [ 'actionexecuted' ],
+	props: { 
+		res: Object,
+		action: Object
+	},
+	computed: {
+		actionHref() {
+			if (this.action.type !== 'link')
+				return 'javascript:void(0);';
+			return typeof this.action.action === 'function'
+				? this.action.action(this.res) 
+				: this.action.action;
+		}
+	},
+	methods: {
+		actionFunc() {
+			if (this.action.type !== 'function')
+				return;
+			this.action.action(this.res);
+			this.$emit('actionexecuted');
+		}
+	},
+	template: `
+	<a :href="actionHref" @click="actionFunc">
+		<slot>Action</slot>
+	</a>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/template/actions.js b/public/js/components/searchbar/result/template/actions.js
new file mode 100644
index 000000000..5849594ed
--- /dev/null
+++ b/public/js/components/searchbar/result/template/actions.js
@@ -0,0 +1,26 @@
+import ResultAction from "./action.js";
+
+export default {
+	components: {
+		ResultAction
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Array
+	},
+	template: `
+	<div v-if="actions.length" class="searchbar-actions">
+		<result-action
+			v-for="(action, index) in actions"
+			:key="action.label"
+			:res="res"
+			:action="action"
+			class="btn btn-primary btn-sm"
+			@actionexecuted="$emit('actionexecuted')"
+			>
+			<i v-if="action.icon" :class="action.icon"></i>
+			<span class="p-2">{{ action.label }}</span>
+		</result-action>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/template/frame.js b/public/js/components/searchbar/result/template/frame.js
new file mode 100644
index 000000000..87078a166
--- /dev/null
+++ b/public/js/components/searchbar/result/template/frame.js
@@ -0,0 +1,59 @@
+import ResultAction from "./action.js";
+import ResultActions from "./actions.js";
+
+export default {
+	components: {
+		ResultAction,
+		ResultActions
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object,
+		title: String,
+		image: String,
+		imageFallback: String
+	},
+	template: `
+	<div class="searchbar-result">
+		<div class="searchbar_grid">
+			<div class="searchbar_icon">
+				<result-action
+					:res="res"
+					:action="actions.defaultaction"
+					@actionexecuted="$emit('actionexecuted')"
+					class="searchbar-square-image"
+					>
+					<img
+						v-if="image"
+						:src="image"
+						class="rounded-circle"
+						/>
+					<div v-else class="d-flex justify-content-center align-items-center rounded-circle overflow-hidden">
+						<i :class="imageFallback"></i>
+					</div>
+				</result-action>
+			</div>
+
+			<div class="searchbar_data">
+				<result-action
+					:res="res"
+					:action="actions.defaultaction"
+					@actionexecuted="$emit('actionexecuted')"
+					class="mb-3"
+					>
+					<span class="fw-bold">{{ title }}</span>
+				</result-action>
+
+				<slot></slot>
+
+				<result-actions
+					:res="res"
+					:actions="actions.childactions"
+					@actionexecuted="$emit('actionexecuted')"
+					>
+				</result-actions>
+			</div>
+		</div>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index d23ab2226..54049679e 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -1,168 +1,282 @@
-import person from "./person.js";
-import raum from "./raum.js";
-import employee from "./employee.js";
-import organisationunit from "./organisationunit.js";
-import student from "./student.js";
-import prestudent from "./prestudent.js";
+import ResultPerson from "./result/person.js";
+import ResultStudent from "./result/student.js";
+import ResultPrestudent from "./result/prestudent.js";
+import ResultEmployee from "./result/employee.js";
+import ResultOrganisationunit from "./result/organisationunit.js";
+import ResultRoom from "./result/room.js";
+import ResultMergedperson from "./result/mergedperson.js";
+import ResultMergedstudent from "./result/mergedstudent.js";
+
+// TODO(chris): arrays in results
 
 export default {
-    props: [ "searchoptions", "searchfunction" ],
-    data: function() {
-      return {
-        searchtimer: null,
-        hidetimer: null,
-        showsettings: false,
-        searchsettings: {
-            searchstr: '',
-            types: []
-        },
-        showresult: false,        
-        searchresult: [],
-        searching: false,
-        error: null
-      };
-    },
-    components: {
-      person: person,
-      raum: raum,
-      employee: employee,
-      organisationunit: organisationunit,
-      student: student,
-      prestudent: prestudent
-    },
-    template: `
-          <form ref="searchform" class="d-flex me-3 position-relative" action="javascript:void(0);" 
-            @focusin="this.searchfocusin" @focusout="this.searchfocusout">
-            <div class="input-group me-2 bg-white">
-                <input ref="searchbox" @keyup="this.search" @focus="this.showsearchresult" 
-                    v-model="this.searchsettings.searchstr" class="form-control"
-                    type="search" placeholder="Suche..." aria-label="Search">
-                <button ref="settingsbutton" @click="this.togglesettings" class="btn btn-light border-start" type="button" id="search-filter"><i class="fas fa-cog"></i></button>
-            </div>            
-        
-            <div v-show="this.showresult" ref="result" 
-                 class="searchbar_results" tabindex="-1">
-              <div v-if="this.searching">
-                <i class="fas fa-spinner fa-spin fa-2x"></i>
-              </div>
-              <div v-else-if="this.error !== null">{{ this.error }}</div>
-              <div v-else-if="this.searchresult.length < 1">Es wurden keine Ergebnisse gefunden.</div>
-              <template v-else="" v-for="res in this.searchresult">
-                <person v-if="res.type === 'person'" :res="res" :actions="this.searchoptions.actions.person" @actionexecuted="this.hideresult"></person>
-                <student v-else-if="res.type === 'student'" :res="res" :actions="this.searchoptions.actions.student" @actionexecuted="this.hideresult"></student>
-                <prestudent v-else-if="res.type === 'prestudent'" :res="res" :actions="this.searchoptions.actions.prestudent" @actionexecuted="this.hideresult"></prestudent>
-                <employee v-else-if="res.type === 'mitarbeiter'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
-                <employee v-else-if="res.type === 'mitarbeiter_ohne_zuordnung'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
-                <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
-                <raum v-else-if="res.type === 'raum'" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
-                <div v-else="">Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
-              </template>
-            </div>
-            <div v-show="this.showsettings" ref="settings" 
-                 class="searchbar_settings" tabindex="-1">
-              <div class="btn-group" v-if="this.searchoptions.types.length > 0">
-                <template v-for="(type, index) in this.searchoptions.types" :key="type">
-                  <input type="checkbox" class="btn-check" :id="this.$.uid + 'search_type_' + index" :value="type" v-model="this.searchsettings.types"/>
-                  <label class="btn btn-outline-secondary" :for="this.$.uid + 'search_type_' + index">{{ type }}</label>
-                </template>
-              </div>
-              <div class="mb-2"></div>
-              <button ref="settingsrefreshsearch" @click="this.refreshsearch" class="btn btn-primary" type="button">Übernehmen</button>
-            </div>
-        
-          </form>
-    `,
-    beforeMount: function() {
-        this.updateSearchOptions();
-    },
-    methods: {
-        updateSearchOptions: function() {
-            this.searchsettings.types = [];
-            for( const idx in this.searchoptions.types ) {
-                this.searchsettings.types.push(this.searchoptions.types[idx]);
-            }
-        },
-        calcSearchResultExtent: function() {
-            var rect = this.$refs.searchbox.getBoundingClientRect();
+	components: {
+		ResultPerson,
+		ResultStudent,
+		ResultPrestudent,
+		ResultEmployee,
+		ResultOrganisationunit,
+		ResultRoom,
+		ResultMergedperson,
+		ResultMergedstudent
+	},
+	props: [ "searchoptions", "searchfunction" ],
+	data() {
+		return {
+			searchtimer: null,
+			hidetimer: null,
+			showsettings: false,
+			searchsettings: {
+				searchstr: '',
+				types: []
+			},
+			showresult: false,        
+			searchresult: [],
+			searching: false,
+			error: null,
+			abortController: null,
+			retry: 5
+		};
+	},
+	beforeMount() {
+		this.updateSearchOptions();
+	},
+	methods: {
+		updateSearchOptions() {
+			this.searchsettings.types = [];
+			for (const idx in this.searchoptions.types) {
+				this.searchsettings.types.push(this.searchoptions.types[idx]);
+			}
+		},
+		calcSearchResultExtent() {
+			var rect = this.$refs.searchbox.getBoundingClientRect();
             //console.log(window.innerWidth + ' ' + window.innerHeight + ' ' + JSON.stringify(rect));
-             this.$refs.result.style.height = Math.floor(window.innerHeight * 0.80) + 'px';
-        },
-        search: function() {
-            if( this.searchtimer !== null ) {
-                clearTimeout(this.searchtimer);
-            }
-            if( this.searchsettings.searchstr.length >= 2 ) {
-                this.calcSearchResultExtent();
-                this.searchtimer = setTimeout(
-                    this.callsearchapi,
-                    500
-                );
-            } else {                
-                this.showresult = false;
-            }
-        },
-        callsearchapi: function() {            
-            var that = this;
-            this.error = null;
-            this.searchresult = [];
-            this.searching = true;
-            this.showsearchresult();            
-            this.searchfunction(this.searchsettings)
-            .then(function(response) {
-                if( response.data?.error === 1 ) {
-                    that.error = 'Bei der Suche ist ein Fehler aufgetreten.';
-                } else {
-                    that.searchresult = response.data.data;
-                }
-            })
-            .catch(function(error) {
-                that.error = 'Bei der Suche ist ein Fehler aufgetreten.' 
-                    + ' ' + error.message;
-            })
-            .finally(function() {
-                that.searching = false;
-            });
-        },
-        refreshsearch: function() {
-          this.search();
-          this.togglesettings();
-        },
-        calcSearchSettingsExtent: function() {
-            var rect = this.$refs.settingsbutton.getBoundingClientRect();
+			this.$refs.result.style.height = Math.floor(window.innerHeight * 0.80) + 'px';
+		},
+		search() {
+			if (this.searchtimer !== null) {
+				clearTimeout(this.searchtimer);
+			}
+			if (this.abortController) {
+				this.abortController.abort();
+				this.abortController = null;
+			}
+			if (this.searchsettings.searchstr.length >= 2) {
+				this.calcSearchResultExtent();
+				this.searchtimer = setTimeout(
+					this.callsearchapi,
+					500
+				);
+			} else {                
+				this.showresult = false;
+			}
+		},
+		callsearchapi() {
+			this.error = null;
+			this.searchresult = [];
+			this.searching = true;
+			this.showsearchresult();  
+			
+			if (this.abortController)
+				this.abortController.abort();
+			this.abortController = new AbortController();
+
+			this
+				.searchfunction(this.searchsettings, { signal: this.abortController.signal })
+				.then(response => {
+					if (!response.data) {
+						this.error = 'Bei der Suche ist ein Fehler aufgetreten.';
+					} else {
+						let res = response.data.map(el => ({...el, ...JSON.parse(el.data)}));
+						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', 'unassigned_employee', 'mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'student', 'prestudent'];
+								mergedType += this.searchoptions.mergeResults;
+								mergeKey = 'person_id';
+								break;
+							}
+
+							if (mergeTypes.length) {
+								res = Object.values(res.reduce((a, c) => {
+									if (!mergeTypes.includes(c.type)) {
+										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,
+											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.searching = false;
+					this.retry = 5;
+				})
+				.catch(error => {
+					if (error.code == "ERR_CANCELED") {
+						return this.retry = 5;
+					}
+					if (error.code == "ECONNABORTED" && this.retry) {
+						this.retry--;
+						return this.callsearchapi();
+					}
+
+					this.error = 'Bei der Suche ist ein Fehler aufgetreten.' + ' ' + error.message;
+					this.searching = false;
+					this.retry = 5;
+				});
+		},
+		refreshsearch() {
+			this.search();
+			this.togglesettings();
+		},
+		calcSearchSettingsExtent() {
+			var rect = this.$refs.settingsbutton.getBoundingClientRect();
             //console.log(window.innerWidth + ' ' + window.innerHeight + ' ' + JSON.stringify(rect));
-            this.$refs.settings.style.top = Math.floor(rect.bottom + 3) + 'px';
-            this.$refs.settings.style.right = Math.floor(window.innerWidth - rect.right) + 'px';
-            this.$refs.settings.style.width = Math.floor(window.innerWidth * 0.5) + 'px';
+			this.$refs.settings.style.top = Math.floor(rect.bottom + 3) + 'px';
+			this.$refs.settings.style.right = Math.floor(window.innerWidth - rect.right) + 'px';
+			this.$refs.settings.style.width = Math.floor(window.innerWidth * 0.5) + 'px';
             //this.$refs.settings.style.height = Math.floor(window.innerHeight * 0.5) + 'px';  
-        },
-        togglesettings: function() {
-            this.showsettings = !this.showsettings;
-            this.calcSearchSettingsExtent();
-        },
-        hideresult: function() {
-            this.showresult = false;
-            window.removeEventListener('resize', this.calcSearchResultExtent);
-        },
-        showsearchresult: function() {
-            if( this.searchsettings.searchstr.length >= 3 ) {
-                this.showresult = true;
-                window.addEventListener('resize', this.calcSearchResultExtent);
-            }
-        },
-        searchfocusin: function(e) {
-            e.preventDefault();
-            e.stopPropagation();
-            if( this.hidetimer !== null ) {
-                clearTimeout(this.hidetimer);
-            }
-        },
-        searchfocusout: function(e) {
-            e.preventDefault();
-            e.stopPropagation();
-            this.hidetimer = setTimeout(
-                this.hideresult,
-                100
-            );
-        }
-    }
+		},
+		togglesettings() {
+			this.showsettings = !this.showsettings;
+			this.calcSearchSettingsExtent();
+		},
+		hideresult() {
+			this.showresult = false;
+			window.removeEventListener('resize', this.calcSearchResultExtent);
+		},
+		showsearchresult() {
+			if (this.searchsettings.searchstr.length >= 3) {
+				this.showresult = true;
+				window.addEventListener('resize', this.calcSearchResultExtent);
+			}
+		},
+		searchfocusin(e) {
+			e.preventDefault();
+			e.stopPropagation();
+			if (this.hidetimer !== null) {
+				clearTimeout(this.hidetimer);
+			}
+		},
+		searchfocusout(e) {
+			e.preventDefault();
+			e.stopPropagation();
+			this.hidetimer = setTimeout(
+				this.hideresult,
+				100
+			);
+		}
+	},
+	template: `
+	<form
+		ref="searchform"
+		class="d-flex me-3 position-relative"
+		action="javascript:void(0);"
+		@focusin="searchfocusin"
+		@focusout="searchfocusout"
+	>
+		<div class="input-group me-2 bg-white">
+			<input
+				ref="searchbox"
+				@input="search"
+				@focus="showsearchresult"
+				v-model="searchsettings.searchstr"
+				class="form-control"
+				type="search"
+				placeholder="Suche..."
+				aria-label="Search"
+			>
+			<button
+				ref="settingsbutton"
+				@click="togglesettings"
+				class="btn btn-light border-start"
+				type="button"
+				id="search-filter"
+				>
+				<i class="fas fa-cog"></i>
+			</button>
+		</div>
+
+		<div
+			v-show="showresult"
+			ref="result"
+			class="searchbar_results"
+			tabindex="-1"
+		>
+			<div v-if="searching">
+				<i class="fas fa-spinner fa-spin fa-2x"></i>
+			</div>
+			<div v-else-if="error !== null">{{ error }}</div>
+			<div v-else-if="searchresult.length < 1">Es wurden keine Ergebnisse gefunden.</div>
+			<template v-else>
+				<template v-for="res in searchresult">
+					<result-person v-if="res.type === 'person'" :res="res" :actions="searchoptions.actions.person" @actionexecuted="hideresult"></result-person>
+					<result-student v-else-if="res.type === 'student'" :res="res" :actions="searchoptions.actions.student" @actionexecuted="hideresult"></result-student>
+					<result-prestudent v-else-if="res.type === 'prestudent'" :res="res" :actions="searchoptions.actions.prestudent" @actionexecuted="hideresult"></result-prestudent>
+					<result-employee v-else-if="res.type === 'employee'" :res="res" :actions="searchoptions.actions.employee" @actionexecuted="hideresult"></result-employee>
+					<result-employee v-else-if="res.type === 'unassigned_employee'" :res="res" :actions="searchoptions.actions.employee" @actionexecuted="hideresult"></result-employee>
+					<result-organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="searchoptions.actions.organisationunit" @actionexecuted="hideresult"></result-organisationunit>
+					<result-room v-else-if="res.type === 'room'" :res="res" :actions="searchoptions.actions.room" @actionexecuted="hideresult"></result-room>
+					<result-mergedperson v-else-if="res.type === 'mergedperson'" :res="res" :actions="searchoptions.actions.mergedperson" @actionexecuted="hideresult"></result-mergedperson>
+					<result-mergedstudent v-else-if="res.type === 'mergedstudent'" :res="res" :actions="searchoptions.actions.mergedstudent" @actionexecuted="hideresult"></result-mergedstudent>
+					<div v-else>Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
+				</template>
+			</template>
+		</div>
+		<div
+			v-show="showsettings"
+			ref="settings"
+			class="searchbar_settings"
+			tabindex="-1"
+		>
+			<div class="btn-group" v-if="searchoptions.types.length > 0">
+				<template v-for="(type, index) in searchoptions.types" :key="type">
+					<input
+						type="checkbox"
+						class="btn-check"
+						:id="$.uid + 'search_type_' + index"
+						:value="type"
+						v-model="searchsettings.types"
+					/>
+					<label
+						class="btn btn-outline-secondary"
+						:for="$.uid + 'search_type_' + index"
+					>
+						{{ type }}
+					</label>
+				</template>
+			</div>
+			<div class="mb-2"></div>
+			<button
+				ref="settingsrefreshsearch"
+				@click="refreshsearch"
+				class="btn btn-primary"
+				type="button"
+			>
+				Übernehmen
+			</button>
+		</div>
+	</form>`
 };
diff --git a/public/js/plugin/FhcApi.js b/public/js/plugin/FhcApi.js
index 7be1a5b9f..dbf5069b8 100644
--- a/public/js/plugin/FhcApi.js
+++ b/public/js/plugin/FhcApi.js
@@ -40,6 +40,8 @@ export default {
 		function _clean_return_value(response) {
 			const result = response.data;
 			delete response.data;
+			if (!result)
+				return {meta: {response}, data: null};
 			if (!result.meta)
 				result.meta = {response};
 			else
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 11880fd55..9bdccecf8 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -58,6 +58,7 @@ require_once('dbupdate_3.4/17513_Entwicklungsteam.php');
 require_once('dbupdate_3.4/28575_softwarebereitstellung.php');
 require_once('dbupdate_3.4/41150_oe-pfad_db_view.php');
 require_once('dbupdate_3.4/44031_stv_favorites.php');
+require_once('dbupdate_3.4/40128_search.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/40128_search.php b/system/dbupdate_3.4/40128_search.php
new file mode 100644
index 000000000..2ef8f8b4a
--- /dev/null
+++ b/system/dbupdate_3.4/40128_search.php
@@ -0,0 +1,171 @@
+<?php
+if (!defined('DB_NAME')) exit('No direct script access allowed');
+
+// Activate module pg_trgm
+if (!$db->db_num_rows(@$db->db_query("SELECT 1 
+FROM pg_extension WHERE extname = 'pg_trgm' LIMIT 1;")))
+{
+	$qry = "CREATE extension pg_trgm;";
+
+	if (!$db->db_query($qry))
+		echo '<strong>Module pg_trgm ' . $db->db_last_error() . '</strong><br>';
+	else
+		echo 'Module pg_trgm: activated<br>';
+}
+
+
+// Add additional computed columns
+// Add column fts_bezeichnung to public.tbl_organisationseinheit
+if (!@$db->db_query("SELECT fts_bezeichnung FROM public.tbl_organisationseinheit LIMIT 1"))
+{
+	$qry = "ALTER TABLE public.tbl_organisationseinheit ADD COLUMN fts_bezeichnung tsvector;";
+	$qry .= "COMMENT ON COLUMN public.tbl_organisationseinheit.fts_bezeichnung IS 'used for search - auto generated w triggers';";
+
+	if (!$db->db_query($qry))
+		echo '<strong> public.tbl_organisationseinheit ' . $db->db_last_error() . '</strong><br>';
+	else
+		echo 'public.tbl_organisationseinheit: new column "fts_bezeichnung" added<br>';
+}
+
+// Add function tr_update_tbl_organisationseinheit_fts_bezeichnung to public
+if (!$db->db_num_rows(@$db->db_query("SELECT 1 FROM pg_proc WHERE proname = 'tr_update_tbl_organisationseinheit_fts_bezeichnung' LIMIT 1;")))
+{
+	$qry = "CREATE FUNCTION tr_update_tbl_organisationseinheit_fts_bezeichnung()
+		RETURNS TRIGGER 
+		LANGUAGE PLPGSQL
+		AS
+		$$
+		BEGIN
+			IF TG_TABLE_NAME = 'tbl_organisationseinheit' THEN
+				NEW.fts_bezeichnung := to_tsvector('simple', COALESCE((SELECT bezeichnung FROM public.tbl_organisationseinheittyp WHERE organisationseinheittyp_kurzbz = NEW.organisationseinheittyp_kurzbz), '') || ' ' || COALESCE(NEW.bezeichnung, ''));
+			ELSIF TG_TABLE_NAME = 'tbl_organisationseinheittyp' THEN
+				UPDATE public.tbl_organisationseinheit SET fts_bezeichnung = to_tsvector('simple', COALESCE(NEW.bezeichnung, '') || ' ' || COALESCE(bezeichnung, '')) WHERE organisationseinheittyp_kurzbz = NEW.organisationseinheittyp_kurzbz;
+			END IF;
+			RETURN NEW;
+		END;
+		$$";
+
+	if (!$db->db_query($qry))
+		echo '<strong> public.tr_update_tbl_organisationseinheit_fts_bezeichnung ' . $db->db_last_error() . '</strong><br>';
+	else
+		echo 'public.tr_update_tbl_organisationseinheit_fts_bezeichnung: function created<br>';
+}
+
+$update_column = false;
+// Add trigger tr_organisationseinheit_update_organisationseinheittyp_kurzbz to public.tbl_organisationseinheit
+if (!$db->db_num_rows(@$db->db_query("SELECT 1 FROM information_schema.triggers WHERE event_object_table ='tbl_organisationseinheit' AND trigger_name = 'tr_organisationseinheit_update_organisationseinheittyp_kurzbz' LIMIT 1;")))
+{
+	$qry = "CREATE TRIGGER tr_organisationseinheit_update_organisationseinheittyp_kurzbz
+		BEFORE UPDATE OF organisationseinheittyp_kurzbz OR INSERT
+		ON public.tbl_organisationseinheit
+		FOR EACH ROW
+		EXECUTE FUNCTION tr_update_tbl_organisationseinheit_fts_bezeichnung();";
+
+	if (!$db->db_query($qry))
+		echo '<strong> public.tbl_organisationseinheit ' . $db->db_last_error() . '</strong><br>';
+	else {
+		echo 'public.tbl_organisationseinheit: trigger "tr_organisationseinheit_update_organisationseinheittyp_kurzbz" created<br>';
+		$update_column = true;
+	}
+}
+
+// Add trigger tr_organisationseinheittyp_update_bezeichnung to public.tbl_organisationseinheittyp
+if (!$db->db_num_rows(@$db->db_query("SELECT 1 FROM information_schema.triggers WHERE event_object_table ='tbl_organisationseinheittyp' AND trigger_name = 'tr_organisationseinheittyp_update_bezeichnung' LIMIT 1;")))
+{
+	$qry = "CREATE TRIGGER tr_organisationseinheittyp_update_bezeichnung
+		BEFORE UPDATE OF bezeichnung
+		ON public.tbl_organisationseinheittyp
+		FOR EACH ROW
+		EXECUTE FUNCTION tr_update_tbl_organisationseinheit_fts_bezeichnung();";
+
+	if (!$db->db_query($qry))
+		echo '<strong> public.tbl_organisationseinheittyp ' . $db->db_last_error() . '</strong><br>';
+	else {
+		echo 'public.tbl_organisationseinheittyp: trigger "tr_organisationseinheittyp_update_bezeichnung" created<br>';
+		$update_column = true;
+	}
+}
+
+// Update fts_bezeichnung on tbl_organisationseinheit with new triggers
+if ($update_column)
+{
+	$qry = "UPDATE public.tbl_organisationseinheittyp SET bezeichnung = bezeichnung;";
+
+	if (!$db->db_query($qry))
+		echo '<strong> public.tbl_organisationseinheit ' . $db->db_last_error() . '</strong><br>';
+	else
+		echo 'public.tbl_organisationseinheit: column "fts_bezeichnung" updated<br>';
+}
+
+
+// Add Trigram Indexes
+// Add index for kontakt to public.tbl_kontakt
+if ($result = @$db->db_query("SELECT 1 
+FROM pg_indexes WHERE indexname = 'idx_tbl_kontakt_kontakt_trgm';"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "CREATE INDEX idx_tbl_kontakt_kontakt_trgm ON public.tbl_kontakt USING GIN (COALESCE(kontakt, '') gin_trgm_ops);";
+
+		if (!$db->db_query($qry))
+			echo '<strong>public.tbl_kontakt ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'public.tbl_kontakt: added index "idx_tbl_kontakt_kontakt_trgm"<br>';
+	}
+}
+// Add index for vorname to public.tbl_person
+if ($result = @$db->db_query("SELECT 1 
+FROM pg_indexes WHERE indexname = 'idx_tbl_person_vorname_trgm';"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "CREATE INDEX idx_tbl_person_vorname_trgm ON public.tbl_person USING GIN (COALESCE(vorname, '') gin_trgm_ops);";
+
+		if (!$db->db_query($qry))
+			echo '<strong>public.tbl_person ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'public.tbl_person: added index "idx_tbl_person_vorname_trgm"<br>';
+	}
+}
+// Add index for nachname to public.tbl_person
+if ($result = @$db->db_query("SELECT 1 
+FROM pg_indexes WHERE indexname = 'idx_tbl_person_nachname_trgm';"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "CREATE INDEX idx_tbl_person_nachname_trgm ON public.tbl_person USING GIN (COALESCE(nachname, '') gin_trgm_ops);";
+
+		if (!$db->db_query($qry))
+			echo '<strong>public.tbl_person ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'public.tbl_person: added index "idx_tbl_person_nachname_trgm"<br>';
+	}
+}
+// Add index for vorname || ' ' || nachname to public.tbl_person
+if ($result = @$db->db_query("SELECT 1 
+FROM pg_indexes WHERE indexname = 'idx_tbl_person_name_trgm';"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "CREATE INDEX idx_tbl_person_name_trgm ON public.tbl_person USING GIN (COALESCE((vorname || ' ' || nachname), '') gin_trgm_ops);";
+
+		if (!$db->db_query($qry))
+			echo '<strong>public.tbl_person ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'public.tbl_person: added index "idx_tbl_person_name_trgm"<br>';
+	}
+}
+
+
+// Add Vector Indexes
+// Add index for fts_bezeichnung to public.tbl_organisationseinheit
+if (!$db->db_num_rows(@$db->db_query("SELECT 1 
+FROM pg_indexes WHERE indexname = 'idx_tbl_organisationseinheit_fts_bezeichnung_vector' LIMIT 1;")))
+{
+	$qry = "CREATE INDEX idx_tbl_organisationseinheit_fts_bezeichnung_vector ON public.tbl_organisationseinheit USING GIN (fts_bezeichnung);";
+
+	if (!$db->db_query($qry))
+		echo '<strong>public.tbl_organisationseinheit ' . $db->db_last_error() . '</strong><br>';
+	else
+		echo 'public.tbl_organisationseinheit: added index "idx_tbl_organisationseinheit_fts_bezeichnung_vector"<br>';
+}

From 7174f9cbe08950efb65cf2acd295b41f808f374f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 20 Sep 2024 14:38:33 +0200
Subject: [PATCH 002/572] Use Merged Person

---
 public/js/components/Stv/Studentenverwaltung.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index e2ca8e349..57dd82081 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -91,8 +91,20 @@ export default {
 						},
 						childactions: [
 						]
+					},
+					mergedperson: {
+						defaultaction: {
+							type: "link",
+							action: data => this.$fhcApi.getUri('/studentenverwaltung/person/' + data.person_id)
+						},
+						defaultactionstudent: {
+							type: "link",
+							action: data => this.$fhcApi.getUri('/studentenverwaltung/prestudent/' + data.prestudent_id)
+						},
+						childactions: []
 					}
-				}
+				},
+				mergeResults: 'person'
 			},
 			studiengangKz: undefined,
 			studiensemesterKurzbz: this.defaultSemester,

From 322544c7fb0746c85934e21d232845f7f38971e6 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 14 Oct 2024 11:20:46 +0200
Subject: [PATCH 003/572] dynamic image url for searchresults

---
 application/config/search.php                     | 15 ++++++++++++---
 application/libraries/SearchBarLib.php            |  1 -
 .../components/searchbar/result/mergedperson.js   | 12 ++++--------
 public/js/components/searchbar/result/person.js   |  9 +--------
 .../js/components/searchbar/result/prestudent.js  |  9 +--------
 public/js/components/searchbar/result/student.js  |  9 +--------
 6 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/application/config/search.php b/application/config/search.php
index ac6189527..14b6e89d8 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -74,7 +74,10 @@ $config['person'] = [
 		"p.person_id",
 		"(p.vorname || ' ' || p.nachname) AS name",
 		"ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
-		"p.foto"
+		"CASE
+			WHEN p.foto IS NOT NULL THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
+			ELSE NULL END
+			AS photo_url"
 	],
 	'resultjoin' => "
 		JOIN public.tbl_person p USING (person_id)
@@ -200,7 +203,10 @@ $config['student'] = [
 		"p.person_id",
 		"(p.vorname || ' ' || p.nachname) AS name",
 		"ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
-		"p.foto"
+		"CASE
+			WHEN p.foto IS NOT NULL THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
+			ELSE NULL END
+			AS photo_url"
 	],
 	'resultjoin' => "
 		JOIN public.tbl_student s USING (student_uid)
@@ -298,7 +304,10 @@ $config['prestudent'] = [
 		"b.uid",
 		"(p.vorname || ' ' || p.nachname) AS name",
 		"ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
-		"p.foto",
+		"CASE
+			WHEN p.foto IS NOT NULL THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
+			ELSE NULL END
+			AS photo_url",
 		"UPPER(sg.typ || sg.kurzbz) AS stg_kuerzel",
 		"sg.bezeichnung",
 		"(
diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index 6547cd107..c3528978d 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -228,7 +228,6 @@ class SearchBarLib
 				GROUP BY " . $table_config['primarykey'] . "
 			)";
 
-			$other_selects = 
 			$selects[] = "
 				SELECT
 					" . $this->_ci->db->escape($type) . " AS type,
diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
index f6b07f3d2..09b967b2f 100644
--- a/public/js/components/searchbar/result/mergedperson.js
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -20,8 +20,9 @@ export default {
 			if (person.length)
 				return person.pop();
 
-			const { person_id, name, foto, photo_url, email } = this.res.list[0];
-			return { person_id, name, foto, photo_url, email };
+			// TODO(chris): first one might have not one of these but a later one
+			const { person_id, name, photo_url, email } = this.res.list[0];
+			return { person_id, name, photo_url, email };
 		},
 		employee() {
 			const ma = this.res.list.filter(item => [
@@ -34,11 +35,6 @@ export default {
 			const students = this.res.list.filter(item => item.type == 'prestudent');
 			return students.length ? students : null;
 		},
-		foto() {
-			if (this.person.foto)
-				return 'data:image/jpeg;base64,' + this.person.foto;
-			return this.person.photo_url;
-		},
 		emails() {
 			if (Array.isArray(this.person.email))
 				return this.person.email;
@@ -51,7 +47,7 @@ export default {
 		:res="person"
 		:actions="actions"
 		:title="person.name"
-		:image="foto"
+		:image="this.person.photo_url"
 		image-fallback="fas fa-user-circle fa-7x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
diff --git a/public/js/components/searchbar/result/person.js b/public/js/components/searchbar/result/person.js
index f8adee56e..65155a95f 100644
--- a/public/js/components/searchbar/result/person.js
+++ b/public/js/components/searchbar/result/person.js
@@ -9,20 +9,13 @@ export default {
 		res: Object,
 		actions: Object
 	},
-	computed: {
-		foto() {
-			if (this.res.foto)
-				return 'data:image/jpeg;base64,' + this.res.foto;
-			return null;
-		}
-	},
 	template: `
 	<template-frame
 		class="searchbar-result-student"
 		:res="res"
 		:actions="actions"
 		:title="res.name"
-		:image="foto"
+		:image="res.photo_url"
 		image-fallback="fas fa-user-circle fa-7x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
diff --git a/public/js/components/searchbar/result/prestudent.js b/public/js/components/searchbar/result/prestudent.js
index 8c174d3c0..662069b75 100644
--- a/public/js/components/searchbar/result/prestudent.js
+++ b/public/js/components/searchbar/result/prestudent.js
@@ -9,20 +9,13 @@ export default {
 		res: Object,
 		actions: Object
 	},
-	computed: {
-		foto() {
-			if (this.res.foto)
-				return 'data:image/jpeg;base64,' + this.res.foto;
-			return null;
-		}
-	},
 	template: `
 	<template-frame
 		class="searchbar-result-prestudent"
 		:res="res"
 		:actions="actions"
 		:title="res.name + ' (' + res.status + ' ' + res.stg_kuerzel + ')'"
-		:image="foto"
+		:image="res.photo_url"
 		image-fallback="fas fa-user-circle fa-7x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
diff --git a/public/js/components/searchbar/result/student.js b/public/js/components/searchbar/result/student.js
index 8d8c4894b..93033d08b 100644
--- a/public/js/components/searchbar/result/student.js
+++ b/public/js/components/searchbar/result/student.js
@@ -9,20 +9,13 @@ export default {
 		res: Object,
 		actions: Object
 	},
-	computed: {
-		foto() {
-			if (this.res.foto)
-				return 'data:image/jpeg;base64,' + this.res.foto;
-			return null;
-		}
-	},
 	template: `
 	<template-frame
 		class="searchbar-result-student"
 		:res="res"
 		:actions="actions"
 		:title="res.name"
-		:image="foto"
+		:image="res.photo_url"
 		image-fallback="fas fa-user-circle fa-7x"
 		@actionexecuted="$emit('actionexecuted')"
 		>

From 123f29a75062d5008fbfdd8b55370f09404ba93e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 14 Oct 2024 11:22:20 +0200
Subject: [PATCH 004/572] CMS Search

---
 application/config/search.php                 | 94 +++++++++++++++++++
 application/config/searchfunctions.php        |  2 +-
 .../controllers/api/frontend/v1/Language.php  | 47 ++++++++++
 application/libraries/SearchBarLib.php        |  6 ++
 public/js/api/fhcapifactory.js                |  4 +-
 public/js/api/language.js                     | 22 +++++
 public/js/components/searchbar/result/cms.js  | 81 ++++++++++++++++
 public/js/components/searchbar/searchbar.js   | 34 ++++++-
 system/dbupdate_3.4/40128_search.php          | 15 +++
 9 files changed, 298 insertions(+), 7 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/Language.php
 create mode 100644 public/js/api/language.js
 create mode 100644 public/js/components/searchbar/result/cms.js

diff --git a/application/config/search.php b/application/config/search.php
index 14b6e89d8..f52d755dd 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -671,3 +671,97 @@ $config['room'] = [
 		LEFT JOIN public.tbl_adresse address
 			USING (adresse_id)"
 ];
+
+$config['cms'] = [
+	'primarykey' => 'contentsprache_id',
+	'table' => 'cms',
+	'prepare' => "
+		cms_auth (content_id) AS (
+			SELECT content_id
+			FROM campus.tbl_content c
+			WHERE NOT EXISTS (SELECT 1 FROM campus.tbl_contentgruppe g WHERE g.content_id=c.content_id)
+			UNION
+			SELECT content_id
+			FROM public.vw_gruppen g
+			JOIN campus.tbl_contentgruppe c USING (gruppe_kurzbz)
+			WHERE uid = (TABLE auth)
+		),
+		cms_active (content_id, template_kurzbz) AS (
+			SELECT content_id, template_kurzbz
+			FROM cms_auth
+			JOIN campus.tbl_content USING (content_id)
+			WHERE aktiv = TRUE
+		),
+		cms_active_redirect (content_id) AS (
+			SELECT content_id
+			FROM cms_active
+			WHERE template_kurzbz = 'redirect'
+		),
+		cms_active_redirect_linked (content_id) AS (
+			SELECT content_id
+			FROM cms_active_redirect
+			JOIN campus.tbl_contentsprache USING (content_id)
+			WHERE LEFT((xpath('string(/content/url)', content))[1]::text, 1) <> '#'
+		),
+		cms_active_others (content_id) AS (
+			SELECT content_id
+			FROM cms_active
+			WHERE template_kurzbz IN ('contentmittitel', 'contentohnetitel', 'contentmittitel_filterwidget')
+		),
+		cms (contentsprache_id) AS (
+			SELECT contentsprache_id
+			FROM campus.tbl_contentsprache
+			WHERE content_id IN (
+				SELECT content_id 
+				FROM cms_active_redirect_linked 
+				UNION 
+				SELECT content_id 
+				FROM cms_active_others
+			)
+			AND version = campus.get_highest_content_version(content_id)
+		)
+	",
+	'searchfields' => [
+		'content' => [
+			'alias' => ['inhalt'],
+			'comparison' => "vector",
+			'field' => "(setweight(to_tsvector('simple', COALESCE(titel, '')), 'A') || setweight(to_tsvector('simple', COALESCE(content, '')::text), 'B'))",
+			'join' => [
+				'table' => "campus.tbl_contentsprache",
+				'using' => "contentsprache_id"
+			]
+		],
+		'content_id' => [
+			'alias' => ['id'],
+			'comparison' => "equal-int",
+			'field' => "content_id",
+			'join' => [
+				'table' => "campus.tbl_contentsprache",
+				'using' => "contentsprache_id"
+			]
+		],
+		'lang' => [
+			'alias' => ['language', 'sprache'],
+			'comparison' => "equals",
+			'field' => "sprache",
+			'join' => [
+				'table' => "campus.tbl_contentsprache",
+				'using' => "contentsprache_id"
+			]
+		]
+	],
+	'resultfields' => [
+		"contentsprache.content_id",
+		"content.template_kurzbz",
+		"contentsprache.version",
+		"contentsprache.sprache AS language",
+		"contentsprache.titel AS title",
+		"contentsprache.content",
+		"(xpath('string(/content/url)', contentsprache.content))[1] AS content_url"
+	],
+	'resultjoin' => "
+		JOIN campus.tbl_contentsprache contentsprache
+			USING (contentsprache_id)
+		JOIN campus.tbl_content content
+			USING (content_id)"
+];
diff --git a/application/config/searchfunctions.php b/application/config/searchfunctions.php
index c8244e9a3..898069aed 100644
--- a/application/config/searchfunctions.php
+++ b/application/config/searchfunctions.php
@@ -25,7 +25,7 @@ $config['similar'] = [
 
 $config['vector'] = [
 	'priority' => 1,
-	'rank' => "ts_rank_cd({field}, to_tsquery('simple', {word}))",
+	'rank' => "ts_rank({field}, to_tsquery('simple', {word}))",
 	'compare' => "to_tsquery('simple', {word}) @@ {field}"
 ];
 
diff --git a/application/controllers/api/frontend/v1/Language.php b/application/controllers/api/frontend/v1/Language.php
new file mode 100644
index 000000000..797af4804
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Language.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about languages
+ * This controller works with JSON calls on the HTTP GET and the output is always JSON
+ */
+class Language extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'get' => self::PERM_LOGGED
+		]);
+
+		// Load models
+		$this->load->model('system/Sprache_model', 'SpracheModel');
+	}
+
+	public function get()
+	{
+		$this->SpracheModel->addOrder('sprache');
+
+		$result = $this->SpracheModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+		
+		$this->terminateWithSuccess($data);
+	}
+}
diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index c3528978d..782e30843 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -168,6 +168,9 @@ class SearchBarLib
 				FROM public.tbl_sprache
 				WHERE sprache=" . $this->_ci->db->escape($lang) . "
 				LIMIT 1
+			),
+			auth (uid) AS (
+				SELECT " . $this->_ci->db->escape(getAuthUID()) . " AS uid
 			)";
 
 		if ($sql_with) {
@@ -248,6 +251,9 @@ class SearchBarLib
 			WHERE sprache=" . $this->_ci->db->escape($lang) . "
 			LIMIT 1
 		)");
+		array_unshift($with, "auth (uid) AS (
+			SELECT " . $this->_ci->db->escape(getAuthUID()) . " AS uid
+		)");
 
 		return success("
 			WITH " . implode(", ", $with) . "
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index 655bfa409..26ed8847b 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -23,6 +23,7 @@ import studstatus from "./studstatus.js";
 import stv from "./stv.js";
 import notiz from "./notiz.js";
 import betriebsmittel from "./betriebsmittel.js";
+import language from "./language.js";
 
 export default {
     search,
@@ -32,5 +33,6 @@ export default {
     studstatus,
     stv,
     notiz,
-    betriebsmittel
+    betriebsmittel,
+    language
 };
diff --git a/public/js/api/language.js b/public/js/api/language.js
new file mode 100644
index 000000000..6a11d193b
--- /dev/null
+++ b/public/js/api/language.js
@@ -0,0 +1,22 @@
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+	getAll() {
+		return this.$fhcApi.get('/api/frontend/v1/language/get');
+	}
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/cms.js b/public/js/components/searchbar/result/cms.js
new file mode 100644
index 000000000..af2d6b0bb
--- /dev/null
+++ b/public/js/components/searchbar/result/cms.js
@@ -0,0 +1,81 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+	components: {
+		TemplateFrame
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object
+	},
+	inject: [
+		'languages',
+		'query'
+	],
+	computed: {
+		preview() {
+			if (this.res.template_kurzbz != 'redirect') {
+				let text = this.res.content.replace(/<!\[CDATA\[|\]\]>/ig, '').replace(/<[^>]+>/ig, '').replace(/^\s+|\s+$/g, '');
+
+				if (text.length > 1000) {
+					// NOTE(chris): focus on searched text!
+					let lower = text.toLowerCase();
+					let firstOccurence = Math.min(this.query.split(' ').reduce((a, c) => {
+						// NOTE(chris): filter query for words that affects the content field and get the lowest index of them
+						if (c == 'or')
+							return a;
+						let i = c.indexOf(':');
+						if (i < 0 || (i > 0 && ['content', 'inhalt'].includes(c.split(':')[0]))) {
+							let posInText = lower.indexOf(c);
+							if (posInText >= 0)
+								a.push(posInText);
+						}
+						return a;
+					}, []));
+
+					if (firstOccurence) {
+						if (firstOccurence + 997 >= text.length) {
+							firstOccurence = text.length - 997;
+							if (firstOccurence > 0)
+								return '...' + text.substr(firstOccurence, 997);
+						} else {
+							return '...' + text.substr(firstOccurence, 994) + '...';
+						}
+					}
+
+					text = text.substr(0, 997) + '...';
+				}
+				
+				return text;
+			}
+			
+			let url = this.res.content_url;
+			if (url.substr(0, 16) == '../index.ci.php/')
+				url = this.$fhcApi.getUri(url.substr(16));
+			else if (url.substr(0, 3) == '../')
+				url = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/\/+$/, '') + url.substr(2);
+			return '<a href="' + url + '">' + url + '</a>';
+		},
+		flag() {
+			if (!this.languages || !this.languages[this.res.language])
+				return "";
+			return "data:image/jpeg;base64," + this.languages[this.res.language].flagge;
+		}
+	},
+	template: `
+	<template-frame
+		class="searchbar-result-cms"
+		:res="res"
+		:actions="actions"
+		:title="res.title"
+		image-fallback="fas fa-newspaper fa-4x p-4 text-white bg-primary"
+		@actionexecuted="$emit('actionexecuted')"
+		>
+		<img v-if="flag" :src="flag" class="ms-2">
+		<div v-if="preview" class="searchbar_table" v-html="preview"></div>
+		<div v-else class="searchbar_table text-muted">
+			No Content
+		</div>
+	</template-frame>`
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 54049679e..8ac64e856 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -4,6 +4,7 @@ import ResultPrestudent from "./result/prestudent.js";
 import ResultEmployee from "./result/employee.js";
 import ResultOrganisationunit from "./result/organisationunit.js";
 import ResultRoom from "./result/room.js";
+import ResultCms from "./result/cms.js";
 import ResultMergedperson from "./result/mergedperson.js";
 import ResultMergedstudent from "./result/mergedstudent.js";
 
@@ -17,10 +18,17 @@ export default {
 		ResultEmployee,
 		ResultOrganisationunit,
 		ResultRoom,
+		ResultCms,
 		ResultMergedperson,
 		ResultMergedstudent
 	},
 	props: [ "searchoptions", "searchfunction" ],
+	provide() {
+		return {
+			languages: Vue.computed(() => this.languages),
+			query: Vue.computed(() => this.lastQuery)
+		};
+	},
 	data() {
 		return {
 			searchtimer: null,
@@ -35,9 +43,22 @@ export default {
 			searching: false,
 			error: null,
 			abortController: null,
-			retry: 5
+			retry: 0,
+			languages: null,
+			lastQuery: ''
 		};
 	},
+	created() {
+		this.$fhcApi.factory
+			.language.getAll()
+			.then(result => {
+				this.languages = result.data.reduce((a, c) => {
+					a[c.sprache] = c;
+					return a;
+				}, {});
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
 	beforeMount() {
 		this.updateSearchOptions();
 	},
@@ -82,12 +103,14 @@ export default {
 			this.abortController = new AbortController();
 
 			this
-				.searchfunction(this.searchsettings, { signal: this.abortController.signal })
+				.searchfunction(this.searchsettings, { timeout: 50000, signal: this.abortController.signal })
 				.then(response => {
 					if (!response.data) {
 						this.error = 'Bei der Suche ist ein Fehler aufgetreten.';
 					} else {
 						let res = response.data.map(el => ({...el, ...JSON.parse(el.data)}));
+						this.lastQuery = response.meta.searchstring;
+
 						if (this.searchoptions.mergeResults) {
 							let counter = 0;
 							let mergeTypes = [];
@@ -131,11 +154,11 @@ export default {
 						this.searchresult = res;
 					}
 					this.searching = false;
-					this.retry = 5;
+					this.retry = 0;
 				})
 				.catch(error => {
 					if (error.code == "ERR_CANCELED") {
-						return this.retry = 5;
+						return this.retry = 0;
 					}
 					if (error.code == "ECONNABORTED" && this.retry) {
 						this.retry--;
@@ -144,7 +167,7 @@ export default {
 
 					this.error = 'Bei der Suche ist ein Fehler aufgetreten.' + ' ' + error.message;
 					this.searching = false;
-					this.retry = 5;
+					this.retry = 0;
 				});
 		},
 		refreshsearch() {
@@ -239,6 +262,7 @@ export default {
 					<result-employee v-else-if="res.type === 'unassigned_employee'" :res="res" :actions="searchoptions.actions.employee" @actionexecuted="hideresult"></result-employee>
 					<result-organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="searchoptions.actions.organisationunit" @actionexecuted="hideresult"></result-organisationunit>
 					<result-room v-else-if="res.type === 'room'" :res="res" :actions="searchoptions.actions.room" @actionexecuted="hideresult"></result-room>
+					<result-cms v-else-if="res.type === 'cms'" :res="res" :actions="searchoptions.actions.cms" @actionexecuted="hideresult"></result-cms>
 					<result-mergedperson v-else-if="res.type === 'mergedperson'" :res="res" :actions="searchoptions.actions.mergedperson" @actionexecuted="hideresult"></result-mergedperson>
 					<result-mergedstudent v-else-if="res.type === 'mergedstudent'" :res="res" :actions="searchoptions.actions.mergedstudent" @actionexecuted="hideresult"></result-mergedstudent>
 					<div v-else>Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
diff --git a/system/dbupdate_3.4/40128_search.php b/system/dbupdate_3.4/40128_search.php
index 2ef8f8b4a..92e1a10fd 100644
--- a/system/dbupdate_3.4/40128_search.php
+++ b/system/dbupdate_3.4/40128_search.php
@@ -169,3 +169,18 @@ FROM pg_indexes WHERE indexname = 'idx_tbl_organisationseinheit_fts_bezeichnung_
 	else
 		echo 'public.tbl_organisationseinheit: added index "idx_tbl_organisationseinheit_fts_bezeichnung_vector"<br>';
 }
+// Add index for titel || ' ' || content to campus.tbl_contentsprache
+if (!$db->db_num_rows(@$db->db_query("SELECT 1 
+FROM pg_indexes WHERE indexname = 'idx_tbl_contentsprache_fts_titel_content_vector' LIMIT 1;")))
+{
+	$qry = "
+		CREATE INDEX idx_tbl_contentsprache_fts_titel_content_vector 
+		ON campus.tbl_contentsprache 
+		USING GIN ((setweight(to_tsvector('simple', COALESCE(titel, '')), 'A') || setweight(to_tsvector('simple', COALESCE(content, '')::text), 'B')));
+	";
+
+	if (!$db->db_query($qry))
+		echo '<strong>campus.tbl_contentsprache ' . $db->db_last_error() . '</strong><br>';
+	else
+		echo 'campus.tbl_contentsprache: added index "idx_tbl_contentsprache_fts_titel_content_vector"<br>';
+}

From a9a18d1cd43f2ba49b041117f03f6f67aa972df5 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 28 Oct 2024 11:16:02 +0100
Subject: [PATCH 005/572] Remove deprecated components

---
 public/js/components/searchbar/action.js      | 31 -------
 public/js/components/searchbar/actions.js     | 28 ------
 public/js/components/searchbar/employee.js    | 89 -------------------
 .../components/searchbar/organisationunit.js  | 82 -----------------
 public/js/components/searchbar/person.js      | 55 ------------
 public/js/components/searchbar/prestudent.js  | 88 ------------------
 public/js/components/searchbar/raum.js        | 51 -----------
 public/js/components/searchbar/student.js     | 80 -----------------
 8 files changed, 504 deletions(-)
 delete mode 100644 public/js/components/searchbar/action.js
 delete mode 100644 public/js/components/searchbar/actions.js
 delete mode 100644 public/js/components/searchbar/employee.js
 delete mode 100644 public/js/components/searchbar/organisationunit.js
 delete mode 100644 public/js/components/searchbar/person.js
 delete mode 100644 public/js/components/searchbar/prestudent.js
 delete mode 100644 public/js/components/searchbar/raum.js
 delete mode 100644 public/js/components/searchbar/student.js

diff --git a/public/js/components/searchbar/action.js b/public/js/components/searchbar/action.js
deleted file mode 100644
index 699d5f8c7..000000000
--- a/public/js/components/searchbar/action.js
+++ /dev/null
@@ -1,31 +0,0 @@
-export default {
-    props: { 
-        res: {
-            type: Object
-        }, 
-        action: {
-            type: Object
-        }, 
-        cssclass: {
-            type: String,
-            default: ''
-        }
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-            <a :class="this.cssclass" :href="this.getactionhref()" 
-               @click="(this.action.type === 'function') ? this.execaction() : null">
-              <slot>Action</slot>
-            </a>
-    `,
-    methods: {
-        getactionhref: function() {
-            return (this.action.type === 'link') ? this.action.action(this.res) 
-                : 'javascript:void(0);';
-        },
-        execaction: function() { 
-            this.action.action(this.res);
-            this.$emit('actionexecuted');
-        }
-    }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/actions.js b/public/js/components/searchbar/actions.js
deleted file mode 100644
index ff9e25e12..000000000
--- a/public/js/components/searchbar/actions.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import action from "./action.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-        <ul class="searchbar_actions" v-if="this.actions.length > 0">
-          <li v-for="(action, index) in this.actions" :key="action.label">            
-            <action :res="this.res" :action="action" :cssclass="'btn btn-primary btn-sm'" @actionexecuted="$emit('actionexecuted')">
-                <i v-if="this.hasicon(index)" :class="this.geticonclass(index)"></i>
-                <span class="p-2">{{ action.label }}</span>
-            </action>
-          </li>
-        </ul>
-        <div class="mb-3" v-else=""></div>
-    `,
-    methods: {
-        hasicon: function(index) {
-            return (typeof this.actions[index].icon !== "undefined");
-        },
-        geticonclass: function(index) {            
-            return this.actions[index].icon;
-        }
-    }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/employee.js b/public/js/components/searchbar/employee.js
deleted file mode 100644
index afb947874..000000000
--- a/public/js/components/searchbar/employee.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action,
-        actions: actions
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-        <div class="searchbar_result searchbar_employee">
-    
-          <div class="searchbar_grid">
-              <div class="searchbar_icon">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <img v-if="(typeof res.photo_url !== 'undefined') && (res.photo_url !== null)" :src="res.photo_url" 
-                    class="rounded" style="max-height: 120px; max-width: 90px;" />
-                  <i v-else class="fas fa-user-circle fa-5x"></i>
-                </action>
-              </div>
-              
-              <div class="searchbar_data">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <span class="fw-bold">{{ res.name }}</span>
-                </action>
-        
-                <div class="mb-3"></div>
-        
-                <div class="searchbar_table">
-
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">Standard-Kostenstelle</div>
-                    <div class="searchbar_tablecell">
-                        <ul class="searchbar_inline_ul" v-if="res.standardkostenstelle.length > 0">
-                          <li v-for="(stdkst, idx) in res.standardkostenstelle" :key="idx">{{ stdkst }}</li>
-                        </ul>
-                        <span v-else="">keine</span>
-                    </div>
-                  </div>
-
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">Organisations-Einheit</div>
-                    <div class="searchbar_tablecell">
-                        <ul class="searchbar_inline_ul" v-if="res.organisationunit_name.length > 0">
-                          <li v-for="(oe, idx) in res.organisationunit_name" :key="idx">{{ oe }}</li>
-                        </ul>
-                        <span v-else="">keine</span> 
-                    </div>
-                  </div>
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">EMail</div>
-                    <div class="searchbar_tablecell">
-                        <a :href="this.mailtourl">
-                          {{ res.email }}
-                        </a>
-                    </div>
-                  </div>
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">Telefon</div>
-                    <div class="searchbar_tablecell">
-                        <a :href="this.telurl">
-                          {{ res.phone }}
-                        </a>
-                    </div>
-                  </div>        
-        
-                </div>
-        
-                <actions :res="this.res" :actions="this.actions.childactions" @actionexecuted="$emit('actionexecuted')"></actions>
-        
-              </div>
-          </div>
-          
-        </div>
-    `,
-    methods: {
-    },
-    computed: {
-        mailtourl: function() {
-            return 'mailto:' + this.res.email;
-        },
-        telurl: function() {
-            return 'tel:' + this.res.phone;
-        }
-    }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/organisationunit.js b/public/js/components/searchbar/organisationunit.js
deleted file mode 100644
index e7b5861e8..000000000
--- a/public/js/components/searchbar/organisationunit.js
+++ /dev/null
@@ -1,82 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action,
-        actions: actions
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-        <div class="searchbar_result searchbar_organisationunit">
-    
-          <div class="searchbar_grid">
-              <div class="searchbar_icon">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <i class="fas fa-sitemap fa-4x"></i>
-                </action>
-              </div>
-              
-              <div class="searchbar_data">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <span class="fw-bold">{{ res.name }}</span>
-                </action>
-        
-                <div class="mb-3"></div>
-        
-                <div class="searchbar_table">
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">übergeordnete OrgEinheit</div>
-                    <div class="searchbar_tablecell">
-                          {{ res.parentoe_name }}
-                    </div>
-                  </div>
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">Gruppen-EMail</div>
-                    <div class="searchbar_tablecell">
-                        <a :href="this.mailtourl">
-                          {{ res.mailgroup }}
-                        </a>
-                    </div>
-                  </div>
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">Leiter</div>
-                    <div class="searchbar_tablecell">
-                        <ul class="searchbar_inline_ul" v-if="res.leaders.length > 0">
-                          <li v-for="(leader, idx) in res.leaders" :key="idx">{{ leader.name }}</li>
-                        </ul>
-                        <span v-else="">N.N.</span>                                
-                    </div>
-                  </div>        
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">Mitarbeiter-Anzahl</div>
-                    <div class="searchbar_tablecell">
-                        {{ res.number_of_people }}
-                    </div>
-                  </div>
-        
-                </div>
-        
-                <actions :res="this.res" :actions="this.actions.childactions" @actionexecuted="$emit('actionexecuted')"></actions>
-        
-              </div>        
-          </div>
-          
-        </div>
-    `,
-    methods: {
-    },
-    computed: {
-        mailtourl: function() {
-            return 'mailto:' + this.res.mailgroup;
-        },
-        telurl: function() {
-            return 'tel:' + this.res.phone;
-        }
-    }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/person.js b/public/js/components/searchbar/person.js
deleted file mode 100644
index 4f267cbd4..000000000
--- a/public/js/components/searchbar/person.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action,
-        actions: actions
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-        <div class="searchbar_result searchbar_person">
-    
-          <div class="searchbar_grid">
-              <div class="searchbar_icon">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <img v-if="(typeof res.foto !== 'undefined') && (res.foto !== null)" :src="res.foto" 
-                    class="rounded" style="max-height: 120px; max-width: 90px;" />
-                  <i v-else class="fas fa-user-circle fa-5x"></i>
-                </action>
-              </div>
-              
-              <div class="searchbar_data">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <span class="fw-bold">{{ res.gn }} {{ res.sn }}</span>
-                </action>
-        
-                <div class="mb-3"></div>
-        
-                <div class="searchbar_table">
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell">EMail</div>
-                    <div class="searchbar_tablecell">
-                        <a :href="this.mailtourl">
-                          {{ res.mail }}
-                        </a>
-                    </div>
-                  </div>
-                </div>
-        
-                <actions :res="this.res" :actions="this.actions.childactions" @actionexecuted="$emit('actionexecuted')"></actions>
-        
-              </div>
-          </div>
-          
-        </div>
-    `,
-    methods: {
-    },
-    computed: {
-        mailtourl: function() {
-            return 'mailto:' + this.res.mail;
-        }
-    }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/prestudent.js b/public/js/components/searchbar/prestudent.js
deleted file mode 100644
index 0f7429075..000000000
--- a/public/js/components/searchbar/prestudent.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-	props: [ "res", "actions" ],
-	components: {
-		action: action,
-		actions: actions
-	},
-	emits: [ 'actionexecuted' ],
-	template: `
-		<div class="searchbar_result searchbar_prestudent">
-		
-			<div class="searchbar_grid">
-				<div class="searchbar_icon">
-					<action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-						<img v-if="(typeof res.foto !== 'undefined') && (res.foto !== null)"
-							 :src="'data:image/jpeg;base64,' + res.foto"
-							 class="rounded-circle" height="100"/>
-						<i v-else class="fas fa-user-circle fa-5x"></i>
-					</action>
-				</div>
-		
-				<div class="searchbar_data">
-					<action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-						<span class="fw-bold">{{ res.name }}</span>
-					</action>
-		
-					<div class="mb-3"></div>
-		
-					<div class="searchbar_table">
-		
-						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell">Prestudent_id</div>
-							<div class="searchbar_tablecell">
-								{{ res.prestudent_id }}
-							</div>
-						</div>
-		
-						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell">Student_uid</div>
-							<div class="searchbar_tablecell">
-								{{ res.uid }}
-							</div>
-						</div>
-		
-						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell">Person_id</div>
-							<div class="searchbar_tablecell">
-								{{ res.person_id }}
-							</div>
-						</div>
-		
-						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell">Studiengang</div>
-							<div class="searchbar_tablecell">
-								{{ res.bezeichnung }}
-							</div>
-						</div>
-		
-						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell">EMail</div>
-							<div class="searchbar_tablecell">
-								<a :href="this.mailtourl">
-									{{ res.email }}
-								</a>
-							</div>
-						</div>
-		
-		
-					</div>
-		
-					<actions :res="this.res" :actions="this.actions.childactions"
-							 @actionexecuted="$emit('actionexecuted')"></actions>
-		
-				</div>
-			</div>
-		
-		</div>
-    `,
-	methods: {
-	},
-	computed: {
-		mailtourl: function() {
-			return 'mailto:' + this.res.email;
-		}
-	}
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/raum.js b/public/js/components/searchbar/raum.js
deleted file mode 100644
index 887820d6c..000000000
--- a/public/js/components/searchbar/raum.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action, 
-        actions: actions
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-        <div class="searchbar_result searchbar_raum">
-        
-          <div class="searchbar_grid">
-            <div class="searchbar_icon">
-              <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                <i class="fas fa-door-open fa-4x"></i>
-              </action>
-            </div>
-            <div class="searchbar_data">
-              <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                <span class="fw-bold">{{ res.r }}</span>
-              </action>
-        
-              <div class="mb-3"></div>
-        
-              <div class="searchbar_table">
-                <div class="searchbar_tablerow">
-                  <div class="searchbar_tablecell">Gebäude</div>
-                  <div class="searchbar_tablecell">{{ res.g }}</div>
-                </div>
-                <div class="searchbar_tablerow">
-                  <div class="searchbar_tablecell">Stockwerk</div>
-                  <div class="searchbar_tablecell">{{ res.s }}</div>
-                </div>
-                <div class="searchbar_tablerow">
-                  <div class="searchbar_tablecell">Raumnummer</div>
-                  <div class="searchbar_tablecell">{{ res.rn }}</div>
-                </div>
-              </div>
-        
-              <actions :res="this.res" :actions="this.actions.childactions" @actionexecuted="$emit('actionexecuted')"></actions>
-        
-            </div>
-          </div>
-        
-        </div>
-    `,
-    methods: {
-    }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/student.js b/public/js/components/searchbar/student.js
deleted file mode 100644
index 73253237c..000000000
--- a/public/js/components/searchbar/student.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action,
-        actions: actions
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-        <div class="searchbar_result searchbar_student">
-        
-            <div class="searchbar_grid">
-                <div class="searchbar_icon">
-                    <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                        <img v-if="(typeof res.foto !== 'undefined') && (res.foto !== null)"
-                             :src="'data:image/jpeg;base64,' + res.foto"
-                             class="rounded-circle" height="100"/>
-                        <i v-else class="fas fa-user-circle fa-5x"></i>
-                    </action>
-                </div>
-        
-                <div class="searchbar_data">
-                    <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                        <span class="fw-bold">{{ res.name }}</span>
-                    </action>
-        
-                    <div class="mb-3"></div>
-                
-                    <div class="searchbar_table">
-        
-                        <div class="searchbar_tablerow">
-                            <div class="searchbar_tablecell">Student_uid</div>
-                            <div class="searchbar_tablecell">
-                                {{ res.uid }}
-                            </div>
-                        </div>
-        
-                        <div class="searchbar_tablerow">
-                            <div class="searchbar_tablecell">Person_id</div>
-                            <div class="searchbar_tablecell">
-                                {{ res.person_id }}
-                            </div>
-                        </div>
-        
-                        <div class="searchbar_tablerow">
-                            <div class="searchbar_tablecell">Matrikelnummer</div>
-                            <div class="searchbar_tablecell">
-                                {{ res.matrikelnr }}
-                            </div>
-                        </div>
-        
-                        <div class="searchbar_tablerow">
-                            <div class="searchbar_tablecell">EMail</div>
-                            <div class="searchbar_tablecell">
-                                <a :href="this.mailtourl">
-                                    {{ res.email }}
-                                </a>
-                            </div>
-                        </div>
-        
-                    </div>
-        
-                    <actions :res="this.res" :actions="this.actions.childactions"
-                             @actionexecuted="$emit('actionexecuted')"></actions>
-        
-                </div>
-            </div>
-        
-        </div>
-    `,
-    methods: {
-    },
-    computed: {
-        mailtourl: function() {
-            return 'mailto:' + this.res.email;
-        }
-    }
-};
\ No newline at end of file

From 084a13316d128ad9a0330473d7cddf301ac10532 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 28 Oct 2024 11:17:03 +0100
Subject: [PATCH 006/572] Remove duplicate emails

---
 public/js/components/searchbar/result/mergedperson.js | 2 +-
 public/js/components/searchbar/result/person.js       | 7 ++++++-
 public/js/components/searchbar/result/prestudent.js   | 7 ++++++-
 public/js/components/searchbar/result/student.js      | 7 ++++++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
index 09b967b2f..8f12540be 100644
--- a/public/js/components/searchbar/result/mergedperson.js
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -37,7 +37,7 @@ export default {
 		},
 		emails() {
 			if (Array.isArray(this.person.email))
-				return this.person.email;
+				return new Set(this.person.email);
 			return [this.person.email];
 		}
 	},
diff --git a/public/js/components/searchbar/result/person.js b/public/js/components/searchbar/result/person.js
index 65155a95f..daa968e72 100644
--- a/public/js/components/searchbar/result/person.js
+++ b/public/js/components/searchbar/result/person.js
@@ -9,6 +9,11 @@ export default {
 		res: Object,
 		actions: Object
 	},
+	computed: {
+		emails() {
+			return new Set(this.res.email);
+		}
+	},
 	template: `
 	<template-frame
 		class="searchbar-result-student"
@@ -29,7 +34,7 @@ export default {
 			<div class="searchbar_tablerow">
 				<div class="searchbar_tablecell">EMails</div>
 				<div class="searchbar_tablecell">
-					<a v-for="email in res.email" :key="email" :href="'mailto:' + email" class="d-block">
+					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
 						{{ email }}
 					</a>
 				</div>
diff --git a/public/js/components/searchbar/result/prestudent.js b/public/js/components/searchbar/result/prestudent.js
index 662069b75..4a11ac941 100644
--- a/public/js/components/searchbar/result/prestudent.js
+++ b/public/js/components/searchbar/result/prestudent.js
@@ -9,6 +9,11 @@ export default {
 		res: Object,
 		actions: Object
 	},
+	computed: {
+		emails() {
+			return new Set(this.res.email);
+		}
+	},
 	template: `
 	<template-frame
 		class="searchbar-result-prestudent"
@@ -29,7 +34,7 @@ export default {
 			<div class="searchbar_tablerow">
 				<div class="searchbar_tablecell">EMails</div>
 				<div class="searchbar_tablecell">
-					<a v-for="email in res.email" :key="email" :href="'mailto:' + email" class="d-block">
+					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
 						{{ email }}
 					</a>
 				</div>
diff --git a/public/js/components/searchbar/result/student.js b/public/js/components/searchbar/result/student.js
index 93033d08b..3eb401d97 100644
--- a/public/js/components/searchbar/result/student.js
+++ b/public/js/components/searchbar/result/student.js
@@ -9,6 +9,11 @@ export default {
 		res: Object,
 		actions: Object
 	},
+	computed: {
+		emails() {
+			return new Set(this.res.email);
+		}
+	},
 	template: `
 	<template-frame
 		class="searchbar-result-student"
@@ -41,7 +46,7 @@ export default {
 			<div class="searchbar_tablerow">
 				<div class="searchbar_tablecell">EMails</div>
 				<div class="searchbar_tablecell">
-					<a v-for="email in res.email" :key="email" :href="'mailto:' + email" class="d-block">
+					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
 						{{ email }}
 					</a>
 				</div>

From b1f4e5487d0fdd1977000bb91fc0b82fe5eacb3d Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 28 Oct 2024 11:18:25 +0100
Subject: [PATCH 007/572] Bug: wrong function name

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

diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index 782e30843..6d817c20f 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -778,7 +778,7 @@ class SearchBarLib
 		if (strstr($tpl, '{word}'))
 			$tpl = str_replace('{word}', $this->_ci->db->escape($word), $tpl);
 		if (strstr($tpl, '{like:word}'))
-			$tpl = str_replace('{like:word}', "'%" . $this->_ci->db->escapeLike($word) . "%'", $tpl);
+			$tpl = str_replace('{like:word}', "'%" . $this->_ci->db->escape_like_str($word) . "%'", $tpl);
 		
 		return $tpl;
 	}

From 963391ec99a061dd96de350afe80da7cb12f9ce2 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 28 Oct 2024 11:20:51 +0100
Subject: [PATCH 008/572] Bug: counting "with" statements + allowing multi
 primarykey + allowing "recursive" statement in prepare config

---
 application/libraries/SearchBarLib.php | 142 +++++++++++++++++--------
 1 file changed, 96 insertions(+), 46 deletions(-)

diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index 6d817c20f..54591b11f 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -162,8 +162,14 @@ class SearchBarLib
 
 		$lang = getUserLanguage();
 
-		$output = "
-			WITH lang (index) AS (
+		$output = "WITH";
+		if ($sql_with && $sql_with[0] === 'RECURSIVE') {
+			$output .= " RECURSIVE";
+			array_shift($sql_with);
+		}
+
+		$output .= "
+			lang (index) AS (
 				SELECT index
 				FROM public.tbl_sprache
 				WHERE sprache=" . $this->_ci->db->escape($lang) . "
@@ -185,10 +191,10 @@ class SearchBarLib
 			$other_selects = ", " . $other_selects;
 
 		$output .= "
-			, q (" . $table_config['primarykey'] . ", rank) AS (
-				SELECT " . $table_config['primarykey'] . ", MAX(rank)
+			, q (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
+				SELECT " . $this->_formatPrimarykeys($table_config['primarykey']) . ", MAX(rank)
 				FROM (" . implode(" UNION ", $sql_select) . ") q
-				GROUP BY " . $table_config['primarykey'] . "
+				GROUP BY " . $this->_formatPrimarykeys($table_config['primarykey']) . "
 			)
 			SELECT
 				" . $this->_ci->db->escape($table) . " AS type,
@@ -225,10 +231,10 @@ class SearchBarLib
 			if (!$select)
 				continue;
 
-			$with[] = "final_" . $type . " (" . $table_config['primarykey'] . ", rank) AS (
-				SELECT " . $table_config['primarykey'] . ", MAX(rank)
+			$with[] = "final_" . $type . " (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
+				SELECT " . $this->_formatPrimarykeys($table_config['primarykey']) . ", MAX(rank)
 				FROM (" . implode(" UNION ", $select) . ") q
-				GROUP BY " . $table_config['primarykey'] . "
+				GROUP BY " . $this->_formatPrimarykeys($table_config['primarykey']) . "
 			)";
 
 			$selects[] = "
@@ -242,6 +248,12 @@ class SearchBarLib
 		if (!$selects)
 			return success("");
 
+		$recursive = "";
+		if ($with && $with[0] === "RECURSIVE") {
+			$recursive = "RECURSIVE ";
+			array_shift($with);
+		}
+
 		$with = array_unique($with);
 
 		$lang = getUserLanguage();
@@ -256,7 +268,7 @@ class SearchBarLib
 		)");
 
 		return success("
-			WITH " . implode(", ", $with) . "
+			WITH " . $recursive . implode(", ", $with) . "
 			SELECT *
 			FROM (" . implode(" UNION ", $selects) . ") q
 			ORDER BY rank DESC
@@ -399,10 +411,7 @@ class SearchBarLib
 		$sql_select = [];
 
 		if (isset($table_config['prepare'])) {
-			if (is_array($table_config['prepare']))
-				$sqlWith = $table_config['prepare'];
-			else
-				$sqlWith[] = $table_config['prepare'];
+			$this->_addPreparesToSqlWith($sqlWith, $table_config['prepare']);
 		}
 
 		foreach ($searchArray as $or_search) {
@@ -484,17 +493,14 @@ class SearchBarLib
 					$field_config = $table_config['searchfields'][$code];
 
 					if (isset($field_config['prepare'])) {
-						if (is_array($field_config['prepare']))
-							$or_with = array_merge($or_with, $field_config['prepare']);
-						else
-							$or_with[] = $field_config['prepare'];
+						$this->_addPreparesToSqlWith($or_with, $field_config['prepare']);
 						$or_prepare[$code] = $field_config['prepare'];
 						unset($table_config['searchfields'][$code]['prepare']);
 						unset($field_config['prepare']);
 					}
 					$field_sql = "
 						SELECT
-							" . $table_config['table'] . "." . $table_config['primarykey'] . "
+							" . $this->_formatPrimarykeys($table_config['primarykey'], $table_config['table']) . "
 							FROM " . $table_config['table'] . "
 							" . $this->_makeJoin($field_config['join']) . "
 							WHERE ";
@@ -506,7 +512,7 @@ class SearchBarLib
 
 				$or_select[] = "
 					SELECT 
-						" . $table_config['primarykey'] . ",
+						" . $table_config['table']($table_config['primarykey']) . ",
 						1.0 AS rank
 					FROM " . $table_config['table'] . "
 					WHERE prestudent_id NOT IN (" . implode(" UNION ", $sql) . ")";
@@ -537,16 +543,13 @@ class SearchBarLib
 								$word_rank = "0";
 								if ($current_select) {
 									$word_from = $current_select;
-									if ($field_config['field'] != $table_config['primarykey']) {
+									if ($this->_needBasicTableJoin($field_config['field'], $table_config['primarykey'])) {
 										$word_join .= " " . $this->_makeJoin($table_config);
 									}
 									$word_rank = "rank";
 								}
 								if (isset($field_config['prepare'])) {
-									if (is_array($field_config['prepare']))
-										$or_with = array_merge($or_with, $field_config['prepare']);
-									else
-										$or_with[] = $field_config['prepare'];
+									$this->_addPreparesToSqlWith($or_with, $field_config['prepare']);
 									$or_prepare[$c] = $field_config['prepare'];
 									unset($table_config['searchfields'][$c]['prepare']);
 									unset($field_config['prepare']);
@@ -556,7 +559,7 @@ class SearchBarLib
 								}
 								$field_sql[] = "
 									SELECT
-										" . $word_from . "." . $table_config['primarykey'] . ",
+										" . $this->_formatPrimarykeys($table_config['primarykey'], $word_from) . ",
 										" . $word_rank . " AS w_rank,
 										" . $this->_makeRank($field_config['comparison'], $field_config['field'], $word) . " AS rank
 										FROM " . $word_from . "
@@ -576,15 +579,15 @@ class SearchBarLib
 
 							$id = "w" . ($id_offset + count($or_with));
 							$or_with[] = "
-								" . $id . " (" . $table_config['primarykey'] . ", rank) AS (
+								" . $id . " (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
 								SELECT
-									" . $table_config['primarykey'] . ",
+									" . $this->_formatPrimarykeys($table_config['primarykey']) . ",
 									(w_rank + 1.0 - CASE " .
 										"WHEN MIN(rank) = 0 THEN 0 " .
 										"ELSE EXP(SUM(LN(CASE WHEN rank = 0 THEN 1 ELSE rank " .
 										"END))) END) AS rank
 									FROM (" . implode(' UNION ALL ', $field_sql) . ") " . $id . "
-									GROUP BY " . $table_config['primarykey'] . ", w_rank
+									GROUP BY " . $this->_formatPrimarykeys($table_config['primarykey']) . ", w_rank
 								)";
 							$current_select = $id;
 						}
@@ -611,7 +614,7 @@ class SearchBarLib
 									")";
 								if ($field_config['1-n'] ?? false) {
 									$where = "GROUP BY " .
-										$table_config['primarykey'] .
+										$this->_formatPrimarykeys($table_config['primarykey'], $current_select ?: $table_config['table']) .
 										", rank HAVING MIN(CASE WHEN " .
 										$where .
 										" THEN 1 ELSE 0 END) = 1";
@@ -631,16 +634,13 @@ class SearchBarLib
 							$word_rank = "";
 							if ($current_select) {
 								$word_from = $current_select;
-								if ($field_config['field'] != $table_config['primarykey']) {
+								if ($this->_needBasicTableJoin($field_config['field'], $table_config['primarykey'])) {
 									$word_join .= " " . $this->_makeJoin($table_config);
 								}
 								$word_rank = "rank + ";
 							}
 							if (isset($field_config['prepare'])) {
-								if (is_array($field_config['prepare']))
-									$or_with = array_merge($or_with, $field_config['prepare']);
-								else
-									$or_with[] = $field_config['prepare'];
+								$this->_addPreparesToSqlWith($or_with, $field_config['prepare']);
 								$or_prepare[$code] = $field_config['prepare'];
 								unset($table_config['searchfields'][$code]['prepare']);
 								unset($field_config['prepare']);
@@ -651,9 +651,9 @@ class SearchBarLib
 
 							$id = "w" . ($id_offset + count($or_with));
 							$or_with[] = "
-								" . $id . " (" . $table_config['primarykey'] . ", rank) AS (
+								" . $id . " (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
 								SELECT
-									" . $word_from . "." . $table_config['primarykey'] . ",
+									" . $this->_formatPrimarykeys($table_config['primarykey'], $word_from) . ",
 									" . $word_rank . $rank . " AS rank
 									FROM " . $word_from . "
 									" . $word_join . "
@@ -671,11 +671,12 @@ class SearchBarLib
 					continue;
 
 				$or_select[] = "
-					SELECT " . $table_config['primarykey'] . ", rank / " . $count . " AS rank FROM " . $current_select;
+					SELECT " . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank / " . $count . " AS rank FROM " . $current_select;
 			}
 
 			$sqlWith = array_merge($sqlWith, $or_with);
 			$sql_select = array_merge($sql_select, $or_select);
+			$id_offset += count($or_with);
 		}
 
 		return $sql_select;
@@ -685,27 +686,76 @@ class SearchBarLib
 	// Private methods
 
 	/**
-	 * Search for documents
+	 * Checks if the field is not one of the primarykeys.
+	 *
+	 * @param string							$field
+	 * @param array|string						$primarykeys
+	 *
+	 * @return boolean
 	 */
-	private function _document($searchstr, $type)
+	private function _needBasicTableJoin($field, $primarykeys)
 	{
-		return array();
+		if (!is_array($primarykeys) && strpos($primarykeys, ",") !== false) {
+			return $field != $primarykeys;
+		}
+		if (!is_array($primarykeys))
+			$primarykeys = explode(",", $primarykeys);
+
+		foreach ($primarykeys as $key) {
+			if ($field == trim($key))
+				return false;
+		}
+		return true;
 	}
 
 	/**
-	 * Search for CMSs
+	 * Returns comma separated primarykeys. Optionally with table prefix
+	 *
+	 * @param array|string						$primarykeys
+	 * @param string							$prefix
+	 *
+	 * @return string
 	 */
-	private function _cms($searchstr, $type)
+	private function _formatPrimarykeys($primarykeys, $prefix = "")
 	{
-		return array();
+		if (is_array($primarykeys)) {
+			if ($prefix)
+				$prefix .= ".";
+			return $prefix . implode(", " . $prefix, $primarykeys);
+		}
+		if (!$prefix)
+			return $primarykeys;
+
+		return $prefix . "." . implode(", " . $prefix . ".", explode(",", $primarykeys));
 	}
 
 	/**
-	 * Search for rooms
+	 * Adds the prepare statement to the sqlWith stack and handles the
+	 * "RECURSIVE" modifier
+	 *
+	 * @param array								&$sqlWith
+	 * @param array								$prepares
+	 *
+	 * @return void
 	 */
-	private function _raum($searchstr, $type)
+	private function _addPreparesToSqlWith(&$sqlWith, $prepares)
 	{
-		return array();
+		$recursive = $sqlWith[0] ?? "" === "RECURSIVE";
+		if (!is_array($prepares))
+			$prepares = [$prepares];
+		
+		foreach ($prepares as $prep) {
+			$prep = trim($prep);
+			if (strtoupper(substr($prep, 0, 10)) === "RECURSIVE ") {
+				$recursive = true;
+				$sqlWith[] = substr($prep, 10);
+			} else {
+				$sqlWith[] = $prep;
+			}
+		}
+		if ($recursive && $sqlWith[0] !== "RECURSIVE") {
+			array_unshift($sqlWith, "RECURSIVE");
+		}
 	}
 
 	/**

From 8d00a9b4c9b5fa160bbbd7db391a2c45b6399b02 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 31 Oct 2024 14:22:31 +0100
Subject: [PATCH 009/572] Bugfix

---
 application/config/search.php          | 6 +++++-
 application/libraries/SearchBarLib.php | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/application/config/search.php b/application/config/search.php
index f52d755dd..aa99c17e0 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -400,7 +400,11 @@ $config['employee'] = [
 		'pid' => [
 			'alias' => ['person_id'],
 			'comparison' => 'equal-int',
-			'field' => "person_id"
+			'field' => "person_id",
+			'join' => [
+				'table' => "public.tbl_benutzer",
+				'on' => "uid = mitarbeiter_uid"
+			]
 		],
 		'oe' => [
 			'alias' => ['ou', 'organisationseinheit', 'organisationunit'],
diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index 54591b11f..91abeaebb 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -242,7 +242,8 @@ class SearchBarLib
 					" . $this->_ci->db->escape($type) . " AS type,
 					rank,
 					TO_JSONB((SELECT x FROM (SELECT " . implode(", ", $table_config['resultfields'] ?? ['*']) . ") x)) AS data
-				FROM final_" . $type  . ($table_config['resultjoin'] ?? "");
+				FROM final_" . $type  . "
+				" . ($table_config['resultjoin'] ?? "");
 		}
 
 		if (!$selects)

From 0916d3476744fb3504c20a6c92081ed82cb46b77 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 31 Oct 2024 14:25:27 +0100
Subject: [PATCH 010/572] DMS Search

---
 application/config/search.php               | 135 +++++++++++++++-----
 public/js/components/searchbar/searchbar.js |   3 +
 system/dbupdate_3.4/40128_search.php        |  15 +++
 3 files changed, 119 insertions(+), 34 deletions(-)

diff --git a/application/config/search.php b/application/config/search.php
index aa99c17e0..488a1ab3b 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -3,10 +3,6 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 
-// TODO(chris): permissions
-// TODO(chris): foto
-
-
 $config['person'] = [
 	'primarykey' => 'person_id',
 	'table' => 'public.tbl_person',
@@ -70,7 +66,7 @@ $config['person'] = [
 		]
 	],
 	'resultfields' => [
-		"b.uid",
+		"b.uid", // TODO(chris): multiple?
 		"p.person_id",
 		"(p.vorname || ' ' || p.nachname) AS name",
 		"ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
@@ -678,7 +674,7 @@ $config['room'] = [
 
 $config['cms'] = [
 	'primarykey' => 'contentsprache_id',
-	'table' => 'cms',
+	'table' => 'campus.tbl_contentsprache',
 	'prepare' => "
 		cms_auth (content_id) AS (
 			SELECT content_id
@@ -711,47 +707,23 @@ $config['cms'] = [
 			SELECT content_id
 			FROM cms_active
 			WHERE template_kurzbz IN ('contentmittitel', 'contentohnetitel', 'contentmittitel_filterwidget')
-		),
-		cms (contentsprache_id) AS (
-			SELECT contentsprache_id
-			FROM campus.tbl_contentsprache
-			WHERE content_id IN (
-				SELECT content_id 
-				FROM cms_active_redirect_linked 
-				UNION 
-				SELECT content_id 
-				FROM cms_active_others
-			)
-			AND version = campus.get_highest_content_version(content_id)
 		)
 	",
 	'searchfields' => [
 		'content' => [
 			'alias' => ['inhalt'],
 			'comparison' => "vector",
-			'field' => "(setweight(to_tsvector('simple', COALESCE(titel, '')), 'A') || setweight(to_tsvector('simple', COALESCE(content, '')::text), 'B'))",
-			'join' => [
-				'table' => "campus.tbl_contentsprache",
-				'using' => "contentsprache_id"
-			]
+			'field' => "(setweight(to_tsvector('simple', COALESCE(titel, '')), 'A') || setweight(to_tsvector('simple', COALESCE(content, '')::text), 'B'))"
 		],
 		'content_id' => [
 			'alias' => ['id'],
 			'comparison' => "equal-int",
-			'field' => "content_id",
-			'join' => [
-				'table' => "campus.tbl_contentsprache",
-				'using' => "contentsprache_id"
-			]
+			'field' => "content_id"
 		],
 		'lang' => [
 			'alias' => ['language', 'sprache'],
 			'comparison' => "equals",
-			'field' => "sprache",
-			'join' => [
-				'table' => "campus.tbl_contentsprache",
-				'using' => "contentsprache_id"
-			]
+			'field' => "sprache"
 		]
 	],
 	'resultfields' => [
@@ -767,5 +739,100 @@ $config['cms'] = [
 		JOIN campus.tbl_contentsprache contentsprache
 			USING (contentsprache_id)
 		JOIN campus.tbl_content content
-			USING (content_id)"
+			USING (content_id)
+		WHERE content_id IN (
+			SELECT content_id 
+			FROM cms_active_redirect_linked 
+			UNION 
+			SELECT content_id 
+			FROM cms_active_others
+		)
+		AND version = campus.get_highest_content_version(content_id)"
+];
+
+$config['dms'] = [
+	// TODO(chris): IMPLEMENT
+	// TODO(chris): TEST
+	// TODO(chris): project?
+	'primarykey' => 'dms_id, version',
+	'table' => 'campus.tbl_dms_version',
+	'searchfields' => [
+		'keywords' => [
+			'alias' => ['keyword', 'keywords', 'schlagwort', 'schlagworte'],
+			'comparison' => "vector",
+			'field' => "(to_tsvector('simple', COALESCE(schlagworte, '')))"
+		]
+	],
+	'resultfields' => [
+		"v.dms_id",
+		"v.version",
+		"v.filename",
+		"v.mimetype",
+		"v.name",
+		"v.beschreibung AS description",
+		"v.schlagworte AS keywords"
+	],
+	'resultjoin' => "
+		JOIN campus.tbl_dms_version v
+			USING (dms_id, version)
+		WHERE cis_suche = TRUE
+			AND version=(SELECT MAX(version) FROM campus.tbl_dms_version WHERE dms_id=v.dms_id)
+			AND NOT EXISTS (
+				SELECT
+					1
+				FROM
+					fue.tbl_projekt_dokument p
+				WHERE p.dms_id = v.dms_id
+			) AND (
+				NOT EXISTS (
+					WITH RECURSIVE categories (kategorie_kurzbz) AS (
+						SELECT
+							kategorie_kurzbz
+						FROM
+							campus.tbl_dms c
+						WHERE c.dms_id = v.dms_id
+						UNION ALL
+						SELECT
+							cat.parent_kategorie_kurzbz AS kategorie_kurzbz
+						FROM
+							categories
+							JOIN campus.tbl_dms_kategorie cat USING (kategorie_kurzbz)
+					)
+					SELECT
+						1
+					FROM
+						categories
+					JOIN campus.tbl_dms_kategorie_gruppe USING (kategorie_kurzbz)
+					UNION
+					SELECT
+						1
+					FROM
+						categories
+						JOIN campus.tbl_dms_kategorie USING (kategorie_kurzbz)
+					WHERE
+						berechtigung_kurzbz IS NOT NULL
+				) OR EXISTS (
+					WITH RECURSIVE categories (kategorie_kurzbz) AS (
+						SELECT
+							kategorie_kurzbz
+						FROM
+							campus.tbl_dms c
+						WHERE c.dms_id = v.dms_id
+						UNION ALL
+						SELECT
+							cat.parent_kategorie_kurzbz AS kategorie_kurzbz
+						FROM
+							categories
+							JOIN campus.tbl_dms_kategorie cat USING (kategorie_kurzbz)
+					)
+					SELECT
+						1
+					FROM
+						categories
+						JOIN campus.tbl_dms_kategorie_gruppe USING (kategorie_kurzbz)
+						JOIN public.tbl_benutzergruppe USING(gruppe_kurzbz)
+					WHERE
+						uid = (TABLE auth)
+				)
+			)"
 ];
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 8ac64e856..7589cfbef 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -5,6 +5,7 @@ import ResultEmployee from "./result/employee.js";
 import ResultOrganisationunit from "./result/organisationunit.js";
 import ResultRoom from "./result/room.js";
 import ResultCms from "./result/cms.js";
+import ResultDms from "./result/dms.js";
 import ResultMergedperson from "./result/mergedperson.js";
 import ResultMergedstudent from "./result/mergedstudent.js";
 
@@ -19,6 +20,7 @@ export default {
 		ResultOrganisationunit,
 		ResultRoom,
 		ResultCms,
+		ResultDms,
 		ResultMergedperson,
 		ResultMergedstudent
 	},
@@ -263,6 +265,7 @@ export default {
 					<result-organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="searchoptions.actions.organisationunit" @actionexecuted="hideresult"></result-organisationunit>
 					<result-room v-else-if="res.type === 'room'" :res="res" :actions="searchoptions.actions.room" @actionexecuted="hideresult"></result-room>
 					<result-cms v-else-if="res.type === 'cms'" :res="res" :actions="searchoptions.actions.cms" @actionexecuted="hideresult"></result-cms>
+					<result-dms v-else-if="res.type === 'dms'" :res="res" :actions="searchoptions.actions.dms" @actionexecuted="hideresult"></result-dms>
 					<result-mergedperson v-else-if="res.type === 'mergedperson'" :res="res" :actions="searchoptions.actions.mergedperson" @actionexecuted="hideresult"></result-mergedperson>
 					<result-mergedstudent v-else-if="res.type === 'mergedstudent'" :res="res" :actions="searchoptions.actions.mergedstudent" @actionexecuted="hideresult"></result-mergedstudent>
 					<div v-else>Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
diff --git a/system/dbupdate_3.4/40128_search.php b/system/dbupdate_3.4/40128_search.php
index 92e1a10fd..8ca0fd246 100644
--- a/system/dbupdate_3.4/40128_search.php
+++ b/system/dbupdate_3.4/40128_search.php
@@ -184,3 +184,18 @@ FROM pg_indexes WHERE indexname = 'idx_tbl_contentsprache_fts_titel_content_vect
 	else
 		echo 'campus.tbl_contentsprache: added index "idx_tbl_contentsprache_fts_titel_content_vector"<br>';
 }
+// Add index for schlagworte to campus.tbl_dms_version
+if (!$db->db_num_rows(@$db->db_query("SELECT 1 
+FROM pg_indexes WHERE indexname = 'idx_tbl_dms_version_fts_schlagworte_vector' LIMIT 1;")))
+{
+	$qry = "
+		CREATE INDEX idx_tbl_dms_version_fts_schlagworte_vector 
+		ON campus.tbl_dms_version 
+		USING GIN ((to_tsvector('simple', COALESCE(schlagworte, ''))));
+	";
+
+	if (!$db->db_query($qry))
+		echo '<strong>campus.tbl_dms_version ' . $db->db_last_error() . '</strong><br>';
+	else
+		echo 'campus.tbl_contentsprache: added index "idx_tbl_dms_version_fts_schlagworte_vector"<br>';
+}

From b27564ea0f22d6cf414bfa334e154e13ff325560 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 5 Nov 2024 09:01:18 +0100
Subject: [PATCH 011/572] Multiple uids in person search

---
 application/config/search.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/application/config/search.php b/application/config/search.php
index 488a1ab3b..8c601e046 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -66,7 +66,7 @@ $config['person'] = [
 		]
 	],
 	'resultfields' => [
-		"b.uid", // TODO(chris): multiple?
+		"ARRAY( SELECT uid FROM public.tbl_benutzer WHERE person_id = p.person_id ) AS uids",
 		"p.person_id",
 		"(p.vorname || ' ' || p.nachname) AS name",
 		"ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
@@ -76,8 +76,7 @@ $config['person'] = [
 			AS photo_url"
 	],
 	'resultjoin' => "
-		JOIN public.tbl_person p USING (person_id)
-		LEFT JOIN public.tbl_benutzer b USING (person_id)"
+		JOIN public.tbl_person p USING (person_id)"
 ];
 
 $config['student'] = [
@@ -210,7 +209,6 @@ $config['student'] = [
 		JOIN public.tbl_person p USING(person_id)"
 ];
 
-// TODO(chris): "ref"
 $config['prestudent'] = [
 	'primarykey' => 'prestudent_id',
 	'table' => 'public.tbl_prestudent',
@@ -751,9 +749,6 @@ $config['cms'] = [
 ];
 
 $config['dms'] = [
-	// TODO(chris): IMPLEMENT
-	// TODO(chris): TEST
-	// TODO(chris): project?
 	'primarykey' => 'dms_id, version',
 	'table' => 'campus.tbl_dms_version',
 	'searchfields' => [

From 2ff7c9f5823484b6ae929e1fdc6e8ba778ff8862 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 5 Nov 2024 09:02:09 +0100
Subject: [PATCH 012/572] Dms search result component

---
 public/js/components/searchbar/result/dms.js | 77 ++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 public/js/components/searchbar/result/dms.js

diff --git a/public/js/components/searchbar/result/dms.js b/public/js/components/searchbar/result/dms.js
new file mode 100644
index 000000000..74fc9440b
--- /dev/null
+++ b/public/js/components/searchbar/result/dms.js
@@ -0,0 +1,77 @@
+import TemplateFrame from "./template/frame.js";
+
+export default {
+	components: {
+		TemplateFrame
+	},
+	emits: [ 'actionexecuted' ],
+	props: {
+		res: Object,
+		actions: Object
+	},
+	inject: [
+		'query'
+	],
+	computed: {
+		icon() {
+			switch (this.res.mimetype) {
+				case 'application/pdf':
+					return 'file-pdf';
+				case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
+				case 'application/msword':
+					return 'file-word';
+				case 'application/vnd.openxmlformats-officedocument.presentationml.presentation':
+				case 'application/mspowerpoint':
+					return 'file-powerpoint';
+				case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
+				case 'application/vnd.ms-excel':
+					return 'file-excel';
+				case 'application/x-zip':
+				case 'application/zip':
+					return 'file-zipper';
+				case 'image/jpeg':
+				case 'image/gif':
+				case 'image/png':
+					return 'file-image';
+				default:
+					return 'file';
+			}
+		}
+	},
+	template: `
+	<template-frame
+		class="searchbar-result-dms"
+		:res="res"
+		:actions="actions"
+		:title="res.name"
+		:image-fallback="'fas fa-' + icon + ' fa-4x p-5 text-white bg-primary'"
+		@actionexecuted="$emit('actionexecuted')"
+		>
+		<div class="searchbar_table">
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">DMS ID</div>
+				<div class="searchbar_tablecell">
+					{{ res.dms_id }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Version</div>
+				<div class="searchbar_tablecell">
+					{{ res.version }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Keywords</div>
+				<div class="searchbar_tablecell">
+					{{ res.keywords }}
+				</div>
+			</div>
+			<div class="searchbar_tablerow">
+				<div class="searchbar_tablecell">Description</div>
+				<div class="searchbar_tablecell">
+					{{ res.description }}
+				</div>
+			</div>
+		</div>
+	</template-frame>`
+};
\ No newline at end of file

From 3a13226298323f8bf5bd60e4e903755ad40cf0f9 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 5 Nov 2024 11:08:07 +0100
Subject: [PATCH 013/572] Bug: merge "RECURSIVE"-keyword

---
 application/libraries/SearchBarLib.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index 91abeaebb..d563a9c79 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -675,6 +675,12 @@ class SearchBarLib
 					SELECT " . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank / " . $count . " AS rank FROM " . $current_select;
 			}
 
+			if ($or_with[0] === "RECURSIVE") {
+				if ($sqlWith[0] !== "RECURSIVE")
+					array_unshift($sqlWith, "RECURSIVE");
+				array_shift($or_with);
+			}
+
 			$sqlWith = array_merge($sqlWith, $or_with);
 			$sql_select = array_merge($sql_select, $or_select);
 			$id_offset += count($or_with);

From d0cf86585a174ef777accb102d71f0fcb6668169 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 5 Nov 2024 11:42:18 +0100
Subject: [PATCH 014/572] Visual update for search icons

---
 public/css/components/searchbar.css           | 74 +++++++++++++------
 public/js/components/searchbar/result/cms.js  |  2 +-
 public/js/components/searchbar/result/dms.js  |  2 +-
 .../components/searchbar/result/employee.js   |  2 +-
 .../searchbar/result/mergedperson.js          |  2 +-
 .../searchbar/result/organisationunit.js      |  2 +-
 .../js/components/searchbar/result/person.js  |  2 +-
 .../components/searchbar/result/prestudent.js |  2 +-
 public/js/components/searchbar/result/room.js |  2 +-
 .../js/components/searchbar/result/student.js |  2 +-
 .../searchbar/result/template/frame.js        |  5 +-
 11 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/public/css/components/searchbar.css b/public/css/components/searchbar.css
index 61032d227..37eeaef83 100644
--- a/public/css/components/searchbar.css
+++ b/public/css/components/searchbar.css
@@ -97,37 +97,69 @@
 /* new variant with template/frame */
 
 .searchbar-result {
-    border-bottom: 1px solid lightgrey;
-    margin-bottom: 1rem;
-    padding-bottom: 1rem;
+	border-bottom: 1px solid lightgrey;
+	margin-bottom: 1rem;
+	padding-bottom: 1rem;
 }
 
 .searchbar-actions {
-    display: flex;
-    flex-wrap: wrap;
-    gap: .5rem;
-    padding: 0;
-    margin: 1rem 0 0;
+	display: flex;
+	flex-wrap: wrap;
+	gap: .5rem;
+	padding: 0;
+	margin: 1rem 0 0;
 }
 
 .searchbar-square-image {
-    position: relative;
-    display: block;
-    height: 0;
-    padding-bottom: 100%;
+	position: relative;
+	display: block;
+	height: 0;
+	padding-bottom: 100%;
+}
+.searchbar-square-image > * {
+	position: absolute;
+	top: 0;
+	left: 0;
+	height: 100%;
+	width: 100%;
+}
+.searchbar-square-image > img {
+	object-fit: cover;
+}
+.searchbar-square-image > div {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	overflow: hidden;
+	color: rgba(var(--bs-white-rgb),1);
+	background-color: rgba(var(--bs-primary-rgb),var(--bs-bg-opacity));
+}
+.searchbar-square-image.rounded-circle > img,
+.searchbar-square-image.rounded-circle > div {
+	border-radius: 50%;
 }
 
-.searchbar-square-image > * {
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 100%;
-    width: 100%;
+.searchbar-rounded-image {
+	display: block;
+	width: 100%;
 }
-.searchbar-square-image img {
-    object-fit: cover;
+.searchbar-rounded-image > img {
+	width: 100%;
+}
+.searchbar-rounded-image > div {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	overflow: hidden;
+	color: rgba(var(--bs-white-rgb),1);
+	background-color: rgba(var(--bs-primary-rgb),var(--bs-bg-opacity));
+	height: calc((100px - .75em) * 1.3);
+}
+.searchbar-rounded-image > img,
+.searchbar-rounded-image > div {
+	border-radius: .25rem;
 }
 
 .no-margin-paragraphs p {
-    margin: 0;
+	margin: 0;
 }
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/cms.js b/public/js/components/searchbar/result/cms.js
index af2d6b0bb..5befdb413 100644
--- a/public/js/components/searchbar/result/cms.js
+++ b/public/js/components/searchbar/result/cms.js
@@ -69,7 +69,7 @@ export default {
 		:res="res"
 		:actions="actions"
 		:title="res.title"
-		image-fallback="fas fa-newspaper fa-4x p-4 text-white bg-primary"
+		image-fallback="fas fa-newspaper fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
 		<img v-if="flag" :src="flag" class="ms-2">
diff --git a/public/js/components/searchbar/result/dms.js b/public/js/components/searchbar/result/dms.js
index 74fc9440b..ad770f1c6 100644
--- a/public/js/components/searchbar/result/dms.js
+++ b/public/js/components/searchbar/result/dms.js
@@ -44,7 +44,7 @@ export default {
 		:res="res"
 		:actions="actions"
 		:title="res.name"
-		:image-fallback="'fas fa-' + icon + ' fa-4x p-5 text-white bg-primary'"
+		:image-fallback="'fas fa-' + icon + ' fa-4x'"
 		@actionexecuted="$emit('actionexecuted')"
 		>
 		<div class="searchbar_table">
diff --git a/public/js/components/searchbar/result/employee.js b/public/js/components/searchbar/result/employee.js
index 1c4da075a..2fa07bf5a 100644
--- a/public/js/components/searchbar/result/employee.js
+++ b/public/js/components/searchbar/result/employee.js
@@ -16,7 +16,7 @@ export default {
 		:actions="actions"
 		:title="res.name"
 		:image="res.photo_url"
-		image-fallback="fas fa-user-circle fa-7x"
+		image-fallback="fas fa-user fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
 		<div class="searchbar_table">
diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
index 8f12540be..cfb7fe5a6 100644
--- a/public/js/components/searchbar/result/mergedperson.js
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -48,7 +48,7 @@ export default {
 		:actions="actions"
 		:title="person.name"
 		:image="this.person.photo_url"
-		image-fallback="fas fa-user-circle fa-7x"
+		image-fallback="fas fa-user fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
 		<div class="searchbar_table">
diff --git a/public/js/components/searchbar/result/organisationunit.js b/public/js/components/searchbar/result/organisationunit.js
index f9b6870e0..129479277 100644
--- a/public/js/components/searchbar/result/organisationunit.js
+++ b/public/js/components/searchbar/result/organisationunit.js
@@ -22,7 +22,7 @@ export default {
 		:res="res"
 		:actions="actions"
 		:title="res.name"
-		image-fallback="fas fa-sitemap fa-4x p-4 text-white bg-primary"
+		image-fallback="fas fa-sitemap fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
 		<div class="searchbar_table">
diff --git a/public/js/components/searchbar/result/person.js b/public/js/components/searchbar/result/person.js
index daa968e72..bc4e75ee8 100644
--- a/public/js/components/searchbar/result/person.js
+++ b/public/js/components/searchbar/result/person.js
@@ -21,7 +21,7 @@ export default {
 		:actions="actions"
 		:title="res.name"
 		:image="res.photo_url"
-		image-fallback="fas fa-user-circle fa-7x"
+		image-fallback="fas fa-user fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
 		<div class="searchbar_table">
diff --git a/public/js/components/searchbar/result/prestudent.js b/public/js/components/searchbar/result/prestudent.js
index 4a11ac941..f3df3e8ca 100644
--- a/public/js/components/searchbar/result/prestudent.js
+++ b/public/js/components/searchbar/result/prestudent.js
@@ -21,7 +21,7 @@ export default {
 		:actions="actions"
 		:title="res.name + ' (' + res.status + ' ' + res.stg_kuerzel + ')'"
 		:image="res.photo_url"
-		image-fallback="fas fa-user-circle fa-7x"
+		image-fallback="fas fa-user fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
 		<div class="searchbar_table">
diff --git a/public/js/components/searchbar/result/room.js b/public/js/components/searchbar/result/room.js
index 6da1e970a..23ce6b463 100644
--- a/public/js/components/searchbar/result/room.js
+++ b/public/js/components/searchbar/result/room.js
@@ -33,7 +33,7 @@ export default {
 		:res="res"
 		:actions="actions"
 		:title="res.ort_kurzbz"
-		image-fallback="fas fa-door-open fa-4x p-4 text-white bg-primary"
+		image-fallback="fas fa-door-open fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
 		<div class="searchbar_table">
diff --git a/public/js/components/searchbar/result/student.js b/public/js/components/searchbar/result/student.js
index 3eb401d97..bb3512e3a 100644
--- a/public/js/components/searchbar/result/student.js
+++ b/public/js/components/searchbar/result/student.js
@@ -21,7 +21,7 @@ export default {
 		:actions="actions"
 		:title="res.name"
 		:image="res.photo_url"
-		image-fallback="fas fa-user-circle fa-7x"
+		image-fallback="fas fa-user fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
 		<div class="searchbar_table">
diff --git a/public/js/components/searchbar/result/template/frame.js b/public/js/components/searchbar/result/template/frame.js
index 87078a166..336c2d9f9 100644
--- a/public/js/components/searchbar/result/template/frame.js
+++ b/public/js/components/searchbar/result/template/frame.js
@@ -22,14 +22,13 @@ export default {
 					:res="res"
 					:action="actions.defaultaction"
 					@actionexecuted="$emit('actionexecuted')"
-					class="searchbar-square-image"
+					class="searchbar-rounded-image"
 					>
 					<img
 						v-if="image"
 						:src="image"
-						class="rounded-circle"
 						/>
-					<div v-else class="d-flex justify-content-center align-items-center rounded-circle overflow-hidden">
+					<div v-else>
 						<i :class="imageFallback"></i>
 					</div>
 				</result-action>

From e3119ee48ce91d3a6e2785d234582d8c0e9479d5 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 5 Nov 2024 15:35:00 +0100
Subject: [PATCH 015/572] cleanup

---
 application/controllers/api/frontend/v1/Searchbar.php | 1 -
 application/libraries/SearchBarLib.php                | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Searchbar.php b/application/controllers/api/frontend/v1/Searchbar.php
index 2d5b06063..d630d3afd 100644
--- a/application/controllers/api/frontend/v1/Searchbar.php
+++ b/application/controllers/api/frontend/v1/Searchbar.php
@@ -50,7 +50,6 @@ class Searchbar extends FHCAPI_Controller
 	 */
 	public function search()
 	{
-		#$searchstrings = ['pid:71995', 'email:eder.iris', 'schnabl', 'schnabl thomas', 'schnabl thomas sarim', 'schnabl -thomas', 'nachname:schnabl -vorname:thomas', 'schnabl thomas -sarim', 'schnabl or hacker', '-ali', '-ali -baba', '-ali -baba -raub', '-ali -honig', '-ali -baba ali', 'hofer martin'];
 		$this->load->library('form_validation');
 
 		// Checks if the searchstr and the types parameters are in the POSTed JSON
diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index d563a9c79..630f31ecf 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -32,11 +32,6 @@ class SearchBarLib
 	const ERROR_WRONG_TYPES = 'ERR004';
 	const ERROR_NOT_AUTH = 'ERR005';
 
-	// List of allowed types of search
-	const ALLOWED_TYPES = ['mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'organisationunit', 'raum', 'person', 'student', 'prestudent', 'document', 'cms'];
-
-	const PHOTO_IMG_URL = '/cis/public/bild.php?src=person&person_id=';
-
 	private $_ci; // Code igniter instance
 
 	private $_searchfunction_priorities = [];

From 8c689418f7fffe9c54d77aeb5406c1fe55576570 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 7 Nov 2024 09:57:26 +0100
Subject: [PATCH 016/572] Bugfixes

---
 application/libraries/SearchBarLib.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index 630f31ecf..b9c71b16b 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -68,7 +68,6 @@ class SearchBarLib
 
 	/**
 	 * It performes the search of the given search string using the specified search types
-	 * TODO(chris): permissions
 	 *
 	 * @param string							$searchstring
 	 * @param array								$types (optional)
@@ -498,9 +497,8 @@ class SearchBarLib
 						SELECT
 							" . $this->_formatPrimarykeys($table_config['primarykey'], $table_config['table']) . "
 							FROM " . $table_config['table'] . "
-							" . $this->_makeJoin($field_config['join']) . "
+							" . $this->_makeJoin($field_config['join'] ?? '') . "
 							WHERE ";
-					// TODO(chris): equals and equal-int could be IN () statement???
 					foreach ($words as $word) {
 						$sql[] = $field_sql . $this->_makeCompareBool($field_config['comparison'], $field_config['field'], $word);
 					}
@@ -508,10 +506,10 @@ class SearchBarLib
 
 				$or_select[] = "
 					SELECT 
-						" . $table_config['table']($table_config['primarykey']) . ",
+						" . $this->_formatPrimarykeys($table_config['primarykey'], $table_config['table']) . ",
 						1.0 AS rank
 					FROM " . $table_config['table'] . "
-					WHERE prestudent_id NOT IN (" . implode(" UNION ", $sql) . ")";
+					WHERE " . $table_config['primarykey'] . " NOT IN (" . implode(" UNION ", $sql) . ")";
 			} else {
 				$current_select = false;
 				$count = 0;

From f82ed6928aaae0a6d1a648a4ea5d572b2ee6f11b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 7 Nov 2024 11:47:35 +0100
Subject: [PATCH 017/572] Phrasen

---
 application/libraries/SearchBarLib.php        |   8 +-
 public/js/components/searchbar/result/cms.js  |   2 +-
 public/js/components/searchbar/result/dms.js  |  11 +-
 .../components/searchbar/result/employee.js   |  12 +-
 .../searchbar/result/mergedperson.js          |  26 +-
 .../searchbar/result/organisationunit.js      |  17 +-
 .../js/components/searchbar/result/person.js  |   4 +-
 .../components/searchbar/result/prestudent.js |  12 +-
 public/js/components/searchbar/result/room.js |  16 +-
 .../js/components/searchbar/result/student.js |   8 +-
 .../searchbar/result/template/action.js       |   2 +-
 public/js/components/searchbar/searchbar.js   |  18 +-
 system/phrasesupdate.php                      | 682 +++++++++++++++++-
 13 files changed, 744 insertions(+), 74 deletions(-)

diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index b9c71b16b..a14319bba 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -95,7 +95,7 @@ class SearchBarLib
 				return error(array_map(function ($type) use ($p) {
 					return $p->t('search', 'error_missing_config', [
 						'type' => $type
-					]); // TODO(chris): phrase
+					]);
 				}, $missing));
 			}
 			$types = $tmp;
@@ -288,7 +288,7 @@ class SearchBarLib
 		if (!$table_config)
 			return error($this->_ci->search_phrases->t('search', 'error_missing_config', [
 				'type' => $name
-			])); // TODO(chris): phrase
+			]));
 
 		$errors = [];
 		if (!isset($table_config['table'])
@@ -298,7 +298,7 @@ class SearchBarLib
 			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
 				'type' => $name,
 				'field' => 'table'
-			]); // TODO(chris): phrase
+			]);
 		}
 		if (!isset($table_config['primarykey'])
 			|| !is_string($table_config['primarykey'])
@@ -336,7 +336,7 @@ class SearchBarLib
 						'type' => $name,
 						'searchfield' => $searchfield,
 						'field' => 'field'
-					]); // TODO(chris): phrase
+					]);
 				}
 				if (!isset($config['comparison'])
 					|| !is_string($config['comparison'])
diff --git a/public/js/components/searchbar/result/cms.js b/public/js/components/searchbar/result/cms.js
index 5befdb413..591c7e79c 100644
--- a/public/js/components/searchbar/result/cms.js
+++ b/public/js/components/searchbar/result/cms.js
@@ -75,7 +75,7 @@ export default {
 		<img v-if="flag" :src="flag" class="ms-2">
 		<div v-if="preview" class="searchbar_table" v-html="preview"></div>
 		<div v-else class="searchbar_table text-muted">
-			No Content
+			{{ $p.t('search/result_content_none') }}
 		</div>
 	</template-frame>`
 };
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/dms.js b/public/js/components/searchbar/result/dms.js
index ad770f1c6..75b281541 100644
--- a/public/js/components/searchbar/result/dms.js
+++ b/public/js/components/searchbar/result/dms.js
@@ -9,9 +9,6 @@ export default {
 		res: Object,
 		actions: Object
 	},
-	inject: [
-		'query'
-	],
 	computed: {
 		icon() {
 			switch (this.res.mimetype) {
@@ -49,25 +46,25 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">DMS ID</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_dms_id') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.dms_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Version</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_version') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.version }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Keywords</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_keywords') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.keywords }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Description</div>
+				<div class="searchbar_tablecell">{{ $p.t('global/beschreibung') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.description }}
 				</div>
diff --git a/public/js/components/searchbar/result/employee.js b/public/js/components/searchbar/result/employee.js
index 2fa07bf5a..a86fc6cbf 100644
--- a/public/js/components/searchbar/result/employee.js
+++ b/public/js/components/searchbar/result/employee.js
@@ -21,25 +21,25 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Standard-Kostenstelle</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_stdkst') }}</div>
 				<div class="searchbar_tablecell">
 					<ul class="searchbar_inline_ul" v-if="res.standardkostenstelle.length > 0">
 						<li v-for="(stdkst, idx) in res.standardkostenstelle" :key="idx">{{ stdkst }}</li>
 					</ul>
-					<span v-else="">keine</span>
+					<span v-else="">{{ $p.t('search/result_stdkst_none') }}</span>
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Organisations-Einheit</div>
+				<div class="searchbar_tablecell">{{ $p.t('lehre/organisationseinheit') }}</div>
 				<div class="searchbar_tablecell">
 					<ul class="searchbar_inline_ul" v-if="res.organisationunit_name.length > 0">
 						<li v-for="(oe, idx) in res.organisationunit_name" :key="idx">{{ oe }}</li>
 					</ul>
-					<span v-else="">keine</span>
+					<span v-else="">{{ $p.t('search/result_oe_none') }}</span>
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">EMails</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_emails') }}</div>
 				<div class="searchbar_tablecell">
 					<a :href="'mailto:' + res.email" class="d-block">
 						{{ res.email }}
@@ -47,7 +47,7 @@ export default {
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Telefon</div>
+				<div class="searchbar_tablecell">{{ $p.t('person/telefon') }}</div>
 				<div class="searchbar_tablecell">
 					<a :href="'tel:' + res.phone" class="d-block">
 						{{ res.phone }}
diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
index cfb7fe5a6..c0349c2e3 100644
--- a/public/js/components/searchbar/result/mergedperson.js
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -47,19 +47,19 @@ export default {
 		:res="person"
 		:actions="actions"
 		:title="person.name"
-		:image="this.person.photo_url"
+		:image="person.photo_url"
 		image-fallback="fas fa-user fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Person ID</div>
+				<div class="searchbar_tablecell">{{ $p.t('person/person_id') }}</div>
 				<div class="searchbar_tablecell">
 					{{ person.person_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">EMails</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_emails') }}</div>
 				<div class="searchbar_tablecell">
 					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
 						{{ email }}
@@ -75,12 +75,12 @@ export default {
 							:action="actions.defaultactionemployee || actions.defaultaction"
 							@actionexecuted="$emit('actionexecuted')"
 							>
-							Mitarbeiter
+							{{ $p.t('search/result_employee') }}
 						</template-action>
 					</div>
 				</div>
 				<div class="searchbar_tablerow">
-					<div class="searchbar_tablecell ps-3">Standard-Kostenstelle</div>
+					<div class="searchbar_tablecell ps-3">{{ $p.t('search/result_stdkst') }}</div>
 					<div class="searchbar_tablecell">
 						<ul class="searchbar_inline_ul" v-if="employee.standardkostenstelle.length > 0">
 							<li
@@ -90,11 +90,11 @@ export default {
 								{{ stdkst }}
 							</li>
 						</ul>
-						<span v-else="">keine</span>
+						<span v-else="">{{ $p.t('search/result_stdkst_none') }}</span>
 					</div>
 				</div>
 				<div class="searchbar_tablerow">
-					<div class="searchbar_tablecell ps-3">Organisations-Einheit</div>
+					<div class="searchbar_tablecell ps-3">{{ $p.t('lehre/organisationseinheit') }}</div>
 					<div class="searchbar_tablecell">
 						<ul class="searchbar_inline_ul" v-if="employee.organisationunit_name.length > 0">
 							<li
@@ -104,11 +104,11 @@ export default {
 								{{ oe }}
 							</li>
 						</ul>
-						<span v-else="">keine</span>
+						<span v-else="">{{ $p.t('search/result_oe_none') }}</span>
 					</div>
 				</div>
 				<div class="searchbar_tablerow">
-					<div class="searchbar_tablecell ps-3">Telefon</div>
+					<div class="searchbar_tablecell ps-3">{{ $p.t('person/telefon') }}</div>
 					<div class="searchbar_tablecell">
 						<a :href="telurl">
 							{{ employee.phone }}
@@ -132,25 +132,25 @@ export default {
 						</div>
 					</div>
 					<div class="searchbar_tablerow">
-						<div class="searchbar_tablecell ps-3">Studiengang</div>
+						<div class="searchbar_tablecell ps-3">{{ $p.t('lehre/studiengang') }}</div>
 						<div class="searchbar_tablecell">
 							{{ student.bezeichnung }}
 						</div>
 					</div>
 					<div class="searchbar_tablerow">
-						<div class="searchbar_tablecell ps-3">Prestudent ID</div>
+						<div class="searchbar_tablecell ps-3">{{ $p.t('search/result_prestudent_id') }}</div>
 						<div class="searchbar_tablecell">
 							{{ student.prestudent_id }}
 						</div>
 					</div>
 					<div v-if="student.uid" class="searchbar_tablerow">
-						<div class="searchbar_tablecell ps-3">Student UID</div>
+						<div class="searchbar_tablecell ps-3">{{ $p.t('search/result_student_uid') }}</div>
 						<div class="searchbar_tablecell">
 							{{ student.uid }}
 						</div>
 					</div>
 					<div v-if="student.matrikelnr" class="searchbar_tablerow">
-						<div class="searchbar_tablecell ps-3">Matrikelnummer</div>
+						<div class="searchbar_tablecell ps-3">{{ $p.t('person/matrikelnummer') }}</div>
 						<div class="searchbar_tablecell">
 							{{ student.matrikelnr }}
 						</div>
diff --git a/public/js/components/searchbar/result/organisationunit.js b/public/js/components/searchbar/result/organisationunit.js
index 129479277..fe5d6512a 100644
--- a/public/js/components/searchbar/result/organisationunit.js
+++ b/public/js/components/searchbar/result/organisationunit.js
@@ -9,13 +9,6 @@ export default {
 		res: Object,
 		actions: Object
 	},
-	computed: {
-		foto() {
-			if (this.res.foto)
-				return 'data:image/jpeg;base64,' + this.res.foto;
-			return null;
-		}
-	},
 	template: `
 	<template-frame
 		class="searchbar-result-organisationunit"
@@ -27,14 +20,14 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">übergeordnete OrgEinheit</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_parent_oe') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.parentoe_name }}
 				</div>
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Gruppen-EMail</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_group_emails') }}</div>
 				<div class="searchbar_tablecell">
 					<a :href="'mailto:' + res.mailgroup">
 						{{ res.mailgroup }}
@@ -43,17 +36,17 @@ export default {
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Leiter</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_leader') }}</div>
 				<div class="searchbar_tablecell">
 					<ul class="searchbar_inline_ul" v-if="res.leaders.length > 0">
 						<li v-for="(leader, idx) in res.leaders" :key="idx">{{ leader.name }}</li>
 					</ul>
-					<span v-else="">N.N.</span>
+					<span v-else="">{{ $p.t('search/result_leader_none') }}</span>
 				</div>
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Mitarbeiter-Anzahl</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_number_of_employees') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.number_of_people }}
 				</div>
diff --git a/public/js/components/searchbar/result/person.js b/public/js/components/searchbar/result/person.js
index bc4e75ee8..f6ce0a5f0 100644
--- a/public/js/components/searchbar/result/person.js
+++ b/public/js/components/searchbar/result/person.js
@@ -26,13 +26,13 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Person ID</div>
+				<div class="searchbar_tablecell">{{ $p.t('person/person_id') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.person_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">EMails</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_emails') }}</div>
 				<div class="searchbar_tablecell">
 					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
 						{{ email }}
diff --git a/public/js/components/searchbar/result/prestudent.js b/public/js/components/searchbar/result/prestudent.js
index f3df3e8ca..51b4ccd9b 100644
--- a/public/js/components/searchbar/result/prestudent.js
+++ b/public/js/components/searchbar/result/prestudent.js
@@ -26,13 +26,13 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Person ID</div>
+				<div class="searchbar_tablecell">{{ $p.t('person/person_id') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.person_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">EMails</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_emails') }}</div>
 				<div class="searchbar_tablecell">
 					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
 						{{ email }}
@@ -40,25 +40,25 @@ export default {
 				</div>
 			</div>
 			<div v-if="res.uid" class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Student UID</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_student_uid') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.uid }}
 				</div>
 			</div>
 			<div v-if="res.matrikelnr" class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Matrikelnummer</div>
+				<div class="searchbar_tablecell">{{ $p.t('person/matrikelnummer') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.matrikelnr }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Prestudent ID</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_prestudent_id') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.prestudent_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Studiengang</div>
+				<div class="searchbar_tablecell">{{ $p.t('lehre/studiengang') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.bezeichnung }}
 				</div>
diff --git a/public/js/components/searchbar/result/room.js b/public/js/components/searchbar/result/room.js
index 23ce6b463..46fce1c71 100644
--- a/public/js/components/searchbar/result/room.js
+++ b/public/js/components/searchbar/result/room.js
@@ -22,9 +22,9 @@ export default {
 			if (this.res.street)
 				address += (address ? ', ' : '') + this.res.street;
 			if (this.res.floor)
-				address += (address ? ' / ' : '') + this.res.floor + ' Stockwerk';
+				address += (address ? ' / ' : '') + this.$p.t('search/result_address_floor', this.res);
 
-			return address || 'N/A';
+			return address || this.$p.t('search/result_address_none');
 		}
 	},
 	template: `
@@ -38,33 +38,33 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Standort</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_room_address') }}</div>
 				<div class="searchbar_tablecell">
 					{{ address }}
 				</div>
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Sitzplätze</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_workplaces') }}</div>
 				<div class="searchbar_tablecell">
 					<template v-if="res.max_person !== null && res.workplaces !== null">
-						{{ res.max_person }}, davon {{ res.workplaces }} PC-Plätze
+						{{ $p.t('search/result_workplaces_pc', res) }}
 					</template>
 					<template v-else>
-						N/A
+						{{ $p.t('search/result_workplaces_none') }}
 					</template>
 				</div>
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Gebäude</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_building') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.building }}
 				</div>
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Zusatz Informationen</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_equipment') }}</div>
 				<div class="searchbar_tablecell">
 					<div class="no-margin-paragraphs" v-html="equipment"></div>
 				</div>
diff --git a/public/js/components/searchbar/result/student.js b/public/js/components/searchbar/result/student.js
index bb3512e3a..e85716a94 100644
--- a/public/js/components/searchbar/result/student.js
+++ b/public/js/components/searchbar/result/student.js
@@ -26,25 +26,25 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Student UID</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_student_uid') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.uid }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Person ID</div>
+				<div class="searchbar_tablecell">{{ $p.t('person/person_id') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.person_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">Matrikelnummer</div>
+				<div class="searchbar_tablecell">{{ $p.t('person/matrikelnummer') }}</div>
 				<div class="searchbar_tablecell">
 					{{ res.matrikelnr }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">EMails</div>
+				<div class="searchbar_tablecell">{{ $p.t('search/result_emails') }}</div>
 				<div class="searchbar_tablecell">
 					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
 						{{ email }}
diff --git a/public/js/components/searchbar/result/template/action.js b/public/js/components/searchbar/result/template/action.js
index a7654df59..f41d9925f 100644
--- a/public/js/components/searchbar/result/template/action.js
+++ b/public/js/components/searchbar/result/template/action.js
@@ -23,6 +23,6 @@ export default {
 	},
 	template: `
 	<a :href="actionHref" @click="actionFunc">
-		<slot>Action</slot>
+		<slot>{{ $p.t('search/action_default_label') }}</slot>
 	</a>`
 };
\ No newline at end of file
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 7589cfbef..034cf842a 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -9,8 +9,6 @@ import ResultDms from "./result/dms.js";
 import ResultMergedperson from "./result/mergedperson.js";
 import ResultMergedstudent from "./result/mergedstudent.js";
 
-// TODO(chris): arrays in results
-
 export default {
 	components: {
 		ResultPerson,
@@ -108,7 +106,7 @@ export default {
 				.searchfunction(this.searchsettings, { timeout: 50000, signal: this.abortController.signal })
 				.then(response => {
 					if (!response.data) {
-						this.error = 'Bei der Suche ist ein Fehler aufgetreten.';
+						this.error = this.$p.t('search/error_general');
 					} else {
 						let res = response.data.map(el => ({...el, ...JSON.parse(el.data)}));
 						this.lastQuery = response.meta.searchstring;
@@ -167,7 +165,7 @@ export default {
 						return this.callsearchapi();
 					}
 
-					this.error = 'Bei der Suche ist ein Fehler aufgetreten.' + ' ' + error.message;
+					this.error = this.$p.t('search/error_general', error);
 					this.searching = false;
 					this.retry = 0;
 				});
@@ -230,8 +228,8 @@ export default {
 				v-model="searchsettings.searchstr"
 				class="form-control"
 				type="search"
-				placeholder="Suche..."
-				aria-label="Search"
+				:placeholder="$p.t('search/input_search_label')"
+				:aria-label="$p.t('search/input_search_label')"
 			>
 			<button
 				ref="settingsbutton"
@@ -239,6 +237,8 @@ export default {
 				class="btn btn-light border-start"
 				type="button"
 				id="search-filter"
+				:title="$p.t('search/button_filter_label')"
+				:aria-label="$p.t('search/button_filter_label')"
 				>
 				<i class="fas fa-cog"></i>
 			</button>
@@ -254,7 +254,7 @@ export default {
 				<i class="fas fa-spinner fa-spin fa-2x"></i>
 			</div>
 			<div v-else-if="error !== null">{{ error }}</div>
-			<div v-else-if="searchresult.length < 1">Es wurden keine Ergebnisse gefunden.</div>
+			<div v-else-if="searchresult.length < 1">{{  $p.t('search/error_no_results') }}</div>
 			<template v-else>
 				<template v-for="res in searchresult">
 					<result-person v-if="res.type === 'person'" :res="res" :actions="searchoptions.actions.person" @actionexecuted="hideresult"></result-person>
@@ -268,7 +268,7 @@ export default {
 					<result-dms v-else-if="res.type === 'dms'" :res="res" :actions="searchoptions.actions.dms" @actionexecuted="hideresult"></result-dms>
 					<result-mergedperson v-else-if="res.type === 'mergedperson'" :res="res" :actions="searchoptions.actions.mergedperson" @actionexecuted="hideresult"></result-mergedperson>
 					<result-mergedstudent v-else-if="res.type === 'mergedstudent'" :res="res" :actions="searchoptions.actions.mergedstudent" @actionexecuted="hideresult"></result-mergedstudent>
-					<div v-else>Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
+					<div v-else class="searchbar-result text-danger fw-bold">{{ $p.t('search/error_unknown_type', res) }}</div>
 				</template>
 			</template>
 		</div>
@@ -302,7 +302,7 @@ export default {
 				class="btn btn-primary"
 				type="button"
 			>
-				Übernehmen
+				{{ $p.t('search/button_applyfilter_label') }}
 			</button>
 		</div>
 	</form>`
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d9a72eaac..76059451d 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31165,8 +31165,688 @@ array(
 				'insertvon' => 'system'
 			)
 		)
+	),
+	//****************************	 CORE/search
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'input_search_label',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Suche...',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Search...',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'button_filter_label',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Filter',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Filter',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'button_applyfilter_label',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Übernehmen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Apply',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'action_default_label',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Standard Aktion',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Default Action',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_student_uid',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Student UID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student UID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_prestudent_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Prestudent ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Prestudent ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_emails',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Emails',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Emails',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_group_emails',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gruppen-Email',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Group-Email',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_employee',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'MitarbeiterIn',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Employee',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_stdkst',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Standard-Kostenstelle',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Standard cost center',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_stdkst_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'keine',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'none',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_parent_oe',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Übergeordnete OE',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Parent OU',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_oe_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'keine',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'none',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_room_address',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Standort',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Site',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_address_floor',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{floor} Stockwerk',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{floor} floor',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_address_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'N/A',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'N/A',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_workplaces',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sitzplätze',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Seats',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_workplaces_pc',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{max_person}, davon {workplaces} PC-Plätze',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{max_person}, of which {workplaces} PC-Workstations',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_workplaces_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'N/A',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'N/A',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_building',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gebäude',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Building',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_equipment',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zusatz Informationen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Additional information',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_leader',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Leiter',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Leader',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_leader_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'N.N.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'N/A',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_number_of_employees',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mitarbeiter-Anzahl',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Number of employees',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_dms_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'DMS ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'DMS ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_version',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Version',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Version',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_keywords',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Schlagwörter',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Keywords',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_content_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Inhalt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No Content',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_no_results',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Es wurden keine Ergebnisse gefunden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No results were found.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_unknown_type',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Unbekannter Ergebnistyp: '{type}'.",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Unknown resulttype: '{type}'.",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_general',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bei der Suche ist ein Fehler aufgetreten. {message}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'An error occurred while searching. {message}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_missing_config',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Such-Konfiguration $config["{type}"] nicht gefunden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Search config $config["{type}"] not found.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_invalid_config',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Such-Konfiguration für $config["{type}"] ist ungültig: Feld "{field}" fehlt, ist leer oder hat einen ungültigen Typ.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Search config for $config["{type}"] is invalid: field {field} is missing, empty or has an invalid type.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_invalid_config_searchfield',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Such-Konfiguration $config["{type}"]["searchfields"]["{searchfield}"] ist ungültig: Feld "{field}" fehlt oder ist unglültig.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Search config $config["{type}"]["searchfields"]["{searchfield}"] is invalid: field {field} is missing or invalid.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
 	)
-
 );
 
 

From 72c992569c5c79a49f7b1c8325db494533f612d4 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 7 Nov 2024 13:33:51 +0100
Subject: [PATCH 018/572] Improvements Mergedperson Component

---
 .../searchbar/result/mergedperson.js          | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
index c0349c2e3..e6fc5833b 100644
--- a/public/js/components/searchbar/result/mergedperson.js
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -12,33 +12,38 @@ export default {
 		actions: Object
 	},
 	computed: {
-		telurl() {
-			return 'tel:' + this.employee?.phone;
-		},
 		person() {
-			const person = this.res.list.filter(item => item.type == 'person');
-			if (person.length)
-				return person.pop();
+			 // Cummulate all emails
+			const email = this.res.list.reduce((a, c) => [...a, ...(Array.isArray(c.email) ? c.email : [c.email])], []);
+
+			// Use person entry if available (with cummulated emails)
+			const person = this.res.list.find(item => item.type == 'person');
+			if (person)
+				return {...person, email};
+
+			 // Those properties should be the same in all entries
+			const { person_id, name } = this.res.list[0];
+			 // Get first photo (prefer student photo if available)
+			const photo_url = ((this.students ? this.students.find(el => el.photo_url) : null) || this.employee)?.photo_url;
 
-			// TODO(chris): first one might have not one of these but a later one
-			const { person_id, name, photo_url, email } = this.res.list[0];
 			return { person_id, name, photo_url, email };
 		},
 		employee() {
-			const ma = this.res.list.filter(item => [
+			return this.res.list.find(item => [
 				'employee',
 				'unassigned_employee'
-			].includes(item.type));
-			return ma.length ? ma.pop() : null;
+			].includes(item.type)) || null;
 		},
 		students() {
 			const students = this.res.list.filter(item => item.type == 'prestudent');
 			return students.length ? students : null;
 		},
 		emails() {
-			if (Array.isArray(this.person.email))
-				return new Set(this.person.email);
-			return [this.person.email];
+			// Remove duplicates
+			return new Set(this.person.email);
+		},
+		telurl() {
+			return 'tel:' + this.employee?.phone;
 		}
 	},
 	template: `

From 2ed5df8c1c18f644bac7de3ff0aad41c9103f7dc Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 7 Nov 2024 17:01:51 +0100
Subject: [PATCH 019/572] Orgform of Stg in searchresults

---
 application/config/search.php                       | 13 ++++++++++++-
 .../js/components/searchbar/result/mergedperson.js  |  2 +-
 public/js/components/searchbar/result/prestudent.js |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/application/config/search.php b/application/config/search.php
index 8c601e046..3a2c27a18 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -309,7 +309,18 @@ $config['prestudent'] = [
 			FROM public.tbl_status
 			WHERE status_kurzbz = public.get_rolle_prestudent(ps.prestudent_id, NULL)
 			LIMIT 1
-		) as status"
+		) AS status",
+		"COALESCE(
+			(
+				SELECT COALESCE(plan.orgform_kurzbz, pss.orgform_kurzbz)
+				FROM public.tbl_prestudentstatus pss
+				LEFT JOIN lehre.tbl_studienplan plan USING (studienplan_id)
+				WHERE pss.prestudent_id=ps.prestudent_id
+				ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
+				LIMIT 1
+			),
+			sg.orgform_kurzbz
+		) AS orgform"
 	],
 	'resultjoin' => "
 		LEFT JOIN public.tbl_prestudent ps USING (prestudent_id)
diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
index e6fc5833b..be9d1e735 100644
--- a/public/js/components/searchbar/result/mergedperson.js
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -139,7 +139,7 @@ export default {
 					<div class="searchbar_tablerow">
 						<div class="searchbar_tablecell ps-3">{{ $p.t('lehre/studiengang') }}</div>
 						<div class="searchbar_tablecell">
-							{{ student.bezeichnung }}
+							{{ student.bezeichnung }} {{ student.orgform ? '(' + student.orgform + ')' : '' }}
 						</div>
 					</div>
 					<div class="searchbar_tablerow">
diff --git a/public/js/components/searchbar/result/prestudent.js b/public/js/components/searchbar/result/prestudent.js
index 51b4ccd9b..c33877bf0 100644
--- a/public/js/components/searchbar/result/prestudent.js
+++ b/public/js/components/searchbar/result/prestudent.js
@@ -60,7 +60,7 @@ export default {
 			<div class="searchbar_tablerow">
 				<div class="searchbar_tablecell">{{ $p.t('lehre/studiengang') }}</div>
 				<div class="searchbar_tablecell">
-					{{ res.bezeichnung }}
+					{{ res.bezeichnung }} {{ res.orgform ? '(' + res.orgform + ')' : '' }}
 				</div>
 			</div>
 		</div>

From 7fbff20dd97d66a15cd0242214c96616530fe924 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 4 Feb 2025 14:49:41 +0100
Subject: [PATCH 020/572] new Tab Gruppen

---
 .../api/frontend/v1/stv/Config.php            |   4 +
 .../api/frontend/v1/stv/Favorites.php         |   2 +-
 .../api/frontend/v1/stv/Gruppen.php           |  81 ++++++++
 public/js/api/stv.js                          |   2 +
 public/js/api/stv/group.js                    |   8 +
 .../js/components/Stv/Studentenverwaltung.js  |   1 +
 .../Studentenverwaltung/Details/Gruppen.js    |  19 ++
 .../Details/Gruppen/Gruppen.js                | 182 ++++++++++++++++++
 system/phrasesupdate.php                      |  83 ++++++++
 9 files changed, 381 insertions(+), 1 deletion(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Gruppen.php
 create mode 100644 public/js/api/stv/group.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Gruppen.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index c28c49485..12cd77048 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -91,6 +91,10 @@ class Config extends FHCAPI_Controller
 			'title' => $this->p->t('stv', 'tab_resources'),
 			'component' => './Stv/Studentenverwaltung/Details/Betriebsmittel.js'
 		];
+		$result['groups'] = [
+			'title' => $this->p->t('stv', 'tab_groups'),
+			'component' => './Stv/Studentenverwaltung/Details/Gruppen.js'
+		];
 		/* TODO(chris): Ausgeblendet für Testing
 		$result['grades'] = [
 			'title' => $this->p->t('stv', 'tab_grades'),
diff --git a/application/controllers/api/frontend/v1/stv/Favorites.php b/application/controllers/api/frontend/v1/stv/Favorites.php
index 8d7a6cd14..b8fe6f3d7 100644
--- a/application/controllers/api/frontend/v1/stv/Favorites.php
+++ b/application/controllers/api/frontend/v1/stv/Favorites.php
@@ -48,7 +48,7 @@ class Favorites extends FHCAPI_Controller
 		if (!$data)
 			$this->terminateWithSuccess(null);
 		else
-			$this->terminateWithSuccess($data['stv_favorites']);
+			$this->terminateWithSuccess($data['stv_favorites'] ?? null);
 	}
 
 	public function set()
diff --git a/application/controllers/api/frontend/v1/stv/Gruppen.php b/application/controllers/api/frontend/v1/stv/Gruppen.php
new file mode 100644
index 000000000..39c5efe21
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Gruppen.php
@@ -0,0 +1,81 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Gruppen extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getGruppen' => ['admin:r', 'assistenz:r'],
+			'deleteGruppe' => ['admin:rw', 'assistenz:rw'],
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui', 'gruppenmanagement'
+		]);
+
+		// Load models
+		$this->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
+		$this->load->model('organisation/Gruppe_model', 'GruppeModel');
+	}
+
+	public function getGruppen($student_uid)
+	{
+		$this->BenutzergruppeModel ->addSelect('gruppe_kurzbz');
+		$this->BenutzergruppeModel ->addSelect('bezeichnung');
+		$this->BenutzergruppeModel ->addSelect('generiert');
+		$this->BenutzergruppeModel ->addSelect('uid');
+		$this->BenutzergruppeModel ->addSelect('studiensemester_kurzbz');
+		$this->BenutzergruppeModel ->addSelect('public.tbl_benutzergruppe.insertvon');
+		$this->BenutzergruppeModel ->addJoin('public.tbl_gruppe', 'gruppe_kurzbz');
+		$this->BenutzergruppeModel-> addOrder('bezeichnung', 'ASC');
+
+		$result = $this->BenutzergruppeModel->loadWhere(
+			array(
+				'uid' => $student_uid
+			)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function deleteGruppe()
+	{
+		$student_uid = $this->input->post('id');
+		$gruppe_kurzbz = $this->input->post('gruppe_kurzbz');
+
+		//Validate if automatic group generation
+		$result = $this->GruppeModel-> loadWhere(
+			array(
+				'gruppe_kurzbz' => $gruppe_kurzbz
+			)
+		);
+		$data = $this->getDataOrTerminateWithError($result);
+		$generation = current($data);
+
+		if($generation->generiert)
+		{
+			$this->terminateWithError($this->p->t('gruppenmanagement', 'error_deleteGeneratedGroups'), self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->BenutzergruppeModel->delete(
+			array(
+				'gruppe_kurzbz' => $gruppe_kurzbz,
+				'uid' => $student_uid
+				)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		return $this->terminateWithSuccess($data);
+	}
+}
diff --git a/public/js/api/stv.js b/public/js/api/stv.js
index 14fcc6661..8b14beb14 100644
--- a/public/js/api/stv.js
+++ b/public/js/api/stv.js
@@ -2,12 +2,14 @@ import verband from './stv/verband.js';
 import students from './stv/students.js';
 import filter from './stv/filter.js';
 import konto from './stv/konto.js';
+import group from './stv/group.js';
 
 export default {
 	verband,
 	students,
 	filter,
 	konto,
+	group,
 	configStudent() {
 		return this.$fhcApi.get('api/frontend/v1/stv/config/student');
 	},
diff --git a/public/js/api/stv/group.js b/public/js/api/stv/group.js
new file mode 100644
index 000000000..af6e6e122
--- /dev/null
+++ b/public/js/api/stv/group.js
@@ -0,0 +1,8 @@
+export default {
+	getGruppen(url, config, params) {
+		return this.$fhcApi.get('api/frontend/v1/stv/Gruppen/getGruppen/' + params.id);
+	},
+	deleteGroup(params) {
+		return this.$fhcApi.post('api/frontend/v1/stv/Gruppen/deleteGruppe/', params);
+	}
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 8779e4bf1..eaa253c2c 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -57,6 +57,7 @@ export default {
 			hasPermissionToSkipStatusCheck: this.permissions['student/keine_studstatuspruefung'],
 			hasPermissionRtAufsicht: this.permissions['lehre/reihungstestAufsicht'],
 			lists: this.lists,
+			currentSemester: Vue.computed(() => this.studiensemesterKurzbz),
 			defaultSemester: this.defaultSemester,
 			$reloadList: () => {
 				this.$refs.stvList.reload();
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen.js b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen.js
new file mode 100644
index 000000000..1c7c47d6b
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen.js
@@ -0,0 +1,19 @@
+import GruppenList from './Gruppen/Gruppen.js';
+
+export default {
+	components: {
+		GruppenList
+	},
+	props: {
+		modelValue: Object
+	},
+	methods: {
+		reload() {
+			this.$refs.gruppen.$refs.table.reloadTable();
+		}
+	},
+	template: `
+	<div class="stv-details-gruppen h-100 d-flex flex-column">
+		<gruppen-list ref="gruppen" :student="modelValue"></gruppen-list>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
new file mode 100644
index 000000000..6a657a793
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
@@ -0,0 +1,182 @@
+import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+
+export default {
+	components: {
+		CoreFilterCmpt,
+	},
+	inject: {
+		currentSemester: {
+			from: 'currentSemester',
+		},
+	},
+	props: {
+		student: Object
+	},
+	data() {
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: this.$fhcApi.factory.stv.group.getGruppen,
+				ajaxParams: () => {
+					return {
+						id: this.student.uid
+					};
+				},
+				ajaxResponse: (url, params, response) => response.data,
+				initialFilter: [
+					{field: "uid", type: "=", value: this.student.uid},
+					[
+						{field: "studiensemester_kurzbz", type: "=", value: this.currentSemester},
+						{field: "insertvon", type: "=", value: "mlists_generate"}
+					]
+				],
+				columns: [
+					{title: "Gruppe", field: "gruppe_kurzbz"},
+					{title: "Bezeichnung", field: "bezeichnung"},
+					{title: "Semester", field: "studiensemester_kurzbz"},
+					{
+						title: "automatisch generiert",
+						field: "generiert",
+						formatter: "tickCross",
+						hozAlign: "center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
+						}
+					},
+					{title: "UID", field: "uid"},
+					{title: "InsertVon", field: "insertvon", visible: false},
+					{
+						title: 'Aktionen', field: 'actions',
+						minWidth: 150, // Ensures Action-buttons will be always fully displayed
+						formatter: (cell, formatterParams, onRendered) => {
+							const container = document.createElement('div');
+							container.className = "d-flex gap-2";
+
+							const data = cell.getData();
+
+							const button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-xmark"></i>';
+							button.title = this.$p.t('ui', 'loeschen');
+							button.addEventListener('click', () =>
+								this.actionDeleteGroup(data.gruppe_kurzbz)
+							);
+							if (data.generiert)
+								button.disabled = true;
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					},
+				],
+				layout: 'fitDataFill',
+				height: 'auto',
+				selectable: true,
+				index: 'group_id',
+				persistenceID: 'stv-details-gruppe'
+			},
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async () => {
+
+						await this.$p.loadCategory(['global', 'person', 'stv', 'ui', 'gruppenmanagement']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('gruppe_kurzbz').component.updateDefinition({
+							title: this.$p.t('gruppenmanagement', 'gruppe')
+						});
+
+						cm.getColumnByField('bezeichnung').component.updateDefinition({
+							title: this.$p.t('ui', 'bezeichnung')
+						});
+
+						cm.getColumnByField('generiert').component.updateDefinition({
+							title: this.$p.t('gruppenmanagement', 'automatisch_generiert')
+						});
+
+						cm.getColumnByField('uid').component.updateDefinition({
+							title: this.$p.t('ui', 'student_uid')
+						});
+
+						//Interference with Filter if not commented out
+						/*
+						cm.getColumnByField('studiensemester_kurzbz').component.updateDefinition({
+							title: this.$p.t('lehre', 'studiensemester')
+						});*/
+
+					}
+				}
+			],
+		}
+	},
+	methods: {
+		actionDeleteGroup(gruppe_kurzbz) {
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? gruppe_kurzbz
+					: Promise.reject({handled: true}))
+				.then(this.deleteGroup)
+				.catch(this.$fhcAlert.handleSystemError);
+
+		},
+		deleteGroup(gruppe_kurzbz) {
+			const group_id = {
+				id: this.student.uid,
+				gruppe_kurzbz: gruppe_kurzbz
+			};
+
+			return this.$fhcApi.factory.stv.group.deleteGroup(group_id)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					window.scrollTo(0, 0);
+					this.reload();
+				});
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+		},
+	},
+	watch: {
+		currentSemester(newVal) {
+			if (newVal) {
+
+				this.$refs.table.tabulator.clearFilter(); // Clear old filters
+
+				this.$refs.table.tabulator.setFilter([
+					{field: "uid", type: "=", value: this.student.uid},
+					[
+						{field: "studiensemester_kurzbz", type: "=", value: newVal},
+						{field: "insertvon", type: "=", value: "mlists_generate"}
+					]
+				]);
+
+
+			}
+		},
+		student() {
+			this.$refs.table.reloadTable();
+		}
+	},
+	template: `
+				<div class="stv-details-gruppen h-100 pb-3">
+					<h5>{{$p.t('stv', 'tab_groups')}}</h5>
+
+					<core-filter-cmpt
+						ref="table"
+						:tabulator-options="tabulatorOptions"
+						:tabulator-events="tabulatorEvents"
+						table-only
+						:side-menu="false"
+						reload
+					>
+					</core-filter-cmpt>
+				</div>
+			`
+}
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 746c24da3..160db2853 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37297,7 +37297,90 @@ array(
 				'insertvon' => 'system'
 			)
 		)
+	),
+	//////////// FHC4 Phrases Gruppen Start ////////////
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_groups',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gruppen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Groups',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'gruppenmanagement',
+		'phrase' => 'gruppe',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gruppe',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Group',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'gruppenmanagement',
+		'phrase' => 'automatisch_generiert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'automatisch generiert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'automatically generated',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'gruppenmanagement',
+		'phrase' => 'error_deleteGeneratedGroups',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Automatisch generierte Gruppenzuordnungen können nicht gelöscht werden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Automatically generated group assignments cannot be deleted.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
 	)
+	//////////// FHC4 Phrases Gruppen End ////////////
+
 );
 
 

From 6eb9c2ac223e34fe6bd5e89310615e3822e58bf2 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 4 Feb 2025 14:57:35 +0100
Subject: [PATCH 021/572] update filtering

---
 application/controllers/api/frontend/v1/stv/Gruppen.php      | 1 -
 .../Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js       | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Gruppen.php b/application/controllers/api/frontend/v1/stv/Gruppen.php
index 39c5efe21..c30816f2a 100644
--- a/application/controllers/api/frontend/v1/stv/Gruppen.php
+++ b/application/controllers/api/frontend/v1/stv/Gruppen.php
@@ -33,7 +33,6 @@ class Gruppen extends FHCAPI_Controller
 		$this->BenutzergruppeModel ->addSelect('generiert');
 		$this->BenutzergruppeModel ->addSelect('uid');
 		$this->BenutzergruppeModel ->addSelect('studiensemester_kurzbz');
-		$this->BenutzergruppeModel ->addSelect('public.tbl_benutzergruppe.insertvon');
 		$this->BenutzergruppeModel ->addJoin('public.tbl_gruppe', 'gruppe_kurzbz');
 		$this->BenutzergruppeModel-> addOrder('bezeichnung', 'ASC');
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
index 6a657a793..63a9b24e1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
@@ -27,7 +27,7 @@ export default {
 					{field: "uid", type: "=", value: this.student.uid},
 					[
 						{field: "studiensemester_kurzbz", type: "=", value: this.currentSemester},
-						{field: "insertvon", type: "=", value: "mlists_generate"}
+						{field: "studiensemester_kurzbz", type: "=", value: null}
 					]
 				],
 				columns: [
@@ -45,7 +45,6 @@ export default {
 						}
 					},
 					{title: "UID", field: "uid"},
-					{title: "InsertVon", field: "insertvon", visible: false},
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 150, // Ensures Action-buttons will be always fully displayed
@@ -153,7 +152,7 @@ export default {
 					{field: "uid", type: "=", value: this.student.uid},
 					[
 						{field: "studiensemester_kurzbz", type: "=", value: newVal},
-						{field: "insertvon", type: "=", value: "mlists_generate"}
+						{field: "studiensemester_kurzbz", type: "=", value: null}
 					]
 				]);
 

From 018220594a82590cffbcbc612f0f767a314387d7 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 6 Feb 2025 08:34:34 +0100
Subject: [PATCH 022/572] prepare basic framework

---
 .../api/frontend/v1/messages/Messages.php     |  45 +++++++
 .../api/frontend/v1/stv/Config.php            |   4 +
 .../api/frontend/v1/stv/Favorites.php         |   2 +-
 application/models/system/Message_model.php   |   9 +-
 public/js/api/fhcapifactory.js                |   4 +-
 public/js/api/messages.js                     |   5 +
 public/js/api/messages/person.js              |   6 +
 .../components/Messages/Details/NewMessage.js |  13 ++
 .../Messages/Details/TableMessages.js         | 117 ++++++++++++++++++
 public/js/components/Messages/Messages.js     |  48 +++++++
 .../Studentenverwaltung/Details/Messages.js   |  25 ++++
 system/phrasesupdate.php                      |  25 +++-
 12 files changed, 297 insertions(+), 6 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/messages/Messages.php
 create mode 100644 public/js/api/messages.js
 create mode 100644 public/js/api/messages/person.js
 create mode 100644 public/js/components/Messages/Details/NewMessage.js
 create mode 100644 public/js/components/Messages/Details/TableMessages.js
 create mode 100644 public/js/components/Messages/Messages.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Messages.js

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
new file mode 100644
index 000000000..f81e85e9a
--- /dev/null
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -0,0 +1,45 @@
+<?php
+
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+class Messages extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getMessages' => ['admin:r', 'assistenz:r'],
+		]);
+
+		//Load Models
+		$this->load->model('system/Message_model', 'MessageModel');
+
+		// Additional Permission Checks
+		//TODO(manu) check permissions
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+	public function getMessages($id, $type_id)
+	{
+		//$this->terminateWithError("in backend " . $type_id . ": " . $id, self::ERROR_TYPE_GENERAL);
+
+		if ($type_id != "person_id")
+		{
+			$this->terminateWithError("logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->MessageModel->getMessagesOfPerson($id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index c28c49485..9dec3015f 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -91,6 +91,10 @@ class Config extends FHCAPI_Controller
 			'title' => $this->p->t('stv', 'tab_resources'),
 			'component' => './Stv/Studentenverwaltung/Details/Betriebsmittel.js'
 		];
+		$result['messages'] = [
+			'title' => $this->p->t('stv', 'tab_messages'),
+			'component' => './Stv/Studentenverwaltung/Details/Messages.js'
+		];
 		/* TODO(chris): Ausgeblendet für Testing
 		$result['grades'] = [
 			'title' => $this->p->t('stv', 'tab_grades'),
diff --git a/application/controllers/api/frontend/v1/stv/Favorites.php b/application/controllers/api/frontend/v1/stv/Favorites.php
index 8d7a6cd14..b8fe6f3d7 100644
--- a/application/controllers/api/frontend/v1/stv/Favorites.php
+++ b/application/controllers/api/frontend/v1/stv/Favorites.php
@@ -48,7 +48,7 @@ class Favorites extends FHCAPI_Controller
 		if (!$data)
 			$this->terminateWithSuccess(null);
 		else
-			$this->terminateWithSuccess($data['stv_favorites']);
+			$this->terminateWithSuccess($data['stv_favorites'] ?? null);
 	}
 
 	public function set()
diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index d9f8585ed..6288f54f3 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -85,7 +85,7 @@ class Message_model extends DB_Model
 	 */
 	public function getMessagesOfPerson($person_id, $status = null)
 	{
-		$sql = 'SELECT m.message_id,
+		$sql = "SELECT m.message_id,
 						m.person_id,
 						m.subject,
 						m.body,
@@ -109,7 +109,10 @@ class Message_model extends DB_Model
 						re.vornamen AS revornamen,
 						s.status,
 						s.statusinfo,
-						s.insertamum AS statusamum
+						s.insertamum AS statusamum,
+						CONCAT(se.titelpre, ' ', se.vorname, ' ', se.nachname, ' ', se.titelpost) as sender,
+						CONCAT(re.titelpre, ' ', re.vorname, ' ', re.nachname, ' ', re.titelpost ) as recipient,
+						TO_CHAR(s.insertamum::timestamp, 'DD.MM.YYYY HH24:MI') AS format_insertamum
 				  FROM public.tbl_msg_message m
 						JOIN public.tbl_msg_recipient r ON m.message_id = r.message_id
 						JOIN public.tbl_person se ON (m.person_id = se.person_id)
@@ -122,7 +125,7 @@ class Message_model extends DB_Model
 						  ) s ON (m.message_id = s.message_id AND re.person_id = s.person_id)
 				 WHERE se.person_id = ?
 				 OR re.person_id = ?
-				 ';
+				 ";
 
 		if (is_numeric($status))
 		{
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index c4106c3f6..7bc510b6e 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -33,6 +33,7 @@ import ort from "./ort.js";
 import cms from "./cms.js";
 import lehre from "./lehre.js";
 import addons from "./addons.js";
+import messages from "./messages.js";
 
 export default {
     search,
@@ -52,5 +53,6 @@ export default {
     ort,
     cms,
     lehre,
-    addons
+    addons,
+    messages
 };
diff --git a/public/js/api/messages.js b/public/js/api/messages.js
new file mode 100644
index 000000000..f1378c69d
--- /dev/null
+++ b/public/js/api/messages.js
@@ -0,0 +1,5 @@
+import person from "./messages/person.js";
+
+export default {
+	person
+}
\ No newline at end of file
diff --git a/public/js/api/messages/person.js b/public/js/api/messages/person.js
new file mode 100644
index 000000000..bfbdaf123
--- /dev/null
+++ b/public/js/api/messages/person.js
@@ -0,0 +1,6 @@
+export default {
+	getMessages(url, config, params){
+		console.log("in api", params);
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessages/' + params.id + '/' + params.type);
+	},
+}
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/NewMessage.js b/public/js/components/Messages/Details/NewMessage.js
new file mode 100644
index 000000000..bf60842d2
--- /dev/null
+++ b/public/js/components/Messages/Details/NewMessage.js
@@ -0,0 +1,13 @@
+export default {
+	data(){
+		return {
+
+		}
+	},
+	template: `
+	<div class="messages-detail-newmessage">
+		<h4>New Message</h4>
+	</div>
+	`
+
+}
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
new file mode 100644
index 000000000..bc7e6a02a
--- /dev/null
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -0,0 +1,117 @@
+import {CoreFilterCmpt} from "../../filter/Filter.js";
+
+export default {
+	components: {
+		CoreFilterCmpt,
+	},
+	props: {
+		endpoint: {
+			type: String,
+			required: true
+		},
+		typeId: String,
+		id: {
+			type: [Number, String],
+			required: true
+		},
+	},
+	//TODO(Manu) endpoint macht Probleme
+	data(){
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: this.$fhcApi.factory.messages.person.getMessages,
+				ajaxParams: () => {
+					return {
+						id: this.id,
+						type: this.typeId
+					};
+				},
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "subject", field: "subject"},
+					{title: "body", field: "body", visible: false},
+					{title: "message_id", field: "message_id", visible: false},
+					{title: "datum", field: "format_insertamum"},
+					{title: "sender", field: "sender"},
+					{title: "recipient", field: "recipient"},
+					{title: "sepersonid", field: "sepersonid"},
+					{title: "repersonid", field: "repersonid"},
+					{title: "status", field: "status"},
+					{
+						title: 'Aktionen', field: 'actions',
+						width: 100,
+						formatter: (cell, formatterParams, onRendered) => {
+							let container = document.createElement('div');
+							container.className = "d-flex gap-2";
+
+							let button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.title = this.$p.t('ui', 'notiz_edit');
+							button.innerHTML = '<i class="fa fa-edit"></i>';
+							button.addEventListener(
+								'click',
+								(event) =>
+									this.actionEditNotiz(cell.getData().notiz_id)
+							);
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.title = this.$p.t('notiz', 'notiz_delete');
+							button.innerHTML = '<i class="fa fa-xmark"></i>';
+							button.addEventListener(
+								'click',
+								() =>
+									this.actionDeleteNotiz(cell.getData().notiz_id)
+							);
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					}],
+				layout: 'fitColumns',
+				layoutColumnsOnNewData: false,
+				height: '250',
+				selectableRangeMode: 'click',
+				selectable: true,
+				index: 'message_id',
+				persistenceID: 'core-message'
+			},
+		}
+	},
+/*	computed: {
+		statusText(){
+			0: this.$p.t('messsages', 'unread'),
+			1: this.$p.t('messsages', 'read'),
+			2: this.$p.t('messsages', 'archived'),
+			0: this.$p.t('messsages', 'unread'),
+			3: this.$p.t('person', 'deleted'),
+		}
+	},*/
+	template: `
+	<div class="messages-detail-table">
+		<h4>Table Messages</h4>
+		<p>type_id: {{typeId}}</p>
+		<p>id: {{id}}</p>
+		<p>endpoint: {{endpoint}}</p>
+		
+<!--		{{statusText}}-->
+		
+		
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			table-only
+			:side-menu="false"
+			reload
+			new-btn-show
+			:new-btn-label="this.$p.t('global', 'nachricht')"
+			@click:new="actionNewNotiz"
+			>
+		</core-filter-cmpt>
+	</div>
+	`
+
+}
\ No newline at end of file
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
new file mode 100644
index 000000000..6811a3aed
--- /dev/null
+++ b/public/js/components/Messages/Messages.js
@@ -0,0 +1,48 @@
+import TableMessages from "./Details/TableMessages.js";
+import NewMessage from "./Details/NewMessage.js";
+
+export default {
+	components: {
+		TableMessages,
+		NewMessage
+	},
+	props: {
+		endpoint: {
+			type: String,
+			required: true
+		},
+		typeId: String,
+		id: {
+			type: [Number, String],
+			required: true
+		},
+		showNew: Boolean,
+		showTable: Boolean
+	},
+	data() {
+		return {}
+	},
+	template: `
+	<div class="core-messages h-100 pb-3">
+	<p>endpoint: {{endpoint}}</p>
+		<div v-if="showNew">
+			<NewMessage
+				
+			>
+			</NewMessage>
+		</div>
+		
+		<div v-if="showTable">
+			<TableMessages
+				:type-id="typeId"
+				:id="id"
+				:endpoint="endpoint"
+			>
+			
+			</TableMessages>
+		</div>
+		
+	</div>
+	`
+
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
new file mode 100644
index 000000000..7bd6d4b4d
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -0,0 +1,25 @@
+import CoreMessages from "../../../Messages/Messages.js";
+
+export default {
+	components: {
+		CoreMessages
+	},
+	props: {
+		modelValue: Object
+	},
+	template: `
+	<div class="stv-details-messages h-100 pb-3 overflow-hidden">
+		<core-messages
+			ref="formc"
+			endpoint="$fhcApi.factory.messages.person"
+			type-id="person_id"
+			:id="modelValue.person_id"
+			show-table
+			>
+		</core-messages>
+
+
+		
+	</div>
+	`
+};
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index cfaf85ec7..f25cc72ec 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37297,7 +37297,30 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
+	/////////// FHC4 Phrases Messages START ///////////
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_messages',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nachrichten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Messages',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	/////////// FHC4 Phrases Messages END ///////////
+
 );
 
 

From ae3072be924940441968f5d65a352245af043afc Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 11 Feb 2025 09:02:56 +0100
Subject: [PATCH 023/572] listTables with preview in two layouts

---
 .../api/frontend/v1/messages/Messages.php     |   2 +-
 application/models/system/Message_model.php   |  57 +++-
 public/css/Studentenverwaltung.css            |   1 +
 public/css/components/Messages.css            |   4 +
 public/js/api/messages/person.js              |   1 -
 .../Messages/Details/TableMessages.js         | 272 +++++++++++++++---
 public/js/components/Messages/Messages.js     |  15 +-
 .../Studentenverwaltung/Details/Messages.js   |   3 +-
 system/phrasesupdate.php                      | 200 +++++++++++++
 9 files changed, 508 insertions(+), 47 deletions(-)
 create mode 100644 public/css/components/Messages.css

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index f81e85e9a..adf1d52e9 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -36,7 +36,7 @@ class Messages extends FHCAPI_Controller
 			$this->terminateWithError("logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
 		}
 
-		$result = $this->MessageModel->getMessagesOfPerson($id);
+		$result = $this->MessageModel->getMessagesForTable($id);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index 6288f54f3..1b201fc1b 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -109,10 +109,7 @@ class Message_model extends DB_Model
 						re.vornamen AS revornamen,
 						s.status,
 						s.statusinfo,
-						s.insertamum AS statusamum,
-						CONCAT(se.titelpre, ' ', se.vorname, ' ', se.nachname, ' ', se.titelpost) as sender,
-						CONCAT(re.titelpre, ' ', re.vorname, ' ', re.nachname, ' ', re.titelpost ) as recipient,
-						TO_CHAR(s.insertamum::timestamp, 'DD.MM.YYYY HH24:MI') AS format_insertamum
+						s.insertamum AS statusamum
 				  FROM public.tbl_msg_message m
 						JOIN public.tbl_msg_recipient r ON m.message_id = r.message_id
 						JOIN public.tbl_person se ON (m.person_id = se.person_id)
@@ -233,4 +230,56 @@ class Message_model extends DB_Model
 		
 		return $this->execQuery($query, $params);
 	}
+
+	/**
+	 * Gets messages for a person for tableMessages.
+	 * @param $person_id
+	 * @param null $status message status. by default, latest status is returned
+	 * @return array|null
+	 */
+	public function getMessagesForTable($person_id, $status = null)
+	{
+		$sql = "
+			SELECT
+				m.message_id AS message_id,
+				m.subject AS subject,
+				m.body AS body,
+				m.insertamum AS insertamum,
+				m.relationmessage_id AS relationmessage_id,
+				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = m.person_id) as sender,
+				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = r.person_id) as recipient,
+				m.person_id as sender_id,
+				r.person_id as recipient_id,
+				MAX(ss.status) as status,
+				MAX(ss.insertamum) as statusdatum
+			FROM public.tbl_msg_message m
+				 JOIN public.tbl_msg_recipient r USING(message_id)
+				 JOIN public.tbl_msg_status ss ON(r.message_id = ss.message_id AND ss.person_id = r.person_id)
+			WHERE m.person_id = ?
+			GROUP BY m.message_id, m.subject, m.body, m.insertamum, m.relationmessage_id, sender, recipient, sender_id, recipient_id
+			UNION ALL
+			SELECT
+				m.message_id AS message_id,
+				m.subject AS subject,
+				m.body AS body,
+				m.insertamum AS insertamum,
+				m.relationmessage_id AS relationmessage_id,
+				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = m.person_id) as sender,
+				(SELECT COALESCE(titelpre,'') || ' ' || COALESCE(vorname,'') || ' ' || COALESCE(nachname,'') || ' ' || COALESCE(titelpost,'') FROM public.tbl_person WHERE person_id = r.person_id) as recipient,
+				m.person_id as sender_id,
+				r.person_id as recipient_id,
+				MAX(ss.status) as status,
+				MAX(ss.insertamum) as statusdatum
+			FROM public.tbl_msg_recipient r
+				 JOIN public.tbl_msg_status ss USING(message_id, person_id)
+				 JOIN public.tbl_msg_message m USING(message_id)
+			WHERE r.person_id = ?
+			GROUP BY m.message_id, m.subject, m.body, m.insertamum, m.relationmessage_id, sender, recipient, sender_id, recipient_id
+			ORDER BY insertamum
+				 ";
+
+		$parametersArray = array($person_id, $person_id);
+
+		return $this->execQuery($sql, $parametersArray);
+	}
 }
diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index f179c3667..cc2eff51d 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -4,6 +4,7 @@
 @import './components/FilterComponent.css';
 @import './components/Tabs.css';
 @import './components/Notiz.css';
+@import './components/Messages.css';
 
 html {
   font-size: .875em;
diff --git a/public/css/components/Messages.css b/public/css/components/Messages.css
new file mode 100644
index 000000000..1c004f6b0
--- /dev/null
+++ b/public/css/components/Messages.css
@@ -0,0 +1,4 @@
+.twoColumns {
+    height: 400px;
+    overflow-y: auto;
+}
diff --git a/public/js/api/messages/person.js b/public/js/api/messages/person.js
index bfbdaf123..baf8bd39f 100644
--- a/public/js/api/messages/person.js
+++ b/public/js/api/messages/person.js
@@ -1,6 +1,5 @@
 export default {
 	getMessages(url, config, params){
-		console.log("in api", params);
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessages/' + params.id + '/' + params.type);
 	},
 }
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index bc7e6a02a..c4fd4d4d7 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -1,8 +1,12 @@
 import {CoreFilterCmpt} from "../../filter/Filter.js";
+import FormForm from '../../Form/Form.js';
+//import FormInput from '../../Form/Input.js';
 
 export default {
 	components: {
 		CoreFilterCmpt,
+		FormForm,
+	//	FormInput
 	},
 	props: {
 		endpoint: {
@@ -14,6 +18,7 @@ export default {
 			type: [Number, String],
 			required: true
 		},
+		messageLayout: String,
 	},
 	//TODO(Manu) endpoint macht Probleme
 	data(){
@@ -32,12 +37,65 @@ export default {
 					{title: "subject", field: "subject"},
 					{title: "body", field: "body", visible: false},
 					{title: "message_id", field: "message_id", visible: false},
-					{title: "datum", field: "format_insertamum"},
+					{
+						title: "Datum",
+						field: "insertamum",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							const date = new Date(dateStr); // Convert to Date object
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour: "2-digit",
+								minute: "2-digit",
+								hour12: false
+							});
+						}
+					},
 					{title: "sender", field: "sender"},
 					{title: "recipient", field: "recipient"},
-					{title: "sepersonid", field: "sepersonid"},
-					{title: "repersonid", field: "repersonid"},
-					{title: "status", field: "status"},
+					{title: "senderId", field: "sender_id"},
+					{title: "recipientId", field: "recipient_id"},
+					{
+						title: "status",
+						field: "status",
+						formatter: function (cell) {
+							//TODO(Manu) get phrases in this context to work?
+
+							/*							const statusMap = {
+															0: this.$p.t('messsages', 'unread'),
+															1: this.$p.t('messsages', 'read'),
+															2: this.$p.t('messsages', 'archived'),
+															3: this.$p.t('messsages', 'deleted')
+														};*/
+							const statusMap = {
+								0: 'unread',
+								1: 'read',
+								2: 'archived',
+								3: 'deleted'
+							};
+							return statusMap[cell.getValue()];
+							// return this.$p.t('messsages', 'deleted');
+						}
+
+					},
+					{
+						title: "letzte Änderung",
+						field: "statusdatum",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							const date = new Date(dateStr); // Convert to Date object
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour: "2-digit",
+								minute: "2-digit",
+								hour12: false
+							});
+						}
+					},
 					{
 						title: 'Aktionen', field: 'actions',
 						width: 100,
@@ -47,23 +105,23 @@ export default {
 
 							let button = document.createElement('button');
 							button.className = 'btn btn-outline-secondary btn-action';
-							button.title = this.$p.t('ui', 'notiz_edit');
-							button.innerHTML = '<i class="fa fa-edit"></i>';
+							button.title = this.$p.t('global', 'reply');
+							button.innerHTML = '<i class="fa fa-reply"></i>';
 							button.addEventListener(
 								'click',
 								(event) =>
-									this.actionEditNotiz(cell.getData().notiz_id)
+									this.reply(cell.getData().message_id)
 							);
 							container.append(button);
 
 							button = document.createElement('button');
 							button.className = 'btn btn-outline-secondary btn-action';
-							button.title = this.$p.t('notiz', 'notiz_delete');
+							button.title = this.$p.t('ui', 'loeschen');
 							button.innerHTML = '<i class="fa fa-xmark"></i>';
 							button.addEventListener(
 								'click',
 								() =>
-									this.actionDeleteNotiz(cell.getData().notiz_id)
+									this.deleteMessage(cell.getData().message_id)
 							);
 							container.append(button);
 
@@ -71,46 +129,186 @@ export default {
 						},
 						frozen: true
 					}],
-				layout: 'fitColumns',
-				layoutColumnsOnNewData: false,
-				height: '250',
+				layout: 'fitDataFill',
+				layoutColumnsOnNewData:	false,
+			//	height:	'auto',
+				height: '400',
+				selectable:	true,
+				selectableRangeMode: 'click',
+/*				layoutColumnsOnNewData: false,
+
 				selectableRangeMode: 'click',
 				selectable: true,
 				index: 'message_id',
-				persistenceID: 'core-message'
+				persistenceID: 'core-message'*/
 			},
+			tabulatorEvents: [
+				{
+					event: 'dataLoaded',
+					handler: data => this.tabulatorData = data.map(item => {
+						return item;
+					}),
+				},
+				{
+					event: 'tableBuilt',
+					handler: async() => {
+						await this.$p.loadCategory(['global', 'person', 'stv', 'messages', 'ui', 'notiz']);
+
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('subject').component.updateDefinition({
+							title: this.$p.t('global', 'betreff')
+						});
+						cm.getColumnByField('body').component.updateDefinition({
+							title: this.$p.t('messages', 'body')
+						});
+						cm.getColumnByField('message_id').component.updateDefinition({
+							title: this.$p.t('messages', 'message_id')
+						});
+						cm.getColumnByField('insertamum').component.updateDefinition({
+							title: this.$p.t('global', 'datum')
+						});
+						cm.getColumnByField('sender').component.updateDefinition({
+							title: this.$p.t('messages', 'sender')
+						});
+						cm.getColumnByField('recipient').component.updateDefinition({
+							title: this.$p.t('messages', 'recipient')
+						});
+						cm.getColumnByField('sender_id').component.updateDefinition({
+							title: this.$p.t('messages', 'senderId')
+						});
+						cm.getColumnByField('recipient_id').component.updateDefinition({
+							title: this.$p.t('messages', 'recipientId')
+						});
+						cm.getColumnByField('statusdatum').component.updateDefinition({
+							title: this.$p.t('notiz', 'letzte_aenderung')
+						});
+						/*
+						cm.getColumnByField('actions').component.updateDefinition({
+						title: this.$p.t('global', 'aktionen')
+												});
+						*/
+					}
+				},
+				{
+					event: 'rowClick',
+					handler: (e, row) => {
+							const selectedMessage = row.getData().message_id;
+							const body = row.getData().body;
+							this.previewBody = body;
+							console.log(selectedMessage);
+					}
+				},
+			],
+			tabulatorData: [],
+			previewBody: ""
 		}
 	},
-/*	computed: {
+	methods: {
+		reply(message_id){
+			console.log("in reply " + message_id);
+		},
+		deleteMessage(message_id){
+			console.log("deleteMessage " + message_id);
+		},
+		actionNewMessage(){
+			console.log("action new message");
+		},
+	},
+	computed: {
 		statusText(){
-			0: this.$p.t('messsages', 'unread'),
-			1: this.$p.t('messsages', 'read'),
-			2: this.$p.t('messsages', 'archived'),
-			0: this.$p.t('messsages', 'unread'),
-			3: this.$p.t('person', 'deleted'),
+			return {
+				0: this.$p.t('messsages', 'unread'),
+				1: this.$p.t('messsages', 'read'),
+				2: this.$p.t('messsages', 'archived'),
+				3: this.$p.t('messsages', 'deleted')
+			}
 		}
-	},*/
+	},
+	mounted() {
+		// change to target="_blank"
+/*		this.$nextTick(() => {
+			const links = document.querySelectorAll('.preview a');
+			links.forEach(link => {
+				link.setAttribute('target', '_blank');
+				link.setAttribute('rel', 'noopener noreferrer'); // Sicherheitsmaßnahme
+			});
+		});*/
+	},
 	template: `
 	<div class="messages-detail-table">
-		<h4>Table Messages</h4>
-		<p>type_id: {{typeId}}</p>
-		<p>id: {{id}}</p>
 		<p>endpoint: {{endpoint}}</p>
+		<p>{{messageLayout}}</p>
+
+		<!-- {{statusText[0] }}
+		<hr>
+		{{$p.t('messages', 'unread')}} -->
+		<!-- {{statusText.0}} -->
+		<!-- <p v-for="(bezeichnung, key) in statusText" :key="key" :value="key">{{bezeichnung}}</p> -->
+
+		<!--View Studierendenverwaltung-->
+		<div v-if="messageLayout=='twoColumnsTableLeft'">
 		
-<!--		{{statusText}}-->
-		
-		
-		<core-filter-cmpt
-			ref="table"
-			:tabulator-options="tabulatorOptions"
-			table-only
-			:side-menu="false"
-			reload
-			new-btn-show
-			:new-btn-label="this.$p.t('global', 'nachricht')"
-			@click:new="actionNewNotiz"
-			>
-		</core-filter-cmpt>
+			<div class="row">
+				<!--table-->
+				<div class="col-sm-6 pt-6">
+					<core-filter-cmpt
+						ref="table"
+						:tabulator-options="tabulatorOptions"
+						:tabulator-events="tabulatorEvents"
+						table-only
+						:side-menu="false"
+						reload
+						new-btn-show
+						:new-btn-label="this.$p.t('global', 'nachricht')"
+						@click:new="actionNewMessage"
+						>
+					</core-filter-cmpt>
+				</div>
+
+				<!--preview wysiwyg-window-->
+				<div class="col-sm-6 pt-6">
+				<br><br><br><br>
+
+					<div ref="preview">
+						<div v-html="previewBody" class="p-3 border rounded overflow-scroll twoColumns"></div>
+					</div>
+
+				</div>
+
+			</div>
+		</div>
+
+		<!--View Infocenter-->
+		<div v-if="messageLayout=='listTableTop'">
+
+				<!--table-->
+				<div class="col-sm-12 pt-6">
+					<core-filter-cmpt
+						ref="table"
+						:tabulator-options="tabulatorOptions"
+						:tabulator-events="tabulatorEvents"
+						table-only
+						:side-menu="false"
+						reload
+						new-btn-show
+						:new-btn-label="this.$p.t('global', 'nachricht')"
+						@click:new="actionNewMessage"
+						>
+					</core-filter-cmpt>
+				</div>
+
+				<!--preview wysiwyg-window-->
+				<div class="col-sm-12">
+
+					<div ref="preview">
+						<div v-html="previewBody" class="p-3 border rounded overflow-scroll twoColumns"></div>
+					</div>
+
+				</div>
+		</div>
+
 	</div>
 	`
 
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index 6811a3aed..3fd6e2a02 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -17,14 +17,24 @@ export default {
 			required: true
 		},
 		showNew: Boolean,
-		showTable: Boolean
+		showTable: Boolean,
+		messageLayout: {
+			type: String,
+			default: 'twoColumnsTableLeft',
+			validator(value) {
+				return [
+					'twoColumnsTableLeft',
+					'listTableTop'
+				].includes(value)
+			}
+		},
 	},
 	data() {
 		return {}
 	},
 	template: `
 	<div class="core-messages h-100 pb-3">
-	<p>endpoint: {{endpoint}}</p>
+	<p>endpoint Messages.js: {{endpoint}}</p>
 		<div v-if="showNew">
 			<NewMessage
 				
@@ -37,6 +47,7 @@ export default {
 				:type-id="typeId"
 				:id="id"
 				:endpoint="endpoint"
+				:messageLayout="messageLayout"
 			>
 			
 			</TableMessages>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index 7bd6d4b4d..e9f542945 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -14,12 +14,11 @@ export default {
 			endpoint="$fhcApi.factory.messages.person"
 			type-id="person_id"
 			:id="modelValue.person_id"
+			messageLayout="listTableTop"
 			show-table
 			>
 		</core-messages>
 
-
-		
 	</div>
 	`
 };
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index f25cc72ec..95a505a23 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37319,6 +37319,206 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'unread',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ungelesen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'unread',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'read',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'gelesen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'read',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'archived',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'archiviert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'archived',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'deleted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'gelöscht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'deleted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'body',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nachrichtentext',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Body',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'message_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Message ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Message ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'sender',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'SenderIn',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Sender',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'recipient',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'EmpfängerIn',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Recipient',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'senderId',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'SenderIn ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Sender ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'recipientId',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'EmpfängerIn ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Recipient ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	/////////// FHC4 Phrases Messages END ///////////
 
 );

From c960b4832d110794842de25d9c8caa5274dfff0a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 17 Feb 2025 14:40:24 +0100
Subject: [PATCH 024/572] test

---
 public/js/api/stundenplan.js                     | 11 +++++++++++
 public/js/apps/Dashboard/Fhc.js                  | 16 ++++++++--------
 public/js/components/Calendar/Week/Page.js       |  4 +++-
 public/js/components/Cis/Cms/Content.js          |  2 +-
 public/js/components/Cis/Cms/News.js             |  2 +-
 .../StudiengangInformation.js                    |  4 ++--
 public/js/components/Cis/Mylv/LvUebersicht.js    |  4 ++--
 .../js/components/Cis/Stundenplan/Stundenplan.js |  5 +++++
 8 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/public/js/api/stundenplan.js b/public/js/api/stundenplan.js
index 9ddbeff54..0f5de934e 100644
--- a/public/js/api/stundenplan.js
+++ b/public/js/api/stundenplan.js
@@ -42,4 +42,15 @@ export default {
 			{}
 		);
 	},
+	getMoodleEventsByUserid(username, timestart, timeend) {
+		return this.$fhcApi.get(
+			FHC_JS_DATA_STORAGE_OBJECT.app_root +
+			`addons/moodle/cis/get_events_by_userid.php`,
+			{
+				username: username,
+				timestart: timestart,
+				timeend: timeend,
+			}
+		);
+	},
 };
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 9f77d4b9b..19f6b3a2b 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -2,14 +2,14 @@ import FhcDashboard from '../../components/Dashboard/Dashboard.js';
 import FhcApi from '../../plugin/FhcApi.js';
 import Phrasen from '../../plugin/Phrasen.js';
 import contrast from '../../directives/contrast.js';
-import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers";
-import Stundenplan from "../../components/Cis/Stundenplan/Stundenplan";
-import MylvStudent from "../../components/Cis/Mylv/Student";
-import Profil from "../../components/Cis/Profil/Profil";
-import CmsNews from "../../components/Cis/Cms/News";
-import CmsContent from "../../components/Cis/Cms/Content";
-import Info from "../../components/Cis/Mylv/Semester/Studiengang/Lv/Info";
-import RoomInformation from "../../components/Cis/Mylv/RoomInformation";
+import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers.js";
+import Stundenplan from "../../components/Cis/Stundenplan/Stundenplan.js";
+import MylvStudent from "../../components/Cis/Mylv/Student.js";
+import Profil from "../../components/Cis/Profil/Profil.js";
+import CmsNews from "../../components/Cis/Cms/News.js";
+import CmsContent from "../../components/Cis/Cms/Content.js";
+import Info from "../../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
+import RoomInformation from "../../components/Cis/Mylv/RoomInformation.js";
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 10ff6c495..b029b854a 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -197,7 +197,9 @@ export default {
 				'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)',
 				'grid-template-rows': 'repeat(' + (this.hours.length * 60 / this.smallestTimeFrame) + ', 1fr)',
 			}
-			
+			console.log(this.smallestTimeFrame,"this is the smallest timeframe")
+			console.log(this.hours.length,"this is the length of the hours")
+			console.log(this.hours.length/60, "this is the length of the hours multiplied by 60 resulting in minutes")
 			if(day.isPast) {
 				styleObj['background-color'] = '#F5E9D7'
 				styleObj['border-color'] = '#E8E8E8';
diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
index ed87e1aae..d657322ba 100644
--- a/public/js/components/Cis/Cms/Content.js
+++ b/public/js/components/Cis/Cms/Content.js
@@ -1,6 +1,6 @@
 import raum_contentmittitel from './Content_types/Raum_contentmittitel.js'
 import general from './Content_types/General.js'
-import BsConfirm from "../../Bootstrap/Confirm";
+import BsConfirm from "../../Bootstrap/Confirm.js";
 
 export default {
 	name: "ContentComponent",
diff --git a/public/js/components/Cis/Cms/News.js b/public/js/components/Cis/Cms/News.js
index 89bed18d7..1567cbef4 100644
--- a/public/js/components/Cis/Cms/News.js
+++ b/public/js/components/Cis/Cms/News.js
@@ -1,6 +1,6 @@
 import Pagination from "../../Pagination/Pagination.js";
 import StudiengangInformation from "./StudiengangInformation/StudiengangInformation.js";
-import BsConfirm from "../../Bootstrap/Confirm";
+import BsConfirm from "../../Bootstrap/Confirm.js";
 
 export default {
 	name: "NewsComponent",
diff --git a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
index 06743ae5d..92e303801 100644
--- a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
+++ b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
@@ -1,5 +1,5 @@
-import StudiengangPerson from "./StudiengangPerson";
-import StudiengangVertretung from "./StudiengangVertretung";
+import StudiengangPerson from "./StudiengangPerson.js";
+import StudiengangVertretung from "./StudiengangVertretung.js";
 
 export default {
 data(){
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index 6670a0c76..13972af5e 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -1,5 +1,5 @@
-import BsModal from "../../Bootstrap/Modal";
-import LvMenu from "./LvMenu";
+import BsModal from "../../Bootstrap/Modal.js";
+import LvMenu from "./LvMenu.js";
 export default  {
   
     props:{
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index d35c9c536..ba3a3c649 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -150,6 +150,11 @@ export const Stundenplan = {
 	},
 	created()
 	{
+		let time_start = Math.floor(this.eventCalendarDate.firstDayOfCalendarMonth.getTime() / 1000);
+		let time_end = Math.floor(this.eventCalendarDate.lastDayOfCalendarMonth.getTime() / 1000);
+		this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid('io23m005', time_start, time_end).then((response) => {
+			console.log(response);
+		})
 		this.$fhcApi.factory.authinfo.getAuthUID().then((res) => res.data)
 		.then(data=>{
 			this.uid = data.uid;

From e086da2274ce66bc477d8ba5b6c8308b38eba720 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 18 Feb 2025 14:23:56 +0100
Subject: [PATCH 025/572] feature(Calendar Moodle Events): displays moodle
 events as allDayEvents in the Calendar

---
 public/js/components/Calendar/Week/Page.js    | 75 ++++++++++++++-----
 public/js/components/Cis/Mylv/LvModal.js      |  4 +-
 .../components/Cis/Stundenplan/Stundenplan.js | 74 +++++++++++++-----
 3 files changed, 116 insertions(+), 37 deletions(-)

diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index b029b854a..504293d07 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -10,7 +10,7 @@ export default {
 			hourPosition:null,
 			hourPositionTime:null,
 			resizeObserver: null,
-			width: 0
+			width: 0,
 		}
 	},
 	inject: [
@@ -36,6 +36,16 @@ export default {
 		'input',
 	],
 	computed: {
+		allDayEvents(){
+			let allDayEvents = {};
+			for(let day in this.events){
+				const filteredAllDayEvents = this.events[day].filter(event=>event.allDayEvent);
+				if (filteredAllDayEvents.length > 0){
+					allDayEvents[day]=filteredAllDayEvents;
+				}
+			};
+			return allDayEvents;
+		},
 		getGridStyle() {
 			return {
 				'min-height': '100px',
@@ -126,6 +136,7 @@ export default {
 				d.isToday = nextDay.getFullYear() === this.todayDate.getFullYear() && nextDay.getMonth() === this.todayDate.getMonth() && nextDay.getDate() === this.todayDate.getDate()
 				if (this.events[key]) {
 					this.events[key].forEach(evt => {
+						if (evt.allDayEvent) return;
 						let event = {orig:evt,lane:1,maxLane:1,start: evt.start < day ? day : evt.start, end: evt.end > nextDay ? nextDay : evt.end,shared:[],setSharedMaxRecursive(doneItems) {
 							this.maxLane = Math.max(doneItems[0].maxLane, this.maxLane);
 							doneItems.push(this);
@@ -197,31 +208,44 @@ export default {
 				'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)',
 				'grid-template-rows': 'repeat(' + (this.hours.length * 60 / this.smallestTimeFrame) + ', 1fr)',
 			}
-			console.log(this.smallestTimeFrame,"this is the smallest timeframe")
-			console.log(this.hours.length,"this is the length of the hours")
-			console.log(this.hours.length/60, "this is the length of the hours multiplied by 60 resulting in minutes")
 			if(day.isPast) {
 				styleObj['background-color'] = '#F5E9D7'
 				styleObj['border-color'] = '#E8E8E8';
 				styleObj.opacity = 0.5;
 			} else if (day.isToday) {
 				
-				// styleObj['backgroundImage'] = 'linear-gradient(to bottom, #F5E9D7 '+this.getDayTimePercent+'%, #FFFFFF '+this.getDayTimePercent+'%)'
-				// styleObj['border-color'] = '#E8E8E8';
-				// styleObj.opacity = 0.5;
+				styleObj['backgroundImage'] = 'linear-gradient(to bottom, #F5E9D7 '+this.getDayTimePercent+'%, #FFFFFF '+this.getDayTimePercent+'%)'
+				styleObj['border-color'] = '#E8E8E8';
+				styleObj.opacity = 0.5;
 			}
 			
 			return styleObj
 		},
 		eventGridStyle(day, event) {
-			return {
-				'z-index': 1,
-				'grid-column-start': 1 + (event.lane - 1) * day.lanes / event.maxLane,
-				'grid-column-end': 1 + event.lane * day.lanes / event.maxLane,
-				'grid-row-start': this.dateToMinutesOfDay(event.start),
-				'grid-row-end': this.dateToMinutesOfDay(event.end),
-				'background-color': event.orig.color,
-				'max-height': '75px'				
+			if (event.orig.allDayEvent)
+			{
+				return;
+				return {
+					'z-index': '2',
+					'grid-column': '1 / -1',
+					'background-color': 'rgb(204, 204, 204)',
+					'max-height': '75px',
+					color: 'black',
+					position: 'sticky',
+					top: '44px',
+				};
+			}
+			else
+			{
+				return {
+					'z-index': 1,
+					'grid-column-start': 1 + (event.lane - 1) * day.lanes / event.maxLane,
+					'grid-column-end': 1 + event.lane * day.lanes / event.maxLane,
+					'grid-row-start': this.dateToMinutesOfDay(event.start),
+					'grid-row-end': this.dateToMinutesOfDay(event.end),
+					'background-color': event.orig.color,
+					'max-height': '75px'
+				};
 			}
 		},
 		calcHourPosition(event) {
@@ -333,12 +357,27 @@ export default {
 						<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
 					</div>
 				</Transition>
-				
+
 				<div class="events" :ref="'eventsRef'+week">
+
 					<div class="hours">
 						<div v-for="hour in hours" :style="getGridStyle" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
-					<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="dayGridStyle(day)">
+					<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start position-relative" :style="dayGridStyle(day)">
+						<div class="position-absolute w-100" style="top:0; bottom:0;">
+							<div class="position-sticky d-grid gap-1" style="top:44px;" v-for="(events,_day) in allDayEvents" :key="day">
+								<div v-if="dayindex == _day" v-for="event in events" :key="event" @click.prevent="weekPageClick(event, _day)"
+									:selected="event == selectedEvent"
+									:style="{'background-color': event?.color, 'z-index':2}"
+									class="small rounded overflow-hidden fhc-entry "
+									v-contrast
+									>
+									<slot class="p-1" name="weekPage" :event="event" :day="day">
+										<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
+									</slot>
+								</div>
+							</div>
+						</div>
 						<Transition>
 							<div v-if="day.isToday" class="position-absolute border-top small"  :style="curIndicatorStyle">
 								<span class="border border-top-0 px-2 bg-white">{{curTime}}</span>
@@ -350,7 +389,7 @@ export default {
 						:style="eventGridStyle(day,event)"
 						class="mx-2 small rounded overflow-hidden fhc-entry "
 						v-contrast >
-							<slot name="weekPage" :event="event" :day="day">
+							<slot name="weekPage" :event="event.orig" :day="day">
 								<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 							</slot>		
 						</div>
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index e873dd5f8..acb2a7693 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -35,7 +35,7 @@ export default {
 	},
 	data() {
 		return {
-			menu: [],
+			menu: null,
 			result: false,
 			info: null,
 		};
@@ -76,7 +76,7 @@ export default {
 		<template v-slot:default>
 			<h3 >{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
 			<lv-info :event="event"></lv-info>
-			<template v-if="showMenu">
+			<template v-if="showMenu && this.menu">
 				<h3 >Lehrveranstaltungs Menu</h3>
 				<lv-menu :menu="menu"></lv-menu>
 			</template>
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index ba3a3c649..4a751a637 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -118,7 +118,8 @@ export const Stundenplan = {
 		loadEvents: function(){
 			Promise.allSettled([
 				this.$fhcApi.factory.stundenplan.getStundenplan(this.monthFirstDay, this.monthLastDay, this.viewData.lv_id),
-				this.$fhcApi.factory.stundenplan.getStundenplanReservierungen(this.monthFirstDay, this.monthLastDay)
+				this.$fhcApi.factory.stundenplan.getStundenplanReservierungen(this.monthFirstDay, this.monthLastDay),
+				this.loadMoodleEvents(this.monthFirstDay, this.monthLastDay)
 			]).then((result) => {
 				let promise_events = [];
 				result.forEach((promise_result) => {
@@ -147,14 +148,49 @@ export const Stundenplan = {
 				this.events = promise_events;
 			});
 		},
+		loadMoodleEvents: function(start_date, end_date){
+			
+			let date_start = Math.floor(new Date(start_date).getTime() / 1000);
+			let date_end = Math.floor(new Date(end_date).getTime() / 1000);
+			return this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid('io23m005', date_start, date_end).then((response) => response.events).then(events => {
+				let data =events.map(event =>{
+					const start_date = new Date(event.timestart * 1000);
+					const formatted_year = Intl.DateTimeFormat(this.$p.user_locale, { year: 'numeric' }).format(start_date);
+					const formatted_month = Intl.DateTimeFormat(this.$p.user_locale, { month: '2-digit' }).format(start_date);
+					const formatted_day = Intl.DateTimeFormat(this.$p.user_locale, { year: '2-digit' }).format(start_date);
+					const formatted_date = `${formatted_year}-${formatted_month}-${formatted_day}`;
+					return {
+						type:'moodle',
+						beginn: "14:00:00",
+						ende: "15:00:00",
+						allDayEvent: true,
+						datum: formatted_date,
+						topic: event.activityname,
+						lektor:[],
+						gruppe:[],
+						ort_kurzbz: event.location,
+						lehreinheit_id:0,
+						titel: event.activitystr,
+						lehrfach:'',
+						lehrform:'',
+						lehrfach_bez:'',
+						organisationseinheit:'',
+						farbe:'00689E',
+						lehrveranstaltung_id:0,
+						ort_content_id:0,
+					}
+				});
+				return {
+					data: data,
+					meta: { status: 'success' }
+				};
+			})
+			
+		},
 	},
 	created()
 	{
-		let time_start = Math.floor(this.eventCalendarDate.firstDayOfCalendarMonth.getTime() / 1000);
-		let time_end = Math.floor(this.eventCalendarDate.lastDayOfCalendarMonth.getTime() / 1000);
-		this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid('io23m005', time_start, time_end).then((response) => {
-			console.log(response);
-		})
+		
 		this.$fhcApi.factory.authinfo.getAuthUID().then((res) => res.data)
 		.then(data=>{
 			this.uid = data.uid;
@@ -185,20 +221,24 @@ export const Stundenplan = {
 			</span>
 		</template>
 		<template #weekPage="{event,day}">
-			<div @click="showModal(event?.orig); " type="button"
-			class=" position-relative border border-secondary border d-flex flex-col align-items-center
-			justify-content-evenly h-100" style="overflow: auto;">
-
-				<div v-if="event?.orig?.beginn && event?.orig?.ende" class="d-none d-xl-block" >
+			<div @click="showModal(event); " type="button"
+			class=" position-relative border border-secondary border d-flex flex-col align-items-center justify-content-evenly h-100"
+			:class="{'p-1':event.allDayEvent}"
+			style="overflow: auto;">
+				<div v-if="!event.allDayEvent && event?.beginn && event?.ende" class="d-none d-xl-block" >
 					<div class="d-flex flex-column p-4 p-xl-2 border-end border-secondary">
-						<span class="small">{{convertTime(event.orig.beginn.split(":"))}}</span>
-						<span class="small">{{convertTime(event.orig.ende.split(":"))}}</span>
+						<span class="small">{{convertTime(event.beginn.split(":"))}}</span>
+						<span class="small">{{convertTime(event.ende.split(":"))}}</span>
 					</div>
 				</div>
-				<div class="d-flex flex-column flex-grow-1 align-items-center" style="font-size: 0.75rem">
-					<span>{{event?.orig.topic}}</span>
-					<span v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</span>
-					<span>{{event?.orig.ort_kurzbz}}</span>
+				<div v-if="event.type=='moodle'" class="d-flex small w-100" >
+					<span >moodle:</span>
+					<span class="flex-grow-1 text-center">{{event.titel}}</span>
+				</div>
+				<div v-else class="d-flex flex-column flex-grow-1 align-items-center small">
+					<span>{{event.topic}}</span>
+					<span v-for="lektor in event.lektor">{{lektor.kurzbz}}</span>
+					<span>{{event.ort_kurzbz}}</span>
 				</div>
 			</div>
 		</template>

From f89c194d3288d83aec44082fd1f8db4b7010618c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 19 Feb 2025 11:36:00 +0100
Subject: [PATCH 026/572] add Vorlagendropdown Component and Listboxes for
 Messaging Variables

---
 .../api/frontend/v1/messages/Messages.php     | 246 +++++++++-
 .../api/frontend/v1/vorlagen/Vorlagen.php     |  63 +++
 application/models/system/Message_model.php   |  42 ++
 application/models/system/Vorlage_model.php   | 116 +++++
 public/js/api/fhcapifactory.js                |   4 +-
 public/js/api/messages/person.js              |  29 ++
 public/js/api/vorlagen.js                     |   8 +
 .../components/Messages/Details/NewMessage.js | 440 +++++++++++++++++-
 .../Messages/Details/TableMessages.js         |  53 ++-
 public/js/components/Messages/Messages.js     |   6 +-
 .../Studentenverwaltung/Details/Messages.js   |   7 +-
 .../VorlagenDropdown/VorlagenDropdown.js      | 109 +++++
 system/phrasesupdate.php                      |  20 +
 13 files changed, 1123 insertions(+), 20 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/vorlagen/Vorlagen.php
 create mode 100644 public/js/api/vorlagen.js
 create mode 100644 public/js/components/VorlagenDropdown/VorlagenDropdown.js

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index adf1d52e9..ac107f687 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -9,6 +9,14 @@ class Messages extends FHCAPI_Controller
 	{
 		parent::__construct([
 			'getMessages' => ['admin:r', 'assistenz:r'],
+			'getVorlagen' => ['admin:r', 'assistenz:r'],
+			'getMessageVarsPerson' => ['admin:r', 'assistenz:r'],
+			'getMsgVarsPrestudent' => ['admin:r', 'assistenz:r'],
+			'getMsgVarsLoggedInUser' => ['admin:r', 'assistenz:r'],
+			'getNameOfDefaultRecipient' => ['admin:r', 'assistenz:r'],
+			'sendMessage' => ['admin:r', 'assistenz:r'],
+			'deleteMessage' => ['admin:r', 'assistenz:r'],
+			'getVorlagentext' => ['admin:r', 'assistenz:r'],
 		]);
 
 		//Load Models
@@ -20,6 +28,7 @@ class Messages extends FHCAPI_Controller
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 		$this->load->library('form_validation');
+		$this->load->library('MessageLib');
 
 		// Load language phrases
 		$this->loadPhrases([
@@ -29,11 +38,17 @@ class Messages extends FHCAPI_Controller
 
 	public function getMessages($id, $type_id)
 	{
-		//$this->terminateWithError("in backend " . $type_id . ": " . $id, self::ERROR_TYPE_GENERAL);
-
-		if ($type_id != "person_id")
+		switch($type_id)
 		{
-			$this->terminateWithError("logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
+			case 'uid':
+				$id = $this->_getPersonIdFromUid($id);
+				break;
+			case 'person_id':
+				$id = $id;
+				break;
+			default:
+				$this->terminateWithError("MESSAGES::getMessages logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
+				break;
 		}
 
 		$result = $this->MessageModel->getMessagesForTable($id);
@@ -42,4 +57,227 @@ class Messages extends FHCAPI_Controller
 
 		$this->terminateWithSuccess($data);
 	}
+
+	public function getVorlagen()
+	{
+		//get oe of user
+		$uid = getAuthUID();
+		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+		$result = $this->BenutzerfunktionModel->getBenutzerfunktionByUid($uid, 'oezuordnung');
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$oe_kurzbz = current($data);
+
+	//	$this->terminateWithError("oe: ". $oe_kurzbz->oe_kurzbz, self::ERROR_TYPE_GENERAL);
+
+		$this->load->model('system/Vorlage_model', 'VorlageModel');
+
+		//39 Stück Variante OE
+		$result = $this->VorlageModel->getAllVorlagenByOe($oe_kurzbz->oe_kurzbz);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+
+		//IF ADMIN 167
+		$this->VorlageModel->addOrder('vorlage_kurzbz', 'ASC');
+		//only HTML-vorlagen -> for admin
+		$result = $this->VorlageModel->loadWhere(
+			array(
+				'mimetype' => 'text/html'
+			));
+
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getVorlagentext($vorlage_kurzbz)
+	{
+		//$this->terminateWithError("vor " . $vorlage_kurzbz, self::ERROR_TYPE_GENERAL);
+		//$studiengang_kz = 227; //TODO(Manu) check dynamisieren NULL
+		$studiengang_kz = 0;
+		$this->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
+		$this->VorlagestudiengangModel->addOrder('version', 'DESC');
+
+		$result = $this->VorlagestudiengangModel->loadWhere(
+			[
+				'vorlage_kurzbz' =>$vorlage_kurzbz,
+				'studiengang_kz' => $studiengang_kz
+			]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		//not correct with Vorlage
+		$vorlage = current($data);
+
+		//$this->terminateWithSuccess($data);
+		$this->terminateWithSuccess($vorlage->text);
+	}
+
+	public function getMessageVarsPerson()
+	{
+		$result = $this->MessageModel->getMessageVarsPerson();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getMsgVarsPrestudent($uid)
+	{
+
+		$prestudent_id = $this-> _getPrestudentIdFromUid($uid);
+
+	//	$this->terminateWithError("prestudent_id " . $prestudent_id, self::ERROR_TYPE_GENERAL);
+
+		$result = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getMsgVarsLoggedInUser()
+	{
+		$uid = getAuthUID();
+
+		$result = $this->MessageModel->getMsgVarsLoggedInUser();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getNameOfDefaultRecipient($id, $type_id)
+	{
+		switch($type_id)
+		{
+			case 'uid':
+				$id = $this->_getPersonIdFromUid($id);
+				break;
+			case 'person_id':
+				$id = $id;
+				break;
+			default:
+				$this->terminateWithError("MESSAGES::getNameOfDefaultRecipient logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
+				break;
+		}
+
+		$this->load->model('person/Person_model', 'PersonModel');
+
+		$result = $this->PersonModel->load($id);
+		//$this->terminateWithSuccess($result);
+		$data = $this->getDataOrTerminateWithError($result);
+		$name = current($data);
+
+		$this->terminateWithSuccess($name->vorname . " " . $name->nachname );
+	}
+
+	public function sendMessage($recipient_id)
+	{
+		//TODO(manu) Problems with Vorlagen...
+		//TODO(Manu) Problems with VARS
+		$receiversPersonId = $this->_getPersonIdFromUid($recipient_id);
+
+		$uid = getAuthUID();
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+		$result = $this->BenutzerModel->loadWhere(
+			['uid' => $uid]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$benutzer = current($data);
+
+		if (isset($_POST['data']))
+		{
+			$data = json_decode($_POST['data']);
+			unset($_POST['data']);
+			foreach ($data as $k => $v) {
+				$_POST[$k] = $v;
+			}
+		}
+
+		$subject = $this->input->post('subject');
+
+		$body = $this->input->post('body');
+
+	//	$this->terminateWithError("rp_id " . $receiversPersonId, self::ERROR_TYPE_GENERAL);
+
+/*		$subject = $this->input->post('subject');
+
+		$formData = $this->input->post('data');*/
+
+		//$_POST['subject'] = $formData['subject'];
+	//	$subject = $formData['subject'];
+	//	$body = $formData['body'];
+
+	//	$subject = isset($_POST['subject']) ? $_POST['subject'] : null;
+	//	$body = isset($_POST['body']) ? $_POST['body'] : null;
+
+	//	$this->terminateWithError("person_id " . $receiversPersonId, self::ERROR_TYPE_GENERAL);
+
+	//	$this->terminateWithError("subject " . $subject, self::ERROR_TYPE_GENERAL);
+	//	$this->terminateWithError("body " . $body, self::ERROR_TYPE_GENERAL);
+
+	//	$this->terminateWithError("person_id " . $benutzer->person_id, self::ERROR_TYPE_GENERAL);
+	//	$this->terminateWithError("subject " . $subject, self::ERROR_TYPE_GENERAL);
+		$result = $this->messagelib->sendMessageUser($receiversPersonId, $subject, $body, $benutzer->person_id);
+
+		$this->terminateWithSuccess($result);
+	}
+
+	public function deleteMessage($messageId)
+	{
+		// Start DB transaction
+		$this->db->trans_begin();
+
+		$result = $this->MessageModel->deleteMessageRecipient($messageId);
+		if (isError($result)) {
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->MessageModel->deleteMessageStatus($messageId);
+		if (isError($result)) {
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->MessageModel->deleteMessage($messageId);
+		if (isError($result)) {
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->db->trans_commit();
+
+		$this->terminateWithSuccess($result);
+	}
+
+	private function _getPersonIdFromUid($uid)
+	{
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+		$result = $this->BenutzerModel->loadWhere(
+			['uid' => $uid]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$benutzer = current($data);
+
+		return $benutzer->person_id;
+	}
+
+	private function _getPrestudentIdFromUid($uid)
+	{
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$result = $this->StudentModel->loadWhere(
+			['student_uid' => $uid]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$student = current($data);
+
+		return $student->prestudent_id;
+	}
 }
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/vorlagen/Vorlagen.php b/application/controllers/api/frontend/v1/vorlagen/Vorlagen.php
new file mode 100644
index 000000000..01edb33d1
--- /dev/null
+++ b/application/controllers/api/frontend/v1/vorlagen/Vorlagen.php
@@ -0,0 +1,63 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+class Vorlagen extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getVorlagen' => ['admin:r', 'assistenz:r'],
+			'getVorlagenByLoggedInUser' => ['admin:r', 'assistenz:r'],
+		]);
+
+		//Load Models
+		$this->load->model('system/Vorlage_model', 'VorlageModel');
+
+		// Additional Permission Checks
+		//TODO(manu) check permissions
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+		$this->load->library('VorlageLib');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+	public function getVorlagen()
+	{
+		$this->load->model('system/Vorlage_model', 'VorlageModel');
+
+		$this->VorlageModel->addOrder('vorlage_kurzbz', 'ASC');
+
+		$result = $this->VorlageModel->loadWhere(
+			array(
+				'mimetype' => 'text/html'
+			));
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getVorlagenByLoggedInUser()
+	{
+		//get oe of user
+		$uid = getAuthUID();
+		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+		$result = $this->BenutzerfunktionModel->getBenutzerfunktionByUid($uid, 'oezuordnung');
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$oe_kurzbz = current($data);
+
+		$result = $this->VorlageModel->getAllVorlagenByOe($oe_kurzbz->oe_kurzbz);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+}
\ No newline at end of file
diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index 1b201fc1b..7ecb54a9e 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -282,4 +282,46 @@ class Message_model extends DB_Model
 
 		return $this->execQuery($sql, $parametersArray);
 	}
+
+	/**
+	 * Deletes a messages from tableMessages and tbl_msg_recipient
+	 * TODO(MANU) CHECK IF NECESSARY
+	 * dependency with other tables
+	 * in case of reply... more messages
+	 * maybe anonimize it
+	 * @param $message_id
+	 * @return boolean success
+	 */
+	public function deleteMessageRecipient($message_id)
+	{
+		$sql = "
+		 DELETE FROM public.tbl_msg_recipient
+			WHERE message_id = ?;
+		 ";
+
+		return $this->execQuery($sql, array($message_id));
+	}
+
+
+	public function deleteMessageStatus($message_id)
+	{
+		$sql = "
+		 DELETE FROM public.tbl_msg_status
+			WHERE message_id = ?;
+		 ";
+
+		return $this->execQuery($sql, array($message_id));
+	}
+
+	public function deleteMessage($message_id)
+	{
+		$sql = "
+		 DELETE FROM public.tbl_msg_message
+			WHERE message_id = ?;
+		 ";
+
+		return $this->execQuery($sql, array($message_id));
+	}
+	
+	
 }
diff --git a/application/models/system/Vorlage_model.php b/application/models/system/Vorlage_model.php
index 8022e71fc..69aa0aa3f 100644
--- a/application/models/system/Vorlage_model.php
+++ b/application/models/system/Vorlage_model.php
@@ -21,4 +21,120 @@ class Vorlage_model extends DB_Model
 
 		return $this->execQuery($query);
 	}
+
+	/**
+	 * Returns all Vorlagen
+	 * that belongs to the organisation units of the user
+	 * and the parents of those organisation units until the root of the
+	 * @param Array Array of $oe_kurzbz
+	 * @return object Array of Vorlagen
+	 */
+	public function getAllVorlagenByOe($oe_kurzbz)
+	{
+		// Loads library OrganisationseinheitLib
+		$this->load->library('OrganisationseinheitLib');
+
+		$vorlage = success(array()); // Default value
+
+		$table = '(
+					SELECT v.vorlage_kurzbz,
+							v.bezeichnung,
+							vs.version,
+							vs.oe_kurzbz,
+							vs.aktiv,
+							vs.subject,
+							vs.text,
+							v.mimetype
+					FROM tbl_vorlagestudiengang vs
+					JOIN tbl_vorlage v USING(vorlage_kurzbz)
+				) templates';
+
+		$alias = 'templates';
+
+		$fields = array(
+			'templates.vorlage_kurzbz AS id',
+			'templates.bezeichnung || \' (\' || UPPER(templates.oe_kurzbz) || \')\' AS description'
+		);
+
+		$where = 'templates.aktiv = TRUE
+					AND templates.subject IS NOT NULL
+					AND templates.text IS NOT NULL
+					AND templates.mimetype = \'text/html\'
+			   GROUP BY 1, 2, 3';
+
+		$order_by = 'description ASC';
+
+		if (!is_array($oe_kurzbz))
+		{
+			$vorlage = $this->organisationseinheitlib->treeSearchEntire(
+				$table,
+				$alias,
+				$fields,
+				$where,
+				$order_by,
+				$oe_kurzbz
+			);
+		}
+		else // is an array
+		{
+			// Get the vorlage for each organisation unit
+			foreach($oe_kurzbz as $val)
+			{
+				$tmpVorlage = $this->organisationseinheitlib->treeSearchEntire(
+					$table,
+					$alias,
+					$fields,
+					$where,
+					$order_by,
+					$val
+				);
+
+				// Everything is ok and data are inside
+				if (hasData($tmpVorlage))
+				{
+					// If it's the first vorlage copy it
+					if (!hasData($vorlage))
+					{
+						for ($j = 0; $j < count(getData($tmpVorlage)); $j++)
+						{
+							if (getData($tmpVorlage)[$j]->id != '')
+							{
+								array_push($vorlage->retval, getData($tmpVorlage)[$j]);
+							}
+						}
+					}
+					else // checks for duplicates, if it's not already present push it into the array getData($vorlage)
+					{
+						for ($j = 0; $j < count(getData($tmpVorlage)); $j++)
+						{
+							$found = false;
+							$currentTmpVorlageData = null;
+
+							for ($i = 0; $i < count(getData($vorlage)); $i++)
+							{
+								$currentTmpVorlageData = getData($tmpVorlage)[$j];
+
+								if (getData($vorlage)[$i]->id == getData($tmpVorlage)[$j]->id
+									&& getData($vorlage)[$i]->_pk == getData($tmpVorlage)[$j]->_pk
+									&& getData($vorlage)[$i]->_ppk == getData($tmpVorlage)[$j]->_ppk
+									&& getData($vorlage)[$i]->_jtpk == getData($tmpVorlage)[$j]->_jtpk)
+								{
+									$found = true;
+									break;
+								}
+							}
+
+							if (!$found && $currentTmpVorlageData->id != '')
+							{
+								array_push($vorlage->retval, $currentTmpVorlageData);
+							}
+						}
+					}
+				}
+			}
+		}
+
+		return $vorlage;
+	}
+
 }
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index 7bc510b6e..8a4a2132a 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -34,6 +34,7 @@ import cms from "./cms.js";
 import lehre from "./lehre.js";
 import addons from "./addons.js";
 import messages from "./messages.js";
+import vorlagen from "./vorlagen.js";
 
 export default {
     search,
@@ -54,5 +55,6 @@ export default {
     cms,
     lehre,
     addons,
-    messages
+    messages,
+    vorlagen
 };
diff --git a/public/js/api/messages/person.js b/public/js/api/messages/person.js
index baf8bd39f..6a0ac8c7c 100644
--- a/public/js/api/messages/person.js
+++ b/public/js/api/messages/person.js
@@ -2,4 +2,33 @@ export default {
 	getMessages(url, config, params){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessages/' + params.id + '/' + params.type);
 	},
+	getVorlagen(){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagen/');
+	},
+	getMsgVarsLoggedInUser(){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsLoggedInUser/');
+	},
+	getMessageVarsPerson(){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessageVarsPerson/');
+	},
+	getMsgVarsPrestudent(uid){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsPrestudent/' + uid);
+	},
+	getVorlagentext(vorlage_kurzbz){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagentext/' + vorlage_kurzbz);
+	},
+	getNameOfDefaultRecipient(params){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getNameOfDefaultRecipient/' + params.id + '/' + params.type_id);
+	},
+	sendMessage(form, id, data) {
+	console.log("factory " + id);
+		console.log(JSON.stringify(data));
+
+		return this.$fhcApi.post(form, 'api/frontend/v1/messages/messages/sendMessage/' + id,
+			data
+		);
+	},
+	deleteMessage(messageId){
+		return this.$fhcApi.post('api/frontend/v1/messages/messages/deleteMessage/' + messageId);
+	}
 }
\ No newline at end of file
diff --git a/public/js/api/vorlagen.js b/public/js/api/vorlagen.js
new file mode 100644
index 000000000..2933ccf97
--- /dev/null
+++ b/public/js/api/vorlagen.js
@@ -0,0 +1,8 @@
+export default {
+	getVorlagen() {
+		return this.$fhcApi.get('api/frontend/v1/vorlagen/vorlagen/getVorlagen/');
+	},
+	getVorlagenByLoggedInUser() {
+		return this.$fhcApi.get('api/frontend/v1/vorlagen/vorlagen/getVorlagenByLoggedInUser/');
+	}
+}
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/NewMessage.js b/public/js/components/Messages/Details/NewMessage.js
index bf60842d2..2d85c8e00 100644
--- a/public/js/components/Messages/Details/NewMessage.js
+++ b/public/js/components/Messages/Details/NewMessage.js
@@ -1,12 +1,448 @@
+import FormForm from '../../Form/Form.js';
+import FormInput from '../../Form/Input.js';
+import ListBox from "../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
+import DropdownComponent from '../../VorlagenDropdown/VorlagenDropdown.js';
+
+
 export default {
+	components: {
+		FormForm,
+		FormInput,
+		ListBox,
+		DropdownComponent
+	},
+	props: {
+		endpoint: {
+			type: String,
+			required: true
+		},
+		typeId: String,
+		id: {
+			type: [Number, String],
+			required: true
+		},
+	},
 	data(){
 		return {
-
+			formData: {
+				recipient: this.id,
+				subject: null,
+				body: null,
+				vorlage_kurzbz: null,
+				selectedValue: '',
+			},
+			statusNew: true,
+			vorlagen: [],
+			defaultRecipient: null,
+			editor: null,
+			isVisible: true,
+			fieldsUser: [],
+			fieldsPerson: [],
+			fieldsPrestudent: [],
+			selectedFieldPrestudent: null,
+			selectedFieldUser: null,
+			selectedFieldPerson: null,
+			itemsPrestudent: [],
+			itemsPerson: [],
+			itemsUser: [],
+			selectedFieldStudent: null,
+			itemsStudent: [
+				{ label: "Variable 1", value: "var1" },
+				{ label: "Variable 2", value: "var2" },
+				{ label: "Variable 3", value: "var3" }
+			]
 		}
 	},
+	methods: {
+		initTinyMCE() {
+			const vm = this;
+			tinymce.init({
+				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
+				//height: 800,
+				//plugins: ['lists'],
+				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify',
+				style_formats: [
+					{title: 'Blocks', block: 'div'},
+					{title: 'Paragraph', block: 'p'},
+					{title: 'Heading 1', block: 'h1'},
+					{title: 'Heading 2', block: 'h2'},
+					{title: 'Heading 3', block: 'h3'},
+					{title: 'Heading 4', block: 'h4'},
+					{title: 'Heading 5', block: 'h5'},
+					{title: 'Heading 6', block: 'h6'},
+				],
+				autoresize_bottom_margin: 16,
+
+				setup: (editor) => {
+					vm.editor = editor;
+
+					editor.on('input', () => {
+						const newContent = editor.getContent();
+						vm.formData.body = newContent;
+					});
+				},
+			});
+		},
+		updateText(value) {
+			this.formData.body = value;
+		},
+		sendMessage(){
+			//TODO(Manu) check default recipient(s)
+			const data = new FormData();
+
+			data.append('data', JSON.stringify(this.formData));
+			return this.$fhcApi.factory.messages.person.sendMessage(this.$refs.formVorlage, this.id, data)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
+					//this.hideModal('messageModal');
+					this.resetForm();
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					//this.resetForm();
+					//closeModal
+					//closewindwo
+				}
+				);
+		},
+		getVorlagentext(vorlage_kurzbz){
+			//console.log(typeof vorlage_kurzbz);
+			return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz)
+				.then(response => {
+					//this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
+					//this.hideModal('messageModal');
+					//this.resetForm();
+					//TODO(Manu) CHECK
+					this.formData.body = response.data;
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					//this.resetForm();
+					//closeModal
+					//closewindwo
+				});
+		},
+		insertVariable(selectedItem){
+			if (this.editor) {
+				this.editor.insertContent(selectedItem.value + " ");
+			} else {
+				console.error("Editor instance is not available.");
+			}
+		},
+		//TODO(Manu) refactor
+/*		insertVariablePrestudent() {
+				if (this.editor) {
+					//const lastVariable = this.selectedFieldsPrestudent[this.selectedFieldsPrestudent.length - 1].value;
+					const lastVariable = this.selectedFieldPrestudent.value;
+
+				//Use insertContent method
+				this.editor.insertContent(lastVariable + " ");
+				} else {
+				console.error("Editor instance is not available.");
+			}
+		},*/
+/*		insertVariablePrestudentByClick(selectedItem) {
+
+			if (selectedItem) {
+				this.editor.insertContent(selectedItem.value + " ");
+				console.log("Eingefügte Variable:", selectedItem);
+			} else {
+				console.warn("Keine Variable ausgewählt!");
+			}
+		},
+
+		insertVariablePerson() {
+				if (this.editor) {
+					//const lastVariable = this.selectedFieldsPrestudent[this.selectedFieldsPrestudent.length - 1].value;
+					const lastVariable = this.selectedFieldPerson.value;
+
+				//Use insertContent method
+				this.editor.insertContent(lastVariable + " ");
+				} else {
+				console.error("Editor instance is not available.");
+			}
+		},
+		insertVariableUser() {
+			if (this.editor) {
+				console.log(this.selectedFieldUser.value);
+				const lastVariable = this.selectedFieldUser.value;
+
+				//Multiple
+				//const lastVariable = this.selectedFieldsPrestudent[this.selectedFieldsPrestudent.length - 1].value;
+
+				//Use insertContent method
+				this.editor.insertContent(lastVariable + " ");
+				this.selectedFieldUser = null;
+			} else {
+				console.error("Editor instance is not available.");
+			}
+		},
+		insertVariableStudent(selectedItem) {
+			if (selectedItem) {
+				console.log("Eingefügte Variable:", selectedItem);
+				this.editor.insertContent(selectedItem.value + " ");
+			} else {
+				console.warn("Keine Variable ausgewählt!");
+			}
+		},*/
+		replyMessage(message_id){
+			console.log("auf message " + message_id + " antworten");
+		},
+		resetForm(){
+			this.formData = {
+				vorlage_kurzbz: null,
+				body: null,
+				subject: null,
+			};
+			if (this.editor) {
+				this.editor.setContent("");
+			}
+			this.$refs.dropdownComp.setValue(null);
+
+		},
+		toggleDivNewMessage(){
+			this.isVisible = !this.isVisible;
+		},
+		handleSelectedVorlage(vorlage_kurzbz) {
+			if (typeof vorlage_kurzbz === "string") {
+				this.getVorlagentext(vorlage_kurzbz);
+				this.formData.subject = vorlage_kurzbz;
+			}
+		},
+	},
+	watch: {
+		'formData.body': {
+			handler(newVal) {
+				const tinymcsVal = this.editor.getContent();
+
+				if (newVal && tinymcsVal != newVal) {
+					//Inhalt des Editors aktualisieren
+					this.editor.setContent(newVal);
+				}
+			}
+		},
+		'formData.vorlage_kurzbz': {
+			handler(newVal){
+			//	console.log("Vorlage: " + newVal);
+
+				if (newVal && newVal != null) {
+					this.formData.subject = newVal;
+					return this.getVorlagentext(newVal);
+				}
+				//TODO(Manu) own function or retval to getVorlagentext
+				//component VorlagenComponent
+
+			}
+		}
+	},
+	created(){
+
+		if(this.typeId == 'person_id'){
+			this.$fhcApi.factory.messages.person.getMessageVarsPerson()
+				.then(result => {
+					this.fieldsPerson = result.data;
+					this.itemsPerson = Object.entries(this.fieldsPerson).map(([key, value]) => ({
+						label: value,
+						value: '{' + value + '}'
+					}));
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+
+		if(this.typeId == 'uid') {
+			this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(this.id)
+				.then(result => {
+					this.fieldsPrestudent = result.data;
+					const prestudent = this.fieldsPrestudent[0];
+					//Just for testing with inserting values
+/*					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
+						label: key,
+						value: value
+					}));*/
+					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
+						label: key,
+						value: '{' + key + '}'
+					}));
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+
+		this.$fhcApi.factory.messages.person.getMsgVarsLoggedInUser()
+			.then(result => {
+				this.fieldsUser = result.data;
+				const user = this.fieldsUser;
+				this.itemsUser = Object.entries(user).map(([key, value]) => ({
+					label: value,
+					value: '{' + value + '}'
+				}));
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$fhcApi.factory.messages.person.getNameOfDefaultRecipient({
+			id: this.id,
+			type_id: this.typeId})
+			.then(result => {
+				this.defaultRecipient = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
+	async mounted() {
+		this.initTinyMCE();
+	},
+	beforeDestroy() {
+		this.editor.destroy();
+	},
 	template: `
 	<div class="messages-detail-newmessage">
-		<h4>New Message</h4>
+	
+		<div v-show="isVisible">
+			<h4>New Message</h4>
+			
+				{{typeId}} {{id}}
+			
+				{{formData.subject}}
+				{{formData.vorlage_kurzbz}}
+	
+			<p v-if="formData.body">
+				formData.body befüllt
+			</p>
+
+			<div class="row">
+			
+				<div class="col-sm-8">
+		
+					<form-form class="row g-3 mt-2" ref="formMessage">
+					
+						<div class="row mb-3">
+						
+							<form-input
+								type="text"
+								name="recipient"
+								:label="$p.t('messages/recipient')"
+								v-model="defaultRecipient"
+								disabled
+							>
+							</form-input>					
+						</div>
+						
+						<div class="row mb-3">
+							<form-input
+								type="text"
+								name="subject"
+								:label="$p.t('global/betreff') + ' *'"
+								v-model="formData.subject"
+							>
+							</form-input>					
+						</div>
+				
+						<!--Tiny MCE-->
+						<div class="row mb-3">
+							<form-input
+								ref="editor"
+								:label="$p.t('global','nachricht')  + ' *'"
+								type="textarea"
+								v-model="formData.body"
+								name="text"
+								rows="15"
+								cols="75"
+								>
+							</form-input>
+						</div>
+								
+						<div class="row">				
+							<DropdownComponent
+								ref="dropdownComp"
+								:label="$p.t('global/vorlage')"
+								@change="handleSelectedVorlage"
+								useLoggedInUserOe
+							>
+							</DropdownComponent>
+						</div>
+											
+					</form-form>
+				</div>
+		
+				<div class="col-sm-4">
+				
+					<div v-if="this.fieldsPrestudent.length > 0">
+						<strong>Felder Prestudent</strong>
+						<div class="border p-3 overflow-auto" style="height: 200px;">
+							
+							<list-box
+								v-model="selectedFieldPrestudent"
+								:options="itemsPrestudent"
+								optionLabel="label"
+							>
+							  <template #option="slotProps">
+								<div @dblclick="insertVariable(slotProps.option)">
+								  {{ slotProps.option.label }}
+								</div>
+							  </template>
+							</list-box>
+													
+						</div>
+						
+						<button class="m-3" @click="insertVariablePrestudent">Insert Variable</button>
+						<p>{{selectedFieldPrestudent}}</p>
+
+					</div>
+					
+					<div v-if="this.fieldsPerson.length > 0">
+						<strong>Felder Person</strong>
+						<div class="border p-3 overflow-auto" style="height: 200px;">
+							
+							<list-box
+								v-model="selectedFieldPerson"
+								:options="itemsPerson"
+								optionLabel="label"
+							>
+								<template #option="slotProps">
+									<div @dblclick="insertVariable(slotProps.option)">
+									  {{ slotProps.option.label }}
+									</div>
+							  </template>
+							</list-box>
+													
+						</div>
+						<button class="m-3" @click="insertVariablePerson">Insert Variable</button>
+						<p>{{selectedFieldPerson}}</p>
+					</div>
+							
+					<div>
+						<strong>Meine Felder</strong>
+						<div class="border p-3 overflow-auto" style="height: 200px;">
+							
+							<list-box
+								v-model="selectedFieldUser"
+								:options="itemsUser"
+								optionLabel="label"
+							>
+								<template #option="slotProps">
+									<div @dblclick="insertVariable(slotProps.option)">
+									  {{ slotProps.option.label }}
+									</div>
+							  </template>
+							</list-box>
+													
+						</div>
+						<button class="m-3" @click="insertVariableUser">Insert Variable</button>
+					</div>
+					
+					
+					<div class="d-grid gap-2 d-md-flex justify-content-md-end">
+					
+						<button class="btn btn-secondary" @click="resetForm">Reset All</button>
+						
+						<button v-if="statusNew" type="button" class="btn btn-primary" @click="sendMessage()">{{$p.t('ui', 'nachrichtSenden')}}</button>
+						<button v-else type="button" class="btn btn-primary" @click="replyMessage(formData.message_id)">{{$p.t('global', 'reply')}}</button>
+					</div>
+					
+				</div>
+				
+			</div>
+		</div>
+		
+		<hr>
+		<button type="button" class="btn btn-warning" @click="toggleDivNewMessage()">Toggle NewMessage</button>
+		<hr>
 	</div>
 	`
 
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index c4fd4d4d7..0025d7b47 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -1,12 +1,15 @@
 import {CoreFilterCmpt} from "../../filter/Filter.js";
 import FormForm from '../../Form/Form.js';
-//import FormInput from '../../Form/Input.js';
 
 export default {
 	components: {
 		CoreFilterCmpt,
 		FormForm,
-	//	FormInput
+	},
+	inject: {
+		cisRoot: {
+			from: 'cisRoot'
+		},
 	},
 	props: {
 		endpoint: {
@@ -121,7 +124,7 @@ export default {
 							button.addEventListener(
 								'click',
 								() =>
-									this.deleteMessage(cell.getData().message_id)
+									this.actionDeleteMessage(cell.getData().message_id)
 							);
 							container.append(button);
 
@@ -197,7 +200,6 @@ export default {
 							const selectedMessage = row.getData().message_id;
 							const body = row.getData().body;
 							this.previewBody = body;
-							console.log(selectedMessage);
 					}
 				},
 			],
@@ -209,11 +211,45 @@ export default {
 		reply(message_id){
 			console.log("in reply " + message_id);
 		},
+		actionDeleteMessage(message_id){
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? message_id
+					: Promise.reject({handled: true}))
+				.then(this.deleteMessage)
+				.catch(this.$fhcAlert.handleSystemError);
+		},
 		deleteMessage(message_id){
-			console.log("deleteMessage " + message_id);
+		//	console.log("deleteMessage " + message_id);
+			return this.$fhcApi.factory.messages.person.deleteMessage(message_id)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(()=> {
+					window.scrollTo(0, 0);
+					this.reload();
+				});
 		},
 		actionNewMessage(){
-			console.log("action new message");
+			//console.log("action new message");
+			if (this.openMode == "window") {
+				console.log("openInNewWindow")
+				const linkWindowNewMessage = this.cisRoot + '/public/js/components/Messages/Details/NewMessage.js';
+				window.open(linkWindowNewMessage, '_blank');
+			}
+			else if (this.openmode == "modal"){
+				console.log("open with bootstrap Modal");
+			}
+			else if (this.openmode == "showDiv"){
+				console.log("open div in NewMessage.js");
+				//emit to NewMessage.js
+			}
+			else
+				console.log("no valid openmode: yet to be developed");
+		},
+		reload() {
+			this.$refs.table.reloadTable();
 		},
 	},
 	computed: {
@@ -238,8 +274,9 @@ export default {
 	},
 	template: `
 	<div class="messages-detail-table">
-		<p>endpoint: {{endpoint}}</p>
-		<p>{{messageLayout}}</p>
+<!--		<p>endpoint: {{endpoint}}</p>-->
+<!--				{{cisRoot}}-->
+<!--		<p>{{messageLayout}}</p>-->
 
 		<!-- {{statusText[0] }}
 		<hr>
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index 3fd6e2a02..a7cccb8cb 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -34,10 +34,12 @@ export default {
 	},
 	template: `
 	<div class="core-messages h-100 pb-3">
-	<p>endpoint Messages.js: {{endpoint}}</p>
+<!--	<p>endpoint Messages.js: {{endpoint}}</p>-->
 		<div v-if="showNew">
 			<NewMessage
-				
+				:type-id="typeId"
+				:id="id"
+				:endpoint="endpoint"
 			>
 			</NewMessage>
 		</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index e9f542945..14d74e56c 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -12,10 +12,11 @@ export default {
 		<core-messages
 			ref="formc"
 			endpoint="$fhcApi.factory.messages.person"
-			type-id="person_id"
-			:id="modelValue.person_id"
-			messageLayout="listTableTop"
+			type-id="uid"
+			:id="modelValue.uid"
+			messageLayout="twoColumnsTableLeft"
 			show-table
+			show-new
 			>
 		</core-messages>
 
diff --git a/public/js/components/VorlagenDropdown/VorlagenDropdown.js b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
new file mode 100644
index 000000000..e4c48501a
--- /dev/null
+++ b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
@@ -0,0 +1,109 @@
+import {CoreFilterCmpt} from "../filter/Filter.js";
+import FormForm from '../Form/Form';
+import FormInput from '../Form/Input.js';
+
+export default {
+	components: {
+		FormForm,
+		FormInput,
+		CoreFilterCmpt
+	},
+	props: {
+		label: {
+			type: String,
+			required: true
+		},
+		modelValue: {
+			type: String,
+			required: true
+		},
+/*		oe: {
+			type: Array,
+			required: false
+		}, */
+		isAdmin: {
+			type: Boolean,
+			required: true
+		},
+		useLoggedInUserOe: {
+			type: Boolean,
+			required: true
+		}
+	},
+	data() {
+		return {
+			vorlagen: [],
+			selectedValue: null,
+			vorlagenOe: []
+		}
+	},
+	methods: {
+		updateValue() {
+		//	console.log("in COMPO: update: " + this.selectedValue + ' jetzt ' + 'InfocenterMailErgaenzungsprfEng');
+			this.$emit('change', this.selectedValue);
+			//this.$emit('change', this.selectedValue); // Emit-Event beim Ändern des Wertes
+		},
+		setValue(value) {
+			this.selectedValue = value;
+		},
+	},
+	 created() {
+
+		if(this.isAdmin) {
+			this.$fhcApi.factory.vorlagen.getVorlagen()
+				.then(result => {
+					this.vorlagen = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+
+		if(this.useLoggedInUserOe){
+			this.$fhcApi.factory.vorlagen.getVorlagenByLoggedInUser()
+				.then(result => {
+					console.log(this.vorlagenOe);
+					this.vorlagenOe = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+	},
+template: `
+	<div class="core-vorlagen-dropdown">
+		<div v-if="isAdmin" class="col-sm-8 pt-3">
+			<form-input
+				ref="dropdown"
+				type="select"
+				:label="label"
+				@change="updateValue"
+				v-model="selectedValue"
+				>
+				<option 
+					v-for="vorlage in vorlagen" 
+					:key="vorlage.vorlage_kurzbz" 
+					:value="vorlage.vorlage_kurzbz" 
+					>
+					{{vorlage.bezeichnung}}
+				</option>
+			</form-input>
+		</div>
+		
+		<div v-if="useLoggedInUserOe" class="col-sm-8 pt-3">
+			<form-input
+				ref="dropdown"
+				type="select"
+				:label="label"
+				@change="updateValue"
+				v-model="selectedValue"
+				>
+				<option 
+					v-for="vorlage in vorlagenOe" 
+					:key="vorlage.id" 
+					:value="vorlage.id" 
+					>
+					{{vorlage.description}}
+				</option>
+			</form-input>
+		</div>
+		
+	</div>
+	`,
+}
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 95a505a23..63cf34038 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37519,6 +37519,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'successSent',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nachricht erfolgreich versandt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Message sent successfully',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	/////////// FHC4 Phrases Messages END ///////////
 
 );

From 5cb09c8e7b060179c659f897c8724df6079c3165 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 19 Feb 2025 14:50:19 +0100
Subject: [PATCH 027/572] fix(LvMenu): fixes the highlighting styles for the
 lvMenu, instead of using fhc-entry it uses its own class

---
 public/css/Cis4/Cis.css                 | 6 +++++-
 public/js/components/Cis/Mylv/LvMenu.js | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 2fbfb0cd7..ab8f30260 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -53,7 +53,11 @@ html {
   }
 }
 
-
+/* lvMenu entry style */
+#cis-menu .menu-entry:hover{
+	background-color: var(--fhc-cis-primary);
+	color:white;
+}
 
 /* buttons */
 #cis-header .btn-level-1,
diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index e64dbd667..d6a84527a 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -57,13 +57,13 @@ export default {
 	},
 	template:/*html*/`
 	<div v-if="!menu">No Menu available</div>
-	<div v-else>
+	<div id="cis-menu" v-else>
 		<div class="container" :class="containerStyles">
 			<div class="row g-2 justify-content-center" :class="rowStyles">
 							<div style="min-height:150px; min-width:150px;" class="col-12 col-lg-6 col-xl-4" v-for="(menuItem, index) in menu" :key="index">
 					<a :id="menuItem.name" :class="{'dropdown-toggle':menuItem.c4_moodle_links?.length }"  role="button" :href="c4_link(menuItem)"
 					:disabled="c4_disabled(menuItem)" :data-bs-toggle="menuItem.c4_moodle_links?.length?'dropdown':null"
-					class="fhc-entry p-2 w-100 text-wrap border border-1 rounded-3 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link-dark h-100">
+					class="menu-entry p-2 w-100 text-wrap border border-1 rounded-3 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link-dark h-100">
 						<img :src="menuItem.c4_icon" :alt="menuItem.name" />
 						<p @click="selectMenu(menuItem)" class="w-100 mt-2">{{menuItem.name}}</p>
 						<p v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)" class="mt-1 w-100" :index="index">{{text}}</p>

From 40f64cc9796d960ef3a8ba5398bf30e5b25487eb Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 19 Feb 2025 14:52:51 +0100
Subject: [PATCH 028/572] feature(Calendar Moodle): adds and modifies the week
 and day view for moodle events

---
 public/js/components/Calendar/Calendar.js     |   4 +-
 public/js/components/Calendar/Day.js          |   4 +-
 public/js/components/Calendar/Day/Page.js     |  37 ++++-
 public/js/components/Calendar/Week/Page.js    |   6 +-
 public/js/components/Cis/Mylv/LvInfo.js       | 127 +++++++++++-------
 public/js/components/Cis/Mylv/LvModal.js      |  12 +-
 .../components/Cis/Stundenplan/Stundenplan.js |  83 +++++++-----
 system/phrasesupdate.php                      |  20 +++
 8 files changed, 195 insertions(+), 98 deletions(-)

diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 8d4c56cfe..cdef23aa9 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -247,8 +247,8 @@ export default {
 			<template #dayPage="{event,day,mobile}">
 				<slot name="dayPage" :event="event" :day="day" :mobile="mobile"></slot>
 			</template>
-			<template #pageMobilContent="{lvMenu}">
-				<slot name="pageMobilContent" :lvMenu="lvMenu"></slot>
+			<template #pageMobilContent="{lvMenu, event}">
+				<slot name="pageMobilContent" :lvMenu="lvMenu" :event="event"></slot>
 			</template>
 			<template #pageMobilContentEmpty>
 				<slot name="pageMobilContentEmpty" ></slot>
diff --git a/public/js/components/Calendar/Day.js b/public/js/components/Calendar/Day.js
index 2f07efef3..a83ea6818 100644
--- a/public/js/components/Calendar/Day.js
+++ b/public/js/components/Calendar/Day.js
@@ -50,8 +50,8 @@ export default {
 				<template #dayPage="{event,day,mobile}">
 					<slot name="dayPage" :event="event" :day="day" :mobile="mobile" ></slot>
 				</template>
-				<template #pageMobilContent="{lvMenu}">
-					<slot name="pageMobilContent" :lvMenu="lvMenu" ></slot>
+				<template #pageMobilContent="{lvMenu, event}">
+					<slot name="pageMobilContent" :lvMenu="lvMenu" :event="event" ></slot>
 				</template>
 				<template #pageMobilContentEmpty>
 					<slot name="pageMobilContentEmpty" ></slot>
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 3d5cc5f02..4f83f7c36 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -93,6 +93,16 @@ export default {
 		}
 	},
 	computed: {
+		allDayEvents() {
+			let allDayEvents = {};
+			for (let day in this.events) {
+				const filteredAllDayEvents = this.events[day].filter(event => event.allDayEvent);
+				if (filteredAllDayEvents.length > 0) {
+					allDayEvents[day] = filteredAllDayEvents;
+				}
+			};
+			return allDayEvents;
+		},
 		overlayStyle() {
 			return {
 				'background-color': '#F5E9D7',
@@ -183,6 +193,7 @@ export default {
 			let d = {events: [], lanes: 1};
 			if (this.events[key]) {
 				this.events[key].forEach(evt => {
+					if (evt.allDayEvent) return;
 					let event = {
 						orig: evt,
 						lane: 1,
@@ -282,7 +293,7 @@ export default {
 			}
 		},
 		eventClick(evt) {
-			let event = evt.orig;
+			let event = evt.orig || evt;
 			this.setSelectedEvent(event);
 			this.$emit('input', event);
 		},
@@ -374,18 +385,32 @@ export default {
 									<div class="hours">
 										<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 									</div>
-									<div v-for="day in eventsPerDayAndHour" :key="day" class=" day border-start" :style="dayGridStyle(day)">
+									<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start" :style="dayGridStyle(day)">
+										<div class="position-absolute w-100" style="top:0; bottom:0;">
+											<div class="position-sticky d-grid " style="top:0;" v-for="(events,_day) in allDayEvents" :key="day">
+												<div v-if="dayindex == _day" v-for="event in events" :key="event" @click.prevent="eventClick(event)"
+													:selected="event == selectedEvent"
+													:style="{'background-color': event?.color, 'z-index':2, 'margin-bottom':'1px'}"
+													class="small rounded overflow-hidden fhc-entry"
+													v-contrast
+													>
+													<slot class="p-1" name="dayPage" :event="event" :day="day">
+														<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
+													</slot>
+												</div>
+											</div>
+										</div>
 										<div v-if="lookingAtToday && !noEventsCondition" :style="overlayStyle"></div>
 										<div v-for="event in day.events" :key="event" :style="eventGridStyle(day,event)" v-contrast :selected="event.orig == selectedEvent" class="fhc-entry mx-2 small rounded overflow-hidden " >
 											<!-- desktop version of the page template, parent receives slotProp mobile = false -->
 											<div class="d-none d-xl-block h-100 "  @click.prevent="eventClick(event)">
-												<slot  name="dayPage" :event="event" :day="day" :mobile="false">
+												<slot  name="dayPage" :event="event.orig" :day="day" :mobile="false">
 													<p>this is a slot placeholder</p>
 												</slot>
 											</div>
 											<!-- mobile version of the page template, parent receives slotProp mobile = true -->
 											<div class="d-block d-xl-none h-100" @click.prevent="eventClick(event)">
-												<slot  name="dayPage" :event="event" :day="day" :mobile="true">
+												<slot  name="dayPage" :event="event.orig" :day="day" :mobile="true">
 													<p>this is a slot placeholder</p>
 												</slot>
 											</div>
@@ -401,8 +426,8 @@ export default {
 			<div class="d-xl-block col-xl-6 p-4 d-none" style="max-height: 100%">
 				<div style="z-index:0; max-height: 100%" class="sticky-top d-flex justify-content-center align-items-center flex-column">
 					<div style="max-height: 100%; overflow-y:auto;" class="w-100">
-						<template v-if="selectedEvent && lvMenu">
-							<slot name="pageMobilContent" :lvMenu="lvMenu" >
+						<template v-if="selectedEvent ">
+							<slot name="pageMobilContent" :event="selectedEvent" :lvMenu="lvMenu" >
 								<p>this is a slot placeholder</p>
 							</slot>
 						</template>
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 504293d07..37cd47be8 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -365,11 +365,11 @@ export default {
 					</div>
 					<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start position-relative" :style="dayGridStyle(day)">
 						<div class="position-absolute w-100" style="top:0; bottom:0;">
-							<div class="position-sticky d-grid gap-1" style="top:44px;" v-for="(events,_day) in allDayEvents" :key="day">
+							<div class="position-sticky d-grid " style="top:44px;" v-for="(events,_day) in allDayEvents" :key="day">
 								<div v-if="dayindex == _day" v-for="event in events" :key="event" @click.prevent="weekPageClick(event, _day)"
 									:selected="event == selectedEvent"
-									:style="{'background-color': event?.color, 'z-index':2}"
-									class="small rounded overflow-hidden fhc-entry "
+									:style="{'background-color': event?.color, 'z-index':2, 'margin-bottom':'1px'}"
+									class="small rounded overflow-hidden fhc-entry"
 									v-contrast
 									>
 									<slot class="p-1" name="weekPage" :event="event" :day="day">
diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
index df82f5cca..cfddc2c6a 100644
--- a/public/js/components/Cis/Mylv/LvInfo.js
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -1,6 +1,5 @@
 import { numberPadding, formatDate } from "../../../helpers/DateHelpers.js"
 
-
 export default {
 	props: {
 		event: Object,
@@ -11,17 +10,23 @@ export default {
 		}
 	},
 	computed: {
-		lektorenLinks: function(){
+		LV_TYPES: function () {
+			return {
+				lehreinheit: "lehreinheit",
+				reservierung: "reservierung",
+				moodle: "moodle",
+			};
+		},
+		lektorenLinks: function () {
 			if (!this.event || !Array.isArray(this.event.lektor) || !this.event.lektor.length) return "a";
 
-			let lektorenLinks ={};
-			this.event.lektor.forEach((lektor)=>{
+			let lektorenLinks = {};
+			this.event.lektor.forEach((lektor) => {
 				lektorenLinks[lektor.kurzbz] = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/Cis/Profil/View/${lektor.mitarbeiter_uid}`;
 			})
 			return lektorenLinks;
 		},
-		getOrtContentLink: function()
-		{
+		getOrtContentLink: function () {
 			if (!this.event || !this.event.ort_content_id) return "a";
 
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/CisVue/Cms/content/${this.event.ort_content_id}`
@@ -61,52 +66,74 @@ export default {
 					<td>{{methodFormatDate(event.datum)}}</td>
 				</tr>
 				<tr>
-					<th>{{
-						$p.t('global','raum')?
-						$p.t('global','raum')+':'
-						:''
-					}}</th>
-					<td>
-						<a v-if="event.ort_content_id" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
-						{{event.ort_kurzbz}}
-					</td>
+					<template v-if="event.type == LV_TYPES.moodle">
+						<th>{{$p.t('global','aktivitaet')}}:</th>
+						<td>{{event?.assignment}}</td>
+					</template>
+					<template v-else>
+						<th>{{
+							$p.t('global','raum')?
+							$p.t('global','raum')+':'
+							:''
+						}}</th>
+						<td>
+							<a v-if="event.ort_content_id" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+							{{event.ort_kurzbz}}
+						</td>
+					</template>
+				</tr>
+				<template v-if="event.type != LV_TYPES.moodle">
+					<tr>
+						<th>{{
+							$p.t('lehre','lehrveranstaltung')?
+							$p.t('lehre','lehrveranstaltung')+':'
+							:''
+						}}</th>
+						<td>{{'('+event.lehrform+') ' + event.lehrfach_bez}}</td>
+					</tr>
+				</template>
+				<template v-if="event.type != LV_TYPES.moodle">
+					<tr>
+						<th>{{
+							$p.t('lehre','lektor')?
+							$p.t('lehre','lektor')+':'
+							:''
+						}}</th>
+						<td>
+							<div v-for="lektor in event.lektor" class="d-block">
+								<a v-if="lektorenLinks[lektor.kurzbz]" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+								{{lektor.kurzbz}}
+							</div>
+						</td>
+					</tr>
+				</template>
+				<tr>
+					<template v-if="event.type == LV_TYPES.moodle">
+						<th>{{$p.t('global','typ')}}:</th>
+						<td>{{event?.purpose}}</td>
+					</template>
+					<template v-else>
+						<th>{{
+							$p.t('ui','zeitraum')?
+							$p.t('ui','zeitraum')+':'
+							:''
+						}}</th>
+						<td>{{start_time + ' - ' + end_time}}</td>
+					</template>
 				</tr>
 				<tr>
-					<th>{{
-						$p.t('lehre','lehrveranstaltung')?
-						$p.t('lehre','lehrveranstaltung')+':'
-						:''
-					}}</th>
-					<td>{{'('+event.lehrform+') ' + event.lehrfach_bez}}</td>
-				</tr>
-				<tr>
-					<th>{{
-						$p.t('lehre','lektor')?
-						$p.t('lehre','lektor')+':'
-						:''
-					}}</th>
-					<td>
-						<div v-for="lektor in event.lektor" class="d-block">
-							<a v-if="lektorenLinks[lektor.kurzbz]" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
-							{{lektor.kurzbz}}
-						</div>
-					</td>
-				</tr>
-				<tr>
-					<th>{{
-						$p.t('ui','zeitraum')?
-						$p.t('ui','zeitraum')+':'
-						:''
-					}}</th>
-					<td>{{start_time + ' - ' + end_time}}</td>
-				</tr>
-				<tr>
-					<th>{{
-						$p.t('lehre','organisationseinheit')?
-						$p.t('lehre','organisationseinheit')+':'
-						:''
-					}}</th>
-					<td>{{event.organisationseinheit}}</td>
+				    <template v-if="event.type == LV_TYPES.moodle">
+						<th>{{$p.t('fristenmanagement','frist')}}:</th>
+						<td>{{start_time}}</td>
+					</template>
+					<template v-else>
+						<th>{{
+							$p.t('lehre','organisationseinheit')?
+							$p.t('lehre','organisationseinheit')+':'
+							:''
+						}}</th>
+						<td>{{event.organisationseinheit}}</td>
+					</template>
 				</tr>
 			</tbody>
 		</table>
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index acb2a7693..4be4e5c79 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -70,11 +70,19 @@ export default {
 	template: /*html*/ `
 	<bs-modal ref="modalContainer" @showBsModal="onModalShow" @hideBsModal="onModalHide" v-bind="$props" :bodyClass="''" dialogClass='modal-lg' class="bootstrap-alert" backdrop="false" >
 		<template v-slot:title>
-			<template v-if="event.titel">{{ event.titel + ' - ' + event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
+			<template v-if="event?.type=='moodle'">{{event.titel}}</template>
+			<template v-else-if="event.titel">{{ event.titel + ' - ' + event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
 			<template v-else>{{ event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
 		</template>
 		<template v-slot:default>
-			<h3 >{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
+			<h3>
+				<template v-if="event?.type =='moodle'">
+					{{$p.t('lvinfo','Moodleinformationen')}}
+				</template>
+				<template v-else>
+					{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}
+				</template>
+			</h3>
 			<lv-info :event="event"></lv-info>
 			<template v-if="showMenu && this.menu">
 				<h3 >Lehrveranstaltungs Menu</h3>
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 4a751a637..af19e218b 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -154,23 +154,28 @@ export const Stundenplan = {
 			let date_end = Math.floor(new Date(end_date).getTime() / 1000);
 			return this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid('io23m005', date_start, date_end).then((response) => response.events).then(events => {
 				let data =events.map(event =>{
-					const start_date = new Date(event.timestart * 1000);
-					const formatted_year = Intl.DateTimeFormat(this.$p.user_locale, { year: 'numeric' }).format(start_date);
-					const formatted_month = Intl.DateTimeFormat(this.$p.user_locale, { month: '2-digit' }).format(start_date);
-					const formatted_day = Intl.DateTimeFormat(this.$p.user_locale, { year: '2-digit' }).format(start_date);
-					const formatted_date = `${formatted_year}-${formatted_month}-${formatted_day}`;
+					const event_start_date = new Date(Number(event.timestart) * 1000);
+					const event_end_date = new Date(((Number(event.timestart) + Number(event.timeduration)) * 1000));
+					const formatted_date = `${event_start_date.getFullYear()}-${event_start_date.getMonth()+1}-${event_start_date.getDate()}`;
+					// to get the same date and time as in moodle, we use the default UTC time zone 
+					const formatted_start_time = event_start_date.toLocaleTimeString(this.$p.user_locale, {hour:'2-digit',minute:'2-digit', second:'2-digit',hour12:false, timeZone:'UTC'});
+					const formatted_end_time = event_end_date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false, timeZone: 'UTC' });
+					
 					return {
 						type:'moodle',
-						beginn: "14:00:00",
-						ende: "15:00:00",
+						beginn: formatted_start_time,
+						ende: formatted_end_time,
 						allDayEvent: true,
 						datum: formatted_date,
-						topic: event.activityname,
+						purpose: event.purpose,
+						assignment: event.activityname,
+						topic: event.activitystr,
 						lektor:[],
 						gruppe:[],
 						ort_kurzbz: event.location,
-						lehreinheit_id:0,
-						titel: event.activitystr,
+						//moodle idnumber entspricht der course id number die man den Kurs in Moodle vergeben kann
+						lehreinheit_id:event.lehreinheitsNummber??null,
+						titel: event.course.fullname,
 						lehrfach:'',
 						lehrform:'',
 						lehrfach_bez:'',
@@ -233,7 +238,7 @@ export const Stundenplan = {
 				</div>
 				<div v-if="event.type=='moodle'" class="d-flex small w-100" >
 					<span >moodle:</span>
-					<span class="flex-grow-1 text-center">{{event.titel}}</span>
+					<span class="flex-grow-1 text-center">{{event.topic}}</span>
 				</div>
 				<div v-else class="d-flex flex-column flex-grow-1 align-items-center small">
 					<span>{{event.topic}}</span>
@@ -243,34 +248,46 @@ export const Stundenplan = {
 			</div>
 		</template>
 		<template #dayPage="{event,day,mobile}">
-			<div @click="mobile? showModal(event?.orig):null" type="button" class="fhc-entry border border-secondary border row m-0 h-100 justify-content-center align-items-center text-center">
-				<div class="col-auto" v-if="event?.orig?.beginn && event?.orig?.ende" >
-					<div class="d-flex flex-column p-4 border-end border-secondary">
-						<span class="small">{{convertTime(event.orig.beginn.split(":"))}}</span>
-						<span class="small">{{convertTime(event.orig.ende.split(":"))}}</span>
+			<div @click="mobile? showModal(event):null" type="button" class="fhc-entry border border-secondary border m-0 h-100  text-center">
+				<template v-if="event.type=='moodle'">
+					<div class="d-flex align-items-center w-100" >
+						<span class="p-2">moodle:</span>
+						<span class="flex-grow-1 text-center">{{event.topic}}</span>
 					</div>
-				</div>
-				<div class="col ">
-					<p>Lehrveranstaltung:</p>
-					<p class="m-0">{{event?.orig.topic}}</p>
-				</div>
-				<div class="col ">
-					<p>Lektor:</p>
-					<p class="m-0" v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</p>
-				</div>
-				<div class="col ">
-					<p>Ort: </p>
-					<p class="m-0">{{event?.orig.ort_kurzbz}}</p>
-				</div>
+				</template>
+				<template v-else>
+					<div class="row justify-content-center align-items-center">
+						<div class="col-auto" v-if="!event.allDayEvent && event?.beginn && event?.ende" >
+							<div class="d-flex flex-column p-4 border-end border-secondary">
+								<span class="small">{{convertTime(event.beginn.split(":"))}}</span>
+								<span class="small">{{convertTime(event.ende.split(":"))}}</span>
+							</div>
+						</div>
+						<div class="col ">
+							<p>Lehrveranstaltung:</p>
+							<p class="m-0">{{event?.topic}}</p>
+						</div>
+						<div class="col ">
+							<p>Lektor:</p>
+							<p class="m-0" v-for="lektor in event?.lektor">{{lektor.kurzbz}}</p>
+						</div>
+						<div class="col ">
+							<p>Ort: </p>
+							<p class="m-0">{{event?.ort_kurzbz}}</p>
+						</div>
+					</div>
+				</template>
 			</div>
 		</template>
-		<template #pageMobilContent="{lvMenu}">
+		<template #pageMobilContent="{lvMenu, event}">
 			<h3 >{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
 			<div class="w-100">
-				<lv-info  :event="currentlySelectedEvent" />
+				<lv-info  :event="event" />
 			</div>
-			<h3 >Lehrveranstaltungs Menu</h3>
-			<lv-menu :containerStyles="['p-0']" :rowStyles="['m-0']" v-show="lvMenu" :menu="lvMenu" />
+			<template v-if="event.type != 'moodle'">
+				<h3 >Lehrveranstaltungs Menu</h3>
+				<lv-menu :containerStyles="['p-0']" :rowStyles="['m-0']" v-show="lvMenu" :menu="lvMenu" />
+			</template>
 		</template>
 		<template #pageMobilContentEmpty >
 			<h3>Keine Lehrveranstaltungen</h3>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d841acc85..f55698ec3 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -20164,6 +20164,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lvinfo',
+		'phrase' => 'Moodleinformationen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Moodle Informationen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Moodle Information",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',

From 400ba2d7f9f901c3d12f267dd6ff34632e2025a8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 20 Feb 2025 12:10:48 +0100
Subject: [PATCH 029/572] fix(Calendar All Day Events): positions the all day
 Events in its own container above the events

---
 public/css/components/calendar.css            | 21 ++++++++-
 public/js/components/Calendar/Calendar.js     |  3 --
 public/js/components/Calendar/Day.js          |  3 --
 public/js/components/Calendar/Day/Page.js     | 22 ++++++----
 public/js/components/Calendar/Week/Page.js    | 43 ++++++++++---------
 .../components/Cis/Stundenplan/Stundenplan.js |  7 ++-
 6 files changed, 58 insertions(+), 41 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 9be771adf..3e6eeb3e2 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -69,8 +69,27 @@
   display: grid;
 }
 
+.all-day-event-border{
+	box-shadow: 1px 1px 0 #dee2e6;
+}
+
+.all-day-event{
+	max-height: 75px;
+	overflow:scroll;
+}
+
+.all-day-event-container{
+	position: sticky;
+	top: 44px;
+	display:grid;
+	grid-template-columns:repeat(7,1fr);
+	width:100%;
+	box-shadow: 0px 1px 0px #dee2e6;
+	z-index:3;
+}
+
 /* grid hour lines of the Stundenplan use box-shadow instead of border because box-shadow renders consistently on different viewports*/
-.box-shadow-border-top{
+.box-shadow-border{
 	box-shadow: 0 0 0 1px #dee2e6 !important;
 }
 
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index cdef23aa9..c3515df45 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -250,9 +250,6 @@ export default {
 			<template #pageMobilContent="{lvMenu, event}">
 				<slot name="pageMobilContent" :lvMenu="lvMenu" :event="event"></slot>
 			</template>
-			<template #pageMobilContentEmpty>
-				<slot name="pageMobilContentEmpty" ></slot>
-			</template>
 			<template #minimizedPage="{event,day}">
 				<slot name="minimizedPage" :event="event" :day="day"></slot>
 			</template>
diff --git a/public/js/components/Calendar/Day.js b/public/js/components/Calendar/Day.js
index a83ea6818..b85615f3e 100644
--- a/public/js/components/Calendar/Day.js
+++ b/public/js/components/Calendar/Day.js
@@ -53,9 +53,6 @@ export default {
 				<template #pageMobilContent="{lvMenu, event}">
 					<slot name="pageMobilContent" :lvMenu="lvMenu" :event="event" ></slot>
 				</template>
-				<template #pageMobilContentEmpty>
-					<slot name="pageMobilContentEmpty" ></slot>
-				</template>
 			</calendar-day-page>
 		</calendar-pane>
 	</div>`
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 4f83f7c36..679086885 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -366,7 +366,7 @@ export default {
 					<div id="scroll g-0" style="height: 100%; overflow-y: scroll;">
 
 						<div ref="eventcontainer" class="position-relative flex-grow-1" @mousemove="calcHourPosition" @mouseleave="hourPosition = null" >
-							<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border-top" :style="hourGridStyle(hour)"></div>
+							<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border" :style="hourGridStyle(hour)"></div>
 
 							<Transition>
 								<div v-if="hourPosition && !noEventsCondition" class="position-absolute border-top small"  :style="indicatorStyle">
@@ -381,7 +381,6 @@ export default {
 							<div>
 								<h1 v-if="noEventsCondition" class="m-0 text-secondary" ref="noEventsText" :style="noLvStyle">Keine Lehrveranstaltungen</h1>
 								<div :class="{'fhc-calendar-no-events-overlay':noEventsCondition, 'events':true}">
-
 									<div class="hours">
 										<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 									</div>
@@ -394,9 +393,16 @@ export default {
 													class="small rounded overflow-hidden fhc-entry"
 													v-contrast
 													>
-													<slot class="p-1" name="dayPage" :event="event" :day="day">
-														<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
-													</slot>
+													<div class="d-none d-xl-block">
+														<slot name="dayPage" :event="event" :day="day" :mobile="false">
+															<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
+														</slot>
+													</div>
+													<div class="d-block d-xl-none">
+														<slot name="dayPage" :event="event" :day="day" :mobile="true">
+															<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
+														</slot>
+													</div>
 												</div>
 											</div>
 										</div>
@@ -414,7 +420,7 @@ export default {
 													<p>this is a slot placeholder</p>
 												</slot>
 											</div>
-		
+
 										</div>
 									</div>
 								</div>
@@ -432,9 +438,7 @@ export default {
 							</slot>
 						</template>
 						<template v-else-if="noEventsCondition">
-							<slot name="pageMobilContentEmpty" >
-								<h3>This is an slot placeholder</h3>
-							</slot>
+							<h3>Keine Lehrveranstaltungen</h3>
 						</template>
 						<template v-else>
 							<div class="p-4 d-flex w-100 justify-content-center align-items-center">
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 37cd47be8..b4ee7626c 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -249,8 +249,8 @@ export default {
 			}
 		},
 		calcHourPosition(event) {
-			let height = this.$refs.eventcontainer.getBoundingClientRect().height;
-			let top = this.$refs.eventcontainer.getBoundingClientRect().top;
+			let height = this.$refs['eventsRef' + this.week].getBoundingClientRect().height;
+			let top = this.$refs['eventsRef' + this.week].getBoundingClientRect().top;
 			let position = event.clientY - top;
 			// position percentage of total height
 			let timePercentage = (position / height) * 100;
@@ -350,34 +350,35 @@ export default {
 					<a href="#" class="small text-secondary text-decoration-none" >{{dayText[day]?.datum}}</a>
 				</div>
 			</div>
-			<div ref="eventcontainer" class="position-relative flex-grow-1" @mousemove="calcHourPosition" @mouseleave="hourPosition = null" >
-				<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border-top" :style="hourGridStyle(hour)"></div>
-				<Transition>
-					<div v-if="hourPosition" class="position-absolute border-top small"  :style="indicatorStyle">
-						<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
-					</div>
-				</Transition>
-
-				<div class="events" :ref="'eventsRef'+week">
-
-					<div class="hours">
-						<div v-for="hour in hours" :style="getGridStyle" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
-					</div>
-					<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start position-relative" :style="dayGridStyle(day)">
-						<div class="position-absolute w-100" style="top:0; bottom:0;">
-							<div class="position-sticky d-grid " style="top:44px;" v-for="(events,_day) in allDayEvents" :key="day">
-								<div v-if="dayindex == _day" v-for="event in events" :key="event" @click.prevent="weekPageClick(event, _day)"
+			<div ref="eventcontainer" class="position-relative flex-grow-1" >
+				<div class="all-day-event-container" >
+					<div class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
+						<div class="position-sticky d-grid mx-1" style="top:0;" v-for="(events,_day) in allDayEvents" :key="_day">
+						
+						<div v-if="dayindex == _day" v-for="event in events" :key="event" @click.prevent="weekPageClick(event, _day)"
 									:selected="event == selectedEvent"
-									:style="{'background-color': event?.color, 'z-index':2, 'margin-bottom':'1px'}"
+									:style="{'background-color': event?.color, 'margin-bottom':'1px'}"
 									class="small rounded overflow-hidden fhc-entry"
 									v-contrast
-									>
+									>		
 									<slot class="p-1" name="weekPage" :event="event" :day="day">
 										<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 									</slot>
 								</div>
 							</div>
+					</div>
+				</div>
+				<div class="events position-relative" :ref="'eventsRef'+week" @mousemove="calcHourPosition" @mouseleave="hourPosition = null">
+					<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border" :style="hourGridStyle(hour)"></div>
+					<Transition>
+						<div v-if="hourPosition" class="position-absolute border-top small"  :style="indicatorStyle">
+							<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
 						</div>
+					</Transition>
+					<div class="hours">
+						<div v-for="hour in hours" :style="getGridStyle" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
+					</div>
+					<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start position-relative" :style="dayGridStyle(day)">
 						<Transition>
 							<div v-if="day.isToday" class="position-absolute border-top small"  :style="curIndicatorStyle">
 								<span class="border border-top-0 px-2 bg-white">{{curTime}}</span>
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index af19e218b..b5ade9542 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -237,7 +237,9 @@ export const Stundenplan = {
 					</div>
 				</div>
 				<div v-if="event.type=='moodle'" class="d-flex small w-100" >
-					<span >moodle:</span>
+					<span >
+						<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><radialGradient id="moodle-original-a" cx="532.855" cy="-537.557" r="209.76" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#FAAF40"/><stop offset=".043" stop-color="#F9A538"/><stop offset=".112" stop-color="#F89D31"/><stop offset=".227" stop-color="#F89A2F"/><stop offset=".528" stop-color="#F7922D"/><stop offset="1" stop-color="#F37B28"/></radialGradient><path fill="url(#moodle-original-a)" d="M106.259 105.754V66.975c0-8.164-3.397-12.244-10.034-12.244-6.629 0-10.034 4.08-10.034 12.244v38.779H66.294V66.975c0-8.164-3.228-12.244-9.862-12.244-6.633 0-10.036 4.08-10.036 12.244v38.779H26.667V64.768c0-8.504 2.891-14.801 8.844-19.223 5.102-3.91 12.246-5.777 20.92-5.777 9.015 0 15.478 2.207 19.727 6.801 3.57-4.594 10.207-6.801 19.897-6.801 8.844 0 15.819 1.867 20.922 5.777 5.951 4.422 8.843 10.719 8.843 19.223v41.152h-19.563v-.166z"/><path fill="#58595B" d="M28.539 49.627l-2.041 10.207c18.708 6.291 36.395.166 45.751-16.158-13.778-9.522-26.535.17-43.71 5.951"/><linearGradient id="moodle-original-b" gradientUnits="userSpaceOnUse" x1="324.268" y1="-509.952" x2="368.932" y2="-509.952" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#929497"/><stop offset=".124" stop-color="#757578"/><stop offset=".279" stop-color="#575658"/><stop offset=".44" stop-color="#403E3F"/><stop offset=".609" stop-color="#302D2E"/><stop offset=".788" stop-color="#262223"/><stop offset="1" stop-color="#231F20"/></linearGradient><path fill="url(#moodle-original-b)" d="M28.539 47.08c-.681 3.91-1.192 7.65-1.872 11.563 17.857 6.125 35.375.85 44.73-15.137-11.909-13.776-25.17-2.383-42.858 3.574"/><linearGradient id="moodle-original-c" gradientUnits="userSpaceOnUse" x1="332.834" y1="-495.051" x2="351.377" y2="-521.534" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#231F20"/><stop offset="1" stop-color="#231F20" stop-opacity="0"/></linearGradient><path fill="url(#moodle-original-c)" d="M49.799 51.668c-8.164-1.701-17.009 2.555-23.131 6.975-3.912-28.57 13.777-27.893 36.903-20.75-1.529 6.975-4.083 16.33-8.502 21.941-.169-3.744-1.869-6.293-5.27-8.166"/><linearGradient id="moodle-original-d" gradientUnits="userSpaceOnUse" x1="299.778" y1="-495.802" x2="381.412" y2="-495.802" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#929497"/><stop offset=".124" stop-color="#757578"/><stop offset=".279" stop-color="#575658"/><stop offset=".44" stop-color="#403E3F"/><stop offset=".609" stop-color="#302D2E"/><stop offset=".788" stop-color="#262223"/><stop offset="1" stop-color="#231F20"/></linearGradient><path fill="url(#moodle-original-d)" d="M2.178 47.08c29.932-18.031 46.77-21.43 81.634-25-40.478 31.969-41.499 25-81.634 25"/><path stroke="#4A4A4C" stroke-width=".5" fill="none" d="M83.812 22.246L51.667 45.545"/><path opacity=".23" fill="#231F20" d="M45.545 34.66c.34 3.744-.511-3.572 0 0"/><path stroke="#A8ABAD" stroke-width=".5" fill="none" d="M2.178 47.08l49.489-1.535"/><path stroke="#F16922" stroke-width=".5" d="M42.484 35.002C33.98 37.383 6.09 43.506 5.747 47.08c-.849 6.631-.167 17.176-.167 17.176" fill="none"/><path fill="#F16922" d="M8.131 89.596c-3.063-7.652-6.804-16.158-2.384-26.703C8.64 72.756 8.131 80.24 8.131 89.596"/><path fill="#6D6E70" d="M41.076 33.844c.708-.25 1.384-.17 1.509.184.126.355-.344.846-1.052 1.096-.709.256-1.384.172-1.51-.184-.127-.352.344-.844 1.053-1.096z"/></svg>
+					</span>
 					<span class="flex-grow-1 text-center">{{event.topic}}</span>
 				</div>
 				<div v-else class="d-flex flex-column flex-grow-1 align-items-center small">
@@ -289,9 +291,6 @@ export const Stundenplan = {
 				<lv-menu :containerStyles="['p-0']" :rowStyles="['m-0']" v-show="lvMenu" :menu="lvMenu" />
 			</template>
 		</template>
-		<template #pageMobilContentEmpty >
-			<h3>Keine Lehrveranstaltungen</h3>
-		</template>
 	</fhc-calendar>
 	`
 }

From b989eae461b52e2b7f89d6b4d5794f64fae4722f Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Thu, 20 Feb 2025 20:07:07 +0100
Subject: [PATCH 030/572] added archive tab to Studierendenverwaltung,
 possibility to archive documents

---
 application/config/javascript.php             |   4 +-
 .../controllers/api/frontend/v1/Documents.php |  83 +++++-
 .../api/frontend/v1/stv/Archiv.php            | 202 +++++++++++++++
 .../api/frontend/v1/stv/Config.php            |  17 +-
 application/models/crm/Akte_model.php         |  10 +-
 application/models/system/Vorlage_model.php   |  12 +-
 public/js/api/stv.js                          |   2 +
 public/js/api/stv/archiv.js                   |  30 +++
 .../Stv/Studentenverwaltung/Details/Archiv.js | 241 ++++++++++++++++++
 system/phrasesupdate.php                      |  40 +++
 10 files changed, 625 insertions(+), 16 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Archiv.php
 create mode 100644 public/js/api/stv/archiv.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Archiv.js

diff --git a/application/config/javascript.php b/application/config/javascript.php
index 5e9aa270a..bfcf8d540 100644
--- a/application/config/javascript.php
+++ b/application/config/javascript.php
@@ -2,6 +2,6 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 // use vuejs dev version
-$config['use_vuejs_dev_version'] = false;
+$config['use_vuejs_dev_version'] = true;
 // use bundled javascript
-$config['use_bundled_javascript'] = false;
\ No newline at end of file
+$config['use_bundled_javascript'] = false;
diff --git a/application/controllers/api/frontend/v1/Documents.php b/application/controllers/api/frontend/v1/Documents.php
index 60010e14d..42a2d3433 100644
--- a/application/controllers/api/frontend/v1/Documents.php
+++ b/application/controllers/api/frontend/v1/Documents.php
@@ -43,7 +43,8 @@ class Documents extends FHCAPI_Controller
 		parent::__construct([
 			'permissionAlternativeFormat' => self::PERM_LOGGED,
 			'archive' => ['admin:rw', 'assistenz:rw'],
-			'archiveSigned' => ['admin:rw', 'assistenz:rw']
+			'archiveSigned' => ['admin:rw', 'assistenz:rw'],
+			'download' => ['admin:rw', 'assistenz:rw']
 		]);
 
 		// Load Phrases
@@ -66,7 +67,7 @@ class Documents extends FHCAPI_Controller
 	}
 
 	/**
-	 * Download a not signed document.
+	 * Archive a not signed document.
 	 *
 	 * @param string				$xml (optional)
 	 * @param string				$xsl (optional)
@@ -79,7 +80,7 @@ class Documents extends FHCAPI_Controller
 	}
 
 	/**
-	 * Download a signed document.
+	 * Archive a signed document.
 	 *
 	 * @param string				$xml (optional)
 	 * @param string				$xsl (optional)
@@ -91,6 +92,42 @@ class Documents extends FHCAPI_Controller
 		return $this->_archive($xml, $xsl, getAuthUID());
 	}
 
+	/**
+	 *
+	 * @return void
+	 */
+	public function download($xml, $xsl, $sign_user = null)
+	{
+		$akteExportData = $this->_getAkteExportData($xml, $xsl, $sign_user);
+
+		$akteData = $akteData['akteData'];
+		$exportData = $akteData['exportData'];
+
+		/**
+		 *				[
+					'vorlage' => $vorlage,
+					'xml_data' => $data,
+					'oe_kurzbz' => $xsl_oe_kurzbz,
+					'version' => $version,
+					'outputformat' => $outputformat,
+					'sign_user' => $sign_user
+				]
+		 */
+
+		// Output
+		$result = $this->documentexportlib->showContent(
+			$akteData['akteData']['inhalt'],
+			$exportData['vorlage'],
+			$exportData['xml_data'],
+			$exportData['oe_kurzbz'],
+			$exportData['version'],
+			$exportData['outputformat'],
+			$exportData['sign_user']
+		);
+
+		$this->terminateWithSuccess(true);
+	}
+
 	/**
 	 * Helper function for archive() and archiveSigned()
 	 *
@@ -100,16 +137,34 @@ class Documents extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	public function _archive($xml, $xsl, $sign_user = null)
+	private function _archive($xml, $xsl, $sign_user = null)
+	{
+		$akteData = $this->_getAkteExportData($xml, $xsl, $sign_user);
+
+		$this->load->model('crm/Akte_model', 'AkteModel');
+		$result = $this->AkteModel->insert($akteData['akteData']);
+		$this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(true);
+	}
+
+	/**
+	 * 
+	 * @param
+	 * @return object success or error
+	 */
+	private function _getAkteExportData($xml, $xsl, $sign_user = null)
 	{
 		if (!$xml || !$xsl) {
 			$this->load->library('form_validation');
 			if (!$xml) {
 				$xml = $this->input->post_get('xml');
+				$this->addMeta('xml', $xml);
 				$this->form_validation->set_rules('xml', 'xml', 'required');
 			}
 			if (!$xsl) {
 				$xsl = $this->input->post_get('xsl');
+				$this->addMeta('xsl', $xsl);
 				$this->form_validation->set_rules('xsl', 'xsl', 'required');
 			}
 
@@ -151,6 +206,7 @@ class Documents extends FHCAPI_Controller
 		$this->load->model('system/Vorlage_model', 'VorlageModel');
 
 		$result = $this->VorlageModel->load($xsl);
+		$this->addMeta("ress", $result);
 		$vorlage = current($this->getDataOrTerminateWithError($result));
 		if (!$vorlage)
 			show_404();
@@ -171,6 +227,7 @@ class Documents extends FHCAPI_Controller
 		$studiengang_kz = null;
 		if ($akteData['uid']) {
 			$this->load->model('crm/Student_model', 'StudentModel');
+			$this->StudentModel->addSelect('tbl_student.*, UPPER(typ || kurzbz) AS kuerzel');
 			$this->StudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
 			$result = $this->StudentModel->load([$akteData['uid']]);
 			$student = current($this->getDataOrTerminateWithError($result));
@@ -318,6 +375,7 @@ class Documents extends FHCAPI_Controller
 
 			$result = $this->VorlagestudiengangModel->getCurrent($xsl, $xsl_oe_kurzbz, $version);
 			$access_rights = current($this->getDataOrTerminateWithError($result));
+			// TODO: was bedeutet wenn keine berechtigung?
 			if (!$access_rights || !$access_rights->berechtigung)
 				return show_404();
 			
@@ -413,10 +471,17 @@ class Documents extends FHCAPI_Controller
 		$akteData['titel'] .= '.pdf';
 		$akteData['inhalt'] = base64_encode($content);
 
-		$this->load->model('crm/Akte_model', 'AkteModel');
-		$result = $this->AkteModel->insert($akteData);
-		$this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(true);
+		return [
+			'akteData' => $akteData,
+			'exportData' =>
+				[
+					'vorlage' => $vorlage,
+					'xml_data' => $data,
+					'oe_kurzbz' => $xsl_oe_kurzbz,
+					'version' => $version,
+					'outputformat' => $outputformat,
+					'sign_user' => $sign_user
+				]
+		];
 	}
 }
diff --git a/application/controllers/api/frontend/v1/stv/Archiv.php b/application/controllers/api/frontend/v1/stv/Archiv.php
new file mode 100644
index 000000000..dc93c2c4c
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Archiv.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+use CI3_Events as Events;
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * Provides data to the ajax get calls about archive documents
+ * Listens to ajax post calls to change the archive documents
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Archiv extends FHCAPI_Controller
+{
+	/**
+	 * Calls the parent's constructor and prepares libraries and phrases
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'get' => ['admin:r', 'assistenz:r'],
+			'getArchivVorlagen' => ['admin:r', 'assistenz:r'],
+			'archive' => ['admin:w', 'assistenz:w'],
+			'download' => ['admin:w', 'assistenz:w'],
+			//'update' => ['admin:w', 'assistenz:w'],
+			'delete' => ['admin:w', 'assistenz:w']
+		]);
+
+		// Load models
+		$this->load->model('crm/Akte_model', 'AkteModel');
+		$this->load->model('system/Vorlage_model', 'VorlageModel');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'archiv'
+		]);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Get archive documents for a person
+	 
+	 * @return void
+	 */
+	public function get()
+	{
+		$person_id = $this->input->post('person_id');
+
+		$this->load->library('form_validation');
+
+		if (!$person_id || !is_array($person_id))
+		{
+			$this->form_validation->set_rules('person_id', 'Person ID', 'required');
+
+			if (!$this->form_validation->run())
+				$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$result = $this->AkteModel->getArchiv($person_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * Get Vorlagen for archiving documents
+	 * @return void
+	 */
+	public function getArchivVorlagen()
+	{
+		$result = $this->VorlageModel->getArchivVorlagen();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * 
+	 * @param
+	 * @return object success or error
+	 */
+	public function download()
+	{
+		$akte_id = $this->input->get('akte_id');
+
+		if (!is_numeric($akte_id)) $this->terminateWithError('akte Id missing');
+
+		$result = $this->AkteModel->load($akte_id);
+
+
+		if (!hasData($result)) $this->terminateWithError('Akte not found');
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$data = getData($result)[0];
+		//$this->addMeta("daa", $data->inhalt);
+
+		$fileObj = new stdClass();
+		if (isset($data->inhalt) && $data->inhalt != '')
+		{
+			// Define handle to output stream
+			$tmpFilePointer   = fopen("php://output", 'w');
+			$meta_data = stream_get_meta_data($tmpFilePointer);
+			$filename = $meta_data["uri"];
+			fwrite($tmpFilePointer, $data->inhalt);
+
+			header('Content-Description: File Transfer');
+			header('Content-Type: '. $data->mimetype);
+			header('Expires: 0');
+			header('Cache-Control: must-revalidate');
+			header('Pragma: public');
+			//header('Content-Length: ' . filesize($fileObj->file));
+			//header("Content-type: $data->mimetype");
+			header('Content-Disposition: attachment; filename="'.$data->titel.'"');
+			readfile($filename);
+			//echo base64_decode($data->inhalt);
+			die();
+			//~ $fileObj->file = $data->inhalt;
+			//~ $fileObj->name = $data->titel;
+			//~ $fileObj->mimetype = $data->mimetype;
+			//~ $fileObj->disposition = 'attachment';
+		}
+		else
+		{
+			$this->load->library('AkteLib');
+
+			$result = $this->aktelib->get($akte_id);
+		}
+
+		/*	 * 	$fileObj->filename
+	 * 	$fileObj->file
+	 * 	$fileObj->name
+	 * 	$fileObj->mimetype
+	 * 	$fileObj->disposition*/
+	}
+
+
+	/**
+	 * Delete archived Akte
+	 *
+	 * @return void
+	 */
+	public function delete()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('akte_id', 'Akte ID', 'required');
+		$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'has_permissions_for_stg[admin:rw,assistenz:rw]');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$akte_id = $this->input->post('akte_id');
+
+		$result = $this->AkteModel->load($akte_id);
+
+		if (!hasData($result))
+		{
+			$this->terminateWithError($this->p->t('archiv', 'error_missing', [
+				'akte_id' => $akte_id
+			]));
+		}
+
+		$result = getData($result)[0];
+
+		if ($result->dokument_kurzbz == 'Ausbvert'
+				&& isset($result->akzeptiertamum)
+				&& !isEmptyString($result->akzeptiertamum)
+				&& !has_permissions_for_stg($this->input->post('studiengang_kz'), 'admin:rw')
+		)
+		{
+			$this->terminateWithError($this->p->t('archiv', 'nur_admins_loschen_ausbildungsvertraege', [
+				'akte_id' => $akte_id
+			]));
+		}
+		
+		$result = $this->AkteModel->delete($akte_id);
+		if (isError($result)) $this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess();
+	}
+}
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index c77ebc07b..2cc2228c9 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -91,6 +91,7 @@ class Config extends FHCAPI_Controller
 			'title' => $this->p->t('stv', 'tab_resources'),
 			'component' => './Stv/Studentenverwaltung/Details/Betriebsmittel.js'
 		];
+		/* TODO(chris): Ausgeblendet für Testing
 		$result['grades'] = [
 			'title' => $this->p->t('stv', 'tab_grades'),
 			'component' => './Stv/Studentenverwaltung/Details/Noten.js',
@@ -103,7 +104,14 @@ class Config extends FHCAPI_Controller
 				'documentslist' => $this->gradesDocumentsList()
 			]
 		];
-		
+		*/
+		$result['archive'] = [
+			'title' => $this->p->t('stv', 'tab_archive'),
+			'component' => './Stv/Studentenverwaltung/Details/Archiv.js'
+			//~ 'config' => [
+				//~ //'columns' => $this->kontoColumns()
+			//~ ]
+		];
 
 		Events::trigger('stv_conf_student', function & () use (&$result) {
 			return $result;
@@ -138,6 +146,13 @@ class Config extends FHCAPI_Controller
 				'changeStatusToAbsolvent' => $this->permissionlib->isBerechtigt('admin')
 			]
 		];
+		$result['archive'] = [
+			'title' => $this->p->t('stv', 'tab_archive'),
+			'component' => './Stv/Studentenverwaltung/Details/Archiv.js'
+			//~ 'config' => [
+				//~ //'columns' => $this->kontoColumns()
+			//~ ]
+		];
 
 		Events::trigger('stv_conf_students', function & () use (&$result) {
 			return $result;
diff --git a/application/models/crm/Akte_model.php b/application/models/crm/Akte_model.php
index 57b6e0665..2fa69d5b0 100644
--- a/application/models/crm/Akte_model.php
+++ b/application/models/crm/Akte_model.php
@@ -195,9 +195,9 @@ class Akte_model extends DB_Model
 	}
 
 	/**
-	 * Liefert die Archivdokumente einer Person
+	 * Liefert die Archivdokumente einer Person/mehrerer Personen
 	 *
-	 * @param integer				$person_id
+	 * @param integer/array				$person_id
 	 * @param boolean|null			$signiert			Wenn true werden nur Dokumente geliefert die digital signiert wurden.
 	 * @param boolean|null			$stud_selfservice	Wenn true werden nur Dokumente geliefert die Studierende selbst herunterladen duerfen.
 	 *
@@ -237,10 +237,14 @@ class Akte_model extends DB_Model
 		if ($stud_selfservice !== null)
 			$this->db->where('stud_selfservice', (boolean)$stud_selfservice);
 
+		if (is_array($person_id))
+			$this->db->where_in('person_id', $person_id);
+		else
+			$this->db->where('person_id', $person_id);
+
 		$this->addOrder('erstelltam', 'DESC');
 
 		return $this->loadWhere([
-			'person_id' => $person_id,
 			'archiv' => true
 		]);
 	}
diff --git a/application/models/system/Vorlage_model.php b/application/models/system/Vorlage_model.php
index 8022e71fc..d36eedba3 100644
--- a/application/models/system/Vorlage_model.php
+++ b/application/models/system/Vorlage_model.php
@@ -13,7 +13,7 @@ class Vorlage_model extends DB_Model
 	}
 
 	/**
-	 * Returns mume types
+	 * Returns mime types
 	 */
 	public function getMimeTypes()
 	{
@@ -21,4 +21,14 @@ class Vorlage_model extends DB_Model
 
 		return $this->execQuery($query);
 	}
+
+	/**
+	 * Returns all Vorlagen for archive
+	 */
+	public function getArchivVorlagen()
+	{
+		$query ="SELECT * FROM public.tbl_vorlage WHERE archivierbar=true ORDER BY bezeichnung";
+
+		return $this->execQuery($query);
+	}
 }
diff --git a/public/js/api/stv.js b/public/js/api/stv.js
index 9a2f08f1d..b0f96415b 100644
--- a/public/js/api/stv.js
+++ b/public/js/api/stv.js
@@ -3,6 +3,7 @@ import students from './stv/students.js';
 import filter from './stv/filter.js';
 import konto from './stv/konto.js';
 import grades from './stv/grades.js';
+import archiv from './stv/archiv.js';
 
 export default {
 	verband,
@@ -10,6 +11,7 @@ export default {
 	filter,
 	konto,
 	grades,
+	archiv,
 	configStudent() {
 		return this.$fhcApi.get('api/frontend/v1/stv/config/student');
 	},
diff --git a/public/js/api/stv/archiv.js b/public/js/api/stv/archiv.js
new file mode 100644
index 000000000..0f303684b
--- /dev/null
+++ b/public/js/api/stv/archiv.js
@@ -0,0 +1,30 @@
+export default {
+	tabulatorConfig(config, self) {
+		config.ajaxURL = 'api/frontend/v1/stv/archiv/get';
+		config.ajaxParams = () => {
+			const params = {
+				person_id: self.modelValue.person_id || self.modelValue.map(e => e.person_id)
+			};
+			return params;
+		};
+		config.ajaxRequestFunc = (url, config, params) => this.$fhcApi.post(url, params, config);
+		config.ajaxResponse = (url, params, response) => response.data;
+
+		return config;
+	},
+	getArchivVorlagen() {
+		return this.$fhcApi.post('api/frontend/v1/stv/archiv/getArchivVorlagen');
+	},
+	archive(data) {
+		return this.$fhcApi.post(
+			'api/frontend/v1/documents/archiveSigned',
+			data
+		);
+	},
+	//~ edit(data) {
+		//~ return this.$fhcApi.post('api/frontend/v1/stv/konto/update', data);
+	//~ },
+	delete({akte_id, studiengang_kz}) {
+		return this.$fhcApi.post('api/frontend/v1/stv/archiv/delete', {akte_id, studiengang_kz});
+	}
+};
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
new file mode 100644
index 000000000..7858dbd5e
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -0,0 +1,241 @@
+import {CoreFilterCmpt} from "../../../filter/Filter.js";
+import FormInput from "../../../Form/Input.js";
+//~ import KontoNew from "./Konto/New.js";
+//~ import KontoEdit from "./Konto/Edit.js";
+
+export default {
+	components: {
+		CoreFilterCmpt,
+		FormInput
+		//~ KontoNew,
+		//~ KontoEdit
+	},
+	inject: {
+		defaultSemester: {
+			from: 'defaultSemester'
+		}
+	},
+	props: {
+		modelValue: Object,
+		config: {
+			type: Object,
+			default: {}
+		}
+	},
+	data() {
+		return {
+			loading: false,
+			vorlage_kurzbz: '',
+			vorlagenArchiv: [],
+			vorlageXmlXslMappings: {
+				'zeugnis.rdf.php': [
+						'Zeugnis',
+						'ZeugnisEng'
+				],
+				'abschlusspruefung.rdf.php': [
+						'PrProtokollBakk',
+						'PrProtBakkEng',
+						'PrProtBA',
+						'PrProtBAEng',
+						'PrProtokollDipl',
+						'PrProtDiplEng',
+						'PrProtMA',
+						'PrProtMAEng',
+						'Bescheid',
+						'BescheidEng',
+						'Bakkurkunde',
+						'BakkurkundeEng',
+						'Diplomurkunde',
+						'DiplomurkundeEng',
+				],
+				'diplomasupplement.xml.php': [
+						'DiplSupplement',
+						'SZeugnis'
+				],
+				'studienblatt.xml.php': [
+						'Studienblatt',
+						'StudienblattEng'
+				],
+				'ausbildungsvertrag.xml.php': [
+						'Ausbildungsver',
+						'AusbVerEng'
+				],
+				'abschlussdokument_lehrgaenge.xml.php': [
+						'AbschlussdokumentLehrgaenge'
+				]
+			}
+			//studiengang_kz: false
+		};
+	},
+	computed: {
+		//~ personIds() {
+			//~ if (this.modelValue.person_id)
+				//~ return [this.modelValue.person_id];
+			//~ return this.modelValue.map(e => e.person_id);
+		//~ },
+		tabulatorColumns() {
+			const columns = [
+				{title: "Akte Id", field: "akte_id", visible: false},
+				{title: "Titel", field: "titel"},
+				{title: "Bezeichnung", field: "bezeichnung"},
+				{title: "Erstelldatum", field: "erstelltam"},
+				{title: "Signiert", field: "erstelltam"},
+				{title: "Selfservice", field: "signiert"},
+				{title: "AkzeptiertAmUm", field: "akzeptiertamum"},
+				{title: "Gedruckt", field: "gedruckt", visible: false},
+				{
+					title: 'Aktionen', field: 'actions',
+					formatter: (cell, formatterParams, onRendered) => {
+						let container = document.createElement('div');
+						container.className = "d-flex gap-2";
+
+						//~ let button = document.createElement('button');
+						//~ button.className = 'btn btn-outline-secondary';
+						//~ button.innerHTML = '<i class="fa fa-edit"></i>';
+						//~ button.addEventListener('click', () =>
+							//~ this.$refs.edit.open(cell.getData())
+						//~ );
+						//~ container.append(button);
+
+						let button = document.createElement('button');
+						button.className = 'btn btn-outline-secondary';
+						button.innerHTML = '<i class="fa fa-trash"></i>';
+						button.addEventListener('click', evt => {
+							evt.stopPropagation();
+							this.$fhcAlert
+								.confirmDelete()
+								.then(result => result ? {akte_id: cell.getData().akte_id, studiengang_kz: this.modelValue.studiengang_kz} : Promise.reject({handled:true}))
+								.then(this.$fhcApi.factory.stv.archiv.delete)
+								.then(() => {
+									//cell.getRow().delete();
+									this.reload();
+								})
+								.catch(this.$fhcAlert.handleSystemError);
+						});
+						container.append(button);
+
+						return container;
+					},
+					minWidth: 150, // Ensures Action-buttons will be always fully displayed
+					maxWidth: 150,
+					frozen: true
+				}
+			];
+			return Object.values(columns);
+		},
+		tabulatorOptions() {
+			return this.$fhcApi.factory.stv.archiv.tabulatorConfig({
+				layout:"fitDataTable",
+				columns: this.tabulatorColumns,
+				//selectable: true,
+				//selectableRangeMode: 'click',
+				index: 'akte_id',
+				persistenceID: 'stv-details-archiv'
+			}, this);
+		},
+		tabulatorEvents() {
+			const events = [
+				{
+					event: "rowDblClick",
+					handler: (e, row) => {
+						this.actionDownload(row.getData().akte_id);
+					}
+				}
+			];
+
+			return events;
+		}
+	},
+	watch: {
+		modelValue() {
+			this.$refs.table.reloadTable();
+		}
+	},
+	methods: {
+		reload() {
+			this.$refs.table.reloadTable();
+		},
+		updateData(data) {
+			if (!data)
+				return this.reload();
+			// TODO(chris): check children (!delete?, multiple children)
+			//this.$refs.table.tabulator.updateOrAddData(data.map(row => row.buchungsnr_verweis ? {buchungsnr:row.buchungsnr_verweis, _children:row} : row));
+			this.$refs.table.tabulator.updateOrAddData(data);
+		},
+		actionArchive() {
+			this.loading = true;
+			this.$fhcApi
+				.factory.stv.archiv.archive({
+					xml: this.getXmlByXsl(this.vorlage_kurzbz),
+					xsl: this.vorlage_kurzbz,
+					ss: this.defaultSemester,
+					uid: this.modelValue.uid,
+					prestudent_id: this.modelValue.prestudent_id
+				})
+				.then(result => result.data)
+				.then(() => {
+					this.reload();
+					this.loading = false;
+				})
+				.then(() => this.$p.t('ui/gespeichert'))
+				.then(this.$fhcAlert.alertSuccess)
+				.catch(error => {
+					this.$fhcAlert.handleSystemError(error);
+					this.loading = false;
+				});
+		},
+		actionDownload(akte_id) {
+			window.open(
+				FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/api/frontend/v1/stv/archiv/download?akte_id=' + encodeURIComponent(akte_id),
+				'_blank'
+			);
+		},
+		getXmlByXsl(xsl) {
+			for (let xml in this.vorlageXmlXslMappings) {
+				let xslArr = this.vorlageXmlXslMappings[xml];
+
+				if (xslArr.includes(xsl)) return xml;
+			}
+			return null;
+		}
+	},
+	created() {
+		this.$fhcApi
+			.factory.stv.archiv.getArchivVorlagen()
+			.then(result => {this.vorlagenArchiv = result.data; this.vorlage_kurzbz = result.data.length > 0 ? result.data[0].vorlage_kurzbz : '';})
+			.catch(this.$fhcAlert.handleSystemError);
+
+	},
+	template: `
+	<div class="stv-details-konto h-100 d-flex flex-column">
+		<core-filter-cmpt
+			ref="table"
+			table-only
+			:side-menu="false"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			reload
+			>
+			<template #actions>
+				<div class="input-group w-auto">
+					<select class="form-select" v-model="vorlage_kurzbz">
+						<option v-for="vorlage in vorlagenArchiv" :key="vorlage.vorlage_kurzbz" :value="vorlage.vorlage_kurzbz">
+							{{ vorlage.bezeichnung }}
+						</option>
+					</select>
+					<button
+						class="btn btn-primary"
+						@click="actionArchive()"
+						:disabled="loading"
+						>
+						<i v-if="loading" class="fa fa-spinner fa-spin"></i>
+						{{ $p.t('stv/archiv_dokument_archivieren') }}
+					</button>
+				</div>
+			</template>
+		</core-filter-cmpt>
+	</div>`
+};
+		//~ <konto-new ref="new" :config="config" @saved="updateData" :person-ids="personIds" :stg-kz="stg_kz"></konto-new>
+		//~ <konto-edit ref="edit" :config="config" @saved="updateData"></konto-edit>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 72572b317..846b07f10 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -38181,6 +38181,46 @@ array(
 				'insertvon' => 'system'
 			)
 		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_dokument_archivieren',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokument archivieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Archive document',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_archive',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Archiv',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Archive',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
 	)
 );
 

From ebbec03de40f8daa1a3f8a11424b415e57dd70c6 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 21 Feb 2025 14:21:38 +0100
Subject: [PATCH 031/572] feature(Calendar Moodle): adds moodle svg and adopts
 month page view for moodle events

---
 public/css/components/calendar.css            | 41 ++++++++--
 public/js/components/Calendar/Day/Page.js     | 76 ++++++++++---------
 public/js/components/Calendar/Month/Page.js   | 10 +--
 public/js/components/Calendar/Week.js         |  2 +-
 public/js/components/Calendar/Week/Page.js    | 37 +++++++--
 .../components/Cis/Stundenplan/Stundenplan.js | 25 +++---
 public/js/helpers/moodleSVG.js                |  5 ++
 7 files changed, 131 insertions(+), 65 deletions(-)
 create mode 100644 public/js/helpers/moodleSVG.js

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 3e6eeb3e2..0cc0b8533 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -69,25 +69,43 @@
   display: grid;
 }
 
-.all-day-event-border{
+.fhc-calendar-week-page .all-day-event-border{
 	box-shadow: 1px 1px 0 #dee2e6;
 }
 
-.all-day-event{
+.fhc-calendar-week-page .all-day-event{
 	max-height: 75px;
 	overflow:scroll;
 }
 
-.all-day-event-container{
+.fhc-calendar-week-page .all-day-event-container{
 	position: sticky;
 	top: 44px;
 	display:grid;
 	grid-template-columns:repeat(7,1fr);
 	width:100%;
-	box-shadow: 0px 1px 0px #dee2e6;
 	z-index:3;
 }
 
+.fhc-calendar-day-page .all-day-event-border {
+	box-shadow: 1px 1px 0 #dee2e6;
+}
+
+.fhc-calendar-day-page .all-day-event {
+	grid-column:2;
+	max-height: 75px;
+	overflow: scroll;
+}
+
+.fhc-calendar-day-page .all-day-event-container {
+	position: sticky;
+	top:0;
+	display: grid;
+	grid-template-columns: 3em 1fr;
+	width: 100%;
+	z-index: 3;
+}
+
 /* grid hour lines of the Stundenplan use box-shadow instead of border because box-shadow renders consistently on different viewports*/
 .box-shadow-border{
 	box-shadow: 0 0 0 1px #dee2e6 !important;
@@ -113,8 +131,6 @@
   min-height: 0;
 }
 .fhc-calendar-day-page > div {
-  /*transform: translate(-0.75em, -0.75em);*/
-  /*width: calc(100% + 1.5em);*/
   height: calc(100% + 1.5em);
 }
 .fhc-calendar-day-page .flex-column > .flex-grow-1 {
@@ -126,7 +142,6 @@
 .fhc-calendar-day-page .events {
   display: grid;
   grid-template-columns: 3em 1fr;
-  /*min-height: 266.6666666667%;*/
 }
 .fhc-calendar-day-page .events .day {
   gap: 1px;
@@ -222,7 +237,19 @@
 }
 
 .fhc-highlight-day {
+	position:relative;
+}
+
+.fhc-highlight-day::before {
+	content:'';
+	position:absolute;
+	top:0;
+	bottom:0;
+	left:0;
+	right:0;
 	box-shadow: inset 0 0 0 2px black !important;
+	pointer-events: none;
+	z-index: 2;
 }
 
 .fhc-calendar-sm .fhc-calendar-month-page-day.active .no,
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 679086885..01cbd8ba9 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -61,13 +61,13 @@ export default {
 			},
 			immediate: true,
 		},
-		eventsPerDayAndHour: {
+		events: {
 			handler(newEvents) {
 				// if no event is selected, select the first event of the day
-				if (this.selectedEvent == null && newEvents[this.day.toDateString()]?.events.length > 0) {
-					let events = newEvents[this.day.toDateString()]?.events;
+				if (this.selectedEvent == null && newEvents[this.day.toDateString()].length > 0) {
+					let events = newEvents[this.day.toDateString()];
 					if (Array.isArray(events) && events.length > 0) {
-						this.setSelectedEvent(events[0].orig);
+						this.setSelectedEvent(events[0]);
 					}
 				}
 			},
@@ -298,8 +298,8 @@ export default {
 			this.$emit('input', event);
 		},
 		calcHourPosition(event) {
-			let height = this.$refs.eventcontainer.getBoundingClientRect().height;
-			let top = this.$refs.eventcontainer.getBoundingClientRect().top;
+			let height = this.$refs.events.getBoundingClientRect().height;
+			let top = this.$refs.events.getBoundingClientRect().top;
 			let position = event.clientY - top;
 			// position percentage of total height
 			let timePercentage = (position / height) * 100;
@@ -365,35 +365,18 @@ export default {
 					</div>
 					<div id="scroll g-0" style="height: 100%; overflow-y: scroll;">
 
-						<div ref="eventcontainer" class="position-relative flex-grow-1" @mousemove="calcHourPosition" @mouseleave="hourPosition = null" >
-							<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border" :style="hourGridStyle(hour)"></div>
+						<div ref="eventcontainer" class="position-relative flex-grow-1"  >
+							<div class="all-day-event-container" >
+								<div class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
+									<template v-for="(events,_day) in allDayEvents" :key="_day">
 
-							<Transition>
-								<div v-if="hourPosition && !noEventsCondition" class="position-absolute border-top small"  :style="indicatorStyle">
-									<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
-								</div>
-							</Transition>
-							<Transition>
-								<div v-if="lookingAtToday && !noEventsCondition" class="position-absolute border-top small"  :style="curIndicatorStyle">
-									<span class="border border-top-0 px-2 bg-white">{{curTime}}</span>
-								</div>
-							</Transition>
-							<div>
-								<h1 v-if="noEventsCondition" class="m-0 text-secondary" ref="noEventsText" :style="noLvStyle">Keine Lehrveranstaltungen</h1>
-								<div :class="{'fhc-calendar-no-events-overlay':noEventsCondition, 'events':true}">
-									<div class="hours">
-										<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
-									</div>
-									<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start" :style="dayGridStyle(day)">
-										<div class="position-absolute w-100" style="top:0; bottom:0;">
-											<div class="position-sticky d-grid " style="top:0;" v-for="(events,_day) in allDayEvents" :key="day">
-												<div v-if="dayindex == _day" v-for="event in events" :key="event" @click.prevent="eventClick(event)"
-													:selected="event == selectedEvent"
-													:style="{'background-color': event?.color, 'z-index':2, 'margin-bottom':'1px'}"
-													class="small rounded overflow-hidden fhc-entry"
-													v-contrast
-													>
-													<div class="d-none d-xl-block">
+									<div v-if="dayindex == _day" v-for="event in events" :key="event" class="d-grid m-1" style="top:0;" @click.prevent="eventClick(event)"
+												:selected="event == selectedEvent"
+												:style="{'background-color': event?.color, 'margin-bottom':'1px'}"
+												class="small rounded overflow-hidden fhc-entry"
+												v-contrast
+												>
+												<div class="d-none d-xl-block">
 														<slot name="dayPage" :event="event" :day="day" :mobile="false">
 															<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 														</slot>
@@ -403,9 +386,32 @@ export default {
 															<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 														</slot>
 													</div>
-												</div>
 											</div>
+										</template>
+								</div>
+							</div>
+
+
+
+							<div >
+								<h1 v-if="noEventsCondition" class="m-0 text-secondary" ref="noEventsText" :style="noLvStyle">Keine Lehrveranstaltungen</h1>
+								<div class="events position-relative" :class="{'fhc-calendar-no-events-overlay':noEventsCondition}" ref="events" @mousemove="calcHourPosition" @mouseleave="hourPosition = null">
+									<Transition>
+										<div v-if="hourPosition && !noEventsCondition" class="position-absolute border-top small"  :style="indicatorStyle">
+											<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
 										</div>
+									</Transition>
+									<Transition>
+										<div v-if="lookingAtToday && !noEventsCondition" class="position-absolute border-top small"  :style="curIndicatorStyle">
+											<span class="border border-top-0 px-2 bg-white">{{curTime}}</span>
+										</div>
+									</Transition>
+									<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border" :style="hourGridStyle(hour)"></div>
+									<div class="hours">
+										<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
+									</div>
+									<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start" :style="dayGridStyle(day)">
+										
 										<div v-if="lookingAtToday && !noEventsCondition" :style="overlayStyle"></div>
 										<div v-for="event in day.events" :key="event" :style="eventGridStyle(day,event)" v-contrast :selected="event.orig == selectedEvent" class="fhc-entry mx-2 small rounded overflow-hidden " >
 											<!-- desktop version of the page template, parent receives slotProp mobile = false -->
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 04e3a8e64..896be61bc 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -138,15 +138,15 @@ export default {
 		<div v-for="day in weeks[0].days" :key="day" class="bg-light fw-bold border-top border-bottom text-center">
 			{{dayText[day]}}
 		</div>
-		<template v-for="week in weeks" 
+		<template v-for="week in weeks"
 		:key="week.no">
 			<a href="#" v-if="showWeeks" class="fhc-calendar-month-page-weekday text-decoration-none text-end opacity-25"
 			@click.prevent="changeToWeek(week)">{{week.no}}</a>
-			<a href="#" 
-			@click.prevent="clickEvent(day,week)" 
-			@mouseover="highlight(week,day)" 
+			<a href="#"
+			@click.prevent="clickEvent(day,week)"
+			@mouseover="highlight(week,day)"
 			@mouseleave="highlightedWeek = null; highlightedDay = null"
-			v-for="day in week.days" 
+			v-for="day in week.days"
 			:key="day"
 			:class="getDayClass(week, day)" 
 			>
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
index 9a42f9659..858af0733 100644
--- a/public/js/components/Calendar/Week.js
+++ b/public/js/components/Calendar/Week.js
@@ -46,7 +46,7 @@ export default {
 			</template>
 		</calendar-header>
 		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
-			<calendar-week-page :year="focusDate.wYear" :week="focusDate.w+slot.offset" @updateMode="$emit('updateMode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" >
+			<calendar-week-page :active="slot.active" :year="focusDate.wYear" :week="focusDate.w+slot.offset" @updateMode="$emit('updateMode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" >
 				<template #weekPage="{event,day}">
 					<slot name="weekPage" :event="event" :day="day" ></slot>
 				</template>
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index b4ee7626c..86db5947e 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -11,6 +11,7 @@ export default {
 			hourPositionTime:null,
 			resizeObserver: null,
 			width: 0,
+			scrollContainer: null,
 		}
 	},
 	inject: [
@@ -27,7 +28,8 @@ export default {
 	],
 	props: {
 		year: Number,
-		week: Number
+		week: Number,
+		active: Boolean
 	},
 	emits: [
 		'updateMode',
@@ -35,6 +37,23 @@ export default {
 		'page:forward',
 		'input',
 	],
+	watch: {
+		active: {
+			handler(value) {
+				const activeContainer = document.querySelector("#calendarContainer")
+				if(value){
+					Vue.nextTick(() => {
+						this.scrollContainer = activeContainer;
+						activeContainer.addEventListener('wheel', this.scrollFunction);
+					})
+				}else{
+					this.scrollContainer=null;
+					activeContainer?.removeEventListener('wheel', this.scrollFunction);
+				}
+			},
+			immediate: true,
+		}
+	},
 	computed: {
 		allDayEvents(){
 			let allDayEvents = {};
@@ -190,6 +209,10 @@ export default {
 		}
 	}, 
 	methods: {
+		scrollFunction(event){
+				event.preventDefault();
+				this.scrollContainer?.scrollBy({ top: Math.sign(event.deltaY) * 100, behavior: 'instant' });
+		},
 		hourGridIdentifier(hour) {
 			// this is the id attribute that is responsible to scroll the calender to the first event
 			return 'scroll' + hour + this.focusDate.d + this.week;
@@ -335,7 +358,7 @@ export default {
 			container.style['overflow-y'] = 'scroll'
 			container.style['overflow-x'] = 'auto'
 		}
-
+		
 		this.initResizeObserver();
 	},
 	beforeUnmount() {
@@ -350,12 +373,12 @@ export default {
 					<a href="#" class="small text-secondary text-decoration-none" >{{dayText[day]?.datum}}</a>
 				</div>
 			</div>
-			<div ref="eventcontainer" class="position-relative flex-grow-1" >
+			<div ref="eventcontainer" class="position-relative flex-grow-1"  >
 				<div class="all-day-event-container" >
 					<div class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
-						<div class="position-sticky d-grid mx-1" style="top:0;" v-for="(events,_day) in allDayEvents" :key="_day">
-						
-						<div v-if="dayindex == _day" v-for="event in events" :key="event" @click.prevent="weekPageClick(event, _day)"
+						<template v-for="(events,_day) in allDayEvents" :key="_day">
+
+						<div v-if="dayindex == _day" v-for="event in events" :key="event" class="d-grid m-1" style="top:0;" @click.prevent="weekPageClick(event, _day)"
 									:selected="event == selectedEvent"
 									:style="{'background-color': event?.color, 'margin-bottom':'1px'}"
 									class="small rounded overflow-hidden fhc-entry"
@@ -365,7 +388,7 @@ export default {
 										<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 									</slot>
 								</div>
-							</div>
+							</template>
 					</div>
 				</div>
 				<div class="events position-relative" :ref="'eventsRef'+week" @mousemove="calcHourPosition" @mouseleave="hourPosition = null">
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index b5ade9542..4b4879e29 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -3,6 +3,7 @@ import CalendarDate from "../../../composables/CalendarDate.js";
 import LvModal from "../Mylv/LvModal.js";
 import LvInfo from "../Mylv/LvInfo.js"
 import LvMenu from "../Mylv/LvMenu.js"
+import moodleSvg from "../../../helpers/moodleSVG.js"
 
 export const Stundenplan = {
 	name: 'Stundenplan',
@@ -36,7 +37,7 @@ export const Stundenplan = {
 		}
 	},
 	components: {
-		FhcCalendar, LvModal, LvMenu, LvInfo
+		FhcCalendar, LvModal, LvMenu, LvInfo, moodleSvg
 	},
 	computed:{
 		downloadLinks: function(){
@@ -221,9 +222,15 @@ export const Stundenplan = {
 			</div>
 		</template>
 		<template #monthPage="{event,day}">
-			<span class="fhc-entry" >
-				{{event.topic}}
-			</span>
+			<div class="p-1" v-if="event.type=='moodle'">
+				<div class="d-flex small w-100" >
+					<moodle-svg></moodle-svg>
+					<span class="flex-grow-1 text-center ">{{event.topic}}</span>
+				</div>
+			</div>
+			<div class="p-1" v-else>
+				<span>{{event.topic}}</span>
+			</div>
 		</template>
 		<template #weekPage="{event,day}">
 			<div @click="showModal(event); " type="button"
@@ -237,9 +244,7 @@ export const Stundenplan = {
 					</div>
 				</div>
 				<div v-if="event.type=='moodle'" class="d-flex small w-100" >
-					<span >
-						<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><radialGradient id="moodle-original-a" cx="532.855" cy="-537.557" r="209.76" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#FAAF40"/><stop offset=".043" stop-color="#F9A538"/><stop offset=".112" stop-color="#F89D31"/><stop offset=".227" stop-color="#F89A2F"/><stop offset=".528" stop-color="#F7922D"/><stop offset="1" stop-color="#F37B28"/></radialGradient><path fill="url(#moodle-original-a)" d="M106.259 105.754V66.975c0-8.164-3.397-12.244-10.034-12.244-6.629 0-10.034 4.08-10.034 12.244v38.779H66.294V66.975c0-8.164-3.228-12.244-9.862-12.244-6.633 0-10.036 4.08-10.036 12.244v38.779H26.667V64.768c0-8.504 2.891-14.801 8.844-19.223 5.102-3.91 12.246-5.777 20.92-5.777 9.015 0 15.478 2.207 19.727 6.801 3.57-4.594 10.207-6.801 19.897-6.801 8.844 0 15.819 1.867 20.922 5.777 5.951 4.422 8.843 10.719 8.843 19.223v41.152h-19.563v-.166z"/><path fill="#58595B" d="M28.539 49.627l-2.041 10.207c18.708 6.291 36.395.166 45.751-16.158-13.778-9.522-26.535.17-43.71 5.951"/><linearGradient id="moodle-original-b" gradientUnits="userSpaceOnUse" x1="324.268" y1="-509.952" x2="368.932" y2="-509.952" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#929497"/><stop offset=".124" stop-color="#757578"/><stop offset=".279" stop-color="#575658"/><stop offset=".44" stop-color="#403E3F"/><stop offset=".609" stop-color="#302D2E"/><stop offset=".788" stop-color="#262223"/><stop offset="1" stop-color="#231F20"/></linearGradient><path fill="url(#moodle-original-b)" d="M28.539 47.08c-.681 3.91-1.192 7.65-1.872 11.563 17.857 6.125 35.375.85 44.73-15.137-11.909-13.776-25.17-2.383-42.858 3.574"/><linearGradient id="moodle-original-c" gradientUnits="userSpaceOnUse" x1="332.834" y1="-495.051" x2="351.377" y2="-521.534" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#231F20"/><stop offset="1" stop-color="#231F20" stop-opacity="0"/></linearGradient><path fill="url(#moodle-original-c)" d="M49.799 51.668c-8.164-1.701-17.009 2.555-23.131 6.975-3.912-28.57 13.777-27.893 36.903-20.75-1.529 6.975-4.083 16.33-8.502 21.941-.169-3.744-1.869-6.293-5.27-8.166"/><linearGradient id="moodle-original-d" gradientUnits="userSpaceOnUse" x1="299.778" y1="-495.802" x2="381.412" y2="-495.802" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#929497"/><stop offset=".124" stop-color="#757578"/><stop offset=".279" stop-color="#575658"/><stop offset=".44" stop-color="#403E3F"/><stop offset=".609" stop-color="#302D2E"/><stop offset=".788" stop-color="#262223"/><stop offset="1" stop-color="#231F20"/></linearGradient><path fill="url(#moodle-original-d)" d="M2.178 47.08c29.932-18.031 46.77-21.43 81.634-25-40.478 31.969-41.499 25-81.634 25"/><path stroke="#4A4A4C" stroke-width=".5" fill="none" d="M83.812 22.246L51.667 45.545"/><path opacity=".23" fill="#231F20" d="M45.545 34.66c.34 3.744-.511-3.572 0 0"/><path stroke="#A8ABAD" stroke-width=".5" fill="none" d="M2.178 47.08l49.489-1.535"/><path stroke="#F16922" stroke-width=".5" d="M42.484 35.002C33.98 37.383 6.09 43.506 5.747 47.08c-.849 6.631-.167 17.176-.167 17.176" fill="none"/><path fill="#F16922" d="M8.131 89.596c-3.063-7.652-6.804-16.158-2.384-26.703C8.64 72.756 8.131 80.24 8.131 89.596"/><path fill="#6D6E70" d="M41.076 33.844c.708-.25 1.384-.17 1.509.184.126.355-.344.846-1.052 1.096-.709.256-1.384.172-1.51-.184-.127-.352.344-.844 1.053-1.096z"/></svg>
-					</span>
+					<moodle-svg></moodle-svg>
 					<span class="flex-grow-1 text-center">{{event.topic}}</span>
 				</div>
 				<div v-else class="d-flex flex-column flex-grow-1 align-items-center small">
@@ -252,8 +257,8 @@ export const Stundenplan = {
 		<template #dayPage="{event,day,mobile}">
 			<div @click="mobile? showModal(event):null" type="button" class="fhc-entry border border-secondary border m-0 h-100  text-center">
 				<template v-if="event.type=='moodle'">
-					<div class="d-flex align-items-center w-100" >
-						<span class="p-2">moodle:</span>
+					<div class="d-flex small align-items-center w-100 p-1" >
+						<moodle-svg></moodle-svg>
 						<span class="flex-grow-1 text-center">{{event.topic}}</span>
 					</div>
 				</template>
@@ -282,7 +287,7 @@ export const Stundenplan = {
 			</div>
 		</template>
 		<template #pageMobilContent="{lvMenu, event}">
-			<h3 >{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
+			<h3 >{{event.type=='moodle'?$p.t('lvinfo','Moodleinformationen'):$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
 			<div class="w-100">
 				<lv-info  :event="event" />
 			</div>
diff --git a/public/js/helpers/moodleSVG.js b/public/js/helpers/moodleSVG.js
new file mode 100644
index 000000000..679c9b1a6
--- /dev/null
+++ b/public/js/helpers/moodleSVG.js
@@ -0,0 +1,5 @@
+export default {
+	template:`
+		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 20 130 90" style="height:1.5em" ><radialGradient id="moodle-original-a" cx="532.855" cy="-537.557" r="209.76" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#FAAF40" /><stop offset=".043" stop-color="#F9A538" /><stop offset=".112" stop-color="#F89D31" /><stop offset=".227" stop-color="#F89A2F" /><stop offset=".528" stop-color="#F7922D" /><stop offset="1" stop-color="#F37B28" /></radialGradient><path fill="white" stroke="black" stroke-width="1" d="M106.259 105.754V66.975c0-8.164-3.397-12.244-10.034-12.244-6.629 0-10.034 4.08-10.034 12.244v38.779H66.294V66.975c0-8.164-3.228-12.244-9.862-12.244-6.633 0-10.036 4.08-10.036 12.244v38.779H26.667V64.768c0-8.504 2.891-14.801 8.844-19.223 5.102-3.91 12.246-5.777 20.92-5.777 9.015 0 15.478 2.207 19.727 6.801 3.57-4.594 10.207-6.801 19.897-6.801 8.844 0 15.819 1.867 20.922 5.777 5.951 4.422 8.843 10.719 8.843 19.223v41.152h-19.563v-.166z" /><path fill="black" d="M28.539 49.627l-2.041 10.207c18.708 6.291 36.395.166 45.751-16.158-13.778-9.522-26.535.17-43.71 5.951" /><linearGradient id="moodle-original-b" gradientUnits="userSpaceOnUse" x1="324.268" y1="-509.952" x2="368.932" y2="-509.952" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#929497" /><stop offset=".124" stop-color="#757578" /><stop offset=".279" stop-color="#575658" /><stop offset=".44" stop-color="#403E3F" /><stop offset=".609" stop-color="#302D2E" /><stop offset=".788" stop-color="#262223" /><stop offset="1" stop-color="#231F20" /></linearGradient><path fill="black" d="M28.539 47.08c-.681 3.91-1.192 7.65-1.872 11.563 17.857 6.125 35.375.85 44.73-15.137-11.909-13.776-25.17-2.383-42.858 3.574" /><linearGradient id="moodle-original-c" gradientUnits="userSpaceOnUse" x1="332.834" y1="-495.051" x2="351.377" y2="-521.534" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#231F20" /><stop offset="1" stop-color="#231F20" stop-opacity="0" /></linearGradient><path fill="none" d="M49.799 51.668c-8.164-1.701-17.009 2.555-23.131 6.975-3.912-28.57 13.777-27.893 36.903-20.75-1.529 6.975-4.083 16.33-8.502 21.941-.169-3.744-1.869-6.293-5.27-8.166" /><linearGradient id="moodle-original-d" gradientUnits="userSpaceOnUse" x1="299.778" y1="-495.802" x2="381.412" y2="-495.802" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#929497" /><stop offset=".124" stop-color="#757578" /><stop offset=".279" stop-color="#575658" /><stop offset=".44" stop-color="#403E3F" /><stop offset=".609" stop-color="#302D2E" /><stop offset=".788" stop-color="#262223" /><stop offset="1" stop-color="#231F20" /></linearGradient><path fill="black" d="M2.178 47.08c29.932-18.031 46.77-21.43 81.634-25-40.478 31.969-41.499 25-81.634 25" /><path stroke="#4A4A4C" stroke-width=".5" fill="black" d="M83.812 22.246L51.667 45.545" /><path opacity=".23" fill="black" d="M45.545 34.66c.34 3.744-.511-3.572 0 0" /><path stroke="#4A4A4C" stroke-width=".5" fill="black" d="M2.178 47.08l49.489-1.535" /><path stroke="#F16922" stroke-width=".5" d="M42.484 35.002C33.98 37.383 6.09 43.506 5.747 47.08c-.849 6.631-.167 17.176-.167 17.176" fill="none" /><path fill="#F16922" d="M8.131 89.596c-3.063-7.652-6.804-16.158-2.384-26.703C8.64 72.756 8.131 80.24 8.131 89.596" /><path fill="#6D6E70" d="M41.076 33.844c.708-.25 1.384-.17 1.509.184.126.355-.344.846-1.052 1.096-.709.256-1.384.172-1.51-.184-.127-.352.344-.844 1.053-1.096z" /></svg> 
+	`
+}

From 3c34b17d2d37dcc87489cdf26d478e44a01fbe33 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 21 Feb 2025 14:58:59 +0100
Subject: [PATCH 032/572] add Preview-logic, update function sendMessage

---
 .../api/frontend/v1/messages/Messages.php     |  96 +++-
 application/models/system/Message_model.php   |   1 -
 public/js/api/messages/person.js              |  12 +-
 .../components/Messages/Details/NewMessage.js | 411 +++++++++++-------
 .../Messages/Details/TableMessages.js         |  10 +-
 public/js/components/Messages/Messages.js     |  33 +-
 .../Studentenverwaltung/Details/Messages.js   |   2 +
 .../VorlagenDropdown/VorlagenDropdown.js      |   8 +-
 8 files changed, 368 insertions(+), 205 deletions(-)

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index ac107f687..788c8861e 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -17,10 +17,12 @@ class Messages extends FHCAPI_Controller
 			'sendMessage' => ['admin:r', 'assistenz:r'],
 			'deleteMessage' => ['admin:r', 'assistenz:r'],
 			'getVorlagentext' => ['admin:r', 'assistenz:r'],
+			'getPreviewText' => ['admin:r', 'assistenz:r'],
 		]);
 
 		//Load Models
 		$this->load->model('system/Message_model', 'MessageModel');
+		$this->load->model('CL/Messages_model', 'MessagesModel');
 
 		// Additional Permission Checks
 		//TODO(manu) check permissions
@@ -179,8 +181,7 @@ class Messages extends FHCAPI_Controller
 
 	public function sendMessage($recipient_id)
 	{
-		//TODO(manu) Problems with Vorlagen...
-		//TODO(Manu) Problems with VARS
+		//default setting
 		$receiversPersonId = $this->_getPersonIdFromUid($recipient_id);
 
 		$uid = getAuthUID();
@@ -201,35 +202,94 @@ class Messages extends FHCAPI_Controller
 			}
 		}
 
-		$subject = $this->input->post('subject');
+		$this->load->library('form_validation');
 
+		$this->form_validation->set_rules('subject', 'Betreff', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Betreff'])
+		]);
+
+		$this->form_validation->set_rules('body', 'Text', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Text'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$subject = $this->input->post('subject');
 		$body = $this->input->post('body');
 
-	//	$this->terminateWithError("rp_id " . $receiversPersonId, self::ERROR_TYPE_GENERAL);
 
-/*		$subject = $this->input->post('subject');
 
-		$formData = $this->input->post('data');*/
+		$typeId = $this->input->post('type_id');
+		$id = $this->input->post('id');
 
-		//$_POST['subject'] = $formData['subject'];
-	//	$subject = $formData['subject'];
-	//	$body = $formData['body'];
+		if($typeId == 'uid')
+		{
+			//$this->terminateWithError("uid ", self::ERROR_TYPE_GENERAL);
+			$prestudent_id = $this-> _getPrestudentIdFromUid($id);
 
-	//	$subject = isset($_POST['subject']) ? $_POST['subject'] : null;
-	//	$body = isset($_POST['body']) ? $_POST['body'] : null;
+			//parseMessagetext for variables Prestudent
+			$result = $this->MessagesModel->parseMessageTextPrestudent($prestudent_id, $body);
+			$bodyParsed = $this->getDataOrTerminateWithError($result);
+		}
+		elseif($typeId == 'person_id')
+		{
+			$this->terminateWithError("person_id ", self::ERROR_TYPE_GENERAL);
 
-	//	$this->terminateWithError("person_id " . $receiversPersonId, self::ERROR_TYPE_GENERAL);
+			$result = $this->MessagesModel->parseMessageTextPerson($id, $body);
+			$bodyParsed = $this->getDataOrTerminateWithError($result);
+		}
+		elseif($typeId == 'prestudent_id')
+		{
+			$this->terminateWithError("prestudent_id ", self::ERROR_TYPE_GENERAL);
 
-	//	$this->terminateWithError("subject " . $subject, self::ERROR_TYPE_GENERAL);
-	//	$this->terminateWithError("body " . $body, self::ERROR_TYPE_GENERAL);
+			$result = $this->MessagesModel->parseMessageTextPrestudent($id, $body);
+			$bodyParsed = $this->getDataOrTerminateWithError($result);
+		}
+		else
+		{
+			$this->terminateWithError("type_id " . $typeId . " not valid", self::ERROR_TYPE_GENERAL);
+		}
 
-	//	$this->terminateWithError("person_id " . $benutzer->person_id, self::ERROR_TYPE_GENERAL);
-	//	$this->terminateWithError("subject " . $subject, self::ERROR_TYPE_GENERAL);
-		$result = $this->messagelib->sendMessageUser($receiversPersonId, $subject, $body, $benutzer->person_id);
+		$result = $this->messagelib->sendMessageUser($receiversPersonId, $subject, $bodyParsed, $benutzer->person_id);
 
 		$this->terminateWithSuccess($result);
 	}
 
+	public function getPreviewText($id, $type_id)
+	{
+		if (isset($_POST['data']))
+		{
+			$data = json_decode($_POST['data']);
+			unset($_POST['data']);
+
+		}
+		else
+			$this->terminateWithError("Textbody missing ", self::ERROR_TYPE_GENERAL);
+
+		switch($type_id)
+		{
+			case 'uid':
+				$prestudent_id = $this->_getPrestudentIdFromUid($id);
+				$result = $this->MessagesModel->parseMessageTextPrestudent($prestudent_id, $data);
+
+				break;
+			case 'person_id':
+				$id = $id;
+				break;
+			default:
+				$this->terminateWithError("MESSAGES::getPreviewText logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
+				break;
+		}
+
+		//$this->terminateWithSuccess($result);
+		$bodyParsed = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($bodyParsed);
+	}
+
 	public function deleteMessage($messageId)
 	{
 		// Start DB transaction
@@ -238,6 +298,7 @@ class Messages extends FHCAPI_Controller
 		$result = $this->MessageModel->deleteMessageRecipient($messageId);
 		if (isError($result)) {
 			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 
 		$result = $this->MessageModel->deleteMessageStatus($messageId);
@@ -265,6 +326,7 @@ class Messages extends FHCAPI_Controller
 		$data = $this->getDataOrTerminateWithError($result);
 		$benutzer = current($data);
 
+		//return $data->person_id;
 		return $benutzer->person_id;
 	}
 
diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index 7ecb54a9e..0fdb39736 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -323,5 +323,4 @@ class Message_model extends DB_Model
 		return $this->execQuery($sql, array($message_id));
 	}
 	
-	
 }
diff --git a/public/js/api/messages/person.js b/public/js/api/messages/person.js
index 6a0ac8c7c..5cbb49550 100644
--- a/public/js/api/messages/person.js
+++ b/public/js/api/messages/person.js
@@ -20,13 +20,13 @@ export default {
 	getNameOfDefaultRecipient(params){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getNameOfDefaultRecipient/' + params.id + '/' + params.type_id);
 	},
+	getPreviewText(params, data){
+		return this.$fhcApi.post('api/frontend/v1/messages/messages/getPreviewText/' + params.id + '/' + params.type_id,
+			data);
+	},
 	sendMessage(form, id, data) {
-	console.log("factory " + id);
-		console.log(JSON.stringify(data));
-
-		return this.$fhcApi.post(form, 'api/frontend/v1/messages/messages/sendMessage/' + id,
-			data
-		);
+		return this.$fhcApi.post(form,'api/frontend/v1/messages/messages/sendMessage/' + id,
+			data);
 	},
 	deleteMessage(messageId){
 		return this.$fhcApi.post('api/frontend/v1/messages/messages/deleteMessage/' + messageId);
diff --git a/public/js/components/Messages/Details/NewMessage.js b/public/js/components/Messages/Details/NewMessage.js
index 2d85c8e00..c8aae2124 100644
--- a/public/js/components/Messages/Details/NewMessage.js
+++ b/public/js/components/Messages/Details/NewMessage.js
@@ -3,7 +3,6 @@ import FormInput from '../../Form/Input.js';
 import ListBox from "../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
 import DropdownComponent from '../../VorlagenDropdown/VorlagenDropdown.js';
 
-
 export default {
 	components: {
 		FormForm,
@@ -21,6 +20,7 @@ export default {
 			type: [Number, String],
 			required: true
 		},
+		openMode: String,
 	},
 	data(){
 		return {
@@ -45,12 +45,14 @@ export default {
 			itemsPrestudent: [],
 			itemsPerson: [],
 			itemsUser: [],
-			selectedFieldStudent: null,
+/*			selectedFieldStudent: null,
 			itemsStudent: [
 				{ label: "Variable 1", value: "var1" },
 				{ label: "Variable 2", value: "var2" },
 				{ label: "Variable 3", value: "var3" }
-			]
+			]*/
+			previewText: null,
+			previewBody: ""
 		}
 	},
 	methods: {
@@ -86,22 +88,35 @@ export default {
 		updateText(value) {
 			this.formData.body = value;
 		},
-		sendMessage(){
+		sendMessage() {
 			//TODO(Manu) check default recipient(s)
 			const data = new FormData();
+			const params = {
+					id: this.id,
+					type_id: this.typeId
+			};
+			const merged = {
+				...this.formData,
+				...params
+			};
+			data.append('data', JSON.stringify(merged));
 
-			data.append('data', JSON.stringify(this.formData));
-			return this.$fhcApi.factory.messages.person.sendMessage(this.$refs.formVorlage, this.id, data)
+			return this.$fhcApi.factory.messages.person.sendMessage(
+				this.$refs.formMessage,
+				this.id,
+				data)
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
 					//this.hideModal('messageModal');
+					this.hideTemplate();
 					this.resetForm();
 				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
-					//this.resetForm();
-					//closeModal
-					//closewindwo
-				}
+						//this.resetForm();
+						//closeModal
+						//closewindwo
+						this.$emit('reloadTable');
+					}
 				);
 		},
 		getVorlagentext(vorlage_kurzbz){
@@ -120,9 +135,37 @@ export default {
 					//closewindwo
 				});
 		},
+		getPreviewText(){
+			const data = new FormData();
+
+			data.append('data', JSON.stringify(this.formData.body));
+			return this.$fhcApi.factory.messages.person.getPreviewText({
+				id: this.id,
+				type_id: this.typeId}, data)
+				.then(response => {
+					this.previewText = response.data;
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					//this.resetForm();
+					//closeModal
+					//closewindwo
+				});
+		},
 		insertVariable(selectedItem){
 			if (this.editor) {
 				this.editor.insertContent(selectedItem.value + " ");
+				//TODO(Manu) check: nicht mal mit Punkt adden gehts ohne eintrag nach vars
+/*				this.editor.focus();
+				this.editor.setDirty(true);*/
+
+				//this.editor.fire('change'); //forces
+
+				//this.editor.undoManager.add();
+
+				//this.editor.insertContent(selectedItem.value + "\u00A0");
+				//this.editor.insertContent(`<span>${selectedItem.value}&nbsp;</span>`);
+				//this.editor.selection.setCursorLocation(this.editor.getBody(), 1);
+
 			} else {
 				console.error("Editor instance is not available.");
 			}
@@ -207,6 +250,19 @@ export default {
 				this.formData.subject = vorlage_kurzbz;
 			}
 		},
+		hideTemplate(){
+			if (this.openMode == "showDiv")
+				this.isVisible = false;
+		},
+		showTemplate(){
+			if (this.openMode == "showDiv")
+				this.isVisible = true;
+		},
+		showPreview(){
+			this.getPreviewText().then(() => {
+				this.previewBody = this.previewText;
+			});
+		}
 	},
 	watch: {
 		'formData.body': {
@@ -227,14 +283,10 @@ export default {
 					this.formData.subject = newVal;
 					return this.getVorlagentext(newVal);
 				}
-				//TODO(Manu) own function or retval to getVorlagentext
-				//component VorlagenComponent
-
 			}
 		}
 	},
 	created(){
-
 		if(this.typeId == 'person_id'){
 			this.$fhcApi.factory.messages.person.getMessageVarsPerson()
 				.then(result => {
@@ -246,7 +298,6 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		}
-
 		if(this.typeId == 'uid') {
 			this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(this.id)
 				.then(result => {
@@ -258,8 +309,8 @@ export default {
 						value: value
 					}));*/
 					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
-						label: key,
-						value: '{' + key + '}'
+						label: key.toLowerCase(),
+						value: '{' + key.toLowerCase() + '}'
 					}));
 				})
 				.catch(this.$fhcAlert.handleSystemError);
@@ -292,157 +343,185 @@ export default {
 	},
 	template: `
 	<div class="messages-detail-newmessage">
-	
-		<div v-show="isVisible">
-			<h4>New Message</h4>
-			
-				{{typeId}} {{id}}
-			
-				{{formData.subject}}
-				{{formData.vorlage_kurzbz}}
-	
-			<p v-if="formData.body">
-				formData.body befüllt
-			</p>
-
-			<div class="row">
-			
-				<div class="col-sm-8">
-		
-					<form-form class="row g-3 mt-2" ref="formMessage">
-					
-						<div class="row mb-3">
-						
-							<form-input
-								type="text"
-								name="recipient"
-								:label="$p.t('messages/recipient')"
-								v-model="defaultRecipient"
-								disabled
-							>
-							</form-input>					
-						</div>
-						
-						<div class="row mb-3">
-							<form-input
-								type="text"
-								name="subject"
-								:label="$p.t('global/betreff') + ' *'"
-								v-model="formData.subject"
-							>
-							</form-input>					
-						</div>
-				
-						<!--Tiny MCE-->
-						<div class="row mb-3">
-							<form-input
-								ref="editor"
-								:label="$p.t('global','nachricht')  + ' *'"
-								type="textarea"
-								v-model="formData.body"
-								name="text"
-								rows="15"
-								cols="75"
-								>
-							</form-input>
-						</div>
-								
-						<div class="row">				
-							<DropdownComponent
-								ref="dropdownComp"
-								:label="$p.t('global/vorlage')"
-								@change="handleSelectedVorlage"
-								useLoggedInUserOe
-							>
-							</DropdownComponent>
-						</div>
-											
-					</form-form>
-				</div>
-		
-				<div class="col-sm-4">
-				
-					<div v-if="this.fieldsPrestudent.length > 0">
-						<strong>Felder Prestudent</strong>
-						<div class="border p-3 overflow-auto" style="height: 200px;">
-							
-							<list-box
-								v-model="selectedFieldPrestudent"
-								:options="itemsPrestudent"
-								optionLabel="label"
-							>
-							  <template #option="slotProps">
-								<div @dblclick="insertVariable(slotProps.option)">
-								  {{ slotProps.option.label }}
-								</div>
-							  </template>
-							</list-box>
-													
-						</div>
-						
-						<button class="m-3" @click="insertVariablePrestudent">Insert Variable</button>
-						<p>{{selectedFieldPrestudent}}</p>
-
-					</div>
-					
-					<div v-if="this.fieldsPerson.length > 0">
-						<strong>Felder Person</strong>
-						<div class="border p-3 overflow-auto" style="height: 200px;">
-							
-							<list-box
-								v-model="selectedFieldPerson"
-								:options="itemsPerson"
-								optionLabel="label"
-							>
-								<template #option="slotProps">
-									<div @dblclick="insertVariable(slotProps.option)">
-									  {{ slotProps.option.label }}
-									</div>
-							  </template>
-							</list-box>
-													
-						</div>
-						<button class="m-3" @click="insertVariablePerson">Insert Variable</button>
-						<p>{{selectedFieldPerson}}</p>
-					</div>
-							
-					<div>
-						<strong>Meine Felder</strong>
-						<div class="border p-3 overflow-auto" style="height: 200px;">
-							
-							<list-box
-								v-model="selectedFieldUser"
-								:options="itemsUser"
-								optionLabel="label"
-							>
-								<template #option="slotProps">
-									<div @dblclick="insertVariable(slotProps.option)">
-									  {{ slotProps.option.label }}
-									</div>
-							  </template>
-							</list-box>
-													
-						</div>
-						<button class="m-3" @click="insertVariableUser">Insert Variable</button>
-					</div>
-					
-					
-					<div class="d-grid gap-2 d-md-flex justify-content-md-end">
-					
-						<button class="btn btn-secondary" @click="resetForm">Reset All</button>
-						
-						<button v-if="statusNew" type="button" class="btn btn-primary" @click="sendMessage()">{{$p.t('ui', 'nachrichtSenden')}}</button>
-						<button v-else type="button" class="btn btn-primary" @click="replyMessage(formData.message_id)">{{$p.t('global', 'reply')}}</button>
-					</div>
-					
-				</div>
-				
-			</div>
-		</div>
-		
-		<hr>
+			<hr>
 		<button type="button" class="btn btn-warning" @click="toggleDivNewMessage()">Toggle NewMessage</button>
 		<hr>
+
+		<div v-show="isVisible">
+			<div class="overflow-auto" style="max-height: 500px; border: 1px solid #ccc;">
+
+				<h4>New Message</h4>
+	<!--			{{formData.body}}
+				||
+				{{previewText}}-->
+
+				<div class="row">
+					<div class="col-sm-8">
+						<form-form class="row g-3 mt-2" ref="formMessage">
+
+						<!--TODO(Manu) ist eigentlich ein Array, hier werden alle Einträge angegeben als String-->
+							<div class="row mb-3">
+
+								<form-input
+									type="text"
+									name="recipient"
+									:label="$p.t('messages/recipient')"
+									v-model="defaultRecipient"
+									disabled
+								>
+								</form-input>
+							</div>
+							
+							<div class="row mb-3">
+								<form-input
+									type="text"
+									name="subject"
+									:label="$p.t('global/betreff') + ' *'"
+									v-model="formData.subject"
+								>
+								</form-input>
+							</div>
+
+							<!--Tiny MCE-->
+							<div class="row mb-3">
+								<form-input
+									ref="editor"
+									:label="$p.t('global','nachricht')  + ' *'"
+									type="textarea"
+									v-model="formData.body"
+									name="text"
+									rows="15"
+									cols="75"
+									>
+								</form-input>
+							</div>
+
+							<div class="row">
+								<DropdownComponent
+									ref="dropdownComp"
+									:label="$p.t('global/vorlage')"
+									@change="handleSelectedVorlage"
+									useLoggedInUserOe
+								>
+								</DropdownComponent>
+							</div>
+
+						</form-form>
+					</div>
+
+					<div class="col-sm-4">
+						<div v-if="this.fieldsPrestudent.length > 0">
+							<strong>Felder Prestudent</strong>
+							<div class="border p-3 overflow-auto" style="height: 200px;">
+
+								<list-box
+									v-model="selectedFieldPrestudent"
+									:options="itemsPrestudent"
+									optionLabel="label"
+								>
+								  <template #option="slotProps">
+									<div @dblclick="insertVariable(slotProps.option)">
+									  {{ slotProps.option.label }}
+									</div>
+								  </template>
+								</list-box>
+
+							</div>
+
+							<button class="m-3" @click="insertVariablePrestudent">Insert Variable</button>
+							<p>{{selectedFieldPrestudent}}</p>
+
+						</div>
+
+						<div v-if="this.fieldsPerson.length > 0">
+							<strong>Felder Person</strong>
+							<div class="border p-3 overflow-auto" style="height: 200px;">
+
+								<list-box
+									v-model="selectedFieldPerson"
+									:options="itemsPerson"
+									optionLabel="label"
+								>
+									<template #option="slotProps">
+										<div @dblclick="insertVariable(slotProps.option)">
+										  {{ slotProps.option.label }}
+										</div>
+								  </template>
+								</list-box>
+
+							</div>
+							<button class="m-3" @click="insertVariablePerson">Insert Variable</button>
+							<p>{{selectedFieldPerson}}</p>
+						</div>
+
+						<div>
+							<strong>Meine Felder</strong>
+							<div class="border p-3 overflow-auto" style="height: 200px;">
+
+								<list-box
+									v-model="selectedFieldUser"
+									:options="itemsUser"
+									optionLabel="label"
+								>
+									<template #option="slotProps">
+										<div @dblclick="insertVariable(slotProps.option)">
+										  {{ slotProps.option.label }}
+										</div>
+								  </template>
+								</list-box>
+
+							</div>
+							<button class="m-3" @click="insertVariableUser">Insert Variable</button>
+						</div>
+
+						<div class="d-grid gap-2 d-md-flex justify-content-md-end">
+
+							<button class="btn btn-secondary" @click="resetForm">Reset All</button>
+
+							<button v-if="statusNew" type="button" class="btn btn-primary" @click="sendMessage()">{{$p.t('ui', 'nachrichtSenden')}}</button>
+							<button v-else type="button" class="btn btn-primary" @click="replyMessage(formData.message_id)">{{$p.t('global', 'reply')}}</button>
+						</div>
+
+					</div>
+
+				</div>
+
+				<div class="row mt-4">
+
+					<h4>Vorschau:</h4>
+					<div>
+						<form-form class="row g-3 mt-2" ref="formPreview">
+
+							<div class="col-sm-2 mb-3">
+								<form-input
+									type="select"
+									name="recipient"
+									:label="$p.t('messages/recipient')"
+									v-model="defaultRecipient"
+								>
+								</form-input>
+							</div>
+
+							<div class="col-md-2 mt-4">
+								<br>
+								<button type="button" class="btn bt		n-secondary" @click="showPreview()">Aktualisieren</button>
+							</div>
+						</form-form>
+
+						<div class="col-sm-12 overflow-scroll">
+								<div ref="preview">
+									<div v-html="previewBody" class="p-3 border rounded overflow-scroll twoColumns"></div>
+								</div>
+						</div>
+
+					</div>
+
+				</div>
+	
+			</div>
+
+		</div>
+
 	</div>
 	`
 
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 0025d7b47..10210ece4 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -22,6 +22,7 @@ export default {
 			required: true
 		},
 		messageLayout: String,
+		openMode: String
 	},
 	//TODO(Manu) endpoint macht Probleme
 	data(){
@@ -238,15 +239,14 @@ export default {
 				const linkWindowNewMessage = this.cisRoot + '/public/js/components/Messages/Details/NewMessage.js';
 				window.open(linkWindowNewMessage, '_blank');
 			}
-			else if (this.openmode == "modal"){
+			else if (this.openMode == "modal"){
 				console.log("open with bootstrap Modal");
 			}
-			else if (this.openmode == "showDiv"){
-				console.log("open div in NewMessage.js");
-				//emit to NewMessage.js
+			else if (this.openMode == "showDiv"){
+				this.$emit('showNewMessageTemplate');
 			}
 			else
-				console.log("no valid openmode: yet to be developed");
+				console.log("no valid openMode");
 		},
 		reload() {
 			this.$refs.table.reloadTable();
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index a7cccb8cb..f862ebc46 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -28,31 +28,56 @@ export default {
 				].includes(value)
 			}
 		},
+		openMode: {
+			type: String,
+			default: 'window',
+			validator(value) {
+				return [
+					'window',
+					'modal',
+					'showDiv'
+				].includes(value)
+			}
+		}
 	},
 	data() {
 		return {}
 	},
+	methods: {
+		showNewMessageTemplate(){
+			this.$refs.templateNewMessage.showTemplate();
+		},
+		reloadTable(){
+			this.$refs.templateTableMessage.reload();
+		}
+	},
 	template: `
 	<div class="core-messages h-100 pb-3">
 <!--	<p>endpoint Messages.js: {{endpoint}}</p>-->
 		<div v-if="showNew">
-			<NewMessage
+			<new-message
+				ref="templateNewMessage"
 				:type-id="typeId"
 				:id="id"
 				:endpoint="endpoint"
+				:openMode="openMode"
+				@reloadTable="reloadTable"
 			>
-			</NewMessage>
+			</new-message>
 		</div>
 		
 		<div v-if="showTable">
-			<TableMessages
+			<table-messages
+				ref="templateTableMessage"
 				:type-id="typeId"
 				:id="id"
 				:endpoint="endpoint"
 				:messageLayout="messageLayout"
+				:openMode="openMode"
+				@showNewMessageTemplate="showNewMessageTemplate"
 			>
 			
-			</TableMessages>
+			</table-messages>
 		</div>
 		
 	</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index 14d74e56c..bc07401e6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -1,4 +1,5 @@
 import CoreMessages from "../../../Messages/Messages.js";
+//import CoreMessages from "@/Messages/Messages.js";
 
 export default {
 	components: {
@@ -17,6 +18,7 @@ export default {
 			messageLayout="twoColumnsTableLeft"
 			show-table
 			show-new
+			open-mode="showDiv"
 			>
 		</core-messages>
 
diff --git a/public/js/components/VorlagenDropdown/VorlagenDropdown.js b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
index e4c48501a..b074711f4 100644
--- a/public/js/components/VorlagenDropdown/VorlagenDropdown.js
+++ b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
@@ -1,5 +1,5 @@
 import {CoreFilterCmpt} from "../filter/Filter.js";
-import FormForm from '../Form/Form';
+import FormForm from '../Form/Form.js';
 import FormInput from '../Form/Input.js';
 
 export default {
@@ -39,16 +39,13 @@ export default {
 	},
 	methods: {
 		updateValue() {
-		//	console.log("in COMPO: update: " + this.selectedValue + ' jetzt ' + 'InfocenterMailErgaenzungsprfEng');
 			this.$emit('change', this.selectedValue);
-			//this.$emit('change', this.selectedValue); // Emit-Event beim Ändern des Wertes
 		},
 		setValue(value) {
 			this.selectedValue = value;
 		},
 	},
-	 created() {
-
+	created() {
 		if(this.isAdmin) {
 			this.$fhcApi.factory.vorlagen.getVorlagen()
 				.then(result => {
@@ -103,7 +100,6 @@ template: `
 				</option>
 			</form-input>
 		</div>
-		
 	</div>
 	`,
 }
\ No newline at end of file

From 881b7fb7897ec633ae7d848e5d2e46a48b72cc03 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 24 Feb 2025 17:53:56 +0100
Subject: [PATCH 033/572] fix loadEvents race condition; normalize route
 pushes; WIP getting route.replace to work;

---
 .../education/Lehrveranstaltung_model.php     | 22 ++++------
 public/js/components/Calendar/Day.js          |  6 +--
 public/js/components/Calendar/Month.js        | 16 ++++----
 public/js/components/Calendar/Month/Page.js   |  7 +++-
 public/js/components/Calendar/Week.js         |  8 ++--
 public/js/components/Cis/Mylv/Semester.js     |  3 +-
 .../Cis/Mylv/Semester/Studiengang.js          |  5 ++-
 .../Cis/Mylv/Semester/Studiengang/Lv.js       |  9 +++--
 .../components/Cis/Stundenplan/Stundenplan.js | 40 +++++++++----------
 9 files changed, 60 insertions(+), 56 deletions(-)

diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 8044fa9de..44f9834d8 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -556,16 +556,6 @@ class Lehrveranstaltung_model extends DB_Model
 	 */
 	public function getLvsByStudentWithGrades($student_uid, $studiensemester_kurzbz, $sprache = null, $lvid=null)
 	{
-		if ($sprache) {
-			$sprache_qry = $this->db->compile_binds('SELECT index FROM public.tbl_sprache WHERE sprache = ?', [$sprache]);
-			$bezeichnung = 'bezeichnung_mehrsprachig[(' . $sprache_qry . ')]';
-			$sgbezeichnung = $sprache == 'English' ? 'COALESCE(sg.english, sg.bezeichnung)' : 'sg.bezeichnung';
-			$lvbezeichnung = $sprache == 'English' ? 'COALESCE(v.bezeichnung_english, v.bezeichnung)' : 'v.bezeichnung';
-		} else {
-			$bezeichnung = 'bezeichnung';
-			$sgbezeichnung = 'sg.bezeichnung';
-			$lvbezeichnung = 'v.bezeichnung';
-		}
 
 		$this->addDistinct();
 		// TODO(chris): selects
@@ -605,16 +595,20 @@ class Lehrveranstaltung_model extends DB_Model
 		$this->addSelect('znn.positiv');
 
 		#$this->addSelect('splv.module');
-		$this->addSelect($lvbezeichnung . ' AS bezeichnung');
-		$this->addSelect($sgbezeichnung . ' AS sg_bezeichnung');
+		$this->addSelect('v.bezeichnung AS bezeichnung');
+		$this->addSelect('v.bezeichnung_english AS bezeichnung_eng');
+		$this->addSelect('sg.bezeichnung AS sg_bezeichnung');
+		$this->addSelect('sg.english AS sg_bezeichnung_eng');
 		$this->addSelect('UPPER(sg.typ::VARCHAR(1) || sg.kurzbz) AS studiengang_kuerzel');
 		
 		//also adds returns the index of the grade
 		//TODO: ist zeugnissnote immer gleich wie die lvgesamtnote
 		$this->addSelect('COALESCE(zn.note::numeric,gn.note::numeric) as note_index');
 		$this->addSelect('COALESCE(znn.positiv,gnn.positiv) as positiv');
-		$this->addSelect('COALESCE(gnn.' . $bezeichnung . ', gnn.bezeichnung, gn.note::text) AS lvnote');
-		$this->addSelect('COALESCE(znn.' . $bezeichnung . ', znn.bezeichnung, zn.note::text) AS znote');
+		$this->addSelect('gnn.bezeichnung_mehrsprachig AS lvnotebez');
+		$this->addSelect('gnn.note AS lvnote');
+		$this->addSelect('znn.bezeichnung_mehrsprachig AS znotebez');
+		$this->addSelect('znn.note AS znote');
 
 		// TODO(chris): Potentielle Anpassung "Eine UID"
 		$this->addJoin('campus.vw_student_lehrveranstaltung v', 'lehrveranstaltung_id');
diff --git a/public/js/components/Calendar/Day.js b/public/js/components/Calendar/Day.js
index c0f1040f5..9eafe0120 100644
--- a/public/js/components/Calendar/Day.js
+++ b/public/js/components/Calendar/Day.js
@@ -22,7 +22,7 @@ export default {
 			this.focusDate.d += dir;
 			this.emitRangeChanged(previousDate);
 		},
-		emitRangeChanged(previousDate) {
+		emitRangeChanged(previousDate, mounted) {
 			this.$emit('change:range', { start: previousDate, end:this.focusDate });
 		},
 		prev() {
@@ -37,8 +37,8 @@ export default {
 			this.$emit('input', ['select:event', event]);
 		}
 	},
-	created() {
-		this.emitRangeChanged();
+	mounted() {
+		this.emitRangeChanged(new CalendarDate(this.focusDate.y, this.focusDate.m, this.focusDate.d -1), true);
 	},
 	template: /*html*/`
 	<div class="fhc-calendar-day">
diff --git a/public/js/components/Calendar/Month.js b/public/js/components/Calendar/Month.js
index 513ed1c8c..d427304b8 100644
--- a/public/js/components/Calendar/Month.js
+++ b/public/js/components/Calendar/Month.js
@@ -28,9 +28,14 @@ export default {
 			} else {
 				this.focusDate.moveMonthInDirection(dir)
 			}
+			this.emitRangeChanged()
+		},
+		emitRangeChanged(mounted = false) {
+
 			this.$emit('change:range', {
-				start: new Date(this.focusDate.y, this.focusDate.m, 1), 
-				end: new Date(this.focusDate.y, this.focusDate.m+1, 0)
+				start: new Date(this.focusDate.y, this.focusDate.m, 1),
+				end: new Date(this.focusDate.y, this.focusDate.m+1, 0),
+				mounted
 			});
 		},
 		prev() {
@@ -55,11 +60,8 @@ export default {
 			this.$emit('input', ['select:day',day])
 		}
 	},
-	created() {
-		this.$emit('change:range', {
-			start: new Date(this.focusDate.y, this.focusDate.m, 1), 
-			end: new Date(this.focusDate.y, this.focusDate.m+1, 0)
-		});
+	mounted() {
+		this.emitRangeChanged(true)
 	},
 	template: `
 	<div class="fhc-calendar-month">
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 8ec700ce7..f5354fc7b 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -63,6 +63,10 @@ export default {
 		
 	},
 	methods: {
+		handleEventClick(e, day) {
+			this.selectDay(day)
+			e.stopPropagation()
+		},
 		getDayClass(week, day) {
 			let classstring = 'fhc-calendar-month-page-day text-decoration-none overflow-hidden'
 			const isHighlightedWeek = this.isHighlightedWeek(week)
@@ -153,7 +157,8 @@ export default {
 				<span @click="clickEvent(day,week)" class="no" :style="getNumberStyle(day)">{{day.getDate()}}</span>
 				<span v-if="events[day.toDateString()] && events[day.toDateString()].length" class="events">
 					<div v-for="event in events[day.toDateString()]" :key="event.id" 
-					:style="{'background-color': event.color}" class="fhc-entry" :selected="event == selectedEvent" v-contrast >
+					:style="{'background-color': event.color}" class="fhc-entry" :selected="event == selectedEvent"
+					v-contrast @click="handleEventClick($event, day)">
 						<slot  name="monthPage" :event="event" :day="day" >
 							<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 						</slot>
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
index 350f0130d..6e94c6b92 100644
--- a/public/js/components/Calendar/Week.js
+++ b/public/js/components/Calendar/Week.js
@@ -20,10 +20,10 @@ export default {
 			this.focusDate.d += dir * 7;
 			this.emitRangeChanged();
 		},
-		emitRangeChanged() {
+		emitRangeChanged(mounted = false) {
 			let start = this.focusDate.firstDayOfWeek;
 			let end = this.focusDate.lastDayOfWeek;
-			this.$emit('change:range', { start, end });
+			this.$emit('change:range', { start, end, mounted });
 		},
 		prev() {
 			this.$refs.pane.prev();
@@ -37,8 +37,8 @@ export default {
 			this.$emit('input', ['select:event',event]);
 		}
 	},
-	created() {
-		this.emitRangeChanged();
+	mounted() {
+		this.emitRangeChanged(true);
 	},
 	template: /*html*/`
 	<div class="fhc-calendar-week">
diff --git a/public/js/components/Cis/Mylv/Semester.js b/public/js/components/Cis/Mylv/Semester.js
index b6ac3563a..994a7c9ff 100644
--- a/public/js/components/Cis/Mylv/Semester.js
+++ b/public/js/components/Cis/Mylv/Semester.js
@@ -22,7 +22,8 @@ export default {
 					lv.studiengang_kz + '#' + lv.semester, 
 					{
 						studiengang_kz: lv.studiengang_kz, 
-						bezeichnung: lv.sg_bezeichnung, 
+						bezeichnung: lv.sg_bezeichnung,
+						sg_bezeichnung_eng: lv.sg_bezeichnung_eng,
 						kuerzel: lv.studiengang_kuerzel, 
 						semester: lv.semester
 					}
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang.js b/public/js/components/Cis/Mylv/Semester/Studiengang.js
index 9629ba307..15d210796 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang.js
@@ -12,7 +12,8 @@ export default {
 		bezeichnung: String,
 		kuerzel: String,
 		semester: [String,Number],
-		lvs: Array
+		lvs: Array,
+		sg_bezeichnung_eng: String
 	},
 	computed: {
 		lehrveranstaltungen() {
@@ -32,7 +33,7 @@ export default {
 	},
 	template: `<div class="card mb-3">
 		<div class="card-body">
-			<h4 class="card-title mb-3">{{bezeichnung}} - {{kuerzel}}
+			<h4 class="card-title mb-3">{{$p.user_language.value === 'English' ? sg_bezeichnung_eng : bezeichnung}} - {{kuerzel}}
 				<small>{{semester}}.{{$p.t('lehre/semester')}}</small>
 			</h4>
 			<div class="row">
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index ea19652c6..d0dd99f68 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -29,7 +29,7 @@ export default {
 		ects: String,
 		incoming: Number,
 		positiv: Boolean,
-		note_index: String,
+		note_index: String
 	},
 	data: () => {
 		return {
@@ -66,8 +66,8 @@ export default {
 			return bodyStyle;
 		},
 		grade() {
-			// TODO: noten phrasen
-			return this.benotung ? this.znote || this.lvnote || null : null;
+			const languageIndex = this.$p.user_language.value === 'English' ? 1 : 0
+			return this.benotung ? this.znotebez[languageIndex] || this.lvnotebez[languageIndex] || null : null;
 		},
 		LvHasPruefungenInformation(){
 			return this.pruefungenData && this.pruefungenData.length > 0;
@@ -123,6 +123,7 @@ export default {
 				LvInfo.popup({
 					lehrveranstaltung_id: this.lehrveranstaltung_id, 
 					bezeichnung: this.bezeichnung,
+					bezeichnung_eng: this.bezeichnung_eng,
 					studiengang_kuerzel: this.studiengang_kuerzel,
 					semester: this.semester,
 					studien_semester: this.studien_semester,
@@ -161,7 +162,7 @@ export default {
 		<div class="p-2" :class="is_organisatorische_einheit?'':'card-header'">
 			<!-- {{module}} if the module of the lv is important then query the module from the api endpoint for LV-->
 			<h6 class="fw-bold" v-if="is_organisatorische_einheit" >{{ $p.t('lehre/organisationseinheit') }}:</h6>
-			<h6 class="mb-0">{{bezeichnung}}</h6>
+			<h6 class="mb-0">{{$p.user_language.value === 'English' ? bezeichnung_eng : bezeichnung}}</h6>
 		</div>
 		<div v-if="!emptyMenu" class="card-body " :style="bodyStyle">
 			<template v-if="menu">
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 3fee43058..ba26e25db 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -118,16 +118,17 @@ const Stundenplan = {
 			const date = day.getFullYear() + "-" +
 				String(day.getMonth() + 1).padStart(2, "0") + "-" +
 				String(day.getDate()).padStart(2, "0");
-
-			this.$router.push({
-				name: "Stundenplan",
-				params: {
-					mode: this.calendarMode,
-					focus_date: date,
-					lv_id: this.propsViewData?.lv_id || null
-				}
-			})
+			const capitalizedMode = this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1);
 			
+			this.$router.push({
+					name: "Stundenplan",
+					params: {
+						mode: capitalizedMode,
+						focus_date: date,
+						lv_id: this.propsViewData?.lv_id || null
+					}
+				})
+
 			this.currentDay = day;
 		},
 		handleOffset: function(offset)  {
@@ -144,14 +145,14 @@ const Stundenplan = {
 			this.$router.push({
 				name: "Stundenplan",
 				params: {
-					mode: this.calendarMode,
+					mode: this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1),
 					focus_date: date,
 					lv_id: this.propsViewData?.lv_id || null
 				}
 			})
 		},
 		handleChangeMode(mode) {
-			const modeCapitalized = mode.charAt(0).toUpperCase() + mode.slice(1)
+			let m = mode[0].toUpperCase() + mode.slice(1)
 			const date = this.currentDay.getFullYear() + "-" +
 				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
 				String(this.currentDay.getDate()).padStart(2, "0");
@@ -159,30 +160,29 @@ const Stundenplan = {
 			this.$router.push({
 				name: "Stundenplan",
 				params: {
-					mode: modeCapitalized,
+					mode: m,
 					focus_date: date,
 					lv_id: this.propsViewData?.lv_id ?? null
 				}
 			})
-		
-			this.calendarMode = mode
+			this.calendarMode = m
 		},
 		showModal: function(e, event){
-			e.stopPropagation()
 			this.currentlySelectedEvent = event;
 			Vue.nextTick(() => {
 				this.$refs.lvmodal.show();
 			});
 		},
-		updateRange: function ({start,end}) {
-			
+		updateRange: function ({start,end, mounted}) {
 			let checkDate = (date) => {
 				return date.m != this.eventCalendarDate.m || date.y != this.eventCalendarDate.y;
 			}
 			this.calendarDate = new CalendarDate(end);
 
 			// only load month data if the month or year has changed
-			if (checkDate(new CalendarDate(start)) && checkDate(new CalendarDate(end))){
+			// or we receive a reload flag from the mounted routine of the components
+			// or this handler is being called from the mounted lifecycle of a component
+			if (mounted || (checkDate(new CalendarDate(start)) && checkDate(new CalendarDate(end)))){
 				// reset the events before querying the new events to activate the loading spinner
 				this.events = null;
 				this.eventCalendarDate = new CalendarDate(end);
@@ -238,7 +238,7 @@ const Stundenplan = {
 		.then(data=>{
 			this.uid = data.uid;
 		})
-		this.loadEvents();
+
 	},
 	beforeUnmount() {
 		if(this.$refs.lvmodal) this.$refs.lvmodal.hide()	
@@ -275,7 +275,7 @@ const Stundenplan = {
 			</div>
 		</template>
 		<template #monthPage="{event,day}">
-			<div @click="showModal($event, event); ">
+			<div>
 				<span class="fhc-entry">
 					{{event.topic}}
 				</span>

From bad19ccde7ac4266f5bd2a0c51fda0e594125d2b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 26 Feb 2025 09:40:42 +0100
Subject: [PATCH 034/572] feature(Calendar Scroll Behavior): only scrolls an
 entire hour at the time when scrolling with the mouse wheel

---
 public/js/components/Calendar/Day/Page.js  | 12 +++++++----
 public/js/components/Calendar/Pane.js      |  5 ++++-
 public/js/components/Calendar/Week/Page.js | 24 +---------------------
 3 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 01cbd8ba9..44aadb837 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -53,6 +53,7 @@ export default {
 		//TODO: workaround is to watch the active state and refetch in case the lvMenu is empty
 		active: {
 			handler(value) {
+				// handles fetching the lvMenu
 				if (value) {
 					if (!this.lvMenu) {
 						this.fetchLvMenu(this.selectedEvent);
@@ -64,7 +65,7 @@ export default {
 		events: {
 			handler(newEvents) {
 				// if no event is selected, select the first event of the day
-				if (this.selectedEvent == null && newEvents[this.day.toDateString()].length > 0) {
+				if (this.selectedEvent == null && newEvents[this.day.toDateString()]?.length > 0) {
 					let events = newEvents[this.day.toDateString()];
 					if (Array.isArray(events) && events.length > 0) {
 						this.setSelectedEvent(events[0]);
@@ -239,6 +240,9 @@ export default {
 		}
 	},
 	methods: {
+		dayScrollBehavior(event){
+			this.$refs.dayScrollContainer?.scrollBy({ top: Math.sign(event.deltaY) * 100, behavior: 'instant' });
+		},
 		dayGridStyle(day) {
 			const styleObj = {
 				'grid-template-columns': '1 1fr',
@@ -355,7 +359,7 @@ export default {
 	template: /*html*/`
 	<div class="fhc-calendar-day-page h-100">
 		<div class="row m-0 h-100">
-			<div class="col-12 col-xl-6 p-0 h-100">
+			<div style="overflow:auto" class="col-12 col-xl-6 p-0 h-100">
 				<div class="d-flex flex-column h-100">
 					<div ref="header" class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="pageHeaderStyle">
 						<div type="button" class="flex-grow-1" :title="dayText.heading" @click.prevent="changeToMonth(day)">
@@ -363,11 +367,11 @@ export default {
 							<a href="#" class="small text-secondary text-decoration-none" >{{dayText.datum}}</a>
 						</div>
 					</div>
-					<div id="scroll g-0" style="height: 100%; overflow-y: scroll;">
+					<div @wheel.prevent="dayScrollBehavior" id="scrollContainer" ref="dayScrollContainer" style="height: 100%; overflow-y: scroll;">
 
 						<div ref="eventcontainer" class="position-relative flex-grow-1"  >
 							<div class="all-day-event-container" >
-								<div class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
+								<div @wheel.stop class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
 									<template v-for="(events,_day) in allDayEvents" :key="_day">
 
 									<div v-if="dayindex == _day" v-for="event in events" :key="event" class="d-grid m-1" style="top:0;" @click.prevent="eventClick(event)"
diff --git a/public/js/components/Calendar/Pane.js b/public/js/components/Calendar/Pane.js
index 5a3a43aa9..abcf03744 100644
--- a/public/js/components/Calendar/Pane.js
+++ b/public/js/components/Calendar/Pane.js
@@ -39,6 +39,9 @@ export default {
 		
 	},
 	methods: {
+		scrollBehavior(event){
+			this.$refs.calendarContainer?.scrollBy({ top: Math.sign(event.deltaY) * 100, behavior: 'instant' });
+		},
 		scrollCalendar(event){
 			this.scrollTop = this.$refs.calendarContainer.scrollTop;
 			this.clientHeight = this.$refs.calendarContainer.clientHeight;
@@ -82,7 +85,7 @@ export default {
 	},
 	template: `
 	<div ref="carousel" class="calendar-pane carousel slide" @[\`slide.bs.carousel\`]="slide" @[\`slid.bs.carousel\`]="slid" :data-queue="queue">
-		<div id="calendarContainer" @scroll="scrollCalendar" ref="calendarContainer" class="carousel-inner " style="height:var(--fhc-calendar-pane-height);">
+		<div id="calendarContainer" @wheel.prevent="scrollBehavior" @scroll="scrollCalendar" ref="calendarContainer" class="carousel-inner " style="height:var(--fhc-calendar-pane-height);">
 			<div ref="carouselItems" v-for="i in [...Array(3).keys()]" :key="i" class="carousel-item" style="height:var(--fhc-calendar-pane-height);">
 				<slot :active="i == activeCarouselItemIndex" :index="i" :offset="offsets[i]" />
 			</div>
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 86db5947e..a6bc221fe 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -11,7 +11,6 @@ export default {
 			hourPositionTime:null,
 			resizeObserver: null,
 			width: 0,
-			scrollContainer: null,
 		}
 	},
 	inject: [
@@ -37,23 +36,6 @@ export default {
 		'page:forward',
 		'input',
 	],
-	watch: {
-		active: {
-			handler(value) {
-				const activeContainer = document.querySelector("#calendarContainer")
-				if(value){
-					Vue.nextTick(() => {
-						this.scrollContainer = activeContainer;
-						activeContainer.addEventListener('wheel', this.scrollFunction);
-					})
-				}else{
-					this.scrollContainer=null;
-					activeContainer?.removeEventListener('wheel', this.scrollFunction);
-				}
-			},
-			immediate: true,
-		}
-	},
 	computed: {
 		allDayEvents(){
 			let allDayEvents = {};
@@ -209,10 +191,6 @@ export default {
 		}
 	}, 
 	methods: {
-		scrollFunction(event){
-				event.preventDefault();
-				this.scrollContainer?.scrollBy({ top: Math.sign(event.deltaY) * 100, behavior: 'instant' });
-		},
 		hourGridIdentifier(hour) {
 			// this is the id attribute that is responsible to scroll the calender to the first event
 			return 'scroll' + hour + this.focusDate.d + this.week;
@@ -375,7 +353,7 @@ export default {
 			</div>
 			<div ref="eventcontainer" class="position-relative flex-grow-1"  >
 				<div class="all-day-event-container" >
-					<div class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
+					<div @wheel.stop class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
 						<template v-for="(events,_day) in allDayEvents" :key="_day">
 
 						<div v-if="dayindex == _day" v-for="event in events" :key="event" class="d-grid m-1" style="top:0;" @click.prevent="weekPageClick(event, _day)"

From ecd5e95f2d341b7dc1dcac89bf7f9e0f46914f62 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 26 Feb 2025 11:42:32 +0100
Subject: [PATCH 035/572] access computed grade phrase defensive; avoid pushing
 redundant mode changes; replace current state with new params when a
 different day is selected in the current month -> beforeEnter guard creates
 redundant navigation history entry which is currently being blocked but
 produces the possibility to infinitely "rego forward";

---
 public/js/apps/Dashboard/Fhc.js               | 10 +++++++
 .../Cis/Mylv/Semester/Studiengang/Lv.js       |  8 +++++-
 .../components/Cis/Stundenplan/Stundenplan.js | 27 ++++++++++++++-----
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index e3ba786f1..b4d410344 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -198,6 +198,16 @@ const router = VueRouter.createRouter({
 	]
 })
 
+router.beforeEach((to, from) => {
+	// this avoids redundant routing navigation in place due to router.replace on a route with param function and
+	// beforeEnter navigation guard
+	
+	// TODO: manage the infinite forward navigation issue somehow
+	if (to.fullPath === from.fullPath) {
+		return false
+	}
+})
+
 const app = Vue.createApp({
 	name: 'FhcApp',
 	data: () => ({
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index d0dd99f68..0543d8fae 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -21,7 +21,9 @@ export default {
 		lvinfo: Boolean,
 		benotung: Boolean,
 		lvnote: String,
+		lvnotebez: Array,
 		znote: String,
+		znotebez: Array,
 		studiengang_kuerzel: String,
 		semester: [String, Number],
 		orgform_kurzbz: String,
@@ -67,7 +69,11 @@ export default {
 		},
 		grade() {
 			const languageIndex = this.$p.user_language.value === 'English' ? 1 : 0
-			return this.benotung ? this.znotebez[languageIndex] || this.lvnotebez[languageIndex] || null : null;
+			if(this.benotung && this.znotebez?.length) {
+				return this.znotebez[languageIndex]
+			} else if(this.benotung && this.lvnotebez?.length) {
+				return this.lvnotebez[languageIndex]
+			} else return null
 		},
 		LvHasPruefungenInformation(){
 			return this.pruefungenData && this.pruefungenData.length > 0;
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index ba26e25db..b24cb1037 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -11,7 +11,7 @@ const Stundenplan = {
 	data() {
 		return {
 			events: null,
-			calendarMode: DEFAULT_MODE_STUNDENPLAN,
+			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_STUNDENPLAN,
 			calendarDate: new CalendarDate(new Date()),
 			eventCalendarDate: new CalendarDate(new Date()),
 			currentlySelectedEvent: null,
@@ -60,6 +60,7 @@ const Stundenplan = {
 			if(this.$refs.calendar) this.$refs.calendar.setMode(newVal)
 		},
 		'propsViewData.focus_date'(newVal) {
+			// todo: navigate around with date in current mode
 			this.currentDate = new Date(newVal)
 		}
 	},
@@ -119,8 +120,11 @@ const Stundenplan = {
 				String(day.getMonth() + 1).padStart(2, "0") + "-" +
 				String(day.getDate()).padStart(2, "0");
 			const capitalizedMode = this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1);
+			const isMonthMode = capitalizedMode === 'Month'
+			const isInCurrentMonth = day.getMonth() == this.currentDay.getMonth()
 			
-			this.$router.push({
+			if(isMonthMode && isInCurrentMonth) {
+				this.$router.replace({
 					name: "Stundenplan",
 					params: {
 						mode: capitalizedMode,
@@ -128,6 +132,16 @@ const Stundenplan = {
 						lv_id: this.propsViewData?.lv_id || null
 					}
 				})
+			} else {
+				this.$router.push({
+					name: "Stundenplan",
+					params: {
+						mode: capitalizedMode,
+						focus_date: date,
+						lv_id: this.propsViewData?.lv_id || null
+					}
+				})
+			}
 
 			this.currentDay = day;
 		},
@@ -141,7 +155,7 @@ const Stundenplan = {
 			const date = this.currentDay.getFullYear() + "-" +
 				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
 				String(this.currentDay.getDate()).padStart(2, "0");
-
+			
 			this.$router.push({
 				name: "Stundenplan",
 				params: {
@@ -153,10 +167,11 @@ const Stundenplan = {
 		},
 		handleChangeMode(mode) {
 			let m = mode[0].toUpperCase() + mode.slice(1)
+			if(m === this.calendarMode) return
 			const date = this.currentDay.getFullYear() + "-" +
 				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
 				String(this.currentDay.getDate()).padStart(2, "0");
-
+			
 			this.$router.push({
 				name: "Stundenplan",
 				params: {
@@ -238,7 +253,7 @@ const Stundenplan = {
 		.then(data=>{
 			this.uid = data.uid;
 		})
-
+		
 	},
 	beforeUnmount() {
 		if(this.$refs.lvmodal) this.$refs.lvmodal.hide()	
@@ -275,7 +290,7 @@ const Stundenplan = {
 			</div>
 		</template>
 		<template #monthPage="{event,day}">
-			<div>
+			<div @click="showModal($event, event)">
 				<span class="fhc-entry">
 					{{event.topic}}
 				</span>

From fe1971a1d3fd3e0c32c0978b1120a2239d09580b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 26 Feb 2025 13:05:17 +0100
Subject: [PATCH 036/572] update(Calendar Moodle): adds background color to
 full day events, adds the link to the moodle activity, sorts the events based
 on type

---
 public/css/components/calendar.css            | 16 ++++++++++++++-
 public/js/components/Cis/Mylv/LvInfo.js       |  4 ++++
 .../components/Cis/Stundenplan/Stundenplan.js | 20 +++++++++++++++----
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 0cc0b8533..f1005f516 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -85,10 +85,22 @@
 	grid-template-columns:repeat(7,1fr);
 	width:100%;
 	z-index:3;
+	background-color:white;
+}
+
+.fhc-calendar-week-page .all-day-event-container::before {
+	position: absolute;
+	content:'';
+	top: 0;
+	bottom: 0;
+	left: -3em;
+	right: 100%;
+	background-color: white;
+	box-shadow: 1px 1px 0 #dee2e6;
 }
 
 .fhc-calendar-day-page .all-day-event-border {
-	box-shadow: 1px 1px 0 #dee2e6;
+	box-shadow: 0 0 0 1px #dee2e6;
 }
 
 .fhc-calendar-day-page .all-day-event {
@@ -104,6 +116,8 @@
 	grid-template-columns: 3em 1fr;
 	width: 100%;
 	z-index: 3;
+	background-color:white;
+	box-shadow: 1px 1px 0 #dee2e6;
 }
 
 /* grid hour lines of the Stundenplan use box-shadow instead of border because box-shadow renders consistently on different viewports*/
diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
index cfddc2c6a..18b318b4b 100644
--- a/public/js/components/Cis/Mylv/LvInfo.js
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -135,6 +135,10 @@ export default {
 						<td>{{event.organisationseinheit}}</td>
 					</template>
 				</tr>
+				<tr v-if="event.type == LV_TYPES.moodle">
+				    <th>Link:</th>
+					<td><a :href="event?.url" target="_blank"><i class="fa fa-arrow-up-right-from-square me-1"></i></a></td>
+				</tr>
 			</tbody>
 		</table>
 	`
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 4b4879e29..9e7cd528f 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -146,6 +146,17 @@ export const Stundenplan = {
 						promise_events = promise_events.concat(data);
 					}
 				})
+				promise_events.sort((a, b) => {
+					if(a.type=='moodle'){
+						return -1;
+					}
+					else if(b.type=='moodle'){
+						return 1;
+					}
+					else{
+						return 0;
+					}
+				});
 				this.events = promise_events;
 			});
 		},
@@ -155,12 +166,12 @@ export const Stundenplan = {
 			let date_end = Math.floor(new Date(end_date).getTime() / 1000);
 			return this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid('io23m005', date_start, date_end).then((response) => response.events).then(events => {
 				let data =events.map(event =>{
-					const event_start_date = new Date(Number(event.timestart) * 1000);
-					const event_end_date = new Date(((Number(event.timestart) + Number(event.timeduration)) * 1000));
+					const event_start_date = new Date(event.timestart);
+					const event_end_date = new Date(event.timeend);
 					const formatted_date = `${event_start_date.getFullYear()}-${event_start_date.getMonth()+1}-${event_start_date.getDate()}`;
 					// to get the same date and time as in moodle, we use the default UTC time zone 
-					const formatted_start_time = event_start_date.toLocaleTimeString(this.$p.user_locale, {hour:'2-digit',minute:'2-digit', second:'2-digit',hour12:false, timeZone:'UTC'});
-					const formatted_end_time = event_end_date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false, timeZone: 'UTC' });
+					const formatted_start_time = event_start_date.toLocaleTimeString(this.$p.user_locale, {hour:'2-digit',minute:'2-digit', second:'2-digit',hour12:false});
+					const formatted_end_time = event_end_date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false });
 					
 					return {
 						type:'moodle',
@@ -184,6 +195,7 @@ export const Stundenplan = {
 						farbe:'00689E',
 						lehrveranstaltung_id:0,
 						ort_content_id:0,
+						url:event?.url,
 					}
 				});
 				return {

From e635d5e0e174fb489a56de59bf3e1f16c08b8b0e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 26 Feb 2025 13:43:28 +0100
Subject: [PATCH 037/572] update(Dashboard Calendar Moodle): adds the moodle
 Calendar Events in the Dashboard Stundenplan both for the minimized view and
 the month view

---
 public/js/api/stundenplan.js                  |  1 +
 public/js/components/Cis/Cms/ContentModal.js  |  4 +-
 .../components/Cis/Stundenplan/Stundenplan.js |  2 +-
 public/js/components/DashboardWidget/Ampel.js |  4 +-
 public/js/components/DashboardWidget/News.js  |  4 +-
 .../components/DashboardWidget/Stundenplan.js | 91 +++++++++++++++++--
 public/js/components/DashboardWidget/Url.js   |  2 +-
 7 files changed, 91 insertions(+), 17 deletions(-)

diff --git a/public/js/api/stundenplan.js b/public/js/api/stundenplan.js
index 0f5de934e..94dad7ffe 100644
--- a/public/js/api/stundenplan.js
+++ b/public/js/api/stundenplan.js
@@ -53,4 +53,5 @@ export default {
 			}
 		);
 	},
+	
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Cms/ContentModal.js b/public/js/components/Cis/Cms/ContentModal.js
index 87aaf98f9..b7533305f 100644
--- a/public/js/components/Cis/Cms/ContentModal.js
+++ b/public/js/components/Cis/Cms/ContentModal.js
@@ -1,5 +1,5 @@
-import BsModal from "../../Bootstrap/Modal";
-import RaumContent from "./Content_types/Raum_contentmittitel";
+import BsModal from "../../Bootstrap/Modal.js";
+import RaumContent from "./Content_types/Raum_contentmittitel.js";
 
 
 export default {
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 9e7cd528f..cdc5d3e06 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -240,7 +240,7 @@ export const Stundenplan = {
 					<span class="flex-grow-1 text-center ">{{event.topic}}</span>
 				</div>
 			</div>
-			<div class="p-1" v-else>
+			<div v-else class="p-1">
 				<span>{{event.topic}}</span>
 			</div>
 		</template>
diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index 4cb49ce94..925942079 100644
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -1,5 +1,5 @@
-import AbstractWidget from './Abstract';
-import BaseOffcanvas from '../Base/Offcanvas';
+import AbstractWidget from './Abstract.js';
+import BaseOffcanvas from '../Base/Offcanvas.js';
 
 let _idcounter = 0;
 
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index f6b94e6f1..98c5244e1 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -1,5 +1,5 @@
-import AbstractWidget from './Abstract';
-import BsModal from '../Bootstrap/Modal';
+import AbstractWidget from './Abstract.js';
+import BsModal from '../Bootstrap/Modal.js';
 
 const MAX_LOADED_NEWS = 30;
 
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index bf4324f4a..18f609260 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -4,6 +4,7 @@ import FhcCalendar from '../Calendar/Calendar.js';
 import LvModal from '../Cis/Mylv/LvModal.js';
 import ContentModal from '../Cis/Cms/ContentModal.js'
 import CalendarDate from '../../composables/CalendarDate.js';
+import moodleSvg from "../../helpers/moodleSVG.js"
 
 export default {
 	mixins: [
@@ -14,6 +15,7 @@ export default {
 		FhcCalendar,
 		LvModal,
 		ContentModal,
+		moodleSvg
 	},
 	
 	data() {
@@ -123,7 +125,8 @@ export default {
 		loadEvents: function () {
 			Promise.allSettled([
 				this.$fhcApi.factory.stundenplan.getStundenplan(this.monthFirstDay, this.monthLastDay),
-				this.$fhcApi.factory.stundenplan.getStundenplanReservierungen(this.monthFirstDay, this.monthLastDay)
+				this.$fhcApi.factory.stundenplan.getStundenplanReservierungen(this.monthFirstDay, this.monthLastDay),
+				this.loadMoodleEvents(this.monthFirstDay, this.monthLastDay)
 			]).then((result) => {
 				let promise_events = [];
 				result.forEach((promise_result) => {
@@ -149,10 +152,65 @@ export default {
 						promise_events = promise_events.concat(data);
 					}
 				})
+				promise_events.sort((a, b) => {
+					if (a.type == 'moodle') {
+						return -1;
+					}
+					else if (b.type == 'moodle') {
+						return 1;
+					}
+					else {
+						return 0;
+					}
+				});
 				this.events = promise_events;
 			});
 		},
+		loadMoodleEvents: function (start_date, end_date) {
 
+			let date_start = Math.floor(new Date(start_date).getTime() / 1000);
+			let date_end = Math.floor(new Date(end_date).getTime() / 1000);
+			return this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid('io23m005', date_start, date_end).then((response) => response.events).then(events => {
+				let data = events.map(event => {
+					const event_start_date = new Date(event.timestart);
+					const event_end_date = new Date(event.timeend);
+					const formatted_date = `${event_start_date.getFullYear()}-${event_start_date.getMonth() + 1}-${event_start_date.getDate()}`;
+					// to get the same date and time as in moodle, we use the default UTC time zone 
+					const formatted_start_time = event_start_date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false });
+					const formatted_end_time = event_end_date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false });
+
+					return {
+						type: 'moodle',
+						beginn: formatted_start_time,
+						ende: formatted_end_time,
+						allDayEvent: true,
+						datum: formatted_date,
+						purpose: event.purpose,
+						assignment: event.activityname,
+						topic: event.activitystr,
+						lektor: [],
+						gruppe: [],
+						ort_kurzbz: event.location,
+						//moodle idnumber entspricht der course id number die man den Kurs in Moodle vergeben kann
+						lehreinheit_id: event.lehreinheitsNummber ?? null,
+						titel: event.course.fullname,
+						lehrfach: '',
+						lehrform: '',
+						lehrfach_bez: '',
+						organisationseinheit: '',
+						farbe: '00689E',
+						lehrveranstaltung_id: 0,
+						ort_content_id: 0,
+						url: event?.url,
+					}
+				});
+				return {
+					data: data,
+					meta: { status: 'success' }
+				};
+			})
+
+		},
 		setCalendarMaximized() {
 			this.minimized = false
 		}
@@ -169,7 +227,13 @@ export default {
 		<content-modal :content_id="roomInfoContentID" dialogClass="modal-lg" ref="contentModal"/>
 		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" :widget="true" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" >
 			<template #monthPage="{event,day}">
-				<span  >
+				<div  v-if="event.type=='moodle'">
+					<div class="d-flex small w-100" >
+						<moodle-svg></moodle-svg>
+						<span class="flex-grow-1 text-center ">{{event.topic}}</span>
+					</div>
+				</div>
+				<span v-else class="small" >
 					{{event.topic}}
 				</span>
 			</template>
@@ -183,13 +247,22 @@ export default {
 							<button class="btn btn-link link-secondary text-decoration-none" @click="setCalendarMaximized">{{ key.format({dateStyle: "full"}, $p.user_locale.value)}}</button>
 						</div>
 						<div role="button" @click="showLvUebersicht(evt)" v-for="evt in value" :key="evt.id" class="list-group-item small" :style="getEventStyle(evt)">
-							<b>{{evt.topic}}</b>
-							<br>
-							<small v-if="evt.ort_kurzbz" class="d-flex w-100 justify-content-between">
-								<!-- event modifier stop to prevent opening the modal for the lv Uebersicht when clicking on the ort_kurzbz -->
-								<span @click.stop="showRoomInfoModal(evt.ort_kurzbz)" style="text-decoration:underline" type="button">{{evt.ort_kurzbz}}</span>
-								<span>{{evt.start.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}-{{evt.end.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}</span>
-							</small>
+							<template v-if="evt.type=='moodle'">
+								<div class="d-flex align-items-center ">
+									<moodle-svg></moodle-svg>
+									<b class="flex-grow-1 text-center">{{evt.topic}}</b>
+								</div>
+							</template>
+							<template v-else>
+								<b>{{evt.topic}}</b>
+								<br>
+								<small v-if="evt.ort_kurzbz" class="d-flex w-100 justify-content-between">
+									<!-- event modifier stop to prevent opening the modal for the lv Uebersicht when clicking on the ort_kurzbz -->
+									<span @click.stop="showRoomInfoModal(evt.ort_kurzbz)" style="text-decoration:underline" type="button">{{evt.ort_kurzbz}}</span>
+									<span>{{evt.start.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}-{{evt.end.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}</span>
+								</small>
+							</template>
+							
 						</div>
 						<div v-if="!value.length" class="list-group-item small text-center">
 							{{ p.t('lehre/noLvFound') }}
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index eaf42ab2d..d3b3e8b2d 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -1,7 +1,7 @@
 import CoreForm from "../Form/Form.js";
 import FormInput from "../Form/Input.js";
 import BsModal from "../Bootstrap/Modal.js";
-import AbstractWidget from './Abstract';
+import AbstractWidget from './Abstract.js';
 
 export default {
 	name: "WidgetsUrl",

From c833b40527fc4f7d62ccf4693e77baa6d395a56d Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 26 Feb 2025 15:11:05 +0100
Subject: [PATCH 038/572] merge fix

---
 public/js/apps/Dashboard/Fhc.js                     | 1 +
 public/js/components/Calendar/Month/Page.js         | 6 +-----
 public/js/components/Cis/Stundenplan/Stundenplan.js | 6 +++---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index d49195399..9df11e491 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -203,6 +203,7 @@ router.beforeEach((to, from) => {
 	// beforeEnter navigation guard
 	
 	// TODO: manage the infinite forward navigation issue somehow
+	// https://stackoverflow.com/questions/28028297/how-can-i-delete-a-window-history-state?rq=3
 	if (to.fullPath === from.fullPath) {
 		return false
 	}
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 27c649f1b..6d6b27d21 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -63,10 +63,6 @@ export default {
 		
 	},
 	methods: {
-		handleEventClick(e, day) {
-			this.selectDay(day)
-			e.stopPropagation()
-		},
 		getDayClass(week, day) {
 			let classstring = 'fhc-calendar-month-page-day text-decoration-none overflow-hidden'
 			const isHighlightedWeek = this.isHighlightedWeek(week)
@@ -158,7 +154,7 @@ export default {
 				<span v-if="events[day.toDateString()] && events[day.toDateString()].length" class="events">
 					<div v-for="event in events[day.toDateString()]" :key="event.id" 
 					:style="{'background-color': event.color}" class="fhc-entry" :selected="event == selectedEvent"
-					v-contrast @click="handleEventClick($event, day)">
+					v-contrast @click.stop="selectDay(day)">
 						<slot  name="monthPage" :event="event" :day="day" >
 							<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 						</slot>
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index c27a3bc30..e11845e8b 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -399,15 +399,15 @@ const Stundenplan = {
 						</div>
 						<div class="col">
 							<p>{{ $p.t('lehre/lehrveranstaltung') }}:</p>
-							<p class="m-0">{{event?.orig.topic}}</p>
+							<p class="m-0">{{event?.topic}}</p>
 						</div>
 						<div class="col" :style="'max-height: ' + eventMaxHeight + '; overflow: auto;'">
 							<p>{{ $p.t('lehre/lektor') }}:</p>
-							<p class="m-0" v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</p>
+							<p class="m-0" v-for="lektor in event?.lektor">{{lektor.kurzbz}}</p>
 						</div>
 						<div class="col">
 							<p>{{ $p.t('profil/Ort') }}: </p>
-							<p class="m-0">{{event?.orig.ort_kurzbz}}</p>
+							<p class="m-0">{{event?.ort_kurzbz}}</p>
 						</div>
 					</div>
 				</template>

From 8e697515bc33513062fe46a85e16b8f30ae3be5b Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 26 Feb 2025 17:04:59 +0100
Subject: [PATCH 039/572] added vue datepicker11 option; month page header
 click show months in modal instead of switching page & mode;

---
 .../views/CisRouterView/CisRouterView.php     |  1 +
 application/views/templates/FHC-Common.php    |  1 +
 application/views/templates/FHC-Footer.php    |  6 +++-
 application/views/templates/FHC-Header.php    |  7 ++++-
 composer.json                                 | 26 ++++++++++++++++-
 public/js/components/Calendar/Month.js        | 28 ++++++++++++++++---
 public/js/components/Calendar/Months.js       |  6 ++--
 .../components/Cis/Stundenplan/Stundenplan.js |  4 +--
 8 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index 4590b210e..1c81f3570 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -8,6 +8,7 @@ $includesArray = array(
 	'tabulator5' => true,
 	'vue3' => true,
 	'primevue3' => true,
+	'vuedatepicker11' => true,
 	'customCSSs' => array(
 		'public/css/components/verticalsplit.css',
 		'public/css/components/searchbar/searchbar.css',
diff --git a/application/views/templates/FHC-Common.php b/application/views/templates/FHC-Common.php
index 245432f46..024bcb40d 100644
--- a/application/views/templates/FHC-Common.php
+++ b/application/views/templates/FHC-Common.php
@@ -28,6 +28,7 @@
 	$tinymce5 = isset($tinymce5) ? $tinymce5 : false;
 	$vue3 = isset($vue3) ? $vue3 : false;
 	$primevue3 = isset($primevue3) ? $primevue3 : false;
+	$vuedatepicker11 = isset($vuedatepicker11) ? $vuedatepicker11 : false;
 
 	// Hooks
 	$addons = isset($addons) ? $addons : false;
diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php
index d78e0e9c3..76d581c4c 100644
--- a/application/views/templates/FHC-Footer.php
+++ b/application/views/templates/FHC-Footer.php
@@ -152,6 +152,8 @@
 		generateJSsInclude('vendor/npm-asset/primevue/confirmationservice/confirmationservice.min.js');
 	}
 
+	if($vuedatepicker11) generateJSsInclude('vendor/vuejs/vuedatepicker_js11/vue-datepicker.iife.js');
+	
 	// --------------------------------------------------------------------------------------------------------
 	// From public folder
 
@@ -181,11 +183,13 @@
 
 	// User Defined Fields
 	if ($udfs === true) generateJSsInclude('public/js/UDFWidget.js');
-
+	
 	// Load addon hooks JS
 	// NOTE: keep it as the last but one
 	if ($addons === true) generateAddonsJSsInclude($calledPath.'/'.$calledMethod);
 
+	
+	
 	// Eventually required JS
 	// NOTE: keep it as the latest
 	generateJSsInclude($customJSs);
diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php
index bca75512f..8e813916e 100644
--- a/application/views/templates/FHC-Header.php
+++ b/application/views/templates/FHC-Header.php
@@ -92,7 +92,12 @@
 				generateCSSsInclude('vendor/npm-asset/primeicons/primeicons.css');
 			}
 
-			// --------------------------------------------------------------------------------------------------------
+			if ($vuedatepicker11 === true)
+			{
+				generateCSSsInclude('vendor/vuejs/vuedatepicker_css11/main.css');
+			}
+			
+		// --------------------------------------------------------------------------------------------------------
 			// From public folder
 
 			// AjaxLib CSS
diff --git a/composer.json b/composer.json
index 15d61f3d1..6aa94c0f7 100644
--- a/composer.json
+++ b/composer.json
@@ -370,6 +370,28 @@
 				}
 			}
 		},
+		{
+			"type": "package",
+			"package": {
+				"name": "vuejs/vuedatepicker_js11",
+				"version": "11.0.1",
+				"dist": {
+					"url": "https://unpkg.com/@vuepic/vue-datepicker@11.0.1/dist/vue-datepicker.iife.js",
+					"type": "file"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "vuejs/vuedatepicker_css11",
+				"version": "11.0.1",
+				"dist": {
+					"url": "https://unpkg.com/@vuepic/vue-datepicker@11.0.1/dist/main.css",
+					"type": "file"
+				}
+			}
+		},
 		{
 			"type": "package",
 			"package": {
@@ -456,7 +478,9 @@
 		"vuejs/vuejs3": "3.3.8",
 		"vuejs/vuerouter4": "4.1.3",
 		"vuejs/vuedatepicker_js": "7.2.0",
-		"vuejs/vuedatepicker_css": "7.2.0"
+		"vuejs/vuedatepicker_css": "7.2.0",
+		"vuejs/vuedatepicker_js11": "11.0.1",
+		"vuejs/vuedatepicker_css11": "11.0.1"
 
 	},
 	"config": {
diff --git a/public/js/components/Calendar/Month.js b/public/js/components/Calendar/Month.js
index d427304b8..9d35707a0 100644
--- a/public/js/components/Calendar/Month.js
+++ b/public/js/components/Calendar/Month.js
@@ -1,14 +1,17 @@
 import CalendarAbstract from './Abstract.js';
 import CalendarPane from './Pane.js';
 import CalendarMonthPage from './Month/Page.js';
-
+import BsModal from "../Bootstrap/Modal.js";
+import Months from "./Months";
 export default {
 	mixins: [
 		CalendarAbstract
 	],
 	components: {
 		CalendarMonthPage,
-		CalendarPane
+		CalendarPane,
+		BsModal,
+		Months
 	},
 	data() {
 		return {
@@ -21,6 +24,16 @@ export default {
 		}
 	},
 	methods: {
+		handleMonthChanged(month) {
+			this.$emit('change:offset', { y: 0, m: month - this.focusDate.m, d: 0 });
+			this.$refs.modalDatepickerContainer.hide()
+		},
+		hideMonthsModal() {
+			this.$refs.modalDatepickerContainer.hide()
+		},
+		handleHeaderClickMonth() {
+			this.$refs.modalDatepickerContainer.show()
+		},
 		paneChanged(dir) {
 			if (this.syncOnNextChange) {
 				this.syncOnNextChange = false;
@@ -65,7 +78,7 @@ export default {
 	},
 	template: `
 	<div class="fhc-calendar-month">
-		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" @click="$emit('updateMode', 'months')" >
+		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" @click="handleHeaderClickMonth">
 			<template #calendarDownloads>
 				<slot name="calendarDownloads"></slot>
 			</template>
@@ -77,5 +90,12 @@ export default {
 				</template>
 			</calendar-month-page>
 		</calendar-pane>
-	</div>`
+	</div>
+
+	<bs-modal ref="modalDatepickerContainer" dialogClass='modal-lg' class="bootstrap-prompt">
+		<template v-slot:default>
+			<months @change="handleMonthChanged"></months>
+		</template>
+	</bs-modal>
+`
 }
diff --git a/public/js/components/Calendar/Months.js b/public/js/components/Calendar/Months.js
index 6ef9b1bb1..1647f6f6a 100644
--- a/public/js/components/Calendar/Months.js
+++ b/public/js/components/Calendar/Months.js
@@ -4,6 +4,9 @@ export default {
 	mixins: [
 		CalendarAbstract
 	],
+	emits: [
+		'change'
+	],
 	inject: [
 		'size'
 	],
@@ -22,10 +25,9 @@ export default {
 	},
 	template: `
 	<div class="fhc-calendar-months">
-		<calendar-header :title="title" @prev="focusDate.y--" @next="focusDate.y++" @click="$emit('updateMode', 'years')" @updateMode="$emit('updateMode', $event)" />
 		<div class="d-flex flex-wrap">
 			<div v-for="(month, key) in months" :key="key" class="d-grid col-4">
-				<button @click="focusDate.m = key; $emit('updateMode', 'month')" class="btn btn-outline-secondary" :class="{'border-0': key != focusDate.m}">
+				<button @click=" $emit('change', key); focusDate.m = key;" class="btn btn-outline-secondary" :class="{'border-0': key != focusDate.m}">
 					{{month}}
 				</button>
 			</div>
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index e11845e8b..2ee684c32 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -355,12 +355,12 @@ const Stundenplan = {
 					<span class="flex-grow-1 text-center ">{{event.topic}}</span>
 				</div>
 			</div>
-			<div v-else @click="showModal($event, event)" class="p-1">
+			<div v-else @click="showModal(event)" class="p-1">
 				<span>{{event.topic}}</span>
 			</div>
 		</template>
 		<template #weekPage="{event,day}">
-			<div @click="showModal(event); " type="button"
+			<div @click="showModal(event)" type="button"
 			class=" position-relative border border-secondary border d-flex flex-col align-items-center justify-content-evenly h-100"
 			:class="{'p-1':event.allDayEvent}"
 			style="overflow: auto;">

From 00b77d726cf5201ce8bec4fcfd50ceb75f7b53c4 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 26 Feb 2025 18:11:07 +0100
Subject: [PATCH 040/572] Studverwaltung Archiv: update of archived documents
 is possible, enabled archiving via multi-select

---
 .../api/frontend/v1/stv/Archiv.php            |  74 +++++++++-
 .../api/frontend/v1/stv/Config.php            |  26 ++--
 public/js/api/stv/archiv.js                   |   6 +-
 .../Stv/Studentenverwaltung/Details/Archiv.js | 129 +++++++++++-------
 .../Details/Archiv/Edit.js                    | 116 ++++++++++++++++
 5 files changed, 281 insertions(+), 70 deletions(-)
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js

diff --git a/application/controllers/api/frontend/v1/stv/Archiv.php b/application/controllers/api/frontend/v1/stv/Archiv.php
index dc93c2c4c..91fc9643d 100644
--- a/application/controllers/api/frontend/v1/stv/Archiv.php
+++ b/application/controllers/api/frontend/v1/stv/Archiv.php
@@ -38,7 +38,7 @@ class Archiv extends FHCAPI_Controller
 			'getArchivVorlagen' => ['admin:r', 'assistenz:r'],
 			'archive' => ['admin:w', 'assistenz:w'],
 			'download' => ['admin:w', 'assistenz:w'],
-			//'update' => ['admin:w', 'assistenz:w'],
+			'update' => ['admin:w'],
 			'delete' => ['admin:w', 'assistenz:w']
 		]);
 
@@ -147,13 +147,83 @@ class Archiv extends FHCAPI_Controller
 			$result = $this->aktelib->get($akte_id);
 		}
 
-		/*	 * 	$fileObj->filename
+	/*	$fileObj->filename
 	 * 	$fileObj->file
 	 * 	$fileObj->name
 	 * 	$fileObj->mimetype
 	 * 	$fileObj->disposition*/
 	}
 
+	/**
+	 * Updating an Akte
+	 * @return void
+	 */
+	public function update()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('akte_id', 'Akte Id', 'required');
+		$this->form_validation->set_rules('signiert', 'Signiert', 'is_bool');
+		$this->form_validation->set_rules('stud_selfservice', 'Self-Service', 'is_bool');
+
+		//Events::trigger('konto_update_validation', $this->form_validation);
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$id = $this->input->post('akte_id');
+
+		// get the akte
+		$result = $this->AkteModel->load($id);
+
+		if (!hasData($result)) $this->terminateWithError("Akte not found!");
+
+		$akte = getData($result)[0];
+
+		$allowed = [
+			'signiert',
+			'stud_selfservice'
+		];
+
+		$data = [
+			'updateamum' => date('c'),
+			'updatevon' => getAuthUID()
+		];
+
+		// if Akte has Inhalt directly in Akte table
+		if (isset($_FILES['datei']['tmp_name']))
+		{
+		$this->addMeta('read', "read");
+			// update inhalt directly
+
+			// get tmp file
+			$filename = $_FILES['datei']['tmp_name'];
+			// open it
+			$fp = fopen($filename,'r');
+			// read it
+			$content = fread($fp, filesize($filename));
+			fclose($fp);
+			// encode it
+			$data['inhalt'] = base64_encode($content);
+			$this->addMeta('content', base64_encode($content));
+		}
+
+		
+		foreach ($allowed as $field)
+			if ($this->input->post($field) !== null)
+				$data[$field] = $this->input->post($field);
+
+		$this->addMeta("data", $data);
+
+		$result = $this->AkteModel->update($id, $data);
+
+		$this->getDataOrTerminateWithError($result);
+
+		$result = null;
+
+		$this->terminateWithSuccess($result);
+	}
+
 
 	/**
 	 * Delete archived Akte
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 2cc2228c9..3415c8e41 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -94,23 +94,15 @@ class Config extends FHCAPI_Controller
 		/* TODO(chris): Ausgeblendet für Testing
 		$result['grades'] = [
 			'title' => $this->p->t('stv', 'tab_grades'),
-			'component' => './Stv/Studentenverwaltung/Details/Noten.js',
-			'showOnlyWithUid' => true,
-			'config' => [
-				'usePoints' => defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE,
-				'edit' => 'both', // Possible values: both|header|inline
-				'delete' => 'both', // Possible values: both|header|inline
-				'documents' => 'both', // Possible values: both|header|inline
-				'documentslist' => $this->gradesDocumentsList()
-			]
+			'component' => './Stv/Studentenverwaltung/Details/Noten.js'
 		];
 		*/
 		$result['archive'] = [
 			'title' => $this->p->t('stv', 'tab_archive'),
-			'component' => './Stv/Studentenverwaltung/Details/Archiv.js'
-			//~ 'config' => [
-				//~ //'columns' => $this->kontoColumns()
-			//~ ]
+			'component' => './Stv/Studentenverwaltung/Details/Archiv.js',
+			'config' => [
+				'showEdit' => $this->permissionlib->isBerechtigt('admin')
+			]
 		];
 
 		Events::trigger('stv_conf_student', function & () use (&$result) {
@@ -148,10 +140,10 @@ class Config extends FHCAPI_Controller
 		];
 		$result['archive'] = [
 			'title' => $this->p->t('stv', 'tab_archive'),
-			'component' => './Stv/Studentenverwaltung/Details/Archiv.js'
-			//~ 'config' => [
-				//~ //'columns' => $this->kontoColumns()
-			//~ ]
+			'component' => './Stv/Studentenverwaltung/Details/Archiv.js',
+			'config' => [
+				'showEdit' => $this->permissionlib->isBerechtigt('admin')
+			]
 		];
 
 		Events::trigger('stv_conf_students', function & () use (&$result) {
diff --git a/public/js/api/stv/archiv.js b/public/js/api/stv/archiv.js
index 0f303684b..76dbecec8 100644
--- a/public/js/api/stv/archiv.js
+++ b/public/js/api/stv/archiv.js
@@ -21,9 +21,9 @@ export default {
 			data
 		);
 	},
-	//~ edit(data) {
-		//~ return this.$fhcApi.post('api/frontend/v1/stv/konto/update', data);
-	//~ },
+	update(data) {
+		return this.$fhcApi.post('api/frontend/v1/stv/archiv/update', data);
+	},
 	delete({akte_id, studiengang_kz}) {
 		return this.$fhcApi.post('api/frontend/v1/stv/archiv/delete', {akte_id, studiengang_kz});
 	}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index 7858dbd5e..f69e89838 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -1,14 +1,12 @@
 import {CoreFilterCmpt} from "../../../filter/Filter.js";
 import FormInput from "../../../Form/Input.js";
-//~ import KontoNew from "./Konto/New.js";
-//~ import KontoEdit from "./Konto/Edit.js";
+import AkteEdit from "./Archiv/Edit.js";
 
 export default {
 	components: {
 		CoreFilterCmpt,
-		FormInput
-		//~ KontoNew,
-		//~ KontoEdit
+		FormInput,
+		AkteEdit
 	},
 	inject: {
 		defaultSemester: {
@@ -76,31 +74,62 @@ export default {
 		tabulatorColumns() {
 			const columns = [
 				{title: "Akte Id", field: "akte_id", visible: false},
-				{title: "Titel", field: "titel"},
-				{title: "Bezeichnung", field: "bezeichnung"},
-				{title: "Erstelldatum", field: "erstelltam"},
-				{title: "Signiert", field: "erstelltam"},
-				{title: "Selfservice", field: "signiert"},
-				{title: "AkzeptiertAmUm", field: "akzeptiertamum"},
-				{title: "Gedruckt", field: "gedruckt", visible: false},
+				{title: this.$p.t('stv', 'archiv_title'), field: "titel"},
+				{title: this.$p.t('stv', 'archiv_description'), field: "bezeichnung"},
+				{title: this.$p.t('stv', 'archiv_creation_date'), field: "erstelltam"},
+				{
+					title: this.$p.t('stv', 'archiv_signiert'),
+					field: "signiert",
+					formatter:"tickCross",
+					hozAlign:"center",
+					formatterParams: {
+						tickElement: '<i class="fa fa-check text-success"></i>',
+						crossElement: '<i class="fa fa-xmark text-danger"></i>'
+					}
+				},
+				{
+					title: "Selfservice",
+					field: "stud_selfservice",
+					formatter:"tickCross",
+					hozAlign:"center",
+					formatterParams: {
+						tickElement: '<i class="fa fa-check text-success"></i>',
+						crossElement: '<i class="fa fa-xmark text-danger"></i>'
+					},
+				},
+				{title: this.$p.t('stv', 'archiv_accepted_on_at'), field: "akzeptiertamum"},
+				{
+					title: this.$p.t('stv', 'archiv_gedruckt'),
+					field: "gedruckt",
+					visible: false,
+					formatter:"tickCross",
+					hozAlign:"center",
+					formatterParams: {
+						tickElement: '<i class="fa fa-check text-success"></i>',
+						crossElement: '<i class="fa fa-xmark text-danger"></i>'
+					}
+				},
 				{
 					title: 'Aktionen', field: 'actions',
 					formatter: (cell, formatterParams, onRendered) => {
 						let container = document.createElement('div');
 						container.className = "d-flex gap-2";
 
-						//~ let button = document.createElement('button');
-						//~ button.className = 'btn btn-outline-secondary';
-						//~ button.innerHTML = '<i class="fa fa-edit"></i>';
-						//~ button.addEventListener('click', () =>
-							//~ this.$refs.edit.open(cell.getData())
-						//~ );
-						//~ container.append(button);
+						if (this.config.showEdit)
+						{
+							let editButton = document.createElement('button');
+							editButton.className = 'btn btn-outline-secondary';
+							editButton.innerHTML = '<i class="fa fa-edit"></i>';
+							editButton.addEventListener('click', () =>
+								this.$refs.edit.open(cell.getData())
+							);
+							container.append(editButton);
+						}
 
-						let button = document.createElement('button');
-						button.className = 'btn btn-outline-secondary';
-						button.innerHTML = '<i class="fa fa-trash"></i>';
-						button.addEventListener('click', evt => {
+						let deleteButton = document.createElement('button');
+						deleteButton.className = 'btn btn-outline-secondary';
+						deleteButton.innerHTML = '<i class="fa fa-trash"></i>';
+						deleteButton.addEventListener('click', evt => {
 							evt.stopPropagation();
 							this.$fhcAlert
 								.confirmDelete()
@@ -112,7 +141,7 @@ export default {
 								})
 								.catch(this.$fhcAlert.handleSystemError);
 						});
-						container.append(button);
+						container.append(deleteButton);
 
 						return container;
 					},
@@ -158,31 +187,36 @@ export default {
 		updateData(data) {
 			if (!data)
 				return this.reload();
-			// TODO(chris): check children (!delete?, multiple children)
-			//this.$refs.table.tabulator.updateOrAddData(data.map(row => row.buchungsnr_verweis ? {buchungsnr:row.buchungsnr_verweis, _children:row} : row));
 			this.$refs.table.tabulator.updateOrAddData(data);
 		},
 		actionArchive() {
-			this.loading = true;
-			this.$fhcApi
-				.factory.stv.archiv.archive({
-					xml: this.getXmlByXsl(this.vorlage_kurzbz),
-					xsl: this.vorlage_kurzbz,
-					ss: this.defaultSemester,
-					uid: this.modelValue.uid,
-					prestudent_id: this.modelValue.prestudent_id
-				})
-				.then(result => result.data)
-				.then(() => {
-					this.reload();
-					this.loading = false;
-				})
-				.then(() => this.$p.t('ui/gespeichert'))
-				.then(this.$fhcAlert.alertSuccess)
-				.catch(error => {
-					this.$fhcAlert.handleSystemError(error);
-					this.loading = false;
-				});
+			console.log(this.modelValue);
+			let archiveDataArr = Array.isArray(this.modelValue) ? this.modelValue : [this.modelValue];
+
+			for (let archiveData of archiveDataArr)
+			{
+				this.loading = true;
+				this.$fhcApi
+					.factory.stv.archiv.archive({
+						xml: this.getXmlByXsl(this.vorlage_kurzbz),
+						xsl: this.vorlage_kurzbz,
+						ss: this.defaultSemester,
+						uid: archiveData.uid,
+						prestudent_id: archiveData.prestudent_id
+					})
+					.then(result => result.data)
+					.then(() => {
+						this.reload();
+						this.loading = false;
+					})
+					.then(() => this.$p.t('ui/gespeichert'))
+					.then(this.$fhcAlert.alertSuccess)
+					.catch(error => {
+						this.$fhcAlert.handleSystemError(error);
+						this.loading = false;
+					});
+				
+			}
 		},
 		actionDownload(akte_id) {
 			window.open(
@@ -235,7 +269,6 @@ export default {
 				</div>
 			</template>
 		</core-filter-cmpt>
+		<akte-edit ref="edit" :config="config" @saved="updateData"></akte-edit>
 	</div>`
 };
-		//~ <konto-new ref="new" :config="config" @saved="updateData" :person-ids="personIds" :stg-kz="stg_kz"></konto-new>
-		//~ <konto-edit ref="edit" :config="config" @saved="updateData"></konto-edit>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js
new file mode 100644
index 000000000..35777b6ac
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js
@@ -0,0 +1,116 @@
+import BsModal from "../../../../Bootstrap/Modal.js";
+import CoreForm from "../../../../Form/Form.js";
+import FormValidation from "../../../../Form/Validation.js";
+import FormInput from "../../../../Form/Input.js";
+import FormUploadDms from '../../../../Form/Upload/Dms.js';
+
+export default {
+	components: {
+		BsModal,
+		CoreForm,
+		FormValidation,
+		FormInput,
+		FormUploadDms
+	},
+	inject: {
+		lists: {
+			from: 'lists'
+		}
+	},
+	props: {
+		config: {
+			type: Object,
+			default: {}
+		}
+	},
+	data() {
+		return {
+			loading: false,
+			//file: [],
+			data: {
+				datei: []
+			}
+		};
+	},
+	methods: {
+		save() {
+			this.$refs.form.clearValidation();
+			this.loading = true;
+
+			//~ const formData = new FormData();
+			//~ formData.append('data', JSON.stringify(this.data));
+			//Object.entries(this.data.anhang).forEach(([k, v]) => formData.append(k, v));
+
+			this.$refs.form
+				.factory.stv.archiv.update(this.data)
+				.then(result => {
+					this.$emit('saved', result.data);
+					this.loading = false;
+					this.$refs.modal.hide();
+					this.$fhcAlert.alertSuccess(this.$p.t('ui/gespeichert'));
+				})
+				.catch(error => {
+					this.$fhcAlert.handleSystemError(error);
+					this.loading = false;
+				});
+		},
+		open(data) {
+			this.data.datei = [];
+			this.data = {...this.data, ...data};
+			this.$refs.modal.show();
+		},
+		preventCloseOnLoading(ev) {
+			if (this.loading)
+				ev.returnValue = false;
+		}
+	},
+	template: `
+	<core-form ref="form" class="stv-details-archiv-edit" @submit.prevent="save">
+		<bs-modal ref="modal" @hide-bs-modal="preventCloseOnLoading">
+			<form-validation></form-validation>
+			<fieldset :disabled="loading">
+				<div class="mb-3">
+					{{ data.titel }} ({{ data.bezeichnung }})
+				</div>
+				<form-input
+					v-model="data.akte_id"
+					name="akte_id"
+					:label="$p.t('stv/archiv_akte_id')"
+					disabled
+					>
+				</form-input>
+				<div class="position-relative">
+					<label for="text" class="form-label col-sm-2">{{ $p.t('stv/archiv_new_file') }}</label>
+					<!--Upload Component-->
+					<FormUploadDms ref="upload" id="inhalt" v-model="data.datei"></FormUploadDms>
+				</div>
+				<form-input
+					container-class="form-check"
+					type="checkbox"
+					name="signiert"
+					:label="$p.t('stv/archiv_signiert')"
+					v-model="data.signiert"
+				>
+				</form-input>
+				<form-input
+					container-class="form-check"
+					type="checkbox"
+					name="stud_selfservice"
+					:label="'Selfservice'"
+					v-model="data.stud_selfservice"
+				>
+				</form-input>
+			</fieldset>
+
+			<template #title>
+				{{ $p.t('stv/archiv_title_edit', data) }}
+			</template>
+			<template #footer>
+				<button type="submit" class="btn btn-primary" :disabled="loading">
+					<i v-if="loading" class="fa fa-spinner fa-spin"></i>
+					{{ $p.t('ui/speichern') }}
+				</button>
+			</template>
+		</bs-modal>
+	</core-form>`
+};
\ No newline at end of file

From 9bd5f6dcb62573ce62c33a7007d47a109f62abfa Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Wed, 26 Feb 2025 19:38:09 +0100
Subject: [PATCH 041/572] Studierendenverwaltung Archiv: enabled download of
 documents

---
 .../controllers/api/frontend/v1/stv/Akte.php  | 70 +++++++++++++++++++
 .../Stv/Studentenverwaltung/Details/Archiv.js |  2 +-
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Akte.php

diff --git a/application/controllers/api/frontend/v1/stv/Akte.php b/application/controllers/api/frontend/v1/stv/Akte.php
new file mode 100644
index 000000000..1d38c96d4
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Akte.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Controller for downloading Akte
+ */
+class Akte extends Auth_Controller
+{
+	/**
+	 * Calls the parent's constructor and prepares libraries and phrases
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'download' => ['admin:w', 'assistenz:w'],
+		]);
+
+		// Load models
+		$this->load->model('crm/Akte_model', 'AkteModel');
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 *
+	 * Downloads an Akte
+	 */
+	public function download()
+	{
+		$akte_id = $this->input->get('akte_id');
+
+		if (!is_numeric($akte_id)) $this->terminateWithError('akte Id missing');
+
+		$result = $this->AkteModel->load($akte_id);
+
+		if (!hasData($result)) $this->terminateWithError('Akte not found');
+
+		$data = getData($result)[0];
+
+		if (isset($data->inhalt) && $data->inhalt != '')
+		{
+			header('Content-Description: File Transfer');
+			header('Content-Type: '. $data->mimetype);
+			header('Expires: 0');
+			header('Cache-Control: must-revalidate');
+			header('Pragma: public');
+			header('Content-Disposition: attachment; filename="'.$data->titel.'"');
+			echo base64_decode($data->inhalt);
+			die();
+		}
+	}
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index f69e89838..1856815a1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -221,7 +221,7 @@ export default {
 		actionDownload(akte_id) {
 			window.open(
 				FHC_JS_DATA_STORAGE_OBJECT.app_root
-				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/api/frontend/v1/stv/archiv/download?akte_id=' + encodeURIComponent(akte_id),
+				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/api/frontend/v1/stv/akte/download?akte_id=' + encodeURIComponent(akte_id),
 				'_blank'
 			);
 		},

From 9acc2a8a9db5ccb0116bf2047549e09a5622e8d1 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 27 Feb 2025 11:16:35 +0100
Subject: [PATCH 042/572] revert router.replace strategy in month page; added
 weeks component without header into modal when week page header is clicked to
 enable week selection but without leaving the week carousel page

---
 public/js/apps/Dashboard/Fhc.js               | 11 -------
 public/js/components/Calendar/Month.js        |  1 -
 public/js/components/Calendar/Month/Page.js   |  4 ++-
 public/js/components/Calendar/Months.js       |  1 +
 public/js/components/Calendar/Week.js         | 27 ++++++++++++++--
 public/js/components/Calendar/Weeks.js        | 13 ++++++--
 .../components/Cis/Stundenplan/Stundenplan.js | 31 ++++++-------------
 7 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 9df11e491..b8ec122e0 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -198,17 +198,6 @@ const router = VueRouter.createRouter({
 	]
 })
 
-router.beforeEach((to, from) => {
-	// this avoids redundant routing navigation in place due to router.replace on a route with param function and
-	// beforeEnter navigation guard
-	
-	// TODO: manage the infinite forward navigation issue somehow
-	// https://stackoverflow.com/questions/28028297/how-can-i-delete-a-window-history-state?rq=3
-	if (to.fullPath === from.fullPath) {
-		return false
-	}
-})
-
 const app = Vue.createApp({
 	name: 'FhcApp',
 	data: () => ({
diff --git a/public/js/components/Calendar/Month.js b/public/js/components/Calendar/Month.js
index 9d35707a0..520c4d0d9 100644
--- a/public/js/components/Calendar/Month.js
+++ b/public/js/components/Calendar/Month.js
@@ -44,7 +44,6 @@ export default {
 			this.emitRangeChanged()
 		},
 		emitRangeChanged(mounted = false) {
-
 			this.$emit('change:range', {
 				start: new Date(this.focusDate.y, this.focusDate.m, 1),
 				end: new Date(this.focusDate.y, this.focusDate.m+1, 0),
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 6d6b27d21..3aa6d41c9 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -67,10 +67,12 @@ export default {
 			let classstring = 'fhc-calendar-month-page-day text-decoration-none overflow-hidden'
 			const isHighlightedWeek = this.isHighlightedWeek(week)
 			const isHighlightedDay = this.isHighlightedDay(day)
-			const isThisDate = this.date.compare(day)
+			const isThisDate = this.focusDate.compare(day)
+
 			const isNotThisMonth = day.getMonth() != this.month
 			const isInThePast = day.getTime() < this.today // this.date is just the focusDate but not the initial Date
 			
+			if(isThisDate) classstring += ' border-8'
 			if(isHighlightedWeek) classstring += ' fhc-highlight-week'
 			if(isHighlightedDay) classstring += ' fhc-highlight-day'
 			
diff --git a/public/js/components/Calendar/Months.js b/public/js/components/Calendar/Months.js
index 1647f6f6a..6263e1b01 100644
--- a/public/js/components/Calendar/Months.js
+++ b/public/js/components/Calendar/Months.js
@@ -12,6 +12,7 @@ export default {
 	],
 	data() {
 		return {
+			// TODO: 36, 24, 16 (2+ 12 + 2) months to enable year switch?
 			monthIndices: [...Array(12).keys()]
 		}
 	},
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
index 132660d78..9e5baac76 100644
--- a/public/js/components/Calendar/Week.js
+++ b/public/js/components/Calendar/Week.js
@@ -1,6 +1,8 @@
 import CalendarAbstract from './Abstract.js';
 import CalendarPane from './Pane.js';
 import CalendarWeekPage from './Week/Page.js';
+import BsModal from "../Bootstrap/Modal.js";
+import Weeks from "./Weeks";
 
 export default {
 	mixins: [
@@ -8,7 +10,9 @@ export default {
 	],
 	components: {
 		CalendarWeekPage,
-		CalendarPane
+		CalendarPane,
+		BsModal,
+		Weeks
 	},
 	computed: {
 		title() {
@@ -16,6 +20,16 @@ export default {
 		}
 	},
 	methods: {
+		handleWeekChanged(week) {
+			// this.$emit('change:offset', { y: 0, m: month - this.focusDate.m, d: 0 });
+			this.$refs.modalDatepickerContainer.hide()
+		},
+		hideMonthsModal() {
+			this.$refs.modalDatepickerContainer.hide()
+		},
+		handleHeaderClickWeek() {
+			this.$refs.modalDatepickerContainer.show()
+		},
 		paneChanged(dir) {
 			this.focusDate.d += dir * 7;
 			this.emitRangeChanged();
@@ -42,7 +56,7 @@ export default {
 	},
 	template: /*html*/`
 	<div class="fhc-calendar-week">
-		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" @click="$emit('updateMode', 'weeks')">
+		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" @click="handleHeaderClickWeek">
 			<template #calendarDownloads>
 				<slot name="calendarDownloads"></slot>
 			</template>
@@ -54,5 +68,12 @@ export default {
 				</template>
 			</calendar-week-page>
 		</calendar-pane>
-	</div>`
+	</div>
+
+	<bs-modal ref="modalDatepickerContainer" dialogClass='modal-lg' class="bootstrap-prompt">
+		<template v-slot:default>
+			<weeks :header="false" @change="handleWeekChanged"></weeks>
+		</template>
+	</bs-modal>
+`
 }
diff --git a/public/js/components/Calendar/Weeks.js b/public/js/components/Calendar/Weeks.js
index 76243c67b..b8300b4b5 100644
--- a/public/js/components/Calendar/Weeks.js
+++ b/public/js/components/Calendar/Weeks.js
@@ -4,10 +4,19 @@ export default {
 	mixins: [
 		CalendarAbstract
 	],
+	emits: [
+		'change'
+	],
 	inject: [
 		'size',
 		'focusDate'
 	],
+	props: {
+		header: {
+			type: Boolean,
+			default: true
+		}
+	},
 	computed: {
 		weeks(){
 			return [...Array(this.focusDate.numWeeks).keys()].map(i => i + 1);
@@ -20,7 +29,7 @@ export default {
 		setWeek(week) {
 			// TODO(chris): test is there a week jump on year select? => yes there is if the same month/day are in different weeks ... should we prevent that?
 			this.focusDate.w = week;
-			this.$emit('updateMode', 'week');
+			this.$emit('change', week);
 		},
 		prev(){
 			this.focusDate.y--;
@@ -33,7 +42,7 @@ export default {
 	},
 	template: `
 	<div class="fhc-calendar-weeks h-100">
-		<calendar-header :title="title" @prev="prev" @next="next" @click="$emit('updateMode', 'years')" @updateMode="$emit('updateMode', $event)" />
+		<calendar-header v-if="header" :title="title" @prev="prev" @next="next" @click="$emit('updateMode', 'years')" @updateMode="$emit('updateMode', $event)" />
 		<div class="d-flex flex-wrap">
 			<div v-for="(week, key) in weeks" :key="key" class="d-grid col-2">
 				<button @click="setWeek(week)" class="btn btn-outline-secondary" :class="{'border-0': week != focusDate.w}">
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 2ee684c32..053b1c3b9 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -121,28 +121,15 @@ const Stundenplan = {
 				String(day.getMonth() + 1).padStart(2, "0") + "-" +
 				String(day.getDate()).padStart(2, "0");
 			const capitalizedMode = this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1);
-			const isMonthMode = capitalizedMode === 'Month'
-			const isInCurrentMonth = day.getMonth() == this.currentDay.getMonth()
-			
-			if(isMonthMode && isInCurrentMonth) {
-				this.$router.replace({
-					name: "Stundenplan",
-					params: {
-						mode: capitalizedMode,
-						focus_date: date,
-						lv_id: this.propsViewData?.lv_id || null
-					}
-				})
-			} else {
-				this.$router.push({
-					name: "Stundenplan",
-					params: {
-						mode: capitalizedMode,
-						focus_date: date,
-						lv_id: this.propsViewData?.lv_id || null
-					}
-				})
-			}
+
+			this.$router.push({
+				name: "Stundenplan",
+				params: {
+					mode: capitalizedMode,
+					focus_date: date,
+					lv_id: this.propsViewData?.lv_id || null
+				}
+			})
 
 			this.currentDay = day;
 		},

From 9b68bfd336bd4c7dc15ff90afc14f266b51d2bbd Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 27 Feb 2025 11:49:57 +0100
Subject: [PATCH 043/572] focus day highlight css animation

---
 public/css/components/calendar.css          | 23 +++++++++++++++++----
 public/js/components/Calendar/Month/Page.js |  2 +-
 public/js/components/Calendar/Week/Page.js  | 22 ++++++++++----------
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index f1005f516..9edc1c0f2 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -242,10 +242,25 @@
 	opacity: 0.5;
 }
 
-.fhc-calendar-month-page-day-highlight {
-	 /*background-color: #f5f5f5;*/
-	 /*background-color: red;*/
- }
+.fhc-calendar-month-page-day-focusday {
+	border-color: black !important;
+	background-color: white;
+	position: relative;
+	animation: dash-animation 2.5s linear infinite;
+}
+
+@keyframes dash-animation {
+	0% {
+		border-style: dashed;
+	}
+	50% {
+		border-style: solid;
+	}
+	100% {
+		border-style: dashed;
+	}
+}
+
 .fhc-highlight-week {
 	/*border-color: black !important;*/
 }
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 3aa6d41c9..47630f47f 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -72,7 +72,7 @@ export default {
 			const isNotThisMonth = day.getMonth() != this.month
 			const isInThePast = day.getTime() < this.today // this.date is just the focusDate but not the initial Date
 			
-			if(isThisDate) classstring += ' border-8'
+			if(isThisDate) classstring += ' fhc-calendar-month-page-day-focusday'
 			if(isHighlightedWeek) classstring += ' fhc-highlight-week'
 			if(isHighlightedDay) classstring += ' fhc-highlight-day'
 			
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 999369313..dccca6630 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -363,17 +363,17 @@ export default {
 					<div @wheel.stop class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
 						<template v-for="(events,_day) in allDayEvents" :key="_day">
 
-						<div v-if="dayindex == _day" v-for="event in events" :key="event" class="d-grid m-1" style="top:0;" @click.prevent="weekPageClick(event, _day)"
-									:selected="event == selectedEvent"
-									:style="{'background-color': event?.color, 'margin-bottom':'1px'}"
-									class="small rounded overflow-hidden fhc-entry"
-									v-contrast
-									>		
-									<slot class="p-1" name="weekPage" :event="event" :day="day">
-										<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
-									</slot>
-								</div>
-							</template>
+							<div v-if="dayindex == _day" v-for="event in events" :key="event" class="d-grid m-1" style="top:0;" @click.prevent="weekPageClick(event, _day)"
+								:selected="event == selectedEvent"
+								:style="{'background-color': event?.color, 'margin-bottom':'1px'}"
+								class="small rounded overflow-hidden fhc-entry"
+								v-contrast
+								>		
+								<slot class="p-1" name="weekPage" :event="event" :day="day">
+									<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
+								</slot>
+							</div>
+						</template>
 					</div>
 				</div>
 				<div class="events position-relative" :ref="'eventsRef'+week" @mousemove="calcHourPosition" @mouseleave="hourPosition = null">

From e2b1dad7761ebb74942be32d36d47bad90b8fe29 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 27 Feb 2025 12:06:43 +0100
Subject: [PATCH 044/572] fix(Plugin Moodle Event.php) adds the moodle calendar
 events integration through the Events instead of having a fixed dependency

---
 .../api/frontend/v1/Stundenplan.php            | 18 ++++++++++++++++++
 public/js/api/stundenplan.js                   |  6 ++----
 .../components/Cis/Stundenplan/Stundenplan.js  |  2 +-
 .../components/DashboardWidget/Stundenplan.js  |  6 +++---
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 2ec02fea9..4abff559c 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -18,6 +18,8 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+use CI3_Events as Events;
+
 class Stundenplan extends FHCAPI_Controller
 {
 
@@ -28,6 +30,7 @@ class Stundenplan extends FHCAPI_Controller
 	{
 
 		parent::__construct([
+			'fetchMoodleEvents' => self::PERM_LOGGED,
 			'getRoomplan' => self::PERM_LOGGED,
             'Stunden' => self::PERM_LOGGED,
             'Reservierungen' => self::PERM_LOGGED,
@@ -57,6 +60,21 @@ class Stundenplan extends FHCAPI_Controller
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
+	public function fetchMoodleEvents(){
+		$this->load->library('form_validation');
+        $this->form_validation->set_data($_GET);
+        $this->form_validation->set_rules('timestart',"timestart","required");
+        $this->form_validation->set_rules('timeend',"timeend","required");
+        if($this->form_validation->run() === FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+        $timestart = intval($this->input->get('timestart', TRUE));
+        $timeend = intval($this->input->get('timeend', TRUE));
+		Events::trigger('moodleCalendarEvents',
+						['timestart'=>$timestart,'timeend'=>$timeend, 'username'=>getAuthUID()]
+		);
+		$this->terminateWithSuccess(json_decode(ob_get_contents()));
+	}
+
 	//TODO: delete this function if we don't use the old calendar export endpoints anymore
 	public function studiensemesterDateInterval($date){
 		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
diff --git a/public/js/api/stundenplan.js b/public/js/api/stundenplan.js
index 94dad7ffe..388db5454 100644
--- a/public/js/api/stundenplan.js
+++ b/public/js/api/stundenplan.js
@@ -42,12 +42,10 @@ export default {
 			{}
 		);
 	},
-	getMoodleEventsByUserid(username, timestart, timeend) {
+	getMoodleEventsByUserid(timestart, timeend) {
 		return this.$fhcApi.get(
-			FHC_JS_DATA_STORAGE_OBJECT.app_root +
-			`addons/moodle/cis/get_events_by_userid.php`,
+			`/api/frontend/v1/Stundenplan/fetchMoodleEvents`,
 			{
-				username: username,
 				timestart: timestart,
 				timeend: timeend,
 			}
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 053b1c3b9..889a3f8bf 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -250,7 +250,7 @@ const Stundenplan = {
 			
 			let date_start = Math.floor(new Date(start_date).getTime() / 1000);
 			let date_end = Math.floor(new Date(end_date).getTime() / 1000);
-			return this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid('io23m005', date_start, date_end).then((response) => response.events).then(events => {
+			return this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid(date_start, date_end).then((response) => response?.data?.events).then(events => {
 				let data =events.map(event =>{
 					const event_start_date = new Date(event.timestart);
 					const event_end_date = new Date(event.timeend);
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 3bffb478e..006acd306 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -170,7 +170,7 @@ export default {
 
 			let date_start = Math.floor(new Date(start_date).getTime() / 1000);
 			let date_end = Math.floor(new Date(end_date).getTime() / 1000);
-			return this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid('io23m005', date_start, date_end).then((response) => response.events).then(events => {
+			return this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid(date_start, date_end).then((response) => response?.data?.events).then(events => {
 				let data = events.map(event => {
 					const event_start_date = new Date(event.timestart);
 					const event_end_date = new Date(event.timeend);
@@ -230,7 +230,7 @@ export default {
 				<div  v-if="event.type=='moodle'">
 					<div class="d-flex small w-100" >
 						<moodle-svg></moodle-svg>
-						<span class="flex-grow-1 text-center ">{{event.topic}}</span>
+						<span v-contrast class="flex-grow-1 text-center ">{{event.topic}}</span>
 					</div>
 				</div>
 				<span v-else class="small" >
@@ -250,7 +250,7 @@ export default {
 							<template v-if="evt.type=='moodle'">
 								<div class="d-flex align-items-center ">
 									<moodle-svg></moodle-svg>
-									<b class="flex-grow-1 text-center">{{evt.topic}}</b>
+									<b v-contrast class="flex-grow-1 text-center">{{evt.topic}}</b>
 								</div>
 							</template>
 							<template v-else>

From f9f185bfef0291274011e99fe057da8a3b42f994 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 27 Feb 2025 14:06:25 +0100
Subject: [PATCH 045/572] Views modal, new tab, new page, app and controller
 for newMessage to open in tab or window

---
 application/controllers/NeueNachricht.php     |  30 ++
 .../api/frontend/v1/messages/Messages.php     |   2 +-
 application/views/Nachrichten.php             |  48 ++
 public/js/apps/Messages/NewMessage.js         |  27 +
 public/js/apps/Nachrichten.js                 |  25 +
 .../components/Messages/Details/NewMessage.js |  92 +---
 .../Messages/Details/NewMessage/Modal.js      | 468 +++++++++++++++++
 .../Messages/Details/NewMessage/NewDiv.js     | 488 ++++++++++++++++++
 .../Messages/Details/TableMessages.js         |  32 +-
 public/js/components/Messages/Messages.js     | 108 +++-
 .../Studentenverwaltung/Details/Messages.js   |   2 +-
 .../VorlagenDropdown/VorlagenDropdown.js      |   2 +-
 12 files changed, 1218 insertions(+), 106 deletions(-)
 create mode 100644 application/controllers/NeueNachricht.php
 create mode 100644 application/views/Nachrichten.php
 create mode 100644 public/js/apps/Messages/NewMessage.js
 create mode 100644 public/js/apps/Nachrichten.js
 create mode 100644 public/js/components/Messages/Details/NewMessage/Modal.js
 create mode 100644 public/js/components/Messages/Details/NewMessage/NewDiv.js

diff --git a/application/controllers/NeueNachricht.php b/application/controllers/NeueNachricht.php
new file mode 100644
index 000000000..9e9e0a39b
--- /dev/null
+++ b/application/controllers/NeueNachricht.php
@@ -0,0 +1,30 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class NeueNachricht extends Auth_Controller
+{
+	public function __construct()
+	{
+		$permissions = [];
+		$router = load_class('Router');
+		$permissions[$router->method] = ['vertrag/mitarbeiter:r'];
+		parent::__construct($permissions);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function _remap()
+	{
+		//now working
+		$this->load->view('Nachrichten', [
+			'permissions' => [
+				'vertragsverwaltung_schreibrechte' => $this->permissionlib->isBerechtigt('vertrag/mitarbeiter', 'suid')
+			]
+		]);
+	}
+}
diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index 788c8861e..4bc9a13ab 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -129,7 +129,7 @@ class Messages extends FHCAPI_Controller
 
 	public function getMsgVarsPrestudent($uid)
 	{
-
+		//$this->terminateWithError($uid, self::ERROR_TYPE_GENERAL);
 		$prestudent_id = $this-> _getPrestudentIdFromUid($uid);
 
 	//	$this->terminateWithError("prestudent_id " . $prestudent_id, self::ERROR_TYPE_GENERAL);
diff --git a/application/views/Nachrichten.php b/application/views/Nachrichten.php
new file mode 100644
index 000000000..cf34bfd53
--- /dev/null
+++ b/application/views/Nachrichten.php
@@ -0,0 +1,48 @@
+<?php
+$includesArray = array(
+	'title' => 'Nachrichten',
+	'axios027' => true,
+	'bootstrap5' => true,
+	'fontawesome6' => true,
+	'vue3' => true,
+	'primevue3' => true,
+	#'filtercomponent' => true,
+	'tabulator5' => true,
+	'tinymce5' => true,
+	'phrases' => array(
+		'global',
+		'ui',
+	),
+	'customCSSs' => [
+		'public/css/components/vue-datepicker.css',
+		'public/css/components/primevue.css',
+	],
+	'customJSs' => [
+		#'vendor/npm-asset/primevue/tree/tree.min.js',
+		#'vendor/npm-asset/primevue/toast/toast.min.js'
+	],
+	'customJSModules' => [
+		'public/js/apps/Nachrichten.js'
+	]
+);
+
+$this->load->view('templates/FHC-Header', $includesArray);
+?>
+
+<?php
+$configArray = [
+	'domain' => !defined('DOMAIN') ? 'notDefined' : DOMAIN,
+];
+?>
+
+<div id="main">
+	<router-view
+		cis-root="<?= CIS_ROOT; ?>"
+		:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
+		:config="<?=  htmlspecialchars(json_encode($configArray)); ?>"
+	>
+	</router-view>
+</div>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+
diff --git a/public/js/apps/Messages/NewMessage.js b/public/js/apps/Messages/NewMessage.js
new file mode 100644
index 000000000..693c8b0e2
--- /dev/null
+++ b/public/js/apps/Messages/NewMessage.js
@@ -0,0 +1,27 @@
+//TODO Manu
+//use this instead of Nachrichten.js
+import NewMessage from "../../components/Messages/Details/NewMessage/NewDiv.js";
+import Phrasen from "../../plugin/Phrasen.js";
+
+const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+
+const router = VueRouter.createRouter({
+	history: VueRouter.createWebHistory(),
+	routes: [
+		{ path: `/${ciPath}/NeueNachricht`, component: NewMessage },
+		{ path: `/${ciPath}/NeueNachricht/:id`, component: NewMessage },
+		{ path: `/${ciPath}/NeueNachricht/:id/:typeId`, component: NewMessage },
+	]
+});
+
+const app = Vue.createApp();
+
+app
+	.use(router)
+	.use(primevue.config.default, {
+		zIndex: {
+			overlay: 1100
+		}
+	})
+	.use(Phrasen)
+	.mount('#main');
diff --git a/public/js/apps/Nachrichten.js b/public/js/apps/Nachrichten.js
new file mode 100644
index 000000000..0f921a9f8
--- /dev/null
+++ b/public/js/apps/Nachrichten.js
@@ -0,0 +1,25 @@
+import NewMessage from "../components/Messages/Details/NewMessage/NewDiv.js";
+
+import Phrasen from "../plugin/Phrasen.js";
+
+const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+
+const router = VueRouter.createRouter({
+	history: VueRouter.createWebHistory(),
+	routes: [
+		{ path: `/${ciPath}/NeueNachricht/:id/:typeId`, component: NewMessage },
+	]
+});
+
+
+const app = Vue.createApp();
+
+app
+	.use(router)
+	.use(primevue.config.default, {
+		zIndex: {
+			overlay: 1100
+		}
+	})
+	.use(Phrasen)
+	.mount('#main');
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/NewMessage.js b/public/js/components/Messages/Details/NewMessage.js
index c8aae2124..33ff74d9c 100644
--- a/public/js/components/Messages/Details/NewMessage.js
+++ b/public/js/components/Messages/Details/NewMessage.js
@@ -2,13 +2,15 @@ import FormForm from '../../Form/Form.js';
 import FormInput from '../../Form/Input.js';
 import ListBox from "../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
 import DropdownComponent from '../../VorlagenDropdown/VorlagenDropdown.js';
+import MessageModal from "../Details/NewMessage/Modal.js";
 
 export default {
 	components: {
 		FormForm,
 		FormInput,
 		ListBox,
-		DropdownComponent
+		DropdownComponent,
+		MessageModal,
 	},
 	props: {
 		endpoint: {
@@ -35,7 +37,7 @@ export default {
 			vorlagen: [],
 			defaultRecipient: null,
 			editor: null,
-			isVisible: true,
+			isVisible: false,
 			fieldsUser: [],
 			fieldsPerson: [],
 			fieldsPrestudent: [],
@@ -45,12 +47,6 @@ export default {
 			itemsPrestudent: [],
 			itemsPerson: [],
 			itemsUser: [],
-/*			selectedFieldStudent: null,
-			itemsStudent: [
-				{ label: "Variable 1", value: "var1" },
-				{ label: "Variable 2", value: "var2" },
-				{ label: "Variable 3", value: "var3" }
-			]*/
 			previewText: null,
 			previewBody: ""
 		}
@@ -170,62 +166,6 @@ export default {
 				console.error("Editor instance is not available.");
 			}
 		},
-		//TODO(Manu) refactor
-/*		insertVariablePrestudent() {
-				if (this.editor) {
-					//const lastVariable = this.selectedFieldsPrestudent[this.selectedFieldsPrestudent.length - 1].value;
-					const lastVariable = this.selectedFieldPrestudent.value;
-
-				//Use insertContent method
-				this.editor.insertContent(lastVariable + " ");
-				} else {
-				console.error("Editor instance is not available.");
-			}
-		},*/
-/*		insertVariablePrestudentByClick(selectedItem) {
-
-			if (selectedItem) {
-				this.editor.insertContent(selectedItem.value + " ");
-				console.log("Eingefügte Variable:", selectedItem);
-			} else {
-				console.warn("Keine Variable ausgewählt!");
-			}
-		},
-
-		insertVariablePerson() {
-				if (this.editor) {
-					//const lastVariable = this.selectedFieldsPrestudent[this.selectedFieldsPrestudent.length - 1].value;
-					const lastVariable = this.selectedFieldPerson.value;
-
-				//Use insertContent method
-				this.editor.insertContent(lastVariable + " ");
-				} else {
-				console.error("Editor instance is not available.");
-			}
-		},
-		insertVariableUser() {
-			if (this.editor) {
-				console.log(this.selectedFieldUser.value);
-				const lastVariable = this.selectedFieldUser.value;
-
-				//Multiple
-				//const lastVariable = this.selectedFieldsPrestudent[this.selectedFieldsPrestudent.length - 1].value;
-
-				//Use insertContent method
-				this.editor.insertContent(lastVariable + " ");
-				this.selectedFieldUser = null;
-			} else {
-				console.error("Editor instance is not available.");
-			}
-		},
-		insertVariableStudent(selectedItem) {
-			if (selectedItem) {
-				console.log("Eingefügte Variable:", selectedItem);
-				this.editor.insertContent(selectedItem.value + " ");
-			} else {
-				console.warn("Keine Variable ausgewählt!");
-			}
-		},*/
 		replyMessage(message_id){
 			console.log("auf message " + message_id + " antworten");
 		},
@@ -241,9 +181,9 @@ export default {
 			this.$refs.dropdownComp.setValue(null);
 
 		},
-		toggleDivNewMessage(){
+/*		toggleDivNewMessage(){
 			this.isVisible = !this.isVisible;
-		},
+		},*/
 		handleSelectedVorlage(vorlage_kurzbz) {
 			if (typeof vorlage_kurzbz === "string") {
 				this.getVorlagentext(vorlage_kurzbz);
@@ -254,15 +194,17 @@ export default {
 			if (this.openMode == "showDiv")
 				this.isVisible = false;
 		},
-		showTemplate(){
+		showTemplate(id, typeId){
 			if (this.openMode == "showDiv")
 				this.isVisible = true;
+			//just for testing:
+			this.isVisible = true;
 		},
 		showPreview(){
 			this.getPreviewText().then(() => {
 				this.previewBody = this.previewText;
 			});
-		}
+		},
 	},
 	watch: {
 		'formData.body': {
@@ -343,9 +285,19 @@ export default {
 	},
 	template: `
 	<div class="messages-detail-newmessage">
-			<hr>
+
+			<message-modal
+				ref="modalMsg"
+				:type-id="typeId"
+				:id="id"
+				:endpoint="endpoint"
+				:openMode="openMode"
+				@reloadTable="reloadTable"
+				>
+			</message-modal>
+<!--			<hr>
 		<button type="button" class="btn btn-warning" @click="toggleDivNewMessage()">Toggle NewMessage</button>
-		<hr>
+		<hr>-->
 
 		<div v-show="isVisible">
 			<div class="overflow-auto" style="max-height: 500px; border: 1px solid #ccc;">
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
new file mode 100644
index 000000000..9bfe49929
--- /dev/null
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -0,0 +1,468 @@
+import BsModal from "../../../Bootstrap/Modal.js";
+import FormForm from "../../../Form/Form.js";
+import FormInput from '../../../Form/Input.js';
+import ListBox from "../../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
+import DropdownComponent from "../../../VorlagenDropdown/VorlagenDropdown.js";
+
+export default {
+	components: {
+		BsModal,
+		FormForm,
+		DropdownComponent,
+		FormInput,
+		ListBox
+	},
+	props: {
+		endpoint: {
+			type: String,
+			required: true
+		},
+		typeId: String,
+		id: {
+			type: [Number, String],
+			required: true
+		},
+		openMode: String,
+	},
+	data(){
+		return {
+			formData: {
+				recipient: this.id,
+				subject: null,
+				body: null,
+				vorlage_kurzbz: null,
+				selectedValue: '',
+			},
+			statusNew: true,
+			vorlagen: [],
+			defaultRecipient: null,
+			editor: null,
+			fieldsUser: [],
+			fieldsPerson: [],
+			fieldsPrestudent: [],
+			selectedFieldPrestudent: null,
+			selectedFieldUser: null,
+			selectedFieldPerson: null,
+			itemsPrestudent: [],
+			itemsPerson: [],
+			itemsUser: [],
+			previewText: null,
+			previewBody: ""
+		}
+	},
+	methods: {
+		initTinyMCE() {
+			const vm = this;
+			tinymce.init({
+				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
+				//height: 800,
+				//plugins: ['lists'],
+				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify',
+				style_formats: [
+					{title: 'Blocks', block: 'div'},
+					{title: 'Paragraph', block: 'p'},
+					{title: 'Heading 1', block: 'h1'},
+					{title: 'Heading 2', block: 'h2'},
+					{title: 'Heading 3', block: 'h3'},
+					{title: 'Heading 4', block: 'h4'},
+					{title: 'Heading 5', block: 'h5'},
+					{title: 'Heading 6', block: 'h6'},
+				],
+				autoresize_bottom_margin: 16,
+
+				setup: (editor) => {
+					vm.editor = editor;
+
+					editor.on('input', () => {
+						const newContent = editor.getContent();
+						vm.formData.body = newContent;
+					});
+				},
+			});
+		},
+		updateText(value) {
+			this.formData.body = value;
+		},
+		sendMessage() {
+			//TODO(Manu) check default recipient(s)
+			const data = new FormData();
+			const params = {
+				id: this.id,
+				type_id: this.typeId
+			};
+			const merged = {
+				...this.formData,
+				...params
+			};
+			data.append('data', JSON.stringify(merged));
+
+			return this.$fhcApi.factory.messages.person.sendMessage(
+				this.$refs.formMessage,
+				this.id,
+				data)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
+					//this.hideModal('messageModal');
+					this.hideTemplate();
+					this.resetForm();
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+						//this.resetForm();
+						//closeModal
+						//closewindwo
+						this.$emit('reloadTable');
+					}
+				);
+		},
+		getVorlagentext(vorlage_kurzbz){
+			//console.log(typeof vorlage_kurzbz);
+			return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz)
+				.then(response => {
+					//this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
+					//this.hideModal('messageModal');
+					//this.resetForm();
+					//TODO(Manu) CHECK
+					this.formData.body = response.data;
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					//this.resetForm();
+					//closeModal
+					//closewindwo
+				});
+		},
+		getPreviewText(){
+			const data = new FormData();
+
+			data.append('data', JSON.stringify(this.formData.body));
+			return this.$fhcApi.factory.messages.person.getPreviewText({
+				id: this.id,
+				type_id: this.typeId}, data)
+				.then(response => {
+					this.previewText = response.data;
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					//this.resetForm();
+					//closeModal
+					//closewindwo
+				});
+		},
+		insertVariable(selectedItem){
+			if (this.editor) {
+				this.editor.insertContent(selectedItem.value + " ");
+				//TODO(Manu) check: nicht mal mit Punkt adden gehts ohne eintrag nach vars
+				/*				this.editor.focus();
+								this.editor.setDirty(true);*/
+
+				//this.editor.fire('change'); //forces
+
+				//this.editor.undoManager.add();
+
+				//this.editor.insertContent(selectedItem.value + "\u00A0");
+				//this.editor.insertContent(`<span>${selectedItem.value}&nbsp;</span>`);
+				//this.editor.selection.setCursorLocation(this.editor.getBody(), 1);
+
+			} else {
+				console.error("Editor instance is not available.");
+			}
+		},
+		replyMessage(message_id){
+			console.log("auf message " + message_id + " antworten");
+		},
+		resetForm(){
+			this.formData = {
+				vorlage_kurzbz: null,
+				body: null,
+				subject: null,
+			};
+			if (this.editor) {
+				this.editor.setContent("");
+			}
+			this.$refs.dropdownComp.setValue(null);
+
+		},
+		handleSelectedVorlage(vorlage_kurzbz) {
+			if (typeof vorlage_kurzbz === "string") {
+				this.getVorlagentext(vorlage_kurzbz);
+				this.formData.subject = vorlage_kurzbz;
+			}
+		},
+		hideTemplate(){
+			if (this.openMode == "showDiv")
+				this.isVisible = false;
+		},
+		showTemplate(){
+			if (this.openMode == "showDiv")
+				this.isVisible = true;
+		},
+		showPreview(){
+			this.getPreviewText().then(() => {
+				this.previewBody = this.previewText;
+			});
+		},
+		show(){
+			this.$refs.modalNewMessage.show();
+		}
+	},
+	watch: {
+		'formData.body': {
+			handler(newVal) {
+				const tinymcsVal = this.editor.getContent();
+
+				if (newVal && tinymcsVal != newVal) {
+					//Inhalt des Editors aktualisieren
+					this.editor.setContent(newVal);
+				}
+			}
+		},
+		'formData.vorlage_kurzbz': {
+			handler(newVal){
+				//	console.log("Vorlage: " + newVal);
+
+				if (newVal && newVal != null) {
+					this.formData.subject = newVal;
+					return this.getVorlagentext(newVal);
+				}
+			}
+		}
+	},
+	created(){
+		if(this.typeId == 'person_id'){
+			this.$fhcApi.factory.messages.person.getMessageVarsPerson()
+				.then(result => {
+					this.fieldsPerson = result.data;
+					this.itemsPerson = Object.entries(this.fieldsPerson).map(([key, value]) => ({
+						label: value,
+						value: '{' + value + '}'
+					}));
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+		if(this.typeId == 'uid') {
+			this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(this.id)
+				.then(result => {
+					this.fieldsPrestudent = result.data;
+					const prestudent = this.fieldsPrestudent[0];
+					//Just for testing with inserting values
+					/*					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
+											label: key,
+											value: value
+										}));*/
+					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
+						label: key.toLowerCase(),
+						value: '{' + key.toLowerCase() + '}'
+					}));
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+
+		this.$fhcApi.factory.messages.person.getMsgVarsLoggedInUser()
+			.then(result => {
+				this.fieldsUser = result.data;
+				const user = this.fieldsUser;
+				this.itemsUser = Object.entries(user).map(([key, value]) => ({
+					label: value,
+					value: '{' + value + '}'
+				}));
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$fhcApi.factory.messages.person.getNameOfDefaultRecipient({
+			id: this.id,
+			type_id: this.typeId})
+			.then(result => {
+				this.defaultRecipient = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
+	async mounted() {
+		this.initTinyMCE();
+	},
+	beforeDestroy() {
+		this.editor.destroy();
+	},
+	template: `
+		<bs-modal class="messages-detail-newmessage-modal" ref="modalNewMessage" dialog-class="modal-xl">
+
+			<template #title>
+				New Message
+			</template>
+
+			<form-form ref="formNewMassage">
+
+				<div class="overflow-auto" style="max-height: 500px; border: 1px solid #ccc;">
+
+
+				<div class="row">
+					<div class="col-sm-8">
+						<form-form class="row g-3 mt-2" ref="formMessage">
+
+						<!--TODO(Manu) ist eigentlich ein Array, hier werden alle Einträge angegeben als String-->
+							<div class="row mb-3">
+
+								<form-input
+									type="text"
+									name="recipient"
+									:label="$p.t('messages/recipient')"
+									v-model="defaultRecipient"
+									disabled
+								>
+								</form-input>
+							</div>
+
+							<div class="row mb-3">
+								<form-input
+									type="text"
+									name="subject"
+									:label="$p.t('global/betreff') + ' *'"
+									v-model="formData.subject"
+								>
+								</form-input>
+							</div>
+
+							<!--Tiny MCE-->
+							<div class="row mb-3">
+								<form-input
+									ref="editor"
+									:label="$p.t('global','nachricht')  + ' *'"
+									type="textarea"
+									v-model="formData.body"
+									name="text"
+									rows="15"
+									cols="75"
+									>
+								</form-input>
+							</div>
+
+							<div class="row">
+								<DropdownComponent
+									ref="dropdownComp"
+									:label="$p.t('global/vorlage')"
+									@change="handleSelectedVorlage"
+									useLoggedInUserOe
+								>
+								</DropdownComponent>
+							</div>
+
+						</form-form>
+					</div>
+
+					<div class="col-sm-4">
+						<div v-if="this.fieldsPrestudent.length > 0">
+							<strong>Felder Prestudent</strong>
+							<div class="border p-3 overflow-auto" style="height: 200px;">
+
+								<list-box
+									v-model="selectedFieldPrestudent"
+									:options="itemsPrestudent"
+									optionLabel="label"
+								>
+								  <template #option="slotProps">
+									<div @dblclick="insertVariable(slotProps.option)">
+									  {{ slotProps.option.label }}
+									</div>
+								  </template>
+								</list-box>
+
+							</div>
+
+							<button class="m-3" @click="insertVariablePrestudent">Insert Variable</button>
+							<p>{{selectedFieldPrestudent}}</p>
+
+						</div>
+
+						<div v-if="this.fieldsPerson.length > 0">
+							<strong>Felder Person</strong>
+							<div class="border p-3 overflow-auto" style="height: 200px;">
+
+								<list-box
+									v-model="selectedFieldPerson"
+									:options="itemsPerson"
+									optionLabel="label"
+								>
+									<template #option="slotProps">
+										<div @dblclick="insertVariable(slotProps.option)">
+										  {{ slotProps.option.label }}
+										</div>
+								  </template>
+								</list-box>
+
+							</div>
+							<button class="m-3" @click="insertVariablePerson">Insert Variable</button>
+							<p>{{selectedFieldPerson}}</p>
+						</div>
+
+						<div>
+							<strong>Meine Felder</strong>
+							<div class="border p-3 overflow-auto" style="height: 200px;">
+
+								<list-box
+									v-model="selectedFieldUser"
+									:options="itemsUser"
+									optionLabel="label"
+								>
+									<template #option="slotProps">
+										<div @dblclick="insertVariable(slotProps.option)">
+										  {{ slotProps.option.label }}
+										</div>
+								  </template>
+								</list-box>
+
+							</div>
+							<button class="m-3" @click="insertVariableUser">Insert Variable</button>
+						</div>
+
+					</div>
+
+				</div>
+
+				<div class="row mt-4">
+
+					<h4>Vorschau:</h4>
+					<div>
+						<form-form class="row g-3 mt-2" ref="formPreview">
+
+							<div class="col-sm-2 mb-3">
+								<form-input
+									type="select"
+									name="recipient"
+									:label="$p.t('messages/recipient')"
+									v-model="defaultRecipient"
+								>
+								</form-input>
+							</div>
+
+							<div class="col-md-2 mt-4">
+								<br>
+								<button type="button" class="btn bt		n-secondary" @click="showPreview()">Aktualisieren</button>
+							</div>
+						</form-form>
+
+						<div class="col-sm-12 overflow-scroll">
+								<div ref="preview">
+									<div v-html="previewBody" class="p-3 border rounded overflow-scroll twoColumns"></div>
+								</div>
+						</div>
+
+					</div>
+
+				</div>
+
+			</div>
+
+			</form-form>
+
+			<template #footer>
+				<div class="d-grid gap-2 d-md-flex justify-content-md-end">
+
+					<button class="btn btn-secondary" @click="resetForm">Reset All</button>
+
+					<button v-if="statusNew" type="button" class="btn btn-primary" @click="sendMessage()">{{$p.t('ui', 'nachrichtSenden')}}</button>
+					<button v-else type="button" class="btn btn-primary" @click="replyMessage(formData.message_id)">{{$p.t('global', 'reply')}}</button>
+				</div>
+			</template>
+
+		</bs-modal>
+
+	</div>
+	`,
+}
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
new file mode 100644
index 000000000..b31cd9932
--- /dev/null
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -0,0 +1,488 @@
+import FormForm from '../../../Form/Form.js';
+import FormInput from '../../../Form/Input.js';
+import ListBox from "../../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
+import DropdownComponent from '../../../VorlagenDropdown/VorlagenDropdown.js';
+
+export default {
+	components: {
+		FormForm,
+		FormInput,
+		ListBox,
+		DropdownComponent,
+	},
+	props: {
+		endpoint: {
+			type: String,
+			required: true
+		},
+		//for open in div and modal
+/*		typeId: String,
+		id: {
+			type: [Number, String],
+			required: true
+		},*/
+		openMode: String,
+	},
+	computed: {
+		//params with routes for new tab and new window AND props
+/*		id(){
+			return this.$route.params.id || this.id;
+		},
+		typeId(){
+			return this.$route.params.typeId || this.typeId;
+		},*/
+		id(){
+			return this.$route.params.id || this.$props.id;
+		},
+		typeId(){
+			return this.$route.params.typeId || this.$props.id;
+		}
+	},
+	data(){
+		return {
+			formData: {
+				recipient: this.id,
+				subject: null,
+				body: null,
+				vorlage_kurzbz: null,
+				selectedValue: '',
+			},
+			statusNew: true,
+			vorlagen: [],
+			defaultRecipient: null,
+			editor: null,
+			isVisible: false,
+			fieldsUser: [],
+			fieldsPerson: [],
+			fieldsPrestudent: [],
+			selectedFieldPrestudent: null,
+			selectedFieldUser: null,
+			selectedFieldPerson: null,
+			itemsPrestudent: [],
+			itemsPerson: [],
+			itemsUser: [],
+			previewText: null,
+			previewBody: ""
+		}
+	},
+	methods: {
+		initTinyMCE() {
+			const vm = this;
+			tinymce.init({
+				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
+				//height: 800,
+				//plugins: ['lists'],
+				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify',
+				style_formats: [
+					{title: 'Blocks', block: 'div'},
+					{title: 'Paragraph', block: 'p'},
+					{title: 'Heading 1', block: 'h1'},
+					{title: 'Heading 2', block: 'h2'},
+					{title: 'Heading 3', block: 'h3'},
+					{title: 'Heading 4', block: 'h4'},
+					{title: 'Heading 5', block: 'h5'},
+					{title: 'Heading 6', block: 'h6'},
+				],
+				autoresize_bottom_margin: 16,
+
+				setup: (editor) => {
+					vm.editor = editor;
+
+					editor.on('input', () => {
+						const newContent = editor.getContent();
+						vm.formData.body = newContent;
+					});
+				},
+			});
+		},
+		updateText(value) {
+			this.formData.body = value;
+		},
+		sendMessage() {
+			//TODO(Manu) check default recipient(s)
+			const data = new FormData();
+			const params = {
+				id: this.id,
+				type_id: this.typeId
+			};
+			const merged = {
+				...this.formData,
+				...params
+			};
+			data.append('data', JSON.stringify(merged));
+
+			return this.$fhcApi.factory.messages.person.sendMessage(
+				this.$refs.formMessage,
+				this.id,
+				data)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
+					//this.hideModal('messageModal');
+					this.hideTemplate();
+					this.resetForm();
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+						//this.resetForm();
+						//closeModal
+						//closewindwo
+						this.$emit('reloadTable');
+					}
+				);
+		},
+		getVorlagentext(vorlage_kurzbz){
+			return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz)
+				.then(response => {
+					//this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
+					//this.hideModal('messageModal');
+					//this.resetForm();
+					//TODO(Manu) CHECK
+					this.formData.body = response.data;
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					//this.resetForm();
+					//closeModal
+					//closewindwo
+				});
+		},
+		getPreviewText(){
+			const data = new FormData();
+
+			data.append('data', JSON.stringify(this.formData.body));
+			return this.$fhcApi.factory.messages.person.getPreviewText({
+				id: this.id,
+				type_id: this.typeId}, data)
+				.then(response => {
+					this.previewText = response.data;
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					//this.resetForm();
+					//closeModal
+					//closewindwo
+				});
+		},
+		insertVariable(selectedItem){
+			if (this.editor) {
+				this.editor.insertContent(selectedItem.value + " ");
+				//TODO(Manu) check: nicht mal mit Punkt adden gehts ohne eintrag nach vars
+				/*				this.editor.focus();
+								this.editor.setDirty(true);*/
+
+				//this.editor.fire('change'); //forces
+
+				//this.editor.undoManager.add();
+
+				//this.editor.insertContent(selectedItem.value + "\u00A0");
+				//this.editor.insertContent(`<span>${selectedItem.value}&nbsp;</span>`);
+				//this.editor.selection.setCursorLocation(this.editor.getBody(), 1);
+
+			} else {
+				console.error("Editor instance is not available.");
+			}
+		},
+		replyMessage(message_id){
+			console.log("auf message " + message_id + " antworten");
+		},
+		resetForm(){
+			this.formData = {
+				vorlage_kurzbz: null,
+				body: null,
+				subject: null,
+			};
+			if (this.editor) {
+				this.editor.setContent("");
+			}
+			this.$refs.dropdownComp.setValue(null);
+
+			this.previewBody = null;
+
+		},
+		toggleDivNewMessage(){
+			this.isVisible = !this.isVisible;
+		},
+		handleSelectedVorlage(vorlage_kurzbz) {
+			if (typeof vorlage_kurzbz === "string") {
+				this.getVorlagentext(vorlage_kurzbz);
+				this.formData.subject = vorlage_kurzbz;
+			}
+		},
+		hideTemplate(){
+			if (this.openMode == "showDiv")
+				this.isVisible = false;
+		},
+		showTemplate(){
+			if (this.openMode == "showDiv")
+				this.isVisible = true;
+			//just for testing:
+			this.isVisible = true;
+		},
+		showPreview(){
+			this.getPreviewText().then(() => {
+				this.previewBody = this.previewText;
+			});
+		},
+	},
+	watch: {
+		'formData.body': {
+			handler(newVal) {
+				const tinymcsVal = this.editor.getContent();
+
+				if (newVal && tinymcsVal != newVal) {
+					//Inhalt des Editors aktualisieren
+					this.editor.setContent(newVal);
+				}
+			}
+		},
+		'formData.vorlage_kurzbz': {
+			handler(newVal){
+				//	console.log("Vorlage: " + newVal);
+
+				if (newVal && newVal != null) {
+					this.formData.subject = newVal;
+					return this.getVorlagentext(newVal);
+				}
+			}
+		},
+	},
+	created(){
+		if(this.typeId == 'person_id'){
+			this.$fhcApi.factory.messages.person.getMessageVarsPerson()
+				.then(result => {
+					this.fieldsPerson = result.data;
+					this.itemsPerson = Object.entries(this.fieldsPerson).map(([key, value]) => ({
+						label: value,
+						value: '{' + value + '}'
+					}));
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+		if(this.typeId == 'uid') {
+			this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(this.id)
+				.then(result => {
+					this.fieldsPrestudent = result.data;
+					const prestudent = this.fieldsPrestudent[0];
+					//Just for testing with inserting values
+					/*					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
+											label: key,
+											value: value
+										}));*/
+					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
+						label: key.toLowerCase(),
+						value: '{' + key.toLowerCase() + '}'
+					}));
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+
+		this.$fhcApi.factory.messages.person.getMsgVarsLoggedInUser()
+			.then(result => {
+				this.fieldsUser = result.data;
+				const user = this.fieldsUser;
+				this.itemsUser = Object.entries(user).map(([key, value]) => ({
+					label: value,
+					value: '{' + value + '}'
+				}));
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$fhcApi.factory.messages.person.getNameOfDefaultRecipient({
+			id: this.id,
+			type_id: this.typeId
+		})
+			.then(result => {
+				this.defaultRecipient = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+	},
+	async mounted() {
+		this.initTinyMCE();
+	},
+	beforeDestroy() {
+		this.editor.destroy();
+	},
+	template: `
+
+	<div class="messages-detail-newmessage">
+
+			<!--passt für showdiv-->
+<!--			<div class="overflow-auto" style="max-height: 500px; border: 1px solid #ccc;">-->
+
+			<!--new page-->
+			<div class="overflow-auto m-3">
+
+			{{id}} || {{typeId}}
+
+				<h4>New Message</h4>
+	<!--			{{formData.body}}
+				||
+				{{previewText}}-->
+
+				<div class="row">
+					<div class="col-sm-8">
+						<form-form class="row g-3 mt-2" ref="formMessage">
+
+						<!--TODO(Manu) ist eigentlich ein Array, hier werden alle Einträge angegeben als String-->
+							<div class="row mb-3">
+
+								<form-input
+									type="text"
+									name="recipient"
+									:label="$p.t('messages/recipient')"
+									v-model="defaultRecipient"
+									disabled
+								>
+								</form-input>
+							</div>
+
+							<div class="row mb-3">
+								<form-input
+									type="text"
+									name="subject"
+									:label="$p.t('global/betreff') + ' *'"
+									v-model="formData.subject"
+								>
+								</form-input>
+							</div>
+
+							<!--Tiny MCE-->
+							<div class="row mb-3">
+								<form-input
+									ref="editor"
+									:label="$p.t('global','nachricht')  + ' *'"
+									type="textarea"
+									v-model="formData.body"
+									name="text"
+									rows="15"
+									cols="75"
+									>
+								</form-input>
+							</div>
+
+							<div class="row">
+								<DropdownComponent
+									ref="dropdownComp"
+									:label="$p.t('global/vorlage')"
+									@change="handleSelectedVorlage"
+									useLoggedInUserOe
+								>
+								</DropdownComponent>
+							</div>
+
+						</form-form>
+					</div>
+
+					<div class="col-sm-4">
+						<div v-if="this.fieldsPrestudent.length > 0"  class="mt-3">
+							<strong>Felder Prestudent</strong>
+							<div class="border p-3 overflow-auto" style="height: 250px;">
+
+								<list-box
+									v-model="selectedFieldPrestudent"
+									:options="itemsPrestudent"
+									optionLabel="label"
+								>
+								  <template #option="slotProps">
+									<div @dblclick="insertVariable(slotProps.option)">
+									  {{ slotProps.option.label }}
+									</div>
+								  </template>
+								</list-box>
+
+							</div>
+
+						</div>
+
+						<br>
+
+						<div v-if="this.fieldsPerson.length > 0" class="mt-3">
+							<strong>Felder Person</strong>
+							<div class="border p-3 overflow-auto" style="height: 250px;">
+
+								<list-box
+									v-model="selectedFieldPerson"
+									:options="itemsPerson"
+									optionLabel="label"
+								>
+									<template #option="slotProps">
+										<div @dblclick="insertVariable(slotProps.option)">
+										  {{ slotProps.option.label }}
+										</div>
+								  </template>
+								</list-box>
+
+							</div>
+
+						</div>
+
+						<div>
+							<strong>Meine Felder</strong>
+							<div class="border p-3 overflow-auto" style="height: 200px;">
+
+								<list-box
+									v-model="selectedFieldUser"
+									:options="itemsUser"
+									optionLabel="label"
+								>
+									<template #option="slotProps">
+										<div @dblclick="insertVariable(slotProps.option)">
+										  {{ slotProps.option.label }}
+										</div>
+								  </template>
+								</list-box>
+
+							</div>
+
+						</div>
+
+						<br>
+
+						<div class="d-grid gap-2 d-md-flex justify-content-md-end">
+
+							<button class="btn btn-secondary" @click="resetForm">Reset All</button>
+
+							<button v-if="statusNew" type="button" class="btn btn-primary" @click="sendMessage()">{{$p.t('ui', 'nachrichtSenden')}}</button>
+							<button v-else type="button" class="btn btn-primary" @click="replyMessage(formData.message_id)">{{$p.t('global', 'reply')}}</button>
+						</div>
+
+					</div>
+
+				</div>
+
+				<div class="row mt-4">
+
+					<h4>Vorschau:</h4>
+					<div>
+						<form-form class="row g-3 mt-2" ref="formPreview">
+
+							<div class="col-sm-2 mb-3">
+								<form-input
+									type="select"
+									name="recipient"
+									:label="$p.t('messages/recipient')"
+									v-model="defaultRecipient"
+								>
+								</form-input>
+							</div>
+
+							<div class="col-md-2 mt-4">
+								<br>
+								<button type="button" class="btn bt		n-secondary" @click="showPreview()">Aktualisieren</button>
+							</div>
+						</form-form>
+
+						<div class="col-sm-12 overflow-scroll">
+								<div ref="preview">
+									<div v-html="previewBody" class="p-3 border rounded overflow-scroll" style="height: 300px;"></div>
+								</div>
+						</div>
+
+					</div>
+
+				</div>
+
+		</div>
+
+	</div>
+	`
+
+}
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 10210ece4..7994cbe1d 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -1,10 +1,12 @@
 import {CoreFilterCmpt} from "../../filter/Filter.js";
 import FormForm from '../../Form/Form.js';
+import NewMessage from "../Details/NewMessage.js";
 
 export default {
 	components: {
 		CoreFilterCmpt,
 		FormForm,
+		NewMessage,
 	},
 	inject: {
 		cisRoot: {
@@ -205,7 +207,8 @@ export default {
 				},
 			],
 			tabulatorData: [],
-			previewBody: ""
+			previewBody: "",
+			open: false
 		}
 	},
 	methods: {
@@ -233,20 +236,9 @@ export default {
 				});
 		},
 		actionNewMessage(){
+			this.$emit('newMessage', this.id, this.typeId);
 			//console.log("action new message");
-			if (this.openMode == "window") {
-				console.log("openInNewWindow")
-				const linkWindowNewMessage = this.cisRoot + '/public/js/components/Messages/Details/NewMessage.js';
-				window.open(linkWindowNewMessage, '_blank');
-			}
-			else if (this.openMode == "modal"){
-				console.log("open with bootstrap Modal");
-			}
-			else if (this.openMode == "showDiv"){
-				this.$emit('showNewMessageTemplate');
-			}
-			else
-				console.log("no valid openMode");
+
 		},
 		reload() {
 			this.$refs.table.reloadTable();
@@ -274,19 +266,10 @@ export default {
 	},
 	template: `
 	<div class="messages-detail-table">
-<!--		<p>endpoint: {{endpoint}}</p>-->
-<!--				{{cisRoot}}-->
-<!--		<p>{{messageLayout}}</p>-->
-
-		<!-- {{statusText[0] }}
-		<hr>
-		{{$p.t('messages', 'unread')}} -->
-		<!-- {{statusText.0}} -->
-		<!-- <p v-for="(bezeichnung, key) in statusText" :key="key" :value="key">{{bezeichnung}}</p> -->
 
 		<!--View Studierendenverwaltung-->
 		<div v-if="messageLayout=='twoColumnsTableLeft'">
-		
+
 			<div class="row">
 				<!--table-->
 				<div class="col-sm-6 pt-6">
@@ -307,7 +290,6 @@ export default {
 				<!--preview wysiwyg-window-->
 				<div class="col-sm-6 pt-6">
 				<br><br><br><br>
-
 					<div ref="preview">
 						<div v-html="previewBody" class="p-3 border rounded overflow-scroll twoColumns"></div>
 					</div>
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index f862ebc46..49fdbdf79 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -1,10 +1,20 @@
 import TableMessages from "./Details/TableMessages.js";
 import NewMessage from "./Details/NewMessage.js";
-
+import FormOnly from "./Details/NewMessage/NewDiv.js";
+import FhcApi from "../../../../public/js/plugin/FhcApi.js";
+import Phrasen from "../../../../public/js/plugin/Phrasen.js";
 export default {
 	components: {
 		TableMessages,
-		NewMessage
+		NewMessage,
+		FormOnly,
+		FhcApi,
+		Phrasen
+	},
+	inject: {
+		cisRoot: {
+			from: 'cisRoot'
+		}
 	},
 	props: {
 		endpoint: {
@@ -34,6 +44,7 @@ export default {
 			validator(value) {
 				return [
 					'window',
+					'newTab',
 					'modal',
 					'showDiv'
 				].includes(value)
@@ -41,18 +52,85 @@ export default {
 		}
 	},
 	data() {
-		return {}
+		return {
+			showDiv: false
+		}
 	},
 	methods: {
-		showNewMessageTemplate(){
-			this.$refs.templateNewMessage.showTemplate();
-		},
 		reloadTable(){
 			this.$refs.templateTableMessage.reload();
-		}
+		},
+		newMessage(id, typeId){
+			if (this.openMode == "window") {
+				this.openInNewWindow(id, typeId);
+			}
+			else if (this.openMode == "newTab"){
+				this.openInNewTab(id, typeId);
+			}
+			else if (this.openMode == "modal"){
+				this.openInModal(id, typeId);
+			}
+			else if (this.openMode == "showDiv"){
+				this.$refs.templateNewMessage.showTemplate(id, typeId);
+			}
+			else
+				console.log("no valid openMode");
+		},
+		openInDiv(id, typeId){
+			this.$refs.templateNewMessage.showTemplate(id, typeId);
+			//this.showDiv = true; //local variante
+			//this.$refs.templateNewMessage.showTemplate();
+		},
+		openInModal(id, typeId){
+			//TODO(manu) define bs-modal in this component
+			this.$refs.templateNewMessage.$refs.modalMsg.show();
+		},
+		openInNewTab(id, typeId){
+			//TODO(MANU) check if array of ids...
+/*			let path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+			path += "/NeueNachricht/" + this.id + "/" + this.typeId;*/
+
+			//als param
+			let path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+			path += "/NeueNachricht/" + id + "/" + typeId;
+
+			const newTab = window.open(path, "_blank");
+		},
+		openInNewWindow(id, typeId){
+			//TODO(MANU) check if array of ids...
+			let path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+			path += "/NeueNachricht/" + id + "/" + typeId;
+
+			const newTab = window.open(path, "_blank");
+
+			const width = Math.round(window.innerWidth * 0.75);
+			const height = Math.round(window.innerHeight * 0.75);
+			const left = Math.round((window.innerWidth - width) / 2);
+			const top = Math.round((window.innerHeight - height) / 2);
+
+			const newWindow = window.open(path, "_blank", `width=${width},height=${height},left=${left},top=${top}`);
+		},
+
 	},
 	template: `
 	<div class="core-messages h-100 pb-3">
+
+		<message-modal
+			ref="modalMsg"
+			:type-id="typeId"
+			:id="id"
+			:endpoint="endpoint"
+			:openMode="openMode"
+			@reloadTable="reloadTable"
+			>
+		</message-modal>
+
+<!--		<div>
+			<button class="btn btn-secondary m-1" @click="openInDiv(id,typeId)">Open in Div</button>
+			<button class="btn btn-secondary" @click="openInModal(id,typeId)">Open in Modal</button>
+			<button class="btn btn-secondary m-1" @click="openInNewTab(id,typeId)">Open in Tab</button>
+			<button class="btn btn-secondary" @click="openInNewWindow(id,typeId)">Open in Page</button>
+		</div>-->
 <!--	<p>endpoint Messages.js: {{endpoint}}</p>-->
 		<div v-if="showNew">
 			<new-message
@@ -74,10 +152,24 @@ export default {
 				:endpoint="endpoint"
 				:messageLayout="messageLayout"
 				:openMode="openMode"
-				@showNewMessageTemplate="showNewMessageTemplate"
+				@newMessage="newMessage"
 			>
 			
 			</table-messages>
+
+			<!--working also with form_only-->
+			<div v-if="showDiv">
+				<form-only
+					ref="templateNewForm"
+					:type-id="typeId"
+					:id="id"
+					:endpoint="endpoint"
+					:openMode="openMode"
+					@reloadTable="reloadTable"
+				>
+				</form-only>
+			</div>
+
 		</div>
 		
 	</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index bc07401e6..44f1a6aa2 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -18,7 +18,7 @@ export default {
 			messageLayout="twoColumnsTableLeft"
 			show-table
 			show-new
-			open-mode="showDiv"
+			open-mode="newTab"
 			>
 		</core-messages>
 
diff --git a/public/js/components/VorlagenDropdown/VorlagenDropdown.js b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
index b074711f4..e5d80077e 100644
--- a/public/js/components/VorlagenDropdown/VorlagenDropdown.js
+++ b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
@@ -57,7 +57,7 @@ export default {
 		if(this.useLoggedInUserOe){
 			this.$fhcApi.factory.vorlagen.getVorlagenByLoggedInUser()
 				.then(result => {
-					console.log(this.vorlagenOe);
+					//console.log(this.vorlagenOe);
 					this.vorlagenOe = result.data;
 				})
 				.catch(this.$fhcAlert.handleSystemError);

From b3481194882cdc9c40068e77168bc442cafbe529 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Thu, 27 Feb 2025 14:45:57 +0100
Subject: [PATCH 046/572] added comment to Documents api controller

---
 application/controllers/api/frontend/v1/Documents.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Documents.php b/application/controllers/api/frontend/v1/Documents.php
index 42a2d3433..ebd1b269b 100644
--- a/application/controllers/api/frontend/v1/Documents.php
+++ b/application/controllers/api/frontend/v1/Documents.php
@@ -149,9 +149,11 @@ class Documents extends FHCAPI_Controller
 	}
 
 	/**
+	 * @param string				$xml
+	 * @param string				$xsl
+	 * @param string				$sign_user (optional)
 	 * 
-	 * @param
-	 * @return object success or error
+	 * @return array with Akte data and export data
 	 */
 	private function _getAkteExportData($xml, $xsl, $sign_user = null)
 	{

From 45c929cb90c0358bd3e9cb2dec9c2dc9f0014585 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 27 Feb 2025 14:47:45 +0100
Subject: [PATCH 047/572] refactor(LvInfo): refactors template layout of LvInfo
 for lehrveranstaltungen and moodle events

---
 public/js/components/Calendar/Month.js        |  2 +-
 public/js/components/Calendar/Week.js         |  2 +-
 public/js/components/Cis/Mylv/LvInfo.js       | 94 ++++++++++---------
 .../components/Cis/Stundenplan/Stundenplan.js |  2 +-
 4 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/public/js/components/Calendar/Month.js b/public/js/components/Calendar/Month.js
index 520c4d0d9..ab20e2e03 100644
--- a/public/js/components/Calendar/Month.js
+++ b/public/js/components/Calendar/Month.js
@@ -2,7 +2,7 @@ import CalendarAbstract from './Abstract.js';
 import CalendarPane from './Pane.js';
 import CalendarMonthPage from './Month/Page.js';
 import BsModal from "../Bootstrap/Modal.js";
-import Months from "./Months";
+import Months from "./Months.js";
 export default {
 	mixins: [
 		CalendarAbstract
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
index 9e5baac76..4b30a1b79 100644
--- a/public/js/components/Calendar/Week.js
+++ b/public/js/components/Calendar/Week.js
@@ -2,7 +2,7 @@ import CalendarAbstract from './Abstract.js';
 import CalendarPane from './Pane.js';
 import CalendarWeekPage from './Week/Page.js';
 import BsModal from "../Bootstrap/Modal.js";
-import Weeks from "./Weeks";
+import Weeks from "./Weeks.js";
 
 export default {
 	mixins: [
diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
index 18b318b4b..e2a00b5c9 100644
--- a/public/js/components/Cis/Mylv/LvInfo.js
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -56,21 +56,47 @@ export default {
 	},
 	template:/*html*/`
 		<table class="table table-hover mb-4">
-			<tbody>
-				<tr>
-					<th>{{
-						$p.t('global','datum')?
-						$p.t('global','datum')+':'
-						:''
-					}}</th>
-					<td>{{methodFormatDate(event.datum)}}</td>
-				</tr>
-				<tr>
-					<template v-if="event.type == LV_TYPES.moodle">
+			<template v-if="event.type == LV_TYPES.moodle">
+				<tbody>
+					<tr>
+						<th>{{
+							$p.t('global','datum')?
+							$p.t('global','datum')+':'
+							:''
+						}}</th>
+						<td>{{methodFormatDate(event.datum)}}</td>
+					</tr>
+					<tr>
 						<th>{{$p.t('global','aktivitaet')}}:</th>
 						<td>{{event?.assignment}}</td>
-					</template>
-					<template v-else>
+					</tr>
+					<tr>
+						<th>{{$p.t('global','typ')}}:</th>
+						<td>{{event?.purpose}}</td>
+					</tr>
+					<tr>
+						<th>{{$p.t('fristenmanagement','frist')}}:</th>
+						<td>{{start_time}}</td>
+					</tr>
+					<tr >
+				    	<th>Link:</th>
+						<td>
+							<a :href="event?.url" target="_blank"><i class="fa fa-arrow-up-right-from-square me-1"></i></a>
+						</td>
+					</tr>
+				</tbody>
+			</template>
+			<template v-else>
+				<tbody>
+					<tr>
+						<th>{{
+							$p.t('global','datum')?
+							$p.t('global','datum')+':'
+							:''
+						}}</th>
+						<td>{{methodFormatDate(event.datum)}}</td>
+					</tr>
+					<tr>
 						<th>{{
 							$p.t('global','raum')?
 							$p.t('global','raum')+':'
@@ -80,9 +106,7 @@ export default {
 							<a v-if="event.ort_content_id" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
 							{{event.ort_kurzbz}}
 						</td>
-					</template>
-				</tr>
-				<template v-if="event.type != LV_TYPES.moodle">
+					</tr>
 					<tr>
 						<th>{{
 							$p.t('lehre','lehrveranstaltung')?
@@ -91,8 +115,6 @@ export default {
 						}}</th>
 						<td>{{'('+event.lehrform+') ' + event.lehrfach_bez}}</td>
 					</tr>
-				</template>
-				<template v-if="event.type != LV_TYPES.moodle">
 					<tr>
 						<th>{{
 							$p.t('lehre','lektor')?
@@ -106,40 +128,24 @@ export default {
 							</div>
 						</td>
 					</tr>
-				</template>
-				<tr>
-					<template v-if="event.type == LV_TYPES.moodle">
-						<th>{{$p.t('global','typ')}}:</th>
-						<td>{{event?.purpose}}</td>
-					</template>
-					<template v-else>
+					<tr>
 						<th>{{
-							$p.t('ui','zeitraum')?
-							$p.t('ui','zeitraum')+':'
-							:''
-						}}</th>
+								$p.t('ui','zeitraum')?
+								$p.t('ui','zeitraum')+':'
+								:''
+							}}</th>
 						<td>{{start_time + ' - ' + end_time}}</td>
-					</template>
-				</tr>
-				<tr>
-				    <template v-if="event.type == LV_TYPES.moodle">
-						<th>{{$p.t('fristenmanagement','frist')}}:</th>
-						<td>{{start_time}}</td>
-					</template>
-					<template v-else>
+					</tr>
+					<tr>
 						<th>{{
 							$p.t('lehre','organisationseinheit')?
 							$p.t('lehre','organisationseinheit')+':'
 							:''
 						}}</th>
 						<td>{{event.organisationseinheit}}</td>
-					</template>
-				</tr>
-				<tr v-if="event.type == LV_TYPES.moodle">
-				    <th>Link:</th>
-					<td><a :href="event?.url" target="_blank"><i class="fa fa-arrow-up-right-from-square me-1"></i></a></td>
-				</tr>
-			</tbody>
+					</tr>
+				</tbody>
+			</template>
 		</table>
 	`
 }
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 889a3f8bf..c8c4fb91c 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -336,7 +336,7 @@ const Stundenplan = {
 			</div>
 		</template>
 		<template #monthPage="{event,day}">
-			<div class="p-1" v-if="event.type=='moodle'">
+			<div class="p-1" v-if="event.type=='moodle'" @click="showModal(event)">
 				<div class="d-flex small w-100" >
 					<moodle-svg></moodle-svg>
 					<span class="flex-grow-1 text-center ">{{event.topic}}</span>

From 4a01198e10c86bf2f49fdcf38f60ab5cb4270f9d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 28 Feb 2025 14:52:02 +0100
Subject: [PATCH 048/572] refactor(Stundenplan Endpoint):puts methods used to
 fetch Stundenplan and Reservierungs Events in its own library and dynamically
 merges the moodle events if plugin is present

---
 .../api/frontend/v1/Stundenplan.php           | 568 +++---------------
 application/libraries/StundenplanLib.php      | 558 +++++++++++++++++
 public/js/api/stundenplan.js                  |  16 +-
 .../components/Cis/Stundenplan/Stundenplan.js |  61 +-
 .../components/DashboardWidget/Stundenplan.js |  60 +-
 5 files changed, 647 insertions(+), 616 deletions(-)
 create mode 100644 application/libraries/StundenplanLib.php

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 4abff559c..c53af8e3c 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -30,11 +30,10 @@ class Stundenplan extends FHCAPI_Controller
 	{
 
 		parent::__construct([
-			'fetchMoodleEvents' => self::PERM_LOGGED,
 			'getRoomplan' => self::PERM_LOGGED,
             'Stunden' => self::PERM_LOGGED,
             'Reservierungen' => self::PERM_LOGGED,
-			'getStundenplan' => self::PERM_LOGGED,
+			'StundenplanEvents' => self::PERM_LOGGED,
 			'getLehreinheitStudiensemester' => self::PERM_LOGGED,
 			'studiensemesterDateInterval' => self::PERM_LOGGED,
 		]);
@@ -60,19 +59,83 @@ class Stundenplan extends FHCAPI_Controller
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
-	public function fetchMoodleEvents(){
-		$this->load->library('form_validation');
-        $this->form_validation->set_data($_GET);
-        $this->form_validation->set_rules('timestart',"timestart","required");
-        $this->form_validation->set_rules('timeend',"timeend","required");
-        if($this->form_validation->run() === FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+	 /**
+     * fetches Stundenplan and Moodle events together
+     * @access public
+     *
+     */
+	public function StundenplanEvents(){
+		$this->load->library('StundenplanLib');
 
-        $timestart = intval($this->input->get('timestart', TRUE));
-        $timeend = intval($this->input->get('timeend', TRUE));
+		// form validation
+		$this->load->library('form_validation');
+		$this->form_validation->set_data($_GET);
+		$this->form_validation->set_rules('start_date', "start_date", "required");
+		$this->form_validation->set_rules('end_date', "end_date", "required");
+		if ($this->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		// storing the get parameter in local variables
+		$start_date = $this->input->get('start_date', TRUE);
+		$end_date = $this->input->get('end_date', TRUE);
+		$lv_id = $this->input->get('lv_id', TRUE);
+
+		$stundenplan_events = $this->stundenplanlib->getStundenplan($start_date,$end_date,$lv_id);
+		$stundenplan_events = $this->getDataOrTerminateWithError($stundenplan_events);	
+
+		// fetching moodle events
+		$moodle_start_date = new DateTime($start_date);
+		$moodle_start_date = $moodle_start_date->getTimestamp();
+		$moodle_end_date = new DateTime($end_date);
+		$moodle_end_date = $moodle_end_date->getTimestamp();
+		$moodle_events = [];
 		Events::trigger('moodleCalendarEvents',
-						['timestart'=>$timestart,'timeend'=>$timeend, 'username'=>getAuthUID()]
+						function & () use (&$moodle_events) {
+							return $moodle_events;
+						},
+						['timestart'=>$moodle_start_date,'timeend'=>$moodle_end_date, 'username'=>getAuthUID()]
 		);
-		$this->terminateWithSuccess(json_decode(ob_get_contents()));
+		
+		$moodle_events = array_map(function($event){
+			$moodle_event_timestart = new DateTime($event->timestart);
+			$moodle_event_timeend = new DateTime($event->timeend);
+			$convertedEvent = new stdClass();
+			$convertedEvent->type = 'moodle';
+			$convertedEvent->beginn = $moodle_event_timestart->format('H:i:s');
+			$convertedEvent->ende = $moodle_event_timeend->format('H:i:s');
+			$convertedEvent->allDayEvent = true;
+			$convertedEvent->datum = $moodle_event_timestart->format('Y-n-j');
+			$convertedEvent->purpose = $event->purpose;
+			$convertedEvent->assignment = $event->activityname;
+			$convertedEvent->topic = $event->activitystr;
+			$convertedEvent->lektor = [];
+			$convertedEvent->gruppe = [];
+			$convertedEvent->ort_kurzbz = $event->location;
+			$convertedEvent->lehreinheit_id = $event->lehreinheitsNummber ?? null;
+			$convertedEvent->titel = $event->course->fullname;
+			$convertedEvent->lehrfach = '';
+			$convertedEvent->lehrform = '';
+			$convertedEvent->lehrfach_bez = '';
+			$convertedEvent->organisationseinheit = '';
+			$convertedEvent->farbe = '00689E';
+			$convertedEvent->lehrveranstaltung_id = 0;
+			$convertedEvent->ort_content_id = 0;
+			$convertedEvent->url = $event->url;
+			return $convertedEvent;
+		},$moodle_events);
+		
+		$result = array_merge($stundenplan_events,$moodle_events);
+		// sort array with moodle events first
+		usort($result, function($a, $b){
+			if ($a->type === 'moodle' && $b->type !== 'moodle') {
+				return -1;
+			} elseif ($a->type !== 'moodle' && $b->type === 'moodle') {
+				return 1;
+			} else {
+				return 0;
+			}
+		});
+		$this->terminateWithSuccess($result);
 	}
 
 	//TODO: delete this function if we don't use the old calendar export endpoints anymore
@@ -129,90 +192,7 @@ class Stundenplan extends FHCAPI_Controller
 		$this->terminateWithSuccess($roomplan_data);
 
 	}
-
-	/**
-	 * fetches stundenplan events from a UID and start/end date
-	 * @access public
-	 *
-	 */
-
-	public function getStundenplan(){
-
-		$this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
-		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
-		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-		$this->load->model('person/Benutzergruppe_model','BenutzergruppeModel');
-
-		// form validation
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('start_date', "start_date", "required");
-		$this->form_validation->set_rules('end_date', "end_date", "required");
-		if ($this->form_validation->run() === FALSE)
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		// storing the get parameter in local variables
-		$start_date = $this->input->get('start_date', TRUE);
-		$end_date = $this->input->get('end_date', TRUE);
-		$lv_id = $this->input->get('lv_id', TRUE);
-
-		$student_uid = getAuthUID();
-		if(is_null($student_uid))
-		{
-			$this->terminateWithError("No UID");
-		}
-		
-		$semester_range = $this->studienSemesterErmitteln($start_date,$end_date);
-		$this->sortStudienSemester($semester_range);
-		$this->applyLoadUeberSemesterHaelfte($semester_range);
-		
-		if($lv_id) { // fetch Stundenplan for lva, irrelevant of who is requesting it (for now)
-
-			$stundenplan_data = $this->StundenplanModel->getStundenplanLVA($start_date, $end_date, $lv_id);
-			$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
-			$this->expand_object_information($stundenplan_data);
-
-			// query lv itself in case its Stundenplan is being queried and it has no entries
-			$this->load->model('education/Lehrveranstaltung_model','LehrveranstaltungModel');
-			$lv = getData($this->LehrveranstaltungModel->load($lv_id))[0];
-			$this->addMeta('lv', $lv);
-			$this->terminateWithSuccess($stundenplan_data);
-			
-		}
-		
-		$is_mitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter($student_uid));
-		if($is_mitarbeiter)
-		{
-			
-			$stundenplan_data = $this->StundenplanModel->getStundenplanMitarbeiter($start_date, $end_date, $student_uid);
-			$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
-			$this->expand_object_information($stundenplan_data);
-			$this->terminateWithSuccess($stundenplan_data);
-		} else {
-			// getting the gruppen_kurzbz of the student in the different studiensemester
-			$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($semester_range);
-
-			// getting the student_lehrverbaende of the student in the different studiensemester
-			$student_lehrverband = $this->fetchStudentlehrverbandFromStudiensemester($semester_range);
-
-			$stundenplan_query = $this->StundenplanModel->getStundenplanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
-			if(!$stundenplan_query)
-			{
-				$this->terminateWithSuccess([]);
-			}
-			$stundenplan_data = $this->StundenplanModel->stundenplanGruppierung($stundenplan_query);
-			$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
-
-			$this->expand_object_information($stundenplan_data);
-			
-			$this->returnObj['$stundenplan_query'] = $stundenplan_query;
-			$this->returnObj['$student_lehrverband'] = $student_lehrverband;
-			$this->returnObj['$benutzer_gruppen'] = $benutzer_gruppen;
-			$this->terminateWithSuccess($stundenplan_data);
-		}
-		
-	}
-
+	
 	// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the stundenplan of a student
     public function Reservierungen($ort_kurzbz = null)
 	{
@@ -229,19 +209,10 @@ class Stundenplan extends FHCAPI_Controller
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
-		$is_mitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter(getAuthUID()));
-		if($is_mitarbeiter)
-		{
-			$reservierungen = $this->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date, $ort_kurzbz);
-		} else {
-			// querying the reservierungen
-			$reservierungen = $this->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
-		}
-		
-		$reservierungen = $this->getDataOrTerminateWithError($reservierungen) ?? [];
-		$this->expand_object_information($reservierungen);
-		$this->terminateWithSuccess($reservierungen);
-		
+		$this->load->library('StundenplanLib');
+		$result = $this->stundenplanlib->getReservierungen($start_date,$end_date,$ort_kurzbz);
+		$result = $this->getDataOrTerminateWithError($result);	
+		$this->terminateWithSuccess($result);
 	}
 
 	public function getLehreinheitStudiensemester($lehreinheit_id){
@@ -252,385 +223,6 @@ class Stundenplan extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
-	// ################# Private Functions
-
-	private function expand_object_information($data){
-
-		foreach ($data as $item)
-		{
-
-			$lektor_obj_array = array();
-			$gruppe_obj_array = array();
-
-			// load lektor object
-			foreach ($item->lektor as $lv_lektor)
-			{
-				$this->StundenplanModel->addLimit(1);
-				$lektor_object = $this->StundenplanModel->execReadOnlyQuery("
-				SELECT mitarbeiter_uid, vorname, nachname, kurzbz
-				FROM public.tbl_mitarbeiter
-				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
-				JOIN public.tbl_person person ON person.person_id = benutzer.person_id
-				WHERE kurzbz = ?", [$lv_lektor]);
-				if (isError($lektor_object)) {
-					$this->show_error(getError($lektor_object));
-				}
-				$lektor_object = $this->getDataOrTerminateWithError($lektor_object);
-				if(count($lektor_object) == 0)
-				{
-					$this->terminateWithError("No lektor object");
-				}
-				$lektor_object = current($lektor_object);
-				// only provide needed information of the mitarbeiter object
-				$lektor_obj_array[] = $lektor_object;
-			}
-
-			// load gruppe object
-			foreach ($item->gruppe as $lv_gruppe)
-			{
-				$lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
-				$lv_gruppe_array = explode(",", $lv_gruppe);
-				list($gruppe, $verband, $semester, $studiengang_kz, $gruppen_kuerzel) = $lv_gruppe_array;
-
-				$lv_gruppe_object = new stdClass();
-				$lv_gruppe_object->gruppe = $gruppe;
-				$lv_gruppe_object->verband = $verband;
-				$lv_gruppe_object->semester = $semester;
-				$lv_gruppe_object->studiengang_kz = $studiengang_kz;
-				$lv_gruppe_object->kuerzel = $gruppen_kuerzel;
-
-				$gruppe_obj_array[] = $lv_gruppe_object;
-			}
-			
-			if($item->ort_kurzbz) {
-
-				$ort_content_object = $this->StundenplanModel->execReadOnlyQuery("
-				SELECT content_id
-				FROM public.tbl_ort
-				WHERE ort_kurzbz = ?", [$item->ort_kurzbz]);
-				if (isError($ort_content_object)) {
-					$this->show_error(getError($ort_content_object));
-				}
-				$ort_content_object = getData($ort_content_object)[0];
-				if($ort_content_object) {
-					$item->ort_content_id = $ort_content_object->content_id;
-				}
-				
-				
-			}
-
-			$item->gruppe = $gruppe_obj_array;
-			$item->lektor = $lektor_obj_array;
-
-		}
-	}
-
-	// function used to sort an array of studiensemester strings
-	private function sortStudienSemester(&$semester_range){
-		usort(
-			$semester_range,
-			function($first,$second)
-			{
-				$sem_first = null;
-				$year_first = null;
-				$match_first = null;
-
-				$sem_second = null;
-				$year_second = null;
-				$match_second = null;
-
-				preg_match('/([WS]+)([0-9]+)/',$first,$match_first);
-				preg_match('/([WS]+)([0-9]+)/',$second,$match_second);
-				
-				$sem_first = $match_first[1];
-				$year_first = intval($match_first[2]);
-
-				$sem_second = $match_second[1];
-				$year_second = intval($match_second[2]);
-
-				if($year_first < $year_second)
-				{
-					return -1;
-				}
-				else if($year_first > $year_second)
-				{
-					return 1;
-				}
-				else if($year_first == $year_second && $sem_first > $sem_second)
-				{
-					return 1;
-				}
-				else if($year_first == $year_second && $sem_first < $sem_second)
-				{
-					return -1;
-				}
-				return 0;
-			} 
-		);
-	}
-
 	
 
-	private function fetchBenutzerGruppenFromStudiensemester($semester_range){
-		$student_uid = getAuthUID();
-		$benutzer_gruppen = [];
-		// for each studiensemester fetch the benutzer gruppen and add them to an associate $bentuzer_gruppen array
-		/*
-		[
-			['WS2023'] => [['gruppe1_SS2023','gruppe2_SS2023'],['gruppe1_WS2023','gruppe2_WS2023']],
-			['SS2024'] => [['gruppe1_WS2023','gruppe2_WS2023'],['gruppe1_SS2024','gruppe2_SS2024']],
-			['WS2024'] => [['gruppe1_SS2024','gruppe2_SS2024'],['gruppe1_WS2024','gruppe2_WS2024']],
-		]
-		*/ 
-		foreach($semester_range as $semester_key => $semester_array)
-		{
-			$benutzer_gruppen[$semester_key] = [];
-			// each semester could have ajoint semesters that need to be checked
-			foreach($semester_array as $semester=>$semester_date_range)
-			{
-				// for each active semester query the benutzer_gruppen associated to the semester
-				$benutzer_query = $this->BenutzergruppeModel->execReadOnlyQuery("
-				SELECT * FROM tbl_benutzergruppe where uid = ? AND studiensemester_kurzbz = ?",[$student_uid, $semester]);
-				$benutzer_query_result = $this->getDataOrTerminateWithError($benutzer_query);
-				array_push(
-					$benutzer_gruppen[$semester_key],
-					 array_map(
-						function($item)
-						{
-							return "'".$item->gruppe_kurzbz. "'";
-						},
-						$benutzer_query_result
-					)
-				);
-			}
-		}
-		
-		// merge the gruppen of each studiensemester together for the original studiensemester
-		/*
-		[
-			['WS2023'] => ['gruppe1_SS2023','gruppe2_SS2023','gruppe1_WS2023','gruppe2_WS2023'],
-			['SS2024'] => ['gruppe1_WS2023','gruppe2_WS2023','gruppe1_SS2024','gruppe2_SS2024'],
-			['WS2024'] => ['gruppe1_SS2024','gruppe2_SS2024','gruppe1_WS2024','gruppe2_WS2024'],
-		]
-		*/ 
-		$benutzer_gruppen = array_map(
-			function($gruppe)
-			{
-				$merged_gruppe = [];
-				foreach($gruppe as $gruppen_array)
-				{
-					$merged_gruppe = array_merge($merged_gruppe, $gruppen_array);
-				}
-				return $merged_gruppe;
-			},
-			$benutzer_gruppen
-		);
-
-		return $benutzer_gruppen;
-	}
-
-	private function fetchStudentlehrverbandFromStudiensemester($semester_range){
-		$student_uid = getAuthUID();
-		$student_lehrverband = [];
-		// for each studiensemester fetch the studentlehrverbaende and add them to an associate $student_lehrverband array
-		/*
-		[
-			['WS2023'] => [ [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ] ],
-			['SS2024'] => [ [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ], [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ] ],
-			['WS2024'] => [ [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ], [ ['stg_kz'=>298,'semester'=>3,'verband'=>"A",'gruppe'=>""] ] ],
-		]
-		*/ 
-		foreach($semester_range as $semester_key => $semester_array)
-		{
-			$student_lehrverband[$semester_key] = [];
-			foreach($semester_array as $semester=>$semester_date_range)
-			{
-				// for each active semester query the student_lehrverband associated to the semester
-				$lehrverband_query = $this->BenutzergruppeModel->execReadOnlyQuery("
-				SELECT * FROM tbl_studentlehrverband where student_uid = ? AND studiensemester_kurzbz = ?", [$student_uid, $semester]);
-				$lehrverband_query_result = $this->getDataOrTerminateWithError($lehrverband_query);
-				array_push($student_lehrverband[$semester_key], array_map(
-					function ($item)
-					{
-						$result = new stdClass();
-						$result->studiengang_kz = $item->studiengang_kz;
-						$result->semester = $item->semester;
-						$result->verband = $item->verband;
-						$result->gruppe = $item->gruppe;
-						return $result;
-					},
-					$lehrverband_query_result)); 
-			}
-		}
-
-		// merge the studentlehrverband of each studiensemester together for the original studiensemester
-		/*
-		[
-			['WS2023'] => [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ],
-			['SS2024'] => [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""], ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ],
-			['WS2024'] => [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""], ['stg_kz'=>298,'semester'=>3,'verband'=>"A",'gruppe'=>""] ],
-		]
-		*/
-		$student_lehrverband = array_map(
-			function($studentlehrverband)
-			{	
-				$merged_studentlehrverband = [];
-				foreach($studentlehrverband as $studentlehrverband_array)
-				{
-					$merged_studentlehrverband = array_merge($merged_studentlehrverband, $studentlehrverband_array);
-				}
-				return $merged_studentlehrverband;
-			},
-			$student_lehrverband
-		);
-
-		return $student_lehrverband;
-	}
-
-	private function applyLoadUeberSemesterHaelfte(&$semester_range){
-		/*
-		@var($semester_collection)
-		convert the array of studiensemester into an associative array with the studiensemester as the key 
-		and the values of each key are the studiensemester needed for the query associated to that studiensemester
-		example:
-
-		#INPUT:
-		['WS2023','SS2024','WS2024']
-		#OUTPUT:
-		[
-			'WS2023' => ['SS2023','WS2023']
-			'SS2024' => ['WS2023','SS2024']
-			'WS2024' => ['SS2024','WS2024']
-		]
-		*/
-		$semester_collection = [];
-		foreach($semester_range as $studiensemester)
-		{
-			$previous_studiensemester = $this->StudiensemesterModel->getPreviousFrom($studiensemester);
-			$previous_studiensemester = $this->getDataOrTerminateWithError($previous_studiensemester);
-			if (count($previous_studiensemester) == 0) {
-				$this->terminateWithError("No previous semester");
-			}
-			$previous_studiensemester = current($previous_studiensemester)->studiensemester_kurzbz;
-			$semester_collection[$studiensemester] = [$previous_studiensemester, $studiensemester];
-		}
-
-		/*
-		@var($studienSemesterDateRanges)
-		fetches for each studiensemester the start and end date, (SS) summer studiensemester are extended by 1 month to cover the summerbreak
-		based on the LVPLAN_LOAD_UEBER_SEMESTERHAELFTE constant it will load both the semester and the previous semester with the full date range 
-		or the semester with the full date range and the previous semester with the half date range:
-
-		#INPUT:
-		[
-			'WS2023' => ['SS2023','WS2023']
-			'SS2024' => ['WS2023','SS2024']
-			'WS2024' => ['SS2024','WS2024']
-		]
-		#OUTPUT: depends whether LVPLAN_LOAD_UEBER_SEMESTERHAELFTE is true or false
-		~ if LVPLAN_LOAD_UEBER_SEMESTERHAELFTE == true
-		[
-			"SS2024": [
-				"WS2023": [
-					"start"=> "2024-02-03",
-					"ende"=> "2024-08-31"
-				],
-				"SS2024": [
-					"start"=> "2024-02-03",
-					"ende"=> "2024-08-31"
-				]
-			]
-		]
-		~ if LVPLAN_LOAD_UEBER_SEMESTERHAELFTE == false
-		[
-			"SS2024": [
-				"WS2023": [
-					"start"=> "2024-02-03",
-					"ende"=> "2024-05-17"
-				],
-				"SS2024": [
-					"start"=> "2024-02-03",
-					"ende"=> "2024-08-31"
-				]
-			]
-		]
-		*/
-		$studienSemesterDateRanges=[]; 
-		foreach($semester_collection as $semester_original => $semester_adjoint)
-		{
-			$semester_start_ende = $this->StudiensemesterModel->getStartEndeFromStudiensemester($semester_original);
-			$semester_start_ende = current($this->getDataOrTerminateWithError($semester_start_ende)); 
-				
-			// initialize empty arrays to add key value pairs
-			$studienSemesterDateRanges[$semester_original] = [];
-
-			// check if the studiensemester is a summer semester and add 1 month to bridge the school summer break
-			$match = null;
-			preg_match("/^(SS)([0-9]+)/",$semester_original,$match);
-			if(count($match) >0)
-			{
-				$one_month = new DateInterval('P1M');
-				$one_day = DateInterval::createFromDateString('1 days');
-				$summer_studiensemester_end_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->ende);
-				$summer_studiensemester_end_date->add($one_month);
-				$summer_studiensemester_end_date->sub($one_day);
-				$semester_start_ende->ende = date_format($summer_studiensemester_end_date,'Y-m-d');
-			}
-			if (defined('LVPLAN_LOAD_UEBER_SEMESTERHAELFTE') && LVPLAN_LOAD_UEBER_SEMESTERHAELFTE === true)
-			{
-				foreach($semester_adjoint as $adjoint)
-				{
-					$studienSemesterDateRanges[$semester_original][$adjoint]=$semester_start_ende;
-				}
-			}
-			else
-			{
-				//TODO: half of a DateInterval might not be correctly calculated
-				// calculate the half of the studiensemester
-				$studiensemester_start_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->start);
-				$studiensemester_end_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->ende);
-				$studiensemester_time_difference = $studiensemester_start_date->diff($studiensemester_end_date);
-				$half_dateNumber = ceil($studiensemester_time_difference->d/2)+ceil(($studiensemester_time_difference->m*30)/2);
-				$half_dateInterval = new DateInterval('P'.strval($half_dateNumber) .'D');
-				$studiensemester_half = date_format($studiensemester_start_date->add($half_dateInterval),'Y-m-d');
-				
-				$first_half = new stdClass();
-				$first_half->start = $semester_start_ende->start;
-				$first_half->ende = $studiensemester_half;
-
-				$studienSemesterDateRanges[$semester_original][$semester_adjoint[0]] = $first_half;
-				$studienSemesterDateRanges[$semester_original][$semester_adjoint[1]] = $semester_start_ende;
-			}
-			$semester_range = $studienSemesterDateRanges;
-		}
-	}
-
-	private function studienSemesterErmitteln($start_date,$end_date){
-		
-		// gets all studiensemester from the student from start_date to end_date
-		$semester_range = $this->StudiensemesterModel->getByDateRange($start_date,$end_date);
-		$semester_range = array_map( 
-			function($sem)
-			{
-				return $sem->studiensemester_kurzbz;
-			},
-			$this->getDataOrTerminateWithError($semester_range)
-		);
-
-		// if no studiensemester is found for the given timespan, get the nearest studiensemester
-		if(count($semester_range) == 0)
-		{
-			$aktuelle_studiensemester = $this->StudiensemesterModel->getNearest();
-			$aktuelle_studiensemester = $this->getDataOrTerminateWithError($aktuelle_studiensemester);
-			if (count($aktuelle_studiensemester) == 0) {
-				$this->terminateWithError("No aktuelles semester");
-			}
-			$aktuelle_studiensemester = current($aktuelle_studiensemester)->studiensemester_kurzbz;
-			// push aktuelles semester in active semester array
-			array_push($semester_range, $aktuelle_studiensemester);
-
-		}
-		return $semester_range;
-	}
-
 }
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
new file mode 100644
index 000000000..5a741e10c
--- /dev/null
+++ b/application/libraries/StundenplanLib.php
@@ -0,0 +1,558 @@
+<?php
+
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class StundenplanLib{
+
+	private $_ci; // Code igniter instance
+	
+
+	/**
+	 * fetches stundenplan events from a UID and start/end date
+	 * @access public
+	 *
+	 */
+	public function getStundenplan($start_date, $end_date, $lv_id = null){
+		
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
+		$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$this->_ci->load->model('person/Benutzergruppe_model','BenutzergruppeModel');
+
+		$student_uid = getAuthUID();
+		if(is_null($student_uid))
+		{
+			return error("No UID");
+		}
+		
+		$semester_range = $this->studienSemesterErmitteln($start_date,$end_date);
+		if(isError($semester_range))
+		{
+			return error(getData($semester_range));
+		}
+		$semester_range = getData($semester_range);
+		$this->sortStudienSemester($semester_range);
+		$function_error = $this->applyLoadUeberSemesterHaelfte($semester_range);
+		if(!is_null($function_error)){
+			return $function_error;
+		}
+		
+		if($lv_id) { // fetch Stundenplan for lva, irrelevant of who is requesting it (for now)
+
+			$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanLVA($start_date, $end_date, $lv_id);
+			if(isError($stundenplan_data))
+			{
+				return error(getData($stundenplan_data));
+			}
+			$stundenplan_data = getData($stundenplan_data) ?? [];
+			$function_error = $this->expand_object_information($stundenplan_data);
+			if(!is_null($function_error)){
+				return $function_error;
+			}
+
+			// query lv itself in case its Stundenplan is being queried and it has no entries
+			$this->_ci->load->model('education/Lehrveranstaltung_model','LehrveranstaltungModel');
+			$lv_result = $this->LehrveranstaltungModel->load($lv_id);
+			if(isError($lv_result))
+			{
+				return error(getData($lv_result));
+			}
+			$lv = getData($lv_result)[0];
+			return $stundenplan_data;
+			
+		}
+		
+		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter($student_uid));
+		if($is_mitarbeiter)
+		{
+			
+			$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanMitarbeiter($start_date, $end_date, $student_uid);
+			if(isError($stundenplan_data))
+			{
+				return error(getData($stundenplan_data));
+			}
+			$stundenplan_data = getData($stundenplan_data) ?? [];
+			$function_error = $this->expand_object_information($stundenplan_data);
+			if(!is_null($function_error)){
+				return $function_error;
+			}
+			return $stundenplan_data;
+		} else {
+			// getting the gruppen_kurzbz of the student in the different studiensemester
+			$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($semester_range);
+			if(isError($benutzer_gruppen))
+			{
+				return error(getData($benutzer_gruppen));
+			}
+			$benutzer_gruppen = getData($benutzer_gruppen);
+
+			// getting the student_lehrverbaende of the student in the different studiensemester
+			$student_lehrverband = $this->fetchStudentlehrverbandFromStudiensemester($semester_range);
+			if(isError($student_lehrverband))
+			{
+				return error(getData($student_lehrverband));
+			}
+			$student_lehrverband = getData($student_lehrverband);
+			
+			$stundenplan_query = $this->_ci->StundenplanModel->getStundenplanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
+			if(!$stundenplan_query)
+			{
+				return [];
+			}
+			
+			
+			$stundenplan_data = $this->_ci->StundenplanModel->stundenplanGruppierung($stundenplan_query);
+			if(isError($stundenplan_data))
+			{
+				return error(getData($stundenplan_data));
+			}
+			$stundenplan_data = getData($stundenplan_data) ?? [];
+
+			$function_error = $this->expand_object_information($stundenplan_data);
+			if(!is_null($function_error)){
+				return $function_error;
+			}
+			
+			return success($stundenplan_data);
+		}
+		
+	}
+
+	public function getReservierungen($start_date, $end_date, $ort_kurzbz){
+		$this->_ci =& get_instance();
+		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter(getAuthUID()));
+		if($is_mitarbeiter)
+		{
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date, $ort_kurzbz);
+		} else {
+			// querying the reservierungen
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
+		}
+		if(isError($reservierungen))
+		{
+			return error(getData($reservierungen));
+		}
+		$reservierungen = getData($reservierungen) ?? [];
+		$function_error = $this->expand_object_information($reservierungen);
+		if(!is_null($function_error)){
+			return $function_error;
+		}
+		return success($reservierungen);
+	}
+
+
+	private function expand_object_information($data){
+
+		foreach ($data as $item)
+		{
+
+			$lektor_obj_array = array();
+			$gruppe_obj_array = array();
+
+			// load lektor object
+			foreach ($item->lektor as $lv_lektor)
+			{
+				$this->_ci->StundenplanModel->addLimit(1);
+				$lektor_object = $this->_ci->StundenplanModel->execReadOnlyQuery("
+				SELECT mitarbeiter_uid, vorname, nachname, kurzbz
+				FROM public.tbl_mitarbeiter
+				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
+				JOIN public.tbl_person person ON person.person_id = benutzer.person_id
+				WHERE kurzbz = ?", [$lv_lektor]);
+				if (isError($lektor_object)) {
+					$this->_ci->show_error(getError($lektor_object));
+				}
+				if(isError($lektor_object))
+				{
+					return error(getData($lektor_object));
+				}
+				$lektor_object = getData($lektor_object);
+				if(count($lektor_object) == 0)
+				{
+					return error("No lektor object");
+				}
+				$lektor_object = current($lektor_object);
+				// only provide needed information of the mitarbeiter object
+				$lektor_obj_array[] = $lektor_object;
+			}
+
+			// load gruppe object
+			foreach ($item->gruppe as $lv_gruppe)
+			{
+				$lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
+				$lv_gruppe_array = explode(",", $lv_gruppe);
+				list($gruppe, $verband, $semester, $studiengang_kz, $gruppen_kuerzel) = $lv_gruppe_array;
+
+				$lv_gruppe_object = new stdClass();
+				$lv_gruppe_object->gruppe = $gruppe;
+				$lv_gruppe_object->verband = $verband;
+				$lv_gruppe_object->semester = $semester;
+				$lv_gruppe_object->studiengang_kz = $studiengang_kz;
+				$lv_gruppe_object->kuerzel = $gruppen_kuerzel;
+
+				$gruppe_obj_array[] = $lv_gruppe_object;
+			}
+			
+			if($item->ort_kurzbz) {
+
+				$ort_content_object = $this->_ci->StundenplanModel->execReadOnlyQuery("
+				SELECT content_id
+				FROM public.tbl_ort
+				WHERE ort_kurzbz = ?", [$item->ort_kurzbz]);
+				if (isError($ort_content_object)) {
+					return error(getData($ort_content_object));
+				}
+				$ort_content_object = getData($ort_content_object)[0];
+				if($ort_content_object) {
+					$item->ort_content_id = $ort_content_object->content_id;
+				}
+				
+				
+			}
+
+			$item->gruppe = $gruppe_obj_array;
+			$item->lektor = $lektor_obj_array;
+
+		}
+	}
+
+	// function used to sort an array of studiensemester strings
+	private function sortStudienSemester(&$semester_range){
+		usort(
+			$semester_range,
+			function($first,$second)
+			{
+				$sem_first = null;
+				$year_first = null;
+				$match_first = null;
+
+				$sem_second = null;
+				$year_second = null;
+				$match_second = null;
+
+				preg_match('/([WS]+)([0-9]+)/',$first,$match_first);
+				preg_match('/([WS]+)([0-9]+)/',$second,$match_second);
+				
+				$sem_first = $match_first[1];
+				$year_first = intval($match_first[2]);
+
+				$sem_second = $match_second[1];
+				$year_second = intval($match_second[2]);
+
+				if($year_first < $year_second)
+				{
+					return -1;
+				}
+				else if($year_first > $year_second)
+				{
+					return 1;
+				}
+				else if($year_first == $year_second && $sem_first > $sem_second)
+				{
+					return 1;
+				}
+				else if($year_first == $year_second && $sem_first < $sem_second)
+				{
+					return -1;
+				}
+				return 0;
+			} 
+		);
+	}
+
+	
+
+	private function fetchBenutzerGruppenFromStudiensemester($semester_range){
+		$student_uid = getAuthUID();
+		$benutzer_gruppen = [];
+		// for each studiensemester fetch the benutzer gruppen and add them to an associate $bentuzer_gruppen array
+		/*
+		[
+			['WS2023'] => [['gruppe1_SS2023','gruppe2_SS2023'],['gruppe1_WS2023','gruppe2_WS2023']],
+			['SS2024'] => [['gruppe1_WS2023','gruppe2_WS2023'],['gruppe1_SS2024','gruppe2_SS2024']],
+			['WS2024'] => [['gruppe1_SS2024','gruppe2_SS2024'],['gruppe1_WS2024','gruppe2_WS2024']],
+		]
+		*/ 
+		foreach($semester_range as $semester_key => $semester_array)
+		{
+			$benutzer_gruppen[$semester_key] = [];
+			// each semester could have ajoint semesters that need to be checked
+			foreach($semester_array as $semester=>$semester_date_range)
+			{
+				// for each active semester query the benutzer_gruppen associated to the semester
+				$benutzer_query = $this->_ci->BenutzergruppeModel->execReadOnlyQuery("
+				SELECT * FROM tbl_benutzergruppe where uid = ? AND studiensemester_kurzbz = ?",[$student_uid, $semester]);
+				if(isError($benutzer_query)){
+					return error(getData($benutzer_query));
+				}
+				$benutzer_query_result = getData($benutzer_query)??[];
+				
+				array_push(
+					$benutzer_gruppen[$semester_key],
+					 array_map(
+						function($item)
+						{
+							return "'".$item->gruppe_kurzbz. "'";
+						},
+						$benutzer_query_result
+					)
+				);
+			}
+		}
+		
+		// merge the gruppen of each studiensemester together for the original studiensemester
+		/*
+		[
+			['WS2023'] => ['gruppe1_SS2023','gruppe2_SS2023','gruppe1_WS2023','gruppe2_WS2023'],
+			['SS2024'] => ['gruppe1_WS2023','gruppe2_WS2023','gruppe1_SS2024','gruppe2_SS2024'],
+			['WS2024'] => ['gruppe1_SS2024','gruppe2_SS2024','gruppe1_WS2024','gruppe2_WS2024'],
+		]
+		*/ 
+		$benutzer_gruppen = array_map(
+			function($gruppe)
+			{
+				$merged_gruppe = [];
+				foreach($gruppe as $gruppen_array)
+				{
+					$merged_gruppe = array_merge($merged_gruppe, $gruppen_array);
+				}
+				return $merged_gruppe;
+			},
+			$benutzer_gruppen
+		);
+
+		return success($benutzer_gruppen);
+	}
+
+	private function fetchStudentlehrverbandFromStudiensemester($semester_range){
+		$student_uid = getAuthUID();
+		$student_lehrverband = [];
+		// for each studiensemester fetch the studentlehrverbaende and add them to an associate $student_lehrverband array
+		/*
+		[
+			['WS2023'] => [ [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ] ],
+			['SS2024'] => [ [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ], [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ] ],
+			['WS2024'] => [ [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ], [ ['stg_kz'=>298,'semester'=>3,'verband'=>"A",'gruppe'=>""] ] ],
+		]
+		*/ 
+		foreach($semester_range as $semester_key => $semester_array)
+		{
+			$student_lehrverband[$semester_key] = [];
+			foreach($semester_array as $semester=>$semester_date_range)
+			{
+				// for each active semester query the student_lehrverband associated to the semester
+				$lehrverband_query = $this->_ci->BenutzergruppeModel->execReadOnlyQuery("
+				SELECT * FROM tbl_studentlehrverband where student_uid = ? AND studiensemester_kurzbz = ?", [$student_uid, $semester]);
+				if(isError($lehrverband_query)){
+					return error(getData($lehrverband_query));
+				}	
+				$lehrverband_query_result = getData($lehrverband_query)??[];
+				
+				$converted_studentLehrverband= array_map(
+					function ($item)
+					{
+						$result = new stdClass();
+						$result->studiengang_kz = $item->studiengang_kz;
+						$result->semester = $item->semester;
+						$result->verband = $item->verband;
+						$result->gruppe = $item->gruppe;
+						return $result;
+					},
+					$lehrverband_query_result);
+				
+				array_push($student_lehrverband[$semester_key], $converted_studentLehrverband); 
+				
+			}
+			
+		}
+
+		// merge the studentlehrverband of each studiensemester together for the original studiensemester
+		/*
+		[
+			['WS2023'] => [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ],
+			['SS2024'] => [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""], ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ],
+			['WS2024'] => [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""], ['stg_kz'=>298,'semester'=>3,'verband'=>"A",'gruppe'=>""] ],
+		]
+		*/
+		
+		$student_lehrverband = array_map(
+			function($studentlehrverband)
+			{	
+				$merged_studentlehrverband = [];
+				foreach($studentlehrverband as $studentlehrverband_array)
+				{
+					$merged_studentlehrverband = array_merge($merged_studentlehrverband, $studentlehrverband_array);
+				}
+				return $merged_studentlehrverband;
+			},
+			$student_lehrverband
+		);
+
+		return success($student_lehrverband);
+	}
+
+	private function applyLoadUeberSemesterHaelfte(&$semester_range){
+		/*
+		@var($semester_collection)
+		convert the array of studiensemester into an associative array with the studiensemester as the key 
+		and the values of each key are the studiensemester needed for the query associated to that studiensemester
+		example:
+
+		#INPUT:
+		['WS2023','SS2024','WS2024']
+		#OUTPUT:
+		[
+			'WS2023' => ['SS2023','WS2023']
+			'SS2024' => ['WS2023','SS2024']
+			'WS2024' => ['SS2024','WS2024']
+		]
+		*/
+		$semester_collection = [];
+		foreach($semester_range as $studiensemester)
+		{
+			$previous_studiensemester = $this->_ci->StudiensemesterModel->getPreviousFrom($studiensemester);
+			if(isError($previous_studiensemester))
+			{
+				return error(getData($previous_studiensemester));
+			}
+			$previous_studiensemester = getData($previous_studiensemester);
+			if (count($previous_studiensemester) == 0) {
+				return error('no previous semester');
+			}
+			$previous_studiensemester = current($previous_studiensemester)->studiensemester_kurzbz;
+			$semester_collection[$studiensemester] = [$previous_studiensemester, $studiensemester];
+		}
+
+		/*
+		@var($studienSemesterDateRanges)
+		fetches for each studiensemester the start and end date, (SS) summer studiensemester are extended by 1 month to cover the summerbreak
+		based on the LVPLAN_LOAD_UEBER_SEMESTERHAELFTE constant it will load both the semester and the previous semester with the full date range 
+		or the semester with the full date range and the previous semester with the half date range:
+
+		#INPUT:
+		[
+			'WS2023' => ['SS2023','WS2023']
+			'SS2024' => ['WS2023','SS2024']
+			'WS2024' => ['SS2024','WS2024']
+		]
+		#OUTPUT: depends whether LVPLAN_LOAD_UEBER_SEMESTERHAELFTE is true or false
+		~ if LVPLAN_LOAD_UEBER_SEMESTERHAELFTE == true
+		[
+			"SS2024": [
+				"WS2023": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-08-31"
+				],
+				"SS2024": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-08-31"
+				]
+			]
+		]
+		~ if LVPLAN_LOAD_UEBER_SEMESTERHAELFTE == false
+		[
+			"SS2024": [
+				"WS2023": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-05-17"
+				],
+				"SS2024": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-08-31"
+				]
+			]
+		]
+		*/
+		$studienSemesterDateRanges=[]; 
+		foreach($semester_collection as $semester_original => $semester_adjoint)
+		{
+			$semester_start_ende = $this->_ci->StudiensemesterModel->getStartEndeFromStudiensemester($semester_original);
+			if(isError($semester_start_ende))
+			{
+				return error(getData($semester_start_ende));
+			}
+			$semester_start_ende = current(getData($semester_start_ende)); 
+				
+			// initialize empty arrays to add key value pairs
+			$studienSemesterDateRanges[$semester_original] = [];
+
+			// check if the studiensemester is a summer semester and add 1 month to bridge the school summer break
+			$match = null;
+			preg_match("/^(SS)([0-9]+)/",$semester_original,$match);
+			if(count($match) >0)
+			{
+				$one_month = new DateInterval('P1M');
+				$one_day = DateInterval::createFromDateString('1 days');
+				$summer_studiensemester_end_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->ende);
+				$summer_studiensemester_end_date->add($one_month);
+				$summer_studiensemester_end_date->sub($one_day);
+				$semester_start_ende->ende = date_format($summer_studiensemester_end_date,'Y-m-d');
+			}
+			if (defined('LVPLAN_LOAD_UEBER_SEMESTERHAELFTE') && LVPLAN_LOAD_UEBER_SEMESTERHAELFTE === true)
+			{
+				foreach($semester_adjoint as $adjoint)
+				{
+					$studienSemesterDateRanges[$semester_original][$adjoint]=$semester_start_ende;
+				}
+			}
+			else
+			{
+				//TODO: half of a DateInterval might not be correctly calculated
+				// calculate the half of the studiensemester
+				$studiensemester_start_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->start);
+				$studiensemester_end_date = DateTime::createFromFormat('Y-m-d',$semester_start_ende->ende);
+				$studiensemester_time_difference = $studiensemester_start_date->diff($studiensemester_end_date);
+				$half_dateNumber = ceil($studiensemester_time_difference->d/2)+ceil(($studiensemester_time_difference->m*30)/2);
+				$half_dateInterval = new DateInterval('P'.strval($half_dateNumber) .'D');
+				$studiensemester_half = date_format($studiensemester_start_date->add($half_dateInterval),'Y-m-d');
+				
+				$first_half = new stdClass();
+				$first_half->start = $semester_start_ende->start;
+				$first_half->ende = $studiensemester_half;
+
+				$studienSemesterDateRanges[$semester_original][$semester_adjoint[0]] = $first_half;
+				$studienSemesterDateRanges[$semester_original][$semester_adjoint[1]] = $semester_start_ende;
+			}
+			$semester_range = $studienSemesterDateRanges;
+		}
+	}
+
+	private function studienSemesterErmitteln($start_date,$end_date){
+		
+		// gets all studiensemester from the student from start_date to end_date
+		$semester_range = $this->_ci->StudiensemesterModel->getByDateRange($start_date,$end_date);
+		if(isError($semester_range))
+		{
+			return error(getData($semester_range));
+		}
+		$semester_range = array_map( 
+			function($sem)
+			{
+				return $sem->studiensemester_kurzbz;
+			},
+			getData($semester_range)
+		);
+
+		// if no studiensemester is found for the given timespan, get the nearest studiensemester
+		if(count($semester_range) == 0)
+		{
+			$aktuelle_studiensemester = $this->_ci->StudiensemesterModel->getNearest();
+			if(isError($aktuelle_studiensemester))
+			{
+				return error(getData($aktuelle_studiensemester));
+			}
+			$aktuelle_studiensemester = getData($aktuelle_studiensemester);
+			if (count($aktuelle_studiensemester) == 0) {
+				return error("No aktuelles semester");
+			}
+			$aktuelle_studiensemester = current($aktuelle_studiensemester)->studiensemester_kurzbz;
+			// push aktuelles semester in active semester array
+			array_push($semester_range, $aktuelle_studiensemester);
+
+		}
+		return success($semester_range);
+	}
+}
\ No newline at end of file
diff --git a/public/js/api/stundenplan.js b/public/js/api/stundenplan.js
index 388db5454..9b831b77e 100644
--- a/public/js/api/stundenplan.js
+++ b/public/js/api/stundenplan.js
@@ -6,12 +6,6 @@ export default {
 			{  ort_kurzbz, start_date, end_date}
 		);
 	},
-	getStundenplan(start_date, end_date, lv_id) {
-		return this.$fhcApi.get(
-			'/api/frontend/v1/Stundenplan/getStundenplan',
-			{ start_date, end_date, lv_id }
-		);
-	},
 	getStunden() {
 		return this.$fhcApi.get(
 			'/api/frontend/v1/Stundenplan/Stunden',
@@ -42,14 +36,12 @@ export default {
 			{}
 		);
 	},
-	getMoodleEventsByUserid(timestart, timeend) {
+	StundenplanEvents(start_date, end_date, lv_id) {
 		return this.$fhcApi.get(
-			`/api/frontend/v1/Stundenplan/fetchMoodleEvents`,
-			{
-				timestart: timestart,
-				timeend: timeend,
-			}
+			'/api/frontend/v1/Stundenplan/StundenplanEvents',
+			{ start_date, end_date, lv_id }
 		);
 	},
 	
+	
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index c8c4fb91c..e7d48fe21 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -191,6 +191,7 @@ const Stundenplan = {
 				this.eventCalendarDate = new CalendarDate(end);
 				Vue.nextTick(() => {
 					this.loadEvents();
+					
 				});
 			}
 		},
@@ -202,9 +203,8 @@ const Stundenplan = {
 		},
 		loadEvents: function(){
 			Promise.allSettled([
-				this.$fhcApi.factory.stundenplan.getStundenplan(this.monthFirstDay, this.monthLastDay, this.propsViewData.lv_id),
+				this.$fhcApi.factory.stundenplan.StundenplanEvents(this.monthFirstDay, this.monthLastDay, this.propsViewData.lv_id),
 				this.$fhcApi.factory.stundenplan.getStundenplanReservierungen(this.monthFirstDay, this.monthLastDay),
-				this.loadMoodleEvents(this.monthFirstDay, this.monthLastDay)
 			]).then((result) => {
 				let promise_events = [];
 				result.forEach((promise_result) => {
@@ -232,65 +232,10 @@ const Stundenplan = {
 						promise_events = promise_events.concat(data);
 					}
 				})
-				promise_events.sort((a, b) => {
-					if(a.type=='moodle'){
-						return -1;
-					}
-					else if(b.type=='moodle'){
-						return 1;
-					}
-					else{
-						return 0;
-					}
-				});
+			
 				this.events = promise_events;
 			});
 		},
-		loadMoodleEvents: function(start_date, end_date){
-			
-			let date_start = Math.floor(new Date(start_date).getTime() / 1000);
-			let date_end = Math.floor(new Date(end_date).getTime() / 1000);
-			return this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid(date_start, date_end).then((response) => response?.data?.events).then(events => {
-				let data =events.map(event =>{
-					const event_start_date = new Date(event.timestart);
-					const event_end_date = new Date(event.timeend);
-					const formatted_date = `${event_start_date.getFullYear()}-${event_start_date.getMonth()+1}-${event_start_date.getDate()}`;
-					// to get the same date and time as in moodle, we use the default UTC time zone 
-					const formatted_start_time = event_start_date.toLocaleTimeString(this.$p.user_locale, {hour:'2-digit',minute:'2-digit', second:'2-digit',hour12:false});
-					const formatted_end_time = event_end_date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false });
-					
-					return {
-						type:'moodle',
-						beginn: formatted_start_time,
-						ende: formatted_end_time,
-						allDayEvent: true,
-						datum: formatted_date,
-						purpose: event.purpose,
-						assignment: event.activityname,
-						topic: event.activitystr,
-						lektor:[],
-						gruppe:[],
-						ort_kurzbz: event.location,
-						//moodle idnumber entspricht der course id number die man den Kurs in Moodle vergeben kann
-						lehreinheit_id:event.lehreinheitsNummber??null,
-						titel: event.course.fullname,
-						lehrfach:'',
-						lehrform:'',
-						lehrfach_bez:'',
-						organisationseinheit:'',
-						farbe:'00689E',
-						lehrveranstaltung_id:0,
-						ort_content_id:0,
-						url:event?.url,
-					}
-				});
-				return {
-					data: data,
-					meta: { status: 'success' }
-				};
-			})
-			
-		},
 	},
 	created()
 	{
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 006acd306..437f6a17f 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -124,9 +124,8 @@ export default {
 
 		loadEvents: function () {
 			Promise.allSettled([
-				this.$fhcApi.factory.stundenplan.getStundenplan(this.monthFirstDay, this.monthLastDay),
+				this.$fhcApi.factory.stundenplan.StundenplanEvents(this.monthFirstDay, this.monthLastDay),
 				this.$fhcApi.factory.stundenplan.getStundenplanReservierungen(this.monthFirstDay, this.monthLastDay),
-				this.loadMoodleEvents(this.monthFirstDay, this.monthLastDay)
 			]).then((result) => {
 				let promise_events = [];
 				result.forEach((promise_result) => {
@@ -152,65 +151,10 @@ export default {
 						promise_events = promise_events.concat(data);
 					}
 				})
-				promise_events.sort((a, b) => {
-					if (a.type == 'moodle') {
-						return -1;
-					}
-					else if (b.type == 'moodle') {
-						return 1;
-					}
-					else {
-						return 0;
-					}
-				});
+				
 				this.events = promise_events;
 			});
 		},
-		loadMoodleEvents: function (start_date, end_date) {
-
-			let date_start = Math.floor(new Date(start_date).getTime() / 1000);
-			let date_end = Math.floor(new Date(end_date).getTime() / 1000);
-			return this.$fhcApi.factory.stundenplan.getMoodleEventsByUserid(date_start, date_end).then((response) => response?.data?.events).then(events => {
-				let data = events.map(event => {
-					const event_start_date = new Date(event.timestart);
-					const event_end_date = new Date(event.timeend);
-					const formatted_date = `${event_start_date.getFullYear()}-${event_start_date.getMonth() + 1}-${event_start_date.getDate()}`;
-					// to get the same date and time as in moodle, we use the default UTC time zone 
-					const formatted_start_time = event_start_date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false });
-					const formatted_end_time = event_end_date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', second: '2-digit', hour12: false });
-
-					return {
-						type: 'moodle',
-						beginn: formatted_start_time,
-						ende: formatted_end_time,
-						allDayEvent: true,
-						datum: formatted_date,
-						purpose: event.purpose,
-						assignment: event.activityname,
-						topic: event.activitystr,
-						lektor: [],
-						gruppe: [],
-						ort_kurzbz: event.location,
-						//moodle idnumber entspricht der course id number die man den Kurs in Moodle vergeben kann
-						lehreinheit_id: event.lehreinheitsNummber ?? null,
-						titel: event.course.fullname,
-						lehrfach: '',
-						lehrform: '',
-						lehrfach_bez: '',
-						organisationseinheit: '',
-						farbe: '00689E',
-						lehrveranstaltung_id: 0,
-						ort_content_id: 0,
-						url: event?.url,
-					}
-				});
-				return {
-					data: data,
-					meta: { status: 'success' }
-				};
-			})
-
-		},
 		setCalendarMaximized() {
 			this.minimized = false
 		}

From bc7dba1c144c7c04713bb66acd91d99e6c77bc74 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 28 Feb 2025 16:41:18 +0100
Subject: [PATCH 049/572] legacy raumsuche.php -> cis4 vue component

---
 application/controllers/Cis/Raumsuche.php     |  35 +++
 .../controllers/api/frontend/v1/Ort.php       |  53 ++++
 application/models/ressource/Stunde_model.php |  15 ++
 .../views/CisRouterView/CisRouterView.php     |   5 +-
 public/js/api/fhcapifactory.js                |   2 +-
 public/js/api/ort.js                          |  15 ++
 public/js/apps/Dashboard/Fhc.js               |   8 +-
 public/js/components/Cis/Mylv/Student.js      |   1 +
 .../js/components/Cis/Raumsuche/Raumsuche.js  | 237 ++++++++++++++++++
 system/phrasesupdate.php                      |  80 ++++++
 10 files changed, 447 insertions(+), 4 deletions(-)
 create mode 100644 application/controllers/Cis/Raumsuche.php
 create mode 100644 public/js/components/Cis/Raumsuche/Raumsuche.js

diff --git a/application/controllers/Cis/Raumsuche.php b/application/controllers/Cis/Raumsuche.php
new file mode 100644
index 000000000..055038275
--- /dev/null
+++ b/application/controllers/Cis/Raumsuche.php
@@ -0,0 +1,35 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class Raumsuche extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => ['basis/cis:r']
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Raumsuche']);
+	}
+}
diff --git a/application/controllers/api/frontend/v1/Ort.php b/application/controllers/api/frontend/v1/Ort.php
index 8c4059824..828fbde2e 100644
--- a/application/controllers/api/frontend/v1/Ort.php
+++ b/application/controllers/api/frontend/v1/Ort.php
@@ -35,6 +35,8 @@ class Ort extends FHCAPI_Controller
 		parent::__construct([
 			'ContentID' => self::PERM_LOGGED,
 			'getOrtKurzbzContent' => self::PERM_LOGGED,
+			'getRooms' => self::PERM_LOGGED,
+			'getTypes' => self::PERM_LOGGED
 		]);
 
 		$this->load->model('ressource/Ort_model', 'OrtModel');
@@ -44,6 +46,57 @@ class Ort extends FHCAPI_Controller
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
+	/**
+	 * Retrieves all Ort entries filtered by the provided parameters
+	 */
+	public function getRooms()
+	{
+		// TODO: form validation
+		$datum = $this->input->get('datum', TRUE);
+		$von = $this->input->get('von', TRUE);
+		$bis = $this->input->get('bis', TRUE);
+		$typ = $this->input->get('typ', TRUE);
+		$personenanzahl = $this->input->get('personenanzahl', TRUE);
+
+		$this->load->model('ressource/Stunde_model', 'StundeModel');
+		$vonStunde = getData($this->StundeModel->getStundeForTime($von))[0]->stunde;
+		$bisStunde = getData($this->StundeModel->getStundeForTime($bis))[0]->stunde;
+		
+		$params = array();
+		$qry = "SELECT DISTINCT tbl_ort.*
+			FROM public.tbl_ort JOIN public.tbl_ortraumtyp USING(ort_kurzbz)
+			WHERE aktiv AND lehre AND ort_kurzbz NOT LIKE '\\\\_%'";
+		if($typ) {
+			$params[] = $typ;
+			$qry.= "AND raumtyp_kurzbz= ?";
+		}
+		$qry.= "AND (max_person>= ? OR max_person is null)";
+		$params[] = $personenanzahl;
+
+		$qry.="	AND ort_kurzbz NOT IN 
+			(
+				SELECT ort_kurzbz FROM lehre.tbl_stundenplandev WHERE datum=? AND stunde>=? AND stunde<=?
+				UNION
+				SELECT ort_kurzbz FROM campus.tbl_reservierung WHERE datum=? AND stunde>=? AND stunde<=?
+			)
+		";
+		$params = array_merge($params, [$datum, $vonStunde, $bisStunde, $datum, $vonStunde, $bisStunde]);
+		
+		$result = $this->OrtModel->execReadOnlyQuery($qry, $params);
+		
+		$this->terminateWithSuccess($result);
+	}
+
+	public function getTypes()
+	{
+		$this->load->model('ressource/Raumtyp_model', 'RaumtypModel');
+		$result = $this->OrtModel->execReadOnlyQuery("
+			SELECT * FROM public.tbl_raumtyp WHERE aktiv = true ORDER BY raumtyp_kurzbz;
+		");
+
+		$this->terminateWithSuccess(getData($result));
+	}
+	
 	/**
 	 * Gets a JSON body via HTTP POST and provides the parameters
 	 */
diff --git a/application/models/ressource/Stunde_model.php b/application/models/ressource/Stunde_model.php
index 05a9cddff..0203163f7 100644
--- a/application/models/ressource/Stunde_model.php
+++ b/application/models/ressource/Stunde_model.php
@@ -11,4 +11,19 @@ class Stunde_model extends DB_Model
 		$this->dbTable = 'lehre.tbl_stunde';
 		$this->pk = 'stunde';
 	}
+
+	/**
+	 * $time needs to be of PGSQL TIME format
+	 */
+	public function getStundeForTime($time) {
+		$query = "
+			SELECT min(stunde) as stunde FROM (
+				SELECT stunde, extract(epoch from (beginn-?)) AS delta FROM lehre.tbl_stunde
+				UNION
+				SELECT stunde, extract(epoch from (ende-?)) AS delta FROM lehre.tbl_stunde
+				) foo WHERE delta>=0
+		";
+
+		return $this->execReadOnlyQuery($query, [$time, $time]);
+	}
 }
diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index 1c81f3570..c03330c7a 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -5,7 +5,7 @@ $includesArray = array(
 	'axios027' => true,
 	'bootstrap5' => true,
 	'fontawesome6' => true,
-	'tabulator5' => true,
+	'tabulator5' => true, // TODO: upgrade to 6 when available
 	'vue3' => true,
 	'primevue3' => true,
 	'vuedatepicker11' => true,
@@ -24,7 +24,8 @@ $includesArray = array(
 	),
 	'customJSs' => array(
 		'vendor/npm-asset/primevue/accordion/accordion.js',
-		'vendor/npm-asset/primevue/accordiontab/accordiontab.js'
+		'vendor/npm-asset/primevue/accordiontab/accordiontab.js',
+		'vendor/npm-asset/primevue/inputnumber/inputnumber.js'
 	),
 	'customJSModules' => array(
 		'public/js/apps/Dashboard/Fhc.js'
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index 378d979ab..fe90a73fc 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -60,5 +60,5 @@ export default {
     addons,
 	studiengang,
 	menu,
-	authinfo,
+	authinfo
 };
diff --git a/public/js/api/ort.js b/public/js/api/ort.js
index 4c8e2ce73..b2c1a78dd 100644
--- a/public/js/api/ort.js
+++ b/public/js/api/ort.js
@@ -7,4 +7,19 @@ export default {
 			{ ort_kurzbz: ort_kurbz }
 		);
 	},
+	getRooms(datum, von, bis, typ, personenanzahl = 0) {
+		return this.$fhcApi.get(
+			FHC_JS_DATA_STORAGE_OBJECT.app_root +
+			FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+			"/api/frontend/v1/Ort/getRooms",
+			{ datum, von, bis, typ, personenanzahl }
+		);
+	},
+	getRoomTypes() {
+		return this.$fhcApi.get(
+			FHC_JS_DATA_STORAGE_OBJECT.app_root +
+			FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+			"/api/frontend/v1/Ort/getTypes"
+		);
+	}
 }
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index b8ec122e0..6a46c5999 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -6,6 +6,7 @@ import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers.js";
 import Stundenplan, {DEFAULT_MODE_STUNDENPLAN} from "../../components/Cis/Stundenplan/Stundenplan.js";
 import MylvStudent from "../../components/Cis/Mylv/Student.js";
 import Profil from "../../components/Cis/Profil/Profil.js";
+import Raumsuche from "../../components/Cis/Raumsuche/Raumsuche.js";
 import CmsNews from "../../components/Cis/Cms/News.js";
 import CmsContent from "../../components/Cis/Cms/Content.js";
 import Info from "../../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
@@ -28,7 +29,12 @@ const router = VueRouter.createRouter({
 			component: Profil,
 			props: true
 		},
-		
+		{
+			path: `/Cis/Raumsuche`,
+			name: 'Raumsuche',
+			component: Raumsuche,
+			props: true
+		},
 		// Redirect old links to new format
 		{
 			path: "/CisVue/Cms/getRoomInformation/:ort_kurzbz",
diff --git a/public/js/components/Cis/Mylv/Student.js b/public/js/components/Cis/Mylv/Student.js
index 5aab9b28a..300ed44f8 100644
--- a/public/js/components/Cis/Mylv/Student.js
+++ b/public/js/components/Cis/Mylv/Student.js
@@ -76,6 +76,7 @@ export default {
 			this.$refs.studiensemester.dispatchEvent(new Event('change', { bubbles: true }));
 		},
 		setHash(val) {
+			// TODO: make this a router param to enable history
 			location.hash = val;
 		}
 	},
diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
new file mode 100644
index 000000000..d7660ef11
--- /dev/null
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -0,0 +1,237 @@
+
+import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
+
+export default {
+	name: "Raumsuche",
+	props: {
+		
+	},
+	components: {
+		VueDatePicker,
+		CoreFilterCmpt,
+		InputNumber: primevue.inputnumber,
+	},
+	data() {
+		return {
+			tabulatorUuid: Vue.ref(0),
+			tableBuiltResolve: null,
+			tableBuiltPromise: null,
+			roomtypes: null,
+			defaultType: {
+				raumtyp_kurzbz: '',
+				beschreibung: Vue.computed(() => this.$p.t('global/alle'))
+			},
+			anzahl: 1,
+			selectedType: null,
+			datum: new Date(),
+			von: Vue.ref({
+				hours: new Date().getHours(),
+				minutes: new Date().getMinutes()
+			}),
+			bis: Vue.ref({
+				hours: new Date().getHours() + 1,
+				minutes: new Date().getMinutes()
+			}),
+			raumsucheTableOptions: {
+				height: Vue.ref(400),
+				index: 'prestudent_id',
+				layout: 'fitColumns',
+				placeholder: this.$p.t('global/noDataAvailable'),
+				columns: [
+					{title: Vue.computed(() => this.$p.t('rauminfo/raum_kurzbz')), field: 'ort_kurzbz', widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('global/bezeichnung')), field: 'bezeichnung', widthGrow: 2},
+					{title: Vue.computed(() => this.$p.t('global/nummer')), field: 'nummer', widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('global/personen')), field: 'personen', widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('rauminfo/raumInfo')),
+						field: 'linkInfo', formatter: this.linkFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('rauminfo/roomReservations')), 
+						field: 'linkRes', formatter: this.linkFormatter, widthGrow: 1}
+				],
+				persistence: false,
+			},
+			raumsucheTableEventHandlers: [{
+				event: "tableBuilt",
+				handler: async () => {
+					this.tableBuiltResolve()
+				}
+			},
+			{
+				event: "cellClick",
+				handler: async (e, cell) => {
+
+					if((cell.column.field === 'linkInfo' || cell.column.field === 'linkRes') && cell.value){
+						window.open(cell.value, '_blank');
+						e.stopPropagation();
+					}
+					
+				}
+			}
+			]};
+	},
+	methods: {
+		tableResolve(resolve) {
+			this.tableBuiltResolve = resolve
+		},
+		linkFormatter(cell) {
+			const val = cell.getValue()
+			if(val) {
+				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				'<a href="'+val+'"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a></div>'
+			} else {
+				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+					'-</div>'
+			}
+		},
+		roomPlanLink(room) {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router
+			+ '/CisVue/Cms/getRoomInformation/' + room.ort_kurzbz
+		},
+		roomInfoLink(room) {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router
+				+ '/CisVue/Cms/content/' + room.content_id
+		},
+		getTimeString(time) {
+			return `${time.hours}:${time.minutes}:00`
+		},
+		setupData(data){
+			const d = data.map(room => {
+				return {
+					ort_kurzbz: room.ort_kurzbz,
+					bezeichnung: room.bezeichnung,
+					nummer: room.planbezeichnung,
+					personen: room.max_person,
+					linkInfo: room.content_id ? this.roomInfoLink(room) : null,
+					linkRes: this.roomPlanLink(room)
+					
+				}
+					
+			})
+			
+			this.$refs.raumsucheTable.tabulator.setData(d);
+		},
+		loadRoomTypes() {
+			this.$fhcApi.factory.ort.getRoomTypes().then(res => {
+				this.selectedType = this.defaultType
+				this.roomtypes = res?.data ?? []
+			})
+		},
+		loadRooms() {
+			this.$fhcApi.factory.ort.getRooms(this.date, this.getTimeString(this.von), this.getTimeString(this.bis), this.selectedType?.raumtyp_kurzbz ?? '', this.anzahl)
+				.then(res => {
+					if(res?.data?.retval) this.setupData(res.data.retval)
+			})
+		},
+		handleUuidDefined(uuid) {
+			this.tabulatorUuid = uuid
+		},
+		search(){
+			this.loadRooms()
+		},
+		setRoute(val) {
+			// TODO: router push
+		},
+		dateFormat(date) {
+			const day = date.getDate();
+			const month = date.getMonth() + 1;
+			const year = date.getFullYear();
+			return `${day}.${month}.${year}`
+		},
+		timeFormat(date) {
+			const hours = String(date.getHours()).padStart(2, '0');
+			const minutes = String(date.getMinutes()).padStart(2, '0');
+			return `${hours}:${minutes}`;
+		},
+		async setupMounted() {
+			this.tableBuiltPromise = new Promise(this.tableResolve)
+			await this.tableBuiltPromise
+			
+			this.loadRoomTypes()
+			this.loadRooms()
+
+			const tableID = this.tabulatorUuid ? ('-' + this.tabulatorUuid) : ''
+			const tableDataSet = document.getElementById('filterTableDataset' + tableID);
+			if(!tableDataSet) return
+			const rect = tableDataSet.getBoundingClientRect();
+
+			const h = window.visualViewport.height - rect.top - 100
+			if(this.$refs.raumsucheTable) {
+				this.$refs.raumsucheTable.$refs.table.style.setProperty('height', h+'px')
+			}
+
+		}
+	},
+	watch: {
+
+	},
+	computed: {
+
+	},
+	created() {
+		
+	},
+	mounted() {
+		this.setupMounted()
+	},
+	template: `
+	<h2>{{$p.t('lvplan/raumsuche')}}</h2>
+	<hr>
+	<div class="row">
+		<div class="col-2">
+			<VueDatePicker
+				v-model="datum"
+				:clearable="false"
+				date-picker
+				:enable-time="false"
+				:format="dateFormat"
+				text-input="true"
+				auto-apply>
+			</VueDatePicker>
+		</div>
+		<div class="col-1">
+			<VueDatePicker
+				v-model="von"
+				:clearable="false"
+				time-picker
+				:format="timeFormat"
+				text-input="true"
+				auto-apply
+				>
+			</VueDatePicker>
+		</div>
+		<div class="col-1">
+			<VueDatePicker
+				v-model="bis"
+				:clearable="false"
+				time-picker
+				:format="timeFormat"
+				text-input="true"
+				auto-apply>
+			</VueDatePicker>
+		</div>
+		<div class="col-auto">
+			<select ref="raumtyp" id="raumtypSelect" v-model="selectedType" class="form-select" 
+			:aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setRoute($event.target.value)">
+				<option :key="defaultType" selected :value="defaultType">{{defaultType.beschreibung}}</option>
+				<option v-for="typ in roomtypes" :key="typ" :value="typ">{{typ.beschreibung}}</option>
+			</select>
+		</div>
+		<div class="col-2">
+			<InputNumber v-model="anzahl" :prefix="$p.t('rauminfo/anzahlPersonen') + ': '" inputId="anzahlInput" :min="1" :max="100" />
+		</div>
+		<div class="col-2">
+			<button class="btn btn-primary border-0" @click="search">{{ $p.t('rauminfo/roomSearch') }} <i class="fa fa-magnifying-glass"></i></button>
+		</div>
+	</div>
+
+     <core-filter-cmpt 
+		@tableBuilt="raumsucheTableBuilt"
+		@uuidDefined="handleUuidDefined"
+		:title="''"  
+		ref="raumsucheTable" 
+		:tabulator-options="raumsucheTableOptions"  
+		:tabulator-events="raumsucheTableEventHandlers"
+		tableOnly 
+		:sideMenu="false"
+	 />
+    `,
+};
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index fb71696bf..f952262f8 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -20184,6 +20184,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'rauminfo',
+		'phrase' => 'raum_kurzbz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Raum Kurzbezeichnung",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Room Shortname",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'rauminfo',
@@ -20204,6 +20224,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'rauminfo',
+		'phrase' => 'roomSearch',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Räume Suchen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Search Rooms",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'rauminfo',
+		'phrase' => 'anzahlPersonen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Anzahl Person",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Number of People",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'rauminfo',
+		'phrase' => 'roomReservations',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Raum Reservierungen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Room Reservations",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'rauminfo',

From b8c45cf2447f52fb3d48f0fbcc868c73a81da871 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 3 Mar 2025 11:07:35 +0100
Subject: [PATCH 050/572] update(Moodle Events):adds additional fields for
 Moodle Events and disables the automatic scrolling for moodleEvents

---
 .../api/frontend/v1/Stundenplan.php           |  6 +++--
 public/js/components/Calendar/Calendar.js     | 25 +++++++++++++------
 public/js/components/Cis/Mylv/LvInfo.js       | 14 ++++++++++-
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index c53af8e3c..84c7933ad 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -95,7 +95,6 @@ class Stundenplan extends FHCAPI_Controller
 						},
 						['timestart'=>$moodle_start_date,'timeend'=>$moodle_end_date, 'username'=>getAuthUID()]
 		);
-		
 		$moodle_events = array_map(function($event){
 			$moodle_event_timestart = new DateTime($event->timestart);
 			$moodle_event_timeend = new DateTime($event->timeend);
@@ -112,7 +111,7 @@ class Stundenplan extends FHCAPI_Controller
 			$convertedEvent->gruppe = [];
 			$convertedEvent->ort_kurzbz = $event->location;
 			$convertedEvent->lehreinheit_id = $event->lehreinheitsNummber ?? null;
-			$convertedEvent->titel = $event->course->fullname;
+			$convertedEvent->titel = isset($event->course->fullname)? $event->course->fullname:null;
 			$convertedEvent->lehrfach = '';
 			$convertedEvent->lehrform = '';
 			$convertedEvent->lehrfach_bez = '';
@@ -121,6 +120,9 @@ class Stundenplan extends FHCAPI_Controller
 			$convertedEvent->lehrveranstaltung_id = 0;
 			$convertedEvent->ort_content_id = 0;
 			$convertedEvent->url = $event->url;
+			$convertedEvent->activityIcon = isset($event->icon->iconurl)? $event->icon->iconurl:null;
+			$convertedEvent->actionname = isset($event->action->name)?$event->action->name:null;
+			$convertedEvent->overdue = !empty($event->overdue);
 			return $convertedEvent;
 		},$moodle_events);
 		
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index cdceb38db..da67af6df 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -72,13 +72,16 @@ export default {
 			immediate: true,
 		},
 		// scroll to the first event if the html element was found
-		scrollTime({focusDate,scrollTime}){
+		scrollTime(newValue,oldValue){
 			// return early if the scrollTime is not set
-			if(!scrollTime) return;
+			if(!newValue.scrollTime || !newValue?.doScroll) return;
+			if(newValue?.scrollTime == oldValue?.scrollTime && newValue?.focusDate.compare(oldValue?.focusDate)){
+				return;
+			}
 			// scroll the Stundenplan to the closest event
 			Vue.nextTick(()=>{
-				let previousScrollAnchor = document.getElementById('scroll' + (scrollTime - 1) + this.focusDate.d + this.focusDate.w)
-				let scrollAnchor = document.getElementById('scroll' + scrollTime + this.focusDate.d + this.focusDate.w);
+				let previousScrollAnchor = document.getElementById('scroll' + (newValue.scrollTime - 1) + this.focusDate.d + this.focusDate.w)
+				let scrollAnchor = document.getElementById('scroll' + newValue.scrollTime + this.focusDate.d + this.focusDate.w);
 				if (previousScrollAnchor) {
 					previousScrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
 				}
@@ -147,9 +150,17 @@ export default {
 				// return the first beginning time of the filtered events
 				if(this.filteredEvents && Array.isArray(this.filteredEvents) && this.filteredEvents.length > 0)
 				{
-					let scrollTime = parseInt(this.filteredEvents.sort((a, b) => parseInt(a.beginn) - parseInt(b.beginn))[0].beginn);
+					let doScroll = true;
+					let scrollTimeEvents = this.filteredEvents.filter(event=>{
+						return event.type !== 'moodle';
+					});
+					// do not compute a new scroll time if there are no other events than moodle events
+					if(!(scrollTimeEvents.length >0)){
+						doScroll = false;
+					}
+					let scrollTime = parseInt(scrollTimeEvents.sort((a, b) => parseInt(a.beginn) - parseInt(b.beginn))[0]?.beginn);
 					// to ensure that the scrollTime watcher triggers even if the scrollTime doesn't change, it returns both the scrollTime and the focusDate
-					return { focusDate: this.focusDate, scrollTime };
+					return { focusDate: this.focusDate, doScroll, scrollTime };
 				}
 				// there is no event that matches the current view mode constraints
 				else 
@@ -181,7 +192,7 @@ export default {
 						return true;
 					}
 				})
-
+				
 				return filteredEvents;
 			}
 			else
diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
index e2a00b5c9..b2fc7fe3d 100644
--- a/public/js/components/Cis/Mylv/LvInfo.js
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -72,12 +72,24 @@ export default {
 					</tr>
 					<tr>
 						<th>{{$p.t('global','typ')}}:</th>
-						<td>{{event?.purpose}}</td>
+						<td><img v-if="event?.activityIcon" class="me-1" :src="event?.activityIcon" />{{event?.purpose}}</td>
 					</tr>
 					<tr>
 						<th>{{$p.t('fristenmanagement','frist')}}:</th>
 						<td>{{start_time}}</td>
 					</tr>
+					<tr v-if="event?.actionname">
+						<th>Action required:</th>
+						<td>
+							{{event?.actionname}}
+						</td>
+					</tr>
+					<tr v-if="event?.overdue">
+						<th>Overdue:</th>
+						<td>
+							This event is overdue
+						</td>
+					</tr>
 					<tr >
 				    	<th>Link:</th>
 						<td>

From 98fa76ca1d781d97b2fc6724ed138d9de10b3c3d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 3 Mar 2025 13:04:52 +0100
Subject: [PATCH 051/572] fix(Calendar Month setSelectedEvent): selects the
 clicked lehrveranstaltung as selectedEvent in the click handler of the
 Month/Page View

---
 public/js/components/Calendar/Month/Page.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 47630f47f..2cdf8b21d 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -80,7 +80,8 @@ export default {
 			if(isInThePast) classstring += ' fhc-calendar-past'
 			return classstring
 		},
-		selectDay(day) {
+		selectDay(day, event) {
+			this.setSelectedEvent(event);
 			this.date.set(day);
 			this.$emit('input', day);
 		},
@@ -156,7 +157,7 @@ export default {
 				<span v-if="events[day.toDateString()] && events[day.toDateString()].length" class="events">
 					<div v-for="event in events[day.toDateString()]" :key="event.id" 
 					:style="{'background-color': event.color}" class="fhc-entry" :selected="event == selectedEvent"
-					v-contrast @click.stop="selectDay(day)">
+					v-contrast @click.stop="selectDay(day,event)">
 						<slot  name="monthPage" :event="event" :day="day" >
 							<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 						</slot>

From a408c85fd40f4edfeb242cd7aefd592977290928 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 3 Mar 2025 13:29:31 +0100
Subject: [PATCH 052/572] fix(Calendar Day SelectedEvent): fixes the watcher on
 the property active to additionally look at the events property and set the
 selectedEvent accordingly to the situation

---
 public/js/components/Calendar/Day/Page.js | 34 +++++++++++++----------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index e8c6f4a56..9c04136c2 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -52,29 +52,27 @@ export default {
 	watch: {
 		//TODO: on first render non of the day-page components are active and the watcher on selectedEvent does not fetch the lvMenu
 		//TODO: workaround is to watch the active state and refetch in case the lvMenu is empty
-		active: {
-			handler(value) {
+		activeAndEventsReady: {
+			handler({active,events}) {
 				// handles fetching the lvMenu
-				if (value) {
+				if (active) {
 					if (!this.lvMenu) {
 						this.fetchLvMenu(this.selectedEvent);
 					}
+				
+					if(events){
+						// if no event is selected, select the first event of the day
+						if (this.selectedEvent == null && this.events[this.day.toDateString()]?.length > 0) {
+							let events = this.events[this.day.toDateString()];
+							if (Array.isArray(events) && events.length > 0) {
+								this.setSelectedEvent(events[0]);
+							}
+						}
+					}
 				}
 			},
 			immediate: true,
 		},
-		events: {
-			handler(newEvents) {
-				// if no event is selected, select the first event of the day
-				if (this.selectedEvent == null && newEvents[this.day.toDateString()]?.length > 0) {
-					let events = newEvents[this.day.toDateString()];
-					if (Array.isArray(events) && events.length > 0) {
-						this.setSelectedEvent(events[0]);
-					}
-				}
-			},
-			immediate: true
-		},
 		selectedEvent: {
 			handler(event) {
 				// return early if the day-page component is not the active carousel item
@@ -95,6 +93,12 @@ export default {
 		}
 	},
 	computed: {
+		activeAndEventsReady(){
+			return {
+				active: this.active,
+				events: this.events,
+			}
+		},
 		allDayEvents() {
 			let allDayEvents = {};
 			for (let day in this.events) {

From 225d6b0a830739a51791d6854295a1d8590a81e4 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 3 Mar 2025 13:51:43 +0100
Subject: [PATCH 053/572] raumsuche student config for allowed roomtypes

---
 application/config/raumsuche.php              | 25 +++++++++++
 .../controllers/api/frontend/v1/Ort.php       | 43 ++++++++++++++-----
 .../js/components/Cis/Raumsuche/Raumsuche.js  | 16 ++++---
 3 files changed, 66 insertions(+), 18 deletions(-)
 create mode 100644 application/config/raumsuche.php

diff --git a/application/config/raumsuche.php b/application/config/raumsuche.php
new file mode 100644
index 000000000..afc4beaf8
--- /dev/null
+++ b/application/config/raumsuche.php
@@ -0,0 +1,25 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+// liste von raumtyp_kurzbz welche in raumsuche studenten angezeigt werden
+$config['roomtypes_student'] = array(
+'LAB BM/Chem',
+'xEDV 1-36',
+'xEDV 37-60',
+'EDV 60',
+'EDV-HÖPL',
+'EDV ES',
+'LAB Elek',
+'LAB ES/TK',
+'Ener-EDV',
+'Ener-Lab',
+'Ener-SEM',
+'Ener-HS',
+'HS 59-109',
+'HS 25-38',
+'HS 39-58',
+'LAB Inf',
+'LAB Robo',
+'LAB SET'
+);
diff --git a/application/controllers/api/frontend/v1/Ort.php b/application/controllers/api/frontend/v1/Ort.php
index 828fbde2e..f1d3ddbef 100644
--- a/application/controllers/api/frontend/v1/Ort.php
+++ b/application/controllers/api/frontend/v1/Ort.php
@@ -40,7 +40,7 @@ class Ort extends FHCAPI_Controller
 		]);
 
 		$this->load->model('ressource/Ort_model', 'OrtModel');
-
+		$this->config->load('raumsuche');
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -51,13 +51,16 @@ class Ort extends FHCAPI_Controller
 	 */
 	public function getRooms()
 	{
-		// TODO: form validation
 		$datum = $this->input->get('datum', TRUE);
 		$von = $this->input->get('von', TRUE);
 		$bis = $this->input->get('bis', TRUE);
 		$typ = $this->input->get('typ', TRUE);
 		$personenanzahl = $this->input->get('personenanzahl', TRUE);
-
+		
+		
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID())->retval;
+		
 		$this->load->model('ressource/Stunde_model', 'StundeModel');
 		$vonStunde = getData($this->StundeModel->getStundeForTime($von))[0]->stunde;
 		$bisStunde = getData($this->StundeModel->getStundeForTime($bis))[0]->stunde;
@@ -68,20 +71,28 @@ class Ort extends FHCAPI_Controller
 			WHERE aktiv AND lehre AND ort_kurzbz NOT LIKE '\\\\_%'";
 		if($typ) {
 			$params[] = $typ;
-			$qry.= "AND raumtyp_kurzbz= ?";
+			$qry.= "AND raumtyp_kurzbz = ?";
 		}
+		
+		if(!$isMitarbeiter) { // students are only allowed to get a subset defined by config
+			$qry.= ' AND raumtyp_kurzbz IN ?';
+			$params[] = $this->config->item('roomtypes_student');
+			$this->addMeta('config', $this->config->item('roomtypes_student'));
+		}
+		
 		$qry.= "AND (max_person>= ? OR max_person is null)";
 		$params[] = $personenanzahl;
 
 		$qry.="	AND ort_kurzbz NOT IN 
 			(
-				SELECT ort_kurzbz FROM lehre.tbl_stundenplandev WHERE datum=? AND stunde>=? AND stunde<=?
-				UNION
-				SELECT ort_kurzbz FROM campus.tbl_reservierung WHERE datum=? AND stunde>=? AND stunde<=?
+				SELECT ort_kurzbz FROM lehre.tbl_stundenplandev WHERE datum = ? AND stunde >= ? AND stunde <= ? 
+				UNION 
+				SELECT ort_kurzbz FROM campus.tbl_reservierung WHERE datum= ? AND stunde >= ? AND stunde <= ?
 			)
 		";
 		$params = array_merge($params, [$datum, $vonStunde, $bisStunde, $datum, $vonStunde, $bisStunde]);
-		
+		$this->addMeta('qry', $qry);
+		$this->addMeta('params', $params);
 		$result = $this->OrtModel->execReadOnlyQuery($qry, $params);
 		
 		$this->terminateWithSuccess($result);
@@ -90,9 +101,19 @@ class Ort extends FHCAPI_Controller
 	public function getTypes()
 	{
 		$this->load->model('ressource/Raumtyp_model', 'RaumtypModel');
-		$result = $this->OrtModel->execReadOnlyQuery("
-			SELECT * FROM public.tbl_raumtyp WHERE aktiv = true ORDER BY raumtyp_kurzbz;
-		");
+		$qry = "SELECT * FROM public.tbl_raumtyp WHERE aktiv = true";
+		$params = array();
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		
+		$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID())->retval;
+		if(!$isMitarbeiter) { // students are only allowed to get a subset defined by config
+			$qry.= ' AND raumtyp_kurzbz IN ?';
+			$params[] = $this->config->item('roomtypes_student');
+		}
+                                 
+        $qry .= " ORDER BY raumtyp_kurzbz;";
+		
+		$result = $this->OrtModel->execReadOnlyQuery($qry, $params);
 
 		$this->terminateWithSuccess(getData($result));
 	}
diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index d7660ef11..b5f00aafc 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -97,7 +97,7 @@ export default {
 			const d = data.map(room => {
 				return {
 					ort_kurzbz: room.ort_kurzbz,
-					bezeichnung: room.bezeichnung,
+					bezeichnung: room.bezeichnung.replace('&amp;', '&'),
 					nummer: room.planbezeichnung,
 					personen: room.max_person,
 					linkInfo: room.content_id ? this.roomInfoLink(room) : null,
@@ -111,12 +111,15 @@ export default {
 		},
 		loadRoomTypes() {
 			this.$fhcApi.factory.ort.getRoomTypes().then(res => {
+				res?.data?.forEach(type => {
+					type.beschreibung = type.beschreibung.replace('&amp;', '&')
+				})
 				this.selectedType = this.defaultType
 				this.roomtypes = res?.data ?? []
 			})
 		},
 		loadRooms() {
-			this.$fhcApi.factory.ort.getRooms(this.date, this.getTimeString(this.von), this.getTimeString(this.bis), this.selectedType?.raumtyp_kurzbz ?? '', this.anzahl)
+			this.$fhcApi.factory.ort.getRooms(this.datum, this.getTimeString(this.von), this.getTimeString(this.bis), this.selectedType?.raumtyp_kurzbz ?? '', this.anzahl)
 				.then(res => {
 					if(res?.data?.retval) this.setupData(res.data.retval)
 			})
@@ -181,9 +184,9 @@ export default {
 				v-model="datum"
 				:clearable="false"
 				date-picker
-				:enable-time="false"
+				:enable-time-picker="false"
 				:format="dateFormat"
-				text-input="true"
+				:text-input="true"
 				auto-apply>
 			</VueDatePicker>
 		</div>
@@ -193,7 +196,7 @@ export default {
 				:clearable="false"
 				time-picker
 				:format="timeFormat"
-				text-input="true"
+				:text-input="true"
 				auto-apply
 				>
 			</VueDatePicker>
@@ -204,7 +207,7 @@ export default {
 				:clearable="false"
 				time-picker
 				:format="timeFormat"
-				text-input="true"
+				:text-input="true"
 				auto-apply>
 			</VueDatePicker>
 		</div>
@@ -224,7 +227,6 @@ export default {
 	</div>
 
      <core-filter-cmpt 
-		@tableBuilt="raumsucheTableBuilt"
 		@uuidDefined="handleUuidDefined"
 		:title="''"  
 		ref="raumsucheTable" 

From 20f22d5a7b8147798a53ade4c5b64c1333bf1dcd Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 3 Mar 2025 14:15:30 +0100
Subject: [PATCH 054/572] fix(Calendar selectedEvent and Scrolling): sorts the
 events before selecting the first as the selectedEvent and adds some
 scrolling checks

---
 public/js/components/Calendar/Calendar.js | 31 +++++++++++------------
 public/js/components/Calendar/Day/Page.js | 27 +++++++++++++++++++-
 2 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index da67af6df..a12dc1b0a 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -74,23 +74,22 @@ export default {
 		// scroll to the first event if the html element was found
 		scrollTime(newValue,oldValue){
 			// return early if the scrollTime is not set
-			if(!newValue.scrollTime || !newValue?.doScroll) return;
-			if(newValue?.scrollTime == oldValue?.scrollTime && newValue?.focusDate.compare(oldValue?.focusDate)){
+			if (!newValue.scrollTime || !newValue?.doScroll) return;
+			if (newValue?.scrollTime == oldValue?.scrollTime && newValue?.focusDate.d==oldValue?.focusDate.d) {
 				return;
 			}
 			// scroll the Stundenplan to the closest event
-			Vue.nextTick(()=>{
-				let previousScrollAnchor = document.getElementById('scroll' + (newValue.scrollTime - 1) + this.focusDate.d + this.focusDate.w)
-				let scrollAnchor = document.getElementById('scroll' + newValue.scrollTime + this.focusDate.d + this.focusDate.w);
-				if (previousScrollAnchor) {
-					previousScrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
+			let previousScrollAnchor = document.getElementById('scroll' + (newValue.scrollTime - 1) + this.focusDate.d + this.focusDate.w)
+			let scrollAnchor = document.getElementById('scroll' + newValue.scrollTime + this.focusDate.d + this.focusDate.w);
+			if (previousScrollAnchor) {
+				previousScrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
+			}
+			else {
+				if (scrollAnchor) {
+					scrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
 				}
-				else {
-					if (scrollAnchor) {
-						scrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
-					}
-				}
-			});
+			}
+			
 		},
 	},
 	emits: [
@@ -147,10 +146,10 @@ export default {
 		},
 		// returns the hour of the earliest event, used to scroll to the events in the calendar (week / day view)
 		scrollTime() {
+				let doScroll = true;	
 				// return the first beginning time of the filtered events
 				if(this.filteredEvents && Array.isArray(this.filteredEvents) && this.filteredEvents.length > 0)
 				{
-					let doScroll = true;
 					let scrollTimeEvents = this.filteredEvents.filter(event=>{
 						return event.type !== 'moodle';
 					});
@@ -160,12 +159,12 @@ export default {
 					}
 					let scrollTime = parseInt(scrollTimeEvents.sort((a, b) => parseInt(a.beginn) - parseInt(b.beginn))[0]?.beginn);
 					// to ensure that the scrollTime watcher triggers even if the scrollTime doesn't change, it returns both the scrollTime and the focusDate
-					return { focusDate: this.focusDate, doScroll, scrollTime };
+					return { focusDate: { d: this.focusDate.d, w: this.focusDate.w}, doScroll, scrollTime };	
 				}
 				// there is no event that matches the current view mode constraints
 				else 
 				{
-					return { focusDate: this.focusDate, scrollTime: null };
+					return { focusDate: { d: this.focusDate.d, w: this.focusDate.w }, doScroll,scrollTime: null };
 				}
 			},
 		// filters the events based on the current calendar view mode
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 9c04136c2..f38ea50cd 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -63,7 +63,32 @@ export default {
 					if(events){
 						// if no event is selected, select the first event of the day
 						if (this.selectedEvent == null && this.events[this.day.toDateString()]?.length > 0) {
-							let events = this.events[this.day.toDateString()];
+							let events = this.events[this.day.toDateString()].sort((a,b)=>{
+								let [a_stunde,a_minute,a_sekunden]= a.beginn.split(":");
+								let [b_stunde, b_minute, b_sekunden] = b.beginn.split(":");
+								a_stunde = Number(a_stunde);
+								a_minute = Number(a_minute);
+								a_sekunden= Number(a_sekunden);
+								b_stunde = Number(b_stunde);
+								b_minute = Number(b_minute);
+								b_sekunden = Number(b_sekunden);
+								if(a_stunde > b_stunde){
+									return 1;
+								}
+								else if(b_stunde > a_stunde){
+									return -1;
+								}
+								else if(a_minute > b_minute){
+									return 1;
+								}
+								else if (b_minute > a_minute){
+									return -1;
+								}
+								else{
+									return a_sekunden > b_sekunden? 1:-1;
+								}
+								
+							});
 							if (Array.isArray(events) && events.length > 0) {
 								this.setSelectedEvent(events[0]);
 							}

From b8239b084250a8f1ca379df8ca54894b1b91e738 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 3 Mar 2025 14:38:23 +0100
Subject: [PATCH 055/572] update(LvInfo Phrasen): adds some phrasen for the
 LvInfo View for the moodle events

---
 public/js/components/Cis/Mylv/LvInfo.js |  8 +--
 system/phrasesupdate.php                | 80 +++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
index b2fc7fe3d..514e34779 100644
--- a/public/js/components/Cis/Mylv/LvInfo.js
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -79,19 +79,19 @@ export default {
 						<td>{{start_time}}</td>
 					</tr>
 					<tr v-if="event?.actionname">
-						<th>Action required:</th>
+						<th>{{$p.t('lvinfo','actionname')}}:</th>
 						<td>
 							{{event?.actionname}}
 						</td>
 					</tr>
 					<tr v-if="event?.overdue">
-						<th>Overdue:</th>
+						<th>{{$p.t('lvinfo','overdue')}}:</th>
 						<td>
-							This event is overdue
+							{{$p.t('lvinfo','overdueEvent')}}
 						</td>
 					</tr>
 					<tr >
-				    	<th>Link:</th>
+				    	<th>{{$p.t('lvinfo','moodleLink')}}</th>
 						<td>
 							<a :href="event?.url" target="_blank"><i class="fa fa-arrow-up-right-from-square me-1"></i></a>
 						</td>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index f952262f8..bfae232f4 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -20184,6 +20184,86 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lvinfo',
+		'phrase' => 'actionname',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Aktion",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Action",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lvinfo',
+		'phrase' => 'overdue',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "überfällig",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "overdue",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lvinfo',
+		'phrase' => 'overdueEvent',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Event ist überfällig",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Event is overdue",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lvinfo',
+		'phrase' => 'moodleLink',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Moodle Link",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Moodle link",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'rauminfo',

From e4317f7a94675e2bdb7d43ad8620f2ecae62727b Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 3 Mar 2025 15:57:55 +0100
Subject: [PATCH 056/572] mobile breakpoints & form validation;

---
 .../controllers/api/frontend/v1/Ort.php       |  9 ++++++++
 .../js/components/Cis/Raumsuche/Raumsuche.js  | 22 ++++++++++++-------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Ort.php b/application/controllers/api/frontend/v1/Ort.php
index f1d3ddbef..a6a3b3404 100644
--- a/application/controllers/api/frontend/v1/Ort.php
+++ b/application/controllers/api/frontend/v1/Ort.php
@@ -51,6 +51,15 @@ class Ort extends FHCAPI_Controller
 	 */
 	public function getRooms()
 	{
+		$this->load->library('form_validation');
+		$this->form_validation->set_data($_GET);
+		$this->form_validation->set_rules('datum','Datum','required');
+		$this->form_validation->set_rules('von','Uhrzeit Von','required|regex_match[/^[0-9]{2}:[0-9]{2}$/]');
+		$this->form_validation->set_rules('bis','Uhrzeit Bis','required|regex_match[/^[0-9]{2}:[0-9]{2}$/]');
+		if($this->form_validation->run() == FALSE) {
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+		
 		$datum = $this->input->get('datum', TRUE);
 		$von = $this->input->get('von', TRUE);
 		$bis = $this->input->get('bis', TRUE);
diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index b5f00aafc..a86c3825b 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -91,7 +91,9 @@ export default {
 				+ '/CisVue/Cms/content/' + room.content_id
 		},
 		getTimeString(time) {
-			return `${time.hours}:${time.minutes}:00`
+			const hours = String(time.hours).padStart(2, '0');
+			const minutes = String(time.minutes).padStart(2, '0');
+			return `${hours}:${minutes}`
 		},
 		setupData(data){
 			const d = data.map(room => {
@@ -119,7 +121,7 @@ export default {
 			})
 		},
 		loadRooms() {
-			this.$fhcApi.factory.ort.getRooms(this.datum, this.getTimeString(this.von), this.getTimeString(this.bis), this.selectedType?.raumtyp_kurzbz ?? '', this.anzahl)
+			this.$fhcApi.factory.ort.getRooms(this.datum.toISOString(), this.getTimeString(this.von), this.getTimeString(this.bis), this.selectedType?.raumtyp_kurzbz ?? '', this.anzahl)
 				.then(res => {
 					if(res?.data?.retval) this.setupData(res.data.retval)
 			})
@@ -179,7 +181,7 @@ export default {
 	<h2>{{$p.t('lvplan/raumsuche')}}</h2>
 	<hr>
 	<div class="row">
-		<div class="col-2">
+		<div class="col-12 col-lg-2">
 			<VueDatePicker
 				v-model="datum"
 				:clearable="false"
@@ -190,7 +192,7 @@ export default {
 				auto-apply>
 			</VueDatePicker>
 		</div>
-		<div class="col-1">
+		<div class="col-12 col-lg-1">
 			<VueDatePicker
 				v-model="von"
 				:clearable="false"
@@ -201,7 +203,7 @@ export default {
 				>
 			</VueDatePicker>
 		</div>
-		<div class="col-1">
+		<div class="col-12 col-lg-1">
 			<VueDatePicker
 				v-model="bis"
 				:clearable="false"
@@ -211,20 +213,24 @@ export default {
 				auto-apply>
 			</VueDatePicker>
 		</div>
-		<div class="col-auto">
+		
+		<div class="col-lg-auto">
 			<select ref="raumtyp" id="raumtypSelect" v-model="selectedType" class="form-select" 
 			:aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setRoute($event.target.value)">
 				<option :key="defaultType" selected :value="defaultType">{{defaultType.beschreibung}}</option>
 				<option v-for="typ in roomtypes" :key="typ" :value="typ">{{typ.beschreibung}}</option>
 			</select>
 		</div>
-		<div class="col-2">
+		
+
+		<div class="col-4 col-lg-2">
 			<InputNumber v-model="anzahl" :prefix="$p.t('rauminfo/anzahlPersonen') + ': '" inputId="anzahlInput" :min="1" :max="100" />
 		</div>
-		<div class="col-2">
+		<div class="col-8 col-lg-2 d-flex justify-content-center align-items-center">
 			<button class="btn btn-primary border-0" @click="search">{{ $p.t('rauminfo/roomSearch') }} <i class="fa fa-magnifying-glass"></i></button>
 		</div>
 	</div>
+	
 
      <core-filter-cmpt 
 		@uuidDefined="handleUuidDefined"

From 2b16d8940f93e28b61646a15f90a3bd4118cfe66 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 3 Mar 2025 17:57:42 +0100
Subject: [PATCH 057/572] fhc header skiplink; cis4 skiplink css;

---
 application/helpers/hlp_header_helper.php     | 10 +++++
 .../views/CisRouterView/CisRouterView.php     |  1 +
 application/views/templates/FHC-Header.php    |  3 ++
 public/css/Fhc.css                            | 38 +++++++++++++++++++
 public/js/apps/Dashboard/Fhc.js               |  3 +-
 5 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/application/helpers/hlp_header_helper.php b/application/helpers/hlp_header_helper.php
index 14f7ed338..af8a32807 100644
--- a/application/helpers/hlp_header_helper.php
+++ b/application/helpers/hlp_header_helper.php
@@ -227,3 +227,13 @@ function generateBackwardCompatibleJSMsIe($js)
 	echo "<![endif]-->\n";
 }
 
+/**
+ * Constructs an accessibility skipLink https://www.w3schools.com/accessibility/accessibility_skip_links.php
+ */
+function generateSkipLink($skipID)
+{
+	$toPrint = '<a id="skiplink" href="';
+	$toPrint.=$skipID;
+	$toPrint.='" class="fhcSkipLink"></a>';
+	echo $toPrint;
+}
diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index c03330c7a..75ea0313e 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -8,6 +8,7 @@ $includesArray = array(
 	'tabulator5' => true, // TODO: upgrade to 6 when available
 	'vue3' => true,
 	'primevue3' => true,
+	'skipID' => '#fhccontent',
 	'vuedatepicker11' => true,
 	'customCSSs' => array(
 		'public/css/components/verticalsplit.css',
diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php
index 8e813916e..7779bb823 100644
--- a/application/views/templates/FHC-Header.php
+++ b/application/views/templates/FHC-Header.php
@@ -9,12 +9,15 @@
 	$title = isset($title) ? $title : null;
 	$refresh = isset($refresh) ? $refresh : null;
 	$customCSSs = isset($customCSSs) ? $customCSSs : null;
+	$skipID = isset($skipID) ? $skipID : null;
 ?>
 <!-- Header start -->
 
 <!DOCTYPE HTML>
 <html>
 	<head>
+		<?php if($skipID) generateSkipLink($skipID); ?>
+		
 		<title><?php printPageTitle($title); ?></title>
 
 		<meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/public/css/Fhc.css b/public/css/Fhc.css
index 376206f6e..6e6a25200 100644
--- a/public/css/Fhc.css
+++ b/public/css/Fhc.css
@@ -98,3 +98,41 @@
   padding-right: .375rem;
   background-image: none;
 }
+
+
+.fhcSkipLink {
+  position: absolute;
+  left: -10px;
+  top: -10px;
+  width: 1px;
+  height: 1px;
+  overflow: hidden;
+}
+
+.fhcSkipLink::before {
+   content: "Skip to main content"
+ }
+
+.fhcSkipLink:focus {
+  position: absolute;
+  z-index: 9999999;
+  top: var(--fhc-cis-header-height);
+  left: var(--fhc-cis-menu-width);
+  height: 100px;
+  width: 800px;
+  font-size: 24px;
+  font-weight: bold;
+  color: #0044cc;
+  background-color: #ffeb3b;
+  text-decoration: none;
+  padding: 12px 18px;
+  border-radius: 6px;
+  box-shadow: 0px 4px 6px rgba(0, 0, 0, 0.2);
+  transition: all 0.2s ease-in-out;
+}
+
+fhcSkipLink:hover {
+  background-color: #ffcc00;
+  color: #002b80;
+  transform: scale(1.05);
+}
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 6a46c5999..a41cbb3f0 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -227,7 +227,8 @@ const app = Vue.createApp({
 		},
 		handleClick(event) {
 			const target = event.target.closest('a');
-			
+
+			if(target?.id == 'skiplink') return
 			if (target && this.isInternalRoute(target.href)) {
 				const url = new URL(target.href)
 				

From 815307e392cb245dd696e10edf1ae018040bd5fb Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 4 Mar 2025 07:32:14 +0100
Subject: [PATCH 058/572] Reply functionality and Pagination

---
 application/controllers/NeueNachricht.php     |  2 +-
 .../api/frontend/v1/messages/Messages.php     | 82 +++++++++++++++++--
 application/models/system/Message_model.php   |  4 +-
 public/js/api/messages/person.js              |  7 ++
 public/js/apps/Nachrichten.js                 |  1 +
 .../Messages/Details/NewMessage/NewDiv.js     | 29 +++++--
 .../Messages/Details/TableMessages.js         | 29 +++++--
 public/js/components/Messages/Messages.js     | 41 ++++++++--
 8 files changed, 162 insertions(+), 33 deletions(-)

diff --git a/application/controllers/NeueNachricht.php b/application/controllers/NeueNachricht.php
index 9e9e0a39b..9b61b78ef 100644
--- a/application/controllers/NeueNachricht.php
+++ b/application/controllers/NeueNachricht.php
@@ -23,7 +23,7 @@ class NeueNachricht extends Auth_Controller
 		//now working
 		$this->load->view('Nachrichten', [
 			'permissions' => [
-				'vertragsverwaltung_schreibrechte' => $this->permissionlib->isBerechtigt('vertrag/mitarbeiter', 'suid')
+				'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz','suid'),
 			]
 		]);
 	}
diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index 4bc9a13ab..d080cbee3 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -18,6 +18,8 @@ class Messages extends FHCAPI_Controller
 			'deleteMessage' => ['admin:r', 'assistenz:r'],
 			'getVorlagentext' => ['admin:r', 'assistenz:r'],
 			'getPreviewText' => ['admin:r', 'assistenz:r'],
+			'getReplyData' => ['admin:r', 'assistenz:r'],
+			'getPersonIdFromUid' => ['admin:r', 'assistenz:r'],
 		]);
 
 		//Load Models
@@ -70,8 +72,6 @@ class Messages extends FHCAPI_Controller
 		$data = $this->getDataOrTerminateWithError($result);
 		$oe_kurzbz = current($data);
 
-	//	$this->terminateWithError("oe: ". $oe_kurzbz->oe_kurzbz, self::ERROR_TYPE_GENERAL);
-
 		$this->load->model('system/Vorlage_model', 'VorlageModel');
 
 		//39 Stück Variante OE
@@ -129,11 +129,8 @@ class Messages extends FHCAPI_Controller
 
 	public function getMsgVarsPrestudent($uid)
 	{
-		//$this->terminateWithError($uid, self::ERROR_TYPE_GENERAL);
 		$prestudent_id = $this-> _getPrestudentIdFromUid($uid);
 
-	//	$this->terminateWithError("prestudent_id " . $prestudent_id, self::ERROR_TYPE_GENERAL);
-
 		$result = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
 
 		$data = $this->getDataOrTerminateWithError($result);
@@ -290,6 +287,46 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($bodyParsed);
 	}
 
+	public function getReplyData($messageId)
+	{
+	//	return $this->terminateWithError("in get ReplyBody" . $messageId, self::ERROR_TYPE_GENERAL);
+		//TODO(Manu) validation of messageId: if number
+
+
+		$this->MessageModel->addSelect('public.tbl_msg_message.*');
+		$this->MessageModel->addSelect('r.*');
+		$this->MessageModel->addSelect('p.nachname');
+		$this->MessageModel->addSelect('p.vorname');
+		$this->MessageModel->addJoin('public.tbl_msg_recipient r', 'ON (r.message_id = public.tbl_msg_message.message_id)');
+		$this->MessageModel->addJoin('public.tbl_person p', 'ON (p.person_id = public.tbl_msg_message.person_id)');
+
+		$result = $this->MessageModel->loadWhere(
+			array('r.message_id' => $messageId)
+		);
+
+	//	$this->terminateWithSuccess((getData($result) ?: []));
+		$dataMessage = $this->getDataOrTerminateWithError($result);
+
+		$prefix = "Re: "; // reply subject prefix
+
+/*		$body = current($dataMessage->body);
+		$subject = $dataMessage->subject;*/
+
+		$subject = $dataMessage[0]->subject;
+		$body = $dataMessage[0]->body;
+
+
+		$replyBody = $this->_getReplyBody($body, $dataMessage[0]->nachname, $dataMessage[0]->vorname, $dataMessage[0]->insertamum);
+
+		$dataMessage[0]->replyBody = $replyBody;
+		$dataMessage[0]->rest = "Help Manu";
+		$dataMessage[0]->replySubject = $prefix . $subject;
+
+		$this->terminateWithSuccess($dataMessage);
+
+
+	}
+
 	public function deleteMessage($messageId)
 	{
 		// Start DB transaction
@@ -298,7 +335,7 @@ class Messages extends FHCAPI_Controller
 		$result = $this->MessageModel->deleteMessageRecipient($messageId);
 		if (isError($result)) {
 			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+
 		}
 
 		$result = $this->MessageModel->deleteMessageStatus($messageId);
@@ -316,6 +353,19 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
+	public function getPersonIdFromUid($uid)
+	{
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+		$result = $this->BenutzerModel->loadWhere(
+			['uid' => $uid]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$benutzer = current($data);
+
+		$this->terminateWithSuccess($benutzer->person_id);
+	}
+
 	private function _getPersonIdFromUid($uid)
 	{
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
@@ -326,7 +376,6 @@ class Messages extends FHCAPI_Controller
 		$data = $this->getDataOrTerminateWithError($result);
 		$benutzer = current($data);
 
-		//return $data->person_id;
 		return $benutzer->person_id;
 	}
 
@@ -342,4 +391,23 @@ class Messages extends FHCAPI_Controller
 
 		return $student->prestudent_id;
 	}
+
+	private function _getReplyBody($body, $receiverName, $receiverSurname, $sentDate)
+	{
+		// To quote a reply body message
+		$bodyFormat = "<br>
+					<br>
+					<blockquote>
+						<i>
+							On %s %s %s wrote:
+						</i>
+					</blockquote>
+					<blockquote style='border-left:2px solid; padding-left: 8px'>
+						%s
+					</blockquote>";
+		return sprintf(
+			$bodyFormat,
+			date_format(date_create($sentDate), 'd.m.Y H:i'), $receiverName, $receiverSurname, $body
+		);
+	}
 }
\ No newline at end of file
diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index 0fdb39736..38defa383 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -275,7 +275,7 @@ class Message_model extends DB_Model
 				 JOIN public.tbl_msg_message m USING(message_id)
 			WHERE r.person_id = ?
 			GROUP BY m.message_id, m.subject, m.body, m.insertamum, m.relationmessage_id, sender, recipient, sender_id, recipient_id
-			ORDER BY insertamum
+			ORDER BY insertamum DESC
 				 ";
 
 		$parametersArray = array($person_id, $person_id);
@@ -287,7 +287,7 @@ class Message_model extends DB_Model
 	 * Deletes a messages from tableMessages and tbl_msg_recipient
 	 * TODO(MANU) CHECK IF NECESSARY
 	 * dependency with other tables
-	 * in case of reply... more messages
+	 * in case of reply... more messages?? delete all dependent ones?
 	 * maybe anonimize it
 	 * @param $message_id
 	 * @return boolean success
diff --git a/public/js/api/messages/person.js b/public/js/api/messages/person.js
index 5cbb49550..7693c5189 100644
--- a/public/js/api/messages/person.js
+++ b/public/js/api/messages/person.js
@@ -14,6 +14,9 @@ export default {
 	getMsgVarsPrestudent(uid){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsPrestudent/' + uid);
 	},
+	getPersonIdFromUid(uid){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getPersonIdFromUid/' + uid);
+	},
 	getVorlagentext(vorlage_kurzbz){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagentext/' + vorlage_kurzbz);
 	},
@@ -24,6 +27,10 @@ export default {
 		return this.$fhcApi.post('api/frontend/v1/messages/messages/getPreviewText/' + params.id + '/' + params.type_id,
 			data);
 	},
+	getReplyData(messageId){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getReplyData/' + messageId);
+
+	},
 	sendMessage(form, id, data) {
 		return this.$fhcApi.post(form,'api/frontend/v1/messages/messages/sendMessage/' + id,
 			data);
diff --git a/public/js/apps/Nachrichten.js b/public/js/apps/Nachrichten.js
index 0f921a9f8..84b9ddee5 100644
--- a/public/js/apps/Nachrichten.js
+++ b/public/js/apps/Nachrichten.js
@@ -8,6 +8,7 @@ const router = VueRouter.createRouter({
 	history: VueRouter.createWebHistory(),
 	routes: [
 		{ path: `/${ciPath}/NeueNachricht/:id/:typeId`, component: NewMessage },
+		{ path: `/${ciPath}/NeueNachricht/:id/:typeId/:messageId`, component: NewMessage },
 	]
 });
 
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index b31cd9932..1eb59aa20 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -36,6 +36,9 @@ export default {
 		},
 		typeId(){
 			return this.$route.params.typeId || this.$props.id;
+		},
+		messageId(){
+			return this.$route.params.messageId;
 		}
 	},
 	data(){
@@ -62,7 +65,8 @@ export default {
 			itemsPerson: [],
 			itemsUser: [],
 			previewText: null,
-			previewBody: ""
+			previewBody: "",
+			replyData: null
 		}
 	},
 	methods: {
@@ -179,9 +183,9 @@ export default {
 				console.error("Editor instance is not available.");
 			}
 		},
-		replyMessage(message_id){
+/*		replyMessage(message_id){
 			console.log("auf message " + message_id + " antworten");
-		},
+		},*/
 		resetForm(){
 			this.formData = {
 				vorlage_kurzbz: null,
@@ -293,6 +297,19 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
+		if(this.messageId != null) {
+
+			//get replayBody.. body receivername, receiverSurname, sentDate of message
+			this.$fhcApi.factory.messages.person.getReplyData(this.messageId)
+				.then(result => {
+					this.replyData = result.data;
+					this.formData.subject = this.replyData[0].replySubject;
+					this.formData.body = this.replyData[0].replyBody;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+
+		}
+
 	},
 	async mounted() {
 		this.initTinyMCE();
@@ -309,13 +326,7 @@ export default {
 
 			<!--new page-->
 			<div class="overflow-auto m-3">
-
-			{{id}} || {{typeId}}
-
 				<h4>New Message</h4>
-	<!--			{{formData.body}}
-				||
-				{{previewText}}-->
 
 				<div class="row">
 					<div class="col-sm-8">
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 7994cbe1d..ab6a76599 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -1,12 +1,12 @@
 import {CoreFilterCmpt} from "../../filter/Filter.js";
 import FormForm from '../../Form/Form.js';
-import NewMessage from "../Details/NewMessage.js";
+//import NewMessage from "../Details/NewMessage.js";
 
 export default {
 	components: {
 		CoreFilterCmpt,
 		FormForm,
-		NewMessage,
+	//	NewMessage,
 	},
 	inject: {
 		cisRoot: {
@@ -110,13 +110,15 @@ export default {
 							container.className = "d-flex gap-2";
 
 							let button = document.createElement('button');
+							if (this.personId != cell.getData().recipient_id)
+								button.disabled = true;
 							button.className = 'btn btn-outline-secondary btn-action';
 							button.title = this.$p.t('global', 'reply');
 							button.innerHTML = '<i class="fa fa-reply"></i>';
 							button.addEventListener(
 								'click',
 								(event) =>
-									this.reply(cell.getData().message_id)
+									this.actionReplyToMessage(cell.getData().message_id)
 							);
 							container.append(button);
 
@@ -141,6 +143,8 @@ export default {
 				height: '400',
 				selectable:	true,
 				selectableRangeMode: 'click',
+				pagination: true,
+			//	paginationSize: 5,
 /*				layoutColumnsOnNewData: false,
 
 				selectableRangeMode: 'click',
@@ -208,13 +212,11 @@ export default {
 			],
 			tabulatorData: [],
 			previewBody: "",
-			open: false
+			open: false,
+			personId: null
 		}
 	},
 	methods: {
-		reply(message_id){
-			console.log("in reply " + message_id);
-		},
 		actionDeleteMessage(message_id){
 			this.$fhcAlert
 				.confirmDelete()
@@ -225,7 +227,6 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		deleteMessage(message_id){
-		//	console.log("deleteMessage " + message_id);
 			return this.$fhcApi.factory.messages.person.deleteMessage(message_id)
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
@@ -240,6 +241,9 @@ export default {
 			//console.log("action new message");
 
 		},
+		actionReplyToMessage(message_id){
+			this.$emit('replyToMessage', this.id, this.typeId, message_id);
+		},
 		reload() {
 			this.$refs.table.reloadTable();
 		},
@@ -264,6 +268,15 @@ export default {
 			});
 		});*/
 	},
+	created(){
+		if(this.typeId == 'uid') {
+		this.$fhcApi.factory.messages.person.getPersonIdFromUid(this.id)
+			.then(result => {
+				this.personId = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		}
+	},
 	template: `
 	<div class="messages-detail-table">
 
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index 49fdbdf79..e6947a72a 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -76,6 +76,23 @@ export default {
 			else
 				console.log("no valid openMode");
 		},
+		handleMessage(id, typeId, messageId){
+			console.log("in handleMessage " + messageId);
+			if (this.openMode == "window") {
+				this.openInNewWindow(id, typeId, messageId);
+			}
+			else if (this.openMode == "newTab"){
+				this.openInNewTab(id, typeId, messageId);
+			}
+			else if (this.openMode == "modal"){
+				this.openInModal(id, typeId, messageId);
+			}
+			else if (this.openMode == "showDiv"){
+				this.$refs.templateNewMessage.showTemplate(id, typeId, messageId);
+			}
+			else
+				console.log("no valid openMode");
+		},
 		openInDiv(id, typeId){
 			this.$refs.templateNewMessage.showTemplate(id, typeId);
 			//this.showDiv = true; //local variante
@@ -85,15 +102,26 @@ export default {
 			//TODO(manu) define bs-modal in this component
 			this.$refs.templateNewMessage.$refs.modalMsg.show();
 		},
-		openInNewTab(id, typeId){
+/*		openInNewTab(id, typeId){
 			//TODO(MANU) check if array of ids...
-/*			let path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
-			path += "/NeueNachricht/" + this.id + "/" + this.typeId;*/
-
-			//als param
 			let path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 			path += "/NeueNachricht/" + id + "/" + typeId;
 
+			const newTab = window.open(path, "_blank");
+		},*/
+		openInNewTab(id, typeId, messageId=null){
+			//TODO(MANU) check if array of ids...
+			let path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+
+			if (messageId){
+				path += "/NeueNachricht/" + id + "/" + typeId + "/" + messageId;
+			}
+
+			else {
+				path += "/NeueNachricht/" + id + "/" + typeId;
+			}
+
+
 			const newTab = window.open(path, "_blank");
 		},
 		openInNewWindow(id, typeId){
@@ -152,7 +180,8 @@ export default {
 				:endpoint="endpoint"
 				:messageLayout="messageLayout"
 				:openMode="openMode"
-				@newMessage="newMessage"
+				@newMessage="newMessage"		
+				@replyToMessage="handleMessage"
 			>
 			
 			</table-messages>

From 825ccfcc3708ee9271e0f221712993638271a651 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 4 Mar 2025 11:15:51 +0100
Subject: [PATCH 059/572] Calendar: Get rid of Warnings

---
 public/js/apps/Cis.js                         |  1 -
 public/js/apps/Dashboard/Fhc.js               |  1 -
 public/js/components/Calendar/Calendar.js     |  1 +
 public/js/components/Calendar/Day/Page.js     | 42 ++++++++++---------
 public/js/components/Calendar/Month.js        |  3 ++
 public/js/components/Calendar/Week.js         |  6 ++-
 public/js/components/Calendar/Week/Page.js    | 13 ++++--
 public/js/components/Calendar/Weeks.js        |  2 +-
 public/js/components/Cis/Mylv/LvModal.js      |  4 +-
 .../Cis/Mylv/Semester/Studiengang/Lv.js       |  4 +-
 .../components/Cis/Stundenplan/Stundenplan.js |  5 ++-
 11 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 482c2774a..bb4b76ca4 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -117,7 +117,6 @@ const app = Vue.createApp({
         }
     }
 });
-app.use(FhcApi);
 app.use(primevue.config.default, {
 	zIndex: {
 		overlay: 9000,
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index a41cbb3f0..137d1d008 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -266,7 +266,6 @@ const app = Vue.createApp({
 // kind of a bandaid for bad css on some pages to avoid horizontal scroll
 setScrollbarWidth();
 app.use(router);
-app.use(FhcApi);
 app.use(primevue.config.default, {
 	zIndex: {
 		overlay: 9000,
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index a12dc1b0a..5c2dc8bb0 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -96,6 +96,7 @@ export default {
 		'select:day',
 		'select:event',
 		'change:range',
+		'change:mode',
 		'update:minimized',
 		'selectedEvent',
 		'change:offset'
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index f38ea50cd..b339c12fc 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -403,25 +403,29 @@ export default {
 							<div class="all-day-event-container" >
 								<div @wheel.stop class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
 									<template v-for="(events,_day) in allDayEvents" :key="_day">
-
-									<div v-if="dayindex == _day" v-for="event in events" :key="event" class="d-grid m-1" style="top:0;" @click.prevent="eventClick(event)"
-												:selected="event == selectedEvent"
-												:style="{'background-color': event?.color, 'margin-bottom':'1px'}"
-												class="small rounded overflow-hidden fhc-entry"
-												v-contrast
-												>
-												<div class="d-none d-xl-block">
-														<slot name="dayPage" :event="event" :day="day" :mobile="false">
-															<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
-														</slot>
-													</div>
-													<div class="d-block d-xl-none">
-														<slot name="dayPage" :event="event" :day="day" :mobile="true">
-															<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
-														</slot>
-													</div>
-											</div>
-										</template>
+										<div
+											v-if="dayindex == _day"
+											v-for="event in events"
+											:key="event"
+											style="top:0;"
+											@click.prevent="eventClick(event)"
+											:selected="event == selectedEvent"
+											:style="{'background-color': event?.color, 'margin-bottom':'1px'}"
+											class="d-grid m-1 small rounded overflow-hidden fhc-entry"
+											v-contrast
+											>
+											<div class="d-none d-xl-block">
+													<slot name="dayPage" :event="event" :day="day" :mobile="false">
+														<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
+													</slot>
+												</div>
+												<div class="d-block d-xl-none">
+													<slot name="dayPage" :event="event" :day="day" :mobile="true">
+														<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
+													</slot>
+												</div>
+										</div>
+									</template>
 								</div>
 							</div>
 
diff --git a/public/js/components/Calendar/Month.js b/public/js/components/Calendar/Month.js
index ab20e2e03..27ec50fbf 100644
--- a/public/js/components/Calendar/Month.js
+++ b/public/js/components/Calendar/Month.js
@@ -13,6 +13,9 @@ export default {
 		BsModal,
 		Months
 	},
+	emits: [
+		"change:offset"
+	],
 	data() {
 		return {
 			syncOnNextChange: false
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
index 4b30a1b79..2cca97a27 100644
--- a/public/js/components/Calendar/Week.js
+++ b/public/js/components/Calendar/Week.js
@@ -14,6 +14,9 @@ export default {
 		BsModal,
 		Weeks
 	},
+	emits: [
+		"change:offset"
+	],
 	computed: {
 		title() {
 			return this.focusDate.wYear + ' KW ' + this.focusDate.w;
@@ -28,7 +31,8 @@ export default {
 			this.$refs.modalDatepickerContainer.hide()
 		},
 		handleHeaderClickWeek() {
-			this.$refs.modalDatepickerContainer.show()
+			this.$emit('updateMode', 'weeks');//
+			//this.$refs.modalDatepickerContainer.show()
 		},
 		paneChanged(dir) {
 			this.focusDate.d += dir * 7;
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index dccca6630..55bbfbc75 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -227,7 +227,7 @@ export default {
 			if (event.orig.allDayEvent)
 			{
 				return;
-				return {
+				/*return {
 					'z-index': '2',
 					'grid-column': '1 / -1',
 					'background-color': 'rgb(204, 204, 204)',
@@ -235,7 +235,7 @@ export default {
 					color: 'black',
 					position: 'sticky',
 					top: '44px',
-				};
+				};*/
 			}
 			else
 			{
@@ -363,10 +363,15 @@ export default {
 					<div @wheel.stop class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
 						<template v-for="(events,_day) in allDayEvents" :key="_day">
 
-							<div v-if="dayindex == _day" v-for="event in events" :key="event" class="d-grid m-1" style="top:0;" @click.prevent="weekPageClick(event, _day)"
+							<div
+								v-if="dayindex == _day"
+								v-for="event in events"
+								:key="event"
+								style="top:0;"
+								@click.prevent="weekPageClick(event, _day)"
 								:selected="event == selectedEvent"
 								:style="{'background-color': event?.color, 'margin-bottom':'1px'}"
-								class="small rounded overflow-hidden fhc-entry"
+								class="d-grid m-1 small rounded overflow-hidden fhc-entry"
 								v-contrast
 								>		
 								<slot class="p-1" name="weekPage" :event="event" :day="day">
diff --git a/public/js/components/Calendar/Weeks.js b/public/js/components/Calendar/Weeks.js
index b8300b4b5..260540adb 100644
--- a/public/js/components/Calendar/Weeks.js
+++ b/public/js/components/Calendar/Weeks.js
@@ -29,7 +29,7 @@ export default {
 		setWeek(week) {
 			// TODO(chris): test is there a week jump on year select? => yes there is if the same month/day are in different weeks ... should we prevent that?
 			this.focusDate.w = week;
-			this.$emit('change', week);
+			this.$emit('updateMode', 'week');
 		},
 		prev(){
 			this.focusDate.y--;
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index 63ac069c9..fd944faff 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -59,7 +59,7 @@ export default {
 					}
 				)
 			}
-		},
+		}
 	},
 	mounted() {
 		this.modal = this.$refs.modalContainer.modal;
@@ -68,7 +68,7 @@ export default {
 		return BsModal.popup.bind(this)(null, options);
 	},
 	template: /*html*/ `
-	<bs-modal ref="modalContainer" @showBsModal="onModalShow" @hideBsModal="onModalHide" v-bind="$props" :bodyClass="''" dialogClass='modal-lg' class="bootstrap-alert" :backdrop="false" >
+	<bs-modal ref="modalContainer" @showBsModal="onModalShow" v-bind="$props" :bodyClass="''" dialogClass='modal-lg' class="bootstrap-alert" :backdrop="false" >
 		<template v-slot:title>
 			<template v-if="event?.type=='moodle'">{{event.titel}}</template>
 			<template v-else-if="event.titel">{{ event.titel + ' - ' + event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index 0543d8fae..c0129d1d1 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -62,10 +62,10 @@ export default {
 			return !this.menu || !Array.isArray(this.menu) || Array.isArray(this.menu) && this.menu.length == 0;
 		},
 		bodyStyle() {return {};
-			const bodyStyle = {};
+			/*const bodyStyle = {};
 			if (this.farbe)
 				bodyStyle['background-color'] = '#' + this.farbe;
-			return bodyStyle;
+			return bodyStyle;*/
 		},
 		grade() {
 			const languageIndex = this.$p.user_language.value === 'English' ? 1 : 0
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index e7d48fe21..e603e5525 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -26,6 +26,7 @@ const Stundenplan = {
 		}
 	},
 	props: {
+		viewData: Object, // NOTE(chris): this is inherited from router-view
 		propsViewData: Object,
 		rowMinHeight: {
 			type: String,
@@ -155,11 +156,13 @@ const Stundenplan = {
 		},
 		handleChangeMode(mode) {
 			let m = mode[0].toUpperCase() + mode.slice(1)
-			if(m === this.calendarMode) return
+			if(m === this.calendarMode) return; // TODO(chris): check for date and lv_id too!
 			const date = this.currentDay.getFullYear() + "-" +
 				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
 				String(this.currentDay.getDate()).padStart(2, "0");
 			
+			if (m == 'Weeks' || m == 'Years' || m == 'Months') return;
+			
 			this.$router.push({
 				name: "Stundenplan",
 				params: {

From b1b0d5edd0c2fe00e24bd70ff7171fd1dc5d271a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 4 Mar 2025 12:05:24 +0100
Subject: [PATCH 060/572] remove(Calendar Week Page Style): removes not needed
 style check in component

---
 public/js/components/Calendar/Week/Page.js | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 55bbfbc75..1fe82ff0e 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -224,22 +224,7 @@ export default {
 			return styleObj
 		},
 		eventGridStyle(day, event) {
-			if (event.orig.allDayEvent)
-			{
-				return;
-				/*return {
-					'z-index': '2',
-					'grid-column': '1 / -1',
-					'background-color': 'rgb(204, 204, 204)',
-					'max-height': '75px',
-					color: 'black',
-					position: 'sticky',
-					top: '44px',
-				};*/
-			}
-			else
-			{
-				return {
+			return {
 					'z-index': 1,
 					'grid-column-start': 1 + (event.lane - 1) * day.lanes / event.maxLane,
 					'grid-column-end': 1 + event.lane * day.lanes / event.maxLane,
@@ -247,8 +232,7 @@ export default {
 					'grid-row-end': this.dateToMinutesOfDay(event.end),
 					'background-color': event.orig.color,
 					'max-height': '75px'
-				};
-			}
+			};
 		},
 		calcHourPosition(event) {
 			let height = this.$refs['eventsRef' + this.week].getBoundingClientRect().height;

From 415e7595867269742e0c0779cdeffd53d45332da Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 5 Mar 2025 08:54:26 +0100
Subject: [PATCH 061/572] fix(StudiengangsInformationen API data): fixes little
 error when checking if the uid is a mitarbeiter or not

---
 application/controllers/api/frontend/v1/Studgang.php          | 3 ++-
 .../Cis/Cms/StudiengangInformation/StudiengangInformation.js  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Studgang.php b/application/controllers/api/frontend/v1/Studgang.php
index 63579e3a6..82aebb666 100644
--- a/application/controllers/api/frontend/v1/Studgang.php
+++ b/application/controllers/api/frontend/v1/Studgang.php
@@ -45,8 +45,9 @@ class Studgang extends FHCAPI_Controller
 
 	public function getStudiengangInfo(){
 		$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID());
+		$isMitarbeiter = $this->getDataOrTerminateWithError($isMitarbeiter);
 		if($isMitarbeiter) {
-			$this->terminateWithSuccess();
+			$this->terminateWithSuccess(null);
 		}
 		
 		// fetches the Studiengang Information which is used next to the news
diff --git a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
index 92e303801..30e6ecb6a 100644
--- a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
+++ b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
@@ -31,11 +31,11 @@ template:/*html*/`
 			<div class="card card-body mb-3">
 				<div class="mb-1">
 					<h2 class="mb-1 pb-0">{{$p.t('lehre','studiengang')}}:</h2>
-					<span class="mb-1">{{studiengang.bezeichnung}}</span>
+					<span class="mb-1">{{studiengang?.bezeichnung}}</span>
 				</div>
 				<div class="mb-1">
 					<h2 class="mb-1 pb-0">Moodle:</h2>
-					<a class="mb-1" target="_blank" :href="moodleLink">{{studiengang.kurzbzlang}}</a>
+					<a class="mb-1" target="_blank" :href="moodleLink">{{studiengang?.kurzbzlang}}</a>
 				</div>
 				<div :class="{'mb-1':studiengang?.zusatzinfo_html}">
 					<h2 class="mb-1 pb-0">{{$p.t('lehre','studiensemester')}}: </h2>

From 44777e2f1b74863fc19dde914670004d3189144a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 5 Mar 2025 09:20:35 +0100
Subject: [PATCH 062/572] fix(VueRouter News Ansicht):News ansicht konnte nicht
 geladen werden weil viewData im Cms controller nicht uebergeben wurde aber im
 CisRouterView verwendet wird

---
 application/controllers/CisVue/Cms.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
index 0263a00c4..a9ff13c53 100644
--- a/application/controllers/CisVue/Cms.php
+++ b/application/controllers/CisVue/Cms.php
@@ -82,8 +82,9 @@ class Cms extends Auth_Controller
 	 * @return void
 	 */
 	public function news($infoscreen = false, $studiengang_kz = null, $semester = null, $mischen = true, $titel = '', $edit = false, $sichtbar = true)
-	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'News']);
+	{	
+		$viewData = array();
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData'=>$viewData, 'route' => 'News']);
 	}
 	
 	public function getRoomInformation($ort_kurzbz){

From ba2014b1a331cb3200579cb2152214a9c94cc989 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 5 Mar 2025 11:21:49 +0100
Subject: [PATCH 063/572] fix(News Widget animation): fixes the animation bug
 when changing the width of the News widget from 1 to >1

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

diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 98c5244e1..85bdca64a 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -152,14 +152,14 @@ export default {
 	template: /*html*/ `
 <div ref="container" class="widgets-news h-100" :class="sizeClass" :style="getNewsWidgetStyle">
     <div class="d-flex flex-column h-100">
-        <div class="h-100" style="overflow-y: auto" v-if="width == 1">
+        <div class="h-100" style="overflow-y: auto" v-show="width == 1">
             <div  v-for="(news, index) in newsList" :key="news.news_id" class="mt-2">
                 <div v-if="index > 0 " class="fhc-seperator"></div>
                 <a :href="contentURI(news.content_id)" >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</a><br>
                 <span class="small text-muted">{{ formatDateTime(news.insertamum) }}</span>
 			</div>
 		</div>
-        <div v-else class="row h-100 g-0">
+        <div v-show="width >1" class="row h-100 g-0">
         	<div :class="'col-'+(width == 2? 6 : 4) + ' h-100 g-0'" style="overflow: auto;">
         		<template v-for="news in newsList" :key="'menu-'+news.news_id">
 					<div class="position-relative">

From a4d2a2cace664f0d3cdd4972056925c5da537209 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 5 Mar 2025 14:23:35 +0100
Subject: [PATCH 064/572] fix news widget carousel (re)initialization after
 resize

---
 public/js/components/DashboardWidget/News.js | 45 ++++++++++++++------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 98c5244e1..40a7e0406 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -14,6 +14,8 @@ export default {
 		selected: null,
 		size:0,
 	}),
+	props: ['width', 'height']
+	,
 	mixins: [AbstractWidget],
 	computed: {
 		sizeClass() {
@@ -102,6 +104,31 @@ export default {
 			this.singleNews = singleNews;
 			this.$refs.newsModal.show();
 		},
+		initCarouselInstance() {
+			Vue.nextTick(()=> {
+				if(this.$refs.carousel) { // carousel ref might not exist in every widget width/height
+					this.carouselInstance = new bootstrap.Carousel(this.$refs.carousel, {
+						wrap: false, // keep this off even though it actually wraps
+						interval: false
+					});
+				}
+			})
+		},
+		initActiveItem() {
+			Vue.nextTick(()=> {
+				if (Array.isArray(this.$refs.carouselItems) && this.$refs.carouselItems.length >0) {
+					this.$refs.carouselItems[0].classList.add("active")
+				}
+			})
+		}
+	},
+	watch: {
+		width(newVal, oldVal) {
+			if(oldVal == 1 && newVal > 1) { // carousel instance will have been disposed
+				this.initCarouselInstance()
+				this.initActiveItem()
+			}
+		}
 	},
 	created() {
 		this.$emit("setConfig", false);
@@ -111,12 +138,9 @@ export default {
 			.then((news) => {
 				this.allNewsList = Array.from(Object.values(news));
 				this.selected = this.allNewsList.length ? this.allNewsList[0] : null
-				Vue.nextTick(()=>{
-					if (Array.isArray(this.$refs.carouselItems) && this.$refs.carouselItems.length >0) {
-						this.$refs.carouselItems[0].classList.add("active")
-					}
-				})
-				})
+				this.initActiveItem()
+				
+			})
 			.catch((err) => {
 				console.error("ERROR: ", err);
 			});
@@ -139,15 +163,8 @@ export default {
 			}
 			}).observe(this.$refs.container);
 		}
-		Vue.nextTick(()=> {
-			if(this.$refs.carousel) { // carousel ref might not exist in every widget width/height
-				this.carouselInstance = new bootstrap.Carousel(this.$refs.carousel, {
-					wrap: false, // keep this off even though it actually wraps
-					interval: false
-				});
-			}
-		})
 		
+		this.initCarouselInstance()
 	},
 	template: /*html*/ `
 <div ref="container" class="widgets-news h-100" :class="sizeClass" :style="getNewsWidgetStyle">

From 1989e65d72d1532ab943c71eaaff4b6207581c79 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 10 Mar 2025 07:51:53 +0100
Subject: [PATCH 065/572] Tree structure for messages, preview in NewDiv, Note
 to close window, check recipient_id, save relationmessage_id

---
 .../api/frontend/v1/messages/Messages.php     | 163 ++++++++++--------
 public/js/api/messages/person.js              |  12 +-
 .../Messages/Details/NewMessage/NewDiv.js     | 117 ++++++++++---
 .../Messages/Details/TableMessages.js         | 144 +++++++++++++---
 public/js/components/Messages/Messages.js     |   3 +-
 .../Studentenverwaltung/Details/Messages.js   |  14 +-
 6 files changed, 329 insertions(+), 124 deletions(-)

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index d080cbee3..65c354c4f 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -19,7 +19,8 @@ class Messages extends FHCAPI_Controller
 			'getVorlagentext' => ['admin:r', 'assistenz:r'],
 			'getPreviewText' => ['admin:r', 'assistenz:r'],
 			'getReplyData' => ['admin:r', 'assistenz:r'],
-			'getPersonIdFromUid' => ['admin:r', 'assistenz:r'],
+			'getPersonId' => ['admin:r', 'assistenz:r'],
+			'getUid' => ['admin:r', 'assistenz:r'],
 		]);
 
 		//Load Models
@@ -42,17 +43,8 @@ class Messages extends FHCAPI_Controller
 
 	public function getMessages($id, $type_id)
 	{
-		switch($type_id)
-		{
-			case 'uid':
-				$id = $this->_getPersonIdFromUid($id);
-				break;
-			case 'person_id':
-				$id = $id;
-				break;
-			default:
-				$this->terminateWithError("MESSAGES::getMessages logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
-				break;
+		if($type_id != 'person_id'){
+			$id = $this->_getPersonId($id, $type_id);
 		}
 
 		$result = $this->MessageModel->getMessagesForTable($id);
@@ -74,15 +66,13 @@ class Messages extends FHCAPI_Controller
 
 		$this->load->model('system/Vorlage_model', 'VorlageModel');
 
-		//39 Stück Variante OE
 		$result = $this->VorlageModel->getAllVorlagenByOe($oe_kurzbz->oe_kurzbz);
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
 
-		//IF ADMIN 167
+		//If admin
 		$this->VorlageModel->addOrder('vorlage_kurzbz', 'ASC');
-		//only HTML-vorlagen -> for admin
 		$result = $this->VorlageModel->loadWhere(
 			array(
 				'mimetype' => 'text/html'
@@ -97,7 +87,7 @@ class Messages extends FHCAPI_Controller
 	public function getVorlagentext($vorlage_kurzbz)
 	{
 		//$this->terminateWithError("vor " . $vorlage_kurzbz, self::ERROR_TYPE_GENERAL);
-		//$studiengang_kz = 227; //TODO(Manu) check dynamisieren NULL
+		//$studiengang_kz = 227; //TODO(Manu) dynamisieren NULL
 		$studiengang_kz = 0;
 		$this->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
 		$this->VorlagestudiengangModel->addOrder('version', 'DESC');
@@ -127,49 +117,32 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	public function getMsgVarsPrestudent($uid)
+	public function getMsgVarsPrestudent($id, $typeId)
 	{
-		$prestudent_id = $this-> _getPrestudentIdFromUid($uid);
+		$prestudent_id = ($typeId == 'prestudent_id') ? $id : $this->_getPrestudentIdFromUid($id);
 
 		$result = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-
 		$this->terminateWithSuccess($data);
 	}
 
 	public function getMsgVarsLoggedInUser()
 	{
-		$uid = getAuthUID();
-
 		$result = $this->MessageModel->getMsgVarsLoggedInUser();
-
 		$data = $this->getDataOrTerminateWithError($result);
 
-
 		$this->terminateWithSuccess($data);
 	}
 
 	public function getNameOfDefaultRecipient($id, $type_id)
 	{
-		switch($type_id)
-		{
-			case 'uid':
-				$id = $this->_getPersonIdFromUid($id);
-				break;
-			case 'person_id':
-				$id = $id;
-				break;
-			default:
-				$this->terminateWithError("MESSAGES::getNameOfDefaultRecipient logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
-				break;
-		}
+		$id = $type_id!='person_id)' ? $this->_getPersonId($id, $type_id) : $id;
 
 		$this->load->model('person/Person_model', 'PersonModel');
 
 		$result = $this->PersonModel->load($id);
-		//$this->terminateWithSuccess($result);
 		$data = $this->getDataOrTerminateWithError($result);
 		$name = current($data);
 
@@ -178,8 +151,11 @@ class Messages extends FHCAPI_Controller
 
 	public function sendMessage($recipient_id)
 	{
+		//is always uid in FAS
+		//TODO(Manu) make dynamic for other ids
+
 		//default setting
-		$receiversPersonId = $this->_getPersonIdFromUid($recipient_id);
+		$receiversPersonId = $this->_getPersonId($recipient_id, 'uid');
 
 		$uid = getAuthUID();
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
@@ -216,15 +192,13 @@ class Messages extends FHCAPI_Controller
 
 		$subject = $this->input->post('subject');
 		$body = $this->input->post('body');
-
-
+		$relationmessage_id = $this->input->post('relationmessage_id');
 
 		$typeId = $this->input->post('type_id');
 		$id = $this->input->post('id');
 
 		if($typeId == 'uid')
 		{
-			//$this->terminateWithError("uid ", self::ERROR_TYPE_GENERAL);
 			$prestudent_id = $this-> _getPrestudentIdFromUid($id);
 
 			//parseMessagetext for variables Prestudent
@@ -240,7 +214,7 @@ class Messages extends FHCAPI_Controller
 		}
 		elseif($typeId == 'prestudent_id')
 		{
-			$this->terminateWithError("prestudent_id ", self::ERROR_TYPE_GENERAL);
+		//	$this->terminateWithError("prestudent_id ", self::ERROR_TYPE_GENERAL);
 
 			$result = $this->MessagesModel->parseMessageTextPrestudent($id, $body);
 			$bodyParsed = $this->getDataOrTerminateWithError($result);
@@ -250,7 +224,7 @@ class Messages extends FHCAPI_Controller
 			$this->terminateWithError("type_id " . $typeId . " not valid", self::ERROR_TYPE_GENERAL);
 		}
 
-		$result = $this->messagelib->sendMessageUser($receiversPersonId, $subject, $bodyParsed, $benutzer->person_id);
+		$result = $this->messagelib->sendMessageUser($receiversPersonId, $subject, $bodyParsed, $benutzer->person_id, null, $relationmessage_id);
 
 		$this->terminateWithSuccess($result);
 	}
@@ -271,17 +245,15 @@ class Messages extends FHCAPI_Controller
 			case 'uid':
 				$prestudent_id = $this->_getPrestudentIdFromUid($id);
 				$result = $this->MessagesModel->parseMessageTextPrestudent($prestudent_id, $data);
-
 				break;
-			case 'person_id':
-				$id = $id;
+			case 'prestudent_id':
+				$result = $this->MessagesModel->parseMessageTextPrestudent($id, $data);
 				break;
 			default:
 				$this->terminateWithError("MESSAGES::getPreviewText logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
 				break;
 		}
 
-		//$this->terminateWithSuccess($result);
 		$bodyParsed = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($bodyParsed);
@@ -289,10 +261,8 @@ class Messages extends FHCAPI_Controller
 
 	public function getReplyData($messageId)
 	{
-	//	return $this->terminateWithError("in get ReplyBody" . $messageId, self::ERROR_TYPE_GENERAL);
 		//TODO(Manu) validation of messageId: if number
 
-
 		$this->MessageModel->addSelect('public.tbl_msg_message.*');
 		$this->MessageModel->addSelect('r.*');
 		$this->MessageModel->addSelect('p.nachname');
@@ -304,14 +274,9 @@ class Messages extends FHCAPI_Controller
 			array('r.message_id' => $messageId)
 		);
 
-	//	$this->terminateWithSuccess((getData($result) ?: []));
 		$dataMessage = $this->getDataOrTerminateWithError($result);
-
 		$prefix = "Re: "; // reply subject prefix
 
-/*		$body = current($dataMessage->body);
-		$subject = $dataMessage->subject;*/
-
 		$subject = $dataMessage[0]->subject;
 		$body = $dataMessage[0]->body;
 
@@ -323,8 +288,6 @@ class Messages extends FHCAPI_Controller
 		$dataMessage[0]->replySubject = $prefix . $subject;
 
 		$this->terminateWithSuccess($dataMessage);
-
-
 	}
 
 	public function deleteMessage($messageId)
@@ -353,30 +316,94 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
-	public function getPersonIdFromUid($uid)
+	public function getPersonId($id, $typeId)
 	{
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-		$result = $this->BenutzerModel->loadWhere(
-			['uid' => $uid]
-		);
+		if ($typeId == 'uid')
+		{
+			$this->load->model('person/Benutzer_model', 'BenutzerModel');
+			$result = $this->BenutzerModel->loadWhere(
+				['uid' => $id]
+			);
+		}
+		elseif($typeId == 'prestudent_id')
+		{
+			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+			$result = $this->PrestudentModel->loadWhere(
+				['prestudent_id' => $id]
+			);
+		}
 
 		$data = $this->getDataOrTerminateWithError($result);
-		$benutzer = current($data);
+		$person = current($data);
 
-		$this->terminateWithSuccess($benutzer->person_id);
+		$this->terminateWithSuccess($person->person_id);
 	}
 
-	private function _getPersonIdFromUid($uid)
+	public function getUid($id, $typeId)
 	{
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-		$result = $this->BenutzerModel->loadWhere(
-			['uid' => $uid]
-		);
+		if (!$typeId)
+		{
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Type ID']), self::ERROR_TYPE_GENERAL);
+		}
+		elseif ($typeId == 'person_id')
+		{
+			$this->load->model('person/Benutzer_model', 'BenutzerModel');
+			$result = $this->BenutzerModel->loadWhere(
+				['person_id' => $id]
+			);
+		}
+		elseif($typeId == 'prestudent_id')
+		{
+			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+			$result = $this->PrestudentModel->loadWhere(
+				['prestudent_id' => $id]
+			);
+
+			$data = $this->getDataOrTerminateWithError($result);
+			$person = current($data);
+			$person_id = $person->person_id;
+
+			$this->load->model('person/Benutzer_model', 'BenutzerModel');
+			$result = $this->BenutzerModel->loadWhere(
+				['person_id' => $person_id]
+			);
+		}
+		elseif($typeId == 'uid')
+		{
+			$this->terminateWithSuccess($id);
+		}
+		else
+		{
+			$this->terminateWithError("MESSAGES::getUID logic for type_id " . $typeId . " not defined yet", self::ERROR_TYPE_GENERAL);
+		}
 
 		$data = $this->getDataOrTerminateWithError($result);
 		$benutzer = current($data);
 
-		return $benutzer->person_id;
+		$this->terminateWithSuccess($benutzer->uid);
+	}
+
+	private function _getPersonId($id, $typeId)
+	{
+		if ($typeId == 'uid')
+		{
+			$this->load->model('person/Benutzer_model', 'BenutzerModel');
+			$result = $this->BenutzerModel->loadWhere(
+				['uid' => $id]
+			);
+		}
+		elseif($typeId == 'prestudent_id')
+		{
+			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+			$result = $this->PrestudentModel->loadWhere(
+				['prestudent_id' => $id]
+			);
+		}
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$person = current($data);
+
+		return $person->person_id;
 	}
 
 	private function _getPrestudentIdFromUid($uid)
diff --git a/public/js/api/messages/person.js b/public/js/api/messages/person.js
index 7693c5189..e53f23f6a 100644
--- a/public/js/api/messages/person.js
+++ b/public/js/api/messages/person.js
@@ -11,11 +11,14 @@ export default {
 	getMessageVarsPerson(){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessageVarsPerson/');
 	},
-	getMsgVarsPrestudent(uid){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsPrestudent/' + uid);
+	getMsgVarsPrestudent(params){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsPrestudent/' + params.id + '/' + params.type_id);
 	},
-	getPersonIdFromUid(uid){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getPersonIdFromUid/' + uid);
+	getPersonId(params){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getPersonId/'+ params.id + '/' + params.type_id);
+	},
+	getUid(params){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getUid/'+ params.id + '/' + params.type_id);
 	},
 	getVorlagentext(vorlage_kurzbz){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagentext/' + vorlage_kurzbz);
@@ -29,7 +32,6 @@ export default {
 	},
 	getReplyData(messageId){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getReplyData/' + messageId);
-
 	},
 	sendMessage(form, id, data) {
 		return this.$fhcApi.post(form,'api/frontend/v1/messages/messages/sendMessage/' + id,
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index 1eb59aa20..d8611d611 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -44,14 +44,16 @@ export default {
 	data(){
 		return {
 			formData: {
-				recipient: this.id,
+				recipient: null,
 				subject: null,
 				body: null,
 				vorlage_kurzbz: null,
 				selectedValue: '',
+				relationmessage_id: null
 			},
 			statusNew: true,
 			vorlagen: [],
+			recipientsArray: [],
 			defaultRecipient: null,
 			editor: null,
 			isVisible: false,
@@ -66,7 +68,9 @@ export default {
 			itemsUser: [],
 			previewText: null,
 			previewBody: "",
-			replyData: null
+			replyData: null,
+			uid: null,
+			messageSent: false
 		}
 	},
 	methods: {
@@ -105,19 +109,22 @@ export default {
 		sendMessage() {
 			//TODO(Manu) check default recipient(s)
 			const data = new FormData();
+
 			const params = {
 				id: this.id,
 				type_id: this.typeId
 			};
+
 			const merged = {
 				...this.formData,
 				...params
 			};
 			data.append('data', JSON.stringify(merged));
 
+			//this.uid is important for existing sendFunction
 			return this.$fhcApi.factory.messages.person.sendMessage(
 				this.$refs.formMessage,
-				this.id,
+				this.uid,
 				data)
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
@@ -129,6 +136,10 @@ export default {
 						//this.resetForm();
 						//closeModal
 						//closewindwo
+					this.messageSent = true;
+					//TODO(Manu) hier route definieren? ist kein child sondern mit route aufgerufen
+					//würde allerdings neues fenster aktualisiert öffnen, altes bleibt ohne reload gleich
+					//Reload vorheriges tab???
 						this.$emit('reloadTable');
 					}
 				);
@@ -148,13 +159,13 @@ export default {
 					//closewindwo
 				});
 		},
-		getPreviewText(){
+		getPreviewText(id, typeId){
 			const data = new FormData();
 
 			data.append('data', JSON.stringify(this.formData.body));
 			return this.$fhcApi.factory.messages.person.getPreviewText({
-				id: this.id,
-				type_id: this.typeId}, data)
+				id: id,
+				type_id: typeId}, data)
 				.then(response => {
 					this.previewText = response.data;
 				}).catch(this.$fhcAlert.handleSystemError)
@@ -167,7 +178,8 @@ export default {
 		insertVariable(selectedItem){
 			if (this.editor) {
 				this.editor.insertContent(selectedItem.value + " ");
-				//TODO(Manu) check: nicht mal mit Punkt adden gehts ohne eintrag nach vars
+				//TODO(Manu) check: Laden von Variblen geht nicht wenn kein Zeichen danach kommt
+				// nicht mal mit Punkt adden gehts ohne eintrag nach vars
 				/*				this.editor.focus();
 								this.editor.setDirty(true);*/
 
@@ -183,9 +195,6 @@ export default {
 				console.error("Editor instance is not available.");
 			}
 		},
-/*		replyMessage(message_id){
-			console.log("auf message " + message_id + " antworten");
-		},*/
 		resetForm(){
 			this.formData = {
 				vorlage_kurzbz: null,
@@ -219,11 +228,22 @@ export default {
 			//just for testing:
 			this.isVisible = true;
 		},
-		showPreview(){
-			this.getPreviewText().then(() => {
+		showPreview(id, typeId){
+			this.getPreviewText(id, typeId).then(() => {
 				this.previewBody = this.previewText;
 			});
 		},
+		getUid(id, typeId){
+			const params = {
+				id: id,
+				type_id: typeId
+			};
+			this.$fhcApi.factory.messages.person.getUid(params)
+				.then(result => {
+					this.uid = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
 	},
 	watch: {
 		'formData.body': {
@@ -238,7 +258,6 @@ export default {
 		},
 		'formData.vorlage_kurzbz': {
 			handler(newVal){
-				//	console.log("Vorlage: " + newVal);
 
 				if (newVal && newVal != null) {
 					this.formData.subject = newVal;
@@ -248,6 +267,9 @@ export default {
 		},
 	},
 	created(){
+		if(this.typeId != 'uid')
+			this.getUid(this.id, this.typeId);
+
 		if(this.typeId == 'person_id'){
 			this.$fhcApi.factory.messages.person.getMessageVarsPerson()
 				.then(result => {
@@ -259,8 +281,13 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		}
-		if(this.typeId == 'uid') {
-			this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(this.id)
+
+		if(this.typeId == 'uid' || this.typeId == 'prestudent_id') {
+			const params = {
+				id: this.id,
+				type_id: this.typeId
+			};
+			this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(params)
 				.then(result => {
 					this.fieldsPrestudent = result.data;
 					const prestudent = this.fieldsPrestudent[0];
@@ -294,20 +321,21 @@ export default {
 		})
 			.then(result => {
 				this.defaultRecipient = result.data;
+				this.recipientsArray.push({'uid': this.uid,
+											'details': this.defaultRecipient});
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
+		//case of reply
 		if(this.messageId != null) {
-
-			//get replayBody.. body receivername, receiverSurname, sentDate of message
 			this.$fhcApi.factory.messages.person.getReplyData(this.messageId)
 				.then(result => {
 					this.replyData = result.data;
 					this.formData.subject = this.replyData[0].replySubject;
 					this.formData.body = this.replyData[0].replyBody;
+					this.formData.relationmessage_id = this.messageId;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
-
 		}
 
 	},
@@ -320,12 +348,11 @@ export default {
 	template: `
 
 	<div class="messages-detail-newmessage">
-
 			<!--passt für showdiv-->
 <!--			<div class="overflow-auto" style="max-height: 500px; border: 1px solid #ccc;">-->
 
 			<!--new page-->
-			<div class="overflow-auto m-3">
+			<div v-if="!messageSent" class="overflow-auto m-3">
 				<h4>New Message</h4>
 
 				<div class="row">
@@ -465,19 +492,26 @@ export default {
 					<div>
 						<form-form class="row g-3 mt-2" ref="formPreview">
 
-							<div class="col-sm-2 mb-3">
+							<div class="col-sm-3 mb-3">
+							
 								<form-input
 									type="select"
 									name="recipient"
 									:label="$p.t('messages/recipient')"
-									v-model="defaultRecipient"
+									v-model="formData.recipient"
 								>
+									<option 
+										v-for="recipient in recipientsArray"
+										:key="recipient.uid" 
+										:value="recipient.uid" 
+										>{{recipient.details}}
+									</option>
 								</form-input>
 							</div>
 
 							<div class="col-md-2 mt-4">
 								<br>
-								<button type="button" class="btn bt		n-secondary" @click="showPreview()">Aktualisieren</button>
+								<button type="button" class="btn btn-secondary" @click="showPreview(formData.recipient,'uid')">Aktualisieren</button>
 							</div>
 						</form-form>
 
@@ -492,6 +526,43 @@ export default {
 				</div>
 
 		</div>
+		
+					
+		<div v-else class="container d-flex justify-content-center align-items-center m-3">
+			<div class="card" style="width: 80%">
+			  <div class="card-body alert alert-success text-dar p-5 rounded">
+						<div class="row">
+							<div class="col-6">
+								Message sent successfully!
+							</div>
+							<div class="col-6">
+								Nachricht erfolgreich versandt!
+							</div>
+						</div>
+						
+						<div class="row">
+							<div class="col-6" style="border-right: 1px">
+								You can safely close this window.
+							</div>
+							<div class="col-6">
+								Sie können dieses Fenster schließen.
+							</div>
+						</div>
+				</div>
+				<div class="text-center">
+					<p class="signatureblock">
+						Fachhochschule Technikum Wien | University of Applied Sciences Technikum Wien
+						<br>Hoechstaedtplatz 6, 1200 Wien, AUSTRIA
+						<br><a class="signatureblocklink" href="https://www.technikum-wien.at">www.technikum-wien.at</a>
+					</p>
+				
+				</div>
+						
+
+			</div>
+	
+	</div>
+
 
 	</div>
 	`
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index ab6a76599..317291c56 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -26,7 +26,6 @@ export default {
 		messageLayout: String,
 		openMode: String
 	},
-	//TODO(Manu) endpoint macht Probleme
 	data(){
 		return {
 			tabulatorOptions: {
@@ -38,7 +37,7 @@ export default {
 						type: this.typeId
 					};
 				},
-				ajaxResponse: (url, params, response) => response.data,
+				ajaxResponse: (url, params, response) => this.buildTreemap(response.data),
 				columns: [
 					{title: "subject", field: "subject"},
 					{title: "body", field: "body", visible: false},
@@ -63,6 +62,7 @@ export default {
 					{title: "recipient", field: "recipient"},
 					{title: "senderId", field: "sender_id"},
 					{title: "recipientId", field: "recipient_id"},
+					{title: "relationmessage_id", field: "relationmessage_id"},
 					{
 						title: "status",
 						field: "status",
@@ -110,7 +110,7 @@ export default {
 							container.className = "d-flex gap-2";
 
 							let button = document.createElement('button');
-							if (this.personId != cell.getData().recipient_id)
+							if (this.personId != cell.getData().sender_id)
 								button.disabled = true;
 							button.className = 'btn btn-outline-secondary btn-action';
 							button.title = this.$p.t('global', 'reply');
@@ -136,29 +136,23 @@ export default {
 							return container;
 						},
 						frozen: true
-					}],
+					}
+					],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData:	false,
-			//	height:	'auto',
 				height: '400',
-				selectable:	true,
 				selectableRangeMode: 'click',
-				pagination: true,
-			//	paginationSize: 5,
-/*				layoutColumnsOnNewData: false,
-
-				selectableRangeMode: 'click',
-				selectable: true,
 				index: 'message_id',
-				persistenceID: 'core-message'*/
+				pagination: true,
+				dataTree: true,
+				headerSort: true,
+				dataTreeChildField: "children",
+				dataTreeCollapseElement:"<i class='fas fa-minus-square'></i>",
+				dataTreeChildIndent: 15,
+				dataTreeStartExpanded: false,
+				persistenceID: 'core-message'
 			},
 			tabulatorEvents: [
-				{
-					event: 'dataLoaded',
-					handler: data => this.tabulatorData = data.map(item => {
-						return item;
-					}),
-				},
 				{
 					event: 'tableBuilt',
 					handler: async() => {
@@ -213,7 +207,59 @@ export default {
 			tabulatorData: [],
 			previewBody: "",
 			open: false,
-			personId: null
+			personId: null,
+			//Testdata
+/*			messages: [
+				{
+					message_id: 7,
+					subject: "Antwort auf 4",
+					body: "Text 5",
+					insertamum: "2024-03-05",
+					relationmessage_id: 6,
+				},
+				{
+					message_id: 1,
+					subject: "Hauptnachricht",
+					body: "Text 1",
+					insertamum: "2024-03-05",
+					relationmessage_id: null,
+				},
+				{
+					message_id: 2,
+					subject: "Antwort auf 1",
+					body: "Text 2",
+					insertamum: "2024-03-05",
+					relationmessage_id: 1,
+				},
+				{
+					message_id: 3,
+					subject: "Antwort auf 2",
+					body: "Text 3",
+					insertamum: "2024-03-05",
+					relationmessage_id: 2,
+				},
+				{
+					message_id: 4,
+					subject: "Neue Nachricht",
+					body: "Text 4",
+					insertamum: "2024-03-05",
+					relationmessage_id: null,
+				},
+				{
+					message_id: 5,
+					subject: "Antwort auf 4",
+					body: "Text 5",
+					insertamum: "2024-03-05",
+					relationmessage_id: 4,
+				},
+				{
+					message_id: 6,
+					subject: "Antwort auf 4",
+					body: "Text 5",
+					insertamum: "2024-03-05",
+					relationmessage_id: 5,
+				},
+			],*/
 		}
 	},
 	methods: {
@@ -237,7 +283,11 @@ export default {
 				});
 		},
 		actionNewMessage(){
+		//	this.$emit('newMessage', this.id, this.typeId);
+
+			//here already use person_id??
 			this.$emit('newMessage', this.id, this.typeId);
+
 			//console.log("action new message");
 
 		},
@@ -247,6 +297,47 @@ export default {
 		reload() {
 			this.$refs.table.reloadTable();
 		},
+		buildTreemap(messages) {
+			const messageMap = new Map();
+			const messageNested = [];
+			const remainingMessages = new Set(messages);
+
+			//save all Data in Map
+			messages.forEach(msg => messageMap.set(msg.message_id, msg));
+
+			let iteration = 0;
+			let changes = true;
+
+			// do until each relationmessage_id finds message_id (not sensitive to order)
+			while (changes) {
+				changes = false;
+				iteration++;
+
+				remainingMessages.forEach(msg => {
+					if (msg.relationmessage_id === null) {
+						messageNested.push(messageMap.get(msg.message_id));
+						remainingMessages.delete(msg);
+						changes = true;
+					} else if (messageMap.has(msg.relationmessage_id)) {
+
+						const parent = messageMap.get(msg.relationmessage_id);
+
+						if (!parent.children) {
+							parent.children = [];
+						}
+						parent.children.push(messageMap.get(msg.message_id));
+						remainingMessages.delete(msg);
+						changes = true;
+					}
+				});
+
+		// to avoid endless loop
+		if (iteration > messages.length) break;
+	}
+	return messageNested;
+}
+
+
 	},
 	computed: {
 		statusText(){
@@ -256,7 +347,7 @@ export default {
 				2: this.$p.t('messsages', 'archived'),
 				3: this.$p.t('messsages', 'deleted')
 			}
-		}
+		},
 	},
 	mounted() {
 		// change to target="_blank"
@@ -269,8 +360,12 @@ export default {
 		});*/
 	},
 	created(){
-		if(this.typeId == 'uid') {
-		this.$fhcApi.factory.messages.person.getPersonIdFromUid(this.id)
+		if(this.typeId == 'uid' || this.typeId == 'prestudent_id') {
+			const params = {
+				id: this.id,
+				type_id: this.typeId
+			};
+		this.$fhcApi.factory.messages.person.getPersonId(params)
 			.then(result => {
 				this.personId = result.data;
 			})
@@ -279,7 +374,7 @@ export default {
 	},
 	template: `
 	<div class="messages-detail-table">
-
+	
 		<!--View Studierendenverwaltung-->
 		<div v-if="messageLayout=='twoColumnsTableLeft'">
 
@@ -313,6 +408,7 @@ export default {
 		</div>
 
 		<!--View Infocenter-->
+		<!--TODO(Manu) update-->
 		<div v-if="messageLayout=='listTableTop'">
 
 				<!--table-->
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index e6947a72a..fc73768f1 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -58,6 +58,7 @@ export default {
 	},
 	methods: {
 		reloadTable(){
+			console.log("in parent reload");
 			this.$refs.templateTableMessage.reload();
 		},
 		newMessage(id, typeId){
@@ -121,7 +122,6 @@ export default {
 				path += "/NeueNachricht/" + id + "/" + typeId;
 			}
 
-
 			const newTab = window.open(path, "_blank");
 		},
 		openInNewWindow(id, typeId){
@@ -160,6 +160,7 @@ export default {
 			<button class="btn btn-secondary" @click="openInNewWindow(id,typeId)">Open in Page</button>
 		</div>-->
 <!--	<p>endpoint Messages.js: {{endpoint}}</p>-->
+
 		<div v-if="showNew">
 			<new-message
 				ref="templateNewMessage"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index 44f1a6aa2..f73ad161b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -1,6 +1,8 @@
 import CoreMessages from "../../../Messages/Messages.js";
 //import CoreMessages from "@/Messages/Messages.js";
 
+//TODO(Manu) refactor props
+
 export default {
 	components: {
 		CoreMessages
@@ -10,17 +12,23 @@ export default {
 	},
 	template: `
 	<div class="stv-details-messages h-100 pb-3 overflow-hidden">
+	<template v-if="modelValue.prestudent_id">
 		<core-messages
 			ref="formc"
 			endpoint="$fhcApi.factory.messages.person"
-			type-id="uid"
-			:id="modelValue.uid"
+			type-id="prestudent_id"
+			:id="modelValue.prestudent_id"
 			messageLayout="twoColumnsTableLeft"
 			show-table
-			show-new
 			open-mode="newTab"
 			>
 		</core-messages>
+	</template>
+	<template v-else>
+		 <h3><strong>No valid prestudent_id!</strong></h3>
+		 <p>{{modelValue.anmerkungen}}</p>
+	</template>
+	
 
 	</div>
 	`

From f8eb265eb0914d39d9655148385c0b9b9c95db74 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Mon, 10 Mar 2025 22:35:14 +0100
Subject: [PATCH 066/572] Studentenverwaltung Archiv: non-signable documents
 can be archived, set correct default Vorlage (Zeugnis)

---
 public/js/api/stv/archiv.js                   |  6 +++
 .../Stv/Studentenverwaltung/Details/Archiv.js | 52 ++++++++++---------
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/public/js/api/stv/archiv.js b/public/js/api/stv/archiv.js
index 76dbecec8..9b8bdf416 100644
--- a/public/js/api/stv/archiv.js
+++ b/public/js/api/stv/archiv.js
@@ -16,6 +16,12 @@ export default {
 		return this.$fhcApi.post('api/frontend/v1/stv/archiv/getArchivVorlagen');
 	},
 	archive(data) {
+		return this.$fhcApi.post(
+			'api/frontend/v1/documents/archive',
+			data
+		);
+	},
+	archiveSigned(data) {
 		return this.$fhcApi.post(
 			'api/frontend/v1/documents/archiveSigned',
 			data
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index 1856815a1..fd174e16f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -23,7 +23,7 @@ export default {
 	data() {
 		return {
 			loading: false,
-			vorlage_kurzbz: '',
+			selectedVorlage: {},
 			vorlagenArchiv: [],
 			vorlageXmlXslMappings: {
 				'zeugnis.rdf.php': [
@@ -190,32 +190,34 @@ export default {
 			this.$refs.table.tabulator.updateOrAddData(data);
 		},
 		actionArchive() {
-			console.log(this.modelValue);
 			let archiveDataArr = Array.isArray(this.modelValue) ? this.modelValue : [this.modelValue];
 
 			for (let archiveData of archiveDataArr)
 			{
 				this.loading = true;
-				this.$fhcApi
-					.factory.stv.archiv.archive({
-						xml: this.getXmlByXsl(this.vorlage_kurzbz),
-						xsl: this.vorlage_kurzbz,
-						ss: this.defaultSemester,
-						uid: archiveData.uid,
-						prestudent_id: archiveData.prestudent_id
-					})
-					.then(result => result.data)
-					.then(() => {
-						this.reload();
-						this.loading = false;
-					})
-					.then(() => this.$p.t('ui/gespeichert'))
-					.then(this.$fhcAlert.alertSuccess)
-					.catch(error => {
-						this.$fhcAlert.handleSystemError(error);
-						this.loading = false;
-					});
-				
+				let archiveFunction =
+					this.selectedVorlage.signierbar
+					? this.$fhcApi.factory.stv.archiv.archiveSigned
+					: this.$fhcApi.factory.stv.archiv.archive;
+
+				archiveFunction({
+					xml: this.getXmlByXsl(this.selectedVorlage.vorlage_kurzbz),
+					xsl: this.selectedVorlage.vorlage_kurzbz,
+					ss: this.defaultSemester,
+					uid: archiveData.uid,
+					prestudent_id: archiveData.prestudent_id
+				})
+				.then(result => result.data)
+				.then(() => {
+					this.reload();
+					this.loading = false;
+				})
+				.then(() => this.$p.t('ui/gespeichert'))
+				.then(this.$fhcAlert.alertSuccess)
+				.catch(error => {
+					this.$fhcAlert.handleSystemError(error);
+					this.loading = false;
+				});
 			}
 		},
 		actionDownload(akte_id) {
@@ -237,7 +239,7 @@ export default {
 	created() {
 		this.$fhcApi
 			.factory.stv.archiv.getArchivVorlagen()
-			.then(result => {this.vorlagenArchiv = result.data; this.vorlage_kurzbz = result.data.length > 0 ? result.data[0].vorlage_kurzbz : '';})
+			.then(result => {this.vorlagenArchiv = result.data; this.selectedVorlage = result.data.filter(o => o.vorlage_kurzbz == 'Zeugnis')[0];})
 			.catch(this.$fhcAlert.handleSystemError);
 
 	},
@@ -253,8 +255,8 @@ export default {
 			>
 			<template #actions>
 				<div class="input-group w-auto">
-					<select class="form-select" v-model="vorlage_kurzbz">
-						<option v-for="vorlage in vorlagenArchiv" :key="vorlage.vorlage_kurzbz" :value="vorlage.vorlage_kurzbz">
+					<select class="form-select" v-model="selectedVorlage">
+						<option v-for="vorlage in vorlagenArchiv" :key="vorlage.vorlage_kurzbz" :value="vorlage">
 							{{ vorlage.bezeichnung }}
 						</option>
 					</select>

From 639c7d7e41c387a9d0a421c07dd85aa85db5c909 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Mon, 10 Mar 2025 22:50:04 +0100
Subject: [PATCH 067/572] Studentenverwaltung Archiv: added phrases for table
 headings

---
 system/phrasesupdate.php | 222 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 221 insertions(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 846b07f10..1b0fe6100 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -38221,7 +38221,227 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_title',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Titel',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Title',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_description',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bezeichnung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Description',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_creation_date',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Erstelldatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Creation date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_accepted_on_at',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'AkzeptiertAmUm',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'AcceptionOnAt',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_gedruckt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gedruckt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Printed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_signiert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Signiert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Signed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_title_edit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akte aktualisieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit document',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_akte',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akte',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Document',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_new_file',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neue Datei',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'New file',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_akte_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akte ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Document ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'archiv_signed',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Signiert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Signed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 669752dd907028ba2bea921545fff60196a531bd Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 12 Mar 2025 13:41:01 +0100
Subject: [PATCH 068/572] WIP cis4 abgabetool student

---
 application/controllers/Cis/Abgabetool.php    |  35 ++
 .../controllers/api/frontend/v1/Lehre.php     |  35 +-
 application/models/education/Abgabe_model.php | 140 ++++++++
 public/css/Fhc.css                            |  17 +-
 public/js/api/lehre.js                        |  14 +
 public/js/apps/Dashboard/Fhc.js               |   9 +
 .../components/Cis/Abgabetool/AbgabeDetail.js | 197 ++++++++++
 .../components/Cis/Abgabetool/Abgabetool.js   | 205 +++++++++++
 .../js/components/Cis/Raumsuche/Raumsuche.js  |   6 +-
 public/js/components/Dashboard/Dashboard.js   |   1 +
 system/phrasesupdate.php                      | 340 ++++++++++++++++++
 11 files changed, 991 insertions(+), 8 deletions(-)
 create mode 100644 application/controllers/Cis/Abgabetool.php
 create mode 100644 public/js/components/Cis/Abgabetool/AbgabeDetail.js
 create mode 100644 public/js/components/Cis/Abgabetool/Abgabetool.js

diff --git a/application/controllers/Cis/Abgabetool.php b/application/controllers/Cis/Abgabetool.php
new file mode 100644
index 000000000..6c4770421
--- /dev/null
+++ b/application/controllers/Cis/Abgabetool.php
@@ -0,0 +1,35 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class Abgabetool extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => ['basis/cis:r']
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
+	}
+}
diff --git a/application/controllers/api/frontend/v1/Lehre.php b/application/controllers/api/frontend/v1/Lehre.php
index f079a5b37..e41881df2 100644
--- a/application/controllers/api/frontend/v1/Lehre.php
+++ b/application/controllers/api/frontend/v1/Lehre.php
@@ -31,10 +31,9 @@ class Lehre extends FHCAPI_Controller
 			'lvStudentenMail' => self::PERM_LOGGED,
 			'LV' => self::PERM_LOGGED,
 			'Pruefungen' => self::PERM_LOGGED,
+			'getStudentProjektarbeiten' => self::PERM_LOGGED, // TODO: abgabetool berechtigung?
+			'getStudentProjektabgaben' => self::PERM_LOGGED
 		]);
-
-		
-
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -94,10 +93,36 @@ class Lehre extends FHCAPI_Controller
 
 		$this->terminateWithSuccess($result);
 	}
-	
 
-	
+	public function getStudentProjektabgaben() {
+		$projektarbeit_id = $this->input->get("projektarbeit_id",TRUE);
 
+		$this->load->model('education/Abgabe_model', 'AbgabeModel');
+		$ret = $this->AbgabeModel->getProjektarbeitAbgabetermine($projektarbeit_id);
+
+		
+		$this->terminateWithSuccess($ret);
+	}
+	
+	public function getStudentProjektarbeiten($uid)
+	{
+		$this->load->model('education/Abgabe_model', 'AbgabeModel');
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		
+		$isZugeteilterBetreuer = count($this->AbgabeModel->checkZuordnung($uid, getAuthUID())->retval) > 0;
+		$ret = $this->AbgabeModel->getStudentProjektarbeitenLegacy($uid);
+		$this->addMeta('legacyQueryRetval', $ret);
+		$this->addMeta('isZugeteilterBetreuer', $isZugeteilterBetreuer);
+		
+		if ($this->MitarbeiterModel->isMitarbeiter(getAuthUID()) && ($isZugeteilterBetreuer)){
+			$projektarbeiten = $this->AbgabeModel->getStudentProjektarbeitenWithBetreuer($uid);
+		} else {
+			$projektarbeiten = $this->AbgabeModel->getStudentProjektarbeitenWithBetreuer(getAuthUID());
+		}
+		
+
+		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));	
+	}
 	
 }
 
diff --git a/application/models/education/Abgabe_model.php b/application/models/education/Abgabe_model.php
index c68bc55f4..0240beeb3 100644
--- a/application/models/education/Abgabe_model.php
+++ b/application/models/education/Abgabe_model.php
@@ -11,4 +11,144 @@ class Abgabe_model extends DB_Model
 		$this->dbTable = 'campus.tbl_abgabe';
 		$this->pk = 'abgabe_id';
 	}
+	
+	public function checkZuordnung($studentUID, $maUID) {
+		//oder Lektor mit Betreuung dieses Studenten
+		$qry = "
+			SELECT 1
+			FROM
+				lehre.tbl_projektarbeit
+				JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
+				JOIN campus.vw_benutzer on(vw_benutzer.person_id=tbl_projektbetreuer.person_id)
+			WHERE
+				tbl_projektarbeit.student_uid = ? AND
+				vw_benutzer.uid = ?";
+		
+		return $this->execReadOnlyQuery($qry, array($studentUID, $maUID));
+	}
+	
+	public function getProjektarbeitAbgabetermine($projektarbeit_id) {
+		$qry ="SELECT campus.tbl_paabgabe.paabgabe_id, 
+					   campus.tbl_paabgabe.projektarbeit_id,
+					   campus.tbl_paabgabe.fixtermin,
+					   campus.tbl_paabgabe.kurzbz,
+					   campus.tbl_paabgabe.datum,
+					   campus.tbl_paabgabetyp.bezeichnung, 
+					   campus.tbl_paabgabe.abgabedatum
+				FROM campus.tbl_paabgabe JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
+				WHERE campus.tbl_paabgabe.projektarbeit_id = ?
+				ORDER BY campus.tbl_paabgabe.datum";
+		
+		return $this->execReadOnlyQuery($qry, array($projektarbeit_id));
+	}
+	
+	public function getStudentProjektarbeitenWithBetreuer($studentUID) {
+		$betreuerQuery = "
+		SELECT 
+			vorname as bvorname,
+			nachname as bnachname,
+			titelpre as btitelpre,
+			titelpost AS btitelpost,
+			titelpost AS btitelpost,
+			tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
+		
+			(SELECT person_id 
+			 FROM lehre.tbl_projektbetreuer 
+			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
+			 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_person_id,
+			(SELECT betreuerart_kurzbz 
+			 FROM lehre.tbl_projektbetreuer 
+			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
+			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_betreuerart_kurzbz,
+			(SELECT tbl_betreuerart.beschreibung 
+			 FROM lehre.tbl_projektbetreuer JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz) 
+			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
+			 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied') LIMIT 1) AS zweitbetreuer_betreuerart_beschreibung,
+			
+			tbl_betreuerart.betreuerart_kurzbz,
+			person_id as bperson_id,
+			projektarbeit_id,
+			lehre.tbl_projekttyp.bezeichnung as projekttypbezeichnung,
+			lehre.tbl_lehreinheit.studiensemester_kurzbz,
+			lehre.tbl_lehrveranstaltung.studiengang_kz,
+			public.tbl_studiengang.kurzbzlang,
+			lehre.tbl_projektbetreuer.note as note,
+			public.tbl_mitarbeiter.mitarbeiter_uid,
+			lehre.tbl_projektarbeit.titel as titel,
+			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuer_person_id = tbl_projektbetreuer.person_id) AS babgeschickt,
+			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_abgeschickt,
+			(SELECT datum FROM campus.tbl_paabgabe WHERE paabgabetyp_kurzbz = 'end' AND abgabedatum IS NOT NULL AND projektarbeit_id = tbl_projektarbeit.projektarbeit_id LIMIT 1) AS abgegeben
+		
+		FROM lehre.tbl_projektarbeit
+				 LEFT JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
+				 LEFT JOIN public.tbl_person USING(person_id)
+				 LEFT JOIN public.tbl_benutzer USING(person_id)
+				 LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
+				 LEFT JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz)
+				LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+				LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+		LEFT JOIN public.tbl_mitarbeiter ON(public.tbl_mitarbeiter.mitarbeiter_uid = public.tbl_benutzer.uid)
+		LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
+		WHERE 
+			tbl_projektarbeit.student_uid = ? AND
+			(projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
+  		AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Senatsvorsitz')";
+		
+		// TODO: fetch senatsmitglieder
+		return $this->execReadOnlyQuery($betreuerQuery, array($studentUID));
+	}
+
+	public function getStudentProjektarbeitenLegacy($studentUID)
+	{
+		$qry = "SELECT (SELECT nachname FROM public.tbl_person  WHERE person_id=tbl_projektbetreuer.person_id) AS bnachname,
+	   (SELECT vorname FROM public.tbl_person WHERE person_id=tbl_projektbetreuer.person_id) AS bvorname,
+	   (SELECT titelpre FROM public.tbl_person WHERE person_id=tbl_projektbetreuer.person_id) AS btitelpre,
+	   (SELECT titelpost FROM public.tbl_person WHERE person_id=tbl_projektbetreuer.person_id) AS btitelpost,
+	   tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
+	   (SELECT person_id 
+			FROM lehre.tbl_projektbetreuer 
+			WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
+			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_person_id,
+	   (SELECT betreuerart_kurzbz 
+			FROM lehre.tbl_projektbetreuer 
+			WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
+			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_betreuerart_kurzbz,
+	   (SELECT tbl_betreuerart.beschreibung 
+			FROM lehre.tbl_projektbetreuer JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz) 
+			WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
+			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied') LIMIT 1) AS zweitbetreuer_betreuerart_beschreibung,
+	   tbl_projektbetreuer.person_id AS betreuer_person_id,
+	   tbl_projekttyp.bezeichnung AS prjbez,
+	   lehre.tbl_projektbetreuer.note as note,
+	   public.tbl_benutzer.aktiv as aktiv,
+	   (SELECT abgeschicktvon 
+			FROM extension.tbl_projektarbeitsbeurteilung 
+			WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id 
+			AND betreuer_person_id = tbl_projektbetreuer.person_id) AS babgeschickt,
+	   (SELECT abgeschicktvon 
+			FROM extension.tbl_projektarbeitsbeurteilung 
+			WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id 
+			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_abgeschickt,
+	   (SELECT datum FROM campus.tbl_paabgabe 
+	                 WHERE paabgabetyp_kurzbz = 'end' 
+	                 	AND abgabedatum IS NOT NULL 
+	                    AND projektarbeit_id = tbl_projektarbeit.projektarbeit_id LIMIT 1) AS abgegeben,
+	*
+FROM lehre.tbl_projektarbeit
+		 LEFT JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
+		 LEFT JOIN public.tbl_benutzer ON(uid=student_uid)
+		 LEFT JOIN public.tbl_person ON(tbl_benutzer.person_id=tbl_person.person_id)
+		 LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+		 LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+		 LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
+		 LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
+		 LEFT JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz)
+WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
+  AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Senatsvorsitz')
+  AND tbl_projektarbeit.student_uid= ?
+ORDER BY studiensemester_kurzbz desc, tbl_lehrveranstaltung.kurzbz";
+		
+		return $this->execQuery($qry, array($studentUID));
+	}
+	
 }
diff --git a/public/css/Fhc.css b/public/css/Fhc.css
index 6e6a25200..b7110943d 100644
--- a/public/css/Fhc.css
+++ b/public/css/Fhc.css
@@ -131,8 +131,23 @@
   transition: all 0.2s ease-in-out;
 }
 
-fhcSkipLink:hover {
+.fhcSkipLink:hover {
   background-color: #ffcc00;
   color: #002b80;
   transform: scale(1.05);
 }
+
+.fhc-bullet::before {
+  content: "• ";
+  font-weight: bold;
+  display: inline-block;
+  transform: scale(2);
+}
+
+.fhc-bullet-red::before {
+  color: #ff001e;
+}
+
+.fhc-bullet-green::before {
+  color: #00ff26;
+}
\ No newline at end of file
diff --git a/public/js/api/lehre.js b/public/js/api/lehre.js
index cd7129d61..0020d3490 100644
--- a/public/js/api/lehre.js
+++ b/public/js/api/lehre.js
@@ -18,5 +18,19 @@ export default {
 			`/api/frontend/v1/Lehre/Pruefungen/${lehrveranstaltung_id}`
 			, {}
 		);
+	},
+	getStudentProjektarbeiten(uid) {
+		return this.$fhcApi.get(
+			`/api/frontend/v1/Lehre/getStudentProjektarbeiten/${uid}`
+			, {}
+		);
+	},
+	getStudentProjektabgaben(detail) {
+		return this.$fhcApi.get(
+			`/api/frontend/v1/Lehre/getStudentProjektabgaben`
+			, {
+				projektarbeit_id: detail.projektarbeit_id
+			}
+		);
 	}
   }
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 137d1d008..34494e324 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -11,6 +11,7 @@ import CmsNews from "../../components/Cis/Cms/News.js";
 import CmsContent from "../../components/Cis/Cms/Content.js";
 import Info from "../../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
 import RoomInformation, { DEFAULT_MODE_RAUMINFO } from "../../components/Cis/Mylv/RoomInformation.js";
+import Abgabetool from "../../components/Cis/Abgabetool/Abgabetool";
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 
@@ -29,6 +30,12 @@ const router = VueRouter.createRouter({
 			component: Profil,
 			props: true
 		},
+		// {
+		// 	path: `/Cis/Abgabetool`,
+		// 	name: 'Abgabetool',
+		// 	component: Abgabetool,
+		// 	props: true
+		// },
 		{
 			path: `/Cis/Raumsuche`,
 			name: 'Raumsuche',
@@ -204,6 +211,8 @@ const router = VueRouter.createRouter({
 	]
 })
 
+
+
 const app = Vue.createApp({
 	name: 'FhcApp',
 	data: () => ({
diff --git a/public/js/components/Cis/Abgabetool/AbgabeDetail.js b/public/js/components/Cis/Abgabetool/AbgabeDetail.js
new file mode 100644
index 000000000..a1c3de8ae
--- /dev/null
+++ b/public/js/components/Cis/Abgabetool/AbgabeDetail.js
@@ -0,0 +1,197 @@
+import Upload from '../../../components/Form/Upload/Dms.js';
+import BsModal from '../../Bootstrap/Modal.js';
+
+const today = new Date()
+export const AbgabeDetail = {
+	name: "AbgabeDetail",
+	components: {
+		Upload,
+		BsModal
+	},
+	props: {
+		projektarbeit: {
+			type: Object,
+			default: null
+		}
+	},
+	data() {
+		return {
+			file: []
+		}
+	},
+	methods: {
+		triggerUpload() {
+			// todo: trigger the loadup
+
+			this.$refs.modalContainerEnduploadZusatzdaten.hide()
+		},
+		upload(termin) {
+			console.log(termin)
+			// TODO load it up
+			
+			if(termin.bezeichnung === 'Endupload') {
+				// open endupload form modal and await that it will be sent & checked
+
+				this.$refs.modalContainerEnduploadZusatzdaten.show()
+			}
+		},
+		dateDiffInDays(datum, today){
+			const oneDayMs = 1000 * 60 * 60 * 24
+			return Math.round((new Date(datum) - new Date(today)) / oneDayMs)
+		},
+		getDateStyle(termin) {
+			const datum = new Date(termin.datum)
+			const abgabedatum = new Date(termin.abgabedatum)
+			
+			// https://wiki.fhcomplete.info/doku.php?id=cis:abgabetool_fuer_studierende
+			let color = 'white'
+			let fontColor = 'black'
+			if (termin.abgabedatum === null) {
+				if(datum < today) {
+					color = 'red'
+					fontColor = 'white'
+				} else if (datum > today && this.dateDiffInDays(datum, today) <= 12) {
+					color = 'yellow'
+				}
+			} else if(abgabedatum > datum) {
+				color = 'pink' // aka "hellrot"
+				fontColor = 'white'
+			} else {
+				color = 'green'
+			}
+			
+			return 'font-color: ' + fontColor + '; background-color: ' + color
+		}
+	},
+	watch: {
+		'file'(newVal) {
+			if(newVal == [] || newVal === null || newVal === undefined) return
+
+			// check filetype on input change
+			const file = newVal[0]
+			if(!file) return
+
+			if(file.type && file.type.includes('pdf')) {
+				// all fine
+			} else {
+				// clear and alert for filetypes
+				this.$fhcAlert.alertInfo(this.$p.t('abgabetool/c4allowedFileTypes'))
+				this.entschuldigung.files = []
+			}
+
+		}
+	},
+	computed: {
+
+	},
+	created() {
+
+	},
+	mounted() {
+
+	},
+	template: `
+		<div v-if="projektarbeit">
+		
+			<h5>{{$p.t('abgabetool/c4abgabeStudentenbereich')}}</h5>
+			<div class="row">
+				<p> {{projektarbeit?.betreuer}}</p>
+				<p> {{projektarbeit?.titel}}</p>
+			</div>
+			<div id="uploadWrapper">
+				<div class="row" style="margin-bottom: 12px;">
+					<div class="col">{{$p.t('abgabetool/c4fixtermin')}}</div>
+					<div class="col">{{$p.t('abgabetool/c4zieldatum')}}</div>
+					<div class="col">{{$p.t('abgabetool/c4abgabetyp')}}</div>
+					<div class="col">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
+					<div class="col">{{$p.t('abgabetool/c4abgabedatum')}}</div>
+					<div class="col">
+						{{$p.t('abgabetool/c4fileupload')}}
+					</div>
+					<div class="col">
+					</div>
+				</div>
+				<div class="row" v-for="termin in projektarbeit.abgabetermine">
+					<div class="col d-flex justify-content-center align-items-center">
+						<p class="fhc-bullet" :class="{ 'fhc-bullet-red': termin.fixtermin, 'fhc-bullet-green': !termin.fixtermin }"></p>
+					</div>
+					<div class="col" :style="getDateStyle(termin)">{{ termin.datum?.split("-").reverse().join(".") }}</div>
+					<div class="col">{{ termin.bezeichnung }}</div>
+					<div class="col">{{ termin.kurzbz }}</div>
+					<div class="col">{{ termin.abgabedatum?.split("-").reverse().join(".") }}</div>
+					<div class="col">
+<!--						<Upload accept=".pdf" v-model="file"></Upload>-->
+					</div>
+					<div class="col">
+						<button class="btn btn-primary border-0" @click="upload(termin)">
+							Upload
+							<i style="margin-left: 8px" class="fa-solid fa-upload"></i>
+						</button>
+					</div>
+				</div>
+			</div>
+		 </div>
+	 	
+	 	<bs-modal ref="modalContainerEnduploadZusatzdaten" class="bootstrap-prompt" dialogClass="modal-lg">
+			<template v-slot:title>
+				<div>
+					{{$p.t('abgabetool/c4enduploadZusatzdaten')}}
+					
+				</div>
+				<div class="row mb-3 align-items-center">
+					
+					student uid
+				
+				</div>
+				<div class="row mb-3 align-items-center">
+					
+					{{ projektarbeit?.titel }}
+				
+				</div>
+			</template>
+			<template v-slot:default>
+				<div class="row mb-3 align-items-center">
+					
+					Sprache der Arbeit
+				
+				</div>
+				<div class="row mb-3 align-items-center">
+					
+					Kontrollierte Schlagwörter
+				
+				</div>
+				<div class="row mb-3 align-items-center">
+					
+					Dt. Schlagwörter
+				
+				</div>
+				<div class="row mb-3 align-items-center">
+					
+					Engl. Schlagwörter
+				
+				</div>
+				<div class="row mb-3 align-items-center">
+					
+					Abstract max 5k characters
+				
+				</div>
+				<div class="row mb-3 align-items-center">
+					
+					Abstract eng max 5k chars
+				
+				</div>
+				<div class="row mb-3 align-items-center">
+					
+					Seitenanzahl
+				
+				</div>
+			</template>
+			<template v-slot:footer>
+				<button class="btn btn-primary" @click="triggerUpload">{{$p.t('ui/hochladen')}}</button>
+			</template>
+		</bs-modal>
+	 	
+    `,
+};
+
+export default AbgabeDetail;
diff --git a/public/js/components/Cis/Abgabetool/Abgabetool.js b/public/js/components/Cis/Abgabetool/Abgabetool.js
new file mode 100644
index 000000000..b1ab65181
--- /dev/null
+++ b/public/js/components/Cis/Abgabetool/Abgabetool.js
@@ -0,0 +1,205 @@
+import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
+import AbgabeDetail from "./AbgabeDetail";
+
+export const Abgabetool = {
+	name: "Abgabetool",
+	components: {
+		VueDatePicker,
+		CoreFilterCmpt,
+		AbgabeDetail
+	},
+	props: {
+		viewData: {
+			type: Object,
+			required: true,
+			default: () => ({name: '', uid: ''}),
+			validator(value) {
+				return value && value.name && value.uid
+			}
+		}
+	},
+	data() {
+		return {
+			domain: '',
+			detail: null,
+			selectedProjektarbeit: null,
+			tableBuiltResolve: null,
+			tableBuiltPromise: null,
+			abgabeTableOptions: {
+				height: 200, // TODO: determine smallest necessary height
+				index: 'projektarbeit_id',
+				layout: 'fitColumns',
+				placeholder: this.$p.t('global/noDataAvailable'),
+				columns: [
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4details')), formatter: this.detailFormatter, field: 'details', widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4sem')), field: 'sem', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4kontakt')), field: 'mail', formatter: this.mailFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4betreuer')), field: 'betreuer', formatter: this.centeredTextFormatter,widthGrow: 2},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4projekttyp')), field: 'typ', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4titel')), field: 'titel', formatter: this.centeredTextFormatter, widthGrow: 8}
+				],
+				persistence: false,
+			},
+			abgabeTableEventHandlers: [{
+				event: "tableBuilt",
+				handler: async () => {
+					this.tableBuiltResolve()
+				}
+			},
+			{
+				event: "cellClick",
+				handler: async (e, cell) => {
+
+					if(cell.getColumn().getField() === "details") {
+						const val = cell.getValue()
+						if(val.mode === 'detailTermine') {
+							this.setDetailComponent(cell.getValue())
+						} else if (val.mode === 'beurteilungDownload') {
+							//demo.dev.technikum-wien.at/cis/private/lehre/projektbeurteilungDocumentExport.php?betreuerart_kurzbz=Begutachter&projektarbeit_id=39239&person_id=22117
+							const pdfExportLink = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/pdfExport.php?xml=projektarbeitsbeurteilung.xml.php&xsl=Projektbeurteilung&betreuerart_kurzbz='+val.betreuerart_kurzbz+'&projektarbeit_id='+val.projektarbeit_id+'&person_id=' + val.betreuer_person_id
+							const pdfExportLink2 = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/lehre/projektbeurteilungDocumentExport.php?betreuerart_kurzbz='+val.betreuerart_kurzbz+'&projektarbeit_id='+val.projektarbeit_id+'&person_id=' + val.betreuer_person_id
+							window.open(pdfExportLink, '_blank')
+						}
+
+					}
+					console.log(cell.getData())
+					e.stopPropagation()
+
+				}
+			}
+			]};
+	},
+	methods: {
+		setDetailComponent(details){
+			this.loadAbgaben(details).then((res)=> {
+				console.log(res)
+				const pa = this.data[0]?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
+				pa.abgabetermine = res.data.retval
+				pa.betreuer = this.buildBetreuer(pa)
+				
+				this.selectedProjektarbeit = pa
+			})
+			
+		},
+		centeredTextFormatter(cell) {
+			const val = cell.getValue()
+
+			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				'<p style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+val+'</p></div>'
+		},
+		detailFormatter(cell) {
+			const val = cell.getValue()
+
+			if(val.mode === 'detailTermine') {
+				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+					'<a><i class="fa fa-folder-open" style="color:#00649C"></i></a></div>'
+			} else if (val.mode === 'beurteilungDownload') {
+				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+					'<a><i class="fa fa-file-pdf" style="color:#00649C"></i></a></div>'
+			}
+		},
+		mailFormatter(cell) {
+			const val = cell.getValue()
+				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+					'<a href='+val+'><i class="fa fa-envelope" style="color:#00649C"></i></a></div>'
+		},
+		tableResolve(resolve) {
+			this.tableBuiltResolve = resolve
+		},
+		buildMailToLink(abgabe) {
+			return 'mailto:' + abgabe.mitarbeiter_uid +'@'+ this.domain
+		},
+		buildBetreuer(abgabe) {
+			return abgabe.betreuerart_beschreibung + ': ' + (abgabe.btitelpre ? abgabe.btitelpre + ' ' : '') + abgabe.bvorname + ' ' + abgabe.bnachname + (abgabe.btitelpost ?? '')
+		},
+		setupData(data){
+			
+			this.data = data // TODO: better define what is needed from this for detail component
+			this.domain = data[1] // TODO do this in backend but this is a prototype anyway
+			const d = data[0]?.retval?.map(projekt => {
+				console.log('projekt', projekt)
+				let mode = 'detailTermine'
+				
+				if (projekt.babgeschickt || projekt.zweitbetreuer_abgeschickt) {
+					mode = 'beurteilungDownload' // build dl link for both betreuer documents
+				}
+				
+				return {
+					details: {
+						student_uid: this.viewData?.uid,
+						projektarbeit_id: projekt.projektarbeit_id,
+						betreuer_person_id: projekt.bperson_id,
+						betreuerart_kurzbz: projekt.betreuerart_kurzbz,
+						mode
+					},
+					sem: projekt.studiensemester_kurzbz,
+					stg: projekt.kurzbzlang,
+					mail: this.buildMailToLink(projekt),
+					betreuer: this.buildBetreuer(projekt),
+					typ: projekt.projekttypbezeichnung,
+					titel: projekt.titel
+				}
+			})
+
+			this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
+			this.$refs.abgabeTable.tabulator.setData(d);
+		},
+		loadProjektarbeiten() {
+			this.$fhcApi.factory.lehre.getStudentProjektarbeiten(this.viewData?.uid ?? null)
+				.then(res => {
+					if(res?.data) this.setupData(res.data)
+				})
+		},
+		loadAbgaben(details) {
+			return new Promise((resolve) => {
+				this.$fhcApi.factory.lehre.getStudentProjektabgaben(details)
+					.then(res => {
+						resolve(res)
+					})
+			})	
+		},
+		handleUuidDefined(uuid) {
+			this.tabulatorUuid = uuid
+		},
+		async setupMounted() {
+			this.tableBuiltPromise = new Promise(this.tableResolve)
+			await this.tableBuiltPromise
+			
+			this.loadProjektarbeiten()
+			
+		}
+	},
+	watch: {
+
+	},
+	computed: {
+
+	},
+	created() {
+
+	},
+	mounted() {
+		this.setupMounted()
+	},
+	template: `
+	<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
+	<hr>
+		
+     <core-filter-cmpt 
+		:title="''"  
+		ref="abgabeTable" 
+		:tabulator-options="abgabeTableOptions"  
+		:tabulator-events="abgabeTableEventHandlers"
+		tableOnly
+		:sideMenu="false"
+	 />
+	 
+	 <hr>
+	 <div v-show="selectedProjektarbeit"> 
+	 	<AbgabeDetail :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
+	 </div>
+    `,
+};
+
+export default Abgabetool;
diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index a86c3825b..119fc56be 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -1,7 +1,7 @@
 
 import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
 
-export default {
+export const Raumsuche =  {
 	name: "Raumsuche",
 	props: {
 		
@@ -34,7 +34,7 @@ export default {
 			}),
 			raumsucheTableOptions: {
 				height: Vue.ref(400),
-				index: 'prestudent_id',
+				index: 'ort_kurzbz',
 				layout: 'fitColumns',
 				placeholder: this.$p.t('global/noDataAvailable'),
 				columns: [
@@ -243,3 +243,5 @@ export default {
 	 />
     `,
 };
+
+export default Raumsuche;
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 74a65ecaa..a0d3ddcf3 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -3,6 +3,7 @@ import DashboardWidgetPicker from "./Widget/Picker.js";
 import ObjectUtils from "../../helpers/ObjectUtils.js";
 
 export default {
+	name: 'Dashboard',
 	components: {
 		DashboardSection,
 		DashboardWidgetPicker
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index bfae232f4..d1bddc46b 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37697,6 +37697,346 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'abgabetoolTitle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Bachelor-/Masterarbeiten",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Bachelor's/Master's theses",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4details',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Details",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "details",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4sem',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Semester",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "semester",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4stg',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Studiengang",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "degree program",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4kontakt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Kontakt",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "contact",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4betreuer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Betreuer",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Assessor",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4projekttyp',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Projekttyp",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "project type",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4titel',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Titel",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "title",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4abgabeStudentenbereich',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Dokumentabgabe - Studentenbereich",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "File submission - Student area",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4fixtermin',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Fixtermin",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Fixed submission deadline",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4zieldatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Zieldatum",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "target date",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4abgabetyp',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Abgabetyp",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Type of document submitted",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4abgabekurzbz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Kurzbeschreibung der Abgabe",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Short description of the submitted file",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4abgabedatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Abgabedatum",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "submission date",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4fileupload',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Fileupload PDF max. 30 MB",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Fileupload PDF max. 30 MB",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4allowedFileTypes',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Upload-File ist kein PDF!",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Upload-File is not a PDF!",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4enduploadZusatzdaten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Upload-File ist kein PDF!",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Upload-File is not a PDF!",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// ### STUDIENGANG_INFORMATIONEN PHRASEN START
 	array(
 		'app' => 'core',

From a0ce635c7eb60460cd8075c7f208d9f721979e3d Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 12 Mar 2025 15:04:37 +0100
Subject: [PATCH 069/572] Refactor and Cleanup

- adapt tabulator and queries for remote pagination
- use formatterParams for messageStati to enable phrase logic
- adapt logic for mitarbeiter_uid
- refactor logic to use new Page, new Tab and newDiv with one child component
- add phrases
---
 .../api/frontend/v1/messages/Messages.php     |  59 +++++--
 application/models/system/Message_model.php   |  62 ++++++--
 public/js/api/messages/person.js              |  14 +-
 .../{NewMessage.js => Depr_NewMessage.js}     |   0
 .../Messages/Details/NewMessage/Modal.js      | 148 +++++++++++++-----
 .../Messages/Details/NewMessage/NewDiv.js     | 116 +++++++-------
 .../Messages/Details/TableMessages.js         | 108 ++++---------
 public/js/components/Messages/Messages.js     | 140 +++++++----------
 .../Studentenverwaltung/Details/Messages.js   |  31 +++-
 system/phrasesupdate.php                      |  80 ++++++++++
 10 files changed, 459 insertions(+), 299 deletions(-)
 rename public/js/components/Messages/Details/{NewMessage.js => Depr_NewMessage.js} (100%)

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index 65c354c4f..7834ba5f7 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -41,17 +41,27 @@ class Messages extends FHCAPI_Controller
 		]);
 	}
 
-	public function getMessages($id, $type_id)
+	public function getMessages($id, $type_id, $size, $page)
 	{
 		if($type_id != 'person_id'){
 			$id = $this->_getPersonId($id, $type_id);
 		}
 
-		$result = $this->MessageModel->getMessagesForTable($id);
+		$offset = $size * ($page - 1);
+		$limit = $size;
+
+		$result = $this->MessageModel->getMessagesForTable($id, $offset, $limit);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess($data);
+		//return null if count == 0
+		if($data['count'] == 0){
+			$this->terminateWithSuccess([]);
+		}
+
+		$this->addMeta('count', $data['count']);
+
+		$this->terminateWithSuccess($data['data']);
 	}
 
 	public function getVorlagen()
@@ -107,9 +117,10 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($vorlage->text);
 	}
 
-	public function getMessageVarsPerson()
+	public function getMessageVarsPerson($id, $typeId)
 	{
-		$result = $this->MessageModel->getMessageVarsPerson();
+		$person_id = ($typeId == 'mitarbeiter_uid') ? $this->_getPersonId($id, $typeId) : $id;
+		$result = $this->MessageModel->getMessageVarsPerson($person_id);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -119,7 +130,7 @@ class Messages extends FHCAPI_Controller
 
 	public function getMsgVarsPrestudent($id, $typeId)
 	{
-		$prestudent_id = ($typeId == 'prestudent_id') ? $id : $this->_getPrestudentIdFromUid($id);
+		$prestudent_id = ($typeId == 'uid') ? $this->_getPrestudentIdFromUid($id) : $id;
 
 		$result = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
 
@@ -138,7 +149,7 @@ class Messages extends FHCAPI_Controller
 
 	public function getNameOfDefaultRecipient($id, $type_id)
 	{
-		$id = $type_id!='person_id)' ? $this->_getPersonId($id, $type_id) : $id;
+		$id = ($type_id != 'person_id') ? $this->_getPersonId($id, $type_id) : $id;
 
 		$this->load->model('person/Person_model', 'PersonModel');
 
@@ -151,8 +162,8 @@ class Messages extends FHCAPI_Controller
 
 	public function sendMessage($recipient_id)
 	{
-		//is always uid in FAS
-		//TODO(Manu) make dynamic for other ids
+		//has to be uid
+	//	$this->terminateWithError("uid", $recipient_id, self::ERROR_TYPE_GENERAL);
 
 		//default setting
 		$receiversPersonId = $this->_getPersonId($recipient_id, 'uid');
@@ -205,10 +216,17 @@ class Messages extends FHCAPI_Controller
 			$result = $this->MessagesModel->parseMessageTextPrestudent($prestudent_id, $body);
 			$bodyParsed = $this->getDataOrTerminateWithError($result);
 		}
+		if($typeId == 'mitarbeiter_uid')
+		{
+			$person_id = $this->_getPersonId($id, $typeId);
+
+			$result = $this->MessagesModel->parseMessageTextPerson($person_id, $body);
+			$bodyParsed = $this->getDataOrTerminateWithError($result);
+			$this->terminateWithError($bodyParsed, self::ERROR_TYPE_GENERAL);
+
+		}
 		elseif($typeId == 'person_id')
 		{
-			$this->terminateWithError("person_id ", self::ERROR_TYPE_GENERAL);
-
 			$result = $this->MessagesModel->parseMessageTextPerson($id, $body);
 			$bodyParsed = $this->getDataOrTerminateWithError($result);
 		}
@@ -235,7 +253,6 @@ class Messages extends FHCAPI_Controller
 		{
 			$data = json_decode($_POST['data']);
 			unset($_POST['data']);
-
 		}
 		else
 			$this->terminateWithError("Textbody missing ", self::ERROR_TYPE_GENERAL);
@@ -249,6 +266,15 @@ class Messages extends FHCAPI_Controller
 			case 'prestudent_id':
 				$result = $this->MessagesModel->parseMessageTextPrestudent($id, $data);
 				break;
+			case 'person_id':
+				$result = $this->MessagesModel->parseMessageTextPerson($id, $data);
+				break;
+			case 'mitarbeiter_uid':
+				{
+					$person_id = $this->_getPersonId($id, $type_id);
+					$result = $this->MessagesModel->parseMessageTextPerson($person_id, $data);
+				}
+				break;
 			default:
 				$this->terminateWithError("MESSAGES::getPreviewText logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
 				break;
@@ -318,7 +344,7 @@ class Messages extends FHCAPI_Controller
 
 	public function getPersonId($id, $typeId)
 	{
-		if ($typeId == 'uid')
+		if ($typeId == 'uid' || $typeId == 'mitarbeiter_uid')
 		{
 			$this->load->model('person/Benutzer_model', 'BenutzerModel');
 			$result = $this->BenutzerModel->loadWhere(
@@ -368,7 +394,7 @@ class Messages extends FHCAPI_Controller
 				['person_id' => $person_id]
 			);
 		}
-		elseif($typeId == 'uid')
+		elseif($typeId == 'uid' || $typeId == 'mitarbeiter_uid')
 		{
 			$this->terminateWithSuccess($id);
 		}
@@ -385,7 +411,7 @@ class Messages extends FHCAPI_Controller
 
 	private function _getPersonId($id, $typeId)
 	{
-		if ($typeId == 'uid')
+		if ($typeId == 'uid' || $typeId == 'mitarbeiter_uid')
 		{
 			$this->load->model('person/Benutzer_model', 'BenutzerModel');
 			$result = $this->BenutzerModel->loadWhere(
@@ -408,6 +434,7 @@ class Messages extends FHCAPI_Controller
 
 	private function _getPrestudentIdFromUid($uid)
 	{
+	//	$this->terminateWithError($uid, self::ERROR_TYPE_GENERAL);
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$result = $this->StudentModel->loadWhere(
 			['student_uid' => $uid]
@@ -415,7 +442,7 @@ class Messages extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 		$student = current($data);
-
+	//	$this->terminateWithError($student->prestudent_id, self::ERROR_TYPE_GENERAL);
 		return $student->prestudent_id;
 	}
 
diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index 38defa383..acbe3a44c 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -234,12 +234,15 @@ class Message_model extends DB_Model
 	/**
 	 * Gets messages for a person for tableMessages.
 	 * @param $person_id
-	 * @param null $status message status. by default, latest status is returned
+	 * paginationInitialPage: 1,
+	 * @param $offset number to skip, calculated by tabulatorParam paginationInitialPage and 	paginationSize, refers to specified numer of skipped items
+	 * and page
+	 * @param $limit refers to tabulatorParam paginationSize
 	 * @return array|null
 	 */
-	public function getMessagesForTable($person_id, $status = null)
+	public function getMessagesForTable($person_id, $offset, $limit)
 	{
-		$sql = "
+		$sql_base = "
 			SELECT
 				m.message_id AS message_id,
 				m.subject AS subject,
@@ -275,20 +278,45 @@ class Message_model extends DB_Model
 				 JOIN public.tbl_msg_message m USING(message_id)
 			WHERE r.person_id = ?
 			GROUP BY m.message_id, m.subject, m.body, m.insertamum, m.relationmessage_id, sender, recipient, sender_id, recipient_id
-			ORDER BY insertamum DESC
+				 ";
+		$sql = "
+			SELECT COUNT(*) AS count FROM (
+				" . $sql_base . "
+			) a
 				 ";
 
 		$parametersArray = array($person_id, $person_id);
 
-		return $this->execQuery($sql, $parametersArray);
+		$count = $this->execQuery($sql, $parametersArray);
+
+		if (isError($count))
+			return $count;
+
+		$count = floor(current(getData($count))->count/$limit);
+		$sql = "
+			SELECT * FROM (
+				" . $sql_base . "
+			) a
+			ORDER BY insertamum DESC
+			LIMIT ?
+			OFFSET ?
+				 ";
+
+		$parametersArray = array($person_id, $person_id, $limit, $offset);
+
+		$data = $this->execQuery($sql, $parametersArray);
+
+		if (isError($data))
+			return $data;
+
+		$data = getData($data);
+
+		return success(['data' => $data, 'count' => $count]);
 	}
 
 	/**
-	 * Deletes a messages from tableMessages and tbl_msg_recipient
-	 * TODO(MANU) CHECK IF NECESSARY
-	 * dependency with other tables
-	 * in case of reply... more messages?? delete all dependent ones?
-	 * maybe anonimize it
+	 * Deletes entry in dependency table tbl_msg_recipient
+	 *
 	 * @param $message_id
 	 * @return boolean success
 	 */
@@ -302,7 +330,12 @@ class Message_model extends DB_Model
 		return $this->execQuery($sql, array($message_id));
 	}
 
-
+	/**
+	 * Deletes entry in dependency table tbl_msg_status
+	 *
+	 * @param $message_id
+	 * @return boolean success
+	 */
 	public function deleteMessageStatus($message_id)
 	{
 		$sql = "
@@ -312,7 +345,12 @@ class Message_model extends DB_Model
 
 		return $this->execQuery($sql, array($message_id));
 	}
-
+	/**
+	 * Deletes entry in dependency table tbl_msg_message
+	 *
+	 * @param $message_id
+	 * @return boolean success
+	 */
 	public function deleteMessage($message_id)
 	{
 		$sql = "
diff --git a/public/js/api/messages/person.js b/public/js/api/messages/person.js
index e53f23f6a..6fa39c6ba 100644
--- a/public/js/api/messages/person.js
+++ b/public/js/api/messages/person.js
@@ -1,6 +1,7 @@
 export default {
-	getMessages(url, config, params){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessages/' + params.id + '/' + params.type);
+	getMessages(url, config, params) {
+		console.log('page ' + params.page + ' size ' + params.size);
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessages/' + params.id + '/' + params.type + '/' + params.size + '/' + params.page);
 	},
 	getVorlagen(){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagen/');
@@ -8,8 +9,8 @@ export default {
 	getMsgVarsLoggedInUser(){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsLoggedInUser/');
 	},
-	getMessageVarsPerson(){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessageVarsPerson/');
+	getMessageVarsPerson(params){
+		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessageVarsPerson/' + params.id + '/' + params.type_id);
 	},
 	getMsgVarsPrestudent(params){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsPrestudent/' + params.id + '/' + params.type_id);
@@ -34,9 +35,14 @@ export default {
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getReplyData/' + messageId);
 	},
 	sendMessage(form, id, data) {
+		console.log("id" + id);
 		return this.$fhcApi.post(form,'api/frontend/v1/messages/messages/sendMessage/' + id,
 			data);
 	},
+/*	sendMessage(id, data) {
+		return this.$fhcApi.post('api/frontend/v1/messages/messages/sendMessage/' + id,
+			data);
+	},*/
 	deleteMessage(messageId){
 		return this.$fhcApi.post('api/frontend/v1/messages/messages/deleteMessage/' + messageId);
 	}
diff --git a/public/js/components/Messages/Details/NewMessage.js b/public/js/components/Messages/Details/Depr_NewMessage.js
similarity index 100%
rename from public/js/components/Messages/Details/NewMessage.js
rename to public/js/components/Messages/Details/Depr_NewMessage.js
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index 9bfe49929..c6d3e1210 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -22,19 +22,25 @@ export default {
 			type: [Number, String],
 			required: true
 		},
+		messageId: {
+			type: Number,
+			required: false,
+		},
 		openMode: String,
 	},
 	data(){
 		return {
 			formData: {
-				recipient: this.id,
+				recipient: null,
 				subject: null,
 				body: null,
 				vorlage_kurzbz: null,
 				selectedValue: '',
+				relationmessage_id: null
 			},
 			statusNew: true,
 			vorlagen: [],
+			recipientsArray: [],
 			defaultRecipient: null,
 			editor: null,
 			fieldsUser: [],
@@ -47,7 +53,9 @@ export default {
 			itemsPerson: [],
 			itemsUser: [],
 			previewText: null,
-			previewBody: ""
+			previewBody: "",
+			replyData: null,
+			uid: null,
 		}
 	},
 	methods: {
@@ -98,12 +106,14 @@ export default {
 
 			return this.$fhcApi.factory.messages.person.sendMessage(
 				this.$refs.formMessage,
-				this.id,
+				this.uid,
 				data)
+/*			return this.$fhcApi.factory.messages.person.sendMessage(
+				this.uid,
+				data)*/
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
-					//this.hideModal('messageModal');
-					this.hideTemplate();
+					this.hideModal('modalNewMessage');
 					this.resetForm();
 				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
@@ -119,7 +129,7 @@ export default {
 			return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz)
 				.then(response => {
 					//this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
-					//this.hideModal('messageModal');
+					//this.hideModal('modalNewMessage');
 					//this.resetForm();
 					//TODO(Manu) CHECK
 					this.formData.body = response.data;
@@ -165,20 +175,22 @@ export default {
 				console.error("Editor instance is not available.");
 			}
 		},
-		replyMessage(message_id){
-			console.log("auf message " + message_id + " antworten");
-		},
 		resetForm(){
 			this.formData = {
 				vorlage_kurzbz: null,
 				body: null,
 				subject: null,
 			};
+			this.$emit('resetMessageId');
+
 			if (this.editor) {
 				this.editor.setContent("");
 			}
+
 			this.$refs.dropdownComp.setValue(null);
 
+			this.previewBody = null;
+
 		},
 		handleSelectedVorlage(vorlage_kurzbz) {
 			if (typeof vorlage_kurzbz === "string") {
@@ -186,22 +198,28 @@ export default {
 				this.formData.subject = vorlage_kurzbz;
 			}
 		},
-		hideTemplate(){
-			if (this.openMode == "showDiv")
-				this.isVisible = false;
-		},
-		showTemplate(){
-			if (this.openMode == "showDiv")
-				this.isVisible = true;
-		},
 		showPreview(){
 			this.getPreviewText().then(() => {
 				this.previewBody = this.previewText;
 			});
 		},
+		getUid(id, typeId){
+			const params = {
+				id: id,
+				type_id: typeId
+			};
+			this.$fhcApi.factory.messages.person.getUid(params)
+				.then(result => {
+					this.uid = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
 		show(){
 			this.$refs.modalNewMessage.show();
-		}
+		},
+		hideModal(modalRef){
+			this.$refs[modalRef].hide();
+		},
 	},
 	watch: {
 		'formData.body': {
@@ -223,11 +241,37 @@ export default {
 					return this.getVorlagentext(newVal);
 				}
 			}
+		},
+		messageId: {
+			immediate: true,
+			handler: async function (newMessageId) {
+				if (!newMessageId) return;
+
+				try {
+					const result = await this.$fhcApi.factory.messages.person.getReplyData(newMessageId);
+					this.replyData = result.data;
+					console.log(this.replyData);
+
+					if (this.replyData.length > 0) {
+						this.formData.subject = this.replyData[0].replySubject;
+						this.formData.body = this.replyData[0].replyBody;
+						this.formData.relationmessage_id = newMessageId;
+					}
+				} catch (error) {
+					this.$fhcAlert.handleSystemError(error);
+				}
+			}
 		}
 	},
 	created(){
-		if(this.typeId == 'person_id'){
-			this.$fhcApi.factory.messages.person.getMessageVarsPerson()
+		this.getUid(this.id, this.typeId);
+
+		if(this.typeId == 'person_id' || this.typeId == 'mitarbeiter_uid'){
+			const params = {
+				id: this.id,
+				type_id: this.typeId
+			};
+			this.$fhcApi.factory.messages.person.getMessageVarsPerson(params)
 				.then(result => {
 					this.fieldsPerson = result.data;
 					this.itemsPerson = Object.entries(this.fieldsPerson).map(([key, value]) => ({
@@ -237,16 +281,16 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		}
-		if(this.typeId == 'uid') {
-			this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(this.id)
+
+		if(this.typeId == 'prestudent_id' || this.typeId == 'uid'){
+			const params = {
+				id: this.id,
+				type_id: this.typeId
+			};
+			this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(params)
 				.then(result => {
 					this.fieldsPrestudent = result.data;
 					const prestudent = this.fieldsPrestudent[0];
-					//Just for testing with inserting values
-					/*					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
-											label: key,
-											value: value
-										}));*/
 					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
 						label: key.toLowerCase(),
 						value: '{' + key.toLowerCase() + '}'
@@ -271,8 +315,25 @@ export default {
 			type_id: this.typeId})
 			.then(result => {
 				this.defaultRecipient = result.data;
+			//	console.log("check " + this.uid + "|" + this.defaultRecipient);
+				this.recipientsArray.push({
+					'uid': this.uid,
+					'details': this.defaultRecipient});
+			//	console.log(JSON.stringify(this.recipientsArray));
 			})
 			.catch(this.$fhcAlert.handleSystemError);
+
+		//case of reply
+		if(this.messageId) {
+			this.$fhcApi.factory.messages.person.getReplyData(this.messageId)
+				.then(result => {
+					this.replyData = result.data;
+					this.formData.subject = this.replyData[0].replySubject;
+					this.formData.body = this.replyData[0].replyBody;
+					this.formData.relationmessage_id = this.messageId;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
 	},
 	async mounted() {
 		this.initTinyMCE();
@@ -281,10 +342,15 @@ export default {
 		this.editor.destroy();
 	},
 	template: `
-		<bs-modal class="messages-detail-newmessage-modal" ref="modalNewMessage" dialog-class="modal-xl">
+		<bs-modal
+			class="messages-detail-newmessage-modal"
+			ref="modalNewMessage" 
+			dialog-class="modal-xl"
+			@hidden.bs.modal="resetForm"
+			>
 
 			<template #title>
-				New Message
+				{{ $p.t('messages', 'neueNachricht') }}
 			</template>
 
 			<form-form ref="formNewMassage">
@@ -296,7 +362,6 @@ export default {
 					<div class="col-sm-8">
 						<form-form class="row g-3 mt-2" ref="formMessage">
 
-						<!--TODO(Manu) ist eigentlich ein Array, hier werden alle Einträge angegeben als String-->
 							<div class="row mb-3">
 
 								<form-input
@@ -348,7 +413,7 @@ export default {
 
 					<div class="col-sm-4">
 						<div v-if="this.fieldsPrestudent.length > 0">
-							<strong>Felder Prestudent</strong>
+							<strong>{{$p.t('ui', 'felder')}} {{$p.t('lehre', 'prestudent')}}</strong>
 							<div class="border p-3 overflow-auto" style="height: 200px;">
 
 								<list-box
@@ -365,9 +430,6 @@ export default {
 
 							</div>
 
-							<button class="m-3" @click="insertVariablePrestudent">Insert Variable</button>
-							<p>{{selectedFieldPrestudent}}</p>
-
 						</div>
 
 						<div v-if="this.fieldsPerson.length > 0">
@@ -387,12 +449,10 @@ export default {
 								</list-box>
 
 							</div>
-							<button class="m-3" @click="insertVariablePerson">Insert Variable</button>
-							<p>{{selectedFieldPerson}}</p>
 						</div>
 
 						<div>
-							<strong>Meine Felder</strong>
+							<strong>{{$p.t('messages', 'meineFelder')}}</strong>
 							<div class="border p-3 overflow-auto" style="height: 200px;">
 
 								<list-box
@@ -408,7 +468,6 @@ export default {
 								</list-box>
 
 							</div>
-							<button class="m-3" @click="insertVariableUser">Insert Variable</button>
 						</div>
 
 					</div>
@@ -417,7 +476,7 @@ export default {
 
 				<div class="row mt-4">
 
-					<h4>Vorschau:</h4>
+					<h4>{{ $p.t('global', 'vorschau') }}:</h4>
 					<div>
 						<form-form class="row g-3 mt-2" ref="formPreview">
 
@@ -428,12 +487,19 @@ export default {
 									:label="$p.t('messages/recipient')"
 									v-model="defaultRecipient"
 								>
+									<option :value="null">{{ $p.t('messages', 'recipient') }}...</option>
+									<option
+										v-for="recipient in recipientsArray"
+										:key="recipient.uid"
+										:value="recipient.uid" 
+										>{{recipient.details}}
+									</option>
 								</form-input>
 							</div>
 
 							<div class="col-md-2 mt-4">
 								<br>
-								<button type="button" class="btn bt		n-secondary" @click="showPreview()">Aktualisieren</button>
+								<button type="button" class="btn btn-secondary" @click="showPreview()">{{ $p.t('ui', 'btnAktualisieren') }}</button>
 							</div>
 						</form-form>
 
@@ -454,7 +520,7 @@ export default {
 			<template #footer>
 				<div class="d-grid gap-2 d-md-flex justify-content-md-end">
 
-					<button class="btn btn-secondary" @click="resetForm">Reset All</button>
+					<button class="btn btn-secondary" @click="resetForm">{{$p.t('ui', 'reset')}}</button>
 
 					<button v-if="statusNew" type="button" class="btn btn-primary" @click="sendMessage()">{{$p.t('ui', 'nachrichtSenden')}}</button>
 					<button v-else type="button" class="btn btn-primary" @click="replyMessage(formData.message_id)">{{$p.t('global', 'reply')}}</button>
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index d8611d611..f1dc4c88a 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -15,30 +15,27 @@ export default {
 			type: String,
 			required: true
 		},
-		//for open in div and modal
-/*		typeId: String,
-		id: {
-			type: [Number, String],
-			required: true
-		},*/
 		openMode: String,
+		tempTypeId: String,
+		tempId: {
+			type: [Number, String],
+			required: false
+		},
+		tempMessageId: {
+			type: Number,
+			required: false,
+		}
 	},
 	computed: {
-		//params with routes for new tab and new window AND props
-/*		id(){
-			return this.$route.params.id || this.id;
-		},
-		typeId(){
-			return this.$route.params.typeId || this.typeId;
-		},*/
+		//params with routes for new tab and new window AND props for inSamePage
 		id(){
-			return this.$route.params.id || this.$props.id;
+			return this.$props.tempId || this.$route.params.id;
 		},
 		typeId(){
-			return this.$route.params.typeId || this.$props.id;
+			return this.$props.tempTypeId || this.$route.params.typeId;
 		},
 		messageId(){
-			return this.$route.params.messageId;
+			return this.$props.tempMessageId ||this.$route.params.messageId;
 		}
 	},
 	data(){
@@ -178,12 +175,15 @@ export default {
 		insertVariable(selectedItem){
 			if (this.editor) {
 				this.editor.insertContent(selectedItem.value + " ");
+			//	this.editor.insertContent(selectedItem.value + ". ");
 				//TODO(Manu) check: Laden von Variblen geht nicht wenn kein Zeichen danach kommt
 				// nicht mal mit Punkt adden gehts ohne eintrag nach vars
-				/*				this.editor.focus();
-								this.editor.setDirty(true);*/
+								//this.editor.focus();
+							//	this.editor.setDirty(true);
+
+				this.editor.setDirty(true);//seting dirty true if changes appear
+			//	console.log(tinyMCE.activeEditor.isDirty());//dirty output  = true
 
-				//this.editor.fire('change'); //forces
 
 				//this.editor.undoManager.add();
 
@@ -219,14 +219,12 @@ export default {
 			}
 		},
 		hideTemplate(){
-			if (this.openMode == "showDiv")
+			if (this.openMode == "inSamePage")
 				this.isVisible = false;
 		},
 		showTemplate(){
-			if (this.openMode == "showDiv")
+			if (this.openMode == "inSamePage")
 				this.isVisible = true;
-			//just for testing:
-			this.isVisible = true;
 		},
 		showPreview(id, typeId){
 			this.getPreviewText(id, typeId).then(() => {
@@ -267,23 +265,26 @@ export default {
 		},
 	},
 	created(){
-		if(this.typeId != 'uid')
-			this.getUid(this.id, this.typeId);
+		this.getUid(this.id, this.typeId);
 
-		if(this.typeId == 'person_id'){
-			this.$fhcApi.factory.messages.person.getMessageVarsPerson()
-				.then(result => {
-					this.fieldsPerson = result.data;
-					this.itemsPerson = Object.entries(this.fieldsPerson).map(([key, value]) => ({
-						label: value,
-						value: '{' + value + '}'
-					}));
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		}
+		if (['person_id', 'mitarbeiter_uid'].includes(this.typeId)){
+				const params = {
+					id: this.id,
+					type_id: this.typeId
+				};
+				this.$fhcApi.factory.messages.person.getMessageVarsPerson(params)
+					.then(result => {
+						this.fieldsPerson = result.data;
+						this.itemsPerson = Object.entries(this.fieldsPerson).map(([key, value]) => ({
+							label: value,
+							value: '{' + value + '}'
+						}));
+					})
+					.catch(this.$fhcAlert.handleSystemError);
+			}
 
-		if(this.typeId == 'uid' || this.typeId == 'prestudent_id') {
-			const params = {
+		if (['prestudent_id', 'uid'].includes(this.typeId)){
+				const params = {
 				id: this.id,
 				type_id: this.typeId
 			};
@@ -291,11 +292,7 @@ export default {
 				.then(result => {
 					this.fieldsPrestudent = result.data;
 					const prestudent = this.fieldsPrestudent[0];
-					//Just for testing with inserting values
-					/*					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
-											label: key,
-											value: value
-										}));*/
+
 					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
 						label: key.toLowerCase(),
 						value: '{' + key.toLowerCase() + '}'
@@ -318,11 +315,11 @@ export default {
 		this.$fhcApi.factory.messages.person.getNameOfDefaultRecipient({
 			id: this.id,
 			type_id: this.typeId
-		})
-			.then(result => {
+		}).then(result => {
 				this.defaultRecipient = result.data;
-				this.recipientsArray.push({'uid': this.uid,
-											'details': this.defaultRecipient});
+				this.recipientsArray.push({
+					'uid': this.uid,
+					'details': this.defaultRecipient});
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
@@ -347,13 +344,13 @@ export default {
 	},
 	template: `
 
-	<div class="messages-detail-newmessage">
-			<!--passt für showdiv-->
+	<div class="messages-detail-newmessage-newdiv">
+			<!--passt für inSamePage-->
 <!--			<div class="overflow-auto" style="max-height: 500px; border: 1px solid #ccc;">-->
 
 			<!--new page-->
 			<div v-if="!messageSent" class="overflow-auto m-3">
-				<h4>New Message</h4>
+				<h4>{{ $p.t('messages', 'neueNachricht') }}</h4>
 
 				<div class="row">
 					<div class="col-sm-8">
@@ -411,7 +408,7 @@ export default {
 
 					<div class="col-sm-4">
 						<div v-if="this.fieldsPrestudent.length > 0"  class="mt-3">
-							<strong>Felder Prestudent</strong>
+							<strong>{{$p.t('ui', 'felder')}} {{$p.t('lehre', 'prestudent')}}</strong>
 							<div class="border p-3 overflow-auto" style="height: 250px;">
 
 								<list-box
@@ -453,7 +450,7 @@ export default {
 						</div>
 
 						<div>
-							<strong>Meine Felder</strong>
+							<strong>{{$p.t('messages', 'meineFelder')}}</strong>
 							<div class="border p-3 overflow-auto" style="height: 200px;">
 
 								<list-box
@@ -476,7 +473,7 @@ export default {
 
 						<div class="d-grid gap-2 d-md-flex justify-content-md-end">
 
-							<button class="btn btn-secondary" @click="resetForm">Reset All</button>
+							<button class="btn btn-secondary" @click="resetForm">{{$p.t('ui', 'reset')}}</button>
 
 							<button v-if="statusNew" type="button" class="btn btn-primary" @click="sendMessage()">{{$p.t('ui', 'nachrichtSenden')}}</button>
 							<button v-else type="button" class="btn btn-primary" @click="replyMessage(formData.message_id)">{{$p.t('global', 'reply')}}</button>
@@ -488,18 +485,19 @@ export default {
 
 				<div class="row mt-4">
 
-					<h4>Vorschau:</h4>
+					<h4>{{ $p.t('global', 'vorschau') }}:</h4>
 					<div>
+					
 						<form-form class="row g-3 mt-2" ref="formPreview">
 
-							<div class="col-sm-3 mb-3">
-							
+							<div class="col-sm-2 mb-3">
 								<form-input
 									type="select"
 									name="recipient"
 									:label="$p.t('messages/recipient')"
-									v-model="formData.recipient"
+									v-model="defaultRecipient"
 								>
+									<option :value="null">{{ $p.t('messages', 'recipient') }}...</option>
 									<option 
 										v-for="recipient in recipientsArray"
 										:key="recipient.uid" 
@@ -511,7 +509,7 @@ export default {
 
 							<div class="col-md-2 mt-4">
 								<br>
-								<button type="button" class="btn btn-secondary" @click="showPreview(formData.recipient,'uid')">Aktualisieren</button>
+								<button type="button" class="btn btn-secondary" @click="showPreview(id, typeId)">{{ $p.t('ui', 'btnAktualisieren') }}</button>
 							</div>
 						</form-form>
 
@@ -528,7 +526,7 @@ export default {
 		</div>
 		
 					
-		<div v-else class="container d-flex justify-content-center align-items-center m-3">
+		<div v-if="messageSent && openMode!='inSamePage'" class="container d-flex justify-content-center align-items-center m-3">
 			<div class="card" style="width: 80%">
 			  <div class="card-body alert alert-success text-dar p-5 rounded">
 						<div class="row">
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 317291c56..89a118fd1 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -37,7 +37,8 @@ export default {
 						type: this.typeId
 					};
 				},
-				ajaxResponse: (url, params, response) => this.buildTreemap(response.data),
+				ajaxResponse: (url, params, response) => this.buildTreemap(response),
+				//ajaxResponse: (url, params, response) => this.buildTreemap(response.data),
 				columns: [
 					{title: "subject", field: "subject"},
 					{title: "body", field: "body", visible: false},
@@ -66,25 +67,15 @@ export default {
 					{
 						title: "status",
 						field: "status",
-						formatter: function (cell) {
-							//TODO(Manu) get phrases in this context to work?
-
-							/*							const statusMap = {
-															0: this.$p.t('messsages', 'unread'),
-															1: this.$p.t('messsages', 'read'),
-															2: this.$p.t('messsages', 'archived'),
-															3: this.$p.t('messsages', 'deleted')
-														};*/
-							const statusMap = {
-								0: 'unread',
-								1: 'read',
-								2: 'archived',
-								3: 'deleted'
-							};
-							return statusMap[cell.getValue()];
-							// return this.$p.t('messsages', 'deleted');
+						formatterParams: [
+							"unread",
+							"read",
+							"archived",
+							"deleted"
+						],
+						formatter: (cell, formatterParams) => {
+							return formatterParams[cell.getValue()];
 						}
-
 					},
 					{
 						title: "letzte Änderung",
@@ -144,6 +135,9 @@ export default {
 				selectableRangeMode: 'click',
 				index: 'message_id',
 				pagination: true,
+				paginationMode: "remote",
+				paginationSize: 15,
+				paginationInitialPage: 1,
 				dataTree: true,
 				headerSort: true,
 				dataTreeChildField: "children",
@@ -188,6 +182,15 @@ export default {
 						cm.getColumnByField('statusdatum').component.updateDefinition({
 							title: this.$p.t('notiz', 'letzte_aenderung')
 						});
+						cm.getColumnByField('status').component.updateDefinition({
+							formatterParams: [
+								this.$p.t('messages/unread'),
+								this.$p.t('messages/read'),
+								this.$p.t('messages/archived'),
+								this.$p.t('messages/deleted')
+							]
+						});
+						this.$refs.table.tabulator.rowManager.getDisplayRows();
 						/*
 						cm.getColumnByField('actions').component.updateDefinition({
 						title: this.$p.t('global', 'aktionen')
@@ -204,62 +207,9 @@ export default {
 					}
 				},
 			],
-			tabulatorData: [],
 			previewBody: "",
 			open: false,
 			personId: null,
-			//Testdata
-/*			messages: [
-				{
-					message_id: 7,
-					subject: "Antwort auf 4",
-					body: "Text 5",
-					insertamum: "2024-03-05",
-					relationmessage_id: 6,
-				},
-				{
-					message_id: 1,
-					subject: "Hauptnachricht",
-					body: "Text 1",
-					insertamum: "2024-03-05",
-					relationmessage_id: null,
-				},
-				{
-					message_id: 2,
-					subject: "Antwort auf 1",
-					body: "Text 2",
-					insertamum: "2024-03-05",
-					relationmessage_id: 1,
-				},
-				{
-					message_id: 3,
-					subject: "Antwort auf 2",
-					body: "Text 3",
-					insertamum: "2024-03-05",
-					relationmessage_id: 2,
-				},
-				{
-					message_id: 4,
-					subject: "Neue Nachricht",
-					body: "Text 4",
-					insertamum: "2024-03-05",
-					relationmessage_id: null,
-				},
-				{
-					message_id: 5,
-					subject: "Antwort auf 4",
-					body: "Text 5",
-					insertamum: "2024-03-05",
-					relationmessage_id: 4,
-				},
-				{
-					message_id: 6,
-					subject: "Antwort auf 4",
-					body: "Text 5",
-					insertamum: "2024-03-05",
-					relationmessage_id: 5,
-				},
-			],*/
 		}
 	},
 	methods: {
@@ -283,13 +233,7 @@ export default {
 				});
 		},
 		actionNewMessage(){
-		//	this.$emit('newMessage', this.id, this.typeId);
-
-			//here already use person_id??
 			this.$emit('newMessage', this.id, this.typeId);
-
-			//console.log("action new message");
-
 		},
 		actionReplyToMessage(message_id){
 			this.$emit('replyToMessage', this.id, this.typeId, message_id);
@@ -298,6 +242,8 @@ export default {
 			this.$refs.table.reloadTable();
 		},
 		buildTreemap(messages) {
+			const last_page = messages.meta.count;
+			messages = messages.data;
 			const messageMap = new Map();
 			const messageNested = [];
 			const remainingMessages = new Set(messages);
@@ -334,7 +280,7 @@ export default {
 		// to avoid endless loop
 		if (iteration > messages.length) break;
 	}
-	return messageNested;
+	return {data: messageNested, last_page};
 }
 
 
@@ -360,7 +306,7 @@ export default {
 		});*/
 	},
 	created(){
-		if(this.typeId == 'uid' || this.typeId == 'prestudent_id') {
+		if(this.typeId != 'person_id') {
 			const params = {
 				id: this.id,
 				type_id: this.typeId
@@ -408,7 +354,7 @@ export default {
 		</div>
 
 		<!--View Infocenter-->
-		<!--TODO(Manu) update-->
+		<!--TODO(Manu) finish later -->
 		<div v-if="messageLayout=='listTableTop'">
 
 				<!--table-->
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index fc73768f1..3cc9039d8 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -1,15 +1,19 @@
 import TableMessages from "./Details/TableMessages.js";
-import NewMessage from "./Details/NewMessage.js";
+//import NewMessage from "./Details/NewMessage.js";
 import FormOnly from "./Details/NewMessage/NewDiv.js";
 import FhcApi from "../../../../public/js/plugin/FhcApi.js";
 import Phrasen from "../../../../public/js/plugin/Phrasen.js";
+
+//TODO(Manu) Only if openMode == modal
+import MessageModal from "../Messages/Details/NewMessage/Modal.js";
 export default {
 	components: {
 		TableMessages,
-		NewMessage,
+	//	NewMessage,
 		FormOnly,
 		FhcApi,
-		Phrasen
+		Phrasen,
+		MessageModal
 	},
 	inject: {
 		cisRoot: {
@@ -21,12 +25,22 @@ export default {
 			type: String,
 			required: true
 		},
-		typeId: String,
+		typeId: {
+			type: String,
+			required: true,
+			validator(value) {
+				return [
+					'prestudent_id',
+					'uid',
+					'person_id',
+					'mitarbeiter_uid'
+				].includes(value)
+			}
+		},
 		id: {
 			type: [Number, String],
 			required: true
 		},
-		showNew: Boolean,
 		showTable: Boolean,
 		messageLayout: {
 			type: String,
@@ -40,45 +54,29 @@ export default {
 		},
 		openMode: {
 			type: String,
-			default: 'window',
+			default: 'modal',
 			validator(value) {
 				return [
 					'window',
 					'newTab',
 					'modal',
-					'showDiv'
+					'inSamePage'
 				].includes(value)
 			}
 		}
 	},
 	data() {
 		return {
-			showDiv: false
+			isVisibleDiv: false,
+			messageId: null
 		}
 	},
 	methods: {
 		reloadTable(){
-			console.log("in parent reload");
 			this.$refs.templateTableMessage.reload();
 		},
-		newMessage(id, typeId){
-			if (this.openMode == "window") {
-				this.openInNewWindow(id, typeId);
-			}
-			else if (this.openMode == "newTab"){
-				this.openInNewTab(id, typeId);
-			}
-			else if (this.openMode == "modal"){
-				this.openInModal(id, typeId);
-			}
-			else if (this.openMode == "showDiv"){
-				this.$refs.templateNewMessage.showTemplate(id, typeId);
-			}
-			else
-				console.log("no valid openMode");
-		},
 		handleMessage(id, typeId, messageId){
-			console.log("in handleMessage " + messageId);
+			this.messageId = messageId;
 			if (this.openMode == "window") {
 				this.openInNewWindow(id, typeId, messageId);
 			}
@@ -86,32 +84,16 @@ export default {
 				this.openInNewTab(id, typeId, messageId);
 			}
 			else if (this.openMode == "modal"){
-				this.openInModal(id, typeId, messageId);
+				this.$refs.modalMsg.show();
 			}
-			else if (this.openMode == "showDiv"){
-				this.$refs.templateNewMessage.showTemplate(id, typeId, messageId);
+			else if (this.openMode == "inSamePage"){
+				this.isVisibleDiv = true;
 			}
 			else
 				console.log("no valid openMode");
 		},
-		openInDiv(id, typeId){
-			this.$refs.templateNewMessage.showTemplate(id, typeId);
-			//this.showDiv = true; //local variante
-			//this.$refs.templateNewMessage.showTemplate();
-		},
-		openInModal(id, typeId){
-			//TODO(manu) define bs-modal in this component
-			this.$refs.templateNewMessage.$refs.modalMsg.show();
-		},
-/*		openInNewTab(id, typeId){
-			//TODO(MANU) check if array of ids...
-			let path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
-			path += "/NeueNachricht/" + id + "/" + typeId;
+		openInNewTab(id, typeId, messageId= null){
 
-			const newTab = window.open(path, "_blank");
-		},*/
-		openInNewTab(id, typeId, messageId=null){
-			//TODO(MANU) check if array of ids...
 			let path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 
 			if (messageId){
@@ -124,12 +106,16 @@ export default {
 
 			const newTab = window.open(path, "_blank");
 		},
-		openInNewWindow(id, typeId){
-			//TODO(MANU) check if array of ids...
+		openInNewWindow(id, typeId, messageId){
 			let path = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
-			path += "/NeueNachricht/" + id + "/" + typeId;
 
-			const newTab = window.open(path, "_blank");
+			if (messageId){
+				path += "/NeueNachricht/" + id + "/" + typeId + "/" + messageId;
+			}
+
+			else {
+				path += "/NeueNachricht/" + id + "/" + typeId;
+			}
 
 			const width = Math.round(window.innerWidth * 0.75);
 			const height = Math.round(window.innerHeight * 0.75);
@@ -138,6 +124,9 @@ export default {
 
 			const newWindow = window.open(path, "_blank", `width=${width},height=${height},left=${left},top=${top}`);
 		},
+		resetMessageId(){
+			this.messageId = null;
+		}
 
 	},
 	template: `
@@ -147,31 +136,28 @@ export default {
 			ref="modalMsg"
 			:type-id="typeId"
 			:id="id"
+			:message-id="messageId"
 			:endpoint="endpoint"
 			:openMode="openMode"
 			@reloadTable="reloadTable"
+			@resetMessageId="resetMessageId"
 			>
 		</message-modal>
-
-<!--		<div>
-			<button class="btn btn-secondary m-1" @click="openInDiv(id,typeId)">Open in Div</button>
-			<button class="btn btn-secondary" @click="openInModal(id,typeId)">Open in Modal</button>
-			<button class="btn btn-secondary m-1" @click="openInNewTab(id,typeId)">Open in Tab</button>
-			<button class="btn btn-secondary" @click="openInNewWindow(id,typeId)">Open in Page</button>
-		</div>-->
-<!--	<p>endpoint Messages.js: {{endpoint}}</p>-->
-
-		<div v-if="showNew">
-			<new-message
+		
+		<!--in same page-->
+		<div v-if="isVisibleDiv">
+			<form-only
 				ref="templateNewMessage"
-				:type-id="typeId"
-				:id="id"
+				:temp-type-id="typeId"
+				:temp-id="id"
+				:temp-message-id="messageId"
 				:endpoint="endpoint"
 				:openMode="openMode"
 				@reloadTable="reloadTable"
 			>
-			</new-message>
+			</form-only>
 		</div>
+
 		
 		<div v-if="showTable">
 			<table-messages
@@ -181,27 +167,17 @@ export default {
 				:endpoint="endpoint"
 				:messageLayout="messageLayout"
 				:openMode="openMode"
-				@newMessage="newMessage"		
+				@newMessage="handleMessage"		
 				@replyToMessage="handleMessage"
-			>
-			
+			>		
 			</table-messages>
-
-			<!--working also with form_only-->
-			<div v-if="showDiv">
-				<form-only
-					ref="templateNewForm"
-					:type-id="typeId"
-					:id="id"
-					:endpoint="endpoint"
-					:openMode="openMode"
-					@reloadTable="reloadTable"
-				>
-				</form-only>
-			</div>
-
 		</div>
-		
+		<div v-else>
+			<div class="col-md-2 mt-4">
+				<br>
+				<button type="button" class="btn btn-primary" @click="handleMessage(id, typeId)">{{ $p.t('messages', 'neueNachricht') }}</button>
+			</div>
+		</div>
 	</div>
 	`
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index f73ad161b..fa7d58997 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -1,7 +1,4 @@
 import CoreMessages from "../../../Messages/Messages.js";
-//import CoreMessages from "@/Messages/Messages.js";
-
-//TODO(Manu) refactor props
 
 export default {
 	components: {
@@ -12,6 +9,32 @@ export default {
 	},
 	template: `
 	<div class="stv-details-messages h-100 pb-3 overflow-hidden">
+	
+
+<!--		<h3>Test Dominik Schneider</h3>
+		<core-messages
+			ref="formc"
+			endpoint="$fhcApi.factory.messages.person"
+			type-id="mitarbeiter_uid"
+			id="ma0130"
+			messageLayout="twoColumnsTableLeft"
+			show-table
+			open-mode="modal"
+			>
+		</core-messages>-->
+		
+<!--		<h3>Test Person fields</h3>
+		<core-messages
+			ref="formc"
+			endpoint="$fhcApi.factory.messages.person"
+			type-id="mitarbeiter_uid"
+			id="ma0130"
+			messageLayout="twoColumnsTableLeft"
+			show-table
+			open-mode="modal"
+			>
+		</core-messages>-->
+		
 	<template v-if="modelValue.prestudent_id">
 		<core-messages
 			ref="formc"
@@ -19,8 +42,8 @@ export default {
 			type-id="prestudent_id"
 			:id="modelValue.prestudent_id"
 			messageLayout="twoColumnsTableLeft"
+			open-mode="modal"
 			show-table
-			open-mode="newTab"
 			>
 		</core-messages>
 	</template>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 63cf34038..2af57dab5 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37539,6 +37539,86 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'btnAktualisieren',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Aktualisieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Update',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'neueNachricht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neue Nachricht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'New Message',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'messages',
+		'phrase' => 'meineFelder',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Meine Felder',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'My fields',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'reset',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zurücksetzen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reset',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	/////////// FHC4 Phrases Messages END ///////////
 
 );

From 7b4f0f9dff4838a1d15be85167d90f169656dbd9 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 13 Mar 2025 09:05:53 +0100
Subject: [PATCH 070/572] Adaptions

- bugfix personFields
- validation for sendmessage for openmode inSamePage, newTab, window
- restyling div for enable scrolling in openmode InSamePage
---
 .../api/frontend/v1/messages/Messages.php     |  6 +---
 public/js/api/messages/person.js              |  7 ++--
 .../Messages/Details/NewMessage/Modal.js      | 28 ++++-----------
 .../Messages/Details/NewMessage/NewDiv.js     | 34 ++++++-------------
 public/js/components/Messages/Messages.js     | 10 +-----
 .../Studentenverwaltung/Details/Messages.js   | 15 ++++++--
 .../VorlagenDropdown/VorlagenDropdown.js      |  4 +--
 7 files changed, 37 insertions(+), 67 deletions(-)

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index 7834ba5f7..101a47185 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -120,20 +120,16 @@ class Messages extends FHCAPI_Controller
 	public function getMessageVarsPerson($id, $typeId)
 	{
 		$person_id = ($typeId == 'mitarbeiter_uid') ? $this->_getPersonId($id, $typeId) : $id;
-		$result = $this->MessageModel->getMessageVarsPerson($person_id);
-
+		$result = $this->MessageModel->getMsgVarsDataByPersonId($person_id);
 		$data = $this->getDataOrTerminateWithError($result);
 
-
 		$this->terminateWithSuccess($data);
 	}
 
 	public function getMsgVarsPrestudent($id, $typeId)
 	{
 		$prestudent_id = ($typeId == 'uid') ? $this->_getPrestudentIdFromUid($id) : $id;
-
 		$result = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
-
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
diff --git a/public/js/api/messages/person.js b/public/js/api/messages/person.js
index 6fa39c6ba..9bfae6f38 100644
--- a/public/js/api/messages/person.js
+++ b/public/js/api/messages/person.js
@@ -34,15 +34,14 @@ export default {
 	getReplyData(messageId){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getReplyData/' + messageId);
 	},
-	sendMessage(form, id, data) {
-		console.log("id" + id);
+	sendMessageFromModalContext(form, id, data) {
 		return this.$fhcApi.post(form,'api/frontend/v1/messages/messages/sendMessage/' + id,
 			data);
 	},
-/*	sendMessage(id, data) {
+	sendMessage(id, data) {
 		return this.$fhcApi.post('api/frontend/v1/messages/messages/sendMessage/' + id,
 			data);
-	},*/
+	},
 	deleteMessage(messageId){
 		return this.$fhcApi.post('api/frontend/v1/messages/messages/deleteMessage/' + messageId);
 	}
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index c6d3e1210..03345e9d4 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -92,7 +92,6 @@ export default {
 			this.formData.body = value;
 		},
 		sendMessage() {
-			//TODO(Manu) check default recipient(s)
 			const data = new FormData();
 			const params = {
 				id: this.id,
@@ -104,13 +103,10 @@ export default {
 			};
 			data.append('data', JSON.stringify(merged));
 
-			return this.$fhcApi.factory.messages.person.sendMessage(
+			return this.$fhcApi.factory.messages.person.sendMessageFromModalContext(
 				this.$refs.formMessage,
 				this.uid,
 				data)
-/*			return this.$fhcApi.factory.messages.person.sendMessage(
-				this.uid,
-				data)*/
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
 					this.hideModal('modalNewMessage');
@@ -125,13 +121,8 @@ export default {
 				);
 		},
 		getVorlagentext(vorlage_kurzbz){
-			//console.log(typeof vorlage_kurzbz);
 			return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz)
 				.then(response => {
-					//this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
-					//this.hideModal('modalNewMessage');
-					//this.resetForm();
-					//TODO(Manu) CHECK
 					this.formData.body = response.data;
 				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
@@ -234,8 +225,6 @@ export default {
 		},
 		'formData.vorlage_kurzbz': {
 			handler(newVal){
-				//	console.log("Vorlage: " + newVal);
-
 				if (newVal && newVal != null) {
 					this.formData.subject = newVal;
 					return this.getVorlagentext(newVal);
@@ -274,9 +263,10 @@ export default {
 			this.$fhcApi.factory.messages.person.getMessageVarsPerson(params)
 				.then(result => {
 					this.fieldsPerson = result.data;
-					this.itemsPerson = Object.entries(this.fieldsPerson).map(([key, value]) => ({
-						label: value,
-						value: '{' + value + '}'
+					const person = this.fieldsPerson[0];
+					this.itemsPerson = Object.entries(person).map(([key, value]) => ({
+						label: key.toLowerCase(),
+						value: '{' + key.toLowerCase() + '}'
 					}));
 				})
 				.catch(this.$fhcAlert.handleSystemError);
@@ -315,11 +305,9 @@ export default {
 			type_id: this.typeId})
 			.then(result => {
 				this.defaultRecipient = result.data;
-			//	console.log("check " + this.uid + "|" + this.defaultRecipient);
 				this.recipientsArray.push({
 					'uid': this.uid,
 					'details': this.defaultRecipient});
-			//	console.log(JSON.stringify(this.recipientsArray));
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
@@ -399,13 +387,13 @@ export default {
 							</div>
 
 							<div class="row">
-								<DropdownComponent
+								<dropdown-component
 									ref="dropdownComp"
 									:label="$p.t('global/vorlage')"
 									@change="handleSelectedVorlage"
 									useLoggedInUserOe
 								>
-								</DropdownComponent>
+								</dropdown-component>
 							</div>
 
 						</form-form>
@@ -528,7 +516,5 @@ export default {
 			</template>
 
 		</bs-modal>
-
-	</div>
 	`,
 }
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index f1dc4c88a..4331dd734 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -104,7 +104,6 @@ export default {
 			this.formData.body = value;
 		},
 		sendMessage() {
-			//TODO(Manu) check default recipient(s)
 			const data = new FormData();
 
 			const params = {
@@ -118,42 +117,34 @@ export default {
 			};
 			data.append('data', JSON.stringify(merged));
 
-			//this.uid is important for existing sendFunction
+			//this.uid is necessary for existing sendFunction
 			return this.$fhcApi.factory.messages.person.sendMessage(
-				this.$refs.formMessage,
 				this.uid,
 				data)
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
-					//this.hideModal('messageModal');
 					this.hideTemplate();
 					this.resetForm();
+					this.messageSent = true;
 				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
-						//this.resetForm();
-						//closeModal
-						//closewindwo
-					this.messageSent = true;
-					//TODO(Manu) hier route definieren? ist kein child sondern mit route aufgerufen
+					//TODO(Manu) hier route definieren für openmode in Tab, Page?
+					// ist kein child sondern mit route aufgerufen
 					//würde allerdings neues fenster aktualisiert öffnen, altes bleibt ohne reload gleich
 					//Reload vorheriges tab???
+					if(this.openMode == "inSamePage"){
 						this.$emit('reloadTable');
+						}
 					}
 				);
 		},
 		getVorlagentext(vorlage_kurzbz){
 			return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz)
 				.then(response => {
-					//this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
-					//this.hideModal('messageModal');
-					//this.resetForm();
-					//TODO(Manu) CHECK
 					this.formData.body = response.data;
 				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					//this.resetForm();
-					//closeModal
-					//closewindwo
 				});
 		},
 		getPreviewText(id, typeId){
@@ -168,8 +159,6 @@ export default {
 				}).catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					//this.resetForm();
-					//closeModal
-					//closewindwo
 				});
 		},
 		insertVariable(selectedItem){
@@ -275,9 +264,10 @@ export default {
 				this.$fhcApi.factory.messages.person.getMessageVarsPerson(params)
 					.then(result => {
 						this.fieldsPerson = result.data;
-						this.itemsPerson = Object.entries(this.fieldsPerson).map(([key, value]) => ({
-							label: value,
-							value: '{' + value + '}'
+						const person = this.fieldsPerson[0];
+						this.itemsPerson = Object.entries(person).map(([key, value]) => ({
+							label: key.toLowerCase(),
+							value: '{' + key.toLowerCase() + '}'
 						}));
 					})
 					.catch(this.$fhcAlert.handleSystemError);
@@ -345,9 +335,6 @@ export default {
 	template: `
 
 	<div class="messages-detail-newmessage-newdiv">
-			<!--passt für inSamePage-->
-<!--			<div class="overflow-auto" style="max-height: 500px; border: 1px solid #ccc;">-->
-
 			<!--new page-->
 			<div v-if="!messageSent" class="overflow-auto m-3">
 				<h4>{{ $p.t('messages', 'neueNachricht') }}</h4>
@@ -356,7 +343,6 @@ export default {
 					<div class="col-sm-8">
 						<form-form class="row g-3 mt-2" ref="formMessage">
 
-						<!--TODO(Manu) ist eigentlich ein Array, hier werden alle Einträge angegeben als String-->
 							<div class="row mb-3">
 
 								<form-input
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index 3cc9039d8..5aa7eb7de 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -1,18 +1,10 @@
 import TableMessages from "./Details/TableMessages.js";
-//import NewMessage from "./Details/NewMessage.js";
 import FormOnly from "./Details/NewMessage/NewDiv.js";
-import FhcApi from "../../../../public/js/plugin/FhcApi.js";
-import Phrasen from "../../../../public/js/plugin/Phrasen.js";
-
-//TODO(Manu) Only if openMode == modal
 import MessageModal from "../Messages/Details/NewMessage/Modal.js";
 export default {
 	components: {
 		TableMessages,
-	//	NewMessage,
 		FormOnly,
-		FhcApi,
-		Phrasen,
 		MessageModal
 	},
 	inject: {
@@ -145,7 +137,7 @@ export default {
 		</message-modal>
 		
 		<!--in same page-->
-		<div v-if="isVisibleDiv">
+		<div v-if="isVisibleDiv" class="overflow-auto m-3" style="max-height: 500px; border: 1px solid #ccc;">
 			<form-only
 				ref="templateNewMessage"
 				:temp-type-id="typeId"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index fa7d58997..4c1d9bd6b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -10,7 +10,8 @@ export default {
 	template: `
 	<div class="stv-details-messages h-100 pb-3 overflow-hidden">
 	
-
+	<!--TODO(Manu) Delete Testdata-->
+	
 <!--		<h3>Test Dominik Schneider</h3>
 		<core-messages
 			ref="formc"
@@ -28,9 +29,19 @@ export default {
 			ref="formc"
 			endpoint="$fhcApi.factory.messages.person"
 			type-id="mitarbeiter_uid"
-			id="ma0130"
+			id="ma0158"
 			messageLayout="twoColumnsTableLeft"
 			show-table
+			open-mode="newTab"
+			>
+		</core-messages>-->
+		
+<!--		<h3>Test no table</h3>
+		<core-messages
+			ref="form2"
+			endpoint="$fhcApi.factory.messages.person"
+			type-id="prestudent_id"
+			:id="modelValue.prestudent_id"
 			open-mode="modal"
 			>
 		</core-messages>-->
diff --git a/public/js/components/VorlagenDropdown/VorlagenDropdown.js b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
index e5d80077e..03d8564d6 100644
--- a/public/js/components/VorlagenDropdown/VorlagenDropdown.js
+++ b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
@@ -23,11 +23,11 @@ export default {
 		}, */
 		isAdmin: {
 			type: Boolean,
-			required: true
+			required: false
 		},
 		useLoggedInUserOe: {
 			type: Boolean,
-			required: true
+			required: false
 		}
 	},
 	data() {

From 3b8b8d7882ee052e930da2c0df2b5f4b16ee9527 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 13 Mar 2025 09:34:06 +0100
Subject: [PATCH 071/572] remove testdata in getFunction

---
 .../controllers/api/frontend/v1/messages/Messages.php        | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index 101a47185..dbc11735a 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -54,11 +54,6 @@ class Messages extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		//return null if count == 0
-		if($data['count'] == 0){
-			$this->terminateWithSuccess([]);
-		}
-
 		$this->addMeta('count', $data['count']);
 
 		$this->terminateWithSuccess($data['data']);

From 0dd1e4a628ee438085721325665fa60ead08b7cd Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 13 Mar 2025 10:29:08 +0100
Subject: [PATCH 072/572] refactor(RoomInformation): updates the
 roomInformation endpoint to use the Stundenplan library functions

---
 .../controllers/api/frontend/v1/Stundenplan.php  |  6 +++---
 application/libraries/StundenplanLib.php         |  4 ++--
 public/js/components/Cis/Mylv/RoomInformation.js | 16 ++++++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 84c7933ad..815631d60 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -172,6 +172,7 @@ class Stundenplan extends FHCAPI_Controller
      */
 	public function getRoomplan()
 	{
+		$this->load->library('StundenplanLib');
         // form validation
         $this->load->library('form_validation');
         $this->form_validation->set_data($_GET);
@@ -188,8 +189,7 @@ class Stundenplan extends FHCAPI_Controller
 		$roomplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date));
 
         $roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
-
-		$this->expand_object_information($roomplan_data);
+		$this->stundenplanlib->expand_object_information($roomplan_data);
 
 		$this->terminateWithSuccess($roomplan_data);
 
@@ -198,6 +198,7 @@ class Stundenplan extends FHCAPI_Controller
 	// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the stundenplan of a student
     public function Reservierungen($ort_kurzbz = null)
 	{
+		$this->load->library('StundenplanLib');
 		//form validation
 		$this->load->library('form_validation');
 		$this->form_validation->set_data($_GET);
@@ -211,7 +212,6 @@ class Stundenplan extends FHCAPI_Controller
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
-		$this->load->library('StundenplanLib');
 		$result = $this->stundenplanlib->getReservierungen($start_date,$end_date,$ort_kurzbz);
 		$result = $this->getDataOrTerminateWithError($result);	
 		$this->terminateWithSuccess($result);
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index 5a741e10c..e0691ecab 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -144,8 +144,8 @@ class StundenplanLib{
 	}
 
 
-	private function expand_object_information($data){
-
+	public function expand_object_information($data){
+		$this->_ci =& get_instance();
 		foreach ($data as $item)
 		{
 
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 8a7354305..379f60498 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -219,25 +219,25 @@ const RoomInformation = {
 				</span>
 			</template>
 			<template #weekPage="{event,day}">
-				<div @click="showModal(event?.orig)" type="button" class=" border border-secondary border d-flex flex-column align-items-center justify-content-evenly h-100">
-					<span>{{event?.orig.topic}}</span>
-					<span v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</span>
-					<span>{{event?.orig.ort_kurzbz}}</span>
+				<div @click="showModal(event)" type="button" class=" border border-secondary border d-flex flex-column align-items-center justify-content-evenly h-100">
+					<span>{{event?.topic}}</span>
+					<span v-for="lektor in event?.lektor">{{lektor.kurzbz}}</span>
+					<span>{{event?.ort_kurzbz}}</span>
 				</div>
 			</template>
 			<template #dayPage="{event,day,mobile}">
-				<div @click="mobile? showModal(event?.orig):null" type="button" class="fhc-entry border border-secondary border row h-100 justify-content-center align-items-center text-center">
+				<div @click="mobile? showModal(event):null" type="button" class="fhc-entry border border-secondary border row h-100 justify-content-center align-items-center text-center">
 					<div class="col ">
 						<p>{{ $p.t('lehre/lehrveranstaltung') }}:</p>
-						<p class="m-0">{{event?.orig.topic}}</p>
+						<p class="m-0">{{event?.topic}}</p>
 					</div>
 					<div class="col ">
 						<p>{{ $p.t('lehre/lektor') }}:</p>
-						<p class="m-0" v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</p>
+						<p class="m-0" v-for="lektor in event?.lektor">{{lektor.kurzbz}}</p>
 					</div>
 					<div class="col ">
 						<p>{{ $p.t('profil/Ort') }}: </p>
-						<p class="m-0">{{event?.orig.ort_kurzbz}}</p>
+						<p class="m-0">{{event?.ort_kurzbz}}</p>
 					</div>
 				</div>
 			</template>

From 2759bb03090bded4e7317c7856f0be3444da8a09 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 19 Mar 2025 15:57:08 +0100
Subject: [PATCH 073/572] cis4 abgabetool student uploads/signature
 check/emails working; TODO: - testing with diff users, styling & mobile
 layout;

---
 application/controllers/Cis/Abgabetool.php    |  41 +-
 .../controllers/api/frontend/v1/Lehre.php     | 357 +++++++++++++++++-
 application/models/education/Abgabe_model.php | 139 -------
 .../models/education/Paabgabe_model.php       |  12 +
 .../models/education/Projektarbeit_model.php  | 142 +++++++
 .../views/CisRouterView/CisRouterView.php     |   8 +-
 public/js/api/lehre.js                        |  18 +-
 public/js/apps/Dashboard/Fhc.js               |  12 +-
 .../components/Cis/Abgabetool/AbgabeDetail.js | 277 ++++++++++----
 .../components/Cis/Abgabetool/Abgabetool.js   |  63 +++-
 system/phrasesupdate.php                      | 183 ++++++++-
 11 files changed, 995 insertions(+), 257 deletions(-)

diff --git a/application/controllers/Cis/Abgabetool.php b/application/controllers/Cis/Abgabetool.php
index 6c4770421..e00bbe837 100644
--- a/application/controllers/Cis/Abgabetool.php
+++ b/application/controllers/Cis/Abgabetool.php
@@ -13,7 +13,8 @@ class Abgabetool extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'index' => ['basis/cis:r']
+			'index' => ['basis/cis:r'],
+			'getStudentProjektarbeitAbgabeFile' => ['basis/cis:r']
 		]);
 	}
 
@@ -32,4 +33,42 @@ class Abgabetool extends Auth_Controller
 
 		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
 	}
+	
+	public function getStudentProjektarbeitAbgabeFile() 
+	{
+		$this->_ci =& get_instance();
+		$this->_ci->load->helper('download');
+		
+		$paabgabe_id = $this->_ci->input->get('paabgabe_id');
+		$student_uid = $this->_ci->input->get('student_uid');
+
+		if (!isset($paabgabe_id) || isEmptyString($paabgabe_id) || !isset($student_uid) || isEmptyString($student_uid))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		
+		$this->_ci->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+
+		$isZugeteilterBetreuer = count($this->_ci->ProjektarbeitModel->checkZuordnung($student_uid, getAuthUID())->retval) > 0;
+		
+		if(getAuthUID() == $student_uid || $isZugeteilterBetreuer) {
+			$file_path = PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf';
+			if(file_exists($file_path)) {
+				
+				header('Content-Description: File Transfer');
+				header('Content-Type: application/octet-stream');
+				header('Expires: 0');
+				header('Cache-Control: must-revalidate');
+				header('Pragma: public');
+				header('Content-Disposition: attachment; filename="'.basename($file_path).'"');
+				header('Content-Length: ' . filesize($file_path));
+
+				flush(); // send headers first just in case
+				readfile($file_path); // read file content to output buffer
+				
+			} else {
+				$this->terminateWithError('File not found');
+			}
+		} else {
+			$this->terminateWithError('Keine Zuordnung!');
+		}
+	}
 }
diff --git a/application/controllers/api/frontend/v1/Lehre.php b/application/controllers/api/frontend/v1/Lehre.php
index e41881df2..b28bd2d45 100644
--- a/application/controllers/api/frontend/v1/Lehre.php
+++ b/application/controllers/api/frontend/v1/Lehre.php
@@ -18,6 +18,14 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+//require_once('../../../include/studiengang.class.php');
+//require_once('../../../include/student.class.php');
+//require_once('../../../include/datum.class.php');
+//require_once('../../../include/mail.class.php');
+//require_once('../../../include/benutzerberechtigung.class.php');
+//require_once('../../../include/phrasen.class.php');
+//require_once('../../../include/projektarbeit.class.php');
+//require_once('../../../include/projektbetreuer.class.php');
 
 class Lehre extends FHCAPI_Controller
 {
@@ -32,8 +40,27 @@ class Lehre extends FHCAPI_Controller
 			'LV' => self::PERM_LOGGED,
 			'Pruefungen' => self::PERM_LOGGED,
 			'getStudentProjektarbeiten' => self::PERM_LOGGED, // TODO: abgabetool berechtigung?
-			'getStudentProjektabgaben' => self::PERM_LOGGED
+			'getStudentProjektabgaben' => self::PERM_LOGGED,
+			'postStudentProjektarbeitZwischenabgabe' => self::PERM_LOGGED,
+			'postStudentProjektarbeitEndupload' => self::PERM_LOGGED
 		]);
+
+		$this->load->library('PhrasesLib');
+
+		$this->loadPhrases(
+			array(
+				'global',
+				'ui',
+				'abgabetool'
+			)
+		);
+
+		$this->load->helper('hlp_sancho_helper');
+		
+		require_once(FHCPATH . 'include/studiengang.class.php');
+		require_once(FHCPATH . 'include/student.class.php');
+		require_once(FHCPATH . 'include/projektarbeit.class.php');
+		require_once(FHCPATH . 'include/projektbetreuer.class.php');
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -94,35 +121,327 @@ class Lehre extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
+	/**
+	 * fetches all projektabgabetermine for a given projektarbeit_id used in cis4 student abgabetool
+	 */
 	public function getStudentProjektabgaben() {
 		$projektarbeit_id = $this->input->get("projektarbeit_id",TRUE);
 
-		$this->load->model('education/Abgabe_model', 'AbgabeModel');
-		$ret = $this->AbgabeModel->getProjektarbeitAbgabetermine($projektarbeit_id);
-
+		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		$ret = $this->ProjektarbeitModel->getProjektarbeitAbgabetermine($projektarbeit_id);
 		
 		$this->terminateWithSuccess($ret);
 	}
-	
+
+	/**
+	 * fetches all projektarbeiten and betreuer for a given student_uid used in cis4 student abgabetool
+	 */
 	public function getStudentProjektarbeiten($uid)
 	{
-		$this->load->model('education/Abgabe_model', 'AbgabeModel');
 		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-		
-		$isZugeteilterBetreuer = count($this->AbgabeModel->checkZuordnung($uid, getAuthUID())->retval) > 0;
-		$ret = $this->AbgabeModel->getStudentProjektarbeitenLegacy($uid);
-		$this->addMeta('legacyQueryRetval', $ret);
-		$this->addMeta('isZugeteilterBetreuer', $isZugeteilterBetreuer);
-		
-		if ($this->MitarbeiterModel->isMitarbeiter(getAuthUID()) && ($isZugeteilterBetreuer)){
-			$projektarbeiten = $this->AbgabeModel->getStudentProjektarbeitenWithBetreuer($uid);
-		} else {
-			$projektarbeiten = $this->AbgabeModel->getStudentProjektarbeitenWithBetreuer(getAuthUID());
-		}
-		
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
-		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));	
+		if (!isset($uid) || isEmptyString($uid))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		
+		$isZugeteilterBetreuer = count($this->ProjektarbeitModel->checkZuordnung($uid, getAuthUID())->retval) > 0;
+		$this->addMeta('isZugeteilterBetreuer', $isZugeteilterBetreuer);
+		$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter(getAuthUID());
+		
+		if ($isMitarbeiter && $isZugeteilterBetreuer){
+			$projektarbeiten = $this->ProjektarbeitModel->getStudentProjektarbeitenWithBetreuer($uid);
+		} else {
+			$projektarbeiten = $this->ProjektarbeitModel->getStudentProjektarbeitenWithBetreuer(getAuthUID());
+		}
+
+		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN, $uid));	
 	}
 	
+	
+
+	/**
+	 * projektarbeit - upload for zwischenabgaben in cis4 student abgabetool
+	 */
+	public function postStudentProjektarbeitZwischenabgabe() 
+	{
+
+		$projektarbeit_id = $_POST['projektarbeit_id'];
+		$paabgabe_id = $_POST['paabgabe_id'];
+		$student_uid = $_POST['student_uid'];
+		$bperson_id = $_POST['bperson_id'];
+		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
+
+		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
+			|| !isset($paabgabe_id) || isEmptyString($paabgabe_id)
+			|| !isset($student_uid) || isEmptyString($student_uid)
+			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		if ((isset($_FILES) and isset($_FILES['file']) and ! $_FILES['file']['error'])) {
+			move_uploaded_file($_FILES['file']['tmp_name'], PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf');
+			
+			if(file_exists(PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf')) {
+
+				exec('chmod 640 "'.PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf'.'"');
+
+				$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+				$res = $this->PaabgabeModel->updatePaabgabe($paabgabe_id);
+				
+				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
+				$this->terminateWithSuccess($res);
+			} else {
+				$this->terminateWithError('Error moving File');
+			}
+			
+		} else {
+			$this->terminateWithError('File missing');
+		}
+		
+	}
+
+	/**
+	 * upload für finale abgaben aka Endupload in cis4 student abgabetool
+	 */
+	public function postStudentProjektarbeitEndupload() 
+	{
+
+		$projektarbeit_id = $_POST['projektarbeit_id'];
+		$paabgabe_id = $_POST['paabgabe_id'];
+		$student_uid = $_POST['student_uid'];
+		$sprache = $_POST['sprache'];
+		$abstract = $_POST['abstract'];
+		$abstract_en = $_POST['abstract_en'];
+		$schlagwoerter = $_POST['schlagwoerter'];
+		$schlagwoerter_en = $_POST['schlagwoerter_en'];
+		$seitenanzahl = $_POST['seitenanzahl'];
+		$bperson_id = $_POST['bperson_id'];
+		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
+		
+		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
+			|| !isset($paabgabe_id) || isEmptyString($paabgabe_id)
+			|| !isset($student_uid) || isEmptyString($student_uid)
+			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		
+		// TODO: maybe check for other params aswell?
+
+		if ((isset($_FILES) and isset($_FILES['file']) and ! $_FILES['file']['error'])) {
+			move_uploaded_file($_FILES['file']['tmp_name'], PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf');
+
+			if(file_exists(PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf')) {
+
+				// Loads Libraries
+				$this->load->library('SignatureLib');
+				
+				// Check if the document is signed
+				$signaturVorhanden = true;
+				$signList = SignatureLib::list(PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf');
+				if (is_array($signList) && count($signList) > 0)
+				{
+					// The document is signed
+					$uploadedDocumentSigned = 'The document is signed';
+				}
+				elseif ($signList === null)
+				{
+					$uploadedDocumentSigned = 'WARNING: signature server error';
+				}
+				else
+				{
+					$signaturVorhanden = false;
+					$uploadedDocumentSigned = 'No document signature found';
+				}
+				$this->addMeta('signaturInfo', $uploadedDocumentSigned);
+
+				if ($signaturVorhanden === false)
+				{
+					$this->signaturFehltEmail($student_uid);
+				}
+				
+				// TODO error handle get data has data the updates
+				// update projektarbeit cols
+				$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+				$this->ProjektarbeitModel->updateProjektarbeit($projektarbeit_id,$sprache,$abstract,$abstract_en
+					,$schlagwoerter, $schlagwoerter_en, $seitenanzahl);
+
+				
+				// update paabgabe datum
+				$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+				$res = $this->PaabgabeModel->updatePaabgabe($paabgabe_id);
+				
+				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
+
+				$this->terminateWithSuccess($res);
+			} else {
+				$this->terminateWithError('Error moving File');
+			}
+
+		} else {
+			$this->terminateWithError('File missing');
+		}
+		
+	}
+
+	private function signaturFehltEmail($student_uid) {
+		
+		
+		// Mail an Studiengang wenn keine Signatur gefunden wurde
+		$student = new student();
+		if(!$student->load($student_uid))
+			$this->terminateWithError($this->p->t('global','userNichtGefunden'), 'general');
+
+		$stg_obj = new studiengang();
+		if(!$stg_obj->load($student->studiengang_kz))
+			$this->terminateWithError($this->p->t('global','fehlerBeimLesenAusDatenbank'), 'general');
+
+		$subject = 'Abgabe ohne Signatur';
+		$tomail = $stg_obj->email;
+		$data = array(
+			'vorname' => $student->vorname,
+			'nachname' => $student->nachname,
+			'studiengang' => $stg_obj->bezeichnung
+		);
+
+		$mailres = sendSanchoMail(
+			'ParbeitsbeurteilungSiganturFehlt',
+			$data,
+			$tomail,
+			$subject,
+			'sancho_header_min_bw.jpg',
+			'sancho_footer_min_bw.jpg'
+		);
+	}
+	
+	private function sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid) {
+
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		
+		$resBetr = $this->ProjektarbeitModel->getProjektbetreuerAnrede($bperson_id);
+
+		$projektarbeit_obj = new projektarbeit();
+
+		if(!$projektarbeit_obj->load($projektarbeit_id))
+			$this->terminateWithError('Ungueltiger Eintrag');
+
+		$num_rows_sem = $projektarbeit_obj->projektarbeitIsCurrent($projektarbeit_id);
+
+		if(!is_numeric($num_rows_sem) || $num_rows_sem < 0)
+		{
+			$this->terminateWithError($this->p->t('abgabetool','fehlerAktualitaetProjektarbeit'), 'general');
+		}
+		
+		foreach($resBetr->retval as $betreuerRow) {
+
+			// query student benutzer view for every betreuer row
+			$studentUser = $this->ProjektarbeitModel->getProjektarbeitBenutzer($student_uid)->retval[0];
+			
+			// TODO: hasdata, getData etc
+
+			// 1. Begutachter mail ohne Token
+			$mail_baselink = APP_ROOT."index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/ProjektarbeitsbeurteilungErstbegutachter";
+			$mail_fulllink = "$mail_baselink?projektarbeit_id=".$projektarbeit_id."&uid=".$studentUser->uid;
+			$projekttyp_kurzbz = $projektarbeit_obj->projekttyp_kurzbz;
+			$subject = $projektarbeit_obj->projekttyp_kurzbz == 'Diplom' ? 'Masterarbeitsbetreuung' : 'Bachelorarbeitsbetreuung';
+			$abgabetyp = $paabgabetyp_kurzbz == 'end' ? 'Endabgabe' : 'Zwischenabgabe';
+
+			$maildata = array();
+			$maildata['geehrt'] = "geehrte".($betreuerRow->anrede=="Herr"?"r":"");
+			$maildata['anrede'] = $betreuerRow->anrede;
+			$maildata['betreuer_voller_name'] = $betreuerRow->first;
+			$maildata['student_anrede'] = $studentUser->anrede;
+			$maildata['student_voller_name'] = trim($studentUser->titelpre." ".$studentUser->vorname." ".$studentUser->nachname." ".$studentUser->titelpost);
+			$maildata['abgabetyp'] = $abgabetyp;
+			$maildata['parbeituebersichtlink'] = "<p><a href='".APP_ROOT."cis/private/lehre/abgabe_lektor_frameset.html'>Zur Projektarbeitsübersicht</a></p>";
+			$maildata['bewertunglink'] = $num_rows_sem >= 1 && $paabgabetyp_kurzbz == 'end' ? "<p><a href='$mail_fulllink'>Zur Beurteilung der Arbeit</a></p>" : "";
+			$maildata['token'] = "";
+			
+			$mailres = sendSanchoMail(
+				'ParbeitsbeurteilungEndupload',
+				$maildata,
+				$betreuerRow->mitarbeiter_uid."@".DOMAIN,
+				$subject,
+				'sancho_header_min_bw.jpg',
+				'sancho_footer_min_bw.jpg',
+				get_uid()."@".DOMAIN);
+
+			if(!$mailres)
+			{
+				$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
+			}
+
+			// 2. Begutachter mail, wenn Endabgabe, mit Token wenn extern
+			if ($paabgabetyp_kurzbz == 'end')
+			{
+				// Zweitbegutachter holen
+				$zweitbegutachter = new projektbetreuer();
+				$zweitbegutachterRes = $zweitbegutachter->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid);
+
+				if ($zweitbegutachterRes)
+				{
+					$zweitbegutachterResults = $zweitbegutachter->result;
+
+					foreach ($zweitbegutachterResults as $begutachter)
+					{
+						// token generieren, wenn noch nicht vorhanden und notwendig (wird in methode überprüft)
+						$tokenGenRes = $zweitbegutachter->generateZweitbegutachterToken($begutachter->person_id, $projektarbeit_id);
+
+						if (!$tokenGenRes)
+						{
+							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailZweitBegutachter'), 'general');
+						}
+						
+						// Zweitbegutachter (evtl. mit Token) holen
+						$zweitbegutachterMitToken = new projektbetreuer();
+						$begutachterMitTokenRes = $zweitbegutachterMitToken->getZweitbegutachterWithToken($bperson_id, $projektarbeit_id, $studentUser->uid, $begutachter->person_id);
+
+						if (!$begutachterMitTokenRes)
+						{
+							$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailZweitBegutachter'), 'general');
+						}
+						
+						// Email an Zweitbegutachter senden
+						if (isset($zweitbegutachterMitToken->result[0]))
+						{
+							$begutachterMitToken = $zweitbegutachterMitToken->result[0];
+
+							$path = $begutachterMitToken->betreuerart_kurzbz == 'Zweitbegutachter' ? 'ProjektarbeitsbeurteilungZweitbegutachter' : 'ProjektarbeitsbeurteilungErstbegutachter';
+							$mail_baselink = APP_ROOT."index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/$path";
+							$mail_fulllink = "$mail_baselink?projektarbeit_id=".$projektarbeit_id."&uid=".$studentUser->uid;
+							$intern = isset($begutachterMitToken->uid);
+							$mail_link = $intern ? $mail_fulllink : $mail_baselink;
+
+							$zweitbetmaildata = array();
+							$zweitbetmaildata['geehrt'] = "geehrte" . ($begutachterMitToken->anrede == "Herr" ? "r" : "");
+							$zweitbetmaildata['anrede'] = $begutachterMitToken->anrede;
+							$zweitbetmaildata['betreuer_voller_name'] = $begutachterMitToken->voller_name;
+							$zweitbetmaildata['student_anrede'] = $maildata['student_anrede'];
+							$zweitbetmaildata['student_voller_name'] = $maildata['student_voller_name'];
+							$zweitbetmaildata['abgabetyp'] = $abgabetyp;
+							$zweitbetmaildata['parbeituebersichtlink'] = $intern ? $maildata['parbeituebersichtlink'] : "";
+							$zweitbetmaildata['bewertunglink'] = $num_rows_sem >= 1 ? "<p><a href='$mail_link'>Zur Beurteilung der Arbeit</a></p>" : "";
+							$zweitbetmaildata['token'] = $num_rows_sem >= 1 && isset($begutachterMitToken->zugangstoken) && !$intern ? "<p>Zugangstoken: " . $begutachterMitToken->zugangstoken . "</p>" : "";
+							
+							$mailres = sendSanchoMail(
+								'ParbeitsbeurteilungEndupload',
+								$zweitbetmaildata,
+								$begutachterMitToken->email,
+								$subject,
+								'sancho_header_min_bw.jpg',
+								'sancho_footer_min_bw.jpg',
+								get_uid()."@".DOMAIN
+							);
+
+							if (!$mailres)
+							{
+								$this->terminateWithError($this->p->t('abgabetool', 'fehlerMailBegutachter'), 'general');
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
diff --git a/application/models/education/Abgabe_model.php b/application/models/education/Abgabe_model.php
index 0240beeb3..5a18c4fe3 100644
--- a/application/models/education/Abgabe_model.php
+++ b/application/models/education/Abgabe_model.php
@@ -11,144 +11,5 @@ class Abgabe_model extends DB_Model
 		$this->dbTable = 'campus.tbl_abgabe';
 		$this->pk = 'abgabe_id';
 	}
-	
-	public function checkZuordnung($studentUID, $maUID) {
-		//oder Lektor mit Betreuung dieses Studenten
-		$qry = "
-			SELECT 1
-			FROM
-				lehre.tbl_projektarbeit
-				JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
-				JOIN campus.vw_benutzer on(vw_benutzer.person_id=tbl_projektbetreuer.person_id)
-			WHERE
-				tbl_projektarbeit.student_uid = ? AND
-				vw_benutzer.uid = ?";
-		
-		return $this->execReadOnlyQuery($qry, array($studentUID, $maUID));
-	}
-	
-	public function getProjektarbeitAbgabetermine($projektarbeit_id) {
-		$qry ="SELECT campus.tbl_paabgabe.paabgabe_id, 
-					   campus.tbl_paabgabe.projektarbeit_id,
-					   campus.tbl_paabgabe.fixtermin,
-					   campus.tbl_paabgabe.kurzbz,
-					   campus.tbl_paabgabe.datum,
-					   campus.tbl_paabgabetyp.bezeichnung, 
-					   campus.tbl_paabgabe.abgabedatum
-				FROM campus.tbl_paabgabe JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
-				WHERE campus.tbl_paabgabe.projektarbeit_id = ?
-				ORDER BY campus.tbl_paabgabe.datum";
-		
-		return $this->execReadOnlyQuery($qry, array($projektarbeit_id));
-	}
-	
-	public function getStudentProjektarbeitenWithBetreuer($studentUID) {
-		$betreuerQuery = "
-		SELECT 
-			vorname as bvorname,
-			nachname as bnachname,
-			titelpre as btitelpre,
-			titelpost AS btitelpost,
-			titelpost AS btitelpost,
-			tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
-		
-			(SELECT person_id 
-			 FROM lehre.tbl_projektbetreuer 
-			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-			 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_person_id,
-			(SELECT betreuerart_kurzbz 
-			 FROM lehre.tbl_projektbetreuer 
-			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_betreuerart_kurzbz,
-			(SELECT tbl_betreuerart.beschreibung 
-			 FROM lehre.tbl_projektbetreuer JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz) 
-			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-			 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied') LIMIT 1) AS zweitbetreuer_betreuerart_beschreibung,
-			
-			tbl_betreuerart.betreuerart_kurzbz,
-			person_id as bperson_id,
-			projektarbeit_id,
-			lehre.tbl_projekttyp.bezeichnung as projekttypbezeichnung,
-			lehre.tbl_lehreinheit.studiensemester_kurzbz,
-			lehre.tbl_lehrveranstaltung.studiengang_kz,
-			public.tbl_studiengang.kurzbzlang,
-			lehre.tbl_projektbetreuer.note as note,
-			public.tbl_mitarbeiter.mitarbeiter_uid,
-			lehre.tbl_projektarbeit.titel as titel,
-			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuer_person_id = tbl_projektbetreuer.person_id) AS babgeschickt,
-			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_abgeschickt,
-			(SELECT datum FROM campus.tbl_paabgabe WHERE paabgabetyp_kurzbz = 'end' AND abgabedatum IS NOT NULL AND projektarbeit_id = tbl_projektarbeit.projektarbeit_id LIMIT 1) AS abgegeben
-		
-		FROM lehre.tbl_projektarbeit
-				 LEFT JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
-				 LEFT JOIN public.tbl_person USING(person_id)
-				 LEFT JOIN public.tbl_benutzer USING(person_id)
-				 LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
-				 LEFT JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz)
-				LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-				LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
-		LEFT JOIN public.tbl_mitarbeiter ON(public.tbl_mitarbeiter.mitarbeiter_uid = public.tbl_benutzer.uid)
-		LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
-		WHERE 
-			tbl_projektarbeit.student_uid = ? AND
-			(projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
-  		AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Senatsvorsitz')";
-		
-		// TODO: fetch senatsmitglieder
-		return $this->execReadOnlyQuery($betreuerQuery, array($studentUID));
-	}
 
-	public function getStudentProjektarbeitenLegacy($studentUID)
-	{
-		$qry = "SELECT (SELECT nachname FROM public.tbl_person  WHERE person_id=tbl_projektbetreuer.person_id) AS bnachname,
-	   (SELECT vorname FROM public.tbl_person WHERE person_id=tbl_projektbetreuer.person_id) AS bvorname,
-	   (SELECT titelpre FROM public.tbl_person WHERE person_id=tbl_projektbetreuer.person_id) AS btitelpre,
-	   (SELECT titelpost FROM public.tbl_person WHERE person_id=tbl_projektbetreuer.person_id) AS btitelpost,
-	   tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
-	   (SELECT person_id 
-			FROM lehre.tbl_projektbetreuer 
-			WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_person_id,
-	   (SELECT betreuerart_kurzbz 
-			FROM lehre.tbl_projektbetreuer 
-			WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_betreuerart_kurzbz,
-	   (SELECT tbl_betreuerart.beschreibung 
-			FROM lehre.tbl_projektbetreuer JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz) 
-			WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied') LIMIT 1) AS zweitbetreuer_betreuerart_beschreibung,
-	   tbl_projektbetreuer.person_id AS betreuer_person_id,
-	   tbl_projekttyp.bezeichnung AS prjbez,
-	   lehre.tbl_projektbetreuer.note as note,
-	   public.tbl_benutzer.aktiv as aktiv,
-	   (SELECT abgeschicktvon 
-			FROM extension.tbl_projektarbeitsbeurteilung 
-			WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id 
-			AND betreuer_person_id = tbl_projektbetreuer.person_id) AS babgeschickt,
-	   (SELECT abgeschicktvon 
-			FROM extension.tbl_projektarbeitsbeurteilung 
-			WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id 
-			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_abgeschickt,
-	   (SELECT datum FROM campus.tbl_paabgabe 
-	                 WHERE paabgabetyp_kurzbz = 'end' 
-	                 	AND abgabedatum IS NOT NULL 
-	                    AND projektarbeit_id = tbl_projektarbeit.projektarbeit_id LIMIT 1) AS abgegeben,
-	*
-FROM lehre.tbl_projektarbeit
-		 LEFT JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
-		 LEFT JOIN public.tbl_benutzer ON(uid=student_uid)
-		 LEFT JOIN public.tbl_person ON(tbl_benutzer.person_id=tbl_person.person_id)
-		 LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-		 LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
-		 LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
-		 LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
-		 LEFT JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz)
-WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
-  AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Senatsvorsitz')
-  AND tbl_projektarbeit.student_uid= ?
-ORDER BY studiensemester_kurzbz desc, tbl_lehrveranstaltung.kurzbz";
-		
-		return $this->execQuery($qry, array($studentUID));
-	}
-	
 }
diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
index 5fb58cc81..97235c37d 100644
--- a/application/models/education/Paabgabe_model.php
+++ b/application/models/education/Paabgabe_model.php
@@ -30,4 +30,16 @@ class Paabgabe_model extends DB_Model
 
 		return $this->execQuery($qry, array($projektarbeit_id));
 	}
+	
+	public function updatePaabgabe($paabgabe_id) {
+		$qry="
+			UPDATE campus.tbl_paabgabe SET
+				abgabedatum = now(),
+				updatevon = ?,
+				updateamum = now()
+			WHERE paabgabe_id= ?";
+
+		return $this->execQuery($qry, array(getAuthUID(), $paabgabe_id));
+	}
+	
 }
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index 109e23373..c9c2b6b73 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -69,4 +69,146 @@ class Projektarbeit_model extends DB_Model
 
 		return $this->execQuery($qry, $params);
 	}
+
+	/**
+	 * Update a Projektarbeit of a student by projektarbeit_id with 
+	 * the paramenters used by the student endupload page in cis4 abgabetool.
+	 */
+	public function updateProjektarbeit($projektarbeit_id,$sprache,$abstract,$abstract_en,
+										$schlagwoerter, $schlagwoerter_en,$seitenanzahl)
+	{
+		$qry = "UPDATE lehre.tbl_projektarbeit SET
+					seitenanzahl = ?,
+					abgabedatum = now(),
+					sprache = ?,
+					schlagwoerter_en = ?,
+					schlagwoerter = ?,
+					abstract = ?,
+					abstract_en = ?
+					WHERE projektarbeit_id = ?";
+
+		return $this->execQuery($qry, array($seitenanzahl, $sprache, $schlagwoerter_en,
+			$schlagwoerter, $abstract, $abstract_en, $projektarbeit_id));
+	}
+
+	/**
+	 * Get a List of Projektarbeiten of a student with betreuer 
+	 * used by the student cis4 abgabetool.
+	 */
+	public function getStudentProjektarbeitenWithBetreuer($studentUID)
+	{
+		$betreuerQuery = "
+		SELECT 
+			vorname as bvorname,
+			nachname as bnachname,
+			titelpre as btitelpre,
+			titelpost AS btitelpost,
+			titelpost AS btitelpost,
+			tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
+		
+			(SELECT person_id 
+			 FROM lehre.tbl_projektbetreuer 
+			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
+			 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_person_id,
+			(SELECT betreuerart_kurzbz 
+			 FROM lehre.tbl_projektbetreuer 
+			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
+			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_betreuerart_kurzbz,
+			(SELECT tbl_betreuerart.beschreibung 
+			 FROM lehre.tbl_projektbetreuer JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz) 
+			 WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
+			 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied') LIMIT 1) AS zweitbetreuer_betreuerart_beschreibung,
+			
+			tbl_betreuerart.betreuerart_kurzbz,
+			person_id as bperson_id,
+			projektarbeit_id,
+			lehre.tbl_projekttyp.bezeichnung as projekttypbezeichnung,
+			lehre.tbl_lehreinheit.studiensemester_kurzbz,
+			lehre.tbl_lehrveranstaltung.studiengang_kz,
+			public.tbl_studiengang.kurzbzlang,
+			lehre.tbl_projektbetreuer.note as note,
+			public.tbl_mitarbeiter.mitarbeiter_uid,
+			lehre.tbl_projektarbeit.titel as titel,
+			lehre.tbl_projektarbeit.sprache as sprache,
+			lehre.tbl_projektarbeit.seitenanzahl as seitenanzahl,
+			lehre.tbl_projektarbeit.kontrollschlagwoerter as kontrollschlagwoerter,
+			lehre.tbl_projektarbeit.schlagwoerter as schlagwoerter,
+			lehre.tbl_projektarbeit.schlagwoerter_en as schlagwoerter_en,
+			lehre.tbl_projektarbeit.abstract as abstract,
+			lehre.tbl_projektarbeit.abstract_en as abstract_en, 
+			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuer_person_id = tbl_projektbetreuer.person_id) AS babgeschickt,
+			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_abgeschickt,
+			(SELECT datum FROM campus.tbl_paabgabe WHERE paabgabetyp_kurzbz = 'end' AND abgabedatum IS NOT NULL AND projektarbeit_id = tbl_projektarbeit.projektarbeit_id LIMIT 1) AS abgegeben
+		
+		FROM lehre.tbl_projektarbeit
+				 LEFT JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
+				 LEFT JOIN public.tbl_person USING(person_id)
+				 LEFT JOIN public.tbl_benutzer USING(person_id)
+				 LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
+				 LEFT JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz)
+				LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+				LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+		LEFT JOIN public.tbl_mitarbeiter ON(public.tbl_mitarbeiter.mitarbeiter_uid = public.tbl_benutzer.uid)
+		LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
+		WHERE 
+			tbl_projektarbeit.student_uid = ? AND
+			(projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
+  		AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Senatsvorsitz')";
+		
+		return $this->execReadOnlyQuery($betreuerQuery, array($studentUID));
+	}
+
+	/**
+	 * Get a List of Projektarbeit Abgabetermin used by the student cis4 abgabetool.
+	 */
+	public function getProjektarbeitAbgabetermine($projektarbeit_id) {
+		$qry ="SELECT campus.tbl_paabgabe.paabgabe_id, 
+					campus.tbl_paabgabe.projektarbeit_id,
+					campus.tbl_paabgabe.fixtermin,
+					campus.tbl_paabgabe.kurzbz,
+					campus.tbl_paabgabe.datum,
+					campus.tbl_paabgabetyp.paabgabetyp_kurzbz, 
+					campus.tbl_paabgabetyp.bezeichnung, 
+					campus.tbl_paabgabe.abgabedatum
+				FROM campus.tbl_paabgabe JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
+				WHERE campus.tbl_paabgabe.projektarbeit_id = ?
+				ORDER BY campus.tbl_paabgabe.datum";
+
+		return $this->execReadOnlyQuery($qry, array($projektarbeit_id));
+	}
+
+	public function getProjektbetreuerAnrede($bperson_id) {
+		$qry_betr="SELECT distinct trim(COALESCE(titelpre,'')||' '||COALESCE(vorname,'')||' '||COALESCE(nachname,'')||' '||COALESCE(titelpost,'')) as first,
+						public.tbl_mitarbeiter.mitarbeiter_uid, anrede
+						FROM public.tbl_person JOIN lehre.tbl_projektbetreuer ON(lehre.tbl_projektbetreuer.person_id=public.tbl_person.person_id)
+						JOIN public.tbl_benutzer ON(public.tbl_benutzer.person_id=public.tbl_person.person_id)
+						JOIN public.tbl_mitarbeiter ON(public.tbl_benutzer.uid=public.tbl_mitarbeiter.mitarbeiter_uid)
+						WHERE public.tbl_person.person_id= ?";
+
+		return $this->execReadOnlyQuery($qry_betr, [$bperson_id]);
+
+	}
+
+	public function getProjektarbeitBenutzer($uid) {
+		$qry="SELECT * FROM campus.vw_benutzer where uid=?";
+		return $this->execReadOnlyQuery($qry, [$uid]);
+	}
+	
+	/**
+	 * Checks if mitarbeiter has a projektbetreuer zuordnung to student.
+	 */
+	public function checkZuordnung($studentUID, $maUID) {
+		//oder Lektor mit Betreuung dieses Studenten
+		$qry = "
+			SELECT 1
+			FROM
+				lehre.tbl_projektarbeit
+				JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
+				JOIN campus.vw_benutzer on(vw_benutzer.person_id=tbl_projektbetreuer.person_id)
+			WHERE
+				tbl_projektarbeit.student_uid = ? AND
+				vw_benutzer.uid = ?";
+
+		return $this->execReadOnlyQuery($qry, array($studentUID, $maUID));
+	}
 }
diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index 75ea0313e..231e25696 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -24,9 +24,11 @@ $includesArray = array(
 		'public/css/Cis4/Cms.css',
 	),
 	'customJSs' => array(
-		'vendor/npm-asset/primevue/accordion/accordion.js',
-		'vendor/npm-asset/primevue/accordiontab/accordiontab.js',
-		'vendor/npm-asset/primevue/inputnumber/inputnumber.js'
+		'vendor/npm-asset/primevue/accordion/accordion.min.js',
+		'vendor/npm-asset/primevue/accordiontab/accordiontab.min.js',
+		'vendor/npm-asset/primevue/inputnumber/inputnumber.min.js',
+		'vendor/npm-asset/primevue/textarea/textarea.min.js',
+		'vendor/npm-asset/primevue/checkbox/checkbox.min.js'
 	),
 	'customJSModules' => array(
 		'public/js/apps/Dashboard/Fhc.js'
diff --git a/public/js/api/lehre.js b/public/js/api/lehre.js
index 0020d3490..785b6abcf 100644
--- a/public/js/api/lehre.js
+++ b/public/js/api/lehre.js
@@ -29,8 +29,24 @@ export default {
 		return this.$fhcApi.get(
 			`/api/frontend/v1/Lehre/getStudentProjektabgaben`
 			, {
-				projektarbeit_id: detail.projektarbeit_id
+				projektarbeit_id: detail.projektarbeit_id,
+				student_uid: detail.student_uid
 			}
 		);
+	},
+	postStudentProjektarbeitEndupload(formData) {
+		const url = '/api/frontend/v1/Lehre/postStudentProjektarbeitEndupload';
+		const headers = {Headers: { "Content-Type": "multipart/form-data" }}
+		return this.$fhcApi.post(url, formData, headers)
+	},
+	postStudentProjektarbeitZwischenabgabe(formData) {
+		const url = '/api/frontend/v1/Lehre/postStudentProjektarbeitZwischenabgabe';
+		const headers = {Headers: { "Content-Type": "multipart/form-data" }}
+		return this.$fhcApi.post(url, formData, headers)
+	},
+	getStudentProjektarbeitAbgabeFile(paabgabe_id, student_uid) {
+		const url = `/Cis/Abgabetool/getStudentProjektarbeitAbgabeFile?paabgabe_id=${paabgabe_id}&student_uid=${student_uid}`;
+
+		window.location = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url
 	}
   }
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 34494e324..0b50891b9 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -30,12 +30,12 @@ const router = VueRouter.createRouter({
 			component: Profil,
 			props: true
 		},
-		// {
-		// 	path: `/Cis/Abgabetool`,
-		// 	name: 'Abgabetool',
-		// 	component: Abgabetool,
-		// 	props: true
-		// },
+		{
+			path: `/Cis/Abgabetool`,
+			name: 'Abgabetool',
+			component: Abgabetool,
+			props: true
+		},
 		{
 			path: `/Cis/Raumsuche`,
 			name: 'Raumsuche',
diff --git a/public/js/components/Cis/Abgabetool/AbgabeDetail.js b/public/js/components/Cis/Abgabetool/AbgabeDetail.js
index a1c3de8ae..5daf1a2b7 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeDetail.js
@@ -6,7 +6,11 @@ export const AbgabeDetail = {
 	name: "AbgabeDetail",
 	components: {
 		Upload,
-		BsModal
+		BsModal,
+		InputNumber: primevue.inputnumber,
+		Checkbox: primevue.checkbox,
+		Dropdown: primevue.dropdown,
+		Textarea: primevue.textarea
 	},
 	props: {
 		projektarbeit: {
@@ -16,23 +20,101 @@ export const AbgabeDetail = {
 	},
 	data() {
 		return {
-			file: []
+			eidAkzeptiert: false,
+			enduploadTermin: null,
+			allActiveLanguages: FHC_JS_DATA_STORAGE_OBJECT.server_languages,
+			form: Vue.reactive({
+				sprache: '',
+				abstract: '',
+				abstract_en: '',
+				schlagwoerter: '',
+				schlagwoerter_en: '',
+				kontrollschlagwoerter: '',
+				seitenanzahl: 1,
+			})
 		}
 	},
 	methods: {
-		triggerUpload() {
-			// todo: trigger the loadup
+		validate: function(termin) {
+			if(!termin.file.length) {
+				this.$fhcAlert.alertWarning(this.$p.t('global/warningChooseFile'));
+				return false
+			}
 
+			return true;
+		},
+		triggerEndupload() {
+			if (!this.validate(this.enduploadTermin))
+			{
+				return false;
+			}
+			
+			// post endabgabe
+			const formData = new FormData();
+			formData.append('paabgabetyp_kurzbz', this.enduploadTermin.paabgabetyp_kurzbz)
+			formData.append('projektarbeit_id', this.enduploadTermin.projektarbeit_id);
+			formData.append('paabgabe_id', this.enduploadTermin.paabgabe_id)
+			formData.append('student_uid', this.projektarbeit.student_uid)
+			formData.append('bperson_id', this.projektarbeit.bperson_id)
+			
+			// TODO: validate/check for null etc.
+			formData.append('sprache', this.form['sprache'].sprache)
+			formData.append('abstract', this.form['abstract'])
+			formData.append('abstract_en', this.form['abstract_en'])
+			formData.append('schlagwoerter', this.form['schlagwoerter'])
+			formData.append('schlagwoerter_en', this.form['schlagwoerter_en'])
+			formData.append('seitenanzahl', this.form['seitenanzahl'])
+			
+			for (let i = 0; i < this.enduploadTermin.file.length; i++) {
+				formData.append('file', this.enduploadTermin.file[i]);
+			}
+			this.$fhcApi.factory.lehre.postStudentProjektarbeitEndupload(formData)
+				.then(res => {
+					this.handleUploadRes(res)
+				})
+			
 			this.$refs.modalContainerEnduploadZusatzdaten.hide()
 		},
+		downloadAbgabe(termin) {
+			this.$fhcApi.factory.lehre.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid)
+		},
 		upload(termin) {
-			console.log(termin)
-			// TODO load it up
+
+			if (!this.validate(termin))
+			{
+				return false;
+			}
 			
 			if(termin.bezeichnung === 'Endupload') {
-				// open endupload form modal and await that it will be sent & checked
-
+				// open endupload form modal for further inputs
+				this.enduploadTermin = termin
 				this.$refs.modalContainerEnduploadZusatzdaten.show()
+			} else {
+				const formData = new FormData();
+				formData.append('paabgabetyp_kurzbz', termin.paabgabetyp_kurzbz)
+				formData.append('projektarbeit_id', this.projektarbeit.projektarbeit_id)
+				formData.append('paabgabe_id', termin.paabgabe_id)
+				formData.append('student_uid', this.projektarbeit.student_uid)
+				formData.append('bperson_id', this.projektarbeit.bperson_id)
+				
+				for (let i = 0; i < termin.file.length; i++) {
+					formData.append('file', termin.file[i]);
+				}
+				this.$fhcApi.factory.lehre.postStudentProjektarbeitZwischenabgabe(formData)
+					.then(res => {
+						this.handleUploadRes(res)
+					})
+			}
+		},
+		handleUploadRes(res) {
+			if(res.meta.status == "success") {
+				this.$fhcAlert.alertSuccess('File erfolgreich hochgeladen')
+			} else {
+				this.$fhcAlert.alertError('File upload error')
+			}
+			
+			if(res.meta.signaturInfo) {
+				this.$fhcAlert.alertInfo(res.meta.signaturInfo)
 			}
 		},
 		dateDiffInDays(datum, today){
@@ -43,6 +125,7 @@ export const AbgabeDetail = {
 			const datum = new Date(termin.datum)
 			const abgabedatum = new Date(termin.abgabedatum)
 			
+			// todo: rework styling but keep the color pattern logic
 			// https://wiki.fhcomplete.info/doku.php?id=cis:abgabetool_fuer_studierende
 			let color = 'white'
 			let fontColor = 'black'
@@ -61,28 +144,33 @@ export const AbgabeDetail = {
 			}
 			
 			return 'font-color: ' + fontColor + '; background-color: ' + color
+		},
+		openBeurteilungLink(link) {
+			window.open(link, '_blank')
+		},
+		getOptionLabel(option) {
+			return option.sprache
 		}
 	},
 	watch: {
-		'file'(newVal) {
-			if(newVal == [] || newVal === null || newVal === undefined) return
-
-			// check filetype on input change
-			const file = newVal[0]
-			if(!file) return
-
-			if(file.type && file.type.includes('pdf')) {
-				// all fine
-			} else {
-				// clear and alert for filetypes
-				this.$fhcAlert.alertInfo(this.$p.t('abgabetool/c4allowedFileTypes'))
-				this.entschuldigung.files = []
-			}
-
+		projektarbeit(newVal) {
+			// default select german if projektarbeit sprache was null
+			this.form.sprache = newVal.sprache ? this.allActiveLanguages.find(lang => lang.sprache == newVal.sprache) : this.allActiveLanguages.find(lang => lang.sprache == 'German')
+			this.form.abstract = newVal.abstract
+			this.form.abstract_en = newVal.abstract_en
+			this.form.schlagwoerter = newVal.schlagwoerter
+			this.form.schlagwoerter_en = newVal.schlagwoerter_en
+			this.form.kontrollschlagwoerter = newVal.kontrollschlagwoerter
+			this.form.seitenanzahl = newVal.seitenanzahl
 		}
 	},
 	computed: {
-
+		getEid() {
+			return this.$p.t('abgabetool/c4eidesstattlicheErklaerung')
+		},
+		getEnduploadErlaubt() {
+			return !this.eidAkzeptiert
+		}
 	},
 	created() {
 
@@ -100,33 +188,46 @@ export const AbgabeDetail = {
 			</div>
 			<div id="uploadWrapper">
 				<div class="row" style="margin-bottom: 12px;">
-					<div class="col">{{$p.t('abgabetool/c4fixtermin')}}</div>
-					<div class="col">{{$p.t('abgabetool/c4zieldatum')}}</div>
-					<div class="col">{{$p.t('abgabetool/c4abgabetyp')}}</div>
-					<div class="col">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
-					<div class="col">{{$p.t('abgabetool/c4abgabedatum')}}</div>
+					<div style="width: 100px">{{$p.t('abgabetool/c4fixtermin')}}</div>
+					<div class="col-1">{{$p.t('abgabetool/c4zieldatum')}}</div>
+					<div class="col-1">{{$p.t('abgabetool/c4abgabetyp')}}</div>
+					<div class="col-2">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
+					<div class="col-1">{{$p.t('abgabetool/c4abgabedatum')}}</div>
 					<div class="col">
 						{{$p.t('abgabetool/c4fileupload')}}
 					</div>
-					<div class="col">
-					</div>
 				</div>
 				<div class="row" v-for="termin in projektarbeit.abgabetermine">
-					<div class="col d-flex justify-content-center align-items-center">
+					<div style="width: 100px" class="d-flex justify-content-center align-items-center">
 						<p class="fhc-bullet" :class="{ 'fhc-bullet-red': termin.fixtermin, 'fhc-bullet-green': !termin.fixtermin }"></p>
 					</div>
-					<div class="col" :style="getDateStyle(termin)">{{ termin.datum?.split("-").reverse().join(".") }}</div>
-					<div class="col">{{ termin.bezeichnung }}</div>
-					<div class="col">{{ termin.kurzbz }}</div>
-					<div class="col">{{ termin.abgabedatum?.split("-").reverse().join(".") }}</div>
-					<div class="col">
-<!--						<Upload accept=".pdf" v-model="file"></Upload>-->
+					<div class="col-1 d-flex justify-content-center align-items-center">
+						<div :style="getDateStyle(termin)">
+							{{ termin.datum?.split("-").reverse().join(".") }}
+						</div>				
 					</div>
-					<div class="col">
-						<button class="btn btn-primary border-0" @click="upload(termin)">
-							Upload
-							<i style="margin-left: 8px" class="fa-solid fa-upload"></i>
-						</button>
+					<div class="col-1 d-flex justify-content-center align-items-center">{{ termin.bezeichnung }}</div>
+					<div class="col-2 d-flex justify-content-center align-items-center">{{ termin.kurzbz }}</div>
+					<div class="col-1 d-flex justify-content-center align-items-center">
+						{{ termin.abgabedatum?.split("-").reverse().join(".") }}
+						<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="cursor: pointer;">
+							<i class="fa-solid fa-file-pdf"></i>
+						</a>
+					</div>
+					<div class="col-6">
+						<div class="row">
+							<div class="col-6">
+								<Upload v-if="termin && termin.allowedToUpload" accept=".pdf" v-model="termin.file"></Upload>
+							</div>
+							<div class="col-6">
+								<button class="btn btn-primary border-0" @click="upload(termin)" :disabled="!termin.allowedToUpload">
+									Upload
+									<i style="margin-left: 8px" class="fa-solid fa-upload"></i>
+								</button>
+							</div>
+						</div>
+						
+						
 					</div>
 				</div>
 			</div>
@@ -136,58 +237,98 @@ export const AbgabeDetail = {
 			<template v-slot:title>
 				<div>
 					{{$p.t('abgabetool/c4enduploadZusatzdaten')}}
-					
 				</div>
 				<div class="row mb-3 align-items-center">
 					
-					student uid
+					<p class="ml-4 mr-4">Student UID: {{ projektarbeit?.student_uid}}</p>
 				
 				</div>
 				<div class="row mb-3 align-items-center">
 					
-					{{ projektarbeit?.titel }}
+					<p class="ml-4 mr-4">Titel: {{ projektarbeit?.titel }}</p>
 				
 				</div>
 			</template>
 			<template v-slot:default>
 				<div class="row mb-3 align-items-center">
-					
-					Sprache der Arbeit
-				
+					<div class="row">{{$p.t('abgabetool/c4Sprache')}}</div>
+					<div class="row">
+						<Dropdown 
+							:style="{'width': '100%'}"
+							v-model="form.sprache"
+							:options="allActiveLanguages"
+							:optionLabel="getOptionLabel">
+						</Dropdown>
+					</div>
 				</div>
+				
+<!--				 lektor fills these out-->
+<!--				<div class="row mb-3 align-items-center">-->
+<!--					<div class="row">Kontrollierte Schlagwörter</div>-->
+<!--					<div class="row">-->
+<!--						<Textarea v-model="form.kontrollschlagwoerter"></Textarea>-->
+<!--					</div>-->
+<!--					-->
+<!--				-->
+<!--				</div>-->
 				<div class="row mb-3 align-items-center">
-					
-					Kontrollierte Schlagwörter
-				
+					<div class="row">{{$p.t('abgabetool/c4schlagwoerterGer')}}</div>
+					<div class="row">
+						<Textarea v-model="form.schlagwoerter"></Textarea>
+					</div>
 				</div>
+				
 				<div class="row mb-3 align-items-center">
-					
-					Dt. Schlagwörter
-				
+					<div class="row">{{$p.t('abgabetool/c4schlagwoerterEng')}}</div>
+					<div class="row">
+						<Textarea v-model="form.schlagwoerter_en"></Textarea>
+					</div>
 				</div>
+				
 				<div class="row mb-3 align-items-center">
-					
-					Engl. Schlagwörter
-				
+					<div class="row">{{$p.t('abgabetool/c4abstractGer')}}</div>
+					<div class="row">
+						<Textarea v-model="form.abstract" rows="10"></Textarea>
+					</div>
 				</div>
+
 				<div class="row mb-3 align-items-center">
-					
-					Abstract max 5k characters
-				
+					<div class="row">{{$p.t('abgabetool/c4abstractEng')}}</div>
+					<div class="row">
+						<Textarea v-model="form.abstract_en" rows="10"></Textarea>
+					</div>				
 				</div>
+				
 				<div class="row mb-3 align-items-center">
-					
-					Abstract eng max 5k chars
-				
+					<div class="row">{{$p.t('abgabetool/c4seitenanzahl')}}</div>
+					<div class="row">
+						<InputNumber 
+							v-model="form.seitenanzahl"
+							inputId="seitenanzahlInput" :min="1" :max="100000">
+						</InputNumber>
+					</div>		
 				</div>
-				<div class="row mb-3 align-items-center">
-					
-					Seitenanzahl
 				
+				<div v-if="projektarbeit">
+					<div v-html="getEid"></div>
+					<div class="row">
+						<div class="col-9"></div>
+						<div class="col-2"><p>{{ $p.t('abgabetool/c4gelesenUndAkzeptiert') }}</p></div>
+						<div class="col-1">
+							
+							<Checkbox 
+								v-model="eidAkzeptiert" 
+								:binary="true" 
+								:pt="{ root: { class: 'ml-auto' }}"
+							>
+							</Checkbox>
+						</div>
+					</div>
 				</div>
+				
 			</template>
 			<template v-slot:footer>
-				<button class="btn btn-primary" @click="triggerUpload">{{$p.t('ui/hochladen')}}</button>
+				<button class="btn btn-primary" :disabled="getEnduploadErlaubt" @click="triggerEndupload">{{$p.t('ui/hochladen')}}</button>
 			</template>
 		</bs-modal>
 	 	
diff --git a/public/js/components/Cis/Abgabetool/Abgabetool.js b/public/js/components/Cis/Abgabetool/Abgabetool.js
index b1ab65181..6a34ff052 100644
--- a/public/js/components/Cis/Abgabetool/Abgabetool.js
+++ b/public/js/components/Cis/Abgabetool/Abgabetool.js
@@ -21,17 +21,20 @@ export const Abgabetool = {
 	data() {
 		return {
 			domain: '',
+			student_uid: null,
 			detail: null,
+			projektarbeiten: null,
 			selectedProjektarbeit: null,
 			tableBuiltResolve: null,
 			tableBuiltPromise: null,
 			abgabeTableOptions: {
-				height: 200, // TODO: determine smallest necessary height
+				height: 300,
 				index: 'projektarbeit_id',
 				layout: 'fitColumns',
 				placeholder: this.$p.t('global/noDataAvailable'),
 				columns: [
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4details')), formatter: this.detailFormatter, field: 'details', widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4beurteilung')), formatter: this.beurteilungFormatter, field: 'beurteilung', widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4sem')), field: 'sem', formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg', formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4kontakt')), field: 'mail', formatter: this.mailFormatter, widthGrow: 1},
@@ -50,20 +53,23 @@ export const Abgabetool = {
 			{
 				event: "cellClick",
 				handler: async (e, cell) => {
-
+					
 					if(cell.getColumn().getField() === "details") {
 						const val = cell.getValue()
+						
 						if(val.mode === 'detailTermine') {
 							this.setDetailComponent(cell.getValue())
 						} else if (val.mode === 'beurteilungDownload') {
-							//demo.dev.technikum-wien.at/cis/private/lehre/projektbeurteilungDocumentExport.php?betreuerart_kurzbz=Begutachter&projektarbeit_id=39239&person_id=22117
 							const pdfExportLink = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/pdfExport.php?xml=projektarbeitsbeurteilung.xml.php&xsl=Projektbeurteilung&betreuerart_kurzbz='+val.betreuerart_kurzbz+'&projektarbeit_id='+val.projektarbeit_id+'&person_id=' + val.betreuer_person_id
-							const pdfExportLink2 = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/lehre/projektbeurteilungDocumentExport.php?betreuerart_kurzbz='+val.betreuerart_kurzbz+'&projektarbeit_id='+val.projektarbeit_id+'&person_id=' + val.betreuer_person_id
+							// const pdfExportLink2 = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/lehre/projektbeurteilungDocumentExport.php?betreuerart_kurzbz='+val.betreuerart_kurzbz+'&projektarbeit_id='+val.projektarbeit_id+'&person_id=' + val.betreuer_person_id
 							window.open(pdfExportLink, '_blank')
 						}
 
-					}
-					console.log(cell.getData())
+					} else if (cell.getColumn().getField() === "beurteilung") {
+						const val = cell.getValue()
+						
+						if(val != '-') window.open(val, '_blank')
+					} 
 					e.stopPropagation()
 
 				}
@@ -71,13 +77,29 @@ export const Abgabetool = {
 			]};
 	},
 	methods: {
+		isPastDate(date) {
+			return new Date(date) < new Date(Date.now())	
+		},
 		setDetailComponent(details){
 			this.loadAbgaben(details).then((res)=> {
-				console.log(res)
-				const pa = this.data[0]?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
+				const pa = this.projektarbeiten?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
 				pa.abgabetermine = res.data.retval
+				pa.abgabetermine.forEach(termin => {
+					termin.file = []
+					termin.allowedToUpload = true
+					
+					// TODO: fixtermin logic?
+					if(termin.bezeichnung == 'Endupload' && this.isPastDate(termin.datum)) {
+						
+						// termin.allowedToUpload = false
+					} else {
+						// termin.allowedToUpload = true
+					}
+
+				})
 				pa.betreuer = this.buildBetreuer(pa)
-				
+				pa.student_uid = this.student_uid
+
 				this.selectedProjektarbeit = pa
 			})
 			
@@ -104,6 +126,13 @@ export const Abgabetool = {
 				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
 					'<a href='+val+'><i class="fa fa-envelope" style="color:#00649C"></i></a></div>'
 		},
+		beurteilungFormatter(cell) {
+			const val = cell.getValue()
+			if(val) {
+				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+					'<a><i class="fa fa-file-pdf" style="color:#00649C"></i></a></div>'
+			} else return '-'
+		},
 		tableResolve(resolve) {
 			this.tableBuiltResolve = resolve
 		},
@@ -111,28 +140,30 @@ export const Abgabetool = {
 			return 'mailto:' + abgabe.mitarbeiter_uid +'@'+ this.domain
 		},
 		buildBetreuer(abgabe) {
-			return abgabe.betreuerart_beschreibung + ': ' + (abgabe.btitelpre ? abgabe.btitelpre + ' ' : '') + abgabe.bvorname + ' ' + abgabe.bnachname + (abgabe.btitelpost ?? '')
+			return abgabe.betreuerart_beschreibung + ': ' + (abgabe.btitelpre ? abgabe.btitelpre + ' ' : '') + abgabe.bvorname + ' ' + abgabe.bnachname + (abgabe.btitelpost ? ' ' + abgabe.btitelpost : '')
 		},
 		setupData(data){
-			
-			this.data = data // TODO: better define what is needed from this for detail component
-			this.domain = data[1] // TODO do this in backend but this is a prototype anyway
+			this.projektarbeiten = data[0]
+			this.domain = data[1]
+			this.student_uid = data[2]
 			const d = data[0]?.retval?.map(projekt => {
-				console.log('projekt', projekt)
 				let mode = 'detailTermine'
 				
 				if (projekt.babgeschickt || projekt.zweitbetreuer_abgeschickt) {
-					mode = 'beurteilungDownload' // build dl link for both betreuer documents
+					// mode = 'beurteilungDownload' // build dl link for both betreuer documents
+					projekt.beurteilungLink = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/pdfExport.php?xml=projektarbeitsbeurteilung.xml.php&xsl=Projektbeurteilung&betreuerart_kurzbz='+projekt.betreuerart_kurzbz+'&projektarbeit_id='+projekt.projektarbeit_id+'&person_id=' + projekt.bperson_id
+
 				}
 				
 				return {
 					details: {
-						student_uid: this.viewData?.uid,
+						student_uid: this.student_uid,
 						projektarbeit_id: projekt.projektarbeit_id,
 						betreuer_person_id: projekt.bperson_id,
 						betreuerart_kurzbz: projekt.betreuerart_kurzbz,
 						mode
 					},
+					beurteilung: projekt.beurteilungLink ?? null,
 					sem: projekt.studiensemester_kurzbz,
 					stg: projekt.kurzbzlang,
 					mail: this.buildMailToLink(projekt),
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d1bddc46b..01f0427b6 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37885,13 +37885,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Fixtermin",
+				'text' => "Fix",
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => "Fixed submission deadline",
+				'text' => "Fixed",
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -38025,13 +38025,188 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Upload-File ist kein PDF!",
+				'text' => "Endupload Zusatzdaten",
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => "Upload-File is not a PDF!",
+				'text' => "Final submission additional data",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4beurteilung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Beurteilung",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Evaluation",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4schlagwoerterGer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Deutsche Schlagwörter",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "German Keywords",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4schlagwoerterEng',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Englische Schlagwörter",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "English Keywords",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4abstractGer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Abstract max 5000 Zeichen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Abstract max 5000 characters",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4abstractEng',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Abstract englisch max 5000 Zeichen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Abstract english max 5000 characters",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4seitenanzahl',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Seitenanzahl",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Number of pages",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4gelesenUndAkzeptiert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Gelesen und akzeptiert",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Read and accepted",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4eidesstattlicheErklaerung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ich räume der Fachhochschule Technikum Wien das Recht ein, sämtliche übermittelte Dokumente elektronisch zu speichern und zum Zwecke der Langzeitarchivierung unter Beachtung der Bewahrung des Inhalts in andere Formate zu konvertieren.
+					<br><br>
+					Im Falle einer Masterarbeit räume ich der FH Technikum Wien das Recht ein, sie in Datennetzen öffentlich zugänglich zu machen und stimme den bezughabenden <a target="_blank" href="https://cis.technikum-wien.at/cms/dms.php?id=284975">Nutzungsbedingungen des Publikationsservers ePub</a> zu.
+					<br><br>
+					Ich bestätige hiermit, dass ich die eidesstattliche Erklärung mittels digitaler Signatur unterzeichnet habe.
+					<a target="_blank" href="https://cis.technikum-wien.at/cms/dms.php?id=214779">Link zum Leitfaden Digitale Signatur</a>.
+					<br><br>
+					Hiermit willige ich ein, dass meine Bachelor- oder Masterarbeit im Zuge der Beurteilung auch mittels (Online)-Tools auf die unerlaubte Verwendung von KI geprüft wird.
+					',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'I grant UAS Technikum Wien the right to store all submitted documents electronically and to convert them into other formats for the purpose of long-term archiving, taking into account the preservation of the content.
+					<br><br>
+					In the case of a Master\'s thesis, I grant UAS Technikum Wien the right to make it publicly accessible in data networks and agree to the related <a target="_blank" href="https://cis.technikum-wien.at/cms/dms.php?id=284976">Terms of use for the publication server ePub</a>.
+					<br><br>
+					I hereby confirm that I have signed the affidavit using a digital signature. <a target="_blank" href="https://cis.technikum-wien.at/cms/dms.php?id=215614">Link to the Digital Signature Guide</a>.
+					<br><br>
+					I hereby agree that my bachelor\'s or master\'s thesis will also be checked for unauthorized use of AI using (online) tools as part of the assessment.
+					',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From b75c9cc524420a68b85167e0db82da220c3d9dac Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 20 Mar 2025 11:16:05 +0100
Subject: [PATCH 074/572] portation of tab Anrechnungen

	- switch version edit / non edit in config
---
 application/config/stv.php                    |   6 +-
 .../api/frontend/v1/stv/Anrechnungen.php      | 241 ++++++++++
 .../api/frontend/v1/stv/Config.php            |   6 +
 .../models/education/Anrechnung_model.php     |  62 +++
 .../education/Lehrveranstaltung_model.php     |  37 ++
 .../models/ressource/Mitarbeiter_model.php    |  35 +-
 public/js/api/stv.js                          |   3 +
 public/js/api/stv/exemptions.js               |  29 ++
 .../Details/Anrechnungen.js                   |  25 ++
 .../Details/Anrechnungen/Anrechnungen.js      | 425 ++++++++++++++++++
 system/phrasesupdate.php                      | 142 ++++++
 11 files changed, 1007 insertions(+), 4 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Anrechnungen.php
 create mode 100644 public/js/api/stv/exemptions.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js

diff --git a/application/config/stv.php b/application/config/stv.php
index 31ce3f521..1fdd5b28a 100644
--- a/application/config/stv.php
+++ b/application/config/stv.php
@@ -52,7 +52,11 @@ $config['tabs'] =
 					],
 				],
 			],
-		]
+		],
+		'exemptions' => [
+			//if true, Anrechnungen can be added and edited in tab Anrechnungen
+			'editableAnrechnungen' => false,
+		],
 	];
 	
 // List of fields to show when ZGV_DOKTOR_ANZEIGEN is defined
diff --git a/application/controllers/api/frontend/v1/stv/Anrechnungen.php b/application/controllers/api/frontend/v1/stv/Anrechnungen.php
new file mode 100644
index 000000000..85019334f
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Anrechnungen.php
@@ -0,0 +1,241 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Anrechnungen extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getAnrechnungen' => ['admin:r', 'assistenz:r'],
+			'deleteAnrechnung' => ['admin:rw', 'assistenz:rw'],
+			'getLehrveranstaltungen' => ['admin:r', 'assistenz:r'],
+			'getBegruendungen' => ['admin:r', 'assistenz:r'],
+			'getLektoren' => ['admin:r', 'assistenz:r'],
+			'getLvsKompatibel' => ['admin:r', 'assistenz:r'],
+			'insertAnrechnung' => ['admin:rw', 'assistenz:rw'],
+			'loadAnrechnung' => ['admin:rw', 'assistenz:rw'],
+			'updateAnrechnung' => ['admin:rw', 'assistenz:rw'],
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui', 'lehre'
+		]);
+
+		// Load models
+		$this->load->model('education/Anrechnung_model', 'AnrechnungsModel');
+	}
+
+	public function getAnrechnungen($prestudent_id)
+	{
+		$result = $this->AnrechnungsModel->getAnrechnungsData($prestudent_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getBegruendungen()
+	{
+		$this->load->model('education/Anrechnungbegruendung_model', 'AnrechnungbegrueundungsModel');
+
+		$result = $this->AnrechnungbegrueundungsModel->load();
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getLehrveranstaltungen($prestudent_id)
+	{
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+		$result = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$studienplan_id = current($data)->studienplan_id;
+
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$result = $this->LehrveranstaltungModel->getLvsByStudienplanId($studienplan_id);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getLvsKompatibel($lehrveranstaltung_id)
+	{
+		$this->AnrechnungsModel->addJoin('lehre.tbl_lehrveranstaltung lv', 'ON (lv.lehrveranstaltung_id = lehre.tbl_anrechnung.lehrveranstaltung_id)');
+		$result = $this->AnrechnungsModel->loadWhere(
+			['lehrveranstaltung_id_kompatibel' => $lehrveranstaltung_id]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getLektoren($studiengang_kz)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+
+		$result = $this->MitarbeiterModel->getLektoren($studiengang_kz);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function insertAnrechnung()
+	{
+		$this->load->library('form_validation');
+
+		$prestudent_id = $this->input->post('prestudent_id');
+
+		if(!$prestudent_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$formData = $this->input->post('formData');
+		$_POST['lehrveranstaltung_id'] =
+			(isset($formData['lehrveranstaltung_id']) && !empty($formData['lehrveranstaltung_id']))
+			? $formData['lehrveranstaltung_id']
+			: null;
+		$_POST['lehrveranstaltung_id_kompatibel'] =
+			(isset($formData['lehrveranstaltung_id_kompatibel']) && !empty($formData['lehrveranstaltung_id_kompatibel']))
+				? $formData['lehrveranstaltung_id_kompatibel']
+				: null;
+		$_POST['begruendung'] =
+			(isset($formData['begruendung_id']) && !empty($formData['begruendung_id']))
+				? $formData['begruendung_id']
+				: null;
+		$_POST['genehmigtVon'] = (isset($formData['genehmigt_von']) && !empty($formData['genehmigt_von']))
+			? $formData['genehmigt_von']
+			: null;
+
+		$this->form_validation->set_rules('lehrveranstaltung_id', 'Lehrveranstaltung_id', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehrveranstaltung'])
+		]);
+
+		$this->form_validation->set_rules('begruendung', 'Begruendung', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Begruendung'])
+		]);
+
+		if($_POST['begruendung'] == 2)
+		{
+			$this->form_validation->set_rules('lehrveranstaltung_id_kompatibel', 'Lehrveranstaltung_id', 'required', [
+				'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehrveranstaltung Kompatibel'])
+			]);
+		}
+
+		$this->form_validation->set_rules('genehmigtVon', 'GenehmigtVon', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'GenehmigtVon'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$result = $this->AnrechnungsModel->insert(
+			[
+				'prestudent_id' => $prestudent_id,
+				'lehrveranstaltung_id' => $_POST['lehrveranstaltung_id'],
+				'lehrveranstaltung_id_kompatibel' => $_POST['lehrveranstaltung_id_kompatibel'],
+				'begruendung_id' => $_POST['begruendung'],
+				'genehmigt_von' => $_POST['genehmigtVon']
+			]
+		);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function loadAnrechnung($anrechnung_id)
+	{
+		$result = $this->AnrechnungsModel->loadWhere(
+			array('anrechnung_id' => $anrechnung_id)
+		);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function updateAnrechnung()
+	{
+		$this->load->library('form_validation');
+
+		$anrechnung_id = $this->input->post('anrechnung_id');
+
+		if(!$anrechnung_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Anrechnung UID']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$formData = $this->input->post('formData');
+		$_POST['lehrveranstaltung_id'] =
+			(isset($formData['lehrveranstaltung_id']) && !empty($formData['lehrveranstaltung_id']))
+				? $formData['lehrveranstaltung_id']
+				: null;
+		$_POST['lehrveranstaltung_id_kompatibel'] =
+			(isset($formData['lehrveranstaltung_id_kompatibel']) && !empty($formData['lehrveranstaltung_id_kompatibel']))
+				? $formData['lehrveranstaltung_id_kompatibel']
+				: null;
+		$_POST['begruendung'] = (isset($formData['begruendung_id']) && !empty($formData['begruendung_id'])) ? $formData['begruendung_id'] : null;
+		$_POST['genehmigtVon'] = (isset($formData['genehmigt_von']) && !empty($formData['genehmigt_von'])) ? $formData['genehmigt_von'] : null;
+
+		$this->form_validation->set_rules('lehrveranstaltung_id', 'Lehrveranstaltung_id', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehrveranstaltung'])
+		]);
+
+		$this->form_validation->set_rules('begruendung', 'Begruendung', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Begruendung'])
+		]);
+
+		if($_POST['begruendung'] == 2)
+		{
+			$this->form_validation->set_rules('lehrveranstaltung_id_kompatibel', 'Lehrveranstaltung_id', 'required', [
+				'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehrveranstaltung Kompatibel'])
+			]);
+		}
+
+		$this->form_validation->set_rules('genehmigtVon', 'GenehmigtVon', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'GenehmigtVon'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$result = $this->AnrechnungsModel->update(
+			[
+				'anrechnung_id' => $anrechnung_id,
+			],
+			[
+
+				'lehrveranstaltung_id' => $_POST['lehrveranstaltung_id'],
+				'lehrveranstaltung_id_kompatibel' => $_POST['lehrveranstaltung_id_kompatibel'],
+				'begruendung_id' => $_POST['begruendung'],
+				'genehmigt_von' => $_POST['genehmigtVon']
+			]
+		);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function deleteAnrechnung($anrechnung_id)
+	{
+		$result = $this->AnrechnungsModel->delete(
+			array('anrechnung_id' => $anrechnung_id)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+}
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 42de1b02f..319abdd83 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -117,6 +117,12 @@ class Config extends FHCAPI_Controller
 			'component' => './Stv/Studentenverwaltung/Details/Pruefung.js'
 		];
 
+		$result['exemptions'] = [
+			'title' => $this->p->t('lehre', 'anrechnungen'),
+			'component' => './Stv/Studentenverwaltung/Details/Anrechnungen.js',
+			'config' => $config['exemptions']
+		];
+
 		$result['finalexam'] = [
 			'title' => $this->p->t('stv', 'tab_finalexam'),
 			'component' => './Stv/Studentenverwaltung/Details/Abschlusspruefung.js',
diff --git a/application/models/education/Anrechnung_model.php b/application/models/education/Anrechnung_model.php
index cbfdb6607..0b81be80c 100644
--- a/application/models/education/Anrechnung_model.php
+++ b/application/models/education/Anrechnung_model.php
@@ -202,4 +202,66 @@ class Anrechnung_model extends DB_Model
 		return success();
 		
 	}
+
+	/**
+	 * Get Anrechnungsdata for Table Anrechnungen
+	 *
+	 * @param $prestudent_id
+	 * @return array
+	 */
+	public function getAnrechnungsData($prestudent_id)
+	{
+		$qry = '
+			SELECT
+			  lehre.tbl_anrechnung.anrechnung_id,
+			  lehre.tbl_anrechnung.prestudent_id,
+			  lehre.tbl_anrechnung.lehrveranstaltung_id,
+			  lehre.tbl_lehrveranstaltung.bezeichnung AS bez_lehrveranstaltung,
+			  lehre.tbl_anrechnung_begruendung.bezeichnung AS begruendung,
+			  lehre.tbl_anrechnung_anrechnungstatus.status_kurzbz AS status,
+			  genehmigt_von,
+			  lehre.tbl_anrechnung.insertamum,
+			  lehre.tbl_anrechnung.insertvon,
+			  lehre.tbl_anrechnung.updateamum,
+			  lehre.tbl_anrechnung.updatevon,
+			  lehrveranstaltung_id_kompatibel,
+			  lv_comp.bezeichnung as lehrveranstaltung_bez_kompatibel,
+			  count(nz.notizzuordnung_id) AS notizen_anzahl
+			FROM
+			  lehre.tbl_anrechnung
+			  	JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
+				LEFT JOIN lehre.tbl_lehrveranstaltung lv_comp ON (lehre.tbl_anrechnung.lehrveranstaltung_id_kompatibel = lv_comp.lehrveranstaltung_id)
+			  	JOIN lehre.tbl_anrechnung_begruendung USING (begruendung_id)
+			  	LEFT JOIN lehre.tbl_anrechnung_anrechnungstatus ON (lehre.tbl_anrechnung_anrechnungstatus.anrechnung_id = lehre.tbl_anrechnung.anrechnung_id)
+				AND lehre.tbl_anrechnung_anrechnungstatus.insertamum = (
+					SELECT MAX(insertamum) 
+					FROM lehre.tbl_anrechnung_anrechnungstatus 
+					WHERE anrechnung_id = lehre.tbl_anrechnung.anrechnung_id
+				)
+				LEFT JOIN lehre.tbl_anrechnungstatus USING (status_kurzbz)
+				LEFT JOIN public.tbl_notizzuordnung nz ON (nz.anrechnung_id = lehre.tbl_anrechnung.anrechnung_id)
+			WHERE
+				lehre.tbl_anrechnung.prestudent_id = ?
+			GROUP BY 
+			      nz.anrechnung_id,
+				  lehre.tbl_anrechnung.anrechnung_id,
+				  lehre.tbl_anrechnung.prestudent_id,
+				  lehre.tbl_anrechnung.lehrveranstaltung_id,
+				  bez_lehrveranstaltung,
+				  begruendung,
+				  status,
+				  genehmigt_von,
+				  lehre.tbl_anrechnung.insertamum,
+				  lehre.tbl_anrechnung.insertvon,
+				  lehre.tbl_anrechnung.updateamum,
+				  lehre.tbl_anrechnung.updatevon,
+				  lehrveranstaltung_id_kompatibel,
+				  lehrveranstaltung_bez_kompatibel
+			ORDER BY
+			  	lehre.tbl_anrechnung.updateamum ASC
+		';
+
+		return $this->execQuery($qry, array($prestudent_id));
+
+	}
 }
diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 0a48965b5..6176f00b1 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -1071,4 +1071,41 @@ class Lehrveranstaltung_model extends DB_Model
 
 		return $this->execQuery($qry, $params);
 	}
+
+	/**
+	 * Gets lehrveranstaltungen of Studienplan
+	 * @param $studienplan_id ID des Studienplans
+	 * @param $semester Semester optional
+	 * @return array|null
+	 */
+	public function getLvsByStudienplanId($studienplan_id, $semester = null)
+	{
+		$params = array($studienplan_id);
+
+		$qry = "SELECT tbl_lehrveranstaltung.*,
+			tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id,
+			tbl_studienplan_lehrveranstaltung.semester as stpllv_semester,
+			tbl_studienplan_lehrveranstaltung.pflicht as stpllv_pflicht,
+			tbl_studienplan_lehrveranstaltung.koordinator as stpllv_koordinator,
+			tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id_parent,
+			tbl_studienplan_lehrveranstaltung.sort stpllv_sort,
+			tbl_studienplan_lehrveranstaltung.curriculum,
+			tbl_studienplan_lehrveranstaltung.export,
+			tbl_studienplan_lehrveranstaltung.genehmigung
+		FROM lehre.tbl_lehrveranstaltung
+		JOIN lehre.tbl_studienplan_lehrveranstaltung
+		USING(lehrveranstaltung_id)
+		WHERE tbl_studienplan_lehrveranstaltung.studienplan_id = ?
+		";
+
+		if ($semester !== null)
+		{
+			$qry.= " AND tbl_studienplan_lehrveranstaltung.semester = ?";
+			$params[] = $semester;
+		}
+
+		$qry .= " ORDER BY stpllv_sort, semester, sort";
+
+		return $this->execQuery($qry, $params);
+	}
 }
diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php
index 836f5d65a..2b652c65b 100644
--- a/application/models/ressource/Mitarbeiter_model.php
+++ b/application/models/ressource/Mitarbeiter_model.php
@@ -261,9 +261,9 @@ class Mitarbeiter_model extends DB_Model
 	 * @param $lehrveranstaltung_id
 	 * @return array with Mitarbeiter and their Lehreinheiten
 	 */
-	public function getMitarbeiterFromLV($lehrveranstaltung_id){
-	//TODO(manu) maybe filter that in pruefungslist.js ?
-	$qry = "SELECT DISTINCT
+	public function getMitarbeiterFromLV($lehrveranstaltung_id)
+	{
+		$qry = "SELECT DISTINCT
     			lehrveranstaltung_id, uid, vorname, wahlname, vornamen, nachname, titelpre, titelpost, kurzbz, mitarbeiter_uid 
 			FROM 
 			    lehre.tbl_lehreinheitmitarbeiter, campus.vw_mitarbeiter, lehre.tbl_lehreinheit
@@ -278,4 +278,33 @@ class Mitarbeiter_model extends DB_Model
 
 		return $this->execQuery($qry, $parametersArray);
 	}
+
+	/**
+	 * Get Lektoren by studiengang_kz
+	 *
+	 * @param $studiengang_kz
+	 * @return array with Mitarbeiter
+	 */
+	public function getLektoren($studiengang_kz)
+	{
+		$qry = "
+			SELECT DISTINCT
+			    campus.vw_mitarbeiter.uid,
+				campus.vw_mitarbeiter.vorname,
+				campus.vw_mitarbeiter.nachname,
+				studiengang_kz,
+				tbl_studiengang.typ,
+				tbl_studiengang.kurzbz AS stg_kurzbz
+			FROM
+			  campus.vw_mitarbeiter
+			  JOIN public.tbl_benutzerfunktion USING (uid)
+			  JOIN public.tbl_studiengang USING(oe_kurzbz)
+				WHERE studiengang_kz = ?
+				AND lektor is true
+			ORDER BY campus.vw_mitarbeiter.nachname";
+
+		$parametersArray = array($studiengang_kz);
+
+		return $this->execQuery($qry, $parametersArray);
+	}
 }
diff --git a/public/js/api/stv.js b/public/js/api/stv.js
index ae88b0516..0de3ac1fa 100644
--- a/public/js/api/stv.js
+++ b/public/js/api/stv.js
@@ -10,6 +10,8 @@ import exam from './stv/exam.js';
 import abschlusspruefung from './stv/abschlusspruefung.js';
 import grades from './stv/grades.js';
 import mobility from './stv/mobility.js';
+import exemptions from './stv/exemptions.js';
+
 
 export default {
 	verband,
@@ -24,6 +26,7 @@ export default {
 	abschlusspruefung,
 	grades,
 	mobility,
+	exemptions,
 	configStudent() {
 		return this.$fhcApi.get('api/frontend/v1/stv/config/student');
 	},
diff --git a/public/js/api/stv/exemptions.js b/public/js/api/stv/exemptions.js
new file mode 100644
index 000000000..f8b421200
--- /dev/null
+++ b/public/js/api/stv/exemptions.js
@@ -0,0 +1,29 @@
+export default {
+	getAnrechnungen(url, config, params) {
+		return this.$fhcApi.get('api/frontend/v1/stv/anrechnungen/getAnrechnungen/' + params.id);
+	},
+	getLehrveranstaltungen(prestudent_id){
+		return this.$fhcApi.get('api/frontend/v1/stv/anrechnungen/getLehrveranstaltungen/' + prestudent_id);
+	},
+	getBegruendungen(){
+		return this.$fhcApi.get('api/frontend/v1/stv/anrechnungen/getBegruendungen/');
+	},
+	getLvsKompatibel(lv_id){
+		return this.$fhcApi.get('api/frontend/v1/stv/anrechnungen/getLvsKompatibel/' + lv_id);
+	},
+	getLektoren(studiengang_kz){
+		return this.$fhcApi.get('api/frontend/v1/stv/anrechnungen/getLektoren/' + studiengang_kz);
+	},
+	addNewAnrechnung(form, data){
+		return this.$fhcApi.post(form, 'api/frontend/v1/stv/anrechnungen/insertAnrechnung/', data);
+	},
+	loadAnrechnung(anrechnung_id){
+		return this.$fhcApi.get('api/frontend/v1/stv/anrechnungen/loadAnrechnung/' + anrechnung_id);
+	},
+	editAnrechnung(form, data){
+		return this.$fhcApi.post(form, 'api/frontend/v1/stv/anrechnungen/updateAnrechnung/', data);
+	},
+	deleteAnrechnung(anrechnung_id){
+		return this.$fhcApi.post('api/frontend/v1/stv/anrechnungen/deleteAnrechnung/' + anrechnung_id);
+	},
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen.js
new file mode 100644
index 000000000..76d8ae7dd
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen.js
@@ -0,0 +1,25 @@
+import AnrechnungenList from './Anrechnungen/Anrechnungen.js';
+
+export default {
+	components: {
+		AnrechnungenList
+	},
+	provide() {
+		return {
+			config: this.config
+		};
+	},
+	props: {
+		modelValue: Object,
+		config: Object
+	},
+	methods: {
+		reload() {
+			this.$refs.anrechnungen.$refs.table.reloadTable();
+		}
+	},
+	template: `
+	<div class="stv-details-anrechnungen h-100 d-flex flex-column">
+		<anrechnungen-list ref="anrechnungen" :student="modelValue"></anrechnungen-list>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
new file mode 100644
index 000000000..0560f1b5c
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -0,0 +1,425 @@
+import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+import BsModal from "../../../../Bootstrap/Modal.js";
+import CoreForm from "../../../../Form/Form.js";
+import FormInput from "../../../../Form/Input.js";
+import CoreNotiz from "../../../../Notiz/Notiz.js";
+
+export default {
+	components: {
+		CoreFilterCmpt,
+		BsModal,
+		CoreForm,
+		FormInput,
+		CoreNotiz
+	},
+	inject: {
+		$reloadList: {
+			from: '$reloadList',
+			required: true
+		},
+		config: {
+			from: 'config',
+			required: true
+		},
+	},
+	props: {
+		student: Object
+	},
+	data() {
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: this.$fhcApi.factory.stv.exemptions.getAnrechnungen,
+				ajaxParams: () => {
+					return {
+						id: this.student.prestudent_id
+					};
+				},
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "anrechnung_id", field: "anrechnung_id", visible: false},
+					{title: "lehrveranstaltung_id", field: "lehrveranstaltung_id", visible: false},
+					{title: "Lehrveranstaltung", field: "bez_lehrveranstaltung"},
+					{title: "Begründung", field: "begruendung"},
+					{title: "lehrveranstaltung_id_kompatibel", field: "lehrveranstaltung_id_kompatibel", visible: false},
+					{title: "lehrveranstaltung_bez_kompatibel", field: "lehrveranstaltung_bez_kompatibel"},
+					{title: "status", field: "status"},
+					{title: "genehmigt_von", field: "genehmigt_von"},
+					{title: "notizen_anzahl", field: "notizen_anzahl", visible: false},
+					{title: "Datum", field: "insertamum",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+							});
+						}
+					},
+					{
+						title: 'Aktionen', field: 'actions',
+						minWidth: 150, // Ensures Action-buttons will be always fully displayed
+						formatter: (cell, formatterParams, onRendered) => {
+							let container = document.createElement('div');
+							container.className = "d-flex gap-2";
+
+							if(this.config.editableAnrechnungen){
+								let buttonEdit = document.createElement('button');
+								buttonEdit.className = 'btn btn-outline-secondary btn-action';
+								buttonEdit.innerHTML = '<i class="fa fa-edit"></i>';
+								buttonEdit.title = this.$p.t('ui', 'bearbeiten');
+								buttonEdit.addEventListener('click', (event) =>
+									this.actionEditAnrechnung(cell.getData().anrechnung_id)
+								);
+								container.append(buttonEdit);
+							}
+
+							let button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-xmark"></i>';
+							button.title = this.$p.t('ui', 'loeschen');
+							button.addEventListener('click', () =>
+								this.deleteAnrechnung(cell.getData().anrechnung_id)
+							);
+							container.append(button);
+
+							let countNotizen = cell.getData().notizen_anzahl;
+							let buttonNotes = document.createElement('button');
+							buttonNotes.className = 'btn btn-outline-secondary btn-action';
+							if (countNotizen > 0){
+								buttonNotes.innerHTML = countNotizen + this.$p.t('anrechnung', 'existingNotes');
+							}
+							else
+								buttonNotes.innerHTML = '+' + this.$p.t('global', 'notiz');
+
+							buttonNotes.addEventListener('click', (event) =>
+								this.addNote(cell.getData().anrechnung_id)
+							);
+							container.append(buttonNotes);
+
+							return container;
+						},
+						frozen: true
+					},
+				],
+				layout: 'fitDataFill',
+				height: '500',
+				index: 'anrechnung_id',
+				persistenceID: 'stv-details-anrechnungen'
+			},
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async () => {
+
+						await this.$p.loadCategory(['anrechnungen', 'global', 'ui', 'lehre']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('anrechnung_id').component.updateDefinition({
+							title: this.$p.t('ui', 'anrechnung_id'),
+						});
+						cm.getColumnByField('lehrveranstaltung_id').component.updateDefinition({
+							title: this.$p.t('lehre', 'lehrveranstaltung_id'),
+						});
+						cm.getColumnByField('bez_lehrveranstaltung').component.updateDefinition({
+							title: this.$p.t('lehre', 'lehrveranstaltung'),
+						});
+						cm.getColumnByField('begruendung').component.updateDefinition({
+							title: this.$p.t('global', 'begruendung'),
+						});
+						cm.getColumnByField('lehrveranstaltung_id_kompatibel').component.updateDefinition({
+							title: this.$p.t('anrechnung', 'lehrveranstaltung_id_kompatibel'),
+						});
+						cm.getColumnByField('lehrveranstaltung_bez_kompatibel').component.updateDefinition({
+							title: this.$p.t('anrechnung', 'lehrveranstaltung_bez_kompatibel'),
+						});
+						cm.getColumnByField('genehmigt_von').component.updateDefinition({
+							title: this.$p.t('anrechnung', 'genehmigtVon'),
+						});
+						cm.getColumnByField('notizen_anzahl').component.updateDefinition({
+							title: this.$p.t('anrechnung', 'existingNotes'),
+						});
+						cm.getColumnByField('insertamum').component.updateDefinition({
+							title: this.$p.t('global', 'datum'),
+						});
+
+					}
+				}
+			],
+			formData: {},
+			listBegruendungen: [],
+			listNewLehrveranstaltungen: [],
+			listLektoren: [],
+			listKompatibleLehrveranstaltungen: [],
+			statusNew: true,
+			showNotizen: false,
+			currentAnrechnung_id: null
+		}
+	},
+	watch: {
+		student(){
+			if (this.$refs.table) {
+				this.$refs.table.reloadTable();
+			}
+		},
+	},
+	methods: {
+		actionNewAnrechnung(){
+			this.statusNew = true;
+			this.$refs.anrechnungsModal.show();
+		},
+		actionEditAnrechnung(anrechnung_id){
+			this.resetForm();
+			this.statusNew = false;
+			this.loadAnrechnung(anrechnung_id);
+			this.$refs.anrechnungsModal.show();
+		},
+		addNote(anrechnung_id){
+			this.currentAnrechnung_id = anrechnung_id;
+			this.showNotizen = true;
+		},
+		addNewAnrechnung(){
+			const dataToSend = {
+				prestudent_id: this.student.prestudent_id,
+				formData: this.formData
+			};
+			return this.$fhcApi.factory.stv.exemptions.addNewAnrechnung(this.$refs.formExemptions, dataToSend)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.$refs.anrechnungsModal.hide();
+					this.resetForm();
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		editAnrechnung(anrechnung_id){
+			const dataToSend = {
+				anrechnung_id: anrechnung_id,
+				formData: this.formData
+			};
+			return this.$fhcApi.factory.stv.exemptions.editAnrechnung(this.$refs.formExemptions, dataToSend)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.$refs.anrechnungsModal.hide();
+					this.resetForm();
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		deleteAnrechnung(anrechnung_id){
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? anrechnung_id
+					: Promise.reject({handled: true}))
+				.then(this.$fhcApi.factory.stv.exemptions.deleteAnrechnung)
+				.then(result => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+					this.reload();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		getLvsKompatibel(){
+			if(this.formData.lehrveranstaltung_id) {
+				this.$fhcApi.factory.stv.exemptions.getLvsKompatibel(this.formData.lehrveranstaltung_id)
+					.then(result => {
+						this.listKompatibleLehrveranstaltungen = result.data;
+					})
+					.catch(this.$fhcAlert.handleSystemError);
+			}
+		},
+		handleInput(){
+			if(this.formData.begruendung == 2) {
+				this.getLvsKompatibel();
+			}
+		},
+		loadAnrechnung(anrechnung_id){
+			return this.$fhcApi.factory.stv.exemptions.loadAnrechnung(anrechnung_id)
+				.then(result => {
+					this.formData = result.data;
+					this.getLvsKompatibel();
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+		},
+		resetForm(){
+			this.formData = {};
+			this.statusNew = true;
+		},
+		resetLvKompatibel(){
+			this.formData.lehrveranstaltung_id_kompatibel = null;
+			this.handleInput();
+		}
+	},
+	created() {
+		this.$fhcApi.factory.stv.exemptions.getLehrveranstaltungen(this.student.prestudent_id)
+			.then(result => {
+				this.listNewLehrveranstaltungen = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$fhcApi.factory.stv.exemptions.getBegruendungen()
+			.then(result => {
+				this.listBegruendungen = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$fhcApi.factory.stv.exemptions.getLektoren(this.student.studiengang_kz)
+			.then(result => {
+				this.listLektoren = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+	},
+	template: `
+					<div class="stv-details-tab_exemptions h-100 pb-3">
+					<h5>{{$p.t('lehre', 'anrechnungen')}}</h5>
+					
+					<div v-if="showNotizen" class="border p-3 overflow-auto" style="height: 200px;">
+							<div class="justify-content-end pb-3">
+								<form-input
+									container-class="form-switch"
+									type="checkbox"
+									label="Notizen"
+									v-model="showNotizen"
+									@change="onSwitchHide"
+									>
+								</form-input>
+							</div>
+						<core-notiz
+							:endpoint="$fhcApi.factory.notiz.person"
+							ref="formNotes"
+							notiz-layout="popupModal"
+							typeId="anrechnung_id"
+							:id="currentAnrechnung_id"
+							show-document
+							show-tiny-mce
+							:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
+							>
+						</core-notiz>
+					
+					</div>
+					
+					<template v-if="config.editableAnrechnungen" >
+						<core-filter-cmpt
+							ref="table"
+							:tabulator-options="tabulatorOptions"
+							:tabulator-events="tabulatorEvents"
+							table-only
+							:side-menu="false"
+							reload
+							new-btn-show
+							:new-btn-label="this.$p.t('lehre', 'anrechnung')"
+							@click:new="actionNewAnrechnung"
+						>
+						</core-filter-cmpt>
+					</template>
+					<template v-else>
+						<core-filter-cmpt
+							ref="table"
+							:tabulator-options="tabulatorOptions"
+							:tabulator-events="tabulatorEvents"
+							table-only
+							:side-menu="false"
+							reload
+						>
+						</core-filter-cmpt>
+					</template>
+				
+					<bs-modal ref="anrechnungsModal" dialog-class="modal-dialog-scrollable" >
+						<template #title>
+							<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('anrechnung', 'neueAnrechnung')}}</p>							
+							<p v-else class="fw-bold mt-3">{{$p.t('anrechnung', 'editAnrechnung')}}</p>
+						</template>
+						
+						<core-form ref="formExemptions">
+							<div class="row mb-3">
+								<form-input
+									type="select"
+									:label="$p.t('lehre/lehrveranstaltung')"
+									name="lehrveranstaltung"
+									v-model="formData.lehrveranstaltung_id"
+									@change="resetLvKompatibel"
+									>
+									<option
+										v-for="entry in listNewLehrveranstaltungen"
+										:key="entry.lehrveranstaltung_id"
+										:value="entry.lehrveranstaltung_id"
+										>
+										{{entry.bezeichnung}} Semester {{entry.semester}} {{entry.lehrform_kurzbz}}
+									</option>
+								</form-input>
+							</div>
+							
+							<div class="row mb-3">
+								<form-input
+									type="select"
+									:label="$p.t('anrechnung/begruendung')"
+									name="begruendung"
+									v-model="formData.begruendung_id"
+									@change="handleInput"
+									>
+									<option
+										v-for="entry in listBegruendungen"
+										:key="entry.begruendung_id"
+										:value="entry.begruendung_id"
+										>
+										{{entry.bezeichnung}}
+									</option>
+								</form-input>
+							</div>
+							
+							<!--is shown when typ == kompatible LV-->
+							<div v-if="formData.begruendung_id == '2'" class="row mb-3">
+								<form-input
+									type="select"
+									label="Lehrveranstaltung Kompatibel"
+									name="lehrveranstaltung_id_kompatibel"
+									v-model="formData.lehrveranstaltung_id_kompatibel"
+									>
+									<option
+										v-for="entry in listKompatibleLehrveranstaltungen"
+										:key="entry.lehrveranstaltung_id"
+										:value="entry.lehrveranstaltung_id"
+										>
+										{{entry.bezeichnung}} Semester {{entry.semester}} {{entry.lehrform_kurzbz}}
+									</option>
+								</form-input>
+							</div>						
+							
+							<div class="row mb-3">
+								<form-input
+									type="select"
+									:label="$p.t('anrechnung/genehmigtVon')"
+									name="genehmigtVon"
+									v-model="formData.genehmigt_von"
+									>
+									<option
+										v-for="entry in listLektoren"
+										:key="entry.uid"
+										:value="entry.uid"
+										>
+										{{entry.nachname}} {{entry.vorname}}
+									</option>
+								</form-input>
+							</div>						
+						</core-form>
+						
+						<template #footer>
+							<button v-if="statusNew" type="button" class="btn btn-primary" @click="addNewAnrechnung">{{$p.t('ui', 'speichern')}}</button>
+							<button v-else type="button" class="btn btn-primary" @click="editAnrechnung(formData.anrechnung_id)">{{$p.t('ui', 'speichern')}}</button>
+						</template>
+								
+					</bs-modal>
+	`
+}
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index acb7a12e6..54297fb6a 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -40432,6 +40432,148 @@ array(
 		)
 	),
 	// FHC4 Phrases Mobility End
+	// FHC4 Phrases Anrechnungen Start
+	array(
+		'app' => 'core',
+		'category' => 'anrechnung',
+		'phrase' => 'begruendung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Begründung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reason',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'anrechnung',
+		'phrase' => 'genehmigtVon',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'genehmigt von',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'approved by',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'anrechnung',
+		'phrase' => 'editAnrechnung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Anrechnung bearbeiten",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Edit Exemption",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'anrechnung',
+		'phrase' => 'existingNotes',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => " Notiz(en)",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => " note(s)",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'anrechnung_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anrechnung ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Exemption ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'anrechnung',
+		'phrase' => 'lehrveranstaltung_id_kompatibel',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV kompatibel ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course compatible ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'anrechnung',
+		'phrase' => 'lehrveranstaltung_bez_kompatibel',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV kompatibel',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course compatible',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// FHC4 Phrases Anrechnungen End
 );
 
 

From 3f605e70513ce5011606f288b456a2036cbdac05 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 21 Mar 2025 11:42:09 +0100
Subject: [PATCH 075/572] feature(Cis Color Themes): makes it possible to
 change color theme of the application

---
 .../api/frontend/v1/Stundenplan.php           |   6 +-
 application/libraries/StundenplanLib.php      |   4 +-
 application/views/Cis/Login.php               |   3 +-
 .../anrechnung/requestAnrechnungImportant.php |   6 +-
 composer.json                                 |   6 +-
 public/css/Cis4/Cis.css                       | 245 ++++++++++++----
 public/css/Cis4/CisVariables.css              | 265 ++++++++++++++++++
 public/css/Cis4/CisVariablesCms.css           |  14 +
 public/css/Cis4/Cms.css                       |   8 +-
 public/css/Fhc.css                            |   2 +-
 public/css/FilterWidget.css                   |  19 +-
 public/css/components/FilterComponent.css     |  14 +-
 public/css/components/FormUnderline.css       |   6 +-
 public/css/components/MyLv.css                |   6 +-
 public/css/components/NavigationComponent.css |  27 +-
 public/css/components/Profil.css              |   9 +-
 public/css/components/Sprachen.css            |   8 +-
 public/css/components/calendar.css            | 147 ++++++++--
 public/css/components/dashboard.css           |  31 +-
 public/css/components/dashboard/news.css      |  24 +-
 public/css/components/searchbar/searchbar.css |  25 +-
 public/css/components/searchbar/switches.css  |  25 +-
 public/css/components/verticalsplit.css       |   6 +-
 public/css/lehre/anrechnung.css               |  40 ---
 public/js/components/Calendar/Day/Page.js     |  30 +-
 public/js/components/Calendar/Month/Page.js   |   6 +-
 public/js/components/Calendar/Week/Page.js    |  63 ++---
 public/js/components/Cis/Cms/Content.js       |   4 +-
 .../Cis/Cms/Content_types/General.js          |  32 ++-
 public/js/components/Cis/Cms/News.js          |   2 +-
 .../StudiengangInformation.js                 |   5 +-
 .../StudiengangPerson.js                      |   8 +-
 .../StudiengangVertretung.js                  |   2 +-
 public/js/components/Cis/DarkTheme.js         |  51 ++++
 public/js/components/Cis/Menu.js              |  31 +-
 public/js/components/Cis/Mylv/LvInfo.js       |   4 +-
 public/js/components/Cis/Mylv/LvMenu.js       |   2 +-
 .../js/components/Cis/Mylv/RoomInformation.js |  16 +-
 .../Cis/Mylv/Semester/Studiengang/Lv.js       |   8 +-
 .../Cis/Mylv/Semester/Studiengang/Lv/Info.js  |   4 +-
 .../Cis/Profil/ProfilComponents/Adresse.js    |   2 +-
 .../ProfilComponents/FetchProfilUpdates.js    |   4 +-
 .../Cis/Profil/ProfilComponents/Kontakt.js    |   2 +-
 .../Profil/ProfilComponents/Mailverteiler.js  |   4 +-
 .../Profil/ProfilComponents/ProfilEmails.js   |   2 +-
 .../ProfilComponents/RoleInformation.js       |   6 +-
 .../Cis/ProfilUpdate/ProfilUpdateView.js      |   2 +-
 .../js/components/Cis/Raumsuche/Raumsuche.js  |   2 +-
 public/js/components/Cis/Sprachen.js          |   2 +-
 public/js/components/DashboardWidget/Ampel.js |   2 +-
 .../components/DashboardWidget/Stundenplan.js |   4 +-
 public/js/components/DashboardWidget/Url.js   |   4 +-
 public/js/components/searchbar/searchbar.js   |   6 +-
 public/js/helpers/ColorThemeSetting.js        |   5 +
 54 files changed, 911 insertions(+), 350 deletions(-)
 create mode 100644 public/css/Cis4/CisVariables.css
 create mode 100644 public/css/Cis4/CisVariablesCms.css
 create mode 100644 public/js/components/Cis/DarkTheme.js
 create mode 100644 public/js/helpers/ColorThemeSetting.js

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 84c7933ad..815631d60 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -172,6 +172,7 @@ class Stundenplan extends FHCAPI_Controller
      */
 	public function getRoomplan()
 	{
+		$this->load->library('StundenplanLib');
         // form validation
         $this->load->library('form_validation');
         $this->form_validation->set_data($_GET);
@@ -188,8 +189,7 @@ class Stundenplan extends FHCAPI_Controller
 		$roomplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date));
 
         $roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
-
-		$this->expand_object_information($roomplan_data);
+		$this->stundenplanlib->expand_object_information($roomplan_data);
 
 		$this->terminateWithSuccess($roomplan_data);
 
@@ -198,6 +198,7 @@ class Stundenplan extends FHCAPI_Controller
 	// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the stundenplan of a student
     public function Reservierungen($ort_kurzbz = null)
 	{
+		$this->load->library('StundenplanLib');
 		//form validation
 		$this->load->library('form_validation');
 		$this->form_validation->set_data($_GET);
@@ -211,7 +212,6 @@ class Stundenplan extends FHCAPI_Controller
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
-		$this->load->library('StundenplanLib');
 		$result = $this->stundenplanlib->getReservierungen($start_date,$end_date,$ort_kurzbz);
 		$result = $this->getDataOrTerminateWithError($result);	
 		$this->terminateWithSuccess($result);
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index 5a741e10c..e0691ecab 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -144,8 +144,8 @@ class StundenplanLib{
 	}
 
 
-	private function expand_object_information($data){
-
+	public function expand_object_information($data){
+		$this->_ci =& get_instance();
 		foreach ($data as $item)
 		{
 
diff --git a/application/views/Cis/Login.php b/application/views/Cis/Login.php
index 68490e67e..90f78f123 100644
--- a/application/views/Cis/Login.php
+++ b/application/views/Cis/Login.php
@@ -2,7 +2,8 @@
 	$includesArray = array(
 		'title' => 'FH-Complete',
 		'bootstrap5' => true,
-		'fontawesome6' => true
+		'fontawesome6' => true,
+		'customJSs' => 'public/js/helpers/ColorThemeSetting.js'
 	);
 
 	$this->load->view('templates/FHC-Header', $includesArray);
diff --git a/application/views/lehre/anrechnung/requestAnrechnungImportant.php b/application/views/lehre/anrechnung/requestAnrechnungImportant.php
index 0ee13d422..d224a52dd 100644
--- a/application/views/lehre/anrechnung/requestAnrechnungImportant.php
+++ b/application/views/lehre/anrechnung/requestAnrechnungImportant.php
@@ -4,8 +4,8 @@
        <!--    Beantragung: Fristen panel -->
   <div class="accordion-item">
     <h2 class="accordion-header">
-        <div  class="bg-info-subtle accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#Beantragung" aria-expanded="true" aria-controls="Beantragung">
         <div class="d-flex">
+        <div  class="bg-info-subtle accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#Beantragung" aria-expanded="true" aria-controls="Beantragung">
         
         <i class="me-2 fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
 				<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoFristenTitle'); ?>
@@ -22,8 +22,8 @@
   <!--    Referenzbeispiele ECTS Berechnung panel -->
   <div class="accordion-item">
     <h2 class="accordion-header">
-        <div class="bg-info-subtle accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#Referenzbeispiele" aria-expanded="false" aria-controls="Referenzbeispiele">
         <div class="d-flex">
+        <div class="bg-info-subtle accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#Referenzbeispiele" aria-expanded="false" aria-controls="Referenzbeispiele">
         <i class="me-2 fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
 					<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoEctsBerechnungTitle'); ?>
         </div>
@@ -54,8 +54,8 @@
     <!--    Herkunft der Kenntnisse: Angaben panel -->
   <div class="accordion-item">
     <h2 class="accordion-header">
-        <div class="bg-info-subtle accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#HerkunftKenntnisse" aria-expanded="false" aria-controls="HerkunftKenntnisse">
         <div class="d-flex">
+        <div class="bg-info-subtle accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#HerkunftKenntnisse" aria-expanded="false" aria-controls="HerkunftKenntnisse">
         <i class="me-2 fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
 					<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoHerkunftKenntnisseTitle'); ?>
         </div>
diff --git a/composer.json b/composer.json
index 6aa94c0f7..053b5227f 100644
--- a/composer.json
+++ b/composer.json
@@ -308,9 +308,9 @@
 			"type": "package",
 			"package": {
 				"name": "twbs/bootstrap5",
-				"version": "5.1.3",
+				"version": "5.3",
 				"dist": {
-					"url": "https://github.com/twbs/bootstrap/archive/refs/tags/v5.1.3.zip",
+					"url": "https://github.com/twbs/bootstrap/archive/refs/tags/v5.3.zip",
 					"type": "zip"
 				}
 			}
@@ -473,7 +473,7 @@
 		"tinymce/tinymce5": "5.10.*",
 		"tomazdragar/simplecropper": "1.0",
 		"twbs/bootstrap3": "3.4.*",
-		"twbs/bootstrap5": "5.1.*",
+		"twbs/bootstrap5": "5.3.*",
 
 		"vuejs/vuejs3": "3.3.8",
 		"vuejs/vuerouter4": "4.1.3",
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index ab8f30260..8602def32 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -1,4 +1,5 @@
 /* basic */
+@import './CisVariables.css';
 @import '../components/searchbar/searchbar.css';
 @import '../components/Sprachen.css';
 
@@ -6,57 +7,176 @@ html {
   font-size: 0.875em;
 }
 
-/* variables */
-:root {
-  --fhc-cis-primary: #00649c;
-  --fhc-cis-primary-hover: #005585;
-  --fhc-cis-header-px: 1rem;
-  --fhc-cis-header-py: .5rem;
-  --fhc-cis-main-px: 1.5rem;
-  --fhc-cis-main-py: 1.5rem;
-  --fhc-cis-menu-lvl-1-bg: #00649c;
-  --fhc-cis-menu-lvl-1-color: #fff;
-  --fhc-cis-menu-lvl-1-bg-hover: #005585;
-  --fhc-cis-menu-lvl-1-color-hover: #fff;
-  --fhc-cis-menu-lvl-2-bg: #343a40;
-  --fhc-cis-menu-lvl-2-color: #fff;
-  --fhc-cis-menu-lvl-2-bg-hover: #2c3136;
-  --fhc-cis-menu-lvl-2-color-hover: #fff;
-  --fhc-cis-menu-lvl-2-color-active: #292b2a;
-  --fhc-cis-menu-lvl-3-bg: #72777A;
-  --fhc-cis-menu-lvl-3-color: #fff;
-  --fhc-cis-menu-lvl-3-bg-hover: #616568;
-  --fhc-cis-menu-lvl-3-color-hover: #fff;
-  --fhc-cis-menu-lvl-4-bg: #ced4da;
-  --fhc-cis-menu-lvl-4-color: #000;
-  --fhc-cis-menu-lvl-4-bg-hover: #d5dae0;
-  --fhc-cis-menu-lvl-4-color-hover: #000;
-  --fhc-cis-menu-lvl-5-bg: #e9ecef;
-  --fhc-cis-menu-lvl-5-color: #000;
-  --fhc-cis-menu-lvl-5-bg-hover: #eceff1;
-  --fhc-cis-menu-lvl-5-color-hover: #000;
-  --fhc-cis-grade-positive: rgb(0, 128, 0);
-  --fhc-cis-grade-negative: rgb(128, 0, 0);
+.fhc-dark-bg{
+	background-color: var(--fhc-dark);
+	color:var(--fhc-light) !important;
 }
+
+.fhc-dark-color {
+	color: var(--fhc-dark);
+}
+
+.fhc-dark-bg:hover{
+	filter: brightness(120%);
+}
+
+.fhc-primary-color{
+	color: var(--fhc-primary) !important;
+}
+
+.fhc-primary-bg {
+	background-color: var(--fhc-primary) !important;
+}
+
+.fhc-primary-highlight-bg {
+	background-color: var(--fhc-primary-highlight) !important;
+}
+
+.fhc-body-bg{
+	background-color:var(--fhc-background) !important;
+}
+
+.fhc-body-color{
+	color: var(--fhc-text) !important;
+}
+
+.fhc-secondary-bg{
+	background-color: var(--fhc-secondary) !important;
+}
+
+.fhc-secondary-color {
+	color: var(--fhc-secondary) !important;
+}
+
+.fhc-tertiary-bg{
+	background-color: var(--fhc-tertiary) !important;
+}
+
+.fhc-tertiary-color {
+	color: var(--fhc-tertiary) !important;
+}
+
+.fhc-fourth-bg {
+	background-color: var(--fhc-fourth) !important;
+}
+
+.fhc-fourth-color {
+	color: var(--fhc-fourth) !important;
+}
+
+.fhc-fifth-bg {
+	background-color: var(--fhc-fifth) !important;
+}
+
+.fhc-fifth-color {
+	color: var(--fhc-fifth) !important;
+}
+
+.fhc-body{
+	color:var(--fhc-text);
+	background-color: var(--fhc-background);
+	border-color: var(--fhc-border);
+}
+
+.fhc-secondary {
+	color: var(--fhc-text);
+	background-color: var(--fhc-secondary);
+	border-color: var(--fhc-border);
+}
+
+.fhc-tertiary{
+	color: var(--fhc-text);
+	background-color: var(--fhc-tertiary);
+	border-color:var(--fhc-border);
+}
+
+.fhc-link-color{
+	color: var(--fhc-link);
+}
+
+.fhc-text{
+	color: var(--fhc-text) !important;
+}
+
+:root{	
+	/* sidebar colors */
+	--fhc-cis-sidebar-bg: var(--fhc-tertiary);
+	--fhc-cis-menu-bg: var(--fhc-tertiary);
+
+	--fhc-cis-header-px: 1rem;
+	--fhc-cis-header-py: .5rem;
+	--fhc-cis-main-px: 1.5rem;
+	--fhc-cis-main-py: 1.5rem;
+
+	--fhc-cis-menu-lvl-1-bg: var(--fhc-primary);
+	--fhc-cis-menu-lvl-1-color: var(--fhc-text);
+	--fhc-cis-menu-lvl-1-bg-hover: var(--fhc-primary-highlight);
+	--fhc-cis-menu-lvl-1-color-hover: var(--fhc-text);
+
+	--fhc-cis-menu-lvl-2-bg: var(--fhc-tertiary);
+	--fhc-cis-menu-lvl-2-color: var(--fhc-text);
+	--fhc-cis-menu-lvl-2-bg-hover: var(--fhc-tertiary-highlight);
+	--fhc-cis-menu-lvl-2-color-hover: var(--fhc-text);
+
+	--fhc-cis-menu-lvl-3-bg: var(--fhc-secondary);
+	--fhc-cis-menu-lvl-3-color: var(--fhc-text);
+	--fhc-cis-menu-lvl-3-bg-hover: var(--fhc-secondary-highlight);
+	--fhc-cis-menu-lvl-3-color-hover: var(--fhc-text);
+
+	--fhc-cis-menu-lvl-4-bg: var(--fhc-fourth);
+	--fhc-cis-menu-lvl-4-color: var(--fhc-text);
+	--fhc-cis-menu-lvl-4-bg-hover: var(--fhc-fourth-highlight);
+	--fhc-cis-menu-lvl-4-color-hover: var(--fhc-text);
+
+	--fhc-cis-menu-lvl-5-bg: var(--fhc-fifth);
+	--fhc-cis-menu-lvl-5-color: var(--fhc-text);
+	--fhc-cis-menu-lvl-5-bg-hover: var(--fhc-fifth-highlight);
+	--fhc-cis-menu-lvl-5-color-hover: var(--fhc-text);
+	--fhc-cis-grade-positive: var(--fhc-success);
+	--fhc-cis-grade-negative: var(--fhc-danger);
+}
+
 @media (min-width: 992px) {
-  :root {
-    --fhc-cis-menu-width: 250px;
-    --fhc-cis-header-height: 60px;
-    --fhc-cis-menu-bg: #72777A;
-  }
+	:root {
+		--fhc-cis-menu-width: 250px;
+		--fhc-cis-header-height: 60px;
+	}
 }
+
 @media (max-width: 991.98px) {
-  :root {
-    --fhc-cis-menu-width: 400px;
-    --fhc-cis-header-height: 40px;
-    --fhc-cis-menu-bg: #343a40;
-  }
+	:root {
+		--fhc-cis-menu-width: 400px;
+		--fhc-cis-header-height: 40px;
+	}
 }
 
 /* lvMenu entry style */
+#cis-menu .menu-entry {
+	color: var(--fhc-text);
+}
+
+[disabled="true"].menu-entry {
+	pointer-events: none;
+	cursor: default;
+	background-color: var(--fhc-disabled) !important;
+	color: black !important;
+	opacity: 0.75;
+	-webkit-touch-callout: none;
+	/* iOS Safari */
+	-webkit-user-select: none;
+	/* Safari */
+	-khtml-user-select: none;
+	/* Konqueror HTML */
+	-moz-user-select: none;
+	/* Old versions of Firefox */
+	-ms-user-select: none;
+	/* Internet Explorer/Edge */
+	user-select: none;
+}
+
 #cis-menu .menu-entry:hover{
-	background-color: var(--fhc-cis-primary);
-	color:white;
+	background-color: var(--fhc-primary);
+	color:var(--fhc-light);
 }
 
 /* buttons */
@@ -199,6 +319,7 @@ html {
 
 /* searchbar */
 #nav-search {
+  background-color: var(--fhc-primary);
   z-index: 1;
 }
 #nav-search.me-3 {
@@ -227,9 +348,16 @@ html {
 }
 
 #cis-main {
+  color: var(--fhc-text);
+  background-color: var(--fhc-background);
+  border-color: var(--fhc-border);
   padding: var(--fhc-cis-main-py) var(--fhc-cis-main-px);
 }
 
+#cis-main .fa-arrow-up-right-from-square {
+	color: var(--fhc-link) !important;
+}
+
 #nav-main-sticky {
 	max-height: calc(100vh - var(--fhc-cis-header-height));
 }
@@ -249,10 +377,6 @@ html {
   display: flex;
 }
 
-.fhc-active {
-  background-color: var(--fhc-cis-menu-lvl-2-color-active) !important;
-}
-
 .fhc-seperator {
   position: relative;
 }
@@ -265,7 +389,7 @@ html {
   margin-left: 12.5%;
   width: 75%; /* Full width of the parent element */
   height: 1px; /* Height of the border */
-  background: linear-gradient(to right, #ffffff, var(--fhc-cis-primary), #ffffff);
+  background: linear-gradient(to right, var(--fhc-background), var(--fhc-primary), var(--fhc-background));
   opacity: 0.8; /* Adjust opacity for a subtle fade effect */
 }
 
@@ -299,7 +423,7 @@ html {
     left: 0;
     height: var(--fhc-cis-header-height);
     width: var(--fhc-cis-menu-width);
-    background-color: var(--fhc-cis-primary);
+    background-color: var(--fhc-primary);
     padding: var(--fhc-cis-header-py) var(--fhc-cis-header-px);
     z-index: 2;
   }
@@ -331,7 +455,7 @@ html {
   }
   #nav-main-toggle .collapsed .fa-arrow-circle-left {
     transform: scaleX(-1);
-    color: var(--bs-dark);
+    color: var(--fhc-black-40);
   }
   #nav-search {
     position: fixed;
@@ -349,7 +473,7 @@ html {
   #nav-user-btn {
     border-width: 0;
     padding: var(--fhc-cis-header-py) var(--fhc-cis-header-px);
-    background-color: var(--fhc-cis-primary);
+    background-color: var(--fhc-primary);
   }
   #nav-user-btn img {
     object-fit: contain;
@@ -359,7 +483,7 @@ html {
   #nav-user-menu {
     position: absolute;
     min-width: var(--fhc-cis-menu-width);
-    background-color: var(--fhc-cis-menu-lvl-2-bg);
+    background-color: var(--fhc-dark);
   }
 
   #nav-user-menu img {
@@ -394,7 +518,7 @@ html {
     margin-top: var(--fhc-cis-header-height);
   }
   #cis-header {
-    background-color: var(--fhc-cis-primary);
+    background-color: var(--fhc-primary);
     height: var(--fhc-cis-header-height);
     position: fixed;
     width: 100vw;
@@ -431,18 +555,23 @@ html {
   }
   #nav-user-menu {
     position: absolute;
-	background-color: var(--fhc-cis-menu-lvl-2-bg);
+	background-color: var(--fhc-dark);
   }
   #nav-main-menu {
     display: block;
   }
 }
+
+#nav-main{
+	background-color: var(--fhc-cis-sidebar-bg);
+}
+
 /* Typography */
 .fhc-header {
   display: flex;
   justify-content: space-between;
   align-items: end;
-  border-bottom: 1px solid #dee2e6;
+  border-bottom: 1px solid var(--fhc-border);
   margin: 1rem 0;
 }
 .fhc-header > h1 {
@@ -454,7 +583,7 @@ html {
   }
 }
 .fhc-header > h1 > small {
-  color: #6c757d;
+  color: var(--fhc-secondary);
   font-size: 1rem;
 }
 .fhc-header > h1 > small:before {
@@ -465,7 +594,7 @@ html {
   text-decoration: none;
 }
 .fhc-header > a:after {
-  color: var(--bs-body-color);
+  color: var(--fhc-text);
   content: "\f059";
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
@@ -482,7 +611,7 @@ html {
 [disabled="true"].fhc-entry {
 	pointer-events: none;
 	cursor: default;
-	background-color: #dadada !important;
+	background-color: var(--fhc-disabled) !important;
 	color: black !important;
 	-webkit-touch-callout: none; /* iOS Safari */
 	-webkit-user-select: none;/* Safari */
diff --git a/public/css/Cis4/CisVariables.css b/public/css/Cis4/CisVariables.css
new file mode 100644
index 000000000..53af08837
--- /dev/null
+++ b/public/css/Cis4/CisVariables.css
@@ -0,0 +1,265 @@
+/* css overrides for static cms content */
+@import './CisVariablesCms.css';
+
+/* colors */
+:root {
+
+	--fhc-black-10:black;
+	--fhc-black-20: #1d2024;
+	--fhc-black-30: #212529;
+	--fhc-black-40: #292b2a;
+	--fhc-black-50: #2B3035;
+	--fhc-black-60: #2c3136;
+	--fhc-black-70: #343a40;
+
+	--fhc-white-10: #FFFFFF;
+	--fhc-white-20:#f6f6f6;
+	--fhc-white-30:#eceff1;
+	--fhc-white-40:#e9ecef;
+	--fhc-white-50:#dee2e6;
+	--fhc-white-60:#d5dae0;
+	--fhc-white-70:#ced4da;
+	--fhc-white-80:#c7cbcf;
+	--fhc-white-90:#aeb3b8;
+
+	--fhc-gray-10: #858f97;
+	--fhc-gray-20: #72777A;
+	--fhc-gray-30: #616568;
+	--fhc-gray-40: #495057;
+
+	--fhc-blue-10: #0a57ca;
+	--fhc-blue-20: #79b7d8;
+	/*  --fhc-blue-20: #00649c;*/
+	--fhc-blue-30: #00598d;
+	/*--fhc-blue-40: #005585;*/
+	--fhc-blue-40: #61aed8;
+	--fhc-blue-50: #00507e;
+
+	--fhc-blue-primary: #00649c;
+	--fhc-blue-primary-highlight: #005585;
+
+	--fhc-red-10: #842029;
+	--fhc-red-20: #800000;
+	
+	--fhc-green-10: #008000;
+
+	--fhc-beige-10: rgba(245, 233, 215,0.5);
+	--fhc-beige-20: rgba(172, 153, 125,0.5);
+	
+	
+
+}
+
+:root.light{
+	
+
+	/* fhc base colors */
+	--fhc-primary: var(--fhc-blue-20);
+	--fhc-primary-highlight: var(--fhc-blue-40);
+
+	--fhc-tertiary: var(--fhc-white-20);
+	--fhc-tertiary-highlight: var(--fhc-white-40);
+
+	--fhc-secondary: var(--fhc-white-40);
+	--fhc-secondary-highlight: var(--fhc-white-60);
+
+	--fhc-fourth: var(--fhc-white-60);
+	--fhc-fourth-highlight: var(--fhc-white-80);
+
+	--fhc-fifth: var(--fhc-white-80);
+	--fhc-fifth-highlight: var(--fhc-white-90);
+
+	/*background*/
+	--fhc-background: var(--fhc-white-10);
+	--fhc-background-highlight: var(--fhc-white-60);
+	
+	/*text*/
+	--fhc-text: var(--fhc-black-30);
+	
+	/* shadows and borders */
+	--fhc-shadow-20: rgba(0, 0, 0, 0.2);
+	--fhc-shadow-40: rgba(0, 0, 0, 0.4);
+	--fhc-shadow-60: rgba(0, 0, 0, 0.6);
+	--fhc-shadow-80: rgba(0, 0, 0, 0.8);
+	--fhc-box-shadow: var(--fhc-white-50);
+	--fhc-border: var(--fhc-white-50);
+	--fhc-border-highlight: var(--fhc-gray-40);
+
+	/* links */
+	--fhc-link: var(--fhc-blue-10);
+
+	/* disabled */
+	--fhc-disabled: var(--fhc-gray-10);
+
+	/* status colors */
+	--fhc-danger: var(--fhc-red-10);
+	--fhc-success: var(--fhc-green-10);
+	--fhc-dark: var(--fhc-black-30);
+	--fhc-light: var(--fhc-white-50);
+
+
+}
+
+:root.dark{
+
+	/* fhc base colors */
+	--fhc-primary: var(--fhc-blue-primary-highlight);
+	--fhc-primary-highlight: var(--fhc-blue-primary);
+
+	--fhc-secondary: var(--fhc-black-70);
+	--fhc-secondary-highlight: var(--fhc-gray-40);
+
+	--fhc-tertiary: var(--fhc-black-50);
+	--fhc-tertiary-highlight: var(--fhc-black-70);
+
+	--fhc-danger: var(--fhc-red-10);
+
+	/*background*/
+	--fhc-background: var(--fhc-black-30);
+	--fhc-background-highlight: var(--fhc-black-20);
+
+	/*text*/
+	--fhc-text: var(--fhc-white-50);
+
+	/* shadows and borders */
+	--fhc-shadow-20: rgba(125, 125, 125, 0.2);
+	--fhc-shadow-40: rgba(125, 125, 125, 0.4);
+	--fhc-shadow-60: rgba(125, 125, 125, 0.6);
+	--fhc-shadow-80: rgba(125, 125, 125, 0.8);
+	--fhc-box-shadow: var(--fhc-gray-40);
+	--fhc-border: var(--fhc-gray-40);
+	--fhc-border-highlight: var(--fhc-white-90);
+
+	/* links */
+	--fhc-link: var(--fhc-white-70);
+
+	/* disabled */
+	--fhc-disabled: var(--fhc-gray-10);
+
+	/* status colors */
+	--fhc-danger: var(--fhc-red-10);
+	--fhc-success: var(--fhc-green-10);
+	--fhc-dark: var(--fhc-black-50);
+	--fhc-light: var(--fhc-white-70);
+
+}
+
+:root.purple {
+
+	--fhc-purple-primary: rgb(150, 120, 255);
+	--fhc-purple-primary-highlight: rgb(170, 140, 255);
+	--fhc-purple-5: rgb(245, 240, 255);
+	--fhc-purple-10: rgb(235, 225, 255);
+	--fhc-purple-20: rgb(220, 200, 255);
+	--fhc-purple-30: rgb(200, 170, 255);
+	--fhc-purple-40: rgb(180, 140, 240);
+	--fhc-purple-50: rgb(160, 110, 225);
+	--fhc-purple-60: rgb(140, 90, 210);
+	--fhc-purple-70: rgb(120, 70, 195);
+	--fhc-purple-80: rgb(100, 50, 180);
+	--fhc-purple-90: rgb(80, 30, 165);
+
+	/* fhc base colors */
+	--fhc-primary: var(--fhc-purple-primary-highlight);
+	--fhc-primary-highlight: var(--fhc-purple-primary);
+
+	--fhc-secondary: var(--fhc-purple-30);
+	--fhc-secondary-highlight: var(--fhc-purple-50);
+
+	--fhc-tertiary: var(--fhc-purple-20);
+	--fhc-tertiary-highlight: var(--fhc-purple-40);
+
+	/* background */
+	--fhc-background: var(--fhc-purple-5);
+	--fhc-background-highlight: var(--fhc-purple-10);
+
+	/* text */
+	--fhc-text: var(--fhc-black-20);
+
+	/* shadows and borders */
+	--fhc-shadow-20: rgba(150, 100, 200, 0.2);
+	--fhc-shadow-40: rgba(150, 100, 200, 0.4);
+	--fhc-shadow-60: rgba(150, 100, 200, 0.6);
+	--fhc-shadow-80: rgba(150, 100, 200, 0.8);
+	--fhc-box-shadow: var(--fhc-white-50);
+	--fhc-border: var(--fhc-white-50);
+	--fhc-border-highlight: var(--fhc-gray-40);
+
+	/* links */
+	--fhc-link: var(--fhc-black-50);
+
+	/* disabled */
+	--fhc-disabled: var(--fhc-purple-20);
+
+	/* status colors */
+	--fhc-danger: var(--fhc-red-10);
+	--fhc-success: var(--fhc-green-10);
+	--fhc-dark: var(--fhc-black-20);
+	--fhc-light: var(--fhc-white-70);
+
+}
+
+/* fhc primary*/
+html.dark .bg-primary,
+html.dark .btn-primary,
+html.dark .btn-outline-primary {
+	background-color: var(--fhc-primary) !important;
+	border-color: var(--fhc-primary) !important;
+	color: white;
+}
+
+html.dark .btn-outline-primary:hover,
+html.dark .btn-primary:hover {
+	filter: brightness(90%);
+}
+
+html.dark .text-primary {
+	color: var(--fhc-primary) !important;
+}
+
+html.dark .btn-outline-primary,
+html.dark .border-primary {
+	border-color: var(--fhc-primary) !important;
+}
+
+/* fhc danger*/
+html.dark .bg-danger,
+html.dark .btn-danger,
+html.dark .btn-outline-danger {
+	background-color: var(--fhc-danger) !important;
+	border-color: var(--fhc-danger) !important;
+	color: white;
+}
+
+html.dark .btn-outline-danger:hover,
+html.dark .btn-danger:hover {
+	filter: brightness(90%);
+}
+
+html.dark .text-danger {
+	color: var(--fhc-danger) !important;
+}
+
+html.dark .border-danger {
+	border-color: var(--fhc-danger) !important;
+}
+
+
+html.dark .tabulator,
+html.dark .tabulator .tabulator-header,
+html.dark .tabulator .tabulator-header .tabulator-col,
+html.dark .tabulator .tabulator-table,
+html.dark .tabulator .tabulator-row {
+	background-color: var(--fhc-tertiary) !important;
+	color: var(--fhc-text) !important;
+	border-color: var(--fhc-border) !important;
+}
+
+html.dark .tabulator .tabulator-cell {
+	background-color: var(--fhc-secondary) !important;
+	border-color: var(--fhc-border) !important;
+}
+
+html.dark .tabulator .tabulator-header .tabulator-col:hover {
+	background-color: var(--fhc-secondary) !important;
+}
\ No newline at end of file
diff --git a/public/css/Cis4/CisVariablesCms.css b/public/css/Cis4/CisVariablesCms.css
new file mode 100644
index 000000000..a5e46a6f9
--- /dev/null
+++ b/public/css/Cis4/CisVariablesCms.css
@@ -0,0 +1,14 @@
+/* css overrides for dark mode */
+html.dark #fhc-cms-content *[style*="color"] {
+	color: var(--fhc-text) !important;
+}
+
+/* fhc cms classes */
+html.dark #fhc-cms-content a {
+	color: var(--fhc-link);
+}
+
+html.dark #fhc-cms-content img {
+	background-color: var(--fhc-text);
+	color: var(--fhc-background);
+}
\ No newline at end of file
diff --git a/public/css/Cis4/Cms.css b/public/css/Cis4/Cms.css
index 13b90aac5..4151e7500 100644
--- a/public/css/Cis4/Cms.css
+++ b/public/css/Cis4/Cms.css
@@ -11,14 +11,14 @@
 	margin-inline-start: 0 !important;
 }
 #cms a.btn-outline-primary {
-	color: var(--fhc-cis-primary);
-	border-color: var(--fhc-cis-primary);
+	color: var(--fhc-primary);
+	border-color: var(--fhc-primary);
 }
 #cms a.btn-outline-primary:hover,
 #cms a.btn-outline-primary:focus {
 	color: #fff;
-	background-color: var(--fhc-cis-primary);
-	border-color: var(--fhc-cis-primary);
+	background-color: var(--fhc-primary);
+	border-color: var(--fhc-primary);
 }
 #cms a.btn-primary {
 	color: var(--fhc-cis-menu-lvl-1-color);
diff --git a/public/css/Fhc.css b/public/css/Fhc.css
index 6e6a25200..c5368930d 100644
--- a/public/css/Fhc.css
+++ b/public/css/Fhc.css
@@ -10,7 +10,7 @@
   font-size: calc(1.325rem + .9vw);
 }
 .fhc-header > :first-child > small {
-  color: var(--bs-secondary);
+  color: var(--fhc-secondary);
   font-size: .65em;
   padding-inline-start: 1em;
 }
diff --git a/public/css/FilterWidget.css b/public/css/FilterWidget.css
index 6c33f63b8..5723de69e 100644
--- a/public/css/FilterWidget.css
+++ b/public/css/FilterWidget.css
@@ -1,8 +1,15 @@
+:root{
+	--filter-widget-border: var(--fhc-dark);
+	--filter-widget-color: var(--fhc-dark);
+	--filter-widget-primary: var(--fhc-primary);
+	--filter-widget-border-light: var(--fhc-border);
+}
+
 .filter-name-title {
 	font-family: inherit;
 	font-size: 16px;
 	line-height: 1.1;
-	color: black;
+	color: var(--filter-widget-color);
 }
 
 .panel-title {
@@ -26,7 +33,7 @@
 }
 
 .drag-and-drop-fields-span {
-	border: 1px solid black;
+	border: 1px solid var(--filter-widget-border);
 	border-radius: 7px;
 	margin-right: 6px;
 	margin-bottom: 10px;
@@ -64,7 +71,7 @@
 	right: 100%;
 	height: 100%;
 	margin-right: 3px;
-	border-left: 2px solid #428bca;
+	border-left: 2px solid var(--filter-widget-primary);
 }
 
 .selection-after::after {
@@ -74,7 +81,7 @@
 	left: 100%;
 	height: 100%;
 	margin-left: 3px;
-	border-right: 2px solid #428bca;
+	border-right: 2px solid var(--filter-widget-primary);
 }
 
 .applied-filter-operation {
@@ -139,10 +146,10 @@
 
 .up-down-border {
 	border-top-width: 1px;
-	border-top-color: #ddd;
+	border-top-color: var(--filter-widget-border-light);
 	border-top-style: solid;
 	border-bottom-width: 1px;
-	border-bottom-color: #ddd;
+	border-bottom-color: var(--filter-widget-border-light);
 	border-bottom-style: solid;
 }
 
diff --git a/public/css/components/FilterComponent.css b/public/css/components/FilterComponent.css
index 50bfe561e..805987a84 100644
--- a/public/css/components/FilterComponent.css
+++ b/public/css/components/FilterComponent.css
@@ -1,3 +1,9 @@
+:root{
+	--fhc-filtercomponent-primary: var(--fhc-primary);
+	--fhc-filtercomponent-bg:var(--fhc-background);
+	--fhc-filtercomponent-border:var(--fhc-border);
+}
+
 .filter-header-title {
 	text-align: right;
 }
@@ -26,9 +32,9 @@
 	margin-left: 7px;
 	padding: 11px;
 	display: inline-block;
-	background-color: white;
+	background-color: var(--fhc-filtercomponent-bg);
 	border-style: solid;
-	border-color: black;
+	border-color: var(--fhc-filtercomponent-border);
 	border-width: 1px;
 	border-radius: 7px;
 	font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
@@ -47,7 +53,7 @@
         right: 100%;
         height: 100%;
         margin-right: 3px;
-        border-left: 2px solid #428bca;
+        border-left: 2px solid var(--fhc-filtercomponent-primary);
 }
 
 .selection-after::after {
@@ -57,7 +63,7 @@
         left: 100%;
         height: 100%;
         margin-left: 3px;
-        border-right: 2px solid #428bca;
+        border-right: 2px solid var(--fhc-filtercomponent-primary);
 }
 
 .filter-table-dataset {
diff --git a/public/css/components/FormUnderline.css b/public/css/components/FormUnderline.css
index 6b3092b49..f41883265 100644
--- a/public/css/components/FormUnderline.css
+++ b/public/css/components/FormUnderline.css
@@ -8,11 +8,13 @@
   
   }
   
-  
+  a.form-underline-content{
+	color: var(--fhc-link);
+  }
   
   .form-underline .form-underline-content{
     border-width: 1px;
-    border-color: transparent transparent #dee2e6 transparent;
+    border-color: transparent transparent var(--fhc-border) transparent;
     border-style: solid;
     padding-bottom: 0.25rem;
     padding-left: 0.5rem;
diff --git a/public/css/components/MyLv.css b/public/css/components/MyLv.css
index 2ce544582..b7176fb35 100644
--- a/public/css/components/MyLv.css
+++ b/public/css/components/MyLv.css
@@ -1,4 +1,8 @@
+:root{
+	--myLv-disabled: var(--fhc-disabled);
+}
+
 .unavailable, .unavailable:hover{
-	color: #565e647f !important;
+	color: var(--myLv-disabled) !important;
 	cursor: default;
 }
diff --git a/public/css/components/NavigationComponent.css b/public/css/components/NavigationComponent.css
index 429a131b5..bf38d3d8c 100644
--- a/public/css/components/NavigationComponent.css
+++ b/public/css/components/NavigationComponent.css
@@ -1,13 +1,24 @@
 /*
  * Hederer
  */
+
+ :root{
+	--nav-component-bg: var(--fhc-secondary);
+	--nav-component-border: var(--fhc-border);
+	--nav-component-color: var(--fhc-text);
+	--nav-left-component-border: var(--fhc-border);
+	--nav-left-component-bg: var(--fhc-secondary);
+	--nav-left-component-color: var(--fhc-primary);
+	--nav-left-component-hover: var(--fhc-secondary-highlight);
+ }
+
 .navbar-header {
-	background-color: #f8f8f8;
+	background-color: var(--nav-component-bg);
 	padding-top: 0px;
 	padding-bottom: 0px;
 	padding-left: 10px;
 	border-style: solid;
-	border-color: #e7e7e7;
+	border-color: var(--nav-component-border);
 	border-width: 0 0 1px;
 }
 
@@ -15,7 +26,7 @@
 	font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
 	font-size: 18px;
 	line-height: 1.42857143;
-	color: #5e5e5e !important;
+	color: var(--nav-component-color) !important;
 	padding-top: 15px !important;
 	padding-right: 7px !important;
 	padding-left: 7px !important;
@@ -34,8 +45,8 @@
 	z-index: 1;
 	position: absolute;
 	width: 250px;
-	border-right: 1px solid #e7e7e7;
-	background-color: #f8f8f8;
+	border-right: 1px solid ;
+	background-color:var(--nav-left-component-bg);
 }
 
 .navbar-left-side ul {
@@ -43,7 +54,7 @@
 }
 
 .navbar-left-side ul li {
-	border-bottom: 1px solid #e7e7e7;
+	border-bottom: 1px solid var(--nav-left-component-border);
 }
 
 .left-side-menu-second-level {
@@ -67,7 +78,7 @@
 	font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
 	font-size: 14px;
 	line-height: 1.42857143;
-	color: #23527c;
+	color: var(--nav-left-component-color);
 	padding-top: 10px !important;
 	padding-bottom: 10px !important;
 	padding-left: 7px !important;
@@ -76,7 +87,7 @@
 }
 
 .left-side-menu-link-entry:hover {
-	background-color: #eee;
+	background-color: var(--nav-left-component-hover);
 }
 
 /*
diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
index aa9932cd7..de6adbee7 100644
--- a/public/css/components/Profil.css
+++ b/public/css/components/Profil.css
@@ -1,11 +1,14 @@
 
-
+:root{
+	--profil-border: var(--fhc-border);
+	--profil-tabulator-shadow:var(--fhc-shadow-20);
+}
 
 
 .image-lock{
   height:22px; 
   width:21px; 
-  background-color:white; 
+  background-color:var(--profil-border); 
   position:absolute;
   /* top: 1px is important, otherwise it goes over the border of the thumbnail*/ 
   top:1px; 
@@ -18,7 +21,7 @@
 
 .tabulator-collapsed-row{
     padding:15px;
-    background-color: rgba(0,0,0,0.1);
+    background-color: var(--profil-tabulator-shadow);
 
 }
 
diff --git a/public/css/components/Sprachen.css b/public/css/components/Sprachen.css
index 73dfa563f..028b4f2f2 100644
--- a/public/css/components/Sprachen.css
+++ b/public/css/components/Sprachen.css
@@ -1,9 +1,13 @@
 .sprachen-entry{
-	background-color: var(--fhc-cis-primary-hover);
+	background-color: var(--fhc-primary);
+}
+
+.sprachen-entry:hover {
+	background-color: var(--fhc-primary);
 }
 
 [selected="true"].sprachen-entry {
-	background-color: var(--fhc-cis-primary);
+	background-color: var(--fhc-primary-highlight);
 }
 
 .sprachen-entry.btn {
diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 9edc1c0f2..10958f03f 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -1,14 +1,44 @@
 :root{
-	--fhc-calendar-pane-height: calc(100vh - 220px);
-	--fhc-calendar-past: #F5E9D7
+	--calendar-pane-height: calc(100vh - 220px);
+	
+	--calendar-primary: var(--fhc-primary);
+	--calendar-border: var(--fhc-border);
+	--calendar-border-highlight: var(--fhc-border-highlight);
+	--calendar-text: var(--fhc-text);
+	--calendar-text-light: var(--fhc-text);
+	--calendar-bg: var(--fhc-background);
+	--calendar-hour-indicator-bg: var(--fhc-background);
+	--calendar-week-page-header-background: var(--fhc-background);
+	--calendar-week-page-header-color: var(--fhc-text);
+	--calendar-week-page-header-border: var(--fhc-border);
+	--calendar-week-page-header-hover-background: var(--fhc-background-highlight);
+	--calendar-all-day-event-background: var(--fhc-background);
+	--calendar-past: var(--fhc-beige-10);
 }
 
-.fhc-calendar-week-page-header {
-  background-color: #e9ecef;
+:root.dark{
+	--calendar-past: var(--fhc-beige-20);
+}
+
+.fhc-calendar-hour-indicator{
+	border-top: 1px solid var(--calendar-border);
+}
+
+.fhc-calendar-hour-indicator span{
+	background-color: var(--calendar-hour-indicator-bg) !important;
+}
+
+.fhc-calendar-week-page-header{
+	color: var(--calendar-text);
+	background-color: var(--calendar-week-page-header-background);
+}
+
+.fhc-calendar-week-page-header > div {
+	border-right: 1px solid var(--calendar-border);
 }
 
 .fhc-calendar-week-page-header > div:hover{
-	background-color: #dddfe2;
+	background-color: var(--calendar-week-page-header-hover-background);
 }
 
 .fhc-calendar-months .col-4,
@@ -70,7 +100,7 @@
 }
 
 .fhc-calendar-week-page .all-day-event-border{
-	box-shadow: 1px 1px 0 #dee2e6;
+	box-shadow: 1px 1px 0 var(--fhc-box-shadow);
 }
 
 .fhc-calendar-week-page .all-day-event{
@@ -85,7 +115,7 @@
 	grid-template-columns:repeat(7,1fr);
 	width:100%;
 	z-index:3;
-	background-color:white;
+	background-color:var(--calendar-all-day-event-background);
 }
 
 .fhc-calendar-week-page .all-day-event-container::before {
@@ -95,12 +125,12 @@
 	bottom: 0;
 	left: -3em;
 	right: 100%;
-	background-color: white;
-	box-shadow: 1px 1px 0 #dee2e6;
+	background-color: var(--calendar-all-day-event-background);
+	box-shadow: 1px 1px 0 var(--fhc-box-shadow);
 }
 
 .fhc-calendar-day-page .all-day-event-border {
-	box-shadow: 0 0 0 1px #dee2e6;
+	box-shadow: 0 0 0 1px var(--fhc-box-shadow);
 }
 
 .fhc-calendar-day-page .all-day-event {
@@ -116,13 +146,13 @@
 	grid-template-columns: 3em 1fr;
 	width: 100%;
 	z-index: 3;
-	background-color:white;
-	box-shadow: 1px 1px 0 #dee2e6;
+	background-color:var(--calendar-all-day-event-background);
+	box-shadow: 1px 1px 0 var(--fhc-box-shadow);
 }
 
 /* grid hour lines of the Stundenplan use box-shadow instead of border because box-shadow renders consistently on different viewports*/
 .box-shadow-border{
-	box-shadow: 0 0 0 1px #dee2e6 !important;
+	box-shadow: 0 0 0 1px var(--calendar-border) !important;
 }
 
 .fhc-calendar-no-events-overlay{
@@ -137,7 +167,7 @@
 	margin:auto;
 	width: 100%;
 	height: 100%;
-	background-image: linear-gradient(120deg, white, gray );
+	background-image: linear-gradient(120deg, var(--fhc-background), var(--fhc-dark) );
 	opacity: .7;
 }
 .fhc-calendar-day-page {
@@ -150,9 +180,7 @@
 .fhc-calendar-day-page .flex-column > .flex-grow-1 {
   padding-left: 3em;
 }
-.fhc-calendar-day-page .flex-column {
-	border-right: 1px solid #dee2e6;
-}
+
 .fhc-calendar-day-page .events {
   display: grid;
   grid-template-columns: 3em 1fr;
@@ -164,11 +192,19 @@
   display: grid;
 }
 
+.fhc-calendar-month-page-day{
+	color: var(--calendar-text) !important;
+}
+
+.fhc-calendar-month-page-day.fhc-calendar-past:not(.fhc-calendar-month-page-day-focusday) {
+	color: var(--fhc-text) !important;
+}
+
 .fhc-calendar-lg .fhc-calendar-month-page-day,
 .fhc-calendar-lg .fhc-calendar-month-page-weekday,
 .fhc-calendar-md .fhc-calendar-month-page-day,
 .fhc-calendar-md .fhc-calendar-month-page-weekday {
-  border: solid 1px #dee2e6;
+  border: solid 1px var(--calendar-border);
 }
 .fhc-calendar-lg .fhc-calendar-month-page-day,
 .fhc-calendar-md .fhc-calendar-month-page-day {
@@ -178,7 +214,7 @@
 }
 .fhc-calendar-lg .fhc-calendar-month-page-day.active,
 .fhc-calendar-md .fhc-calendar-month-page-day.active {
-  border-color: var(--bs-secondary);
+  border-color: var(--calendar-border-highlight);
 }
 /*.fhc-calendar-lg .fhc-calendar-month-page-day .events,*/
 /*.fhc-calendar-md .fhc-calendar-month-page-day .events {*/
@@ -223,8 +259,8 @@
 }
 
 .fhc-calendar-month-page-weekday:hover {
-	background-color:#37789c;
-	color:white;
+	background-color:var(--calendar-primary);
+	color:var(--calendar-text-light);
 	
 }
 
@@ -237,14 +273,14 @@
 
 
 .fhc-calendar-past {
-	background-color: var(--fhc-calendar-past);
-	border-color: #E8E8E8;
+	background-color: var(--calendar-past);
+	border-color: var(--calendar-border);
 	opacity: 0.5;
 }
 
 .fhc-calendar-month-page-day-focusday {
-	border-color: black !important;
-	background-color: white;
+	border-color: var(--calendar-border-highlight) !important;
+	background-color: var(--calendar-bg);
 	position: relative;
 	animation: dash-animation 2.5s linear infinite;
 }
@@ -276,20 +312,20 @@
 	bottom:0;
 	left:0;
 	right:0;
-	box-shadow: inset 0 0 0 2px black !important;
+	box-shadow: inset 0 0 0 2px var(--calendar-border) !important;
 	pointer-events: none;
 	z-index: 2;
 }
 
 .fhc-calendar-sm .fhc-calendar-month-page-day.active .no,
 .fhc-calendar-xs .fhc-calendar-month-page-day.active .no {
-  background-color: rgba(var(--bs-info-rgb), 0.25);
+  background-color: var(--calendar-primary);
   border-radius: 50%;
   font-weight: bold;
 }
 .fhc-calendar-sm .fhc-calendar-month-page-day:not(.active):hover .no,
 .fhc-calendar-xs .fhc-calendar-month-page-day:not(.active):hover .no {
-  background-color: rgba(var(--bs-secondary-rgb), 0.25);
+  background-color: var(--calendar-primary);
   border-radius: 50%;
 }
 /*.fhc-calendar-sm .fhc-calendar-month-page-day .no,*/
@@ -317,6 +353,57 @@
 }
 
 .selectedEvent {
-	background-color: #00649c !important;
-	color: white;
+	background-color: var(--calendar-primary) !important;
+	color: var(--calendar-text-light);
+}
+
+.fhc-calendar-day-page .curTimeIndicator{
+	position: absolute;
+	left: 0;
+	right: 0;
+	pointer-events: none;
+	padding-left: 7rem;
+	margin-top: -1px;
+	z-index: 2;
+	border-color: var(--calendar-border)!important;
+}
+
+.fhc-calendar-week-page .curTimeIndicator {
+	position: absolute;
+	left: 0;
+	right: 0;
+	pointer-events: none;
+	padding-left: 1rem;
+	margin-top: -1px;
+	z-index: 2;
+	border-color: var(--calendar-border) !important;
+}
+
+.fhc-calendar-week-page .past::before{
+	content:"";
+	background-color: var(--calendar-past);
+	position: absolute;
+	pointer-events: none;
+	z-index: 2;
+	opacity: 0.5;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
+}
+
+.fhc-calendar-week-page .overlay {
+	background-color: var(--calendar-past);
+	position: absolute;
+	pointer-events: none;
+	z-index: 2;
+	opacity: 0.5;
+}
+
+.fhc-calendar-day-page .overlay {
+	background-color: var(--calendar-past);
+	position: absolute;
+	pointer-events: none;
+	z-index: 2;
+	opacity: 0.5;
 }
\ No newline at end of file
diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index e742f7fa4..ef7b9caaa 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -1,6 +1,21 @@
 @import './calendar.css';
 @import './dashboard/news.css';
 
+:root{
+	--dashboard-danger: var(--fhc-danger);
+	--fhc-dashboard-grid-size: 4;
+}
+
+@media(max-width: 577px) {
+	:root {
+		--fhc-dashboard-grid-size: 1;
+	}
+}
+
+.core-dashboard a{
+	color: var(--fhc-link);
+}
+
 .empty-tile-hover {
 	height: 100%;
 	width: 100%;
@@ -16,18 +31,11 @@
 }
 
 .alert-danger .form-check-input:checked {
-	border-color: #842029;
-	background-color: #842029;
+	border-color: var(--dashboard-danger);
+	background-color: var(--dashboard-danger);
 }
 
-:root {
-	--fhc-dashboard-grid-size: 4;
-}
-@media(max-width: 577px) {
-	:root {
-		--fhc-dashboard-grid-size: 1;
-	}
-}
+
 
 .mirror-x {
 	transform: scaleX(-1);
@@ -40,5 +48,8 @@
 	cursor: move;
 }
 
+#deleteBookmark i{
+	color: var(--fhc-danger);
+}
 
 
diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index 58d9ad263..d65b51592 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -1,5 +1,10 @@
 :root{
     --news-widget-height: 1;
+	--news-widget-bg: var(--fhc-primary);
+	--news-widget-highlight-color: var(--fhc-primary-highlight);
+	--news-widget-border: var(--fhc-border);
+	--news-widget-border-highlight: var(--fhc-border-highlight);
+	--news-widget-text-light: var(--fhc-text);
 }
 
 
@@ -48,31 +53,26 @@
 
 .fhc-news-menu-item {
     padding: 0.375rem;
-    color: var(--fhc-cis-menu-lvl-1-color);
+    color: var(--news-widget-text-light);
     min-height: 5%;
     max-height: 30%;
     width: 100%;
     justify-content: space-between;
     align-items: center;
-    background-color: #00649c;
-    border: 1px solid #f1f1f1;
+    background-color: var(--news-widget-bg);
+    border: 1px solid var(--news-widget-border);
     cursor: pointer;
     transition: background-color 0.2s ease, border-color 0.2s ease; /* Smooth transition */
 }
 
 .fhc-news-menu-item:hover {
-    background-color: var(--fhc-cis-menu-lvl-1-bg-hover);
-    border-color: #f1f1f1;
-}
-
-.fhc-news-menu-item:active {
-    background-color: var(--fhc-cis-menu-lvl-1-color-hover);
-    border-color: #f1f1f1;
+    background-color: var(--news-widget-highlight-color);
+    border-color: var(--news-widget-border-highlight);
 }
 
 .fhc-news-menu-item.selected {
-    background-color: var(--fhc-cis-menu-lvl-1-bg-hover);
-    border-right: 2px solid #fff;
+    background-color: var(--news-widget-highlight-color);
+    border: 2px solid var(--news-widget-border-highlight);
     
 }
 
diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css
index 3250a20c7..6aa84c716 100644
--- a/public/css/components/searchbar/searchbar.css
+++ b/public/css/components/searchbar/searchbar.css
@@ -5,28 +5,35 @@
 
 @import url(./switches.css);
 
-#search-filter{
-    border: 1px solid #ced4da;
+:root{
+	--searchbar-shadow: var(--fhc-shadow-40);
 }
 
-
 .searchbar_settings {
-    position: absolute; 
+	position: absolute; 
     z-index: 9999; 
-    background-color: #343a40;
+    background-color: var(--fhc-dark);
 }
 
 .searchbar_results {
     position: absolute; 
     z-index: 9998; 
-    background-color: #fff; 
-    border: 1px solid lightgrey;
+    background-color: var(--fhc-background); 
+    border: 1px solid var(--fhc-border);
     padding: .5rem;
     top: 100%;
     width: 100%;
     left: 0;
     right: 0;
-	box-shadow: 2px 2px 4px rgba(0, 0, 0, .4);
+	box-shadow: 2px 2px 4px var(--searchbar-shadow);
+}
+
+.searchbar_results a{
+	color: var(--fhc-link);
+}
+
+.searchbar_results a:not(a~i) {
+	color: inherit;
 }
 
 .searchbar_results_scroller {
@@ -35,7 +42,7 @@
 }
 
 .searchbar_result {
-    border-bottom: 1px solid lightgrey;
+    border-bottom: 1px solid var(--fhc-border);
     margin-bottom: 1rem;
 }
 
diff --git a/public/css/components/searchbar/switches.css b/public/css/components/searchbar/switches.css
index 164976514..64da02ce8 100644
--- a/public/css/components/searchbar/switches.css
+++ b/public/css/components/searchbar/switches.css
@@ -1,23 +1,24 @@
+:root{
+	--fhc-switches-checked-bg: var(--fhc-light);
+	--fhc-switches-unchecked-bg: var(--fhc-disabled);
+	--fhc-switches-shadow: var(--fhc-shadow-20);
+}
+
 .fhc-switches:checked  {
-    background-color: white !important;
-    border-color: white !important;
+    background-color: var(--fhc-switches-checked-bg) !important;
+    border-color: transparent;
     background-position: right center !important;
-    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%23000000'/%3e%3c/svg%3e") !important;
+    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='black'/%3e%3c/svg%3e") !important;
 }
 
 .fhc-switches  {
-    background-color: var(--bs-gray-600) !important;
-    border-color: var(--bs-gray-600) !important;
+    background-color: var(--fhc-switches-unchecked-bg) !important;
+    border-color: transparent;
     background-position: left center !important;
-    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%238e99a3'/%3e%3c/svg%3e") !important;
+    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%236b747a'/%3e%3c/svg%3e") !important;
 }
 
 .fhc-switches:focus  {
-    box-shadow: 0 0 0 .25rem rgba(108, 117, 125,.25);
+    box-shadow: 0 0 0 .25rem var(--fhc-switches-shadow);
 }
 
-/*.form-switch .form-check-input:checked {
- 
-
-rgb(52, 58, 64)*/
-
diff --git a/public/css/components/verticalsplit.css b/public/css/components/verticalsplit.css
index 8d8599ec4..1d5a56788 100644
--- a/public/css/components/verticalsplit.css
+++ b/public/css/components/verticalsplit.css
@@ -3,9 +3,9 @@
     Author     : bambi
 */
 :root {
-    --fhc-verticalsplit-vsplitter-bg-color: #eee;
-    --fhc-verticalsplit-vsplitter-border-color: #eee;
-    --fhc-verticalsplit-vsplitter-splitactions-color: #000;
+    --fhc-verticalsplit-vsplitter-bg-color: var(--fhc-background);
+    --fhc-verticalsplit-vsplitter-border-color: var(--fhc-border);
+    --fhc-verticalsplit-vsplitter-splitactions-color: var(--fhc-dark);
 }
 
 .verticalsplitted {
diff --git a/public/css/lehre/anrechnung.css b/public/css/lehre/anrechnung.css
index 50914aa1f..22e2641fe 100644
--- a/public/css/lehre/anrechnung.css
+++ b/public/css/lehre/anrechnung.css
@@ -24,46 +24,6 @@
     border-color: #DEE2E6 !important;
 }
 
-.bg-info-subtle{
-    background-color: #D9EDF7 !important; 
-    color: #31708F !important;
-    border-style: solid !important;
-    border-width: 1px !important;
-    border-color: #BCE8F1 !important;
-}
-
-.bg-warning-subtle{
-    background-color: #FFF3CD !important; 
-    color: #664D03 !important;
-    border-style: solid !important;
-    border-width: 1px !important;
-    border-color: #FFE69C !important;
-}
-
-.bg-success-subtle{
-    background-color: #D1E7DD !important; 
-    color: #0A3622 !important;
-    border-style: solid !important;
-    border-width: 1px !important;
-    border-color: #A3CFBB !important;
-}
-
-.bg-danger-subtle{
-    background-color: #F8D7DA !important; 
-    color: #672B31 !important;
-    border-style: solid !important;
-    border-width: 1px !important;
-    border-color: #F1AEB5 !important;
-}
-
-.bg-primary-subtle{
-    background-color: #CFE2FF !important; 
-    color: #052C65 !important;
-    border-style: solid !important;
-    border-width: 1px !important;
-    border-color: #9EC5FE !important;
-}
-
 
 /* html attribute disabled and title don't work together, sets the pointer-event to auto in order to see the title toolip */
 .btn:disabled {
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index b339c12fc..ece6141b8 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -136,13 +136,7 @@ export default {
 		},
 		overlayStyle() {
 			return {
-				'background-color': '#F5E9D7',
-				'position': 'absolute',
-				'pointer-events': 'none',
-				'z-index': 2,
 				height:  this.getDayTimePercent + '%',
-				opacity: 0.5,
-				overflow: 'hidden'
 			}
 		},
 		pageHeaderStyle() {
@@ -178,7 +172,7 @@ export default {
 				'padding-left': '3.5rem',
 				'margin-top': '-1px',
 				'z-index': 2,
-				'border-color': '#00649C!important',
+				'border-color': 'var(--fhc-border)',
 				top: this.hourPosition + 'px',
 				left: 0,
 				right: 0,
@@ -190,14 +184,7 @@ export default {
 		},
 		curIndicatorStyle() {
 			return {
-				'pointer-events': 'none',
-				'padding-left': '7rem',
-				'margin-top': '-1px',
-				'z-index': 2,
-				'border-color': '#00649C!important',
 				top:  this.getDayTimePercent + '%',
-				left: 0,
-				right: 0,
 			}
 		},
 		noEventsCondition() {
@@ -280,8 +267,7 @@ export default {
 			}
 
 			if(this.date.compare(this.todayDate)) {
-				styleObj['backgroundImage'] = 'linear-gradient(to bottom, #F5E9D7 '+this.getDayTimePercent+'%, #FFFFFF '+this.getDayTimePercent+'%)'
-				styleObj['border-color'] = '#E8E8E8';
+				styleObj['backgroundImage'] = 'linear-gradient(to bottom, var(--calendar-past) '+this.getDayTimePercent+'%, transparent '+this.getDayTimePercent+'%)'
 				// styleObj.opacity = 0.5; // would opaque the whole column
 			}
 
@@ -390,7 +376,7 @@ export default {
 	<div class="fhc-calendar-day-page h-100">
 		<div class="row m-0 h-100">
 			<div style="overflow:auto" class="col-12 col-xl-6 p-0 h-100">
-				<div class="d-flex flex-column h-100">
+				<div class="d-flex flex-column h-100 border">
 					<div ref="header" class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="pageHeaderStyle">
 						<div type="button" class="flex-grow-1" :title="dayText.heading" @click.prevent="changeToMonth(day)">
 							<div class="fw-bold">{{dayText.tag}}</div>
@@ -432,16 +418,16 @@ export default {
 
 
 							<div >
-								<h1 v-if="noEventsCondition" class="m-0 text-secondary" ref="noEventsText" :style="noLvStyle">{{ $p.t('lehre/noLvFound') }}</h1>
+								<h1 v-if="noEventsCondition" class="m-0 bs-body" ref="noEventsText" :style="noLvStyle">{{ $p.t('lehre/noLvFound') }}</h1>
 								<div class="events position-relative" :class="{'fhc-calendar-no-events-overlay':noEventsCondition}" ref="events" @mousemove="calcHourPosition" @mouseleave="hourPosition = null">
 									<Transition>
 										<div v-if="hourPosition && !noEventsCondition" class="position-absolute border-top small"  :style="indicatorStyle">
-											<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
+											<span class="border border-top-0 px-2">{{hourPositionTime}}</span>
 										</div>
 									</Transition>
 									<Transition>
-										<div v-if="lookingAtToday && !noEventsCondition" class="position-absolute border-top small"  :style="curIndicatorStyle">
-											<span class="border border-top-0 px-2 bg-white">{{curTime}}</span>
+										<div v-if="lookingAtToday && !noEventsCondition" class="curTimeIndicator border-top small"  :style="curIndicatorStyle">
+											<span class="border border-top-0 px-2">{{curTime}}</span>
 										</div>
 									</Transition>
 									<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border" :style="hourGridStyle(hour)"></div>
@@ -450,7 +436,7 @@ export default {
 									</div>
 									<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start" :style="dayGridStyle(day)">
 										
-										<div v-if="lookingAtToday && !noEventsCondition" :style="overlayStyle"></div>
+										<div v-if="lookingAtToday && !noEventsCondition" class="overlay" :style="overlayStyle"></div>
 										<div v-for="event in day.events" :key="event" :style="eventGridStyle(day,event)" v-contrast 
 											:selected="event.orig == selectedEvent" class="fhc-entry mx-2 small rounded overflow-hidden" >
 											<!-- desktop version of the page template, parent receives slotProp mobile = false -->
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 2cdf8b21d..3f9d9ad67 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -123,7 +123,7 @@ export default {
 			if(day.getDate() === this.todayDate.getDate() 
 				&& day.getMonth() === this.todayDate.getMonth() 
 				&& day.getFullYear() === this.todayDate.getFullYear()) {
-				styleObj['background-color'] = '#00649c'; // fh blau
+				styleObj['background-color'] = 'var(--fhc-primary)'; 
 				styleObj.color = 'white';
 			}
 			
@@ -137,8 +137,8 @@ export default {
 	},
 	template: /*html*/`
 	<div class="fhc-calendar-month-page" :class="{'show-weeks': showWeeks}">
-		<div v-if="showWeeks" class=" bg-light fw-bold border-top border-bottom text-center"></div>
-		<div v-for="day in weeks[0].days" :key="day" class="bg-light fw-bold border-top border-bottom text-center">
+		<div v-if="showWeeks" class=" fw-bold border-top border-bottom text-center"></div>
+		<div v-for="day in weeks[0].days" :key="day" class=" fw-bold border-top border-bottom text-center">
 			{{dayText[day]}}
 		</div>
 		<template v-for="week in weeks"
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 1fe82ff0e..b7705b1ed 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -63,6 +63,11 @@ export default {
 			const now = new Date();
 			return String(now.getHours()).padStart(2, '0') + ':' + String(now.getMinutes()).padStart(2, '0');
 		},
+		curIndicatorStyle() {
+			return {
+				top: this.getDayTimePercent + '%',
+			}
+		},
 		pageHeaderStyle(){
 			return {
 				'z-index': 4,
@@ -74,27 +79,11 @@ export default {
 		},
 		overlayStyle() {
 			return {
-				'background-color': '#F5E9D7',
-				'position': 'absolute',
-				'pointer-events': 'none',
-				'z-index': 2,
 				height:  this.getDayTimePercent + '%',
 				width: this.laneWidth + 'px',
-				opacity: 0.5
-			}
-		},
-		indicatorStyle() {
-			return {
-				'pointer-events': 'none',
-				'padding-left': '3.5rem',
-				'margin-top': '-1px',
-				'z-index': 2,
-				'border-color': '#00649C!important',
-				top: this.hourPosition + 'px',
-				left: 0,
-				right: 0,
 			}
 		},
+		
 		hours(){
 			// returns an array with elements starting at 7 and ending at 24
 			return [...Array(24).keys()].filter(hour => hour >= 7 && hour <= 24);
@@ -171,16 +160,16 @@ export default {
 				d.getDate() === this.todayDate.getDate()
 			)
 		},
-		curIndicatorStyle() {
-
+		indicatorStyle() {
 			return {
 				'pointer-events': 'none',
-				'padding-left': '1rem',
+				'padding-left': '3.5rem',
 				'margin-top': '-1px',
 				'z-index': 2,
-				'border-color': '#00649C!important',
-				top: this.getDayTimePercent + '%',
-				width: this.laneWidth + 'px'
+				'border-color': 'var(--fhc-border)',
+				top: this.hourPosition + 'px',
+				left: 0,
+				right: 0,
 			}
 		},
 		getDayTimePercent() {
@@ -211,14 +200,12 @@ export default {
 				'grid-template-rows': 'repeat(' + (this.hours.length * 60 / this.smallestTimeFrame) + ', 1fr)',
 			}
 			if(day.isPast) {
-				styleObj['background-color'] = '#F5E9D7'
-				styleObj['border-color'] = '#E8E8E8';
-				styleObj.opacity = 0.5;
+				//styleObj['background-color'] = 'var(--calendar-past)'
+				styleObj['border-color'] = 'var(--fhc-border)';
 			} else if (day.isToday) {
 				
-				styleObj['backgroundImage'] = 'linear-gradient(to bottom, #F5E9D7 '+this.getDayTimePercent+'%, #FFFFFF '+this.getDayTimePercent+'%)'
-				styleObj['border-color'] = '#E8E8E8';
-				styleObj.opacity = 0.5;
+				//styleObj['backgroundImage'] = 'linear-gradient(to bottom, var(--calendar-past) '+this.getDayTimePercent+'%, transparent '+this.getDayTimePercent+'%)'
+				styleObj['border-color'] = 'var(--fhc-border)';
 			}
 			
 			return styleObj
@@ -335,7 +322,7 @@ export default {
 	},
 	template: /*html*/`
 	<div ref="page" class="fhc-calendar-week-page" style="min-width: 700px;">
-		<div class="d-flex flex-column">
+	<div class="d-flex flex-column">
 			<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="pageHeaderStyle" >
 				<div type="button" v-for="day in days" :key="day" class="flex-grow-1" :title="dayText[day]?.heading" @click.prevent="changeToDay(day)">
 					<div class="fw-bold">{{dayText[day]?.tag}}</div>
@@ -357,7 +344,7 @@ export default {
 								:style="{'background-color': event?.color, 'margin-bottom':'1px'}"
 								class="d-grid m-1 small rounded overflow-hidden fhc-entry"
 								v-contrast
-								>		
+								>
 								<slot class="p-1" name="weekPage" :event="event" :day="day">
 									<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 								</slot>
@@ -366,22 +353,22 @@ export default {
 					</div>
 				</div>
 				<div class="events position-relative" :ref="'eventsRef'+week" @mousemove="calcHourPosition" @mouseleave="hourPosition = null">
-					<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border" :style="hourGridStyle(hour)"></div>
+					<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour" class="position-absolute box-shadow-border" :style="hourGridStyle(hour)"></div>
 					<Transition>
-						<div v-if="hourPosition" class="position-absolute border-top small"  :style="indicatorStyle">
-							<span class="border border-top-0 px-2 bg-white">{{hourPositionTime}}</span>
+						<div v-if="hourPosition" class="fhc-calendar-hour-indicator position-absolute small" :style="indicatorStyle" >
+							<span class=" border border-top-0 px-2 ">{{hourPositionTime}}</span>
 						</div>
 					</Transition>
 					<div class="hours">
 						<div v-for="hour in hours" :style="getGridStyle" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
-					<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start position-relative" :style="dayGridStyle(day)">
+					<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" :class="{'past':day.isPast}" class=" day border-start position-relative" :style="dayGridStyle(day)">
 						<Transition>
-							<div v-if="day.isToday" class="position-absolute border-top small"  :style="curIndicatorStyle">
-								<span class="border border-top-0 px-2 bg-white">{{curTime}}</span>
+							<div v-if="day.isToday" class="border-top small curTimeIndicator" :style="curIndicatorStyle">
+								<span class="fhc-body-bg border border-top-0 px-2">{{curTime}}</span>
 							</div>
 						</Transition>
-						<div v-if="day.isToday" :style="overlayStyle"></div>
+						<div v-if="day.isToday" class="overlay" :style="overlayStyle"></div>
 						<div v-for="event in day.events" :key="event" @click.prevent="weekPageClick(event.orig, day)" 
 						:selected="event.orig == selectedEvent"
 						:style="eventGridStyle(day,event)"
diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
index d657322ba..90fb095f0 100644
--- a/public/js/components/Cis/Cms/Content.js
+++ b/public/js/components/Cis/Cms/Content.js
@@ -88,7 +88,9 @@ export default {
 	},
 	template: /*html*/ `
     <!-- div that contains the content -->
-    <component ref="content" :is="computeContentType" v-if="content" :content="content" :content_id="content_id_internal" />
+	<div id="fhc-cms-content" v-if="content">
+    	<component ref="content" :is="computeContentType" :content="content" :content_id="content_id_internal" />
+	</div>
     <p v-else>No content is available to display</p>
     `,
 };
diff --git a/public/js/components/Cis/Cms/Content_types/General.js b/public/js/components/Cis/Cms/Content_types/General.js
index 692843e3e..85716ef43 100644
--- a/public/js/components/Cis/Cms/Content_types/General.js
+++ b/public/js/components/Cis/Cms/Content_types/General.js
@@ -85,26 +85,36 @@ export default {
                 .then(() => {
                   Axios.get(el.href)
                     .then((res) => {
-                      // TODO(chris): check for success then show message and/or reload
-                      location = location;
+                    	// TODO(chris): check for success then show message and/or reload
+                    	location = location;
                     })
                     .catch((err) => console.error("ERROR:", err));
                 })
                 .catch(() => {});
             });
           });
-          document.querySelectorAll("#cms [data-href]").forEach((el) => {
+        document.querySelectorAll("#cms [data-href]").forEach((el) => {
             el.href = el.dataset.href.replace(
-              /^ROOT\//,
-              FHC_JS_DATA_STORAGE_OBJECT.app_root
+            	/^ROOT\//,
+            	FHC_JS_DATA_STORAGE_OBJECT.app_root
             );
-          });
+        });
 			
-			document.querySelectorAll("[href]").forEach((element) => {
-				let orignal_href = element.getAttribute("href");
-				let new_href = replaceRelativeLegacyLink(orignal_href);
-				element.href = new_href;
-			});
+		document.querySelectorAll("[href]").forEach((element) => {
+			let orignal_href = element.getAttribute("href");
+			let new_href = replaceRelativeLegacyLink(orignal_href);
+			element.href = new_href;
+		});
+
+		document.querySelectorAll("[style*=background-color]").forEach((element) => {
+			if (element.style.backgroundColor == "rgb(255, 255, 255)"){
+				element.style.backgroundColor = "var(--fhc-background)";
+			}
+			if(element.querySelector("*[style*=background-color]")){
+				element.style.backgroundColor = "var(--fhc-secondary)";
+			}
+		});
+
     },
     template: /*html*/ `
       <!-- div that contains the content -->
diff --git a/public/js/components/Cis/Cms/News.js b/public/js/components/Cis/Cms/News.js
index 1567cbef4..81d26e6c5 100644
--- a/public/js/components/Cis/Cms/News.js
+++ b/public/js/components/Cis/Cms/News.js
@@ -80,7 +80,7 @@ export default {
 	<hr/>
 	<pagination v-show="content?true:false" :page_size="page_size"  @page="page=$event.page; loadNewPageContent($event)" :maxPageCount="maxPageCount">
 	</pagination>
-	<div class="container-fluid">
+	<div class="container-fluid mt-4">
 		<div class="row">
 			<div class="col" v-html="content">
 			</div>
diff --git a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
index 30e6ecb6a..c984b46eb 100644
--- a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
+++ b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
@@ -26,7 +26,7 @@ components:{
 	StudiengangVertretung,
 },
 template:/*html*/`
-
+		<div id="fhc-studiengang-informationen">
 		<template v-if="studiengang?.bezeichnung && semester">
 			<div class="card card-body mb-3">
 				<div class="mb-1">
@@ -35,7 +35,7 @@ template:/*html*/`
 				</div>
 				<div class="mb-1">
 					<h2 class="mb-1 pb-0">Moodle:</h2>
-					<a class="mb-1" target="_blank" :href="moodleLink">{{studiengang?.kurzbzlang}}</a>
+					<a class="fhc-link-color mb-1" target="_blank" :href="moodleLink">{{studiengang?.kurzbzlang}}</a>
 				</div>
 				<div :class="{'mb-1':studiengang?.zusatzinfo_html}">
 					<h2 class="mb-1 pb-0">{{$p.t('lehre','studiensemester')}}: </h2>
@@ -72,6 +72,7 @@ template:/*html*/`
 		<template v-if="jahrgangsvertr && Array.isArray(jahrgangsvertr) && jahrgangsvertr.length >0">
 			<studiengang-vertretung :title="$p.t('studiengangInformation', 'Jahrgangsvertretung')" :vertretungsList="jahrgangsvertr"></studiengang-vertretung>
 		</template>
+		</div>
 	
 `,
 computed:{
diff --git a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js
index 10e74ef84..3b9481013 100644
--- a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js
+++ b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js
@@ -20,16 +20,16 @@ export default {
 			<img  :src="base64Image" alt="mitarbeiter_foto" style="width: 110px; height: auto; object-fir:scale-down;" class="card-img-top" >
 		</div>
 		<div class="card-body">
-			<h6 class="text-center card-title mb-0">{{fullname}} <a v-if="profilViewLink" :href="profilViewLink"><i class="ms-2 fa fa-arrow-up-right-from-square" style="color:#00649C"></i></a></h6>
+			<h6 class="text-center card-title mb-0">{{fullname}} <a v-if="profilViewLink" :href="profilViewLink"><i class="ms-2 fa fa-arrow-up-right-from-square fhc-primary-color" ></i></a></h6>
 		</div>
 		<hr class="my-0">
 		<div class="card-body">
-			
+
 			<div class="flex flex-column gap-3">
 			<div class="mb-3">
 				<span>
 					<i class="fa fa-phone me-2"></i>
-					<a :href="phone.link">{{phone.number}}</a>
+					<a class="fhc-link-color" :href="phone.link">{{phone.number}}</a>
 				</span>
 			</div>
 			<div class="mb-3">
@@ -41,7 +41,7 @@ export default {
 			<div>
 				<span>
 					<i class="fa-regular fa-envelope me-2"></i>
-					<a :href="email_link" v-html="formattedEmail"></a>
+					<a class="fhc-link-color" :href="email_link" v-html="formattedEmail"></a>
 				</span>
 			</div>
 			
diff --git a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js
index abb476c19..142050e9e 100644
--- a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js
+++ b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js
@@ -12,7 +12,7 @@ export default {
 		<div class="card-body">
 			<p v-for="vertretung in vertretungsList">
 				<a v-if="profilViewLink(vertretung.uid)" :href="profilViewLink(vertretung.uid)">
-					<i class="me-2 fa fa-arrow-up-right-from-square" style="color:#00649C"></i>
+					<i class="me-2 fa fa-arrow-up-right-from-square fhc-primary-color" ></i>
 				</a>
 				{{vertretungFormatedName(vertretung,false)}}
 			</p>
diff --git a/public/js/components/Cis/DarkTheme.js b/public/js/components/Cis/DarkTheme.js
new file mode 100644
index 000000000..2d3192b6d
--- /dev/null
+++ b/public/js/components/Cis/DarkTheme.js
@@ -0,0 +1,51 @@
+export default {
+	data:()=>{
+		return{
+			theme:'light',
+			themes:['light','dark','purple'],
+		}
+	},
+	methods:{
+		toggleTheme(theme){
+			if(!theme) return;
+
+			for(const theme of this.themes){
+				document.documentElement.classList.remove(theme);
+			}
+			document.documentElement.classList.add(theme);
+
+			document.body.setAttribute("data-bs-theme", theme);
+
+			let stylesheet = document.querySelector('link[href*="primevue/resources/themes"]');
+			if(theme =="dark"){
+				stylesheet.attributes.href.value = stylesheet.attributes.href.value.replace("bootstrap4-light-blue", "bootstrap4-dark-blue");
+			}else if(theme =="light"){
+				stylesheet.attributes.href.value = stylesheet.attributes.href.value.replace("bootstrap4-dark-blue", "bootstrap4-light-blue");
+			} 
+
+			localStorage.setItem("theme",theme);
+			this.theme = theme;
+		}
+	},
+	computed:{
+		nextTheme(){
+			return this.themes[(this.themes.indexOf(this.theme) + 1) % this.themes.length];
+		},
+	},
+	mounted(){
+		const theme =localStorage.getItem("theme");
+		if(this.themes.includes(theme)){
+			this.theme = theme;
+		}
+		this.toggleTheme(this.theme);
+
+	},
+	template:/*html*/`
+
+	<button @click="toggleTheme(nextTheme)" class="fhc-primary-highlight-bg align-self-center btn btn-secondary rounded-5">
+		<i v-if="theme == 'light'" class="fa-solid fa-moon fhc-text"></i>
+		<i v-else-if="theme == 'dark'" class="fa-solid fa-sun fhc-text"></i>
+		<i v-else-if="theme == 'purple'" class="fa-solid fa-wine-bottle"></i>
+	</button>
+	`
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index ebab00109..08934cc78 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -1,12 +1,14 @@
 import CisMenuEntry from "./Menu/Entry.js";
 import FhcSearchbar from "../searchbar/searchbar.js";
 import CisSprachen from "./Sprachen.js"
+import DarkTheme from "./DarkTheme.js";
 
 export default {
     components: {
         CisMenuEntry,
         FhcSearchbar,
 		CisSprachen,
+		DarkTheme,
     },
     props: {
 		rootUrl: String,
@@ -103,10 +105,15 @@ export default {
 	<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" style="background-color:var(--fhc-cis-primary)" class="fhc-searchbar w-100 py-1 py-lg-2" :searchoptions="searchbaroptions" :searchfunction="searchfunction"></fhc-searchbar>
-    <a id="nav-logo" class="d-none d-lg-block" :href="rootUrl">
-        <img :src="logoUrl" alt="Logo">
-    </a>
+	<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="nav-logo" class="d-none d-lg-block">
+		<div class="d-flex h-100">
+			<a :href="rootUrl">
+				<img :src="logoUrl" alt="Logo">
+			</a>
+			<dark-theme></dark-theme>
+		</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" class="bg-dark avatar rounded-circle border border-dark"/>
@@ -115,19 +122,19 @@ export default {
 		@[\`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 class="btn-level-2"><a class="btn btn-level-2 rounded-0 d-block" :href="site_url + '/Cis/Profil'" id="menu-profil">Profil</a></li>
-			<li class="btn-level-2">
+			<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 class="btn-level-2"><hr class="dropdown-divider m-0 "></li>
-			<li><a class="btn btn-level-2 rounded-0 d-block" :href="logoutUrl">Logout</a></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>
-    <nav id="nav-main" class="offcanvas offcanvas-start bg-dark" tabindex="-1" aria-labelledby="nav-main-btn" data-bs-backdrop="false">
+    <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 bg-dark">
-				<button type="button" class="btn bg-dark text-light rounded-0 p-1 d-flex align-items-center" data-bs-toggle="collapse" data-bs-target=".nav-menu-collapse" aria-expanded="true" aria-controls="nav-sprachen nav-main-menu">
-					<i class="fa fa-arrow-circle-left"></i>
+			<div id="nav-main-toggle" class="position-static d-none d-lg-block ">
+				<button type="button" class="btn text-light rounded-0 p-1 d-flex align-items-center" data-bs-toggle="collapse" data-bs-target=".nav-menu-collapse" aria-expanded="true" aria-controls="nav-sprachen nav-main-menu">
+					<i class="fa fa-arrow-circle-left fhc-text"></i>
 				</button>
 			</div>
 			<div class="offcanvas-body p-0">
diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
index 514e34779..f8ef0dd70 100644
--- a/public/js/components/Cis/Mylv/LvInfo.js
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -115,7 +115,7 @@ export default {
 							:''
 						}}</th>
 						<td>
-							<a v-if="event.ort_content_id" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+							<a v-if="event.ort_content_id" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1 fhc-primary-color" ></i></a>
 							{{event.ort_kurzbz}}
 						</td>
 					</tr>
@@ -135,7 +135,7 @@ export default {
 						}}</th>
 						<td>
 							<div v-for="lektor in event.lektor" class="d-block">
-								<a v-if="lektorenLinks[lektor.kurzbz]" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+								<a v-if="lektorenLinks[lektor.kurzbz]" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1 fhc-primary-color" ></i></a>
 								{{lektor.kurzbz}}
 							</div>
 						</td>
diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index fc6a3a723..d554b0e95 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -63,7 +63,7 @@ export default {
 				<div style="min-height:150px; min-width:150px;" class="col-12 col-lg-6 col-xl-4" v-for="(menuItem, index) in menu" :key="index">
 					<a :id="menuItem.name" :class="{'dropdown-toggle':menuItem.c4_moodle_links?.length }"  role="button" :href="c4_link(menuItem)"
 					:disabled="c4_disabled(menuItem)" :data-bs-toggle="menuItem.c4_moodle_links?.length?'dropdown':null"
-					class="menu-entry p-2 w-100 text-wrap border border-1 rounded-3 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link-dark h-100">
+					class="menu-entry p-2 w-100 text-wrap border border-1 rounded-3 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link h-100">
 						<img :src="menuItem.c4_icon" :alt="menuItem.name" />
 						<p @click="selectMenu(menuItem)" class="w-100 mt-2">{{menuItem.name}}</p>
 						<p v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)" class="mt-1 w-100" :index="index">{{text}}</p>
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 8a7354305..379f60498 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -219,25 +219,25 @@ const RoomInformation = {
 				</span>
 			</template>
 			<template #weekPage="{event,day}">
-				<div @click="showModal(event?.orig)" type="button" class=" border border-secondary border d-flex flex-column align-items-center justify-content-evenly h-100">
-					<span>{{event?.orig.topic}}</span>
-					<span v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</span>
-					<span>{{event?.orig.ort_kurzbz}}</span>
+				<div @click="showModal(event)" type="button" class=" border border-secondary border d-flex flex-column align-items-center justify-content-evenly h-100">
+					<span>{{event?.topic}}</span>
+					<span v-for="lektor in event?.lektor">{{lektor.kurzbz}}</span>
+					<span>{{event?.ort_kurzbz}}</span>
 				</div>
 			</template>
 			<template #dayPage="{event,day,mobile}">
-				<div @click="mobile? showModal(event?.orig):null" type="button" class="fhc-entry border border-secondary border row h-100 justify-content-center align-items-center text-center">
+				<div @click="mobile? showModal(event):null" type="button" class="fhc-entry border border-secondary border row h-100 justify-content-center align-items-center text-center">
 					<div class="col ">
 						<p>{{ $p.t('lehre/lehrveranstaltung') }}:</p>
-						<p class="m-0">{{event?.orig.topic}}</p>
+						<p class="m-0">{{event?.topic}}</p>
 					</div>
 					<div class="col ">
 						<p>{{ $p.t('lehre/lektor') }}:</p>
-						<p class="m-0" v-for="lektor in event?.orig.lektor">{{lektor.kurzbz}}</p>
+						<p class="m-0" v-for="lektor in event?.lektor">{{lektor.kurzbz}}</p>
 					</div>
 					<div class="col ">
 						<p>{{ $p.t('profil/Ort') }}: </p>
-						<p class="m-0">{{event?.orig.ort_kurzbz}}</p>
+						<p class="m-0">{{event?.ort_kurzbz}}</p>
 					</div>
 				</div>
 			</template>
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index c0129d1d1..cb05e7fe4 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -48,11 +48,11 @@ export default {
 			// returns a suitable color for the given grade
 			if (this.positiv)
 			{
-				return 'var(--fhc-cis-grade-positive)';
+				return 'var(--fhc-success)';
 			}
 			else
 			{
-				return 'var(--fhc-cis-grade-negative)';
+				return 'var(--fhc-danger)';
 			}
 		},
 		is_organisatorische_einheit(){
@@ -179,9 +179,9 @@ export default {
 								<i :class="[menuItem.c4_icon2 ? menuItem.c4_icon2 : 'fa-solid fa-pen-to-square', !menuItem.c4_link ? 'unavailable' : null ]"></i>
 							</div>
 							<a
-							class="text-decoration-none text-truncate"
+							class="fhc-body text-decoration-none text-truncate"
 							:id="'moodle_links_'+lehrveranstaltung_id"
-							:class="{'link-dark':menuItem.c4_link, 'unavailable':!menuItem.c4_link, 'dropdown-toggle':menuItem.c4_moodle_links?.length }"
+							:class="{ 'unavailable':!menuItem.c4_link, 'dropdown-toggle':menuItem.c4_moodle_links?.length }"
 							:target="menuItem.c4_target"
 							:href="c4_link(menuItem) ? c4_link(menuItem) : null">
 								{{ menuItem.phrase ? $p.t(menuItem.phrase) : menuItem.name}}
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
index 2c0f7f044..9e0eb4a0c 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv/Info.js
@@ -114,7 +114,7 @@ export default {
 							<td>
 								<ul v-if="lektorNames.length" class="list-unstyled mb-0">
 									<li v-for="name in new Set(lektorNames)" :key="name">
-									<a :href="lektorNamesLinks[name]?lektorNamesLinks[name]:null"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+									<a :href="lektorNamesLinks[name]?lektorNamesLinks[name]:null"><i class="fa fa-arrow-up-right-from-square me-1 fhc-primary-color" ></i></a>
 										{{name}}
 									</li>
 								</ul>
@@ -128,7 +128,7 @@ export default {
 							<td>
 								<ul class="list-unstyled mb-0">
 									<li v-for="name in lvLeitung" :key="name">
-										<a :href="lektorNamesLinks[name]?lektorNamesLinks[name]:null"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+										<a :href="lektorNamesLinks[name]?lektorNamesLinks[name]:null"><i class="fa fa-arrow-up-right-from-square me-1 fhc-primary-color" ></i></a>
 										{{name}}
 									</li>
 								</ul>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Adresse.js b/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
index 996cdfb87..5ba2f1fe7 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Adresse.js
@@ -19,7 +19,7 @@ export default {
     
         <!-- column 1 in the address row -->
         <div class="col-1 text-center">
-            <i class="fa fa-location-dot fa-lg" style="color:#00649C "></i>
+            <i class="fa fa-location-dot fa-lg fhc-link-color" ></i>
         </div>
         
         <div  class="col-11 col-sm-8 col-xl-11 col-xxl-8 order-1">
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index 4c7411cdf..e75696a4d 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -174,9 +174,9 @@ export default {
                                         <div  class="align-middle text-center"><i role="button" @click="showEditProfilModal(item)" class="fa fa-eye"></i></div>
                                     </template>
                                     <template v-else >
-                                        <div class="align-middle text-center" ><i style="color:#00639c" @click="showEditProfilModal(item)" role="button" class="fa fa-edit"></i></div>
+                                        <div class="align-middle text-center" ><i  @click="showEditProfilModal(item)" role="button" class="fa fa-edit fhc-primary-color"></i></div>
                                     </template>
-                                    <div class="align-middle text-center"><i style="color:red" role="button" @click="deleteRequest(item)" class="fa fa-trash"></i></div>
+                                    <div class="align-middle text-center"><i role="button" @click="deleteRequest(item)" class="text-danger fa fa-trash"></i></div>
                                 </div>
                             </td>
                         </template>          
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js b/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
index 704e5a1ef..3d703f6b6 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
@@ -14,7 +14,7 @@ export default{
     template:/*html*/`
     <div class="gy-2 row align-items-center justify-content-center">
         <div class="col-1 text-center" >
-            <i class="fa-solid " :class="{...(data.kontakt.includes('@')?{'fa-envelope':true}:{'fa-phone':true})}" style="color:rgb(0, 100, 156)"></i>
+            <i class="fa-solid fhc-link-color" :class="{...(data.kontakt.includes('@')?{'fa-envelope':true}:{'fa-phone':true})}" ></i>
         </div>
         <div :class="{...(data.anmerkung? {'col-11':true, 'col-md-6':true, 'col-xl-11':true, 'col-xxl-6':true} : {'col-10':true, 'col-xl-9':true, 'col-xxl-10':true})}">
             <!-- rendering KONTAKT emails -->
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
index 82b0aad57..cf2bc22e3 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
@@ -20,10 +20,10 @@ export default {
                 <div class="col-12 ">
                     <div class="row">  
                         <div class="col-1 ">
-                            <i class="fa-solid fa-envelope" style="color: #00649C;"></i>
+                            <i class="fa-solid fa-envelope fhc-link-color" ></i>
                         </div>
                         <div class="col">
-                            <a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
+                            <a class="fhc-link-color" :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
                         </div>
                     </div>
                 </div> 
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
index 43ef807ba..1342aed8e 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
@@ -22,7 +22,7 @@ export default {
             <div v-for="email in data" class="col-12 ">
                 <div class="row align-items-center">
                     <div class="col-1 text-center">
-                        <i class="fa-solid fa-envelope" style="color:rgb(0, 100, 156)"></i>
+                        <i class="fa-solid fa-envelope fhc-link-color" ></i>
                     </div>
                     <div class="col-11">
                         <div class="form-underline">
diff --git a/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js b/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
index e49fa624a..2e2ec0c6e 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
@@ -49,7 +49,7 @@ export default {
 						<span v-else-if="key == 'semester' && entry.value"  class="form-underline-content">
 							{{ entry.value }}
 							<a class="ms-auto mb-2" target="_blank" :href="getLinkSemesterListe">
-								<i class="fa fa-arrow-up-right-from-square me-1"></i>
+								<i class="fa fa-arrow-up-right-from-square me-1 fhc-link-color"></i>
 							</a>
 						</span>
 						
@@ -57,7 +57,7 @@ export default {
 						<span v-else-if="key =='verband' && entry.value"  class="form-underline-content">
 							{{ entry.value }}
 							<a class="ms-auto mb-2" target="_blank" :href="getLinkVerbandListe">
-								<i class="fa fa-arrow-up-right-from-square me-1"></i>
+								<i class="fa fa-arrow-up-right-from-square me-1 fhc-link-color"></i>
 							</a>
 						</span>
 						
@@ -65,7 +65,7 @@ export default {
 						<span v-else-if="key == 'gruppe' && entry.value"  class="form-underline-content">
 							{{ entry.value }}
 							<a class="ms-auto mb-2" target="_blank" :href="getLinkGruppeListe">
-								<i class="fa fa-arrow-up-right-from-square me-1"></i>
+								<i class="fa fa-arrow-up-right-from-square me-1 fhc-link-color"></i>
 							</a>
 						</span>
 						
diff --git a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
index c30f1ab89..05e08cefe 100644
--- a/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
+++ b/public/js/components/Cis/ProfilUpdate/ProfilUpdateView.js
@@ -248,7 +248,7 @@ export default {
                 this.profilUpdateStates["Pending"];
 
               let html = `<div class="d-flex justify-content-evenly align-items-center">
-                <button class="btn border-primary border-2" id="showButton"><i class="fa-solid fa-eye" style="color: #0d6efd;"></i></button>
+                <button class="btn border-primary border-2" id="showButton"><i class="fa-solid fa-eye fhc-primary-color"></i></button>
                 ${
                   STATUS_PENDING ?
                   `<button class="btn border-success border-2" id="acceptButton"><i class='fa fa-lg fa-circle-check text-success'></i></button>
diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index a86c3825b..94507fa73 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -76,7 +76,7 @@ export default {
 			const val = cell.getValue()
 			if(val) {
 				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
-				'<a href="'+val+'"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a></div>'
+				'<a href="'+val+'"><i class="fa fa-arrow-up-right-from-square me-1 fhc-primary-color" ></i></a></div>'
 			} else {
 				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
 					'-</div>'
diff --git a/public/js/components/Cis/Sprachen.js b/public/js/components/Cis/Sprachen.js
index fd53d06db..d5e2f827a 100644
--- a/public/js/components/Cis/Sprachen.js
+++ b/public/js/components/Cis/Sprachen.js
@@ -23,7 +23,7 @@ export default {
 	template:/*html*/`
 	<div class="container">
 		<div class="row justify-content-center align-items-center flex-nowrap overflow-hidden">
-			<button v-for="lang in allActiveLanguages" @click.prevent="changeLanguage(lang.sprache)" class="col text-white sprachen-entry btn text-center w-100" :selected="$p.user_language.value==lang.sprache">{{lang.bezeichnung}}</button>
+			<button v-for="lang in allActiveLanguages" @click.prevent="changeLanguage(lang.sprache)" class="col fhc-text sprachen-entry btn text-center w-100" :selected="$p.user_language.value==lang.sprache">{{lang.bezeichnung}}</button>
 		</div>
 	</div>
 	`,
diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index 925942079..e611af5db 100644
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -191,7 +191,7 @@ export default {
 					</div>
 				</div>
 				<div class="col">
-					<button class="btn btn-light w-100" @click="filter = ''">
+					<button class="btn fhc-tertiary w-100" @click="filter = ''">
 						<small :class="{'fw-bold':filter===''}">{{$p.t('ui','alle')}}: <b>{{ count.alle }}</b></small>
 					</button>
 				</div>
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 437f6a17f..42f8dfa0e 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -187,8 +187,8 @@ export default {
 						<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 					</div>
 					<template v-else-if="allEventsGrouped.size" v-for="([key, value], index) in allEventsGrouped" :key="index" style="margin-top: 8px;">
-						<div class="card-header d-grid p-0">
-							<button class="btn btn-link link-secondary text-decoration-none" @click="setCalendarMaximized">{{ key.format({dateStyle: "full"}, $p.user_locale.value)}}</button>
+						<div class=" card-header d-grid p-0">
+							<button class="btn fhc-tertiary text-decoration-none" @click="setCalendarMaximized">{{ key.format({dateStyle: "full"}, $p.user_locale.value)}}</button>
 						</div>
 						<div role="button" @click="showLvUebersicht(evt)" v-for="evt in value" :key="evt.id" class="list-group-item small" :style="getEventStyle(evt)">
 							<template v-if="evt.type=='moodle'">
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 7f836bf1c..2910f08d9 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -175,8 +175,8 @@ export default {
 								<i class="fa fa-edit me-1"></i>
 							</a>
 							<!--DELETE BOOKMARK-->
-							<a href="#" @click.prevent="removeLink(link.bookmark_id)" v-show="configMode || editModeIsActive">
-								<i class="fa fa-regular fa-trash-can" style="color: #e01b24;"></i>
+							<a id="deleteBookmark" href="#" @click.prevent="removeLink(link.bookmark_id)" v-show="configMode || editModeIsActive">
+								<i class="fa fa-regular fa-trash-can"></i>
 							</a>
 						</div>
 					</div>
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 7b28c8bea..fa17bc8a2 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -33,14 +33,14 @@ export default {
     template: /*html*/`
           <form ref="searchform" class="d-flex me-3" :class="searchoptions.cssclass" action="javascript:void(0);"
 		 	 @focusin="this.searchfocusin" @focusout="this.searchfocusout">
-			<div ref="searchbox" class="h-100 input-group me-2 bg-white">
-				<span style="background-color:inherit" class="input-group-text">
+			<div ref="searchbox" class="h-100 input-group me-2">
+				<span class="input-group-text">
 					<i class="fa-solid fa-magnifying-glass"></i>
 				</span>
                 <input @keyup="this.search" @focus="this.showsearchresult"
                     v-model="this.searchsettings.searchstr" class="form-control"
                     type="search" :placeholder="'Search: '+ search_types_string" aria-label="Search">
-                <button data-bs-toggle="collapse" data-bs-target="#searchSettings" aria-expanded="false" aria-controls="searchSettings" ref="settingsbutton"  class="btn btn-outline-secondary" type="button" id="search-filter"><i class="fas fa-cog"></i></button>
+                <span data-bs-toggle="collapse" data-bs-target="#searchSettings" aria-expanded="false" aria-controls="searchSettings" ref="settingsbutton"  class="input-group-text" type="button"><i class="fas fa-cog"></i></span>
             </div>
 
             <div v-show="this.showresult"
diff --git a/public/js/helpers/ColorThemeSetting.js b/public/js/helpers/ColorThemeSetting.js
new file mode 100644
index 000000000..fb3c94b8e
--- /dev/null
+++ b/public/js/helpers/ColorThemeSetting.js
@@ -0,0 +1,5 @@
+let theme = localStorage.getItem("theme");
+if (theme == 'dark') {
+	document.body.setAttribute("data-bs-theme", theme); 
+	document.documentElement.classList.add('dark');
+}
\ No newline at end of file

From 7936e08d3d8515861720bfe0cdc92bff23882bfe Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 21 Mar 2025 12:49:29 +0100
Subject: [PATCH 076/572] refactor(Dasboard Item): adds container for actions
 events from Dashboard widgets

---
 public/js/components/Dashboard/Item.js        | 22 +++++++++++++++----
 public/js/components/Dashboard/Section.js     |  1 +
 .../js/components/DashboardWidget/Abstract.js |  6 ++++-
 public/js/components/DashboardWidget/Url.js   | 17 +++++++++-----
 public/js/components/Drop/Grid.js             |  4 ++--
 5 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 379437b74..1ff6a4516 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -27,6 +27,7 @@ export default {
 		"configClosed"
 	],
 	props: [
+		"index",
 		"id",
 		"config",
 		"width",
@@ -44,6 +45,15 @@ export default {
 		ready() {
 			return this.component && this.arguments !== null;
 		},
+		widget_action_identifier(){
+			return `${this.widget.widget_kurzbz}-${this.index}-action-section`;
+		},
+		widgetInformation(){
+			return { 
+				action_section_identifier: this.widget_action_identifier,
+				widget_kurzbz: this.widget.widget_kurzbz,
+			}
+		}
 	},
 	methods: {
 		getWidgetC4Link(widget) {
@@ -120,14 +130,18 @@ export default {
 		</div>
 	</div>
 	<div v-else-if="!hidden || editMode" class="dashboard-item card overflow-hidden h-100" :class="arguments && arguments.className ? arguments.className : ''">
-		<div v-if="widget" class="card-header d-flex ps-0 pe-2">
+		<div v-if="widget" class="card-header d-flex ps-0 pe-2 align-items-center">
 			<Transition>
 				<span v-if="editMode" drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
 			</Transition>
 			<span class="col mx-2 px-2">{{ widget.setup.name }}</span>
-			<a v-if="widget.setup.cis4link" :href="getWidgetC4Link(widget)" class="ms-auto mb-2">
+			<a v-if="widget.setup.cis4link" :href="getWidgetC4Link(widget)" class="col-auto ms-auto ">
           		<i class="fa fa-arrow-up-right-from-square me-1"></i>
           	</a>
+
+			<!-- container for widget specific actions -->
+			<div :id="widget_action_identifier"></div>
+
 			<a v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig"><i class="fa-solid fa-gear"></i></a>
 			<a v-if="custom && editMode" class="col-auto px-1" href="#" @click.prevent="$emit('remove')">
 				<i class="fa-solid fa-trash"></i>
@@ -139,7 +153,7 @@ export default {
 			</Transition>
 		</div>
 		<div v-if="ready" class="card-body overflow-hidden" style="padding: 0px;">
-			<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
+			<component :is="component" v-model:shared-data="sharedData" :widgetInfo="widgetInformation" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
 		</div>
 		<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
 		<bs-modal v-if="hasConfig" ref="config" @hideBsModal="handleHideBsModal" @showBsModal="handleShowBsModal">
@@ -147,7 +161,7 @@ export default {
 				{{ widget ? 'Config for ' + widget.setup.name : '' }}
 			</template>
 			<template v-slot:default>
-				<component v-if="ready && !isLoading" :is="component" v-model:shared-data="sharedData" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
+				<component v-if="ready && !isLoading" :is="component" v-model:shared-data="sharedData" :widgetInfo="widgetInformation" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
 				<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
 			</template>
 			<template v-if="!widget?.setup?.hideFooter" v-slot:footer>
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index ab931543d..387edf04e 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -199,6 +199,7 @@ export default {
 			<template #default="item">
 				
 				<dashboard-item v-if="!item.placeholder"
+					:index="item.index"
 					:id="item.widget"
 					:width="item.w"
 					:height="item.h"
diff --git a/public/js/components/DashboardWidget/Abstract.js b/public/js/components/DashboardWidget/Abstract.js
index d459abc0b..50f63cf74 100644
--- a/public/js/components/DashboardWidget/Abstract.js
+++ b/public/js/components/DashboardWidget/Abstract.js
@@ -4,7 +4,8 @@ export default {
 		"width",
 		"height",
 		"configMode",
-		"sharedData"
+		"sharedData",
+		"widgetInfo"
 	],
 	emits: [
 		"setConfig",
@@ -24,6 +25,9 @@ export default {
 			set(value) {
 				this.$emit('update:sharedData', value);
 			}
+		},
+		widget_action_css_identifier(){
+			return `#${this.widgetInfo.action_section_identifier}`;
 		}
 	},
 	methods: {
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 7f836bf1c..b962d156d 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -159,9 +159,14 @@ export default {
 	template: /*html*/ `
     <div class="widgets-url w-100 h-100 overflow-scroll" style="padding: 1rem 1rem;">
         <div class="d-flex flex-column justify-content-between">
-        	<button v-if="editModeIsActive" class="btn btn-outline-secondary btn-sm w-100 mt-2" @click="openCreateModal" type="button">{{$p.t('bookmark','newLink')}}</button>
 
-            <template v-if="shared">
+			<Teleport :to="widget_action_css_identifier">
+				<button v-show="!editModeIsActive" class="btn btn-outline-secondary btn-sm" @click="openCreateModal" type="button">
+					<i class="fa-solid fa-plus"></i>
+				</button>
+			</Teleport>
+
+			<template v-if="shared">
 
                 <template v-if="!emptyBookmarks">
 					<div v-for="link in shared" :key="link.id" class="d-flex mt-2">
@@ -171,11 +176,11 @@ export default {
 
 						<div class="ms-auto">
 							<!--EDIT BOOKMARK-->
-							<a href="#" @click.prevent="openEditModal(link)" v-show="configMode || editModeIsActive">
+							<a href="#" @click.prevent="openEditModal(link)" >
 								<i class="fa fa-edit me-1"></i>
 							</a>
 							<!--DELETE BOOKMARK-->
-							<a href="#" @click.prevent="removeLink(link.bookmark_id)" v-show="configMode || editModeIsActive">
+							<a href="#" @click.prevent="removeLink(link.bookmark_id)" >
 								<i class="fa fa-regular fa-trash-can" style="color: #e01b24;"></i>
 							</a>
 						</div>
@@ -196,7 +201,7 @@ export default {
         </div>
     </div>
 	<!--EDIT MODAL-->
-	<core-form draggable="true" @dragstart="stopDrag" @drag="stopDrag" @dragend="stopDrag" v-if="editModeIsActive " ref="editForm">
+	<core-form draggable="true" @dragstart="stopDrag" @drag="stopDrag" @dragend="stopDrag" ref="editForm">
 		<bs-modal @[\`hide.bs.modal\`]="bookmark_id=null; clearInputs();" ref="editModal">
 			<template #title>
 				<h2>{{$p.t('bookmark','editLink')}}</h2>
@@ -214,7 +219,7 @@ export default {
 	</core-form>
 
 	<!--CREATE MODAL-->
-	<core-form draggable="true" @dragstart="stopDrag" @drag="stopDrag" @dragend="stopDrag" v-if="editModeIsActive " ref="createForm">
+	<core-form draggable="true" @dragstart="stopDrag" @drag="stopDrag" @dragend="stopDrag" ref="createForm">
 		<bs-modal @[\`hide.bs.modal\`]="clearInputs();" ref="createModal">
 			<template #title>
 				<h2>{{$p.t('bookmark','newLink')}}</h2>
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 0381352d4..d3ea29355 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -359,7 +359,7 @@ export default {
 		@mouseleave="mouseLeave">
 		<TransitionGroup tag="div">
 			<grid-item
-				v-for="item in (mode == 0 && active ? placedItems_withPlaceholders : placedItems)"
+				v-for="(item,index) in (mode == 0 && active ? placedItems_withPlaceholders : placedItems)"
 				:key="item.data.id"
 				:item="item"
 				@start-move="startMove"
@@ -378,7 +378,7 @@ export default {
 					paddingRight: 'var(--fhc-dg-item-padding-horizontal)'
 				}">
 				<template v-slot="item">
-					<slot v-bind="{...item, ...item.data}" :x="item.x" :y="item.y" ></slot>
+					<slot v-bind="{...item, ...item.data, index:index}" :x="item.x" :y="item.y" ></slot>
 				</template>
 			</grid-item>
 		</TransitionGroup>

From 0735c61361c666b9311ed47441c25c82ce8724ac Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 24 Mar 2025 08:53:15 +0100
Subject: [PATCH 077/572] update(UrlWidget addUrl Action):adds the transition
 animation to the action button of the url widget

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

diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index b962d156d..c0f05257e 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -161,9 +161,11 @@ export default {
         <div class="d-flex flex-column justify-content-between">
 
 			<Teleport :to="widget_action_css_identifier">
-				<button v-show="!editModeIsActive" class="btn btn-outline-secondary btn-sm" @click="openCreateModal" type="button">
-					<i class="fa-solid fa-plus"></i>
-				</button>
+				<Transition>
+					<button v-if="!editModeIsActive" class="btn btn-outline-secondary btn-sm" @click="openCreateModal" type="button">
+						<i class="fa-solid fa-plus"></i>
+					</button>
+				</Transition>
 			</Teleport>
 
 			<template v-if="shared">

From ff311ddaa80bb04464fcc4de13af2d89c1fc1d00 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 24 Mar 2025 09:34:52 +0100
Subject: [PATCH 078/572] fix(News widget autoscroll): removes the ride
 attribute from the bootstrap carousel to remove the autoscrolling of the news
 widget

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

diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index b7bd2f367..5a7e910ea 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -195,7 +195,7 @@ export default {
 			</div>
 			<div :class="'col-'+(width == 2? 6 : 8) + ' h-100'" style="padding-left: 0px; padding-right: 0px;" ref="htmlContent">
 				<div class="container h-100" style="padding: 0px;"  ref="carocontainer">
-					<div id="FhcCarouselContainer" style="height: 100%;" ref="carousel" class="carousel slide fhc-carousel" data-bs-ride="carousel" data-bs-interval="false">
+					<div id="FhcCarouselContainer" style="height: 100%;" ref="carousel" class="carousel slide fhc-carousel" data-bs-interval="false">
 
 						<div class="carousel-inner" ref="carouselInner"  style="height: 100%; max-width: 100%;">
 							<div ref="carouselItems" v-for="(news, index) in newsList" class="carousel-item " style="overflow-y: auto; overflow-x: hidden; height: 100%;" :id="'card-'+news.news_id" v-html="news.content_obj.content"/>

From 80c326360f31a2769a9d0f9ebba4df12e2ca191d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 24 Mar 2025 11:59:03 +0100
Subject: [PATCH 079/572] update(FHC Color Themes): makes the css variables and
 color modes configurable through the config for different fh's

---
 application/config/theme.php                  | 10 +++++
 application/helpers/hlp_header_helper.php     |  5 +++
 application/views/templates/CISVUE-Header.php |  4 +-
 public/css/Cis4/Cis.css                       |  1 -
 .../CisVariables.css => theme/default.css}    | 40 +++++++++----------
 .../default_cms_fixes.css}                    |  0
 public/js/components/Cis/Menu.js              |  4 +-
 .../Cis/{DarkTheme.js => ThemeSwitch.js}      |  8 +++-
 8 files changed, 46 insertions(+), 26 deletions(-)
 create mode 100644 application/config/theme.php
 rename public/css/{Cis4/CisVariables.css => theme/default.css} (93%)
 rename public/css/{Cis4/CisVariablesCms.css => theme/default_cms_fixes.css} (100%)
 rename public/js/components/Cis/{DarkTheme.js => ThemeSwitch.js} (85%)

diff --git a/application/config/theme.php b/application/config/theme.php
new file mode 100644
index 000000000..f16482bea
--- /dev/null
+++ b/application/config/theme.php
@@ -0,0 +1,10 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+// changing the color theme
+
+$config['theme_name']='default';
+$config['theme_css']= "public/css/theme/default.css";
+$config['theme_modes']=['light','dark'];
\ No newline at end of file
diff --git a/application/helpers/hlp_header_helper.php b/application/helpers/hlp_header_helper.php
index af8a32807..73a91594f 100644
--- a/application/helpers/hlp_header_helper.php
+++ b/application/helpers/hlp_header_helper.php
@@ -88,6 +88,7 @@ function generateCSSsInclude($CSSs)
 function generateJSDataStorageObject($indexPage, $calledPath, $calledMethod)
 {
 	$ci =& get_instance();
+	$ci->load->config('theme');
 	$ci->load->model('system/Sprache_model','SpracheModel');
 	$server_language = getData($ci->SpracheModel->loadWhere(['content' => true]));
 	$server_language = array_map(function($language){
@@ -103,6 +104,10 @@ function generateJSDataStorageObject($indexPage, $calledPath, $calledMethod)
 		'server_languages' => $server_language,
 		'user_language' => $user_language,
 		'timezone' => date_default_timezone_get(),
+		'theme' => [
+			'name'=>$ci->config->item('theme_name'),
+			'modes'=>$ci->config->item('theme_modes'),
+		]
 	);
 
 	$toPrint = "\n";
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index 86b5b8755..2f7a3877c 100644
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -1,4 +1,5 @@
 <?php
+$this->load->config('theme');
 $includesArray = array(
 	'title' => $title ?? 'FH-Complete',
 	'vue3' => true,
@@ -10,7 +11,8 @@ $includesArray = array(
 		'public/js/apps/Cis.js'
 	], $customJSModules ?? []),
 	'customCSSs' => array_merge([
-		'public/css/Cis4/Cis.css'
+		'public/css/Cis4/Cis.css',
+		$this->config->item('theme_css'),
 	], $customCSSs ?? [])
 );
 
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 8602def32..8010d0746 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -1,5 +1,4 @@
 /* basic */
-@import './CisVariables.css';
 @import '../components/searchbar/searchbar.css';
 @import '../components/Sprachen.css';
 
diff --git a/public/css/Cis4/CisVariables.css b/public/css/theme/default.css
similarity index 93%
rename from public/css/Cis4/CisVariables.css
rename to public/css/theme/default.css
index 53af08837..2d94847ee 100644
--- a/public/css/Cis4/CisVariables.css
+++ b/public/css/theme/default.css
@@ -1,10 +1,10 @@
 /* css overrides for static cms content */
-@import './CisVariablesCms.css';
+@import './default_cms_fixes.css';
 
 /* colors */
 :root {
 
-	--fhc-black-10:black;
+	--fhc-black-10: black;
 	--fhc-black-20: #1d2024;
 	--fhc-black-30: #212529;
 	--fhc-black-40: #292b2a;
@@ -13,14 +13,14 @@
 	--fhc-black-70: #343a40;
 
 	--fhc-white-10: #FFFFFF;
-	--fhc-white-20:#f6f6f6;
-	--fhc-white-30:#eceff1;
-	--fhc-white-40:#e9ecef;
-	--fhc-white-50:#dee2e6;
-	--fhc-white-60:#d5dae0;
-	--fhc-white-70:#ced4da;
-	--fhc-white-80:#c7cbcf;
-	--fhc-white-90:#aeb3b8;
+	--fhc-white-20: #f6f6f6;
+	--fhc-white-30: #eceff1;
+	--fhc-white-40: #e9ecef;
+	--fhc-white-50: #dee2e6;
+	--fhc-white-60: #d5dae0;
+	--fhc-white-70: #ced4da;
+	--fhc-white-80: #c7cbcf;
+	--fhc-white-90: #aeb3b8;
 
 	--fhc-gray-10: #858f97;
 	--fhc-gray-20: #72777A;
@@ -40,18 +40,18 @@
 
 	--fhc-red-10: #842029;
 	--fhc-red-20: #800000;
-	
+
 	--fhc-green-10: #008000;
 
-	--fhc-beige-10: rgba(245, 233, 215,0.5);
-	--fhc-beige-20: rgba(172, 153, 125,0.5);
-	
-	
+	--fhc-beige-10: rgba(245, 233, 215, 0.5);
+	--fhc-beige-20: rgba(172, 153, 125, 0.5);
+
+
 
 }
 
-:root.light{
-	
+:root.light {
+
 
 	/* fhc base colors */
 	--fhc-primary: var(--fhc-blue-20);
@@ -72,10 +72,10 @@
 	/*background*/
 	--fhc-background: var(--fhc-white-10);
 	--fhc-background-highlight: var(--fhc-white-60);
-	
+
 	/*text*/
 	--fhc-text: var(--fhc-black-30);
-	
+
 	/* shadows and borders */
 	--fhc-shadow-20: rgba(0, 0, 0, 0.2);
 	--fhc-shadow-40: rgba(0, 0, 0, 0.4);
@@ -100,7 +100,7 @@
 
 }
 
-:root.dark{
+:root.dark {
 
 	/* fhc base colors */
 	--fhc-primary: var(--fhc-blue-primary-highlight);
diff --git a/public/css/Cis4/CisVariablesCms.css b/public/css/theme/default_cms_fixes.css
similarity index 100%
rename from public/css/Cis4/CisVariablesCms.css
rename to public/css/theme/default_cms_fixes.css
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 08934cc78..aa2fc3411 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -1,14 +1,14 @@
 import CisMenuEntry from "./Menu/Entry.js";
 import FhcSearchbar from "../searchbar/searchbar.js";
 import CisSprachen from "./Sprachen.js"
-import DarkTheme from "./DarkTheme.js";
+import ThemeSwitch from "./ThemeSwitch.js";
 
 export default {
     components: {
         CisMenuEntry,
         FhcSearchbar,
 		CisSprachen,
-		DarkTheme,
+		ThemeSwitch,
     },
     props: {
 		rootUrl: String,
diff --git a/public/js/components/Cis/DarkTheme.js b/public/js/components/Cis/ThemeSwitch.js
similarity index 85%
rename from public/js/components/Cis/DarkTheme.js
rename to public/js/components/Cis/ThemeSwitch.js
index 2d3192b6d..445e71cf0 100644
--- a/public/js/components/Cis/DarkTheme.js
+++ b/public/js/components/Cis/ThemeSwitch.js
@@ -1,8 +1,9 @@
 export default {
 	data:()=>{
 		return{
-			theme:'light',
-			themes:['light','dark','purple'],
+			theme: FHC_JS_DATA_STORAGE_OBJECT.theme.modes[0],
+			theme_name: FHC_JS_DATA_STORAGE_OBJECT.theme.name,
+			themes: FHC_JS_DATA_STORAGE_OBJECT.theme.modes,
 		}
 	},
 	methods:{
@@ -40,6 +41,9 @@ export default {
 		this.toggleTheme(this.theme);
 
 	},
+	created(){
+		document.documentElement.classList.add(this.theme_name);	
+	},
 	template:/*html*/`
 
 	<button @click="toggleTheme(nextTheme)" class="fhc-primary-highlight-bg align-self-center btn btn-secondary rounded-5">

From 45b7a56c3a4ac53f556b7d8760b5eb8b6f321127 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 24 Mar 2025 14:00:14 +0100
Subject: [PATCH 080/572] - zeugnis vorlage fuer micro degree

---
 rdf/zeugnis.rdf.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/rdf/zeugnis.rdf.php b/rdf/zeugnis.rdf.php
index 2021c8335..038aba842 100644
--- a/rdf/zeugnis.rdf.php
+++ b/rdf/zeugnis.rdf.php
@@ -35,6 +35,7 @@ require_once('../include/studiengang.class.php');
 require_once('../include/mitarbeiter.class.php');
 require_once('../include/anrechnung.class.php');
 require_once('../include/prestudent.class.php');
+require_once('../include/nation.class.php');
 
 $datum = new datum();
 $db = new basis_db();
@@ -107,7 +108,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 					tbl_studiengang.bezeichnung, tbl_studiengang.english, tbl_studentlehrverband.semester,
 					tbl_person.vorname, tbl_person.vornamen, tbl_person.nachname,tbl_person.gebdatum,tbl_person.titelpre,
 					tbl_person.titelpost, tbl_person.anrede, tbl_studiensemester.bezeichnung as sembezeichnung,
-					tbl_studiensemester.studiensemester_kurzbz as stsem, tbl_student.prestudent_id, tbl_studiengang.max_semester
+					tbl_studiensemester.studiensemester_kurzbz as stsem, tbl_student.prestudent_id, tbl_studiengang.max_semester, tbl_person.gebort, tbl_person.geburtsnation, tbl_person.geschlecht
 				FROM tbl_person, tbl_student, tbl_studiengang, tbl_benutzer, tbl_studentlehrverband, tbl_studiensemester
 				WHERE tbl_student.studiengang_kz = tbl_studiengang.studiengang_kz
 				AND tbl_student.student_uid = tbl_benutzer.uid AND tbl_benutzer.person_id = tbl_person.person_id
@@ -187,6 +188,10 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 				else
 					$studiengang_kz = sprintf("%04s", abs($row->studiengang_kz));
 
+
+				$nation = new nation($row->geburtsnation);
+				$geburtsnation = $nation->kurztext;
+
 				$xml .= "		<studiengang_art><![CDATA[".$bezeichnung."]]></studiengang_art>";
 				$xml .= "		<studiengang_kz><![CDATA[".$studiengang_kz."]]></studiengang_kz>";
 				$xml .= "\n		<anrede><![CDATA[".$row->anrede."]]></anrede>";
@@ -195,6 +200,9 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 				$xml .= "		<name><![CDATA[".trim($row->titelpre.' '.trim($row->vorname.' '.$row->vornamen).' '.$row->nachname.($row->titelpost!=''?', '.$row->titelpost:''))."]]></name>";
 				$gebdatum = date('d.m.Y',strtotime($row->gebdatum));
 				$xml .= "		<gebdatum><![CDATA[".$gebdatum."]]></gebdatum>";
+				$xml .= "		<gebort><![CDATA[".$row->gebort."]]></gebort>";
+				$xml .= "		<geburtsnation><![CDATA[".$geburtsnation."]]></geburtsnation>";
+				$xml .= "		<geschlecht><![CDATA[".$row->geschlecht."]]></geschlecht>";
 				$xml .= "		<matrikelnr><![CDATA[".trim($row->matrikelnr)."]]></matrikelnr>";
 				$xml .= "		<studiengangsleiter><![CDATA[".$stgl."]]></studiengangsleiter>";
 				$datum_aktuell = date('d.m.Y');
@@ -267,6 +275,15 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 				if ($lastPrestudentStatus)
 					$showAllNoten = $prestudent->status_kurzbz === 'Incoming';
 
+				$lastBenotungsdatum = '';
+
+				$dates = array_column($obj->result, 'benotungsdatum');
+				if (!empty($dates))
+				{
+					$lastBenotungsdatum = max($dates);
+					$xml .= "<last_benotungsdatum><![CDATA[".date('d.m.Y', strtotime($lastBenotungsdatum))."]]></last_benotungsdatum>";
+				}
+
 				foreach ($obj->result as $row)
 				{
 					if($showAllNoten || $row->zeugnis)
@@ -390,6 +407,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 							}
 						}
 						$xml .= "\n			<unterrichtsfach>";
+						$xml .= "				<benotungsdatum><![CDATA[".date('d.m.Y', strtotime($row->benotungsdatum))."]]></benotungsdatum>";
 						$xml .= "				<bezeichnung><![CDATA[".$bezeichnung."]]></bezeichnung>";
 						$xml .= "				<bezeichnung_englisch><![CDATA[".$bezeichnung_englisch."]]></bezeichnung_englisch>";
 						$xml .= "				<note_positiv><![CDATA[".$row->note_positiv."]]></note_positiv>";

From 5d39d5ec466292cff27dd8a05f7655d6821c6914 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 24 Mar 2025 14:29:21 +0100
Subject: [PATCH 081/572] feature(FHC Theme plugin): adds a plugin that
 provides functionality and information of the current theme

---
 public/js/apps/Cis.js                   |  2 +
 public/js/apps/Dashboard/Fhc.js         |  2 +
 public/js/components/Cis/Menu.js        |  2 +-
 public/js/components/Cis/ThemeSwitch.js | 47 ++++++-----------------
 public/js/plugin/Theme.js               | 51 +++++++++++++++++++++++++
 5 files changed, 68 insertions(+), 36 deletions(-)
 create mode 100644 public/js/plugin/Theme.js

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index bb4b76ca4..c2c733b14 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -2,6 +2,7 @@ import FhcSearchbar from "../components/searchbar/searchbar.js";
 import CisMenu from "../components/Cis/Menu.js";
 import FhcApi from '../plugin/FhcApi.js';
 import Phrasen from '../plugin/Phrasen.js';
+import Theme from "../plugin/Theme.js";
 import fhcapifactory from "./api/fhcapifactory.js";
 Vue.$fhcapi = fhcapifactory;
 
@@ -124,4 +125,5 @@ app.use(primevue.config.default, {
 	}
 })
 app.use(Phrasen);
+app.use(Theme);
 app.mount('#cis-header');
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 137d1d008..00357fb2e 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -1,6 +1,7 @@
 import FhcDashboard from '../../components/Dashboard/Dashboard.js';
 import FhcApi from '../../plugin/FhcApi.js';
 import Phrasen from '../../plugin/Phrasen.js';
+import Theme from '../../plugin/Theme.js';
 import contrast from '../../directives/contrast.js';
 import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers.js";
 import Stundenplan, {DEFAULT_MODE_STUNDENPLAN} from "../../components/Cis/Stundenplan/Stundenplan.js";
@@ -273,5 +274,6 @@ app.use(primevue.config.default, {
 	}
 })
 app.use(Phrasen);
+app.use(Theme);
 app.directive('contrast', contrast);
 app.mount('#fhccontent');
\ No newline at end of file
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index aa2fc3411..73ec181a4 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -111,7 +111,7 @@ export default {
 			<a :href="rootUrl">
 				<img :src="logoUrl" alt="Logo">
 			</a>
-			<dark-theme></dark-theme>
+			<theme-switch></theme-switch>
 		</div>
     </div>
 	<div id="nav-user">
diff --git a/public/js/components/Cis/ThemeSwitch.js b/public/js/components/Cis/ThemeSwitch.js
index 445e71cf0..7f560376e 100644
--- a/public/js/components/Cis/ThemeSwitch.js
+++ b/public/js/components/Cis/ThemeSwitch.js
@@ -1,54 +1,31 @@
 export default {
 	data:()=>{
 		return{
-			theme: FHC_JS_DATA_STORAGE_OBJECT.theme.modes[0],
-			theme_name: FHC_JS_DATA_STORAGE_OBJECT.theme.name,
-			themes: FHC_JS_DATA_STORAGE_OBJECT.theme.modes,
+			theme: null,
 		}
 	},
 	methods:{
-		toggleTheme(theme){
-			if(!theme) return;
-
-			for(const theme of this.themes){
-				document.documentElement.classList.remove(theme);
-			}
-			document.documentElement.classList.add(theme);
-
-			document.body.setAttribute("data-bs-theme", theme);
-
-			let stylesheet = document.querySelector('link[href*="primevue/resources/themes"]');
-			if(theme =="dark"){
-				stylesheet.attributes.href.value = stylesheet.attributes.href.value.replace("bootstrap4-light-blue", "bootstrap4-dark-blue");
-			}else if(theme =="light"){
-				stylesheet.attributes.href.value = stylesheet.attributes.href.value.replace("bootstrap4-dark-blue", "bootstrap4-light-blue");
-			} 
-
-			localStorage.setItem("theme",theme);
-			this.theme = theme;
+		switchTheme(nextTheme){
+			this.theme = nextTheme;
+			this.$theme.switchTheme(this.theme);
 		}
 	},
 	computed:{
 		nextTheme(){
-			return this.themes[(this.themes.indexOf(this.theme) + 1) % this.themes.length];
+			return this.$theme.theme_modes[(this.$theme.theme_modes.indexOf(this.theme) + 1) % this.$theme.theme_modes.length];
 		},
 	},
-	mounted(){
-		const theme =localStorage.getItem("theme");
-		if(this.themes.includes(theme)){
-			this.theme = theme;
-		}
-		this.toggleTheme(this.theme);
-
-	},
 	created(){
-		document.documentElement.classList.add(this.theme_name);	
+		this.theme = localStorage.getItem('theme');
+		if (!this.theme || !this.$theme.theme_modes.includes(this.theme)) {
+			this.theme = this.$theme.theme_modes[0];
+		}
 	},
 	template:/*html*/`
 
-	<button @click="toggleTheme(nextTheme)" class="fhc-primary-highlight-bg align-self-center btn btn-secondary rounded-5">
-		<i v-if="theme == 'light'" class="fa-solid fa-moon fhc-text"></i>
-		<i v-else-if="theme == 'dark'" class="fa-solid fa-sun fhc-text"></i>
+	<button @click="switchTheme(nextTheme)" class="fhc-primary-highlight-bg align-self-center btn btn-secondary rounded-5">
+		<i v-if="theme == 'light'" class="fa-solid fa-sun fhc-text"></i>
+		<i v-else-if="theme == 'dark'" class="fa-solid fa-moon fhc-text"></i>
 		<i v-else-if="theme == 'purple'" class="fa-solid fa-wine-bottle"></i>
 	</button>
 	`
diff --git a/public/js/plugin/Theme.js b/public/js/plugin/Theme.js
new file mode 100644
index 000000000..29ae4c4a4
--- /dev/null
+++ b/public/js/plugin/Theme.js
@@ -0,0 +1,51 @@
+const theme_name= FHC_JS_DATA_STORAGE_OBJECT.theme.name;
+const theme_modes = FHC_JS_DATA_STORAGE_OBJECT.theme.modes;
+
+const toggleTheme = (theme)=>{
+	if (!theme) return;
+
+	for (const theme of theme_modes) {
+		document.documentElement.classList.remove(theme);
+	}
+	document.documentElement.classList.add(theme);
+
+	document.body.setAttribute("data-bs-theme", theme);
+
+	let stylesheet = document.querySelector('link[href*="primevue/resources/themes"]');
+	if (theme == "dark") {
+		stylesheet.attributes.href.value = stylesheet.attributes.href.value.replace("bootstrap4-light-blue", "bootstrap4-dark-blue");
+	} else if (theme == "light") {
+		stylesheet.attributes.href.value = stylesheet.attributes.href.value.replace("bootstrap4-dark-blue", "bootstrap4-light-blue");
+	}
+
+	localStorage.setItem("theme", theme);
+}
+
+const initializeTheme = ()=>{
+	
+	let theme = localStorage.getItem("theme");
+	if (!theme || !theme_modes.includes(theme)) {
+		// set the first theme mode as default
+		theme = theme_modes[0];
+		localStorage.setItem("theme",theme);
+	}
+	toggleTheme(theme);
+}
+
+
+export default {
+	install: (app,options)=>{
+		
+		document.documentElement.classList.add(theme_name);
+
+		initializeTheme();
+
+		app.config.globalProperties.$theme = {
+			theme_name,
+			theme_modes,
+			switchTheme: (theme) => {
+				toggleTheme(theme);
+			}, 
+		} 
+	}
+}
\ No newline at end of file

From 75ad88eb243a285575acee7d6d948367e9070773 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 24 Mar 2025 15:03:59 +0100
Subject: [PATCH 082/572] update(Plugin Theme):changes the way the primevue
 theme is replaced if the theme is not dark or light

---
 public/js/plugin/Theme.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/js/plugin/Theme.js b/public/js/plugin/Theme.js
index 29ae4c4a4..d063b4d46 100644
--- a/public/js/plugin/Theme.js
+++ b/public/js/plugin/Theme.js
@@ -17,6 +17,10 @@ const toggleTheme = (theme)=>{
 	} else if (theme == "light") {
 		stylesheet.attributes.href.value = stylesheet.attributes.href.value.replace("bootstrap4-dark-blue", "bootstrap4-light-blue");
 	}
+	else{
+		if (stylesheet.attributes.href.value.includes("bootstrap4-dark-blue"))
+			stylesheet.attributes.href.value = stylesheet.attributes.href.value.replace("bootstrap4-dark-blue", "bootstrap4-light-blue");
+	}
 
 	localStorage.setItem("theme", theme);
 }

From ab36d567b81f582b875ccdebe807b8b81a2de759 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 25 Mar 2025 12:47:58 +0100
Subject: [PATCH 083/572] refactor(Url Widget): fixes add link button inside
 the widget

---
 public/js/components/Dashboard/Item.js          | 17 ++---------------
 .../js/components/DashboardWidget/Abstract.js   |  3 ---
 public/js/components/DashboardWidget/Url.js     | 12 +++---------
 3 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 1ff6a4516..59f33b711 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -45,15 +45,6 @@ export default {
 		ready() {
 			return this.component && this.arguments !== null;
 		},
-		widget_action_identifier(){
-			return `${this.widget.widget_kurzbz}-${this.index}-action-section`;
-		},
-		widgetInformation(){
-			return { 
-				action_section_identifier: this.widget_action_identifier,
-				widget_kurzbz: this.widget.widget_kurzbz,
-			}
-		}
 	},
 	methods: {
 		getWidgetC4Link(widget) {
@@ -138,10 +129,6 @@ export default {
 			<a v-if="widget.setup.cis4link" :href="getWidgetC4Link(widget)" class="col-auto ms-auto ">
           		<i class="fa fa-arrow-up-right-from-square me-1"></i>
           	</a>
-
-			<!-- container for widget specific actions -->
-			<div :id="widget_action_identifier"></div>
-
 			<a v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig"><i class="fa-solid fa-gear"></i></a>
 			<a v-if="custom && editMode" class="col-auto px-1" href="#" @click.prevent="$emit('remove')">
 				<i class="fa-solid fa-trash"></i>
@@ -153,7 +140,7 @@ export default {
 			</Transition>
 		</div>
 		<div v-if="ready" class="card-body overflow-hidden" style="padding: 0px;">
-			<component :is="component" v-model:shared-data="sharedData" :widgetInfo="widgetInformation" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
+			<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
 		</div>
 		<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
 		<bs-modal v-if="hasConfig" ref="config" @hideBsModal="handleHideBsModal" @showBsModal="handleShowBsModal">
@@ -161,7 +148,7 @@ export default {
 				{{ widget ? 'Config for ' + widget.setup.name : '' }}
 			</template>
 			<template v-slot:default>
-				<component v-if="ready && !isLoading" :is="component" v-model:shared-data="sharedData" :widgetInfo="widgetInformation" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
+				<component v-if="ready && !isLoading" :is="component" v-model:shared-data="sharedData" :config="tmpConfig" @change="changeConfig" :configMode="true"></component>
 				<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
 			</template>
 			<template v-if="!widget?.setup?.hideFooter" v-slot:footer>
diff --git a/public/js/components/DashboardWidget/Abstract.js b/public/js/components/DashboardWidget/Abstract.js
index 50f63cf74..e9f87490d 100644
--- a/public/js/components/DashboardWidget/Abstract.js
+++ b/public/js/components/DashboardWidget/Abstract.js
@@ -26,9 +26,6 @@ export default {
 				this.$emit('update:sharedData', value);
 			}
 		},
-		widget_action_css_identifier(){
-			return `#${this.widgetInfo.action_section_identifier}`;
-		}
 	},
 	methods: {
 		formatDateTime: function(dateTime) {
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index c0f05257e..8123852d0 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -160,17 +160,11 @@ export default {
     <div class="widgets-url w-100 h-100 overflow-scroll" style="padding: 1rem 1rem;">
         <div class="d-flex flex-column justify-content-between">
 
-			<Teleport :to="widget_action_css_identifier">
-				<Transition>
-					<button v-if="!editModeIsActive" class="btn btn-outline-secondary btn-sm" @click="openCreateModal" type="button">
-						<i class="fa-solid fa-plus"></i>
-					</button>
-				</Transition>
-			</Teleport>
-
 			<template v-if="shared">
-
                 <template v-if="!emptyBookmarks">
+					<button class="btn btn-outline-secondary btn-sm" @click="openCreateModal" type="button">
+						{{$p.t('bookmark','newLink')}}
+					</button>
 					<div v-for="link in shared" :key="link.id" class="d-flex mt-2">
 						<a target="_blank" :href="link.url">
 							<i class="fa fa-solid fa-arrow-up-right-from-square me-1"></i>{{ link.title }}

From 1cdf89e405d08b84b7d51c1f22f55efdd6c942e0 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 25 Mar 2025 13:18:00 +0100
Subject: [PATCH 084/572] fix(Dashboard drag event): fixes bug where widget
 wouldn't drag to new position

---
 public/js/components/Drop/Grid.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index d3ea29355..ed7d32bd2 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -260,7 +260,7 @@ export default {
 				return;
 			this._dragStart(evt);
 			this.mode = MODE_MOVE;
-			this.updateCursor(evt);
+			//this.updateCursor(evt);
 			this.draggedItem = item;
 			this.draggedOffset = [item.x - this.x, item.y - this.y];
 		},
@@ -274,6 +274,7 @@ export default {
 		dragOver(evt) {
 			if (!this.active)
 				return this.dragCancel();
+			
 			if (this.updateCursor(evt)) {
 				switch(this.mode) {
 					case MODE_MOVE: {
@@ -344,6 +345,10 @@ export default {
 		},
 		emptyTileClicked() {
 			this.$emit('newItem', this.x, this.y);
+		},
+		updateCursorOnMouseMove(evt){
+			if(this.mode == MODE_IDLE)
+				this.updateCursor(evt);
 		}
 	},
 	template: `
@@ -355,7 +360,7 @@ export default {
 		@touchend="dragCancel"
 		@dragover.prevent="dragOver"
 		@drop="dragEnd"
-		@mousemove="updateCursor"
+		@mousemove="updateCursorOnMouseMove"
 		@mouseleave="mouseLeave">
 		<TransitionGroup tag="div">
 			<grid-item

From b52993f7ccebb8843543ea7192744d018457ce7b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 26 Mar 2025 13:02:48 +0100
Subject: [PATCH 085/572] refactor(Grid Widgets drag): shows a placeholder item
 in the space where the new widget position would be when dragging a widget on
 the dashboard

---
 public/css/components/dashboard.css       | 12 ++++++++-
 public/js/components/Dashboard/Item.js    |  4 +--
 public/js/components/Dashboard/Section.js |  5 ++--
 public/js/components/Drop/Grid.js         | 31 ++++++++++++++++++++---
 public/js/components/Drop/Grid/Item.js    |  2 ++
 5 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index e742f7fa4..eb0c2bf78 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -40,5 +40,15 @@
 	cursor: move;
 }
 
-
+.dashboard-item-overlay::before{
+	position:absolute;
+	content:"";
+	top:0;
+	left:0;
+	right:0;
+	bottom:0;
+	background-color:rgba(0, 100, 156);
+	border:1px dashed lightgray;
+	z-index: 2;
+}
 
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 59f33b711..c52c7887e 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -27,8 +27,8 @@ export default {
 		"configClosed"
 	],
 	props: [
-		"index",
 		"id",
+		"widgetID",
 		"config",
 		"width",
 		"height",
@@ -120,7 +120,7 @@ export default {
 			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 		</div>
 	</div>
-	<div v-else-if="!hidden || editMode" class="dashboard-item card overflow-hidden h-100" :class="arguments && arguments.className ? arguments.className : ''">
+	<div v-else-if="!hidden || editMode" :id="widgetID" class="dashboard-item card overflow-hidden h-100 position-relative" :class="arguments && arguments.className ? arguments.className : ''">
 		<div v-if="widget" class="card-header d-flex ps-0 pe-2 align-items-center">
 			<Transition>
 				<span v-if="editMode" drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 387edf04e..7818e06b9 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -198,9 +198,10 @@ export default {
 		<drop-grid v-model:cols="gridWidth" :items="items" :placeholders="items_placeholders" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
 				
-				<dashboard-item v-if="!item.placeholder"
-					:index="item.index"
+				<dashboard-item 
+					v-if="!item.placeholder"
 					:id="item.widget"
+					:widgetID="item.widgetid"
 					:width="item.w"
 					:height="item.h"
 					:loading="item.loading"
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index ed7d32bd2..baa8129cc 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -34,12 +34,14 @@ export default {
 	emits: [
 		"rearrangeItems",
 		"newItem",
-		"gridHeight"
+		"gridHeight",
 	],
 	data() {
 		return {
 			x: -1,
 			y: -1,
+			clientX:0,
+			clientY: 0,
 			mode: MODE_IDLE,
 			grid: null,
 			dragGrid: null,
@@ -48,7 +50,7 @@ export default {
 			fixedPositionUpdates: null,
 			draggedOffset: [0,0],
 			draggedItem: null,
-			additionalRow: null
+			additionalRow: null,
 		}
 	},
 	computed: {
@@ -154,6 +156,22 @@ export default {
 		}
 	},
 	methods: {
+		toggleDraggedItemOverlay(condition){
+			let draggedItemNode = document.getElementById(this.draggedItem.data.id);
+			if(condition){
+				draggedItemNode.classList.add("dashboard-item-overlay");
+			}else{
+				draggedItemNode.classList.remove("dashboard-item-overlay");
+			}
+		},
+		dragging(event){
+			this.toggleDraggedItemOverlay(true);
+			/*  use case: instead of showing the ghost widget when dragging, 
+				change the x and y position of the widget when dragging to drag the whole widget
+			event.target.style.top = `${this.clientY}px`;
+			event.target.style.left = `${this.clientX}px`;
+			*/
+		},
 		createNewGrid(items) {
 			this.grid = new GridLogic(this.cols);
 			const result = [];
@@ -228,6 +246,9 @@ export default {
 				evt.clientY = evt.touches[0].clientY;
 			}
 
+			this.clientX = (evt.clientX - rect.left);
+			this.clientY = (evt.clientY - rect.top);
+
 			const gridX = Math.floor(this.cols * (evt.clientX - rect.left) / this.$refs.container.clientWidth);
 			const gridY = Math.floor((this.rows + addH) * (evt.clientY - rect.top) / this.$refs.container.clientHeight);
 			if (this.x == gridX && this.y == gridY)
@@ -250,7 +271,7 @@ export default {
 		},
 		_dragStart(evt) {
 			if (evt.dataTransfer) {
-				evt.dataTransfer.setDragImage(evt.target, -99999, -99999);
+				//evt.dataTransfer.setDragImage(evt.target, -99999, -99999);
 				evt.dataTransfer.dropEffect = 'move';
 				evt.dataTransfer.effectAllowed = 'move';
 			}
@@ -258,9 +279,9 @@ export default {
 		startMove(evt, item) {
 			if (!this.active)
 				return;
+			
 			this._dragStart(evt);
 			this.mode = MODE_MOVE;
-			//this.updateCursor(evt);
 			this.draggedItem = item;
 			this.draggedOffset = [item.x - this.x, item.y - this.y];
 		},
@@ -317,6 +338,7 @@ export default {
 			this.draggedItem = null;
 		},
 		dragEnd() {
+			this.toggleDraggedItemOverlay(false);
 			if (this.mode == MODE_IDLE)
 				return;
 			if (!this.active || this.x < 0 || this.y < 0 || this.x >= this.cols)
@@ -369,6 +391,7 @@ export default {
 				:item="item"
 				@start-move="startMove"
 				@start-resize="startResize"
+				@dragging="dragging"
 				@end-drag="dragCancel"
 				@drop-drag="dragEnd"
 				class="position-absolute"
diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index 8087aadd8..1ff4213ea 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -10,6 +10,7 @@ export default {
 	emits: [
 		"startMove",
 		"startResize",
+		"dragging",
 		"endDrag",
 		"dropDrag"
 	],
@@ -65,6 +66,7 @@ export default {
 		@touchstart="tryDragStart($event, item)"
 		@touchend="touchDragEnd"
 		@dragstart="tryDragStart($event, item)"
+		@drag="$emit('dragging',$event)"
 		@dragend="$emit('endDrag', $event)"
 		:draggable="active">
 		<slot v-bind="item"></slot>

From 08cb4a7970c53b90038d2d8b3da3cb761c6050aa Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 26 Mar 2025 13:17:08 +0100
Subject: [PATCH 086/572] refactor(color update): switches fhc-secondary with
 fhc-tertiary

---
 public/css/Cis4/Cis.css                       | 36 +++++++++----------
 public/css/Fhc.css                            |  2 +-
 public/css/components/NavigationComponent.css |  4 +--
 public/css/theme/default.css                  | 30 ++++++++--------
 .../Cis/Cms/Content_types/General.js          |  2 +-
 5 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 8010d0746..ea59cb9d8 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -40,21 +40,21 @@ html {
 }
 
 .fhc-secondary-bg{
-	background-color: var(--fhc-secondary) !important;
-}
-
-.fhc-secondary-color {
-	color: var(--fhc-secondary) !important;
-}
-
-.fhc-tertiary-bg{
 	background-color: var(--fhc-tertiary) !important;
 }
 
-.fhc-tertiary-color {
+.fhc-secondary-color {
 	color: var(--fhc-tertiary) !important;
 }
 
+.fhc-tertiary-bg{
+	background-color: var(--fhc-secondary) !important;
+}
+
+.fhc-tertiary-color {
+	color: var(--fhc-secondary) !important;
+}
+
 .fhc-fourth-bg {
 	background-color: var(--fhc-fourth) !important;
 }
@@ -79,13 +79,13 @@ html {
 
 .fhc-secondary {
 	color: var(--fhc-text);
-	background-color: var(--fhc-secondary);
+	background-color: var(--fhc-tertiary);
 	border-color: var(--fhc-border);
 }
 
 .fhc-tertiary{
 	color: var(--fhc-text);
-	background-color: var(--fhc-tertiary);
+	background-color: var(--fhc-secondary);
 	border-color:var(--fhc-border);
 }
 
@@ -99,8 +99,8 @@ html {
 
 :root{	
 	/* sidebar colors */
-	--fhc-cis-sidebar-bg: var(--fhc-tertiary);
-	--fhc-cis-menu-bg: var(--fhc-tertiary);
+	--fhc-cis-sidebar-bg: var(--fhc-secondary);
+	--fhc-cis-menu-bg: var(--fhc-secondary);
 
 	--fhc-cis-header-px: 1rem;
 	--fhc-cis-header-py: .5rem;
@@ -112,14 +112,14 @@ html {
 	--fhc-cis-menu-lvl-1-bg-hover: var(--fhc-primary-highlight);
 	--fhc-cis-menu-lvl-1-color-hover: var(--fhc-text);
 
-	--fhc-cis-menu-lvl-2-bg: var(--fhc-tertiary);
+	--fhc-cis-menu-lvl-2-bg: var(--fhc-secondary);
 	--fhc-cis-menu-lvl-2-color: var(--fhc-text);
-	--fhc-cis-menu-lvl-2-bg-hover: var(--fhc-tertiary-highlight);
+	--fhc-cis-menu-lvl-2-bg-hover: var(--fhc-secondary-highlight);
 	--fhc-cis-menu-lvl-2-color-hover: var(--fhc-text);
 
-	--fhc-cis-menu-lvl-3-bg: var(--fhc-secondary);
+	--fhc-cis-menu-lvl-3-bg: var(--fhc-tertiary);
 	--fhc-cis-menu-lvl-3-color: var(--fhc-text);
-	--fhc-cis-menu-lvl-3-bg-hover: var(--fhc-secondary-highlight);
+	--fhc-cis-menu-lvl-3-bg-hover: var(--fhc-tertiary-highlight);
 	--fhc-cis-menu-lvl-3-color-hover: var(--fhc-text);
 
 	--fhc-cis-menu-lvl-4-bg: var(--fhc-fourth);
@@ -582,7 +582,7 @@ html {
   }
 }
 .fhc-header > h1 > small {
-  color: var(--fhc-secondary);
+  color: var(--fhc-tertiary);
   font-size: 1rem;
 }
 .fhc-header > h1 > small:before {
diff --git a/public/css/Fhc.css b/public/css/Fhc.css
index c5368930d..6827f2d3f 100644
--- a/public/css/Fhc.css
+++ b/public/css/Fhc.css
@@ -10,7 +10,7 @@
   font-size: calc(1.325rem + .9vw);
 }
 .fhc-header > :first-child > small {
-  color: var(--fhc-secondary);
+  color: var(--fhc-tertiary);
   font-size: .65em;
   padding-inline-start: 1em;
 }
diff --git a/public/css/components/NavigationComponent.css b/public/css/components/NavigationComponent.css
index bf38d3d8c..e922d4812 100644
--- a/public/css/components/NavigationComponent.css
+++ b/public/css/components/NavigationComponent.css
@@ -3,11 +3,11 @@
  */
 
  :root{
-	--nav-component-bg: var(--fhc-secondary);
+	--nav-component-bg: var(--fhc-tertiary);
 	--nav-component-border: var(--fhc-border);
 	--nav-component-color: var(--fhc-text);
 	--nav-left-component-border: var(--fhc-border);
-	--nav-left-component-bg: var(--fhc-secondary);
+	--nav-left-component-bg: var(--fhc-tertiary);
 	--nav-left-component-color: var(--fhc-primary);
 	--nav-left-component-hover: var(--fhc-secondary-highlight);
  }
diff --git a/public/css/theme/default.css b/public/css/theme/default.css
index 2d94847ee..7f39cff54 100644
--- a/public/css/theme/default.css
+++ b/public/css/theme/default.css
@@ -57,11 +57,11 @@
 	--fhc-primary: var(--fhc-blue-20);
 	--fhc-primary-highlight: var(--fhc-blue-40);
 
-	--fhc-tertiary: var(--fhc-white-20);
-	--fhc-tertiary-highlight: var(--fhc-white-40);
-
-	--fhc-secondary: var(--fhc-white-40);
-	--fhc-secondary-highlight: var(--fhc-white-60);
+	--fhc-secondary: var(--fhc-white-20);
+	--fhc-secondary-highlight: var(--fhc-white-40);
+	
+	--fhc-tertiary: var(--fhc-white-40);
+	--fhc-tertiary-highlight: var(--fhc-white-60);
 
 	--fhc-fourth: var(--fhc-white-60);
 	--fhc-fourth-highlight: var(--fhc-white-80);
@@ -106,11 +106,11 @@
 	--fhc-primary: var(--fhc-blue-primary-highlight);
 	--fhc-primary-highlight: var(--fhc-blue-primary);
 
-	--fhc-secondary: var(--fhc-black-70);
-	--fhc-secondary-highlight: var(--fhc-gray-40);
+	--fhc-secondary: var(--fhc-black-50);
+	--fhc-secondary-highlight: var(--fhc-black-70);
 
-	--fhc-tertiary: var(--fhc-black-50);
-	--fhc-tertiary-highlight: var(--fhc-black-70);
+	--fhc-tertiary: var(--fhc-black-70);
+	--fhc-tertiary-highlight: var(--fhc-gray-40);
 
 	--fhc-danger: var(--fhc-red-10);
 
@@ -163,11 +163,11 @@
 	--fhc-primary: var(--fhc-purple-primary-highlight);
 	--fhc-primary-highlight: var(--fhc-purple-primary);
 
-	--fhc-secondary: var(--fhc-purple-30);
-	--fhc-secondary-highlight: var(--fhc-purple-50);
+	--fhc-secondary: var(--fhc-purple-20);
+	--fhc-secondary-highlight: var(--fhc-purple-40);
 
-	--fhc-tertiary: var(--fhc-purple-20);
-	--fhc-tertiary-highlight: var(--fhc-purple-40);
+	--fhc-tertiary: var(--fhc-purple-30);
+	--fhc-tertiary-highlight: var(--fhc-purple-50);
 
 	/* background */
 	--fhc-background: var(--fhc-purple-5);
@@ -256,10 +256,10 @@ html.dark .tabulator .tabulator-row {
 }
 
 html.dark .tabulator .tabulator-cell {
-	background-color: var(--fhc-secondary) !important;
+	background-color: var(--fhc-tertiary) !important;
 	border-color: var(--fhc-border) !important;
 }
 
 html.dark .tabulator .tabulator-header .tabulator-col:hover {
-	background-color: var(--fhc-secondary) !important;
+	background-color: var(--fhc-tertiary) !important;
 }
\ No newline at end of file
diff --git a/public/js/components/Cis/Cms/Content_types/General.js b/public/js/components/Cis/Cms/Content_types/General.js
index 85716ef43..c57ccd8ca 100644
--- a/public/js/components/Cis/Cms/Content_types/General.js
+++ b/public/js/components/Cis/Cms/Content_types/General.js
@@ -111,7 +111,7 @@ export default {
 				element.style.backgroundColor = "var(--fhc-background)";
 			}
 			if(element.querySelector("*[style*=background-color]")){
-				element.style.backgroundColor = "var(--fhc-secondary)";
+				element.style.backgroundColor = "var(--fhc-tertiary)";
 			}
 		});
 

From 727b951bbc2632af05d2b83a22b5a556db93ed6f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 26 Mar 2025 14:59:28 +0100
Subject: [PATCH 087/572] update(Dashboard Grid): does not show the overlay
 when resizing the widget and adds different grid sizes for different
 viewports

---
 public/css/components/dashboard.css | 25 +++++++++++++++++++++++++
 public/js/components/Drop/Grid.js   | 11 +++++++----
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index eb0c2bf78..fb9a628de 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -23,6 +23,31 @@
 :root {
 	--fhc-dashboard-grid-size: 4;
 }
+
+@media(max-width: 1400px) {
+	:root {
+		--fhc-dashboard-grid-size: 4;
+	}
+}
+
+@media(max-width: 1200px) {
+	:root {
+		--fhc-dashboard-grid-size: 3;
+	}
+}
+
+@media(max-width: 992px) {
+	:root {
+		--fhc-dashboard-grid-size: 2;
+	}
+}
+
+@media(max-width: 768px) {
+	:root {
+		--fhc-dashboard-grid-size: 2;
+	}
+}
+
 @media(max-width: 577px) {
 	:root {
 		--fhc-dashboard-grid-size: 1;
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index baa8129cc..3a975d209 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -165,7 +165,8 @@ export default {
 			}
 		},
 		dragging(event){
-			this.toggleDraggedItemOverlay(true);
+			if(this.mode == MODE_MOVE)
+				this.toggleDraggedItemOverlay(true);
 			/*  use case: instead of showing the ghost widget when dragging, 
 				change the x and y position of the widget when dragging to drag the whole widget
 			event.target.style.top = `${this.clientY}px`;
@@ -271,7 +272,8 @@ export default {
 		},
 		_dragStart(evt) {
 			if (evt.dataTransfer) {
-				//evt.dataTransfer.setDragImage(evt.target, -99999, -99999);
+				if(this.mode == MODE_RESIZE)
+					evt.dataTransfer.setDragImage(evt.target, -99999, -99999);
 				evt.dataTransfer.dropEffect = 'move';
 				evt.dataTransfer.effectAllowed = 'move';
 			}
@@ -288,9 +290,9 @@ export default {
 		startResize(evt, item) {
 			if (!this.active)
 				return;
-			this._dragStart(evt);
 			this.mode = MODE_RESIZE;
 			this.draggedItem = item;
+			this._dragStart(evt);
 		},
 		dragOver(evt) {
 			if (!this.active)
@@ -338,7 +340,8 @@ export default {
 			this.draggedItem = null;
 		},
 		dragEnd() {
-			this.toggleDraggedItemOverlay(false);
+			if(this.mode == MODE_MOVE)
+				this.toggleDraggedItemOverlay(false);
 			if (this.mode == MODE_IDLE)
 				return;
 			if (!this.active || this.x < 0 || this.y < 0 || this.x >= this.cols)

From 95856c9e4dab2d2f301a908361166f5c2d67f18f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 27 Mar 2025 15:14:56 +0100
Subject: [PATCH 088/572] bootstrap5 version 5.3.3

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 053b5227f..0d45d00f1 100644
--- a/composer.json
+++ b/composer.json
@@ -308,9 +308,9 @@
 			"type": "package",
 			"package": {
 				"name": "twbs/bootstrap5",
-				"version": "5.3",
+				"version": "5.3.3",
 				"dist": {
-					"url": "https://github.com/twbs/bootstrap/archive/refs/tags/v5.3.zip",
+					"url": "https://github.com/twbs/bootstrap/archive/refs/tags/v5.3.3.zip",
 					"type": "zip"
 				}
 			}

From 51f4e1e57dc32a3b91442e9552faf711e9174815 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 31 Mar 2025 09:47:27 +0200
Subject: [PATCH 089/572] fix(Chrome overflow scroll display): changes overflow
 scroll to auto to change the visual in the chrome browser

---
 public/css/components/calendar.css                  | 4 ++--
 public/js/components/DashboardWidget/Studiengang.js | 2 +-
 public/js/components/DashboardWidget/Url.js         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 9edc1c0f2..ddf35e3e7 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -75,7 +75,7 @@
 
 .fhc-calendar-week-page .all-day-event{
 	max-height: 75px;
-	overflow:scroll;
+	overflow:auto;
 }
 
 .fhc-calendar-week-page .all-day-event-container{
@@ -106,7 +106,7 @@
 .fhc-calendar-day-page .all-day-event {
 	grid-column:2;
 	max-height: 75px;
-	overflow: scroll;
+	overflow: auto;
 }
 
 .fhc-calendar-day-page .all-day-event-container {
diff --git a/public/js/components/DashboardWidget/Studiengang.js b/public/js/components/DashboardWidget/Studiengang.js
index 3542bb523..2dd667538 100644
--- a/public/js/components/DashboardWidget/Studiengang.js
+++ b/public/js/components/DashboardWidget/Studiengang.js
@@ -13,7 +13,7 @@ export default {
 		this.$emit('setConfig', false);
 	},
 	template:/*html*/`
-		<div class="p-3 h-100 overflow-scroll">
+		<div class="p-3 h-100 overflow-auto">
 			<studiengang-information displayWidget ></studiengang-information>
 		</div>
 	`	
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 8123852d0..ead0d0d38 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -157,7 +157,7 @@ export default {
 		// this.$emit('setConfig', true); -> use this to enable widget config mode if needed
 	},
 	template: /*html*/ `
-    <div class="widgets-url w-100 h-100 overflow-scroll" style="padding: 1rem 1rem;">
+    <div class="widgets-url w-100 h-100 overflow-auto" style="padding: 1rem 1rem;">
         <div class="d-flex flex-column justify-content-between">
 
 			<template v-if="shared">

From 232da256acd3eb5fc2f8d0417d71d6aaac3a124b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 31 Mar 2025 14:56:41 +0200
Subject: [PATCH 090/572] fix(Dashboard Drag Placeholder): doesn't allow
 placeholder items to be dragged anymore and keeps the height and width of a
 widget when resizing the grid of the dashboard

---
 public/js/components/Dashboard/Section.js | 14 ++++++++++++--
 public/js/components/Drop/Grid/Item.js    |  7 ++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 7818e06b9..3a71eb5fc 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -49,8 +49,18 @@ export default {
 			return 'margin-bottom: 8px;';
 		},
 		items() {
+			
 			return this.widgets.map(item => {
-				return { ...item, ...(item.place[this.gridWidth] || {h: 1, w:1, x:0, y:0})};
+				let place;
+				if(!item.place[this.gridWidth]){
+					const nearestIndex = Object.keys(item.place).sort((a,b)=>Math.abs(a-this.gridWidth)-Math.abs(b-this.gridWidth)).pop();
+					if (nearestIndex === null){
+						place = {x:0,y:0,w:1,h:1};
+					}else{
+						place = item.place[nearestIndex];
+					}
+				}
+				return { ...item, ...(item.place[this.gridWidth] || place)};
 			});
 		},
 		items_hashmap() {
@@ -201,7 +211,7 @@ export default {
 				<dashboard-item 
 					v-if="!item.placeholder"
 					:id="item.widget"
-					:widgetID="item.widgetid"
+					:widgetID="item.id"
 					:width="item.w"
 					:height="item.h"
 					:loading="item.loading"
diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index 1ff4213ea..e7cafab4e 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -12,7 +12,8 @@ export default {
 		"startResize",
 		"dragging",
 		"endDrag",
-		"dropDrag"
+		"dropDrag",
+		"item"
 	],
 	data() {
 		return {
@@ -63,12 +64,12 @@ export default {
 	template: `
 	<div class="drop-grid-item"
 		@mousedown="registerDragAction"
-		@touchstart="tryDragStart($event, item)"
+		@touchstart.prevent="tryDragStart($event, item)"
 		@touchend="touchDragEnd"
 		@dragstart="tryDragStart($event, item)"
 		@drag="$emit('dragging',$event)"
 		@dragend="$emit('endDrag', $event)"
-		:draggable="active">
+		:draggable="active && !item.placeholder">
 		<slot v-bind="item"></slot>
 	</div>`
 }

From 702a84a25d15741fb93f9dea335633ce9f65db6b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 1 Apr 2025 09:28:29 +0200
Subject: [PATCH 091/572] update(Dashboard Grid Item):makes a widget only
 draggable if the dragAction is defined

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

diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index e7cafab4e..3f664eaec 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -69,7 +69,7 @@ export default {
 		@dragstart="tryDragStart($event, item)"
 		@drag="$emit('dragging',$event)"
 		@dragend="$emit('endDrag', $event)"
-		:draggable="active && !item.placeholder">
+		:draggable="active && !item.placeholder && dragAction != ''">
 		<slot v-bind="item"></slot>
 	</div>`
 }

From 33f800fa2844a604aca18c38a91797bd29caa600 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 1 Apr 2025 13:06:23 +0200
Subject: [PATCH 092/572] fix(Dashboard Mobile Touch Events): fixes the
 behaviour of the touch event for the dashboard grid

---
 public/css/components/dashboard.css           |  8 +++
 public/js/components/Dashboard/Dashboard.js   | 14 +++++
 public/js/components/Dashboard/Section.js     | 29 +++++-----
 .../js/components/Dashboard/Widget/Picker.js  | 18 ++----
 .../components/Dashboard/Widget/WidgetIcon.js | 29 ++++++++++
 public/js/components/Drop/Grid.js             | 55 +++++++++++++------
 public/js/components/Drop/Grid/Item.js        | 15 ++---
 7 files changed, 118 insertions(+), 50 deletions(-)
 create mode 100644 public/js/components/Dashboard/Widget/WidgetIcon.js

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index fb9a628de..e31b74233 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -77,3 +77,11 @@
 	z-index: 2;
 }
 
+.dragged-widget-icon{
+	position: absolute;
+	height: 250px;
+	width: 200px;
+	top: -999px;
+	left: -999px;
+	z-index: 3;
+}
\ No newline at end of file
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index a0d3ddcf3..e6f26d169 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -34,6 +34,7 @@ export default {
 	provide() {
 		return {
 			editMode: Vue.computed(()=>this.editMode),
+			widgetsSetup: Vue.computed(() => this.widgets),
 		}
 	},
 	computed: {
@@ -142,6 +143,19 @@ export default {
 		}
 	},
 	created() {
+
+		axios.get(this.apiurl + '/Widget/getWidgetsForDashboard', {
+			params: {
+				db: this.dashboard
+			}
+		}).then(res => {
+			res.data.retval.forEach(widget => {
+				widget.arguments = JSON.parse(widget.arguments);
+				widget.setup = JSON.parse(widget.setup);
+			});
+			this.widgets = res.data.retval;
+		}).catch(err => console.error('ERROR:', err));
+
 		axios.get(this.apiurl + '/Config', {params:{
 			db: this.dashboard
 		}}).then(res => {
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 3a71eb5fc..9a8a59a4f 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -49,18 +49,23 @@ export default {
 			return 'margin-bottom: 8px;';
 		},
 		items() {
+
+			const computeNearestPlace = (item, gridWidth) =>{
+				let place;
+				if (Object.keys(item.place).length > 0) {
+					const nearestIndex = Object.keys(item.place)
+											   .sort((a, b) => Math.abs(a - gridWidth) - Math.abs(b - gridWidth))
+											   .pop();
+					place = item.place[nearestIndex];
+				}
+				else{
+					place = { x: 0, y: 0, w: 1, h: 1 };
+				}
+				return place;
+			}
 			
 			return this.widgets.map(item => {
-				let place;
-				if(!item.place[this.gridWidth]){
-					const nearestIndex = Object.keys(item.place).sort((a,b)=>Math.abs(a-this.gridWidth)-Math.abs(b-this.gridWidth)).pop();
-					if (nearestIndex === null){
-						place = {x:0,y:0,w:1,h:1};
-					}else{
-						place = item.place[nearestIndex];
-					}
-				}
-				return { ...item, ...(item.place[this.gridWidth] || place)};
+				return { ...item, ...(item.place[this.gridWidth] || computeNearestPlace(item, this.gridWidth))};
 			});
 		},
 		items_hashmap() {
@@ -73,10 +78,6 @@ export default {
 		items_placeholders(){
 			let placeholders = [];
 			let col_max = this.gridWidth;
-			// OLD way of calculating the max rows
-			//let max_row = Math.max(...this.items.map(item => item.y)) + 1;
-			//let max_row_max_height = Math.max(...this.items.filter(item => item.y == (max_row - 1)).map(item => item.h));
-			//max_row + max_row_max_height - 1;
 			let rows_max = this.gridHeight;
 
 			// occupied hashmap to keep track of the occupied cells
diff --git a/public/js/components/Dashboard/Widget/Picker.js b/public/js/components/Dashboard/Widget/Picker.js
index c96e3bc7b..7ffd0671c 100644
--- a/public/js/components/Dashboard/Widget/Picker.js
+++ b/public/js/components/Dashboard/Widget/Picker.js
@@ -1,8 +1,10 @@
 import BsModal from "../../Bootstrap/Modal.js";
+import WidgetIcon from "./WidgetIcon.js";
 
 export default {
 	components: {
-		BsModal
+		BsModal,
+		WidgetIcon,
 	},
 	props: [
 		"widgets"
@@ -28,11 +30,7 @@ export default {
 			this.callbacks = {};
 			this.$refs.modal.hide();
 		},
-		path(src) {
-			if (src[0] == '/')
-				return FHC_JS_DATA_STORAGE_OBJECT.app_root + src;
-			return src;
-		}
+		
 	},
 	template: `<div class="dashboard-widget-picker">
 		<bs-modal ref="modal" class="fade" :dialog-class="{'modal-fullscreen-sm-down': 1, 'modal-xl': widgets && widgets.length > 0}" @hiddenBsModal="close">
@@ -43,13 +41,7 @@ export default {
 						No Widgets available
 					</div>
 					<div v-for="widget in widgets" :key="widget.widget_id" class="col-sm-6 col-md-4 col-lg-3 col-xl-2">
-						<div class="card h-100" @click="pick(widget.widget_id)">
-							<img class="card-img-top" :src="path(widget.setup.icon)" :alt="'pictogram for ' + (widget.setup.name || widget.widget_kurzbz)">
-							<div class="card-body">
-								<h5 class="card-title">{{ widget.setup.name || widget.widget_kurzbz }}</h5>
-								<p class="card-text">{{ widget.beschreibung }}</p>
-							</div>
-						</div>
+						<widget-icon @select="pick" :widget="widget" ></widget-icon>
 					</div>
 				</div>
 				<div v-else class="text-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
diff --git a/public/js/components/Dashboard/Widget/WidgetIcon.js b/public/js/components/Dashboard/Widget/WidgetIcon.js
new file mode 100644
index 000000000..312cad659
--- /dev/null
+++ b/public/js/components/Dashboard/Widget/WidgetIcon.js
@@ -0,0 +1,29 @@
+export default {
+	data(){
+		return {
+
+		}
+	},
+	props:{
+		widget:{
+			type:Object,
+			required:true,
+		}
+	},
+	methods:{
+		path(src) {
+			if (src[0] == '/')
+				return FHC_JS_DATA_STORAGE_OBJECT.app_root + src;
+			return src;
+		}
+	},
+	emits:["select"],
+	template: /*html */`
+	<div class="card h-100" @click="$emit('select',widget.widget_id);  pick(widget.widget_id)">
+		<img class="card-img-top" :src="path(widget.setup.icon)" :alt="'pictogram for ' + (widget.setup.name || widget.widget_kurzbz)">
+		<div class="card-body">
+			<h5 class="card-title">{{ widget.setup.name || widget.widget_kurzbz }}</h5>
+			<p class="card-text">{{ widget.beschreibung }}</p>
+		</div>
+	</div>`,
+}
\ No newline at end of file
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 3a975d209..4da51e815 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -2,6 +2,7 @@
 
 import GridItem from './Grid/Item.js';
 import GridLogic from '../../composables/GridLogic.js';
+import WidgetIcon from '../Dashboard/Widget/WidgetIcon.js';
 
 const MODE_IDLE = 0;
 const MODE_MOVE = 1;
@@ -10,10 +11,10 @@ const MODE_RESIZE = 2;
 export default {
 	name: 'Grid',
 	components: {
-		GridItem
-	},
-	inject: {
+		GridItem,
+		WidgetIcon,
 	},
+	inject: ["widgetsSetup"],
 	props: {
 		cols: Number,
 		items: Array,
@@ -50,6 +51,7 @@ export default {
 			fixedPositionUpdates: null,
 			draggedOffset: [0,0],
 			draggedItem: null,
+			draggedItemIcon: null,
 			additionalRow: null,
 		}
 	},
@@ -125,7 +127,15 @@ export default {
 			if (!this.active || !this.grid || this.mode != MODE_IDLE || this.x < 0 || this.y < 0 || this.x >= this.cols || this.y >= this.rows)
 				return false;
 			return this.grid.isFreeSlot(this.x, this.y);
-		}
+		},
+		widgetSetup(){
+			if (!this.widgetsSetup)
+				return;
+			return this.widgetsSetup.reduce((acc, ele) => { 
+				acc[ele.widget_id] =ele;
+				return acc;
+			} ,{});
+		},
 	},
 	watch: {
 		active(active) {
@@ -157,6 +167,8 @@ export default {
 	},
 	methods: {
 		toggleDraggedItemOverlay(condition){
+			if(!this.draggedItem)
+				return;
 			let draggedItemNode = document.getElementById(this.draggedItem.data.id);
 			if(condition){
 				draggedItemNode.classList.add("dashboard-item-overlay");
@@ -165,13 +177,11 @@ export default {
 			}
 		},
 		dragging(event){
-			if(this.mode == MODE_MOVE)
+			if(this.mode == MODE_MOVE){
 				this.toggleDraggedItemOverlay(true);
-			/*  use case: instead of showing the ghost widget when dragging, 
-				change the x and y position of the widget when dragging to drag the whole widget
-			event.target.style.top = `${this.clientY}px`;
-			event.target.style.left = `${this.clientX}px`;
-			*/
+			    this.draggedItemIcon.style.top = `${this.clientY}px`;
+			    this.draggedItemIcon.style.left = `${this.clientX}px`;
+			}
 		},
 		createNewGrid(items) {
 			this.grid = new GridLogic(this.cols);
@@ -270,10 +280,9 @@ export default {
 
 			return true;
 		},
-		_dragStart(evt) {
+		_dragStart(evt, item) {
 			if (evt.dataTransfer) {
-				if(this.mode == MODE_RESIZE)
-					evt.dataTransfer.setDragImage(evt.target, -99999, -99999);
+				evt.dataTransfer.setDragImage(evt.target, -99999, -99999);
 				evt.dataTransfer.dropEffect = 'move';
 				evt.dataTransfer.effectAllowed = 'move';
 			}
@@ -282,10 +291,11 @@ export default {
 			if (!this.active)
 				return;
 			
-			this._dragStart(evt);
 			this.mode = MODE_MOVE;
 			this.draggedItem = item;
+			this.draggedItemIcon = document.getElementById(`widget${this.draggedItem?.data.widget}`);
 			this.draggedOffset = [item.x - this.x, item.y - this.y];
+			this._dragStart(evt, item);
 		},
 		startResize(evt, item) {
 			if (!this.active)
@@ -334,14 +344,21 @@ export default {
 			}
 		},
 		dragCancel() {
+			
+			this.toggleDraggedItemOverlay(false);
 			this.mode = MODE_IDLE;
 			this.positionUpdates = null;
 			this.draggedOffset = [0,0],
 			this.draggedItem = null;
+			
+			if(this.draggedItemIcon){
+				this.draggedItemIcon.style.top = '-999px';
+				this.draggedItemIcon.style.left = '-999px';
+				this.draggedItemIcon = null;
+			}
+			
 		},
 		dragEnd() {
-			if(this.mode == MODE_MOVE)
-				this.toggleDraggedItemOverlay(false);
 			if (this.mode == MODE_IDLE)
 				return;
 			if (!this.active || this.x < 0 || this.y < 0 || this.x >= this.cols)
@@ -388,6 +405,11 @@ export default {
 		@mousemove="updateCursorOnMouseMove"
 		@mouseleave="mouseLeave">
 		<TransitionGroup tag="div">
+			<template v-for="(item,index) in placedItems">
+				<div class="dragged-widget-icon" :id="'widget'+item.data.widget" >
+					<widget-icon v-if="widgetsSetup" :widget="widgetSetup[item.data.widget]"></widget-icon>
+				</div>
+			</template>
 			<grid-item
 				v-for="(item,index) in (mode == 0 && active ? placedItems_withPlaceholders : placedItems)"
 				:key="item.data.id"
@@ -397,6 +419,7 @@ export default {
 				@dragging="dragging"
 				@end-drag="dragCancel"
 				@drop-drag="dragEnd"
+				@touchEvent="updateCursorOnMouseMove"
 				class="position-absolute"
 				:active="active"
 				:style="{
diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index 3f664eaec..c677dba79 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -13,7 +13,8 @@ export default {
 		"dragging",
 		"endDrag",
 		"dropDrag",
-		"item"
+		"item",
+		"touchEvent"
 	],
 	data() {
 		return {
@@ -54,20 +55,20 @@ export default {
 			this.dragging = false;
 			this.$emit('dropDrag', evt);
 		},
-		test(evt) {
-			let dragAction = this.dragAction || evt.target.getAttribute('drag-action');
-			if (dragAction) {
-				this.dragging = true;
-			}
+		touchStart(event){
+			this.$emit('touchEvent', event); 
+			this.registerDragAction(event); 
+			this.tryDragStart(event, this.item);
 		}
 	},
 	template: `
 	<div class="drop-grid-item"
 		@mousedown="registerDragAction"
-		@touchstart.prevent="tryDragStart($event, item)"
+		@touchstart.prevent="touchStart"
 		@touchend="touchDragEnd"
 		@dragstart="tryDragStart($event, item)"
 		@drag="$emit('dragging',$event)"
+		@touchmove="$emit('dragging',$event)"
 		@dragend="$emit('endDrag', $event)"
 		:draggable="active && !item.placeholder && dragAction != ''">
 		<slot v-bind="item"></slot>

From 97e34948e5da8ce636c70076a5aa7e2e91c6081a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 2 Apr 2025 11:23:25 +0200
Subject: [PATCH 093/572] refactor(WidgetIcon for Dashboard dragging): puts the
 hidden dashboard icons for the dragging image in the section component so
 that each section has its relative clientX and clientY positions

---
 public/css/components/dashboard.css           |  3 ++-
 public/js/components/Dashboard/Item.js        |  2 +-
 public/js/components/Dashboard/Section.js     | 19 ++++++++++++++++---
 .../components/Dashboard/Widget/WidgetIcon.js |  2 +-
 public/js/components/Drop/Grid.js             | 18 ++++++++----------
 5 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index e31b74233..1a9808e0c 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -84,4 +84,5 @@
 	top: -999px;
 	left: -999px;
 	z-index: 3;
-}
\ No newline at end of file
+}
+
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index c52c7887e..b78659a96 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -100,7 +100,7 @@ export default {
 	},
 	watch: {
 		config() {
-			this.arguments = { ...this.widget.arguments, ...this.config };
+			this.arguments = { ...this.widget?.arguments, ...this.config };
 			this.tmpConfig = { ...this.arguments };
 			this.$refs.config && this.$refs.config.hide();
 			this.isLoading = false;
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 9a8a59a4f..0ff0f52e2 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -2,13 +2,20 @@ import BsConfirm from "../Bootstrap/Confirm.js";
 import DropGrid from '../Drop/Grid.js'
 import DashboardItem from "./Item.js";
 import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
+import WidgetIcon from "./Widget/WidgetIcon.js"
+
 export default {
 	name: 'Section',
 	components: {
 		DropGrid,
-		DashboardItem
+		DashboardItem,
+		WidgetIcon,
 	},
 	inject: {
+		widgetsSetup:{
+			type: Object,
+			default: {},
+		},
 		adminMode: {
 			type: Boolean,
 			default: false
@@ -38,7 +45,8 @@ export default {
 		return {
 			editModeIsActive: Vue.computed(() =>
 				this.editModeIsActive
-			),		
+			),	
+			sectionName: Vue.computed(() => this.name),	
 		}
 	},
 	computed: {
@@ -205,7 +213,12 @@ export default {
 		});
 	},
 	template: `
-	<div class="dashboard-section" ref="container" :style="getSectionStyle">
+	<div class="dashboard-section position-relative" ref="container" :style="getSectionStyle">
+		<template v-for="setup in widgetsSetup">
+			<div class="dragged-widget-icon" :id="'widget-'+name+'-'+setup.widget_id" >
+				<widget-icon v-if="widgetsSetup" :widget="setup"></widget-icon>
+			</div>
+		</template>
 		<drop-grid v-model:cols="gridWidth" :items="items" :placeholders="items_placeholders" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
 				
diff --git a/public/js/components/Dashboard/Widget/WidgetIcon.js b/public/js/components/Dashboard/Widget/WidgetIcon.js
index 312cad659..a7d816cb2 100644
--- a/public/js/components/Dashboard/Widget/WidgetIcon.js
+++ b/public/js/components/Dashboard/Widget/WidgetIcon.js
@@ -19,7 +19,7 @@ export default {
 	},
 	emits:["select"],
 	template: /*html */`
-	<div class="card h-100" @click="$emit('select',widget.widget_id);  pick(widget.widget_id)">
+	<div class="card h-100" @click="$emit('select',widget.widget_id);">
 		<img class="card-img-top" :src="path(widget.setup.icon)" :alt="'pictogram for ' + (widget.setup.name || widget.widget_kurzbz)">
 		<div class="card-body">
 			<h5 class="card-title">{{ widget.setup.name || widget.widget_kurzbz }}</h5>
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 4da51e815..535eed2ba 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -2,7 +2,6 @@
 
 import GridItem from './Grid/Item.js';
 import GridLogic from '../../composables/GridLogic.js';
-import WidgetIcon from '../Dashboard/Widget/WidgetIcon.js';
 
 const MODE_IDLE = 0;
 const MODE_MOVE = 1;
@@ -12,9 +11,7 @@ export default {
 	name: 'Grid',
 	components: {
 		GridItem,
-		WidgetIcon,
 	},
-	inject: ["widgetsSetup"],
 	props: {
 		cols: Number,
 		items: Array,
@@ -55,6 +52,12 @@ export default {
 			additionalRow: null,
 		}
 	},
+	inject:{
+		sectionName: {
+			type: String,
+			default: '',
+		},
+	},
 	computed: {
 		rows() {
 			if ((this.mode == MODE_MOVE || this.mode == MODE_RESIZE) && this.dragGrid)
@@ -293,7 +296,7 @@ export default {
 			
 			this.mode = MODE_MOVE;
 			this.draggedItem = item;
-			this.draggedItemIcon = document.getElementById(`widget${this.draggedItem?.data.widget}`);
+			this.draggedItemIcon = document.getElementById(`widget-${this.sectionName}-${this.draggedItem?.data.widget}`);
 			this.draggedOffset = [item.x - this.x, item.y - this.y];
 			this._dragStart(evt, item);
 		},
@@ -398,18 +401,13 @@ export default {
 		ref="container"
 		class="drop-grid position-relative h-0"
 		:style="gridStyle"
-		@touchmove="dragOver"
+		@touchmove.prevent="dragOver"
 		@touchend="dragCancel"
 		@dragover.prevent="dragOver"
 		@drop="dragEnd"
 		@mousemove="updateCursorOnMouseMove"
 		@mouseleave="mouseLeave">
 		<TransitionGroup tag="div">
-			<template v-for="(item,index) in placedItems">
-				<div class="dragged-widget-icon" :id="'widget'+item.data.widget" >
-					<widget-icon v-if="widgetsSetup" :widget="widgetSetup[item.data.widget]"></widget-icon>
-				</div>
-			</template>
 			<grid-item
 				v-for="(item,index) in (mode == 0 && active ? placedItems_withPlaceholders : placedItems)"
 				:key="item.data.id"

From 199141893197adb85db4a306e81fc54026e730a3 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 3 Apr 2025 16:54:56 +0200
Subject: [PATCH 094/572] New tab Dokumente

---
 .../api/frontend/v1/stv/Config.php            |   4 +
 .../api/frontend/v1/stv/Dokumente.php         | 553 ++++++++++++++
 application/models/crm/Akte_model.php         |  57 +-
 application/models/crm/Dokument_model.php     |  87 +++
 .../models/crm/Dokumentprestudent_model.php   |  35 +
 public/js/api/stv.js                          |   2 +
 public/js/api/stv/documents.js                |  33 +
 .../Studentenverwaltung/Details/Dokumente.js  |  22 +
 .../Details/Dokumente/Dokumente.js            |  51 ++
 .../Details/Dokumente/List/Accepted.js        | 331 +++++++++
 .../Details/Dokumente/List/Unaccepted.js      | 344 +++++++++
 .../Details/Dokumente/Modal/Edit.js           | 137 ++++
 .../Details/Dokumente/Modal/Upload.js         | 124 ++++
 system/phrasesupdate.php                      | 682 ++++++++++++++++++
 14 files changed, 2461 insertions(+), 1 deletion(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Dokumente.php
 create mode 100644 public/js/api/stv/documents.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Dokumente.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Dokumente.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 42de1b02f..ecc17119d 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -83,6 +83,10 @@ class Config extends FHCAPI_Controller
 			'title' => 'Status',
 			'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js'
 		];
+		$result['documents'] = [
+			'title' => $this->p->t('stv', 'tab_dokumente'),
+			'component' => './Stv/Studentenverwaltung/Details/Dokumente.js'
+		];
 		$result['banking'] = [
 			'title' => $this->p->t('stv', 'tab_banking'),
 			'component' => './Stv/Studentenverwaltung/Details/Konto.js',
diff --git a/application/controllers/api/frontend/v1/stv/Dokumente.php b/application/controllers/api/frontend/v1/stv/Dokumente.php
new file mode 100644
index 000000000..2923f7204
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Dokumente.php
@@ -0,0 +1,553 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Dokumente extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getDocumentsUnaccepted' => ['admin:r', 'assistenz:r'],
+			'getDocumentsAccepted' => ['admin:r', 'assistenz:r'],
+			'deleteZuordnung' => ['admin:rw', 'assistenz:rw'],
+			'createZuordnung' => ['admin:rw', 'assistenz:rw'],
+			'loadAkte' => ['admin:rw', 'assistenz:rw'],
+			'deleteAkte' => ['admin:rw', 'assistenz:rw'],
+			'updateAkte' => ['admin:rw', 'assistenz:rw'],
+			'getDoktypen' => ['admin:r', 'assistenz:r'],
+			'uploadDokument' => ['admin:rw', 'assistenz:rw'],
+			'download' => ['admin:rw', 'assistenz:rw'],
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+			'dokumente'
+		]);
+
+		// Load models
+		$this->load->model('crm/Akte_model', 'AkteModel');
+		$this->load->model('crm/Dokument_model', 'DokumentModel');
+		$this->load->model('crm/Dokumentprestudent_model', 'DokumentprestudentModel');
+
+		//TODO(Manu) check additional Berechtigungen
+		//TODO(Manu) check if using dokument lib instead of dokument model?
+	}
+
+	public function getDocumentsUnaccepted($prestudent_id, $studiengang_kz)
+	{
+		if(!$prestudent_id)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+
+		if (!is_numeric($prestudent_id))
+			$this->terminateWithError($this->p->t('ui', 'error_valueNotNumeric', ['value' => 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+
+		if(!$studiengang_kz)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiengang_kz']), self::ERROR_TYPE_GENERAL);
+
+		$person_id = $this->_getPersonId($prestudent_id);
+		$result = $this->DokumentModel->getUnacceptedDocuments($prestudent_id, $person_id);
+
+		$dataAkteUnaccepted = $this->getDataOrTerminateWithError($result);
+		$resultMd = $this->_getMissingDocuments($studiengang_kz, $prestudent_id);
+
+		$data = $this->_mergeDocuments($dataAkteUnaccepted, $resultMd);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getDocumentsAccepted($prestudent_id, $studiengang_kz)
+	{
+		if(!$prestudent_id)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+
+		if (!is_numeric($prestudent_id))
+			$this->terminateWithError($this->p->t('ui', 'error_valueNotNumeric', ['value' => 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+
+		if(!$studiengang_kz)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiengang_kz']), self::ERROR_TYPE_GENERAL);
+
+		$resultPreDoc = $this->_getPrestudentDokumente($prestudent_id);
+
+		$arrayAccepted = [];
+		$person_id = $this->_getPersonId($prestudent_id);
+
+		$docNames = array_map(function ($item) {
+			return $item->dokument_kurzbz;
+		}, $resultPreDoc);
+
+		foreach($docNames as $doc)
+		{
+			$result = $this->AkteModel->getAktenFAS($person_id, $doc, $studiengang_kz, $prestudent_id, true);
+
+			if (isError($result))
+			{
+				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+			if (hasData($result))
+			{
+				$data = getData($result);
+				array_push($arrayAccepted, current($data));
+			}
+		}
+
+		//Merge with Data of Akte
+		$newDataMap = [];
+		//helper, lookupArray
+		foreach ($arrayAccepted as $item) {
+			$newDataMap[$item->dokument_kurzbz] = $item;
+		}
+
+		//add Data of Akte to PrestudentData
+		foreach ($resultPreDoc as $obj) {
+			if (isset($newDataMap[$obj->dokument_kurzbz])) {
+				$obj->akte_id = $newDataMap[$obj->dokument_kurzbz]->akte_id;
+				$obj->hochgeladenamum = $newDataMap[$obj->dokument_kurzbz]->hochgeladenamum;
+				$obj->titel_intern = $newDataMap[$obj->dokument_kurzbz]->titel_intern;
+				$obj->nachgereicht = $newDataMap[$obj->dokument_kurzbz]->nachgereicht;
+				$obj->akzeptiertamum = $newDataMap[$obj->dokument_kurzbz]->akzeptiertamum;
+				$obj->dms_id = $newDataMap[$obj->dokument_kurzbz]->dms_id;
+				$obj->infotext = $newDataMap[$obj->dokument_kurzbz]->infotext;
+				$obj->anmerkung_intern = $newDataMap[$obj->dokument_kurzbz]->anmerkung_intern;
+				$obj->nachgereicht_am = $newDataMap[$obj->dokument_kurzbz]->nachgereicht_am;
+				$obj->vorhanden = $newDataMap[$obj->dokument_kurzbz]->vorhanden;
+			}
+		}
+		$this->terminateWithSuccess($resultPreDoc);
+	}
+
+	public function deleteZuordnung($prestudent_id, $dokument_kurzbz)
+	{
+		if(!$prestudent_id)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+
+		if (!is_numeric($prestudent_id))
+			$this->terminateWithError($this->p->t('ui', 'error_valueNotNumeric', ['value' => 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+
+		if(!$dokument_kurzbz)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Dokument_kurzbz']), self::ERROR_TYPE_GENERAL);
+
+		$result = $this->DokumentprestudentModel->delete(
+			[
+				'prestudent_id' => $prestudent_id,
+				'dokument_kurzbz' => $dokument_kurzbz
+			]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function loadAkte($akte_id)
+	{
+		if (!$akte_id)
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Akte ID']), self::ERROR_TYPE_GENERAL);
+
+		$this->AkteModel->addSelect('public.tbl_akte.*');
+		$this->AkteModel->addSelect("CONCAT(public.tbl_person.vorname, ' ' , public.tbl_person.nachname) AS namePerson");
+		$this->AkteModel->addJoin('public.tbl_person', 'person_id');
+		$result = $this->AkteModel->loadWhere(
+			[
+				'akte_id' => $akte_id,
+			]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$data = current($data);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function updateAkte()
+	{
+		$this->form_validation->set_rules('akte_id', 'Akte ID', 'required', [
+			'required' => $this->p->t('dokumente', 'err_updateNotAllowed')
+		]);
+
+		$this->form_validation->set_rules('dokument_kurzbz', 'Dokumenttyp', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Dokumenttyp'])
+		]);
+
+		$this->form_validation->set_rules('nachreichung_am', 'Nachreichung am', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Nachreichung am'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$uid = getAuthUID();
+
+		$result = $this->AkteModel->update(
+			[
+				'akte_id' => $this->input->post('akte_id'),
+			],
+			[
+				'dokument_kurzbz' => $this->input->post('dokument_kurzbz'),
+				'anmerkung_intern' => $this->input->post('anmerkung_intern'),
+				'titel_intern' => $this->input->post('titel_intern'),
+				'nachgereicht_am' => $this->input->post('nachgereicht_am'),
+				'updateamum' => date('c'),
+				'updatevon' => $uid,
+			]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function createZuordnung($prestudent_id, $dokument_kurzbz)
+	{
+		if (!$prestudent_id)
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+
+		if(!$dokument_kurzbz)
+			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Dokument_kurzbz']), self::ERROR_TYPE_GENERAL);
+
+		$uid = getAuthUid();
+
+		$result = $this->DokumentprestudentModel->insert(
+			[
+				'prestudent_id' => $prestudent_id,
+				'dokument_kurzbz' => $dokument_kurzbz,
+				'mitarbeiter_uid' => $uid,
+				'datum' => date('c'),
+				'insertamum' => date('c'),
+				'insertvon' =>  $uid,
+			]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function deleteAkte($akte_id)
+	{
+		if (!$akte_id)
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Akte ID']), self::ERROR_TYPE_GENERAL);
+
+		$result = $this->AkteModel->load($akte_id);
+		$dataAkte = $this->getDataOrTerminateWithError($result);
+
+		$logdata_akte = var_export($dataAkte, true);
+
+		$dms_id = current($dataAkte)->dms_id;
+		$nachgereicht = current($dataAkte)->nachgereicht;
+		$inhalt = current($dataAkte)->inhalt;
+		$inhaltVorhanden = $inhalt != '';
+		$uid = getAuthUid();
+
+		$this->db->trans_start();
+
+		if($dms_id)
+		{
+			$this->load->model('content/Dms_model', 'DmsModel');
+			$result = $this->DmsModel->load($dms_id);
+			$data = $this->getDataOrTerminateWithError($result);
+
+			$logdata_dms = (array)$data;
+			$logdata_dms = "Logdata: " . var_export($logdata_dms, true);
+
+			//delete from dmsLib
+			$this->load->library('DmsLib');
+			$person_id = current($dataAkte)->person_id;
+			$result = $this->dmslib->delete($person_id, $dms_id);
+			$this->getDataOrTerminateWithError($result);
+
+			//LOGGING Dms ID
+			$this->load->model('system/Log_model', 'LogModel');
+			$result = $this->LogModel->insert([
+				'executetime' => date('c'),
+				'mitarbeiter_uid' => $uid,
+				'beschreibung' => "Löschen der DMS_ID ". $dms_id,
+				'sql' => $logdata_dms
+			]);
+			$this->getDataOrTerminateWithError($result);
+
+			//delete akte
+			$result = $this->AkteModel->delete(
+				[
+					'akte_id' => $akte_id
+				]
+			);
+			$data = $this->getDataOrTerminateWithError($result);
+
+			//Logging Deletion Akte
+			$result = $this->LogModel->insert([
+				'executetime' => date('c'),
+				'mitarbeiter_uid' => $uid,
+				'beschreibung' => "Löschen der Akte ". $akte_id,
+				'sql' => "DELETE FROM public.tbl_akte WHERE akte_id=" .$akte_id. " LogData: ". $logdata_akte
+			]);
+			$this->getDataOrTerminateWithError($result);
+			$this->db->trans_complete();
+			$this->terminateWithSuccess($data);
+		}
+		elseif (!!$dms_id || ($nachgereicht && !$inhaltVorhanden))
+		{
+			$result = $this->AkteModel->delete(
+				[
+					'akte_id' => $akte_id
+				]
+			);
+			$data = $this->getDataOrTerminateWithError($result);
+
+			$result = $this->LogModel->insert([
+				'executetime' => date('c'),
+				'mitarbeiter_uid' => $uid,
+				'beschreibung' => "Löschen der Akte ". $akte_id,
+				'sql' => "DELETE FROM public.tbl_akte WHERE akte_id=" .$akte_id. " LogData: ". $logdata_akte
+			]);
+			$this->getDataOrTerminateWithError($result);
+
+			$this->db->trans_complete();
+			$this->terminateWithSuccess($data);
+		}
+		else
+			$this->terminateWithError($this->p->t('dokumente', 'err_deleteDokHere'), self::ERROR_TYPE_GENERAL);
+	}
+
+	public function uploadDokument()
+	{
+		$this->load->library('DmsLib');
+		$prestudent_id = $this->input->post('prestudent_id');
+		$anmerkung_intern = $this->input->post('anmerkung_intern');
+		$titel_intern = $this->input->post('titel_intern');
+		$dokument_kurzbz = $this->input->post('dokument_kurzbz');
+
+		$this->form_validation->set_rules('prestudent_id', 'Prestudent_id', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Prestudent ID'])
+		]);
+
+		$this->form_validation->set_rules('dokument_kurzbz', 'Dokumenttyp', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Dokumenttyp'])
+		]);
+
+		//validation if attachment was added
+		$this->form_validation->set_rules('anhang', 'Attachment', 'callback_file_check');
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$this->db->trans_start();
+		$uid = getAuthUID();
+
+		$dms = array(
+			'kategorie_kurzbz'  => 'Akte',
+			'version'           => 0,
+			'name'              => $_FILES['anhang']['name'],
+			'mimetype'          => $_FILES['anhang']['type'],
+			'insertamum'        => date('c'),
+			'insertvon'         => $uid
+		);
+
+		$result = $this->dmslib->upload($dms, 'anhang', array("jpg", "png", "pdf"));
+
+		if (isError($result))
+		{
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$dms_id = $result->retval['dms_id'];
+
+		$person_id = $this->_getPersonId($prestudent_id);
+
+		$result = $this->DokumentModel->load($dokument_kurzbz);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$bezeichnung = current($data)->bezeichnung;
+
+		//save entry in akte
+		if($dms_id)
+		{
+			$result = $this->AkteModel->insert([
+				'person_id' => $person_id,
+				'dms_id' => $dms_id,
+				'dokument_kurzbz' => $dokument_kurzbz,
+				'mimetype' => $_FILES['anhang']['type'],
+				'insertamum' => date('c'),
+				'erstelltam' => date('c'),
+				'insertvon' => $uid,
+				'anmerkung_intern' => $anmerkung_intern,
+				'titel_intern' => $titel_intern,
+				'bezeichnung' => $bezeichnung,
+				'titel' => $_FILES['anhang']['name']
+			]);
+
+			$data = $this->getDataOrTerminateWithError($result);
+			$this->db->trans_complete();
+			$this->terminateWithSuccess($data);
+		}
+		$this->db->trans_complete();
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getDoktypen()
+	{
+		$this->DokumentModel->addSelect('dokument_kurzbz');
+		$this->DokumentModel->addSelect('bezeichnung');
+		$this->DokumentModel->addOrder('dokument_kurzbz', 'ASC');
+		$result = $this->DokumentModel->load();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function download()
+	{
+		//TODO(Manu) check filetype, Decoding
+		$akte_id = $this->input->get('akte_id');
+
+		if(!$akte_id)
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Akte ID']), self::ERROR_TYPE_GENERAL);
+
+		if (!is_numeric($akte_id))
+			$this->terminateWithError($this->p->t('ui', 'error_valueNotNumeric', ['value' => 'Akte ID']), self::ERROR_TYPE_GENERAL);
+
+
+		$result = $this->AkteModel->load($akte_id);
+
+		if (!hasData($result)) $this->terminateWithError('Akte not found');
+
+		$data = getData($result)[0];
+
+		header('Content-Description: File Transfer');
+		header('Content-Type: '. $data->mimetype);
+		header('Content-Disposition: attachment; filename="'.$data->titel.'"');
+		header('Expires: 0');
+		header('Cache-Control: must-revalidate');
+		header('Pragma: public');
+		if (isset($data->inhalt) && !empty($data->inhalt)) {
+			$decodedContent = base64_decode($data->inhalt, true);
+
+			if ($decodedContent === false) {
+				die('Error: Base64-Dekodierung failed.');
+			}
+			echo $decodedContent;
+		}
+		die();
+	}
+
+	private function _getMissingDocuments($studiengang_kz, $prestudent_id)
+	{
+		$result = $this->DokumentModel->getMissingDocuments($studiengang_kz, $prestudent_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		return $data;
+	}
+
+	private function _getUnacceptedDocuments($prestudent_id)
+	{
+		$person_id = $this->_getPersonId($prestudent_id);
+		$result = $this->DokumentModel->getUnacceptedDocuments($prestudent_id, $person_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		return $data;
+	}
+
+	/**
+	 * helper function for merging objects
+	 * sorts object after merging according to dokument_kurzbz
+	 * @param $original object of documents of akte
+	 * @param object $toMerge documents to merge (of dokumentprestudent, dokumentstudiengang)
+	 * @return Array mergedObject
+	 */
+	private function _mergeDocuments($original, $toMerge)
+	{
+		$existingKurzbez = [];
+		foreach ($original as $doc) {
+			$existingKurzbez[$doc->dokument_kurzbz] = true;
+		}
+
+		foreach ($toMerge as $doc) {
+			if (!isset($existingKurzbez[$doc->dokument_kurzbz])) {
+				$original[] = $doc;
+				$existingKurzbez[$doc->dokument_kurzbz] = true;
+			}
+			else
+			{
+				foreach($original as $docOriginal)
+				{
+					if ($docOriginal->dokument_kurzbz == $doc->dokument_kurzbz)
+					{
+						$docOriginal->pflicht = $doc->pflicht;
+						$docOriginal->onlinebewerbung = $doc->onlinebewerbung;
+					}
+				}
+			}
+		}
+
+		usort($original, function ($a, $b) {
+			return strcmp($a->dokument_kurzbz, $b->dokument_kurzbz);
+		});
+
+		return $original;
+	}
+
+	private function _getDocumentsOfAkte($person_id)
+	{
+		$result = $this->AkteModel->getAktenFAS($person_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		return $data;
+	}
+
+	private function _getPrestudentDokumente($prestudent_id)
+	{
+		$result = $this->DokumentprestudentModel->getPrestudentDokumente($prestudent_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		return $data;
+	}
+
+	private function _getPersonId($prestudent_id)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$result = $this->PrestudentModel->loadWhere(
+			['prestudent_id' => $prestudent_id]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$person = current($data);
+
+		return $person->person_id;
+	}
+
+	public function file_check($str)
+	{
+		if (isset($_FILES['anhang']) && $_FILES['anhang']['size'] > 0)
+		{
+			$allowed_mime_types = ['image/jpeg', 'image/png', 'application/pdf'];
+			$mime = mime_content_type($_FILES['anhang']['tmp_name']);
+
+			if (in_array($mime, $allowed_mime_types))
+			{
+				return true;
+			} else
+			{
+				$this->form_validation->set_message('file_check', $this->p->t('dokumente', 'error_fileType'));
+				return false;
+			}
+		}
+		else
+		{
+			$this->form_validation->set_message('file_check', $this->p->t('dokumente', 'error_fileMissing'));
+			return false;
+		}
+	}
+}
diff --git a/application/models/crm/Akte_model.php b/application/models/crm/Akte_model.php
index 57b6e0665..4b36e8267 100644
--- a/application/models/crm/Akte_model.php
+++ b/application/models/crm/Akte_model.php
@@ -92,7 +92,7 @@ class Akte_model extends DB_Model
 						 a.anmerkung,
 						 a.nachgereicht,
 						 a.nachgereicht_am,
-						 CASE WHEN MAX(dp.dokument_kurzbz) IS NOT NULL THEN TRUE ELSE FALSE END AS accepted
+						 CASE WHEN MAX(dp.dokument_kurzbz) IS NOT NULL THEN TRUE ELSE FALSE END AS accepted,
 					FROM public.tbl_akte a
 			  INNER JOIN public.tbl_prestudent p USING(person_id)
 			   LEFT JOIN public.tbl_dokumentprestudent dp USING(prestudent_id, dokument_kurzbz)
@@ -111,6 +111,61 @@ class Akte_model extends DB_Model
 		return $this->execQuery($query, $parametersArray);
 	}
 
+	/**
+	 * getAktenAccepted FAS
+	 */
+	public function getAktenFAS($person_id, $dokument_kurzbz = null, $stg_kz = null, $prestudent_id = null, $returnInhalt = false)
+	{
+		$query = 'SELECT
+    				a.akte_id,
+    				a.bezeichnung,
+    				a.dokument_kurzbz,
+					a.titel_intern,
+					a.anmerkung_intern,
+					a.insertamum as hochgeladenamum,
+					a.updatevon, a.insertvon, a.uid,
+					a.dms_id, a.anmerkung as infotext,
+					a.nachgereicht,
+					CASE
+						WHEN inhalt IS NOT NULL OR a.dms_id IS NOT NULL
+						    THEN true
+						ELSE false
+					END AS vorhanden,
+    				a.nachgereicht_am,
+					ausstellungsnation, formal_geprueft_amum, archiv,
+					signiert, stud_selfservice, akzeptiertamum, inhalt
+					FROM public.tbl_akte a
+					WHERE a.person_id = ?';
+
+		$parametersArray = array($person_id);
+
+		if (!isEmptyString($dokument_kurzbz))
+		{
+			$query .= " AND dokument_kurzbz = ?
+			AND dokument_kurzbz NOT IN ('Zeugnis','DiplSupp','Bescheid')";
+			array_push($parametersArray, $dokument_kurzbz);
+		}
+
+		if($stg_kz != null && $prestudent_id != null)
+		{
+			$query.= " AND dokument_kurzbz not in (
+				SELECT dokument_kurzbz
+					FROM public.tbl_dokument
+					JOIN public.tbl_dokumentstudiengang USING(dokument_kurzbz)
+				WHERE studiengang_kz= ?
+ 				AND dokument_kurzbz NOT IN(
+ 					SELECT dokument_kurzbz FROM public.tbl_dokumentprestudent
+				JOIN public.tbl_dokument USING(dokument_kurzbz)
+				WHERE prestudent_id=?))";
+			array_push($parametersArray, $stg_kz);
+			array_push($parametersArray, $prestudent_id);
+		}
+
+		$query .= ' ORDER BY erstelltam';
+
+		return $this->execQuery($query, $parametersArray);
+	}
+
 	/**
 	 * getAktenAcceptedDms
 	 */
diff --git a/application/models/crm/Dokument_model.php b/application/models/crm/Dokument_model.php
index 7ef2be716..8008202c1 100644
--- a/application/models/crm/Dokument_model.php
+++ b/application/models/crm/Dokument_model.php
@@ -11,4 +11,91 @@ class Dokument_model extends DB_Model
 		$this->dbTable = 'public.tbl_dokument';
 		$this->pk = 'dokument_kurzbz';
 	}
+
+	/**
+	 * Loads all missing Documents of a Studiengang
+	 * a Prestudent has not submitted
+	 * @param integer studiengang_kz
+	 * @param integer prestudent_id
+	 * @param boolean archivdokumente
+	 * 	Default: true.
+	 * 	If false, documents that are archivable (tbl_vorlage.archivierbar e.g. certificate, notice, ...) not retrieved
+	 * @return Array of Documents || error
+	 */
+	public function getMissingDocuments($studiengang_kz, $prestudent_id = null, $archivdokumente = false, $person_id = null)
+	{
+		$parametersArray = array($studiengang_kz);
+
+		$qry = "SELECT
+    				tbl_dokument.* ,
+					tbl_dokumentstudiengang.*
+				FROM public.tbl_dokument
+				JOIN public.tbl_dokumentstudiengang USING(dokument_kurzbz)
+				LEFT JOIN public.tbl_vorlage ON (tbl_dokument.dokument_kurzbz = tbl_vorlage.vorlage_kurzbz)
+				WHERE studiengang_kz = ? ";
+
+		if($prestudent_id)
+		{
+			array_push($parametersArray, $prestudent_id);
+			$qry.="	AND tbl_dokument.dokument_kurzbz NOT IN (
+					SELECT dokument_kurzbz FROM public.tbl_dokumentprestudent WHERE prestudent_id= ?)";
+		}
+
+		if(!$archivdokumente)
+		{
+			$qry.="	AND (tbl_vorlage.archivierbar = FALSE OR tbl_vorlage.archivierbar IS NULL)";
+		}
+
+		$qry.=" ORDER BY tbl_dokument.dokument_kurzbz;";
+
+		return $this->execQuery($qry, $parametersArray);
+	}
+
+	public function getUnacceptedDocuments($prestudent_id, $person_id)
+	{
+		$parametersArray = array($person_id, $prestudent_id);
+
+		$qry = " SELECT
+				  a.akte_id,
+				  a.bezeichnung,
+				  a.dokument_kurzbz,
+				  a.titel_intern,
+				  a.anmerkung_intern,
+				  a.insertamum as hochgeladenamum,
+				  a.updatevon,
+				  a.insertvon,
+				  a.uid,
+				  a.dms_id,
+				  a.anmerkung as infotext,
+				  a.nachgereicht,
+				  CASE
+					WHEN inhalt IS NOT NULL
+					OR a.dms_id IS NOT NULL THEN true
+					ELSE false
+				  END AS vorhanden,
+				  a.nachgereicht_am,
+				  ausstellungsnation,
+				  formal_geprueft_amum,
+				  archiv,
+				  signiert,
+				  stud_selfservice,
+				  akzeptiertamum,
+				  inhalt
+				FROM
+				  public.tbl_akte a
+				WHERE
+				  a.person_id = ?
+				  AND a.dokument_kurzbz NOT IN (
+					SELECT
+					  dokument_kurzbz
+					FROM
+					  public.tbl_dokumentprestudent
+					WHERE
+					  prestudent_id = ?
+					)
+				AND a.dokument_kurzbz NOT IN ('Zeugnis','DiplSupp','Bescheid')
+				ORDER BY a.dokument_kurzbz;";
+
+		return $this->execQuery($qry, $parametersArray);
+	}
 }
diff --git a/application/models/crm/Dokumentprestudent_model.php b/application/models/crm/Dokumentprestudent_model.php
index 0a6669359..2415ee483 100644
--- a/application/models/crm/Dokumentprestudent_model.php
+++ b/application/models/crm/Dokumentprestudent_model.php
@@ -69,4 +69,39 @@ class Dokumentprestudent_model extends DB_Model
 
 		return $result;
 	}
+
+	/**
+	 * Loads all Documents of Prestudent, already submitted
+	 * @param integer prestudent_id
+	 * @param boolean archivdokumente Default true. if false, archivable Documents (tbl_vorlage.archivierbar zB Zeugnis, Bescheid, ...) not retrieved
+	 * @return Array of Documents || error
+	 */
+	public function getPrestudentDokumente($prestudent_id, $archivdokumente = true)
+	{
+		$parametersArray = array($prestudent_id);
+
+		$qry = "SELECT
+				  d.bezeichnung,
+				  d.dokument_kurzbz,
+				  dp.datum as Docdatum,
+				  dp.mitarbeiter_uid as DocMitarbeiter_uid,
+				  dp.insertamum as Docinsertamum,
+				  dp.prestudent_id,
+				  CONCAT(p.vorname, ' ', p.nachname) as insertvonma
+				FROM
+				  public.tbl_dokumentprestudent dp
+				  JOIN public.tbl_dokument d USING(dokument_kurzbz)
+				  LEFT JOIN public.tbl_vorlage v ON (d.dokument_kurzbz = v.vorlage_kurzbz)
+				  LEFT JOIN public.tbl_benutzer bn ON (bn.uid = dp.mitarbeiter_uid)
+				  LEFT JOIN public.tbl_person p ON (p.person_id = bn.person_id)
+				WHERE
+				  prestudent_id = ?";
+
+		if(!$archivdokumente)
+		{
+			$qry.="	AND (v.archivierbar = FALSE OR v.archivierbar IS NULL)";
+		}
+
+		return $this->execQuery($qry, $parametersArray);
+	}
 }
diff --git a/public/js/api/stv.js b/public/js/api/stv.js
index ae88b0516..b1d83df88 100644
--- a/public/js/api/stv.js
+++ b/public/js/api/stv.js
@@ -10,6 +10,7 @@ import exam from './stv/exam.js';
 import abschlusspruefung from './stv/abschlusspruefung.js';
 import grades from './stv/grades.js';
 import mobility from './stv/mobility.js';
+import documents from './stv/documents.js';
 
 export default {
 	verband,
@@ -24,6 +25,7 @@ export default {
 	abschlusspruefung,
 	grades,
 	mobility,
+	documents,
 	configStudent() {
 		return this.$fhcApi.get('api/frontend/v1/stv/config/student');
 	},
diff --git a/public/js/api/stv/documents.js b/public/js/api/stv/documents.js
new file mode 100644
index 000000000..9934520fc
--- /dev/null
+++ b/public/js/api/stv/documents.js
@@ -0,0 +1,33 @@
+export default {
+	getDocumentsUnaccepted(url, config, params) {
+		return this.$fhcApi.get('api/frontend/v1/stv/dokumente/getDocumentsUnaccepted/' + params.id + '/' + params.studiengang_kz);
+	},
+	getDocumentsAccepted(url, config, params) {
+		return this.$fhcApi.get('api/frontend/v1/stv/dokumente/getDocumentsAccepted/' + params.id + '/' + params.studiengang_kz);
+	},
+	deleteZuordnung(params){
+		return this.$fhcApi.post('api/frontend/v1/stv/dokumente/deleteZuordnung/' + params.prestudent_id + '/' + params.dokument_kurzbz);
+	},
+	createZuordnung(params){
+		return this.$fhcApi.post('api/frontend/v1/stv/dokumente/createZuordnung/'
+			+ params.prestudent_id + '/'
+			+ params.dokument_kurzbz);
+	},
+	loadAkte(akte_id){
+		return this.$fhcApi.get('api/frontend/v1/stv/dokumente/loadAkte/' + akte_id);
+	},
+	getDoktypen(){
+		return this.$fhcApi.get('api/frontend/v1/stv/dokumente/getDoktypen/');
+	},
+	updateFile(akte_id, data){
+		return this.$fhcApi.post('api/frontend/v1/stv/dokumente/updateAkte/' + akte_id,
+			data);
+	},
+	deleteFile(akte_id){
+		return this.$fhcApi.post('api/frontend/v1/stv/dokumente/deleteAkte/' + akte_id);
+	},
+	uploadFile(prestudent_id, data){
+		return this.$fhcApi.post('api/frontend/v1/stv/dokumente/uploadDokument/' + prestudent_id,
+			data);
+	},
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente.js
new file mode 100644
index 000000000..39dbeb914
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente.js
@@ -0,0 +1,22 @@
+import ViewDocuments from "./Dokumente/Dokumente.js";
+
+export default {
+	components: {
+		ViewDocuments
+	},
+/*	provide() {
+		return {
+			config: this.config
+		};
+	},*/
+	props: {
+		modelValue: Object,
+	},
+	data(){
+		return {}
+	},
+	template: `
+	<div class="stv-details-documents h-100 d-flex flex-column">
+		<view-documents ref="vw_documents" :student="modelValue"></view-documents>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Dokumente.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Dokumente.js
new file mode 100644
index 000000000..be69ae70d
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Dokumente.js
@@ -0,0 +1,51 @@
+import DocumentsUnaccepted from './List/Unaccepted.js';
+import DocumentsAccepted from './List/Accepted.js';
+
+export default {
+	components: {
+		DocumentsUnaccepted,
+		DocumentsAccepted
+	},
+	props: {
+		student: Object
+	},
+	data(){
+		return {
+			listMissingDocuments: []
+		}
+	},
+	methods: {
+		reloadUnaccepted(){
+			this.$refs.tableUnaccepted.reload();
+		},
+		reloadAccepted(){
+			this.$refs.tableAccepted.reload();
+		},
+	},
+	template: `
+	 <div class="stv-details-documents h-100 pb-3">
+ 	
+	 	<div class="row mb-3">
+	 		<div class="col-6">
+	 			 <documents-unaccepted
+	 			 	ref="tableUnaccepted"
+					:prestudent_id="student.prestudent_id"
+					:studiengang_kz="student.studiengang_kz"
+					@reloadAccepted="reloadAccepted"
+				></documents-unaccepted>
+			</div>	 		
+
+			<div class="col-6">
+				<documents-accepted
+					ref="tableAccepted"
+					:prestudent_id="student.prestudent_id"
+					:studiengang_kz="student.studiengang_kz"
+					@reloadUnaccepted="reloadUnaccepted"
+				></documents-accepted>	
+			</div>
+
+		</div>
+
+	 </div>
+	 `
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
new file mode 100644
index 000000000..505ee9840
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -0,0 +1,331 @@
+import {CoreFilterCmpt} from "../../../../../filter/Filter.js";
+import ModalEdit from "../Modal/Edit.js";
+import ModalUpload from "../Modal/Upload.js";
+
+export default {
+	components: {
+		CoreFilterCmpt,
+		ModalEdit,
+		ModalUpload
+	},
+	props: {
+		prestudent_id: Number,
+		studiengang_kz: Number
+	},
+	data(){
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: this.$fhcApi.factory.stv.documents.getDocumentsAccepted,
+				ajaxParams: () => {
+					return {
+						id: this.prestudent_id,
+						studiengang_kz: this.studiengang_kz
+					};
+				},
+				ajaxResponse: (url, params, response) =>  {
+					return response.data;
+				},
+				columns: [
+					{title: "Dokument", field: "bezeichnung"},
+					{title: "Akzeptiertdatum", field: "docdatum",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+						}},
+					{title: "Akzeptiertvon", field: "insertvonma"},
+					{
+						title: "UploadDatum", field: "hochgeladenamum",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+						}},
+					{title: "Kurzbz", field: "dokument_kurzbz", visible: false},
+					{title: "Prestudent ID", field: "prestudent_id", visible: false},
+					{title: "nachgereicht", field: "nachgereicht", visible: false,
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-secondary"></i>',
+							crossElement: '<i class="fa fa-xmark text-secondary"></i>'
+						}},
+					{title: "infotext", field: "infotext"},
+					{title: "akte_id", field: "akte_id"},
+					{title: "dms_id", field: "dms_id", visible: false},
+					{title: "titel", field: "titel_intern"},
+					{title: "vorhanden", field: "vorhanden",
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
+						}},
+					{title: "Anmerkung_intern", field: "anmerkung_intern", visible: false},
+					{title: "Nachreichung am", field: "nachgereicht_am",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+						}},
+					{
+						title: 'Aktionen', field: 'actions',
+						minWidth: 50,
+						maxWidth: 100,
+						formatter: (cell, formatterParams, onRendered) => {
+
+							let container = document.createElement('div');
+							container.className = "d-flex gap-2";
+
+							if(cell.getData().vorhanden){
+								let button = document.createElement('button');
+								button.className = 'btn btn-outline-secondary btn-action';
+								button.innerHTML = '<i class="fa fa-download"></i>';
+								button.title = this.$p.t('ui', 'downloadDok');
+								button.addEventListener('click', (event) =>
+									this.actionDownloadFile(cell.getData().akte_id)
+								);
+								container.append(button);
+
+								button = document.createElement('button');
+								button.className = 'btn btn-outline-secondary btn-action';
+								button.innerHTML = '<i class="fa fa-edit"></i>';
+								button.title = this.$p.t('ui', 'editDokument');
+								button.addEventListener('click', (event) =>
+									this.actionEditDocument(cell.getData().akte_id)
+								);
+								container.append(button);
+
+								button = document.createElement('button');
+								button.className = 'btn btn-outline-secondary btn-action';
+								button.innerHTML = '<i class="fa fa-xmark"></i>';
+								button.title = this.$p.t('ui', 'deleteDokument');
+								button.addEventListener('click', () =>
+									this.actionDeleteFile(cell.getData().akte_id)
+								);
+								container.append(button);
+							}
+							else
+							{
+								let button = document.createElement('button');
+								button.className = 'btn btn-outline-secondary btn-action';
+								button.innerHTML = '<i class="fa fa-upload"></i>';
+								button.title = this.$p.t('ui', 'uploadDokument');
+								button.addEventListener('click', () =>
+									this.actionUploadFile(cell.getData().dokument_kurzbz)
+								);
+								container.append(button);
+							}
+
+
+							return container;
+						},
+						frozen: true
+					},
+				],
+				layout: 'fitColumns',
+				layoutColumnsOnNewData: false,
+				height: 300,
+				selectable: true,
+				selectableRangeMode: 'click',
+				persistenceID: 'core-details-documents-accepted',
+				listDocuments: [],
+			},
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async () => {
+						await this.$p.loadCategory(['global', 'dokumente', 'ui', 'mobility', 'ampeln']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('bezeichnung').component.updateDefinition({
+							title: this.$p.t('global', 'dokument')
+						});
+						cm.getColumnByField('docdatum').component.updateDefinition({
+							title: this.$p.t('dokumente', 'datumAkzeptiert')
+						});
+						cm.getColumnByField('dokument_kurzbz').component.updateDefinition({
+							title: this.$p.t('mobility', 'kurzbz')
+						});
+						cm.getColumnByField('insertvonma').component.updateDefinition({
+							title: this.$p.t('global', 'uploaddatum')
+						});
+						cm.getColumnByField('hochgeladenamum').component.updateDefinition({
+							title: this.$p.t('global', 'uploaddatum')
+						});
+						cm.getColumnByField('nachgereicht').component.updateDefinition({
+							title: this.$p.t('dokumente', 'nachgereicht')
+						});
+						cm.getColumnByField('vorhanden').component.updateDefinition({
+							title: this.$p.t('dokumente', 'vorhanden')
+						});
+						cm.getColumnByField('dms_id').component.updateDefinition({
+							title: this.$p.t('global', 'dms_id')
+						});
+						cm.getColumnByField('titel_intern').component.updateDefinition({
+							title: this.$p.t('global', 'titel')
+						});
+						cm.getColumnByField('anmerkung_intern').component.updateDefinition({
+							title: this.$p.t('global', 'anmerkung')
+						});
+						cm.getColumnByField('akte_id').component.updateDefinition({
+							title: this.$p.t('global', 'akte_id')
+						});
+						cm.getColumnByField('nachgereicht_am').component.updateDefinition({
+							title: this.$p.t('global', 'dokument')
+						});
+					}
+				}
+			]
+		}
+	},
+	computed: {
+		tabulatorEvents() {
+			const events = [
+				{
+					event: "rowDblClick",
+					handler: (e, row) => {
+						this.actionDownloadFile(row.getData().akte_id);
+					}
+				}
+			];
+			return events;
+		}
+	},
+	methods: {
+		actionDownloadFile(akte_id){
+			window.open(
+				FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/api/frontend/v1/stv/dokumente/download?akte_id=' + encodeURIComponent(akte_id),
+				'_blank'
+			);
+		},
+		actionUploadFile(dokument_kurzbz){
+			this.$refs.modalUpload.open(this.prestudent_id, dokument_kurzbz);
+		},
+		actionEditDocument(akte_id){
+			this.$refs.modalEdit.open(akte_id);
+		},
+		actionDeleteFile(akte_id){
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? akte_id
+					: Promise.reject({handled: true}))
+				.then(this.deleteFile)
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		deleteFile(akte_id){
+			return this.$fhcApi.factory.stv.documents.deleteFile(akte_id)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(()=> {
+					this.reload();
+				});
+		},
+		deleteZuordnung(selected) {
+			Promise.allSettled(
+				selected.map(e =>
+					this.$fhcApi.factory.stv.documents.deleteZuordnung({
+						prestudent_id: this.prestudent_id,
+						dokument_kurzbz: e.dokument_kurzbz
+					}).then(() => ({
+							success: true,
+							dokument_bz: e.bezeichnung
+						}))
+						.catch(() => ({
+							success: false,
+							dokument_bz: e.bezeichnung
+						}))
+				)
+			).then(results => {
+				const failed = results.filter(res => !res.value.success);
+				const suceeded = results.filter(res => res.value.success);
+				if (failed.length > 0) {
+					failed.forEach(res => {
+						this.$fhcAlert.alertError(this.$p.t('dokumente', 'errorUnaccepted',
+							{'dokument_kurzbz': res.value.dokument_bz}
+						));
+					});
+					let countSuceeded = suceeded.length;
+					if(countSuceeded > 0)
+						this.$fhcAlert.alertSuccess(this.$p.t('dokumente', 'successCountUnaccepted',
+							{'count': countSuceeded}));
+
+				} else {
+					this.$fhcAlert.alertSuccess(this.$p.t('dokumente', 'successUnaccepted'));
+				}
+				this.reloadAll();
+			});
+		},
+
+		reload(){
+			this.$refs.table.reloadTable();
+		},
+		reloadAll(){
+			this.reload();
+			this.$emit('reloadUnaccepted');
+		}
+	},
+	template: `
+	 <div class="stv-details-documents h-100 pb-3">
+		<h5>{{$p.t('dokumente', 'accepted')}}</h5>
+
+		 <modal-edit
+			ref="modalEdit"
+			@reload="reloadAll"
+		>
+		</modal-edit>
+
+		<modal-upload
+			ref="modalUpload"
+			@reload="reloadAll"
+		>
+		</modal-upload>
+
+	 	<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+	 	>
+			<template #actions="{selected}">
+				<button
+					class="btn btn-primary"
+					@click="deleteZuordnung(selected)"
+					:disabled="!selected.length"
+					>
+						{{$p.t('dokumente', 'dokumentUnaccept')}}
+				</button>
+			</template>
+		</core-filter-cmpt>
+	 </div>
+	 `
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
new file mode 100644
index 000000000..08a9d8f92
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -0,0 +1,344 @@
+import {CoreFilterCmpt} from "../../../../../filter/Filter.js";
+import ModalEdit from "../Modal/Edit.js";
+import ModalUpload from "../Modal/Upload.js";
+
+export default {
+	components: {
+		CoreFilterCmpt,
+		ModalEdit,
+		ModalUpload
+	},
+	props: {
+		prestudent_id: Number,
+		studiengang_kz: Number
+	},
+	data(){
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: this.$fhcApi.factory.stv.documents.getDocumentsUnaccepted,
+				ajaxParams: () => {
+					return {
+						id: this.prestudent_id,
+						studiengang_kz: this.studiengang_kz
+					};
+				},
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "Dokument", field: "bezeichnung"},
+					{title: "Kurzbz", field: "dokument_kurzbz", visible: false},
+					{
+						title: "UploadDatum", field: "hochgeladenamum",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+						}
+						},
+					{title: "nachgereicht", field: "nachgereicht", visible: false,
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-secondary"></i>',
+							crossElement: '<i class="fa fa-xmark text-secondary"></i>'
+						}},
+					{title: "vorhanden",
+						field: "vorhanden",
+						formatter: function(cell, formatterParams, onRendered) {
+							let value = cell.getValue();
+							let rowData = cell.getRow().getData();  // Zugriff auf gesamte Zeile
+							let dueDate = rowData["nachgereicht_am"];
+							const date = new Date(dueDate);
+							let dateFormatted = date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+
+							let tickCrossIcon = value
+								? '<i class="fa fa-check text-success"></i>'
+								: '<i class="fa fa-xmark text-danger"></i>';
+
+							// if nachgereicht_am show datum
+							let pill = dueDate
+								? `<span>${dateFormatted}</span>`
+								: '';
+
+							return `${tickCrossIcon} ${pill}`;
+						},
+						hozAlign: "center"
+						},
+					{title: "infotext", field: "infotext"},
+					{title: "akte_id", field: "akte_id"},
+					{title: "titel_intern", field: "titel_intern"},
+					{title: "Anmerkung_intern", field: "anmerkung_intern", visible: false},
+					{title: "Online", field: "onlinebewerbung",
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-secondary"></i>',
+							crossElement: '<i class="fa fa-xmark text-secondary"></i>'
+						}},
+					{title: "Pflicht", field: "pflicht",
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-secondary"></i>',
+							crossElement: '<i class="fa fa-xmark text-secondary"></i>'
+						}},
+					{title: "Nachreichung am", field: "nachgereicht_am",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+						}},
+					{
+						title: 'Aktionen', field: 'actions',
+						minWidth: 50,
+						maxWidth: 100,
+						formatter: (cell, formatterParams, onRendered) => {
+
+							let container = document.createElement('div');
+							container.className = "d-flex gap-2";
+
+							if(cell.getData().akte_id){
+								let button = document.createElement('button');
+								button.className = 'btn btn-outline-secondary btn-action';
+								button.innerHTML = '<i class="fa fa-download"></i>';
+								button.title = this.$p.t('ui', 'downloadDok');
+								button.addEventListener('click', (event) =>
+									this.actionDownloadFile(cell.getData().akte_id)
+								);
+								container.append(button);
+
+								button = document.createElement('button');
+								button.className = 'btn btn-outline-secondary btn-action';
+								button.innerHTML = '<i class="fa fa-edit"></i>';
+								button.title = this.$p.t('ui', 'editDokument');
+								button.addEventListener('click', (event) =>
+									this.actionEditFile(cell.getData().akte_id)
+								);
+								container.append(button);
+
+								button = document.createElement('button');
+								button.className = 'btn btn-outline-secondary btn-action';
+								button.innerHTML = '<i class="fa fa-xmark"></i>';
+								button.title = this.$p.t('ui', 'deleteDokument');
+								button.addEventListener('click', () =>
+									this.actionDeleteFile(cell.getData().akte_id)
+								);
+								container.append(button);
+							}
+							else
+							{
+								let button = document.createElement('button');
+								button.className = 'btn btn-outline-secondary btn-action';
+								button.innerHTML = '<i class="fa fa-upload"></i>';
+								button.title = this.$p.t('ui', 'uploadDokument');
+								button.addEventListener('click', () =>
+									this.actionUploadFile(cell.getData().dokument_kurzbz)
+								);
+								container.append(button);
+							}
+
+							return container;
+						},
+						frozen: true
+					},
+				],
+				layout: 'fitColumns',
+				layoutColumnsOnNewData: false,
+				height: 300,
+				selectable: true,
+				selectableRangeMode: 'click',
+				persistenceID: 'core-details-documents-unaccepted',
+				listDocuments: [],
+				prestudentDocumentData: [],
+			},
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async () => {
+						await this.$p.loadCategory(['global', 'dokumente', 'ui', 'mobility', 'ampeln']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('bezeichnung').component.updateDefinition({
+							title: this.$p.t('global', 'dokument')
+						});
+						cm.getColumnByField('dokument_kurzbz').component.updateDefinition({
+							title: this.$p.t('mobility', 'kurzbz')
+						});
+						cm.getColumnByField('hochgeladenamum').component.updateDefinition({
+							title: this.$p.t('global', 'uploaddatum')
+						});
+						cm.getColumnByField('nachgereicht').component.updateDefinition({
+							title: this.$p.t('dokumente', 'nachgereicht')
+						});
+						cm.getColumnByField('vorhanden').component.updateDefinition({
+							title: this.$p.t('dokumente', 'vorhanden')
+						});
+						cm.getColumnByField('anmerkung_intern').component.updateDefinition({
+							title: this.$p.t('global', 'anmerkung')
+						});
+						cm.getColumnByField('akte_id').component.updateDefinition({
+							title: this.$p.t('global', 'akte_id')
+						});
+						cm.getColumnByField('pflicht').component.updateDefinition({
+							title: this.$p.t('ampeln', 'mandatory')
+						});
+						cm.getColumnByField('nachgereicht_am').component.updateDefinition({
+							title: this.$p.t('global', 'dokument')
+						});
+					}
+				}
+			]
+		}
+	},
+	computed: {
+		tabulatorEvents() {
+			const events = [
+				{
+					event: "rowDblClick",
+					handler: (e, row) => {
+						this.actionDownloadFile(row.getData().akte_id);
+					}
+				}
+			];
+
+			return events;
+			}
+	},
+	methods: {
+		actionDownloadFile(akte_id){
+			window.open(
+				FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/api/frontend/v1/stv/dokumente/download?akte_id=' + encodeURIComponent(akte_id),
+				'_blank'
+			);
+		},
+		actionUploadFile(dokument_kurzbz){
+			this.$refs.modalUpload.open(this.prestudent_id, dokument_kurzbz);
+		},
+		actionDeleteFile(akte_id){
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? akte_id
+					: Promise.reject({handled: true}))
+				.then(this.deleteFile)
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		actionEditFile(akte_id){
+			this.$refs.modalEdit.open(akte_id);
+		},
+		acceptDocuments(selected){
+			Promise
+				.allSettled(
+					selected.map(e =>
+						this.$fhcApi.factory.stv.documents.createZuordnung({
+								prestudent_id: this.prestudent_id,
+								dokument_kurzbz: e.dokument_kurzbz,
+							}).then(() => ({
+							success: true,
+							dokument_bz: e.bezeichnung
+						}))
+							.catch(() => ({
+								success: false,
+								dokument_bz: e.bezeichnung
+							}))
+					)
+				)
+				.then(results => {
+						const failed = results.filter(res => !res.value.success);
+						const suceeded = results.filter(res => res.value.success);
+						if (failed.length > 0) {
+							failed.forEach(res => {
+								this.$fhcAlert.alertError(this.$p.t('dokumente', 'errorAccepted',
+									{'dokument_kurzbz': res.value.dokument_bz}
+								));
+							});
+							let countSuceeded = suceeded.length;
+							if(countSuceeded > 0)
+								this.$fhcAlert.alertSuccess(this.$p.t('dokumente', 'successCountAccepted',
+									{'count': countSuceeded}));
+
+						} else {
+							this.$fhcAlert.alertSuccess(this.$p.t('dokumente', 'successAccepted'));
+						}
+						this.reloadAll();
+				});
+		},
+		deleteFile(akte_id){
+			return this.$fhcApi.factory.stv.documents.deleteFile(akte_id)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(()=> {
+					this.reload();
+				});
+		},
+		reload(){
+			this.$refs.table.reloadTable();
+		},
+		reloadAll() {
+			this.reload();
+			this.$emit('reloadAccepted');
+		}
+	},
+	template: `
+	 <div class="stv-details-documents h-100 pb-3">
+		<h5>{{$p.t('dokumente', 'unaccepted')}}</h5>
+
+		 <modal-edit
+			ref="modalEdit"
+			@reload="reloadAll"
+			>
+		</modal-edit>
+
+		 <modal-upload
+			ref="modalUpload"
+			@reload="reloadAll"
+			>
+		</modal-upload>
+
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+			new-btn-show
+			:new-btn-label="this.$p.t('global', 'dokument')"
+			@click:new="actionUploadFile"
+		>
+			<template #actions="{selected}">
+				<button
+					class="btn btn-primary"
+					@click="acceptDocuments(selected)"
+					:disabled="!selected.length"
+					>
+						{{$p.t('dokumente', 'dokumentAccept')}}
+				</button>
+			</template>
+		</core-filter-cmpt>
+	 </div>
+	 `
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
new file mode 100644
index 000000000..7b8f1b984
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
@@ -0,0 +1,137 @@
+import BsModal from "../../../../../Bootstrap/Modal.js";
+import FormForm from "../../../../../Form/Form.js";
+import FormInput from "../../../../../Form/Input.js";
+
+export default {
+	components: {
+		BsModal,
+		FormForm,
+		FormInput
+	},
+	data(){
+		return {
+			formData: [],
+			listDokTypen: []
+		}
+	},
+	methods: {
+		updateFile(akte_id){
+			console.log("in update" + akte_id);
+
+			this.$fhcApi.factory.stv.documents.updateFile(akte_id, this.formData).
+			then(response => {
+				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+				this.$refs.modalEditDocument.hide();
+				this.$emit('reload');
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		},
+		open(akte_id){
+			this.loadFormData(akte_id);
+			this.$refs.modalEditDocument.show();
+		},
+		loadFormData(akte_id){
+			return this.$fhcApi.factory.stv.documents.loadAkte(akte_id)
+				.then(result => {
+					this.formData = result.data;
+					return result;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
+	},
+	created(){
+		this.$fhcApi.factory.stv.documents.getDoktypen()
+			.then(result => {
+				this.listDokTypen = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
+	template: `
+		<bs-modal
+			ref="modalEditDocument"
+			dialog-class="modal-dialog-scrollable"
+		>
+			<template #title>
+				{{ $p.t('dokumente', 'dokDetails') }} {{formData.nameperson}}
+			</template>
+
+			<form-form
+				ref="formEditDocument"
+				>
+				<div>
+					<div class="row mb-3">
+						<form-input
+							type="select"
+							name="dokument_kurzbz"
+							:label="$p.t('dokumente/dokTyp')"
+							v-model="formData.dokument_kurzbz"
+						>
+							<option
+								v-for="typ in listDokTypen"
+								:key="typ.dokument_kurzbz"
+								:value="typ.dokument_kurzbz" >{{typ.bezeichnung}}
+							</option>
+						</form-input>
+					</div>
+
+					<div class="row mb-3">
+						<form-input
+							type="text"
+							name="titel_intern"
+							:label="$p.t('dokumente/title')"
+							v-model="formData.titel_intern"
+						>
+						</form-input>
+					</div>
+
+					<div class="row mb-3">
+						<form-input
+							type="textarea"
+							name="anmerkung"
+							:label="$p.t('global/anmerkung')"
+							v-model="formData.anmerkung_intern"
+							rows="5"
+						>
+						</form-input>
+					</div>			
+
+					<div class="row mb-3">
+						<form-input
+							type="DatePicker"
+							v-model="formData.nachgereicht_am"
+							name="nachgereicht_am"
+							:label="$p.t('dokumente/nachreichungAm')"
+							auto-apply
+							:enable-time-picker="false"
+							format="dd.MM.yyyy"
+							preview-format="dd.MM.yyyy"
+							:teleport="true"
+							>
+						</form-input>
+					</div>
+
+					<div class="row mb-3">
+						<form-input
+							type="textarea"
+							name="anmerkung"
+							:label="$p.t('dokumente/anmerkung_person')"
+							v-model="formData.anmerkung"
+							rows="5"
+							disabled
+						>
+						</form-input>
+					</div>
+
+				</div>
+
+			</form-form>
+
+			<template #footer>
+				<div class="d-grid gap-2 d-md-flex justify-content-md-end">
+					<button type="button" class="btn btn-primary" @click="updateFile(formData.akte_id)">{{$p.t('global', 'speichern')}}</button>
+				</div>
+			</template>
+
+		</bs-modal>
+	`,
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js
new file mode 100644
index 000000000..84fa4a57b
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js
@@ -0,0 +1,124 @@
+import BsModal from "../../../../../Bootstrap/Modal.js";
+import FormForm from "../../../../../Form/Form.js";
+import FormInput from "../../../../../Form/Input.js";
+import FormUploadDms from "../../../../../Form/Upload/Dms.js";
+
+export default {
+	components: {
+		BsModal,
+		FormForm,
+		FormInput,
+		FormUploadDms
+	},
+	data(){
+		return{
+			formData: {
+				dokument_kurzbz: null,
+				anhang: [],
+				anmerkung_intern: null
+			},
+			listDokTypen: []
+		}
+	},
+	methods:{
+		open(prestudent_id, dokument_kurzbz){
+			console.log("ps: " + prestudent_id + 'dok: ' + dokument_kurzbz);
+			this.formData.dokument_kurzbz = dokument_kurzbz;
+			this.formData.prestudent_id = prestudent_id;
+			this.$refs.modalUploadFile.show();
+		},
+		uploadFile(){
+			console.log(this.formData.anhang[0]);
+
+			return this.$fhcApi.factory.stv.documents.uploadFile(this.formData.prestudent_id, this.formData)
+				.then(result => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successUpload'));
+					this.resetModal();
+					this.$refs.modalUploadFile.hide();
+					this.$emit('reload');
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		resetModal(){
+			this.formData.dokument_kurzbz = null;
+			this.formData.anhang = [];
+			this.formData.anmerkung_intern = null;
+			this.formData.titel_intern = null;
+		}
+	},
+	created(){
+		this.$fhcApi.factory.stv.documents.getDoktypen()
+			.then(result => {
+				this.listDokTypen = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+	},
+	template: `
+			<bs-modal
+			ref="modalUploadFile"
+			dialog-class="modal-dialog-scrollable"
+		>
+			<template #title>
+				Upload {{ $p.t('stv', 'tab_documents') }} 
+			</template>
+
+			<form-form
+				ref="formUploadFile"
+				>
+
+				<div>
+					<div class="row mb-3">
+						<label for="text" class="form-label col-sm-2">{{$p.t('global','dokument')}}</label>
+						<FormUploadDms ref="upload" id="file" v-model="formData.anhang"></FormUploadDms>
+					</div>
+
+					<div class="row mb-3">
+						<form-input
+							type="select"
+							name="dokument_kurzbz"
+							:label="$p.t('dokumente/dokTyp')"
+							v-model="formData.dokument_kurzbz"
+						>
+						<option value=null> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
+							<option
+								v-for="typ in listDokTypen"
+								:key="typ.dokument_kurzbz"
+								:value="typ.dokument_kurzbz" >{{typ.bezeichnung}}
+							</option>
+						</form-input>
+					</div>
+
+					<div class="row mb-3">
+						<form-input
+							type="text"
+							name="titel_intern"
+							:label="$p.t('dokumente/title')"
+							v-model="formData.titel_intern"
+						>
+						</form-input>
+					</div>
+
+					<div class="row mb-3">
+						<form-input
+							type="textarea"
+							name="anmerkung"
+							:label="$p.t('global/anmerkung')"
+							v-model="formData.anmerkung_intern"
+							rows="5"
+						>
+						</form-input>
+					</div>
+
+				</div>
+
+			</form-form>
+
+			<template #footer>
+				<div class="d-grid gap-2 d-md-flex justify-content-md-end">
+					<button type="button" class="btn btn-primary" @click="uploadFile">{{$p.t('ui', 'hochladen')}}</button>
+				</div>
+			</template>
+
+		</bs-modal>
+	`,
+}
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index a5b83c31d..5a63713b2 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -40534,6 +40534,688 @@ array(
 		)
 	),
 	// feature-55614 end
+	// FHC4 Studierendenverwaltung Dokumente START
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_documents',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokumente',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Documents',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'uploadDokument',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokument hochladen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Upload document',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'deleteDokument',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokument löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete document',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'editDokument',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokument bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit document',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'title',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Titel',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'title',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'dokTyp',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokumententyp',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Document type',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'nachreichungAm',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nachreichung am',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Submission on',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'dokDetails',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokumentendetails',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Document Details',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'anmerkung_person',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anmerkung der Person',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Notes of the Person',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'successUpload',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokument erfolgreich hochgeladen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Dokumentupload successful',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'dokumentAccept',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akzeptieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Accept',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'dokumentUnaccept',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entakzeptieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Unaccept',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'accepted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akzeptiert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Accepted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'unaccepted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nicht Akzeptiert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Not Accepted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'err_deleteDokHere',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dieses Dokument darf hier nicht gelöscht werden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This document may not be deleted here',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'err_updateNotAllowed',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Es können nur Eintraege geändert werden zu denen Dokumente hochgeladen wurden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Only entries to which documents have been uploaded can be changed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'downloadDok',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokument herunterladen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Download Document',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'successAccepted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akzeptieren erfolgreich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Successfully set to accepted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'successUnaccepted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entakzeptieren erfolgreich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Successfully set to unaccepted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'successCountUnaccepted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entakzeptieren von {count} Dokument(en) erfolgreich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{count} Document(s) successfully set to unaccepted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'successCountAccepted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akzeptieren von {count} Dokument(en) erfolgreich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{count} Document(s) successfully set to accepted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'errorUnaccepted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim Entakzeptieren von Dokument {dokument_kurzbz}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error unaccepting document {dokument_kurzbz}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'errorAccepted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim Akzeptieren von Dokument {dokument_kurzbz}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error Accepting document {dokument_kurzbz}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'errorMissingValue',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{value} fehlt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{value} missing',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_valueNotNumeric',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{value} darf nur Ziffern enthalten.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{value} must contain only numbers.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'nachgereicht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nachgereicht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Submitted later',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'vorhanden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vorhanden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Available',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'akte_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akte ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'File ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'nachgereicht_am',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nachgereicht am',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Submitted on',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'datumAkzeptiert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akzeptiertdatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Accepted on',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'akzeptiertVon',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akzeptiert von',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Accepted by',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'dms_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dms ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Dms ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'error_fileMissing',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte eine Datei anhängen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please attach a file',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'error_fileType',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nur Dateitypen JPEG, PNG oder PDF sind erlaubt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Only JPEG, PNG, or PDF files are allowed.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// FHC4 Studierendenverwaltung Dokumente END
 );
 
 

From f826c20949c0518cba9d4953e7b8110003ae2e44 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Fri, 4 Apr 2025 08:42:20 +0200
Subject: [PATCH 095/572] =?UTF-8?q?lv=5Fid=20beim=20zeugnis.rdf.php=20hinz?=
 =?UTF-8?q?ugefuegt=20auf=20die=20ersten=202=20lvs=20im=20microdegree=20ei?=
 =?UTF-8?q?ngeschr=C3=A4nkt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rdf/zeugnis.rdf.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rdf/zeugnis.rdf.php b/rdf/zeugnis.rdf.php
index 038aba842..c468301d5 100644
--- a/rdf/zeugnis.rdf.php
+++ b/rdf/zeugnis.rdf.php
@@ -414,6 +414,8 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 						$xml .= "				<note><![CDATA[".$note2."]]></note>";
 						$xml .= "				<sws><![CDATA[".($row->semesterstunden==0?'':number_format(sprintf('%.1F',$row->semesterstunden/$wochen),1))."]]></sws>";
 						$xml .= "				<sws_lv><![CDATA[".($row->sws==0?'':number_format(sprintf('%.1F',$row->sws),1))."]]></sws_lv>";
+						$xml .= "				<lv_id><![CDATA[".$row->lehrveranstaltung_id."]]></lv_id>";
+
 						$ectspunkte='';
 
 						$anrechnung = new anrechnung();

From 4d1fc5e48c9bddaffcb5290c1c319639f9d05c42 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 4 Apr 2025 09:41:11 +0200
Subject: [PATCH 096/572] added name attribute to components

---
 .../components/Stv/Studentenverwaltung/Details/Dokumente.js | 6 +-----
 .../Studentenverwaltung/Details/Dokumente/List/Accepted.js  | 1 +
 .../Details/Dokumente/List/Unaccepted.js                    | 1 +
 .../Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js | 1 +
 .../Studentenverwaltung/Details/Dokumente/Modal/Upload.js   | 1 +
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente.js
index 39dbeb914..01ca2d373 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente.js
@@ -1,14 +1,10 @@
 import ViewDocuments from "./Dokumente/Dokumente.js";
 
 export default {
+	name:"TabDocuments",
 	components: {
 		ViewDocuments
 	},
-/*	provide() {
-		return {
-			config: this.config
-		};
-	},*/
 	props: {
 		modelValue: Object,
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
index 505ee9840..e22ad4cdb 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -4,6 +4,7 @@ import ModalUpload from "../Modal/Upload.js";
 
 export default {
 	components: {
+		name: "AcceptedDocuments",
 		CoreFilterCmpt,
 		ModalEdit,
 		ModalUpload
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
index 08a9d8f92..5b2a2d080 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -3,6 +3,7 @@ import ModalEdit from "../Modal/Edit.js";
 import ModalUpload from "../Modal/Upload.js";
 
 export default {
+	name: "UnacceptedDocuments",
 	components: {
 		CoreFilterCmpt,
 		ModalEdit,
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
index 7b8f1b984..95a12a669 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
@@ -3,6 +3,7 @@ import FormForm from "../../../../../Form/Form.js";
 import FormInput from "../../../../../Form/Input.js";
 
 export default {
+	name: "modalEditDocuments",
 	components: {
 		BsModal,
 		FormForm,
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js
index 84fa4a57b..dec8da503 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js
@@ -4,6 +4,7 @@ import FormInput from "../../../../../Form/Input.js";
 import FormUploadDms from "../../../../../Form/Upload/Dms.js";
 
 export default {
+	name: "modalUploadDocuments",
 	components: {
 		BsModal,
 		FormForm,

From b2fef71b4779aaadbe662b606935a84a019700e3 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 4 Apr 2025 09:53:54 +0200
Subject: [PATCH 097/572] added name attribute to components

---
 .../Messages/Details/Depr_NewMessage.js       | 480 ------------------
 .../Messages/Details/NewMessage/Modal.js      |   1 +
 .../Messages/Details/NewMessage/NewDiv.js     |   1 +
 .../Messages/Details/TableMessages.js         |   3 +-
 public/js/components/Messages/Messages.js     |   1 +
 .../Studentenverwaltung/Details/Messages.js   |   1 +
 6 files changed, 5 insertions(+), 482 deletions(-)
 delete mode 100644 public/js/components/Messages/Details/Depr_NewMessage.js

diff --git a/public/js/components/Messages/Details/Depr_NewMessage.js b/public/js/components/Messages/Details/Depr_NewMessage.js
deleted file mode 100644
index 33ff74d9c..000000000
--- a/public/js/components/Messages/Details/Depr_NewMessage.js
+++ /dev/null
@@ -1,480 +0,0 @@
-import FormForm from '../../Form/Form.js';
-import FormInput from '../../Form/Input.js';
-import ListBox from "../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
-import DropdownComponent from '../../VorlagenDropdown/VorlagenDropdown.js';
-import MessageModal from "../Details/NewMessage/Modal.js";
-
-export default {
-	components: {
-		FormForm,
-		FormInput,
-		ListBox,
-		DropdownComponent,
-		MessageModal,
-	},
-	props: {
-		endpoint: {
-			type: String,
-			required: true
-		},
-		typeId: String,
-		id: {
-			type: [Number, String],
-			required: true
-		},
-		openMode: String,
-	},
-	data(){
-		return {
-			formData: {
-				recipient: this.id,
-				subject: null,
-				body: null,
-				vorlage_kurzbz: null,
-				selectedValue: '',
-			},
-			statusNew: true,
-			vorlagen: [],
-			defaultRecipient: null,
-			editor: null,
-			isVisible: false,
-			fieldsUser: [],
-			fieldsPerson: [],
-			fieldsPrestudent: [],
-			selectedFieldPrestudent: null,
-			selectedFieldUser: null,
-			selectedFieldPerson: null,
-			itemsPrestudent: [],
-			itemsPerson: [],
-			itemsUser: [],
-			previewText: null,
-			previewBody: ""
-		}
-	},
-	methods: {
-		initTinyMCE() {
-			const vm = this;
-			tinymce.init({
-				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
-				//height: 800,
-				//plugins: ['lists'],
-				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify',
-				style_formats: [
-					{title: 'Blocks', block: 'div'},
-					{title: 'Paragraph', block: 'p'},
-					{title: 'Heading 1', block: 'h1'},
-					{title: 'Heading 2', block: 'h2'},
-					{title: 'Heading 3', block: 'h3'},
-					{title: 'Heading 4', block: 'h4'},
-					{title: 'Heading 5', block: 'h5'},
-					{title: 'Heading 6', block: 'h6'},
-				],
-				autoresize_bottom_margin: 16,
-
-				setup: (editor) => {
-					vm.editor = editor;
-
-					editor.on('input', () => {
-						const newContent = editor.getContent();
-						vm.formData.body = newContent;
-					});
-				},
-			});
-		},
-		updateText(value) {
-			this.formData.body = value;
-		},
-		sendMessage() {
-			//TODO(Manu) check default recipient(s)
-			const data = new FormData();
-			const params = {
-					id: this.id,
-					type_id: this.typeId
-			};
-			const merged = {
-				...this.formData,
-				...params
-			};
-			data.append('data', JSON.stringify(merged));
-
-			return this.$fhcApi.factory.messages.person.sendMessage(
-				this.$refs.formMessage,
-				this.id,
-				data)
-				.then(response => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
-					//this.hideModal('messageModal');
-					this.hideTemplate();
-					this.resetForm();
-				}).catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-						//this.resetForm();
-						//closeModal
-						//closewindwo
-						this.$emit('reloadTable');
-					}
-				);
-		},
-		getVorlagentext(vorlage_kurzbz){
-			//console.log(typeof vorlage_kurzbz);
-			return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz)
-				.then(response => {
-					//this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
-					//this.hideModal('messageModal');
-					//this.resetForm();
-					//TODO(Manu) CHECK
-					this.formData.body = response.data;
-				}).catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-					//this.resetForm();
-					//closeModal
-					//closewindwo
-				});
-		},
-		getPreviewText(){
-			const data = new FormData();
-
-			data.append('data', JSON.stringify(this.formData.body));
-			return this.$fhcApi.factory.messages.person.getPreviewText({
-				id: this.id,
-				type_id: this.typeId}, data)
-				.then(response => {
-					this.previewText = response.data;
-				}).catch(this.$fhcAlert.handleSystemError)
-				.finally(() => {
-					//this.resetForm();
-					//closeModal
-					//closewindwo
-				});
-		},
-		insertVariable(selectedItem){
-			if (this.editor) {
-				this.editor.insertContent(selectedItem.value + " ");
-				//TODO(Manu) check: nicht mal mit Punkt adden gehts ohne eintrag nach vars
-/*				this.editor.focus();
-				this.editor.setDirty(true);*/
-
-				//this.editor.fire('change'); //forces
-
-				//this.editor.undoManager.add();
-
-				//this.editor.insertContent(selectedItem.value + "\u00A0");
-				//this.editor.insertContent(`<span>${selectedItem.value}&nbsp;</span>`);
-				//this.editor.selection.setCursorLocation(this.editor.getBody(), 1);
-
-			} else {
-				console.error("Editor instance is not available.");
-			}
-		},
-		replyMessage(message_id){
-			console.log("auf message " + message_id + " antworten");
-		},
-		resetForm(){
-			this.formData = {
-				vorlage_kurzbz: null,
-				body: null,
-				subject: null,
-			};
-			if (this.editor) {
-				this.editor.setContent("");
-			}
-			this.$refs.dropdownComp.setValue(null);
-
-		},
-/*		toggleDivNewMessage(){
-			this.isVisible = !this.isVisible;
-		},*/
-		handleSelectedVorlage(vorlage_kurzbz) {
-			if (typeof vorlage_kurzbz === "string") {
-				this.getVorlagentext(vorlage_kurzbz);
-				this.formData.subject = vorlage_kurzbz;
-			}
-		},
-		hideTemplate(){
-			if (this.openMode == "showDiv")
-				this.isVisible = false;
-		},
-		showTemplate(id, typeId){
-			if (this.openMode == "showDiv")
-				this.isVisible = true;
-			//just for testing:
-			this.isVisible = true;
-		},
-		showPreview(){
-			this.getPreviewText().then(() => {
-				this.previewBody = this.previewText;
-			});
-		},
-	},
-	watch: {
-		'formData.body': {
-			handler(newVal) {
-				const tinymcsVal = this.editor.getContent();
-
-				if (newVal && tinymcsVal != newVal) {
-					//Inhalt des Editors aktualisieren
-					this.editor.setContent(newVal);
-				}
-			}
-		},
-		'formData.vorlage_kurzbz': {
-			handler(newVal){
-			//	console.log("Vorlage: " + newVal);
-
-				if (newVal && newVal != null) {
-					this.formData.subject = newVal;
-					return this.getVorlagentext(newVal);
-				}
-			}
-		}
-	},
-	created(){
-		if(this.typeId == 'person_id'){
-			this.$fhcApi.factory.messages.person.getMessageVarsPerson()
-				.then(result => {
-					this.fieldsPerson = result.data;
-					this.itemsPerson = Object.entries(this.fieldsPerson).map(([key, value]) => ({
-						label: value,
-						value: '{' + value + '}'
-					}));
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		}
-		if(this.typeId == 'uid') {
-			this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(this.id)
-				.then(result => {
-					this.fieldsPrestudent = result.data;
-					const prestudent = this.fieldsPrestudent[0];
-					//Just for testing with inserting values
-/*					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
-						label: key,
-						value: value
-					}));*/
-					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
-						label: key.toLowerCase(),
-						value: '{' + key.toLowerCase() + '}'
-					}));
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		}
-
-		this.$fhcApi.factory.messages.person.getMsgVarsLoggedInUser()
-			.then(result => {
-				this.fieldsUser = result.data;
-				const user = this.fieldsUser;
-				this.itemsUser = Object.entries(user).map(([key, value]) => ({
-					label: value,
-					value: '{' + value + '}'
-				}));
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-
-		this.$fhcApi.factory.messages.person.getNameOfDefaultRecipient({
-			id: this.id,
-			type_id: this.typeId})
-			.then(result => {
-				this.defaultRecipient = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-	},
-	async mounted() {
-		this.initTinyMCE();
-	},
-	beforeDestroy() {
-		this.editor.destroy();
-	},
-	template: `
-	<div class="messages-detail-newmessage">
-
-			<message-modal
-				ref="modalMsg"
-				:type-id="typeId"
-				:id="id"
-				:endpoint="endpoint"
-				:openMode="openMode"
-				@reloadTable="reloadTable"
-				>
-			</message-modal>
-<!--			<hr>
-		<button type="button" class="btn btn-warning" @click="toggleDivNewMessage()">Toggle NewMessage</button>
-		<hr>-->
-
-		<div v-show="isVisible">
-			<div class="overflow-auto" style="max-height: 500px; border: 1px solid #ccc;">
-
-				<h4>New Message</h4>
-	<!--			{{formData.body}}
-				||
-				{{previewText}}-->
-
-				<div class="row">
-					<div class="col-sm-8">
-						<form-form class="row g-3 mt-2" ref="formMessage">
-
-						<!--TODO(Manu) ist eigentlich ein Array, hier werden alle Einträge angegeben als String-->
-							<div class="row mb-3">
-
-								<form-input
-									type="text"
-									name="recipient"
-									:label="$p.t('messages/recipient')"
-									v-model="defaultRecipient"
-									disabled
-								>
-								</form-input>
-							</div>
-							
-							<div class="row mb-3">
-								<form-input
-									type="text"
-									name="subject"
-									:label="$p.t('global/betreff') + ' *'"
-									v-model="formData.subject"
-								>
-								</form-input>
-							</div>
-
-							<!--Tiny MCE-->
-							<div class="row mb-3">
-								<form-input
-									ref="editor"
-									:label="$p.t('global','nachricht')  + ' *'"
-									type="textarea"
-									v-model="formData.body"
-									name="text"
-									rows="15"
-									cols="75"
-									>
-								</form-input>
-							</div>
-
-							<div class="row">
-								<DropdownComponent
-									ref="dropdownComp"
-									:label="$p.t('global/vorlage')"
-									@change="handleSelectedVorlage"
-									useLoggedInUserOe
-								>
-								</DropdownComponent>
-							</div>
-
-						</form-form>
-					</div>
-
-					<div class="col-sm-4">
-						<div v-if="this.fieldsPrestudent.length > 0">
-							<strong>Felder Prestudent</strong>
-							<div class="border p-3 overflow-auto" style="height: 200px;">
-
-								<list-box
-									v-model="selectedFieldPrestudent"
-									:options="itemsPrestudent"
-									optionLabel="label"
-								>
-								  <template #option="slotProps">
-									<div @dblclick="insertVariable(slotProps.option)">
-									  {{ slotProps.option.label }}
-									</div>
-								  </template>
-								</list-box>
-
-							</div>
-
-							<button class="m-3" @click="insertVariablePrestudent">Insert Variable</button>
-							<p>{{selectedFieldPrestudent}}</p>
-
-						</div>
-
-						<div v-if="this.fieldsPerson.length > 0">
-							<strong>Felder Person</strong>
-							<div class="border p-3 overflow-auto" style="height: 200px;">
-
-								<list-box
-									v-model="selectedFieldPerson"
-									:options="itemsPerson"
-									optionLabel="label"
-								>
-									<template #option="slotProps">
-										<div @dblclick="insertVariable(slotProps.option)">
-										  {{ slotProps.option.label }}
-										</div>
-								  </template>
-								</list-box>
-
-							</div>
-							<button class="m-3" @click="insertVariablePerson">Insert Variable</button>
-							<p>{{selectedFieldPerson}}</p>
-						</div>
-
-						<div>
-							<strong>Meine Felder</strong>
-							<div class="border p-3 overflow-auto" style="height: 200px;">
-
-								<list-box
-									v-model="selectedFieldUser"
-									:options="itemsUser"
-									optionLabel="label"
-								>
-									<template #option="slotProps">
-										<div @dblclick="insertVariable(slotProps.option)">
-										  {{ slotProps.option.label }}
-										</div>
-								  </template>
-								</list-box>
-
-							</div>
-							<button class="m-3" @click="insertVariableUser">Insert Variable</button>
-						</div>
-
-						<div class="d-grid gap-2 d-md-flex justify-content-md-end">
-
-							<button class="btn btn-secondary" @click="resetForm">Reset All</button>
-
-							<button v-if="statusNew" type="button" class="btn btn-primary" @click="sendMessage()">{{$p.t('ui', 'nachrichtSenden')}}</button>
-							<button v-else type="button" class="btn btn-primary" @click="replyMessage(formData.message_id)">{{$p.t('global', 'reply')}}</button>
-						</div>
-
-					</div>
-
-				</div>
-
-				<div class="row mt-4">
-
-					<h4>Vorschau:</h4>
-					<div>
-						<form-form class="row g-3 mt-2" ref="formPreview">
-
-							<div class="col-sm-2 mb-3">
-								<form-input
-									type="select"
-									name="recipient"
-									:label="$p.t('messages/recipient')"
-									v-model="defaultRecipient"
-								>
-								</form-input>
-							</div>
-
-							<div class="col-md-2 mt-4">
-								<br>
-								<button type="button" class="btn bt		n-secondary" @click="showPreview()">Aktualisieren</button>
-							</div>
-						</form-form>
-
-						<div class="col-sm-12 overflow-scroll">
-								<div ref="preview">
-									<div v-html="previewBody" class="p-3 border rounded overflow-scroll twoColumns"></div>
-								</div>
-						</div>
-
-					</div>
-
-				</div>
-	
-			</div>
-
-		</div>
-
-	</div>
-	`
-
-}
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index 03345e9d4..33698f1c8 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -5,6 +5,7 @@ import ListBox from "../../../../../../index.ci.php/public/js/components/primevu
 import DropdownComponent from "../../../VorlagenDropdown/VorlagenDropdown.js";
 
 export default {
+	name: "ModalNewMessages",
 	components: {
 		BsModal,
 		FormForm,
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index 4331dd734..d8db657df 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -4,6 +4,7 @@ import ListBox from "../../../../../../index.ci.php/public/js/components/primevu
 import DropdownComponent from '../../../VorlagenDropdown/VorlagenDropdown.js';
 
 export default {
+	name: "ComponentNewMessages",
 	components: {
 		FormForm,
 		FormInput,
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 89a118fd1..9047d6726 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -1,12 +1,11 @@
 import {CoreFilterCmpt} from "../../filter/Filter.js";
 import FormForm from '../../Form/Form.js';
-//import NewMessage from "../Details/NewMessage.js";
 
 export default {
+	name: "TableMessages",
 	components: {
 		CoreFilterCmpt,
 		FormForm,
-	//	NewMessage,
 	},
 	inject: {
 		cisRoot: {
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index 5aa7eb7de..337883be3 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -2,6 +2,7 @@ import TableMessages from "./Details/TableMessages.js";
 import FormOnly from "./Details/NewMessage/NewDiv.js";
 import MessageModal from "../Messages/Details/NewMessage/Modal.js";
 export default {
+	name: "MessagesComponent",
 	components: {
 		TableMessages,
 		FormOnly,
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index 4c1d9bd6b..0c46a6333 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -1,6 +1,7 @@
 import CoreMessages from "../../../Messages/Messages.js";
 
 export default {
+	name: "TabMessages",
 	components: {
 		CoreMessages
 	},

From 01b3d4580e0015e8130be52d38df2d1f37c98811 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 4 Apr 2025 11:03:00 +0200
Subject: [PATCH 098/572] set name attribute to components

---
 public/js/components/Stv/Studentenverwaltung/Details/Gruppen.js  | 1 +
 .../Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen.js b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen.js
index 1c7c47d6b..96fc6c772 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen.js
@@ -1,6 +1,7 @@
 import GruppenList from './Gruppen/Gruppen.js';
 
 export default {
+	name: 'TabGroups',
 	components: {
 		GruppenList
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
index 63a9b24e1..6434f9fa8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
@@ -1,6 +1,7 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 
 export default {
+	name: 'TblGroups',
 	components: {
 		CoreFilterCmpt,
 	},

From 958577902decc826190b75c2ef8c41e957ea1032 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 4 Apr 2025 11:07:54 +0200
Subject: [PATCH 099/572] set name attribute to components

---
 .../components/Stv/Studentenverwaltung/Details/Anrechnungen.js   | 1 +
 .../Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen.js
index 76d8ae7dd..c98f0598f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen.js
@@ -1,6 +1,7 @@
 import AnrechnungenList from './Anrechnungen/Anrechnungen.js';
 
 export default {
+	name: "TabExemptions",
 	components: {
 		AnrechnungenList
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index 0560f1b5c..9515f2be6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -5,6 +5,7 @@ import FormInput from "../../../../Form/Input.js";
 import CoreNotiz from "../../../../Notiz/Notiz.js";
 
 export default {
+	name: "ExemptionComponent",
 	components: {
 		CoreFilterCmpt,
 		BsModal,

From d75e26f8aea359d073d46d54d7801c681721af10 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 7 Apr 2025 14:46:36 +0200
Subject: [PATCH 100/572] add basis framework for lv dates

---
 .../api/frontend/v1/stv/Config.php            |  5 ++
 .../api/frontend/v1/stv/Lvtermine.php         | 67 +++++++++++++++++++
 .../models/ressource/Stundenplan_model.php    |  2 +-
 public/js/api/stv.js                          |  2 +
 public/js/api/stv/courselist.js               |  6 ++
 .../Details/Lehrveranstaltungstermine.js      | 18 +++++
 .../ListLehrveranstaltungstermine.js          | 47 +++++++++++++
 system/phrasesupdate.php                      | 24 ++++++-
 8 files changed, 169 insertions(+), 2 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Lvtermine.php
 create mode 100644 public/js/api/stv/courselist.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 42de1b02f..2232189b5 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -128,6 +128,11 @@ class Config extends FHCAPI_Controller
 			'component' => './Stv/Studentenverwaltung/Details/Mobility.js'
 		];
 
+		$result['coursedates'] = [
+			'title' => $this->p->t('stv', 'tab_courseDates'),
+			'component' => './Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js'
+		];
+
 		Events::trigger('stv_conf_student', function & () use (&$result) {
 			return $result;
 		});
diff --git a/application/controllers/api/frontend/v1/stv/Lvtermine.php b/application/controllers/api/frontend/v1/stv/Lvtermine.php
new file mode 100644
index 000000000..17a529f85
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Lvtermine.php
@@ -0,0 +1,67 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Lvtermine extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getStundenplan' => ['admin:r', 'assistenz:r'],
+			'getLvsStudent' => ['admin:r', 'assistenz:r'],
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+		]);
+
+		// Load models
+		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+	}
+
+	public function getStundenplan($uid)
+	{
+		//get stundenplan for uid
+		$result = $this->StundenplanModel->loadForUid($uid);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+
+	}
+
+	public function getLvsStudent($uid)
+	{
+		$authUID = getAuthUID();
+		//$this->terminateWithError('uid' . $uid, self::ERROR_TYPE_GENERAL);
+		//$this->terminateWithError('uid' . $authUID, self::ERROR_TYPE_GENERAL);
+
+		$this->load->model('system/Variable_model', 'VariableModel');
+		$result = $this->VariableModel->getVariables($authUID);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		//$this->terminateWithSuccess(current($data)); // WS2025
+
+		$this->load->model('ressource/Stunde_model', 'StundeModel');
+		$this->StundeModel->addOrder('stunde', 'ASC');
+		$result = $this->StundeModel->load();
+		$dataStunden = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($dataStunden);
+	//	$this->terminateWithSuccess(current($data));
+
+		//TODO(manu) check existing apis for liste stundenplan und lvs
+		// version for student
+		// version for lehrfaecherverteilung
+
+
+
+
+	}
+}
\ No newline at end of file
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 012ce0a57..40498a766 100644
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -421,7 +421,7 @@ class Stundenplan_model extends DB_Model
 	 */
 	public function loadForUid($uid)
 	{
-		$this->addSelect(['sp.*','le.studiensemester_kurzbz']);
+		$this->addSelect(['5sp.*','le.studiensemester_kurzbz']);
 		$this->db->join('public.tbl_benutzergruppe bg', 'sp.gruppe_kurzbz=bg.gruppe_kurzbz AND bg.uid=?', 'LEFT', false);
 		$this->addJoin('public.tbl_studiensemester ss1', 'bg.studiensemester_kurzbz=ss1.studiensemester_kurzbz AND ss1.start<=sp.datum AND ss1.ende>=sp.datum', 'LEFT');
 		$this->db->join('public.tbl_studentlehrverband slv', "sp.studiengang_kz=slv.studiengang_kz AND slv.student_uid=? AND (slv.semester=sp.semester OR sp.semester IS NULL) AND (slv.verband=sp.verband OR sp.verband IS NULL OR sp.verband='' OR sp.verband='0') AND (slv.gruppe=sp.gruppe OR sp.gruppe IS NULL OR sp.gruppe='' OR sp.gruppe='0') AND sp.gruppe_kurzbz IS NULL", 'LEFT', false);
diff --git a/public/js/api/stv.js b/public/js/api/stv.js
index ae88b0516..e9f0fd2f5 100644
--- a/public/js/api/stv.js
+++ b/public/js/api/stv.js
@@ -10,6 +10,7 @@ import exam from './stv/exam.js';
 import abschlusspruefung from './stv/abschlusspruefung.js';
 import grades from './stv/grades.js';
 import mobility from './stv/mobility.js';
+import courselist from './stv/courselist.js';
 
 export default {
 	verband,
@@ -24,6 +25,7 @@ export default {
 	abschlusspruefung,
 	grades,
 	mobility,
+	courselist,
 	configStudent() {
 		return this.$fhcApi.get('api/frontend/v1/stv/config/student');
 	},
diff --git a/public/js/api/stv/courselist.js b/public/js/api/stv/courselist.js
new file mode 100644
index 000000000..b6035c098
--- /dev/null
+++ b/public/js/api/stv/courselist.js
@@ -0,0 +1,6 @@
+export default {
+	getCourselist(url, config, params) {
+		console.log("her");
+		return this.$fhcApi.get('api/frontend/v1/stv/Lvtermine/getLvsStudent/' + params.id);
+	},
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js
new file mode 100644
index 000000000..6845613ab
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js
@@ -0,0 +1,18 @@
+import TableLvList from "./Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js";
+
+export default {
+	name: "TabCourseList",
+	components: {
+		TableLvList
+	},
+	props: {
+		modelValue: Object,
+	},
+	data(){
+		return {}
+	},
+	template: `
+	<div class="stv-details-course-list h-100 d-flex flex-column">	
+		<table-lv-list ref="tbl_course_list" :student="modelValue"></table-lv-list>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
new file mode 100644
index 000000000..8a6c0d2b0
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
@@ -0,0 +1,47 @@
+import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+
+export default {
+	name: "TblCourseList",
+	components: {
+		CoreFilterCmpt
+	},
+	props: {
+		student: Object
+	},
+	data(){
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: this.$fhcApi.factory.stv.courselist.getCourselist,
+				ajaxParams: () => {
+					return {
+						id: this.student.uid
+					};
+				},
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "Prestudent_id", field: "prestudent_id"},
+					]
+			},
+			tabulatorEvents: [],
+		}
+
+	},
+	methods: {},
+	template: `
+		<div class="stv-details-courselist h-100 pb-3">
+			<h4>Termine</h4>
+			{{student}}
+		
+			<core-filter-cmpt
+				ref="table"
+				:tabulator-options="tabulatorOptions"
+				:tabulator-events="tabulatorEvents"
+				table-only
+				:side-menu="false"
+				reload
+				>
+			</core-filter-cmpt>
+		</div>
+	`
+}
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index cd17215ee..7d6d7361d 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41393,8 +41393,30 @@ and represent the current state of research on the topic. The prescribed citatio
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
 	// PROJEKTARBEITSBEURTEILUNG SS2025 ENDE ---------------------------------------------------------------------------
+	// FHC 4 Lehrveranstaltungstermine START ---------------------------------------------------------------------------
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_courseDates',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV Termine',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Course Dates',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// FHC 4 Lehrveranstaltungstermine ENDE ---------------------------------------------------------------------------
 );
 
 

From 9b9b8b1532e0ebde6f87805939ee102e9bfcec8f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 9 Apr 2025 10:50:19 +0200
Subject: [PATCH 101/572] feature(CIS Dashboard gridsystem): allows to pin
 widgets in the grid and changes how widgets are positioned in different
 viewports

---
 public/css/components/dashboard.css       |  12 +--
 public/js/components/Dashboard/Item.js    |  39 ++++++-
 public/js/components/Dashboard/Section.js |  85 ++++-----------
 public/js/components/Drop/Grid.js         | 126 +++++++++++++++++++---
 public/js/composables/GridLogic.js        |  65 ++++++++++-
 5 files changed, 233 insertions(+), 94 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 1a9808e0c..47ce239ee 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -77,12 +77,10 @@
 	z-index: 2;
 }
 
-.dragged-widget-icon{
-	position: absolute;
-	height: 250px;
-	width: 200px;
-	top: -999px;
-	left: -999px;
-	z-index: 3;
+.pin:hover{
+	cursor: pointer;
 }
 
+.pin[pinned]:hover{
+	color:rgb(153, 116, 116);
+}
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index b78659a96..33e614531 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -24,7 +24,9 @@ export default {
 		"dragstart",
 		"resizestart",
 		"configOpened",
-		"configClosed"
+		"configClosed",
+		"pinItem",
+		"unPinItem"
 	],
 	props: [
 		"id",
@@ -36,8 +38,13 @@ export default {
 		"hidden",
 		"editMode",
 		"loading",
+		"item_data",
+		"place",
 	],
 	computed: {
+		isPinned(){
+			return this.place?.pinned ? true : false;
+		},
 		isResizeable() {
 			if (!this.widget) return false;
 			return this.widget.setup.width.max || this.widget.setup.height.max;
@@ -47,6 +54,17 @@ export default {
 		},
 	},
 	methods: {
+		unpin(){
+			// Unpinning is only possible in edit mode
+			if(!this.editMode)
+				return;
+			let result = { item: this.item_data, x: this.item_data.x, y: this.item_data.y };
+			this.$emit('unPinItem', [result]);
+		},
+		pinItem(){
+			let result = { item: this.item_data, x: this.item_data.x, y: this.item_data.y};
+			this.$emit('pinItem',[result]);
+		},
 		getWidgetC4Link(widget) {
 			return (FHC_JS_DATA_STORAGE_OBJECT.app_root +
 				FHC_JS_DATA_STORAGE_OBJECT.ci_router + widget.setup.cis4link)
@@ -120,12 +138,25 @@ export default {
 			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 		</div>
 	</div>
-	<div v-else-if="!hidden || editMode" :id="widgetID" class="dashboard-item card overflow-hidden h-100 position-relative" :class="arguments && arguments.className ? arguments.className : ''">
+	<div v-else-if="!hidden || editMode" class="dashboard-item card overflow-hidden h-100 position-relative" :class="arguments && arguments.className ? arguments.className : ''">
 		<div v-if="widget" class="card-header d-flex ps-0 pe-2 align-items-center">
 			<Transition>
-				<span v-if="editMode" drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
+				<span v-if="editMode && !isPinned" drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
 			</Transition>
 			<span class="col mx-2 px-2">{{ widget.setup.name }}</span>
+			<template v-if="isPinned">
+				<div v-if="editMode" pinned="true" @click="unpin" class="pin cursor-pointer col-auto me-2">
+					<i class="fa-solid fa-thumbtack "></i>
+				</div>
+				<div v-else class="col-auto me-2">
+					<i class="fa-solid fa-thumbtack "></i>
+				</div>
+			</template>
+			<template v-else>
+				<div v-if="editMode"  class="col-auto me-2 pin" @click="pinItem">
+					<i class="fa-solid fa-thumbtack" style="color:lightgray;"></i>
+				</div>
+			</template>
 			<a v-if="widget.setup.cis4link" :href="getWidgetC4Link(widget)" class="col-auto ms-auto ">
           		<i class="fa fa-arrow-up-right-from-square me-1"></i>
           	</a>
@@ -157,7 +188,7 @@ export default {
 			</template>
 		</bs-modal>
 		<height-transition>
-			<div v-if="editMode && isResizeable" class="card-footer d-flex justify-content-end p-0">
+			<div v-if="editMode && isResizeable && !isPinned" class="card-footer d-flex justify-content-end p-0">
 				<span drag-action="resize" class="col-auto px-1 cursor-nw-resize"><i class="fa-solid fa-up-right-and-down-left-from-center mirror-x"></i></span>
 			</div>
 		</height-transition>
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 0ff0f52e2..44fac5550 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -57,71 +57,28 @@ export default {
 			return 'margin-bottom: 8px;';
 		},
 		items() {
-
-			const computeNearestPlace = (item, gridWidth) =>{
+			// reuses the nearest placement of the widget from another viewport 
+			/* const computeNearestPlace = (item, gridWidth) =>{
 				let place;
 				if (Object.keys(item.place).length > 0) {
 					const nearestIndex = Object.keys(item.place)
 											   .sort((a, b) => Math.abs(a - gridWidth) - Math.abs(b - gridWidth))
-											   .pop();
+											   .shift();
 					place = item.place[nearestIndex];
 				}
 				else{
 					place = { x: 0, y: 0, w: 1, h: 1 };
 				}
 				return place;
-			}
+			} */
 			
-			return this.widgets.map(item => {
-				return { ...item, ...(item.place[this.gridWidth] || computeNearestPlace(item, this.gridWidth))};
+			let placedItems = this.widgets.map(item => {
+				return { ...item, reorder: false, ...(item.place[this.gridWidth] || { reorder: true, ...{ x: 0, y: 0, w: 1, h: 1 } })};
 			});
+			return placedItems;
+			
 		},
-		items_hashmap() {
-			let items = {};
-			this.items.forEach(item => {
-				items[`x${item.x}y${item.y}`] = item;
-			});
-			return items
-		},
-		items_placeholders(){
-			let placeholders = [];
-			let col_max = this.gridWidth;
-			let rows_max = this.gridHeight;
-
-			// occupied hashmap to keep track of the occupied cells
-			let occupied = {};
-
-			for (let y = 0; y < rows_max; y++) {
-				for (let x = 0; x < col_max; x++) {
-					// skip current position if it was registered as occupied
-					if (Object.keys(occupied).length && occupied[`x${x}y${y}`]) {
-						continue;
-					}
-					let current_item = this.items_hashmap[`x${x}y${y}`];
-					if (current_item) {
-						//calculate the occupied cells from the width and the height from the items 
-						let width = current_item.w;
-						let height = current_item.h;
-						let max_x = x + width - 1;
-						let max_y = y + height - 1;
-						if(x != max_x || y != max_y){
-							for (let occupied_y = y; occupied_y <= max_y; occupied_y++) {
-								for (let occupied_x = x; occupied_x <= max_x; occupied_x++) {
-									if (occupied_x != x || occupied_y != y) {
-										occupied[`x${occupied_x}y${occupied_y}`]=true;
-									}
-								}
-							}
-						}
-					}
-					else {
-						placeholders.push({ x: x, y: y, w: 1, h: 1, placeholder: true, 
-							data: { id: 'placeholder_' + String(placeholders.length).padStart(4, "0") } });
-					}
-				}
-			}
-			return placeholders;
-		},
+		
 	},
 	methods: {
 		handleConfigOpened() {
@@ -140,7 +97,7 @@ export default {
 				else
 					minmaxW = {min:minmaxW,max:minmaxW};
 				if (w < minmaxW.min)
-					w = minmaxW.min;
+					w = minmaxW.min; 
 				if (w > minmaxW.max)
 					w = minmaxW.max;
 
@@ -170,7 +127,7 @@ export default {
 			payload[item.id] = { config };
 			this.updatePreset(payload);
 		},
-		updatePositions(updated) {
+		updatePositions(updated, pinned=false) {
 			let result = {};
 			updated.forEach(update => {
 				
@@ -182,6 +139,7 @@ export default {
 				delete item.y;
 				delete item.w;
 				delete item.h;
+				delete item.place[this.gridWidth].pinned;
 				if (update.x !== undefined)
 					item.place[this.gridWidth].x = update.x;
 				if (update.y !== undefined)
@@ -190,11 +148,13 @@ export default {
 					item.place[this.gridWidth].w = update.w;
 				if (update.h !== undefined)
 					item.place[this.gridWidth].h = update.h;
+				if (pinned){
+					item.place[this.gridWidth].pinned = true;
+				}
 
 				result[item.id] = item;
 				}
 			});
-			
 			this.updatePreset(result);
 		},
 		updatePreset(update) {
@@ -213,13 +173,8 @@ export default {
 		});
 	},
 	template: `
-	<div class="dashboard-section position-relative" ref="container" :style="getSectionStyle">
-		<template v-for="setup in widgetsSetup">
-			<div class="dragged-widget-icon" :id="'widget-'+name+'-'+setup.widget_id" >
-				<widget-icon v-if="widgetsSetup" :widget="setup"></widget-icon>
-			</div>
-		</template>
-		<drop-grid v-model:cols="gridWidth" :items="items" :placeholders="items_placeholders" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
+	<div class="dashboard-section position-relative pb-3 border-bottom" ref="container" :style="getSectionStyle">
+		<drop-grid v-model:cols="gridWidth" :items="items" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
 				
 				<dashboard-item 
@@ -228,15 +183,19 @@ export default {
 					:widgetID="item.id"
 					:width="item.w"
 					:height="item.h"
+					:item_data="{config:item.config, custom:item.custom, h:item.h, w:item.w,id:item.id,reorder:item.reorder,place:item.place,widget:item.widget,widgetid:item.widgetid,x:item.x,y:item.y}"
 					:loading="item.loading"
 					:config="item.config"
 					:custom="item.custom"
 					:hidden="item.hidden"
 					:editMode="editMode"
+					:place="item.place[gridWidth]"
 					@change="saveConfig($event, item)"
 					@remove="removeWidget(item, $event)"
 					@config-opened="handleConfigOpened"
-					@config-closed="handleConfigClosed">
+					@config-closed="handleConfigClosed"
+					@pinItem="updatePositions($event,true)"
+					@unPinItem="updatePositions">
 				</dashboard-item>
 				<div v-else class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
 				
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 535eed2ba..b69973294 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -24,10 +24,6 @@ export default {
 			type: Number,
 			default: 0
 		},
-		placeholders: {
-			type: Array,
-			default: () => []
-		}
 	},
 	emits: [
 		"rearrangeItems",
@@ -48,8 +44,11 @@ export default {
 			fixedPositionUpdates: null,
 			draggedOffset: [0,0],
 			draggedItem: null,
+			draggedNode: null,
 			draggedItemIcon: null,
 			additionalRow: null,
+			reorderedItems:[],
+			clonedWidget:null,
 		}
 	},
 	inject:{
@@ -59,6 +58,64 @@ export default {
 		},
 	},
 	computed: {
+		items_hashmap() {
+			let items = {};
+			this.items.forEach(item => {
+				if (this.reorderedItems.length > 0){
+					if(item.reorder){
+						let rearrangedPosition = this.reorderedItems.filter(widget => widget.data.widgetid == item.widgetid)?.pop();
+						if (rearrangedPosition) {			
+							item.x = rearrangedPosition.x;
+							item.y = rearrangedPosition.y;
+						}
+					}
+				}
+				items[`x${item.x}y${item.y}`] = item;
+			});	
+			return items
+		},
+		items_placeholders(){
+			let placeholders = [];
+			let col_max = this.cols;
+			let rows_max = this.rows;
+
+			// occupied hashmap to keep track of the occupied cells
+			let occupied = {};
+
+			for (let y = 0; y < rows_max; y++) {
+				for (let x = 0; x < col_max; x++) {
+					// skip current position if it was registered as occupied
+					if (Object.keys(occupied).length && occupied[`x${x}y${y}`]) {
+						continue;
+					}
+					let current_item = this.items_hashmap[`x${x}y${y}`];
+					if (current_item) {
+						//calculate the occupied cells from the width and the height from the items 
+						let width = current_item.w;
+						let height = current_item.h;
+						let max_x = x + width - 1;
+						let max_y = y + height - 1;
+						if(x != max_x || y != max_y){
+							for (let occupied_y = y; occupied_y <= max_y; occupied_y++) {
+								for (let occupied_x = x; occupied_x <= max_x; occupied_x++) {
+									if (occupied_x != x || occupied_y != y) {
+										occupied[`x${occupied_x}y${occupied_y}`]=true;
+									}
+								}
+							}
+						}
+					}
+					else {
+						placeholders.push({ x: x, y: y, w: 1, h: 1, placeholder: true, 
+							data: { id: 'placeholder_' + String(placeholders.length).padStart(4, "0") } });
+					}
+				}
+			}
+			return placeholders;
+		},
+		placedItems_withPlaceholders() {
+			return [...this.placedItems, ...this.items_placeholders];
+		},
 		rows() {
 			if ((this.mode == MODE_MOVE || this.mode == MODE_RESIZE) && this.dragGrid)
 				return this.dragGrid.h;
@@ -83,6 +140,7 @@ export default {
 						y: item.y,
 						w: item.w,
 						h: item.h,
+						reorder: item.reorder,
 						weight: item.weight || 0,
 						data: item
 					}
@@ -110,7 +168,7 @@ export default {
 			if (!this.positionUpdates)
 				return this.prePlacedItems;
 			return this.prePlacedItems.map(item => {
-				if (!this.positionUpdates[item.index])
+				if (!this.positionUpdates[item.index] )
 					return item;
 				return {
 					index: item.index,
@@ -123,9 +181,6 @@ export default {
 				};
 			});
 		},
-		placedItems_withPlaceholders(){
-			return [...this.placedItems,...this.placeholders];
-		},
 		showEmptyTileHover() {
 			if (!this.active || !this.grid || this.mode != MODE_IDLE || this.x < 0 || this.y < 0 || this.x >= this.cols || this.y >= this.rows)
 				return false;
@@ -169,27 +224,52 @@ export default {
 		}
 	},
 	methods: {
+		
 		toggleDraggedItemOverlay(condition){
-			if(!this.draggedItem)
+			if(!this.draggedNode)
 				return;
-			let draggedItemNode = document.getElementById(this.draggedItem.data.id);
 			if(condition){
-				draggedItemNode.classList.add("dashboard-item-overlay");
+				this.draggedNode.firstElementChild.classList.add("dashboard-item-overlay");
 			}else{
-				draggedItemNode.classList.remove("dashboard-item-overlay");
+				this.draggedNode.firstElementChild.classList.remove("dashboard-item-overlay");
 			}
 		},
 		dragging(event){
 			if(this.mode == MODE_MOVE){
 				this.toggleDraggedItemOverlay(true);
-			    this.draggedItemIcon.style.top = `${this.clientY}px`;
-			    this.draggedItemIcon.style.left = `${this.clientX}px`;
+				this.clonedWidget.style.top = `${this.clientY-20}px`;
+				this.clonedWidget.style.left = `${this.clientX-15}px`;
 			}
 		},
 		createNewGrid(items) {
 			this.grid = new GridLogic(this.cols);
 			const result = [];
-			[...items].sort((a, b) => a.weight > b.weight).forEach(item => {
+			let sortedItems = [...items].sort((a, b) => {
+				if (a.reorder){
+					return 999;
+				}
+				if (b.reorder){
+					return -999;
+				}
+				return a.weight > b.weight;
+			}); 
+			let reorderedItems = [];
+			sortedItems.forEach(item => {
+				let freeSlots = this.grid.getFreeSlots();
+				
+				if(item.reorder){
+					item.reorder=true;
+					let firstFreeSlot = freeSlots.shift();
+					if (!firstFreeSlot) {
+						item.x = 0;
+						item.y = this.grid.h;
+					}else{
+						item.x = firstFreeSlot.x;
+						item.y = firstFreeSlot.y;
+					}
+					reorderedItems.push(item);
+					
+				}
 				if (item.x + item.w > this.cols) {
 					let targetW = this.cols-item.x,
 						targetX = undefined;
@@ -214,10 +294,12 @@ export default {
 				item.frame = this.grid.getItemFrame(item);
 				this.convertGridResultToUpdate(this.grid.add(item), result, items);
 			});
+			this.reorderedItems = reorderedItems;
 			this.grid.clearWeights();
 			return result;
 		},
 		convertGridResultToUpdate(input, output, baseArray) {
+			
 			if (!input)
 				return;
 			if (!baseArray)
@@ -296,7 +378,14 @@ export default {
 			
 			this.mode = MODE_MOVE;
 			this.draggedItem = item;
-			this.draggedItemIcon = document.getElementById(`widget-${this.sectionName}-${this.draggedItem?.data.widget}`);
+			this.draggedNode = evt.target;
+			//clones the widget for the drag Image
+			let clone = evt.target.cloneNode(true);
+			clone.style.zIndex = 20;
+			clone.classList.add("widgetClone");
+			this.$refs.container.appendChild(clone);
+			this.clonedWidget = clone;
+			
 			this.draggedOffset = [item.x - this.x, item.y - this.y];
 			this._dragStart(evt, item);
 		},
@@ -353,6 +442,7 @@ export default {
 			this.positionUpdates = null;
 			this.draggedOffset = [0,0],
 			this.draggedItem = null;
+			this.draggedNode = null;
 			
 			if(this.draggedItemIcon){
 				this.draggedItemIcon.style.top = '-999px';
@@ -362,6 +452,10 @@ export default {
 			
 		},
 		dragEnd() {
+			let widgetClones = document.getElementsByClassName("widgetClone");
+			for(let widget of widgetClones){
+				this.$refs.container.removeChild(widget);
+			}
 			if (this.mode == MODE_IDLE)
 				return;
 			if (!this.active || this.x < 0 || this.y < 0 || this.x >= this.cols)
diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index 10aa2909c..fae9a082d 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -23,9 +23,34 @@ class GridLogic {
 		const i = y*this.w + x;
 		return !this.grid[i] && this.grid[i] !== 0;
 	}
+	getMaxY(){
+		return this.data.reduce((acc, item) => { 
+			if (item?.y > acc) {
+				 acc = item.y; 
+			} 
+			return acc; 
+		}, 0);
+	}
+	getFreeSlots() {
+		const freeSlots = [];
+		let biggestY = this.getMaxY();
+		let totalSpaces = this.w * (biggestY+1);
+		for(let i=0; i < totalSpaces; i++){
+			if (!this.grid[i] && this.grid[i] !== 0){
+				this.grid[i] = undefined;
+			}
+		}
+		for(let i =0; i < this.grid.length; i++){
+			if (!this.grid[i] && this.grid[i] !== 0){
+				let x = i % this.w;
+				let y = Math.floor(i / this.w);
+				freeSlots.push({x, y});
+			}
+		}
+		return freeSlots;
+	}
 	add(item, prefer) {
 		let occupiers = this.getItemsInFrame(item.frame);
-
 		if (!occupiers.length) {
 			item.frame.forEach(f => this.grid[f] = item.index);
 			this.data[item.index] = item;
@@ -63,6 +88,7 @@ class GridLogic {
 				});
 				item.frame.forEach(f => this.grid[f] = item.index);
 				this.data[item.index] = item;
+
 				return result;
 			} else {
 				console.error('FATAL', "can't arrange item on grid");
@@ -70,8 +96,11 @@ class GridLogic {
 		}
 	}
 	move(item, x, y) {
+		if (item.data.place[this.w].pinned)
+			return [];
 		if (item.x == x && item.y == y)
 			return [];
+		
 		this.remove(item);
 
 		let prefer = undefined;
@@ -91,6 +120,32 @@ class GridLogic {
 		currItem.x = x;
 		currItem.y = y;
 		currItem.frame = this.getItemFrame(currItem);
+		let occupiers = this.getItemsInFrame(currItem.frame);
+		
+		// does not update if the target conatins pinned widgets
+		if (occupiers.some(frame => this.data[frame]?.data.place[this.w].pinned)) {
+			return [];
+		}
+		
+		// checks if target contains widget with the same high and width
+		let replace = occupiers
+					.map(occupier => this.data[occupier])
+					.filter( occupier => {
+						return occupier.data.w == item.w && occupier.data.h == item.h
+					});
+		
+		// replaces positions of widget and target widget if they have same height and width
+		if(replace.length > 0){
+			let replaceUpdate =[];
+			replaceUpdate[replace[0].index] = { index: replace[0].index, x:item.x, y:item.y };
+			replaceUpdate[item.index] = { index: item.index, x: replace[0].x, y: replace[0].y};
+			//update Grid and dataGrid 
+			replace[0].frame.forEach(f => this.grid[f] = item.index)
+			item.frame.forEach(f => this.grid[f] = replace[0].index);
+			this.data[replace[0].index] = item;
+			this.data[item.index] = replace[0];
+			return replaceUpdate;
+		}
 		
 		const updates = this.add(currItem, prefer);
 		updates[item.index] = {index: item.index, x, y};
@@ -145,25 +200,27 @@ class GridLogic {
 		let targetframe;
 		switch(dir) {
 			case DIR_UP:
-				if (this.data[index].y - amount < 0)
+				if (this.data[index].data?.place[this.w]?.pinned || this.data[index].y - amount < 0)
 					return false;
 				targetframe = this.data[index].frame.map(i => i-this.w*amount);
 				move.y = -amount;
 				break;
 			case DIR_DOWN:
+				if (this.data[index].data?.place[this.w]?.pinned)
+					return false;
 				if (this.data[index].y + this.data[index].h + amount > this.h)
 					cost += .4;
 				targetframe = this.data[index].frame.map(i => i+this.w*amount);
 				move.y = amount;
 				break;
 			case DIR_LEFT:
-				if (this.data[index].x - amount < 0)
+				if (this.data[index].data?.place[this.w]?.pinned || this.data[index].x - amount < 0)
 					return false;
 				targetframe = this.data[index].frame.map(i => i-amount);
 				move.x = -amount;
 				break;
 			case DIR_RIGHT:
-				if (this.data[index].x + this.data[index].w + amount > this.w)
+				if (this.data[index].data?.place[this.w]?.pinned || this.data[index].x + this.data[index].w + amount > this.w)
 					return false;
 				targetframe = this.data[index].frame.map(i => i+amount);
 				move.x = amount;

From 419c199e84ab9d2c3590546c224ff3d2c2c053c6 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 9 Apr 2025 11:06:50 +0200
Subject: [PATCH 102/572] new Tab GemeinsameStudien

---
 .../api/frontend/v1/stv/Config.php            |   5 +
 .../api/frontend/v1/stv/GemeinsameStudien.php | 283 +++++++++++
 .../models/codex/Mobilitaetstyp_model.php     |  14 +
 public/js/api/stv.js                          |   2 +
 public/js/api/stv/jointstudies.js             |  33 ++
 .../Details/JointStudies.js                   |  16 +
 .../Details/JointStudies/JointStudies.js      | 467 ++++++++++++++++++
 system/phrasesupdate.php                      | 144 +++++-
 8 files changed, 963 insertions(+), 1 deletion(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/GemeinsameStudien.php
 create mode 100644 application/models/codex/Mobilitaetstyp_model.php
 create mode 100644 public/js/api/stv/jointstudies.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/JointStudies.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 42de1b02f..e0d9daf26 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -128,6 +128,11 @@ class Config extends FHCAPI_Controller
 			'component' => './Stv/Studentenverwaltung/Details/Mobility.js'
 		];
 
+		$result['jointstudies'] = [
+			'title' => $this->p->t('stv', 'tab_jointstudies'),
+			'component' => './Stv/Studentenverwaltung/Details/JointStudies.js'
+		];
+
 		Events::trigger('stv_conf_student', function & () use (&$result) {
 			return $result;
 		});
diff --git a/application/controllers/api/frontend/v1/stv/GemeinsameStudien.php b/application/controllers/api/frontend/v1/stv/GemeinsameStudien.php
new file mode 100644
index 000000000..dbf9efce1
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/GemeinsameStudien.php
@@ -0,0 +1,283 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class GemeinsameStudien extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getStudien' => ['admin:r', 'assistenz:r'],
+			'loadStudie' => ['admin:r', 'assistenz:r'],
+			'insertStudie' => ['admin:rw', 'assistenz:rw'],
+			'updateStudie' => ['admin:rw', 'assistenz:rw'],
+			'deleteStudie' => ['admin:rw', 'assistenz:rw'],
+			'getProgramsStudien' => ['admin:r', 'assistenz:r'],
+			'getTypenMobility' => ['admin:r', 'assistenz:r'],
+			'getStudiensemester' => ['admin:r', 'assistenz:r'],
+			'getStudienprogramme' => ['admin:r', 'assistenz:r'],
+			'getPartnerfirmen' => ['admin:r', 'assistenz:r'],
+			'getStatiPrestudent' => ['admin:r', 'assistenz:r'],
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+			'jointstudies'
+		]);
+
+		// Load models
+		$this->load->model('codex/Mobilitaet_model', 'MobilitaetModel');
+
+		//TODO(check if additional Permissions necessary): 'student/stammdaten'
+	}
+
+	public function getStudien($prestudent_id)
+	{
+		$this->MobilitaetModel->addSelect('mobilitaet_id');
+		$this->MobilitaetModel->addSelect('mobilitaetstyp_kurzbz');
+		$this->MobilitaetModel->addSelect('prestudent_id');
+		$this->MobilitaetModel->addSelect('studiensemester_kurzbz');
+		$this->MobilitaetModel->addSelect('bis.tbl_mobilitaet.mobilitaetsprogramm_code');
+		$this->MobilitaetModel->addSelect('bis.tbl_mobilitaet.gsprogramm_id');
+		$this->MobilitaetModel->addSelect('bis.tbl_mobilitaet.firma_id');
+		$this->MobilitaetModel->addSelect('status_kurzbz');
+		$this->MobilitaetModel->addSelect('ausbildungssemester');
+		$this->MobilitaetModel->addSelect('bis.tbl_mobilitaet.insertvon');
+		$this->MobilitaetModel->addSelect('bis.tbl_mobilitaet.insertamum');
+		$this->MobilitaetModel->addSelect('bis.tbl_mobilitaet.updatevon');
+		$this->MobilitaetModel->addSelect('bis.tbl_mobilitaet.updateamum');
+		$this->MobilitaetModel->addSelect('mp.kurzbz');
+		$this->MobilitaetModel->addSelect('gp.gsprogrammtyp_kurzbz');
+		$this->MobilitaetModel->addSelect('gp.bezeichnung as studienprogramm');
+		$this->MobilitaetModel->addSelect('f.name as partner');
+
+		$this->MobilitaetModel->addJoin('bis.tbl_mobilitaetsprogramm mp', 'ON (mp.mobilitaetsprogramm_code = bis.tbl_mobilitaet.mobilitaetsprogramm_code)', 'LEFT');
+		$this->MobilitaetModel->addJoin('bis.tbl_gsprogramm gp', 'ON (gp.gsprogramm_id = bis.tbl_mobilitaet.gsprogramm_id)', 'LEFT');
+		$this->MobilitaetModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = bis.tbl_mobilitaet.firma_id)', 'LEFT');
+
+		$result = $this->MobilitaetModel->loadWhere([
+			'prestudent_id' => $prestudent_id,
+		]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getTypenMobility()
+	{
+		$this->load->model('codex/Mobilitaetstyp_model', 'MobilitaetstypModel');
+
+		$result = $this->MobilitaetstypModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getStudiensemester()
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$this->StudiensemesterModel->addOrder('studienjahr_kurzbz', 'DESC');
+		$result = $this->StudiensemesterModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getStudienprogramme()
+	{
+		$this->load->model('codex/Gsprogramm_model', 'GsprogrammModel');
+
+		$result = $this->GsprogrammModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getPartnerfirmen()
+	{
+		$this->load->model('ressource/Firma_model', 'FirmaModel');
+
+		$result = $this->FirmaModel->loadWhere(
+			['partner_code !=' => null]
+		);
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getStatiPrestudent()
+	{
+		$this->load->model('crm/Status_model', 'StatusModel');
+
+		$result = $this->StatusModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function loadStudie($mobilitaet_id)
+	{
+		$result = $this->MobilitaetModel->load($mobilitaet_id);
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function insertStudie()
+	{
+		$this->load->library('form_validation');
+		$authUID = getAuthUID();
+
+		$prestudent_id = $this->input->post('prestudent_id');
+		if(!$prestudent_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$formData = $this->input->post('formData');
+		$_POST['ausbildungssemester'] = (isset($formData['ausbildungssemester']) && !empty($formData['ausbildungssemester']))
+			? $formData['ausbildungssemester']
+			: null;
+		$_POST['mobilitaetstyp_kurzbz'] = (isset($formData['mobilitaetstyp_kurzbz']) && !empty($formData['mobilitaetstyp_kurzbz']))
+			? $formData['mobilitaetstyp_kurzbz']
+			: null;
+		$_POST['studiensemester_kurzbz'] = (isset($formData['studiensemester_kurzbz']) && !empty($formData['studiensemester_kurzbz']))
+			? $formData['studiensemester_kurzbz'] : null;
+
+		$this->form_validation->set_rules('mobilitaetstyp_kurzbz', 'Typ', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
+		]);
+
+		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Studiensemester'])
+		]);
+
+		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'required|numeric', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Ausbildungssemester']),
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ausbildungssemester']),
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$status_kurzbz = (isset($formData['status_kurzbz']) && !empty($formData['status_kurzbz']))
+			? $formData['status_kurzbz']
+			: null;
+		$mobilitaetsprogramm_code = (isset($formData['mobilitaetsprogramm_code']) && !empty($formData['mobilitaetsprogramm_code']))
+			? $formData['mobilitaetsprogramm_code']
+			: null;
+		$gsprogramm_id = (isset($formData['gsprogramm_id']) && !empty($formData['gsprogramm_id']))
+			? $formData['gsprogramm_id']
+			: null;
+		$firma_id= (isset($formData['firma_id']) && !empty($formData['firma_id'])) ? $formData['firma_id'] : null;
+
+		$result = $this->MobilitaetModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'mobilitaetstyp_kurzbz' => $_POST['mobilitaetstyp_kurzbz'],
+			'status_kurzbz' => $status_kurzbz,
+			'studiensemester_kurzbz' => $_POST['studiensemester_kurzbz'],
+			'mobilitaetsprogramm_code' => $mobilitaetsprogramm_code,
+			'gsprogramm_id' => $gsprogramm_id,
+			'firma_id' => $firma_id,
+			'ausbildungssemester' => $_POST['ausbildungssemester'],
+			'insertvon' => $authUID,
+			'insertamum' => date('c'),
+		]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function updateStudie()
+	{
+		$this->load->library('form_validation');
+		$authUID = getAuthUID();
+
+		$prestudent_id = $this->input->post('prestudent_id');
+		if(!$prestudent_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$formData = $this->input->post('formData');
+
+		$_POST['mobilitaet_id'] = (isset($formData['mobilitaet_id']) && !empty($formData['mobilitaet_id']))
+			? $formData['mobilitaet_id'] :
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Mobilitaet ID']), self::ERROR_TYPE_GENERAL);
+		$_POST['ausbildungssemester'] = (isset($formData['ausbildungssemester']) && !empty($formData['ausbildungssemester']))
+			? $formData['ausbildungssemester']
+			: null;
+		$_POST['mobilitaetstyp_kurzbz'] = (isset($formData['mobilitaetstyp_kurzbz']) && !empty($formData['mobilitaetstyp_kurzbz']))
+			? $formData['mobilitaetstyp_kurzbz']
+			: null;
+		$_POST['studiensemester_kurzbz'] = (isset($formData['studiensemester_kurzbz']) && !empty($formData['studiensemester_kurzbz']))
+			? $formData['studiensemester_kurzbz']
+			: null;
+
+		$this->form_validation->set_rules('mobilitaetstyp_kurzbz', 'Typ', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
+		]);
+
+		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Studiensemester'])
+		]);
+
+		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'required|numeric', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Ausbildungssemester']),
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ausbildungssemester']),
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$status_kurzbz = (isset($formData['status_kurzbz']) && !empty($formData['status_kurzbz'])) ? $formData['status_kurzbz'] : null;
+		$mobilitaetsprogramm_code = (isset($formData['mobilitaetsprogramm_code']) && !empty($formData['mobilitaetsprogramm_code']))
+			? $formData['mobilitaetsprogramm_code']
+			: null;
+		$gsprogramm_id = (isset($formData['gsprogramm_id']) && !empty($formData['gsprogramm_id']))
+			? $formData['gsprogramm_id']
+			: null;
+		$firma_id= (isset($formData['firma_id']) && !empty($formData['firma_id'])) ? $formData['firma_id'] : null;
+
+		$result = $this->MobilitaetModel->update(
+			[
+				'mobilitaet_id' => $_POST['mobilitaet_id'],
+			],
+			[
+				'prestudent_id' => $prestudent_id,
+				'mobilitaetstyp_kurzbz' => $_POST['mobilitaetstyp_kurzbz'],
+				'status_kurzbz' => $status_kurzbz,
+				'studiensemester_kurzbz' => $_POST['studiensemester_kurzbz'],
+				'mobilitaetsprogramm_code' => $mobilitaetsprogramm_code,
+				'gsprogramm_id' => $gsprogramm_id,
+				'firma_id' => $firma_id,
+				'ausbildungssemester' => $_POST['ausbildungssemester'],
+				'updatevon' => $authUID,
+				'updateamum' => date('c'),
+			]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function deleteStudie($mobilitaet_id)
+	{
+		if(!$mobilitaet_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Mobilität ID']), self::ERROR_TYPE_GENERAL);
+		}
+		$result = $this->MobilitaetModel->delete(
+			array('mobilitaet_id' => $mobilitaet_id)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+}
diff --git a/application/models/codex/Mobilitaetstyp_model.php b/application/models/codex/Mobilitaetstyp_model.php
new file mode 100644
index 000000000..f93f588a0
--- /dev/null
+++ b/application/models/codex/Mobilitaetstyp_model.php
@@ -0,0 +1,14 @@
+<?php
+class Mobilitaetstyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_mobilitaetstyp';
+		$this->pk = 'mobilitaetstyp_kurzbz';
+	}
+}
diff --git a/public/js/api/stv.js b/public/js/api/stv.js
index ae88b0516..89a69c84e 100644
--- a/public/js/api/stv.js
+++ b/public/js/api/stv.js
@@ -10,6 +10,7 @@ import exam from './stv/exam.js';
 import abschlusspruefung from './stv/abschlusspruefung.js';
 import grades from './stv/grades.js';
 import mobility from './stv/mobility.js';
+import jointstudies from "./stv/jointstudies.js";
 
 export default {
 	verband,
@@ -24,6 +25,7 @@ export default {
 	abschlusspruefung,
 	grades,
 	mobility,
+	jointstudies,
 	configStudent() {
 		return this.$fhcApi.get('api/frontend/v1/stv/config/student');
 	},
diff --git a/public/js/api/stv/jointstudies.js b/public/js/api/stv/jointstudies.js
new file mode 100644
index 000000000..b550852df
--- /dev/null
+++ b/public/js/api/stv/jointstudies.js
@@ -0,0 +1,33 @@
+export default {
+	getStudies(url, config, params) {
+		return this.$fhcApi.get('api/frontend/v1/stv/GemeinsameStudien/getStudien/' + params.id);
+	},
+	getTypenMobility(){
+		return this.$fhcApi.get('api/frontend/v1/stv/GemeinsameStudien/getTypenMobility/');
+	},
+	getStudiensemester(){
+		return this.$fhcApi.get('api/frontend/v1/stv/GemeinsameStudien/getStudiensemester/');
+	},
+	getStudyprograms(){
+		return this.$fhcApi.get('api/frontend/v1/stv/GemeinsameStudien/getStudienprogramme/');
+	},
+	getListPartner(){
+		return this.$fhcApi.get('api/frontend/v1/stv/GemeinsameStudien/getPartnerfirmen/');
+	},
+	getStatiPrestudent(){
+		return this.$fhcApi.get('api/frontend/v1/stv/GemeinsameStudien/getStatiPrestudent/');
+	},
+	loadStudy(id){
+		return this.$fhcApi.get('api/frontend/v1/stv/GemeinsameStudien/loadStudie/' + id);
+	},
+	insertStudy(form, data){
+		return this.$fhcApi.post(form,'api/frontend/v1/stv/GemeinsameStudien/insertStudie/', data);
+	},
+	updateStudy(form, data){
+		return this.$fhcApi.post(form,'api/frontend/v1/stv/GemeinsameStudien/updateStudie/', data);
+	},
+	deleteStudy(id){
+		return this.$fhcApi.post('api/frontend/v1/stv/GemeinsameStudien/deleteStudie/' + id);
+	},
+
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/JointStudies.js b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies.js
new file mode 100644
index 000000000..e80ae34f6
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies.js
@@ -0,0 +1,16 @@
+import TblJointStudies from "./JointStudies/JointStudies.js";
+
+export default {
+	name: 'Tab_JointStudies',
+	components: {
+		TblJointStudies
+	},
+	props: {
+		modelValue: Object,
+	},
+	template: `
+	<div class="stv-details-jointstudies h-100">
+		<tbl-joint-studies :student="modelValue"></tbl-joint-studies>
+	</div>
+	`
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
new file mode 100644
index 000000000..1c75486de
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
@@ -0,0 +1,467 @@
+import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+import BsModal from "../../../../Bootstrap/Modal.js";
+import FormForm from "../../../../Form/Form.js";
+import FormInput from "../../../../Form/Input.js";
+
+export default {
+	name: 'Tbl_JointStudies',
+	components: {
+		CoreFilterCmpt,
+		BsModal,
+		FormForm,
+		FormInput,
+	},
+	inject: {
+		currentSemester: {
+			from: 'currentSemester',
+		},
+	},
+	props: {
+		student: Object
+	},
+	data(){
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: this.$fhcApi.factory.stv.jointstudies.getStudies,
+				ajaxParams: () => {
+					return {
+						id: this.student.prestudent_id
+					};
+				},
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "mobilitaet_id", field: "mobilitaet_id", visible: false},
+					{title: "StSem", field: "studiensemester_kurzbz"},
+					//	{title: "mobilitaetstyp_kurzbz", field: "mobilitaetstyp_kurzbz"},
+					{title: "kurzbz", field: "kurzbz"},
+					{title: "prestudent_id", field: "prestudent_id", visible: false},
+					{title: "Status", field: "status_kurzbz"},
+					{title: "Partner", field: "partner", visible: false},
+					{title: "Sem", field: "ausbildungssemester"},
+					{title: "gsprogrammtyp_kurzbz", field: "gsprogrammtyp_kurzbz"},
+					{title: "studienprogramm", field: "studienprogramm", visible: false},
+					{title: "insertvon", field: "insertvon", visible: false},
+					{
+						title: "insertamum", field: "insertamum",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+							});
+						},
+						visible: false
+					},
+					{title: "updatevon", field: "updatevon", visible: false},
+					{
+						title: "updateamum", field: "updateamum",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+							});
+						},
+						visible: false
+					},
+					{
+						title: 'Aktionen',
+						field: 'actions',
+						minWidth: 150,
+						maxWidth: 150,
+						formatter: (cell, formatterParams, onRendered) => {
+							let container = document.createElement('div');
+							container.className = "d-flex gap-2";
+
+							let button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-copy"></i>';
+							button.title = this.$p.t('exam', 'newFromOld_studies');
+							button.addEventListener(
+								'click',
+								(event) =>
+									this.actionNewFromOldJointStudy(cell.getData().mobilitaet_id)
+							);
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-edit"></i>';
+							button.title = this.$p.t('exam', 'edit_studies');
+							button.addEventListener(
+								'click',
+								(event) =>
+									this.actionEditJointStudy(cell.getData().mobilitaet_id)
+							);
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-xmark"></i>';
+							button.title = this.$p.t('exam', 'delete_studies');
+							button.addEventListener(
+								'click',
+								() =>
+									this.actionDeleteJointStudy(cell.getData().mobilitaet_id)
+							);
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					},
+				],
+			},
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async() => {
+						await this.$p.loadCategory(['global', 'jointstudies', 'ui', 'lehre', 'mobility']);
+
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('mobilitaet_id').component.updateDefinition({
+							title: this.$p.t('global', 'mobilitaet_id')
+						});
+/*						cm.getColumnByField('studiensemester_kurzbz').component.updateDefinition({
+							title: this.$p.t('lehre', 'studiensemester')
+						});*/
+						cm.getColumnByField('gsprogrammtyp_kurzbz').component.updateDefinition({
+							title: this.$p.t('global', 'typ')
+						});
+/*						cm.getColumnByField('ausbildungssemester').component.updateDefinition({
+							title: this.$p.t('lehre', 'semester')
+						});*/
+						cm.getColumnByField('prestudent_id').component.updateDefinition({
+							title: this.$p.t('global', 'prestudentID')
+						});
+						cm.getColumnByField('kurzbz').component.updateDefinition({
+							title: this.$p.t('mobility', 'mobilitaetsprogramm')
+						});
+						cm.getColumnByField('studienprogramm').component.updateDefinition({
+							title: this.$p.t('jointstudies', 'studienprogramm')
+						});
+						cm.getColumnByField('insertamum').component.updateDefinition({
+							title: this.$p.t('global', 'insertamum')
+						});
+						cm.getColumnByField('insertvon').component.updateDefinition({
+							title: this.$p.t('global', 'insertvon')
+						});
+						cm.getColumnByField('updateamum').component.updateDefinition({
+							title: this.$p.t('global', 'updateamum')
+						});
+						cm.getColumnByField('updatevon').component.updateDefinition({
+							title: this.$p.t('global', 'updatevon')
+						});
+
+/*						cm.getColumnByField('actions').component.updateDefinition({
+						title: this.$p.t('global', 'aktionen')
+						});*/
+					}
+				}
+			],
+			formData: {
+				mobilitaetstyp_kurzbz: "GS",
+				studiensemester_kurzbz: this.currentSemester,
+				status_kurzbz: 'Student',
+				mobilitaet_id: null
+			},
+			statusNew: true,
+			listTypenMobility: [],
+			listStudiensemester: [],
+			programsMobility: [],
+			listStudienprogramme: [],
+			listPartner: [],
+			statiPrestudent: [],
+		}
+	},
+	methods: {
+		actionDeleteJointStudy(mobilitaet_id) {
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? mobilitaet_id
+					: Promise.reject({handled: true}))
+				.then(this.deleteJointStudy)
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		actionEditJointStudy(mobilitaet_id) {
+			this.resetForm();
+			this.statusNew = false;
+			this.loadJointStudy(mobilitaet_id);
+			this.$refs.jointstudyModal.show();
+		},
+		actionNewFromOldJointStudy(mobilitaet_id) {
+			this.resetForm();
+			this.loadJointStudy(mobilitaet_id);
+			this.statusNew = true;
+			this.$refs.jointstudyModal.show();
+		},
+		actionNewJointStudy() {
+			this.resetForm();
+			this.statusNew = true;
+			this.$refs.jointstudyModal.show();
+		},
+		addNewJointStudy() {
+			const data = {
+				prestudent_id: this.student.prestudent_id,
+				formData: this.formData
+			};
+			return this.$fhcApi.factory.stv.jointstudies.insertStudy(this.$refs.formJointStudies, data)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.hideModal("jointstudyModal");
+					this.resetForm();
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		updateJointStudy() {
+			const data = {
+				prestudent_id: this.student.prestudent_id,
+				formData: this.formData
+			};
+			return this.$fhcApi.factory.stv.jointstudies.updateStudy(this.$refs.formJointStudies, data)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.hideModal("jointstudyModal");
+					this.resetForm();
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		loadJointStudy(mobilitaet_id) {
+			return this.$fhcApi.factory.stv.jointstudies.loadStudy(mobilitaet_id)
+				.then(result => {
+					this.formData = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		deleteJointStudy(mobilitaet_id) {
+			return this.$fhcApi.factory.stv.jointstudies.deleteStudy(mobilitaet_id)
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		hideModal(modalRef){
+			this.$refs[modalRef].hide();
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+		},
+		resetForm() {
+			this.formData = {};
+			this.formData.mobilitaetstyp_kurzbz = "GS";
+			this.formData.status_kurzbz = 'Student';
+			this.formData.studiensemester_kurzbz = this.currentSemester;
+			this.formData.prestudent_id = this.student.prestudent_id;
+		}
+	},
+	created(){
+		this.$fhcApi.factory.stv.jointstudies.getTypenMobility()
+			.then(result => {
+				this.listTypenMobility = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		this.$fhcApi.factory.stv.jointstudies.getStudiensemester()
+			.then(result => {
+				this.listStudiensemester = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		this.$fhcApi.factory.stv.mobility.getProgramsMobility()
+			.then(result => {
+				this.programsMobility = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		this.$fhcApi.factory.stv.jointstudies.getStudyprograms()
+			.then(result => {
+				this.listStudienprogramme = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		this.$fhcApi.factory.stv.jointstudies.getListPartner()
+			.then(result => {
+				this.listPartner = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		this.$fhcApi.factory.stv.jointstudies.getStatiPrestudent()
+			.then(result => {
+				this.statiPrestudent = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+	},
+	template: `
+	<div class="stv-details-jointstudies-table h-100 pb-3">
+		<h4>{{$p.t('jointstudies', 'gemeinsameStudien')}}</h4>
+
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+			new-btn-show
+			:new-btn-label="this.$p.t('jointstudies', 'gemeinsamesStudium')"
+			@click:new="actionNewJointStudy"
+			>
+		</core-filter-cmpt>
+
+		<!--Modal: jointstudyModal-->
+		<bs-modal ref="jointstudyModal" dialog-class="modal-dialog-scrollable">
+			<template #title>
+				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('jointstudies', 'neuAnlegen')}}</p>
+				<p v-else class="fw-bold mt-3">{{$p.t('jointstudies', 'edit')}}</p>
+			</template>
+
+			<form-form ref="formJointStudies">
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-jointstudy-mobilitaetstyp"
+						:label="$p.t('global', 'typ')"
+						type="select"
+						v-model="formData.mobilitaetstyp_kurzbz"
+						name="mobilitaetstyp_kurzbz"
+						disabled
+						>
+						<option
+							v-for="mob in listTypenMobility"
+							:key="mob.mobilitaetstyp_kurzbz"
+							:value="mob.mobilitaetstyp_kurzbz"
+							>
+							 {{mob.bezeichnung}}
+						</option>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-jointstudies-studiensemester"
+						:label="$p.t('lehre', 'studiensemester')"
+						type="select"
+						v-model="formData.studiensemester_kurzbz"
+						name="studiensemester_kurzbz"
+						>
+						<option
+							v-for="sem in listStudiensemester"
+							:key="sem.studiensemester_kurzbz"
+							:value="sem.studiensemester_kurzbz"
+							>
+							 {{sem.studiensemester_kurzbz}}
+						</option>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-jointstudies-partner"
+						:label="$p.t('mobility', 'mobilitaetsprogramm')"
+						type="select"
+						v-model="formData.mobilitaetsprogramm_code"
+						name="mobilitaetsprogramm_code"
+						>
+						<option
+							v-for="mob in programsMobility"
+							:key="mob.mobilitaetsprogramm_code"
+							:value="mob.mobilitaetsprogramm_code"
+							>
+							 {{mob.beschreibung}}
+						</option>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-jointstudies-studienprogramm"
+						:label="$p.t('jointstudies', 'studienprogramm')"
+						type="select"
+						v-model="formData.gsprogramm_id"
+						name="gsprogramm_id"
+						>
+						<option
+							v-for="prog in listStudienprogramme"
+							:key="prog.gsprogramm_id"
+							:value="prog.gsprogramm_id"
+							>
+							 {{prog.bezeichnung}}
+						</option>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-jointstudies-partner"
+						label="Partner"
+						type="select"
+						v-model="formData.firma_id"
+						name="firma_id"
+						>
+						<option
+							v-for="partner in listPartner"
+							:key="partner.firma_id"
+							:value="partner.firma_id"
+							>
+							 {{partner.name}}
+						</option>
+					</form-input>
+				</div>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-jointstudies-status"
+						label="Status"
+						type="select"
+						v-model="formData.status_kurzbz"
+						name="status_kurzbz"
+						>
+						<option
+							v-for="status in statiPrestudent"
+							:key="status.status_kurzbz"
+							:value="status.status_kurzbz"
+							>
+							 {{status.status_kurzbz}}
+						</option>
+					</form-input>
+				</div>
+				<div class="col-2 row mb-3">
+					<form-input
+						container-class="stv-details-jointstudies-ausbildungssemester"
+						:label="$p.t('lehre', 'ausbildungssemester')"
+						type="text"
+						v-model="formData.ausbildungssemester"
+						name="ausbildungssemester"
+						>
+					</form-input>
+				</div>
+
+			</form-form>
+
+			<template #footer>
+				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
+				<button v-if="statusNew" class="btn btn-primary" @click="addNewJointStudy()"> {{$p.t('ui', 'speichern')}}</button>
+				<button v-else class="btn btn-primary" @click="updateJointStudy(formData.mobilitaet_id)"> {{$p.t('ui', 'speichern')}}</button>
+			</template>
+
+		</bs-modal>
+
+	</div>
+	`
+}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index cd17215ee..81089fcd6 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41393,8 +41393,150 @@ and represent the current state of research on the topic. The prescribed citatio
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
 	// PROJEKTARBEITSBEURTEILUNG SS2025 ENDE ---------------------------------------------------------------------------
+	// FHC4 JOINT STUDIES START ----------------------------------------------------------------------------------------
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_jointstudies',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'GS',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Joint Studies',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'jointstudies',
+		'phrase' => 'gemeinsamesStudium',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gemeinsames Studium',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Joint Study',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'jointstudies',
+		'phrase' => 'gemeinsameStudien',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gemeinsame Studien',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Joint Studies',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'jointstudies',
+		'phrase' => 'studienprogramm',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studienprogramm',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Study Program',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'jointstudies',
+		'phrase' => 'neuAnlegen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gemeinsames Studium anlegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add Joint Study',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'jointstudies',
+		'phrase' => 'edit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gemeinsames Studium bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit Joint Study',
+				'description' => '',
+				'insertvon' => 'system',
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'mobilitaet_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mobilität ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Mobility Id',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// FHC4 JOINT STUDIES END   ----------------------------------------------------------------------------------------
 );
 
 

From 204ae75f5743596c77508556e2af81fb759e5f86 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 10 Apr 2025 11:23:39 +0200
Subject: [PATCH 103/572] refactor(Dashboard Widget Names): adds the name
 property to the components of the dashboard widgets

---
 public/js/components/DashboardWidget/Studiengang.js | 1 +
 public/js/components/DashboardWidget/Stundenplan.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/public/js/components/DashboardWidget/Studiengang.js b/public/js/components/DashboardWidget/Studiengang.js
index 2dd667538..c10d0c3f4 100644
--- a/public/js/components/DashboardWidget/Studiengang.js
+++ b/public/js/components/DashboardWidget/Studiengang.js
@@ -2,6 +2,7 @@ import AbstractWidget from './Abstract.js';
 import StudiengangInformation from '../Cis/Cms/StudiengangInformation/StudiengangInformation.js';
 
 export default {
+	name: "WidgetsStudiengang",
 	data(){
 		return {};
 	},
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 437f6a17f..f4961f962 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -7,6 +7,7 @@ import CalendarDate from '../../composables/CalendarDate.js';
 import moodleSvg from "../../helpers/moodleSVG.js"
 
 export default {
+	name: "WidgetsStundenplan",
 	mixins: [
 		Phrasen,
 		AbstractWidget

From 90ce3e0263301d21faaa2e0703c44fcc61cfbd77 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 11 Apr 2025 11:55:57 +0200
Subject: [PATCH 104/572] update(dashboard CSS): adds animation for pinned
 widgets and different cursor styles

---
 public/css/components/dashboard.css | 60 ++++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 47ce239ee..55cd9a8ed 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -11,6 +11,12 @@
 	cursor:pointer;
 }
 
+.draggedItem {
+	height: 100%;
+	width: 100%;
+	background-color:white;
+}
+
 .empty-tile-hover:hover {
 		background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-500 -500 1448 1512"><path fill="rgb(211, 211, 211)" d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zM200 344V280H136c-13.3 0-24-10.7-24-24s10.7-24 24-24h64V168c0-13.3 10.7-24 24-24s24 10.7 24 24v64h64c13.3 0 24 10.7 24 24s-10.7 24-24 24H248v64c0 13.3-10.7 24-24 24s-24-10.7-24-24z"/></svg>');
 }
@@ -61,6 +67,19 @@
 .cursor-nw-resize {
 	cursor: nw-resize;
 }
+
+.cursor-ew-resize {
+	cursor: ew-resize;
+}
+
+.cursor-ns-resize {
+	cursor: ns-resize;
+}
+
+.no-drag-drop {
+	cursor: not-allowed;
+}
+
 .cursor-move {
 	cursor: move;
 }
@@ -73,8 +92,9 @@
 	right:0;
 	bottom:0;
 	background-color:rgba(0, 100, 156);
-	border:1px dashed lightgray;
+	border:4px dashed lightgray;
 	z-index: 2;
+	opacity: 0.5;
 }
 
 .pin:hover{
@@ -84,3 +104,41 @@
 .pin[pinned]:hover{
 	color:rgb(153, 116, 116);
 }
+
+.section-info{
+	color: #00649c;
+	cursor:pointer;
+}
+
+.section-info:hover {
+	color: #005585;
+}
+
+.denied-dragging-animation {
+	animation: wiggle 0.5s linear;
+	color:red !important;
+}
+
+@keyframes wiggle {
+
+	0% {
+		transform: rotate(0deg);
+	}
+
+	25% {
+		transform: rotate(-30deg);
+	}
+
+	50% {
+		transform: rotate(0deg);
+	}
+
+	75% {
+		transform: rotate(30deg);
+	}
+
+	100% {
+		transform: rotate(0em);
+	}
+
+}
\ No newline at end of file

From a0a2ac41bf2fa21b01d4ddcad7308234991a3764 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 11 Apr 2025 12:00:38 +0200
Subject: [PATCH 105/572] refactor(Dashboard Grid): updates replace logic when
 moving widgets and fixes position detection between mousemove and mousedown

---
 public/js/components/Dashboard/Item.js    | 43 ++++++++++++++++++----
 public/js/components/Dashboard/Section.js | 25 ++++++++++---
 public/js/components/Drop/Grid.js         | 44 +++++++++++++++++------
 public/js/components/Drop/Grid/Item.js    |  5 +++
 public/js/composables/GridLogic.js        | 41 +++++++++++----------
 5 files changed, 119 insertions(+), 39 deletions(-)

diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 33e614531..b7a334b92 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -40,15 +40,30 @@ export default {
 		"loading",
 		"item_data",
 		"place",
+		"setup",
 	],
 	computed: {
+		maxHeight(){
+			return this.setup?.height?.max;
+		},
+		maxWidth(){
+			if (Object.prototype.toString.call(this.setup?.width) == "[object Number]"){
+				return this.setup?.width;
+			}
+			return this.setup?.width?.max;
+		},
+		minHeight() {
+			return this.setup?.height?.min;
+		},
+		minWidth() {
+			return this.setup?.width?.min;
+		},
+		isResizeable(){
+			return this.maxWidth >1 || this.maxHeight >1;
+		},
 		isPinned(){
 			return this.place?.pinned ? true : false;
 		},
-		isResizeable() {
-			if (!this.widget) return false;
-			return this.widget.setup.width.max || this.widget.setup.height.max;
-		},
 		ready() {
 			return this.component && this.arguments !== null;
 		},
@@ -138,7 +153,7 @@ export default {
 			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 		</div>
 	</div>
-	<div v-else-if="!hidden || editMode" class="dashboard-item card overflow-hidden h-100 position-relative" :class="arguments && arguments.className ? arguments.className : ''">
+	<div v-else-if="!hidden || editMode" :id="widgetID" class="dashboard-item card overflow-hidden h-100 position-relative" :class="arguments && arguments.className ? arguments.className : ''">
 		<div v-if="widget" class="card-header d-flex ps-0 pe-2 align-items-center">
 			<Transition>
 				<span v-if="editMode && !isPinned" drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
@@ -188,8 +203,22 @@ export default {
 			</template>
 		</bs-modal>
 		<height-transition>
-			<div v-if="editMode && isResizeable && !isPinned" class="card-footer d-flex justify-content-end p-0">
-				<span drag-action="resize" class="col-auto px-1 cursor-nw-resize"><i class="fa-solid fa-up-right-and-down-left-from-center mirror-x"></i></span>
+			<div v-if="editMode && isResizeable && !isPinned " class="card-footer d-flex justify-content-end p-0">
+				<template v-if="maxWidth < 2">
+					<span drag-action="resize" class="col-auto px-1 cursor-ns-resize">
+						<i  class="fa-solid fa-up-down pe-2"></i>
+					</span>
+				</template>
+				<template v-else-if="maxHeight < 2">
+					<span drag-action="resize" class="col-auto px-1 cursor-ew-resize">
+						<i class="fa-solid fa-left-right pe-2"></i>
+					</span>
+				</template>
+				<template v-else>
+					<span drag-action="resize" class="col-auto px-1 cursor-nw-resize">
+						<i  class="fa-solid fa-up-right-and-down-left-from-center mirror-x"></i>
+					</span>
+				</template>
 			</div>
 		</height-transition>
 	</div>`,
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 44fac5550..eb37009ae 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -1,4 +1,5 @@
 import BsConfirm from "../Bootstrap/Confirm.js";
+import SectionModal from "../Bootstrap/Alert.js";
 import DropGrid from '../Drop/Grid.js'
 import DashboardItem from "./Item.js";
 import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
@@ -39,6 +40,7 @@ export default {
 			configOpened: false,
 			gridWidth: 1,
 			gridHeight: null,
+			draggedItem:null,
 		}
 	},
 	provide() {
@@ -50,6 +52,13 @@ export default {
 		}
 	},
 	computed: {
+		computedWidgetsSetup(){
+			if(!this.widgetsSetup) return {};
+			return this.widgetsSetup.reduce((acc, setup)=>{
+				acc[setup.widget_id] = setup.setup;
+				return acc;
+			},{})
+		},
 		editModeIsActive() {
 			return (this.editMode || this.adminMode) && !this.configOpened	
 		},
@@ -81,6 +90,9 @@ export default {
 		
 	},
 	methods: {
+		showSectionInformation(){
+			SectionModal.popup(`this is the information for the section ${name}`);
+		},
 		handleConfigOpened() {
 			this.configOpened = true
 		},
@@ -173,12 +185,17 @@ export default {
 		});
 	},
 	template: `
+	<h4 v-if="items.length>0 && editMode" class=" mb-0">
+		<i @click="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>
+		{{name}}:
+	</h4>
 	<div class="dashboard-section position-relative pb-3 border-bottom" ref="container" :style="getSectionStyle">
-		<drop-grid v-model:cols="gridWidth" :items="items" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
+		<drop-grid v-model:cols="gridWidth" :items="items" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
-				
+				<div v-if="item.placeholder" class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
+				<div v-else-if="item.widgetid == draggedItem?.data.widgetid" class="draggedItem" ></div>
 				<dashboard-item 
-					v-if="!item.placeholder"
+					v-else
 					:id="item.widget"
 					:widgetID="item.id"
 					:width="item.w"
@@ -190,6 +207,7 @@ export default {
 					:hidden="item.hidden"
 					:editMode="editMode"
 					:place="item.place[gridWidth]"
+					:setup="computedWidgetsSetup[item.widget]"
 					@change="saveConfig($event, item)"
 					@remove="removeWidget(item, $event)"
 					@config-opened="handleConfigOpened"
@@ -197,7 +215,6 @@ export default {
 					@pinItem="updatePositions($event,true)"
 					@unPinItem="updatePositions">
 				</dashboard-item>
-				<div v-else class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
 				
 			</template>
 			
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index b69973294..b73cca9ef 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -6,6 +6,7 @@ import GridLogic from '../../composables/GridLogic.js';
 const MODE_IDLE = 0;
 const MODE_MOVE = 1;
 const MODE_RESIZE = 2;
+const MODE_MOUSE_DOWN = 3;
 
 export default {
 	name: 'Grid',
@@ -29,6 +30,7 @@ export default {
 		"rearrangeItems",
 		"newItem",
 		"gridHeight",
+		"draggedItem",
 	],
 	data() {
 		return {
@@ -45,7 +47,6 @@ export default {
 			draggedOffset: [0,0],
 			draggedItem: null,
 			draggedNode: null,
-			draggedItemIcon: null,
 			additionalRow: null,
 			reorderedItems:[],
 			clonedWidget:null,
@@ -377,11 +378,13 @@ export default {
 				return;
 			
 			this.mode = MODE_MOVE;
+			
 			this.draggedItem = item;
+			this.$emit('draggedItem',item);
 			this.draggedNode = evt.target;
 			//clones the widget for the drag Image
 			let clone = evt.target.cloneNode(true);
-			clone.style.zIndex = 20;
+			clone.style.zIndex = 5;
 			clone.classList.add("widgetClone");
 			this.$refs.container.appendChild(clone);
 			this.clonedWidget = clone;
@@ -400,6 +403,7 @@ export default {
 			if (!this.active)
 				return this.dragCancel();
 			
+			this.checkPinnedWidgetAnimation();
 			if (this.updateCursor(evt)) {
 				switch(this.mode) {
 					case MODE_MOVE: {
@@ -442,14 +446,9 @@ export default {
 			this.positionUpdates = null;
 			this.draggedOffset = [0,0],
 			this.draggedItem = null;
+			this.$emit('draggedItem',null);
 			this.draggedNode = null;
 			
-			if(this.draggedItemIcon){
-				this.draggedItemIcon.style.top = '-999px';
-				this.draggedItemIcon.style.left = '-999px';
-				this.draggedItemIcon = null;
-			}
-			
 		},
 		dragEnd() {
 			let widgetClones = document.getElementsByClassName("widgetClone");
@@ -486,11 +485,33 @@ export default {
 			this.$emit('newItem', this.x, this.y);
 		},
 		updateCursorOnMouseMove(evt){
-			if(this.mode == MODE_IDLE)
+			if(this.mode == MODE_IDLE){
 				this.updateCursor(evt);
-		}
+			}
+		},
+		checkPinnedWidgetAnimation(){
+			let itemAtPosition = this.items.filter(item => item.x == this.x && item.y == this.y).pop();
+			if (itemAtPosition && itemAtPosition.place[this.cols] && itemAtPosition.place[this.cols].pinned) {
+				let pinnedWidget = document.getElementById(itemAtPosition.widgetid);
+				let test = pinnedWidget.querySelector("[pinned='true']");
+				if (!test.classList.contains("denied-dragging-animation")) {
+					test.classList.add("denied-dragging-animation");
+				}
+			} else {
+				Array.from(document.getElementsByClassName("denied-dragging-animation"))?.forEach(ele => {
+					ele.classList.remove("denied-dragging-animation");
+				})
+			}
+		},
+		mouseDown(){
+			this.mode = MODE_MOUSE_DOWN;
+		},
+		mouseUp() {
+			this.mode = MODE_IDLE;
+		},
 	},
 	template: `
+	<p style="position:fixed; top:200px; left:300px; z-index:200;">{{x}}-{{y}}</p>
 	<div
 		ref="container"
 		class="drop-grid position-relative h-0"
@@ -503,10 +524,13 @@ export default {
 		@mouseleave="mouseLeave">
 		<TransitionGroup tag="div">
 			<grid-item
+				ref="gridItems"
 				v-for="(item,index) in (mode == 0 && active ? placedItems_withPlaceholders : placedItems)"
 				:key="item.data.id"
 				:item="item"
 				@start-move="startMove"
+				@mouse-down="mouseDown"
+				@mouse-up="mouseUp"
 				@start-resize="startResize"
 				@dragging="dragging"
 				@end-drag="dragCancel"
diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index c677dba79..b8acf3044 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -1,4 +1,5 @@
 export default {
+	name:'GridItem',
 	components: {
 	},
 	inject: {
@@ -8,6 +9,8 @@ export default {
 		active: Boolean
 	},
 	emits: [
+		"mouseDown",
+		"mouseUp",
 		"startMove",
 		"startResize",
 		"dragging",
@@ -26,6 +29,7 @@ export default {
 	},
 	methods: {
 		registerDragAction(evt) {
+			this.$emit('mouseDown', evt);
 			if (evt.target.hasAttribute('drag-action')) {
 				this.dragAction = evt.target.getAttribute('drag-action');
 			} else {
@@ -64,6 +68,7 @@ export default {
 	template: `
 	<div class="drop-grid-item"
 		@mousedown="registerDragAction"
+		@mouseup="$emit('mouseUp', $event)"
 		@touchstart.prevent="touchStart"
 		@touchend="touchDragEnd"
 		@dragstart="tryDragStart($event, item)"
diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index fae9a082d..ed060e123 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -96,7 +96,7 @@ class GridLogic {
 		}
 	}
 	move(item, x, y) {
-		if (item.data.place[this.w].pinned)
+		if (item.data.place[this.w]?.pinned)
 			return [];
 		if (item.x == x && item.y == y)
 			return [];
@@ -116,6 +116,8 @@ class GridLogic {
 				prefer = DIR_RIGHT;
 		}
 
+		const originalFrame = [...item.frame];
+
 		const currItem = {...item};
 		currItem.x = x;
 		currItem.y = y;
@@ -123,27 +125,27 @@ class GridLogic {
 		let occupiers = this.getItemsInFrame(currItem.frame);
 		
 		// does not update if the target conatins pinned widgets
-		if (occupiers.some(frame => this.data[frame]?.data.place[this.w].pinned)) {
+		if (occupiers.some(frame => this.data[frame]?.data.place[this.w]?.pinned)) {
 			return [];
 		}
 		
 		// checks if target contains widget with the same high and width
-		let replace = occupiers
-					.map(occupier => this.data[occupier])
-					.filter( occupier => {
-						return occupier.data.w == item.w && occupier.data.h == item.h
-					});
-		
-		// replaces positions of widget and target widget if they have same height and width
-		if(replace.length > 0){
-			let replaceUpdate =[];
-			replaceUpdate[replace[0].index] = { index: replace[0].index, x:item.x, y:item.y };
-			replaceUpdate[item.index] = { index: item.index, x: replace[0].x, y: replace[0].y};
-			//update Grid and dataGrid 
-			replace[0].frame.forEach(f => this.grid[f] = item.index)
-			item.frame.forEach(f => this.grid[f] = replace[0].index);
-			this.data[replace[0].index] = item;
-			this.data[item.index] = replace[0];
+		let occupiersData = occupiers.map(occupier => this.data[occupier]);
+		let occupiersFrame = occupiersData.map(occupier => occupier.frame).flat();
+		if (!occupiersFrame.some(frame => !currItem.frame.includes(frame)) && !occupiersFrame.some(frame => originalFrame.includes(frame))){
+			let replaceUpdate = [];
+			let newOccupierFrames = [];
+			for(let f of originalFrame){
+				if(newOccupierFrames.includes(f)){
+					continue;
+				}
+				let occ = occupiersData.shift();
+				if(occ){
+					newOccupierFrames = [...newOccupierFrames, ...this.getItemFrame({ ...occ, ...this.getSingleFramePosition(f) })];
+					replaceUpdate[occ.index] = { index: occ.index, ...this.getSingleFramePosition(f)}
+				}
+			}
+			replaceUpdate[item.index] = { index: item.index, x, y };
 			return replaceUpdate;
 		}
 		
@@ -257,6 +259,9 @@ class GridLogic {
 				frame.push(i + item.x + (j + item.y) * this.w);
 		return frame;
 	}
+	getSingleFramePosition(frame){
+		return { x: frame % this.w, y: Math.floor(frame / this.w)};
+	}
 	debug() {
 		return this.grid;
 	}

From 59ebd33ba6860df99b4c129c3a81c589c42f667d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 14 Apr 2025 11:28:13 +0200
Subject: [PATCH 106/572] feature(Dashboard resize):adds overlays to the
 elements when resizing widgets on the dashboard

---
 public/js/components/Dashboard/Section.js |  2 +-
 public/js/components/Drop/Grid.js         | 28 +++++++++++++++++++----
 public/js/composables/GridLogic.js        |  3 ++-
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index eb37009ae..1631cadcd 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -193,7 +193,7 @@ export default {
 		<drop-grid v-model:cols="gridWidth" :items="items" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
 				<div v-if="item.placeholder" class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
-				<div v-else-if="item.widgetid == draggedItem?.data.widgetid" class="draggedItem" ></div>
+				<div v-else-if="item.blank || item.widgetid == draggedItem?.data.widgetid" :class="{'dashboard-item-overlay':item.resizeOverlay}" class="dashboard-item card overflow-hidden h-100 position-relative draggedItem" ></div>
 				<dashboard-item 
 					v-else
 					:id="item.widget"
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index b73cca9ef..65564c3bb 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -168,19 +168,39 @@ export default {
 		placedItems() {
 			if (!this.positionUpdates)
 				return this.prePlacedItems;
-			return this.prePlacedItems.map(item => {
+			let mappedPlacedItems= this.prePlacedItems.map(item => {
 				if (!this.positionUpdates[item.index] )
 					return item;
+				
+				let height_diff = this.positionUpdates[item.index]?.h - item.h;
+				let width_diff = this.positionUpdates[item.index]?.w - item.w;
 				return {
+					resize: this.positionUpdates[item.index]?.resize,
 					index: item.index,
 					weight: item.weight,
 					data: item.data,
 					x: this.positionUpdates[item.index].x === undefined ? item.x : this.positionUpdates[item.index].x,
 					y: this.positionUpdates[item.index].y === undefined ? item.y : this.positionUpdates[item.index].y,
-					w: this.positionUpdates[item.index].w === undefined ? item.w : this.positionUpdates[item.index].w,
-					h: this.positionUpdates[item.index].h === undefined ? item.h : this.positionUpdates[item.index].h
+					w: width_diff>0?item.w:this.positionUpdates[item.index].w === undefined ? item.w : this.positionUpdates[item.index].w,
+					h: height_diff > 0 ?item.h:this.positionUpdates[item.index].h === undefined ? item.h : this.positionUpdates[item.index].h
+					
 				};
 			});
+
+			let temporaryResizeItems = [];
+			mappedPlacedItems.forEach(item=>{
+				if(item.resize){
+					let newItem = {
+						...item,
+						w:this.positionUpdates[item.index].w === undefined ? item.w : this.positionUpdates[item.index].w,
+						h:this.positionUpdates[item.index].h === undefined ? item.h : this.positionUpdates[item.index].h,
+						resizeOverlay:true,
+						blank:true,
+					};
+					temporaryResizeItems.push(newItem)
+				}
+			})
+			return [...mappedPlacedItems, ...temporaryResizeItems];
 		},
 		showEmptyTileHover() {
 			if (!this.active || !this.grid || this.mode != MODE_IDLE || this.x < 0 || this.y < 0 || this.x >= this.cols || this.y >= this.rows)
@@ -422,7 +442,6 @@ export default {
 							this.draggedOffset[1] -= y;
 							y = 0;
 						}
-
 						this.positionUpdates = this.dragGrid.move(this.draggedItem, x, y);
 						break;
 					}
@@ -539,6 +558,7 @@ export default {
 				class="position-absolute"
 				:active="active"
 				:style="{
+					zIndex: item.resizeOverlay ? -5 : 'auto',
 					top: 'calc(' + item.y + ' * var(--fhc-dg-row-height))',
 					left: 'calc(' + item.x + ' * var(--fhc-dg-col-width))',
 					width: 'calc(' + item.w + ' * var(--fhc-dg-col-width))',
diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index ed060e123..d6b6d4723 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -164,7 +164,8 @@ class GridLogic {
 		currItem.frame = this.getItemFrame(currItem);
 		
 		const updates = this.add(currItem);
-		updates[item.index] = {index: item.index, w, h};
+		updates[item.index] = {index: item.index, w, h, resize:true};
+
 		return updates;
 	}
 	tryMoving(index, prefer) {

From 54bbfacf8680896a25d708a31a9248b871f18407 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 14 Apr 2025 11:42:03 +0200
Subject: [PATCH 107/572] remove(Dashboard debugging):removes a debugging print
 statment

---
 public/js/components/Drop/Grid.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 65564c3bb..4df29b8ba 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -530,7 +530,6 @@ export default {
 		},
 	},
 	template: `
-	<p style="position:fixed; top:200px; left:300px; z-index:200;">{{x}}-{{y}}</p>
 	<div
 		ref="container"
 		class="drop-grid position-relative h-0"

From d4ae8b0f91457163c6cde152fed48f24a17ce527 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 14 Apr 2025 14:33:49 +0200
Subject: [PATCH 108/572] fix(Dashboard Grid Height): a bug was removed where
 the grid height was not correct when adding a new widget and the widget was
 not correctly displayed when adding a new widget

---
 public/js/components/Dashboard/Section.js |  2 +-
 public/js/components/Drop/Grid.js         | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 1631cadcd..b14047148 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -193,7 +193,7 @@ export default {
 		<drop-grid v-model:cols="gridWidth" :items="items" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
 				<div v-if="item.placeholder" class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
-				<div v-else-if="item.blank || item.widgetid == draggedItem?.data.widgetid" :class="{'dashboard-item-overlay':item.resizeOverlay}" class="dashboard-item card overflow-hidden h-100 position-relative draggedItem" ></div>
+				<div v-else-if="item.blank || (item.widgetid && item.widgetid == draggedItem?.data.widgetid)" :class="{'dashboard-item-overlay':item.resizeOverlay}" class="dashboard-item card overflow-hidden h-100 position-relative draggedItem" ></div>
 				<dashboard-item 
 					v-else
 					:id="item.widget"
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 4df29b8ba..d74211997 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -118,8 +118,9 @@ export default {
 			return [...this.placedItems, ...this.items_placeholders];
 		},
 		rows() {
-			if ((this.mode == MODE_MOVE || this.mode == MODE_RESIZE) && this.dragGrid)
+			if ((this.mode == MODE_MOVE || this.mode == MODE_RESIZE) && this.dragGrid){
 				return this.dragGrid.h;
+			}
 			return this.grid ? this.grid.h : 1;
 		},
 		gridStyle() {
@@ -171,7 +172,6 @@ export default {
 			let mappedPlacedItems= this.prePlacedItems.map(item => {
 				if (!this.positionUpdates[item.index] )
 					return item;
-				
 				let height_diff = this.positionUpdates[item.index]?.h - item.h;
 				let width_diff = this.positionUpdates[item.index]?.w - item.w;
 				return {
@@ -345,7 +345,10 @@ export default {
 				this.x = -1;
 				this.y = -1;
 				if (this.additionalRow !== null) {
-					this.grid.h = this.additionalRow;
+					let gridHeight = this.grid.getMaxY() + 1;
+					if(this.grid.h>gridHeight){
+						this.grid.h = gridHeight;
+					}
 					this.additionalRow = null;
 				}
 			}
@@ -376,11 +379,13 @@ export default {
 					this.additionalRow = this.grid.h;
 					this.grid.h += 1;
 				} else if (this.additionalRow !== null && gridY != this.rows - 1) {
-					this.grid.h = this.additionalRow;
+					let gridHeight = this.grid.getMaxY() + 1;
+					if(this.grid.h > gridHeight){
+						this.grid.h = gridHeight;
+					}
 					this.additionalRow = null;
 				}
 			}
-			
 			this.x = gridX;
 			this.y = gridY;
 

From a25ccd79b26627a3e95ac7e896e459a8f0b29880 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 14 Apr 2025 14:46:11 +0200
Subject: [PATCH 109/572] fix(Dashboard New Widget Not Draggable): adds the
 widgetid property to newly created widgets if it is not already present

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

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index b14047148..8c2826f0c 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -82,6 +82,9 @@ export default {
 			} */
 			
 			let placedItems = this.widgets.map(item => {
+				if(!item?.widgetid && item?.id){
+					item.widgetid = item.id;
+				}
 				return { ...item, reorder: false, ...(item.place[this.gridWidth] || { reorder: true, ...{ x: 0, y: 0, w: 1, h: 1 } })};
 			});
 			return placedItems;

From 88c4a04aea3cd187ffd23a6c134b19147181b300 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 14 Apr 2025 14:57:14 +0200
Subject: [PATCH 110/572] fix(Dashboard widget resize position): when resizing
 an widget without saved position it would save it with x:0 and y:0

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

diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index d6b6d4723..4fb4f847f 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -164,7 +164,7 @@ class GridLogic {
 		currItem.frame = this.getItemFrame(currItem);
 		
 		const updates = this.add(currItem);
-		updates[item.index] = {index: item.index, w, h, resize:true};
+		updates[item.index] = {index: item.index, w, h, x:item.x, y:item.y, resize:true};
 
 		return updates;
 	}

From fc0a09180a4a8a5d0f6384e496743a237f79258b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 15 Apr 2025 11:16:20 +0200
Subject: [PATCH 111/572] update(Dashboard pinned animation): also triggers the
 pinned animation when the target area of a drag action contains a pinned
 widget

---
 public/js/components/Drop/Grid.js  | 42 +++++++++++++++++++++---------
 public/js/composables/GridLogic.js |  3 ++-
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index d74211997..f5572c639 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -427,7 +427,6 @@ export default {
 		dragOver(evt) {
 			if (!this.active)
 				return this.dragCancel();
-			
 			this.checkPinnedWidgetAnimation();
 			if (this.updateCursor(evt)) {
 				switch(this.mode) {
@@ -514,18 +513,37 @@ export default {
 			}
 		},
 		checkPinnedWidgetAnimation(){
-			let itemAtPosition = this.items.filter(item => item.x == this.x && item.y == this.y).pop();
-			if (itemAtPosition && itemAtPosition.place[this.cols] && itemAtPosition.place[this.cols].pinned) {
-				let pinnedWidget = document.getElementById(itemAtPosition.widgetid);
-				let test = pinnedWidget.querySelector("[pinned='true']");
-				if (!test.classList.contains("denied-dragging-animation")) {
-					test.classList.add("denied-dragging-animation");
-				}
-			} else {
-				Array.from(document.getElementsByClassName("denied-dragging-animation"))?.forEach(ele => {
-					ele.classList.remove("denied-dragging-animation");
-				})
+			let itemAtPosition=[];
+			switch(this.mode){
+				case MODE_RESIZE:
+					for (let x = this.draggedItem.x; x <= this.x; x++) {
+						for (let y = this.draggedItem.y; y <= this.y; y++) {
+							this.items.forEach(item => {
+								if (item.x == x && item.y == y) {
+									itemAtPosition.push(item);
+								}
+							});
+						}
+					}
+					break;
+				case MODE_MOVE:
+					itemAtPosition = this.items.filter(item=>item.x == this.x && item.y == this.y);
+					break;
 			}
+			
+			Array.from(document.getElementsByClassName("denied-dragging-animation"))?.forEach(ele => {
+				ele.classList.remove("denied-dragging-animation");
+			})
+			
+			itemAtPosition.forEach(item=>{
+				if (item.place[this.cols] && item.place[this.cols].pinned) {
+					let pinnedWidget = document.getElementById(item.widgetid);
+					let pinNode = pinnedWidget.querySelector("[pinned='true']");
+					if (!pinNode.classList.contains("denied-dragging-animation")) {
+						pinNode.classList.add("denied-dragging-animation");
+					}
+				}	
+			})
 		},
 		mouseDown(){
 			this.mode = MODE_MOUSE_DOWN;
diff --git a/public/js/composables/GridLogic.js b/public/js/composables/GridLogic.js
index 4fb4f847f..93c662eb5 100644
--- a/public/js/composables/GridLogic.js
+++ b/public/js/composables/GridLogic.js
@@ -164,7 +164,8 @@ class GridLogic {
 		currItem.frame = this.getItemFrame(currItem);
 		
 		const updates = this.add(currItem);
-		updates[item.index] = {index: item.index, w, h, x:item.x, y:item.y, resize:true};
+		if(updates)
+			updates[item.index] = {index: item.index, w, h, x:item.x, y:item.y, resize:true};
 
 		return updates;
 	}

From 19f169aca2349e28ebe8d7c10b1b8fe422379b86 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 15 Apr 2025 13:55:02 +0200
Subject: [PATCH 112/572] feature(Dashboard Grid): adds a red border to the
 widget if the user tries to resize the widget over its max width/height or
 under its min width/height

---
 public/js/components/Dashboard/Section.js |  2 +-
 public/js/components/Drop/Grid.js         | 51 +++++++++++++++++++++--
 2 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 8c2826f0c..4a2a4eaaa 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -193,7 +193,7 @@ export default {
 		{{name}}:
 	</h4>
 	<div class="dashboard-section position-relative pb-3 border-bottom" ref="container" :style="getSectionStyle">
-		<drop-grid v-model:cols="gridWidth" :items="items" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
+		<drop-grid v-model:cols="gridWidth" :items="items" :itemsSetup="computedWidgetsSetup" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
 				<div v-if="item.placeholder" class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
 				<div v-else-if="item.blank || (item.widgetid && item.widgetid == draggedItem?.data.widgetid)" :class="{'dashboard-item-overlay':item.resizeOverlay}" class="dashboard-item card overflow-hidden h-100 position-relative draggedItem" ></div>
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index f5572c639..4b4b181d3 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -16,6 +16,7 @@ export default {
 	props: {
 		cols: Number,
 		items: Array,
+		itemsSetup: Object,
 		resizeLimit: Function,
 		active: {
 			type: Boolean,
@@ -404,6 +405,7 @@ export default {
 			
 			this.mode = MODE_MOVE;
 			
+			this.grid.h += 1;
 			this.draggedItem = item;
 			this.$emit('draggedItem',item);
 			this.draggedNode = evt.target;
@@ -425,9 +427,19 @@ export default {
 			this._dragStart(evt);
 		},
 		dragOver(evt) {
+			if ((this.y + 1) > this.grid?.h && this.mode == MODE_MOVE) {
+				this.positionUpdates = this.positionUpdates.filter(item => {
+					return item.widgetid == this.draggedItem.data.widgetid;
+				})
+				this.dragEnd();
+				this.dragCancel();
+			}
 			if (!this.active)
 				return this.dragCancel();
 			this.checkPinnedWidgetAnimation();
+			if(this.mode == MODE_RESIZE){
+				this.checkWidgetSizeLimitAnimation();
+			}
 			if (this.updateCursor(evt)) {
 				switch(this.mode) {
 					case MODE_MOVE: {
@@ -463,7 +475,6 @@ export default {
 			}
 		},
 		dragCancel() {
-			
 			this.toggleDraggedItemOverlay(false);
 			this.mode = MODE_IDLE;
 			this.positionUpdates = null;
@@ -474,12 +485,19 @@ export default {
 			
 		},
 		dragEnd() {
+			if (this.mode == MODE_IDLE)
+				return;
+			// clean up unused classes
+			let draggedItemNode = document.getElementById(this.draggedItem.data.widgetid);
+			draggedItemNode.classList.remove("border-danger");
+			Array.from(document.getElementsByClassName("denied-dragging-animation"))?.forEach(ele => {
+				ele.classList.remove("denied-dragging-animation");
+			})
 			let widgetClones = document.getElementsByClassName("widgetClone");
 			for(let widget of widgetClones){
 				this.$refs.container.removeChild(widget);
 			}
-			if (this.mode == MODE_IDLE)
-				return;
+			
 			if (!this.active || this.x < 0 || this.y < 0 || this.x >= this.cols)
 				return this.dragCancel();
 			this.mode = MODE_IDLE;
@@ -534,7 +552,7 @@ export default {
 			Array.from(document.getElementsByClassName("denied-dragging-animation"))?.forEach(ele => {
 				ele.classList.remove("denied-dragging-animation");
 			})
-			
+
 			itemAtPosition.forEach(item=>{
 				if (item.place[this.cols] && item.place[this.cols].pinned) {
 					let pinnedWidget = document.getElementById(item.widgetid);
@@ -545,6 +563,31 @@ export default {
 				}	
 			})
 		},
+		checkWidgetSizeLimitAnimation() {
+
+			let draggedItemSetup = this.itemsSetup[this.draggedItem.data.widget];
+			let draggedItemMaxWidth = draggedItemSetup.width.max ?? draggedItemSetup.width;
+			let draggedItemMinWidth = draggedItemSetup.width.min ?? draggedItemSetup.width;
+			let draggedItemMaxHeight = draggedItemSetup.height.max ?? draggedItemSetup.height;
+			let draggedItemMinHeight = draggedItemSetup.height.min ?? draggedItemSetup.height;
+			let draggedItemNode = document.getElementById(this.draggedItem.data.widgetid);
+
+			let width_after_resize = this.x - this.draggedItem.x + 1; 
+			let height_after_resize = this.y - this.draggedItem.y + 1; 
+			if(  
+				(width_after_resize > 0 && (width_after_resize > draggedItemMaxWidth
+				|| width_after_resize < draggedItemMinWidth)
+				)
+				||
+				(height_after_resize > 0 && (height_after_resize > draggedItemMaxHeight
+				|| height_after_resize < draggedItemMinHeight)
+				)
+			){
+				draggedItemNode.classList.add("border-danger");
+			}else{
+				draggedItemNode.classList.remove("border-danger");
+			}
+		},
 		mouseDown(){
 			this.mode = MODE_MOUSE_DOWN;
 		},

From af30a3408cd3d6dfc462554ffdb6c3a48c90fa35 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 15 Apr 2025 14:22:39 +0200
Subject: [PATCH 113/572] add switch stundenplan, excel export, phrases

---
 .../api/frontend/v1/stv/LvTermine.php         | 408 ++++++++++++++++++
 .../api/frontend/v1/stv/Lvtermine.php         |  67 ---
 .../models/ressource/Stundenplan_model.php    | 124 +++++-
 public/css/Studentenverwaltung.css            |   4 +
 public/js/api/stv/courselist.js               |  13 +-
 .../ListLehrveranstaltungstermine.js          | 175 +++++++-
 system/phrasesupdate.php                      | 180 ++++++++
 7 files changed, 876 insertions(+), 95 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/LvTermine.php
 delete mode 100644 application/controllers/api/frontend/v1/stv/Lvtermine.php

diff --git a/application/controllers/api/frontend/v1/stv/LvTermine.php b/application/controllers/api/frontend/v1/stv/LvTermine.php
new file mode 100644
index 000000000..c29f56964
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/LvTermine.php
@@ -0,0 +1,408 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class LvTermine extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getStundenplan' => ['admin:r', 'assistenz:r'],
+			'getStudiensemester' => ['admin:r', 'assistenz:r'],
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+		]);
+
+		// Load models
+		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		//query verwenden wie im Cis endpoint
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$this->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
+	}
+
+	//TODO Build own lib or combine with Controller Stundenplan.php
+	//here use of logic of Stundenplan.php, extended with parameters uid, grouping, and used dbTable
+	public function getStundenplan($uid, $start_date = null, $end_date = null, $groupConsecutiveHours = false, $dbStundenplanTable = "stundenplan")
+	{
+		$student_uid = $uid;
+		$semester_range = $this->studienSemesterErmitteln($start_date, $end_date);
+
+		$this->sortStudienSemester($semester_range);
+		$this->applyLoadUeberSemesterHaelfte($semester_range);
+
+		$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($semester_range, $student_uid);
+		$student_lehrverband = $this->fetchStudentlehrverbandFromStudiensemester($semester_range, $student_uid);
+
+		if(!$groupConsecutiveHours)
+			$stundenplan_query = $this->StundenplanModel->getStundenplanQuery(
+				$start_date,
+				$end_date,
+				$semester_range,
+				$benutzer_gruppen,
+				$student_lehrverband
+			);
+		else
+			$stundenplan_query = $this->StundenplanModel->getStundenplanQuery(
+				$start_date,
+				$end_date,
+				$semester_range,
+				$benutzer_gruppen,
+				$student_lehrverband,
+				true,
+				$dbStundenplanTable
+			);
+
+		if(!$stundenplan_query)
+		{
+			$this->terminateWithSuccess([]);
+		}
+
+		if($groupConsecutiveHours)
+		{
+			$stundenplan_data = $this->StundenplanModel->stundenplanGruppierungConsecutive($stundenplan_query);
+		}
+		else
+		{
+			$stundenplan_data = $this->StundenplanModel->stundenplanGruppierung($stundenplan_query);
+		}
+
+		$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
+		$this->terminateWithSuccess($stundenplan_data);
+
+		$this->expand_object_information($stundenplan_data);
+
+		$this->returnObj['$stundenplan_query'] = $stundenplan_query;
+		$this->returnObj['$student_lehrverband'] = $student_lehrverband;
+		$this->returnObj['$benutzer_gruppen'] = $benutzer_gruppen;
+		$this->terminateWithSuccess($stundenplan_data);
+	}
+
+	public function getStudiensemester()
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$this->StudiensemesterModel->addOrder('studienjahr_kurzbz', 'DESC');
+		$result = $this->StudiensemesterModel->load();
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	//copied from Stundenplan.php
+	private function studienSemesterErmitteln($start_date, $end_date)
+	{
+		// gets all studiensemester from the student from start_date to end_date
+		$semester_range = $this->StudiensemesterModel->getByDateRange($start_date, $end_date);
+		$semester_range = array_map(
+			function ($sem) {
+				return $sem->studiensemester_kurzbz;
+			},
+			$this->getDataOrTerminateWithError($semester_range)
+		);
+
+		// if no studiensemester is found for the given timespan, get the nearest studiensemester
+		if(count($semester_range) == 0)
+		{
+			$aktuelle_studiensemester = $this->StudiensemesterModel->getNearest();
+			$aktuelle_studiensemester = $this->getDataOrTerminateWithError($aktuelle_studiensemester);
+			if (count($aktuelle_studiensemester) == 0) {
+				$this->terminateWithError("No aktuelles semester");
+			}
+			$aktuelle_studiensemester = current($aktuelle_studiensemester)->studiensemester_kurzbz;
+			// push aktuelles semester in active semester array
+			array_push($semester_range, $aktuelle_studiensemester);
+		}
+		return $semester_range;
+	}
+
+	//copied from Stundenplan.php
+	private function sortStudienSemester(&$semester_range)
+	{
+		usort(
+			$semester_range,
+			function ($first, $second) {
+				$sem_first = null;
+				$year_first = null;
+				$match_first = null;
+
+				$sem_second = null;
+				$year_second = null;
+				$match_second = null;
+
+				preg_match('/([WS]+)([0-9]+)/', $first, $match_first);
+				preg_match('/([WS]+)([0-9]+)/', $second, $match_second);
+
+				$sem_first = $match_first[1];
+				$year_first = intval($match_first[2]);
+
+				$sem_second = $match_second[1];
+				$year_second = intval($match_second[2]);
+
+				if($year_first < $year_second)
+				{
+					return -1;
+				}
+				elseif($year_first > $year_second)
+				{
+					return 1;
+				}
+				elseif($year_first == $year_second && $sem_first > $sem_second)
+				{
+					return 1;
+				}
+				elseif($year_first == $year_second && $sem_first < $sem_second)
+				{
+					return -1;
+				}
+				return 0;
+			}
+		);
+	}
+
+	//copied from Stundenplan.php
+	private function applyLoadUeberSemesterHaelfte(&$semester_range)
+	{
+		/*
+		@var($semester_collection)
+		convert the array of studiensemester into an associative array with the studiensemester as the key
+		and the values of each key are the studiensemester needed for the query associated to that studiensemester
+		example:
+
+		#INPUT:
+		['WS2023','SS2024','WS2024']
+		#OUTPUT:
+		[
+			'WS2023' => ['SS2023','WS2023']
+			'SS2024' => ['WS2023','SS2024']
+			'WS2024' => ['SS2024','WS2024']
+		]
+		*/
+		$semester_collection = [];
+		foreach($semester_range as $studiensemester)
+		{
+			$previous_studiensemester = $this->StudiensemesterModel->getPreviousFrom($studiensemester);
+			$previous_studiensemester = $this->getDataOrTerminateWithError($previous_studiensemester);
+			if (count($previous_studiensemester) == 0) {
+				$this->terminateWithError("No previous semester");
+			}
+			$previous_studiensemester = current($previous_studiensemester)->studiensemester_kurzbz;
+			$semester_collection[$studiensemester] = [$previous_studiensemester, $studiensemester];
+		}
+
+		/*
+		@var($studienSemesterDateRanges)
+		fetches for each studiensemester the start and end date, (SS) summer studiensemester are extended by 1 month to cover the summerbreak
+		based on the LVPLAN_LOAD_UEBER_SEMESTERHAELFTE constant it will load both the semester and the previous semester with the full date range
+		or the semester with the full date range and the previous semester with the half date range:
+
+		#INPUT:
+		[
+			'WS2023' => ['SS2023','WS2023']
+			'SS2024' => ['WS2023','SS2024']
+			'WS2024' => ['SS2024','WS2024']
+		]
+		#OUTPUT: depends whether LVPLAN_LOAD_UEBER_SEMESTERHAELFTE is true or false
+		~ if LVPLAN_LOAD_UEBER_SEMESTERHAELFTE == true
+		[
+			"SS2024": [
+				"WS2023": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-08-31"
+				],
+				"SS2024": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-08-31"
+				]
+			]
+		]
+		~ if LVPLAN_LOAD_UEBER_SEMESTERHAELFTE == false
+		[
+			"SS2024": [
+				"WS2023": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-05-17"
+				],
+				"SS2024": [
+					"start"=> "2024-02-03",
+					"ende"=> "2024-08-31"
+				]
+			]
+		]
+		*/
+		$studienSemesterDateRanges=[];
+		foreach($semester_collection as $semester_original => $semester_adjoint)
+		{
+			$semester_start_ende = $this->StudiensemesterModel->getStartEndeFromStudiensemester($semester_original);
+			$semester_start_ende = current($this->getDataOrTerminateWithError($semester_start_ende));
+
+			// initialize empty arrays to add key value pairs
+			$studienSemesterDateRanges[$semester_original] = [];
+
+			// check if the studiensemester is a summer semester and add 1 month to bridge the school summer break
+			$match = null;
+			preg_match("/^(SS)([0-9]+)/", $semester_original, $match);
+			if(count($match) >0)
+			{
+				$one_month = new DateInterval('P1M');
+				$one_day = DateInterval::createFromDateString('1 days');
+				$summer_studiensemester_end_date = DateTime::createFromFormat('Y-m-d', $semester_start_ende->ende);
+				$summer_studiensemester_end_date->add($one_month);
+				$summer_studiensemester_end_date->sub($one_day);
+				$semester_start_ende->ende = date_format($summer_studiensemester_end_date, 'Y-m-d');
+			}
+			if (defined('LVPLAN_LOAD_UEBER_SEMESTERHAELFTE') && LVPLAN_LOAD_UEBER_SEMESTERHAELFTE === true)
+			{
+				foreach($semester_adjoint as $adjoint)
+				{
+					$studienSemesterDateRanges[$semester_original][$adjoint]=$semester_start_ende;
+				}
+			}
+			else
+			{
+				//TODO: half of a DateInterval might not be correctly calculated
+				// calculate the half of the studiensemester
+				$studiensemester_start_date = DateTime::createFromFormat('Y-m-d', $semester_start_ende->start);
+				$studiensemester_end_date = DateTime::createFromFormat('Y-m-d', $semester_start_ende->ende);
+				$studiensemester_time_difference = $studiensemester_start_date->diff($studiensemester_end_date);
+				$half_dateNumber = ceil($studiensemester_time_difference->d/2)+ceil(($studiensemester_time_difference->m*30)/2);
+				$half_dateInterval = new DateInterval('P'.strval($half_dateNumber) .'D');
+				$studiensemester_half = date_format($studiensemester_start_date->add($half_dateInterval), 'Y-m-d');
+
+				$first_half = new stdClass();
+				$first_half->start = $semester_start_ende->start;
+				$first_half->ende = $studiensemester_half;
+
+				$studienSemesterDateRanges[$semester_original][$semester_adjoint[0]] = $first_half;
+				$studienSemesterDateRanges[$semester_original][$semester_adjoint[1]] = $semester_start_ende;
+			}
+			$semester_range = $studienSemesterDateRanges;
+		}
+	}
+
+	//copied from Stundenplan.php, extended with $student_uid
+	private function fetchBenutzerGruppenFromStudiensemester($semester_range, $student_uid)
+	{
+		//$student_uid = getAuthUID();
+		$benutzer_gruppen = [];
+		// for each studiensemester fetch the benutzer gruppen and add them to an associate $bentuzer_gruppen array
+		/*
+		[
+			['WS2023'] => [['gruppe1_SS2023','gruppe2_SS2023'],['gruppe1_WS2023','gruppe2_WS2023']],
+			['SS2024'] => [['gruppe1_WS2023','gruppe2_WS2023'],['gruppe1_SS2024','gruppe2_SS2024']],
+			['WS2024'] => [['gruppe1_SS2024','gruppe2_SS2024'],['gruppe1_WS2024','gruppe2_WS2024']],
+		]
+		*/
+		foreach($semester_range as $semester_key => $semester_array)
+		{
+			$benutzer_gruppen[$semester_key] = [];
+			// each semester could have ajoint semesters that need to be checked
+			foreach($semester_array as $semester => $semester_date_range)
+			{
+				// for each active semester query the benutzer_gruppen associated to the semester
+				$benutzer_query = $this->BenutzergruppeModel->execReadOnlyQuery("
+				SELECT * FROM tbl_benutzergruppe where uid = ? AND studiensemester_kurzbz = ?", [$student_uid, $semester]);
+				$benutzer_query_result = $this->getDataOrTerminateWithError($benutzer_query);
+				array_push(
+					$benutzer_gruppen[$semester_key],
+					array_map(
+						function ($item) {
+							return "'".$item->gruppe_kurzbz. "'";
+						},
+						$benutzer_query_result
+					)
+				);
+			}
+		}
+
+		// merge the gruppen of each studiensemester together for the original studiensemester
+		/*
+		[
+			['WS2023'] => ['gruppe1_SS2023','gruppe2_SS2023','gruppe1_WS2023','gruppe2_WS2023'],
+			['SS2024'] => ['gruppe1_WS2023','gruppe2_WS2023','gruppe1_SS2024','gruppe2_SS2024'],
+			['WS2024'] => ['gruppe1_SS2024','gruppe2_SS2024','gruppe1_WS2024','gruppe2_WS2024'],
+		]
+		*/
+		$benutzer_gruppen = array_map(
+			function ($gruppe) {
+				$merged_gruppe = [];
+				foreach($gruppe as $gruppen_array)
+				{
+					$merged_gruppe = array_merge($merged_gruppe, $gruppen_array);
+				}
+				return $merged_gruppe;
+			},
+			$benutzer_gruppen
+		);
+
+		return $benutzer_gruppen;
+	}
+
+	//copied from Stundenplan.php, extended with $student_uid
+	private function fetchStudentlehrverbandFromStudiensemester($semester_range, $student_uid)
+	{
+		//$student_uid = getAuthUID();
+		$student_lehrverband = [];
+		// for each studiensemester fetch the studentlehrverbaende and add them to an associate $student_lehrverband array
+		/*
+		[
+			['WS2023'] => [ [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ] ],
+			['SS2024'] => [ [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ], [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ] ],
+			['WS2024'] => [ [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ], [ ['stg_kz'=>298,'semester'=>3,'verband'=>"A",'gruppe'=>""] ] ],
+		]
+		*/
+		foreach($semester_range as $semester_key => $semester_array)
+		{
+			$student_lehrverband[$semester_key] = [];
+			foreach($semester_array as $semester => $semester_date_range)
+			{
+				// for each active semester query the student_lehrverband associated to the semester
+				$lehrverband_query = $this->BenutzergruppeModel->execReadOnlyQuery("
+				SELECT * FROM tbl_studentlehrverband where student_uid = ? AND studiensemester_kurzbz = ?", [$student_uid, $semester]);
+				$lehrverband_query_result = $this->getDataOrTerminateWithError($lehrverband_query);
+				array_push($student_lehrverband[$semester_key], array_map(
+					function ($item) {
+						$result = new stdClass();
+						$result->studiengang_kz = $item->studiengang_kz;
+						$result->semester = $item->semester;
+						$result->verband = $item->verband;
+						$result->gruppe = $item->gruppe;
+						return $result;
+					},
+					$lehrverband_query_result));
+			}
+		}
+
+		// merge the studentlehrverband of each studiensemester together for the original studiensemester
+		/*
+		[
+			['WS2023'] => [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""] ],
+			['SS2024'] => [ ['stg_kz'=>298,'semester'=>1,'verband'=>"A",'gruppe'=>""], ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""] ],
+			['WS2024'] => [ ['stg_kz'=>298,'semester'=>2,'verband'=>"A",'gruppe'=>""], ['stg_kz'=>298,'semester'=>3,'verband'=>"A",'gruppe'=>""] ],
+		]
+		*/
+		$student_lehrverband = array_map(
+			function ($studentlehrverband) {
+				$merged_studentlehrverband = [];
+				foreach($studentlehrverband as $studentlehrverband_array)
+				{
+					$merged_studentlehrverband = array_merge($merged_studentlehrverband, $studentlehrverband_array);
+				}
+				return $merged_studentlehrverband;
+			},
+			$student_lehrverband
+		);
+
+		return $student_lehrverband;
+	}
+}
diff --git a/application/controllers/api/frontend/v1/stv/Lvtermine.php b/application/controllers/api/frontend/v1/stv/Lvtermine.php
deleted file mode 100644
index 17a529f85..000000000
--- a/application/controllers/api/frontend/v1/stv/Lvtermine.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class Lvtermine extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getStundenplan' => ['admin:r', 'assistenz:r'],
-			'getLvsStudent' => ['admin:r', 'assistenz:r'],
-		]);
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-		$this->load->library('form_validation');
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui',
-		]);
-
-		// Load models
-		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-	}
-
-	public function getStundenplan($uid)
-	{
-		//get stundenplan for uid
-		$result = $this->StundenplanModel->loadForUid($uid);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-
-	}
-
-	public function getLvsStudent($uid)
-	{
-		$authUID = getAuthUID();
-		//$this->terminateWithError('uid' . $uid, self::ERROR_TYPE_GENERAL);
-		//$this->terminateWithError('uid' . $authUID, self::ERROR_TYPE_GENERAL);
-
-		$this->load->model('system/Variable_model', 'VariableModel');
-		$result = $this->VariableModel->getVariables($authUID);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		//$this->terminateWithSuccess(current($data)); // WS2025
-
-		$this->load->model('ressource/Stunde_model', 'StundeModel');
-		$this->StundeModel->addOrder('stunde', 'ASC');
-		$result = $this->StundeModel->load();
-		$dataStunden = $this->getDataOrTerminateWithError($result);
-		$this->terminateWithSuccess($dataStunden);
-	//	$this->terminateWithSuccess(current($data));
-
-		//TODO(manu) check existing apis for liste stundenplan und lvs
-		// version for student
-		// version for lehrfaecherverteilung
-
-
-
-
-	}
-}
\ No newline at end of file
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 40498a766..ac20c96c3 100644
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -50,7 +50,6 @@ class Stundenplan_model extends DB_Model
 	 */
 	public function groupedCalendarEvents($ort_kurzbz,$start_date,$end_date){
 
-
 		$gruppierteEvents= $this->execReadOnlyQuery("
 		SELECT
 
@@ -186,6 +185,99 @@ class Stundenplan_model extends DB_Model
 		return $query_result;
 	}
 
+	/**
+	 * groups rows of a subquery that fetches data from the lehre.vw_stundenplan table or lehre.vw_stundenplandev
+	 * @param string $stundenplanViewQuery the subquery used to group the result regarding consecutive hours (Tab LV Termine)
+	 *
+	 * @return stdClass
+	 */
+	public function stundenplanGruppierungConsecutive($stundenplanViewQuery)
+	{
+		$query_result = $this->execReadOnlyQuery("
+			SELECT
+			  distinct lehrveranstaltung_id,
+			  datum,
+			  MIN(beginn) as beginn,
+			  MAX(ende) as ende,
+			  type,
+			  topic,
+			  gruppe,
+			  ort_kurzbz,
+			  lehreinheit_id,
+			  lehrfach_bez,
+			  lektor,
+			  lektorname,
+			  gruppen_kuerzel,
+			  farbe
+			FROM
+			  (
+				SELECT
+				'lehreinheit' as type, beginn, ende, datum,
+				CONCAT(lehrfach,'-',lehrform) as topic,
+				array_agg(DISTINCT lektor) as lektor,
+				array_agg(DISTINCT lektorname) as lektorname,
+				array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
+				array_agg(DISTINCT (gruppen_kuerzel)) as gruppen_kuerzel,
+				string_agg(DISTINCT ort_kurzbz, '/') as ort_kurzbz,
+				array_agg(DISTINCT lehreinheit_id) as lehreinheit_id,
+				titel, lehrfach, lehrform, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
+
+				FROM
+				(
+					SELECT unr,datum,beginn, ende,
+					CASE
+						WHEN sp.mitarbeiter_kurzbz IS NOT NULL THEN sp.mitarbeiter_kurzbz
+						ELSE lektor
+					END as lektor,
+					CASE
+						WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz
+						ELSE (SELECT UPPER(typ || kurzbz) 
+						      FROM public.tbl_studiengang 
+							  WHERE studiengang_kz=sp.studiengang_kz) || COALESCE(sp.semester,'0') || COALESCE(sp.verband,'') || COALESCE(sp.gruppe,'')
+					END as gruppen_kuerzel,
+					(SELECT bezeichnung
+					FROM public.tbl_organisationseinheit
+					WHERE oe_kurzbz IN(
+						SELECT oe_kurzbz
+						FROM lehre.tbl_lehrveranstaltung
+						WHERE lehrveranstaltung_id = sp.lehrveranstaltung_id
+					)) as organisationseinheit,
+					ort_kurzbz, studiengang_kz, titel,lehreinheit_id,lehrfach_id,sp.anmerkung,fix,lehrveranstaltung_id,
+					stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,
+					anmerkung_lehreinheit,gruppe, verband, semester,stg_kurzbz,
+					  CONCAT(p.nachname, ' ', p.vorname) as lektorname
+
+					FROM (".$stundenplanViewQuery.") sp
+					JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
+					LEFT JOIN public.tbl_benutzer bn ON bn.uid = sp.uid
+					LEFT JOIN public.tbl_person p ON p.person_id = bn.person_id
+				) as subquery
+
+			GROUP BY unr, datum, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, 
+			farbe, lehrveranstaltung_id
+
+			ORDER BY datum, beginn) t
+
+			GROUP BY
+			  lehrveranstaltung_id,
+			  type,
+			  datum,
+			  topic,
+			  lektor,
+			  lehrfach_bez,
+			  gruppe,
+			  ort_kurzbz,
+			  lehreinheit_id,
+			  lektorname,
+			  gruppen_kuerzel,
+			  farbe
+			ORDER BY
+			  datum, beginn
+			"
+		);
+		return $query_result;
+	}
+
 	/**
 	 * queries Stundenplan but for a whole lva, irrespective of who is requesting it
 	 * 
@@ -300,10 +392,13 @@ class Stundenplan_model extends DB_Model
 	/**
 	 * NO STANDALONE FUNCTION - Generates a SQL query string to fetch 'stundenplan' events for a specific student within the current semester.
 	 *
+	 * @param isLvList if condition needed for Tab LV Termine is given
+	 * @param db_stpl_table enables switch to db 'stundenplandev'
+	 *
 	 * @return mixed
 	 */
-	public function getStundenplanQuery($start_date, $end_date,$semester,$gruppen,$studentlehrverbaende){
-		
+	public function getStundenplanQuery($start_date, $end_date, $semester, $gruppen, $studentlehrverbaende, $isLvList=false, $db_stpl_table='stundenplan'){
+
 		// helper function to check if either $gruppen or $studentlehrverbaende are empty for each semester
 		$emptyCheck = function($toBeCheckedArray) use ($semester){
 			$result = true;
@@ -325,7 +420,7 @@ class Stundenplan_model extends DB_Model
 
 		$query =
 		"select sp.*
-		from lehre.vw_stundenplan sp
+		from lehre.vw_".$db_stpl_table." sp
 		WHERE
 		sp.datum >= ".$this->escape($start_date)."
 		AND sp.datum <= ".$this->escape($end_date);
@@ -335,10 +430,10 @@ class Stundenplan_model extends DB_Model
 		{
 			$query .= " AND ( ";
 		} 
-		
+
 		foreach($semester as $sem => $semester_date_range)
 		{
-			
+
 			foreach($semester_date_range as $sem_date => $sem_date_range)
 			{
 				// if there are not groups for the semester skip the iteration step
@@ -358,7 +453,13 @@ class Stundenplan_model extends DB_Model
 		{
 			$query = substr($query, 0, -2);
 		}
-		
+
+		//Condition for showLVList FHC4
+		if(!$isLvList)
+			$stringGroupLv =  "AND gruppe_kurzbz is null";
+		else
+			$stringGroupLv ="";
+
 		foreach($semester as $sem=>$semester_date_range)
 		{
 			foreach($semester_date_range as $sem_date => $sem_date_range)
@@ -373,10 +474,10 @@ class Stundenplan_model extends DB_Model
 					// Eintraege fuer den ganzen Verband
 					$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND (sp.gruppe is null OR sp.gruppe='') AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende).")";
 					// Eintraege fuer das ganze Semester
-					$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND (sp.verband is null OR sp.verband='') AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende).") AND gruppe_kurzbz is null)";
-					
+					$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND (sp.verband is null OR sp.verband='') AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)
+						." AND ".$this->escape($sem_date_range->ende).")". $stringGroupLv. ")";
+
 					$query .="OR";
-					 
 				}
 			}	
 		}
@@ -421,7 +522,7 @@ class Stundenplan_model extends DB_Model
 	 */
 	public function loadForUid($uid)
 	{
-		$this->addSelect(['5sp.*','le.studiensemester_kurzbz']);
+		$this->addSelect(['sp.*','le.studiensemester_kurzbz']);
 		$this->db->join('public.tbl_benutzergruppe bg', 'sp.gruppe_kurzbz=bg.gruppe_kurzbz AND bg.uid=?', 'LEFT', false);
 		$this->addJoin('public.tbl_studiensemester ss1', 'bg.studiensemester_kurzbz=ss1.studiensemester_kurzbz AND ss1.start<=sp.datum AND ss1.ende>=sp.datum', 'LEFT');
 		$this->db->join('public.tbl_studentlehrverband slv', "sp.studiengang_kz=slv.studiengang_kz AND slv.student_uid=? AND (slv.semester=sp.semester OR sp.semester IS NULL) AND (slv.verband=sp.verband OR sp.verband IS NULL OR sp.verband='' OR sp.verband='0') AND (slv.gruppe=sp.gruppe OR sp.gruppe IS NULL OR sp.gruppe='' OR sp.gruppe='0') AND sp.gruppe_kurzbz IS NULL", 'LEFT', false);
@@ -434,5 +535,4 @@ class Stundenplan_model extends DB_Model
 
 		return $this->execQuery($query, [$uid, $uid]);
 	}
-
 }
diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index 1ccac1273..67cff2982 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -77,6 +77,10 @@ html {
 	overflow: visible !important;
 }
 
+.highlight-row {
+	background-color: #e5aeae !important;
+}
+
 @media (min-width: 768px) {
 	#sidebarMenu {
 		visibility: visible!important;
diff --git a/public/js/api/stv/courselist.js b/public/js/api/stv/courselist.js
index b6035c098..6bd999e5f 100644
--- a/public/js/api/stv/courselist.js
+++ b/public/js/api/stv/courselist.js
@@ -1,6 +1,15 @@
 export default {
 	getCourselist(url, config, params) {
-		console.log("her");
-		return this.$fhcApi.get('api/frontend/v1/stv/Lvtermine/getLvsStudent/' + params.id);
+		//corresponding logic controller Stundenplan.php
+		return this.$fhcApi.get('api/frontend/v1/stv/LvTermine/getStundenplan/'
+			+ params.student_uid + '/'
+			+ params.start_date + '/'
+			+ params.end_date + '/'
+			+ params.group_consecutiveHours + '/'
+			+ params.dbStundenplanTable
+		);
+	},
+	getStudiensemester(){
+		return this.$fhcApi.get('api/frontend/v1/stv/LvTermine/getStudiensemester/');
 	},
 }
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
index 8a6c0d2b0..bc4e02b51 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
@@ -1,39 +1,173 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+import FormInput from "../../../../Form/Input.js";
+import FormForm from '../../../../Form/Form.js';
 
 export default {
 	name: "TblCourseList",
 	components: {
-		CoreFilterCmpt
+		CoreFilterCmpt,
+		FormInput,
+		FormForm
+	},
+	computed: {
+		downloadLink: function(){
+			if(!this.dataSem.start || !this.dataSem.ende || !this.student.uid) return;
+			let start = new Date(this.dataSem.start);
+			start = Math.floor(start.getTime()/1000);
+			let ende = new Date(this.dataSem.ende);
+			ende = Math.floor(ende.getTime() / 1000);
+
+			let link =
+				FHC_JS_DATA_STORAGE_OBJECT.app_root + "cis/private/lvplan/stpl_kalender.php?type=student&pers_uid=" + this.student.uid + "&begin=" + start + "&ende= " +ende + "&format=excel";
+			return link;
+		},
+		dbStundenplanTable: function (){
+			return this.showStundenplanDev ? 'stundenplandev' : 'stundenplan';
+		}
+	},
+	inject: {
+		currentSemester: {
+			from: 'currentSemester',
+		},
 	},
 	props: {
 		student: Object
 	},
 	data(){
 		return {
-			tabulatorOptions: {
+			tabulatorOptions: null,
+			tabulatorEvents: [],
+			listStudiensemester: [],
+			dataSem: {},
+			showStundenplanDev: false
+		};
+	},
+	methods: {
+		initTabulatorOptions(){
+			this.tabulatorOptions = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: this.$fhcApi.factory.stv.courselist.getCourselist,
 				ajaxParams: () => {
 					return {
-						id: this.student.uid
+						student_uid: this.student.uid,
+						start_date: this.dataSem.start,
+						end_date: this.dataSem.ende,
+						group_consecutiveHours: true,
+						dbStundenplanTable: this.dbStundenplanTable
 					};
 				},
-				ajaxResponse: (url, params, response) => response.data,
+				ajaxResponse: (url, params, response) => {
+					return response.data;
+				},
 				columns: [
-					{title: "Prestudent_id", field: "prestudent_id"},
-					]
-			},
-			tabulatorEvents: [],
-		}
+					{title: "lv_id", field: "lehrveranstaltung_id", visible: false},
+					{title: "lehreinheit_id", field: "lehreinheit_id", visible: false},
+					{title: "datum", field: "datum",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
 
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+						}},
+					{title: "beginn", field: "beginn"},
+					{title: "ende", field: "ende"},
+					{title: "farbe", field: "farbe", visible: false},
+					{title: "Gruppen", field: "gruppen_kuerzel"},
+					{title: "ort", field: "ort_kurzbz"},
+					{title: "lektorIn", field: "lektorname"},
+					{title: "Lehrfach", field: "lehrfach_bez"}
+				],
+				rowFormatter: function(row){
+					var data = row.getData();
+					//highlight background of row if color red in table
+					if(data.farbe == "A4A7FC"){
+						let el = row.getElement();
+						row.getElement().classList.add("highlight-row");
+						row.getElement().classList.remove("tabulator-row-odd");
+						row.getElement().classList.remove("tabulator-row-even");
+					}
+				}
+			};
+			this.tabulatorEvents = [
+				{
+					event: 'tableBuilt',
+					handler: async() => {
+						await this.$p.loadCategory(['global', 'ui', 'lehre']);
+
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('lehrveranstaltung_id').component.updateDefinition({
+							title: this.$p.t('lehre', 'lehrveranstaltung_id')
+						});
+						cm.getColumnByField('lehreinheit_id').component.updateDefinition({
+							title: this.$p.t('global', 'lehreinheit_id')
+						});
+						cm.getColumnByField('datum').component.updateDefinition({
+							title: this.$p.t('global', 'datum')
+						});
+						cm.getColumnByField('beginn').component.updateDefinition({
+							title: this.$p.t('ui', 'dateFrom')
+						});
+						cm.getColumnByField('ende').component.updateDefinition({
+							title: this.$p.t('ui', 'dateTo')
+						});
+						cm.getColumnByField('gruppen_kuerzel').component.updateDefinition({
+							title: this.$p.t('global', 'gruppen')
+						});
+						cm.getColumnByField('ort_kurzbz').component.updateDefinition({
+							title: this.$p.t('global', 'ortLocation')
+						});
+						cm.getColumnByField('lektorname').component.updateDefinition({
+							title: this.$p.t('lehre', 'lektor')
+						});
+						cm.getColumnByField('lehrfach_bez').component.updateDefinition({
+							title: this.$p.t('global', 'lehrfach')
+						});
+					}
+				}
+			];
+		},
+		getDatesOfSemester(studiensemester_kurzbz) {
+			this.dataSem = this.listStudiensemester.find(item => item.studiensemester_kurzbz === studiensemester_kurzbz);
+			},
+		exportToExcel(){
+			window.open(this.downloadLink, '_blank');
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+		},
+		switchStundenplan(){
+			this.showStundenplanDev = !this.showStundenplanDev;
+			this.reload();
+		}
+	},
+	watch: {
+		currentSemester(newVal, oldVal) {
+			this.getDatesOfSemester(newVal);
+		},
+	},
+	created(){
+		this.$fhcApi.factory.stv.courselist.getStudiensemester()
+			.then(result => {
+				this.listStudiensemester = result.data;
+				this.getDatesOfSemester(this.currentSemester);
+				this.initTabulatorOptions();
+
+			})
+			.catch(this.$fhcAlert.handleSystemError);
 	},
-	methods: {},
 	template: `
 		<div class="stv-details-courselist h-100 pb-3">
-			<h4>Termine</h4>
-			{{student}}
-		
+			<h4>{{$p.t('global', 'termine')}}</h4>
+
 			<core-filter-cmpt
+				v-if="tabulatorOptions"
 				ref="table"
 				:tabulator-options="tabulatorOptions"
 				:tabulator-events="tabulatorEvents"
@@ -41,7 +175,20 @@ export default {
 				:side-menu="false"
 				reload
 				>
+					<template #actions>	
+						<button
+							class="btn btn-outline-secondary"
+							@click="exportToExcel">
+								{{$p.t('ui', 'export')}}
+						</button>
+						<button
+							class="btn btn-outline-secondary"
+							@click="switchStundenplan">
+								<span v-if="!showStundenplanDev">{{$p.t('lehre', 'stundenplan')}}</span>
+								<span v-else>{{$p.t('lehre', 'stundenplanDev')}}</span>
+						</button>
+					</template>
 			</core-filter-cmpt>
 		</div>
 	`
-}
\ No newline at end of file
+}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 7d6d7361d..5749562ac 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41416,6 +41416,186 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'export',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Exportieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Export',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'stundenplanDev',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Stundenplan DEV',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Timetable DEV',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'lehreinheit_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehreinheit ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Teaching Unit ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'dateFrom',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'von',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'from',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'dateTo',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'bis',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'to',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'gruppen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gruppen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'groups',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'ortLocation',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ort',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'location',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'lehrfach',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehrfach',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'subject',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'termine',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Termine',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Dates',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC 4 Lehrveranstaltungstermine ENDE ---------------------------------------------------------------------------
 );
 

From c98d0a9c4503efe1cea52d6de0ebcc95c98666fc Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 17 Apr 2025 08:52:21 +0200
Subject: [PATCH 114/572] refactor(Dashboard Section description): updates the
 database structure for the dashboard information to add information about the
 description of a section

---
 .../libraries/dashboard/DashboardLib.php      | 10 ++++----
 public/js/components/Dashboard/Dashboard.js   | 11 +++++----
 public/js/components/Dashboard/Section.js     | 13 ++++++-----
 public/js/components/Drop/Grid.js             | 23 +++++++++++--------
 4 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
index edea7c310..d411bfcfc 100644
--- a/application/libraries/dashboard/DashboardLib.php
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -53,7 +53,6 @@ class DashboardLib
 		$userconfig = $this->getUserConfig($dashboard_id, $uid);
 		
 		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig);
-		
 		return $mergedconfig;
 	}
 	
@@ -209,18 +208,19 @@ class DashboardLib
 		if (!isset($widgets[$section]) || !is_array($widgets[$section]))
 		{
 			$widgets[$section] = array();
+			$widgets[$section]["widgets"] = array();
 		}
 		
-		$widgets[$section][$widgetid] = $widget;
+		$widgets[$section]["widgets"][$widgetid] = $widget;
 	}
 	
 	public function removeWidgetFromWidgets(&$widgets, $section, $widgetid)
 	{
 		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-		if (isset($widgets[$section]) && isset($widgets[$section][$widgetid]))
+		if (isset($widgets[$section]["widgets"]) && isset($widgets[$section]["widgets"][$widgetid]))
 		{
-			unset($widgets[$section][$widgetid]);
-			if(empty($widgets[$section]) && $section !== self::USEROVERRIDE_SECTION) {
+			unset($widgets[$section]["widgets"][$widgetid]);
+			if(empty($widgets[$section]["widgets"]) && $section !== self::USEROVERRIDE_SECTION) {
 				unset($widgets[$section]);
 			}
 			return true;
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index e6f26d169..c682d78c6 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -162,15 +162,16 @@ export default {
 			for (var name in res.data.retval.widgets) {
 				let widgets = [];
 				let remove = [];
-				for (var wid in res.data.retval.widgets[name]) {
-					res.data.retval.widgets[name][wid].id = wid;
-					if (res.data.retval.widgets[name][wid].custom || res.data.retval.widgets[name][wid].preset)
-						widgets.push(res.data.retval.widgets[name][wid]);
+				for (var wid in res.data.retval.widgets[name].widgets) {
+					res.data.retval.widgets[name].widgets[wid].id = wid;
+					if (res.data.retval.widgets[name].widgets[wid].custom || res.data.retval.widgets[name].widgets[wid].preset)
+						widgets.push(res.data.retval.widgets[name].widgets[wid]);
 					else
 						remove.push(wid);
 				}
 				this.sections.push({
 					name: name,
+					description:res.data.retval.widgets[name].description,
 					widgets: widgets
 				});
 				remove.forEach(wid => this.widgetRemove(name, wid));
@@ -189,7 +190,7 @@ export default {
 			{{ $p.t('global/personalGreeting', [ viewDataInternal?.name ]) }}
 			<button style="margin-left: 8px;" class="btn" @click="editMode = !editMode"><i class="fa-solid fa-gear"></i></button>
 		</h3>
-		<dashboard-section v-for="(section, index) in sections" :key="section.name" :seperator="index" :name="section.name" :widgets="section.widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>
+		<dashboard-section v-for="(section, index) in sections" :key="section.name" :seperator="index" :name="section.name" :description="section.description" :widgets="section.widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>
 		<dashboard-widget-picker ref="widgetpicker" :widgets="widgets"></dashboard-widget-picker>
 	</div>`
 }
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 4a2a4eaaa..9ccb729df 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -28,7 +28,8 @@ export default {
 	},
 	props: [
 		"name",
-		"widgets"
+		"widgets",
+		"description"
 	],
 	emits: [
 		"widgetAdd",
@@ -85,7 +86,7 @@ export default {
 				if(!item?.widgetid && item?.id){
 					item.widgetid = item.id;
 				}
-				return { ...item, reorder: false, ...(item.place[this.gridWidth] || { reorder: true, ...{ x: 0, y: 0, w: 1, h: 1 } })};
+				return { ...item, ...(item.place[this.gridWidth] || { x: 0, y: 0, w: 1, h: 1 } )};
 			});
 			return placedItems;
 			
@@ -94,7 +95,7 @@ export default {
 	},
 	methods: {
 		showSectionInformation(){
-			SectionModal.popup(`this is the information for the section ${name}`);
+			SectionModal.popup(this.description);
 		},
 		handleConfigOpened() {
 			this.configOpened = true
@@ -188,11 +189,11 @@ export default {
 		});
 	},
 	template: `
-	<h4 v-if="items.length>0 && editMode" class=" mb-0">
+	<h4 v-if="items.length>0 && editMode" >
 		<i @click="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>
 		{{name}}:
 	</h4>
-	<div class="dashboard-section position-relative pb-3 border-bottom" ref="container" :style="getSectionStyle">
+	<div class="dashboard-section position-relative pb-3 border-1" ref="container" :style="getSectionStyle">
 		<drop-grid v-model:cols="gridWidth" :items="items" :itemsSetup="computedWidgetsSetup" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
 				<div v-if="item.placeholder" class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
@@ -203,7 +204,7 @@ export default {
 					:widgetID="item.id"
 					:width="item.w"
 					:height="item.h"
-					:item_data="{config:item.config, custom:item.custom, h:item.h, w:item.w,id:item.id,reorder:item.reorder,place:item.place,widget:item.widget,widgetid:item.widgetid,x:item.x,y:item.y}"
+					:item_data="{config:item.config, custom:item.custom, h:item.h, w:item.w,id:item.id,place:item.place,widget:item.widget,widgetid:item.widgetid,x:item.x,y:item.y}"
 					:loading="item.loading"
 					:config="item.config"
 					:custom="item.custom"
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 4b4b181d3..ade654acc 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -63,14 +63,12 @@ export default {
 		items_hashmap() {
 			let items = {};
 			this.items.forEach(item => {
-				if (this.reorderedItems.length > 0){
-					if(item.reorder){
+				if (this.reorderedItems.length > 0 && this.needsReordering(item)){
 						let rearrangedPosition = this.reorderedItems.filter(widget => widget.data.widgetid == item.widgetid)?.pop();
 						if (rearrangedPosition) {			
 							item.x = rearrangedPosition.x;
 							item.y = rearrangedPosition.y;
 						}
-					}
 				}
 				items[`x${item.x}y${item.y}`] = item;
 			});	
@@ -143,7 +141,6 @@ export default {
 						y: item.y,
 						w: item.w,
 						h: item.h,
-						reorder: item.reorder,
 						weight: item.weight || 0,
 						data: item
 					}
@@ -246,7 +243,12 @@ export default {
 		}
 	},
 	methods: {
-		
+		needsReordering(item){
+			if (!item?.data?.place[this.cols]){
+				return true;
+			}
+			return false;
+		},
 		toggleDraggedItemOverlay(condition){
 			if(!this.draggedNode)
 				return;
@@ -267,20 +269,23 @@ export default {
 			this.grid = new GridLogic(this.cols);
 			const result = [];
 			let sortedItems = [...items].sort((a, b) => {
-				if (a.reorder){
+				if(this.needsReordering(a) && this.needsReordering(b)){
+					return 0;
+				}
+				else if(this.needsReordering(a)){
 					return 999;
 				}
-				if (b.reorder){
+				else if(this.needsReordering(b)){
 					return -999;
 				}
+				
 				return a.weight > b.weight;
 			}); 
 			let reorderedItems = [];
 			sortedItems.forEach(item => {
 				let freeSlots = this.grid.getFreeSlots();
 				
-				if(item.reorder){
-					item.reorder=true;
+				if(this.needsReordering(item)){
 					let firstFreeSlot = freeSlots.shift();
 					if (!firstFreeSlot) {
 						item.x = 0;

From da86575e65dc022dbbe138b28e037cf544dfd7a6 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Fri, 18 Apr 2025 13:25:00 +0200
Subject: [PATCH 115/572] archiv: added space in edit form

---
 application/config/javascript.php             |  2 +-
 .../Details/Archiv/Edit.js                    | 32 ++++++++++---------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/application/config/javascript.php b/application/config/javascript.php
index bfcf8d540..383002dab 100644
--- a/application/config/javascript.php
+++ b/application/config/javascript.php
@@ -2,6 +2,6 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 // use vuejs dev version
-$config['use_vuejs_dev_version'] = true;
+$config['use_vuejs_dev_version'] = false;
 // use bundled javascript
 $config['use_bundled_javascript'] = false;
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js
index 35777b6ac..e819eb252 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js
@@ -84,21 +84,23 @@ export default {
 					<!--Upload Component-->
 					<FormUploadDms ref="upload" id="inhalt" v-model="data.datei"></FormUploadDms>
 				</div>
-				<form-input
-					container-class="form-check"
-					type="checkbox"
-					name="signiert"
-					:label="$p.t('stv/archiv_signiert')"
-					v-model="data.signiert"
-				>
-				</form-input>
-				<form-input
-					container-class="form-check"
-					type="checkbox"
-					name="stud_selfservice"
-					:label="'Selfservice'"
-					v-model="data.stud_selfservice"
-				>
+				<div class="mt-3">
+					<form-input
+						container-class="form-check"
+						type="checkbox"
+						name="signiert"
+						:label="$p.t('stv/archiv_signiert')"
+						v-model="data.signiert"
+					>
+					</form-input>
+						<form-input
+							container-class="form-check"
+							type="checkbox"
+							name="stud_selfservice"
+							:label="'Selfservice'"
+							v-model="data.stud_selfservice"
+					>
+				</div>
 				</form-input>
 			</fieldset>
 

From 8c00158d04e409d03bc0114ee54c60540fff4991 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 22 Apr 2025 09:52:07 +0200
Subject: [PATCH 116/572] refactor(Dashboard Database data structure): changes
 how the data for the dashboard is structured in the database, instead of
 having a global widgets property, each section has its own widgets property
 where additional properties like description can be stored

---
 application/controllers/dashboard/Config.php     | 12 ++++++------
 application/libraries/dashboard/DashboardLib.php | 15 ++++++++-------
 public/js/apps/DashboardAdmin.js                 |  3 ++-
 public/js/components/Dashboard/Admin/Presets.js  |  3 +--
 public/js/components/Dashboard/Dashboard.js      | 12 ++++++------
 public/js/components/Dashboard/Section.js        |  8 ++++----
 public/js/components/Drop/Grid.js                |  2 +-
 7 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/application/controllers/dashboard/Config.php b/application/controllers/dashboard/Config.php
index 2c0cf5fca..f6db9509f 100644
--- a/application/controllers/dashboard/Config.php
+++ b/application/controllers/dashboard/Config.php
@@ -65,7 +65,7 @@ class Config extends Auth_Controller
 		
 		$preset_decoded = json_decode($preset->preset, true);
 		
-		$this->DashboardLib->addWidgetsToWidgets($preset_decoded['widgets'], $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
+		$this->DashboardLib->addWidgetsToWidgets($preset_decoded, $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
 		
 		$preset->preset = json_encode($preset_decoded);
 				
@@ -92,7 +92,7 @@ class Config extends Auth_Controller
 		}
 		
 		$preset_decoded = json_decode($preset->preset, true);
-		if (!$this->DashboardLib->removeWidgetFromWidgets($preset_decoded['widgets'], $funktion_kurzbz, $widgetid))
+		if (!$this->DashboardLib->removeWidgetFromWidgets($preset_decoded, $funktion_kurzbz, $widgetid))
 		{
 			http_response_code(404);
 			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
@@ -119,7 +119,7 @@ class Config extends Auth_Controller
 		
 		$override_decoded = json_decode($override->override, true);
 
-		$this->DashboardLib->addWidgetsToWidgets($override_decoded['widgets'], $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
+		$this->DashboardLib->addWidgetsToWidgets($override_decoded, $dashboard_kurzbz, $funktion_kurzbz, $input->widgets);
 		
 		$override->override = json_encode($override_decoded);
 				
@@ -148,7 +148,7 @@ class Config extends Auth_Controller
 		
 		$override_decoded = json_decode($override->override, true);
 		
-		if (!$this->DashboardLib->removeWidgetFromWidgets($override_decoded['widgets'], $funktion_kurzbz, $widgetid))
+		if (!$this->DashboardLib->removeWidgetFromWidgets($override_decoded, $funktion_kurzbz, $widgetid))
 		{
 			http_response_code(404);
 			$this->terminateWithJsonError('widgetid ' . $widgetid . ' not found');
@@ -202,10 +202,10 @@ class Config extends Auth_Controller
 			if ($conf)
 			{
 				$preset = json_decode($conf->preset, true);
-				if (!isset($preset['widgets']) || !isset($preset['widgets'][$funktion]))
+				if (!isset($preset[$funktion]) || !isset($preset[$funktion]['widgets']))
 					$result[$funktion] = [];
 				else
-					$result[$funktion] = $preset['widgets'][$funktion];
+					$result[$funktion] = $preset[$funktion]['widgets'];
 			}
 			else
 				$result[$funktion] = [];
diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
index edea7c310..72072f657 100644
--- a/application/libraries/dashboard/DashboardLib.php
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -107,7 +107,7 @@ class DashboardLib
 		$emptyoverride = new stdClass();
 		$emptyoverride->dashboard_id = $dashboard->dashboard_id;
 		$emptyoverride->uid = $uid;
-		$emptyoverride->override = '{"widgets": {"' . self::USEROVERRIDE_SECTION . '": {}}}';
+		$emptyoverride->override = '{"' . self::USEROVERRIDE_SECTION . '": {"widgets":{}}}}';
 		
 		return $emptyoverride;
 	}
@@ -127,7 +127,7 @@ class DashboardLib
 		$emptypreset->dashboard_id = $dashboard->dashboard_id;
 		$emptypreset->funktion_kurzbz = $funktion_kurzbz;
 		$section = ($funktion_kurzbz !== null) ? $funktion_kurzbz : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-		$emptypreset->preset = '{"widgets": {"' . $section . '": {}}}';
+		$emptypreset->preset = '{"' . $section . '": { "widgets" : {}}}';
 		
 		return $emptypreset;
 	}
@@ -206,21 +206,22 @@ class DashboardLib
 	public function addWidgetToWidgets(&$widgets, $section, $widget, $widgetid)
 	{
 		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-		if (!isset($widgets[$section]) || !is_array($widgets[$section]))
+		if (!isset($widgets[$section]) || !isset($widgets[$section]["widgets"]) || !is_array($widgets[$section]))
 		{
 			$widgets[$section] = array();
+			$widgets[$section]["widgets"] = array();
 		}
 		
-		$widgets[$section][$widgetid] = $widget;
+		$widgets[$section]["widgets"][$widgetid] = $widget;
 	}
 	
 	public function removeWidgetFromWidgets(&$widgets, $section, $widgetid)
 	{
 		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-		if (isset($widgets[$section]) && isset($widgets[$section][$widgetid]))
+		if (isset($widgets[$section]) && isset($widgets[$section]["widgets"][$widgetid]))
 		{
-			unset($widgets[$section][$widgetid]);
-			if(empty($widgets[$section]) && $section !== self::USEROVERRIDE_SECTION) {
+			unset($widgets[$section]["widgets"][$widgetid]);
+			if(empty($widgets[$section]["widgets"]) && $section !== self::USEROVERRIDE_SECTION) {
 				unset($widgets[$section]);
 			}
 			return true;
diff --git a/public/js/apps/DashboardAdmin.js b/public/js/apps/DashboardAdmin.js
index 1f3e831c8..05b438798 100644
--- a/public/js/apps/DashboardAdmin.js
+++ b/public/js/apps/DashboardAdmin.js
@@ -1,5 +1,6 @@
 import {CoreNavigationCmpt} from '../components/navigation/Navigation.js';
 import DashboardAdmin from '../components/Dashboard/Admin.js';
+import Phrases from "../plugin/Phrasen.js"
 
 Vue.createApp({
   name: 'DashboardAdminApp',
@@ -12,4 +13,4 @@ Vue.createApp({
   },
   mounted() {
   }
-}).mount('#main');
\ No newline at end of file
+}).use(Phrases).mount('#main');
\ No newline at end of file
diff --git a/public/js/components/Dashboard/Admin/Presets.js b/public/js/components/Dashboard/Admin/Presets.js
index fa8f65970..8d6a07803 100644
--- a/public/js/components/Dashboard/Admin/Presets.js
+++ b/public/js/components/Dashboard/Admin/Presets.js
@@ -42,7 +42,7 @@ export default {
 					funktion_kurzbz: section_name,
 					widgets: [widget]
 				}).then(result => {
-					let newId = Object.keys(result.data.retval.data.widgets[section_name]).pop();
+					let newId = Object.keys(result.data.retval.data[section_name].widgets).pop();
 					widget.id = newId;
 					widget.custom = 1;
 					this.sections.forEach(section => {
@@ -126,7 +126,6 @@ export default {
 			}}).then(res => {
 				if (this.tmpLoading !== funktionen.join('###'))
 					return; // NOTE(chris): prevent race condition
-				
 				for (var section in res.data.retval) {
 					let widgets = [];
 					for (var wid in res.data.retval[section]) {
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index e6f26d169..046edf920 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -70,7 +70,7 @@ export default {
 					funktion_kurzbz: section_name,
 					widgets: [widget]
 				}).then(result => {
-					let newId = Object.keys(result.data.retval.data.widgets[section_name]).pop();
+					let newId = Object.keys(result.data.retval.data[section_name].widgets).pop();
 					widget.id = newId;
 					this.sections.forEach(section => {
 						if (section.name == section_name) {
@@ -159,13 +159,13 @@ export default {
 		axios.get(this.apiurl + '/Config', {params:{
 			db: this.dashboard
 		}}).then(res => {
-			for (var name in res.data.retval.widgets) {
+			for (var name in res.data.retval) {
 				let widgets = [];
 				let remove = [];
-				for (var wid in res.data.retval.widgets[name]) {
-					res.data.retval.widgets[name][wid].id = wid;
-					if (res.data.retval.widgets[name][wid].custom || res.data.retval.widgets[name][wid].preset)
-						widgets.push(res.data.retval.widgets[name][wid]);
+				for (var wid in res.data.retval[name].widgets) {
+					res.data.retval[name].widgets[wid].id = wid;
+					if (res.data.retval[name].widgets[wid].custom || res.data.retval[name].widgets[wid].preset)
+						widgets.push(res.data.retval[name].widgets[wid]);
 					else
 						remove.push(wid);
 				}
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 4a2a4eaaa..5c4b82206 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -14,8 +14,8 @@ export default {
 	},
 	inject: {
 		widgetsSetup:{
-			type: Object,
-			default: {},
+			type: Array,
+			default: [],
 		},
 		adminMode: {
 			type: Boolean,
@@ -188,7 +188,7 @@ export default {
 		});
 	},
 	template: `
-	<h4 v-if="items.length>0 && editMode" class=" mb-0">
+	<h4 v-if="items.length>0 && editModeIsActive" class=" mb-0">
 		<i @click="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>
 		{{name}}:
 	</h4>
@@ -208,7 +208,7 @@ export default {
 					:config="item.config"
 					:custom="item.custom"
 					:hidden="item.hidden"
-					:editMode="editMode"
+					:editMode="editModeIsActive"
 					:place="item.place[gridWidth]"
 					:setup="computedWidgetsSetup[item.widget]"
 					@change="saveConfig($event, item)"
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 4b4b181d3..396af5901 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -609,7 +609,7 @@ export default {
 		<TransitionGroup tag="div">
 			<grid-item
 				ref="gridItems"
-				v-for="(item,index) in (mode == 0 && active ? placedItems_withPlaceholders : placedItems)"
+				v-for="(item,index) in ((mode != 1 || mode != 2) && active ? placedItems_withPlaceholders : placedItems)"
 				:key="item.data.id"
 				:item="item"
 				@start-move="startMove"

From 0c95dbad1fe5901d7490bc7ea0e320810b94373f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 22 Apr 2025 11:40:58 +0200
Subject: [PATCH 117/572] update(Dashboard Section description): adds phrases
 for the description of general/custom/other sections

---
 .../libraries/dashboard/DashboardLib.php      |   2 +-
 public/js/components/Dashboard/Dashboard.js   |   3 +-
 public/js/components/Dashboard/Section.js     |  27 ++++-
 system/phrasesupdate.php                      | 104 +++++++++++++++++-
 4 files changed, 130 insertions(+), 6 deletions(-)

diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
index 72072f657..7aab6b949 100644
--- a/application/libraries/dashboard/DashboardLib.php
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -127,7 +127,7 @@ class DashboardLib
 		$emptypreset->dashboard_id = $dashboard->dashboard_id;
 		$emptypreset->funktion_kurzbz = $funktion_kurzbz;
 		$section = ($funktion_kurzbz !== null) ? $funktion_kurzbz : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-		$emptypreset->preset = '{"' . $section . '": { "widgets" : {}}}';
+		$emptypreset->preset = '{"' . $section . '": { "widgets" : {}},"custom": { "widgets" : {}}}';
 		
 		return $emptypreset;
 	}
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 046edf920..005551570 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -143,7 +143,7 @@ export default {
 		}
 	},
 	created() {
-
+		this.$p.loadCategory('dashboard');
 		axios.get(this.apiurl + '/Widget/getWidgetsForDashboard', {
 			params: {
 				db: this.dashboard
@@ -175,6 +175,7 @@ export default {
 				});
 				remove.forEach(wid => this.widgetRemove(name, wid));
 			}
+			this.sections = this.sections.sort((section1, section2) => section2.widgets.length - section1.widgets.length);
 		}).catch(err => console.error('ERROR:', err));
 	},
 	async beforeMount() {
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 5c4b82206..17c2ac004 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -93,8 +93,29 @@ export default {
 		
 	},
 	methods: {
+		sectionNameTranslation(){
+			switch(this.name){
+				case "general": 
+					return this.$p.t('dashboard',this.name); 
+					break;
+				case "custom":
+					return this.$p.t('dashboard',this.name);
+					break;
+				default:
+					return this.name;
+					break;
+			}
+		},
 		showSectionInformation(){
-			SectionModal.popup(`this is the information for the section ${name}`);
+			if (this.name == "general"){
+				SectionModal.popup(this.$p.t('dashboard', 'dashboardGeneralSectionDescription')); 
+			}
+			else if(this.name == "custom"){
+				SectionModal.popup(this.$p.t('dashboard', 'dashboardCustomSectionDescription'));
+			}
+			else{
+				SectionModal.popup(this.$p.t('dashboard', 'dashboardSectionDescription', [this.name]));
+			}
 		},
 		handleConfigOpened() {
 			this.configOpened = true
@@ -188,9 +209,9 @@ export default {
 		});
 	},
 	template: `
-	<h4 v-if="items.length>0 && editModeIsActive" class=" mb-0">
+	<h4 v-if="editModeIsActive" class=" mb-0">
 		<i @click="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>
-		{{name}}:
+		{{sectionNameTranslation()}}:
 	</h4>
 	<div class="dashboard-section position-relative pb-3 border-bottom" ref="container" :style="getSectionStyle">
 		<drop-grid v-model:cols="gridWidth" :items="items" :itemsSetup="computedWidgetsSetup" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 01f0427b6..dd874ddff 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -38354,6 +38354,106 @@ array(
 		)
 	),
 	// ### STUDIENGANG_INFORMATIONEN PHRASEN ENDE
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'general',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Allgemein',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'General',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'custom',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Benutzerdefiniert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Custom',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'dashboardGeneralSectionDescription',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Hier befinden sich die vordefinierten Widgets',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Here are the predefined widgets',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'dashboardCustomSectionDescription',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Hier befinden sich die Widgets Ihrer persönlichen Anpassungen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Here are the widgets of your personal cutomizations',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'dashboardSectionDescription',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Hier befinden sich die Widgets der {0} Funktion',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Here are the widgets of the {0} function',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 // CIS4 phrases from legacy code end
 	array(
 		'app' => 'core',
@@ -38414,7 +38514,9 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
+	
+
 );
 
 

From 2d8766384176f6b736607cc95e2b66924b39961d Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 22 Apr 2025 13:35:31 +0200
Subject: [PATCH 118/572] basic structure for Tab Admission Dates

---
 .../api/frontend/v1/stv/Aufnahmetermine.php   | 506 ++++++++++++++++++
 .../api/frontend/v1/stv/Config.php            |   5 +
 public/js/api/factory/stv.js                  |   4 +-
 public/js/api/factory/stv/admissionDates.js   |  25 +
 public/js/api/stv/admissionDates.js           |   0
 .../Details/Aufnahmetermine.js                |  26 +
 .../Aufnahmetermine/Aufnahmetermine.js        |  58 ++
 .../Aufnahmetermine/HeaderReihungstest.js     |  14 +
 system/phrasesupdate.php                      |  25 +-
 9 files changed, 661 insertions(+), 2 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
 create mode 100644 public/js/api/factory/stv/admissionDates.js
 create mode 100644 public/js/api/stv/admissionDates.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js

diff --git a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
new file mode 100644
index 000000000..519e8125d
--- /dev/null
+++ b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
@@ -0,0 +1,506 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Aufnahmetermine extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getAufnahmetermine' => ['admin:r', 'assistenz:r'],
+			'loadAufnahmetermin' => ['admin:r', 'assistenz:r'],
+			'insertAufnahmetermin' => ['admin:rw', 'assistenz:rw'],
+			'updateAufnahmetermin' => ['admin:rw', 'assistenz:rw'],
+			'deleteAufnahmetermin' => ['admin:rw', 'assistenz:rw'],
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+			'mobility'
+		]);
+
+		// Load models
+		$this->load->model('codex/Bisio_model', 'BisioModel');
+	}
+
+	public function getAufnahmetermine($student_uid)
+	{
+		$this->BisioModel->addSelect("*");
+		$this->BisioModel->addJoin('bis.tbl_mobilitaetsprogramm mp', 'ON (mp.mobilitaetsprogramm_code = bis.tbl_bisio.mobilitaetsprogramm_code)', 'LEFT');
+		$this->BisioModel->addJoin('lehre.tbl_lehreinheit le', 'ON (le.lehreinheit_id = bis.tbl_bisio.lehreinheit_id)','LEFT');
+		$this->BisioModel->addOrder('von', 'DESC');
+		$this->BisioModel->addOrder('bis', 'DESC');
+		$this->BisioModel->addOrder('aufnahmetermin_id', 'DESC');
+		$result = $this->BisioModel->loadWhere(
+			array('student_uid' => $student_uid)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function insertAufnahmetermin()
+	{
+		$this->load->library('form_validation');
+		$authUID = getAuthUID();
+
+		$student_uid = $this->input->post('uid');
+
+		if(!$student_uid)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$formData = $this->input->post('formData');
+
+		$_POST['von'] =	(isset($formData['von']) && !empty($formData['von'])) ? $formData['von'] : null;
+		$_POST['bis'] =	(isset($formData['bis']) && !empty($formData['bis'])) ? $formData['bis'] : null;
+		$_POST['nation_code'] =	(isset($formData['nation_code']) && !empty($formData['nation_code'])) ? $formData['nation_code'] : 'A';
+		$_POST['mobilitaetsprogramm_code'] = (isset($formData['mobilitaetsprogramm_code']) && !empty($formData['mobilitaetsprogramm_code'])) ? $formData['mobilitaetsprogramm_code'] : null;
+		$_POST['herkunftsland_code'] = (isset($formData['herkunftsland_code']) && !empty($formData['herkunftsland_code'])) ? $formData['herkunftsland_code'] : 'A';
+		$_POST['ects_erworben'] = (isset($formData['ects_erworben']) && !empty($formData['ects_erworben'])) ? $formData['ects_erworben'] : null;
+		$_POST['ects_angerechnet'] = (isset($formData['ects_angerechnet']) && !empty($formData['ects_angerechnet'])) ? $formData['ects_angerechnet'] : null;
+		$_POST['lehreinheit_id'] = (isset($formData['lehreinheit_id']) && !empty($formData['lehreinheit_id'])) ? $formData['lehreinheit_id'] : null;
+
+		$this->form_validation->set_rules('nation_code', 'Nation_code', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Nation_code'])
+		]);
+		$this->form_validation->set_rules('herkunftsland_code', 'Herkunftsland_code', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Herkunftsland_code'])
+		]);
+		$this->form_validation->set_rules('mobilitaetsprogramm_code', 'Mobilitaetsprogramm_code', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Mobilitaetsprogramm_code'])
+		]);
+		$this->form_validation->set_rules('von', 'VonDatum', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VonDatum'])
+		]);
+
+		$this->form_validation->set_rules('bis', 'VBisDatum', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VBisDatum'])
+		]);
+
+		$this->form_validation->set_rules('ects_erworben', 'Ects_erworben', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ects_erworben'])
+		]);
+
+		$this->form_validation->set_rules('ects_angerechnet', 'Ects_angerechnet', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ects_angerechnet'])
+		]);
+
+		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Lehreinheit'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$ort =	(isset($formData['ort']) && !empty($formData['ort'])) ? $formData['ort'] : null;
+		$universitaet =	(isset($formData['universitaet']) && !empty($formData['universitaet'])) ? $formData['universitaet'] : null;
+		$localPurposes = (isset($formData['localPurposes']) && !empty($formData['localPurposes'])) ? $formData['localPurposes'] : null;
+		$localSupports = (isset($formData['localSupports']) && !empty($formData['localSupports'])) ? $formData['localSupports'] : null;
+
+		$result = $this->BisioModel->insert([
+			'student_uid' => $student_uid,
+			'von' => $_POST['von'],
+			'bis' => $_POST['bis'],
+			'mobilitaetsprogramm_code' => $_POST['mobilitaetsprogramm_code'],
+			'nation_code' => $_POST['nation_code'],
+			'herkunftsland_code' => $_POST['herkunftsland_code'],
+			'lehreinheit_id' => $_POST['lehreinheit_id'],
+			'ort' => $ort,
+			'universitaet' => $universitaet,
+			'ects_erworben' => $_POST['ects_erworben'] ,
+			'ects_angerechnet' => $_POST['ects_angerechnet'],
+			'insertamum' => date('c'),
+			'insertvon' => $authUID,
+		]);
+
+		$aufnahmetermin_id = $this->getDataOrTerminateWithError($result);
+
+		//check if localData (purposes)
+		if(count($localPurposes) > 0){
+			foreach ($localPurposes as $zweck){
+				$zweck = (int)$zweck;
+				$this->addAufnahmeterminPurpose($aufnahmetermin_id, $zweck);
+			}
+		}
+
+		//check if localData (supports)
+		if(count($localSupports) > 0){
+			foreach ($localSupports as $support){
+				$this->addAufnahmeterminSupport($aufnahmetermin_id, $support);
+			}
+		}
+
+		$this->terminateWithSuccess($aufnahmetermin_id);
+	}
+
+	public function loadAufnahmetermin($aufnahmetermin_id)
+	{
+		$this->BisioModel->addSelect("*");
+		$this->BisioModel->addJoin('bis.tbl_mobilitaetsprogramm mp', 'ON (mp.mobilitaetsprogramm_code = bis.tbl_bisio.mobilitaetsprogramm_code)', 'LEFT');
+		$this->BisioModel->addJoin('lehre.tbl_lehreinheit le', 'ON (le.lehreinheit_id = bis.tbl_bisio.lehreinheit_id)','LEFT');
+		$result = $this->BisioModel->loadWhere(
+			array('aufnahmetermin_id' => $aufnahmetermin_id)
+		);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function updateAufnahmetermin()
+	{
+
+		$this->load->library('form_validation');
+		$authUID = getAuthUID();
+
+		$student_uid = $this->input->post('uid');
+
+		if(!$student_uid)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
+		}
+		$formData = $this->input->post('formData');
+
+		$_POST['von'] =	(isset($formData['von']) && !empty($formData['von'])) ? $formData['von'] : null;
+		$_POST['bis'] =	(isset($formData['bis']) && !empty($formData['bis'])) ? $formData['bis'] : null;
+		$_POST['nation_code'] =	(isset($formData['nation_code']) && !empty($formData['nation_code'])) ? $formData['nation_code'] : 'A';
+		$_POST['mobilitaetsprogramm_code'] = (isset($formData['mobilitaetsprogramm_code']) && !empty($formData['mobilitaetsprogramm_code'])) ? $formData['mobilitaetsprogramm_code'] : null;
+		$_POST['herkunftsland_code'] = (isset($formData['herkunftsland_code']) && !empty($formData['herkunftsland_code'])) ? $formData['herkunftsland_code'] : 'A';
+		$_POST['ects_erworben']  = (isset($formData['ects_erworben']) && !empty($formData['ects_erworben'])) ? $formData['ects_erworben'] : null;
+		$_POST['ects_angerechnet'] = (isset($formData['ects_angerechnet']) && !empty($formData['ects_angerechnet'])) ? $formData['ects_angerechnet'] : null;
+		$_POST['lehreinheit_id'] = (isset($formData['lehreinheit_id']) && !empty($formData['lehreinheit_id'])) ? $formData['lehreinheit_id'] : null;
+
+		$this->form_validation->set_rules('nation_code', 'Nation_code', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Nation_code'])
+		]);
+		$this->form_validation->set_rules('herkunftsland_code', 'Herkunftsland_code', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Herkunftsland_code'])
+		]);
+		$this->form_validation->set_rules('mobilitaetsprogramm_code', 'Mobilitaetsprogramm_code', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Mobilitaetsprogramm_code'])
+		]);
+		$this->form_validation->set_rules('von', 'VonDatum', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VonDatum'])
+		]);
+
+		$this->form_validation->set_rules('bis', 'VBisDatum', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VBisDatum'])
+		]);
+
+		$this->form_validation->set_rules('ects_erworben', 'Ects_erworben', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ects_erworben'])
+		]);
+
+		$this->form_validation->set_rules('ects_angerechnet', 'Ects_angerechnet', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ects_angerechnet'])
+		]);
+
+		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Lehreinheit'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$result = $this->BisioModel->update(
+			[
+				'aufnahmetermin_id' =>  $formData['aufnahmetermin_id']
+			],
+			[
+				'student_uid' => $student_uid,
+				'von' => $_POST['von'],
+				'bis' => $_POST['bis'],
+				'mobilitaetsprogramm_code' => $_POST['mobilitaetsprogramm_code'],
+				'nation_code' => $_POST['nation_code'],
+				'herkunftsland_code' => $_POST['herkunftsland_code'],
+				'lehreinheit_id' => $_POST['lehreinheit_id'],
+				'ort' => $formData['ort'],
+				'universitaet' => $formData['universitaet'],
+				'ects_erworben' => $_POST['ects_erworben'] ,
+				'ects_angerechnet' => $_POST['ects_angerechnet'],
+				'updateamum' => date('c'),
+				'updatevon' => $authUID,
+			]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function deleteAufnahmetermin($aufnahmetermin_id)
+	{
+		//check if extension table exists
+		$result =  $this->BisioModel->tableExists('extension', 'tbl_mo_bisioidzuordnung');
+		$data = $this->getDataOrTerminateWithError($result);
+
+		//if table exists check if existing entry
+		if(!empty($data))
+		{
+			$this->BisioModel->addSelect("count(*)");
+			$this->BisioModel->addJoin('extension.tbl_mo_bisioidzuordnung mo', 'ON (mo.aufnahmetermin_id = bis.tbl_bisio.aufnahmetermin_id)', 'LEFT');
+
+			$resultCheckMo = $this->BisioModel->loadWhere(
+				array('mo.aufnahmetermin_id' => $aufnahmetermin_id)
+			);
+
+			$resultCheckMo = $this->getDataOrTerminateWithError($resultCheckMo);
+			$count = current($resultCheckMo)->count;
+
+			$existsInExtension = $count > 0 ? true : false;
+
+			if($existsInExtension)
+				$this->terminateWithError($this->p->t('mobility', 'error_existingEntryInExtension'), self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->BisioModel->delete(
+			array('aufnahmetermin_id' => $aufnahmetermin_id)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getLVList($studiengang_kz)
+	{
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+		$result = $this->LehrveranstaltungModel->getLvsByStudiengangkz($studiengang_kz);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getAllLehreinheiten()
+	{
+		$lv_id = $this->input->post('lv_id');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+
+		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+
+		$result = $this->LehreinheitModel->getLesFromLvIds($lv_id, $studiensemester_kurzbz);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getLvsandLesByStudent($student_uid)
+	{
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+		$result = $this->LehrveranstaltungModel->getLvsByStudent($student_uid);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$lv_ids = array();
+		$allData = array();
+
+		foreach ($data as $lehrveranstaltung) {
+			$lv_ids[] = $lehrveranstaltung->lehrveranstaltung_id;
+		}
+
+		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+
+		foreach ($lv_ids as $id)
+		{
+			$result = $this->LehreinheitModel->getLesFromLvIds($id);
+			$data = $this->getDataOrTerminateWithError($result);
+
+			if (is_array($data)) {
+				$allData = array_merge($allData, $data);
+			}
+		}
+
+		return $this->terminateWithSuccess($allData);
+	}
+
+	public function getPurposes($aufnahmetermin_id)
+	{
+		$aufnahmetermin_id = (int)$aufnahmetermin_id;
+
+		$this->load->model('codex/Bisiozweck_model', 'BisiozweckModel');
+
+		$this->BisiozweckModel->addSelect("*");
+		$this->BisiozweckModel->addJoin('bis.tbl_zweck zw', 'ON (zw.zweck_code = bis.tbl_bisio_zweck.zweck_code)');
+
+		$result = $this->BisiozweckModel->loadWhere(
+			array('aufnahmetermin_id' => $aufnahmetermin_id)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getSupports($aufnahmetermin_id)
+	{
+		$aufnahmetermin_id = (int)$aufnahmetermin_id;
+
+		$this->load->model('codex/Bisioaufenthaltfoerderung_model', 'BisioaufenthaltfoerderungModel');
+
+		$this->BisioaufenthaltfoerderungModel->addSelect("*");
+		$this->BisioaufenthaltfoerderungModel->addJoin('bis.tbl_aufenthaltfoerderung af', 'ON (af.aufenthaltfoerderung_code = bis.tbl_bisio_aufenthaltfoerderung.aufenthaltfoerderung_code)');
+
+		$result = $this->BisioaufenthaltfoerderungModel->loadWhere(
+			array('aufnahmetermin_id' => $aufnahmetermin_id)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getListPurposes()
+	{
+		$this->load->model('codex/Zweck_model', 'ZweckModel');
+
+		$result = $this->ZweckModel->load();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getListSupports()
+	{
+		$this->load->model('codex/Aufenthaltfoerderung_model', 'AufenthaltfoerderungModel');
+
+		$result = $this->AufenthaltfoerderungModel->load();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function addAufnahmeterminPurpose($aufnahmetermin_id, $local_purpose = null)
+	{
+		$zweck_code = $this->input->post('zweck_code');
+
+		if($local_purpose){
+			$zweck_code = $local_purpose;
+		}
+
+		$this->load->model('codex/Bisiozweck_model', 'BisiozweckModel');
+		if(!$local_purpose)
+		{
+			$check = $this->BisiozweckModel->loadWhere(
+				[
+					'aufnahmetermin_id' => $aufnahmetermin_id,
+					'zweck_code' => $zweck_code,
+				]
+			);
+			if (hasData($check))
+			{
+				$this->terminateWithError($this->p->t('ui', 'error_entryExisting'), self::ERROR_TYPE_GENERAL);
+			}
+		}
+
+		$result = $this->BisiozweckModel->insert(
+			array(
+				'aufnahmetermin_id' => $aufnahmetermin_id,
+				'zweck_code' => $zweck_code
+			)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		if($local_purpose)
+		{
+			return $data;
+		}
+
+		return $this->terminateWithSuccess(current($data));
+	}
+
+	public function deleteAufnahmeterminPurpose($aufnahmetermin_id)
+	{
+		$zweck_code = $this->input->post('zweck_code');
+
+		$this->load->model('codex/Bisiozweck_model', 'BisiozweckModel');
+
+
+		$result = $this->BisiozweckModel->delete(
+			array(
+				'aufnahmetermin_id' => $aufnahmetermin_id,
+				'zweck_code' => $zweck_code
+			)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		return $this->terminateWithSuccess(current($data));
+	}
+
+	public function addAufnahmeterminSupport($aufnahmetermin_id, $local_support = null)
+	{
+		$aufenthaltfoerderung_code = $this->input->post('aufenthaltfoerderung_code');
+
+		if($local_support){
+			$aufenthaltfoerderung_code = $local_support;
+		}
+
+		$this->load->model('codex/Bisioaufenthaltfoerderung_model', 'BisioaufenthaltfoerderungModel');
+
+		if(!$local_support)
+		{
+			$check = $this->BisioaufenthaltfoerderungModel->loadWhere(
+				[
+					'aufnahmetermin_id' => $aufnahmetermin_id,
+					'aufenthaltfoerderung_code' => $aufenthaltfoerderung_code,
+				]
+			);
+			if (hasData($check))
+			{
+				$this->terminateWithError($this->p->t('ui', 'error_entryExisting'), self::ERROR_TYPE_GENERAL);
+			}
+		}
+
+		$result = $this->BisioaufenthaltfoerderungModel->insert(
+			array(
+				'aufnahmetermin_id' => $aufnahmetermin_id,
+				'aufenthaltfoerderung_code' => $aufenthaltfoerderung_code
+			)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		if($local_support)
+		{
+			return $data;
+		}
+
+		return $this->terminateWithSuccess(current($data));
+	}
+
+	public function deleteAufnahmeterminSupport($aufnahmetermin_id)
+	{
+		$aufenthaltfoerderung_code = $this->input->post('aufenthaltfoerderung_code');
+
+		$this->load->model('codex/Bisioaufenthaltfoerderung_model', 'BisioaufenthaltfoerderungModel');
+
+		$result = $this->BisioaufenthaltfoerderungModel->delete(
+			array(
+				'aufnahmetermin_id' => $aufnahmetermin_id,
+				'aufenthaltfoerderung_code' => $aufenthaltfoerderung_code
+			)
+		);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		return $this->terminateWithSuccess(current($data));
+	}
+}
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 42de1b02f..f65daf627 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -128,6 +128,11 @@ class Config extends FHCAPI_Controller
 			'component' => './Stv/Studentenverwaltung/Details/Mobility.js'
 		];
 
+		$result['admissionDates'] = [
+			'title' => $this->p->t('stv', 'tab_admissionDates'),
+			'component' => './Stv/Studentenverwaltung/Details/Aufnahmetermine.js'
+		];
+
 		Events::trigger('stv_conf_student', function & () use (&$result) {
 			return $result;
 		});
diff --git a/public/js/api/factory/stv.js b/public/js/api/factory/stv.js
index 7ea387263..95bc227f5 100644
--- a/public/js/api/factory/stv.js
+++ b/public/js/api/factory/stv.js
@@ -29,6 +29,7 @@ import exam from './stv/exam.js';
 import abschlusspruefung from './stv/abschlusspruefung.js';
 import grades from './stv/grades.js';
 import mobility from './stv/mobility.js';
+import admissionDates from './stv/admissionDates.js';
 
 export default {
 	app,
@@ -44,5 +45,6 @@ export default {
 	exam,
 	abschlusspruefung,
 	grades,
-	mobility
+	mobility,
+	admissionDates
 };
\ No newline at end of file
diff --git a/public/js/api/factory/stv/admissionDates.js b/public/js/api/factory/stv/admissionDates.js
new file mode 100644
index 000000000..fc96f47be
--- /dev/null
+++ b/public/js/api/factory/stv/admissionDates.js
@@ -0,0 +1,25 @@
+/**
+ * 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 {
+	getAufnahmetermine(prestudent_id) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/aufnahmetermine/' + prestudent_id
+		};
+	},
+}
\ No newline at end of file
diff --git a/public/js/api/stv/admissionDates.js b/public/js/api/stv/admissionDates.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine.js
new file mode 100644
index 000000000..4ad8c6002
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine.js
@@ -0,0 +1,26 @@
+import AdmissionDates from "./Aufnahmetermine/Aufnahmetermine.js";
+import HeaderPlacement from "./Aufnahmetermine/HeaderReihungstest.js";
+
+export default {
+	name: "TabAdmissionDates",
+	components: {
+		AdmissionDates,
+		HeaderPlacement
+	},
+	provide() {
+		return {
+			config: this.config
+		};
+	},
+	props: {
+		modelValue: Object,
+	},
+	data(){
+		return {}
+	},
+	template: `
+	<div class="stv-details-mobility h-30 d-flex flex-column">
+		<header-placement></header-placement>
+		<admission-dates ref="tbl_admission_dates" :student="modelValue"></admission-dates>
+	</div>`
+};
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
new file mode 100644
index 000000000..58f440836
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -0,0 +1,58 @@
+import {CoreFilterCmpt} from "../../../../filter/Filter.js";
+import BsModal from "../../../../Bootstrap/Modal.js";
+import FormForm from '../../../../Form/Form.js';
+import FormInput from '../../../../Form/Input.js';
+
+import ApiStvAdmissionDates from '../../../../../api/factory/stv/admissionDates';
+
+export default {
+	name: 'ListAdmissionDates',
+	components: {
+		CoreFilterCmpt,
+		BsModal,
+		FormForm,
+		FormInput
+	},
+	inject: {
+		$reloadList: {
+			from: '$reloadList',
+			required: true
+		},
+	},
+	props: {
+		student: Object
+	},
+	data() {
+		return {
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: () => this.$api.call(
+					ApiStvAdmissionDates.getAufnahmetermin(this.student.prestudent_id)
+				),
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "aufnahmetermin_id", field: "aufnahmetermin_id"},
+					{title: "prestudent_id", field: "prestudent_id"},
+				],
+				layout: 'fitDataFill',
+				layoutColumnsOnNewData: false,
+				height: 'auto',
+				minHeight: 200,
+				index: 'aufnahmetermin_id',
+				persistenceID: 'stv-details-table_admission-dates'
+			},
+			tabulatorEvents: [],
+			formData: {},
+			statusNew: true,
+		}
+	},
+	methods: {},
+	created() {
+	},
+	template: `
+	<div class="stv-details-admission-dates-table h-100 pb-3">
+		<h4>Allgemein</h4>
+		
+	</div>
+	`
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js
new file mode 100644
index 000000000..529979b3c
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js
@@ -0,0 +1,14 @@
+export default {
+	name: 'HeaderPlacement',
+	data(){
+		return {
+			statusNew: true,
+		}
+	},
+	template: `
+		<div class="stv-details-admission-header-placement h-100 pb-3">
+			<h4>Studiengang</h4>
+		
+		</div>
+	`
+}
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index cd17215ee..fd54d9f66 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41393,8 +41393,31 @@ and represent the current state of research on the topic. The prescribed citatio
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
 	// PROJEKTARBEITSBEURTEILUNG SS2025 ENDE ---------------------------------------------------------------------------
+	// FHC4 STUDIERENDENVERWALTUNG AUFNAHMETERMINE START ---------------------------------------------------------------
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_admissionDates',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Aufnahmetermine',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Admission Dates',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// FHC4 STUDIERENDENVERWALTUNG AUFNAHMETERMINE ENDE	 ---------------------------------------------------------------
+
 );
 
 

From 08b27edd648762142c1bfc4c0021dbd648f31edb Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 22 Apr 2025 14:29:45 +0200
Subject: [PATCH 119/572] Refactoring FhcApi_Factory

---
 public/js/api/factory/stv/group.js            | 33 +++++++++++++++++++
 .../Details/Gruppen/Gruppen.js                | 14 ++++----
 2 files changed, 40 insertions(+), 7 deletions(-)
 create mode 100644 public/js/api/factory/stv/group.js

diff --git a/public/js/api/factory/stv/group.js b/public/js/api/factory/stv/group.js
new file mode 100644
index 000000000..b395fbf43
--- /dev/null
+++ b/public/js/api/factory/stv/group.js
@@ -0,0 +1,33 @@
+/**
+ * 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 {
+	getGruppen(id) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/Gruppen/getGruppen/' + id
+		};
+	},
+	deleteGroup(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/Gruppen/deleteGruppe/',
+			params
+		};
+	}
+}
+
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
index 6434f9fa8..67f422efb 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
@@ -1,5 +1,7 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 
+import ApiStvGroups from '../../../../../api/factory/stv/group.js';
+
 export default {
 	name: 'TblGroups',
 	components: {
@@ -17,12 +19,9 @@ export default {
 		return {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
-				ajaxRequestFunc: this.$fhcApi.factory.stv.group.getGruppen,
-				ajaxParams: () => {
-					return {
-						id: this.student.uid
-					};
-				},
+				ajaxRequestFunc: () => this.$api.call(
+					ApiStvGroups.getGruppen(this.student.uid)
+				),
 				ajaxResponse: (url, params, response) => response.data,
 				initialFilter: [
 					{field: "uid", type: "=", value: this.student.uid},
@@ -130,7 +129,8 @@ export default {
 				gruppe_kurzbz: gruppe_kurzbz
 			};
 
-			return this.$fhcApi.factory.stv.group.deleteGroup(group_id)
+			return this.$api
+				.call(ApiStvGroups.deleteGroup(group_id))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 				}).catch(this.$fhcAlert.handleSystemError)

From 65c398498fc538df8e93e543cb01b45a6a412ce6 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 23 Apr 2025 09:32:49 +0200
Subject: [PATCH 120/572] Refactoring FhcApi_Factory View Modal

---
 public/js/api/factory/messages/messages.js    | 112 ++++++++++++++++++
 public/js/api/messages/person.js              |   4 +-
 .../Messages/Details/NewMessage/Modal.js      |  47 +++++---
 .../Messages/Details/NewMessage/NewDiv.js     |  45 ++++---
 .../Messages/Details/TableMessages.js         |  42 ++++---
 5 files changed, 201 insertions(+), 49 deletions(-)
 create mode 100644 public/js/api/factory/messages/messages.js

diff --git a/public/js/api/factory/messages/messages.js b/public/js/api/factory/messages/messages.js
new file mode 100644
index 000000000..8424e14f2
--- /dev/null
+++ b/public/js/api/factory/messages/messages.js
@@ -0,0 +1,112 @@
+/**
+ * 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 {
+	//TODO(manu) check how to get params size and page
+	getMessages(params) {
+		console.log('page ' + params.page + ' size ' + params.size);
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/messages/messages/getMessages/'
+				+ params.id + '/'
+				+ params.type + '/'
+				+ params.size + '/'
+				+ params.page
+		};
+	},
+	getVorlagen(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/messages/messages/getVorlagen/'
+		};
+	},
+	getMsgVarsLoggedInUser(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/messages/messages/getMsgVarsLoggedInUser/'
+		};
+	},
+	getMessageVarsPerson(userParams){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/messages/messages/getMessageVarsPerson/' + userParams.id + '/' + userParams.type_id
+		};
+	},
+	getMsgVarsPrestudent(userParams){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/messages/messages/getMsgVarsPrestudent/' + userParams.id + '/' + userParams.type_id
+		};
+	},
+	getPersonId(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/messages/messages/getPersonId/' + params.id + '/' + params.type_id
+		};
+	},
+	getUid(userParams){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/messages/messages/getUid/' + userParams.id + '/' + userParams.type_id
+		};
+	},
+	getVorlagentext(vorlage_kurzbz){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/messages/messages/getVorlagentext/' + vorlage_kurzbz
+		};
+	},
+	getNameOfDefaultRecipient(params){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/messages/messages/getNameOfDefaultRecipient/' + params.id + '/' + params.type_id
+		};
+	},
+	getPreviewText(userParams, params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/messages/messages/getPreviewText/' + userParams.id + '/' + userParams.type_id,
+			params
+		};
+	},
+	getReplyData(messageId){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/messages/messages/getReplyData/' + messageId
+		};
+	},
+	sendMessageFromModalContext(id, params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/messages/messages/sendMessage/' + id,
+			params
+		};
+	},
+	sendMessage(id, params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/messages/messages/sendMessage/' + id,
+			params
+		};
+	},
+	deleteMessage(messageId){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/messages/messages/deleteMessage/' + messageId
+		};
+	}
+}
\ No newline at end of file
diff --git a/public/js/api/messages/person.js b/public/js/api/messages/person.js
index 9bfae6f38..f41050770 100644
--- a/public/js/api/messages/person.js
+++ b/public/js/api/messages/person.js
@@ -3,7 +3,7 @@ export default {
 		console.log('page ' + params.page + ' size ' + params.size);
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessages/' + params.id + '/' + params.type + '/' + params.size + '/' + params.page);
 	},
-	getVorlagen(){
+/*	getVorlagen(){
 		return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagen/');
 	},
 	getMsgVarsLoggedInUser(){
@@ -44,5 +44,5 @@ export default {
 	},
 	deleteMessage(messageId){
 		return this.$fhcApi.post('api/frontend/v1/messages/messages/deleteMessage/' + messageId);
-	}
+	}*/
 }
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index 33698f1c8..5bbf29f16 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -4,6 +4,8 @@ import FormInput from '../../../Form/Input.js';
 import ListBox from "../../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
 import DropdownComponent from "../../../VorlagenDropdown/VorlagenDropdown.js";
 
+import ApiMessages from '../../../../api/factory/messages/messages.js';
+
 export default {
 	name: "ModalNewMessages",
 	components: {
@@ -104,10 +106,8 @@ export default {
 			};
 			data.append('data', JSON.stringify(merged));
 
-			return this.$fhcApi.factory.messages.person.sendMessageFromModalContext(
-				this.$refs.formMessage,
-				this.uid,
-				data)
+			return this.$refs.formMessage
+				.call(ApiMessages.sendMessageFromModalContext(this.uid, data))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
 					this.hideModal('modalNewMessage');
@@ -122,7 +122,8 @@ export default {
 				);
 		},
 		getVorlagentext(vorlage_kurzbz){
-			return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz)
+			return this.$api
+				.call(ApiMessages.getVorlagentext(vorlage_kurzbz))
 				.then(response => {
 					this.formData.body = response.data;
 				}).catch(this.$fhcAlert.handleSystemError)
@@ -136,9 +137,10 @@ export default {
 			const data = new FormData();
 
 			data.append('data', JSON.stringify(this.formData.body));
-			return this.$fhcApi.factory.messages.person.getPreviewText({
-				id: this.id,
-				type_id: this.typeId}, data)
+			return this.$api
+				.call(ApiMessages.getPreviewText({
+					id: this.id,
+					type_id: this.typeId}, data))
 				.then(response => {
 					this.previewText = response.data;
 				}).catch(this.$fhcAlert.handleSystemError)
@@ -200,7 +202,8 @@ export default {
 				id: id,
 				type_id: typeId
 			};
-			this.$fhcApi.factory.messages.person.getUid(params)
+			this.$api
+				.call(ApiMessages.getUid(params))
 				.then(result => {
 					this.uid = result.data;
 				})
@@ -238,9 +241,9 @@ export default {
 				if (!newMessageId) return;
 
 				try {
-					const result = await this.$fhcApi.factory.messages.person.getReplyData(newMessageId);
+					//const result = await this.$fhcApi.factory.messages.person.getReplyData(newMessageId);
+					const result = await this.$api.call(ApiMessages.getReplyData(newMessageId));
 					this.replyData = result.data;
-					console.log(this.replyData);
 
 					if (this.replyData.length > 0) {
 						this.formData.subject = this.replyData[0].replySubject;
@@ -261,7 +264,9 @@ export default {
 				id: this.id,
 				type_id: this.typeId
 			};
-			this.$fhcApi.factory.messages.person.getMessageVarsPerson(params)
+			//this.$fhcApi.factory.messages.person.getMessageVarsPerson(params)
+			this.$api
+				.call(ApiMessages.getMessageVarsPerson(params))
 				.then(result => {
 					this.fieldsPerson = result.data;
 					const person = this.fieldsPerson[0];
@@ -278,7 +283,8 @@ export default {
 				id: this.id,
 				type_id: this.typeId
 			};
-			this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(params)
+			this.$api
+				.call(ApiMessages.getMsgVarsPrestudent(params))
 				.then(result => {
 					this.fieldsPrestudent = result.data;
 					const prestudent = this.fieldsPrestudent[0];
@@ -290,7 +296,8 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		}
 
-		this.$fhcApi.factory.messages.person.getMsgVarsLoggedInUser()
+		this.$api
+			.call(ApiMessages.getMsgVarsLoggedInUser())
 			.then(result => {
 				this.fieldsUser = result.data;
 				const user = this.fieldsUser;
@@ -301,9 +308,10 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
-		this.$fhcApi.factory.messages.person.getNameOfDefaultRecipient({
-			id: this.id,
-			type_id: this.typeId})
+		this.$api
+			.call(ApiMessages.getNameOfDefaultRecipient({
+				id: this.id,
+				type_id: this.typeId}))
 			.then(result => {
 				this.defaultRecipient = result.data;
 				this.recipientsArray.push({
@@ -314,7 +322,8 @@ export default {
 
 		//case of reply
 		if(this.messageId) {
-			this.$fhcApi.factory.messages.person.getReplyData(this.messageId)
+			this.$api
+				.call(ApiMessages.getReplyData(this.messageId))
 				.then(result => {
 					this.replyData = result.data;
 					this.formData.subject = this.replyData[0].replySubject;
@@ -380,7 +389,7 @@ export default {
 									:label="$p.t('global','nachricht')  + ' *'"
 									type="textarea"
 									v-model="formData.body"
-									name="text"
+									name="body"
 									rows="15"
 									cols="75"
 									>
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index d8db657df..11335ed2a 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -2,6 +2,7 @@ import FormForm from '../../../Form/Form.js';
 import FormInput from '../../../Form/Input.js';
 import ListBox from "../../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
 import DropdownComponent from '../../../VorlagenDropdown/VorlagenDropdown.js';
+import ApiMessages from "../../../../api/factory/messages/messages";
 
 export default {
 	name: "ComponentNewMessages",
@@ -119,9 +120,11 @@ export default {
 			data.append('data', JSON.stringify(merged));
 
 			//this.uid is necessary for existing sendFunction
-			return this.$fhcApi.factory.messages.person.sendMessage(
+/*			return this.$fhcApi.factory.messages.person.sendMessage(
 				this.uid,
-				data)
+				data)*/
+			return this.$api
+				.call(ApiMessages.sendMessage(this.uid, data))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
 					this.hideTemplate();
@@ -140,7 +143,9 @@ export default {
 				);
 		},
 		getVorlagentext(vorlage_kurzbz){
-			return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz)
+		//	return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz)
+			return this.$api
+				.call(ApiMessages.getVorlagentext(vorlage_kurzbz))
 				.then(response => {
 					this.formData.body = response.data;
 				}).catch(this.$fhcAlert.handleSystemError)
@@ -152,9 +157,13 @@ export default {
 			const data = new FormData();
 
 			data.append('data', JSON.stringify(this.formData.body));
-			return this.$fhcApi.factory.messages.person.getPreviewText({
+/*			return this.$fhcApi.factory.messages.person.getPreviewText({
 				id: id,
-				type_id: typeId}, data)
+				type_id: typeId}, data)*/
+			return this.$api
+				.call(ApiMessages.getPreviewText({
+					id: this.id,
+					type_id: this.typeId}, data))
 				.then(response => {
 					this.previewText = response.data;
 				}).catch(this.$fhcAlert.handleSystemError)
@@ -226,7 +235,8 @@ export default {
 				id: id,
 				type_id: typeId
 			};
-			this.$fhcApi.factory.messages.person.getUid(params)
+			this.$api
+				.call(ApiMessages.getUid(params))
 				.then(result => {
 					this.uid = result.data;
 				})
@@ -262,7 +272,9 @@ export default {
 					id: this.id,
 					type_id: this.typeId
 				};
-				this.$fhcApi.factory.messages.person.getMessageVarsPerson(params)
+			//	this.$fhcApi.factory.messages.person.getMessageVarsPerson(params)
+				this.$api
+				.call(ApiMessages.getMessageVarsPerson(params))
 					.then(result => {
 						this.fieldsPerson = result.data;
 						const person = this.fieldsPerson[0];
@@ -279,7 +291,9 @@ export default {
 				id: this.id,
 				type_id: this.typeId
 			};
-			this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(params)
+			//this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(params)
+			this.$api
+				.call(ApiMessages.getMsgVarsPrestudent(params))
 				.then(result => {
 					this.fieldsPrestudent = result.data;
 					const prestudent = this.fieldsPrestudent[0];
@@ -292,7 +306,8 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		}
 
-		this.$fhcApi.factory.messages.person.getMsgVarsLoggedInUser()
+		this.$api
+			.call(ApiMessages.getMsgVarsLoggedInUser())
 			.then(result => {
 				this.fieldsUser = result.data;
 				const user = this.fieldsUser;
@@ -303,10 +318,11 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
-		this.$fhcApi.factory.messages.person.getNameOfDefaultRecipient({
-			id: this.id,
-			type_id: this.typeId
-		}).then(result => {
+		this.$api
+			.call(ApiMessages.getNameOfDefaultRecipient({
+				id: this.id,
+				type_id: this.typeId}))
+			.then(result => {
 				this.defaultRecipient = result.data;
 				this.recipientsArray.push({
 					'uid': this.uid,
@@ -316,7 +332,8 @@ export default {
 
 		//case of reply
 		if(this.messageId != null) {
-			this.$fhcApi.factory.messages.person.getReplyData(this.messageId)
+			this.$api
+				.call(ApiMessages.getReplyData(this.messageId))
 				.then(result => {
 					this.replyData = result.data;
 					this.formData.subject = this.replyData[0].replySubject;
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 9047d6726..07fdd8f20 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -1,6 +1,8 @@
 import {CoreFilterCmpt} from "../../filter/Filter.js";
 import FormForm from '../../Form/Form.js';
 
+import ApiMessages from '../../../api/factory/messages/messages.js';
+
 export default {
 	name: "TableMessages",
 	components: {
@@ -27,8 +29,20 @@ export default {
 	},
 	data(){
 		return {
+/*			paginationSize: 15,
+			paginationInitialPage: 1,*/
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
+				//TODO(Manu) how to handle size and page?
+/*				ajaxRequestFunc: () => this.$api.call(
+					ApiMessages.getMessages({
+						id: this.id,
+						type: this.typeId,
+						size: this.paginationSize,
+						page: this.paginationInitialPage
+					})
+				),*/
+		//OLD WORKING VERSION
 				ajaxRequestFunc: this.$fhcApi.factory.messages.person.getMessages,
 				ajaxParams: () => {
 					return {
@@ -36,6 +50,7 @@ export default {
 						type: this.typeId
 					};
 				},
+
 				ajaxResponse: (url, params, response) => this.buildTreemap(response),
 				//ajaxResponse: (url, params, response) => this.buildTreemap(response.data),
 				columns: [
@@ -222,7 +237,8 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		deleteMessage(message_id){
-			return this.$fhcApi.factory.messages.person.deleteMessage(message_id)
+			return this.$api
+				.call(ApiMessages.deleteMessage(message_id))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 				}).catch(this.$fhcAlert.handleSystemError)
@@ -276,13 +292,11 @@ export default {
 					}
 				});
 
-		// to avoid endless loop
-		if (iteration > messages.length) break;
-	}
-	return {data: messageNested, last_page};
-}
-
-
+			// to avoid endless loop
+			if (iteration > messages.length) break;
+			}
+		return {data: messageNested, last_page};
+		}
 	},
 	computed: {
 		statusText(){
@@ -310,11 +324,12 @@ export default {
 				id: this.id,
 				type_id: this.typeId
 			};
-		this.$fhcApi.factory.messages.person.getPersonId(params)
-			.then(result => {
-				this.personId = result.data;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
+			this.$api
+				.call(ApiMessages.getPersonId(params))
+				.then(result => {
+					this.personId = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		}
 	},
 	template: `
@@ -353,7 +368,6 @@ export default {
 		</div>
 
 		<!--View Infocenter-->
-		<!--TODO(Manu) finish later -->
 		<div v-if="messageLayout=='listTableTop'">
 
 				<!--table-->

From 3200a94d17bfc4c87c3d98e845e8449b9aafd4f9 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 23 Apr 2025 11:06:08 +0200
Subject: [PATCH 121/572] Refactoring FhcApi_Factory

---
 public/js/api/factory/stv/jointstudies.js     | 81 +++++++++++++++++++
 .../Details/JointStudies/JointStudies.js      | 42 ++++++----
 2 files changed, 107 insertions(+), 16 deletions(-)
 create mode 100644 public/js/api/factory/stv/jointstudies.js

diff --git a/public/js/api/factory/stv/jointstudies.js b/public/js/api/factory/stv/jointstudies.js
new file mode 100644
index 000000000..18f398bb4
--- /dev/null
+++ b/public/js/api/factory/stv/jointstudies.js
@@ -0,0 +1,81 @@
+/**
+ * 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 {
+	getStudies(uid) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/GemeinsameStudien/getStudien/' + uid
+		};
+	},
+	getTypenMobility(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/GemeinsameStudien/getTypenMobility/'
+		};
+	},
+	getStudiensemester(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/GemeinsameStudien/getStudiensemester/'
+		};
+	},
+	getStudyprograms(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/GemeinsameStudien/getStudienprogramme/'
+		};
+	},
+	getListPartner(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/GemeinsameStudien/getPartnerfirmen/'
+		};
+	},
+	getStatiPrestudent(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/GemeinsameStudien/getStatiPrestudent/'
+		};
+	},
+	loadStudy(id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/GemeinsameStudien/loadStudie/' + id
+		};
+	},
+	insertStudy(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/GemeinsameStudien/insertStudie/',
+			params
+		};
+	},
+	updateStudy(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/GemeinsameStudien/updateStudie/',
+			params
+		};
+	},
+	deleteStudy(id){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/GemeinsameStudien/deleteStudie/' + id
+		};
+	},
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
index 1c75486de..16d1593d3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
@@ -3,6 +3,9 @@ import BsModal from "../../../../Bootstrap/Modal.js";
 import FormForm from "../../../../Form/Form.js";
 import FormInput from "../../../../Form/Input.js";
 
+import ApiStvJointstudies from '../../../../../api/factory/stv/jointstudies.js';
+import ApiStvMobility from "../../../../../api/factory/stv/mobility";
+
 export default {
 	name: 'Tbl_JointStudies',
 	components: {
@@ -23,12 +26,9 @@ export default {
 		return {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
-				ajaxRequestFunc: this.$fhcApi.factory.stv.jointstudies.getStudies,
-				ajaxParams: () => {
-					return {
-						id: this.student.prestudent_id
-					};
-				},
+				ajaxRequestFunc: () => this.$api.call(
+					ApiStvJointstudies.getStudies(this.student.prestudent_id)
+				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
 					{title: "mobilitaet_id", field: "mobilitaet_id", visible: false},
@@ -217,7 +217,8 @@ export default {
 				prestudent_id: this.student.prestudent_id,
 				formData: this.formData
 			};
-			return this.$fhcApi.factory.stv.jointstudies.insertStudy(this.$refs.formJointStudies, data)
+			return this.$refs.formJointStudies
+				.call(ApiStvJointstudies.insertStudy(data))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.hideModal("jointstudyModal");
@@ -233,7 +234,8 @@ export default {
 				prestudent_id: this.student.prestudent_id,
 				formData: this.formData
 			};
-			return this.$fhcApi.factory.stv.jointstudies.updateStudy(this.$refs.formJointStudies, data)
+			return this.$refs.formJointStudies
+				.call(ApiStvJointstudies.updateStudy(data))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.hideModal("jointstudyModal");
@@ -245,14 +247,16 @@ export default {
 				});
 		},
 		loadJointStudy(mobilitaet_id) {
-			return this.$fhcApi.factory.stv.jointstudies.loadStudy(mobilitaet_id)
+			return this.$api
+				.call(ApiStvJointstudies.loadStudy(mobilitaet_id))
 				.then(result => {
 					this.formData = result.data;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		deleteJointStudy(mobilitaet_id) {
-			return this.$fhcApi.factory.stv.jointstudies.deleteStudy(mobilitaet_id)
+			return this.$api
+				.call(ApiStvJointstudies.deleteStudy(mobilitaet_id))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 				})
@@ -276,32 +280,38 @@ export default {
 		}
 	},
 	created(){
-		this.$fhcApi.factory.stv.jointstudies.getTypenMobility()
+		this.$api
+			.call(ApiStvJointstudies.getTypenMobility())
 			.then(result => {
 				this.listTypenMobility = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		this.$fhcApi.factory.stv.jointstudies.getStudiensemester()
+		this.$api
+			.call(ApiStvJointstudies.getStudiensemester())
 			.then(result => {
 				this.listStudiensemester = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		this.$fhcApi.factory.stv.mobility.getProgramsMobility()
+		this.$api
+			.call(ApiStvMobility.getProgramsMobility())
 			.then(result => {
 				this.programsMobility = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		this.$fhcApi.factory.stv.jointstudies.getStudyprograms()
+		this.$api
+			.call(ApiStvJointstudies.getStudyprograms())
 			.then(result => {
 				this.listStudienprogramme = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		this.$fhcApi.factory.stv.jointstudies.getListPartner()
+		this.$api
+			.call(ApiStvJointstudies.getListPartner())
 			.then(result => {
 				this.listPartner = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
-		this.$fhcApi.factory.stv.jointstudies.getStatiPrestudent()
+		this.$api
+			.call(ApiStvJointstudies.getStatiPrestudent())
 			.then(result => {
 				this.statiPrestudent = result.data;
 			})

From 8442a3d758e837114c23827fc9065fb807234e9f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 23 Apr 2025 12:03:21 +0200
Subject: [PATCH 122/572] Refactoring FhcApi_Factory

---
 public/js/api/factory/stv/exemptions.js       | 75 +++++++++++++++++++
 .../Details/Anrechnungen/Anrechnungen.js      | 60 +++++++++------
 2 files changed, 113 insertions(+), 22 deletions(-)
 create mode 100644 public/js/api/factory/stv/exemptions.js

diff --git a/public/js/api/factory/stv/exemptions.js b/public/js/api/factory/stv/exemptions.js
new file mode 100644
index 000000000..2bf8ee610
--- /dev/null
+++ b/public/js/api/factory/stv/exemptions.js
@@ -0,0 +1,75 @@
+/**
+ * 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 {
+	getAnrechnungen(id) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/anrechnungen/getAnrechnungen/' + id
+		};
+	},
+	getLehrveranstaltungen(prestudent_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/anrechnungen/getLehrveranstaltungen/' + prestudent_id
+		};
+	},
+	getBegruendungen(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/anrechnungen/getBegruendungen/'
+		};
+	},
+	getLvsKompatibel(lv_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/anrechnungen/getLvsKompatibel/' + lv_id
+		};
+	},
+	getLektoren(studiengang_kz){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/anrechnungen/getLektoren/' + studiengang_kz
+		};
+	},
+	addNewAnrechnung(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/anrechnungen/insertAnrechnung/',
+			params
+		};
+	},
+	loadAnrechnung(anrechnung_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/anrechnungen/loadAnrechnung/' + anrechnung_id
+		};
+	},
+	editAnrechnung(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/anrechnungen/updateAnrechnung/',
+			params
+		};
+	},
+	deleteAnrechnung(anrechnung_id){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/anrechnungen/deleteAnrechnung/' + anrechnung_id
+		};
+	},
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index 9515f2be6..1d6bd20df 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -4,6 +4,9 @@ import CoreForm from "../../../../Form/Form.js";
 import FormInput from "../../../../Form/Input.js";
 import CoreNotiz from "../../../../Notiz/Notiz.js";
 
+import ApiStvExemptions from "../../../../../api/factory/stv/exemptions.js";
+import ApiNotizPerson from '../../../../../api/factory/notiz/person.js';
+
 export default {
 	name: "ExemptionComponent",
 	components: {
@@ -30,12 +33,9 @@ export default {
 		return {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
-				ajaxRequestFunc: this.$fhcApi.factory.stv.exemptions.getAnrechnungen,
-				ajaxParams: () => {
-					return {
-						id: this.student.prestudent_id
-					};
-				},
+				ajaxRequestFunc: () => this.$api.call(
+					ApiStvExemptions.getAnrechnungen(this.student.prestudent_id)
+				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
 					{title: "anrechnung_id", field: "anrechnung_id", visible: false},
@@ -83,7 +83,7 @@ export default {
 							button.innerHTML = '<i class="fa fa-xmark"></i>';
 							button.title = this.$p.t('ui', 'loeschen');
 							button.addEventListener('click', () =>
-								this.deleteAnrechnung(cell.getData().anrechnung_id)
+								this.actionDeleteAnrechnung(cell.getData().anrechnung_id)
 							);
 							container.append(button);
 
@@ -158,7 +158,8 @@ export default {
 			listKompatibleLehrveranstaltungen: [],
 			statusNew: true,
 			showNotizen: false,
-			currentAnrechnung_id: null
+			currentAnrechnung_id: null,
+			endpoint: ApiNotizPerson
 		}
 	},
 	watch: {
@@ -188,7 +189,9 @@ export default {
 				prestudent_id: this.student.prestudent_id,
 				formData: this.formData
 			};
-			return this.$fhcApi.factory.stv.exemptions.addNewAnrechnung(this.$refs.formExemptions, dataToSend)
+
+			return this.$refs.formExemptions
+				.call(ApiStvExemptions.addNewAnrechnung(dataToSend))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.$refs.anrechnungsModal.hide();
@@ -204,7 +207,8 @@ export default {
 				anrechnung_id: anrechnung_id,
 				formData: this.formData
 			};
-			return this.$fhcApi.factory.stv.exemptions.editAnrechnung(this.$refs.formExemptions, dataToSend)
+			return this.$refs.formExemptions
+				.call(ApiStvExemptions.editAnrechnung(dataToSend))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					this.$refs.anrechnungsModal.hide();
@@ -215,22 +219,30 @@ export default {
 					this.reload();
 				});
 		},
-		deleteAnrechnung(anrechnung_id){
+		actionDeleteAnrechnung(anrechnung_id) {
 			this.$fhcAlert
 				.confirmDelete()
 				.then(result => result
 					? anrechnung_id
 					: Promise.reject({handled: true}))
-				.then(this.$fhcApi.factory.stv.exemptions.deleteAnrechnung)
-				.then(result => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-					this.reload();
-				})
+				.then(this.deleteAnrechnung)
 				.catch(this.$fhcAlert.handleSystemError);
 		},
+		deleteAnrechnung(anrechnung_id){
+			return this.$api
+				.call(ApiStvExemptions.deleteAnrechnung(anrechnung_id))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
 		getLvsKompatibel(){
 			if(this.formData.lehrveranstaltung_id) {
-				this.$fhcApi.factory.stv.exemptions.getLvsKompatibel(this.formData.lehrveranstaltung_id)
+				this.$api
+					.call(ApiStvExemptions.getLvsKompatibel(this.formData.lehrveranstaltung_id))
 					.then(result => {
 						this.listKompatibleLehrveranstaltungen = result.data;
 					})
@@ -243,7 +255,8 @@ export default {
 			}
 		},
 		loadAnrechnung(anrechnung_id){
-			return this.$fhcApi.factory.stv.exemptions.loadAnrechnung(anrechnung_id)
+			return this.$api
+				.call(ApiStvExemptions.loadAnrechnung(anrechnung_id))
 				.then(result => {
 					this.formData = result.data;
 					this.getLvsKompatibel();
@@ -263,19 +276,22 @@ export default {
 		}
 	},
 	created() {
-		this.$fhcApi.factory.stv.exemptions.getLehrveranstaltungen(this.student.prestudent_id)
+		this.$api
+			.call(ApiStvExemptions.getLehrveranstaltungen(this.student.prestudent_id))
 			.then(result => {
 				this.listNewLehrveranstaltungen = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
-		this.$fhcApi.factory.stv.exemptions.getBegruendungen()
+		this.$api
+			.call(ApiStvExemptions.getBegruendungen())
 			.then(result => {
 				this.listBegruendungen = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
-		this.$fhcApi.factory.stv.exemptions.getLektoren(this.student.studiengang_kz)
+		this.$api
+			.call(ApiStvExemptions.getLektoren(this.student.studiengang_kz))
 			.then(result => {
 				this.listLektoren = result.data;
 			})
@@ -298,7 +314,7 @@ export default {
 								</form-input>
 							</div>
 						<core-notiz
-							:endpoint="$fhcApi.factory.notiz.person"
+							:endpoint="endpoint"
 							ref="formNotes"
 							notiz-layout="popupModal"
 							typeId="anrechnung_id"

From e28067259bbd9be65be83992f143a517643f4f5a Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 23 Apr 2025 13:59:31 +0200
Subject: [PATCH 123/572] WIP Abgabetool Mitarbeiter DetailComponent

---
 application/controllers/Cis/Abgabetool.php    |  29 +-
 .../controllers/api/frontend/v1/Lehre.php     |  32 +-
 .../models/education/Projektarbeit_model.php  |  30 ++
 public/js/api/lehre.js                        |   6 +
 public/js/apps/Dashboard/Fhc.js               |  17 +-
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 286 +++++++++++++++
 ...AbgabeDetail.js => AbgabeStudentDetail.js} |   8 +-
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   | 326 ++++++++++++++++++
 .../{Abgabetool.js => AbgabetoolStudent.js}   |  12 +-
 public/js/components/filter/Filter.js         |   8 +-
 .../components/verticalsplit/verticalsplit.js |   1 +
 system/phrasesupdate.php                      | 120 +++++++
 12 files changed, 853 insertions(+), 22 deletions(-)
 create mode 100644 public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
 rename public/js/components/Cis/Abgabetool/{AbgabeDetail.js => AbgabeStudentDetail.js} (98%)
 create mode 100644 public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
 rename public/js/components/Cis/Abgabetool/{Abgabetool.js => AbgabetoolStudent.js} (96%)

diff --git a/application/controllers/Cis/Abgabetool.php b/application/controllers/Cis/Abgabetool.php
index e00bbe837..e7d183f04 100644
--- a/application/controllers/Cis/Abgabetool.php
+++ b/application/controllers/Cis/Abgabetool.php
@@ -13,8 +13,10 @@ class Abgabetool extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'index' => ['basis/cis:r'],
-			'getStudentProjektarbeitAbgabeFile' => ['basis/cis:r']
+			'index' => self::PERM_LOGGED,
+			'getStudentProjektarbeitAbgabeFile' => self::PERM_LOGGED,
+			'Mitarbeiter' => self::PERM_LOGGED,
+			'Student' => self::PERM_LOGGED
 		]);
 	}
 
@@ -33,7 +35,28 @@ class Abgabetool extends Auth_Controller
 
 		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
 	}
-	
+
+	public function Student()
+	{
+
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
+	}
+
+	public function Mitarbeiter()
+	{
+
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
+	}
+
+
 	public function getStudentProjektarbeitAbgabeFile() 
 	{
 		$this->_ci =& get_instance();
diff --git a/application/controllers/api/frontend/v1/Lehre.php b/application/controllers/api/frontend/v1/Lehre.php
index b28bd2d45..a6c593d3a 100644
--- a/application/controllers/api/frontend/v1/Lehre.php
+++ b/application/controllers/api/frontend/v1/Lehre.php
@@ -42,7 +42,8 @@ class Lehre extends FHCAPI_Controller
 			'getStudentProjektarbeiten' => self::PERM_LOGGED, // TODO: abgabetool berechtigung?
 			'getStudentProjektabgaben' => self::PERM_LOGGED,
 			'postStudentProjektarbeitZwischenabgabe' => self::PERM_LOGGED,
-			'postStudentProjektarbeitEndupload' => self::PERM_LOGGED
+			'postStudentProjektarbeitEndupload' => self::PERM_LOGGED,
+			'getMitarbeiterProjektarbeiten' => self::PERM_LOGGED
 		]);
 
 		$this->load->library('PhrasesLib');
@@ -443,5 +444,34 @@ class Lehre extends FHCAPI_Controller
 			}
 		}
 	}
+
+	public function getMitarbeiterProjektarbeiten() {
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+
+//		if (!isset($uid) || isEmptyString($uid))
+//			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		$boolParamStr = $this->input->get('showall');
+		$trueStrings = ['true', '1'];
+		$falseStrings = ['false', '0'];
+
+		// Handle missing or invalid parameter
+		if ($boolParamStr === null) {
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
+		$boolParamStrLower = strtolower($boolParamStr);
+
+		if (in_array($boolParamStrLower, $trueStrings, true)) {
+			$showAllBool = true;
+		} elseif (in_array($boolParamStrLower, $falseStrings, true)) {
+			$showAllBool = false;
+		} else {
+//			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
+		
+		$projektarbeiten = $this->ProjektarbeitModel->getMitarbeiterProjektarbeiten(getAuthUID(), $showAllBool);
+		
+		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));
+	}
 }
 
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index c9c2b6b73..fb5c62149 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -211,4 +211,34 @@ class Projektarbeit_model extends DB_Model
 
 		return $this->execReadOnlyQuery($qry, array($studentUID, $maUID));
 	}
+	
+	public function getMitarbeiterProjektarbeiten($uid, $showAll){
+		$qry = "SELECT
+					*
+				FROM
+					(SELECT tbl_person.vorname, tbl_person.nachname, tbl_studiengang.typ, tbl_studiengang.kurzbz,
+							tbl_projektarbeit.projekttyp_kurzbz, tbl_projekttyp.bezeichnung, tbl_projektarbeit.titel, tbl_projektarbeit.projektarbeit_id,
+							tbl_projektbetreuer.betreuerart_kurzbz, tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
+							tbl_benutzer.uid, tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz
+					 FROM lehre.tbl_projektarbeit
+							  LEFT JOIN lehre.tbl_projektbetreuer using(projektarbeit_id)
+							  LEFT JOIN lehre.tbl_betreuerart using(betreuerart_kurzbz)
+							  LEFT JOIN public.tbl_benutzer on(uid=student_uid)
+							  LEFT JOIN public.tbl_student on(public.tbl_benutzer.uid=public.tbl_student.student_uid)
+							  LEFT JOIN public.tbl_person on(tbl_benutzer.person_id=tbl_person.person_id)
+							  LEFT JOIN lehre.tbl_lehreinheit using(lehreinheit_id)
+							  LEFT JOIN lehre.tbl_lehrveranstaltung using(lehrveranstaltung_id)
+							  LEFT JOIN public.tbl_studiengang on(lehre.tbl_lehrveranstaltung.studiengang_kz=public.tbl_studiengang.studiengang_kz)
+							  LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
+					 WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
+					   AND tbl_projektbetreuer.person_id IN (SELECT person_id FROM public.tbl_benutzer
+															 WHERE public.tbl_benutzer.person_id=lehre.tbl_projektbetreuer.person_id
+															   AND public.tbl_benutzer.uid= ? )
+						 ".($showAll?'':' AND public.tbl_benutzer.aktiv AND lehre.tbl_projektarbeit.note IS NULL ')."
+							AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Zweitbegutachter', 'Erstbetreuer', 'Senatsvorsitz', 'Senatsmitglied')
+					 ORDER BY tbl_projektarbeit.projektarbeit_id, betreuerart_kurzbz desc) as xy
+				ORDER BY nachname;";
+
+		return $this->execReadOnlyQuery($qry, array($uid));
+	}
 }
diff --git a/public/js/api/lehre.js b/public/js/api/lehre.js
index 785b6abcf..cd8c911e2 100644
--- a/public/js/api/lehre.js
+++ b/public/js/api/lehre.js
@@ -48,5 +48,11 @@ export default {
 		const url = `/Cis/Abgabetool/getStudentProjektarbeitAbgabeFile?paabgabe_id=${paabgabe_id}&student_uid=${student_uid}`;
 
 		window.location = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url
+	},
+	getMitarbeiterProjektarbeiten(uid, all) {
+		return this.$fhcApi.get(
+			`/api/frontend/v1/Lehre/getMitarbeiterProjektarbeiten?showall=${all}`
+			, {}
+		);
 	}
   }
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 0b50891b9..457d57e63 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -11,7 +11,8 @@ import CmsNews from "../../components/Cis/Cms/News.js";
 import CmsContent from "../../components/Cis/Cms/Content.js";
 import Info from "../../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
 import RoomInformation, { DEFAULT_MODE_RAUMINFO } from "../../components/Cis/Mylv/RoomInformation.js";
-import Abgabetool from "../../components/Cis/Abgabetool/Abgabetool";
+import AbgabetoolStudent from "../../components/Cis/Abgabetool/AbgabetoolStudent.js";
+import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMitarbeiter.js";
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 
@@ -31,9 +32,15 @@ const router = VueRouter.createRouter({
 			props: true
 		},
 		{
-			path: `/Cis/Abgabetool`,
-			name: 'Abgabetool',
-			component: Abgabetool,
+			path: `/Cis/Abgabetool/Student`,
+			name: 'AbgabetoolStudent',
+			component: AbgabetoolStudent,
+			props: true
+		},
+		{
+			path: `/Cis/Abgabetool/Mitarbeiter`,
+			name: 'AbgabetoolMitarbeiter',
+			component: AbgabetoolMitarbeiter,
 			props: true
 		},
 		{
@@ -211,8 +218,6 @@ const router = VueRouter.createRouter({
 	]
 })
 
-
-
 const app = Vue.createApp({
 	name: 'FhcApp',
 	data: () => ({
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
new file mode 100644
index 000000000..016e08464
--- /dev/null
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -0,0 +1,286 @@
+import BsModal from '../../Bootstrap/Modal.js';
+
+const today = new Date()
+export const AbgabeMitarbeiterDetail = {
+	name: "AbgabeMitarbeiterDetail",
+	components: {
+		BsModal,
+		InputNumber: primevue.inputnumber,
+		Checkbox: primevue.checkbox,
+		Dropdown: primevue.dropdown,
+		Textarea: primevue.textarea
+	},
+	props: {
+		projektarbeit: {
+			type: Object,
+			default: null
+		}
+	},
+	data() {
+		return {
+			eidAkzeptiert: false,
+			enduploadTermin: null,
+			allActiveLanguages: FHC_JS_DATA_STORAGE_OBJECT.server_languages,
+			form: Vue.reactive({
+				sprache: '',
+				abstract: '',
+				abstract_en: '',
+				schlagwoerter: '',
+				schlagwoerter_en: '',
+				kontrollschlagwoerter: '',
+				seitenanzahl: 1,
+			})
+		}
+	},
+	methods: {
+		openZusatzdatenModal(termin) {
+				
+		},
+		save(termin) {
+			// TODO: api speichern termin	
+		},
+		delete(termin) {
+			// TODO: api delete termin	
+		},
+		validate: function(termin) {
+			if(!termin.file.length) {
+				this.$fhcAlert.alertWarning(this.$p.t('global/warningChooseFile'));
+				return false
+			}
+
+			return true;
+		},
+		downloadAbgabe(termin) {
+			this.$fhcApi.factory.lehre.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid)
+		},
+		dateDiffInDays(datum, today){
+			const oneDayMs = 1000 * 60 * 60 * 24
+			return Math.round((new Date(datum) - new Date(today)) / oneDayMs)
+		},
+		getDateStyle(termin) {
+			const datum = new Date(termin.datum)
+			const abgabedatum = new Date(termin.abgabedatum)
+
+			// todo: rework styling but keep the color pattern logic
+			// https://wiki.fhcomplete.info/doku.php?id=cis:abgabetool_fuer_studierende
+			let color = 'white'
+			let fontColor = 'black'
+			if (termin.abgabedatum === null) {
+				if(datum < today) {
+					color = 'red'
+					fontColor = 'white'
+				} else if (datum > today && this.dateDiffInDays(datum, today) <= 12) {
+					color = 'yellow'
+				}
+			} else if(abgabedatum > datum) {
+				color = 'pink' // aka "hellrot"
+				fontColor = 'white'
+			} else {
+				color = 'green'
+			}
+
+			return 'font-color: ' + fontColor + '; background-color: ' + color
+		},
+		openBeurteilungLink(link) {
+			window.open(link, '_blank')
+		},
+		getOptionLabel(option) {
+			return option.sprache
+		}
+	},
+	watch: {
+		projektarbeit(newVal) {
+			// default select german if projektarbeit sprache was null
+			this.form.sprache = newVal.sprache ? this.allActiveLanguages.find(lang => lang.sprache == newVal.sprache) : this.allActiveLanguages.find(lang => lang.sprache == 'German')
+			this.form.abstract = newVal.abstract
+			this.form.abstract_en = newVal.abstract_en
+			this.form.schlagwoerter = newVal.schlagwoerter
+			this.form.schlagwoerter_en = newVal.schlagwoerter_en
+			this.form.kontrollschlagwoerter = newVal.kontrollschlagwoerter
+			this.form.seitenanzahl = newVal.seitenanzahl
+		}
+	},
+	computed: {
+		getEid() {
+			return this.$p.t('abgabetool/c4eidesstattlicheErklaerung')
+		},
+		getEnduploadErlaubt() {
+			return !this.eidAkzeptiert
+		}
+	},
+	created() {
+
+	},
+	mounted() {
+
+	},
+	template: `
+		<div v-if="projektarbeit">
+		
+			<h5>{{$p.t('abgabetool/c4abgabeMitarbeiterbereich')}}</h5>
+			<div class="row">
+				<p> {{projektarbeit?.student}}</p>
+				<p> {{projektarbeit?.titel}}</p>
+				<p v-if="projektarbeit?.zweitbegutachter"> {{projektarbeit?.zweitbegutachter}}</p>
+			</div>
+			<div id="uploadWrapper">
+				<div class="row" style="margin-bottom: 12px;">
+					<div style="width: 100px">{{$p.t('abgabetool/c4fixtermin')}}</div>
+					<div class="col-1">{{$p.t('abgabetool/c4zieldatum')}}</div>
+					<div class="col-1">{{$p.t('abgabetool/c4abgabetyp')}}</div>
+					<div class="col-2">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
+					<div class="col-1">{{$p.t('abgabetool/c4abgabedatum')}}</div>
+					<div class="col">
+						
+					</div>
+				</div>
+<!--			TODO: show some nothing found placeholder when abgabetermine are empty -->
+				<div class="row" v-for="termin in projektarbeit.abgabetermine">
+					<div style="width: 100px" class="d-flex justify-content-center align-items-center">
+						<p class="fhc-bullet" :class="{ 'fhc-bullet-red': termin.fixtermin, 'fhc-bullet-green': !termin.fixtermin }"></p>
+					</div>
+					<div class="col-1 d-flex justify-content-center align-items-center">
+						<div :style="getDateStyle(termin)">
+<!--							TODO: date input-->
+							{{ termin.datum?.split("-").reverse().join(".") }}
+						</div>				
+					</div>
+					<div class="col-1 d-flex justify-content-center align-items-center">
+					<!-- TODO: type dropdown select -->
+							{{ termin.bezeichnung }}
+					</div>
+					<div class="col-2 d-flex justify-content-center align-items-center">
+						<!-- TODO: abgabe kurzbz input -->
+						{{ termin.kurzbz }}
+					</div>
+					<div class="col-1 d-flex justify-content-center align-items-center">
+						{{ termin.abgabedatum?.split("-").reverse().join(".") }}
+						<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="margin-left:4px; cursor: pointer;">
+							<i class="fa-solid fa-file-pdf"></i>
+						</a>
+					</div>
+					<div class="col-6">
+						<div class="row">
+							<div class="col-3">
+								<button class="btn btn-primary border-0" @click="save(termin)" :disabled="!termin.allowedToUpload">
+									Speichern
+									<i style="margin-left: 8px" class="fa-solid fa-floppy-disk"></i>
+								</button>
+							</div>
+							<div class="col-3">
+								<button class="btn btn-primary border-0" @click="delete(termin)" :disabled="!termin.allowedToUpload">
+									Löschen
+									<i style="margin-left: 8px" class="fa-solid fa-trash"></i>
+								</button>
+							</div>
+							<div v-if="termin.endupload && hasFile" class="col-3">
+								<button class="btn btn-primary border-0" @click="openZusatzdatenModal(termin)" :disabled="!termin.allowedToUpload">
+									Löschen
+									<i style="margin-left: 8px" class="fa-solid fa-trash"></i>
+								</button>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		 </div>
+		 <bs-modal ref="modalContainerEnduploadZusatzdaten" class="bootstrap-prompt" dialogClass="modal-lg">
+			<template v-slot:title>
+				<div>
+					{{$p.t('abgabetool/c4enduploadZusatzdaten')}}
+				</div>
+				<div class="row mb-3 align-items-center">
+					
+					<p class="ml-4 mr-4">Student UID: {{ projektarbeit?.student_uid}}</p>
+				
+				</div>
+				<div class="row mb-3 align-items-center">
+					
+					<p class="ml-4 mr-4">Titel: {{ projektarbeit?.titel }}</p>
+				
+				</div>
+			</template>
+			<template v-slot:default>
+				<div class="row mb-3 align-items-center">
+					<div class="row">{{$p.t('abgabetool/c4Sprache')}}</div>
+					<div class="row">
+						<Dropdown 
+							:style="{'width': '100%'}"
+							v-model="form.sprache"
+							:options="allActiveLanguages"
+							:optionLabel="getOptionLabel">
+						</Dropdown>
+					</div>
+				</div>
+				
+				<div class="row mb-3 align-items-center">
+					<div class="row">Kontrollierte Schlagwörter</div>
+					<div class="row">
+						<Textarea v-model="form.kontrollschlagwoerter"></Textarea>
+					</div>
+				</div>
+				<div class="row mb-3 align-items-center">
+					<div class="row">{{$p.t('abgabetool/c4schlagwoerterGer')}}</div>
+					<div class="row">
+						<Textarea v-model="form.schlagwoerter"></Textarea>
+					</div>
+				</div>
+				
+				<div class="row mb-3 align-items-center">
+					<div class="row">{{$p.t('abgabetool/c4schlagwoerterEng')}}</div>
+					<div class="row">
+						<Textarea v-model="form.schlagwoerter_en"></Textarea>
+					</div>
+				</div>
+				
+				<div class="row mb-3 align-items-center">
+					<div class="row">{{$p.t('abgabetool/c4abstractGer')}}</div>
+					<div class="row">
+						<Textarea v-model="form.abstract" rows="10"></Textarea>
+					</div>
+				</div>
+
+				<div class="row mb-3 align-items-center">
+					<div class="row">{{$p.t('abgabetool/c4abstractEng')}}</div>
+					<div class="row">
+						<Textarea v-model="form.abstract_en" rows="10"></Textarea>
+					</div>				
+				</div>
+				
+				<div class="row mb-3 align-items-center">
+					<div class="row">{{$p.t('abgabetool/c4seitenanzahl')}}</div>
+					<div class="row">
+						<InputNumber 
+							v-model="form.seitenanzahl"
+							inputId="seitenanzahlInput" :min="1" :max="100000">
+						</InputNumber>
+					</div>		
+				</div>
+				
+				<div v-if="projektarbeit">
+					<div v-html="getEid"></div>
+					<div class="row">
+						<div class="col-9"></div>
+						<div class="col-2"><p>{{ $p.t('abgabetool/c4gelesenUndAkzeptiert') }}</p></div>
+						<div class="col-1">
+							
+							<Checkbox 
+								v-model="eidAkzeptiert" 
+								:binary="true" 
+								:pt="{ root: { class: 'ml-auto' }}"
+							>
+							</Checkbox>
+						</div>
+					</div>
+				</div>
+				
+			</template>
+			<template v-slot:footer>
+				<button class="btn btn-primary" :disabled="getEnduploadErlaubt" @click="triggerEndupload">{{$p.t('ui/hochladen')}}</button>
+			</template>
+		</bs-modal>
+
+`,
+};
+
+export default AbgabeMitarbeiterDetail;
diff --git a/public/js/components/Cis/Abgabetool/AbgabeDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
similarity index 98%
rename from public/js/components/Cis/Abgabetool/AbgabeDetail.js
rename to public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 5daf1a2b7..513d4f0e5 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -2,8 +2,8 @@ import Upload from '../../../components/Form/Upload/Dms.js';
 import BsModal from '../../Bootstrap/Modal.js';
 
 const today = new Date()
-export const AbgabeDetail = {
-	name: "AbgabeDetail",
+export const AbgabeStudentDetail = {
+	name: "AbgabeStudentDetail",
 	components: {
 		Upload,
 		BsModal,
@@ -210,7 +210,7 @@ export const AbgabeDetail = {
 					<div class="col-2 d-flex justify-content-center align-items-center">{{ termin.kurzbz }}</div>
 					<div class="col-1 d-flex justify-content-center align-items-center">
 						{{ termin.abgabedatum?.split("-").reverse().join(".") }}
-						<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="cursor: pointer;">
+						<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="margin-left:4px; cursor: pointer;">
 							<i class="fa-solid fa-file-pdf"></i>
 						</a>
 					</div>
@@ -335,4 +335,4 @@ export const AbgabeDetail = {
     `,
 };
 
-export default AbgabeDetail;
+export default AbgabeStudentDetail;
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
new file mode 100644
index 000000000..30344e4a0
--- /dev/null
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -0,0 +1,326 @@
+import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
+import AbgabeDetail from "./AbgabeMitarbeiterDetail.js";
+import VerticalSplit from "../../verticalsplit/verticalsplit.js"
+
+export const AbgabetoolMitarbeiter = {
+	name: "AbgabetoolMitarbeiter",
+	components: {
+		CoreFilterCmpt,
+		AbgabeDetail,
+		VerticalSplit
+	},
+	props: {
+		viewData: {
+			type: Object,
+			required: true,
+			default: () => ({name: '', uid: ''}),
+			validator(value) {
+				return value && value.name && value.uid
+			}
+		}
+	},
+	data() {
+		return {
+			showAll: false,
+			tabulatorUuid: Vue.ref(0),
+			selectedData: [],
+			domain: '',
+			student_uid: null,
+			detail: null,
+			detailOffset: 0,
+			projektarbeiten: null,
+			selectedProjektarbeit: null,
+			tableBuiltResolve: null,
+			tableBuiltPromise: null,
+			abgabeTableOptions: {
+				height: 300,
+				index: 'projektarbeit_id',
+				layout: 'fitDataStretch',
+				placeholder: this.$p.t('global/noDataAvailable'),
+				selectable: true,
+				columns: [
+					{
+						formatter: 'rowSelection',
+						titleFormatter: 'rowSelection',
+						titleFormatterParams: {
+							rowRange: "active" // Only toggle the values of the active filtered rows
+						},
+						hozAlign:"center",
+						headerSort: false,
+						frozen: true,
+						width: 70
+					},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4details')), field: 'details', formatter: this.detailFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4personenkennzeichen')), field: 'pkz', formatter: this.pkzTextFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4kontakt')),  field: 'mail', formatter: this.mailFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4vorname')), field: 'vorname', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4nachname')), field: 'nachname', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4projekttyp')), field: 'projekttyp_kurzbz', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg', formatter: this.centeredTextFormatter, widthGrow: 2},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4sem')), field: 'studiensemester_kurzbz', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4titel')), field: 'titel', formatter: this.centeredTextFormatter, maxWidth: 500, widthGrow: 8},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4beteuerart')), field: 'betreuerart_beschreibung',formatter: this.centeredTextFormatter, widthGrow: 8}
+				],
+				persistence: false,
+			},
+			abgabeTableEventHandlers: [{
+				event: "tableBuilt",
+				handler: async () => {
+					this.tableBuiltResolve()
+				}
+			},
+			{
+				event: "cellClick",
+				handler: async (e, cell) => {
+					debugger
+					if(cell.getColumn().getField() === "details") {
+						this.setDetailComponent(cell.getValue())
+					}
+					e.stopPropagation()
+
+				}
+			},
+			{
+				event: "rowClick",
+				handler: async (e, row) => {
+
+					debugger
+					e.stopPropagation()
+
+				}
+			},
+			{
+				event: "rowSelected",
+				handler: async (row) => {
+
+					debugger
+
+				}
+			},
+			{
+				event: "rowSelectionChanged",
+				handler: async(data) => {
+					this.selectedData = data
+				}
+			}
+			]};
+	},
+	methods: {
+		showDeadlines(){
+			// TODO: open seperate view in new window containing all future deadlines for the employee
+		},
+		toggleShowAll(showall) {
+			this.showAll = showall
+			this.loadProjektarbeiten(showall, () => { this.$refs.abgabeTable?.tabulator.redraw(true) })
+		},
+		addSeries() {
+			
+		},
+		isPastDate(date) {
+			return new Date(date) < new Date(Date.now())
+		},
+		setDetailComponent(details){
+			debugger
+			this.loadAbgaben(details).then((res)=> {
+				debugger
+				const pa = this.projektarbeiten?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
+				pa.abgabetermine = res.data.retval
+				pa.abgabetermine.forEach(termin => {
+					termin.file = []
+					termin.allowedToUpload = true
+
+					// TODO: fixtermin logic?
+					if(termin.bezeichnung == 'Endupload' && this.isPastDate(termin.datum)) {
+
+						// termin.allowedToUpload = false
+					} else {
+						// termin.allowedToUpload = true
+					}
+
+				})
+				pa.betreuer = this.buildBetreuer(pa)
+				pa.student_uid = details.student_uid
+				pa.student = `${pa.vorname} ${pa.nachname}`
+				
+				this.selectedProjektarbeit = pa
+				
+				Vue.nextTick(()=>{
+					this.$refs.verticalsplit.showBoth()
+				})
+			
+			})
+		},
+		centeredTextFormatter(cell) {
+			const val = cell.getValue()
+			if(!val) return
+			
+			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				'<p style="max-width: 100%; width: 100%; overflow-wrap: break-word; word-break: break-word; white-space: normal; margin: 0px; text-align: center">'+val+'</p></div>'
+		},
+		detailFormatter(cell) {
+			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				'<a><i class="fa fa-folder-open" style="color:#00649C"></i></a></div>'
+		},
+		mailFormatter(cell) {
+			const val = cell.getValue()
+			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				'<a href='+val+'><i class="fa fa-envelope" style="color:#00649C"></i></a></div>'
+		},
+		beurteilungFormatter(cell) {
+			const val = cell.getValue()
+			if(val) {
+				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+					'<a><i class="fa fa-file-pdf" style="color:#00649C"></i></a></div>'
+			} else return '-'
+		},
+		pkzTextFormatter(cell) {
+			const val = cell.getValue()
+
+			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				'<p style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+val+'</p></div>'
+		},
+		tableResolve(resolve) {
+			this.tableBuiltResolve = resolve
+		},
+		buildMailToLink(abgabe) {
+			return 'mailto:' + abgabe.uid +'@'+ this.domain
+		},
+		buildPKZ(projekt) {
+			return `${projekt.uid} / ${projekt.matrikelnr}`
+		},
+		buildStg(projekt) {
+			return (projekt.typ + projekt.kurzbz)?.toUpperCase()	
+		},
+		buildBetreuer(abgabe) {
+			return abgabe.betreuerart_beschreibung + ': ' + (abgabe.btitelpre ? abgabe.btitelpre + ' ' : '') + abgabe.bvorname + ' ' + abgabe.bnachname + (abgabe.btitelpost ? ' ' + abgabe.btitelpost : '')
+		},
+		setupData(data){
+			this.projektarbeiten = data[0]
+			this.domain = data[1]
+			
+			const d = data[0]?.retval?.map(projekt => {
+				let mode = 'detailTermine'
+
+				return {
+					...projekt,
+					details: {
+						student_uid: projekt.uid,
+						projektarbeit_id: projekt.projektarbeit_id,
+					},
+					pkz: this.buildPKZ(projekt),
+					beurteilung: projekt.beurteilungLink ?? null,
+					sem: projekt.studiensemester_kurzbz,
+					stg: this.buildStg(projekt),
+					mail: this.buildMailToLink(projekt),
+					typ: projekt.projekttyp_kurzbz,
+					titel: projekt.titel
+				}
+			})
+
+			this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
+			this.$refs.abgabeTable.tabulator.setData(d);
+		},
+		loadProjektarbeiten(all = false, callback) {
+			this.$fhcApi.factory.lehre.getMitarbeiterProjektarbeiten(this.viewData?.uid ?? null, all)
+				.then(res => {
+					if(res?.data) this.setupData(res.data)
+				}).finally(() => {
+					if(callback) {
+						callback()
+					}
+				})
+		},
+		loadAbgaben(details) {
+			return new Promise((resolve) => {
+				this.$fhcApi.factory.lehre.getStudentProjektabgaben(details)
+					.then(res => {
+						resolve(res)
+					})
+			})
+		},
+		handleUuidDefined(uuid) {
+			this.tabulatorUuid = uuid
+		},
+		calcMaxTableHeight() {
+			const tableID = this.tabulatorUuid ? ('-' + this.tabulatorUuid) : ''
+			const tableDataSet = document.getElementById('filterTableDataset' + tableID);
+			if(!tableDataSet) return
+			const rect = tableDataSet.getBoundingClientRect();
+
+			this.abgabeTableOptions.height = window.visualViewport.height - rect.top
+			this.$refs.abgabeTable.tabulator.setHeight(this.abgabeTableOptions.height)
+		},
+		async setupMounted() {
+			this.tableBuiltPromise = new Promise(this.tableResolve)
+			await this.tableBuiltPromise
+
+			this.loadProjektarbeiten()
+
+
+			this.$refs.verticalsplit.collapseBottom()
+			this.calcMaxTableHeight()
+			
+		}
+	},
+	watch: {
+
+	},
+	computed: {
+
+	},
+	created() {
+
+	},
+	mounted() {
+		this.setupMounted()
+	},
+	template: `
+	<div class="h-100">
+	
+
+		<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
+		<hr>
+		
+		<vertical-split ref="verticalsplit">
+			<template #top>
+				<core-filter-cmpt 
+					:title="''"  
+					@uuidDefined="handleUuidDefined"
+					ref="abgabeTable"
+					:newBtnShow="true"
+					:newBtnLabel="$p.t('global/neueTerminserie')"
+					:newBtnDisabled="!selectedData.length"
+					@click:new=addSeries
+					:tabulator-options="abgabeTableOptions"  
+					:tabulator-events="abgabeTableEventHandlers"
+					tableOnly
+					:sideMenu="false"
+					:useSelectionSpan="false"
+				>
+					<template #actions>
+						<button @click="toggleShowAll(!showAll)" role="button" class="btn btn-secondary ml-2">
+							<i v-show="!showAll" class="fa fa-eye"></i>
+							<i v-show="showAll" class="fa fa-eye-slash"></i>
+							{{ $p.t('abgabetool/showAll') }}
+						</button>
+						
+						<button @click="showDeadlines" role="button" class="btn btn-secondary ml-2">
+							<i class="fa fa-hourglass-end"></i>
+							{{ $p.t('abgabetool/showDeadlines') }}
+						</button>
+					</template>
+				</core-filter-cmpt>
+			</template>
+			<template #bottom>
+				<div v-show="selectedProjektarbeit" ref="selProj"> 
+					<AbgabeDetail :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
+				</div>
+			</template>
+		</vertical-split>
+
+	</div>
+	 
+    `,
+};
+
+export default AbgabetoolMitarbeiter;
diff --git a/public/js/components/Cis/Abgabetool/Abgabetool.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
similarity index 96%
rename from public/js/components/Cis/Abgabetool/Abgabetool.js
rename to public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 6a34ff052..699be7de6 100644
--- a/public/js/components/Cis/Abgabetool/Abgabetool.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -1,8 +1,8 @@
 import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
-import AbgabeDetail from "./AbgabeDetail";
+import AbgabeDetail from "./AbgabeStudentDetail.js";
 
-export const Abgabetool = {
-	name: "Abgabetool",
+export const AbgabetoolStudent = {
+	name: "AbgabetoolStudent",
 	components: {
 		VueDatePicker,
 		CoreFilterCmpt,
@@ -33,8 +33,8 @@ export const Abgabetool = {
 				layout: 'fitColumns',
 				placeholder: this.$p.t('global/noDataAvailable'),
 				columns: [
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4details')), formatter: this.detailFormatter, field: 'details', widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4beurteilung')), formatter: this.beurteilungFormatter, field: 'beurteilung', widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4details')), field: 'details', formatter: this.detailFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4beurteilung')), field: 'beurteilung', formatter: this.beurteilungFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4sem')), field: 'sem', formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg', formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4kontakt')), field: 'mail', formatter: this.mailFormatter, widthGrow: 1},
@@ -233,4 +233,4 @@ export const Abgabetool = {
     `,
 };
 
-export default Abgabetool;
+export default AbgabetoolStudent;
diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index c6cb6cdb3..aea50a10e 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -74,7 +74,11 @@ export const CoreFilterCmpt = {
 		// TODO soll im master kommen?
 		idField: String,
 		parentIdField: String,
-		countOnly: Boolean
+		countOnly: Boolean,
+		useSelectionSpan: {
+			type: Boolean,
+			default: true
+		}
 	},
 	data: function() {
 		return {
@@ -613,7 +617,7 @@ export const CoreFilterCmpt = {
 					<button v-if="reload" class="btn btn-outline-secondary" aria-label="Reload" @click="reloadTable">
 						<span class="fa-solid fa-rotate-right" aria-hidden="true"></span>
 					</button>
-					<span v-if="$slots.actions && tabulatorHasSelector">
+					<span v-if="$slots.actions && tabulatorHasSelector && useSelectionSpan">
 						<span v-if="countOnly">{{ selectedData.length }} ausgewählt</span>
 						<span v-else> Mit {{ selectedData.length }} ausgewählten:</span>
 					</span>
diff --git a/public/js/components/verticalsplit/verticalsplit.js b/public/js/components/verticalsplit/verticalsplit.js
index 53a1833fb..e712d1ecb 100644
--- a/public/js/components/verticalsplit/verticalsplit.js
+++ b/public/js/components/verticalsplit/verticalsplit.js
@@ -1,4 +1,5 @@
 export default {
+    name: 'VerticalSplit',
     data: function() {
       return {          
           availHeight: 0,
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index dd874ddff..bfebd10cf 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -38177,6 +38177,126 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4personenkennzeichen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Personenkennzeichen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Personal identity number",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4vorname',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Vorname",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "First Name",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4nachname',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Nachname",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Last Name',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4betreuerart',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Betreuerart",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Supervisor type',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'showAll',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Alle anzeigen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Show All',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'showDeadlines',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Deadlines anzeigen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Show Deadlines',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From eaaf5de9c0be9f559c5a14c2958fa743393f9732 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 24 Apr 2025 07:54:06 +0200
Subject: [PATCH 124/572] Refactoring FhcApi_Factory

---
 public/js/api/factory/stv/documents.js        | 76 +++++++++++++++++++
 .../Details/Dokumente/List/Accepted.js        | 25 +++---
 .../Details/Dokumente/List/Unaccepted.js      | 20 ++---
 .../Details/Dokumente/Modal/Edit.js           | 15 ++--
 .../Details/Dokumente/Modal/Upload.js         | 12 +--
 5 files changed, 117 insertions(+), 31 deletions(-)
 create mode 100644 public/js/api/factory/stv/documents.js

diff --git a/public/js/api/factory/stv/documents.js b/public/js/api/factory/stv/documents.js
new file mode 100644
index 000000000..1898023cd
--- /dev/null
+++ b/public/js/api/factory/stv/documents.js
@@ -0,0 +1,76 @@
+/**
+ * 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 {
+	getDocumentsUnaccepted(params) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/dokumente/getDocumentsUnaccepted/' + params.id + '/' + params.studiengang_kz
+		};
+	},
+	getDocumentsAccepted(params) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/dokumente/getDocumentsAccepted/' + params.id + '/' + params.studiengang_kz
+		};
+	},
+	deleteZuordnung(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/dokumente/deleteZuordnung/' + params.prestudent_id + '/' + params.dokument_kurzbz
+		};
+	},
+	createZuordnung(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/dokumente/createZuordnung/' + params.prestudent_id + '/' + params.dokument_kurzbz
+		};
+	},
+	loadAkte(akte_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/dokumente/loadAkte/' + akte_id
+		};
+	},
+	getDoktypen(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/dokumente/getDoktypen/'
+		};
+	},
+	updateFile(akte_id, params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/dokumente/updateAkte/' + akte_id,
+			params
+		};
+	},
+	deleteFile(akte_id){
+		console.log("in deleteFile " + akte_id);
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/dokumente/deleteAkte/' + akte_id,
+		};
+	},
+	uploadFile(prestudent_id, params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/dokumente/uploadDokument/' + prestudent_id,
+			params
+		};
+	},
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
index e22ad4cdb..7790e12f8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -2,6 +2,8 @@ import {CoreFilterCmpt} from "../../../../../filter/Filter.js";
 import ModalEdit from "../Modal/Edit.js";
 import ModalUpload from "../Modal/Upload.js";
 
+import ApiStvDocuments from "../../../../../../api/factory/stv/documents.js";
+
 export default {
 	components: {
 		name: "AcceptedDocuments",
@@ -17,13 +19,11 @@ export default {
 		return {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
-				ajaxRequestFunc: this.$fhcApi.factory.stv.documents.getDocumentsAccepted,
-				ajaxParams: () => {
-					return {
+				ajaxRequestFunc: () => this.$api.call(
+					ApiStvDocuments.getDocumentsAccepted({
 						id: this.prestudent_id,
-						studiengang_kz: this.studiengang_kz
-					};
-				},
+						studiengang_kz: this.studiengang_kz})
+				),
 				ajaxResponse: (url, params, response) =>  {
 					return response.data;
 				},
@@ -240,7 +240,8 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError);
 		},
 		deleteFile(akte_id){
-			return this.$fhcApi.factory.stv.documents.deleteFile(akte_id)
+			return this.$api
+				.call(ApiStvDocuments.deleteFile(akte_id))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 				})
@@ -252,10 +253,12 @@ export default {
 		deleteZuordnung(selected) {
 			Promise.allSettled(
 				selected.map(e =>
-					this.$fhcApi.factory.stv.documents.deleteZuordnung({
-						prestudent_id: this.prestudent_id,
-						dokument_kurzbz: e.dokument_kurzbz
-					}).then(() => ({
+					this.$api
+						.call(ApiStvDocuments.deleteZuordnung({
+							prestudent_id: this.prestudent_id,
+							dokument_kurzbz: e.dokument_kurzbz
+						}))
+						.then(() => ({
 							success: true,
 							dokument_bz: e.bezeichnung
 						}))
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
index 5b2a2d080..6cc25cb6f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -2,6 +2,8 @@ import {CoreFilterCmpt} from "../../../../../filter/Filter.js";
 import ModalEdit from "../Modal/Edit.js";
 import ModalUpload from "../Modal/Upload.js";
 
+import ApiStvDocuments from "../../../../../../api/factory/stv/documents.js";
+
 export default {
 	name: "UnacceptedDocuments",
 	components: {
@@ -17,13 +19,11 @@ export default {
 		return {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
-				ajaxRequestFunc: this.$fhcApi.factory.stv.documents.getDocumentsUnaccepted,
-				ajaxParams: () => {
-					return {
+				ajaxRequestFunc: () => this.$api.call(
+					ApiStvDocuments.getDocumentsUnaccepted({
 						id: this.prestudent_id,
-						studiengang_kz: this.studiengang_kz
-					};
-				},
+						studiengang_kz: this.studiengang_kz})
+				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
 					{title: "Dokument", field: "bezeichnung"},
@@ -252,10 +252,12 @@ export default {
 			Promise
 				.allSettled(
 					selected.map(e =>
-						this.$fhcApi.factory.stv.documents.createZuordnung({
+						this.$api
+							.call(ApiStvDocuments.createZuordnung({
 								prestudent_id: this.prestudent_id,
-								dokument_kurzbz: e.dokument_kurzbz,
-							}).then(() => ({
+								dokument_kurzbz: e.dokument_kurzbz
+							}))
+							.then(() => ({
 							success: true,
 							dokument_bz: e.bezeichnung
 						}))
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
index 95a12a669..29c98020e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
@@ -2,6 +2,8 @@ import BsModal from "../../../../../Bootstrap/Modal.js";
 import FormForm from "../../../../../Form/Form.js";
 import FormInput from "../../../../../Form/Input.js";
 
+import ApiStvDocuments from "../../../../../../api/factory/stv/documents.js";
+
 export default {
 	name: "modalEditDocuments",
 	components: {
@@ -17,10 +19,9 @@ export default {
 	},
 	methods: {
 		updateFile(akte_id){
-			console.log("in update" + akte_id);
-
-			this.$fhcApi.factory.stv.documents.updateFile(akte_id, this.formData).
-			then(response => {
+			this.$api
+				.call(ApiStvDocuments.updateFile(akte_id, this.formData))
+				.then(response => {
 				this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 				this.$refs.modalEditDocument.hide();
 				this.$emit('reload');
@@ -32,7 +33,8 @@ export default {
 			this.$refs.modalEditDocument.show();
 		},
 		loadFormData(akte_id){
-			return this.$fhcApi.factory.stv.documents.loadAkte(akte_id)
+			return	this.$api
+				.call(ApiStvDocuments.loadAkte(akte_id))
 				.then(result => {
 					this.formData = result.data;
 					return result;
@@ -41,7 +43,8 @@ export default {
 		}
 	},
 	created(){
-		this.$fhcApi.factory.stv.documents.getDoktypen()
+		this.$api
+			.call(ApiStvDocuments.getDoktypen())
 			.then(result => {
 				this.listDokTypen = result.data;
 			})
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js
index dec8da503..f6280a9cf 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Upload.js
@@ -3,6 +3,8 @@ import FormForm from "../../../../../Form/Form.js";
 import FormInput from "../../../../../Form/Input.js";
 import FormUploadDms from "../../../../../Form/Upload/Dms.js";
 
+import ApiStvDocuments from "../../../../../../api/factory/stv/documents.js";
+
 export default {
 	name: "modalUploadDocuments",
 	components: {
@@ -23,15 +25,14 @@ export default {
 	},
 	methods:{
 		open(prestudent_id, dokument_kurzbz){
-			console.log("ps: " + prestudent_id + 'dok: ' + dokument_kurzbz);
 			this.formData.dokument_kurzbz = dokument_kurzbz;
 			this.formData.prestudent_id = prestudent_id;
 			this.$refs.modalUploadFile.show();
 		},
 		uploadFile(){
-			console.log(this.formData.anhang[0]);
-
-			return this.$fhcApi.factory.stv.documents.uploadFile(this.formData.prestudent_id, this.formData)
+		//	console.log(this.formData.anhang[0]);
+			return this.$api
+				.call(ApiStvDocuments.uploadFile(this.formData.prestudent_id, this.formData))
 				.then(result => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successUpload'));
 					this.resetModal();
@@ -48,7 +49,8 @@ export default {
 		}
 	},
 	created(){
-		this.$fhcApi.factory.stv.documents.getDoktypen()
+		this.$api
+			.call(ApiStvDocuments.getDoktypen())
 			.then(result => {
 				this.listDokTypen = result.data;
 			})

From ed6b9310aeaf568836007919244e017b6e1c4fc5 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 24 Apr 2025 08:23:24 +0200
Subject: [PATCH 125/572] Refactoring FhcApi_Factory

---
 public/js/api/factory/stv/coursedates.js      | 35 +++++++++++++++++++
 .../ListLehrveranstaltungstermine.js          | 15 ++++----
 2 files changed, 43 insertions(+), 7 deletions(-)
 create mode 100644 public/js/api/factory/stv/coursedates.js

diff --git a/public/js/api/factory/stv/coursedates.js b/public/js/api/factory/stv/coursedates.js
new file mode 100644
index 000000000..71ded7285
--- /dev/null
+++ b/public/js/api/factory/stv/coursedates.js
@@ -0,0 +1,35 @@
+/**
+ * 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 {
+	getCourselist(params) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/LvTermine/getStundenplan/' + params.student_uid + '/'
+				+ params.start_date + '/'
+				+ params.end_date + '/'
+				+ params.group_consecutiveHours + '/'
+				+ params.dbStundenplanTable
+		};
+	},
+	getStudiensemester(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/LvTermine/getStudiensemester/'
+		};
+	},
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
index bc4e02b51..0f1c2f2f0 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
@@ -2,6 +2,8 @@ import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import FormInput from "../../../../Form/Input.js";
 import FormForm from '../../../../Form/Form.js';
 
+import ApiStvCoursedates from "../../../../../api/factory/stv/coursedates.js";
+
 export default {
 	name: "TblCourseList",
 	components: {
@@ -46,16 +48,14 @@ export default {
 		initTabulatorOptions(){
 			this.tabulatorOptions = {
 				ajaxURL: 'dummy',
-				ajaxRequestFunc: this.$fhcApi.factory.stv.courselist.getCourselist,
-				ajaxParams: () => {
-					return {
+				ajaxRequestFunc: () => this.$api.call(
+					ApiStvCoursedates.getCourselist({
 						student_uid: this.student.uid,
 						start_date: this.dataSem.start,
 						end_date: this.dataSem.ende,
 						group_consecutiveHours: true,
-						dbStundenplanTable: this.dbStundenplanTable
-					};
-				},
+						dbStundenplanTable: this.dbStundenplanTable})
+				),
 				ajaxResponse: (url, params, response) => {
 					return response.data;
 				},
@@ -153,7 +153,8 @@ export default {
 		},
 	},
 	created(){
-		this.$fhcApi.factory.stv.courselist.getStudiensemester()
+		this.$api
+			.call(ApiStvCoursedates.getStudiensemester())
 			.then(result => {
 				this.listStudiensemester = result.data;
 				this.getDatesOfSemester(this.currentSemester);

From d48a0b62fd68566d0412b5cf944c979bda553ebd Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 24 Apr 2025 12:59:47 +0200
Subject: [PATCH 126/572] Refactoring FhcApi_Factory

---
 public/js/api/factory/messages/messages.js    |  2 -
 public/js/api/messages/person.js              | 91 +++++++++----------
 .../Messages/Details/NewMessage/Modal.js      |  2 -
 .../Messages/Details/NewMessage/NewDiv.js     | 13 +--
 .../Messages/Details/TableMessages.js         | 33 ++++---
 5 files changed, 64 insertions(+), 77 deletions(-)

diff --git a/public/js/api/factory/messages/messages.js b/public/js/api/factory/messages/messages.js
index 8424e14f2..cec34ad8b 100644
--- a/public/js/api/factory/messages/messages.js
+++ b/public/js/api/factory/messages/messages.js
@@ -16,9 +16,7 @@
  */
 
 export default {
-	//TODO(manu) check how to get params size and page
 	getMessages(params) {
-		console.log('page ' + params.page + ' size ' + params.size);
 		return {
 			method: 'get',
 			url: 'api/frontend/v1/messages/messages/getMessages/'
diff --git a/public/js/api/messages/person.js b/public/js/api/messages/person.js
index f41050770..e2d2fd0c4 100644
--- a/public/js/api/messages/person.js
+++ b/public/js/api/messages/person.js
@@ -1,48 +1,47 @@
 export default {
-	getMessages(url, config, params) {
-		console.log('page ' + params.page + ' size ' + params.size);
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessages/' + params.id + '/' + params.type + '/' + params.size + '/' + params.page);
-	},
-/*	getVorlagen(){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagen/');
-	},
-	getMsgVarsLoggedInUser(){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsLoggedInUser/');
-	},
-	getMessageVarsPerson(params){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessageVarsPerson/' + params.id + '/' + params.type_id);
-	},
-	getMsgVarsPrestudent(params){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsPrestudent/' + params.id + '/' + params.type_id);
-	},
-	getPersonId(params){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getPersonId/'+ params.id + '/' + params.type_id);
-	},
-	getUid(params){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getUid/'+ params.id + '/' + params.type_id);
-	},
-	getVorlagentext(vorlage_kurzbz){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagentext/' + vorlage_kurzbz);
-	},
-	getNameOfDefaultRecipient(params){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getNameOfDefaultRecipient/' + params.id + '/' + params.type_id);
-	},
-	getPreviewText(params, data){
-		return this.$fhcApi.post('api/frontend/v1/messages/messages/getPreviewText/' + params.id + '/' + params.type_id,
-			data);
-	},
-	getReplyData(messageId){
-		return this.$fhcApi.get('api/frontend/v1/messages/messages/getReplyData/' + messageId);
-	},
-	sendMessageFromModalContext(form, id, data) {
-		return this.$fhcApi.post(form,'api/frontend/v1/messages/messages/sendMessage/' + id,
-			data);
-	},
-	sendMessage(id, data) {
-		return this.$fhcApi.post('api/frontend/v1/messages/messages/sendMessage/' + id,
-			data);
-	},
-	deleteMessage(messageId){
-		return this.$fhcApi.post('api/frontend/v1/messages/messages/deleteMessage/' + messageId);
-	}*/
+		getMessages(url, config, params) {
+			return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessages/' + params.id + '/' + params.type + '/' + params.size + '/' + params.page);
+		},
+		getVorlagen(){
+			return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagen/');
+		},
+		getMsgVarsLoggedInUser(){
+			return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsLoggedInUser/');
+		},
+		getMessageVarsPerson(params){
+			return this.$fhcApi.get('api/frontend/v1/messages/messages/getMessageVarsPerson/' + params.id + '/' + params.type_id);
+		},
+		getMsgVarsPrestudent(params){
+			return this.$fhcApi.get('api/frontend/v1/messages/messages/getMsgVarsPrestudent/' + params.id + '/' + params.type_id);
+		},
+		getPersonId(params){
+			return this.$fhcApi.get('api/frontend/v1/messages/messages/getPersonId/'+ params.id + '/' + params.type_id);
+		},
+		getUid(params){
+			return this.$fhcApi.get('api/frontend/v1/messages/messages/getUid/'+ params.id + '/' + params.type_id);
+		},
+		getVorlagentext(vorlage_kurzbz){
+			return this.$fhcApi.get('api/frontend/v1/messages/messages/getVorlagentext/' + vorlage_kurzbz);
+		},
+		getNameOfDefaultRecipient(params){
+			return this.$fhcApi.get('api/frontend/v1/messages/messages/getNameOfDefaultRecipient/' + params.id + '/' + params.type_id);
+		},
+		getPreviewText(params, data){
+			return this.$fhcApi.post('api/frontend/v1/messages/messages/getPreviewText/' + params.id + '/' + params.type_id,
+				data);
+		},
+		getReplyData(messageId){
+			return this.$fhcApi.get('api/frontend/v1/messages/messages/getReplyData/' + messageId);
+		},
+		sendMessageFromModalContext(form, id, data) {
+			return this.$fhcApi.post(form,'api/frontend/v1/messages/messages/sendMessage/' + id,
+				data);
+		},
+		sendMessage(id, data) {
+			return this.$fhcApi.post('api/frontend/v1/messages/messages/sendMessage/' + id,
+				data);
+		},
+		deleteMessage(messageId){
+			return this.$fhcApi.post('api/frontend/v1/messages/messages/deleteMessage/' + messageId);
+		}
 }
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index 5bbf29f16..d44d0faeb 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -241,7 +241,6 @@ export default {
 				if (!newMessageId) return;
 
 				try {
-					//const result = await this.$fhcApi.factory.messages.person.getReplyData(newMessageId);
 					const result = await this.$api.call(ApiMessages.getReplyData(newMessageId));
 					this.replyData = result.data;
 
@@ -264,7 +263,6 @@ export default {
 				id: this.id,
 				type_id: this.typeId
 			};
-			//this.$fhcApi.factory.messages.person.getMessageVarsPerson(params)
 			this.$api
 				.call(ApiMessages.getMessageVarsPerson(params))
 				.then(result => {
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index 11335ed2a..34401f6ea 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -118,11 +118,6 @@ export default {
 				...params
 			};
 			data.append('data', JSON.stringify(merged));
-
-			//this.uid is necessary for existing sendFunction
-/*			return this.$fhcApi.factory.messages.person.sendMessage(
-				this.uid,
-				data)*/
 			return this.$api
 				.call(ApiMessages.sendMessage(this.uid, data))
 				.then(response => {
@@ -143,7 +138,6 @@ export default {
 				);
 		},
 		getVorlagentext(vorlage_kurzbz){
-		//	return this.$fhcApi.factory.messages.person.getVorlagentext(vorlage_kurzbz)
 			return this.$api
 				.call(ApiMessages.getVorlagentext(vorlage_kurzbz))
 				.then(response => {
@@ -157,9 +151,6 @@ export default {
 			const data = new FormData();
 
 			data.append('data', JSON.stringify(this.formData.body));
-/*			return this.$fhcApi.factory.messages.person.getPreviewText({
-				id: id,
-				type_id: typeId}, data)*/
 			return this.$api
 				.call(ApiMessages.getPreviewText({
 					id: this.id,
@@ -174,7 +165,6 @@ export default {
 		insertVariable(selectedItem){
 			if (this.editor) {
 				this.editor.insertContent(selectedItem.value + " ");
-			//	this.editor.insertContent(selectedItem.value + ". ");
 				//TODO(Manu) check: Laden von Variblen geht nicht wenn kein Zeichen danach kommt
 				// nicht mal mit Punkt adden gehts ohne eintrag nach vars
 								//this.editor.focus();
@@ -272,7 +262,7 @@ export default {
 					id: this.id,
 					type_id: this.typeId
 				};
-			//	this.$fhcApi.factory.messages.person.getMessageVarsPerson(params)
+
 				this.$api
 				.call(ApiMessages.getMessageVarsPerson(params))
 					.then(result => {
@@ -291,7 +281,6 @@ export default {
 				id: this.id,
 				type_id: this.typeId
 			};
-			//this.$fhcApi.factory.messages.person.getMsgVarsPrestudent(params)
 			this.$api
 				.call(ApiMessages.getMsgVarsPrestudent(params))
 				.then(result => {
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 07fdd8f20..ac3d616ec 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -29,30 +29,17 @@ export default {
 	},
 	data(){
 		return {
-/*			paginationSize: 15,
-			paginationInitialPage: 1,*/
+			pageNo: 1,
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
-				//TODO(Manu) how to handle size and page?
-/*				ajaxRequestFunc: () => this.$api.call(
-					ApiMessages.getMessages({
-						id: this.id,
-						type: this.typeId,
-						size: this.paginationSize,
-						page: this.paginationInitialPage
-					})
-				),*/
-		//OLD WORKING VERSION
-				ajaxRequestFunc: this.$fhcApi.factory.messages.person.getMessages,
+				ajaxRequestFunc: this.loadAjaxCall,
 				ajaxParams: () => {
 					return {
 						id: this.id,
 						type: this.typeId
 					};
 				},
-
 				ajaxResponse: (url, params, response) => this.buildTreemap(response),
-				//ajaxResponse: (url, params, response) => this.buildTreemap(response.data),
 				columns: [
 					{title: "subject", field: "subject"},
 					{title: "body", field: "body", visible: false},
@@ -220,6 +207,12 @@ export default {
 							this.previewBody = body;
 					}
 				},
+				{
+					event: 'pageLoaded',
+					handler: (pageno) => {
+						this.pageNo = pageno+1;
+					}
+				}
 			],
 			previewBody: "",
 			open: false,
@@ -296,6 +289,16 @@ export default {
 			if (iteration > messages.length) break;
 			}
 		return {data: messageNested, last_page};
+		},
+		loadAjaxCall(params){
+			return this.$api.call(
+				ApiMessages.getMessages({
+					id: this.id,
+					type: this.typeId,
+					size: this.tabulatorOptions.paginationSize,
+					page: this.pageNo
+				})
+			);
 		}
 	},
 	computed: {

From 2ab01132b1a069390abc360bb359fc4dc12bf89f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 24 Apr 2025 16:30:50 +0200
Subject: [PATCH 127/572] show List Admission Dates

---
 .../api/frontend/v1/stv/Aufnahmetermine.php   | 243 +-----------------
 application/models/crm/Reihungstest_model.php |  39 +++
 public/js/api/factory/stv/admissionDates.js   |   4 +-
 public/js/api/stv/admissionDates.js           |   0
 .../Aufnahmetermine/Aufnahmetermine.js        |  31 ++-
 system/phrasesupdate.php                      |  20 ++
 6 files changed, 92 insertions(+), 245 deletions(-)
 delete mode 100644 public/js/api/stv/admissionDates.js

diff --git a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
index 519e8125d..3a0be3d40 100644
--- a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
+++ b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
@@ -27,20 +27,12 @@ class Aufnahmetermine extends FHCAPI_Controller
 		]);
 
 		// Load models
-		$this->load->model('codex/Bisio_model', 'BisioModel');
+		$this->load->model('crm/Reihungstest_model', 'ReihungstestModel');
 	}
 
-	public function getAufnahmetermine($student_uid)
+	public function getAufnahmetermine($person_id)
 	{
-		$this->BisioModel->addSelect("*");
-		$this->BisioModel->addJoin('bis.tbl_mobilitaetsprogramm mp', 'ON (mp.mobilitaetsprogramm_code = bis.tbl_bisio.mobilitaetsprogramm_code)', 'LEFT');
-		$this->BisioModel->addJoin('lehre.tbl_lehreinheit le', 'ON (le.lehreinheit_id = bis.tbl_bisio.lehreinheit_id)','LEFT');
-		$this->BisioModel->addOrder('von', 'DESC');
-		$this->BisioModel->addOrder('bis', 'DESC');
-		$this->BisioModel->addOrder('aufnahmetermin_id', 'DESC');
-		$result = $this->BisioModel->loadWhere(
-			array('student_uid' => $student_uid)
-		);
+		$result = $this->ReihungstestModel->getReihungstestPerson($person_id);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -274,233 +266,4 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	public function getLVList($studiengang_kz)
-	{
-		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
-
-		$result = $this->LehrveranstaltungModel->getLvsByStudiengangkz($studiengang_kz);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getAllLehreinheiten()
-	{
-		$lv_id = $this->input->post('lv_id');
-		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-
-		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-
-		$result = $this->LehreinheitModel->getLesFromLvIds($lv_id, $studiensemester_kurzbz);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getLvsandLesByStudent($student_uid)
-	{
-		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
-
-		$result = $this->LehrveranstaltungModel->getLvsByStudent($student_uid);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$lv_ids = array();
-		$allData = array();
-
-		foreach ($data as $lehrveranstaltung) {
-			$lv_ids[] = $lehrveranstaltung->lehrveranstaltung_id;
-		}
-
-		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-
-		foreach ($lv_ids as $id)
-		{
-			$result = $this->LehreinheitModel->getLesFromLvIds($id);
-			$data = $this->getDataOrTerminateWithError($result);
-
-			if (is_array($data)) {
-				$allData = array_merge($allData, $data);
-			}
-		}
-
-		return $this->terminateWithSuccess($allData);
-	}
-
-	public function getPurposes($aufnahmetermin_id)
-	{
-		$aufnahmetermin_id = (int)$aufnahmetermin_id;
-
-		$this->load->model('codex/Bisiozweck_model', 'BisiozweckModel');
-
-		$this->BisiozweckModel->addSelect("*");
-		$this->BisiozweckModel->addJoin('bis.tbl_zweck zw', 'ON (zw.zweck_code = bis.tbl_bisio_zweck.zweck_code)');
-
-		$result = $this->BisiozweckModel->loadWhere(
-			array('aufnahmetermin_id' => $aufnahmetermin_id)
-		);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getSupports($aufnahmetermin_id)
-	{
-		$aufnahmetermin_id = (int)$aufnahmetermin_id;
-
-		$this->load->model('codex/Bisioaufenthaltfoerderung_model', 'BisioaufenthaltfoerderungModel');
-
-		$this->BisioaufenthaltfoerderungModel->addSelect("*");
-		$this->BisioaufenthaltfoerderungModel->addJoin('bis.tbl_aufenthaltfoerderung af', 'ON (af.aufenthaltfoerderung_code = bis.tbl_bisio_aufenthaltfoerderung.aufenthaltfoerderung_code)');
-
-		$result = $this->BisioaufenthaltfoerderungModel->loadWhere(
-			array('aufnahmetermin_id' => $aufnahmetermin_id)
-		);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getListPurposes()
-	{
-		$this->load->model('codex/Zweck_model', 'ZweckModel');
-
-		$result = $this->ZweckModel->load();
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getListSupports()
-	{
-		$this->load->model('codex/Aufenthaltfoerderung_model', 'AufenthaltfoerderungModel');
-
-		$result = $this->AufenthaltfoerderungModel->load();
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function addAufnahmeterminPurpose($aufnahmetermin_id, $local_purpose = null)
-	{
-		$zweck_code = $this->input->post('zweck_code');
-
-		if($local_purpose){
-			$zweck_code = $local_purpose;
-		}
-
-		$this->load->model('codex/Bisiozweck_model', 'BisiozweckModel');
-		if(!$local_purpose)
-		{
-			$check = $this->BisiozweckModel->loadWhere(
-				[
-					'aufnahmetermin_id' => $aufnahmetermin_id,
-					'zweck_code' => $zweck_code,
-				]
-			);
-			if (hasData($check))
-			{
-				$this->terminateWithError($this->p->t('ui', 'error_entryExisting'), self::ERROR_TYPE_GENERAL);
-			}
-		}
-
-		$result = $this->BisiozweckModel->insert(
-			array(
-				'aufnahmetermin_id' => $aufnahmetermin_id,
-				'zweck_code' => $zweck_code
-			)
-		);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if($local_purpose)
-		{
-			return $data;
-		}
-
-		return $this->terminateWithSuccess(current($data));
-	}
-
-	public function deleteAufnahmeterminPurpose($aufnahmetermin_id)
-	{
-		$zweck_code = $this->input->post('zweck_code');
-
-		$this->load->model('codex/Bisiozweck_model', 'BisiozweckModel');
-
-
-		$result = $this->BisiozweckModel->delete(
-			array(
-				'aufnahmetermin_id' => $aufnahmetermin_id,
-				'zweck_code' => $zweck_code
-			)
-		);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess(current($data));
-	}
-
-	public function addAufnahmeterminSupport($aufnahmetermin_id, $local_support = null)
-	{
-		$aufenthaltfoerderung_code = $this->input->post('aufenthaltfoerderung_code');
-
-		if($local_support){
-			$aufenthaltfoerderung_code = $local_support;
-		}
-
-		$this->load->model('codex/Bisioaufenthaltfoerderung_model', 'BisioaufenthaltfoerderungModel');
-
-		if(!$local_support)
-		{
-			$check = $this->BisioaufenthaltfoerderungModel->loadWhere(
-				[
-					'aufnahmetermin_id' => $aufnahmetermin_id,
-					'aufenthaltfoerderung_code' => $aufenthaltfoerderung_code,
-				]
-			);
-			if (hasData($check))
-			{
-				$this->terminateWithError($this->p->t('ui', 'error_entryExisting'), self::ERROR_TYPE_GENERAL);
-			}
-		}
-
-		$result = $this->BisioaufenthaltfoerderungModel->insert(
-			array(
-				'aufnahmetermin_id' => $aufnahmetermin_id,
-				'aufenthaltfoerderung_code' => $aufenthaltfoerderung_code
-			)
-		);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if($local_support)
-		{
-			return $data;
-		}
-
-		return $this->terminateWithSuccess(current($data));
-	}
-
-	public function deleteAufnahmeterminSupport($aufnahmetermin_id)
-	{
-		$aufenthaltfoerderung_code = $this->input->post('aufenthaltfoerderung_code');
-
-		$this->load->model('codex/Bisioaufenthaltfoerderung_model', 'BisioaufenthaltfoerderungModel');
-
-		$result = $this->BisioaufenthaltfoerderungModel->delete(
-			array(
-				'aufnahmetermin_id' => $aufnahmetermin_id,
-				'aufenthaltfoerderung_code' => $aufenthaltfoerderung_code
-			)
-		);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess(current($data));
-	}
 }
diff --git a/application/models/crm/Reihungstest_model.php b/application/models/crm/Reihungstest_model.php
index 86ebfd0af..f2732b636 100644
--- a/application/models/crm/Reihungstest_model.php
+++ b/application/models/crm/Reihungstest_model.php
@@ -511,4 +511,43 @@ class Reihungstest_model extends DB_Model
 
 		return $this->execQuery($query, array($date, $studiengang_kz));
 	}
+
+	/**
+	 * Loads all placement tests of a given person
+	 * @param integer $person_id
+	 * @return array Returns object array with data of placement tests
+	 */
+	public function getReihungstestPerson($person_id)
+	{
+		$query = ' 
+			SELECT 
+			  tbl_rt_person.*,
+			  tbl_reihungstest.studiengang_kz,
+			  tbl_reihungstest.anmerkung,
+			  tbl_reihungstest.datum,
+			  tbl_reihungstest.uhrzeit,
+			  tbl_reihungstest.ext_id,
+			  tbl_reihungstest.max_teilnehmer,
+			  tbl_reihungstest.oeffentlich,
+			  tbl_reihungstest.freigeschaltet,
+			  tbl_reihungstest.studiensemester_kurzbz,
+			  tbl_reihungstest.stufe,
+			  tbl_reihungstest.anmeldefrist,
+			  tbl_reihungstest.aufnahmegruppe_kurzbz,
+			  tbl_studiengang.typ,
+			  UPPER(typ::varchar(1) || kurzbz) AS stg_kuerzel,
+			  so.studiengangbezeichnung,
+				  so.studiengangbezeichnung_englisch
+			FROM
+			  public.tbl_rt_person
+			JOIN public.tbl_reihungstest ON (rt_id=reihungstest_id)
+			JOIN public.tbl_studiengang ON tbl_reihungstest.studiengang_kz = tbl_studiengang.studiengang_kz
+			JOIN lehre.tbl_studienplan sp USING(studienplan_id)
+			JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
+			WHERE
+			  tbl_rt_person.person_id = ?
+			ORDER BY datum, uhrzeit ASC';
+
+		return $this->execQuery($query, array($person_id));
+	}
 }
\ No newline at end of file
diff --git a/public/js/api/factory/stv/admissionDates.js b/public/js/api/factory/stv/admissionDates.js
index fc96f47be..51a92c331 100644
--- a/public/js/api/factory/stv/admissionDates.js
+++ b/public/js/api/factory/stv/admissionDates.js
@@ -16,10 +16,10 @@
  */
 
 export default {
-	getAufnahmetermine(prestudent_id) {
+	getAufnahmetermine(person_id) {
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/aufnahmetermine/' + prestudent_id
+			url: 'api/frontend/v1/stv/aufnahmetermine/getAufnahmetermine/' + person_id,
 		};
 	},
 }
\ No newline at end of file
diff --git a/public/js/api/stv/admissionDates.js b/public/js/api/stv/admissionDates.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index 58f440836..7e7e2ae97 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -27,12 +27,24 @@ export default {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
-					ApiStvAdmissionDates.getAufnahmetermin(this.student.prestudent_id)
+					ApiStvAdmissionDates.getAufnahmetermine(this.student.person_id)
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "aufnahmetermin_id", field: "aufnahmetermin_id"},
-					{title: "prestudent_id", field: "prestudent_id"},
+					{title: "rt_id", field: "rt_id"},
+					{title: "rt_person_id", field: "rt_person_id"},
+					{title: "person_id", field: "person_id"},
+					{title: "datum", field: "datum"},
+					{title: "stufe", field: "stufe"},
+					{title: "studiensemester", field: "studiensemester_kurzbz"},
+					{title: "anmerkung", field: "anmerkung", visible: false},
+					{title: "anmeldedatum", field: "anmeldedatum", visible: false},
+					{title: "punkte", field: "punkte"},
+					{title: "teilgenommen", field: "teilgenommen"},
+					{title: "ort", field: "ort", visible: false},
+					{title: "studienplan", field: "studienplan", visible: false},
+					{title: "studienplan_id", field: "studienplan_id", visible: false},
+					{title: "stg_kuerzel", field: "stg_kuerzel"},
 				],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData: false,
@@ -53,6 +65,19 @@ export default {
 	<div class="stv-details-admission-dates-table h-100 pb-3">
 		<h4>Allgemein</h4>
 		
+		<core-filter-cmpt
+			ref="table"
+			:tabulator-options="tabulatorOptions"
+			:tabulator-events="tabulatorEvents"
+			table-only
+			:side-menu="false"
+			reload
+			new-btn-show
+			:new-btn-label="this.$p.t('lehre', 'reihungstest')"
+			@click:new="actionNewMobility"
+			>
+		</core-filter-cmpt>
+		
 	</div>
 	`
 }
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index fd54d9f66..bf18f50c8 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41416,6 +41416,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'reihungstest',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Reihungstest',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Placement Test',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC4 STUDIERENDENVERWALTUNG AUFNAHMETERMINE ENDE	 ---------------------------------------------------------------
 
 );

From 97d83d3acf06fe2fa418779fd60f5914876a69a2 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 25 Apr 2025 09:59:41 +0200
Subject: [PATCH 128/572] WIP abgabetool mitarbeiter

---
 .../controllers/api/frontend/v1/Lehre.php     |  78 ++++++++-
 .../models/education/Paabgabe_model.php       |  11 --
 .../models/education/Projektarbeit_model.php  |   3 +-
 public/js/api/lehre.js                        |  23 +++
 public/js/apps/Dashboard/Fhc.js               |   2 +-
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 163 ++++++++++++++----
 .../Cis/Abgabetool/AbgabeStudentDetail.js     |   8 +-
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  48 ++++--
 .../Cis/Abgabetool/AbgabetoolStudent.js       |  12 +-
 public/js/plugin/FhcApi.js                    |   2 -
 10 files changed, 272 insertions(+), 78 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Lehre.php b/application/controllers/api/frontend/v1/Lehre.php
index a6c593d3a..d0b712e36 100644
--- a/application/controllers/api/frontend/v1/Lehre.php
+++ b/application/controllers/api/frontend/v1/Lehre.php
@@ -43,7 +43,9 @@ class Lehre extends FHCAPI_Controller
 			'getStudentProjektabgaben' => self::PERM_LOGGED,
 			'postStudentProjektarbeitZwischenabgabe' => self::PERM_LOGGED,
 			'postStudentProjektarbeitEndupload' => self::PERM_LOGGED,
-			'getMitarbeiterProjektarbeiten' => self::PERM_LOGGED
+			'getMitarbeiterProjektarbeiten' => self::PERM_LOGGED,
+			'postProjektarbeitAbgabe' => self::PERM_LOGGED,
+			'deleteProjektarbeitAbgabe' => self::PERM_LOGGED
 		]);
 
 		$this->load->library('PhrasesLib');
@@ -448,9 +450,6 @@ class Lehre extends FHCAPI_Controller
 	public function getMitarbeiterProjektarbeiten() {
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
-//		if (!isset($uid) || isEmptyString($uid))
-//			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
-
 		$boolParamStr = $this->input->get('showall');
 		$trueStrings = ['true', '1'];
 		$falseStrings = ['false', '0'];
@@ -473,5 +472,76 @@ class Lehre extends FHCAPI_Controller
 		
 		$this->terminateWithSuccess(array($projektarbeiten, DOMAIN));
 	}
+	
+	public function postProjektarbeitAbgabe() {
+		$projektarbeit_id = $_POST['projektarbeit_id'];
+		$paabgabe_id = $_POST['paabgabe_id'];
+		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
+		$datum = $_POST['datum'];
+		$fixtermin = $_POST['fixtermin'];
+		$kurzbz = $_POST['kurzbz'];
+
+		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id)
+			|| !isset($paabgabe_id) || isEmptyString($paabgabe_id)
+			|| !isset($datum) || isEmptyString($datum)
+			|| !isset($datum) || isEmptyString($datum)
+			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+		
+		if($paabgabe_id == -1) {
+			$result = $this->PaabgabeModel->insert(
+				array(
+					'projektarbeit_id' => $projektarbeit_id,
+					'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
+					'fixtermin' => $fixtermin,
+					'datum' => $datum,
+					'kurzbz' => $kurzbz,
+					'insertvon' => getAuthUID(),
+					'insertamum' => date('Y-m-d H:i:s')
+				)
+			);
+			
+			$this->terminateWithSuccess($result);
+		} else {
+			$result = $this->PaabgabeModel->update(
+				$paabgabe_id,
+				array(
+					'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
+					'datum' => $datum,
+					'kurzbz' => $kurzbz,
+					'updatevon' => getAuthUID(),
+					'updateamum' => date('Y-m-d H:i:s')
+				)
+			);
+
+			$this->terminateWithSuccess($result);
+		}
+	}
+	
+	public function deleteProjektarbeitAbgabe() {
+		$paabgabe_id = $_POST['paabgabe_id'];
+		
+		if (!isset($paabgabe_id) || isEmptyString($paabgabe_id))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+
+		$result = $this->PaabgabeModel->load($paabgabe_id);
+		$result = $this->getDataOrTerminateWithError($result);
+		
+		if(count($result) == 0) 
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		// TODO: berechtigung?
+		if($result[0]->insertvon === getAuthUID()) {
+			$result = $this->PaabgabeModel->delete($paabgabe_id);
+			$result = $this->getDataOrTerminateWithError($result);
+			$this->terminateWithSuccess($result);
+		}
+
+		$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+	}
 }
 
diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
index 97235c37d..558059f72 100644
--- a/application/models/education/Paabgabe_model.php
+++ b/application/models/education/Paabgabe_model.php
@@ -31,15 +31,4 @@ class Paabgabe_model extends DB_Model
 		return $this->execQuery($qry, array($projektarbeit_id));
 	}
 	
-	public function updatePaabgabe($paabgabe_id) {
-		$qry="
-			UPDATE campus.tbl_paabgabe SET
-				abgabedatum = now(),
-				updatevon = ?,
-				updateamum = now()
-			WHERE paabgabe_id= ?";
-
-		return $this->execQuery($qry, array(getAuthUID(), $paabgabe_id));
-	}
-	
 }
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index fb5c62149..1041b3aec 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -169,7 +169,8 @@ class Projektarbeit_model extends DB_Model
 					campus.tbl_paabgabe.datum,
 					campus.tbl_paabgabetyp.paabgabetyp_kurzbz, 
 					campus.tbl_paabgabetyp.bezeichnung, 
-					campus.tbl_paabgabe.abgabedatum
+					campus.tbl_paabgabe.abgabedatum,
+					campus.tbl_paabgabe.insertvon
 				FROM campus.tbl_paabgabe JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
 				WHERE campus.tbl_paabgabe.projektarbeit_id = ?
 				ORDER BY campus.tbl_paabgabe.datum";
diff --git a/public/js/api/lehre.js b/public/js/api/lehre.js
index cd8c911e2..2bf6dd277 100644
--- a/public/js/api/lehre.js
+++ b/public/js/api/lehre.js
@@ -54,5 +54,28 @@ export default {
 			`/api/frontend/v1/Lehre/getMitarbeiterProjektarbeiten?showall=${all}`
 			, {}
 		);
+	},
+	postProjektarbeitAbgabe(termin) {
+		const payload = {
+			paabgabe_id: termin.paabgabe_id,
+			paabgabetyp_kurzbz: termin.bezeichnung.paabgabetyp_kurzbz,
+			datum: termin.datum,
+			fixtermin: termin.fixtermin,
+			insertvon: termin.insertvon,
+			kurzbz: termin.kurzbz,
+			projektarbeit_id: termin.projektarbeit_id
+		}
+		const url = '/api/frontend/v1/Lehre/postProjektarbeitAbgabe';
+
+		return this.$fhcApi.post(url, payload, null)
+		
+	},
+	deleteProjektarbeitAbgabe(paabgabe_id) {
+		const payload = {
+			paabgabe_id
+		}
+		const url = '/api/frontend/v1/Lehre/deleteProjektarbeitAbgabe';
+
+		return this.$fhcApi.post(url, payload, null)
 	}
   }
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 457d57e63..31f783b09 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -32,7 +32,7 @@ const router = VueRouter.createRouter({
 			props: true
 		},
 		{
-			path: `/Cis/Abgabetool/Student`,
+			path: `/Cis/Abgabetool/Student/:student_uid_prop?`,
 			name: 'AbgabetoolStudent',
 			component: AbgabetoolStudent,
 			props: true
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 016e08464..3451d97ba 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -8,7 +8,8 @@ export const AbgabeMitarbeiterDetail = {
 		InputNumber: primevue.inputnumber,
 		Checkbox: primevue.checkbox,
 		Dropdown: primevue.dropdown,
-		Textarea: primevue.textarea
+		Textarea: primevue.textarea,
+		VueDatePicker
 	},
 	props: {
 		projektarbeit: {
@@ -21,6 +22,29 @@ export const AbgabeMitarbeiterDetail = {
 			eidAkzeptiert: false,
 			enduploadTermin: null,
 			allActiveLanguages: FHC_JS_DATA_STORAGE_OBJECT.server_languages,
+			// TODO: fetch types
+			allAbgabeTypes: [
+				{
+					paabgabetyp_kurzbz: 'abstract',
+					bezeichnung: 'Entwurf'
+				},
+				{
+					paabgabetyp_kurzbz: 'zwischen',
+					bezeichnung: 'Zwischenabgabe'
+				},
+				{
+					paabgabetyp_kurzbz: 'note',
+					bezeichnung: 'Benotung'
+				},
+				{
+					paabgabetyp_kurzbz: 'end',
+					bezeichnung: 'Endupload'
+				},
+				{
+					paabgabetyp_kurzbz: 'enda',
+					bezeichnung: 'Endabgabe im Sekretariat'
+				}
+			],
 			form: Vue.reactive({
 				sprache: '',
 				abstract: '',
@@ -36,11 +60,52 @@ export const AbgabeMitarbeiterDetail = {
 		openZusatzdatenModal(termin) {
 				
 		},
-		save(termin) {
-			// TODO: api speichern termin	
+		saveTermin(termin) {
+			const paabgabe_id = termin.paabgabe_id
+			this.$fhcApi.factory.lehre.postProjektarbeitAbgabe(termin).then( (res) => {
+				if(res?.meta?.status == 'success') {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui/gespeichert'))
+
+					if(paabgabe_id === -1) { // new abgabe has been inserted
+						termin.paabgabe_id = res?.data?.retval
+
+						this.projektarbeit.abgabetermine.push({ // new abgatermin row
+
+							'paabgabe_id': -1,
+							'projektarbeit_id': this.projektarbeit.projektarbeit_id,
+							'fixtermin': false,
+							'kurzbz': '',
+							'datum': new Date().toISOString().split('T')[0],
+							'paabgabetyp_kurzbz': '',
+							'bezeichnung': '',
+							'abgabedatum': null,
+							'insertvon': this.viewData?.uid ?? '',
+							'allowedToSave': true,
+							'allowedToDelete': true
+						})
+					}
+					
+					
+				} else if(res?.meta?.status == 'error'){
+					this.$fhcAlert.alertError()
+				}
+				
+			})
 		},
-		delete(termin) {
-			// TODO: api delete termin	
+		deleteTermin(termin) {
+			debugger
+			this.$fhcApi.factory.lehre.deleteProjektarbeitAbgabe(termin.paabgabe_id).then( (res) => {
+				if(res?.meta?.status == 'success') {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui/genericDeleted', [this.$p.t('abgabetool/abgabe')]))
+					// this.$p.t('global/tooltipLektorDeleteKontrolle', [this.$entryParams.permissions.kontrolleDeleteMaxReach ])
+					const deletedTerminIndex = this.projektarbeit.abgabetermine.findIndex(t => t.paabgabe_id === termin.paabgabe_id)
+					this.projektarbeit.abgabetermine.splice(deletedTerminIndex, 1)
+
+
+				} else if(res?.meta?.status == 'error'){
+					this.$fhcAlert.alertError()
+				}
+			})
 		},
 		validate: function(termin) {
 			if(!termin.file.length) {
@@ -84,8 +149,25 @@ export const AbgabeMitarbeiterDetail = {
 		openBeurteilungLink(link) {
 			window.open(link, '_blank')
 		},
-		getOptionLabel(option) {
+		getOptionLabelSprache(option) {
 			return option.sprache
+		},
+		getOptionLabelAbgabetyp(option){
+			return option.bezeichnung
+		},
+		formatDate(dateParam) {
+			const date = new Date(dateParam)
+			// handle missing leading 0
+			const padZero = (num) => String(num).padStart(2, '0');
+
+			const month = padZero(date.getMonth() + 1); // Months are zero-based
+			const day = padZero(date.getDate());
+			const year = date.getFullYear();
+
+			return `${day}.${month}.${year}`;
+		},
+		openStudentPage() {
+			// TODO: do it
 		}
 	},
 	watch: {
@@ -119,39 +201,58 @@ export const AbgabeMitarbeiterDetail = {
 		
 			<h5>{{$p.t('abgabetool/c4abgabeMitarbeiterbereich')}}</h5>
 			<div class="row">
-				<p> {{projektarbeit?.student}}</p>
-				<p> {{projektarbeit?.titel}}</p>
-				<p v-if="projektarbeit?.zweitbegutachter"> {{projektarbeit?.zweitbegutachter}}</p>
+				<div class="col-8">
+					<p> {{projektarbeit?.student}}</p>
+					<p> {{projektarbeit?.titel}}</p>
+					<p v-if="projektarbeit?.zweitbegutachter"> {{projektarbeit?.zweitbegutachter}}</p>
+				</div>
+				<div>
+					<button class="btn btn-primary border-0" @click="openStudentPage">
+						Speichern
+						<i style="margin-left: 8px" class="fa-solid fa-floppy-disk"></i>
+					</button>
+				</div>
 			</div>
 			<div id="uploadWrapper">
 				<div class="row" style="margin-bottom: 12px;">
 					<div style="width: 100px">{{$p.t('abgabetool/c4fixtermin')}}</div>
-					<div class="col-1">{{$p.t('abgabetool/c4zieldatum')}}</div>
-					<div class="col-1">{{$p.t('abgabetool/c4abgabetyp')}}</div>
-					<div class="col-2">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
+					<div class="col-2">{{$p.t('abgabetool/c4zieldatum')}}</div>
+					<div class="col-2">{{$p.t('abgabetool/c4abgabetyp')}}</div>
+					<div class="col-4">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
 					<div class="col-1">{{$p.t('abgabetool/c4abgabedatum')}}</div>
 					<div class="col">
 						
 					</div>
 				</div>
-<!--			TODO: show some nothing found placeholder when abgabetermine are empty -->
+				<div v-if="!projektarbeit?.abgabetermine?.length">keine Termine gefunden!</div>
 				<div class="row" v-for="termin in projektarbeit.abgabetermine">
 					<div style="width: 100px" class="d-flex justify-content-center align-items-center">
 						<p class="fhc-bullet" :class="{ 'fhc-bullet-red': termin.fixtermin, 'fhc-bullet-green': !termin.fixtermin }"></p>
 					</div>
-					<div class="col-1 d-flex justify-content-center align-items-center">
+					<div class="col-2 d-flex justify-content-center align-items-center">
 						<div :style="getDateStyle(termin)">
-<!--							TODO: date input-->
-							{{ termin.datum?.split("-").reverse().join(".") }}
+							<VueDatePicker
+								v-model="termin.datum"
+								:clearable="false"
+								:disabled="!termin.allowedToSave"
+								:enable-time-picker="false"
+								:format="formatDate"
+								:text-input="true"
+								auto-apply>
+							</VueDatePicker>
 						</div>				
 					</div>
-					<div class="col-1 d-flex justify-content-center align-items-center">
-					<!-- TODO: type dropdown select -->
-							{{ termin.bezeichnung }}
-					</div>
 					<div class="col-2 d-flex justify-content-center align-items-center">
-						<!-- TODO: abgabe kurzbz input -->
-						{{ termin.kurzbz }}
+						<Dropdown 
+							:style="{'width': '100%'}"
+							:disabled="!termin.allowedToSave"
+							v-model="termin.bezeichnung"
+							:options="allAbgabeTypes"
+							:optionLabel="getOptionLabelAbgabetyp">
+						</Dropdown>
+					</div>
+					<div class="col-4 d-flex justify-content-center align-items-center">
+						<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="3" cols="60" :disabled="!termin.allowedToSave"></Textarea>
 					</div>
 					<div class="col-1 d-flex justify-content-center align-items-center">
 						{{ termin.abgabedatum?.split("-").reverse().join(".") }}
@@ -159,22 +260,16 @@ export const AbgabeMitarbeiterDetail = {
 							<i class="fa-solid fa-file-pdf"></i>
 						</a>
 					</div>
-					<div class="col-6">
+					<div class="col-2 align-content-center">
 						<div class="row">
-							<div class="col-3">
-								<button class="btn btn-primary border-0" @click="save(termin)" :disabled="!termin.allowedToUpload">
+							<div class="col-6">
+								<button v-if="termin.allowedToSave" class="btn btn-primary border-0" @click="saveTermin(termin)">
 									Speichern
 									<i style="margin-left: 8px" class="fa-solid fa-floppy-disk"></i>
 								</button>
 							</div>
-							<div class="col-3">
-								<button class="btn btn-primary border-0" @click="delete(termin)" :disabled="!termin.allowedToUpload">
-									Löschen
-									<i style="margin-left: 8px" class="fa-solid fa-trash"></i>
-								</button>
-							</div>
-							<div v-if="termin.endupload && hasFile" class="col-3">
-								<button class="btn btn-primary border-0" @click="openZusatzdatenModal(termin)" :disabled="!termin.allowedToUpload">
+							<div class="col-6">
+								<button v-if="termin.allowedToDelete && termin.paabgabe_id > 0" class="btn btn-primary border-0" @click="deleteTermin(termin)">
 									Löschen
 									<i style="margin-left: 8px" class="fa-solid fa-trash"></i>
 								</button>
@@ -208,7 +303,7 @@ export const AbgabeMitarbeiterDetail = {
 							:style="{'width': '100%'}"
 							v-model="form.sprache"
 							:options="allActiveLanguages"
-							:optionLabel="getOptionLabel">
+							:optionLabel="getOptionLabelSprache">
 						</Dropdown>
 					</div>
 				</div>
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 513d4f0e5..3c695a038 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -16,6 +16,10 @@ export const AbgabeStudentDetail = {
 		projektarbeit: {
 			type: Object,
 			default: null
+		},
+		viewMode: {
+			type: Boolean,
+			default: false
 		}
 	},
 	data() {
@@ -217,10 +221,10 @@ export const AbgabeStudentDetail = {
 					<div class="col-6">
 						<div class="row">
 							<div class="col-6">
-								<Upload v-if="termin && termin.allowedToUpload" accept=".pdf" v-model="termin.file"></Upload>
+								<Upload v-if="termin && termin.allowedToUpload" :disabled="viewMode" accept=".pdf" v-model="termin.file"></Upload>
 							</div>
 							<div class="col-6">
-								<button class="btn btn-primary border-0" @click="upload(termin)" :disabled="!termin.allowedToUpload">
+								<button class="btn btn-primary border-0" @click="upload(termin)" :disabled="!termin.allowedToUpload || viewMode">
 									Upload
 									<i style="margin-left: 8px" class="fa-solid fa-upload"></i>
 								</button>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 30344e4a0..98d36be19 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -7,7 +7,7 @@ export const AbgabetoolMitarbeiter = {
 	components: {
 		CoreFilterCmpt,
 		AbgabeDetail,
-		VerticalSplit
+		VerticalSplit,
 	},
 	props: {
 		viewData: {
@@ -33,7 +33,7 @@ export const AbgabetoolMitarbeiter = {
 			tableBuiltResolve: null,
 			tableBuiltPromise: null,
 			abgabeTableOptions: {
-				height: 300,
+				height: 700,
 				index: 'projektarbeit_id',
 				layout: 'fitDataStretch',
 				placeholder: this.$p.t('global/noDataAvailable'),
@@ -111,6 +111,7 @@ export const AbgabetoolMitarbeiter = {
 		},
 		toggleShowAll(showall) {
 			this.showAll = showall
+			// TODO: debug tabulator row render
 			this.loadProjektarbeiten(showall, () => { this.$refs.abgabeTable?.tabulator.redraw(true) })
 		},
 		addSeries() {
@@ -120,23 +121,31 @@ export const AbgabetoolMitarbeiter = {
 			return new Date(date) < new Date(Date.now())
 		},
 		setDetailComponent(details){
-			debugger
 			this.loadAbgaben(details).then((res)=> {
-				debugger
 				const pa = this.projektarbeiten?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
 				pa.abgabetermine = res.data.retval
+				pa.abgabetermine.push({ // new abgatermin row
+
+					'paabgabe_id': -1,
+					'projektarbeit_id': pa.projektarbeit_id,
+					'fixtermin': false,
+					'kurzbz': '',
+					'datum': new Date().toISOString().split('T')[0],
+					'paabgabetyp_kurzbz': '',
+					'bezeichnung': '',
+					'abgabedatum': null,
+					'insertvon': this.viewData?.uid ?? ''
+					
+				})
 				pa.abgabetermine.forEach(termin => {
 					termin.file = []
-					termin.allowedToUpload = true
-
-					// TODO: fixtermin logic?
-					if(termin.bezeichnung == 'Endupload' && this.isPastDate(termin.datum)) {
-
-						// termin.allowedToUpload = false
-					} else {
-						// termin.allowedToUpload = true
+					termin.allowedToSave = termin.insertvon == this.viewData?.uid && pa.betreuerart_kurzbz != 'Zweitbegutachter'
+					termin.allowedToDelete = termin.allowedToSave && !termin.abgabedatum
+					
+					termin.bezeichnung = {
+						bezeichnung: termin.bezeichnung,
+						paabgabetyp_kurzbz: termin.paabgabetyp_kurzbz
 					}
-
 				})
 				pa.betreuer = this.buildBetreuer(pa)
 				pa.student_uid = details.student_uid
@@ -192,6 +201,7 @@ export const AbgabetoolMitarbeiter = {
 			return (projekt.typ + projekt.kurzbz)?.toUpperCase()	
 		},
 		buildBetreuer(abgabe) {
+			// TODO: preload and insert own titled name of betreuer somehow
 			return abgabe.betreuerart_beschreibung + ': ' + (abgabe.btitelpre ? abgabe.btitelpre + ' ' : '') + abgabe.bvorname + ' ' + abgabe.bnachname + (abgabe.btitelpost ? ' ' + abgabe.btitelpost : '')
 		},
 		setupData(data){
@@ -275,14 +285,14 @@ export const AbgabetoolMitarbeiter = {
 		this.setupMounted()
 	},
 	template: `
-	<div class="h-100">
-	
 
-		<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
-		<hr>
+
 		
-		<vertical-split ref="verticalsplit">
+		<vertical-split ref="verticalsplit">		
+			
 			<template #top>
+				<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
+				<hr>
 				<core-filter-cmpt 
 					:title="''"  
 					@uuidDefined="handleUuidDefined"
@@ -310,6 +320,7 @@ export const AbgabetoolMitarbeiter = {
 						</button>
 					</template>
 				</core-filter-cmpt>
+
 			</template>
 			<template #bottom>
 				<div v-show="selectedProjektarbeit" ref="selProj"> 
@@ -318,7 +329,6 @@ export const AbgabetoolMitarbeiter = {
 			</template>
 		</vertical-split>
 
-	</div>
 	 
     `,
 };
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 699be7de6..086cc8a9d 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -4,11 +4,13 @@ import AbgabeDetail from "./AbgabeStudentDetail.js";
 export const AbgabetoolStudent = {
 	name: "AbgabetoolStudent",
 	components: {
-		VueDatePicker,
 		CoreFilterCmpt,
 		AbgabeDetail
 	},
 	props: {
+		student_uid_prop: {
+			default: null
+		},
 		viewData: {
 			type: Object,
 			required: true,
@@ -177,7 +179,7 @@ export const AbgabetoolStudent = {
 			this.$refs.abgabeTable.tabulator.setData(d);
 		},
 		loadProjektarbeiten() {
-			this.$fhcApi.factory.lehre.getStudentProjektarbeiten(this.viewData?.uid ?? null)
+			this.$fhcApi.factory.lehre.getStudentProjektarbeiten(this.student_uid_prop ?? this.viewData?.uid ?? null)
 				.then(res => {
 					if(res?.data) this.setupData(res.data)
 				})
@@ -205,7 +207,9 @@ export const AbgabetoolStudent = {
 
 	},
 	computed: {
-
+		isViewMode() {
+			return this.student_uid !== null
+		}
 	},
 	created() {
 
@@ -228,7 +232,7 @@ export const AbgabetoolStudent = {
 	 
 	 <hr>
 	 <div v-show="selectedProjektarbeit"> 
-	 	<AbgabeDetail :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
+	 	<AbgabeDetail :viewMode="isViewMode" :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
 	 </div>
     `,
 };
diff --git a/public/js/plugin/FhcApi.js b/public/js/plugin/FhcApi.js
index 0845a1a5e..211a2c4e1 100644
--- a/public/js/plugin/FhcApi.js
+++ b/public/js/plugin/FhcApi.js
@@ -1,7 +1,5 @@
 import FhcAlert from './FhcAlert.js';
 import FhcApiFactory from '../api/fhcapifactory.js';
-
-
 export default {
 	install: (app, options) => {
 		if (app.config.globalProperties.$fhcApi) {

From a5ab2f138119ae7d465fc7ca42780b894ef28234 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 25 Apr 2025 14:30:12 +0200
Subject: [PATCH 129/572] match abgabetool_detail student/mitarbeiter
 look&feel; WIP terminserie, zweitbetreuer logic etc

---
 .../controllers/api/frontend/v1/Lehre.php     | 15 ++++-
 .../controllers/api/frontend/v1/Ort.php       |  4 +-
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 38 +++++++++--
 .../Cis/Abgabetool/AbgabeStudentDetail.js     | 49 ++++++++++----
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   | 12 ++--
 .../Cis/Abgabetool/AbgabetoolStudent.js       | 64 +++++++++++++------
 .../js/components/Cis/Raumsuche/Raumsuche.js  |  1 -
 public/js/components/Form/Upload/Dms.js       |  6 +-
 system/phrasesupdate.php                      | 60 +++++++++++++++++
 9 files changed, 196 insertions(+), 53 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Lehre.php b/application/controllers/api/frontend/v1/Lehre.php
index d0b712e36..375551e7a 100644
--- a/application/controllers/api/frontend/v1/Lehre.php
+++ b/application/controllers/api/frontend/v1/Lehre.php
@@ -130,13 +130,26 @@ class Lehre extends FHCAPI_Controller
 	public function getStudentProjektabgaben() {
 		$projektarbeit_id = $this->input->get("projektarbeit_id",TRUE);
 
+		// TODO: error messages
+		
 		if (!isset($projektarbeit_id) || isEmptyString($projektarbeit_id))
 			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		$projektarbeit_obj = new projektarbeit();
+		if($projektarbeit_id==-1)
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		if(!$projektarbeit_obj->load($projektarbeit_id))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+
+		$paIsCurrent = $projektarbeit_obj->projektarbeitIsCurrent($projektarbeit_id);
 		
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 		$ret = $this->ProjektarbeitModel->getProjektarbeitAbgabetermine($projektarbeit_id);
 		
-		$this->terminateWithSuccess($ret);
+		// TODO: fetch zweitbetreuer
+		
+		$this->terminateWithSuccess(array($ret, $paIsCurrent));
 	}
 
 	/**
diff --git a/application/controllers/api/frontend/v1/Ort.php b/application/controllers/api/frontend/v1/Ort.php
index a6a3b3404..0d8074fa9 100644
--- a/application/controllers/api/frontend/v1/Ort.php
+++ b/application/controllers/api/frontend/v1/Ort.php
@@ -100,8 +100,8 @@ class Ort extends FHCAPI_Controller
 			)
 		";
 		$params = array_merge($params, [$datum, $vonStunde, $bisStunde, $datum, $vonStunde, $bisStunde]);
-		$this->addMeta('qry', $qry);
-		$this->addMeta('params', $params);
+//		$this->addMeta('qry', $qry);
+//		$this->addMeta('params', $params);
 		$result = $this->OrtModel->execReadOnlyQuery($qry, $params);
 		
 		$this->terminateWithSuccess($result);
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 3451d97ba..7e0da66f6 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -93,7 +93,6 @@ export const AbgabeMitarbeiterDetail = {
 			})
 		},
 		deleteTermin(termin) {
-			debugger
 			this.$fhcApi.factory.lehre.deleteProjektarbeitAbgabe(termin.paabgabe_id).then( (res) => {
 				if(res?.meta?.status == 'success') {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui/genericDeleted', [this.$p.t('abgabetool/abgabe')]))
@@ -144,7 +143,7 @@ export const AbgabeMitarbeiterDetail = {
 				color = 'green'
 			}
 
-			return 'font-color: ' + fontColor + '; background-color: ' + color
+			return `font-color: ${fontColor} ; background-color: ${color}; border-radius: 50%;`
 		},
 		openBeurteilungLink(link) {
 			window.open(link, '_blank')
@@ -167,7 +166,14 @@ export const AbgabeMitarbeiterDetail = {
 			return `${day}.${month}.${year}`;
 		},
 		openStudentPage() {
-			// TODO: do it
+			const link = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router
+				+ '/Cis/Abgabetool/Student/' + this.projektarbeit?.student_uid
+			window.open(link, '_blank')
+		},
+		openPlagiatcheck() {
+			// todo: hardcoded turnitin link pfui?
+			const link = "https://technikum-wien.turnitin.com/sso/sp/redwood/saml/5IyfmBr2OcSIaWQTKlFCGj/start"
+			window.open(link, '_blank')
 		}
 	},
 	watch: {
@@ -188,7 +194,14 @@ export const AbgabeMitarbeiterDetail = {
 		},
 		getEnduploadErlaubt() {
 			return !this.eidAkzeptiert
+		},
+		getSemesterBenotbar(){
+			return this.projektarbeit?.isCurrent ?? false
+		},
+		endUploadVorhanden(){
+			return this.projektarbeit?.abgabetermine.find(abgabe => abgabe.paabgabetyp_kurzbz === 'end' && abgabe.abgabedatum !== null)
 		}
+		
 	},
 	created() {
 
@@ -206,10 +219,20 @@ export const AbgabeMitarbeiterDetail = {
 					<p> {{projektarbeit?.titel}}</p>
 					<p v-if="projektarbeit?.zweitbegutachter"> {{projektarbeit?.zweitbegutachter}}</p>
 				</div>
-				<div>
-					<button class="btn btn-primary border-0" @click="openStudentPage">
-						Speichern
-						<i style="margin-left: 8px" class="fa-solid fa-floppy-disk"></i>
+				<div class="col-4 d-flex justify-content-end">
+					<div>
+						<button :disabled="!getSemesterBenotbar && endUploadVorhanden" class="btn btn-secondary border-0" @click="openPlagiatcheck" style="margin-right: 4px;">
+							benoten
+							<i style="margin-left: 8px" class="fa-solid fa-user-check"></i>
+						</button>
+					</div>
+					<button v-if="projektarbeit?.betreuerart_kurzbz !== 'Zweitbegutachter'" class="btn btn-secondary border-0" @click="openPlagiatcheck" style="margin-right: 4px;">
+						zur Plagiatsprüfung
+						<i style="margin-left: 8px" class="fa-solid fa-user-check"></i>
+					</button>
+					<button class="btn btn-secondary border-0" @click="openStudentPage">
+						Studentenansicht
+						<i style="margin-left: 8px" class="fa-solid fa-eye"></i>
 					</button>
 				</div>
 			</div>
@@ -232,6 +255,7 @@ export const AbgabeMitarbeiterDetail = {
 					<div class="col-2 d-flex justify-content-center align-items-center">
 						<div :style="getDateStyle(termin)">
 							<VueDatePicker
+								style="width: 95%;"
 								v-model="termin.datum"
 								:clearable="false"
 								:disabled="!termin.allowedToSave"
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 3c695a038..9b57244e2 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -10,7 +10,8 @@ export const AbgabeStudentDetail = {
 		InputNumber: primevue.inputnumber,
 		Checkbox: primevue.checkbox,
 		Dropdown: primevue.dropdown,
-		Textarea: primevue.textarea
+		Textarea: primevue.textarea,
+		VueDatePicker
 	},
 	props: {
 		projektarbeit: {
@@ -82,6 +83,17 @@ export const AbgabeStudentDetail = {
 		downloadAbgabe(termin) {
 			this.$fhcApi.factory.lehre.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid)
 		},
+		formatDate(dateParam) {
+			const date = new Date(dateParam)
+			// handle missing leading 0
+			const padZero = (num) => String(num).padStart(2, '0');
+
+			const month = padZero(date.getMonth() + 1); // Months are zero-based
+			const day = padZero(date.getDate());
+			const year = date.getFullYear();
+
+			return `${day}.${month}.${year}`;
+		},
 		upload(termin) {
 
 			if (!this.validate(termin))
@@ -147,7 +159,7 @@ export const AbgabeStudentDetail = {
 				color = 'green'
 			}
 			
-			return 'font-color: ' + fontColor + '; background-color: ' + color
+			return `font-color: ${fontColor} ; background-color: ${color}; border-radius: 50%;`
 		},
 		openBeurteilungLink(link) {
 			window.open(link, '_blank')
@@ -193,9 +205,9 @@ export const AbgabeStudentDetail = {
 			<div id="uploadWrapper">
 				<div class="row" style="margin-bottom: 12px;">
 					<div style="width: 100px">{{$p.t('abgabetool/c4fixtermin')}}</div>
-					<div class="col-1">{{$p.t('abgabetool/c4zieldatum')}}</div>
-					<div class="col-1">{{$p.t('abgabetool/c4abgabetyp')}}</div>
-					<div class="col-2">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
+					<div class="col-2">{{$p.t('abgabetool/c4zieldatum')}}</div>
+					<div class="col-2">{{$p.t('abgabetool/c4abgabetyp')}}</div>
+					<div class="col-4">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
 					<div class="col-1">{{$p.t('abgabetool/c4abgabedatum')}}</div>
 					<div class="col">
 						{{$p.t('abgabetool/c4fileupload')}}
@@ -205,33 +217,42 @@ export const AbgabeStudentDetail = {
 					<div style="width: 100px" class="d-flex justify-content-center align-items-center">
 						<p class="fhc-bullet" :class="{ 'fhc-bullet-red': termin.fixtermin, 'fhc-bullet-green': !termin.fixtermin }"></p>
 					</div>
-					<div class="col-1 d-flex justify-content-center align-items-center">
+					<div class="col-2 d-flex justify-content-center align-items-center">
 						<div :style="getDateStyle(termin)">
-							{{ termin.datum?.split("-").reverse().join(".") }}
+							<VueDatePicker
+								style="width: 95%;"
+								v-model="termin.datum"
+								:clearable="false"
+								:disabled="true"
+								:enable-time-picker="false"
+								:format="formatDate"
+								:text-input="true"
+								auto-apply>
+							</VueDatePicker>
 						</div>				
 					</div>
-					<div class="col-1 d-flex justify-content-center align-items-center">{{ termin.bezeichnung }}</div>
-					<div class="col-2 d-flex justify-content-center align-items-center">{{ termin.kurzbz }}</div>
+					<div class="col-2 d-flex justify-content-center align-items-center">{{ termin.bezeichnung }}</div>
+					<div class="col-4 d-flex justify-content-center align-items-center">
+						<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="3" cols="60" :disabled="true"></Textarea>
+					</div>
 					<div class="col-1 d-flex justify-content-center align-items-center">
 						{{ termin.abgabedatum?.split("-").reverse().join(".") }}
 						<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="margin-left:4px; cursor: pointer;">
 							<i class="fa-solid fa-file-pdf"></i>
 						</a>
 					</div>
-					<div class="col-6">
+					<div class="col-2" v-if="!viewMode">
 						<div class="row">
 							<div class="col-6">
-								<Upload v-if="termin && termin.allowedToUpload" :disabled="viewMode" accept=".pdf" v-model="termin.file"></Upload>
+								<Upload v-if="termin && termin.allowedToUpload" accept=".pdf" v-model="termin.file"></Upload>
 							</div>
 							<div class="col-6">
-								<button class="btn btn-primary border-0" @click="upload(termin)" :disabled="!termin.allowedToUpload || viewMode">
+								<button class="btn btn-primary border-0" @click="upload(termin)" :disabled="!termin.allowedToUpload">
 									Upload
 									<i style="margin-left: 8px" class="fa-solid fa-upload"></i>
 								</button>
 							</div>
 						</div>
-						
-						
 					</div>
 				</div>
 			</div>
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 98d36be19..06a1f2d00 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -72,7 +72,6 @@ export const AbgabetoolMitarbeiter = {
 			{
 				event: "cellClick",
 				handler: async (e, cell) => {
-					debugger
 					if(cell.getColumn().getField() === "details") {
 						this.setDetailComponent(cell.getValue())
 					}
@@ -84,7 +83,6 @@ export const AbgabetoolMitarbeiter = {
 				event: "rowClick",
 				handler: async (e, row) => {
 
-					debugger
 					e.stopPropagation()
 
 				}
@@ -93,7 +91,6 @@ export const AbgabetoolMitarbeiter = {
 				event: "rowSelected",
 				handler: async (row) => {
 
-					debugger
 
 				}
 			},
@@ -123,7 +120,8 @@ export const AbgabetoolMitarbeiter = {
 		setDetailComponent(details){
 			this.loadAbgaben(details).then((res)=> {
 				const pa = this.projektarbeiten?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
-				pa.abgabetermine = res.data.retval
+				pa.abgabetermine = res.data[0].retval
+				pa.isCurrent = res.data[1]
 				pa.abgabetermine.push({ // new abgatermin row
 
 					'paabgabe_id': -1,
@@ -153,9 +151,9 @@ export const AbgabetoolMitarbeiter = {
 				
 				this.selectedProjektarbeit = pa
 				
-				Vue.nextTick(()=>{
-					this.$refs.verticalsplit.showBoth()
-				})
+				
+				this.$refs.verticalsplit.showBoth()
+				
 			
 			})
 		},
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 086cc8a9d..1ac9ad912 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -1,11 +1,13 @@
 import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
 import AbgabeDetail from "./AbgabeStudentDetail.js";
+import VerticalSplit from "../../verticalsplit/verticalsplit.js";
 
 export const AbgabetoolStudent = {
 	name: "AbgabetoolStudent",
 	components: {
 		CoreFilterCmpt,
-		AbgabeDetail
+		AbgabeDetail,
+		VerticalSplit
 	},
 	props: {
 		student_uid_prop: {
@@ -22,6 +24,7 @@ export const AbgabetoolStudent = {
 	},
 	data() {
 		return {
+			tabulatorUuid: Vue.ref(0),
 			domain: '',
 			student_uid: null,
 			detail: null,
@@ -30,7 +33,7 @@ export const AbgabetoolStudent = {
 			tableBuiltResolve: null,
 			tableBuiltPromise: null,
 			abgabeTableOptions: {
-				height: 300,
+				height: 700,
 				index: 'projektarbeit_id',
 				layout: 'fitColumns',
 				placeholder: this.$p.t('global/noDataAvailable'),
@@ -85,7 +88,7 @@ export const AbgabetoolStudent = {
 		setDetailComponent(details){
 			this.loadAbgaben(details).then((res)=> {
 				const pa = this.projektarbeiten?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
-				pa.abgabetermine = res.data.retval
+				pa.abgabetermine = res.data[0].retval
 				pa.abgabetermine.forEach(termin => {
 					termin.file = []
 					termin.allowedToUpload = true
@@ -103,6 +106,10 @@ export const AbgabetoolStudent = {
 				pa.student_uid = this.student_uid
 
 				this.selectedProjektarbeit = pa
+
+				
+				this.$refs.verticalsplit.showBoth()
+				
 			})
 			
 		},
@@ -195,12 +202,23 @@ export const AbgabetoolStudent = {
 		handleUuidDefined(uuid) {
 			this.tabulatorUuid = uuid
 		},
+		calcMaxTableHeight() {
+			const tableID = this.tabulatorUuid ? ('-' + this.tabulatorUuid) : ''
+			const tableDataSet = document.getElementById('filterTableDataset' + tableID);
+			if(!tableDataSet) return
+			const rect = tableDataSet.getBoundingClientRect();
+
+			this.abgabeTableOptions.height = window.visualViewport.height - rect.top
+			this.$refs.abgabeTable.tabulator.setHeight(this.abgabeTableOptions.height)
+		},
 		async setupMounted() {
 			this.tableBuiltPromise = new Promise(this.tableResolve)
 			await this.tableBuiltPromise
 			
 			this.loadProjektarbeiten()
-			
+
+			this.$refs.verticalsplit.collapseBottom()
+			this.calcMaxTableHeight()
 		}
 	},
 	watch: {
@@ -218,22 +236,28 @@ export const AbgabetoolStudent = {
 		this.setupMounted()
 	},
 	template: `
-	<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
-	<hr>
-		
-     <core-filter-cmpt 
-		:title="''"  
-		ref="abgabeTable" 
-		:tabulator-options="abgabeTableOptions"  
-		:tabulator-events="abgabeTableEventHandlers"
-		tableOnly
-		:sideMenu="false"
-	 />
-	 
-	 <hr>
-	 <div v-show="selectedProjektarbeit"> 
-	 	<AbgabeDetail :viewMode="isViewMode" :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
-	 </div>
+	<vertical-split ref="verticalsplit">				
+		<template #top>
+			<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
+			<hr>
+				
+			 <core-filter-cmpt
+			 	@uuidDefined="handleUuidDefined"
+				:title="''"  
+				ref="abgabeTable" 
+				:tabulator-options="abgabeTableOptions"  
+				:tabulator-events="abgabeTableEventHandlers"
+				tableOnly
+				:sideMenu="false"
+			 />
+			 
+		 </template>
+		<template #bottom>
+			<div v-show="selectedProjektarbeit"> 
+				<AbgabeDetail :viewMode="isViewMode" :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
+			 </div>
+		</template>
+	</vertical-split>
     `,
 };
 
diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index 119fc56be..a279fb1c0 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -1,4 +1,3 @@
-
 import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
 
 export const Raumsuche =  {
diff --git a/public/js/components/Form/Upload/Dms.js b/public/js/components/Form/Upload/Dms.js
index a8548fe53..4c7a8eb3f 100644
--- a/public/js/components/Form/Upload/Dms.js
+++ b/public/js/components/Form/Upload/Dms.js
@@ -20,6 +20,10 @@ export default {
 		accept: {
 			type: String,
 			default: ''
+		},
+		disabled: {
+			type: Boolean,
+			default: false
 		}
 	},
 	methods: {
@@ -88,7 +92,7 @@ export default {
 	},
 	template: `
 	<div class="form-upload-dms">
-		<input ref="upload" class="form-control" :accept="accept" :class="inputClass" :id="id" :name="name" :multiple="multiple" type="file" @change="addFiles">
+		<input ref="upload" class="form-control" :disabled="disabled" :accept="accept" :class="inputClass" :id="id" :name="name" :multiple="multiple" type="file" @change="addFiles">
 		<ul v-if="modelValue.length && multiple && !noList" :accept="accept" class="list-unstyled m-0">
 			<dms-item
 				v-for="(file, index) in modelValue"
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 27642e1e0..ae1c9daaa 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37879,6 +37879,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4abgabeMitarbeiterbereich',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Dokumentabgabe - Mitarbeiterbereich",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "File submission - Employee area",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'abgabe',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Abgabe",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Submission',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'genericDeleted',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{0} gelöscht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{0} deleted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',

From bf0cd8e8e3341138a2e7f74cc1927989ef14732e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 25 Apr 2025 16:15:27 +0200
Subject: [PATCH 130/572] actions new, update and delete aufnahmetermine

---
 .../api/frontend/v1/stv/Aufnahmetermine.php   | 250 ++++++----------
 application/models/crm/Reihungstest_model.php |  33 ++
 .../models/organisation/Studienplan_model.php |  13 +
 public/js/api/factory/stv/admissionDates.js   |  39 +++
 .../Aufnahmetermine/Aufnahmetermine.js        | 282 +++++++++++++++++-
 system/phrasesupdate.php                      | 100 +++++++
 6 files changed, 556 insertions(+), 161 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
index 3a0be3d40..6b0356bc3 100644
--- a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
+++ b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
@@ -14,6 +14,9 @@ class Aufnahmetermine extends FHCAPI_Controller
 			'insertAufnahmetermin' => ['admin:rw', 'assistenz:rw'],
 			'updateAufnahmetermin' => ['admin:rw', 'assistenz:rw'],
 			'deleteAufnahmetermin' => ['admin:rw', 'assistenz:rw'],
+			'getListPlacementTests' => ['admin:rw', 'assistenz:rw'],
+			'getListStudyPlans' => ['admin:rw', 'assistenz:rw'],
+
 		]);
 
 		// Load Libraries
@@ -23,11 +26,12 @@ class Aufnahmetermine extends FHCAPI_Controller
 		// Load language phrases
 		$this->loadPhrases([
 			'ui',
-			'mobility'
+			'admission'
 		]);
 
 		// Load models
 		$this->load->model('crm/Reihungstest_model', 'ReihungstestModel');
+		$this->load->model('crm/RtPerson_model', 'RtPersonModel');
 	}
 
 	public function getAufnahmetermine($person_id)
@@ -44,106 +48,62 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$this->load->library('form_validation');
 		$authUID = getAuthUID();
 
-		$student_uid = $this->input->post('uid');
+		$formData = $this->input->post('formData');
+		$person_id = $this->input->post('person_id');
 
-		if(!$student_uid)
+		if(!$person_id)
 		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
 		}
 
-		$formData = $this->input->post('formData');
 
-		$_POST['von'] =	(isset($formData['von']) && !empty($formData['von'])) ? $formData['von'] : null;
-		$_POST['bis'] =	(isset($formData['bis']) && !empty($formData['bis'])) ? $formData['bis'] : null;
-		$_POST['nation_code'] =	(isset($formData['nation_code']) && !empty($formData['nation_code'])) ? $formData['nation_code'] : 'A';
-		$_POST['mobilitaetsprogramm_code'] = (isset($formData['mobilitaetsprogramm_code']) && !empty($formData['mobilitaetsprogramm_code'])) ? $formData['mobilitaetsprogramm_code'] : null;
-		$_POST['herkunftsland_code'] = (isset($formData['herkunftsland_code']) && !empty($formData['herkunftsland_code'])) ? $formData['herkunftsland_code'] : 'A';
-		$_POST['ects_erworben'] = (isset($formData['ects_erworben']) && !empty($formData['ects_erworben'])) ? $formData['ects_erworben'] : null;
-		$_POST['ects_angerechnet'] = (isset($formData['ects_angerechnet']) && !empty($formData['ects_angerechnet'])) ? $formData['ects_angerechnet'] : null;
-		$_POST['lehreinheit_id'] = (isset($formData['lehreinheit_id']) && !empty($formData['lehreinheit_id'])) ? $formData['lehreinheit_id'] : null;
 
-		$this->form_validation->set_rules('nation_code', 'Nation_code', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Nation_code'])
+		$_POST['rt_id'] =	(isset($formData['rt_id']) && !empty($formData['rt_id'])) ? $formData['rt_id'] : null;
+		$_POST['anmeldedatum'] =	(isset($formData['anmeldedatum']) && !empty($formData['anmeldedatum'])) ? $formData['anmeldedatum'] : null;
+		$_POST['teilgenommen'] =	(isset($formData['teilgenommen']) && !empty($formData['teilgenommen'])) ? $formData['teilgenommen'] : false;
+		$_POST['studienplan_id'] = (isset($formData['studienplan_id']) && !empty($formData['studienplan_id'])) ? $formData['studienplan_id'] : null;
+		$_POST['punkte'] = (isset($formData['punkte']) && !empty($formData['punkte'])) ? $formData['punkte'] : null;
+
+		$this->form_validation->set_rules('punkte', 'Punkte', 'numeric', [
+			'required' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Punkte'])
 		]);
-		$this->form_validation->set_rules('herkunftsland_code', 'Herkunftsland_code', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Herkunftsland_code'])
+		$this->form_validation->set_rules('studienplan_id', 'studienplan_id', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Studienplan'])
 		]);
-		$this->form_validation->set_rules('mobilitaetsprogramm_code', 'Mobilitaetsprogramm_code', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Mobilitaetsprogramm_code'])
-		]);
-		$this->form_validation->set_rules('von', 'VonDatum', 'is_valid_date', [
-			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VonDatum'])
+		$this->form_validation->set_rules('rt_id', 'Reihungstest_id', 'required', [
+			'is_valid_date' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Reihungstest'])
 		]);
 
-		$this->form_validation->set_rules('bis', 'VBisDatum', 'is_valid_date', [
-			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VBisDatum'])
+		$this->form_validation->set_rules('anmeldedatum', 'AnmeldeDatum', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Anmeldedatum'])
 		]);
 
-		$this->form_validation->set_rules('ects_erworben', 'Ects_erworben', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ects_erworben'])
-		]);
-
-		$this->form_validation->set_rules('ects_angerechnet', 'Ects_angerechnet', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ects_angerechnet'])
-		]);
-
-		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Lehreinheit'])
-		]);
 
 		if ($this->form_validation->run() == false)
 		{
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$ort =	(isset($formData['ort']) && !empty($formData['ort'])) ? $formData['ort'] : null;
-		$universitaet =	(isset($formData['universitaet']) && !empty($formData['universitaet'])) ? $formData['universitaet'] : null;
-		$localPurposes = (isset($formData['localPurposes']) && !empty($formData['localPurposes'])) ? $formData['localPurposes'] : null;
-		$localSupports = (isset($formData['localSupports']) && !empty($formData['localSupports'])) ? $formData['localSupports'] : null;
-
-		$result = $this->BisioModel->insert([
-			'student_uid' => $student_uid,
-			'von' => $_POST['von'],
-			'bis' => $_POST['bis'],
-			'mobilitaetsprogramm_code' => $_POST['mobilitaetsprogramm_code'],
-			'nation_code' => $_POST['nation_code'],
-			'herkunftsland_code' => $_POST['herkunftsland_code'],
-			'lehreinheit_id' => $_POST['lehreinheit_id'],
-			'ort' => $ort,
-			'universitaet' => $universitaet,
-			'ects_erworben' => $_POST['ects_erworben'] ,
-			'ects_angerechnet' => $_POST['ects_angerechnet'],
+		$result = $this->RtPersonModel->insert([
+			'person_id' => $person_id,
+			'rt_id' => $_POST['rt_id'],
+			'anmeldedatum' => $_POST['anmeldedatum'],
+			'teilgenommen' => $_POST['teilgenommen'],
+			'studienplan_id' => $_POST['studienplan_id'],
+			'punkte' => $_POST['punkte'],
 			'insertamum' => date('c'),
 			'insertvon' => $authUID,
 		]);
 
-		$aufnahmetermin_id = $this->getDataOrTerminateWithError($result);
+		$data = $this->getDataOrTerminateWithError($result);
 
-		//check if localData (purposes)
-		if(count($localPurposes) > 0){
-			foreach ($localPurposes as $zweck){
-				$zweck = (int)$zweck;
-				$this->addAufnahmeterminPurpose($aufnahmetermin_id, $zweck);
-			}
-		}
-
-		//check if localData (supports)
-		if(count($localSupports) > 0){
-			foreach ($localSupports as $support){
-				$this->addAufnahmeterminSupport($aufnahmetermin_id, $support);
-			}
-		}
-
-		$this->terminateWithSuccess($aufnahmetermin_id);
+		$this->terminateWithSuccess($data);
 	}
 
-	public function loadAufnahmetermin($aufnahmetermin_id)
+	public function loadAufnahmetermin($rt_person_id)
 	{
-		$this->BisioModel->addSelect("*");
-		$this->BisioModel->addJoin('bis.tbl_mobilitaetsprogramm mp', 'ON (mp.mobilitaetsprogramm_code = bis.tbl_bisio.mobilitaetsprogramm_code)', 'LEFT');
-		$this->BisioModel->addJoin('lehre.tbl_lehreinheit le', 'ON (le.lehreinheit_id = bis.tbl_bisio.lehreinheit_id)','LEFT');
-		$result = $this->BisioModel->loadWhere(
-			array('aufnahmetermin_id' => $aufnahmetermin_id)
+		$result = $this->RtPersonModel->loadWhere(
+			array('rt_person_id' => $rt_person_id)
 		);
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -152,118 +112,96 @@ class Aufnahmetermine extends FHCAPI_Controller
 
 	public function updateAufnahmetermin()
 	{
-
 		$this->load->library('form_validation');
 		$authUID = getAuthUID();
 
-		$student_uid = $this->input->post('uid');
-
-		if(!$student_uid)
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
-		}
 		$formData = $this->input->post('formData');
+		$rt_person_id = $this->input->post('rt_person_id');
+		$person_id = (isset($formData['person_id']) && !empty($formData['person_id'])) ? $formData['person_id'] : null;
 
-		$_POST['von'] =	(isset($formData['von']) && !empty($formData['von'])) ? $formData['von'] : null;
-		$_POST['bis'] =	(isset($formData['bis']) && !empty($formData['bis'])) ? $formData['bis'] : null;
-		$_POST['nation_code'] =	(isset($formData['nation_code']) && !empty($formData['nation_code'])) ? $formData['nation_code'] : 'A';
-		$_POST['mobilitaetsprogramm_code'] = (isset($formData['mobilitaetsprogramm_code']) && !empty($formData['mobilitaetsprogramm_code'])) ? $formData['mobilitaetsprogramm_code'] : null;
-		$_POST['herkunftsland_code'] = (isset($formData['herkunftsland_code']) && !empty($formData['herkunftsland_code'])) ? $formData['herkunftsland_code'] : 'A';
-		$_POST['ects_erworben']  = (isset($formData['ects_erworben']) && !empty($formData['ects_erworben'])) ? $formData['ects_erworben'] : null;
-		$_POST['ects_angerechnet'] = (isset($formData['ects_angerechnet']) && !empty($formData['ects_angerechnet'])) ? $formData['ects_angerechnet'] : null;
-		$_POST['lehreinheit_id'] = (isset($formData['lehreinheit_id']) && !empty($formData['lehreinheit_id'])) ? $formData['lehreinheit_id'] : null;
 
-		$this->form_validation->set_rules('nation_code', 'Nation_code', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Nation_code'])
+		if(!$person_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
+		}
+		if(!$rt_person_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'RT_Person ID']), self::ERROR_TYPE_GENERAL);
+		}
+
+
+		$_POST['rt_id'] =	(isset($formData['rt_id']) && !empty($formData['rt_id'])) ? $formData['rt_id'] : null;
+		$_POST['anmeldedatum'] =	(isset($formData['anmeldedatum']) && !empty($formData['anmeldedatum'])) ? $formData['anmeldedatum'] : null;
+		$_POST['teilgenommen'] =	(isset($formData['teilgenommen']) && !empty($formData['teilgenommen'])) ? $formData['teilgenommen'] : false;
+		$_POST['studienplan_id'] = (isset($formData['studienplan_id']) && !empty($formData['studienplan_id'])) ? $formData['studienplan_id'] : null;
+		$_POST['punkte'] = (isset($formData['punkte']) && !empty($formData['punkte'])) ? $formData['punkte'] : null;
+
+		$this->form_validation->set_rules('punkte', 'Punkte', 'numeric', [
+			'required' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Punkte'])
 		]);
-		$this->form_validation->set_rules('herkunftsland_code', 'Herkunftsland_code', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Herkunftsland_code'])
+		$this->form_validation->set_rules('studienplan_id', 'studienplan_id', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Studienplan'])
 		]);
-		$this->form_validation->set_rules('mobilitaetsprogramm_code', 'Mobilitaetsprogramm_code', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Mobilitaetsprogramm_code'])
-		]);
-		$this->form_validation->set_rules('von', 'VonDatum', 'is_valid_date', [
-			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VonDatum'])
+		$this->form_validation->set_rules('rt_id', 'Reihungstest_id', 'required', [
+			'is_valid_date' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Reihungstest'])
 		]);
 
-		$this->form_validation->set_rules('bis', 'VBisDatum', 'is_valid_date', [
-			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VBisDatum'])
+		$this->form_validation->set_rules('anmeldedatum', 'AnmeldeDatum', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Anmeldedatum'])
 		]);
 
-		$this->form_validation->set_rules('ects_erworben', 'Ects_erworben', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ects_erworben'])
-		]);
-
-		$this->form_validation->set_rules('ects_angerechnet', 'Ects_angerechnet', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Ects_angerechnet'])
-		]);
-
-		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Lehreinheit'])
-		]);
 
 		if ($this->form_validation->run() == false)
 		{
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$result = $this->BisioModel->update(
+		$result = $this->RtPersonModel->update(
 			[
-				'aufnahmetermin_id' =>  $formData['aufnahmetermin_id']
+				'rt_person_id' => $rt_person_id,
+				'person_id' => $person_id,
 			],
 			[
-				'student_uid' => $student_uid,
-				'von' => $_POST['von'],
-				'bis' => $_POST['bis'],
-				'mobilitaetsprogramm_code' => $_POST['mobilitaetsprogramm_code'],
-				'nation_code' => $_POST['nation_code'],
-				'herkunftsland_code' => $_POST['herkunftsland_code'],
-				'lehreinheit_id' => $_POST['lehreinheit_id'],
-				'ort' => $formData['ort'],
-				'universitaet' => $formData['universitaet'],
-				'ects_erworben' => $_POST['ects_erworben'] ,
-				'ects_angerechnet' => $_POST['ects_angerechnet'],
-				'updateamum' => date('c'),
-				'updatevon' => $authUID,
-			]
-		);
+				'rt_id' => $_POST['rt_id'],
+				'anmeldedatum' => $_POST['anmeldedatum'],
+				'teilgenommen' => $_POST['teilgenommen'],
+				'studienplan_id' => $_POST['studienplan_id'],
+				'punkte' => $_POST['punkte'],
+				'insertamum' => date('c'),
+				'insertvon' => $authUID,
+		]);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess(current($data));
+		$this->terminateWithSuccess($data);
 	}
 
-	public function deleteAufnahmetermin($aufnahmetermin_id)
+	public function deleteAufnahmetermin($rt_person_id)
 	{
-		//check if extension table exists
-		$result =  $this->BisioModel->tableExists('extension', 'tbl_mo_bisioidzuordnung');
-		$data = $this->getDataOrTerminateWithError($result);
-
-		//if table exists check if existing entry
-		if(!empty($data))
-		{
-			$this->BisioModel->addSelect("count(*)");
-			$this->BisioModel->addJoin('extension.tbl_mo_bisioidzuordnung mo', 'ON (mo.aufnahmetermin_id = bis.tbl_bisio.aufnahmetermin_id)', 'LEFT');
-
-			$resultCheckMo = $this->BisioModel->loadWhere(
-				array('mo.aufnahmetermin_id' => $aufnahmetermin_id)
-			);
-
-			$resultCheckMo = $this->getDataOrTerminateWithError($resultCheckMo);
-			$count = current($resultCheckMo)->count;
-
-			$existsInExtension = $count > 0 ? true : false;
-
-			if($existsInExtension)
-				$this->terminateWithError($this->p->t('mobility', 'error_existingEntryInExtension'), self::ERROR_TYPE_GENERAL);
-		}
-
-		$result = $this->BisioModel->delete(
-			array('aufnahmetermin_id' => $aufnahmetermin_id)
+		$result = $this->RtPersonModel->delete(
+			array('rt_person_id' => $rt_person_id)
 		);
 
 		$data = $this->getDataOrTerminateWithError($result);
 		$this->terminateWithSuccess($data);
 	}
 
+	public function getListPlacementTests()
+	{
+		$result = $this->ReihungstestModel->getAllReihungstests();
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getListStudyPlans($person_id)
+	{
+		$this->load->model('organisation/Studienplan_model','StudienplanModel');
+
+		$result = $this->StudienplanModel->getStudienplaeneForPerson($person_id);;
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
 }
diff --git a/application/models/crm/Reihungstest_model.php b/application/models/crm/Reihungstest_model.php
index f2732b636..2eb08ee86 100644
--- a/application/models/crm/Reihungstest_model.php
+++ b/application/models/crm/Reihungstest_model.php
@@ -550,4 +550,37 @@ class Reihungstest_model extends DB_Model
 
 		return $this->execQuery($query, array($person_id));
 	}
+
+	/**
+	 * Loads all placement tests
+	 * @return array Returns object array with data of placement tests
+	 */
+	//TODO(Manu) finish Details
+	public function getAllReihungstests()
+	{
+		$query = '
+			SELECT * FROM public.tbl_reihungstest
+			JOIN public.tbl_studiengang ON tbl_reihungstest.studiengang_kz = tbl_studiengang.studiengang_kz
+		--	JOIN lehre.tbl_studienplan sp USING(studienplan_id)
+		--	JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
+			ORDER BY datum DESC NULLS LAST, uhrzeit
+		';
+
+		return $this->execQuery($query);
+	}
+
+	public function getReihungstestsPs($prestudent_id)
+	{
+		$query = '
+			SELECT * FROM public.tbl_reihungstest
+			JOIN public.tbl_studiengang ON tbl_reihungstest.studiengang_kz = tbl_studiengang.studiengang_kz
+			JOIN lehre.tbl_studienplan sp USING(studienplan_id)
+			JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
+			 ORDER BY datum DESC, uhrzeit
+		';
+
+		return $this->execQuery($query);
+	}
+
+
 }
\ No newline at end of file
diff --git a/application/models/organisation/Studienplan_model.php b/application/models/organisation/Studienplan_model.php
index e35ba52fb..569aebd0b 100644
--- a/application/models/organisation/Studienplan_model.php
+++ b/application/models/organisation/Studienplan_model.php
@@ -134,4 +134,17 @@ class Studienplan_model extends DB_Model
 			'prestudent_id' => $prestudent_id
 		]);
 	}
+
+	public function getStudienplaeneForPerson($person_id)
+	{
+		$this->addDistinct();
+		$this->addSelect($this->dbTable . '.*');
+		$this->addSelect('ps.*');
+		$this->addJoin('public.tbl_prestudentstatus pss', 'studienplan_id');
+		$this->addJoin('public.tbl_prestudent ps', 'prestudent_id');
+
+		return $this->loadWhere([
+			'person_id' => $person_id
+		]);
+	}
 }
diff --git a/public/js/api/factory/stv/admissionDates.js b/public/js/api/factory/stv/admissionDates.js
index 51a92c331..a5b0697da 100644
--- a/public/js/api/factory/stv/admissionDates.js
+++ b/public/js/api/factory/stv/admissionDates.js
@@ -22,4 +22,43 @@ export default {
 			url: 'api/frontend/v1/stv/aufnahmetermine/getAufnahmetermine/' + person_id,
 		};
 	},
+	getListPlacementTests(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/aufnahmetermine/getListPlacementTests/',
+		};
+	},
+	getListStudyPlans(person_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/aufnahmetermine/getListStudyPlans/' + person_id,
+		};
+	},
+	addNewPlacementTest(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/aufnahmetermine/insertAufnahmetermin/',
+			params
+		};
+	},
+	loadPlacementTest(rt_person_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/aufnahmetermine/loadAufnahmetermin/' + rt_person_id,
+		};
+	},
+	updatePlacementTest(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/aufnahmetermine/updateAufnahmetermin/',
+			params
+		};
+	},
+	deletePlacementTest(rt_person_id){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/aufnahmetermine/deleteAufnahmetermin/' + rt_person_id
+		};
+	}
+
 }
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index 7e7e2ae97..5fe32e885 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -34,17 +34,70 @@ export default {
 					{title: "rt_id", field: "rt_id"},
 					{title: "rt_person_id", field: "rt_person_id"},
 					{title: "person_id", field: "person_id"},
-					{title: "datum", field: "datum"},
+					{title: "datum", field: "datum",
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+							});
+						}
+					},
 					{title: "stufe", field: "stufe"},
 					{title: "studiensemester", field: "studiensemester_kurzbz"},
 					{title: "anmerkung", field: "anmerkung", visible: false},
-					{title: "anmeldedatum", field: "anmeldedatum", visible: false},
+					{title: "anmeldedatum", field: "anmeldedatum", visible: false,
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+							});
+						}
+					},
 					{title: "punkte", field: "punkte"},
 					{title: "teilgenommen", field: "teilgenommen"},
 					{title: "ort", field: "ort", visible: false},
 					{title: "studienplan", field: "studienplan", visible: false},
 					{title: "studienplan_id", field: "studienplan_id", visible: false},
 					{title: "stg_kuerzel", field: "stg_kuerzel"},
+					{
+						title: 'Aktionen', field: 'actions',
+						minWidth: 150, // Ensures Action-buttons will be always fully displayed
+						formatter: (cell, formatterParams, onRendered) => {
+							let container = document.createElement('div');
+							container.className = "d-flex gap-2";
+
+							let button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-edit"></i>';
+							button.title = this.$p.t('ui', 'bearbeiten');
+							button.addEventListener('click', (event) =>
+								this.actionEditPlacementTest(cell.getData().rt_person_id)
+							);
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-xmark"></i>';
+							button.title = this.$p.t('ui', 'loeschen');
+							button.addEventListener('click', () =>
+								this.actionDeletePlacementTest(cell.getData().rt_person_id)
+							);
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					}
 				],
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData: false,
@@ -56,13 +109,129 @@ export default {
 			tabulatorEvents: [],
 			formData: {},
 			statusNew: true,
+			listPlacementTests: [],
+			listStudyPlans: []
 		}
 	},
-	methods: {},
+	methods: {
+		actionNewPlacementTest() {
+			this.resetForm();
+			this.statusNew = true;
+			this.$refs.placementTestModal.show();
+		},
+		actionEditPlacementTest(rt_person_id) {
+			console.log("edit Test " + rt_person_id);
+			this.resetForm();
+			this.statusNew = false;
+			this.loadPlacementTest(rt_person_id);
+			this.$refs.placementTestModal.show();
+		},
+		actionDeletePlacementTest(rt_person_id) {
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? rt_person_id
+					: Promise.reject({handled: true}))
+				.then(this.deletePlacementTest)
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		addNewPlacementTest() {
+			const dataToSend = {
+				person_id: this.student.person_id,
+				formData: this.formData
+			};
+			return this.$refs.formPlacementTest
+				.call(ApiStvAdmissionDates.addNewPlacementTest(dataToSend))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.hideModal("placementTestModal");
+					this.resetForm();
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		hideModal(modalRef){
+			this.$refs[modalRef].hide();
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+		},
+		loadPlacementTest(rt_person_id) {
+			console.log("load Test " + rt_person_id);
+			return this.$api
+				.call(ApiStvAdmissionDates.loadPlacementTest(rt_person_id))
+				.then(result => {
+					this.formData = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		updatePlacementTest(rt_person_id) {
+			const dataToSend = {
+				formData: this.formData,
+				rt_person_id: rt_person_id,
+			};
+			this.$refs.formPlacementTest
+				.call(ApiStvAdmissionDates.updatePlacementTest(dataToSend))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.hideModal("placementTestModal");
+					this.resetForm();
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		deletePlacementTest(rt_person_id) {
+			console.log("delete Test" + rt_person_id);
+			return this.$api
+				.call(ApiStvAdmissionDates.deletePlacementTest(rt_person_id))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		resetForm() {
+			console.log("resetForm");
+			this.formData = {};
+			/*
+
+			this.formData.von = new Date();
+			this.formData.bis = new Date();
+			this.formData.mobilitaetsprogramm_code = 7;
+			this.formData.nation_code = 'A';
+			this.formData.herkunftsland_code = 'A';
+			this.formData.rt_id = null;
+			this.formData.localPurposes = [];
+			this.formData.localSupports = [];
+			this.formData.lehrveranstaltung_id = '',
+				this.formData.lehreinheit_id = '',
+				this.statusNew = true;
+			this.listLes = [];*/
+		},
+	},
 	created() {
+		this.$api
+			.call(ApiStvAdmissionDates.getListPlacementTests())
+			.then(result => {
+				this.listPlacementTests = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$api
+			.call(ApiStvAdmissionDates.getListStudyPlans(this.student.person_id))
+			.then(result => {
+				this.listStudyPlans = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
-	<div class="stv-details-admission-dates-table h-100 pb-3">
+	<div class="stv-details-admission-table h-100 pb-3">
 		<h4>Allgemein</h4>
 		
 		<core-filter-cmpt
@@ -74,10 +243,113 @@ export default {
 			reload
 			new-btn-show
 			:new-btn-label="this.$p.t('lehre', 'reihungstest')"
-			@click:new="actionNewMobility"
+			@click:new="actionNewPlacementTest"
 			>
 		</core-filter-cmpt>
 		
+		{{formData}}
+		
+<!--		{{student}}-->
+		
+<!--		{{listPlacementTests}}-->
+		
+		<!--Modal: placementTestModal-->
+		<bs-modal ref="placementTestModal" dialog-class="modal-dialog-scrollable">
+			<template #title>
+				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('admission', 'admission_new')}}</p>
+				<p v-else class="fw-bold mt-3">{{$p.t('admission', 'admission_edit')}}</p>
+			</template>
+
+
+			<form-form ref="formPlacementTest" @submit.prevent>
+
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-admission-placementtest"
+						:label="$p.t('lehre', 'reihungstest')"
+						type="select"
+						v-model="formData.rt_id"
+						name="reihungstest_id"
+						>
+						<option value=""> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
+						<option
+							v-for="test in listPlacementTests"
+							:key="test.reihungstest_id"
+							:value="test.reihungstest_id"
+							>
+							{{test.reihungstest_id}} {{test.studiensemester_kurzbz}} St.{{test.stufe}} {{test.kurzbzlang}} {{test.datum}} {{test.uhrzeit}}
+							{{test.anmerkung}} (x/{{test.max_teilnehmer}}) {{test.rt_id}}
+						</option>
+					</form-input>
+				</div>
+				
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-admission-anmeldedatum"
+						:label="$p.t('admission', 'anmeldundRtAm')"
+						type="DatePicker"
+						v-model="formData.anmeldedatum"
+						auto-apply
+						:enable-time-picker="false"
+						format="dd.MM.yyyy"
+						name="anmeldedatum"
+						:teleport="true"
+						>
+					</form-input>
+				</div>				
+				
+				<div class="row mb-3">
+						<form-input
+							container-class="stv-details-admission-teilgenommen"
+							type="checkbox"
+							name="teilgenommen"
+							:label="$p.t('admission/rtAngetreten')"
+							v-model="formData.teilgenommen"
+						>
+						</form-input>
+				</div>
+				
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-admission-studyplan"
+						:label="$p.t('lehre', 'studienplan')"
+						type="select"
+						v-model="formData.studienplan_id"
+						name="studienplan_id"
+						>
+						<option value=""> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
+						<option
+							v-for="stplan in listStudyPlans"
+							:key="stplan.studienplan_id"
+							:value="stplan.studienplan_id"
+							>
+							{{stplan.bezeichnung}}
+						</option>
+					</form-input>
+				</div>				
+				
+				<div class="row mb-3">
+					<form-input
+						container-class="stv-details-admission-points"
+						:label="$p.t('exam', 'punkte')"
+						type="text"
+						v-model="formData.punkte"
+						name="punkte"
+						>
+					</form-input>	
+				</div>
+				
+				<!--TODO(Manu) Reihungstestergebnis holen-->
+				
+				
+		</form-form>
+		
+		<template #footer>
+			<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
+			<button v-if="statusNew" class="btn btn-primary" @click="addNewPlacementTest()"> {{$p.t('ui', 'speichern')}}</button>
+			<button v-else class="btn btn-primary" @click="updatePlacementTest(formData.rt_id)"> {{$p.t('ui', 'speichern')}}</button>
+		</template>
+		
 	</div>
 	`
 }
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index bf18f50c8..66fd48a8b 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41436,6 +41436,106 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'admission_edit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Aufnahmetermin bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit appointment for participation placement test',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'admission_delete',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Aufnahmetermin Löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete Admission Date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'admission_new',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Termin für Teilnahme am Reihungstest anlegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Create appointment for participation placement test',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'anmeldundRtAm',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anmeldung zum Reihungstest am',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Registration for the ranking test on',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'rtAngetreten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zum Reihungstest angetreten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Participated in the ranking test',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC4 STUDIERENDENVERWALTUNG AUFNAHMETERMINE ENDE	 ---------------------------------------------------------------
 
 );

From 3b7a862dbeacd37682b899b7c6f6ccfce9762957 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 29 Apr 2025 11:42:26 +0200
Subject: [PATCH 131/572] align composer.lock with composer.json

---
 composer.lock | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index b9f6924d3..2addc074e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4d532e48e895cb864fb89170e18e2a3d",
+    "content-hash": "f97c6194d4d63e90a855add1cf7d0e86",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -1868,6 +1868,15 @@
             },
             "type": "library"
         },
+        {
+            "name": "vuejs/vuedatepicker_css11",
+            "version": "11.0.1",
+            "dist": {
+                "type": "file",
+                "url": "https://unpkg.com/@vuepic/vue-datepicker@11.0.1/dist/main.css"
+            },
+            "type": "library"
+        },
         {
             "name": "vuejs/vuedatepicker_js",
             "version": "7.2.0",
@@ -1877,6 +1886,15 @@
             },
             "type": "library"
         },
+        {
+            "name": "vuejs/vuedatepicker_js11",
+            "version": "11.0.1",
+            "dist": {
+                "type": "file",
+                "url": "https://unpkg.com/@vuepic/vue-datepicker@11.0.1/dist/vue-datepicker.iife.js"
+            },
+            "type": "library"
+        },
         {
             "name": "vuejs/vuejs3",
             "version": "3.3.8",

From c24a9997a90fac5291baad71ff46a85cdf471754 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 29 Apr 2025 12:13:29 +0200
Subject: [PATCH 132/572] add function StundenplanEvents to new api factory

---
 public/js/api/factory/stundenplan.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/public/js/api/factory/stundenplan.js b/public/js/api/factory/stundenplan.js
index 3cfa3c641..c22071955 100644
--- a/public/js/api/factory/stundenplan.js
+++ b/public/js/api/factory/stundenplan.js
@@ -63,4 +63,15 @@ export default {
 			url: `/api/frontend/v1/Stundenplan/studiensemesterDateInterval/${date}`
 		};
 	},
+	StundenplanEvents(start_date, end_date, lv_id) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Stundenplan/StundenplanEvents',
+			params: { 
+				start_date: start_date, 
+				end_date: end_date, 
+				lv_id: lv_id 
+			}
+		};
+	},
 };
\ No newline at end of file

From 38424bc875d6639953ea546aa3bb8c1d55866b1e Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 29 Apr 2025 14:36:40 +0200
Subject: [PATCH 133/572] serientermin anlegen mitarbeiter; deadline overview
 mitarbeiter;

---
 application/controllers/Cis/Abgabetool.php    |  23 +-
 .../controllers/api/frontend/v1/Lehre.php     | 115 +++++++++-
 .../models/education/Paabgabe_model.php       |  30 +++
 .../models/education/Projektarbeit_model.php  |  21 +-
 public/js/api/lehre.js                        |  16 ++
 public/js/apps/Dashboard/Fhc.js               |   7 +
 .../Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 173 ++++-----------
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   | 198 +++++++++++++++---
 .../Cis/Abgabetool/DeadlineOverview.js        | 151 +++++++++++++
 system/phrasesupdate.php                      | 182 +++++++++++++++-
 10 files changed, 750 insertions(+), 166 deletions(-)
 create mode 100644 public/js/components/Cis/Abgabetool/DeadlineOverview.js

diff --git a/application/controllers/Cis/Abgabetool.php b/application/controllers/Cis/Abgabetool.php
index e7d183f04..1895f7472 100644
--- a/application/controllers/Cis/Abgabetool.php
+++ b/application/controllers/Cis/Abgabetool.php
@@ -16,7 +16,8 @@ class Abgabetool extends Auth_Controller
 			'index' => self::PERM_LOGGED,
 			'getStudentProjektarbeitAbgabeFile' => self::PERM_LOGGED,
 			'Mitarbeiter' => self::PERM_LOGGED,
-			'Student' => self::PERM_LOGGED
+			'Student' => self::PERM_LOGGED,
+			'Deadlines' => self::PERM_LOGGED
 		]);
 	}
 
@@ -43,7 +44,7 @@ class Abgabetool extends Auth_Controller
 			'uid'=>getAuthUID(),
 		);
 
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolStudent']);
 	}
 
 	public function Mitarbeiter()
@@ -53,7 +54,17 @@ class Abgabetool extends Auth_Controller
 			'uid'=>getAuthUID(),
 		);
 
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolMitarbeiter']);
+	}
+
+	public function Deadlines()
+	{
+
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'DeadlinesOverview']);
 	}
 
 
@@ -66,7 +77,7 @@ class Abgabetool extends Auth_Controller
 		$student_uid = $this->_ci->input->get('student_uid');
 
 		if (!isset($paabgabe_id) || isEmptyString($paabgabe_id) || !isset($student_uid) || isEmptyString($student_uid))
-			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+			$this->terminateWithJsonError($this->p->t('global', 'wrongParameters'), 'general');
 		
 		$this->_ci->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 
@@ -88,10 +99,10 @@ class Abgabetool extends Auth_Controller
 				readfile($file_path); // read file content to output buffer
 				
 			} else {
-				$this->terminateWithError('File not found');
+				$this->terminateWithJsonError('File not found');
 			}
 		} else {
-			$this->terminateWithError('Keine Zuordnung!');
+			$this->terminateWithJsonError('Keine Zuordnung!');
 		}
 	}
 }
diff --git a/application/controllers/api/frontend/v1/Lehre.php b/application/controllers/api/frontend/v1/Lehre.php
index 375551e7a..0ec2456f5 100644
--- a/application/controllers/api/frontend/v1/Lehre.php
+++ b/application/controllers/api/frontend/v1/Lehre.php
@@ -45,7 +45,9 @@ class Lehre extends FHCAPI_Controller
 			'postStudentProjektarbeitEndupload' => self::PERM_LOGGED,
 			'getMitarbeiterProjektarbeiten' => self::PERM_LOGGED,
 			'postProjektarbeitAbgabe' => self::PERM_LOGGED,
-			'deleteProjektarbeitAbgabe' => self::PERM_LOGGED
+			'deleteProjektarbeitAbgabe' => self::PERM_LOGGED,
+			'postSerientermin' => self::PERM_LOGGED,
+			'fetchDeadlines' => self::PERM_LOGGED // TODO: mitarbeiter recht prüfen
 		]);
 
 		$this->load->library('PhrasesLib');
@@ -556,5 +558,116 @@ class Lehre extends FHCAPI_Controller
 
 		$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
 	}
+
+	/**
+	 * endpoint for adding the same paabgabe for multiple projektarbeiten
+	 * can be slow for large n since it queries twice per projektarbeit_id
+	 */
+	public function postSerientermin() {
+		$projektarbeit_ids = $_POST['projektarbeit_ids'];
+		$datum = $_POST['datum'];
+		$paabgabetyp_kurzbz = $_POST['paabgabetyp_kurzbz'];
+		$bezeichnung = $_POST['bezeichnung'];
+		$kurzbz = $_POST['kurzbz'];
+
+		if (!isset($projektarbeit_ids) || !is_array($projektarbeit_ids) || empty($projektarbeit_ids)
+			|| !isset($datum) || isEmptyString($datum)
+			|| !isset($kurzbz) || isEmptyString($kurzbz)
+			|| !isset($bezeichnung) || isEmptyString($bezeichnung)
+			|| !isset($paabgabetyp_kurzbz) || isEmptyString($paabgabetyp_kurzbz))
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		
+		// old script checks if there already are tbl_paabgabe entries with exact date, type & kurzbz
+		// for each termin - good to check that in principle but should not matter in this place. if necessary
+		// duplicate abgabetermine can be easily deleted manually, also via cronjob@night.
+		
+		// since this entry includes the kurzbz string match, it should have only ever mattered when there were
+		// multiple users entering the exact same set of (date, type, kurzbz) - which is a much more narrow case than the
+		// general "saveMultiple" function should handle
+		
+		// old script afterwards again queries if user is not the zweitbetreuer of any id - this is blocked in the ui
+		// and should never unintentionally happen
+		
+		// TODO: check berechtigung &/|| zuordnung?
+		
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+		
+		$res = [];
+		foreach ($projektarbeit_ids as $projektarbeit_id) {
+			
+			$result = $this->PaabgabeModel->insert(
+				array(
+					'projektarbeit_id' => $projektarbeit_id,
+					'paabgabetyp_kurzbz' => $paabgabetyp_kurzbz,
+					'fixtermin' => false,
+					'datum' => $datum,
+					'kurzbz' => $kurzbz,
+					'insertvon' => getAuthUID(),
+					'insertamum' => date('Y-m-d H:i:s')
+				)
+			);
+			
+			$data = $this->getDataOrTerminateWithError($result);
+			
+//			$res[] = $data;
+
+			// send mail to student
+			$result = $this->ProjektarbeitModel->getStudentInfoForProjektarbeitId($projektarbeit_id);
+			$data = $this->getDataOrTerminateWithError($result);
+
+//			$this->addMeta('emaildata'.$projektarbeit_id, $data);
+			
+			$datetime = new DateTime($datum);
+			$dateEmailFormatted = $datetime->format('d.m.Y');
+			
+			$anredeFillString = $data[0]->anrede=="Herr"?"r":"";
+			
+			$fullFormattedNameString = trim($data[0]->titelpre." ".$data[0]->vorname." ".$data[0]->nachname." ".$data[0]->titelpost);
+			$res[] = $fullFormattedNameString;
+			
+			// Prepare mail content
+			$body_fields = array(
+				'anrede' => $data[0]->anrede,
+				'anredeFillString' => $anredeFillString,
+				'datum' => $dateEmailFormatted,
+				'bezeichnung' => $bezeichnung,
+				'fullFormattedNameString' => $fullFormattedNameString,
+				'kurzbz' => $kurzbz
+			);
+
+			$email = $data[0]->uid."@".DOMAIN;
+			
+			sendSanchoMail(
+				'neuerTerminBachelorMasterbetreuung',
+				$body_fields,
+				$email,
+				$this->p->t('abgabetool', 'neuerTerminBachelorMasterbetreuung')
+			);
+		}
+		
+		$this->terminateWithSuccess($res);
+		
+	}
+	
+	public function fetchDeadlines() {
+		$person_id = $_POST['person_id'];
+		
+		if (!isset($person_id) || isEmptyString($person_id))
+			$person_id = getAuthPersonId();
+		
+		
+		if($person_id !== getAuthPersonId()) {
+			$this->load->library('PermissionLib');
+			$isAdmin = $this->permissionlib->isBerechtigt('admin');
+			if(!$isAdmin) $this->terminateWithError($this->p->t('ui', 'keineBerechtigung'), 'general');
+		}
+
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+		$result = $this->PaabgabeModel->getDeadlines($person_id);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
 }
 
diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php
index 558059f72..343a86706 100644
--- a/application/models/education/Paabgabe_model.php
+++ b/application/models/education/Paabgabe_model.php
@@ -30,5 +30,35 @@ class Paabgabe_model extends DB_Model
 
 		return $this->execQuery($qry, array($projektarbeit_id));
 	}
+
+	/**
+	 * Gets all Paabgabe Termin Deadlines of zugewiesene Projektarbeiten as a Mitarbeiter for Terminübersicht Abgabetool.
+	 * @param int $person_id
+	 * @return object
+	 */
+	public function getDeadlines($person_id)
+	{
+		$qry = "SELECT
+					DISTINCT TO_CHAR(tbl_paabgabe.datum, 'DD.MM.YYYY') as datum, tbl_paabgabe.fixtermin, tbl_paabgabe.kurzbz,
+					person_student.vorname as stud_vorname, person_student.nachname as stud_nachname,
+					person_student.titelpre as stud_titelpre, person_student.titelpost as stud_titelpost,
+					tbl_lehrveranstaltung.semester, UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz) as stg,
+					tbl_paabgabetyp.bezeichnung as typ_bezeichnung
+				FROM
+					campus.tbl_paabgabe
+					JOIN lehre.tbl_projektarbeit USING(projektarbeit_id)
+					JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
+					JOIN public.tbl_benutzer bn_student ON(tbl_projektarbeit.student_uid=bn_student.uid)
+					JOIN public.tbl_person person_student ON(bn_student.person_id=person_student.person_id)
+					JOIN lehre.tbl_lehreinheit ON(tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id)
+					JOIN lehre.tbl_lehrveranstaltung ON(tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id)
+					JOIN public.tbl_studiengang ON(tbl_lehrveranstaltung.studiengang_kz=tbl_studiengang.studiengang_kz)
+					JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
+				WHERE
+					tbl_projektbetreuer.person_id= ? AND tbl_paabgabe.datum>=now() AND bn_student.aktiv
+				ORDER BY datum";
+
+		return $this->execReadOnlyQuery($qry, array($person_id));
+	}
 	
 }
diff --git a/application/models/education/Projektarbeit_model.php b/application/models/education/Projektarbeit_model.php
index 1041b3aec..4083dbf6e 100644
--- a/application/models/education/Projektarbeit_model.php
+++ b/application/models/education/Projektarbeit_model.php
@@ -212,7 +212,11 @@ class Projektarbeit_model extends DB_Model
 
 		return $this->execReadOnlyQuery($qry, array($studentUID, $maUID));
 	}
-	
+
+	/**
+	 * Get a List of Projektarbeiten of a mitarbeiter with zuordnung
+	 * used by the mitarbeiter cis4 abgabetool.
+	 */
 	public function getMitarbeiterProjektarbeiten($uid, $showAll){
 		$qry = "SELECT
 					*
@@ -242,4 +246,19 @@ class Projektarbeit_model extends DB_Model
 
 		return $this->execReadOnlyQuery($qry, array($uid));
 	}
+
+	/**
+	 * Fetch Student info relevant to a projektarbeit_id
+	 */
+	public function getStudentInfoForProjektarbeitId($projektarbeit_id) {
+		
+		$qry = "SELECT *
+				FROM campus.vw_student 
+				WHERE uid IN(
+					SELECT student_uid 
+					FROM lehre.tbl_projektarbeit 
+					WHERE projektarbeit_id = ? )";
+		
+		return $this->execReadOnlyQuery($qry, array($projektarbeit_id));
+	}
 }
diff --git a/public/js/api/lehre.js b/public/js/api/lehre.js
index 2bf6dd277..5797a2c75 100644
--- a/public/js/api/lehre.js
+++ b/public/js/api/lehre.js
@@ -76,6 +76,22 @@ export default {
 		}
 		const url = '/api/frontend/v1/Lehre/deleteProjektarbeitAbgabe';
 
+		return this.$fhcApi.post(url, payload, null)
+	},
+	postSerientermin(datum, paabgabetyp_kurzbz, bezeichnung, kurzbz, projektarbeit_ids) {
+		const payload = {
+			datum, paabgabetyp_kurzbz, bezeichnung, kurzbz, projektarbeit_ids
+		}
+		const url = '/api/frontend/v1/Lehre/postSerientermin';
+
+		return this.$fhcApi.post(url, payload, null)
+	},
+	fetchDeadlines(person_id) {
+		const payload = {
+			person_id
+		}
+		const url = '/api/frontend/v1/Lehre/fetchDeadlines';
+
 		return this.$fhcApi.post(url, payload, null)
 	}
   }
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index b04db0a83..5e6b006b9 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -12,6 +12,7 @@ import Info from "../../components/Cis/Mylv/Semester/Studiengang/Lv/Info.js";
 import RoomInformation, {DEFAULT_MODE_RAUMINFO} from "../../components/Cis/Mylv/RoomInformation.js";
 import AbgabetoolStudent from "../../components/Cis/Abgabetool/AbgabetoolStudent.js";
 import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMitarbeiter.js";
+import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.js";
 
 
 
@@ -44,6 +45,12 @@ const router = VueRouter.createRouter({
 			component: AbgabetoolMitarbeiter,
 			props: true
 		},
+		{
+			path: `/Cis/Abgabetool/Deadlines/:person_uid_prop?`,
+			name: 'DeadlineOverview',
+			component: DeadlineOverview,
+			props: true
+		},
 		{
 			path: `/Cis/Raumsuche`,
 			name: 'Raumsuche',
diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index 7e0da66f6..c49dcfd0a 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -19,6 +19,7 @@ export const AbgabeMitarbeiterDetail = {
 	},
 	data() {
 		return {
+			oldPaBeurteilungLink: 'https://moodle.technikum-wien.at/mod/page/view.php?id=1005052', // TODO: inject from app & app provide link from config
 			eidAkzeptiert: false,
 			enduploadTermin: null,
 			allActiveLanguages: FHC_JS_DATA_STORAGE_OBJECT.server_languages,
@@ -44,16 +45,7 @@ export const AbgabeMitarbeiterDetail = {
 					paabgabetyp_kurzbz: 'enda',
 					bezeichnung: 'Endabgabe im Sekretariat'
 				}
-			],
-			form: Vue.reactive({
-				sprache: '',
-				abstract: '',
-				abstract_en: '',
-				schlagwoerter: '',
-				schlagwoerter_en: '',
-				kontrollschlagwoerter: '',
-				seitenanzahl: 1,
-			})
+			]
 		}
 	},
 	methods: {
@@ -171,21 +163,14 @@ export const AbgabeMitarbeiterDetail = {
 			window.open(link, '_blank')
 		},
 		openPlagiatcheck() {
-			// todo: hardcoded turnitin link pfui?
+			// todo: hardcoded turnitin link?
 			const link = "https://technikum-wien.turnitin.com/sso/sp/redwood/saml/5IyfmBr2OcSIaWQTKlFCGj/start"
 			window.open(link, '_blank')
-		}
-	},
-	watch: {
-		projektarbeit(newVal) {
-			// default select german if projektarbeit sprache was null
-			this.form.sprache = newVal.sprache ? this.allActiveLanguages.find(lang => lang.sprache == newVal.sprache) : this.allActiveLanguages.find(lang => lang.sprache == 'German')
-			this.form.abstract = newVal.abstract
-			this.form.abstract_en = newVal.abstract_en
-			this.form.schlagwoerter = newVal.schlagwoerter
-			this.form.schlagwoerter_en = newVal.schlagwoerter_en
-			this.form.kontrollschlagwoerter = newVal.kontrollschlagwoerter
-			this.form.seitenanzahl = newVal.seitenanzahl
+		},
+		openBenotung() {
+			const path = this.projektarbeit?.betreuerart_kurzbz == 'Zweitbegutachter' ? 'ProjektarbeitsbeurteilungZweitbegutachter' : 'ProjektarbeitsbeurteilungErstbegutachter'
+			const link = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/' + path
+			window.open(link, '_blank')
 		}
 	},
 	computed: {
@@ -212,28 +197,47 @@ export const AbgabeMitarbeiterDetail = {
 	template: `
 		<div v-if="projektarbeit">
 		
+
 			<h5>{{$p.t('abgabetool/c4abgabeMitarbeiterbereich')}}</h5>
+
+
 			<div class="row">
 				<div class="col-8">
 					<p> {{projektarbeit?.student}}</p>
 					<p> {{projektarbeit?.titel}}</p>
 					<p v-if="projektarbeit?.zweitbegutachter"> {{projektarbeit?.zweitbegutachter}}</p>
 				</div>
-				<div class="col-4 d-flex justify-content-end">
-					<div>
-						<button :disabled="!getSemesterBenotbar && endUploadVorhanden" class="btn btn-secondary border-0" @click="openPlagiatcheck" style="margin-right: 4px;">
-							benoten
-							<i style="margin-left: 8px" class="fa-solid fa-user-check"></i>
-						</button>
+				<div class="col-4 d-flex">
+					<div class="col">
+						<div class="row">
+							<button :disabled="!getSemesterBenotbar || !endUploadVorhanden" class="btn btn-secondary border-0" @click="openBenotung" style="width: 80%;">
+								benoten
+								<i style="margin-left: 8px" class="fa-solid fa-user-check"></i>
+							</button>
+						</div>
+						<div class="row" style="width: 90%;">
+							<span v-if="!getSemesterBenotbar" v-html="$p.t('abgabetool/c4aeltereParbeitBenoten', oldPaBeurteilungLink)"></span>
+							<span v-else-if="!endUploadVorhanden">Kein Endupload vorhanden!</span>
+						</div>
+					</div>
+					<div class="col">
+						<div class="row">
+							<button v-if="projektarbeit?.betreuerart_kurzbz !== 'Zweitbegutachter'" class="btn btn-secondary border-0" @click="openPlagiatcheck" style="width: 80%;">
+								zur Plagiatsprüfung
+								<i style="margin-left: 8px" class="fa-solid fa-user-check"></i>
+							</button>
+						</div>
+						
+					</div>
+					<div class="col">
+						<div class="row">
+							<button class="btn btn-secondary border-0" @click="openStudentPage" style="width: 80%;">
+								Studentenansicht
+								<i style="margin-left: 8px" class="fa-solid fa-eye"></i>
+							</button>
+						</div>
+						
 					</div>
-					<button v-if="projektarbeit?.betreuerart_kurzbz !== 'Zweitbegutachter'" class="btn btn-secondary border-0" @click="openPlagiatcheck" style="margin-right: 4px;">
-						zur Plagiatsprüfung
-						<i style="margin-left: 8px" class="fa-solid fa-user-check"></i>
-					</button>
-					<button class="btn btn-secondary border-0" @click="openStudentPage">
-						Studentenansicht
-						<i style="margin-left: 8px" class="fa-solid fa-eye"></i>
-					</button>
 				</div>
 			</div>
 			<div id="uploadWrapper">
@@ -303,101 +307,6 @@ export const AbgabeMitarbeiterDetail = {
 				</div>
 			</div>
 		 </div>
-		 <bs-modal ref="modalContainerEnduploadZusatzdaten" class="bootstrap-prompt" dialogClass="modal-lg">
-			<template v-slot:title>
-				<div>
-					{{$p.t('abgabetool/c4enduploadZusatzdaten')}}
-				</div>
-				<div class="row mb-3 align-items-center">
-					
-					<p class="ml-4 mr-4">Student UID: {{ projektarbeit?.student_uid}}</p>
-				
-				</div>
-				<div class="row mb-3 align-items-center">
-					
-					<p class="ml-4 mr-4">Titel: {{ projektarbeit?.titel }}</p>
-				
-				</div>
-			</template>
-			<template v-slot:default>
-				<div class="row mb-3 align-items-center">
-					<div class="row">{{$p.t('abgabetool/c4Sprache')}}</div>
-					<div class="row">
-						<Dropdown 
-							:style="{'width': '100%'}"
-							v-model="form.sprache"
-							:options="allActiveLanguages"
-							:optionLabel="getOptionLabelSprache">
-						</Dropdown>
-					</div>
-				</div>
-				
-				<div class="row mb-3 align-items-center">
-					<div class="row">Kontrollierte Schlagwörter</div>
-					<div class="row">
-						<Textarea v-model="form.kontrollschlagwoerter"></Textarea>
-					</div>
-				</div>
-				<div class="row mb-3 align-items-center">
-					<div class="row">{{$p.t('abgabetool/c4schlagwoerterGer')}}</div>
-					<div class="row">
-						<Textarea v-model="form.schlagwoerter"></Textarea>
-					</div>
-				</div>
-				
-				<div class="row mb-3 align-items-center">
-					<div class="row">{{$p.t('abgabetool/c4schlagwoerterEng')}}</div>
-					<div class="row">
-						<Textarea v-model="form.schlagwoerter_en"></Textarea>
-					</div>
-				</div>
-				
-				<div class="row mb-3 align-items-center">
-					<div class="row">{{$p.t('abgabetool/c4abstractGer')}}</div>
-					<div class="row">
-						<Textarea v-model="form.abstract" rows="10"></Textarea>
-					</div>
-				</div>
-
-				<div class="row mb-3 align-items-center">
-					<div class="row">{{$p.t('abgabetool/c4abstractEng')}}</div>
-					<div class="row">
-						<Textarea v-model="form.abstract_en" rows="10"></Textarea>
-					</div>				
-				</div>
-				
-				<div class="row mb-3 align-items-center">
-					<div class="row">{{$p.t('abgabetool/c4seitenanzahl')}}</div>
-					<div class="row">
-						<InputNumber 
-							v-model="form.seitenanzahl"
-							inputId="seitenanzahlInput" :min="1" :max="100000">
-						</InputNumber>
-					</div>		
-				</div>
-				
-				<div v-if="projektarbeit">
-					<div v-html="getEid"></div>
-					<div class="row">
-						<div class="col-9"></div>
-						<div class="col-2"><p>{{ $p.t('abgabetool/c4gelesenUndAkzeptiert') }}</p></div>
-						<div class="col-1">
-							
-							<Checkbox 
-								v-model="eidAkzeptiert" 
-								:binary="true" 
-								:pt="{ root: { class: 'ml-auto' }}"
-							>
-							</Checkbox>
-						</div>
-					</div>
-				</div>
-				
-			</template>
-			<template v-slot:footer>
-				<button class="btn btn-primary" :disabled="getEnduploadErlaubt" @click="triggerEndupload">{{$p.t('ui/hochladen')}}</button>
-			</template>
-		</bs-modal>
 
 `,
 };
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 06a1f2d00..2d2316036 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -1,13 +1,18 @@
 import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
 import AbgabeDetail from "./AbgabeMitarbeiterDetail.js";
 import VerticalSplit from "../../verticalsplit/verticalsplit.js"
+import BsModal from '../../Bootstrap/Modal.js';
 
 export const AbgabetoolMitarbeiter = {
 	name: "AbgabetoolMitarbeiter",
 	components: {
+		BsModal,
 		CoreFilterCmpt,
 		AbgabeDetail,
 		VerticalSplit,
+		Dropdown: primevue.dropdown,
+		Textarea: primevue.textarea,
+		VueDatePicker
 	},
 	props: {
 		viewData: {
@@ -21,6 +26,39 @@ export const AbgabetoolMitarbeiter = {
 	},
 	data() {
 		return {
+			saving: false,
+			loading: false,
+			// TODO: fetch types
+			allAbgabeTypes: [
+				{
+					paabgabetyp_kurzbz: 'abstract',
+					bezeichnung: 'Entwurf'
+				},
+				{
+					paabgabetyp_kurzbz: 'zwischen',
+					bezeichnung: 'Zwischenabgabe'
+				},
+				{
+					paabgabetyp_kurzbz: 'note',
+					bezeichnung: 'Benotung'
+				},
+				{
+					paabgabetyp_kurzbz: 'end',
+					bezeichnung: 'Endupload'
+				},
+				{
+					paabgabetyp_kurzbz: 'enda',
+					bezeichnung: 'Endabgabe im Sekretariat'
+				}
+			],
+			serienTermin: Vue.reactive({
+				datum: new Date(),
+				bezeichnung: {
+					paabgabetyp_kurzbz: 'zwischen',
+					bezeichnung: 'Zwischenabgabe'
+				},
+				kurzbz: ''
+			}),
 			showAll: false,
 			tabulatorUuid: Vue.ref(0),
 			selectedData: [],
@@ -38,6 +76,7 @@ export const AbgabetoolMitarbeiter = {
 				layout: 'fitDataStretch',
 				placeholder: this.$p.t('global/noDataAvailable'),
 				selectable: true,
+				selectableCheck: this.selectionCheck,
 				columns: [
 					{
 						formatter: 'rowSelection',
@@ -59,7 +98,7 @@ export const AbgabetoolMitarbeiter = {
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg', formatter: this.centeredTextFormatter, widthGrow: 2},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4sem')), field: 'studiensemester_kurzbz', formatter: this.centeredTextFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('abgabetool/c4titel')), field: 'titel', formatter: this.centeredTextFormatter, maxWidth: 500, widthGrow: 8},
-					{title: Vue.computed(() => this.$p.t('abgabetool/c4beteuerart')), field: 'betreuerart_beschreibung',formatter: this.centeredTextFormatter, widthGrow: 8}
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4betreuerart')), field: 'betreuerart_beschreibung',formatter: this.centeredTextFormatter, widthGrow: 8}
 				],
 				persistence: false,
 			},
@@ -74,24 +113,10 @@ export const AbgabetoolMitarbeiter = {
 				handler: async (e, cell) => {
 					if(cell.getColumn().getField() === "details") {
 						this.setDetailComponent(cell.getValue())
+						this.undoSelection(cell)
+					} else if (cell.getColumn().getField() === "mail") {
+						this.undoSelection(cell)
 					}
-					e.stopPropagation()
-
-				}
-			},
-			{
-				event: "rowClick",
-				handler: async (e, row) => {
-
-					e.stopPropagation()
-
-				}
-			},
-			{
-				event: "rowSelected",
-				handler: async (row) => {
-
-
 				}
 			},
 			{
@@ -103,16 +128,82 @@ export const AbgabetoolMitarbeiter = {
 			]};
 	},
 	methods: {
+		getOptionLabelAbgabetyp(option){
+			return option.bezeichnung
+		},
+		formatDate(dateParam) {
+			const date = new Date(dateParam)
+			// handle missing leading 0
+			const padZero = (num) => String(num).padStart(2, '0');
+
+			const month = padZero(date.getMonth() + 1); // Months are zero-based
+			const day = padZero(date.getDate());
+			const year = date.getFullYear();
+
+			return `${day}.${month}.${year}`;
+		},
+		undoSelection(cell) {
+			// checks if cells row is selected and unselects -> imitates columns which dont trigger row selection
+			// but actually just revert it after the fact
+
+			const row = cell.getRow()
+			if(row.isSelected()) {
+				row.deselect();
+			}
+		},
+		selectionCheck(row) {
+			const data = row.getData()
+			if(data?.betreuerart_kurzbz == 'Zweitbegutachter') return false
+			return true
+		},
 		showDeadlines(){
-			// TODO: open seperate view in new window containing all future deadlines for the employee
+			const link = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router
+				+ '/Cis/Abgabetool/Deadlines'
+			window.open(link, '_blank')
 		},
 		toggleShowAll(showall) {
 			this.showAll = showall
-			// TODO: debug tabulator row render
-			this.loadProjektarbeiten(showall, () => { this.$refs.abgabeTable?.tabulator.redraw(true) })
+			this.loading = true
+			this.loadProjektarbeiten(showall, () => {
+				this.$refs.abgabeTable?.tabulator.redraw(true)
+				this.$refs.abgabeTable?.tabulator.setSort([]);
+				this.loading = false
+			})
+		},
+		openAddSeriesModal() {
+			this.$refs.modalContainerAddSeries.show()
 		},
 		addSeries() {
+			this.saving = true
+			this.$fhcApi.factory.lehre.postSerientermin(
+				this.serienTermin.datum.toISOString(),
+				this.serienTermin.bezeichnung.paabgabetyp_kurzbz,
+				this.serienTermin.bezeichnung.bezeichnung,
+				this.serienTermin.kurzbz,
+				this.selectedData?.map(projekt => projekt.projektarbeit_id)
+			).then(res => {
+				if (res.meta.status === "success" && res.data) {
+					this.$fhcAlert.alertSuccess(this.$p.t('abgabetool/serienTerminGespeichert'))
+					// TODO: sticky lifetime erhöhen um sinnvoll lesen zu können?
+					this.$fhcAlert.alertInfo(this.$p.t('abgabetool/serienTerminEmailSentInfo', [this.createInfoString(res.data)]));
+				} else {
+					this.$fhcAlert.alertError(this.$p.t('abgabetool/errorSerienterminSpeichern'))
+				}
+			}).finally(()=>{
+				this.saving = false
+			})
+
+			this.$refs.modalContainerAddSeries.hide()
+		},
+		createInfoString(data) {
+			let str = '';
 			
+			data.forEach(name => {
+				str += name
+				str += '; '
+			})
+			
+			return str
 		},
 		isPastDate(date) {
 			return new Date(date) < new Date(Date.now())
@@ -283,8 +374,57 @@ export const AbgabetoolMitarbeiter = {
 		this.setupMounted()
 	},
 	template: `
-
-
+		<bs-modal ref="modalContainerAddSeries" class="bootstrap-prompt"
+		dialogClass="modal-lg">
+			<template v-slot:title>
+				<div>
+					{{ $p.t('abgabetool/addSeries') }}
+				</div>
+			</template>
+			<template v-slot:default>
+				<div class="row">
+					<div class="col-3 d-flex justify-content-center align-items-center">
+						{{$p.t('abgabetool/c4zieldatum')}}
+					</div>
+					<div class="col-3 d-flex justify-content-center align-items-center">
+						{{$p.t('abgabetool/c4abgabetyp')}}
+					</div>
+					<div class="col-6 d-flex justify-content-center align-items-center">
+						{{$p.t('abgabetool/c4abgabekurzbz')}}
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-3 d-flex justify-content-center align-items-center">
+						<div>
+							<VueDatePicker
+								style="width: 95%;"
+								v-model="serienTermin.datum"
+								:clearable="false"
+								:enable-time-picker="false"
+								:format="formatDate"
+								:text-input="true"
+								auto-apply>
+							</VueDatePicker>
+						</div>				
+					</div>
+					<div class="col-3 d-flex justify-content-center align-items-center">
+						<Dropdown 
+							:style="{'width': '100%'}"
+							v-model="serienTermin.bezeichnung"
+							:options="allAbgabeTypes"
+							:optionLabel="getOptionLabelAbgabetyp">
+						</Dropdown>
+					</div>
+					<div class="col-6 d-flex justify-content-center align-items-center">
+						<Textarea style="margin-bottom: 4px;" v-model="serienTermin.kurzbz" rows="3" cols="40"></Textarea>
+					</div>
+				</div>
+				
+			</template>
+			<template v-slot:footer>
+				<button type="button" class="btn btn-primary" @click="addSeries">{{ $p.t('global/save') }}</button>
+			</template>
+		</bs-modal>	
 		
 		<vertical-split ref="verticalsplit">		
 			
@@ -296,9 +436,9 @@ export const AbgabetoolMitarbeiter = {
 					@uuidDefined="handleUuidDefined"
 					ref="abgabeTable"
 					:newBtnShow="true"
-					:newBtnLabel="$p.t('global/neueTerminserie')"
+					:newBtnLabel="$p.t('abgabetool/neueTerminserie')"
 					:newBtnDisabled="!selectedData.length"
-					@click:new=addSeries
+					@click:new=openAddSeriesModal
 					:tabulator-options="abgabeTableOptions"  
 					:tabulator-events="abgabeTableEventHandlers"
 					tableOnly
@@ -316,6 +456,14 @@ export const AbgabetoolMitarbeiter = {
 							<i class="fa fa-hourglass-end"></i>
 							{{ $p.t('abgabetool/showDeadlines') }}
 						</button>
+						
+						<div v-show="saving">
+							{{ $p.t('abgabetool/currentlySaving') }} <i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+						</div>
+						<div v-show="loading">
+							{{ $p.t('abgabetool/currentlyLoading') }} <i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+						</div>
+						
 					</template>
 				</core-filter-cmpt>
 
diff --git a/public/js/components/Cis/Abgabetool/DeadlineOverview.js b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
new file mode 100644
index 000000000..d2b133979
--- /dev/null
+++ b/public/js/components/Cis/Abgabetool/DeadlineOverview.js
@@ -0,0 +1,151 @@
+import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
+
+export const DeadlineOverview = {
+	name: "DeadlineOverview",
+	components: {
+		CoreFilterCmpt,
+	},
+	props: {
+		person_uid_prop: {
+			default: null	
+		},
+		viewData: {
+			type: Object,
+			required: true,
+			default: () => ({name: '', uid: ''}),
+			validator(value) {
+				return value && value.name && value.uid
+			}
+		}
+	},
+	data() {
+		return {
+			fullName: null, // TODO: fetch this somewhere
+			deadlines: null,
+			tabulatorUuid: Vue.ref(0),
+			tableBuiltResolve: null,
+			tableBuiltPromise: null,
+			deadlineTableOptions: {
+				height: 700,
+				index: 'projektarbeit_id',
+				layout: 'fitColumns',
+				placeholder: this.$p.t('global/noDataAvailable'),
+				columns: [
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4zieldatum')), field: 'datum', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4fixtermin')), field: 'fixterminstring', formatter: this.centeredTextFormatter, widthGrow: 1, tooltip: false},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4abgabetyp')), field: 'typ_bezeichnung', formatter: this.centeredTextFormatter, widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4abgabekurzbz')), field: 'kurzbz', formatter: this.centeredTextFormatter, widthGrow: 3},
+					{title: Vue.computed(() => this.$p.t('person/studentIn')), field: 'student', formatter: this.centeredTextFormatter, widthGrow: 2},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4stg')), field: 'stg', formatter: this.centeredTextFormatter,widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('abgabetool/c4sem')), field: 'semester', formatter: this.centeredTextFormatter, widthGrow: 1}
+				],
+				persistence: false,
+			},
+			deadlineTableEventHandlers: [{
+				event: "tableBuilt",
+				handler: async () => {
+					this.tableBuiltResolve()
+				}
+			},
+				{
+					event: "cellClick",
+					handler: async (e, cell) => {
+
+						if(cell.getColumn().getField() === "details") {
+							const val = cell.getValue()
+
+							if(val.mode === 'detailTermine') {
+								this.setDetailComponent(cell.getValue())
+							} else if (val.mode === 'beurteilungDownload') {
+								const pdfExportLink = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/pdfExport.php?xml=projektarbeitsbeurteilung.xml.php&xsl=Projektbeurteilung&betreuerart_kurzbz='+val.betreuerart_kurzbz+'&projektarbeit_id='+val.projektarbeit_id+'&person_id=' + val.betreuer_person_id
+								// const pdfExportLink2 = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'cis/private/lehre/projektbeurteilungDocumentExport.php?betreuerart_kurzbz='+val.betreuerart_kurzbz+'&projektarbeit_id='+val.projektarbeit_id+'&person_id=' + val.betreuer_person_id
+								window.open(pdfExportLink, '_blank')
+							}
+
+						} else if (cell.getColumn().getField() === "beurteilung") {
+							const val = cell.getValue()
+
+							if(val != '-') window.open(val, '_blank')
+						}
+						e.stopPropagation()
+
+					}
+				}
+			]};
+	},
+	methods: {
+		centeredTextFormatter(cell) {
+			const val = cell.getValue()
+
+			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+				'<p style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+val+'</p></div>'
+		},
+		tableResolve(resolve) {
+			this.tableBuiltResolve = resolve
+		},
+		loadDeadlines() {
+			this.$fhcApi.factory.lehre.fetchDeadlines(this.person_uid_prop ??  null)
+				.then(res => {
+					if(res?.data) this.setupData(res.data)
+				})
+		},
+		setupData(data) {
+			this.deadlines = data
+			
+			this.deadlines.forEach(dl => {
+				dl.student = (dl.stud_titelpre ? (dl.stud_titelpre + ' ') :'') + dl.stud_vorname + ' ' + dl.stud_nachname + (dl.stud_titelpost ? (' ' + dl.stud_titelpost) :'')
+				dl.fixterminstring = dl.fixtermin ? this.$p.t('abgabetool/c4yes') : this.$p.t('abgabetool/c4no')
+			})
+
+			this.$refs.deadlineTable.tabulator.setColumns(this.deadlineTableOptions.columns)
+			this.$refs.deadlineTable.tabulator.setData(this.deadlines);
+		},
+		handleUuidDefined(uuid) {
+			this.tabulatorUuid = uuid
+		},
+		calcMaxTableHeight() {
+			const tableID = this.tabulatorUuid ? ('-' + this.tabulatorUuid) : ''
+			const tableDataSet = document.getElementById('filterTableDataset' + tableID);
+			if(!tableDataSet) return
+			const rect = tableDataSet.getBoundingClientRect();
+
+			this.deadlineTableOptions.height = window.visualViewport.height - rect.top
+			this.$refs.deadlineTable.tabulator.setHeight(this.deadlineTableOptions.height)
+		},
+		async setupMounted() {
+			this.tableBuiltPromise = new Promise(this.tableResolve)
+			await this.tableBuiltPromise
+
+			this.loadDeadlines()
+			this.calcMaxTableHeight()
+		}
+	},
+	watch: {
+
+	},
+	computed: {
+
+	},
+	created() {
+
+	},
+	mounted() {
+		this.setupMounted()
+	},
+	template: `
+		<h2>{{$p.t('abgabetool/deadlinesTitle')}} {{ fullName ? ('-' + fullName) : ''}}</h2>
+		<hr>
+			
+		 <core-filter-cmpt
+			@uuidDefined="handleUuidDefined"
+			:title="''"  
+			ref="deadlineTable" 
+			:tabulator-options="deadlineTableOptions"  
+			:tabulator-events="deadlineTableEventHandlers"
+			tableOnly
+			:sideMenu="false"
+		 />
+    `,
+};
+
+export default DeadlineOverview;
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ae1c9daaa..9e9385c5c 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -30938,7 +30938,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Wrong parameters tranferred',
+				'text' => 'Wrong parameters transferred',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -37879,6 +37879,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'neuerTerminBachelorMasterbetreuung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Neuer Termin Bachelor-/Masterarbeitsbetreuung",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "New date for Bachelor/Master thesis supervision",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'neueTerminserie',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Terminserie anlegen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Create recurring deadline",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'serienTerminEmailSentInfo',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Email über neuen Abgabetermin versendet an: {0}",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Email about new deadline sent to: {0}",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -39784,6 +39844,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4aeltereParbeitBenoten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Projektarbeit für älteres Semester, bitte <a href="{0}" target="_blank">Word-Formular zur Benotung</a> verwenden!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Thesis handed in for older semester, please <a href="{0}" target="_blank">use word form for assessment</a>!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -39964,6 +40044,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'deadlinesTitle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Terminübersicht",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Deadline Overview",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4yes',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Ja",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Yes",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'c4no',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Nein",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "No",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',
@@ -40044,6 +40184,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'currentlySaving',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Speichern... ",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Saving... ',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'currentlyLoading',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Laden... ",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Loading... ',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From d791a6d3ef92e2de2cd885be27fccfdffb9cb72b Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 29 Apr 2025 15:03:10 +0200
Subject: [PATCH 134/572] phrasen & change email template name to under 32
 characters long

---
 .../controllers/api/frontend/v1/Lehre.php     |  2 +-
 .../Cis/Abgabetool/AbgabetoolMitarbeiter.js   |  4 +-
 system/phrasesupdate.php                      | 40 +++++++++++++++++++
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Lehre.php b/application/controllers/api/frontend/v1/Lehre.php
index 0ec2456f5..e42033d9c 100644
--- a/application/controllers/api/frontend/v1/Lehre.php
+++ b/application/controllers/api/frontend/v1/Lehre.php
@@ -639,7 +639,7 @@ class Lehre extends FHCAPI_Controller
 			$email = $data[0]->uid."@".DOMAIN;
 			
 			sendSanchoMail(
-				'neuerTerminBachelorMasterbetreuung',
+				'neuerAbgabetermin',
 				$body_fields,
 				$email,
 				$this->p->t('abgabetool', 'neuerTerminBachelorMasterbetreuung')
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 2d2316036..327c53198 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -378,7 +378,7 @@ export const AbgabetoolMitarbeiter = {
 		dialogClass="modal-lg">
 			<template v-slot:title>
 				<div>
-					{{ $p.t('abgabetool/addSeries') }}
+					{{ $p.t('abgabetool/neueTerminserie') }}
 				</div>
 			</template>
 			<template v-slot:default>
@@ -422,7 +422,7 @@ export const AbgabetoolMitarbeiter = {
 				
 			</template>
 			<template v-slot:footer>
-				<button type="button" class="btn btn-primary" @click="addSeries">{{ $p.t('global/save') }}</button>
+				<button type="button" class="btn btn-primary" @click="addSeries">{{ $p.t('global/speichern') }}</button>
 			</template>
 		</bs-modal>	
 		
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 9e9385c5c..ba3fca24f 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -37939,6 +37939,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'serienTerminGespeichert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Serientermin wurde erfolgreich eingetragen!",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Series dates were successfully entered!",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'abgabetool',
+		'phrase' => 'errorSerienterminSpeichern',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Fehler beim speichern des Serientermins!",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Error saving Series dates!",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From 7d3ffdde7bddab6475fec718bde3e2e5e8f46575 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 29 Apr 2025 17:15:32 +0200
Subject: [PATCH 135/572] fix api endpoint http error 500 when
 stundenplan_events is null or empty array

---
 application/controllers/api/frontend/v1/Stundenplan.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 815631d60..f957ccff6 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -81,7 +81,14 @@ class Stundenplan extends FHCAPI_Controller
 		$lv_id = $this->input->get('lv_id', TRUE);
 
 		$stundenplan_events = $this->stundenplanlib->getStundenplan($start_date,$end_date,$lv_id);
-		$stundenplan_events = $this->getDataOrTerminateWithError($stundenplan_events);	
+		if( is_null($stundenplan_events) || isEmptyArray($stundenplan_events) )
+		{
+			$stundenplan_events = array();
+		}
+		else
+		{
+			$stundenplan_events = $this->getDataOrTerminateWithError($stundenplan_events);
+		}
 
 		// fetching moodle events
 		$moodle_start_date = new DateTime($start_date);

From 9b895fbd235c26a332482957eb227e47d7711e23 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 30 Apr 2025 13:45:01 +0200
Subject: [PATCH 136/572] feature(Studium API endpoinds): adds the api
 endpoints for the Studium View to get the studienplan from a
 studiensemester/studiengang/semester

---
 application/controllers/Cis/Studium.php       |  40 ++++
 .../controllers/api/frontend/v1/Studium.php   | 217 ++++++++++++++++++
 public/js/api/fhcapifactory.js                |   4 +-
 public/js/api/studium.js                      |  33 +++
 public/js/apps/Dashboard/Fhc.js               |   9 +-
 public/js/components/Cis/Studium/Studium.js   | 194 ++++++++++++++++
 6 files changed, 494 insertions(+), 3 deletions(-)
 create mode 100644 application/controllers/Cis/Studium.php
 create mode 100644 application/controllers/api/frontend/v1/Studium.php
 create mode 100644 public/js/api/studium.js
 create mode 100644 public/js/components/Cis/Studium/Studium.js

diff --git a/application/controllers/Cis/Studium.php b/application/controllers/Cis/Studium.php
new file mode 100644
index 000000000..a298de648
--- /dev/null
+++ b/application/controllers/Cis/Studium.php
@@ -0,0 +1,40 @@
+<?php
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+class Studium extends Auth_Controller
+{
+
+	/**
+	 * Constructor
+	 */
+
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => ['basis/cis:r'],
+			
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+
+	/**
+	 * index loads the Studium view
+	 * @access public
+	 * @return void 
+	 */
+	public function index()
+	{
+		$viewData = array(
+
+		);
+		$this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'studium']);
+	}
+
+
+
+}
diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
new file mode 100644
index 000000000..7541a823b
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -0,0 +1,217 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+class Studium extends FHCAPI_Controller
+{
+	
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getStudienAllSemester'=> self::PERM_LOGGED,
+			'getStudiengaengeForStudienSemester'=> self::PERM_LOGGED,
+			'getStudienplaeneBySemester'=> self::PERM_LOGGED,
+		]);
+
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->load->model('organisation/Studienordnung_model','StudienordnungModel');
+		$this->load->model('organisation/Studiensemester_model',"StudiensemesterModel");
+		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+		$this->load->model('codex/Orgform_model','OrgformModel');
+
+		
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	public function getStudienAllSemester(){
+
+		$parameter_studiensemester = $this->input->get('studiensemester',true);
+        $parameter_studiengang = $this->input->get('studiengang',true);
+		$parameter_semester = $this->input->get('semester',true);
+		$parameter_studienplan = $this->input->get('studienplan',true);
+
+		$test1=null;
+		$test2=null;
+		$test3=null;
+		$test4=null;
+
+		if(isset($parameter_studiensemester)){
+			$parameter_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz" => $parameter_studiensemester])));
+		}
+
+		if(isset($parameter_studiengang)){
+			$parameter_studiengang = current($this->getDataOrTerminateWithError($this->StudiengangModel->loadWhere(["studiengang_kz" => $parameter_studiengang])));
+		}
+
+		if(isset($parameter_studienplan)){
+			$this->StudienplanModel->addJoin("lehre.tbl_studienordnung", "studienordnung_id");
+			$this->StudienplanModel->addJoin("lehre.tbl_studienplan_semester", "studienplan_id");
+			$parameter_studienplan = $this->StudienplanModel->loadWhere(["studienplan_id" => $parameter_studienplan, "aktiv" => TRUE]);
+			$parameter_studienplan = current($this->getDataOrTerminateWithError($parameter_studienplan));
+		}
+
+		// fetch studiensemester
+		$allStudienSemester = $this->getDataOrTerminateWithError($this->StudiensemesterModel->load());
+		
+		$aktuelles_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->getAkt()));
+		if(isset($parameter_studiensemester) && !empty(array_filter($allStudienSemester, function($studiensemester) use($parameter_studiensemester){
+			return $studiensemester->studiensemester_kurzbz == $parameter_studiensemester->studiensemester_kurzbz;
+		}))){
+			$test1=true;
+			$aktuelles_studiensemester = $parameter_studiensemester;
+		}
+		
+		// fetch studiengaenge
+		$studiengaenge = $this->computeStudiengaenge($aktuelles_studiensemester->studiensemester_kurzbz);
+		$aktuelles_studiengang = current($studiengaenge);
+		if(!$aktuelles_studiengang){
+			$aktuelles_studiengang = null;
+		}
+		if(isset($parameter_studiengang) && !empty(array_filter( $studiengaenge,function($studiengang)use($parameter_studiengang){
+			return $studiengang->studiengang_kz == $parameter_studiengang->studiengang_kz;
+		}))){
+			$test2=true;
+			$aktuelles_studiengang = $parameter_studiengang;
+		}
+		
+		// compute semester and studienplaene
+		if($aktuelles_studiengang){
+			$studienplaene = $this->computeStudienplaene($aktuelles_studiengang->studiengang_kz, $aktuelles_studiensemester->studiensemester_kurzbz);
+		}else{
+			$studienplaene =[];
+		}
+
+		$semester = array_values(array_unique(array_map(function($item){
+			return $item->semester;
+		}, $studienplaene))); 
+		$aktuelles_semester = current($semester);
+		if(!$aktuelles_semester){
+			$aktuelles_semester = null;
+		}
+		if(isset($parameter_semester) && in_array($parameter_semester, $semester)){
+			$test3=true;
+			$aktuelles_semester = $parameter_semester;
+		}
+
+		$semester_studienplan = array_filter($studienplaene, function($item) use($aktuelles_semester){
+			return $item->semester == $aktuelles_semester;
+		});
+		
+		// fetch current studienplan based on semester
+		$aktuelles_studienplan = current($semester_studienplan);
+		if(!$aktuelles_studienplan){
+			$aktuelles_studienplan = null;
+		}
+		if(isset($parameter_studienplan) && !empty(array_filter( $semester_studienplan, function($stundenplan) use($parameter_studienplan){
+			return $stundenplan->studienplan_id == $parameter_studienplan->studienplan_id;
+		}))){
+			$test4=true;
+			$aktuelles_studienplan = $parameter_studienplan ;
+		}
+
+		// result object
+		$result = new stdClass();
+		$result->studienSemester = [];
+		$result->studienSemester["all"]= $allStudienSemester;
+		$result->studienSemester["preselected"]=$aktuelles_studiensemester;
+		$result->studiengang["all"]=$studiengaenge;
+		$result->studiengang["preselected"]=$aktuelles_studiengang;
+		$result->semester["all"] =$semester;
+		$result->semester["preselected"] =$aktuelles_semester;
+		$result->studienplan["all"]=$semester_studienplan;
+		$result->studienplan["preselected"]=$aktuelles_studienplan;  
+		$result->test1=$test1;
+		$result->test2=$test2; 
+		$result->test3=$test3; 
+		$result->test4=$test4; 
+		
+		/* if($this->getDataOrTerminateWithError($this->StudentModel->isStudent(getAuthUID()))){
+			$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $aktuelles_studiensemester_kz]);
+			$studentLehrverband = current($this->getDataOrTerminateWithError($studentLehrverband));
+			$result->studentLehrverband = $studentLehrverband;
+			//$currentStudienplan = $this->StudienplanModel->loadWhere(["studiengang_kz"=>$studentLehrverband->studiengang_kz,"semester"=>$studentLehrverband->semester, "verband"=>$studentLehrverband->verband, "gruppe"=>$studentLehrverband->gruppe]);
+			$studienplaene = $this->getDataOrTerminateWithError($this->computeStudienplaene($studentLehrverband->studiengang_kz, $studentLehrverband->studiensemester_kurzbz));
+			$result->studienPleane = $studienplaene;
+			
+			//get the studienplan for the user
+			$preselectedStudienplan = $this->getStudienPlanFromPrestudentStatus(getAuthPersonId());
+
+			//set the preselected semester
+			$preselectedSemester = $preselectedStudienplan->semester;
+			
+			//get the studienordnung for the studienplan
+			$preselectedStudienordnung = $this->getStudienOrdnungForStudienplan($preselectedStudienplan->studienplan_id);
+			
+		}  */
+		$this->terminateWithSuccess($result);
+	}
+
+	public function getStudiengaengeForStudienSemester($studiensemester){
+		$studiengaenge = $this->computeStudiengaenge($studiensemester);
+		$this->terminateWithSuccess($studiengaenge);
+	}
+
+	public function getStudienplaeneBySemester(){
+		$this->load->library('form_validation');
+        $this->form_validation->set_data($this->input->get());
+		$this->form_validation->set_rules('studiengang', 'studiengang', 'required');
+        $this->form_validation->set_rules('studiensemester', 'studiensemester', 'required');
+        if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+ 
+        $studiengang = $this->input->get('studiengang',true);
+        $studiensemester = $this->input->get('studiensemester',true);
+        $studienplaene = $this->computeStudienplaene($studiengang, $studiensemester);
+		$this->terminateWithSuccess($studienplaene);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	private function computeStudienplaene($studiengang, $studiensemester){
+		$studienplaene = $this->StudienplanModel->getStudienplaeneBySemester($studiengang, $studiensemester);
+		$studienplaene = $this->getDataOrTerminateWithError($studienplaene);
+		$studienplaene = array_map(function($studienplan){
+			$orgform = current($this->getDataOrTerminateWithError($this->OrgformModel->loadWhere(["orgform_kurzbz" => $studienplan->orgform_kurzbz])));
+			$studienplan->orgform_bezeichnung = $orgform->bezeichnung;
+			return $studienplan;
+		},$studienplaene);
+		return $studienplaene;
+	}
+
+	private function computeStudiengaenge($studiensemester){
+		$studiengang_studiensemester_result = $this->StudiengangModel->getStudiengaengeByStudiensemester($studiensemester);
+		$studiengang_studiensemester_result = $this->getDataOrTerminateWithError($studiengang_studiensemester_result);
+		return $studiengang_studiensemester_result;
+	}
+
+	private function getStudienPlanFromPrestudentStatus($person_id){
+			$studienplan_id = current($this->getDataOrTerminateWithError($this->PrestudentstatusModel->getLastStatusPerson($person_id)))->studienplan_id;
+			$studienplan =current($this->getDataOrTerminateWithError($this->StudienplanModel->loadWhere(["studienplan_id"=>$studienplan_id])));
+			return $studienplan;
+	}
+	
+}
+
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index fe90a73fc..0b7b6631c 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -37,6 +37,7 @@ import studiengang from "./studiengang.js";
 import menu from "./menu.js";
 import dashboard from "./dashboard.js";
 import authinfo from "./authinfo.js";
+import studium from "./studium.js";
 
 export default {
     search,
@@ -60,5 +61,6 @@ export default {
     addons,
 	studiengang,
 	menu,
-	authinfo
+	authinfo,
+	studium,
 };
diff --git a/public/js/api/studium.js b/public/js/api/studium.js
new file mode 100644
index 000000000..1789c449d
--- /dev/null
+++ b/public/js/api/studium.js
@@ -0,0 +1,33 @@
+export default {
+
+	getStudiensemester: function () {
+		return this.$fhcApi.get(
+			'/components/Cis/Mylv/Studiensemester',
+			{}
+		);
+	},
+
+	getAllStudienSemester: function (studiensemester=undefined, studiengang=undefined, semester=undefined, studienplan=undefined) {
+		console.log(studiensemester, studiengang, semester, studienplan)
+		return this.$fhcApi.get(
+			'/api/frontend/v1/Studium/getStudienAllSemester',
+			{studiensemester, studiengang, semester, studienplan}
+		);
+	},
+
+	getStudiengaengeForStudienSemester: function (studiensemester) {
+		return this.$fhcApi.get(
+			`/api/frontend/v1/Studium/getStudiengaengeForStudienSemester/${studiensemester}`,
+			{}
+		);
+	},
+	getStudienplaeneBySemester: function (studiengang, studiensemester) {
+		return this.$fhcApi.get(
+			`/api/frontend/v1/Studium/getStudienplaeneBySemester`,
+			{
+				studiengang,
+				studiensemester,
+			}
+		);
+	},
+}
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 5e6b006b9..fc25fbdfe 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -13,14 +13,19 @@ import RoomInformation, {DEFAULT_MODE_RAUMINFO} from "../../components/Cis/Mylv/
 import AbgabetoolStudent from "../../components/Cis/Abgabetool/AbgabetoolStudent.js";
 import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMitarbeiter.js";
 import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.js";
-
-
+import Studium from "../../components/Cis/Studium/Studium.js";
 
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 
 const router = VueRouter.createRouter({
 	history: VueRouter.createWebHistory(`/${ciPath}`),
 	routes: [
+		{
+			path: `/Cis/Studium`,
+			name: 'Studium',
+			component: Studium,
+			props: true
+		},
 		{
 			path: `/Cis/Profil/View/:uid`,
 			name: 'ProfilView',
diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
new file mode 100644
index 000000000..94a012fc9
--- /dev/null
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -0,0 +1,194 @@
+export default {
+	data(){
+		return {
+			studienSemester :[],
+			selectedStudiensemester: null,
+			studiengaenge:[],
+			selectedStudiengang:null,
+			studienOrdnung: [],
+			selectedStudienordnung: null,
+			semester:[],
+			selectedSemester:null,
+		}
+	},
+	methods:{
+		changeSelectedStudienSemester(studiensemester) {
+			this.$fhcApi.factory.studium.getAllStudienSemester(studiensemester.studiensemester_kurzbz, this.selectedStudiengang, this.selectedSemester, this.selectedStudienordnung)
+				.then(data => data.data)
+				.then(res => {
+					this.extractPropertyValues(res);
+				})
+		},
+		changeSelectedStudienGang(studiengang) {
+			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, studiengang.studiengang_kz, this.selectedSemester, this.selectedStudienordnung)
+				.then(data => data.data)
+				.then(res => {
+					this.extractPropertyValues(res);
+				})
+		},
+		changeSelectedSemester(semester) {
+			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, semester, this.selectedStudienordnung)
+				.then(data => data.data)
+				.then(res => {
+					this.extractPropertyValues(res);
+				})
+		},
+		changeSelectedStudienPlan(studienplan) {
+			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, this.selectedSemester, studienplan.studienplan_id)
+				.then(data => data.data)
+				.then(res => {
+					this.extractPropertyValues(res);
+				})
+		},
+		/* loadStudienplan(studiengang, studiensemester){
+			this.$fhcApi.factory.studium.getStudienplaeneBySemester(studiengang, studiensemester)
+				.then(data => data.data)
+				.then(res => {
+					console.log("This is the result", res)
+				})
+		}, */
+		sortStudienSemester(studienSemester){
+			let regex = new RegExp(/^(WS|SS)([0-9]{4})/);
+			studienSemester.sort((sem1,sem2)=>{
+				let [sem1Match, sem1Semester, sem1Year] = sem1.studiensemester_kurzbz.match(regex);
+				let [sem2Match, sem2Semester, sem2Year] = sem2.studiensemester_kurzbz.match(regex);
+				if(sem1Year == sem2Year){
+					return sem1Semester > sem2Semester? -1:1;
+				}
+				return sem1Year > sem2Year? -1:1;
+			})
+		},
+		setHash(val) {
+			// TODO: make this a router param to enable history
+			location.hash = val;
+		},
+		extractPropertyValues(res){
+			let { studienSemester, studiengang, semester, studienplan } = res;
+			this.sortStudienSemester(studienSemester.all);
+			this.studienSemester = studienSemester.all;
+			this.selectedStudiensemester = studienSemester.preselected.studiensemester_kurzbz;
+
+			this.studiengaenge = studiengang.all;
+			this.selectedStudiengang = studiengang.preselected?.studiengang_kz;
+
+			this.semester = semester.all;
+			this.selectedSemester = semester?.preselected;
+
+			console.log(studienplan.all,"all studienplan")
+			this.studienOrdnung = studienplan.all;
+			console.log(this.studienOrdnung,"studienordnung")
+			this.selectedStudienordnung = studienplan.preselected?.studienplan_id;
+		},
+		studienordnungTitel(studienordnung){
+			if(!studienordnung) return "";
+			return `${studienordnung?.bezeichnung}-${studienordnung?.orgform_kurzbz} ( ${studienordnung?.orgform_bezeichnung}, ${studienordnung?.sprache} )`;
+		},
+		studiengangTitel(studiengang) {
+			if (!studiengang) return "";
+			return `${studiengang?.kurzbzlang} (${studiengang?.bezeichnung})`;
+		},
+		studiensemesterTitel(studiensemester){
+			if (!studiensemester) return "";
+			let studiensemester_regex = new RegExp(/^(WS|SS)([0-9]{4})/);
+			let match = studiensemester.match(studiensemester_regex);
+			switch(match[1]){
+				case "WS":
+					return `Wintersemester ${match[2]}`;
+				case "SS":
+					return `Sommersemester ${match[2]}`;	
+				default:
+					return `${studiensemester}`;
+			}
+		}
+	},
+
+	computed:{
+		
+	},
+	
+	created(){
+		this.$fhcApi.factory.studium.getAllStudienSemester()
+		.then(data => data.data)
+		.then(res => {
+			this.	extractPropertyValues(res);
+		})
+	},
+	/* selectedStudiensemester(newStudiensemester, oldStudiensemester) {
+		if (newStudiensemester !== oldStudiensemester) {
+			this.$fhcApi.factory.studium.getAllStudienSemester(newStudiensemester, this.selectedStudiengang, this.selectedSemester)
+				.then(data => data.data)
+				.then(res => {
+					this.extractPropertyValues(res);
+				})
+		}
+	},
+	selectedStudiengang(newStudiengang, oldStudiengang) {
+		if (newStudiengang !== oldStudiengang) {
+			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, newStudiengang, this.selectedSemester)
+				.then(data => data.data)
+				.then(res => {
+					this.extractPropertyValues(res);
+				})
+		}
+	},
+	selectedSemester(newSemester, oldSemester) {
+		if (newSemester !== oldSemester) {
+			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, newSemester)
+				.then(data => data.data)
+				.then(res => {
+					this.extractPropertyValues(res);
+				})
+		}
+	} */
+	template: `
+	<h2>this is a test titel</h2>
+	<div class="input-group">
+		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="prevSem">
+			<i class="fa fa-caret-left" aria-hidden="true"></i>
+		</button>
+		<select ref="studiensemester" v-model="selectedStudiensemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+			<option v-for="semester in studienSemester" @click="changeSelectedStudienSemester(semester)" :key="semester" :value="semester.studiensemester_kurzbz">{{studiensemesterTitel(semester.studiensemester_kurzbz)	}}</option>
+		</select>
+		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="nextSem">
+			<i class="fa fa-caret-right" aria-hidden="true"></i>
+		</button>
+	</div>
+
+	<div class="input-group">
+		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="prevSem">
+			<i class="fa fa-caret-left" aria-hidden="true"></i>
+		</button>
+		<select ref="studiengaenge" v-model="selectedStudiengang" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+			<option v-for="studiengang in studiengaenge" @click="changeSelectedStudienGang(studiengang)" :key="studiengang.studiengang_kz" :value="studiengang.studiengang_kz" >{{studiengangTitel(studiengang)}}</option>
+		</select>
+		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="nextSem">
+			<i class="fa fa-caret-right" aria-hidden="true"></i>
+		</button>
+	</div>
+
+	<div class="input-group">
+		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="prevSem">
+			<i class="fa fa-caret-left" aria-hidden="true"></i>
+		</button>
+		<select ref="semester" v-model="selectedSemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+			<option v-for="sem in semester" @click="changeSelectedSemester(sem)" :key="semester" :value="sem">{{sem}}. Semester</option>
+		</select>
+		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="nextSem">
+			<i class="fa fa-caret-right" aria-hidden="true"></i>
+		</button>
+	</div>
+
+	<div class="input-group">
+		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="prevSem">
+			<i class="fa fa-caret-left" aria-hidden="true"></i>
+		</button>
+		<select ref="studienordnung" v-model="selectedStudienordnung" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+			<option v-for="ordnung in studienOrdnung" @click="changeSelectedStudienPlan(ordnung)" :key="ordnung.bezeichnung	" :value="ordnung.studienplan_id">{{studienordnungTitel(ordnung)}}</option>
+		</select>
+		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="nextSem">
+			<i class="fa fa-caret-right" aria-hidden="true"></i>
+		</button>
+	</div>
+	
+	`
+};
\ No newline at end of file

From eae44bc6345245db9402c54948575463549cefee Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 2 May 2025 11:23:39 +0200
Subject: [PATCH 137/572] update(Studium): loads lehrmodule and
 lehrveranstaltungen for studienplan and displays the ui with the lvModal

---
 .../controllers/api/frontend/v1/Studium.php   | 41 ++++++++++++++++++-
 public/js/components/Cis/Mylv/LvInfo.js       |  6 +--
 public/js/components/Cis/Mylv/LvModal.js      |  2 +-
 public/js/components/Cis/Studium/Studium.js   | 41 ++++++++++++++++++-
 4 files changed, 83 insertions(+), 7 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index 7541a823b..b14a852a6 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -132,6 +132,14 @@ class Studium extends FHCAPI_Controller
 			$aktuelles_studienplan = $parameter_studienplan ;
 		}
 
+		// fetch studienplan lehrveranstaltungen
+		if($aktuelles_studienplan){
+			$lehrveranstaltungen = $this->computeStudienplanLehrveranstaltungen($aktuelles_studienplan->studienplan_id, $aktuelles_semester);
+			$aktuelles_lehrveranstaltungen = $lehrveranstaltungen;
+		}else{
+			$aktuelles_lehrveranstaltungen = [];
+		}
+
 		// result object
 		$result = new stdClass();
 		$result->studienSemester = [];
@@ -142,7 +150,8 @@ class Studium extends FHCAPI_Controller
 		$result->semester["all"] =$semester;
 		$result->semester["preselected"] =$aktuelles_semester;
 		$result->studienplan["all"]=$semester_studienplan;
-		$result->studienplan["preselected"]=$aktuelles_studienplan;  
+		$result->studienplan["preselected"]=$aktuelles_studienplan; 
+		$result->lehrveranstaltungen=$aktuelles_lehrveranstaltungen;  
 		$result->test1=$test1;
 		$result->test2=$test2; 
 		$result->test3=$test3; 
@@ -201,6 +210,36 @@ class Studium extends FHCAPI_Controller
 		return $studienplaene;
 	}
 
+	private function computeStudienplanLehrveranstaltungen($studienplan_id, $semester){
+		$lehrveranstaltungen = $this->StudienplanModel->getStudienplanLehrveranstaltung($studienplan_id, $semester);	
+		$lehrveranstaltungen = $this->getDataOrTerminateWithError($lehrveranstaltungen);
+		usort($lehrveranstaltungen, function($a, $b){
+			if($a->lehrtyp_kurzbz == "modul"){
+				return -1;
+			}
+			else if($b->lehrtyp_kurzbz == "modul"){
+				return 1;
+			}
+			return 0;
+		});
+		$lehrveranstaltungen= array_reduce($lehrveranstaltungen,function($carry, $lehrv){
+			if($lehrv->lehrtyp_kurzbz == "modul"){
+				array_push($carry, $lehrv);
+			}
+			else{
+				$parent =array_filter($carry, function($item)use($lehrv){
+					return $item->studienplan_lehrveranstaltung_id == $lehrv->studienplan_lehrveranstaltung_id_parent;
+				});
+				$parent = current($parent);
+				if($parent){
+					$parent->lehrveranstaltungen[] = $lehrv;
+				}
+			}
+			return $carry;
+		}, []);
+		return $lehrveranstaltungen;
+	}
+
 	private function computeStudiengaenge($studiensemester){
 		$studiengang_studiensemester_result = $this->StudiengangModel->getStudiengaengeByStudiensemester($studiensemester);
 		$studiengang_studiensemester_result = $this->getDataOrTerminateWithError($studiengang_studiensemester_result);
diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
index 514e34779..e248f523f 100644
--- a/public/js/components/Cis/Mylv/LvInfo.js
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -58,13 +58,13 @@ export default {
 		<table class="table table-hover mb-4">
 			<template v-if="event.type == LV_TYPES.moodle">
 				<tbody>
-					<tr>
+					<tr v-if="event?.datum">
 						<th>{{
 							$p.t('global','datum')?
 							$p.t('global','datum')+':'
 							:''
 						}}</th>
-						<td>{{methodFormatDate(event.datum)}}</td>
+						<td>{{methodFormatDate(event?.datum)}}</td>
 					</tr>
 					<tr>
 						<th>{{$p.t('global','aktivitaet')}}:</th>
@@ -100,7 +100,7 @@ export default {
 			</template>
 			<template v-else>
 				<tbody>
-					<tr>
+					<tr v-if="event?.datum">
 						<th>{{
 							$p.t('global','datum')?
 							$p.t('global','datum')+':'
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index f4ac6edfc..4e4f30aea 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -51,7 +51,7 @@ export default {
 
 			if (this.event.type == 'lehreinheit') {
 				this.$api
-					.call(ApiStundenplan.getLehreinheitStudiensemester(this.event.lehreinheit_id[0]))
+					.call(ApiStundenplan.getLehreinheitStudiensemester(Array.isArray(this.event.lehreinheit_id) ? this.event.lehreinheit_id[0] : this.event.lehreinheit_id))
 					.then(res => res.data)
 					.then(studiensemester_kurzbz => this.$api.call(
 						ApiAddons.getLvMenu(
diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index 94a012fc9..c7b92b6a7 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -1,3 +1,5 @@
+import LvModal from "../Mylv/LvModal.js";
+
 export default {
 	data(){
 		return {
@@ -9,8 +11,13 @@ export default {
 			selectedStudienordnung: null,
 			semester:[],
 			selectedSemester:null,
+			lehrveranstaltungen: [],
+			selectedLehrveranstaltung: null,
 		}
 	},
+	components:{
+		LvModal,
+	},
 	methods:{
 		changeSelectedStudienSemester(studiensemester) {
 			this.$fhcApi.factory.studium.getAllStudienSemester(studiensemester.studiensemester_kurzbz, this.selectedStudiengang, this.selectedSemester, this.selectedStudienordnung)
@@ -40,6 +47,16 @@ export default {
 					this.extractPropertyValues(res);
 				})
 		},
+		selectLehrveranstaltung(lehrveranstaltung) {
+			this.selectedLehrveranstaltung = lehrveranstaltung;
+			this.selectedLehrveranstaltung.type ="lehreinheit";
+			this.selectedLehrveranstaltung.lehreinheit_id = this.selectedLehrveranstaltung.lehrveranstaltung_id;
+			console.log(this.selectedLehrveranstaltung, "selected lehrveranstaltung")
+			Vue.nextTick(()=>{
+				this.$refs.modalContainer.show();
+			})
+			
+		},
 		/* loadStudienplan(studiengang, studiensemester){
 			this.$fhcApi.factory.studium.getStudienplaeneBySemester(studiengang, studiensemester)
 				.then(data => data.data)
@@ -63,7 +80,7 @@ export default {
 			location.hash = val;
 		},
 		extractPropertyValues(res){
-			let { studienSemester, studiengang, semester, studienplan } = res;
+			let { studienSemester, studiengang, semester, studienplan, lehrveranstaltungen } = res;
 			this.sortStudienSemester(studienSemester.all);
 			this.studienSemester = studienSemester.all;
 			this.selectedStudiensemester = studienSemester.preselected.studiensemester_kurzbz;
@@ -78,6 +95,8 @@ export default {
 			this.studienOrdnung = studienplan.all;
 			console.log(this.studienOrdnung,"studienordnung")
 			this.selectedStudienordnung = studienplan.preselected?.studienplan_id;
+
+			this.lehrveranstaltungen = lehrveranstaltungen;
 		},
 		studienordnungTitel(studienordnung){
 			if(!studienordnung) return "";
@@ -141,7 +160,9 @@ export default {
 		}
 	} */
 	template: `
-	<h2>this is a test titel</h2>
+	<div>
+	<h2>Studium</h2>
+	<hr>
 	<div class="input-group">
 		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="prevSem">
 			<i class="fa fa-caret-left" aria-hidden="true"></i>
@@ -189,6 +210,22 @@ export default {
 			<i class="fa fa-caret-right" aria-hidden="true"></i>
 		</button>
 	</div>
+
+	<hr>
+
+	<div class="d-grid" style="grid-template-columns: 1fr 1fr 1fr; gap: 1rem;">
+		<div class="card" v-for="lehrveranstaltung in lehrveranstaltungen" :key="lehrveranstaltung.lehrveranstaltung_id">
+			<div class="card-header">
+				<h5 class=" card-title">{{lehrveranstaltung.bezeichnung}}</h5>
+				<h6 class=" card-subtitle">{{lehrveranstaltung.lehrtyp_kurzbz}}</h6>
+			</div>
+			<div class="card-body">
+				<a class="d-block" href="#" v-for="lv in lehrveranstaltung.lehrveranstaltungen" @click="selectLehrveranstaltung(lv)">{{lv.bezeichnung}}</a>
+			</div>
+		</div>
+	</div>
+	<lv-modal v-if="selectedLehrveranstaltung" ref="modalContainer" :event="selectedLehrveranstaltung" title="test" >
+	</div>
 	
 	`
 };
\ No newline at end of file

From 0930866beb54582a29423eddf1c09356a9005e49 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 5 May 2025 13:55:54 +0200
Subject: [PATCH 138/572] revert change introduced by merging api refactoring
 branch

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

diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index 05fa94c2d..c45248dc8 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -128,7 +128,7 @@ export default {
 
 		loadEvents: function () {
 			Promise.allSettled([
-				this.$api.call(ApiStundenplan.getStundenplan(this.monthFirstDay, this.monthLastDay)),
+				this.$api.call(ApiStundenplan.StundenplanEvents(this.monthFirstDay, this.monthLastDay)),
 				this.$api.call(ApiStundenplan.getStundenplanReservierungen(this.monthFirstDay, this.monthLastDay))
 			]).then((result) => {
 				let promise_events = [];

From 6ab50654ba219c386ec759653998f2e3e3863acb Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 5 May 2025 16:55:06 +0200
Subject: [PATCH 139/572] add activity title to moodle calender entries, render
 activity title as html, set overscroll behavior for all day event area

---
 public/css/components/calendar.css                  | 5 +++--
 public/js/components/Cis/Mylv/LvInfo.js             | 2 +-
 public/js/components/Cis/Mylv/LvModal.js            | 2 +-
 public/js/components/Cis/Stundenplan/Stundenplan.js | 6 +++---
 public/js/components/DashboardWidget/Stundenplan.js | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index ddf35e3e7..1de5e575b 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -73,9 +73,10 @@
 	box-shadow: 1px 1px 0 #dee2e6;
 }
 
-.fhc-calendar-week-page .all-day-event{
+.fhc-calendar-week-page .all-day-event {
 	max-height: 75px;
-	overflow:auto;
+	overflow: auto;
+	overscroll-behavior: none;
 }
 
 .fhc-calendar-week-page .all-day-event-container{
diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
index 514e34779..a17eb4b67 100644
--- a/public/js/components/Cis/Mylv/LvInfo.js
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -68,7 +68,7 @@ export default {
 					</tr>
 					<tr>
 						<th>{{$p.t('global','aktivitaet')}}:</th>
-						<td>{{event?.assignment}}</td>
+						<td v-html="event?.assignment"></td>
 					</tr>
 					<tr>
 						<th>{{$p.t('global','typ')}}:</th>
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index f4ac6edfc..19c444a21 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -76,7 +76,7 @@ export default {
 	template: /*html*/ `
 	<bs-modal ref="modalContainer" @showBsModal="onModalShow" v-bind="$props" :bodyClass="''" dialogClass='modal-lg' class="bootstrap-alert" :backdrop="false" >
 		<template v-slot:title>
-			<template v-if="event?.type=='moodle'">{{event.titel}}</template>
+			<template v-if="event?.type=='moodle'"><strong v-html="event.titel"></strong></template>
 			<template v-else-if="event.titel">{{ event.titel + ' - ' + event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
 			<template v-else>{{ event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
 		</template>
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index bf646d5e4..efb8c06ea 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -288,7 +288,7 @@ const Stundenplan = {
 			<div class="p-1" v-if="event.type=='moodle'" @click="showModal(event)">
 				<div class="d-flex small w-100" >
 					<moodle-svg></moodle-svg>
-					<span class="flex-grow-1 text-center ">{{event.topic}}</span>
+					<span class="flex-grow-1 text-center "><strong v-html="event.titel"></strong> - {{event.topic}}</span>
 				</div>
 			</div>
 			<div v-else @click="showModal(event)" class="p-1">
@@ -308,7 +308,7 @@ const Stundenplan = {
 				</div>
 				<div v-if="event.type=='moodle'" class="d-flex small w-100" >
 					<moodle-svg></moodle-svg>
-					<span class="flex-grow-1 text-center">{{event.topic}}</span>
+					<span class="flex-grow-1 text-center"><strong v-html="event.titel"></strong> - {{event.topic}}</span>
 				</div>
 				<div v-else class="d-flex flex-column flex-grow-1 align-items-center small">
 					<span>{{event.topic}}</span>
@@ -322,7 +322,7 @@ const Stundenplan = {
 				<template v-if="event.type=='moodle'">
 					<div class="d-flex small align-items-center w-100 p-1" >
 						<moodle-svg></moodle-svg>
-						<span class="flex-grow-1 text-center">{{event.topic}}</span>
+						<span class="flex-grow-1 text-center"><strong v-html="event.titel"></strong> - {{event.topic}}</span>
 					</div>
 				</template>
 				<template v-else>
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/Stundenplan.js
index c45248dc8..e492f785a 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/Stundenplan.js
@@ -178,7 +178,7 @@ export default {
 				<div  v-if="event.type=='moodle'">
 					<div class="d-flex small w-100" >
 						<moodle-svg></moodle-svg>
-						<span v-contrast class="flex-grow-1 text-center ">{{event.topic}}</span>
+						<span v-contrast class="flex-grow-1 text-center "><strong v-html="event.titel"></strong> - {{event.topic}}</span>
 					</div>
 				</div>
 				<span v-else class="small" >
@@ -198,7 +198,7 @@ export default {
 							<template v-if="evt.type=='moodle'">
 								<div class="d-flex align-items-center ">
 									<moodle-svg></moodle-svg>
-									<b v-contrast class="flex-grow-1 text-center">{{evt.topic}}</b>
+									<b v-contrast class="flex-grow-1 text-center"><strong v-html="evt.titel"></strong> - {{evt.topic}}</b>
 								</div>
 							</template>
 							<template v-else>

From 05de9cd94afa1631aa7c363ca2726c75c2d0a647 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 6 May 2025 13:24:08 +0200
Subject: [PATCH 140/572] move logic processing moodle events from core to
 moodle addon

---
 .../api/frontend/v1/Stundenplan.php           | 50 ++++---------------
 1 file changed, 11 insertions(+), 39 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index f957ccff6..61a9e8f54 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -91,47 +91,19 @@ class Stundenplan extends FHCAPI_Controller
 		}
 
 		// fetching moodle events
-		$moodle_start_date = new DateTime($start_date);
-		$moodle_start_date = $moodle_start_date->getTimestamp();
-		$moodle_end_date = new DateTime($end_date);
-		$moodle_end_date = $moodle_end_date->getTimestamp();
 		$moodle_events = [];
-		Events::trigger('moodleCalendarEvents',
-						function & () use (&$moodle_events) {
-							return $moodle_events;
-						},
-						['timestart'=>$moodle_start_date,'timeend'=>$moodle_end_date, 'username'=>getAuthUID()]
+		Events::trigger(
+			'moodleCalendarEvents',
+			function & () use (&$moodle_events)
+			{
+				return $moodle_events;
+			},
+			[
+				'start_date' => $start_date,
+				'end_date' => $end_date, 
+				'username' => getAuthUID()
+			]
 		);
-		$moodle_events = array_map(function($event){
-			$moodle_event_timestart = new DateTime($event->timestart);
-			$moodle_event_timeend = new DateTime($event->timeend);
-			$convertedEvent = new stdClass();
-			$convertedEvent->type = 'moodle';
-			$convertedEvent->beginn = $moodle_event_timestart->format('H:i:s');
-			$convertedEvent->ende = $moodle_event_timeend->format('H:i:s');
-			$convertedEvent->allDayEvent = true;
-			$convertedEvent->datum = $moodle_event_timestart->format('Y-n-j');
-			$convertedEvent->purpose = $event->purpose;
-			$convertedEvent->assignment = $event->activityname;
-			$convertedEvent->topic = $event->activitystr;
-			$convertedEvent->lektor = [];
-			$convertedEvent->gruppe = [];
-			$convertedEvent->ort_kurzbz = $event->location;
-			$convertedEvent->lehreinheit_id = $event->lehreinheitsNummber ?? null;
-			$convertedEvent->titel = isset($event->course->fullname)? $event->course->fullname:null;
-			$convertedEvent->lehrfach = '';
-			$convertedEvent->lehrform = '';
-			$convertedEvent->lehrfach_bez = '';
-			$convertedEvent->organisationseinheit = '';
-			$convertedEvent->farbe = '00689E';
-			$convertedEvent->lehrveranstaltung_id = 0;
-			$convertedEvent->ort_content_id = 0;
-			$convertedEvent->url = $event->url;
-			$convertedEvent->activityIcon = isset($event->icon->iconurl)? $event->icon->iconurl:null;
-			$convertedEvent->actionname = isset($event->action->name)?$event->action->name:null;
-			$convertedEvent->overdue = !empty($event->overdue);
-			return $convertedEvent;
-		},$moodle_events);
 		
 		$result = array_merge($stundenplan_events,$moodle_events);
 		// sort array with moodle events first

From b5d3bf3f1ebb13adf538537d185a342611c11188 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 6 May 2025 13:30:06 +0200
Subject: [PATCH 141/572] update(Cis4 Studium): finilizes Studium feature

---
 .../controllers/api/frontend/v1/Studium.php   |  36 ++-
 application/libraries/StundenplanLib.php      |  37 ++-
 .../views/CisRouterView/CisRouterView.php     |   1 +
 public/css/Cis4/Cis.css                       |  19 ++
 public/css/Cis4/Studium.css                   |  60 ++++
 public/js/api/studium.js                      |   1 -
 public/js/components/Cis/Mylv/LvUebersicht.js |  28 +-
 public/js/components/Cis/Studium/Studium.js   | 267 +++++++++++-------
 8 files changed, 331 insertions(+), 118 deletions(-)
 create mode 100644 public/css/Cis4/Studium.css

diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index b14a852a6..c50915ced 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -39,6 +39,7 @@ class Studium extends FHCAPI_Controller
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 		$this->load->model('codex/Orgform_model','OrgformModel');
+		$this->load->model('person/Person_model','PersonModel');
 
 		
 	}
@@ -53,11 +54,6 @@ class Studium extends FHCAPI_Controller
 		$parameter_semester = $this->input->get('semester',true);
 		$parameter_studienplan = $this->input->get('studienplan',true);
 
-		$test1=null;
-		$test2=null;
-		$test3=null;
-		$test4=null;
-
 		if(isset($parameter_studiensemester)){
 			$parameter_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz" => $parameter_studiensemester])));
 		}
@@ -80,7 +76,6 @@ class Studium extends FHCAPI_Controller
 		if(isset($parameter_studiensemester) && !empty(array_filter($allStudienSemester, function($studiensemester) use($parameter_studiensemester){
 			return $studiensemester->studiensemester_kurzbz == $parameter_studiensemester->studiensemester_kurzbz;
 		}))){
-			$test1=true;
 			$aktuelles_studiensemester = $parameter_studiensemester;
 		}
 		
@@ -93,7 +88,6 @@ class Studium extends FHCAPI_Controller
 		if(isset($parameter_studiengang) && !empty(array_filter( $studiengaenge,function($studiengang)use($parameter_studiengang){
 			return $studiengang->studiengang_kz == $parameter_studiengang->studiengang_kz;
 		}))){
-			$test2=true;
 			$aktuelles_studiengang = $parameter_studiengang;
 		}
 		
@@ -112,14 +106,13 @@ class Studium extends FHCAPI_Controller
 			$aktuelles_semester = null;
 		}
 		if(isset($parameter_semester) && in_array($parameter_semester, $semester)){
-			$test3=true;
 			$aktuelles_semester = $parameter_semester;
 		}
 
 		$semester_studienplan = array_filter($studienplaene, function($item) use($aktuelles_semester){
 			return $item->semester == $aktuelles_semester;
 		});
-		
+
 		// fetch current studienplan based on semester
 		$aktuelles_studienplan = current($semester_studienplan);
 		if(!$aktuelles_studienplan){
@@ -128,13 +121,19 @@ class Studium extends FHCAPI_Controller
 		if(isset($parameter_studienplan) && !empty(array_filter( $semester_studienplan, function($stundenplan) use($parameter_studienplan){
 			return $stundenplan->studienplan_id == $parameter_studienplan->studienplan_id;
 		}))){
-			$test4=true;
 			$aktuelles_studienplan = $parameter_studienplan ;
 		}
 
 		// fetch studienplan lehrveranstaltungen
 		if($aktuelles_studienplan){
 			$lehrveranstaltungen = $this->computeStudienplanLehrveranstaltungen($aktuelles_studienplan->studienplan_id, $aktuelles_semester);
+			foreach($lehrveranstaltungen as $lehrv){
+				foreach($lehrv->lehrveranstaltungen as $lv){
+					$lvLektoren =$this->computeLektorenFromLehrveranstaltung($lv->lehrveranstaltung_id,$aktuelles_semester, $aktuelles_studiengang->studiengang_kz, $aktuelles_studiensemester->studiensemester_kurzbz);
+					$lv->lektoren = $lvLektoren;
+				}
+			
+			}
 			$aktuelles_lehrveranstaltungen = $lehrveranstaltungen;
 		}else{
 			$aktuelles_lehrveranstaltungen = [];
@@ -152,10 +151,6 @@ class Studium extends FHCAPI_Controller
 		$result->studienplan["all"]=$semester_studienplan;
 		$result->studienplan["preselected"]=$aktuelles_studienplan; 
 		$result->lehrveranstaltungen=$aktuelles_lehrveranstaltungen;  
-		$result->test1=$test1;
-		$result->test2=$test2; 
-		$result->test3=$test3; 
-		$result->test4=$test4; 
 		
 		/* if($this->getDataOrTerminateWithError($this->StudentModel->isStudent(getAuthUID()))){
 			$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $aktuelles_studiensemester_kz]);
@@ -224,6 +219,7 @@ class Studium extends FHCAPI_Controller
 		});
 		$lehrveranstaltungen= array_reduce($lehrveranstaltungen,function($carry, $lehrv){
 			if($lehrv->lehrtyp_kurzbz == "modul"){
+				$lehrv->lehrveranstaltungen = [];
 				array_push($carry, $lehrv);
 			}
 			else{
@@ -251,6 +247,18 @@ class Studium extends FHCAPI_Controller
 			$studienplan =current($this->getDataOrTerminateWithError($this->StudienplanModel->loadWhere(["studienplan_id"=>$studienplan_id])));
 			return $studienplan;
 	}
+
+	private function computeLektorenFromLehrveranstaltung($lehreinheit_id, $semester, $studiengang, $studiensemester){
+		$this->load->library('StundenplanLib');
+		$lektoren = $this->stundenplanlib->getLektorenFromLehrveranstaltung($lehreinheit_id,$semester, $studiengang,$studiensemester);
+		if(!$lektoren){
+			return [];
+		}
+		$lektoren = array_map(function($lektor){
+			return ["name"=>$this->getDataOrTerminateWithError($this->PersonModel->getFullName($lektor)), "email"=>$lektor."@".DOMAIN];
+		},$lektoren);
+		return $lektoren;
+	}
 	
 }
 
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index e0691ecab..b64fd226e 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -21,6 +21,8 @@ class StundenplanLib{
 		$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
 		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$this->_ci->load->model('person/Benutzergruppe_model','BenutzergruppeModel');
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		
 
 		$student_uid = getAuthUID();
 		if(is_null($student_uid))
@@ -55,7 +57,7 @@ class StundenplanLib{
 
 			// query lv itself in case its Stundenplan is being queried and it has no entries
 			$this->_ci->load->model('education/Lehrveranstaltung_model','LehrveranstaltungModel');
-			$lv_result = $this->LehrveranstaltungModel->load($lv_id);
+			$lv_result = $this->_ci->LehrveranstaltungModel->load($lv_id);
 			if(isError($lv_result))
 			{
 				return error(getData($lv_result));
@@ -143,6 +145,39 @@ class StundenplanLib{
 		return success($reservierungen);
 	}
 
+	public function getLektorenFromLehrveranstaltung($lehrveranstaltung_id, $semester, $studiengang_kz, $studiensemester_kurzbz){
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+		
+		$studiensemester = $this->_ci->StudiensemesterModel->loadWhere(["studiensemester_kurzbz"=>$studiensemester_kurzbz]);
+		if(isError($studiensemester))
+		{
+			return error(getData($studiensemester));
+		}
+		$studiensemester = current(getData($studiensemester));
+		$lektoren = $this->_ci->StundenplanModel->execReadOnlyQuery("
+		SELECT DISTINCT uid 
+		FROM campus.vw_stundenplan
+		WHERE lehrveranstaltung_id = ? AND
+		studiengang_kz = ? AND
+		semester = ? AND
+		(datum BETWEEN ? AND ?)
+		",[$lehrveranstaltung_id, $studiengang_kz, $semester, $studiensemester->start, $studiensemester->ende]);
+		
+		if(isError($lektoren))
+		{
+			return error(getData($lektoren));
+		}
+		$lektoren = getData($lektoren);
+		if(isset($lektoren)){
+			$lektoren = array_map(function($lektor){
+				return $lektor->uid;
+			},$lektoren);
+
+		}
+		return $lektoren;
+	}
 
 	public function expand_object_information($data){
 		$this->_ci =& get_instance();
diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index 231e25696..f70274f6e 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -22,6 +22,7 @@ $includesArray = array(
 		'public/css/components/Profil.css',
 		'public/css/components/FormUnderline.css',
 		'public/css/Cis4/Cms.css',
+		'public/css/Cis4/Studium.css',
 	),
 	'customJSs' => array(
 		'vendor/npm-asset/primevue/accordion/accordion.min.js',
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index aa24641f8..f3beeddec 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -59,6 +59,25 @@ html {
 	color:white;
 }
 
+/* lvMenu entry disabled style */
+[disabled="true"].menu-entry {
+	pointer-events: none;
+	cursor: default;
+	background-color: #dadada !important;
+	color: black !important;
+	-webkit-touch-callout: none;
+	/* iOS Safari */
+	-webkit-user-select: none;
+	/* Safari */
+	-khtml-user-select: none;
+	/* Konqueror HTML */
+	-moz-user-select: none;
+	/* Old versions of Firefox */
+	-ms-user-select: none;
+	/* Internet Explorer/Edge */
+	user-select: none;
+}
+
 /* buttons */
 #cis-header .btn-level-1,
 #cis-header .btn-level-1 + .btn,
diff --git a/public/css/Cis4/Studium.css b/public/css/Cis4/Studium.css
new file mode 100644
index 000000000..c0c58e1d0
--- /dev/null
+++ b/public/css/Cis4/Studium.css
@@ -0,0 +1,60 @@
+.lvUebersicht{
+	display:grid;
+	gap: 1rem;
+}
+
+@media (min-width: 992px) {
+	.lvUebersicht {
+		grid-template-columns: 1fr 1fr 1fr;
+	}
+}
+
+@media (max-width: 992px){
+	.lvUebersicht{
+		grid-template-columns: 1fr 1fr;
+	}
+}
+
+@media (max-width: 576px){
+	.lvUebersicht{
+		grid-template-columns: 1fr;
+	}
+}
+
+.lvOptions {
+	display: grid;
+	gap: 1rem;
+}
+
+.lvOptions > div {
+	flex-basis: auto;
+	flex-grow: 1;
+	flex-shrink: 1;
+
+}
+
+.lvOptions button {
+	flex-shrink: 0;
+
+}
+
+@media (min-width: 1200px) {
+	.lvOptions {
+		grid-template-columns: 1fr 1fr 1fr 1fr;
+	}
+}
+
+@media (max-width: 1200px) {
+	.lvOptions {
+		grid-template-columns: 1fr 1fr;
+	}
+}
+
+@media (max-width: 576px) {
+	.lvOptions {
+		grid-template-columns: 1fr;
+	}
+}
+
+
+
diff --git a/public/js/api/studium.js b/public/js/api/studium.js
index 1789c449d..cb59482e7 100644
--- a/public/js/api/studium.js
+++ b/public/js/api/studium.js
@@ -8,7 +8,6 @@ export default {
 	},
 
 	getAllStudienSemester: function (studiensemester=undefined, studiengang=undefined, semester=undefined, studienplan=undefined) {
-		console.log(studiensemester, studiengang, semester, studienplan)
 		return this.$fhcApi.get(
 			'/api/frontend/v1/Studium/getStudienAllSemester',
 			{studiensemester, studiengang, semester, studienplan}
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index fddf97d38..dcab9acf5 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -11,6 +11,16 @@ export default  {
             required:true,
             default:null,
         },
+		studiensemester: {
+			type: String,
+			required: false,
+			default: null,
+		},
+		titel: {
+			type: String,
+			required: false,
+			default: null,
+		},
 		// prop used to preselect a menu item and skip the grid overview
 		preselectedMenu: {
 			type: Object,
@@ -39,7 +49,7 @@ export default  {
         showModal: function(){
 			if (!this.preselectedMenu) {
                 this.$api
-                    .call(ApiAddons.getLvMenu(this.event.lehrveranstaltung_id, this.event.studiensemester_kurzbz))
+					.call(ApiAddons.getLvMenu(this.event.lehrveranstaltung_id, (this.studiensemester ?? this.event.studiensemester_kurzbz)))
                     .then(res => {
     					if (res.data) {
     						this.menu = res.data;
@@ -53,14 +63,24 @@ export default  {
     mounted(){
         this.modal = this.$refs.modalContainer;
     },
+	beforeUnmount(){
+		this.$refs.modalContainer.hide();
+	},
     template:/*html*/`
     <bs-modal :bodyClass="isMenuSelected ? '' : 'px-4 py-5'" @showBsModal="showModal" @hiddenBsModal="hiddenModal" ref="modalContainer" :dialogClass="{'modal-lg': !isMenuSelected, 'modal-fullscreen':isMenuSelected}">
-        <template #title>
-            <span v-if="event?.lehrfach_bez ">{{event?.lehrfach_bez + (event?.stg_kurzbzlang?' / ' + event?.stg_kurzbzlang:'')}}</span>
-            <span v-else>Lehrveranstaltungs Übersicht</span>
+        
+		<template #title>
+            <template v-if="titel">
+				<span>{{titel}}</span>
+			</template>
+			<template v-else>
+				<span v-if="event?.lehrfach_bez ">{{event?.lehrfach_bez + (event?.stg_kurzbzlang?' / ' + event?.stg_kurzbzlang:'')}}</span>
+				<span v-else>Lehrveranstaltungs Übersicht</span>
+			</template>
 
         </template>
         <template #default>
+			<slot name="content"></slot>
 			<lv-menu v-model:isMenuSelected="isMenuSelected" :preselectedMenu="preselectedMenu" :menu="menu" @hideModal="hide"></lv-menu>
         </template>
         
diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index c7b92b6a7..c6de3113d 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -1,4 +1,5 @@
-import LvModal from "../Mylv/LvModal.js";
+import LvUebersicht from "../Mylv/LvUebersicht.js";
+
 
 export default {
 	data(){
@@ -13,21 +14,84 @@ export default {
 			selectedSemester:null,
 			lehrveranstaltungen: [],
 			selectedLehrveranstaltung: null,
+			menu:null,
 		}
 	},
-	components:{
-		LvModal,
+	components: {
+		LvUebersicht,
+	},
+	watch:{
+		selectedStudiensemester: function(newVal, oldVal){
+			if(newVal != oldVal){
+				const studiensemester =this.getDataFromLocalStorage("sudiensemester");
+				if (!studiensemester || (studiensemester && studiensemester != newVal)){
+					this.storeDataToLocalStorage("sudiensemester", newVal);
+				}
+			}
+		},
+		selectedSemester: function (newVal, oldVal) {
+			if (newVal != oldVal) {
+				const semester = this.getDataFromLocalStorage("semester");
+				if (!semester || (semester && semester != newVal)) {
+					this.storeDataToLocalStorage("semester", newVal);
+				}
+			}
+		},
+		selectedStudiengang: function (newVal, oldVal) {
+			if (newVal != oldVal) {
+				const studiengang = this.getDataFromLocalStorage("studiengang");
+				if (!studiengang || (studiengang && studiengang != newVal)) {
+					this.storeDataToLocalStorage("studiengang", JSON.stringify(newVal));
+				}
+			}
+		},
+		selectedStudienordnung: function (newVal, oldVal) {
+			if (newVal != oldVal) {
+				const studienordnung = this.getDataFromLocalStorage("studienordnung");
+				if (!studienordnung || (studienordnung && studienordnung != newVal)) {
+					this.storeDataToLocalStorage("studienordnung", JSON.stringify(newVal));
+				}
+			}
+		},
 	},
 	methods:{
-		changeSelectedStudienSemester(studiensemester) {
-			this.$fhcApi.factory.studium.getAllStudienSemester(studiensemester.studiensemester_kurzbz, this.selectedStudiengang, this.selectedSemester, this.selectedStudienordnung)
+		changeStudiensemester(value){
+			let studiensemester = this.$refs.studiensemester;
+			studiensemester.selectedIndex = (studiensemester.selectedIndex + value + studiensemester.options.length) % studiensemester.options.length;
+			this.changeSelectedStudienSemester(studiensemester.value);
+		},
+		changeStudiengang(value) {
+			let studiengang = this.$refs.studiengaenge;
+			studiengang.selectedIndex = (studiengang.selectedIndex + value + studiengang.options.length) % studiengang.options.length;
+			this.changeSelectedStudienGang(studiengang.value);
+		},
+		changeSemester(value) {
+			let semester = this.$refs.semester;
+			semester.selectedIndex = (semester.selectedIndex + value + semester.options.length) % semester.options.length;
+			this.changeSelectedSemester(semester.value);
+		},
+		changeStudienordnung(value) {
+			let studienordnung = this.$refs.studienordnung;
+			studienordnung.selectedIndex = (studienordnung.selectedIndex + value + studienordnung.options.length) % studienordnung.options.length;
+			this.changeSelectedStudienPlan(studienordnung.value);
+		},
+		
+		storeDataToLocalStorage(key,value){
+			localStorage.setItem(key, value);
+		},
+		getDataFromLocalStorage(key){
+			const value = localStorage.getItem(key);
+			return value;
+		},
+		changeSelectedStudienSemester(studiensemester_kurzbz) {
+			this.$fhcApi.factory.studium.getAllStudienSemester(studiensemester_kurzbz, this.selectedStudiengang, this.selectedSemester, this.selectedStudienordnung)
 				.then(data => data.data)
 				.then(res => {
 					this.extractPropertyValues(res);
 				})
 		},
-		changeSelectedStudienGang(studiengang) {
-			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, studiengang.studiengang_kz, this.selectedSemester, this.selectedStudienordnung)
+		changeSelectedStudienGang(studiengang_kz) {
+			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, studiengang_kz, this.selectedSemester, this.selectedStudienordnung)
 				.then(data => data.data)
 				.then(res => {
 					this.extractPropertyValues(res);
@@ -40,30 +104,24 @@ export default {
 					this.extractPropertyValues(res);
 				})
 		},
-		changeSelectedStudienPlan(studienplan) {
-			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, this.selectedSemester, studienplan.studienplan_id)
+		changeSelectedStudienPlan(studienplan_id) {
+			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, this.selectedSemester, studienplan_id)
 				.then(data => data.data)
 				.then(res => {
 					this.extractPropertyValues(res);
 				})
 		},
-		selectLehrveranstaltung(lehrveranstaltung) {
+		openLvUebersicht(lehrveranstaltung) {
 			this.selectedLehrveranstaltung = lehrveranstaltung;
+			//convert lehrveranstaltung properties for compatibility with Stundenplan LvModal
 			this.selectedLehrveranstaltung.type ="lehreinheit";
 			this.selectedLehrveranstaltung.lehreinheit_id = this.selectedLehrveranstaltung.lehrveranstaltung_id;
-			console.log(this.selectedLehrveranstaltung, "selected lehrveranstaltung")
-			Vue.nextTick(()=>{
-				this.$refs.modalContainer.show();
-			})
+			if(this.selectedLehrveranstaltung)
+				Vue.nextTick(()=>{
+					this.$refs.lvUebersicht.show();
+				})
 			
 		},
-		/* loadStudienplan(studiengang, studiensemester){
-			this.$fhcApi.factory.studium.getStudienplaeneBySemester(studiengang, studiensemester)
-				.then(data => data.data)
-				.then(res => {
-					console.log("This is the result", res)
-				})
-		}, */
 		sortStudienSemester(studienSemester){
 			let regex = new RegExp(/^(WS|SS)([0-9]{4})/);
 			studienSemester.sort((sem1,sem2)=>{
@@ -91,9 +149,7 @@ export default {
 			this.semester = semester.all;
 			this.selectedSemester = semester?.preselected;
 
-			console.log(studienplan.all,"all studienplan")
 			this.studienOrdnung = studienplan.all;
-			console.log(this.studienOrdnung,"studienordnung")
 			this.selectedStudienordnung = studienplan.preselected?.studienplan_id;
 
 			this.lehrveranstaltungen = lehrveranstaltungen;
@@ -122,108 +178,123 @@ export default {
 	},
 
 	computed:{
-		
+		selectedLehrveranstaltungTitel(){
+			const studiengang = this.studiengaenge.find((studiengang) => studiengang.studiengang_kz == this.selectedStudiengang);
+			return `${this.selectedLehrveranstaltung?.bezeichnung} ${this.selectedLehrveranstaltung?.lehrform_kurzbz} / ${studiengang.kurzbzlang}-${this.selectedSemester} ${this.selectedLehrveranstaltung?.orgform_kurzbz} (${this.selectedStudiensemester})`;
+		},
 	},
 	
 	created(){
-		this.$fhcApi.factory.studium.getAllStudienSemester()
+
+		const studiensemester = this.getDataFromLocalStorage("sudiensemester") ?? undefined;
+		const studiengang = JSON.parse(this.getDataFromLocalStorage("studiengang")) ?? undefined;
+		const semester = this.getDataFromLocalStorage("semester") ?? undefined;
+		const studienordnung = JSON.parse(this.getDataFromLocalStorage("studienordnung")) ?? undefined;
+
+		// only fetch default data if no data is stored in the local storage
+		
+		this.$fhcApi.factory.studium.getAllStudienSemester(studiensemester, studiengang, semester, studienordnung)
 		.then(data => data.data)
 		.then(res => {
 			this.	extractPropertyValues(res);
 		})
+
 	},
-	/* selectedStudiensemester(newStudiensemester, oldStudiensemester) {
-		if (newStudiensemester !== oldStudiensemester) {
-			this.$fhcApi.factory.studium.getAllStudienSemester(newStudiensemester, this.selectedStudiengang, this.selectedSemester)
-				.then(data => data.data)
-				.then(res => {
-					this.extractPropertyValues(res);
-				})
-		}
-	},
-	selectedStudiengang(newStudiengang, oldStudiengang) {
-		if (newStudiengang !== oldStudiengang) {
-			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, newStudiengang, this.selectedSemester)
-				.then(data => data.data)
-				.then(res => {
-					this.extractPropertyValues(res);
-				})
-		}
-	},
-	selectedSemester(newSemester, oldSemester) {
-		if (newSemester !== oldSemester) {
-			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, newSemester)
-				.then(data => data.data)
-				.then(res => {
-					this.extractPropertyValues(res);
-				})
-		}
-	} */
 	template: `
 	<div>
 	<h2>Studium</h2>
 	<hr>
-	<div class="input-group">
-		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="prevSem">
-			<i class="fa fa-caret-left" aria-hidden="true"></i>
-		</button>
-		<select ref="studiensemester" v-model="selectedStudiensemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
-			<option v-for="semester in studienSemester" @click="changeSelectedStudienSemester(semester)" :key="semester" :value="semester.studiensemester_kurzbz">{{studiensemesterTitel(semester.studiensemester_kurzbz)	}}</option>
-		</select>
-		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="nextSem">
-			<i class="fa fa-caret-right" aria-hidden="true"></i>
-		</button>
-	</div>
+	<lv-uebersicht ref="lvUebersicht" :titel="selectedLehrveranstaltungTitel" :event="selectedLehrveranstaltung" :studiensemester="selectedStudiensemester" v-if="selectedLehrveranstaltung">
+		<template #content>
+			<div v-if="Array.isArray(selectedLehrveranstaltung.lektoren) && selectedLehrveranstaltung.lektoren.length>0" class="mb-4">
+				<h4>Lektoren:</h4>
+				<a :href="'mailto:'+lektor?.email" class="mx-2" v-for="lektor in selectedLehrveranstaltung.lektoren">{{lektor.name}}</a>
+			</div>
+		</template>
+	</lv-uebersicht>
+	<div class="lvOptions">
+		<div>
+		<h6>Studiensemester:</h6>
+		<div class="input-group">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(-1)">
+				<i class="fa fa-caret-left" aria-hidden="true"></i>
+			</button>
+			<select ref="studiensemester" v-model="selectedStudiensemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+				<option v-for="semester in studienSemester" @click="changeSelectedStudienSemester(semester.studiensemester_kurzbz)" :key="semester" :value="semester.studiensemester_kurzbz">{{studiensemesterTitel(semester.studiensemester_kurzbz)	}}</option>
+			</select>
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(1)">
+				<i class="fa fa-caret-right" aria-hidden="true"></i>
+			</button>
+		</div>
+		</div>
 
-	<div class="input-group">
-		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="prevSem">
-			<i class="fa fa-caret-left" aria-hidden="true"></i>
-		</button>
-		<select ref="studiengaenge" v-model="selectedStudiengang" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
-			<option v-for="studiengang in studiengaenge" @click="changeSelectedStudienGang(studiengang)" :key="studiengang.studiengang_kz" :value="studiengang.studiengang_kz" >{{studiengangTitel(studiengang)}}</option>
-		</select>
-		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="nextSem">
-			<i class="fa fa-caret-right" aria-hidden="true"></i>
-		</button>
-	</div>
+		<div>
+		<h6>Studiengang:</h6>
+		<div class="input-group">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(-1)">
+				<i class="fa fa-caret-left" aria-hidden="true"></i>
+			</button>
+			<select ref="studiengaenge" v-model="selectedStudiengang" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+				<option v-for="studiengang in studiengaenge" @click="changeSelectedStudienGang(studiengang.studiengang_kz)" :key="studiengang.studiengang_kz" :value="studiengang.studiengang_kz" >{{studiengangTitel(studiengang)}}</option>
+			</select>
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(1)">
+				<i class="fa fa-caret-right" aria-hidden="true"></i>
+			</button>
+		</div>
+		</div>
 
-	<div class="input-group">
-		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="prevSem">
-			<i class="fa fa-caret-left" aria-hidden="true"></i>
-		</button>
-		<select ref="semester" v-model="selectedSemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
-			<option v-for="sem in semester" @click="changeSelectedSemester(sem)" :key="semester" :value="sem">{{sem}}. Semester</option>
-		</select>
-		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="nextSem">
-			<i class="fa fa-caret-right" aria-hidden="true"></i>
-		</button>
-	</div>
+		<div>
+		<h6>Semester:</h6>
+		<div class="input-group">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(-1)">
+				<i class="fa fa-caret-left" aria-hidden="true"></i>
+			</button>
+			<select ref="semester" v-model="selectedSemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+				<option v-for="sem in semester" @click="changeSelectedSemester(sem)" :key="semester" :value="sem">{{sem}}. Semester</option>
+			</select>
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(1)">
+				<i class="fa fa-caret-right" aria-hidden="true"></i>
+			</button>
+		</div>
+		</div>
 
-	<div class="input-group">
-		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="prevSem">
-			<i class="fa fa-caret-left" aria-hidden="true"></i>
-		</button>
-		<select ref="studienordnung" v-model="selectedStudienordnung" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
-			<option v-for="ordnung in studienOrdnung" @click="changeSelectedStudienPlan(ordnung)" :key="ordnung.bezeichnung	" :value="ordnung.studienplan_id">{{studienordnungTitel(ordnung)}}</option>
-		</select>
-		<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="nextSem">
-			<i class="fa fa-caret-right" aria-hidden="true"></i>
-		</button>
+		<div>
+		<h6>Studienordnung:</h6>
+		<div class="input-group">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(-1)">
+				<i class="fa fa-caret-left" aria-hidden="true"></i>
+			</button>
+			<select ref="studienordnung" v-model="selectedStudienordnung" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
+				<option v-for="ordnung in studienOrdnung" @click="changeSelectedStudienPlan(ordnung.studienplan_id)" :key="ordnung.bezeichnung	" :value="ordnung.studienplan_id">{{studienordnungTitel(ordnung)}}</option>
+			</select>
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(1)">
+				<i class="fa fa-caret-right" aria-hidden="true"></i>
+			</button>
+		</div>
+		</div>
 	</div>
 
 	<hr>
 
-	<div class="d-grid" style="grid-template-columns: 1fr 1fr 1fr; gap: 1rem;">
-		<div class="card" v-for="lehrveranstaltung in lehrveranstaltungen" :key="lehrveranstaltung.lehrveranstaltung_id">
+	<div class="lvUebersicht" >
+	<template v-for="lehrveranstaltung in lehrveranstaltungen" :key="lehrveranstaltung.lehrveranstaltung_id">
+		<div  class="card" v-if="Array.isArray(lehrveranstaltung.lehrveranstaltungen) && lehrveranstaltung.lehrveranstaltungen.length >0" >
 			<div class="card-header">
 				<h5 class=" card-title">{{lehrveranstaltung.bezeichnung}}</h5>
 				<h6 class=" card-subtitle">{{lehrveranstaltung.lehrtyp_kurzbz}}</h6>
 			</div>
 			<div class="card-body">
-				<a class="d-block" href="#" v-for="lv in lehrveranstaltung.lehrveranstaltungen" @click="selectLehrveranstaltung(lv)">{{lv.bezeichnung}}</a>
+				<ul class="list-group list-group-flush">
+					<li class="list-group-item" v-for="lv in lehrveranstaltung.lehrveranstaltungen">
+						<a class="d-block" href="#" @click="openLvUebersicht(lv)">{{lv.bezeichnung}}</a>
+					</li>	
+				</ul>
 			</div>
 		</div>
+	</template>
 	</div>
+
+
 	<lv-modal v-if="selectedLehrveranstaltung" ref="modalContainer" :event="selectedLehrveranstaltung" title="test" >
 	</div>
 	

From 7d095b499899ad8baf0fc54f8b2743a6beaee0b7 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 7 May 2025 11:03:12 +0200
Subject: [PATCH 142/572] feature(Studium LvModal): checks whether the lv has
 stundenplan entries and disables menu option if not/ checks the lvevaluierung
 information and adds it to the lvmodal information

---
 .../controllers/api/frontend/v1/Studium.php   | 14 ++++++++
 .../api/frontend/v1/Stundenplan.php           | 19 ++++++++---
 public/js/api/studium.js                      | 15 ++++++++
 public/js/components/Cis/Mylv/LvMenu.js       |  8 +++++
 public/js/components/Cis/Mylv/LvUebersicht.js | 34 ++++++++++++++++---
 public/js/components/Cis/Studium/Studium.js   | 14 ++++++--
 6 files changed, 93 insertions(+), 11 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index c50915ced..ecaf72918 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -17,6 +17,9 @@
  */
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use CI3_Events as Events;
+
 class Studium extends FHCAPI_Controller
 {
 	
@@ -29,6 +32,7 @@ class Studium extends FHCAPI_Controller
 			'getStudienAllSemester'=> self::PERM_LOGGED,
 			'getStudiengaengeForStudienSemester'=> self::PERM_LOGGED,
 			'getStudienplaeneBySemester'=> self::PERM_LOGGED,
+			'getLvEvaluierungInfo'=> self::PERM_LOGGED,
 		]);
 
 		$this->load->model('crm/Student_model', 'StudentModel');
@@ -173,6 +177,14 @@ class Studium extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
+	public function getLvEvaluierungInfo($studiensemester_kurzbz, $lehrveranstaltung_id){
+		$result = [];
+		Events::trigger('lvEvaluierungsInfo', function & () use (&$result) {
+			return $result;
+		},$lehrveranstaltung_id, $studiensemester_kurzbz);
+		$this->terminateWithSuccess($result);
+	}
+
 	public function getStudiengaengeForStudienSemester($studiensemester){
 		$studiengaenge = $this->computeStudiengaenge($studiensemester);
 		$this->terminateWithSuccess($studiengaenge);
@@ -259,6 +271,8 @@ class Studium extends FHCAPI_Controller
 		},$lektoren);
 		return $lektoren;
 	}
+
+	
 	
 }
 
diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index f957ccff6..4e1ed5778 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -36,6 +36,7 @@ class Stundenplan extends FHCAPI_Controller
 			'StundenplanEvents' => self::PERM_LOGGED,
 			'getLehreinheitStudiensemester' => self::PERM_LOGGED,
 			'studiensemesterDateInterval' => self::PERM_LOGGED,
+			'getLvStundenplanForStudiensemester' => self::PERM_LOGGED,
 		]);
 
         $this->load->library('LogLib');
@@ -85,11 +86,6 @@ class Stundenplan extends FHCAPI_Controller
 		{
 			$stundenplan_events = array();
 		}
-		else
-		{
-			$stundenplan_events = $this->getDataOrTerminateWithError($stundenplan_events);
-		}
-
 		// fetching moodle events
 		$moodle_start_date = new DateTime($start_date);
 		$moodle_start_date = $moodle_start_date->getTimestamp();
@@ -154,6 +150,19 @@ class Stundenplan extends FHCAPI_Controller
 		$studiensemester =current($this->getDataOrTerminateWithError($studiensemester));
 		$this->terminateWithSuccess($studiensemester);
 	}
+
+	public function getLvStundenplanForStudiensemester($studiensemester,$lvid){
+		$this->load->library('StundenplanLib');
+		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+		
+		$studiensemester_result = $this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz"=>$studiensemester]);
+		$studiensemester_result = current($this->getDataOrTerminateWithError($studiensemester_result));
+		$timespan_start = new DateTime($studiensemester_result->start);
+		$timespan_ende = new DateTime($studiensemester_result->ende);
+		$stundenplan = $this->stundenplanlib->getStundenplan(date_format($timespan_start, 'Y-m-d'),date_format($timespan_ende, 'Y-m-d'), $lvid);
+		$this->terminateWithSuccess($stundenplan);
+		
+	}
 		
 
     /**
diff --git a/public/js/api/studium.js b/public/js/api/studium.js
index cb59482e7..92bb58698 100644
--- a/public/js/api/studium.js
+++ b/public/js/api/studium.js
@@ -29,4 +29,19 @@ export default {
 			}
 		);
 	},
+	getLvStundenplanForStudiensemester: function (studiensemester, lvid) {
+		return this.$fhcApi.get(
+			`/api/frontend/v1/Stundenplan/getLvStundenplanForStudiensemester/${studiensemester}/${lvid}`,
+			{
+			}
+		);
+	},
+	getLvEvaluierungInfo: function (studiensemester_kurzbz, lvid) {
+		return this.$fhcApi.get(
+			`/api/frontend/v1/Studium/getLvEvaluierungInfo/${studiensemester_kurzbz}/${lvid}`,
+			{
+			}
+		);
+	},
+	
 }
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index fc6a3a723..6c2577793 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -7,6 +7,11 @@ export default {
 		},
 		containerStyles: Array,
 		rowStyles: Array,
+		hasLvStundenplanEintraege: {
+			required:false,
+			default:true,
+			type:Boolean,
+		},
 	},
 	data(){
 		return{
@@ -18,6 +23,9 @@ export default {
 			if (!this.c4_link(menuItem) && !menuItem.c4_moodle_links?.length) {
 				return true;
 			}
+			if (menuItem.id == "addon_fhtw_menu_lvplan_lva" && !this.hasLvStundenplanEintraege){
+				return true;
+			}
 			return null;
 		},
 		c4_target: function (menuItem) {
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index dcab9acf5..e5162730c 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -33,7 +33,8 @@ export default  {
             result: false,
             menu: [],
 			isMenuSelected:false,
-            
+			hasLvStundenplanEintraege: true,
+			lvEvaluierungMessage: "",
         }
     },
     mixins:[BsModal],
@@ -41,6 +42,7 @@ export default  {
         BsModal,
 		LvMenu,
     },
+	inject: ["studium_studiensemester"],
     methods:{
         
         hiddenModal: function(){
@@ -58,9 +60,32 @@ export default  {
 			} else {
 				this.isMenuSelected = true;
 			}
+
+			// check lv evaluierung info
+			if (this.studium_studiensemester) {
+				this.$fhcApi.factory.studium.getLvEvaluierungInfo(this.studium_studiensemester, this.event.lehreinheit_id ?? this.event.lehrveranstaltung_id)
+					.then(data => data.data)
+					.then(res => {
+						this.lvEvaluierungMessage = res.message;
+					})
+			}
+
+			// check if the lv has stundenplan entries for this studiensemester
+			if (this.studiensemester && this.event) {
+				return this.$fhcApi.factory.studium.getLvStundenplanForStudiensemester(this.studiensemester, this.event.lehreinheit_id ?? this.event.lehrveranstaltung_id)
+					.then(data => data.data)
+					.then(res => {
+						if (Array.isArray(res) && res.length > 0) {
+							this.hasLvStundenplanEintraege = true;
+						} else {
+							this.hasLvStundenplanEintraege = false;
+						}
+					});
+			}
+			
         },
     },
-    mounted(){
+	mounted(){
         this.modal = this.$refs.modalContainer;
     },
 	beforeUnmount(){
@@ -68,7 +93,7 @@ export default  {
 	},
     template:/*html*/`
     <bs-modal :bodyClass="isMenuSelected ? '' : 'px-4 py-5'" @showBsModal="showModal" @hiddenBsModal="hiddenModal" ref="modalContainer" :dialogClass="{'modal-lg': !isMenuSelected, 'modal-fullscreen':isMenuSelected}">
-        
+
 		<template #title>
             <template v-if="titel">
 				<span>{{titel}}</span>
@@ -80,8 +105,9 @@ export default  {
 
         </template>
         <template #default>
+			<div class="mb-4" v-if="lvEvaluierungMessage" v-html="lvEvaluierungMessage"></div>
 			<slot name="content"></slot>
-			<lv-menu v-model:isMenuSelected="isMenuSelected" :preselectedMenu="preselectedMenu" :menu="menu" @hideModal="hide"></lv-menu>
+			<lv-menu v-model:isMenuSelected="isMenuSelected" :hasLvStundenplanEintraege="hasLvStundenplanEintraege" :preselectedMenu="preselectedMenu" :menu="menu" @hideModal="hide"></lv-menu>
         </template>
         
     </bs-modal>
diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index c6de3113d..30d21ed1b 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -17,6 +17,15 @@ export default {
 			menu:null,
 		}
 	},
+	provide(){
+		return {
+			studium_studiengang : Vue.computed(()=> this.selectedStudiengang),
+			studium_studiensemester: Vue.computed(() => this.selectedStudiensemester),
+			studium_semester: Vue.computed(() => this.selectedSemester),
+			studium_studienordnung: Vue.computed(() => this.selectedStudienordnung),
+
+		}
+	},
 	components: {
 		LvUebersicht,
 	},
@@ -116,10 +125,11 @@ export default {
 			//convert lehrveranstaltung properties for compatibility with Stundenplan LvModal
 			this.selectedLehrveranstaltung.type ="lehreinheit";
 			this.selectedLehrveranstaltung.lehreinheit_id = this.selectedLehrveranstaltung.lehrveranstaltung_id;
-			if(this.selectedLehrveranstaltung)
+			if(this.selectedLehrveranstaltung){
 				Vue.nextTick(()=>{
 					this.$refs.lvUebersicht.show();
 				})
+			}
 			
 		},
 		sortStudienSemester(studienSemester){
@@ -196,7 +206,7 @@ export default {
 		this.$fhcApi.factory.studium.getAllStudienSemester(studiensemester, studiengang, semester, studienordnung)
 		.then(data => data.data)
 		.then(res => {
-			this.	extractPropertyValues(res);
+			this.extractPropertyValues(res);
 		})
 
 	},

From b62c063a437c3b30eb0919a45a3ef6aadf7f8fde Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 7 May 2025 11:14:59 +0200
Subject: [PATCH 143/572] refactor(Searchbar Localstorage): adds the origin of
 the searchbar to the searchbaroptions and uses it for the localStorage keys

---
 public/js/apps/Cis.js                       |  1 +
 public/js/components/searchbar/searchbar.js | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index b62592ebd..ac17038b5 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -12,6 +12,7 @@ const app = Vue.createApp({
     data: function() {
         return {
             searchbaroptions: {
+				origin: "cis",
 				cssclass: "",
 				calcheightonly: true,
                 types: [
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 7b28c8bea..0bcd4e893 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -84,11 +84,10 @@ export default {
     `,
     watch:{
 		'searchsettings.searchstr': function (newSearchValue, oldSearchValue) {
-			sessionStorage.setItem('searchstr',newSearchValue);
+			sessionStorage.setItem(`${this.searchoptions.origin}_searchstr`,newSearchValue);
 		},
     },
 	computed:{
-		
 		search_types_string(){
 			if (Array.isArray(this.searchsettings.types) && this.searchsettings.types.length > 0){
 				return this.searchsettings.types.join(' / ');
@@ -105,7 +104,7 @@ export default {
 			}
 			// stores the search types in the localstorage, only if the newValue is also an array
 			if(Array.isArray(newValue)){
-				localStorage.setItem('searchtypes', JSON.stringify(newValue));
+				localStorage.setItem(`${this.searchoptions.origin}_searchtypes`, JSON.stringify(newValue));
 			}
 			this.search();
 		});
@@ -125,8 +124,8 @@ export default {
     methods: {
 		getSearchTypes: function () {
 			let result = this.allSearchTypes();
-			if (localStorage.getItem('searchtypes')) {
-				result = JSON.parse(localStorage.getItem('searchtypes'));
+			if (localStorage.getItem(`${this.searchoptions.origin}_searchtypes`)) {
+				result = JSON.parse(`${this.searchoptions.origin}_searchtypes`);
 			}
 			return result;
 		},
@@ -138,7 +137,7 @@ export default {
 			return allTypes;
 		},
 		getSearchStr: function(){
-			return sessionStorage.getItem('searchstr') ?? '';
+			return sessionStorage.getItem(`${this.searchoptions.origin}_searchstr`) ?? '';
 		},
 		checkSettingsVisibility: function(event) {
 			// hides the settings collapsible if the user clicks somewhere else

From 9d4568e15eea009573960a8edb56bc2c79f57f4f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 8 May 2025 09:58:08 +0200
Subject: [PATCH 144/572] client side placementtest handling, filtering
 Dropdowns placementtests, Phrases, show future Placementtests, open
 Reihungstestverwaltung

---
 .../api/frontend/v1/stv/Aufnahmetermine.php   | 209 ++++++++++-
 application/models/crm/Reihungstest_model.php | 222 ++++++++++--
 .../models/person/Benutzergruppe_model.php    |  12 +
 application/models/testtool/Ablauf_model.php  |  27 ++
 application/views/Studentenverwaltung.php     |   5 +-
 public/js/api/factory/stv/admissionDates.js   |  41 ++-
 .../js/components/Stv/Studentenverwaltung.js  |   5 +-
 .../Details/Aufnahmetermine.js                |   2 +-
 .../Aufnahmetermine/Aufnahmetermine.js        | 338 +++++++++++++-----
 .../Aufnahmetermine/HeaderReihungstest.js     | 145 +++++++-
 rdf/reihungstest.rdf.php                      |   5 +
 system/phrasesupdate.php                      | 280 +++++++++++++++
 12 files changed, 1157 insertions(+), 134 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
index 6b0356bc3..538626789 100644
--- a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
+++ b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
@@ -14,9 +14,13 @@ class Aufnahmetermine extends FHCAPI_Controller
 			'insertAufnahmetermin' => ['admin:rw', 'assistenz:rw'],
 			'updateAufnahmetermin' => ['admin:rw', 'assistenz:rw'],
 			'deleteAufnahmetermin' => ['admin:rw', 'assistenz:rw'],
-			'getListPlacementTests' => ['admin:rw', 'assistenz:rw'],
-			'getListStudyPlans' => ['admin:rw', 'assistenz:rw'],
-
+			'getListPlacementTests' => ['admin:r', 'assistenz:r'],
+			'getListStudyPlans' => ['admin:r', 'assistenz:r'],
+			'loadDataRtPrestudent' => ['admin:r', 'assistenz:r'],
+			'insertOrUpdateDataRtPrestudent' => ['admin:r', 'assistenz:r'],
+			'loadAufnahmegruppen' => ['admin:r', 'assistenz:r'],
+			'getResultReihungstest' => ['admin:r', 'assistenz:r'],
+			'getZukuenftigeReihungstestStg' => ['admin:r', 'assistenz:r'],
 		]);
 
 		// Load Libraries
@@ -169,7 +173,8 @@ class Aufnahmetermine extends FHCAPI_Controller
 				'punkte' => $_POST['punkte'],
 				'insertamum' => date('c'),
 				'insertvon' => $authUID,
-		]);
+			]
+		);
 
 		$data = $this->getDataOrTerminateWithError($result);
 
@@ -186,9 +191,53 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	public function getListPlacementTests()
+	public function getListPlacementTests($prestudent_id)
 	{
-		$result = $this->ReihungstestModel->getAllReihungstests();
+		if(!$prestudent_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+		}
+
+		//get studienplan array
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+
+		$this->PrestudentstatusModel->addSelect('*');
+		$this->PrestudentstatusModel->addSelect('sp.studienplan_id');
+
+		$this->PrestudentstatusModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+
+		$result = $this->PrestudentstatusModel->loadWhere(
+			array(
+				'prestudent_id' => $prestudent_id,
+				'status_kurzbz' => 'Interessent'
+			)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$studienplan_arr = [];
+		$include_ids = [];
+		foreach ($data as $item)
+		{
+			if($item->studienplan_id != null)
+				$studienplan_arr[] = $item->studienplan_id;
+		}
+
+		//get Placementtests Person
+		$person_id = $this->_getPersonId($prestudent_id);
+		$resultRt = $this->ReihungstestModel->getReihungstestPerson($person_id);
+
+		$dataRt = $this->getDataOrTerminateWithError($resultRt);
+
+		foreach ($dataRt as $item)
+		{
+			if(!in_array($item->studienplan_id, $studienplan_arr))
+				$studienplan_arr[] = $item->studienplan_id;
+			if(!in_array($item->rt_id, $include_ids) && ($item->rt_id != null))
+				$include_ids[] = $item->rt_id;
+		}
+
+		$result = $this->ReihungstestModel->getReihungstestByStudyPlanAndIds($studienplan_arr, $include_ids);
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
@@ -196,12 +245,156 @@ class Aufnahmetermine extends FHCAPI_Controller
 
 	public function getListStudyPlans($person_id)
 	{
-		$this->load->model('organisation/Studienplan_model','StudienplanModel');
+		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
 
-		$result = $this->StudienplanModel->getStudienplaeneForPerson($person_id);;
+		$result = $this->StudienplanModel->getStudienplaeneForPerson($person_id);
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
 	}
 
+	public function loadDataRtPrestudent($prestudent_id)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$this->PrestudentModel->addSelect(["reihungstestangetreten"]);
+		$this->PrestudentModel->addSelect(["rt_gesamtpunkte"]);
+		$this->PrestudentModel->addSelect(["aufnahmegruppe_kurzbz"]);
+		$result = $this->PrestudentModel->loadWhere(
+			array('prestudent_id' => $prestudent_id)
+		);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function insertOrUpdateDataRtPrestudent()
+	{
+		$this->load->library('form_validation');
+		$authUID = getAuthUID();
+
+		$formData = $this->input->post('formData');
+		$prestudent_id = $this->input->post('prestudent_id');
+
+		if(!$prestudent_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+		}
+		$_POST['rt_gesamtpunkte'] =
+			(isset($formData['rt_gesamtpunkte']) && !empty($formData['rt_gesamtpunkte']))
+				? $formData['rt_gesamtpunkte']
+				: null;
+		$_POST['reihungstestangetreten'] =
+			(isset($formData['reihungstestangetreten']) && !empty($formData['reihungstestangetreten']))
+				? $formData['reihungstestangetreten']
+				: null;
+		$_POST['aufnahmegruppe_kurzbz'] =
+			(isset($formData['aufnahmegruppe_kurzbz']) && !empty($formData['aufnahmegruppe_kurzbz']))
+				? $formData['aufnahmegruppe_kurzbz']
+				: null;
+
+		$this->form_validation->set_rules('rt_gesamtpunkte', 'Rt_gesamtpunkte', 'numeric', [
+			'required' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Rt_gesamtpunkte'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+
+		$result = $this->PrestudentModel->update(
+			[
+				'prestudent_id' => $prestudent_id,
+			],
+			[
+				'reihungstestangetreten' => $_POST['reihungstestangetreten'],
+				'rt_gesamtpunkte' => $_POST['rt_gesamtpunkte'],
+				'aufnahmegruppe_kurzbz' => $_POST['aufnahmegruppe_kurzbz'],
+				'updateamum' => date('c'),
+				'updatevon' => $authUID,
+			]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function loadAufnahmegruppen()
+	{
+		$uid = $this->input->get('uid');
+		$studiensemester_kurzbz = $this->input->get('studiensemester_kurzbz');
+
+		$this->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
+
+		$result = $this->BenutzergruppeModel->loadAufnahmegruppen($uid, $studiensemester_kurzbz);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(($data));
+	}
+
+	public function getResultReihungstest()
+	{
+		$person_id = $this->input->get('person_id');
+		$punkte = $this->input->get('punkte');
+		$reihungstest_id = $this->input->get('reihungstest_id');
+
+		if(!$reihungstest_id)
+		{
+			$this->terminateWithSuccess(null);
+		}
+
+		//for gewichtung
+		$studiengang_kz = $this->input->get('studiengang_kz');
+
+		$this->load->model('testtool/Ablauf_model', 'AblaufModel');
+		$result = $this->AblaufModel->getAblaufGebieteAndGewichte($studiengang_kz);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$weightedArray = [];
+		foreach ($data as $abl)
+		{
+			$weightedArray[$abl->gebiet_id] = $abl->gewicht;
+		}
+
+		$result = $this->ReihungstestModel->getReihungstestErgebnisPerson($person_id, $punkte, $reihungstest_id, $weightedArray);
+
+/*		if (isError($result))
+		{
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}*/
+
+		$this->terminateWithSuccess($result);
+	}
+
+	public function getZukuenftigeReihungstestStg()
+	{
+		$studiengang_kz = $this->input->get('studiengang_kz');
+		if(!$studiengang_kz)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Studiengang_kz']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->ReihungstestModel->getZukuenftigeReihungstestStg($studiengang_kz);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	private function _getPersonId($prestudent_id)
+	{
+		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$result = $this->PrestudentModel->loadWhere(
+			['prestudent_id' => $prestudent_id]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$person = current($data);
+
+		return $person->person_id;
+	}
 }
diff --git a/application/models/crm/Reihungstest_model.php b/application/models/crm/Reihungstest_model.php
index 2eb08ee86..a685b01cd 100644
--- a/application/models/crm/Reihungstest_model.php
+++ b/application/models/crm/Reihungstest_model.php
@@ -530,14 +530,15 @@ class Reihungstest_model extends DB_Model
 			  tbl_reihungstest.max_teilnehmer,
 			  tbl_reihungstest.oeffentlich,
 			  tbl_reihungstest.freigeschaltet,
-			  tbl_reihungstest.studiensemester_kurzbz,
+			  tbl_reihungstest.studiensemester_kurzbz as studiensemester,
 			  tbl_reihungstest.stufe,
 			  tbl_reihungstest.anmeldefrist,
 			  tbl_reihungstest.aufnahmegruppe_kurzbz,
 			  tbl_studiengang.typ,
 			  UPPER(typ::varchar(1) || kurzbz) AS stg_kuerzel,
 			  so.studiengangbezeichnung,
-				  so.studiengangbezeichnung_englisch
+			  so.studiengangbezeichnung_englisch,
+			  so.studiengangkurzbzlang
 			FROM
 			  public.tbl_rt_person
 			JOIN public.tbl_reihungstest ON (rt_id=reihungstest_id)
@@ -552,35 +553,208 @@ class Reihungstest_model extends DB_Model
 	}
 
 	/**
-	 * Loads all placement tests
-	 * @return array Returns object array with data of placement tests
+	 * Calculates Result of Placement Test for a given Person and given placementtest
+	 * and with taking account of weighting per area
+	 *
+	 * @param $person_id ID of Person
+	 * @param $punkte if true result is points else result is percentage of sum
+	 * @param $reihungstest_id ID of Placementtest
+	 * @param $weightedArray array of weighting per area (gewicht per gebiet_id)
+	 * @return float result
 	 */
-	//TODO(Manu) finish Details
-	public function getAllReihungstests()
+	public function getReihungstestErgebnisPerson($person_id, $punkte, $reihungstest_id, $weightedArray = null)
 	{
-		$query = '
-			SELECT * FROM public.tbl_reihungstest
-			JOIN public.tbl_studiengang ON tbl_reihungstest.studiengang_kz = tbl_studiengang.studiengang_kz
-		--	JOIN lehre.tbl_studienplan sp USING(studienplan_id)
-		--	JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
-			ORDER BY datum DESC NULLS LAST, uhrzeit
-		';
+		$parametersArray = array($reihungstest_id);
 
-		return $this->execQuery($query);
+		$qry =  "
+				SELECT DISTINCT ON (vw_auswertung_ablauf.gebiet_id) gebiet_id,
+					vw_auswertung_ablauf.*,
+					tbl_studiengang.typ
+				FROM
+					testtool.vw_auswertung_ablauf
+				JOIN
+					public.tbl_studiengang USING (studiengang_kz)
+				WHERE
+					reihungstest_id = ? ";
+
+		//using prestudent Status to avoid to get the sum of more than 1 placement tests
+		$qry .= "
+				AND prestudent_id = (
+					SELECT
+						prestudent_id
+					FROM
+						public.tbl_rt_person
+					JOIN
+						public.tbl_prestudent USING(person_id)
+					JOIN
+						public.tbl_prestudentstatus USING (prestudent_id, studienplan_id)
+					JOIN
+						tbl_reihungstest ON (
+							tbl_rt_person.rt_id = tbl_reihungstest.reihungstest_id
+						)
+					WHERE
+						tbl_rt_person.person_id = ?
+					AND
+						tbl_rt_person.rt_id = ?
+					AND
+						tbl_prestudentstatus.status_kurzbz = 'Interessent'
+					AND
+						tbl_prestudentstatus.studiensemester_kurzbz = tbl_reihungstest.studiensemester_kurzbz
+					ORDER BY tbl_reihungstest.datum DESC, tbl_prestudent.priorisierung ASC LIMIT 1
+				)
+		";
+		array_push($parametersArray, $person_id);
+		array_push($parametersArray, $reihungstest_id);
+
+		$resultRtPerson = $this->execQuery($qry, $parametersArray);
+
+		$ergebnis = 0;
+		$summeGewicht = 0;
+
+		foreach ($resultRtPerson->retval as $row)
+		{
+			$prozent = 0;
+			if($row->punkte>=$row->maxpunkte)
+			{
+				$prozent = 100;
+				$row->punkte = $row->maxpunkte;
+			}
+			else
+				$prozent = (($row->punkte + $row->offsetpunkte)/($row->maxpunkte + $row->offsetpunkte))*100;
+
+			if($punkte == 'true')
+			{
+				if($row->punkte)
+				{
+					$ergebnis += $row->punkte;
+				}
+			}
+			else
+			{
+				if ($row->punkte)
+				{
+					$gew = isset($weightedArray[$row->gebiet_id]) ? $weightedArray[$row->gebiet_id] : 1;
+					$ergebnis += $prozent * $gew;
+					$summeGewicht += $gew;
+				}
+			}
+		}
+		$return = $summeGewicht > 0
+					? number_format($ergebnis/$summeGewicht, 4, '.', '')
+					: number_format($ergebnis, 4, '.', '');
+
+		return $return;
 	}
 
-	public function getReihungstestsPs($prestudent_id)
+	/**
+	 * returns Reihungstests for given studyplans and include_ids
+	 *
+	 * @param Array $studienplan_arr array of studienplaene
+	 * @param Array $include_ids array of include_ids
+	 * @return Array List of Reihungstests
+	 */
+	public function getReihungstestByStudyPlanAndIds($studienplan_arr, $include_ids = null)
 	{
-		$query = '
-			SELECT * FROM public.tbl_reihungstest
-			JOIN public.tbl_studiengang ON tbl_reihungstest.studiengang_kz = tbl_studiengang.studiengang_kz
-			JOIN lehre.tbl_studienplan sp USING(studienplan_id)
-			JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
-			 ORDER BY datum DESC, uhrzeit
-		';
+		$studienplan_ids_string = implode(',', $studienplan_arr);
+		$studienplan_arr = explode(',', $studienplan_ids_string);
 
-		return $this->execQuery($query);
+		$parametersArray = array($studienplan_arr);
+
+		$qry = "
+				SELECT
+					distinct a.*,
+					CASE EXTRACT(DOW FROM a.datum)
+						WHEN 0 THEN 'So'
+						WHEN 1 THEN 'Mo'
+						WHEN 2 THEN 'Di'
+						WHEN 3 THEN 'Mi'
+						WHEN 4 THEN 'Do'
+						WHEN 5 THEN 'Fr'
+						WHEN 6 THEN 'Sa'
+					  END AS wochentag,
+				    sg.kurzbzlang as stg,
+					(
+						SELECT count(*) FROM public.tbl_rt_person
+						WHERE rt_id = a.reihungstest_id
+					) as angemeldete_teilnehmer
+				FROM
+					public.tbl_reihungstest a
+					JOIN public.tbl_rt_studienplan USING(reihungstest_id)
+					JOIN public.tbl_studiengang sg USING(studiengang_kz)
+				WHERE studienplan_id IN ?";
+
+		if($include_ids && is_array($include_ids) && count($include_ids) > 0)
+		{
+			$include_ids_string = implode(',', $include_ids);
+			$include_ids = explode(',', $include_ids_string);
+
+			array_push($parametersArray, $include_ids);
+
+			$qry .= "OR reihungstest_id in ?";
+		}
+		$qry .= "ORDER BY a.datum DESC";
+
+		return $this->execQuery($qry, $parametersArray);
 	}
+	/**
+	 * returns Reihungstests for given studyplans and include_ids
+	 *
+	 * @param Integer $studiengang_kz
+	 * @param $include_id optional (here null)
+	 * @return Array List of Reihungstests
+	 */
+	public function getZukuenftigeReihungstestStg($studiengang_kz, $include_id = null)
+	{
+		$parametersArray = array($studiengang_kz, $studiengang_kz, $include_id);
 
+		$qry = "
+					SELECT *,
+					CASE EXTRACT(DOW FROM a.datum)
+						WHEN 0 THEN 'So'
+						WHEN 1 THEN 'Mo'
+						WHEN 2 THEN 'Di'
+						WHEN 3 THEN 'Mi'
+						WHEN 4 THEN 'Do'
+						WHEN 5 THEN 'Fr'
+						WHEN 6 THEN 'Sa'
+					  END AS wochentag,
+			(
+				SELECT count(*) FROM public.tbl_prestudent
+				WHERE reihungstest_id=a.reihungstest_id
+			) as angemeldete_teilnehmer
+		FROM
+			(
+			SELECT *, '1' as sortierung,
+				(
+					SELECT upper(typ || kurzbz) FROM public.tbl_studiengang
+					WHERE studiengang_kz=tbl_reihungstest.studiengang_kz
+				) as stg
+			FROM
+				public.tbl_reihungstest
+			WHERE
+				datum>=now()-'1 days'::interval AND studiengang_kz=?
+			UNION
+			SELECT *, '2' as sortierung,
+				(
+					SELECT upper(typ || kurzbz) FROM public.tbl_studiengang
+					WHERE studiengang_kz=tbl_reihungstest.studiengang_kz
+				) as stg
+			FROM
+				public.tbl_reihungstest
+			WHERE datum>=now()-'1 days'::interval AND studiengang_kz!=?
+			UNION
+			SELECT *, '0' as sortierung,
+				(
+					SELECT upper(typ || kurzbz) FROM public.tbl_studiengang
+					WHERE studiengang_kz=tbl_reihungstest.studiengang_kz
+				) as stg
+			FROM
+				public.tbl_reihungstest
+			WHERE reihungstest_id=?
+			ORDER BY sortierung, stg, datum
+					) a
+			";
 
-}
\ No newline at end of file
+		return $this->execQuery($qry, $parametersArray);
+	}
+}
diff --git a/application/models/person/Benutzergruppe_model.php b/application/models/person/Benutzergruppe_model.php
index fba797641..271402ffe 100644
--- a/application/models/person/Benutzergruppe_model.php
+++ b/application/models/person/Benutzergruppe_model.php
@@ -33,4 +33,16 @@ class Benutzergruppe_model extends DB_Model
 		$uids = (hasData($res)) ? getData($res) : array();
 		return $uids;
 	}
+
+	/**
+	 * Laedt die Aufnahmegruppe(n) in Abhängigkeit von User und Studiensemester
+	 * @param uid, gruppe_kurzbz, studiensemester_kurzbz
+	 * @return array
+	 */
+	public function loadAufnahmegruppen($uid, $stsem)
+	{
+		$query = "
+				SELECT * FROM tbl_gruppe WHERE aufnahmegruppe=true;";
+		return $this->execReadOnlyQuery($query);
+	}
 }
diff --git a/application/models/testtool/Ablauf_model.php b/application/models/testtool/Ablauf_model.php
index 748926658..d6d6ebe74 100644
--- a/application/models/testtool/Ablauf_model.php
+++ b/application/models/testtool/Ablauf_model.php
@@ -11,4 +11,31 @@ class Ablauf_model extends DB_Model
 		$this->dbTable = 'testtool.tbl_ablauf';
 		$this->pk = 'ablauf_id';
 	}
+
+	/**
+	 * Returns Weighting of the respective ranking test areas
+	 * @param $studiengang_kz Studiengang_kz
+	 * @param $semester Integer optional
+	 * @return array of weightings per ranking test areas of given studiengang
+	 */
+	public function getAblaufGebieteAndGewichte($studiengang_kz, $semester = null)
+	{
+		$parametersArray = array($studiengang_kz);
+
+		$qry =  "
+				SELECT
+				tbl_ablauf.gebiet_id, tbl_ablauf.gewicht
+				FROM
+					testtool.tbl_ablauf
+				WHERE
+					tbl_ablauf.studiengang_kz= ?";
+
+		if($semester)
+		{
+			$qry .= " AND semester = ?";
+			array_push($parametersArray, $semester);
+
+		}
+		return $this->execQuery($qry, $parametersArray);
+	}
 }
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index c10dc475a..8e4c523d6 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -37,7 +37,10 @@ $configArray = [
 	//replaced by possibility to hide each formular field via config stv.php
 	#'showZgvDoktor' => !defined('ZGV_DOKTOR_ANZEIGEN') ? false : ZGV_DOKTOR_ANZEIGEN,
 	#'showZgvErfuellt' => !defined('ZGV_ERFUELLT_ANZEIGEN') ? false : ZGV_ERFUELLT_ANZEIGEN
-	'showHintKommPrfg' => !defined('FAS_STUDSTATUS_SHOW_KOMM_PRFG_HINT') ? false : FAS_STUDSTATUS_SHOW_KOMM_PRFG_HINT
+	'showHintKommPrfg' => !defined('FAS_STUDSTATUS_SHOW_KOMM_PRFG_HINT') ? false : FAS_STUDSTATUS_SHOW_KOMM_PRFG_HINT,
+	'showAufnahmegruppen' => !defined('FAS_REIHUNGSTEST_AUFNAHMEGRUPPEN') ? false : FAS_REIHUNGSTEST_AUFNAHMEGRUPPEN,
+	'allowUebernahmePunkte' => !defined('FAS_REIHUNGSTEST_PUNKTEUEBERNAHME') ? true : FAS_REIHUNGSTEST_PUNKTEUEBERNAHME,
+	'useReihungstestPunkte' => !defined('FAS_REIHUNGSTEST_PUNKTE') ? true : FAS_REIHUNGSTEST_PUNKTE,
 ];
 ?>
 
diff --git a/public/js/api/factory/stv/admissionDates.js b/public/js/api/factory/stv/admissionDates.js
index a5b0697da..a6d743276 100644
--- a/public/js/api/factory/stv/admissionDates.js
+++ b/public/js/api/factory/stv/admissionDates.js
@@ -22,10 +22,10 @@ export default {
 			url: 'api/frontend/v1/stv/aufnahmetermine/getAufnahmetermine/' + person_id,
 		};
 	},
-	getListPlacementTests(){
+	getListPlacementTests(prestudent_id){
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/aufnahmetermine/getListPlacementTests/',
+			url: 'api/frontend/v1/stv/aufnahmetermine/getListPlacementTests/' + prestudent_id,
 		};
 	},
 	getListStudyPlans(person_id){
@@ -59,6 +59,41 @@ export default {
 			method: 'post',
 			url: 'api/frontend/v1/stv/aufnahmetermine/deleteAufnahmetermin/' + rt_person_id
 		};
-	}
+	},
+	loadDataRtPrestudent(prestudent_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/aufnahmetermine/loadDataRtPrestudent/' + prestudent_id,
+		};
+	},
+	saveDataRtPrestudent(params){
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/aufnahmetermine/insertOrUpdateDataRtPrestudent/',
+			params
+		};
+	},
+	loadAufnahmegruppen(params){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/aufnahmetermine/loadAufnahmegruppen/',
+			params
+		};
+	},
+	getResultReihungstest(params){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/aufnahmetermine/getResultReihungstest/',
+			params
+		};
+	},
+	loadFutureReihungstests(params){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/aufnahmetermine/getZukuenftigeReihungstestStg/',
+			params
+		};
+	},
+
 
 }
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 248cfd55c..36340a767 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -65,7 +65,10 @@ export default {
 			defaultSemester: this.defaultSemester,
 			$reloadList: () => {
 				this.$refs.stvList.reload();
-			}
+			},
+			configShowAufnahmegruppen: this.config.showAufnahmegruppen,
+			configAllowUebernahmePunkte: this.config.allowUebernahmePunkte,
+			configUseReihungstestPunkte: this.config.useReihungstestPunkte
 		}
 	},
 	data() {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine.js
index 4ad8c6002..53ae524e0 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine.js
@@ -20,7 +20,7 @@ export default {
 	},
 	template: `
 	<div class="stv-details-mobility h-30 d-flex flex-column">
-		<header-placement></header-placement>
+		<header-placement :student="modelValue"></header-placement>
 		<admission-dates ref="tbl_admission_dates" :student="modelValue"></admission-dates>
 	</div>`
 };
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index 5fe32e885..cf8a47dd3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -14,10 +14,22 @@ export default {
 		FormInput
 	},
 	inject: {
+		allowUebernahmePunkte: {
+			from: 'configAllowUebernahmePunkte',
+			default: true
+		},
+		//if true use punkte, false: use percentage
+		useReihungstestPunkte: {
+			from: 'configUseReihungstestPunkte',
+			default: true
+		},
 		$reloadList: {
 			from: '$reloadList',
 			required: true
 		},
+		cisRoot: {
+			from: 'cisRoot'
+		},
 	},
 	props: {
 		student: Object
@@ -31,9 +43,9 @@ export default {
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
-					{title: "rt_id", field: "rt_id"},
-					{title: "rt_person_id", field: "rt_person_id"},
-					{title: "person_id", field: "person_id"},
+					{title: "rt_id", field: "rt_id", visible: false},
+					{title: "rt_person_id", field: "rt_person_id", visible: false},
+					{title: "person_id", field: "person_id", visible: false},
 					{title: "datum", field: "datum",
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
@@ -48,7 +60,7 @@ export default {
 						}
 					},
 					{title: "stufe", field: "stufe"},
-					{title: "studiensemester", field: "studiensemester_kurzbz"},
+					{title: "studiensemester", field: "studiensemester"},
 					{title: "anmerkung", field: "anmerkung", visible: false},
 					{title: "anmeldedatum", field: "anmeldedatum", visible: false,
 						formatter: function (cell) {
@@ -64,11 +76,20 @@ export default {
 						}
 					},
 					{title: "punkte", field: "punkte"},
-					{title: "teilgenommen", field: "teilgenommen"},
+					{
+						title: "teilgenommen", field: "teilgenommen",
+						formatter: "tickCross",
+						hozAlign: "center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
+						}
+					},
 					{title: "ort", field: "ort", visible: false},
 					{title: "studienplan", field: "studienplan", visible: false},
 					{title: "studienplan_id", field: "studienplan_id", visible: false},
-					{title: "stg_kuerzel", field: "stg_kuerzel"},
+					{title: "stg", field: "studiengangkurzbzlang"},
+					{title: "Stg", field: "stg_kuerzel"},
 					{
 						title: 'Aktionen', field: 'actions',
 						minWidth: 150, // Ensures Action-buttons will be always fully displayed
@@ -106,21 +127,77 @@ export default {
 				index: 'aufnahmetermin_id',
 				persistenceID: 'stv-details-table_admission-dates'
 			},
-			tabulatorEvents: [],
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async () => {
+						await this.$p.loadCategory(['admission', 'global', 'person', 'ui', 'projektarbeitsbeurteilung']);
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						cm.getColumnByField('rt_id').component.updateDefinition({
+							title: this.$p.t('ui', 'reihungstest_id')
+						});
+						cm.getColumnByField('rt_person_id').component.updateDefinition({
+							title: this.$p.t('ui', 'reihungstest_person_id')
+						});
+						cm.getColumnByField('person_id').component.updateDefinition({
+							title: this.$p.t('person', 'person_id')
+						});
+						cm.getColumnByField('datum').component.updateDefinition({
+							title: this.$p.t('global', 'datum')
+						});
+						cm.getColumnByField('stufe').component.updateDefinition({
+							title: this.$p.t('admission', 'stufe')
+						});
+						cm.getColumnByField('studiensemester').component.updateDefinition({
+							title: this.$p.t('lehre', 'studiensemester')
+						});
+						cm.getColumnByField('anmerkung').component.updateDefinition({
+							title: this.$p.t('global', 'anmerkung')
+						});
+						cm.getColumnByField('anmeldedatum').component.updateDefinition({
+							title: this.$p.t('admission', 'anmeldedatum')
+						});
+						cm.getColumnByField('punkte').component.updateDefinition({
+							title: this.$p.t('exam', 'punkte')
+						});
+						cm.getColumnByField('teilgenommen').component.updateDefinition({
+							title: this.$p.t('admission', 'teilgenommen')
+						});
+						cm.getColumnByField('ort').component.updateDefinition({
+							title: this.$p.t('person', 'ort')
+						});
+						cm.getColumnByField('studienplan').component.updateDefinition({
+							title: this.$p.t('lehre', 'studienplan')
+						});
+						cm.getColumnByField('studienplan_id').component.updateDefinition({
+							title: this.$p.t('ui', 'studienplan_id')
+						});
+						cm.getColumnByField('studiengangkurzbzlang').component.updateDefinition({
+							title: this.$p.t('projektarbeitsbeurteilung', 'studiengang')
+						});
+						cm.getColumnByField('stg_kuerzel').component.updateDefinition({
+							title: this.$p.t('admission', 'stg_kurz')
+						});
+					}
+				}
+			],
 			formData: {},
 			statusNew: true,
 			listPlacementTests: [],
-			listStudyPlans: []
+			listStudyPlans: [],
+			filterOnlyFutureTestsSet: false,
+			filteredPlacementTests: []
 		}
 	},
 	methods: {
 		actionNewPlacementTest() {
 			this.resetForm();
 			this.statusNew = true;
+			this.formData.anmeldedatum = new Date();
 			this.$refs.placementTestModal.show();
 		},
 		actionEditPlacementTest(rt_person_id) {
-			console.log("edit Test " + rt_person_id);
 			this.resetForm();
 			this.statusNew = false;
 			this.loadPlacementTest(rt_person_id);
@@ -159,7 +236,6 @@ export default {
 			this.$refs.table.reloadTable();
 		},
 		loadPlacementTest(rt_person_id) {
-			console.log("load Test " + rt_person_id);
 			return this.$api
 				.call(ApiStvAdmissionDates.loadPlacementTest(rt_person_id))
 				.then(result => {
@@ -185,7 +261,6 @@ export default {
 				});
 		},
 		deletePlacementTest(rt_person_id) {
-			console.log("delete Test" + rt_person_id);
 			return this.$api
 				.call(ApiStvAdmissionDates.deletePlacementTest(rt_person_id))
 				.then(response => {
@@ -196,30 +271,72 @@ export default {
 					this.reload();
 				});
 		},
-		resetForm() {
-			console.log("resetForm");
-			this.formData = {};
-			/*
+		getResultReihungstest(reihungstest_id){
+			const paramsRt = {
+				reihungstest_id: reihungstest_id,
+				person_id: this.student.person_id,
+				punkte: this.useReihungstestPunkte,
+				studiengang_kz: this.student.studiengang_kz
+			};
 
-			this.formData.von = new Date();
-			this.formData.bis = new Date();
-			this.formData.mobilitaetsprogramm_code = 7;
-			this.formData.nation_code = 'A';
-			this.formData.herkunftsland_code = 'A';
-			this.formData.rt_id = null;
-			this.formData.localPurposes = [];
-			this.formData.localSupports = [];
-			this.formData.lehrveranstaltung_id = '',
-				this.formData.lehreinheit_id = '',
-				this.statusNew = true;
-			this.listLes = [];*/
+			return this.$api
+				.call(ApiStvAdmissionDates.getResultReihungstest(paramsRt))
+				.then(response => {
+					this.formData.punkte = response.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		loadFutureReihungstests(){
+			const arrayReihungstestIds = this.listPlacementTests.map(item => item.reihungstest_id);
+			const paramsRt = {
+				studiengang_kz: this.student.studiengang_kz,
+				arrayReihungstestIds : arrayReihungstestIds
+			};
+
+			return this.$api
+				.call(ApiStvAdmissionDates.loadFutureReihungstests(paramsRt))
+				.then(response => {
+					this.filteredPlacementTests = response.data;
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'filterOnlyFutureActive'));
+					this.$refs.filterButton.className = 'btn btn-secondary w-100';
+					this.$refs.filterButton.title = this.$p.t('ui', 'alleAnzeigen');
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		toggleFilter(){
+			this.filterOnlyFutureTestsSet = !this.filterOnlyFutureTestsSet;
+
+			if(this.filterOnlyFutureTestsSet) {
+				this.loadFutureReihungstests();
+			}
+			else
+			{
+				this.filteredPlacementTests = this.listPlacementTests;
+				this.$refs.filterButton.className = 'btn btn-outline-secondary w-100';
+				this.$refs.filterButton.title = this.$p.t('admission', 'loadZukuenftigeRT');}
+		},
+		openAdministrationPlacementTest(reihungstest_id){
+			let link = this.cisRoot + 'vilesci/stammdaten/reihungstestverwaltung.php';
+			if(reihungstest_id){
+				link += '?reihungstest_id=' + reihungstest_id;
+			}
+			window.open(link, '_blank');
+		},
+		resetForm() {
+			this.formData = {};
 		},
 	},
 	created() {
 		this.$api
-			.call(ApiStvAdmissionDates.getListPlacementTests())
+			.call(ApiStvAdmissionDates.getListPlacementTests(this.student.prestudent_id))
 			.then(result => {
-				this.listPlacementTests = result.data;
+				this.listPlacementTests = this.filteredPlacementTests = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
@@ -232,7 +349,7 @@ export default {
 	},
 	template: `
 	<div class="stv-details-admission-table h-100 pb-3">
-		<h4>Allgemein</h4>
+		<h4>{{$p.t('admission', 'allgemein')}}</h4>
 		
 		<core-filter-cmpt
 			ref="table"
@@ -247,14 +364,8 @@ export default {
 			>
 		</core-filter-cmpt>
 		
-		{{formData}}
-		
-<!--		{{student}}-->
-		
-<!--		{{listPlacementTests}}-->
-		
 		<!--Modal: placementTestModal-->
-		<bs-modal ref="placementTestModal" dialog-class="modal-dialog-scrollable">
+		<bs-modal ref="placementTestModal" dialog-class="modal-dialog-scrollable modal-lg">		
 			<template #title>
 				<p v-if="statusNew" class="fw-bold mt-3">{{$p.t('admission', 'admission_new')}}</p>
 				<p v-else class="fw-bold mt-3">{{$p.t('admission', 'admission_edit')}}</p>
@@ -262,43 +373,72 @@ export default {
 
 
 			<form-form ref="formPlacementTest" @submit.prevent>
-
-				<div class="row mb-3">
-					<form-input
-						container-class="stv-details-admission-placementtest"
-						:label="$p.t('lehre', 'reihungstest')"
-						type="select"
-						v-model="formData.rt_id"
-						name="reihungstest_id"
-						>
-						<option value=""> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
-						<option
-							v-for="test in listPlacementTests"
-							:key="test.reihungstest_id"
-							:value="test.reihungstest_id"
+			
+				<div class="row mb-3 g-2">
+					<div class="col-10">
+						<form-input
+							container-class="stv-details-admission-placementtest"
+							:label="$p.t('lehre', 'reihungstest')"
+							type="select"
+							v-model="formData.rt_id"
+							name="reihungstest_id"
 							>
-							{{test.reihungstest_id}} {{test.studiensemester_kurzbz}} St.{{test.stufe}} {{test.kurzbzlang}} {{test.datum}} {{test.uhrzeit}}
-							{{test.anmerkung}} (x/{{test.max_teilnehmer}}) {{test.rt_id}}
-						</option>
-					</form-input>
+							<option value=""> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
+							<option
+								v-for="test in filteredPlacementTests"
+								:key="test.reihungstest_id"
+								:value="test.reihungstest_id"
+								>
+								{{test.studiensemester_kurzbz}} St.{{test.stufe}} {{test.stg}} {{test.datum}} {{test.uhrzeit}}
+								{{test.anmerkung}} <span v-if="test.max_teilnehmer">({{test.angemeldete_teilnehmer}}/{{test.max_teilnehmer}})</span>
+								<span v-if="test.datum">({{test.wochentag}})</span>
+							</option>
+						</form-input>			
+					</div>
+					
+					<div class="col-1">
+						<label class="form-label" style="color:transparent;">filter</label>
+						<button 
+							class="btn btn-outline-secondary w-100"
+							ref="filterButton"
+							@click="toggleFilter" 
+							:title="$p.t('admission', 'loadZukuenftigeRT')"
+							>
+								<i class="fa fa-filter"></i>
+							</button>
+					</div>						
+					<div class="col-1">
+						<label class="form-label" style="color:transparent;">edit</label>
+						<button 
+							class="btn btn-outline-secondary w-100" 
+							@click="openAdministrationPlacementTest(formData.rt_id)" 
+							:title="$p.t('admission', 'headerRTVerwaltung')"
+							>
+							<i class="fa fa-edit"></i>
+						</button>
+					</div>	
+								
 				</div>
 				
 				<div class="row mb-3">
-					<form-input
-						container-class="stv-details-admission-anmeldedatum"
-						:label="$p.t('admission', 'anmeldundRtAm')"
-						type="DatePicker"
-						v-model="formData.anmeldedatum"
-						auto-apply
-						:enable-time-picker="false"
-						format="dd.MM.yyyy"
-						name="anmeldedatum"
-						:teleport="true"
-						>
-					</form-input>
-				</div>				
+					<div class="col-7">
+						<form-input
+							container-class="stv-details-admission-anmeldedatum"
+							:label="$p.t('admission', 'anmeldundRtAm')"
+							type="DatePicker"
+							v-model="formData.anmeldedatum"
+							auto-apply
+							:enable-time-picker="false"
+							format="dd.MM.yyyy"
+							name="anmeldedatum"
+							:teleport="true"
+							>
+						</form-input>
+					</div>
+				</div>		
 				
 				<div class="row mb-3">
+					<div class="mt-2">
 						<form-input
 							container-class="stv-details-admission-teilgenommen"
 							type="checkbox"
@@ -307,41 +447,49 @@ export default {
 							v-model="formData.teilgenommen"
 						>
 						</form-input>
+					</div>
 				</div>
 				
 				<div class="row mb-3">
-					<form-input
-						container-class="stv-details-admission-studyplan"
-						:label="$p.t('lehre', 'studienplan')"
-						type="select"
-						v-model="formData.studienplan_id"
-						name="studienplan_id"
-						>
-						<option value=""> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
-						<option
-							v-for="stplan in listStudyPlans"
-							:key="stplan.studienplan_id"
-							:value="stplan.studienplan_id"
+					<div class="col-7">
+						<form-input
+							container-class="stv-details-admission-studyplan"
+							:label="$p.t('lehre', 'studienplan')"
+							type="select"
+							v-model="formData.studienplan_id"
+							name="studienplan_id"
 							>
-							{{stplan.bezeichnung}}
-						</option>
-					</form-input>
+							<option value=""> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
+							<option
+								v-for="stplan in listStudyPlans"
+								:key="stplan.studienplan_id"
+								:value="stplan.studienplan_id"
+								>
+								{{stplan.bezeichnung}}
+							</option>
+						</form-input>
+					</div>
 				</div>				
 				
 				<div class="row mb-3">
-					<form-input
-						container-class="stv-details-admission-points"
-						:label="$p.t('exam', 'punkte')"
-						type="text"
-						v-model="formData.punkte"
-						name="punkte"
-						>
-					</form-input>	
-				</div>
-				
-				<!--TODO(Manu) Reihungstestergebnis holen-->
-				
+					<div class="col-3">
+						<form-input
+							container-class="stv-details-admission-points"
+							:label="$p.t('exam', 'punkte')"
+							type="text"
+							v-model="formData.punkte"
+							name="punkte"
+							>
+						</form-input>
+						
+					</div>
 				
+					<div v-if="allowUebernahmePunkte" class="col-4">
+						<label class="form-label" style="color:transparent;">getPunkte</label>
+						<button class="btn btn-outline-secondary w-100" @click="getResultReihungstest(formData.rt_id)">{{ $p.t('admission', 'getRTErgebnis') }}</button>
+					</div>
+
+				</div>				
 		</form-form>
 		
 		<template #footer>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js
index 529979b3c..fcda41f34 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js
@@ -1,13 +1,156 @@
+import FormForm from "../../../../Form/Form.js";
+import FormInput from "../../../../Form/Input.js";
+import ApiStvAdmissionDates from '../../../../../api/factory/stv/admissionDates';
+
 export default {
 	name: 'HeaderPlacement',
+	components: {
+		FormForm,
+		FormInput
+	},
+	inject: {
+		showAufnahmegruppen: {
+			from: 'configShowAufnahmegruppen',
+			default: false
+		},
+		currentSemester: {
+			from: 'currentSemester',
+		},
+	},
+	props: {
+		student: Object
+	},
 	data(){
 		return {
 			statusNew: true,
+			formData: {
+				aufnahmegruppe_kurzbz: null
+			},
+			listAufnahmetermine: [],
+			listAufnahmegruppen: []
+		}
+	},
+	methods: {
+		saveDataRt(prestudent_id) {
+			const dataToSend = {
+				prestudent_id: prestudent_id,
+				formData: this.formData
+			};
+			return this.$api
+				.call(ApiStvAdmissionDates.saveDataRtPrestudent(dataToSend))
+				.then(result => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		calculateTotalPoints() {
+			return this.$api
+				.call(ApiStvAdmissionDates.getAufnahmetermine(this.student.person_id))
+				.then(result => {
+					this.listAufnahmetermine = result.data;
+
+					const listAufnahmetermineFiltered = this.listAufnahmetermine
+						.filter(item => item.studiengangkurzbzlang == this.student.studiengang)
+						.sort((a, b) => this.parseSemester(b.studiensemester) - this.parseSemester(a.studiensemester));
+					const elementSemYoungest = listAufnahmetermineFiltered[0];
+
+					this.formData.rt_gesamtpunkte = elementSemYoungest.punkte;
+
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		parseSemester(semester) {
+			const type = semester.slice(0, 2).toUpperCase(); // "WS" or "SS"
+			const year = parseInt(semester.slice(2), 10);
+
+			// WS > SS
+			return year * 10 + (type === 'SS' ? 1 : 2);
+		}
+	},
+	created(){
+		this.$api
+			.call(ApiStvAdmissionDates.loadDataRtPrestudent(this.student.prestudent_id))
+			.then(result => {
+				this.formData = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		if(this.showAufnahmegruppen)
+		{
+			const paramsGroup = {
+				uid: this.student.uid,
+				semester: this.currentSemester
+			};
+			this.$api
+				.call(ApiStvAdmissionDates.loadAufnahmegruppen(paramsGroup))
+				.then(result => {
+					this.listAufnahmegruppen = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
 		}
 	},
 	template: `
 		<div class="stv-details-admission-header-placement h-100 pb-3">
-			<h4>Studiengang</h4>
+			<h4>{{ $p.t('lehre', 'studiengang') }}</h4>
+						
+			<form-form class="mt-3" ref="formRtGesamtData" @submit.prevent>
+				<div v-if="showAufnahmegruppen" class="row mb-3">
+					<div class="col-1">
+						<label>{{ $p.t('lehre', 'gruppe') }}</label>		
+					</div>
+					<div class="col-3">
+						<form-input
+							container-class="stv-details-admission-header-placement-aufnahmegruppe"
+							type="select"
+							name="aufnahmegruppe_kurzbz"
+							v-model="formData.aufnahmegruppe_kurzbz"
+						>
+						<option value=null> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
+						<option
+							v-for="gruppe in listAufnahmegruppen"
+							:key="gruppe.gruppe_kurzbz"
+							:value="gruppe.gruppe_kurzbz"
+							>
+							{{gruppe.bezeichnung}} - {{gruppe.gruppe_kurzbz}}
+						</option>
+						
+						</form-input>
+					</div>
+				</div>
+				
+				<div class="row mb-3">
+
+					<div class="col-3">
+						<form-input
+							container-class="form-check stv-details-admission-header-placement-rtangetreten"
+							type="checkbox"
+							name="reihungstestangetreten"
+							:label="$p.t('admission','rtAbsolviert')"
+							v-model="formData.reihungstestangetreten"
+						>
+						</form-input>	
+					</div>
+					<div class="col-2">
+						<label>{{ $p.t('admission', 'gesamtpunkte') }}</label>		
+					</div>
+					<div class="col-2">
+						<form-input
+							container-class="stv-details-admission-header-placement-gesamtpunkte"
+							type="text"
+							name="rt_gesamtpunkte"
+							v-model="formData.rt_gesamtpunkte"
+						>
+						</form-input>
+					</div>
+					<div class="col-1">
+						<button class="btn btn-outline-primary" @click="saveDataRt(student.prestudent_id)"> {{$p.t('ui', 'speichern')}}</button>		
+					</div>
+					<div class="col-3">
+						<button class="btn btn-outline-primary" @click="calculateTotalPoints"> {{$p.t('admission', 'gesamtpunkteBerechnen')}}</button>			
+					</div>
+							
+				</div>
+			</form-form>
 		
 		</div>
 	`
diff --git a/rdf/reihungstest.rdf.php b/rdf/reihungstest.rdf.php
index cb4ebf8dc..15860d025 100644
--- a/rdf/reihungstest.rdf.php
+++ b/rdf/reihungstest.rdf.php
@@ -73,18 +73,23 @@ $rt = new reihungstest();
 
 if(isset($_GET['include_id']) && isset($_GET['studiengang_kz']))
 {
+	error_log("in zweig get zukuenfigte");
 	$include_id=$_GET['include_id'];
+	error_log("include_Id:" . $include_id);
 	$studiengang_kz=$_GET['studiengang_kz'];
+	error_log(" stg_kz: " . $studiengang_kz);
 	$rt->getZukuenftige($include_id, $studiengang_kz);
 }
 elseif(isset($_GET['prestudent_id']))
 {
 	$include_ids=array();
+	error_log("prestudent");
 	$prestudent = new prestudent();
 	$prestudent->getPrestudentRolle($_GET['prestudent_id'], 'Interessent');
 	$studienplan_arr = array();
 	foreach($prestudent->result as $row)
 	{
+		error_log( $row->studienplan_id);
 		$studienplan_arr[] = $row->studienplan_id;
 	}
 
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 66fd48a8b..2dc464259 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41536,6 +41536,286 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'rtAbsolviert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Reihungstestverfahren absolviert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Placement test procedure completed',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'gesamtpunkte',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gesamtpunkte',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Total Points',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'gesamtpunkteBerechnen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gesamtpunkte berechnen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Calculate total points',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'allgemein',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Allgemein',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Generally',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'headerRTVerwaltung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zur Reihungstestverwaltung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Administration Placement Test',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'loadZukuenftigeRT',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nur zukünftige Reihungstests laden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Show future placement tests only',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'getRTErgebnis',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Reihungstestergebnis holen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Get placement test result',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'filterOnlyFutureActive',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Filter \'Nur zukünftige Reihungstest anzeigen\' aktiv',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Filter \'Only show future placement tests\' active',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'reihungstest_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Reihungstest ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Placementtest ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'reihungstest_person_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'RtPerson ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'PtPerson ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'stufe',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Stufe',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'level',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'anmeldedatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anmeldedatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Registration Date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'teilgenommen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'teilgenommen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'participated',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'admission',
+		'phrase' => 'stg_kurz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kürzel',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'shorthand',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC4 STUDIERENDENVERWALTUNG AUFNAHMETERMINE ENDE	 ---------------------------------------------------------------
 
 );

From a6180b3d59b85b851ca778fbaec05bdc40131fbf Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 8 May 2025 12:34:35 +0200
Subject: [PATCH 145/572] feature(Searchbar Storage): uses UUID's to store
 searchstr and searchtypes and warn user about missing searchoption origin
 property

---
 public/js/components/searchbar/searchbar.js | 33 +++++++++++++++++----
 public/js/helpers/UUID.js                   |  8 +++++
 2 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 public/js/helpers/UUID.js

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 0bcd4e893..31f45455a 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -4,6 +4,7 @@ import employee from "./employee.js";
 import organisationunit from "./organisationunit.js";
 import student from "./student.js";
 import prestudent from "./prestudent.js";
+import uuid from "../../helpers/UUID.js";
 
 export default {
     props: [ "searchoptions", "searchfunction" ],
@@ -84,7 +85,7 @@ export default {
     `,
     watch:{
 		'searchsettings.searchstr': function (newSearchValue, oldSearchValue) {
-			sessionStorage.setItem(`${this.searchoptions.origin}_searchstr`,newSearchValue);
+			sessionStorage.setItem(`${this.searchoptions.origin}_searchstr_${uuid}`,newSearchValue);
 		},
     },
 	computed:{
@@ -104,7 +105,7 @@ export default {
 			}
 			// stores the search types in the localstorage, only if the newValue is also an array
 			if(Array.isArray(newValue)){
-				localStorage.setItem(`${this.searchoptions.origin}_searchtypes`, JSON.stringify(newValue));
+				localStorage.setItem(`${this.searchoptions.origin}_searchtypes_${uuid}`, JSON.stringify(newValue));
 			}
 			this.search();
 		});
@@ -113,6 +114,10 @@ export default {
 		this.settingsDropdown = new bootstrap.Collapse(this.$refs.settings, {
 			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.");
+		}
 	},
 	updated() {
 		if(this.showresult) {
@@ -122,10 +127,28 @@ export default {
 		}
 	},
     methods: {
+		getStorageValue: function (key, sessionStorage = false){
+			const regex = new RegExp(`${this.searchoptions.origin}_${key}`);
+			if(sessionStorage){
+				for (let i = 0; i < sessionStorage.length; i++) {
+					if (sessionStorage.key(i).match(regex)) {
+						return sessionStorage.getItem(sessionStorage.key(i));
+					}
+				}
+			}
+			else{
+				for (let i =0; i < localStorage.length; i++){
+					if (localStorage.key(i).match(regex)){
+						return localStorage.getItem(localStorage.key(i));
+					}
+				}
+			}
+		},
 		getSearchTypes: function () {
 			let result = this.allSearchTypes();
-			if (localStorage.getItem(`${this.searchoptions.origin}_searchtypes`)) {
-				result = JSON.parse(`${this.searchoptions.origin}_searchtypes`);
+			let localStorageValue = this.getStorageValue('searchtypes');
+			if (localStorageValue) {
+				result = JSON.parse(localStorageValue);
 			}
 			return result;
 		},
@@ -137,7 +160,7 @@ export default {
 			return allTypes;
 		},
 		getSearchStr: function(){
-			return sessionStorage.getItem(`${this.searchoptions.origin}_searchstr`) ?? '';
+			return this.getStorageValue("searchstr",true) ?? '';
 		},
 		checkSettingsVisibility: function(event) {
 			// hides the settings collapsible if the user clicks somewhere else
diff --git a/public/js/helpers/UUID.js b/public/js/helpers/UUID.js
new file mode 100644
index 000000000..1c08c1237
--- /dev/null
+++ b/public/js/helpers/UUID.js
@@ -0,0 +1,8 @@
+const uuid41 = () => {
+	const b = crypto.getRandomValues(new Uint16Array(8));
+	const d = [].map.call(b, a => a.toString(16).padStart(4, '0')).join('');
+	const vr = (((b[5] >> 12) & 3) | 8).toString(16);
+	return `${d.substr(0, 8)}-${d.substr(8, 4)}-4${d.substr(13, 3)}-${vr}${d.substr(17, 3)}-${d.substr(20, 12)}`;
+};
+
+export default uuid41;
\ No newline at end of file

From 233e768aad1b322fc2df54d0e8a0d58259f27a2f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 9 May 2025 09:11:33 +0200
Subject: [PATCH 146/572] copy Function files to component

---
 .../frontend/v1/funktionen/FunctionsAPI.php   | 239 +++++++
 .../api/frontend/v1/funktionen/OrgAPI.php     | 153 +++++
 .../api/frontend/v1/stv/Config.php            |   5 +
 application/views/Studentenverwaltung.php     |   2 +
 public/js/api/factory/funktionen.js           |  22 +
 public/js/api/factory/funktionen/person.js    |  68 ++
 public/js/components/Funktionen/Funktionen.js | 620 ++++++++++++++++++
 public/js/components/Funktionen/Modal.js      |  48 ++
 .../js/components/Funktionen/ModalDialog.js   |  69 ++
 public/js/components/Funktionen/OrgChooser.js |  69 ++
 public/js/components/Funktionen/Toast.js      |  47 ++
 .../Studentenverwaltung/Details/Funktionen.js |  28 +
 system/phrasesupdate.php                      |  25 +-
 13 files changed, 1394 insertions(+), 1 deletion(-)
 create mode 100644 application/controllers/api/frontend/v1/funktionen/FunctionsAPI.php
 create mode 100644 application/controllers/api/frontend/v1/funktionen/OrgAPI.php
 create mode 100644 public/js/api/factory/funktionen.js
 create mode 100644 public/js/api/factory/funktionen/person.js
 create mode 100644 public/js/components/Funktionen/Funktionen.js
 create mode 100644 public/js/components/Funktionen/Modal.js
 create mode 100644 public/js/components/Funktionen/ModalDialog.js
 create mode 100644 public/js/components/Funktionen/OrgChooser.js
 create mode 100644 public/js/components/Funktionen/Toast.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js

diff --git a/application/controllers/api/frontend/v1/funktionen/FunctionsAPI.php b/application/controllers/api/frontend/v1/funktionen/FunctionsAPI.php
new file mode 100644
index 000000000..023100a6e
--- /dev/null
+++ b/application/controllers/api/frontend/v1/funktionen/FunctionsAPI.php
@@ -0,0 +1,239 @@
+<?php
+
+defined('BASEPATH') || exit('No direct script access allowed');
+
+class FunctionsAPI extends Auth_Controller
+{
+
+	const DEFAULT_PERMISSION = 'basis/mitarbeiter:rw';
+	const HANDYVERWALTUNG_PERMISSION = 'extension/pv21_handyverwaltung:rw';
+
+	public function __construct() {
+
+		//TODO(Manu) check permissions
+		parent::__construct(array(
+				'getAllFunctions' => FunctionsAPI::DEFAULT_PERMISSION,
+				'getContractFunctions' => FunctionsAPI::DEFAULT_PERMISSION,
+				'getCurrentFunctions' => FunctionsAPI::DEFAULT_PERMISSION,
+				'getAllUserFunctions' => [FunctionsAPI::DEFAULT_PERMISSION, self::HANDYVERWALTUNG_PERMISSION],
+			)
+		);
+		$this->load->library('AuthLib');
+		$this->load->model('extensions/FHC-Core-Personalverwaltung/Api_model','ApiModel');
+		$this->load->model('ressource/Funktion_model', 'FunktionModel');
+		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+	}
+
+
+
+	/*
+	 * return list of all functions
+	 * as key value list to be used in select or autocomplete
+	 */
+	public function getAllFunctions()
+	{
+		$sql = <<<EOSQL
+			SELECT
+				funktion_kurzbz AS value, beschreibung AS label
+			FROM
+				public.tbl_funktion
+			WHERE
+				aktiv = true
+			ORDER BY beschreibung ASC
+EOSQL;
+
+		$fkts = $this->FunktionModel->execReadOnlyQuery($sql);
+		if( hasData($fkts) )
+		{
+			$this->outputJson($fkts);
+			return;
+		}
+		else
+		{
+			$this->outputJsonError('no contract relevant funktionen found');
+			return;
+		}
+	}
+
+	/*
+	 * return list of contract relevant functions
+	 * as key value list to be used in select or autocomplete
+	 */
+	public function getContractFunctions($mode='all')
+	{
+		$addwhere = '';
+		switch ($mode)
+		{
+			case 'zuordnung':
+				$addwhere = ' AND funktion_kurzbz LIKE \'%zuordnung%\'';
+				break;
+			case 'funktion':
+				$addwhere = ' AND funktion_kurzbz NOT LIKE \'%zuordnung%\'';
+				break;
+			case 'all':
+			default:
+				$addwhere = '';
+				break;
+		}
+
+		$sql = <<<EOSQL
+			SELECT
+				funktion_kurzbz AS value, beschreibung AS label
+			FROM
+				public.tbl_funktion
+			WHERE
+				aktiv = true AND vertragsrelevant = true
+				{$addwhere}
+			ORDER BY beschreibung ASC
+EOSQL;
+
+		$fkts = $this->FunktionModel->execReadOnlyQuery($sql);
+		if( hasData($fkts) )
+		{
+			$this->outputJson($fkts);
+			return;
+		}
+		else
+		{
+			$this->outputJsonError('no contract relevant funktionen found');
+			return;
+		}
+	}
+
+	/*
+	 * return list of child orgets for a given company orget_kurzbz
+	 * as key value list to be used in select or autocomplete
+	 */
+	public function getCurrentFunctions($uid, $companyOrgetkurzbz)
+	{
+		if( empty($uid) )
+		{
+			$this->outputJsonError('Missing Parameter <uid>');
+		}
+
+		if( empty($companyOrgetkurzbz) )
+		{
+			$this->outputJsonError('Missing Parameter <companyOrgetkurzbz>');
+		}
+
+		$sql = <<<EOSQL
+			SELECT
+				bf.benutzerfunktion_id AS value, f.beschreibung || ', '
+					|| oe.bezeichnung || ' [' || oet.bezeichnung || '], '
+					|| COALESCE(to_char(bf.datum_von, 'dd.mm.YYYY'), 'n/a')
+					|| ' - ' || COALESCE(to_char(bf.datum_bis, 'dd.mm.YYYY'), 'n/a')
+					|| COALESCE(dvu.attachedtovb, '') AS label
+			FROM (
+					WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) as
+					(
+						SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit
+						WHERE oe_kurzbz = ?
+						UNION ALL
+						SELECT o.oe_kurzbz, o.oe_parent_kurzbz FROM public.tbl_organisationseinheit o, oes
+						WHERE o.oe_parent_kurzbz=oes.oe_kurzbz
+					)
+					SELECT oe_kurzbz
+					FROM oes
+					GROUP BY oe_kurzbz
+			) c
+			JOIN public.tbl_organisationseinheit oe ON oe.oe_kurzbz = c.oe_kurzbz
+			JOIN public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
+			JOIN public.tbl_benutzerfunktion bf ON bf.oe_kurzbz = oe.oe_kurzbz
+			JOIN public.tbl_funktion f ON f.funktion_kurzbz = bf.funktion_kurzbz
+			LEFT JOIN (
+				SELECT
+					benutzerfunktion_id, ' [DV]' AS attachedtovb
+				FROM
+					"hr"."tbl_vertragsbestandteil_funktion"
+				GROUP BY
+					benutzerfunktion_id
+			) dvu ON dvu.benutzerfunktion_id = bf.benutzerfunktion_id
+			WHERE bf.uid = ?
+			ORDER BY f.beschreibung ASC
+
+EOSQL;
+
+		$benutzerfunktionen = $this->BenutzerfunktionModel->execReadOnlyQuery($sql, array($companyOrgetkurzbz, $uid));
+		if( hasData($benutzerfunktionen) )
+		{
+			$this->outputJson($benutzerfunktionen);
+			return;
+		}
+		else
+		{
+			$this->outputJsonError('no benutzerfunktionen found for uid ' . $uid . ' and oe_kurzbz ' . $companyOrgetkurzbz );
+			return;
+		}
+	}
+
+	/*
+	 * return list of functions for a uid
+	 * as objects to be used in as datasource
+	 */
+	public function getAllUserFunctions($uid)
+	{
+		if( empty($uid) )
+		{
+			$this->outputJsonError('Missing Parameter <uid>');
+		}
+
+		$sql = <<<EOSQL
+			SELECT
+				dv.dienstverhaeltnis_id, 
+				un.bezeichnung || ' (' || TO_CHAR(dv.von, 'DD.MM.YYYY') || CASE WHEN dv.bis IS NOT NULL THEN ' - ' || TO_CHAR(dv.bis, 'DD.MM.YYYY') ELSE '' END || ')' AS dienstverhaeltnis_unternehmen ,
+				'[' || oet.bezeichnung || '] ' || oe.bezeichnung AS funktion_oebezeichnung,
+				f.beschreibung AS funktion_beschreibung,
+				bf.*,
+				fb.bezeichnung AS fachbereich_bezeichnung,
+			    CASE
+					WHEN
+						bf.datum_bis IS NOT NULL AND bf.datum_bis::date < now()::date
+					THEN
+						false
+					ELSE
+						true
+				END aktiv
+			FROM
+				public.tbl_benutzerfunktion bf
+			JOIN
+				public.tbl_organisationseinheit oe ON oe.oe_kurzbz = bf.oe_kurzbz
+			JOIN
+				public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
+            JOIN
+				public.tbl_funktion f ON f.funktion_kurzbz = bf.funktion_kurzbz
+			LEFT JOIN
+				hr.tbl_vertragsbestandteil_funktion vf ON vf.benutzerfunktion_id = bf.benutzerfunktion_id
+			LEFT JOIN
+				hr.tbl_vertragsbestandteil v ON vf.vertragsbestandteil_id = v.vertragsbestandteil_id
+			LEFT JOIN
+				hr.tbl_dienstverhaeltnis dv ON v.dienstverhaeltnis_id = dv.dienstverhaeltnis_id
+			LEFT JOIN
+				public.tbl_organisationseinheit un ON dv.oe_kurzbz = un.oe_kurzbz
+			LEFT JOIN
+				public.tbl_fachbereich fb ON fb.fachbereich_kurzbz = bf.fachbereich_kurzbz
+            WHERE
+				bf.uid = ?
+            ORDER BY
+				f.beschreibung, bf.datum_von ASC
+
+EOSQL;
+
+		$benutzerfunktionen = $this->BenutzerfunktionModel->execReadOnlyQuery($sql, array($uid));
+		if( hasData($benutzerfunktionen) )
+		{
+			$this->outputJson($benutzerfunktionen);
+			return;
+		}
+		else
+		{
+			$this->outputJsonError('no benutzerfunktionen found for uid ' . $uid);
+			return;
+		}
+	}
+
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/funktionen/OrgAPI.php b/application/controllers/api/frontend/v1/funktionen/OrgAPI.php
new file mode 100644
index 000000000..f6cf5bdb8
--- /dev/null
+++ b/application/controllers/api/frontend/v1/funktionen/OrgAPI.php
@@ -0,0 +1,153 @@
+<?php
+
+defined('BASEPATH') || exit('No direct script access allowed');
+
+class OrgAPI extends Auth_Controller
+{
+
+	const DEFAULT_PERMISSION = 'basis/mitarbeiter:rw';
+	const HANDYVERWALTUNG_PERMISSION = 'extension/pv21_handyverwaltung:rw';
+
+	public function __construct() {
+		parent::__construct(array(
+				'getOrgHeads' => OrgAPI::DEFAULT_PERMISSION,
+				'getOrgStructure' => OrgAPI::DEFAULT_PERMISSION,
+				'getOrgPersonen' => OrgAPI::DEFAULT_PERMISSION,
+				'getCompanyByOrget'  => [OrgAPI::DEFAULT_PERMISSION, self::HANDYVERWALTUNG_PERMISSION],
+				'getOrgetsForCompany' => OrgAPI::DEFAULT_PERMISSION,
+				'getUnternehmen' => [OrgAPI::DEFAULT_PERMISSION, self::HANDYVERWALTUNG_PERMISSION],
+			)
+		);
+		$this->load->library('AuthLib');
+		$this->load->model('extensions/FHC-Core-Personalverwaltung/Organisationseinheit_model', 'OrganisationseinheitModel');
+		$this->load->model('extensions/FHC-Core-Personalverwaltung/Api_model','ApiModel');
+	}
+
+	// -----------------------------
+	// Organisation
+	// -----------------------------
+
+	function getOrgHeads()
+	{
+		$data = $this->OrganisationseinheitModel->getHeads();
+		return $this->outputJson($data);
+	}
+
+	function getOrgStructure()
+	{
+		$oe = $this->input->get('oe', TRUE);
+
+		$data = $this->OrganisationseinheitModel->getOrgStructure($oe);
+		return $this->outputJson($data);
+	}
+
+	function getOrgPersonen()
+	{
+		$oe = $this->input->get('oe', TRUE);
+
+		$data = $this->OrganisationseinheitModel->getPersonen($oe);
+		return $this->outputJson($data);
+	}
+
+
+
+
+	public function getCompanyByOrget($oe_kurzbz)
+	{
+
+		$sql = <<<EOSQL
+        WITH RECURSIVE unternehmen as
+        (
+                SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit
+                WHERE oe_kurzbz=?
+                UNION ALL
+                SELECT o.oe_kurzbz, o.oe_parent_kurzbz
+                FROM   public.tbl_organisationseinheit AS o
+                       INNER JOIN unternehmen u  ON u.oe_parent_kurzbz=o.oe_kurzbz
+        )
+        SELECT *
+        FROM unternehmen
+        WHERE oe_parent_kurzbz is null;
+EOSQL;
+		$childorgets = $this->OrganisationseinheitModel->execReadOnlyQuery($sql, array($oe_kurzbz));
+		if( hasData($childorgets) )
+		{
+			$this->outputJson($childorgets);
+			return;
+		}
+		else
+		{
+			$this->outputJsonError('no orgets found for parent oe_kurzbz ' . $oe_kurzbz );
+			return;
+		}
+	}
+
+	/*
+	 * return list of child orgets for a given company orget_kurzbz
+	 * as key value list to be used in select or autocomplete
+	 */
+	public function getOrgetsForCompany($companyOrgetkurzbz=null)
+	{
+		if( empty($companyOrgetkurzbz) )
+		{
+			$this->outputJsonError('Missing Parameter <companyOrgetkurzbz>');
+			return;
+		}
+
+		$sql = <<<EOSQL
+			SELECT
+				oe.oe_kurzbz AS value,
+				'[' || COALESCE(oet.bezeichnung, oet.organisationseinheittyp_kurzbz) ||
+				'] ' || COALESCE(oe.bezeichnung, oe.oe_kurzbz) AS label
+			FROM (
+					WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) as
+					(
+						SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit
+						WHERE oe_kurzbz=?
+						UNION ALL
+						SELECT o.oe_kurzbz, o.oe_parent_kurzbz FROM public.tbl_organisationseinheit o, oes
+						WHERE o.oe_parent_kurzbz=oes.oe_kurzbz
+					)
+					SELECT oe_kurzbz
+					FROM oes
+					GROUP BY oe_kurzbz
+			) c
+			JOIN public.tbl_organisationseinheit oe ON oe.oe_kurzbz = c.oe_kurzbz
+			JOIN public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
+			ORDER BY oet.bezeichnung ASC, oe.bezeichnung ASC
+
+EOSQL;
+
+		$childorgets = $this->OrganisationseinheitModel->execReadOnlyQuery($sql, array($companyOrgetkurzbz));
+		if( hasData($childorgets) )
+		{
+			$this->outputJson($childorgets);
+			return;
+		}
+		else
+		{
+			$this->outputJsonError('no orgets found for parent oe_kurzbz ' . $companyOrgetkurzbz );
+			return;
+		}
+	}
+
+
+	public function getUnternehmen()
+	{
+		$this->OrganisationseinheitModel->resetQuery();
+		$this->OrganisationseinheitModel->addSelect('oe_kurzbz AS value, bezeichnung AS label, \'false\'::boolean AS disabled');
+		$this->OrganisationseinheitModel->addOrder('bezeichnung', 'ASC');
+		$unternehmen = $this->OrganisationseinheitModel->loadWhere('oe_parent_kurzbz IS NULL');
+		if( hasData($unternehmen) )
+		{
+			$this->outputJson($unternehmen);
+			return;
+		}
+		else
+		{
+			$this->outputJsonError('no companies (orgets with parent NULL) found');
+			return;
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 42de1b02f..d37a6d6ec 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -128,6 +128,11 @@ class Config extends FHCAPI_Controller
 			'component' => './Stv/Studentenverwaltung/Details/Mobility.js'
 		];
 
+		$result['functions'] = [
+			'title' => $this->p->t('stv', 'tab_functions'),
+			'component' => './Stv/Studentenverwaltung/Details/Funktionen.js'
+		];
+
 		Events::trigger('stv_conf_student', function & () use (&$result) {
 			return $result;
 		});
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index c10dc475a..398b921d2 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -15,11 +15,13 @@
 			'notiz',
 		),
 		'customCSSs' => [
+			#datepicker fuer component functions
 			'public/css/components/vue-datepicker.css',
 			'public/css/components/primevue.css',
 			'public/css/Studentenverwaltung.css'
 		],
 		'customJSs' => [
+			'vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js'
 			#'vendor/npm-asset/primevue/tree/tree.min.js',
 			#'vendor/npm-asset/primevue/toast/toast.min.js'
 		],
diff --git a/public/js/api/factory/funktionen.js b/public/js/api/factory/funktionen.js
new file mode 100644
index 000000000..c1f4efa29
--- /dev/null
+++ b/public/js/api/factory/funktionen.js
@@ -0,0 +1,22 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import person from "./funktionen/person.js";
+
+export default {
+	person
+};
\ No newline at end of file
diff --git a/public/js/api/factory/funktionen/person.js b/public/js/api/factory/funktionen/person.js
new file mode 100644
index 000000000..305d0bbeb
--- /dev/null
+++ b/public/js/api/factory/funktionen/person.js
@@ -0,0 +1,68 @@
+/**
+ * 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 {
+	getContractFunctions(filter) {
+		var url = 'api/frontend/v1/funktionen/FunctionsAPI/getContractFunctions';
+		if( typeof filter !== 'undefined' && filter !== null ) {
+			url = url + '/' + filter;
+		}
+		return {
+			method: 'get',
+			url,
+		};
+
+	},
+	getOrgetsForCompany(unternehmen) {
+		var url = 'api/frontend/v1/funktionen/OrgAPI/getOrgetsForCompany'
+			+ '/' + unternehmen;
+		return {
+			method: 'get',
+			url,
+		};
+	},
+	getCompanyByOrget(orget) {
+		var url = 'api/frontend/v1/funktionen/OrgAPI/getCompanyByOrget'
+			+ '/' + orget;
+		return {
+			method: 'get',
+			url,
+		};
+	},
+	getCurrentFunctions(mitarbeiter_uid, unternehmen) {
+		var url = 'api/frontend/v1/funktionen/FunctionsAPI/getCurrentFunctions'
+			+ '/' + mitarbeiter_uid + '/' + unternehmen;
+		return {
+			method: 'get',
+			url,
+		};
+	}  ,
+	getAllUserFunctions(mitarbeiter_uid) {
+		var url = 'api/frontend/v1/funktionen/FunctionsAPI/getAllUserFunctions'
+			+ '/' + mitarbeiter_uid;
+		return {
+			method: 'get',
+			url,
+		};
+	},
+	getAllFunctions() {
+		var url = 'api/frontend/v1/funktionen/FunctionsAPI/getAllFunctions';
+		return {
+			method: 'get',
+			url,
+		};
+	}
+};
\ No newline at end of file
diff --git a/public/js/components/Funktionen/Funktionen.js b/public/js/components/Funktionen/Funktionen.js
new file mode 100644
index 000000000..c54628b24
--- /dev/null
+++ b/public/js/components/Funktionen/Funktionen.js
@@ -0,0 +1,620 @@
+import { Modal } from './Modal.js';
+import { ModalDialog } from './ModalDialog.js';
+import { Toast } from './Toast.js';
+import {OrgChooser} from "./OrgChooser.js";
+import { usePhrasen } from '../../mixins/Phrasen.js';
+
+import ApiFunktion from '../../api/factory/funktionen/person.js';
+import ApiPerson from "../../../extensions/FHC-Core-Personalverwaltung/js/api/factory/person";
+
+export const Funktionen = {
+	name: 'FunctionComponent',
+	components: {
+		Modal,
+		ModalDialog,
+		Toast,
+		OrgChooser,
+		"datepicker": VueDatePicker
+	},
+	props: {
+		modelValue: { type: Object, default: () => ({}), required: false},
+		config: { type: Object, default: () => ({}), required: false},
+		readonlyMode: { type: Boolean, required: false, default: false },
+		personID: { type: Number, required: false },
+		personUID: { type: String, required: false },
+		writePermission: { type: Boolean, required: false },
+	},
+	emits: ['updateHeader'],
+	setup( props, { emit } ) {
+
+		const $api = Vue.inject('$api');
+		//const fhcAlert = Vue.inject('$fhcAlert');
+
+
+		const readonly = Vue.ref(false);
+
+		const { t } = usePhrasen();
+
+		//const { personID: currentPersonID , personUID: currentPersonUID  } = Vue.toRefs(props);
+		const currentPersonID = Vue.computed(() => { return props.personID });
+		const currentPersonUID = Vue.computed(() => { return props.personUID });
+
+		const dialogRef = Vue.ref();
+
+		const isFetching = Vue.ref(false);
+
+		const theModel = Vue.computed({
+			get: () => props.modelValue,
+			set: (value) => emit('update:modelValue', value),
+		});
+
+		const unternehmen = Vue.ref();
+		const jobfunctionList = Vue.ref([]);
+		const jobfunctionDefList = Vue.ref([]);
+		const orgUnitList = Vue.ref([{value: '', label: '-'}]);
+
+		const aktivChecked = Vue.ref(true);
+
+		const table = Vue.ref(null); // reference to your table element
+		const tabulator = Vue.ref(null); // variable to hold your table
+		const tableData = Vue.reactive([]); // data for table to display
+
+
+		const full = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+		const route = ( props.readonlyMode !== true ) ? VueRouter.useRoute() : null;
+
+		const convertArrayToObject = (array, key) => {
+			const initialValue = {};
+			return array.reduce((obj, item) => {
+				return {
+					...obj,
+					[item[key]]: item,
+				};
+			}, initialValue);
+		};
+
+		const fetchData = async () => {
+			if (currentPersonID.value==null && theModel.value.personID==null) {
+				jobfunctionList.value = [];
+				return;
+			}
+			isFetching.value = true
+
+			// fetch data and map them for easier access
+			try {
+				const response = await $api.call(
+					ApiFunktion.getAllUserFunctions(theModel.value.personUID || currentPersonUID.value));
+				if(response.error === 1) {
+					let rawList = [];
+					tableData.value = [];
+					jobfunctionList.value = convertArrayToObject(rawList, 'benutzerfunktion_id');
+				} else {
+					let rawList = response.retval;
+					tableData.value = response.retval;
+					jobfunctionList.value = convertArrayToObject(rawList, 'benutzerfunktion_id');
+				}
+			} catch (error) {
+				console.log(error)
+			} finally {
+				isFetching.value = false
+			}
+
+		}
+
+		const createShape = () => {
+			return {
+				benutzerfunktion_id: 0,
+				uid: theModel.value.personUID || currentPersonUID.value,
+				oe_kurzbz: "",
+				funktion_kurzbz: "",
+				datum_von: "",
+				datum_bis: "",
+				bezeichnung: "",
+				wochenstunden: 0,
+			}
+		}
+
+		const currentValue = Vue.ref(createShape());
+		const preservedValue = Vue.ref(createShape());
+
+		Vue.watch([currentPersonID, currentPersonUID], ([id,uid]) => {
+			fetchData();
+		});
+
+		Vue.watch(unternehmen, (unternehmen_kurzbz) => {
+			fetchOrgUnits(unternehmen_kurzbz);
+			fetchFunctions();
+		});
+
+		const toggleMode = async () => {
+			if (!readonly.value) {
+				// cancel changes?
+				if (hasChanged.value) {
+					const ok = await dialogRef.value.show();
+					if (ok) {
+						console.log("ok=", ok);
+						currentValue.value = preservedValue.value;
+					} else {
+						return
+					}
+				}
+			} else {
+				// switch to edit mode and preserve data
+				preservedValue.value = {...currentValue.value};
+			}
+			readonly.value = !readonly.value;
+		}
+
+		Vue.onMounted(async () => {
+			currentValue.value = createShape();
+			await fetchData();
+
+			const dateFormatter = (cell) => {
+				return cell.getValue()?.replace(/(.*)-(.*)-(.*)/, '$3.$2.$1');
+			}
+
+			const dvFormatter = (cell) => {
+				if( props.readonlyMode === true ) {
+					return (cell.getValue() != null) ? cell.getValue() : '';
+				}
+				const url = fullPath + route.params.id + '/' + route.params.uid + '/contract/' + cell.getRow().getData().dienstverhaeltnis_id;
+				return cell.getValue() != null ? `<a href="${url}">` + cell.getValue() + '</a>' : '';
+			}
+
+			// helper
+			const createDomButton = (classValue, clickHandler) => {
+				const nodeBtn = document.createElement("button");
+				const classAttrBtn = document.createAttribute("class");
+				classAttrBtn.value = "btn btn-outline-secondary btn-sm";
+				nodeBtn.setAttributeNode(classAttrBtn);
+				nodeBtn.addEventListener("click", clickHandler);
+				const nodeI = document.createElement("i");
+				const classAttrI = document.createAttribute("class");
+				classAttrI.value = classValue;
+				nodeI.setAttributeNode(classAttrI);
+				nodeBtn.appendChild(nodeI);
+				return nodeBtn;
+			}
+
+			const btnFormatter = (cell) => {
+
+				const nodeDiv = document.createElement("div");
+				const classAttrDiv = document.createAttribute("class");
+				classAttrDiv.value = "d-grid gap-2 d-md-flex justify-content-end align-middle";
+				nodeDiv.setAttributeNode(classAttrDiv);
+				// delete button
+				const nodeBtnDel = createDomButton("fa fa-xmark",() => { showDeleteModal(cell.getValue()) })
+				// edit button
+				const nodeBtnEdit = createDomButton("fa fa-pen",() => { showEditModal(cell.getValue()) })
+
+				if( cell.getRow().getData().dienstverhaeltnis_unternehmen === null ) {
+					nodeDiv.appendChild(nodeBtnEdit);
+					nodeDiv.appendChild(nodeBtnDel);
+				}
+
+				return nodeDiv;
+			}
+
+
+			const columnsDef = [
+				{ title: t('person','dv_unternehmen'), field: "dienstverhaeltnis_unternehmen", formatter: dvFormatter, sorter:"string", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
+				{ title: t('person','zuordnung_taetigkeit'), field: "funktion_beschreibung", hozAlign: "left", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
+				{ title: t('lehre','organisationseinheit'), field: "funktion_oebezeichnung", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
+				{ title: t('person','wochenstunden'), field: "wochenstunden", hozAlign: "right", width: 140, headerFilter:true },
+				{ title: t('ui','from'), field: "datum_von", hozAlign: "center", formatter: dateFormatter, width: 140, sorter:"string", headerFilter:true, headerFilterFunc:customHeaderFilter },
+				{ title: t('global','bis'), field: "datum_bis", hozAlign: "center", formatter: dateFormatter, width: 140, sorter:"string", headerFilter:true, headerFilterFunc:customHeaderFilter },
+				{ title: t('ui','bezeichnung'), field: "bezeichnung", hozAlign: "left", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} }
+			];
+
+			if( props.readonlyMode === false) {
+				columnsDef.push({ title: "", field: "benutzerfunktion_id", formatter: btnFormatter, hozAlign: "right", width: 100, headerSort: false, frozen: true });
+			}
+
+			let tabulatorOptions = {
+				height: "100%",
+				layout: "fitColumns",
+				movableColumns: true,
+				reactiveData: true,
+				columns: columnsDef,
+				//data: tableData.value,
+				data: jobfunctionListArray.value,
+			};
+
+			tabulator.value = new Tabulator(
+				table.value,
+				tabulatorOptions
+			);
+
+			function customHeaderFilter(headerValue, rowValue, rowData, filterParams){
+				//headerValue - the value of the header filter element
+				//rowValue - the value of the column in this row
+				//rowData - the data for the row being filtered
+				//filterParams - params object passed to the headerFilterFuncParams property
+
+				const validDate = function(d){
+					return d instanceof Date && isFinite(d);
+				}
+
+				const date1 = new Date(rowValue);
+				date1.setHours(0,0,0,0);
+				let [day, month, year] = headerValue.split('.')
+				if (year < 1000) return true;  // prevents dates like 17.5.2
+				const date2 = new Date(+year, +month - 1, +day);
+
+				return  !(validDate(date2)) || ((date2 - date1) == 0); //must return a boolean, true if it passes the filter.
+			}
+
+			tabulator.value.on('tableBuilt', () => {
+				//tabulator.value.setData(tableData.value);
+
+			})
+
+		})
+
+		const jobfunctionListArray = Vue.computed(() => {
+			let temp = (jobfunctionList.value ? Object.values(jobfunctionList.value) : []);
+			let filtered = temp.filter((e) => ( !aktivChecked.value || (aktivChecked.value && e.aktiv) ));
+			return filtered;
+		});
+
+		// Workaround to update tabulator
+		Vue.watch(jobfunctionListArray, (newVal, oldVal) => {
+			console.log('jobfunctionList changed');
+			tabulator.value?.setData(jobfunctionListArray.value);
+		}, {deep: true})
+
+		// Modal
+		const modalRef = Vue.ref();
+		const confirmDeleteRef = Vue.ref();
+
+		const showAddModal = () => {
+			currentValue.value = createShape();
+			// reset form state
+			frmState.orgetBlurred=false;
+			frmState.funktionBlurred=false;
+			frmState.beginnBlurred=false;
+			// call bootstrap show function
+			modalRef.value.show();
+		}
+
+		const hideModal = () => {
+			modalRef.value.hide();
+		}
+
+		const showEditModal = async (id) => {
+			currentValue.value = { ...jobfunctionList.value[id] };
+			// fetch company
+			isFetching.value = true;
+			try {
+				const res = await $api.call(ApiFunktion.getCompanyByOrget(currentValue.value.oe_kurzbz));
+				if (res.error == 0) {
+					unternehmen.value = res.retval[0].oe_kurzbz;
+				} else {
+					console.log('company not found for orget!');
+				}
+
+			} catch (error) {
+				console.log(error)
+			} finally {
+				isFetching.value = false
+			}
+			//delete currentValue.value.bezeichnung;
+			modalRef.value.show();
+		}
+
+		const showDeleteModal = async (id) => {
+			currentValue.value = { ...jobfunctionList.value[id] };
+			const ok = await confirmDeleteRef.value.show();
+
+			if (ok) {
+
+				try {
+					const res = await $api.call(ApiPerson.deletePersonJobFunction(id));
+					if (res.error == 0) {
+						delete jobfunctionList.value[id];
+						showDeletedToast();
+						theModel.value.updateHeader();
+					}
+				} catch (error) {
+					console.log(error)
+				} finally {
+					isFetching.value = false
+				}
+
+			}
+		}
+
+
+		const okHandler = async () => {
+			if (!validate()) {
+
+				console.log("form invalid");
+
+			} else {
+
+				// submit
+				try {
+					let payload = {...currentValue.value};
+					delete payload.dienstverhaeltnis_id;
+					delete payload.dienstverhaeltnis_unternehmen;
+					delete payload.fachbereich_bezeichnung;
+					delete payload.funktion_oebezeichnung;
+					delete payload.aktiv;
+					delete payload.funktion_beschreibung;
+					const r = await $api.call(ApiPerson.upsertPersonJobFunction(payload));
+					if (r.error == 0) {
+						// fetch all data because of all the references in the changed record
+						await fetchData();
+						console.log('job function successfully saved');
+						theModel.value.updateHeader();
+						showToast();
+					}
+				} catch (error) {
+					console.log(error)
+				} finally {
+					isFetching.value = false
+				}
+
+				hideModal();
+			}
+		}
+
+		// -------------
+		// form handling
+		// -------------
+
+		const jobFunctionFrm = Vue.ref();
+
+		const frmState = Vue.reactive({ beginnBlurred: false, orgetBlurred: false, funktionBlurred: false, wasValidated: false });
+
+		const notEmpty = (n) => {
+			return !!n && n.trim() != "";
+		}
+
+		const validate = () => {
+			frmState.orgetBlurred = true;
+			frmState.funktionBlurred = true;
+			frmState.beginnBlurred = true;
+			return notEmpty(currentValue.value.datum_von) &&
+				notEmpty(currentValue.value.oe_kurzbz) &&
+				notEmpty(currentValue.value.funktion_kurzbz);
+		}
+
+
+		const hasChanged = Vue.computed(() => {
+			return Object.keys(currentValue.value).some(field => currentValue.value[field] !== preservedValue.value[field])
+		});
+
+		const formatDate = (d) => {
+			if (d != null && d != '') {
+				return d.substring(8, 10) + "." + d.substring(5, 7) + "." + d.substring(0, 4);
+			} else {
+				return ''
+			}
+		}
+
+		// Toast
+		const toastRef = Vue.ref();
+		const deleteToastRef = Vue.ref();
+
+		const showToast = () => {
+			toastRef.value.show();
+		}
+
+		const showDeletedToast = () => {
+			deleteToastRef.value.show();
+		}
+
+		const fetchOrgUnits = async (unternehmen_kurzbz) => {
+			if( unternehmen_kurzbz === '' ) {
+				return;
+			}
+			const response = await $api.call(
+				ApiFunktion.getOrgetsForCompany(unternehmen_kurzbz));
+			const orgets = response.retval;
+			orgets.unshift({
+				value: '',
+				label: t('ui','bitteWaehlen'),
+			});
+			orgUnitList.value = await  orgets;
+		}
+
+		const fetchFunctions = async (uid, unternehmen_kurzbz) => {
+			if(unternehmen_kurzbz === '' || uid === '' ) {
+				return;
+			}
+			const response = await $api.call(ApiFunktion.getAllFunctions());
+			const benutzerfunktionen = response.retval;
+			benutzerfunktionen.unshift({
+				value: '',
+				label: t('ui','bitteWaehlen'),
+			});
+			jobfunctionDefList.value = benutzerfunktionen;
+		}
+
+		const unternehmenSelectedHandler = (e) => {
+			console.log('unternehmen selected: ',e);
+			unternehmen.value = e;
+		}
+
+		const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+		const fullPath = `/${ciPath}/extensions/FHC-Core-Personalverwaltung/Employees/`;
+
+		return {
+			jobfunctionList, orgUnitList, jobfunctionListArray,
+			jobfunctionDefList,
+			currentValue,
+			readonly,
+			frmState,
+			dialogRef,
+			toastRef, deleteToastRef,
+			jobFunctionFrm,
+			modalRef,
+			fullPath,
+			route,
+			aktivChecked,
+			unternehmen,
+			tabulator,
+			table,
+
+			toggleMode, formatDate, notEmpty,
+			showToast, showDeletedToast,
+			showAddModal, hideModal, okHandler,
+			showDeleteModal, showEditModal, confirmDeleteRef, t, unternehmenSelectedHandler,
+		}
+	},
+	template: `
+    <div class="row" v-if="readonlyMode === false">
+
+        <div class="toast-container position-absolute top-0 end-0 pt-4 pe-2">
+          <Toast ref="toastRef">
+            <template #body><h4>{{ t('person','funktionGespeichert') }}</h4></template>
+          </Toast>
+        </div>
+
+        <div class="toast-container position-absolute top-0 end-0 pt-4 pe-2">
+            <Toast ref="deleteToastRef">
+                <template #body><h4>{{ t('person', 'funktionGeloescht') }}</h4></template>
+            </Toast>
+        </div>
+    </div>
+    <div class="row pt-md-4">      
+         <div class="col">
+             <div class="card">
+                <div class="card-header">
+                    <div class="h5"><h5>{{ t('person','funktionen') }}</h5></div>        
+                </div>
+
+                <div class="card-body">
+                    <div class="d-grid d-md-flex justify-content-between pt-2 pb-3" v-if="readonlyMode === false">
+                        <button type="button" class="btn btn-sm btn-primary me-3" @click="showAddModal()">
+                            <i class="fa fa-plus"></i> {{ t('person','funktion') }}
+                        </button>
+                        <div class="form-check">
+                            <input class="form-check-input" type="checkbox" role="switch" id="aktivChecked" v-model="aktivChecked">
+                            <label class="form-check-label" for="aktivChecked">Nur aktive anzeigen</label>
+                        </div>
+                    </div>
+
+                    <!-- TABULATOR -->
+                    <div ref="table" class="fhc-tabulator"></div>
+                
+                </div>
+             </div>
+         </div>
+    </div>
+            
+
+    <!-- detail modal -->
+    <Modal :title="t('person','funktion')" ref="modalRef" v-if="readonlyMode === false">
+        <template #body>
+            <form class="row g-3" ref="jobFunctionFrm">
+                            
+                <div class="col-md-8">
+                    <label class="form-label">{{ t('core','unternehmen') }}</label><br>
+                    <org-chooser  @org-selected="unternehmenSelectedHandler" :oe="unternehmen" class="form-select form-select-sm"></org-chooser>
+                </div>
+                <div class="col-md-4">
+                </div>
+                <!--  -->
+                <div class="col-md-8">
+                    <label class="required form-label">{{ t('lehre','organisationseinheit') }}</label><br>
+                    <select id="oe_kurzbz" v-model="currentValue.oe_kurzbz" 
+                        @blur="frmState.orgetBlurred = true"
+                        class="form-select form-select-sm" aria-label=".form-select-sm " 
+                        :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly, 'is-invalid': !notEmpty(currentValue.oe_kurzbz) && frmState.orgetBlurred}"
+                        >
+                        <option v-for="(item, index) in orgUnitList" :value="item.value">
+                            {{ item.label }}
+                        </option>                       
+                    </select>
+                </div>
+                <div class="col-md-4">
+                </div>
+                <!--  -->
+                <div class="col-md-8">
+                    <label for="funktion_kurzbz" class="required form-label">{{ t('person','funktion') }}</label><br>
+                    <select id="_kurzbz" v-model="currentValue.funktion_kurzbz" 
+                        @blur="frmState.funktionBlurred = true"
+                        class="form-select form-select-sm" aria-label=".form-select-sm " 
+                        :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly, 'is-invalid': !notEmpty(currentValue.funktion_kurzbz) && frmState.funktionBlurred}"
+                        >
+                        <option v-for="(item, index) in jobfunctionDefList" :value="item.value">
+                            {{ item.label }}
+                        </option>                       
+                    </select>
+                </div>
+                <div class="col-md-4"></div>
+                <!-- -->
+                <div class="col-md-2">
+                    <label for="uid" class="form-label">{{ t('person','wochenstunden') }}</label>
+                    <input type="number"  :readonly="readonly" class="form-control-sm" :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly}" id="bank" v-model="currentValue.wochenstunden">
+                </div>
+                <!--  -->
+                <div class="col-md-3">
+                    <label for="beginn" class="required form-label">{{ t('ui','from') }}</label>
+                    <datepicker id="beginn"
+                        :teleport="true" 
+                        @blur="frmState.beginnBlurred = true" 
+                        :input-class-name="(!notEmpty(currentValue.datum_von) && frmState.beginnBlurred) ? 'dp-invalid-input' : ''" 
+                        v-model="currentValue.datum_von"
+                        v-bind:enable-time-picker="false"
+                        text-input 
+                        locale="de"
+                        format="dd.MM.yyyy"
+                        auto-apply 
+                        model-type="yyyy-MM-dd"></datepicker>
+                </div>
+                <div class="col-md-3">
+                    <label for="ende" class="form-label">{{ t('global','bis') }}</label>
+                    <datepicker id="ende"
+                        :teleport="true" 
+                        v-model="currentValue.datum_bis"
+                        v-bind:enable-time-picker="false"
+                        text-input 
+                        locale="de"
+                        format="dd.MM.yyyy"
+                        auto-apply 
+                        model-type="yyyy-MM-dd"></datepicker>                   
+                </div>
+                <div class="col-md-3">
+                </div>
+                <!-- -->
+                <div class="col-md-8">
+                    <label for="bezeichnung" class="form-label">{{ t('ui','bezeichnung') }}</label>
+                    <input type="text"  :readonly="readonly" class="form-control-sm" :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly}" id="bezeichnung" v-model="currentValue.bezeichnung">
+                </div>
+                <div class="col-md-4">
+                </div>
+                
+                
+                <!-- changes -->
+                <div class="col-8">
+                    <div class="modificationdate">{{ currentValue.insertamum }}/{{ currentValue.insertvon }}, {{ currentValue.updateamum }}/{{ currentValue.updatevon }} [id={{ currentValue.benutzerfunktion_id }}]</div>
+                </div>
+                
+            </form>
+        </template>
+        <template #footer>
+            <button type="button" class="btn btn-primary" @click="okHandler()" >
+                {{ t('ui','speichern') }}
+            </button>
+        </template>
+
+    </Modal>
+
+    <ModalDialog :title="t('global','warnung')" ref="dialogRef" v-if="readonlyMode === false">
+      <template #body>
+        {{ t('person','funktionNochNichtGespeichert') }}
+      </template>
+    </ModalDialog>
+
+    <ModalDialog :title="t('global','warnung')" ref="confirmDeleteRef" v-if="readonlyMode === false">
+        <template #body>
+            {{ t('person','funktion') }} '{{ currentValue?.funktion_kurzbz }} ({{ currentValue?.datum_von }}-{{ currentValue?.datum_bis }})' {{ t('person', 'wirklichLoeschen') }}?
+        </template>
+    </ModalDialog>
+    `
+}
+
+export default Funktionen;
\ No newline at end of file
diff --git a/public/js/components/Funktionen/Modal.js b/public/js/components/Funktionen/Modal.js
new file mode 100644
index 000000000..716d9ac2a
--- /dev/null
+++ b/public/js/components/Funktionen/Modal.js
@@ -0,0 +1,48 @@
+export const Modal = {
+	name: 'Modal',
+    props: {
+        type: String,
+        title: String,
+        noscroll: Boolean
+    },
+    expose: ['show', 'hide'],
+    setup(props, { emit }) {
+       
+        let modalEle = Vue.ref(null);
+        let thisModalObj;
+
+        Vue.onMounted(() => {
+            thisModalObj = new bootstrap.Modal(modalEle.value);
+        });
+        const show = () => {
+            thisModalObj.show();
+        }
+        function hide() {
+            thisModalObj.hide();
+        }
+
+        return { modalEle, show, hide };
+    },
+
+    template:`
+    <div class="modal fade " id="customModal" tabindex="-1" aria-labelledby=""
+        aria-hidden="true" ref="modalEle">
+        <div class="modal-dialog modal-lg" :class="(!noscroll) ? 'modal-dialog-scrollable' : ''">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="customModalLabel">{{ title }}</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body">
+                    <slot name="body" />
+                </div>
+                <div class="modal-footer">
+                    <slot name="footer"></slot>
+                    <!-- button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
+                        OK
+                    </button-->
+                </div>
+            </div>
+        </div>
+    </div>`
+};
diff --git a/public/js/components/Funktionen/ModalDialog.js b/public/js/components/Funktionen/ModalDialog.js
new file mode 100644
index 000000000..c46540cae
--- /dev/null
+++ b/public/js/components/Funktionen/ModalDialog.js
@@ -0,0 +1,69 @@
+import { usePhrasen } from '../../mixins/Phrasen.js';
+
+export const ModalDialog = {
+	name: 'ModalDialog',
+    props: {
+        type: String,
+        title: String,
+    },
+    expose: ['show', 'hide'],
+    setup(props, { emit }) {
+       
+        let modalConfirmEle = Vue.ref(null);
+        let thisModalObj;
+        let _resolve;
+        let _reject;
+        const { t } = usePhrasen();
+
+        Vue.onMounted(() => {
+            thisModalObj = new bootstrap.Modal(modalConfirmEle.value);
+        });
+        
+        const show = async () => {
+            thisModalObj.show();
+            return new Promise(function (resolve, reject) {
+              _resolve = resolve;
+              _reject = reject;
+            });
+        }
+
+        function hide() {
+            thisModalObj.hide();
+        }
+
+        const ok = () => {
+            _resolve(true);
+          }
+          
+        const cancel = () =>  {
+            _resolve(false);
+        }        
+
+        return { modalConfirmEle, show, hide, ok, cancel, t };
+    },
+
+    template:`
+    <div class="modal fade " id="customModalDialog" tabindex="-1" aria-labelledby=""
+        aria-hidden="true" ref="modalConfirmEle">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="customModalDialogLabel">{{ title }}</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body">
+                    <slot name="body" />
+                </div>
+                <div class="modal-footer">
+                    <slot name="footer"></slot>
+                    <button type="button" class="btn btn-secondary" @click="cancel" data-bs-dismiss="modal">
+                      {{ t('ui','abbrechen') }}
+                    </button>
+                    <button type="button" class="btn btn-primary" @click="ok" data-bs-dismiss="modal">
+                        {{ t('ui','ok') }}
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>`
+};
diff --git a/public/js/components/Funktionen/OrgChooser.js b/public/js/components/Funktionen/OrgChooser.js
new file mode 100644
index 000000000..9c3086e76
--- /dev/null
+++ b/public/js/components/Funktionen/OrgChooser.js
@@ -0,0 +1,69 @@
+import {CoreRESTClient} from '../../../js/RESTClient';
+
+export const OrgChooser = {
+	name: 'OrgChooser',
+    props: {
+      placeholder: String,
+      customClass: String,
+      oe: String,
+    },
+    emits: ["orgSelected"],
+    setup(props, { emit }) {   
+
+      const orgList = Vue.ref([]);
+      const isFetching = Vue.ref(false);
+      const oeRef = Vue.toRefs(props).oe
+      const selected = Vue.ref();
+
+      const fetchHead = async () => {
+        isFetching.value = true
+        try {
+          const res = await CoreRESTClient.get(
+            'extensions/FHC-Core-Personalverwaltung/api/frontend/v1/OrgAPI/getOrgHeads');
+          orgList.value = CoreRESTClient.getData(res.data);
+          if (orgList.value.length > 0)  {
+            //orgList.value.reverse();
+            if (props.oe == undefined || (props.oe != null && props.oe == '')) {
+              selected.value = orgList.value[0].oe_kurzbz;
+            }
+            emit("orgSelected", selected.value);
+          }
+          isFetching.value = false          
+        } catch (error) {
+          console.log(error)
+          isFetching.value = false
+        }
+      }
+
+      Vue.onMounted(() => {
+        fetchHead();
+      })
+
+      const orgSelected = (e) => {
+        emit("orgSelected", e.target.value);
+      }
+
+      Vue.watch(
+        oeRef,
+        (val, old) => {
+          console.log('prop value changed', val);
+          selected.value = val;
+        }
+      )
+
+      return   {
+        orgList, selected,
+
+        orgSelected
+      }
+
+
+    },
+    template: `
+    <select  id="orgHeadChooser" v-model="selected" @change="orgSelected" class="form-control-sm" aria-label=".form-select-sm " >
+        <option v-for="(item, index) in orgList" :value="item.oe_kurzbz"  :key="item.oe_kurzbz">
+            {{ item.bezeichnung }}
+        </option>         
+    </select>
+    `
+}    
diff --git a/public/js/components/Funktionen/Toast.js b/public/js/components/Funktionen/Toast.js
new file mode 100644
index 000000000..6b3faba82
--- /dev/null
+++ b/public/js/components/Funktionen/Toast.js
@@ -0,0 +1,47 @@
+export const Toast = {
+	name: 'Toast',
+    props: {
+        title: {
+            text: String,
+            default: "<<Text goes here>>",
+        },
+        type: {
+            text: String,
+            default: "success",
+        }
+    },
+    expose: ['show', 'hide'],
+    setup(props) {
+
+        let toastEle = Vue.ref(null);
+        let thisToastObj;
+
+        Vue.onMounted(() => {
+            thisToastObj = new bootstrap.Toast(toastEle.value);
+        });
+
+        const show = () => {
+            thisToastObj.show();
+        }
+
+        const hide = () => {
+            thisToastObj.hide();
+        }
+
+        const backgroundColor = Vue.computed(() => {
+            return props.type == "success" ? "bg-primary"  : "bg-danger"
+        })
+
+        return { show, hide, toastEle, backgroundColor };
+
+    },
+    template: `
+    <div class="toast align-items-center text-white border-0 " :class="backgroundColor" role="alert" aria-live="assertive" aria-atomic="true" ref="toastEle">
+        <div class="d-flex">
+            <div class="toast-body">
+            <slot name="body"></slot>
+            </div>
+            <button type="button" class="btn-close btn-close-white me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button>
+        </div>
+    </div>`
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js b/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js
new file mode 100644
index 000000000..df73b6464
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js
@@ -0,0 +1,28 @@
+import PersonFunctions from "../../../Funktionen/Funktionen.js";
+/*import fhcapifactory from "../../../../apps/api/fhcapifactory.js";
+import pv21apifactory from "../../../../../extensions/FHC-Core-Personalverwaltung/js/api/api.js";
+Vue.$fhcapi = {...fhcapifactory, ...pv21apifactory};*/
+
+export default {
+   components: {
+   	PersonFunctions
+   },
+ props: {
+		   modelValue: Object,
+	   },
+   template: `
+   <div class="stv-details-functions h-100 d-flex flex-column">
+		<table-functions 
+			ref="tbl_functions" 
+			:student="modelValue">	
+		</table-functions>
+
+	   <person-functions
+		   :readonlyMode="false"
+		   :personID="modelValue.person_id"
+		   :personUID="modelValue.uid"
+	   >
+	   </person-functions>
+
+      </div>`
+};
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 1afe4a196..6c52517b6 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41453,8 +41453,31 @@ and represent the current state of research on the topic. The prescribed citatio
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
 	// PROJEKTARBEITSBEURTEILUNG SS2025 ENDE ---------------------------------------------------------------------------
+	// FHC-4 Studierendenverwaltung FUNCTIONS START
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'tab_functions',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Funktionen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Functions',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// FHC-4 Studierendenverwaltung FUNCTIONS END
+
 );
 
 

From a99721bb2204bf2dcfccd34c48406ab2e5f42dc8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 9 May 2025 09:34:12 +0200
Subject: [PATCH 147/572] feature(Dashboard Mobile): the modal to add new
 widgets distributes the space to display widgetes more evenly

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

diff --git a/public/js/components/Dashboard/Widget/Picker.js b/public/js/components/Dashboard/Widget/Picker.js
index 7ffd0671c..378c4ca9d 100644
--- a/public/js/components/Dashboard/Widget/Picker.js
+++ b/public/js/components/Dashboard/Widget/Picker.js
@@ -36,11 +36,11 @@ export default {
 		<bs-modal ref="modal" class="fade" :dialog-class="{'modal-fullscreen-sm-down': 1, 'modal-xl': widgets && widgets.length > 0}" @hiddenBsModal="close">
 			<template v-slot:title>Create new widget</template>
 			<template v-slot:default>
-				<div v-if="widgets" class="row">
+				<div v-if="widgets" class="row g-2">
 					<div v-if="!widgets.length">
 						No Widgets available
 					</div>
-					<div v-for="widget in widgets" :key="widget.widget_id" class="col-sm-6 col-md-4 col-lg-3 col-xl-2">
+					<div v-for="widget in widgets" :key="widget.widget_id" class="col-6 col-sm-6 col-md-4 col-lg-3 col-xl-2">
 						<widget-icon @select="pick" :widget="widget" ></widget-icon>
 					</div>
 				</div>

From d3dc81eae8783e8b6191ee0f76d77978df6cc4c4 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 9 May 2025 09:51:30 +0200
Subject: [PATCH 148/572] add missing fileendings in imports

---
 public/js/components/Funktionen/Funktionen.js | 2 +-
 public/js/components/Funktionen/OrgChooser.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Funktionen/Funktionen.js b/public/js/components/Funktionen/Funktionen.js
index c54628b24..0f0fd42c5 100644
--- a/public/js/components/Funktionen/Funktionen.js
+++ b/public/js/components/Funktionen/Funktionen.js
@@ -5,7 +5,7 @@ import {OrgChooser} from "./OrgChooser.js";
 import { usePhrasen } from '../../mixins/Phrasen.js';
 
 import ApiFunktion from '../../api/factory/funktionen/person.js';
-import ApiPerson from "../../../extensions/FHC-Core-Personalverwaltung/js/api/factory/person";
+import ApiPerson from "../../../extensions/FHC-Core-Personalverwaltung/js/api/factory/person.js";
 
 export const Funktionen = {
 	name: 'FunctionComponent',
diff --git a/public/js/components/Funktionen/OrgChooser.js b/public/js/components/Funktionen/OrgChooser.js
index 9c3086e76..64109cc2c 100644
--- a/public/js/components/Funktionen/OrgChooser.js
+++ b/public/js/components/Funktionen/OrgChooser.js
@@ -1,4 +1,4 @@
-import {CoreRESTClient} from '../../../js/RESTClient';
+import {CoreRESTClient} from '../../../js/RESTClient.js';
 
 export const OrgChooser = {
 	name: 'OrgChooser',

From 12415279d1b8b55e071b7e2c98dd49204361118e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 9 May 2025 14:08:49 +0200
Subject: [PATCH 149/572] hide column and formular field
 dienstverhaeltnis_unternehmen via prop

---
 public/js/components/Funktionen/Funktionen.js |  9 +++--
 .../Studentenverwaltung/Details/Funktionen.js | 34 +++++++++----------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/public/js/components/Funktionen/Funktionen.js b/public/js/components/Funktionen/Funktionen.js
index 0f0fd42c5..335edd906 100644
--- a/public/js/components/Funktionen/Funktionen.js
+++ b/public/js/components/Funktionen/Funktionen.js
@@ -23,6 +23,7 @@ export const Funktionen = {
 		personID: { type: Number, required: false },
 		personUID: { type: String, required: false },
 		writePermission: { type: Boolean, required: false },
+		showDvCompany: { tpye: Boolean, required: false, default: true }
 	},
 	emits: ['updateHeader'],
 	setup( props, { emit } ) {
@@ -197,7 +198,7 @@ export const Funktionen = {
 
 
 			const columnsDef = [
-				{ title: t('person','dv_unternehmen'), field: "dienstverhaeltnis_unternehmen", formatter: dvFormatter, sorter:"string", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
+				{ title: t('person','dv_unternehmen'), field: "dienstverhaeltnis_unternehmen", formatter: dvFormatter, sorter:"string", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"}, visible: props.showDvCompany },
 				{ title: t('person','zuordnung_taetigkeit'), field: "funktion_beschreibung", hozAlign: "left", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
 				{ title: t('lehre','organisationseinheit'), field: "funktion_oebezeichnung", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
 				{ title: t('person','wochenstunden'), field: "wochenstunden", hozAlign: "right", width: 140, headerFilter:true },
@@ -511,8 +512,10 @@ export const Funktionen = {
             <form class="row g-3" ref="jobFunctionFrm">
                             
                 <div class="col-md-8">
-                    <label class="form-label">{{ t('core','unternehmen') }}</label><br>
-                    <org-chooser  @org-selected="unternehmenSelectedHandler" :oe="unternehmen" class="form-select form-select-sm"></org-chooser>
+					<template v-if="showDvCompany">
+						<label class="form-label">{{ t('core','unternehmen') }}</label><br>
+						<org-chooser  @org-selected="unternehmenSelectedHandler" :oe="unternehmen" class="form-select form-select-sm"></org-chooser>
+					</template>
                 </div>
                 <div class="col-md-4">
                 </div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js b/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js
index df73b6464..b58c0805c 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js
@@ -1,28 +1,26 @@
 import PersonFunctions from "../../../Funktionen/Funktionen.js";
-/*import fhcapifactory from "../../../../apps/api/fhcapifactory.js";
-import pv21apifactory from "../../../../../extensions/FHC-Core-Personalverwaltung/js/api/api.js";
-Vue.$fhcapi = {...fhcapifactory, ...pv21apifactory};*/
 
 export default {
-   components: {
-   	PersonFunctions
-   },
- props: {
-		   modelValue: Object,
-	   },
-   template: `
-   <div class="stv-details-functions h-100 d-flex flex-column">
+  components: {
+    PersonFunctions,
+  },
+  props: {
+    modelValue: Object,
+  },
+  template: `
+	<div class="stv-details-functions h-100 d-flex flex-column">
 		<table-functions 
 			ref="tbl_functions" 
 			:student="modelValue">	
 		</table-functions>
 
-	   <person-functions
-		   :readonlyMode="false"
-		   :personID="modelValue.person_id"
-		   :personUID="modelValue.uid"
-	   >
-	   </person-functions>
+		<person-functions
+			:readonlyMode="false"
+			:personID="modelValue.person_id"
+			:personUID="modelValue.uid"
+			:showDvCompany="false"
+		>
+		</person-functions>
 
-      </div>`
+	</div>`,
 };

From a94b52dbc68b136d21f1c5ea0eb18a3622399148 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 12 May 2025 11:44:27 +0200
Subject: [PATCH 150/572] refactor(Dashboard touch events): fixes the touch
 event behaviors for the widgets and the dashboard

---
 public/css/components/dashboard.css       |  1 +
 public/js/components/Dashboard/Item.js    |  6 +++++-
 public/js/components/Dashboard/Section.js |  5 +++--
 public/js/components/Drop/Grid.js         | 19 +++++++++++--------
 public/js/components/Drop/Grid/Item.js    | 15 ++++++++-------
 5 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 55cd9a8ed..f48a25418 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -15,6 +15,7 @@
 	height: 100%;
 	width: 100%;
 	background-color:white;
+	position:relative;
 }
 
 .empty-tile-hover:hover {
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index b7a334b92..beaca64f0 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -41,6 +41,8 @@ export default {
 		"item_data",
 		"place",
 		"setup",
+		"dragstate",
+		"resizeOverlay"
 	],
 	computed: {
 		maxHeight(){
@@ -153,7 +155,8 @@ export default {
 			<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 		</div>
 	</div>
-	<div v-else-if="!hidden || editMode" :id="widgetID" class="dashboard-item card overflow-hidden h-100 position-relative" :class="arguments && arguments.className ? arguments.className : ''">
+	<div v-else-if="!hidden || editMode" :id="widgetID" class="dashboard-item card overflow-hidden h-100 position-relative" :class="{'draggedItem':dragstate, 'dashboard-item-overlay':resizeOverlay, [arguments?.className]:arguments && arguments.className}">
+	<div v-show="!dragstate" class="h-100 card border-0">
 		<div v-if="widget" class="card-header d-flex ps-0 pe-2 align-items-center">
 			<Transition>
 				<span v-if="editMode && !isPinned" drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
@@ -221,5 +224,6 @@ export default {
 				</template>
 			</div>
 		</height-transition>
+		</div>
 	</div>`,
 };
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 17c2ac004..fb5caa965 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -209,7 +209,7 @@ export default {
 		});
 	},
 	template: `
-	<h4 v-if="editModeIsActive" class=" mb-0">
+	<h4 v-if="editModeIsActive" class=" mb-2">
 		<i @click="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>
 		{{sectionNameTranslation()}}:
 	</h4>
@@ -217,10 +217,11 @@ export default {
 		<drop-grid v-model:cols="gridWidth" :items="items" :itemsSetup="computedWidgetsSetup" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
 				<div v-if="item.placeholder" class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
-				<div v-else-if="item.blank || (item.widgetid && item.widgetid == draggedItem?.data.widgetid)" :class="{'dashboard-item-overlay':item.resizeOverlay}" class="dashboard-item card overflow-hidden h-100 position-relative draggedItem" ></div>
 				<dashboard-item 
 					v-else
 					:id="item.widget"
+					:dragstate="item.blank || (item.widgetid && item.widgetid == draggedItem?.data.widgetid)"
+					:resizeOverlay="item.resizeOverlay"
 					:widgetID="item.id"
 					:width="item.w"
 					:height="item.h"
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 44ca0a603..54907703b 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -405,6 +405,7 @@ export default {
 			}
 		},
 		startMove(evt, item) {
+			
 			if (!this.active)
 				return;
 			
@@ -413,14 +414,15 @@ export default {
 			this.grid.h += 1;
 			this.draggedItem = item;
 			this.$emit('draggedItem',item);
-			this.draggedNode = evt.target;
+			
+			this.draggedNode = evt.target.closest(".drop-grid-item");
 			//clones the widget for the drag Image
-			let clone = evt.target.cloneNode(true);
+			let clone = evt.target.closest(".drop-grid-item")?.cloneNode(true);
+			
 			clone.style.zIndex = 5;
 			clone.classList.add("widgetClone");
 			this.$refs.container.appendChild(clone);
 			this.clonedWidget = clone;
-			
 			this.draggedOffset = [item.x - this.x, item.y - this.y];
 			this._dragStart(evt, item);
 		},
@@ -498,9 +500,10 @@ export default {
 			Array.from(document.getElementsByClassName("denied-dragging-animation"))?.forEach(ele => {
 				ele.classList.remove("denied-dragging-animation");
 			})
+			
 			let widgetClones = document.getElementsByClassName("widgetClone");
-			for(let widget of widgetClones){
-				this.$refs.container.removeChild(widget);
+			for (let i=0; i <widgetClones.length; i++){ 
+				this.$refs.container.removeChild(widgetClones[i]);
 			}
 			
 			if (!this.active || this.x < 0 || this.y < 0 || this.x >= this.cols)
@@ -614,7 +617,7 @@ export default {
 		<TransitionGroup tag="div">
 			<grid-item
 				ref="gridItems"
-				v-for="(item,index) in ((mode != 1 || mode != 2) && active ? placedItems_withPlaceholders : placedItems)"
+				v-for="(item,index) in ((mode != 1 && mode != 2) && active ? placedItems_withPlaceholders : placedItems)"
 				:key="item.data.id"
 				:item="item"
 				@start-move="startMove"
@@ -623,8 +626,8 @@ export default {
 				@start-resize="startResize"
 				@dragging="dragging"
 				@end-drag="dragCancel"
-				@drop-drag="dragEnd"
-				@touchEvent="updateCursorOnMouseMove"
+				@touch-end="dragEnd();mouseUp();"
+				@touch-start="updateCursorOnMouseMove($event); mouseDown();"
 				class="position-absolute"
 				:active="active"
 				:style="{
diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index b8acf3044..a597c4f00 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -17,7 +17,8 @@ export default {
 		"endDrag",
 		"dropDrag",
 		"item",
-		"touchEvent"
+		"touchStart",
+		"touchEnd",
 	],
 	data() {
 		return {
@@ -54,16 +55,16 @@ export default {
 		},
 		touchDragEnd(evt) {
 			if (!this.dragging)
-				//return evt.preventDefault();
-                                return;
+				return;
 			this.dragging = false;
-			this.$emit('dropDrag', evt);
+			this.$emit('touchEnd', evt);
 		},
 		touchStart(event){
-			this.$emit('touchEvent', event); 
+			this.$emit('touchStart', event); 
 			this.registerDragAction(event); 
 			this.tryDragStart(event, this.item);
-		}
+		},
+		
 	},
 	template: `
 	<div class="drop-grid-item"
@@ -73,7 +74,7 @@ export default {
 		@touchend="touchDragEnd"
 		@dragstart="tryDragStart($event, item)"
 		@drag="$emit('dragging',$event)"
-		@touchmove="$emit('dragging',$event)"
+		@touchmove.prevent="$emit('dragging',$event)"
 		@dragend="$emit('endDrag', $event)"
 		:draggable="active && !item.placeholder && dragAction != ''">
 		<slot v-bind="item"></slot>

From ed2a4679264d2c89f40af5608a15e34aa4b23a2d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 12 May 2025 13:51:20 +0200
Subject: [PATCH 151/572] refactor(Dashboard additional row): changes the UI
 and behavior to add an additional row to the grid

---
 public/css/components/dashboard.css       | 16 +++++++++
 public/js/components/Dashboard/Item.js    |  3 +-
 public/js/components/Dashboard/Section.js |  4 ++-
 public/js/components/Drop/Grid.js         | 41 ++++++++++++-----------
 4 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index f48a25418..8770c1e78 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -18,6 +18,22 @@
 	position:relative;
 }
 
+.dashboard-section > .newGridRow{
+	position:absolute;
+	width:20px;
+	height:20px;
+	padding:0;
+	bottom:0;
+	left:50%;
+	transform:translate(-50%, 50%);
+	background-color:white;
+}
+
+.newGridRow:hover {
+	color:white;
+	background-color:#6c757d;
+}
+
 .empty-tile-hover:hover {
 		background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-500 -500 1448 1512"><path fill="rgb(211, 211, 211)" d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zM200 344V280H136c-13.3 0-24-10.7-24-24s10.7-24 24-24h64V168c0-13.3 10.7-24 24-24s24 10.7 24 24v64h64c13.3 0 24 10.7 24 24s-10.7 24-24 24H248v64c0 13.3-10.7 24-24 24s-24-10.7-24-24z"/></svg>');
 }
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index beaca64f0..68a92e701 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -42,7 +42,8 @@ export default {
 		"place",
 		"setup",
 		"dragstate",
-		"resizeOverlay"
+		"resizeOverlay",
+		"additionalRow"
 	],
 	computed: {
 		maxHeight(){
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index fb5caa965..07e636cf5 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -41,6 +41,7 @@ export default {
 			gridWidth: 1,
 			gridHeight: null,
 			draggedItem:null,
+			additionalRow:false,
 		}
 	},
 	provide() {
@@ -214,7 +215,8 @@ export default {
 		{{sectionNameTranslation()}}:
 	</h4>
 	<div class="dashboard-section position-relative pb-3 border-bottom" ref="container" :style="getSectionStyle">
-		<drop-grid v-model:cols="gridWidth" :items="items" :itemsSetup="computedWidgetsSetup" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
+		<button v-if="!additionalRow && editModeIsActive" @click="additionalRow=true" class="btn btn-outline-secondary rounded-circle newGridRow d-flex justify-content-center align-items-center">+</button>
+		<drop-grid v-model:cols="gridWidth" v-model:additionalRow="additionalRow" :items="items" :itemsSetup="computedWidgetsSetup" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
 				<div v-if="item.placeholder" class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
 				<dashboard-item 
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 54907703b..9be07ca15 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -26,6 +26,10 @@ export default {
 			type: Number,
 			default: 0
 		},
+		additionalRow:{
+			type: Boolean,
+			default: false,
+		}
 	},
 	emits: [
 		"rearrangeItems",
@@ -48,7 +52,6 @@ export default {
 			draggedOffset: [0,0],
 			draggedItem: null,
 			draggedNode: null,
-			additionalRow: null,
 			reorderedItems:[],
 			clonedWidget:null,
 		}
@@ -60,6 +63,14 @@ export default {
 		},
 	},
 	computed: {
+		additionalRowComputed: {
+			get() {
+				return this.additionalRow;
+			},
+			set(value) {
+				this.$emit('update:additionalRow', value);
+			}
+		},
 		items_hashmap() {
 			let items = {};
 			this.items.forEach(item => {
@@ -120,6 +131,11 @@ export default {
 			if ((this.mode == MODE_MOVE || this.mode == MODE_RESIZE) && this.dragGrid){
 				return this.dragGrid.h;
 			}
+			if (this.mode == MODE_IDLE) {
+				if (this.additionalRowComputed) {
+					return this.grid ? (this.grid.h+1) : 1;
+				}
+			}
 			return this.grid ? this.grid.h : 1;
 		},
 		gridStyle() {
@@ -350,13 +366,8 @@ export default {
 			if (this.mode == MODE_IDLE) {
 				this.x = -1;
 				this.y = -1;
-				if (this.additionalRow !== null) {
-					let gridHeight = this.grid.getMaxY() + 1;
-					if(this.grid.h>gridHeight){
-						this.grid.h = gridHeight;
-					}
-					this.additionalRow = null;
-				}
+				this.additionalRowComputed = false;
+				
 			}
 		},
 		updateCursor(evt) {
@@ -380,18 +391,6 @@ export default {
 			if (this.x == gridX && this.y == gridY)
 				return false;
 			
-			if (this.mode == MODE_IDLE) {
-				if (this.additionalRow === null && this.y == this.rows-1 && gridY == this.rows) {
-					this.additionalRow = this.grid.h;
-					this.grid.h += 1;
-				} else if (this.additionalRow !== null && gridY != this.rows - 1) {
-					let gridHeight = this.grid.getMaxY() + 1;
-					if(this.grid.h > gridHeight){
-						this.grid.h = gridHeight;
-					}
-					this.additionalRow = null;
-				}
-			}
 			this.x = gridX;
 			this.y = gridY;
 
@@ -482,6 +481,7 @@ export default {
 			}
 		},
 		dragCancel() {
+			this.additionalRowComputed = false;
 			this.toggleDraggedItemOverlay(false);
 			this.mode = MODE_IDLE;
 			this.positionUpdates = null;
@@ -531,6 +531,7 @@ export default {
 			return updated;
 		},
 		emptyTileClicked() {
+			this.additionalRowComputed = false;
 			this.$emit('newItem', this.x, this.y);
 		},
 		updateCursorOnMouseMove(evt){

From 8e2fd6e61c1cad4a7c072414d29590568c8bf27c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 12 May 2025 13:58:06 +0200
Subject: [PATCH 152/572] refactor(searchbar local/session storage): does not
 use uuid for localStorage and only saves values to localStorage if
 searchoptions.origin is defined

---
 public/js/components/searchbar/searchbar.js | 29 +++++----------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 31f45455a..ce08e3bfd 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -85,7 +85,9 @@ export default {
     `,
     watch:{
 		'searchsettings.searchstr': function (newSearchValue, oldSearchValue) {
-			sessionStorage.setItem(`${this.searchoptions.origin}_searchstr_${uuid}`,newSearchValue);
+			if(this.searchoptions.origin){
+				sessionStorage.setItem(`${this.searchoptions.origin}_searchstr`,newSearchValue);
+			}
 		},
     },
 	computed:{
@@ -104,8 +106,8 @@ export default {
 				this.searchsettings.types = this.allSearchTypes();
 			}
 			// stores the search types in the localstorage, only if the newValue is also an array
-			if(Array.isArray(newValue)){
-				localStorage.setItem(`${this.searchoptions.origin}_searchtypes_${uuid}`, JSON.stringify(newValue));
+			if(Array.isArray(newValue), this.searchoptions.origin){
+				localStorage.setItem(`${this.searchoptions.origin}_searchtypes`, JSON.stringify(newValue));
 			}
 			this.search();
 		});
@@ -127,26 +129,9 @@ export default {
 		}
 	},
     methods: {
-		getStorageValue: function (key, sessionStorage = false){
-			const regex = new RegExp(`${this.searchoptions.origin}_${key}`);
-			if(sessionStorage){
-				for (let i = 0; i < sessionStorage.length; i++) {
-					if (sessionStorage.key(i).match(regex)) {
-						return sessionStorage.getItem(sessionStorage.key(i));
-					}
-				}
-			}
-			else{
-				for (let i =0; i < localStorage.length; i++){
-					if (localStorage.key(i).match(regex)){
-						return localStorage.getItem(localStorage.key(i));
-					}
-				}
-			}
-		},
 		getSearchTypes: function () {
 			let result = this.allSearchTypes();
-			let localStorageValue = this.getStorageValue('searchtypes');
+			let localStorageValue = localStorage.getItem('searchtypes');
 			if (localStorageValue) {
 				result = JSON.parse(localStorageValue);
 			}
@@ -160,7 +145,7 @@ export default {
 			return allTypes;
 		},
 		getSearchStr: function(){
-			return this.getStorageValue("searchstr",true) ?? '';
+			return sessionStorage.getItem("searchstr") ?? '';
 		},
 		checkSettingsVisibility: function(event) {
 			// hides the settings collapsible if the user clicks somewhere else

From dab628a72d5d2f94b18ab4c607fe53fa33b74d18 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 13 May 2025 11:48:01 +0200
Subject: [PATCH 153/572] refactor(Dashboard UX): improves user experience for
 dashboard

---
 public/css/components/dashboard.css                 | 13 +++++++++++++
 public/js/apps/Dashboard/Fhc.js                     |  1 +
 public/js/components/Dashboard/Dashboard.js         |  8 +++++++-
 public/js/components/Dashboard/Section.js           | 11 +++++------
 public/js/components/Dashboard/Widget/Picker.js     |  2 +-
 public/js/components/Dashboard/Widget/WidgetIcon.js |  2 +-
 6 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 8770c1e78..eeb24d007 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -1,6 +1,19 @@
 @import './calendar.css';
 @import './dashboard/news.css';
 
+@media (max-width: 576px){
+	.widget-icon {
+		max-height: 250px;
+		object-fit: cover;
+	}
+	.widget-icon-container{
+		max-width: 250px;
+		margin-left: auto;
+		margin-right: auto;
+	}
+}
+
+
 .empty-tile-hover {
 	height: 100%;
 	width: 100%;
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index fc25fbdfe..ada267900 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -299,6 +299,7 @@ app.use(primevue.config.default, {
 		tooltip: 8000
 	}
 })
+app.directive('tooltip', primevue.tooltip);
 app.use(PluginsPhrasen);
 app.directive('contrast', contrast);
 app.mount('#fhccontent');
\ No newline at end of file
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index a463ff20b..825bad3f7 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -177,7 +177,13 @@ export default {
 				});
 				remove.forEach(wid => this.widgetRemove(name, wid));
 			}
-			this.sections = this.sections.sort((section1, section2) => section2.widgets.length - section1.widgets.length);
+			this.sections = this.sections.sort((section1, section2) => {
+				if(section1.name == 'custom')
+					return 1;
+				if (section2.name == 'custom')
+					return -1;
+				return section2.widgets.length - section1.widgets.length;
+			});
 		}).catch(err => console.error('ERROR:', err));
 	},
 	async beforeMount() {
diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 07e636cf5..05c3f940f 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -1,5 +1,4 @@
 import BsConfirm from "../Bootstrap/Confirm.js";
-import SectionModal from "../Bootstrap/Alert.js";
 import DropGrid from '../Drop/Grid.js'
 import DashboardItem from "./Item.js";
 import CachedWidgetLoader from "../../composables/Dashboard/CachedWidgetLoader.js";
@@ -109,13 +108,13 @@ export default {
 		},
 		showSectionInformation(){
 			if (this.name == "general"){
-				SectionModal.popup(this.$p.t('dashboard', 'dashboardGeneralSectionDescription')); 
+				return this.$p.t('dashboard', 'dashboardGeneralSectionDescription'); 
 			}
 			else if(this.name == "custom"){
-				SectionModal.popup(this.$p.t('dashboard', 'dashboardCustomSectionDescription'));
+				return this.$p.t('dashboard', 'dashboardCustomSectionDescription');
 			}
 			else{
-				SectionModal.popup(this.$p.t('dashboard', 'dashboardSectionDescription', [this.name]));
+				return this.$p.t('dashboard', 'dashboardSectionDescription', [this.name]);
 			}
 		},
 		handleConfigOpened() {
@@ -211,14 +210,14 @@ export default {
 	},
 	template: `
 	<h4 v-if="editModeIsActive" class=" mb-2">
-		<i @click="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>
+		<i v-tooltip="{ value: showSectionInformation(name), hideDelay: 300 }" class="fa-solid fa-circle-info section-info" ></i>
 		{{sectionNameTranslation()}}:
 	</h4>
 	<div class="dashboard-section position-relative pb-3 border-bottom" ref="container" :style="getSectionStyle">
 		<button v-if="!additionalRow && editModeIsActive" @click="additionalRow=true" class="btn btn-outline-secondary rounded-circle newGridRow d-flex justify-content-center align-items-center">+</button>
 		<drop-grid v-model:cols="gridWidth" v-model:additionalRow="additionalRow" :items="items" :itemsSetup="computedWidgetsSetup" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
-				<div v-if="item.placeholder" class="empty-tile-hover" @click="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
+				<div v-if="item.placeholder" class="empty-tile-hover" @pointerdown="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
 				<dashboard-item 
 					v-else
 					:id="item.widget"
diff --git a/public/js/components/Dashboard/Widget/Picker.js b/public/js/components/Dashboard/Widget/Picker.js
index 378c4ca9d..46b7c50e7 100644
--- a/public/js/components/Dashboard/Widget/Picker.js
+++ b/public/js/components/Dashboard/Widget/Picker.js
@@ -40,7 +40,7 @@ export default {
 					<div v-if="!widgets.length">
 						No Widgets available
 					</div>
-					<div v-for="widget in widgets" :key="widget.widget_id" class="col-6 col-sm-6 col-md-4 col-lg-3 col-xl-2">
+					<div v-for="widget in widgets" :key="widget.widget_id" class="widget-icon-container col-sm-6 col-md-4 col-lg-3 col-xl-2">
 						<widget-icon @select="pick" :widget="widget" ></widget-icon>
 					</div>
 				</div>
diff --git a/public/js/components/Dashboard/Widget/WidgetIcon.js b/public/js/components/Dashboard/Widget/WidgetIcon.js
index a7d816cb2..76a32af8c 100644
--- a/public/js/components/Dashboard/Widget/WidgetIcon.js
+++ b/public/js/components/Dashboard/Widget/WidgetIcon.js
@@ -20,7 +20,7 @@ export default {
 	emits:["select"],
 	template: /*html */`
 	<div class="card h-100" @click="$emit('select',widget.widget_id);">
-		<img class="card-img-top" :src="path(widget.setup.icon)" :alt="'pictogram for ' + (widget.setup.name || widget.widget_kurzbz)">
+		<img class="card-img-top widget-icon" :src="path(widget.setup.icon)" :alt="'pictogram for ' + (widget.setup.name || widget.widget_kurzbz)">
 		<div class="card-body">
 			<h5 class="card-title">{{ widget.setup.name || widget.widget_kurzbz }}</h5>
 			<p class="card-text">{{ widget.beschreibung }}</p>

From 53f2776efe2303277787c64054bff2f16e29500e Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 14 May 2025 15:16:18 +0200
Subject: [PATCH 154/572] add CIS_REDIRECT_TO_CIS4 to cis config, add viewport
 meta tag and alter tw.css and mobile.css to improve layout of index.html and
 rendering of logos on mobile devices, add logic to redirect users to cis4
 after login

---
 cis/index.html                    |  1 +
 cis/index_login.php               | 23 ++++++++++++++++++++-
 config/cis.config-default.inc.php |  2 ++
 skin/styles/mobile.css            | 33 ++++++++++++++++++++++++++++++-
 skin/styles/tw.css                |  7 +++++--
 5 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/cis/index.html b/cis/index.html
index 2a3809f6f..074107e57 100644
--- a/cis/index.html
+++ b/cis/index.html
@@ -2,6 +2,7 @@
 <html>
 <head>
 	<title>CIS</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<meta charset="utf-8">
 	<link href="../skin/style.css.php" rel="stylesheet" type="text/css">
 	<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
diff --git a/cis/index_login.php b/cis/index_login.php
index 74c87f649..4040a9304 100644
--- a/cis/index_login.php
+++ b/cis/index_login.php
@@ -22,6 +22,8 @@
  */
 require_once('../config/cis.config.inc.php');
 require_once('../include/functions.inc.php');
+require_once('../include/benutzerberechtigung.class.php');
+require_once('../include/student.class.php');
 
 if(isset($_GET['login']))
 {
@@ -35,7 +37,26 @@ if(isset($_GET['login']))
 
 	if($uid!='')
 	{
-		header('Location: '.APP_ROOT.'cis/index.php');
+		$benutzerberechtigung = new benutzerberechtigung();
+		$benutzerberechtigung->getBerechtigungen($uid);
+		$student = new student();
+		$student->load($uid);
+
+		$redirectToCisneu = (defined('CIS_REDIRECT_TO_CIS4') && (true === CIS_REDIRECT_TO_CIS4));
+		$isBerechtigtCisneu = ($benutzerberechtigung->isBerechtigt('basis/cis') 
+			&& $benutzerberechtigung->isBerechtigt('dashboard/benutzer'));
+		$isValidStudent = $student->checkIfValidStudentUID($uid);
+
+		if( $redirectToCisneu && $isBerechtigtCisneu && $isValidStudent ) 
+		{
+			http_response_code(303);
+			header('Location: ' . APP_ROOT . 'cis.php');
+			exit();
+		}
+		else
+		{
+			header('Location: '.APP_ROOT.'cis/index.php');
+		}
 	}
 }
 
diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php
index b61ce9869..4f6745ce7 100644
--- a/config/cis.config-default.inc.php
+++ b/config/cis.config-default.inc.php
@@ -296,4 +296,6 @@ define ('DEFAULT_ALLIN_DIENSTVERTRAG',[111]);
 //Echter Dienstvertrag
 define ('DEFAULT_ECHTER_DIENSTVERTRAG',[103,111]);
 
+// Weiterleiten zu CIS neu (wenn Rechte vorhanden)
+define('CIS_REDIRECT_TO_CIS4', false);
 ?>
diff --git a/skin/styles/mobile.css b/skin/styles/mobile.css
index 186774433..3b691488c 100644
--- a/skin/styles/mobile.css
+++ b/skin/styles/mobile.css
@@ -935,4 +935,35 @@ table.hoverbox
 	border-style:solid;
 	border-color:grey;
 }
-*/
\ No newline at end of file
+*/
+div.header_logo
+{
+	position: absolute;
+	left: 16px;
+	top: 3%;
+	z-index: 5000;
+
+	background-image:url(styles/tw/logo_250x130.png);
+	background-repeat: no-repeat;
+	width:170px;
+	height:51px;
+	background-size: contain;
+}
+
+td.headerbar
+{
+	background-image: url(styles/tw/header.png);
+	background-position: top;
+	background-repeat: repeat-x;
+}
+
+div.cis_logo
+{
+	background-image:url(styles/tw/cis_logo_text_400x78.png);
+	background-repeat: no-repeat;
+	max-width: 400px;
+	height: 78px;
+	background-size: 100%;
+	width: 90%;
+	background-position: center;
+}
\ No newline at end of file
diff --git a/skin/styles/tw.css b/skin/styles/tw.css
index fd39adc3c..1caf01132 100644
--- a/skin/styles/tw.css
+++ b/skin/styles/tw.css
@@ -1185,13 +1185,16 @@ td.headerbar
 {
 	background-image: url(styles/tw/header.png);
 	background-position: top;
-	background-repeat: repeat-x;"
+	background-repeat: repeat-x;
 }
 
 div.cis_logo
 {
 	background-image:url(styles/tw/cis_logo_text_400x78.png);
 	background-repeat: no-repeat;
-	width: 400px;
+	max-width: 400px;
 	height: 78px;
+	background-size: 100%;
+	width: 90%;
+	background-position: center;
 }

From ebcb33b31692f4d9590b2568ca30c5103c248f24 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 15 May 2025 12:00:41 +0200
Subject: [PATCH 155/572] update(Dashboard DataStructure Migration): adds
 migration file to change all old datastructures from the
 dashboard.tbl_dashboard_preset

---
 system/dbupdate_3.4.php                       |  2 ++
 .../61730_Dashboard_Anpassungen.php           | 34 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 system/dbupdate_3.4/61730_Dashboard_Anpassungen.php

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 0e2b4e7c6..8ff7fab2b 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -74,6 +74,8 @@ require_once('dbupdate_3.4/55968_index_anrechnung.php');
 require_once('dbupdate_3.4/25999_locale_update.php');
 require_once('dbupdate_3.4/55289_pep_fine_tuning.php');
 require_once('dbupdate_3.4/55614_perm_verwaltetoe.php');
+require_once('dbupdate_3.4/61730_Dashboard_Anpassungen.php');
+
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php b/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php
new file mode 100644
index 000000000..a35c6188f
--- /dev/null
+++ b/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php
@@ -0,0 +1,34 @@
+<?php
+
+$result = @$db->db_query("SELECT preset_id FROM dashboard.tbl_dashboard_preset WHERE preset ? 'widgets'");
+$result_num_rows = $db->db_num_rows($result);
+$errorList = array();
+for($i = 0; $i < $result_num_rows; $i++)
+{
+	$row = $db->db_fetch_object($result, $i);
+
+	$qry = "
+	UPDATE dashboard.tbl_dashboard_preset
+	SET preset = 
+	COALESCE(
+	(SELECT jsonb_object_agg(keys,values) FROM (
+		SELECT key AS keys,jsonb_build_object('widgets',to_jsonb(value)) AS values
+		FROM jsonb_each(preset->'widgets')
+	) AS subquery 
+	),preset)
+	WHERE preset_id = ".$row->preset_id;
+
+	$db->db_query($qry);
+	if (!$db->db_query($qry))
+        array_push($errorList,'<br><strong>dashboard.tbl_dashboard_preset: ' . $db->db_last_error() . '</strong><br>') ;
+    
+}
+
+if(empty($errorList)){
+	echo '<br>successfully updated dashboard.tbl_dashboard_preset';
+}
+else{
+	foreach($errorList as $error){
+		echo $error;
+	}
+}

From a40f304d8d4518bd3b91b17ed3ed86c40872940c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 15 May 2025 12:05:12 +0200
Subject: [PATCH 156/572] update(Dashboard DataStructure Migration): also
 changes datastructure for the dashboard.tbl_dashboard_benuter_override

---
 .../61730_Dashboard_Anpassungen.php           | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php b/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php
index a35c6188f..e59df948a 100644
--- a/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php
+++ b/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php
@@ -24,8 +24,31 @@ for($i = 0; $i < $result_num_rows; $i++)
     
 }
 
+$result = @$db->db_query("SELECT override_id FROM dashboard.tbl_dashboard_benutzer_override WHERE override ? 'widgets'");
+$result_num_rows = $db->db_num_rows($result);
+for($i = 0; $i < $result_num_rows; $i++)
+{
+	$row = $db->db_fetch_object($result, $i);
+
+	$qry = "
+	UPDATE dashboard.tbl_dashboard_benutzer_override
+	SET override = 
+	COALESCE(
+	(SELECT jsonb_object_agg(keys,values) FROM (
+		SELECT key AS keys,jsonb_build_object('widgets',to_jsonb(value)) AS values
+		FROM jsonb_each(override->'widgets')
+	) AS subquery 
+	),override)
+	WHERE override_id = ".$row->override_id;
+
+	$db->db_query($qry);
+	if (!$db->db_query($qry))
+        array_push($errorList,'<br><strong>dashboard.tbl_dashboard_benutzer_override: ' . $db->db_last_error() . '</strong><br>') ;
+    
+}
+
 if(empty($errorList)){
-	echo '<br>successfully updated dashboard.tbl_dashboard_preset';
+	echo '<br>successfully updated dashboard.tbl_dashboard_preset and dashboard.tbl_dashboard_benutzer_override';
 }
 else{
 	foreach($errorList as $error){

From a858049e15bf4363aa97215560f67de90d55d583 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 15 May 2025 18:54:28 +0200
Subject: [PATCH 157/572] fix viewData prop validator, change nullish
 coalescing operator to logical or since optional router param is empty string
 and not an unset prop

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

diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 1ac9ad912..7a8482a3f 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -16,9 +16,9 @@ export const AbgabetoolStudent = {
 		viewData: {
 			type: Object,
 			required: true,
-			default: () => ({name: '', uid: ''}),
+			default: () => ({uid: ''}),
 			validator(value) {
-				return value && value.name && value.uid
+				return value && value.uid
 			}
 		}
 	},
@@ -186,7 +186,7 @@ export const AbgabetoolStudent = {
 			this.$refs.abgabeTable.tabulator.setData(d);
 		},
 		loadProjektarbeiten() {
-			this.$fhcApi.factory.lehre.getStudentProjektarbeiten(this.student_uid_prop ?? this.viewData?.uid ?? null)
+			this.$fhcApi.factory.lehre.getStudentProjektarbeiten(this.student_uid_prop || this.viewData?.uid || null)
 				.then(res => {
 					if(res?.data) this.setupData(res.data)
 				})

From c04c08bca4064ac706a155397b26b523c2e6e74a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 16 May 2025 08:22:19 +0200
Subject: [PATCH 158/572] finetune datepicker and timepicker config

---
 .../js/components/Cis/Raumsuche/Raumsuche.js  | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index a279fb1c0..20685fa09 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -31,6 +31,20 @@ export const Raumsuche =  {
 				hours: new Date().getHours() + 1,
 				minutes: new Date().getMinutes()
 			}),
+			datepickerTextInputOptions: {
+				enterSubmit: true,
+				tabSubmit: true,
+				selectOnFocus: true,
+				format: 'dd.MM.yyyy',
+				escClose: true
+			},
+			timepickerTextInputOptions: {
+				enterSubmit: true,
+				tabSubmit: true,
+				selectOnFocus: true,
+				format: 'HH:mm',
+				escClose: true
+			},
 			raumsucheTableOptions: {
 				height: Vue.ref(400),
 				index: 'ort_kurzbz',
@@ -135,8 +149,8 @@ export const Raumsuche =  {
 			// TODO: router push
 		},
 		dateFormat(date) {
-			const day = date.getDate();
-			const month = date.getMonth() + 1;
+			const day = String(date.getDate()).padStart(2, '0');
+			const month = String(date.getMonth() + 1).padStart(2, '0');
 			const year = date.getFullYear();
 			return `${day}.${month}.${year}`
 		},
@@ -187,7 +201,8 @@ export const Raumsuche =  {
 				date-picker
 				:enable-time-picker="false"
 				:format="dateFormat"
-				:text-input="true"
+				:text-input="datepickerTextInputOptions"
+				:min-date="new Date()"
 				auto-apply>
 			</VueDatePicker>
 		</div>
@@ -197,7 +212,8 @@ export const Raumsuche =  {
 				:clearable="false"
 				time-picker
 				:format="timeFormat"
-				:text-input="true"
+				:text-input="timepickerTextInputOptions"
+				:is-24="true"
 				auto-apply
 				>
 			</VueDatePicker>
@@ -208,7 +224,8 @@ export const Raumsuche =  {
 				:clearable="false"
 				time-picker
 				:format="timeFormat"
-				:text-input="true"
+				:text-input="timepickerTextInputOptions"
+				:is-24="true"
 				auto-apply>
 			</VueDatePicker>
 		</div>

From 875a7884760ae8a69cbde9f8bc83fcc8da2d2ce0 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 16 May 2025 09:54:05 +0200
Subject: [PATCH 159/572] update(Dashboard rows and columns): additional row is
 not removed when going out with the mouse

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

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 9be07ca15..fe39a07d2 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -363,12 +363,12 @@ export default {
 			});
 		},
 		mouseLeave() {
-			if (this.mode == MODE_IDLE) {
+			/* if (this.mode == MODE_IDLE) {
 				this.x = -1;
 				this.y = -1;
 				this.additionalRowComputed = false;
 				
-			}
+			} */
 		},
 		updateCursor(evt) {
 			if (!this.active) {

From df108482eb89652e09a65894d4ad164dbf462634 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 19 May 2025 09:09:48 +0200
Subject: [PATCH 160/572] update(Dashboard additionalRow): opens tooltip when
 hovering over the button to add a now line to the dashboard grid

---
 public/js/components/Dashboard/Section.js |  4 ++--
 system/phrasesupdate.php                  | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 05c3f940f..43031b8c1 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -210,11 +210,11 @@ export default {
 	},
 	template: `
 	<h4 v-if="editModeIsActive" class=" mb-2">
-		<i v-tooltip="{ value: showSectionInformation(name), hideDelay: 300 }" class="fa-solid fa-circle-info section-info" ></i>
+		<i v-tooltip="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>
 		{{sectionNameTranslation()}}:
 	</h4>
 	<div class="dashboard-section position-relative pb-3 border-bottom" ref="container" :style="getSectionStyle">
-		<button v-if="!additionalRow && editModeIsActive" @click="additionalRow=true" class="btn btn-outline-secondary rounded-circle newGridRow d-flex justify-content-center align-items-center">+</button>
+		<button v-tooltip="$p.t('dashboard','addLine')" v-if="!additionalRow && editModeIsActive" @click="additionalRow=true" class="btn btn-outline-secondary rounded-circle newGridRow d-flex justify-content-center align-items-center">+</button>
 		<drop-grid v-model:cols="gridWidth" v-model:additionalRow="additionalRow" :items="items" :itemsSetup="computedWidgetsSetup" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
 				<div v-if="item.placeholder" class="empty-tile-hover" @pointerdown="$emit('widgetAdd', name, { widget: 1, config: {}, place: {[gridWidth]: {x:item.x,y:item.y,w:1,h:1}}, custom: 1 })"></div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index f51e8a200..32bbb4364 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -40581,6 +40581,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'dashboard',
+		'phrase' => 'addLine',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Weitere Zeile hinzufügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add another line',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'dashboard',

From 4a10faeb252abf7e013119891ceb479e2b121552 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 19 May 2025 10:28:15 +0200
Subject: [PATCH 161/572] update(Dashboard custom Section & additionalRow): the
 additional row is not removed when moving widgets and the custom section gets
 also created when created user_overrides

---
 application/libraries/dashboard/DashboardLib.php | 2 +-
 public/js/components/Drop/Grid.js                | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
index 7aab6b949..f6d7d6599 100644
--- a/application/libraries/dashboard/DashboardLib.php
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -107,7 +107,7 @@ class DashboardLib
 		$emptyoverride = new stdClass();
 		$emptyoverride->dashboard_id = $dashboard->dashboard_id;
 		$emptyoverride->uid = $uid;
-		$emptyoverride->override = '{"' . self::USEROVERRIDE_SECTION . '": {"widgets":{}}}}';
+		$emptyoverride->override = '{"' . self::USEROVERRIDE_SECTION . '": {"widgets":{}}, "custom": { "widgets" : {}}}';
 		
 		return $emptyoverride;
 	}
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index fe39a07d2..55b9b1bbd 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -128,7 +128,11 @@ export default {
 			return [...this.placedItems, ...this.items_placeholders];
 		},
 		rows() {
-			if ((this.mode == MODE_MOVE || this.mode == MODE_RESIZE) && this.dragGrid){
+			if (this.additionalRowComputed) {
+					return this.grid ? (this.grid.h+1) : 1;
+			}
+			return this.grid ? this.grid.h : 1;
+			/* if ((this.mode == MODE_MOVE || this.mode == MODE_RESIZE) && this.dragGrid){
 				return this.dragGrid.h;
 			}
 			if (this.mode == MODE_IDLE) {
@@ -136,7 +140,7 @@ export default {
 					return this.grid ? (this.grid.h+1) : 1;
 				}
 			}
-			return this.grid ? this.grid.h : 1;
+			return this.grid ? this.grid.h : 1; */
 		},
 		gridStyle() {
 			const addH = this.active ? this.marginForExtraRow : 0;

From da118cbf0a789044226a43bfa934c074bdb9c3c7 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 19 May 2025 12:53:36 +0200
Subject: [PATCH 162/572] refactor(Studium):groups the studienplaene to their
 studienordnung, sorts the lehrveranstaltungs module and the single
 lehrveranstaltungen

---
 public/js/components/Cis/Studium/Studium.js | 54 ++++++++++++++++++++-
 1 file changed, 52 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index 30d21ed1b..e2ef65232 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -163,6 +163,27 @@ export default {
 			this.selectedStudienordnung = studienplan.preselected?.studienplan_id;
 
 			this.lehrveranstaltungen = lehrveranstaltungen;
+			this.lehrveranstaltungen.sort((lv1, lv2) => {
+				if (lv1.bezeichnung.toLowerCase() > lv2.bezeichnung.toLowerCase()) {
+					return 1;
+				} else if (lv1.bezeichnung.toLowerCase() < lv2.bezeichnung.toLowerCase()) {
+					return -1;
+				} else {
+					return 0;
+				}
+			});
+
+			this.lehrveranstaltungen.forEach((lehrveranstaltung)=>{
+				lehrveranstaltung.lehrveranstaltungen.sort((lv1,lv2)=>{
+					if (lv1.bezeichnung.toLowerCase() > lv2.bezeichnung.toLowerCase()) {
+						return 1;
+					} else if (lv1.bezeichnung.toLowerCase() < lv2.bezeichnung.toLowerCase()) {
+						return -1;
+					} else {
+						return 0;
+					}
+				})
+			})
 		},
 		studienordnungTitel(studienordnung){
 			if(!studienordnung) return "";
@@ -192,6 +213,35 @@ export default {
 			const studiengang = this.studiengaenge.find((studiengang) => studiengang.studiengang_kz == this.selectedStudiengang);
 			return `${this.selectedLehrveranstaltung?.bezeichnung} ${this.selectedLehrveranstaltung?.lehrform_kurzbz} / ${studiengang.kurzbzlang}-${this.selectedSemester} ${this.selectedLehrveranstaltung?.orgform_kurzbz} (${this.selectedStudiensemester})`;
 		},
+		computedStudienOrdnung(){
+			if(!this.studienOrdnung) return null;
+			return Object.values(this.studienOrdnung).reduce((carry, item)=>{
+				if(!carry[item.bezeichnung]){
+					carry[item.bezeichnung] = [];
+				}
+				carry[item.bezeichnung].push(item);
+				return carry;
+			},{});
+		},
+		computedStudienOrdnungSelectValues() {
+			if (!this.computedStudienOrdnung) return null;
+			let result = [];
+			Object.entries(this.computedStudienOrdnung).forEach(([key,value])=>{
+				result.push({
+					bezeichnung: `Studienordnung: ${key}`,
+					disabled: true,
+				});
+				value.forEach((studienplan)=>{
+					result.push({
+						studienplan:studienplan,
+						diabled: false,
+						bezeichnung: `${studienplan?.bezeichnung}-${studienplan?.orgform_kurzbz} ( ${studienplan?.orgform_bezeichnung}, ${studienplan?.sprache} )`
+							
+					});
+				})
+			});
+			return result;
+		},
 	},
 	
 	created(){
@@ -275,7 +325,7 @@ export default {
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="studienordnung" v-model="selectedStudienordnung" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
-				<option v-for="ordnung in studienOrdnung" @click="changeSelectedStudienPlan(ordnung.studienplan_id)" :key="ordnung.bezeichnung	" :value="ordnung.studienplan_id">{{studienordnungTitel(ordnung)}}</option>
+				<option v-for="ordnung in computedStudienOrdnungSelectValues" :disabled="ordnung.disabled" @click="changeSelectedStudienPlan(ordnung?.studienplan?.studienplan_id)" :key="ordnung?.studienplan?.bezeichnung	" :value="ordnung?.studienplan?.studienplan_id">{{ordnung.bezeichnung}}</option>
 			</select>
 			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(1)">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
@@ -291,7 +341,7 @@ export default {
 		<div  class="card" v-if="Array.isArray(lehrveranstaltung.lehrveranstaltungen) && lehrveranstaltung.lehrveranstaltungen.length >0" >
 			<div class="card-header">
 				<h5 class=" card-title">{{lehrveranstaltung.bezeichnung}}</h5>
-				<h6 class=" card-subtitle">{{lehrveranstaltung.lehrtyp_kurzbz}}</h6>
+				<h6 class=" card-subtitle">{{lehrveranstaltung.lehrform_kurzbz}}</h6>
 			</div>
 			<div class="card-body">
 				<ul class="list-group list-group-flush">

From af1364faef1def93725731531912d57c42687bff Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 20 May 2025 16:56:25 +0200
Subject: [PATCH 163/572] update(Studium):changes layout

---
 public/js/components/Cis/Studium/Studium.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index e2ef65232..fe6dab458 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -270,6 +270,7 @@ export default {
 				<h4>Lektoren:</h4>
 				<a :href="'mailto:'+lektor?.email" class="mx-2" v-for="lektor in selectedLehrveranstaltung.lektoren">{{lektor.name}}</a>
 			</div>
+			<h4>Menu:</h4>
 		</template>
 	</lv-uebersicht>
 	<div class="lvOptions">
@@ -336,7 +337,7 @@ export default {
 
 	<hr>
 
-	<div class="lvUebersicht" >
+	<div class="lvUebersicht align-items-start" >
 	<template v-for="lehrveranstaltung in lehrveranstaltungen" :key="lehrveranstaltung.lehrveranstaltung_id">
 		<div  class="card" v-if="Array.isArray(lehrveranstaltung.lehrveranstaltungen) && lehrveranstaltung.lehrveranstaltungen.length >0" >
 			<div class="card-header">
@@ -345,8 +346,9 @@ export default {
 			</div>
 			<div class="card-body">
 				<ul class="list-group list-group-flush">
-					<li class="list-group-item" v-for="lv in lehrveranstaltung.lehrveranstaltungen">
-						<a class="d-block" href="#" @click="openLvUebersicht(lv)">{{lv.bezeichnung}}</a>
+					<li class="d-flex list-group-item" v-for="lv in lehrveranstaltung.lehrveranstaltungen">
+						<a class="link-dark d-block me-auto" href="#" @click="openLvUebersicht(lv)">{{lv.bezeichnung}}</a>
+						<p>{{lv.lehrform_kurzbz}}</p>
 					</li>	
 				</ul>
 			</div>
@@ -355,7 +357,6 @@ export default {
 	</div>
 
 
-	<lv-modal v-if="selectedLehrveranstaltung" ref="modalContainer" :event="selectedLehrveranstaltung" title="test" >
 	</div>
 	
 	`

From a1423c33e5d1c40e96b01be0854f5ff0bce8ec3b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 21 May 2025 14:12:16 +0200
Subject: [PATCH 164/572] update(Studium): fetches the preselect lehrverband
 values if the user is a student

---
 .../controllers/api/frontend/v1/Studium.php   | 43 +++++++++++--------
 public/js/components/Cis/Studium/Studium.js   |  2 +-
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index ecaf72918..be2e79800 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -58,6 +58,27 @@ class Studium extends FHCAPI_Controller
 		$parameter_semester = $this->input->get('semester',true);
 		$parameter_studienplan = $this->input->get('studienplan',true);
 
+		$aktuelles_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->getAkt()));
+		
+		if($this->getDataOrTerminateWithError($this->StudentModel->isStudent(getAuthUID()))){
+			$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $aktuelles_studiensemester->studiensemester_kurzbz]);
+			$studentLehrverband = current($this->getDataOrTerminateWithError($studentLehrverband));
+			
+			$student_studiensemester = $studentLehrverband->studiensemester_kurzbz;
+			$student_studiengang = $studentLehrverband->studiengang_kz;
+			$student_semester = $studentLehrverband->semester;
+			$student_studienplan = $this->getStudienPlanFromPrestudentStatus(getAuthPersonId())->studienplan_id;
+			
+			if(!isset($parameter_studiensemester))
+			$parameter_studiensemester = $student_studiensemester;
+			if(!isset($parameter_studiengang))
+			$parameter_studiengang = $student_studiengang;
+			if(!isset($parameter_semester))
+			$parameter_semester = $student_semester;
+			if(!isset($parameter_studienplan))
+			$parameter_studienplan = $student_studienplan;
+		}  
+
 		if(isset($parameter_studiensemester)){
 			$parameter_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz" => $parameter_studiensemester])));
 		}
@@ -76,7 +97,7 @@ class Studium extends FHCAPI_Controller
 		// fetch studiensemester
 		$allStudienSemester = $this->getDataOrTerminateWithError($this->StudiensemesterModel->load());
 		
-		$aktuelles_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->getAkt()));
+		
 		if(isset($parameter_studiensemester) && !empty(array_filter($allStudienSemester, function($studiensemester) use($parameter_studiensemester){
 			return $studiensemester->studiensemester_kurzbz == $parameter_studiensemester->studiensemester_kurzbz;
 		}))){
@@ -156,24 +177,7 @@ class Studium extends FHCAPI_Controller
 		$result->studienplan["preselected"]=$aktuelles_studienplan; 
 		$result->lehrveranstaltungen=$aktuelles_lehrveranstaltungen;  
 		
-		/* if($this->getDataOrTerminateWithError($this->StudentModel->isStudent(getAuthUID()))){
-			$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $aktuelles_studiensemester_kz]);
-			$studentLehrverband = current($this->getDataOrTerminateWithError($studentLehrverband));
-			$result->studentLehrverband = $studentLehrverband;
-			//$currentStudienplan = $this->StudienplanModel->loadWhere(["studiengang_kz"=>$studentLehrverband->studiengang_kz,"semester"=>$studentLehrverband->semester, "verband"=>$studentLehrverband->verband, "gruppe"=>$studentLehrverband->gruppe]);
-			$studienplaene = $this->getDataOrTerminateWithError($this->computeStudienplaene($studentLehrverband->studiengang_kz, $studentLehrverband->studiensemester_kurzbz));
-			$result->studienPleane = $studienplaene;
-			
-			//get the studienplan for the user
-			$preselectedStudienplan = $this->getStudienPlanFromPrestudentStatus(getAuthPersonId());
-
-			//set the preselected semester
-			$preselectedSemester = $preselectedStudienplan->semester;
-			
-			//get the studienordnung for the studienplan
-			$preselectedStudienordnung = $this->getStudienOrdnungForStudienplan($preselectedStudienplan->studienplan_id);
-			
-		}  */
+		
 		$this->terminateWithSuccess($result);
 	}
 
@@ -272,6 +276,7 @@ class Studium extends FHCAPI_Controller
 		return $lektoren;
 	}
 
+
 	
 	
 }
diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index fe6dab458..9e716d7df 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -337,7 +337,7 @@ export default {
 
 	<hr>
 
-	<div class="lvUebersicht align-items-start" >
+	<div class="lvUebersicht " >
 	<template v-for="lehrveranstaltung in lehrveranstaltungen" :key="lehrveranstaltung.lehrveranstaltung_id">
 		<div  class="card" v-if="Array.isArray(lehrveranstaltung.lehrveranstaltungen) && lehrveranstaltung.lehrveranstaltungen.length >0" >
 			<div class="card-header">

From c26bb98960eb5d6186f8efc2a25144bbce59f175 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 21 May 2025 15:34:43 +0200
Subject: [PATCH 165/572] new Core Component Function

- autocomplete and dropdown field for search oes and search functions with active and non active entries
- possibility to dynamic styling of display switch, newButton in Tabulator, different editLabels
- possibility to show/hide column company
- possibility to show/hide to save function as copy
---
 .../api/frontend/v1/funktionen/Funktionen.php |  385 ++++++
 .../api/frontend/v1/stv/Config.php            |    5 +
 .../Organisationseinheit_model.php            |   68 +
 .../models/ressource/Funktion_model.php       |   22 +
 application/views/Studentenverwaltung.php     |    3 +-
 public/css/components/function.css            |    3 +
 public/js/api/factory/functions.js            |  124 ++
 public/js/components/Funktionen/Funktionen.js | 1126 ++++++++---------
 .../Funktionen/Funktionen_composition_api.js  |  622 +++++++++
 .../Studentenverwaltung/Details/Funktionen.js |   11 +-
 .../Details/FunktionenOld.js                  |   28 +
 system/phrasesupdate.php                      |  102 +-
 12 files changed, 1891 insertions(+), 608 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/funktionen/Funktionen.php
 create mode 100644 public/css/components/function.css
 create mode 100644 public/js/api/factory/functions.js
 create mode 100644 public/js/components/Funktionen/Funktionen_composition_api.js
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/FunktionenOld.js

diff --git a/application/controllers/api/frontend/v1/funktionen/Funktionen.php b/application/controllers/api/frontend/v1/funktionen/Funktionen.php
new file mode 100644
index 000000000..d6d4a0ae4
--- /dev/null
+++ b/application/controllers/api/frontend/v1/funktionen/Funktionen.php
@@ -0,0 +1,385 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Funktionen extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		//TODO(Manu) check permissions
+		parent::__construct(array(
+				'getAllFunctions' =>  ['admin:r', 'assistenz:r'],
+				'getContractFunctions' =>  ['admin:r', 'assistenz:r'],
+				'getCurrentFunctions' =>  ['admin:r', 'assistenz:r'],
+				'getAllUserFunctions' =>  ['admin:r', 'assistenz:r'],
+				'getOrgHeads' =>  ['admin:r', 'assistenz:r'],
+				'getOrgetsForCompany' => ['admin:r', 'assistenz:r'],
+				'loadAllOes' => ['admin:r', 'assistenz:r'],
+				'searchOes' => ['admin:r', 'assistenz:r'],
+				'searchFunctions' => ['admin:r', 'assistenz:r'],
+				'loadFunction' => ['admin:r', 'assistenz:r'],
+				'insertFunction' => ['admin:rw', 'assistenz:rw'],
+				'updateFunction' => ['admin:rw', 'assistenz:rw'],
+				'deleteFunction' => ['admin:rw', 'assistenz:rw'],
+			)
+		);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('form_validation');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+		]);
+
+		// Load models
+		$this->load->model('extensions/FHC-Core-Personalverwaltung/Api_model', 'ApiModel');
+		$this->load->model('ressource/Funktion_model', 'FunktionModel');
+		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
+
+		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
+	}
+
+	public function getOrgHeads()
+	{
+		$result = $this->OrganisationseinheitModel->getHeads();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function getAllUserFunctions($uid)
+	{
+		if(!$uid)
+		{
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'UID']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$sql = "
+			SELECT
+				dv.dienstverhaeltnis_id,
+				un.bezeichnung || ' (' || TO_CHAR(dv.von, 'DD.MM.YYYY') || CASE WHEN dv.bis IS NOT NULL THEN ' - ' 
+				 || TO_CHAR(dv.bis, 'DD.MM.YYYY') ELSE '' END || ')' AS dienstverhaeltnis_unternehmen ,
+				'[' || oet.bezeichnung || '] ' || oe.bezeichnung AS funktion_oebezeichnung,
+				f.beschreibung AS funktion_beschreibung,
+				bf.*,
+				fb.bezeichnung AS fachbereich_bezeichnung,
+			    CASE
+					WHEN
+						bf.datum_bis IS NOT NULL AND bf.datum_bis::date < now()::date
+					THEN
+						false
+					ELSE
+						true
+				END aktiv
+			FROM
+				public.tbl_benutzerfunktion bf
+			JOIN
+				public.tbl_organisationseinheit oe ON oe.oe_kurzbz = bf.oe_kurzbz
+			JOIN
+				public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
+            JOIN
+				public.tbl_funktion f ON f.funktion_kurzbz = bf.funktion_kurzbz
+			LEFT JOIN
+				hr.tbl_vertragsbestandteil_funktion vf ON vf.benutzerfunktion_id = bf.benutzerfunktion_id
+			LEFT JOIN
+				hr.tbl_vertragsbestandteil v ON vf.vertragsbestandteil_id = v.vertragsbestandteil_id
+			LEFT JOIN
+				hr.tbl_dienstverhaeltnis dv ON v.dienstverhaeltnis_id = dv.dienstverhaeltnis_id
+			LEFT JOIN
+				public.tbl_organisationseinheit un ON dv.oe_kurzbz = un.oe_kurzbz
+			LEFT JOIN
+				public.tbl_fachbereich fb ON fb.fachbereich_kurzbz = bf.fachbereich_kurzbz
+            WHERE
+				bf.uid = ?
+            ORDER BY
+				f.beschreibung, bf.datum_von ASC";
+
+		$benutzerfunktionen = $this->BenutzerfunktionModel->execReadOnlyQuery($sql, array($uid));
+		$data = $this->getDataOrTerminateWithError($benutzerfunktionen);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	//TODO(Manu) DELETE
+	public function DEPR_getCurrentFunctions($uid, $companyOrgetkurzbz)
+	{
+	$sql = "
+		SELECT
+			bf.benutzerfunktion_id, f.beschreibung || ', '
+			|| oe.bezeichnung || ' [' || oet.bezeichnung || '], '
+			|| COALESCE(to_char(bf.datum_von, 'dd.mm.YYYY'), 'n/a')
+			|| ' - ' || COALESCE(to_char(bf.datum_bis, 'dd.mm.YYYY'), 'n/a')
+			|| COALESCE(dvu.attachedtovb, '') AS label
+
+			FROM (
+			WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) as
+			(
+			SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit
+			WHERE oe_kurzbz = ?
+			UNION ALL
+			SELECT o.oe_kurzbz, o.oe_parent_kurzbz FROM public.tbl_organisationseinheit o, oes
+			WHERE o.oe_parent_kurzbz=oes.oe_kurzbz
+			)
+			SELECT oe_kurzbz
+			FROM oes
+			GROUP BY oe_kurzbz
+			) c
+			JOIN public.tbl_organisationseinheit oe ON oe.oe_kurzbz = c.oe_kurzbz
+			JOIN public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
+			JOIN public.tbl_benutzerfunktion bf ON bf.oe_kurzbz = oe.oe_kurzbz
+			JOIN public.tbl_funktion f ON f.funktion_kurzbz = bf.funktion_kurzbz
+			LEFT JOIN (
+			SELECT
+			benutzerfunktion_id, ' [DV]' AS attachedtovb
+			FROM
+			hr.tbl_vertragsbestandteil_funktion
+			GROUP BY
+			benutzerfunktion_id
+			) dvu ON dvu.benutzerfunktion_id = bf.benutzerfunktion_id
+			WHERE bf.uid = ?
+			ORDER BY f.beschreibung ASC";
+
+		$benutzerfunktionen = $this->BenutzerfunktionModel->execReadOnlyQuery($sql, array( $companyOrgetkurzbz,$uid));
+		$data = $this->getDataOrTerminateWithError($benutzerfunktionen);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/*
+	 * return list of child orgets for a given company orget_kurzbz
+	 * as key value list to be used in select or autocomplete
+	 */
+	public function getOrgetsForCompany($companyOrgetkurzbz=null)
+	{
+		$sql = "
+			SELECT
+				oe.oe_kurzbz,
+				'[' || COALESCE(oet.bezeichnung, oet.organisationseinheittyp_kurzbz) ||
+				'] ' || COALESCE(oe.bezeichnung, oe.oe_kurzbz) AS label
+			FROM (
+					WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) as
+					(
+						SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit
+						WHERE oe_kurzbz=?
+						UNION ALL
+						SELECT o.oe_kurzbz, o.oe_parent_kurzbz FROM public.tbl_organisationseinheit o, oes
+						WHERE o.oe_parent_kurzbz=oes.oe_kurzbz
+					)
+					SELECT oe_kurzbz
+					FROM oes
+					GROUP BY oe_kurzbz
+			) c
+			JOIN public.tbl_organisationseinheit oe ON oe.oe_kurzbz = c.oe_kurzbz
+			JOIN public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
+			ORDER BY oet.bezeichnung ASC, oe.bezeichnung ASC";
+
+		$childorgets = $this->OrganisationseinheitModel->execReadOnlyQuery($sql, array($companyOrgetkurzbz));
+		$data = $this->getDataOrTerminateWithError($childorgets);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	//TODO(Manu) DELETE
+	/*
+	 * List of Oes for autocomplete field organisation unit
+	 */
+	public function DEPR_loadAllOes($filterStudent=false, $aktiv=true)
+	{
+		$sql = "
+			SELECT
+			    oe_kurzbz,
+			    CONCAT('[', organisationseinheittyp_kurzbz, '] ', bezeichnung) as label
+			FROM public.tbl_organisationseinheit 
+			WHERE aktiv = ?";
+
+		if($filterStudent)
+			$sql .= " AND organisationseinheittyp_kurzbz in ('Studiengang','Lehrgang')";
+
+		$sql .= " ORDER BY organisationseinheittyp_kurzbz, bezeichnung";
+
+		$result = $this->OrganisationseinheitModel->execReadOnlyQuery($sql, array($aktiv));
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	public function searchOes($companyOrgetKurzbz, $searchString = null)
+	{
+		$result = $this->OrganisationseinheitModel->getAutocompleteSuggestionsWithCompany($companyOrgetKurzbz, $searchString);
+		if (isError($result)) {
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess($result ?: []);
+	}
+
+	public function searchFunctions($searchString = null)
+	{
+
+		$result = $this->FunktionModel->getAutocompleteSuggestions($searchString);
+		if (isError($result)) {
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess($result ?: []);
+	}
+
+	public function loadFunction($benutzerfunktion_id)
+	{
+		$this->BenutzerfunktionModel->addSelect("*");
+		$result = $this->BenutzerfunktionModel->loadWhere(
+			array('benutzerfunktion_id' => $benutzerfunktion_id)
+		);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function insertFunction()
+	{
+		$this->load->library('form_validation');
+		$authUID = getAuthUID();
+
+		$uid = $this->input->post('uid');
+
+		if(!$uid)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'UID']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$formData = $this->input->post('formData');
+
+		$datum_von = $formData['datum_von'] ?? null;
+		$datum_bis = $formData['datum_bis'] ?? null;
+		$formData['oe_kurzbz'] = is_array($formData['oe_kurzbz']) ? $formData['oe_kurzbz']['oe_kurzbz'] : $formData['oe_kurzbz'];
+		$formData['funktion_kurzbz'] = is_array($formData['funktion_kurzbz'])
+			? $formData['funktion_kurzbz']['funktion_kurzbz']
+			: $formData['funktion_kurzbz'];
+		$bezeichnung = $formData['bezeichnung'] ?? null;
+		$wochenstunden = $formData['wochenstunden'] ?? null;
+
+		$this->form_validation->set_data($formData);
+		$this->form_validation->set_rules('datum_von', 'VonDatum', 'required|is_valid_date', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'VonDatum']),
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VonDatum'])
+		]);
+		$this->form_validation->set_rules('datum_bis', 'BisDatum', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'BisDatum'])
+		]);
+		$this->form_validation->set_rules('oe_kurzbz', 'Organisationseinheit', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Organisationseinheit'])
+		]);
+		$this->form_validation->set_rules('funktion_kurzbz', 'Funktion', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Funktion'])
+		]);
+		$this->form_validation->set_rules('wochenstunden', 'Wochenstunden', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Wochenstunden'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$result = $this->BenutzerfunktionModel->insert([
+			'uid' => $uid,
+			'datum_von' => $datum_von,
+			'datum_bis' => $datum_bis ,
+			'oe_kurzbz' => 	$formData['oe_kurzbz'],
+			'funktion_kurzbz' => $formData['funktion_kurzbz'],
+			'bezeichnung' => $bezeichnung,
+			'wochenstunden' => $wochenstunden,
+			'insertamum' => date('c'),
+			'insertvon' => $authUID,
+		]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function updateFunction()
+	{
+		$this->load->library('form_validation');
+		$authUID = getAuthUID();
+
+		$uid = $this->input->post('uid');
+
+		if(!$uid)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'UID']), self::ERROR_TYPE_GENERAL);
+		}
+		$benutzerfunktion_id = $this->input->post('benutzerfunktion_id');
+
+		if(!$benutzerfunktion_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Benutzerfunktion ID']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$formData = $this->input->post('formData');
+
+		$datum_von = $formData['datum_von'] ?? null;
+		$datum_bis = $formData['datum_bis'] ?? null;
+		$formData['oe_kurzbz'] = is_array($formData['oe_kurzbz']) ? $formData['oe_kurzbz']['oe_kurzbz'] : $formData['oe_kurzbz'];
+		$formData['funktion_kurzbz'] = is_array($formData['funktion_kurzbz'])
+			? $formData['funktion_kurzbz']['funktion_kurzbz']
+			: $formData['funktion_kurzbz'];
+		$bezeichnung = $formData['bezeichnung'] ?? null;
+		$wochenstunden = $formData['wochenstunden'] ?? null;
+
+		$this->form_validation->set_data($formData);
+		$this->form_validation->set_rules('datum_von', 'VonDatum', 'required|is_valid_date', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'VonDatum']),
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'VonDatum'])
+		]);
+		$this->form_validation->set_rules('datum_bis', 'BisDatum', 'is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'BisDatum'])
+		]);
+		$this->form_validation->set_rules('oe_kurzbz', 'Organisationseinheit', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Organisationseinheit'])
+		]);
+		$this->form_validation->set_rules('funktion_kurzbz', 'Funktion', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Funktion'])
+		]);
+		$this->form_validation->set_rules('wochenstunden', 'Wochenstunden', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Wochenstunden'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$result = $this->BenutzerfunktionModel->update(
+			[
+				'benutzerfunktion_id' => $benutzerfunktion_id,
+			],
+			[
+				'uid' => $uid,
+				'datum_von' => $datum_von,
+				'datum_bis' => $datum_bis ,
+				'oe_kurzbz' => 	$formData['oe_kurzbz'],
+				'funktion_kurzbz' => $formData['funktion_kurzbz'],
+				'bezeichnung' => $bezeichnung,
+				'wochenstunden' => $wochenstunden,
+				'updateamum' => date('c'),
+				'updatevon' => $authUID,
+			]
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+
+	public function deleteFunction($benutzerfunktion_id)
+	{
+		$result = $this->BenutzerfunktionModel->delete(
+			array('benutzerfunktion_id' => $benutzerfunktion_id)
+		);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$this->terminateWithSuccess($data);
+	}
+}
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index d37a6d6ec..f22f888de 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -132,6 +132,11 @@ class Config extends FHCAPI_Controller
 			'title' => $this->p->t('stv', 'tab_functions'),
 			'component' => './Stv/Studentenverwaltung/Details/Funktionen.js'
 		];
+/*		TODO(Manu) REMOVE just for Testing*/
+		$result['functions_composition'] = [
+			'title' => 'F_PV21',
+			'component' => './Stv/Studentenverwaltung/Details/FunktionenOld.js'
+		];
 
 		Events::trigger('stv_conf_student', function & () use (&$result) {
 			return $result;
diff --git a/application/models/organisation/Organisationseinheit_model.php b/application/models/organisation/Organisationseinheit_model.php
index 1b1a826aa..b146ee7e5 100644
--- a/application/models/organisation/Organisationseinheit_model.php
+++ b/application/models/organisation/Organisationseinheit_model.php
@@ -217,4 +217,72 @@ class Organisationseinheit_model extends DB_Model
 			oe_kurzbz ILIKE '%". $this->escapeLike($eventQuery). "%'
 		");
 	}
+
+	/**
+	 * Get OEs by eventQuery string and companyOrgetKurzbz
+	 * Use with autocomplete event queries in Function Component
+	 * @param $searchString String
+	 * @param $companyOrgetKurzbz String oe_kurzbz of the company (gst vs gmbh)
+	 * @return array
+	 */
+	public function getAutocompleteSuggestionsWithCompany($companyOrgetKurzbz, $searchString)
+	{
+		$sql = "
+        WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) AS (
+            SELECT oe_kurzbz, oe_parent_kurzbz
+            FROM public.tbl_organisationseinheit
+            WHERE oe_kurzbz = ?
+            UNION ALL
+            SELECT o.oe_kurzbz, o.oe_parent_kurzbz
+            FROM public.tbl_organisationseinheit o
+            INNER JOIN oes ON o.oe_parent_kurzbz = oes.oe_kurzbz
+        )
+        SELECT
+            oe.oe_kurzbz, oe.aktiv,
+            '[' || COALESCE(oet.bezeichnung, oet.organisationseinheittyp_kurzbz) ||
+            '] ' || COALESCE(oe.bezeichnung, oe.oe_kurzbz) AS label
+        FROM (
+            SELECT oe_kurzbz FROM oes GROUP BY oe_kurzbz
+        ) c
+        JOIN public.tbl_organisationseinheit oe ON oe.oe_kurzbz = c.oe_kurzbz
+        JOIN public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
+    ";
+
+		$params = [$companyOrgetKurzbz];
+
+		if (!empty($searchString)) {
+			$escaped = $this->escapeLike($searchString);
+			$ilike = '%' . $escaped . '%';
+
+			$sql .= "
+            WHERE
+                oe.oe_kurzbz ILIKE ? OR
+                oe.bezeichnung ILIKE ? OR
+                oe.organisationseinheittyp_kurzbz ILIKE ?
+        ";
+
+			$params[] = $ilike;
+			$params[] = $ilike;
+			$params[] = $ilike;
+		}
+
+		$sql .= " ORDER BY oet.bezeichnung ASC, oe.bezeichnung ASC";
+
+		$result = $this->execQuery($sql, $params);
+
+		return $result;
+	}
+
+
+	/**
+	 * get highest organisation units
+	 */
+	public function getHeads()
+	{
+		$this->addSelect('*');
+		$this->addSelect('oe_kurzbz as head');
+		$result = $this->loadWhere(array('oe_parent_kurzbz' => null, 'aktiv' => true));
+
+		return $result;
+	}
 }
diff --git a/application/models/ressource/Funktion_model.php b/application/models/ressource/Funktion_model.php
index 43908167c..60965b438 100644
--- a/application/models/ressource/Funktion_model.php
+++ b/application/models/ressource/Funktion_model.php
@@ -11,4 +11,26 @@ class Funktion_model extends DB_Model
 		$this->dbTable = 'public.tbl_funktion';
 		$this->pk = 'funktion_kurzbz';
 	}
+
+	/**
+	 * Get Functions by eventQuery string. Use with autocomplete event queries in Function Component
+	 * @param $eventQuery String
+	 * @return array
+	 */
+	public function getAutocompleteSuggestions($eventQuery)
+	{
+		$this->addSelect('funktion_kurzbz, beschreibung, aktiv');
+		$this->addSelect("beschreibung AS label");
+		$this->addOrder('beschreibung', 'ASC');
+
+		if($eventQuery === null)
+		{
+			return $this->load();
+		}
+
+		return $this->loadWhere("
+			funktion_kurzbz ILIKE '%". $this->escapeLike($eventQuery). "%'
+			OR beschreibung ILIKE '%". $this->escapeLike($eventQuery). "%'
+		");
+	}
 }
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index 398b921d2..a1b7fe347 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -18,7 +18,8 @@
 			#datepicker fuer component functions
 			'public/css/components/vue-datepicker.css',
 			'public/css/components/primevue.css',
-			'public/css/Studentenverwaltung.css'
+			'public/css/Studentenverwaltung.css',
+			'public/css/components/function.css'
 		],
 		'customJSs' => [
 			'vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js'
diff --git a/public/css/components/function.css b/public/css/components/function.css
new file mode 100644
index 000000000..3e5e4a632
--- /dev/null
+++ b/public/css/components/function.css
@@ -0,0 +1,3 @@
+.item-inactive {
+    text-decoration: line-through;
+}
\ No newline at end of file
diff --git a/public/js/api/factory/functions.js b/public/js/api/factory/functions.js
new file mode 100644
index 000000000..ac717050a
--- /dev/null
+++ b/public/js/api/factory/functions.js
@@ -0,0 +1,124 @@
+/**
+ * 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 {
+	getContractFunctions(filter) {
+		var url = 'api/frontend/v1/funktionen/Funktionen/getContractFunctions';
+		if( typeof filter !== 'undefined' && filter !== null ) {
+			url = url + '/' + filter;
+		}
+		return {
+			method: 'get',
+			url,
+		};
+
+	},
+	getOrgHeads() {
+		var url = 'api/frontend/v1/funktionen/Funktionen/getOrgHeads';
+		return {
+			method: 'get',
+			url,
+		};
+	},
+	getOrgetsForCompany(unternehmen) {
+		var url = 'api/frontend/v1/funktionen/Funktionen/getOrgetsForCompany'
+			+ '/' + unternehmen;
+		return {
+			method: 'get',
+			url,
+		};
+	},
+	loadAllOes(filterStudent) {
+		var url = 'api/frontend/v1/funktionen/Funktionen/loadAllOes'
+			+ '/' + filterStudent;
+		return {
+			method: 'get',
+			url,
+		};
+	},
+	getCompanyByOrget(orget) {
+		var url = 'api/frontend/v1/funktionen/Funktionen/getCompanyByOrget'
+			+ '/' + orget;
+		return {
+			method: 'get',
+			url,
+		};
+	},
+	getCurrentFunctions(mitarbeiter_uid, unternehmen) {
+		var url = 'api/frontend/v1/funktionen/Funktionen/getCurrentFunctions'
+			+ '/' + mitarbeiter_uid + '/' + unternehmen;
+		return {
+			method: 'get',
+			url,
+		};
+	}  ,
+	getAllUserFunctions(mitarbeiter_uid) {
+		var url = 'api/frontend/v1/funktionen/Funktionen/getAllUserFunctions'
+			+ '/' + mitarbeiter_uid;
+		return {
+			method: 'get',
+			url,
+		};
+	},
+	getAllFunctions() {
+		var url = 'api/frontend/v1/funktionen/Funktionen/getAllFunctions';
+		return {
+			method: 'get',
+			url,
+		};
+	},
+	addFunction(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/funktionen/Funktionen/insertFunction/',
+			params
+		};
+	},
+	loadFunction(benutzerfunktion_id) {
+		var url = 'api/frontend/v1/funktionen/Funktionen/loadFunction'
+			+ '/' + benutzerfunktion_id;
+		return {
+			method: 'get',
+			url,
+		};
+	},
+	updateFunction(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/funktionen/Funktionen/updateFunction/',
+			params
+		};
+	},
+	deleteFunction(benutzerfunktion_id) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/funktionen/Funktionen/deleteFunction/' + benutzerfunktion_id
+		};
+	},
+	getOes(head, searchString) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/funktionen/Funktionen/searchOes/' + head + '/' + searchString
+		};
+	},
+	getFunctions(searchString) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/funktionen/Funktionen/searchFunctions/' + searchString
+		};
+	}
+
+};
\ No newline at end of file
diff --git a/public/js/components/Funktionen/Funktionen.js b/public/js/components/Funktionen/Funktionen.js
index 335edd906..9618bdf9b 100644
--- a/public/js/components/Funktionen/Funktionen.js
+++ b/public/js/components/Funktionen/Funktionen.js
@@ -1,623 +1,547 @@
-import { Modal } from './Modal.js';
-import { ModalDialog } from './ModalDialog.js';
-import { Toast } from './Toast.js';
-import {OrgChooser} from "./OrgChooser.js";
-import { usePhrasen } from '../../mixins/Phrasen.js';
+import {CoreFilterCmpt} from "../filter/Filter.js";
+import FormInput from "../Form/Input.js";
+import FormForm from "../Form/Form.js";
+import BsModal from "../Bootstrap/Modal.js";
+import PvAutoComplete from "../../../../index.ci.php/public/js/components/primevue/autocomplete/autocomplete.esm.min.js";
 
-import ApiFunktion from '../../api/factory/funktionen/person.js';
-import ApiPerson from "../../../extensions/FHC-Core-Personalverwaltung/js/api/factory/person.js";
+import ApiCoreFunktion from '../../api/factory/functions.js';
 
-export const Funktionen = {
+export default {
 	name: 'FunctionComponent',
 	components: {
-		Modal,
-		ModalDialog,
-		Toast,
-		OrgChooser,
-		"datepicker": VueDatePicker
+		CoreFilterCmpt,
+		FormInput,
+		FormForm,
+		BsModal,
+		PvAutoComplete
 	},
 	props: {
-		modelValue: { type: Object, default: () => ({}), required: false},
-		config: { type: Object, default: () => ({}), required: false},
-		readonlyMode: { type: Boolean, required: false, default: false },
-		personID: { type: Number, required: false },
-		personUID: { type: String, required: false },
-		writePermission: { type: Boolean, required: false },
-		showDvCompany: { tpye: Boolean, required: false, default: true }
+		modelValue: {
+			type: Object,
+			default: () => ({}),
+			required: false
+		},
+		config: {type: Object, default: () => ({}), required: false},
+		readonlyMode: {type: Boolean, required: false, default: false},
+		personID: {type: Number, required: true},
+		personUID: {type: String, required: true},
+		writePermission: {type: Boolean, required: false},
+		showDvCompany: {type: Boolean, required: false, default: true},
+		saveFunctionAsCopy: {type: Boolean, required: false, default: false},
+		stylePv21: {type: Boolean, required: false, default: false},
+		companyLinkFormatter: {type: Function || null,	default: null}
 	},
-	emits: ['updateHeader'],
-	setup( props, { emit } ) {
-
-		const $api = Vue.inject('$api');
-		//const fhcAlert = Vue.inject('$fhcAlert');
-
-
-		const readonly = Vue.ref(false);
-
-		const { t } = usePhrasen();
-
-		//const { personID: currentPersonID , personUID: currentPersonUID  } = Vue.toRefs(props);
-		const currentPersonID = Vue.computed(() => { return props.personID });
-		const currentPersonUID = Vue.computed(() => { return props.personUID });
-
-		const dialogRef = Vue.ref();
-
-		const isFetching = Vue.ref(false);
-
-		const theModel = Vue.computed({
-			get: () => props.modelValue,
-			set: (value) => emit('update:modelValue', value),
-		});
-
-		const unternehmen = Vue.ref();
-		const jobfunctionList = Vue.ref([]);
-		const jobfunctionDefList = Vue.ref([]);
-		const orgUnitList = Vue.ref([{value: '', label: '-'}]);
-
-		const aktivChecked = Vue.ref(true);
-
-		const table = Vue.ref(null); // reference to your table element
-		const tabulator = Vue.ref(null); // variable to hold your table
-		const tableData = Vue.reactive([]); // data for table to display
-
-
-		const full = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
-		const route = ( props.readonlyMode !== true ) ? VueRouter.useRoute() : null;
-
-		const convertArrayToObject = (array, key) => {
-			const initialValue = {};
-			return array.reduce((obj, item) => {
-				return {
-					...obj,
-					[item[key]]: item,
-				};
-			}, initialValue);
-		};
-
-		const fetchData = async () => {
-			if (currentPersonID.value==null && theModel.value.personID==null) {
-				jobfunctionList.value = [];
-				return;
-			}
-			isFetching.value = true
-
-			// fetch data and map them for easier access
-			try {
-				const response = await $api.call(
-					ApiFunktion.getAllUserFunctions(theModel.value.personUID || currentPersonUID.value));
-				if(response.error === 1) {
-					let rawList = [];
-					tableData.value = [];
-					jobfunctionList.value = convertArrayToObject(rawList, 'benutzerfunktion_id');
-				} else {
-					let rawList = response.retval;
-					tableData.value = response.retval;
-					jobfunctionList.value = convertArrayToObject(rawList, 'benutzerfunktion_id');
-				}
-			} catch (error) {
-				console.log(error)
-			} finally {
-				isFetching.value = false
-			}
-
-		}
-
-		const createShape = () => {
-			return {
-				benutzerfunktion_id: 0,
-				uid: theModel.value.personUID || currentPersonUID.value,
-				oe_kurzbz: "",
-				funktion_kurzbz: "",
-				datum_von: "",
-				datum_bis: "",
-				bezeichnung: "",
-				wochenstunden: 0,
-			}
-		}
-
-		const currentValue = Vue.ref(createShape());
-		const preservedValue = Vue.ref(createShape());
-
-		Vue.watch([currentPersonID, currentPersonUID], ([id,uid]) => {
-			fetchData();
-		});
-
-		Vue.watch(unternehmen, (unternehmen_kurzbz) => {
-			fetchOrgUnits(unternehmen_kurzbz);
-			fetchFunctions();
-		});
-
-		const toggleMode = async () => {
-			if (!readonly.value) {
-				// cancel changes?
-				if (hasChanged.value) {
-					const ok = await dialogRef.value.show();
-					if (ok) {
-						console.log("ok=", ok);
-						currentValue.value = preservedValue.value;
-					} else {
-						return
-					}
-				}
-			} else {
-				// switch to edit mode and preserve data
-				preservedValue.value = {...currentValue.value};
-			}
-			readonly.value = !readonly.value;
-		}
-
-		Vue.onMounted(async () => {
-			currentValue.value = createShape();
-			await fetchData();
-
-			const dateFormatter = (cell) => {
-				return cell.getValue()?.replace(/(.*)-(.*)-(.*)/, '$3.$2.$1');
-			}
-
-			const dvFormatter = (cell) => {
-				if( props.readonlyMode === true ) {
-					return (cell.getValue() != null) ? cell.getValue() : '';
-				}
-				const url = fullPath + route.params.id + '/' + route.params.uid + '/contract/' + cell.getRow().getData().dienstverhaeltnis_id;
-				return cell.getValue() != null ? `<a href="${url}">` + cell.getValue() + '</a>' : '';
-			}
-
-			// helper
-			const createDomButton = (classValue, clickHandler) => {
-				const nodeBtn = document.createElement("button");
-				const classAttrBtn = document.createAttribute("class");
-				classAttrBtn.value = "btn btn-outline-secondary btn-sm";
-				nodeBtn.setAttributeNode(classAttrBtn);
-				nodeBtn.addEventListener("click", clickHandler);
-				const nodeI = document.createElement("i");
-				const classAttrI = document.createAttribute("class");
-				classAttrI.value = classValue;
-				nodeI.setAttributeNode(classAttrI);
-				nodeBtn.appendChild(nodeI);
-				return nodeBtn;
-			}
-
-			const btnFormatter = (cell) => {
-
-				const nodeDiv = document.createElement("div");
-				const classAttrDiv = document.createAttribute("class");
-				classAttrDiv.value = "d-grid gap-2 d-md-flex justify-content-end align-middle";
-				nodeDiv.setAttributeNode(classAttrDiv);
-				// delete button
-				const nodeBtnDel = createDomButton("fa fa-xmark",() => { showDeleteModal(cell.getValue()) })
-				// edit button
-				const nodeBtnEdit = createDomButton("fa fa-pen",() => { showEditModal(cell.getValue()) })
-
-				if( cell.getRow().getData().dienstverhaeltnis_unternehmen === null ) {
-					nodeDiv.appendChild(nodeBtnEdit);
-					nodeDiv.appendChild(nodeBtnDel);
-				}
-
-				return nodeDiv;
-			}
-
-
-			const columnsDef = [
-				{ title: t('person','dv_unternehmen'), field: "dienstverhaeltnis_unternehmen", formatter: dvFormatter, sorter:"string", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"}, visible: props.showDvCompany },
-				{ title: t('person','zuordnung_taetigkeit'), field: "funktion_beschreibung", hozAlign: "left", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
-				{ title: t('lehre','organisationseinheit'), field: "funktion_oebezeichnung", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
-				{ title: t('person','wochenstunden'), field: "wochenstunden", hozAlign: "right", width: 140, headerFilter:true },
-				{ title: t('ui','from'), field: "datum_von", hozAlign: "center", formatter: dateFormatter, width: 140, sorter:"string", headerFilter:true, headerFilterFunc:customHeaderFilter },
-				{ title: t('global','bis'), field: "datum_bis", hozAlign: "center", formatter: dateFormatter, width: 140, sorter:"string", headerFilter:true, headerFilterFunc:customHeaderFilter },
-				{ title: t('ui','bezeichnung'), field: "bezeichnung", hozAlign: "left", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} }
-			];
-
-			if( props.readonlyMode === false) {
-				columnsDef.push({ title: "", field: "benutzerfunktion_id", formatter: btnFormatter, hozAlign: "right", width: 100, headerSort: false, frozen: true });
-			}
-
-			let tabulatorOptions = {
-				height: "100%",
-				layout: "fitColumns",
-				movableColumns: true,
-				reactiveData: true,
-				columns: columnsDef,
-				//data: tableData.value,
-				data: jobfunctionListArray.value,
-			};
-
-			tabulator.value = new Tabulator(
-				table.value,
-				tabulatorOptions
-			);
-
-			function customHeaderFilter(headerValue, rowValue, rowData, filterParams){
-				//headerValue - the value of the header filter element
-				//rowValue - the value of the column in this row
-				//rowData - the data for the row being filtered
-				//filterParams - params object passed to the headerFilterFuncParams property
-
-				const validDate = function(d){
-					return d instanceof Date && isFinite(d);
-				}
-
-				const date1 = new Date(rowValue);
-				date1.setHours(0,0,0,0);
-				let [day, month, year] = headerValue.split('.')
-				if (year < 1000) return true;  // prevents dates like 17.5.2
-				const date2 = new Date(+year, +month - 1, +day);
-
-				return  !(validDate(date2)) || ((date2 - date1) == 0); //must return a boolean, true if it passes the filter.
-			}
-
-			tabulator.value.on('tableBuilt', () => {
-				//tabulator.value.setData(tableData.value);
-
-			})
-
-		})
-
-		const jobfunctionListArray = Vue.computed(() => {
-			let temp = (jobfunctionList.value ? Object.values(jobfunctionList.value) : []);
-			let filtered = temp.filter((e) => ( !aktivChecked.value || (aktivChecked.value && e.aktiv) ));
-			return filtered;
-		});
-
-		// Workaround to update tabulator
-		Vue.watch(jobfunctionListArray, (newVal, oldVal) => {
-			console.log('jobfunctionList changed');
-			tabulator.value?.setData(jobfunctionListArray.value);
-		}, {deep: true})
-
-		// Modal
-		const modalRef = Vue.ref();
-		const confirmDeleteRef = Vue.ref();
-
-		const showAddModal = () => {
-			currentValue.value = createShape();
-			// reset form state
-			frmState.orgetBlurred=false;
-			frmState.funktionBlurred=false;
-			frmState.beginnBlurred=false;
-			// call bootstrap show function
-			modalRef.value.show();
-		}
-
-		const hideModal = () => {
-			modalRef.value.hide();
-		}
-
-		const showEditModal = async (id) => {
-			currentValue.value = { ...jobfunctionList.value[id] };
-			// fetch company
-			isFetching.value = true;
-			try {
-				const res = await $api.call(ApiFunktion.getCompanyByOrget(currentValue.value.oe_kurzbz));
-				if (res.error == 0) {
-					unternehmen.value = res.retval[0].oe_kurzbz;
-				} else {
-					console.log('company not found for orget!');
-				}
-
-			} catch (error) {
-				console.log(error)
-			} finally {
-				isFetching.value = false
-			}
-			//delete currentValue.value.bezeichnung;
-			modalRef.value.show();
-		}
-
-		const showDeleteModal = async (id) => {
-			currentValue.value = { ...jobfunctionList.value[id] };
-			const ok = await confirmDeleteRef.value.show();
-
-			if (ok) {
-
-				try {
-					const res = await $api.call(ApiPerson.deletePersonJobFunction(id));
-					if (res.error == 0) {
-						delete jobfunctionList.value[id];
-						showDeletedToast();
-						theModel.value.updateHeader();
-					}
-				} catch (error) {
-					console.log(error)
-				} finally {
-					isFetching.value = false
-				}
-
-			}
-		}
-
-
-		const okHandler = async () => {
-			if (!validate()) {
-
-				console.log("form invalid");
-
-			} else {
-
-				// submit
-				try {
-					let payload = {...currentValue.value};
-					delete payload.dienstverhaeltnis_id;
-					delete payload.dienstverhaeltnis_unternehmen;
-					delete payload.fachbereich_bezeichnung;
-					delete payload.funktion_oebezeichnung;
-					delete payload.aktiv;
-					delete payload.funktion_beschreibung;
-					const r = await $api.call(ApiPerson.upsertPersonJobFunction(payload));
-					if (r.error == 0) {
-						// fetch all data because of all the references in the changed record
-						await fetchData();
-						console.log('job function successfully saved');
-						theModel.value.updateHeader();
-						showToast();
-					}
-				} catch (error) {
-					console.log(error)
-				} finally {
-					isFetching.value = false
-				}
-
-				hideModal();
-			}
-		}
-
-		// -------------
-		// form handling
-		// -------------
-
-		const jobFunctionFrm = Vue.ref();
-
-		const frmState = Vue.reactive({ beginnBlurred: false, orgetBlurred: false, funktionBlurred: false, wasValidated: false });
-
-		const notEmpty = (n) => {
-			return !!n && n.trim() != "";
-		}
-
-		const validate = () => {
-			frmState.orgetBlurred = true;
-			frmState.funktionBlurred = true;
-			frmState.beginnBlurred = true;
-			return notEmpty(currentValue.value.datum_von) &&
-				notEmpty(currentValue.value.oe_kurzbz) &&
-				notEmpty(currentValue.value.funktion_kurzbz);
-		}
-
-
-		const hasChanged = Vue.computed(() => {
-			return Object.keys(currentValue.value).some(field => currentValue.value[field] !== preservedValue.value[field])
-		});
-
-		const formatDate = (d) => {
-			if (d != null && d != '') {
-				return d.substring(8, 10) + "." + d.substring(5, 7) + "." + d.substring(0, 4);
-			} else {
-				return ''
-			}
-		}
-
-		// Toast
-		const toastRef = Vue.ref();
-		const deleteToastRef = Vue.ref();
-
-		const showToast = () => {
-			toastRef.value.show();
-		}
-
-		const showDeletedToast = () => {
-			deleteToastRef.value.show();
-		}
-
-		const fetchOrgUnits = async (unternehmen_kurzbz) => {
-			if( unternehmen_kurzbz === '' ) {
-				return;
-			}
-			const response = await $api.call(
-				ApiFunktion.getOrgetsForCompany(unternehmen_kurzbz));
-			const orgets = response.retval;
-			orgets.unshift({
-				value: '',
-				label: t('ui','bitteWaehlen'),
-			});
-			orgUnitList.value = await  orgets;
-		}
-
-		const fetchFunctions = async (uid, unternehmen_kurzbz) => {
-			if(unternehmen_kurzbz === '' || uid === '' ) {
-				return;
-			}
-			const response = await $api.call(ApiFunktion.getAllFunctions());
-			const benutzerfunktionen = response.retval;
-			benutzerfunktionen.unshift({
-				value: '',
-				label: t('ui','bitteWaehlen'),
-			});
-			jobfunctionDefList.value = benutzerfunktionen;
-		}
-
-		const unternehmenSelectedHandler = (e) => {
-			console.log('unternehmen selected: ',e);
-			unternehmen.value = e;
-		}
-
-		const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
-		const fullPath = `/${ciPath}/extensions/FHC-Core-Personalverwaltung/Employees/`;
-
+	data(){
 		return {
-			jobfunctionList, orgUnitList, jobfunctionListArray,
-			jobfunctionDefList,
-			currentValue,
-			readonly,
-			frmState,
-			dialogRef,
-			toastRef, deleteToastRef,
-			jobFunctionFrm,
-			modalRef,
-			fullPath,
-			route,
-			aktivChecked,
-			unternehmen,
-			tabulator,
-			table,
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: () => this.$api.call(
+					ApiCoreFunktion.getAllUserFunctions(this.personUID)
+				),
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{
+						title: "dienstverhaeltnis_unternehmen",
+						field: "dienstverhaeltnis_unternehmen",
+						width: 50,
+						headerFilter: "list",
+						headerFilterParams: {valuesLookup: true, autocomplete: true, sort: "asc"},
+						formatter: this.companyLinkFormatter
+					},
+					{
+						title: "funktion_beschreibung", field: "funktion_beschreibung", headerFilter: "list",
+						headerFilterParams: {valuesLookup: true, autocomplete: true, sort: "asc"},
+					},
+					{
+						title: "funktion_oebezeichnung", field: "funktion_oebezeichnung", headerFilter: "list",
+						headerFilterParams: {valuesLookup: true, autocomplete: true, sort: "asc"}
+					},
+					{title: "wochenstunden", field: "wochenstunden", headerFilter: true},
+					{
+						title: "Von",
+						field: "datum_von",
+						headerFilter: true,
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
 
-			toggleMode, formatDate, notEmpty,
-			showToast, showDeletedToast,
-			showAddModal, hideModal, okHandler,
-			showDeleteModal, showEditModal, confirmDeleteRef, t, unternehmenSelectedHandler,
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+							});
+						},
+					},
+					{
+						title: "Bis",
+						field: "datum_bis",
+						headerFilter: true,
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+							});
+						},
+					},
+					{title: "bezeichnung", field: "bezeichnung", headerFilter: true},
+					{title: "aktiv", field: "aktiv", visible: false},
+					{title: "benutzerfunktion_id", field: "benutzerfunktion_id", visible: false},
+					{title: "uid", field: "uid", visible: false},
+					{
+						//title: 'Aktionen', field: 'actions',
+						minWidth: 150, // Ensures Action-buttons will be always fully displayed
+						formatter: (cell, formatterParams, onRendered) => {
+							let container = document.createElement('div');
+							container.className = "d-flex gap-2";
+
+
+							if( cell.getRow().getData().dienstverhaeltnis_unternehmen === null ) {
+								let button = document.createElement('button');
+								button.className = 'btn btn-outline-secondary btn-action';
+								if(this.stylePv21)
+									button.innerHTML = '<i class="fa fa-pen"></i>';
+								else
+									button.innerHTML = '<i class="fa fa-edit"></i>';
+								button.title = this.$p.t('ui', 'bearbeiten');
+								button.addEventListener('click', (event) =>
+									this.actionEditFunction(cell.getData().benutzerfunktion_id)
+								);
+								if(this.readonlyMode === true)	button.disabled = true;
+								container.append(button);
+							}
+							if( cell.getRow().getData().dienstverhaeltnis_unternehmen === null ) {
+								let button = document.createElement('button');
+								button.className = 'btn btn-outline-secondary btn-action';
+								button.innerHTML = '<i class="fa fa-xmark"></i>';
+								button.title = this.$p.t('ui', 'loeschen');
+								button.addEventListener('click', () =>
+									this.actionDeleteFunction(cell.getData().benutzerfunktion_id)
+								);
+								if(this.readonlyMode === true)	button.disabled = true;
+								container.append(button);
+							}
+
+							if (cell.getRow().getData().dienstverhaeltnis_unternehmen === null  && this.saveFunctionAsCopy) {
+								let button = document.createElement('button');
+								button.className = 'btn btn-outline-secondary btn-action';
+								button.innerHTML = '<i class="fa fa-copy"></i>';
+								button.title = this.$p.t('ui', 'saveAsCopy');
+								button.addEventListener('click', () =>
+									this.actionCopyFunction(cell.getData().benutzerfunktion_id)
+								);
+								if(this.readonlyMode === true)	button.disabled = true;
+								container.append(button);
+							}
+
+							return container;
+						},
+						frozen: true
+					}
+				],
+				layout: 'fitDataFill',
+				layoutColumnsOnNewData: false,
+				height: '300',
+				persistenceID: 'core-functions',
+			},
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async () => {
+						await this.$p.loadCategory(['global', 'lehre', 'person', 'ui']);
+						let cm = this.$refs.table.tabulator.columnManager;
+
+						//Field Company: if visible show link to dv
+						const column = cm.getColumnByField('dienstverhaeltnis_unternehmen');
+						const companyDv = {
+							title: this.$p.t('person', 'dv_unternehmen'),
+							width: 100,
+							visible: this.showDvCompany,
+						};
+						column.component.updateDefinition(companyDv);
+
+						cm.getColumnByField('funktion_beschreibung').component.updateDefinition({
+							title: this.$p.t('person', 'zuordnung_taetigkeit'),
+							width: 100
+						});
+						cm.getColumnByField('funktion_oebezeichnung').component.updateDefinition({
+							title: this.$p.t('lehre', 'organisationseinheit'),
+							width: 100
+						});
+						cm.getColumnByField('wochenstunden').component.updateDefinition({
+							title: this.$p.t('person', 'wochenstunden')
+						});
+
+						const columnDatumVon = cm.getColumnByField('datum_von');
+						const fieldVonDatum = {
+							title: this.$p.t('ui', 'from')
+						};
+
+						columnDatumVon.component.updateDefinition(fieldVonDatum);
+
+						const columnDatumBis = cm.getColumnByField('datum_bis');
+						const fieldBisDatum = {
+							title: this.$p.t('global', 'bis'),
+						};
+						columnDatumBis.component.updateDefinition(fieldBisDatum);
+
+						cm.getColumnByField('bezeichnung').component.updateDefinition({
+							title: this.$p.t('ui', 'bezeichnung'),
+							width: 100
+						});
+
+					}
+				}
+			],
+			isFilterSet: false,
+			listOrgHeads: [],
+			listOrgUnits: [],
+			formData: {
+				head: 'gst',
+				oe_kurzbz: ''
+			},
+			statusNew: true,
+			listAllFunctions: [],
+			abortController: {
+				oes: null,
+				functions: null
+			},
+			filteredOes: [],
+			filteredFunctions: [],
+			newBtnStyle: ''
 		}
 	},
+	computed: {
+	},
+	methods: {
+		onSwitchChange() {
+			if (this.isFilterSet) {
+				this.$refs.table.tabulator.setFilter("aktiv", "=", true);
+			}
+			else {
+				this.$refs.table.tabulator.clearFilter();
+				this.isFilterSet = false;
+			}
+		},
+		actionNewFunction(){
+			this.resetModal();
+			this.statusNew = true;
+			this.$refs.functionModal.show();
+		},
+		actionCopyFunction(benutzerfunktion_id) {
+			this.statusNew = true;
+			this.loadFunction(benutzerfunktion_id).then(() => {
+				this.$refs.functionModal.show();
+			});
+		},
+		actionDeleteFunction(benutzerfunktion_id) {
+			this.$fhcAlert
+				.confirmDelete()
+				.then(result => result
+					? benutzerfunktion_id
+					: Promise.reject({handled: true}))
+				.then(this.deleteFunction)
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		actionEditFunction(benutzerfunktion_id) {
+			this.resetModal();
+			this.statusNew = false;
+			this.loadFunction(benutzerfunktion_id);
+			this.$refs.functionModal.show();
+		},
+		addFunction() {
+			const dataToSend = {
+				uid: this.personUID,
+				formData: this.formData
+			};
+			return this.$refs.functionData
+				.call(ApiCoreFunktion.addFunction(dataToSend))
+				.then(response => {
+						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.hideModal('functionModal');
+					this.resetModal();
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		loadFunction(benutzerfunktion_id) {
+			return this.$api
+				.call(ApiCoreFunktion.loadFunction(benutzerfunktion_id))
+				.then(result => {
+					this.formData = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		updateFunction(benutzerfunktion_id){
+			const dataToSend = {
+				uid: this.personUID,
+				formData: this.formData,
+				benutzerfunktion_id: benutzerfunktion_id
+			};
+			return this.$refs.functionData
+				.call(ApiCoreFunktion.updateFunction(dataToSend))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					this.hideModal('functionModal');
+					this.resetModal();
+				}).catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		deleteFunction(benutzerfunktion_id) {
+			return this.$api
+				.call(ApiCoreFunktion.deleteFunction(benutzerfunktion_id))
+				.then(response => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+				})
+				.catch(this.$fhcAlert.handleSystemError)
+				.finally(() => {
+					this.reload();
+				});
+		},
+		getOrgetsForCompany(){
+			return this.$api
+				.call(ApiCoreFunktion.getOrgetsForCompany(this.formData.head))
+				.then(result => {
+					this.listOrgUnits = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		hideModal(modalRef) {
+			this.$refs[modalRef].hide();
+		},
+		reload() {
+			this.$refs.table.reloadTable();
+		},
+		resetModal(){
+			this.formData = {};
+			this.formData.head = 'gst';
+			this.formData.oe_kurzbz = '';
+			this.formData.funktion_kurzbz = '';
+		},
+		searchOe(event) {
+			if (this.abortController.oes) {
+				this.abortController.oes.abort();
+			}
+
+			this.abortController.oes = new AbortController();
+
+			return this.$api
+				.call(ApiCoreFunktion.getOes(this.formData.head, event.query))
+				.then(result => {
+					this.filteredOes = result.data.retval;
+				});
+		},
+		searchFunctions(event) {
+			if (this.abortController.functions) {
+				this.abortController.functions.abort();
+			}
+
+			this.abortController.functions = new AbortController();
+
+			return this.$api
+				.call(ApiCoreFunktion.getFunctions(event.query))
+				.then(result => {
+					this.filteredFunctions = result.data.retval;
+				});
+		},
+		styleNewButton(){
+			if(this.stylePv21) {
+				this.newBtnStyle = "btn-sm";
+			}
+		},
+		//helper function: workaround to trigger validation if input is not a number
+		normalizeStunden() {
+			if (this.formData.wochenstunden === null || this.formData.wochenstunden === '') {
+				this.formData.wochenstunden = 'xxx'
+			}
+		}
+	},
+	created() {
+		this.$api
+			.call(ApiCoreFunktion.getOrgHeads())
+			.then(result => {
+				this.listOrgHeads = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.styleNewButton();
+	},
 	template: `
-    <div class="row" v-if="readonlyMode === false">
+		<div class="core-functions h-100 pb-3">
 
-        <div class="toast-container position-absolute top-0 end-0 pt-4 pe-2">
-          <Toast ref="toastRef">
-            <template #body><h4>{{ t('person','funktionGespeichert') }}</h4></template>
-          </Toast>
-        </div>
+			<div class="d-flex justify-content-end pb-3" v-if="stylePv21">
+				<form-input
+					container-class="form-check"
+					type="checkbox"
+					:label="$p.t('funktion/filter_active')"
+					v-model="isFilterSet"
+					@change="onSwitchChange"
+					>
+				</form-input>
+			</div>
+			<div v-else>
+				<form-input
+					container-class="form-switch"
+					type="checkbox"
+					:label="$p.t('funktion/filter_active')"
+					v-model="isFilterSet"
+					@change="onSwitchChange"
+					>
+				</form-input>
+			</div>
 
-        <div class="toast-container position-absolute top-0 end-0 pt-4 pe-2">
-            <Toast ref="deleteToastRef">
-                <template #body><h4>{{ t('person', 'funktionGeloescht') }}</h4></template>
-            </Toast>
-        </div>
-    </div>
-    <div class="row pt-md-4">      
-         <div class="col">
-             <div class="card">
-                <div class="card-header">
-                    <div class="h5"><h5>{{ t('person','funktionen') }}</h5></div>        
-                </div>
+			<core-filter-cmpt
+				ref="table"
+				:tabulator-options="tabulatorOptions"
+				:tabulator-events="tabulatorEvents"
+				table-only
+				:side-menu="false"
+				:reload= "!this.stylePv21"
+				new-btn-show
+				:new-btn-class="this.newBtnStyle"
+				:new-btn-label="this.$p.t('person', 'funktion')"
+				@click:new="actionNewFunction"
+				>
+			</core-filter-cmpt>
 
-                <div class="card-body">
-                    <div class="d-grid d-md-flex justify-content-between pt-2 pb-3" v-if="readonlyMode === false">
-                        <button type="button" class="btn btn-sm btn-primary me-3" @click="showAddModal()">
-                            <i class="fa fa-plus"></i> {{ t('person','funktion') }}
-                        </button>
-                        <div class="form-check">
-                            <input class="form-check-input" type="checkbox" role="switch" id="aktivChecked" v-model="aktivChecked">
-                            <label class="form-check-label" for="aktivChecked">Nur aktive anzeigen</label>
-                        </div>
-                    </div>
+			<!--Modal: functionModal-->
+			<bs-modal ref="functionModal" dialog-class="modal-lg">
+				<template #title>
+					<p v-if="statusNew" class="fw-bold mt-3">{{ $p.t('funktion', 'addFunktion') }}</p>
+					<p v-else class="fw-bold mt-3">{{ $p.t('funktion', 'editFunktion') }}</p>
+				</template>
 
-                    <!-- TABULATOR -->
-                    <div ref="table" class="fhc-tabulator"></div>
-                
-                </div>
-             </div>
-         </div>
-    </div>
-            
+				<form-form class="row pt-3" ref="functionData">
+					<form-input
+						container-class="mb-3 col-8"
+						type="select"
+						name="companies"
+						:label="$p.t('core/unternehmen')"
+						v-model="formData.head"
+						@change="getOrgetsForCompany"
+						>
+						<option
+							v-for="org in listOrgHeads"
+							:key="org.head"
+							:value="org.head"
+							@change="handleChange"
+							>
+							{{ org.bezeichnung }}
+						</option>
+					</form-input>
 
-    <!-- detail modal -->
-    <Modal :title="t('person','funktion')" ref="modalRef" v-if="readonlyMode === false">
-        <template #body>
-            <form class="row g-3" ref="jobFunctionFrm">
-                            
-                <div class="col-md-8">
-					<template v-if="showDvCompany">
-						<label class="form-label">{{ t('core','unternehmen') }}</label><br>
-						<org-chooser  @org-selected="unternehmenSelectedHandler" :oe="unternehmen" class="form-select form-select-sm"></org-chooser>
-					</template>
-                </div>
-                <div class="col-md-4">
-                </div>
-                <!--  -->
-                <div class="col-md-8">
-                    <label class="required form-label">{{ t('lehre','organisationseinheit') }}</label><br>
-                    <select id="oe_kurzbz" v-model="currentValue.oe_kurzbz" 
-                        @blur="frmState.orgetBlurred = true"
-                        class="form-select form-select-sm" aria-label=".form-select-sm " 
-                        :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly, 'is-invalid': !notEmpty(currentValue.oe_kurzbz) && frmState.orgetBlurred}"
-                        >
-                        <option v-for="(item, index) in orgUnitList" :value="item.value">
-                            {{ item.label }}
-                        </option>                       
-                    </select>
-                </div>
-                <div class="col-md-4">
-                </div>
-                <!--  -->
-                <div class="col-md-8">
-                    <label for="funktion_kurzbz" class="required form-label">{{ t('person','funktion') }}</label><br>
-                    <select id="_kurzbz" v-model="currentValue.funktion_kurzbz" 
-                        @blur="frmState.funktionBlurred = true"
-                        class="form-select form-select-sm" aria-label=".form-select-sm " 
-                        :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly, 'is-invalid': !notEmpty(currentValue.funktion_kurzbz) && frmState.funktionBlurred}"
-                        >
-                        <option v-for="(item, index) in jobfunctionDefList" :value="item.value">
-                            {{ item.label }}
-                        </option>                       
-                    </select>
-                </div>
-                <div class="col-md-4"></div>
-                <!-- -->
-                <div class="col-md-2">
-                    <label for="uid" class="form-label">{{ t('person','wochenstunden') }}</label>
-                    <input type="number"  :readonly="readonly" class="form-control-sm" :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly}" id="bank" v-model="currentValue.wochenstunden">
-                </div>
-                <!--  -->
-                <div class="col-md-3">
-                    <label for="beginn" class="required form-label">{{ t('ui','from') }}</label>
-                    <datepicker id="beginn"
-                        :teleport="true" 
-                        @blur="frmState.beginnBlurred = true" 
-                        :input-class-name="(!notEmpty(currentValue.datum_von) && frmState.beginnBlurred) ? 'dp-invalid-input' : ''" 
-                        v-model="currentValue.datum_von"
-                        v-bind:enable-time-picker="false"
-                        text-input 
-                        locale="de"
-                        format="dd.MM.yyyy"
-                        auto-apply 
-                        model-type="yyyy-MM-dd"></datepicker>
-                </div>
-                <div class="col-md-3">
-                    <label for="ende" class="form-label">{{ t('global','bis') }}</label>
-                    <datepicker id="ende"
-                        :teleport="true" 
-                        v-model="currentValue.datum_bis"
-                        v-bind:enable-time-picker="false"
-                        text-input 
-                        locale="de"
-                        format="dd.MM.yyyy"
-                        auto-apply 
-                        model-type="yyyy-MM-dd"></datepicker>                   
-                </div>
-                <div class="col-md-3">
-                </div>
-                <!-- -->
-                <div class="col-md-8">
-                    <label for="bezeichnung" class="form-label">{{ t('ui','bezeichnung') }}</label>
-                    <input type="text"  :readonly="readonly" class="form-control-sm" :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly}" id="bezeichnung" v-model="currentValue.bezeichnung">
-                </div>
-                <div class="col-md-4">
-                </div>
-                
-                
-                <!-- changes -->
-                <div class="col-8">
-                    <div class="modificationdate">{{ currentValue.insertamum }}/{{ currentValue.insertvon }}, {{ currentValue.updateamum }}/{{ currentValue.updatevon }} [id={{ currentValue.benutzerfunktion_id }}]</div>
-                </div>
-                
-            </form>
-        </template>
-        <template #footer>
-            <button type="button" class="btn btn-primary" @click="okHandler()" >
-                {{ t('ui','speichern') }}
-            </button>
-        </template>
+					<!--DropDown Autocomplete Funktion-->
+					<form-input
+						container-class="mb-3 col-8"
+						type="autocomplete"
+						:label="$p.t('person/funktion') + ' *' "
+						name="funktion_kurzbz"
+						v-model="formData.funktion_kurzbz"
+						optionLabel="label"
+						:suggestions="filteredFunctions"
+						dropdown
+						@complete="searchFunctions"
+						>
+							<template #option="slotProps">
+								<div
+									:class="!slotProps.option.aktiv
+									? 'item-inactive'
+									: ''"
+									>
+										{{slotProps.option.label}}
+								</div>
+							</template>
+					</form-input>
 
-    </Modal>
+					<!--DropDown Autocomplete Organisationseinheit-->
+					<form-input
+						container-class="mb-3 col-8"
+						type="autocomplete"
+						:label="$p.t('lehre/organisationseinheit') + ' *'"
+						name="oe_kurzbz"
+						v-model="formData.oe_kurzbz"
+						optionLabel="label"
+						:suggestions="filteredOes"
+						dropdown
+						@complete="searchOe"
+						>
+							<template #option="slotProps">
+								<div
+									:class="!slotProps.option.aktiv
+									? 'item-inactive'
+									: ''"
+									>
+										{{slotProps.option.label}}
+								</div>
+							</template>
+					</form-input>
 
-    <ModalDialog :title="t('global','warnung')" ref="dialogRef" v-if="readonlyMode === false">
-      <template #body>
-        {{ t('person','funktionNochNichtGespeichert') }}
-      </template>
-    </ModalDialog>
+					<!--DropDown Bezeichnung-->
+					<form-input
+						container-class="mb-3 col-8"
+						type="text"
+						name="bezeichnung"
+						:label="$p.t('global/bezeichnung')"
+						v-model="formData.bezeichnung"
+					>
+					</form-input>
 
-    <ModalDialog :title="t('global','warnung')" ref="confirmDeleteRef" v-if="readonlyMode === false">
-        <template #body>
-            {{ t('person','funktion') }} '{{ currentValue?.funktion_kurzbz }} ({{ currentValue?.datum_von }}-{{ currentValue?.datum_bis }})' {{ t('person', 'wirklichLoeschen') }}?
-        </template>
-    </ModalDialog>
+					<div class="row mb-3">
+						<form-input
+							container-class="mb-3 col-2"
+							type="number"
+							name="wochenstunden"
+							@blur="normalizeStunden"
+							:label="$p.t('person/wochenstunden')"
+							v-model="formData.wochenstunden"
+						>
+						</form-input>
+
+						<form-input
+							container-class="mb-3 col-3"
+							type="DatePicker"
+							v-model="formData.datum_von"
+							name="datum_von"
+							:label="$p.t('ui/from') + ' *'"
+							auto-apply
+							:enable-time-picker="false"
+							format="dd.MM.yyyy"
+							preview-format="dd.MM.yyyy"
+							:teleport="true"
+						>
+						</form-input>
+
+						<form-input
+							container-class="mb-3 col-3"
+							type="DatePicker"
+							v-model="formData.datum_bis"
+							name="datum_bis"
+							:label="$p.t('global/bis')"
+							auto-apply
+							:enable-time-picker="false"
+							format="dd.MM.yyyy"
+							preview-format="dd.MM.yyyy"
+							:teleport="true"
+							>
+						</form-input>
+					</div>
+						<input type="hidden" class="form-control" id="oe_kurzbz" v-model="formData.oe_kurzbz">
+
+				</form-form>
+
+				<template #footer>
+					<button type="button" class="btn btn-primary" @click="statusNew ? addFunction() : updateFunction(formData.benutzerfunktion_id)">{{$p.t('ui', 'speichern')}}</button>
+				</template>
+			</bs-modal>
+
+		</div>
     `
 }
-
-export default Funktionen;
\ No newline at end of file
diff --git a/public/js/components/Funktionen/Funktionen_composition_api.js b/public/js/components/Funktionen/Funktionen_composition_api.js
new file mode 100644
index 000000000..d48e77fd3
--- /dev/null
+++ b/public/js/components/Funktionen/Funktionen_composition_api.js
@@ -0,0 +1,622 @@
+import { Modal } from './Modal.js';
+import { ModalDialog } from './ModalDialog.js';
+import { Toast } from './Toast.js';
+import {OrgChooser} from "./OrgChooser.js";
+import { usePhrasen } from '../../mixins/Phrasen.js';
+
+import ApiFunktion from '../../api/factory/funktionen/person.js';
+import ApiPerson from "../../../extensions/FHC-Core-Personalverwaltung/js/api/factory/person.js";
+
+export const Funktionen = {
+	name: 'FunctionComponentOld',
+	components: {
+		Modal,
+		ModalDialog,
+		Toast,
+		OrgChooser,
+		"datepicker": VueDatePicker
+	},
+	props: {
+		modelValue: { type: Object, default: () => ({}), required: false},
+		config: { type: Object, default: () => ({}), required: false},
+		readonlyMode: { type: Boolean, required: false, default: false },
+		personID: { type: Number, required: false },
+		personUID: { type: String, required: false },
+		writePermission: { type: Boolean, required: false },
+		showDvCompany: { type: Boolean, required: false, default: true }
+	},
+	emits: ['updateHeader'],
+	setup( props, { emit } ) {
+
+		const $api = Vue.inject('$api');
+		//const fhcAlert = Vue.inject('$fhcAlert');
+
+
+		const readonly = Vue.ref(false);
+
+		const { t } = usePhrasen();
+
+		//const { personID: currentPersonID , personUID: currentPersonUID  } = Vue.toRefs(props);
+		const currentPersonID = Vue.computed(() => { return props.personID });
+		const currentPersonUID = Vue.computed(() => { return props.personUID });
+
+		const dialogRef = Vue.ref();
+
+		const isFetching = Vue.ref(false);
+
+		const theModel = Vue.computed({
+			get: () => props.modelValue,
+			set: (value) => emit('update:modelValue', value),
+		});
+
+		const unternehmen = Vue.ref();
+		const jobfunctionList = Vue.ref([]);
+		const jobfunctionDefList = Vue.ref([]);
+		const orgUnitList = Vue.ref([{value: '', label: '-'}]);
+
+		const aktivChecked = Vue.ref(true);
+
+		const table = Vue.ref(null); // reference to your table element
+		const tabulator = Vue.ref(null); // variable to hold your table
+		const tableData = Vue.reactive([]); // data for table to display
+
+
+		const full = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+		const route = ( props.readonlyMode !== true ) ? VueRouter.useRoute() : null;
+
+		const convertArrayToObject = (array, key) => {
+			const initialValue = {};
+			return array.reduce((obj, item) => {
+				return {
+					...obj,
+					[item[key]]: item,
+				};
+			}, initialValue);
+		};
+
+		const fetchData = async () => {
+			if (currentPersonID.value==null && theModel.value.personID==null) {
+				jobfunctionList.value = [];
+				return;
+			}
+			isFetching.value = true
+
+			// fetch data and map them for easier access
+			try {
+				const response = await $api.call(
+					ApiFunktion.getAllUserFunctions(theModel.value.personUID || currentPersonUID.value));
+				if(response.error === 1) {
+					let rawList = [];
+					tableData.value = [];
+					jobfunctionList.value = convertArrayToObject(rawList, 'benutzerfunktion_id');
+				} else {
+					let rawList = response.retval;
+					tableData.value = response.retval;
+					jobfunctionList.value = convertArrayToObject(rawList, 'benutzerfunktion_id');
+				}
+			} catch (error) {
+				console.log(error)
+			} finally {
+				isFetching.value = false
+			}
+
+		}
+
+		const createShape = () => {
+			return {
+				benutzerfunktion_id: 0,
+				uid: theModel.value.personUID || currentPersonUID.value,
+				oe_kurzbz: "",
+				funktion_kurzbz: "",
+				datum_von: "",
+				datum_bis: "",
+				bezeichnung: "",
+				wochenstunden: 0,
+			}
+		}
+
+		const currentValue = Vue.ref(createShape());
+		const preservedValue = Vue.ref(createShape());
+
+		Vue.watch([currentPersonID, currentPersonUID], ([id,uid]) => {
+			fetchData();
+		});
+
+		Vue.watch(unternehmen, (unternehmen_kurzbz) => {
+			fetchOrgUnits(unternehmen_kurzbz);
+			fetchFunctions();
+		});
+
+		const toggleMode = async () => {
+			if (!readonly.value) {
+				// cancel changes?
+				if (hasChanged.value) {
+					const ok = await dialogRef.value.show();
+					if (ok) {
+						console.log("ok=", ok);
+						currentValue.value = preservedValue.value;
+					} else {
+						return
+					}
+				}
+			} else {
+				// switch to edit mode and preserve data
+				preservedValue.value = {...currentValue.value};
+			}
+			readonly.value = !readonly.value;
+		}
+
+		Vue.onMounted(async () => {
+			currentValue.value = createShape();
+			await fetchData();
+
+			const dateFormatter = (cell) => {
+				return cell.getValue()?.replace(/(.*)-(.*)-(.*)/, '$3.$2.$1');
+			}
+
+			const dvFormatter = (cell) => {
+				if( props.readonlyMode === true ) {
+					return (cell.getValue() != null) ? cell.getValue() : '';
+				}
+				const url = fullPath + route.params.id + '/' + route.params.uid + '/contract/' + cell.getRow().getData().dienstverhaeltnis_id;
+				return cell.getValue() != null ? `<a href="${url}">` + cell.getValue() + '</a>' : '';
+			}
+
+			// helper
+			const createDomButton = (classValue, clickHandler) => {
+				const nodeBtn = document.createElement("button");
+				const classAttrBtn = document.createAttribute("class");
+				classAttrBtn.value = "btn btn-outline-secondary btn-sm";
+				nodeBtn.setAttributeNode(classAttrBtn);
+				nodeBtn.addEventListener("click", clickHandler);
+				const nodeI = document.createElement("i");
+				const classAttrI = document.createAttribute("class");
+				classAttrI.value = classValue;
+				nodeI.setAttributeNode(classAttrI);
+				nodeBtn.appendChild(nodeI);
+				return nodeBtn;
+			}
+
+			const btnFormatter = (cell) => {
+
+				const nodeDiv = document.createElement("div");
+				const classAttrDiv = document.createAttribute("class");
+				classAttrDiv.value = "d-grid gap-2 d-md-flex justify-content-end align-middle";
+				nodeDiv.setAttributeNode(classAttrDiv);
+				// delete button
+				const nodeBtnDel = createDomButton("fa fa-xmark",() => { showDeleteModal(cell.getValue()) })
+				// edit button
+				const nodeBtnEdit = createDomButton("fa fa-pen",() => { showEditModal(cell.getValue()) })
+
+				if( cell.getRow().getData().dienstverhaeltnis_unternehmen === null ) {
+					nodeDiv.appendChild(nodeBtnEdit);
+					nodeDiv.appendChild(nodeBtnDel);
+				}
+
+				return nodeDiv;
+			}
+
+
+			const columnsDef = [
+				{ title: t('person','dv_unternehmen'), field: "dienstverhaeltnis_unternehmen", formatter: dvFormatter, sorter:"string", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"}, visible: props.showDvCompany },
+				{ title: t('person','zuordnung_taetigkeit'), field: "funktion_beschreibung", hozAlign: "left", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
+				{ title: t('lehre','organisationseinheit'), field: "funktion_oebezeichnung", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
+				{ title: t('person','wochenstunden'), field: "wochenstunden", hozAlign: "right", width: 140, headerFilter:true },
+				{ title: t('ui','from'), field: "datum_von", hozAlign: "center", formatter: dateFormatter, width: 140, sorter:"string", headerFilter:true, headerFilterFunc:customHeaderFilter },
+				{ title: t('global','bis'), field: "datum_bis", hozAlign: "center", formatter: dateFormatter, width: 140, sorter:"string", headerFilter:true, headerFilterFunc:customHeaderFilter },
+				{ title: t('ui','bezeichnung'), field: "bezeichnung", hozAlign: "left", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} }
+			];
+
+			if( props.readonlyMode === false) {
+				columnsDef.push({ title: "", field: "benutzerfunktion_id", formatter: btnFormatter, hozAlign: "right", width: 100, headerSort: false, frozen: true });
+			}
+
+			let tabulatorOptions = {
+				height: "100%",
+				layout: "fitColumns",
+				movableColumns: true,
+				reactiveData: true,
+				columns: columnsDef,
+				//data: tableData.value,
+				data: jobfunctionListArray.value,
+			};
+
+			tabulator.value = new Tabulator(
+				table.value,
+				tabulatorOptions
+			);
+
+			function customHeaderFilter(headerValue, rowValue, rowData, filterParams){
+				//headerValue - the value of the header filter element
+				//rowValue - the value of the column in this row
+				//rowData - the data for the row being filtered
+				//filterParams - params object passed to the headerFilterFuncParams property
+
+				const validDate = function(d){
+					return d instanceof Date && isFinite(d);
+				}
+
+				const date1 = new Date(rowValue);
+				date1.setHours(0,0,0,0);
+				let [day, month, year] = headerValue.split('.')
+				if (year < 1000) return true;  // prevents dates like 17.5.2
+				const date2 = new Date(+year, +month - 1, +day);
+
+				return  !(validDate(date2)) || ((date2 - date1) == 0); //must return a boolean, true if it passes the filter.
+			}
+
+			tabulator.value.on('tableBuilt', () => {
+				//tabulator.value.setData(tableData.value);
+
+			})
+
+		})
+
+		const jobfunctionListArray = Vue.computed(() => {
+			let temp = (jobfunctionList.value ? Object.values(jobfunctionList.value) : []);
+			let filtered = temp.filter((e) => ( !aktivChecked.value || (aktivChecked.value && e.aktiv) ));
+			return filtered;
+		});
+
+		// Workaround to update tabulator
+		Vue.watch(jobfunctionListArray, (newVal, oldVal) => {
+			console.log('jobfunctionList changed');
+			tabulator.value?.setData(jobfunctionListArray.value);
+		}, {deep: true})
+
+		// Modal
+		const modalRef = Vue.ref();
+		const confirmDeleteRef = Vue.ref();
+
+		const showAddModal = () => {
+			currentValue.value = createShape();
+			// reset form state
+			frmState.orgetBlurred=false;
+			frmState.funktionBlurred=false;
+			frmState.beginnBlurred=false;
+			// call bootstrap show function
+			modalRef.value.show();
+		}
+
+		const hideModal = () => {
+			modalRef.value.hide();
+		}
+
+		const showEditModal = async (id) => {
+			currentValue.value = { ...jobfunctionList.value[id] };
+			// fetch company
+			isFetching.value = true;
+			try {
+				const res = await $api.call(ApiFunktion.getCompanyByOrget(currentValue.value.oe_kurzbz));
+				if (res.error == 0) {
+					unternehmen.value = res.retval[0].oe_kurzbz;
+				} else {
+					console.log('company not found for orget!');
+				}
+
+			} catch (error) {
+				console.log(error)
+			} finally {
+				isFetching.value = false
+			}
+			//delete currentValue.value.bezeichnung;
+			modalRef.value.show();
+		}
+
+		const showDeleteModal = async (id) => {
+			currentValue.value = { ...jobfunctionList.value[id] };
+			const ok = await confirmDeleteRef.value.show();
+
+			if (ok) {
+
+				try {
+					const res = await $api.call(ApiPerson.deletePersonJobFunction(id));
+					if (res.error == 0) {
+						delete jobfunctionList.value[id];
+						showDeletedToast();
+						theModel.value.updateHeader();
+					}
+				} catch (error) {
+					console.log(error)
+				} finally {
+					isFetching.value = false
+				}
+
+			}
+		}
+
+
+		const okHandler = async () => {
+			if (!validate()) {
+
+				console.log("form invalid");
+
+			} else {
+
+				// submit
+				try {
+					let payload = {...currentValue.value};
+					delete payload.dienstverhaeltnis_id;
+					delete payload.dienstverhaeltnis_unternehmen;
+					delete payload.fachbereich_bezeichnung;
+					delete payload.funktion_oebezeichnung;
+					delete payload.aktiv;
+					delete payload.funktion_beschreibung;
+					const r = await $api.call(ApiPerson.upsertPersonJobFunction(payload));
+					if (r.error == 0) {
+						// fetch all data because of all the references in the changed record
+						await fetchData();
+						console.log('job function successfully saved');
+						theModel.value.updateHeader();
+						showToast();
+					}
+				} catch (error) {
+					console.log(error)
+				} finally {
+					isFetching.value = false
+				}
+
+				hideModal();
+			}
+		}
+
+		// -------------
+		// form handling
+		// -------------
+
+		const jobFunctionFrm = Vue.ref();
+
+		const frmState = Vue.reactive({ beginnBlurred: false, orgetBlurred: false, funktionBlurred: false, wasValidated: false });
+
+		const notEmpty = (n) => {
+			return !!n && n.trim() != "";
+		}
+
+		const validate = () => {
+			frmState.orgetBlurred = true;
+			frmState.funktionBlurred = true;
+			frmState.beginnBlurred = true;
+			return notEmpty(currentValue.value.datum_von) &&
+				notEmpty(currentValue.value.oe_kurzbz) &&
+				notEmpty(currentValue.value.funktion_kurzbz);
+		}
+
+
+		const hasChanged = Vue.computed(() => {
+			return Object.keys(currentValue.value).some(field => currentValue.value[field] !== preservedValue.value[field])
+		});
+
+		const formatDate = (d) => {
+			if (d != null && d != '') {
+				return d.substring(8, 10) + "." + d.substring(5, 7) + "." + d.substring(0, 4);
+			} else {
+				return ''
+			}
+		}
+
+		// Toast
+		const toastRef = Vue.ref();
+		const deleteToastRef = Vue.ref();
+
+		const showToast = () => {
+			toastRef.value.show();
+		}
+
+		const showDeletedToast = () => {
+			deleteToastRef.value.show();
+		}
+
+		const fetchOrgUnits = async (unternehmen_kurzbz) => {
+			if( unternehmen_kurzbz === '' ) {
+				return;
+			}
+			const response = await $api.call(
+				ApiFunktion.getOrgetsForCompany(unternehmen_kurzbz));
+			const orgets = response.retval;
+			orgets.unshift({
+				value: '',
+				label: t('ui','bitteWaehlen'),
+			});
+			orgUnitList.value = await  orgets;
+		}
+
+		const fetchFunctions = async (uid, unternehmen_kurzbz) => {
+			if(unternehmen_kurzbz === '' || uid === '' ) {
+				return;
+			}
+			const response = await $api.call(ApiFunktion.getAllFunctions());
+			const benutzerfunktionen = response.retval;
+			benutzerfunktionen.unshift({
+				value: '',
+				label: t('ui','bitteWaehlen'),
+			});
+			jobfunctionDefList.value = benutzerfunktionen;
+		}
+
+		const unternehmenSelectedHandler = (e) => {
+			console.log('unternehmen selected: ',e);
+			unternehmen.value = e;
+		}
+
+		const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
+		const fullPath = `/${ciPath}/extensions/FHC-Core-Personalverwaltung/Employees/`;
+
+		return {
+			jobfunctionList, orgUnitList, jobfunctionListArray,
+			jobfunctionDefList,
+			currentValue,
+			readonly,
+			frmState,
+			dialogRef,
+			toastRef, deleteToastRef,
+			jobFunctionFrm,
+			modalRef,
+			fullPath,
+			route,
+			aktivChecked,
+			unternehmen,
+			tabulator,
+			table,
+
+			toggleMode, formatDate, notEmpty,
+			showToast, showDeletedToast,
+			showAddModal, hideModal, okHandler,
+			showDeleteModal, showEditModal, confirmDeleteRef, t, unternehmenSelectedHandler
+		}
+	},
+	template: `
+    <div class="row" v-if="readonlyMode === false">
+
+        <div class="toast-container position-absolute top-0 end-0 pt-4 pe-2">
+          <Toast ref="toastRef">
+            <template #body><h4>{{ t('person','funktionGespeichert') }}</h4></template>
+          </Toast>
+        </div>
+
+        <div class="toast-container position-absolute top-0 end-0 pt-4 pe-2">
+            <Toast ref="deleteToastRef">
+                <template #body><h4>{{ t('person', 'funktionGeloescht') }}</h4></template>
+            </Toast>
+        </div>
+    </div>
+    <div class="row pt-md-4">      
+         <div class="col">
+             <div class="card">
+                <div class="card-header">
+                    <div class="h5"><h5>{{ t('person','funktionen') }}</h5></div>        
+                </div>
+
+                <div class="card-body">
+                    <div class="d-grid d-md-flex justify-content-between pt-2 pb-3" v-if="readonlyMode === false">
+                        <button type="button" class="btn btn-sm btn-primary me-3" @click="showAddModal()">
+                            <i class="fa fa-plus"></i> {{ t('person','funktion') }}
+                        </button>
+                        <div class="form-check">
+                            <input class="form-check-input" type="checkbox" role="switch" id="aktivChecked" v-model="aktivChecked">
+                            <label class="form-check-label" for="aktivChecked">Nur aktive anzeigen</label>
+                        </div>
+                    </div>
+
+                    <!-- TABULATOR -->
+                    <div ref="table" class="fhc-tabulator"></div>
+                
+                </div>
+             </div>
+         </div>
+    </div>    
+
+    <!-- detail modal -->
+    <Modal :title="t('person','funktion')" ref="modalRef" v-if="readonlyMode === false">
+        <template #body>
+            <form class="row g-3" ref="jobFunctionFrm">
+                            
+                <div class="col-md-8">
+					<div v-show="showDvCompany">
+						<label class="form-label">{{ t('core','unternehmen') }}</label><br>
+						<org-chooser @org-selected="unternehmenSelectedHandler" :oe="unternehmen" class="form-select form-select-sm"></org-chooser>
+					</div>
+                </div>
+                <div class="col-md-4">
+                </div>
+                <!--  -->
+                <div class="col-md-8">
+                    <label class="required form-label">{{ t('lehre','organisationseinheit') }}</label><br>
+                    <select id="oe_kurzbz" v-model="currentValue.oe_kurzbz" 
+                        @blur="frmState.orgetBlurred = true"
+                        class="form-select form-select-sm" aria-label=".form-select-sm " 
+                        :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly, 'is-invalid': !notEmpty(currentValue.oe_kurzbz) && frmState.orgetBlurred}"
+                        >
+                        <option v-for="(item, index) in orgUnitList" :value="item.value">
+                            {{ item.label }}
+                        </option>                       
+                    </select>
+                </div>
+                <div class="col-md-4">
+                </div>
+                <!--  -->
+                <div class="col-md-8">
+                    <label for="funktion_kurzbz" class="required form-label">{{ t('person','funktion') }}</label><br>
+                    <select id="_kurzbz" v-model="currentValue.funktion_kurzbz" 
+                        @blur="frmState.funktionBlurred = true"
+                        class="form-select form-select-sm" aria-label=".form-select-sm " 
+                        :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly, 'is-invalid': !notEmpty(currentValue.funktion_kurzbz) && frmState.funktionBlurred}"
+                        >
+                        <option v-for="(item, index) in jobfunctionDefList" :value="item.value">
+                            {{ item.label }}
+                        </option>                       
+                    </select>
+                </div>
+                <div class="col-md-4"></div>
+                <!-- -->
+                <div class="col-md-2">
+                    <label for="uid" class="form-label">{{ t('person','wochenstunden') }}</label>
+                    <input type="number"  :readonly="readonly" class="form-control-sm" :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly}" id="bank" v-model="currentValue.wochenstunden">
+                </div>
+                <!--  -->
+                <div class="col-md-3">
+                    <label for="beginn" class="required form-label">{{ t('ui','from') }}</label>
+                    <datepicker id="beginn"
+                        :teleport="true" 
+                        @blur="frmState.beginnBlurred = true" 
+                        :input-class-name="(!notEmpty(currentValue.datum_von) && frmState.beginnBlurred) ? 'dp-invalid-input' : ''" 
+                        v-model="currentValue.datum_von"
+                        v-bind:enable-time-picker="false"
+                        text-input 
+                        locale="de"
+                        format="dd.MM.yyyy"
+                        auto-apply 
+                        model-type="yyyy-MM-dd"></datepicker>
+                </div>
+                <div class="col-md-3">
+                    <label for="ende" class="form-label">{{ t('global','bis') }}</label>
+                    <datepicker id="ende"
+                        :teleport="true" 
+                        v-model="currentValue.datum_bis"
+                        v-bind:enable-time-picker="false"
+                        text-input 
+                        locale="de"
+                        format="dd.MM.yyyy"
+                        auto-apply 
+                        model-type="yyyy-MM-dd"></datepicker>                   
+                </div>
+                <div class="col-md-3">
+                </div>
+                <!-- -->
+                <div class="col-md-8">
+                    <label for="bezeichnung" class="form-label">{{ t('ui','bezeichnung') }}</label>
+                    <input type="text"  :readonly="readonly" class="form-control-sm" :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly}" id="bezeichnung" v-model="currentValue.bezeichnung">
+                </div>
+                <div class="col-md-4">
+                </div>
+                
+                
+                <!-- changes -->
+                <div class="col-8">
+                    <div class="modificationdate">{{ currentValue.insertamum }}/{{ currentValue.insertvon }}, {{ currentValue.updateamum }}/{{ currentValue.updatevon }} [id={{ currentValue.benutzerfunktion_id }}]</div>
+                </div>
+                
+            </form>
+        </template>
+        <template #footer>
+            <button type="button" class="btn btn-primary" @click="okHandler()" >
+                {{ t('ui','speichern') }}
+            </button>
+        </template>
+
+    </Modal>
+
+    <ModalDialog :title="t('global','warnung')" ref="dialogRef" v-if="readonlyMode === false">
+      <template #body>
+        {{ t('person','funktionNochNichtGespeichert') }}
+      </template>
+    </ModalDialog>
+
+    <ModalDialog :title="t('global','warnung')" ref="confirmDeleteRef" v-if="readonlyMode === false">
+        <template #body>
+            {{ t('person','funktion') }} '{{ currentValue?.funktion_kurzbz }} ({{ currentValue?.datum_von }}-{{ currentValue?.datum_bis }})' {{ t('person', 'wirklichLoeschen') }}?
+        </template>
+    </ModalDialog>
+    `
+}
+
+export default Funktionen;
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js b/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js
index b58c0805c..3e82cc48b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js
@@ -9,16 +9,17 @@ export default {
   },
   template: `
 	<div class="stv-details-functions h-100 d-flex flex-column">
-		<table-functions 
-			ref="tbl_functions" 
-			:student="modelValue">	
-		</table-functions>
+        <h4>{{ $p.t('person', 'funktionen') }}</h4>
 
 		<person-functions
 			:readonlyMode="false"
 			:personID="modelValue.person_id"
 			:personUID="modelValue.uid"
-			:showDvCompany="false"
+			:showDvCompany="true"
+			:saveFunctionAsCopy="true"
+			:filterOeStudent="true"
+			:oeDropdownAutocomplete="true"
+			:stylePv21="false"
 		>
 		</person-functions>
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/FunktionenOld.js b/public/js/components/Stv/Studentenverwaltung/Details/FunktionenOld.js
new file mode 100644
index 000000000..5188c8d1b
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/FunktionenOld.js
@@ -0,0 +1,28 @@
+import PersonFunctions from "../../../Funktionen/Funktionen_composition_api";
+
+//import PersonFunctions from "../../../Funktionen/Funktionen.js";
+
+export default {
+	components: {
+		PersonFunctions,
+	},
+	props: {
+		modelValue: Object,
+	},
+	template: `
+	<div class="stv-details-functions h-100 d-flex flex-column">
+		<table-functions 
+			ref="tbl_functions" 
+			:student="modelValue">	
+		</table-functions>
+
+		<person-functions
+			:readonlyMode="false"
+			:personID="modelValue.person_id"
+			:personUID="modelValue.uid"
+			:showDvCompany="true"
+		>
+		</person-functions>
+
+	</div>`,
+};
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 6c52517b6..ed6f71a7f 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -25079,7 +25079,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Das Eingabefeld {field} darf nur Zahlen enthalten.',
+				'text' => 'Das Eingabefeld {field} darf nur Ziffern enthalten.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -41476,6 +41476,106 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'funktion',
+		'phrase' => 'filter_active',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nur aktive anzeigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Display only active',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'funktion',
+		'phrase' => 'addFunktion',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Funktion hinzufügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add function',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'funktion',
+		'phrase' => 'editFunktion',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Funktion bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit function',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'saveAsCopy',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Als Kopie speichern',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Save as copy',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_fieldMustBePositiveInteger',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Eingabefeld {field} darf nur positive Ganzzahlen enthalten.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The input field {field} may only contain positive integers',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-4 Studierendenverwaltung FUNCTIONS END
 
 );

From 66e5384de6ed1aeb44f9bedd831eabc19b150f8f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 21 May 2025 16:01:37 +0200
Subject: [PATCH 166/572] cleanup: remove not needed code and files

---
 .../frontend/v1/funktionen/FunctionsAPI.php   | 239 -------
 .../api/frontend/v1/funktionen/Funktionen.php |  69 --
 .../api/frontend/v1/funktionen/OrgAPI.php     | 153 -----
 .../api/frontend/v1/stv/Config.php            |   5 -
 public/js/api/factory/funktionen.js           |  22 -
 public/js/api/factory/funktionen/person.js    |  68 --
 public/js/components/Funktionen/Funktionen.js |   4 +-
 .../Funktionen/Funktionen_composition_api.js  | 622 ------------------
 public/js/components/Funktionen/Modal.js      |  48 --
 .../js/components/Funktionen/ModalDialog.js   |  69 --
 public/js/components/Funktionen/OrgChooser.js |  69 --
 public/js/components/Funktionen/Toast.js      |  47 --
 .../Studentenverwaltung/Details/Funktionen.js |   5 +-
 13 files changed, 2 insertions(+), 1418 deletions(-)
 delete mode 100644 application/controllers/api/frontend/v1/funktionen/FunctionsAPI.php
 delete mode 100644 application/controllers/api/frontend/v1/funktionen/OrgAPI.php
 delete mode 100644 public/js/api/factory/funktionen.js
 delete mode 100644 public/js/api/factory/funktionen/person.js
 delete mode 100644 public/js/components/Funktionen/Funktionen_composition_api.js
 delete mode 100644 public/js/components/Funktionen/Modal.js
 delete mode 100644 public/js/components/Funktionen/ModalDialog.js
 delete mode 100644 public/js/components/Funktionen/OrgChooser.js
 delete mode 100644 public/js/components/Funktionen/Toast.js

diff --git a/application/controllers/api/frontend/v1/funktionen/FunctionsAPI.php b/application/controllers/api/frontend/v1/funktionen/FunctionsAPI.php
deleted file mode 100644
index 023100a6e..000000000
--- a/application/controllers/api/frontend/v1/funktionen/FunctionsAPI.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-
-defined('BASEPATH') || exit('No direct script access allowed');
-
-class FunctionsAPI extends Auth_Controller
-{
-
-	const DEFAULT_PERMISSION = 'basis/mitarbeiter:rw';
-	const HANDYVERWALTUNG_PERMISSION = 'extension/pv21_handyverwaltung:rw';
-
-	public function __construct() {
-
-		//TODO(Manu) check permissions
-		parent::__construct(array(
-				'getAllFunctions' => FunctionsAPI::DEFAULT_PERMISSION,
-				'getContractFunctions' => FunctionsAPI::DEFAULT_PERMISSION,
-				'getCurrentFunctions' => FunctionsAPI::DEFAULT_PERMISSION,
-				'getAllUserFunctions' => [FunctionsAPI::DEFAULT_PERMISSION, self::HANDYVERWALTUNG_PERMISSION],
-			)
-		);
-		$this->load->library('AuthLib');
-		$this->load->model('extensions/FHC-Core-Personalverwaltung/Api_model','ApiModel');
-		$this->load->model('ressource/Funktion_model', 'FunktionModel');
-		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
-	}
-
-
-
-	/*
-	 * return list of all functions
-	 * as key value list to be used in select or autocomplete
-	 */
-	public function getAllFunctions()
-	{
-		$sql = <<<EOSQL
-			SELECT
-				funktion_kurzbz AS value, beschreibung AS label
-			FROM
-				public.tbl_funktion
-			WHERE
-				aktiv = true
-			ORDER BY beschreibung ASC
-EOSQL;
-
-		$fkts = $this->FunktionModel->execReadOnlyQuery($sql);
-		if( hasData($fkts) )
-		{
-			$this->outputJson($fkts);
-			return;
-		}
-		else
-		{
-			$this->outputJsonError('no contract relevant funktionen found');
-			return;
-		}
-	}
-
-	/*
-	 * return list of contract relevant functions
-	 * as key value list to be used in select or autocomplete
-	 */
-	public function getContractFunctions($mode='all')
-	{
-		$addwhere = '';
-		switch ($mode)
-		{
-			case 'zuordnung':
-				$addwhere = ' AND funktion_kurzbz LIKE \'%zuordnung%\'';
-				break;
-			case 'funktion':
-				$addwhere = ' AND funktion_kurzbz NOT LIKE \'%zuordnung%\'';
-				break;
-			case 'all':
-			default:
-				$addwhere = '';
-				break;
-		}
-
-		$sql = <<<EOSQL
-			SELECT
-				funktion_kurzbz AS value, beschreibung AS label
-			FROM
-				public.tbl_funktion
-			WHERE
-				aktiv = true AND vertragsrelevant = true
-				{$addwhere}
-			ORDER BY beschreibung ASC
-EOSQL;
-
-		$fkts = $this->FunktionModel->execReadOnlyQuery($sql);
-		if( hasData($fkts) )
-		{
-			$this->outputJson($fkts);
-			return;
-		}
-		else
-		{
-			$this->outputJsonError('no contract relevant funktionen found');
-			return;
-		}
-	}
-
-	/*
-	 * return list of child orgets for a given company orget_kurzbz
-	 * as key value list to be used in select or autocomplete
-	 */
-	public function getCurrentFunctions($uid, $companyOrgetkurzbz)
-	{
-		if( empty($uid) )
-		{
-			$this->outputJsonError('Missing Parameter <uid>');
-		}
-
-		if( empty($companyOrgetkurzbz) )
-		{
-			$this->outputJsonError('Missing Parameter <companyOrgetkurzbz>');
-		}
-
-		$sql = <<<EOSQL
-			SELECT
-				bf.benutzerfunktion_id AS value, f.beschreibung || ', '
-					|| oe.bezeichnung || ' [' || oet.bezeichnung || '], '
-					|| COALESCE(to_char(bf.datum_von, 'dd.mm.YYYY'), 'n/a')
-					|| ' - ' || COALESCE(to_char(bf.datum_bis, 'dd.mm.YYYY'), 'n/a')
-					|| COALESCE(dvu.attachedtovb, '') AS label
-			FROM (
-					WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) as
-					(
-						SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit
-						WHERE oe_kurzbz = ?
-						UNION ALL
-						SELECT o.oe_kurzbz, o.oe_parent_kurzbz FROM public.tbl_organisationseinheit o, oes
-						WHERE o.oe_parent_kurzbz=oes.oe_kurzbz
-					)
-					SELECT oe_kurzbz
-					FROM oes
-					GROUP BY oe_kurzbz
-			) c
-			JOIN public.tbl_organisationseinheit oe ON oe.oe_kurzbz = c.oe_kurzbz
-			JOIN public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
-			JOIN public.tbl_benutzerfunktion bf ON bf.oe_kurzbz = oe.oe_kurzbz
-			JOIN public.tbl_funktion f ON f.funktion_kurzbz = bf.funktion_kurzbz
-			LEFT JOIN (
-				SELECT
-					benutzerfunktion_id, ' [DV]' AS attachedtovb
-				FROM
-					"hr"."tbl_vertragsbestandteil_funktion"
-				GROUP BY
-					benutzerfunktion_id
-			) dvu ON dvu.benutzerfunktion_id = bf.benutzerfunktion_id
-			WHERE bf.uid = ?
-			ORDER BY f.beschreibung ASC
-
-EOSQL;
-
-		$benutzerfunktionen = $this->BenutzerfunktionModel->execReadOnlyQuery($sql, array($companyOrgetkurzbz, $uid));
-		if( hasData($benutzerfunktionen) )
-		{
-			$this->outputJson($benutzerfunktionen);
-			return;
-		}
-		else
-		{
-			$this->outputJsonError('no benutzerfunktionen found for uid ' . $uid . ' and oe_kurzbz ' . $companyOrgetkurzbz );
-			return;
-		}
-	}
-
-	/*
-	 * return list of functions for a uid
-	 * as objects to be used in as datasource
-	 */
-	public function getAllUserFunctions($uid)
-	{
-		if( empty($uid) )
-		{
-			$this->outputJsonError('Missing Parameter <uid>');
-		}
-
-		$sql = <<<EOSQL
-			SELECT
-				dv.dienstverhaeltnis_id, 
-				un.bezeichnung || ' (' || TO_CHAR(dv.von, 'DD.MM.YYYY') || CASE WHEN dv.bis IS NOT NULL THEN ' - ' || TO_CHAR(dv.bis, 'DD.MM.YYYY') ELSE '' END || ')' AS dienstverhaeltnis_unternehmen ,
-				'[' || oet.bezeichnung || '] ' || oe.bezeichnung AS funktion_oebezeichnung,
-				f.beschreibung AS funktion_beschreibung,
-				bf.*,
-				fb.bezeichnung AS fachbereich_bezeichnung,
-			    CASE
-					WHEN
-						bf.datum_bis IS NOT NULL AND bf.datum_bis::date < now()::date
-					THEN
-						false
-					ELSE
-						true
-				END aktiv
-			FROM
-				public.tbl_benutzerfunktion bf
-			JOIN
-				public.tbl_organisationseinheit oe ON oe.oe_kurzbz = bf.oe_kurzbz
-			JOIN
-				public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
-            JOIN
-				public.tbl_funktion f ON f.funktion_kurzbz = bf.funktion_kurzbz
-			LEFT JOIN
-				hr.tbl_vertragsbestandteil_funktion vf ON vf.benutzerfunktion_id = bf.benutzerfunktion_id
-			LEFT JOIN
-				hr.tbl_vertragsbestandteil v ON vf.vertragsbestandteil_id = v.vertragsbestandteil_id
-			LEFT JOIN
-				hr.tbl_dienstverhaeltnis dv ON v.dienstverhaeltnis_id = dv.dienstverhaeltnis_id
-			LEFT JOIN
-				public.tbl_organisationseinheit un ON dv.oe_kurzbz = un.oe_kurzbz
-			LEFT JOIN
-				public.tbl_fachbereich fb ON fb.fachbereich_kurzbz = bf.fachbereich_kurzbz
-            WHERE
-				bf.uid = ?
-            ORDER BY
-				f.beschreibung, bf.datum_von ASC
-
-EOSQL;
-
-		$benutzerfunktionen = $this->BenutzerfunktionModel->execReadOnlyQuery($sql, array($uid));
-		if( hasData($benutzerfunktionen) )
-		{
-			$this->outputJson($benutzerfunktionen);
-			return;
-		}
-		else
-		{
-			$this->outputJsonError('no benutzerfunktionen found for uid ' . $uid);
-			return;
-		}
-	}
-
-
-
-
-
-
-}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/funktionen/Funktionen.php b/application/controllers/api/frontend/v1/funktionen/Funktionen.php
index d6d4a0ae4..030994736 100644
--- a/application/controllers/api/frontend/v1/funktionen/Funktionen.php
+++ b/application/controllers/api/frontend/v1/funktionen/Funktionen.php
@@ -105,51 +105,6 @@ class Funktionen extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	//TODO(Manu) DELETE
-	public function DEPR_getCurrentFunctions($uid, $companyOrgetkurzbz)
-	{
-	$sql = "
-		SELECT
-			bf.benutzerfunktion_id, f.beschreibung || ', '
-			|| oe.bezeichnung || ' [' || oet.bezeichnung || '], '
-			|| COALESCE(to_char(bf.datum_von, 'dd.mm.YYYY'), 'n/a')
-			|| ' - ' || COALESCE(to_char(bf.datum_bis, 'dd.mm.YYYY'), 'n/a')
-			|| COALESCE(dvu.attachedtovb, '') AS label
-
-			FROM (
-			WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) as
-			(
-			SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit
-			WHERE oe_kurzbz = ?
-			UNION ALL
-			SELECT o.oe_kurzbz, o.oe_parent_kurzbz FROM public.tbl_organisationseinheit o, oes
-			WHERE o.oe_parent_kurzbz=oes.oe_kurzbz
-			)
-			SELECT oe_kurzbz
-			FROM oes
-			GROUP BY oe_kurzbz
-			) c
-			JOIN public.tbl_organisationseinheit oe ON oe.oe_kurzbz = c.oe_kurzbz
-			JOIN public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
-			JOIN public.tbl_benutzerfunktion bf ON bf.oe_kurzbz = oe.oe_kurzbz
-			JOIN public.tbl_funktion f ON f.funktion_kurzbz = bf.funktion_kurzbz
-			LEFT JOIN (
-			SELECT
-			benutzerfunktion_id, ' [DV]' AS attachedtovb
-			FROM
-			hr.tbl_vertragsbestandteil_funktion
-			GROUP BY
-			benutzerfunktion_id
-			) dvu ON dvu.benutzerfunktion_id = bf.benutzerfunktion_id
-			WHERE bf.uid = ?
-			ORDER BY f.beschreibung ASC";
-
-		$benutzerfunktionen = $this->BenutzerfunktionModel->execReadOnlyQuery($sql, array( $companyOrgetkurzbz,$uid));
-		$data = $this->getDataOrTerminateWithError($benutzerfunktionen);
-
-		$this->terminateWithSuccess($data);
-	}
-
 	/*
 	 * return list of child orgets for a given company orget_kurzbz
 	 * as key value list to be used in select or autocomplete
@@ -184,30 +139,6 @@ class Funktionen extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	//TODO(Manu) DELETE
-	/*
-	 * List of Oes for autocomplete field organisation unit
-	 */
-	public function DEPR_loadAllOes($filterStudent=false, $aktiv=true)
-	{
-		$sql = "
-			SELECT
-			    oe_kurzbz,
-			    CONCAT('[', organisationseinheittyp_kurzbz, '] ', bezeichnung) as label
-			FROM public.tbl_organisationseinheit 
-			WHERE aktiv = ?";
-
-		if($filterStudent)
-			$sql .= " AND organisationseinheittyp_kurzbz in ('Studiengang','Lehrgang')";
-
-		$sql .= " ORDER BY organisationseinheittyp_kurzbz, bezeichnung";
-
-		$result = $this->OrganisationseinheitModel->execReadOnlyQuery($sql, array($aktiv));
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
 	public function searchOes($companyOrgetKurzbz, $searchString = null)
 	{
 		$result = $this->OrganisationseinheitModel->getAutocompleteSuggestionsWithCompany($companyOrgetKurzbz, $searchString);
diff --git a/application/controllers/api/frontend/v1/funktionen/OrgAPI.php b/application/controllers/api/frontend/v1/funktionen/OrgAPI.php
deleted file mode 100644
index f6cf5bdb8..000000000
--- a/application/controllers/api/frontend/v1/funktionen/OrgAPI.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-
-defined('BASEPATH') || exit('No direct script access allowed');
-
-class OrgAPI extends Auth_Controller
-{
-
-	const DEFAULT_PERMISSION = 'basis/mitarbeiter:rw';
-	const HANDYVERWALTUNG_PERMISSION = 'extension/pv21_handyverwaltung:rw';
-
-	public function __construct() {
-		parent::__construct(array(
-				'getOrgHeads' => OrgAPI::DEFAULT_PERMISSION,
-				'getOrgStructure' => OrgAPI::DEFAULT_PERMISSION,
-				'getOrgPersonen' => OrgAPI::DEFAULT_PERMISSION,
-				'getCompanyByOrget'  => [OrgAPI::DEFAULT_PERMISSION, self::HANDYVERWALTUNG_PERMISSION],
-				'getOrgetsForCompany' => OrgAPI::DEFAULT_PERMISSION,
-				'getUnternehmen' => [OrgAPI::DEFAULT_PERMISSION, self::HANDYVERWALTUNG_PERMISSION],
-			)
-		);
-		$this->load->library('AuthLib');
-		$this->load->model('extensions/FHC-Core-Personalverwaltung/Organisationseinheit_model', 'OrganisationseinheitModel');
-		$this->load->model('extensions/FHC-Core-Personalverwaltung/Api_model','ApiModel');
-	}
-
-	// -----------------------------
-	// Organisation
-	// -----------------------------
-
-	function getOrgHeads()
-	{
-		$data = $this->OrganisationseinheitModel->getHeads();
-		return $this->outputJson($data);
-	}
-
-	function getOrgStructure()
-	{
-		$oe = $this->input->get('oe', TRUE);
-
-		$data = $this->OrganisationseinheitModel->getOrgStructure($oe);
-		return $this->outputJson($data);
-	}
-
-	function getOrgPersonen()
-	{
-		$oe = $this->input->get('oe', TRUE);
-
-		$data = $this->OrganisationseinheitModel->getPersonen($oe);
-		return $this->outputJson($data);
-	}
-
-
-
-
-	public function getCompanyByOrget($oe_kurzbz)
-	{
-
-		$sql = <<<EOSQL
-        WITH RECURSIVE unternehmen as
-        (
-                SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit
-                WHERE oe_kurzbz=?
-                UNION ALL
-                SELECT o.oe_kurzbz, o.oe_parent_kurzbz
-                FROM   public.tbl_organisationseinheit AS o
-                       INNER JOIN unternehmen u  ON u.oe_parent_kurzbz=o.oe_kurzbz
-        )
-        SELECT *
-        FROM unternehmen
-        WHERE oe_parent_kurzbz is null;
-EOSQL;
-		$childorgets = $this->OrganisationseinheitModel->execReadOnlyQuery($sql, array($oe_kurzbz));
-		if( hasData($childorgets) )
-		{
-			$this->outputJson($childorgets);
-			return;
-		}
-		else
-		{
-			$this->outputJsonError('no orgets found for parent oe_kurzbz ' . $oe_kurzbz );
-			return;
-		}
-	}
-
-	/*
-	 * return list of child orgets for a given company orget_kurzbz
-	 * as key value list to be used in select or autocomplete
-	 */
-	public function getOrgetsForCompany($companyOrgetkurzbz=null)
-	{
-		if( empty($companyOrgetkurzbz) )
-		{
-			$this->outputJsonError('Missing Parameter <companyOrgetkurzbz>');
-			return;
-		}
-
-		$sql = <<<EOSQL
-			SELECT
-				oe.oe_kurzbz AS value,
-				'[' || COALESCE(oet.bezeichnung, oet.organisationseinheittyp_kurzbz) ||
-				'] ' || COALESCE(oe.bezeichnung, oe.oe_kurzbz) AS label
-			FROM (
-					WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) as
-					(
-						SELECT oe_kurzbz, oe_parent_kurzbz FROM public.tbl_organisationseinheit
-						WHERE oe_kurzbz=?
-						UNION ALL
-						SELECT o.oe_kurzbz, o.oe_parent_kurzbz FROM public.tbl_organisationseinheit o, oes
-						WHERE o.oe_parent_kurzbz=oes.oe_kurzbz
-					)
-					SELECT oe_kurzbz
-					FROM oes
-					GROUP BY oe_kurzbz
-			) c
-			JOIN public.tbl_organisationseinheit oe ON oe.oe_kurzbz = c.oe_kurzbz
-			JOIN public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
-			ORDER BY oet.bezeichnung ASC, oe.bezeichnung ASC
-
-EOSQL;
-
-		$childorgets = $this->OrganisationseinheitModel->execReadOnlyQuery($sql, array($companyOrgetkurzbz));
-		if( hasData($childorgets) )
-		{
-			$this->outputJson($childorgets);
-			return;
-		}
-		else
-		{
-			$this->outputJsonError('no orgets found for parent oe_kurzbz ' . $companyOrgetkurzbz );
-			return;
-		}
-	}
-
-
-	public function getUnternehmen()
-	{
-		$this->OrganisationseinheitModel->resetQuery();
-		$this->OrganisationseinheitModel->addSelect('oe_kurzbz AS value, bezeichnung AS label, \'false\'::boolean AS disabled');
-		$this->OrganisationseinheitModel->addOrder('bezeichnung', 'ASC');
-		$unternehmen = $this->OrganisationseinheitModel->loadWhere('oe_parent_kurzbz IS NULL');
-		if( hasData($unternehmen) )
-		{
-			$this->outputJson($unternehmen);
-			return;
-		}
-		else
-		{
-			$this->outputJsonError('no companies (orgets with parent NULL) found');
-			return;
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index f22f888de..d37a6d6ec 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -132,11 +132,6 @@ class Config extends FHCAPI_Controller
 			'title' => $this->p->t('stv', 'tab_functions'),
 			'component' => './Stv/Studentenverwaltung/Details/Funktionen.js'
 		];
-/*		TODO(Manu) REMOVE just for Testing*/
-		$result['functions_composition'] = [
-			'title' => 'F_PV21',
-			'component' => './Stv/Studentenverwaltung/Details/FunktionenOld.js'
-		];
 
 		Events::trigger('stv_conf_student', function & () use (&$result) {
 			return $result;
diff --git a/public/js/api/factory/funktionen.js b/public/js/api/factory/funktionen.js
deleted file mode 100644
index c1f4efa29..000000000
--- a/public/js/api/factory/funktionen.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import person from "./funktionen/person.js";
-
-export default {
-	person
-};
\ No newline at end of file
diff --git a/public/js/api/factory/funktionen/person.js b/public/js/api/factory/funktionen/person.js
deleted file mode 100644
index 305d0bbeb..000000000
--- a/public/js/api/factory/funktionen/person.js
+++ /dev/null
@@ -1,68 +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 {
-	getContractFunctions(filter) {
-		var url = 'api/frontend/v1/funktionen/FunctionsAPI/getContractFunctions';
-		if( typeof filter !== 'undefined' && filter !== null ) {
-			url = url + '/' + filter;
-		}
-		return {
-			method: 'get',
-			url,
-		};
-
-	},
-	getOrgetsForCompany(unternehmen) {
-		var url = 'api/frontend/v1/funktionen/OrgAPI/getOrgetsForCompany'
-			+ '/' + unternehmen;
-		return {
-			method: 'get',
-			url,
-		};
-	},
-	getCompanyByOrget(orget) {
-		var url = 'api/frontend/v1/funktionen/OrgAPI/getCompanyByOrget'
-			+ '/' + orget;
-		return {
-			method: 'get',
-			url,
-		};
-	},
-	getCurrentFunctions(mitarbeiter_uid, unternehmen) {
-		var url = 'api/frontend/v1/funktionen/FunctionsAPI/getCurrentFunctions'
-			+ '/' + mitarbeiter_uid + '/' + unternehmen;
-		return {
-			method: 'get',
-			url,
-		};
-	}  ,
-	getAllUserFunctions(mitarbeiter_uid) {
-		var url = 'api/frontend/v1/funktionen/FunctionsAPI/getAllUserFunctions'
-			+ '/' + mitarbeiter_uid;
-		return {
-			method: 'get',
-			url,
-		};
-	},
-	getAllFunctions() {
-		var url = 'api/frontend/v1/funktionen/FunctionsAPI/getAllFunctions';
-		return {
-			method: 'get',
-			url,
-		};
-	}
-};
\ No newline at end of file
diff --git a/public/js/components/Funktionen/Funktionen.js b/public/js/components/Funktionen/Funktionen.js
index 9618bdf9b..7bbd26702 100644
--- a/public/js/components/Funktionen/Funktionen.js
+++ b/public/js/components/Funktionen/Funktionen.js
@@ -216,8 +216,6 @@ export default {
 			newBtnStyle: ''
 		}
 	},
-	computed: {
-	},
 	methods: {
 		onSwitchChange() {
 			if (this.isFilterSet) {
@@ -387,7 +385,7 @@ export default {
 					>
 				</form-input>
 			</div>
-			<div v-else>
+			<div v-else class="py-3">
 				<form-input
 					container-class="form-switch"
 					type="checkbox"
diff --git a/public/js/components/Funktionen/Funktionen_composition_api.js b/public/js/components/Funktionen/Funktionen_composition_api.js
deleted file mode 100644
index d48e77fd3..000000000
--- a/public/js/components/Funktionen/Funktionen_composition_api.js
+++ /dev/null
@@ -1,622 +0,0 @@
-import { Modal } from './Modal.js';
-import { ModalDialog } from './ModalDialog.js';
-import { Toast } from './Toast.js';
-import {OrgChooser} from "./OrgChooser.js";
-import { usePhrasen } from '../../mixins/Phrasen.js';
-
-import ApiFunktion from '../../api/factory/funktionen/person.js';
-import ApiPerson from "../../../extensions/FHC-Core-Personalverwaltung/js/api/factory/person.js";
-
-export const Funktionen = {
-	name: 'FunctionComponentOld',
-	components: {
-		Modal,
-		ModalDialog,
-		Toast,
-		OrgChooser,
-		"datepicker": VueDatePicker
-	},
-	props: {
-		modelValue: { type: Object, default: () => ({}), required: false},
-		config: { type: Object, default: () => ({}), required: false},
-		readonlyMode: { type: Boolean, required: false, default: false },
-		personID: { type: Number, required: false },
-		personUID: { type: String, required: false },
-		writePermission: { type: Boolean, required: false },
-		showDvCompany: { type: Boolean, required: false, default: true }
-	},
-	emits: ['updateHeader'],
-	setup( props, { emit } ) {
-
-		const $api = Vue.inject('$api');
-		//const fhcAlert = Vue.inject('$fhcAlert');
-
-
-		const readonly = Vue.ref(false);
-
-		const { t } = usePhrasen();
-
-		//const { personID: currentPersonID , personUID: currentPersonUID  } = Vue.toRefs(props);
-		const currentPersonID = Vue.computed(() => { return props.personID });
-		const currentPersonUID = Vue.computed(() => { return props.personUID });
-
-		const dialogRef = Vue.ref();
-
-		const isFetching = Vue.ref(false);
-
-		const theModel = Vue.computed({
-			get: () => props.modelValue,
-			set: (value) => emit('update:modelValue', value),
-		});
-
-		const unternehmen = Vue.ref();
-		const jobfunctionList = Vue.ref([]);
-		const jobfunctionDefList = Vue.ref([]);
-		const orgUnitList = Vue.ref([{value: '', label: '-'}]);
-
-		const aktivChecked = Vue.ref(true);
-
-		const table = Vue.ref(null); // reference to your table element
-		const tabulator = Vue.ref(null); // variable to hold your table
-		const tableData = Vue.reactive([]); // data for table to display
-
-
-		const full = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
-		const route = ( props.readonlyMode !== true ) ? VueRouter.useRoute() : null;
-
-		const convertArrayToObject = (array, key) => {
-			const initialValue = {};
-			return array.reduce((obj, item) => {
-				return {
-					...obj,
-					[item[key]]: item,
-				};
-			}, initialValue);
-		};
-
-		const fetchData = async () => {
-			if (currentPersonID.value==null && theModel.value.personID==null) {
-				jobfunctionList.value = [];
-				return;
-			}
-			isFetching.value = true
-
-			// fetch data and map them for easier access
-			try {
-				const response = await $api.call(
-					ApiFunktion.getAllUserFunctions(theModel.value.personUID || currentPersonUID.value));
-				if(response.error === 1) {
-					let rawList = [];
-					tableData.value = [];
-					jobfunctionList.value = convertArrayToObject(rawList, 'benutzerfunktion_id');
-				} else {
-					let rawList = response.retval;
-					tableData.value = response.retval;
-					jobfunctionList.value = convertArrayToObject(rawList, 'benutzerfunktion_id');
-				}
-			} catch (error) {
-				console.log(error)
-			} finally {
-				isFetching.value = false
-			}
-
-		}
-
-		const createShape = () => {
-			return {
-				benutzerfunktion_id: 0,
-				uid: theModel.value.personUID || currentPersonUID.value,
-				oe_kurzbz: "",
-				funktion_kurzbz: "",
-				datum_von: "",
-				datum_bis: "",
-				bezeichnung: "",
-				wochenstunden: 0,
-			}
-		}
-
-		const currentValue = Vue.ref(createShape());
-		const preservedValue = Vue.ref(createShape());
-
-		Vue.watch([currentPersonID, currentPersonUID], ([id,uid]) => {
-			fetchData();
-		});
-
-		Vue.watch(unternehmen, (unternehmen_kurzbz) => {
-			fetchOrgUnits(unternehmen_kurzbz);
-			fetchFunctions();
-		});
-
-		const toggleMode = async () => {
-			if (!readonly.value) {
-				// cancel changes?
-				if (hasChanged.value) {
-					const ok = await dialogRef.value.show();
-					if (ok) {
-						console.log("ok=", ok);
-						currentValue.value = preservedValue.value;
-					} else {
-						return
-					}
-				}
-			} else {
-				// switch to edit mode and preserve data
-				preservedValue.value = {...currentValue.value};
-			}
-			readonly.value = !readonly.value;
-		}
-
-		Vue.onMounted(async () => {
-			currentValue.value = createShape();
-			await fetchData();
-
-			const dateFormatter = (cell) => {
-				return cell.getValue()?.replace(/(.*)-(.*)-(.*)/, '$3.$2.$1');
-			}
-
-			const dvFormatter = (cell) => {
-				if( props.readonlyMode === true ) {
-					return (cell.getValue() != null) ? cell.getValue() : '';
-				}
-				const url = fullPath + route.params.id + '/' + route.params.uid + '/contract/' + cell.getRow().getData().dienstverhaeltnis_id;
-				return cell.getValue() != null ? `<a href="${url}">` + cell.getValue() + '</a>' : '';
-			}
-
-			// helper
-			const createDomButton = (classValue, clickHandler) => {
-				const nodeBtn = document.createElement("button");
-				const classAttrBtn = document.createAttribute("class");
-				classAttrBtn.value = "btn btn-outline-secondary btn-sm";
-				nodeBtn.setAttributeNode(classAttrBtn);
-				nodeBtn.addEventListener("click", clickHandler);
-				const nodeI = document.createElement("i");
-				const classAttrI = document.createAttribute("class");
-				classAttrI.value = classValue;
-				nodeI.setAttributeNode(classAttrI);
-				nodeBtn.appendChild(nodeI);
-				return nodeBtn;
-			}
-
-			const btnFormatter = (cell) => {
-
-				const nodeDiv = document.createElement("div");
-				const classAttrDiv = document.createAttribute("class");
-				classAttrDiv.value = "d-grid gap-2 d-md-flex justify-content-end align-middle";
-				nodeDiv.setAttributeNode(classAttrDiv);
-				// delete button
-				const nodeBtnDel = createDomButton("fa fa-xmark",() => { showDeleteModal(cell.getValue()) })
-				// edit button
-				const nodeBtnEdit = createDomButton("fa fa-pen",() => { showEditModal(cell.getValue()) })
-
-				if( cell.getRow().getData().dienstverhaeltnis_unternehmen === null ) {
-					nodeDiv.appendChild(nodeBtnEdit);
-					nodeDiv.appendChild(nodeBtnDel);
-				}
-
-				return nodeDiv;
-			}
-
-
-			const columnsDef = [
-				{ title: t('person','dv_unternehmen'), field: "dienstverhaeltnis_unternehmen", formatter: dvFormatter, sorter:"string", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"}, visible: props.showDvCompany },
-				{ title: t('person','zuordnung_taetigkeit'), field: "funktion_beschreibung", hozAlign: "left", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
-				{ title: t('lehre','organisationseinheit'), field: "funktion_oebezeichnung", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} },
-				{ title: t('person','wochenstunden'), field: "wochenstunden", hozAlign: "right", width: 140, headerFilter:true },
-				{ title: t('ui','from'), field: "datum_von", hozAlign: "center", formatter: dateFormatter, width: 140, sorter:"string", headerFilter:true, headerFilterFunc:customHeaderFilter },
-				{ title: t('global','bis'), field: "datum_bis", hozAlign: "center", formatter: dateFormatter, width: 140, sorter:"string", headerFilter:true, headerFilterFunc:customHeaderFilter },
-				{ title: t('ui','bezeichnung'), field: "bezeichnung", hozAlign: "left", headerFilter:"list", headerFilterParams: {valuesLookup:true, autocomplete:true, sort:"asc"} }
-			];
-
-			if( props.readonlyMode === false) {
-				columnsDef.push({ title: "", field: "benutzerfunktion_id", formatter: btnFormatter, hozAlign: "right", width: 100, headerSort: false, frozen: true });
-			}
-
-			let tabulatorOptions = {
-				height: "100%",
-				layout: "fitColumns",
-				movableColumns: true,
-				reactiveData: true,
-				columns: columnsDef,
-				//data: tableData.value,
-				data: jobfunctionListArray.value,
-			};
-
-			tabulator.value = new Tabulator(
-				table.value,
-				tabulatorOptions
-			);
-
-			function customHeaderFilter(headerValue, rowValue, rowData, filterParams){
-				//headerValue - the value of the header filter element
-				//rowValue - the value of the column in this row
-				//rowData - the data for the row being filtered
-				//filterParams - params object passed to the headerFilterFuncParams property
-
-				const validDate = function(d){
-					return d instanceof Date && isFinite(d);
-				}
-
-				const date1 = new Date(rowValue);
-				date1.setHours(0,0,0,0);
-				let [day, month, year] = headerValue.split('.')
-				if (year < 1000) return true;  // prevents dates like 17.5.2
-				const date2 = new Date(+year, +month - 1, +day);
-
-				return  !(validDate(date2)) || ((date2 - date1) == 0); //must return a boolean, true if it passes the filter.
-			}
-
-			tabulator.value.on('tableBuilt', () => {
-				//tabulator.value.setData(tableData.value);
-
-			})
-
-		})
-
-		const jobfunctionListArray = Vue.computed(() => {
-			let temp = (jobfunctionList.value ? Object.values(jobfunctionList.value) : []);
-			let filtered = temp.filter((e) => ( !aktivChecked.value || (aktivChecked.value && e.aktiv) ));
-			return filtered;
-		});
-
-		// Workaround to update tabulator
-		Vue.watch(jobfunctionListArray, (newVal, oldVal) => {
-			console.log('jobfunctionList changed');
-			tabulator.value?.setData(jobfunctionListArray.value);
-		}, {deep: true})
-
-		// Modal
-		const modalRef = Vue.ref();
-		const confirmDeleteRef = Vue.ref();
-
-		const showAddModal = () => {
-			currentValue.value = createShape();
-			// reset form state
-			frmState.orgetBlurred=false;
-			frmState.funktionBlurred=false;
-			frmState.beginnBlurred=false;
-			// call bootstrap show function
-			modalRef.value.show();
-		}
-
-		const hideModal = () => {
-			modalRef.value.hide();
-		}
-
-		const showEditModal = async (id) => {
-			currentValue.value = { ...jobfunctionList.value[id] };
-			// fetch company
-			isFetching.value = true;
-			try {
-				const res = await $api.call(ApiFunktion.getCompanyByOrget(currentValue.value.oe_kurzbz));
-				if (res.error == 0) {
-					unternehmen.value = res.retval[0].oe_kurzbz;
-				} else {
-					console.log('company not found for orget!');
-				}
-
-			} catch (error) {
-				console.log(error)
-			} finally {
-				isFetching.value = false
-			}
-			//delete currentValue.value.bezeichnung;
-			modalRef.value.show();
-		}
-
-		const showDeleteModal = async (id) => {
-			currentValue.value = { ...jobfunctionList.value[id] };
-			const ok = await confirmDeleteRef.value.show();
-
-			if (ok) {
-
-				try {
-					const res = await $api.call(ApiPerson.deletePersonJobFunction(id));
-					if (res.error == 0) {
-						delete jobfunctionList.value[id];
-						showDeletedToast();
-						theModel.value.updateHeader();
-					}
-				} catch (error) {
-					console.log(error)
-				} finally {
-					isFetching.value = false
-				}
-
-			}
-		}
-
-
-		const okHandler = async () => {
-			if (!validate()) {
-
-				console.log("form invalid");
-
-			} else {
-
-				// submit
-				try {
-					let payload = {...currentValue.value};
-					delete payload.dienstverhaeltnis_id;
-					delete payload.dienstverhaeltnis_unternehmen;
-					delete payload.fachbereich_bezeichnung;
-					delete payload.funktion_oebezeichnung;
-					delete payload.aktiv;
-					delete payload.funktion_beschreibung;
-					const r = await $api.call(ApiPerson.upsertPersonJobFunction(payload));
-					if (r.error == 0) {
-						// fetch all data because of all the references in the changed record
-						await fetchData();
-						console.log('job function successfully saved');
-						theModel.value.updateHeader();
-						showToast();
-					}
-				} catch (error) {
-					console.log(error)
-				} finally {
-					isFetching.value = false
-				}
-
-				hideModal();
-			}
-		}
-
-		// -------------
-		// form handling
-		// -------------
-
-		const jobFunctionFrm = Vue.ref();
-
-		const frmState = Vue.reactive({ beginnBlurred: false, orgetBlurred: false, funktionBlurred: false, wasValidated: false });
-
-		const notEmpty = (n) => {
-			return !!n && n.trim() != "";
-		}
-
-		const validate = () => {
-			frmState.orgetBlurred = true;
-			frmState.funktionBlurred = true;
-			frmState.beginnBlurred = true;
-			return notEmpty(currentValue.value.datum_von) &&
-				notEmpty(currentValue.value.oe_kurzbz) &&
-				notEmpty(currentValue.value.funktion_kurzbz);
-		}
-
-
-		const hasChanged = Vue.computed(() => {
-			return Object.keys(currentValue.value).some(field => currentValue.value[field] !== preservedValue.value[field])
-		});
-
-		const formatDate = (d) => {
-			if (d != null && d != '') {
-				return d.substring(8, 10) + "." + d.substring(5, 7) + "." + d.substring(0, 4);
-			} else {
-				return ''
-			}
-		}
-
-		// Toast
-		const toastRef = Vue.ref();
-		const deleteToastRef = Vue.ref();
-
-		const showToast = () => {
-			toastRef.value.show();
-		}
-
-		const showDeletedToast = () => {
-			deleteToastRef.value.show();
-		}
-
-		const fetchOrgUnits = async (unternehmen_kurzbz) => {
-			if( unternehmen_kurzbz === '' ) {
-				return;
-			}
-			const response = await $api.call(
-				ApiFunktion.getOrgetsForCompany(unternehmen_kurzbz));
-			const orgets = response.retval;
-			orgets.unshift({
-				value: '',
-				label: t('ui','bitteWaehlen'),
-			});
-			orgUnitList.value = await  orgets;
-		}
-
-		const fetchFunctions = async (uid, unternehmen_kurzbz) => {
-			if(unternehmen_kurzbz === '' || uid === '' ) {
-				return;
-			}
-			const response = await $api.call(ApiFunktion.getAllFunctions());
-			const benutzerfunktionen = response.retval;
-			benutzerfunktionen.unshift({
-				value: '',
-				label: t('ui','bitteWaehlen'),
-			});
-			jobfunctionDefList.value = benutzerfunktionen;
-		}
-
-		const unternehmenSelectedHandler = (e) => {
-			console.log('unternehmen selected: ',e);
-			unternehmen.value = e;
-		}
-
-		const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
-		const fullPath = `/${ciPath}/extensions/FHC-Core-Personalverwaltung/Employees/`;
-
-		return {
-			jobfunctionList, orgUnitList, jobfunctionListArray,
-			jobfunctionDefList,
-			currentValue,
-			readonly,
-			frmState,
-			dialogRef,
-			toastRef, deleteToastRef,
-			jobFunctionFrm,
-			modalRef,
-			fullPath,
-			route,
-			aktivChecked,
-			unternehmen,
-			tabulator,
-			table,
-
-			toggleMode, formatDate, notEmpty,
-			showToast, showDeletedToast,
-			showAddModal, hideModal, okHandler,
-			showDeleteModal, showEditModal, confirmDeleteRef, t, unternehmenSelectedHandler
-		}
-	},
-	template: `
-    <div class="row" v-if="readonlyMode === false">
-
-        <div class="toast-container position-absolute top-0 end-0 pt-4 pe-2">
-          <Toast ref="toastRef">
-            <template #body><h4>{{ t('person','funktionGespeichert') }}</h4></template>
-          </Toast>
-        </div>
-
-        <div class="toast-container position-absolute top-0 end-0 pt-4 pe-2">
-            <Toast ref="deleteToastRef">
-                <template #body><h4>{{ t('person', 'funktionGeloescht') }}</h4></template>
-            </Toast>
-        </div>
-    </div>
-    <div class="row pt-md-4">      
-         <div class="col">
-             <div class="card">
-                <div class="card-header">
-                    <div class="h5"><h5>{{ t('person','funktionen') }}</h5></div>        
-                </div>
-
-                <div class="card-body">
-                    <div class="d-grid d-md-flex justify-content-between pt-2 pb-3" v-if="readonlyMode === false">
-                        <button type="button" class="btn btn-sm btn-primary me-3" @click="showAddModal()">
-                            <i class="fa fa-plus"></i> {{ t('person','funktion') }}
-                        </button>
-                        <div class="form-check">
-                            <input class="form-check-input" type="checkbox" role="switch" id="aktivChecked" v-model="aktivChecked">
-                            <label class="form-check-label" for="aktivChecked">Nur aktive anzeigen</label>
-                        </div>
-                    </div>
-
-                    <!-- TABULATOR -->
-                    <div ref="table" class="fhc-tabulator"></div>
-                
-                </div>
-             </div>
-         </div>
-    </div>    
-
-    <!-- detail modal -->
-    <Modal :title="t('person','funktion')" ref="modalRef" v-if="readonlyMode === false">
-        <template #body>
-            <form class="row g-3" ref="jobFunctionFrm">
-                            
-                <div class="col-md-8">
-					<div v-show="showDvCompany">
-						<label class="form-label">{{ t('core','unternehmen') }}</label><br>
-						<org-chooser @org-selected="unternehmenSelectedHandler" :oe="unternehmen" class="form-select form-select-sm"></org-chooser>
-					</div>
-                </div>
-                <div class="col-md-4">
-                </div>
-                <!--  -->
-                <div class="col-md-8">
-                    <label class="required form-label">{{ t('lehre','organisationseinheit') }}</label><br>
-                    <select id="oe_kurzbz" v-model="currentValue.oe_kurzbz" 
-                        @blur="frmState.orgetBlurred = true"
-                        class="form-select form-select-sm" aria-label=".form-select-sm " 
-                        :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly, 'is-invalid': !notEmpty(currentValue.oe_kurzbz) && frmState.orgetBlurred}"
-                        >
-                        <option v-for="(item, index) in orgUnitList" :value="item.value">
-                            {{ item.label }}
-                        </option>                       
-                    </select>
-                </div>
-                <div class="col-md-4">
-                </div>
-                <!--  -->
-                <div class="col-md-8">
-                    <label for="funktion_kurzbz" class="required form-label">{{ t('person','funktion') }}</label><br>
-                    <select id="_kurzbz" v-model="currentValue.funktion_kurzbz" 
-                        @blur="frmState.funktionBlurred = true"
-                        class="form-select form-select-sm" aria-label=".form-select-sm " 
-                        :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly, 'is-invalid': !notEmpty(currentValue.funktion_kurzbz) && frmState.funktionBlurred}"
-                        >
-                        <option v-for="(item, index) in jobfunctionDefList" :value="item.value">
-                            {{ item.label }}
-                        </option>                       
-                    </select>
-                </div>
-                <div class="col-md-4"></div>
-                <!-- -->
-                <div class="col-md-2">
-                    <label for="uid" class="form-label">{{ t('person','wochenstunden') }}</label>
-                    <input type="number"  :readonly="readonly" class="form-control-sm" :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly}" id="bank" v-model="currentValue.wochenstunden">
-                </div>
-                <!--  -->
-                <div class="col-md-3">
-                    <label for="beginn" class="required form-label">{{ t('ui','from') }}</label>
-                    <datepicker id="beginn"
-                        :teleport="true" 
-                        @blur="frmState.beginnBlurred = true" 
-                        :input-class-name="(!notEmpty(currentValue.datum_von) && frmState.beginnBlurred) ? 'dp-invalid-input' : ''" 
-                        v-model="currentValue.datum_von"
-                        v-bind:enable-time-picker="false"
-                        text-input 
-                        locale="de"
-                        format="dd.MM.yyyy"
-                        auto-apply 
-                        model-type="yyyy-MM-dd"></datepicker>
-                </div>
-                <div class="col-md-3">
-                    <label for="ende" class="form-label">{{ t('global','bis') }}</label>
-                    <datepicker id="ende"
-                        :teleport="true" 
-                        v-model="currentValue.datum_bis"
-                        v-bind:enable-time-picker="false"
-                        text-input 
-                        locale="de"
-                        format="dd.MM.yyyy"
-                        auto-apply 
-                        model-type="yyyy-MM-dd"></datepicker>                   
-                </div>
-                <div class="col-md-3">
-                </div>
-                <!-- -->
-                <div class="col-md-8">
-                    <label for="bezeichnung" class="form-label">{{ t('ui','bezeichnung') }}</label>
-                    <input type="text"  :readonly="readonly" class="form-control-sm" :class="{ 'form-control-plaintext': readonly, 'form-control': !readonly}" id="bezeichnung" v-model="currentValue.bezeichnung">
-                </div>
-                <div class="col-md-4">
-                </div>
-                
-                
-                <!-- changes -->
-                <div class="col-8">
-                    <div class="modificationdate">{{ currentValue.insertamum }}/{{ currentValue.insertvon }}, {{ currentValue.updateamum }}/{{ currentValue.updatevon }} [id={{ currentValue.benutzerfunktion_id }}]</div>
-                </div>
-                
-            </form>
-        </template>
-        <template #footer>
-            <button type="button" class="btn btn-primary" @click="okHandler()" >
-                {{ t('ui','speichern') }}
-            </button>
-        </template>
-
-    </Modal>
-
-    <ModalDialog :title="t('global','warnung')" ref="dialogRef" v-if="readonlyMode === false">
-      <template #body>
-        {{ t('person','funktionNochNichtGespeichert') }}
-      </template>
-    </ModalDialog>
-
-    <ModalDialog :title="t('global','warnung')" ref="confirmDeleteRef" v-if="readonlyMode === false">
-        <template #body>
-            {{ t('person','funktion') }} '{{ currentValue?.funktion_kurzbz }} ({{ currentValue?.datum_von }}-{{ currentValue?.datum_bis }})' {{ t('person', 'wirklichLoeschen') }}?
-        </template>
-    </ModalDialog>
-    `
-}
-
-export default Funktionen;
\ No newline at end of file
diff --git a/public/js/components/Funktionen/Modal.js b/public/js/components/Funktionen/Modal.js
deleted file mode 100644
index 716d9ac2a..000000000
--- a/public/js/components/Funktionen/Modal.js
+++ /dev/null
@@ -1,48 +0,0 @@
-export const Modal = {
-	name: 'Modal',
-    props: {
-        type: String,
-        title: String,
-        noscroll: Boolean
-    },
-    expose: ['show', 'hide'],
-    setup(props, { emit }) {
-       
-        let modalEle = Vue.ref(null);
-        let thisModalObj;
-
-        Vue.onMounted(() => {
-            thisModalObj = new bootstrap.Modal(modalEle.value);
-        });
-        const show = () => {
-            thisModalObj.show();
-        }
-        function hide() {
-            thisModalObj.hide();
-        }
-
-        return { modalEle, show, hide };
-    },
-
-    template:`
-    <div class="modal fade " id="customModal" tabindex="-1" aria-labelledby=""
-        aria-hidden="true" ref="modalEle">
-        <div class="modal-dialog modal-lg" :class="(!noscroll) ? 'modal-dialog-scrollable' : ''">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="customModalLabel">{{ title }}</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body">
-                    <slot name="body" />
-                </div>
-                <div class="modal-footer">
-                    <slot name="footer"></slot>
-                    <!-- button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
-                        OK
-                    </button-->
-                </div>
-            </div>
-        </div>
-    </div>`
-};
diff --git a/public/js/components/Funktionen/ModalDialog.js b/public/js/components/Funktionen/ModalDialog.js
deleted file mode 100644
index c46540cae..000000000
--- a/public/js/components/Funktionen/ModalDialog.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import { usePhrasen } from '../../mixins/Phrasen.js';
-
-export const ModalDialog = {
-	name: 'ModalDialog',
-    props: {
-        type: String,
-        title: String,
-    },
-    expose: ['show', 'hide'],
-    setup(props, { emit }) {
-       
-        let modalConfirmEle = Vue.ref(null);
-        let thisModalObj;
-        let _resolve;
-        let _reject;
-        const { t } = usePhrasen();
-
-        Vue.onMounted(() => {
-            thisModalObj = new bootstrap.Modal(modalConfirmEle.value);
-        });
-        
-        const show = async () => {
-            thisModalObj.show();
-            return new Promise(function (resolve, reject) {
-              _resolve = resolve;
-              _reject = reject;
-            });
-        }
-
-        function hide() {
-            thisModalObj.hide();
-        }
-
-        const ok = () => {
-            _resolve(true);
-          }
-          
-        const cancel = () =>  {
-            _resolve(false);
-        }        
-
-        return { modalConfirmEle, show, hide, ok, cancel, t };
-    },
-
-    template:`
-    <div class="modal fade " id="customModalDialog" tabindex="-1" aria-labelledby=""
-        aria-hidden="true" ref="modalConfirmEle">
-        <div class="modal-dialog modal-lg">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="customModalDialogLabel">{{ title }}</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body">
-                    <slot name="body" />
-                </div>
-                <div class="modal-footer">
-                    <slot name="footer"></slot>
-                    <button type="button" class="btn btn-secondary" @click="cancel" data-bs-dismiss="modal">
-                      {{ t('ui','abbrechen') }}
-                    </button>
-                    <button type="button" class="btn btn-primary" @click="ok" data-bs-dismiss="modal">
-                        {{ t('ui','ok') }}
-                    </button>
-                </div>
-            </div>
-        </div>
-    </div>`
-};
diff --git a/public/js/components/Funktionen/OrgChooser.js b/public/js/components/Funktionen/OrgChooser.js
deleted file mode 100644
index 64109cc2c..000000000
--- a/public/js/components/Funktionen/OrgChooser.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import {CoreRESTClient} from '../../../js/RESTClient.js';
-
-export const OrgChooser = {
-	name: 'OrgChooser',
-    props: {
-      placeholder: String,
-      customClass: String,
-      oe: String,
-    },
-    emits: ["orgSelected"],
-    setup(props, { emit }) {   
-
-      const orgList = Vue.ref([]);
-      const isFetching = Vue.ref(false);
-      const oeRef = Vue.toRefs(props).oe
-      const selected = Vue.ref();
-
-      const fetchHead = async () => {
-        isFetching.value = true
-        try {
-          const res = await CoreRESTClient.get(
-            'extensions/FHC-Core-Personalverwaltung/api/frontend/v1/OrgAPI/getOrgHeads');
-          orgList.value = CoreRESTClient.getData(res.data);
-          if (orgList.value.length > 0)  {
-            //orgList.value.reverse();
-            if (props.oe == undefined || (props.oe != null && props.oe == '')) {
-              selected.value = orgList.value[0].oe_kurzbz;
-            }
-            emit("orgSelected", selected.value);
-          }
-          isFetching.value = false          
-        } catch (error) {
-          console.log(error)
-          isFetching.value = false
-        }
-      }
-
-      Vue.onMounted(() => {
-        fetchHead();
-      })
-
-      const orgSelected = (e) => {
-        emit("orgSelected", e.target.value);
-      }
-
-      Vue.watch(
-        oeRef,
-        (val, old) => {
-          console.log('prop value changed', val);
-          selected.value = val;
-        }
-      )
-
-      return   {
-        orgList, selected,
-
-        orgSelected
-      }
-
-
-    },
-    template: `
-    <select  id="orgHeadChooser" v-model="selected" @change="orgSelected" class="form-control-sm" aria-label=".form-select-sm " >
-        <option v-for="(item, index) in orgList" :value="item.oe_kurzbz"  :key="item.oe_kurzbz">
-            {{ item.bezeichnung }}
-        </option>         
-    </select>
-    `
-}    
diff --git a/public/js/components/Funktionen/Toast.js b/public/js/components/Funktionen/Toast.js
deleted file mode 100644
index 6b3faba82..000000000
--- a/public/js/components/Funktionen/Toast.js
+++ /dev/null
@@ -1,47 +0,0 @@
-export const Toast = {
-	name: 'Toast',
-    props: {
-        title: {
-            text: String,
-            default: "<<Text goes here>>",
-        },
-        type: {
-            text: String,
-            default: "success",
-        }
-    },
-    expose: ['show', 'hide'],
-    setup(props) {
-
-        let toastEle = Vue.ref(null);
-        let thisToastObj;
-
-        Vue.onMounted(() => {
-            thisToastObj = new bootstrap.Toast(toastEle.value);
-        });
-
-        const show = () => {
-            thisToastObj.show();
-        }
-
-        const hide = () => {
-            thisToastObj.hide();
-        }
-
-        const backgroundColor = Vue.computed(() => {
-            return props.type == "success" ? "bg-primary"  : "bg-danger"
-        })
-
-        return { show, hide, toastEle, backgroundColor };
-
-    },
-    template: `
-    <div class="toast align-items-center text-white border-0 " :class="backgroundColor" role="alert" aria-live="assertive" aria-atomic="true" ref="toastEle">
-        <div class="d-flex">
-            <div class="toast-body">
-            <slot name="body"></slot>
-            </div>
-            <button type="button" class="btn-close btn-close-white me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button>
-        </div>
-    </div>`
-}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js b/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js
index 3e82cc48b..f968ebecc 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js
@@ -9,16 +9,13 @@ export default {
   },
   template: `
 	<div class="stv-details-functions h-100 d-flex flex-column">
-        <h4>{{ $p.t('person', 'funktionen') }}</h4>
 
 		<person-functions
 			:readonlyMode="false"
 			:personID="modelValue.person_id"
 			:personUID="modelValue.uid"
-			:showDvCompany="true"
+			:showDvCompany="false"
 			:saveFunctionAsCopy="true"
-			:filterOeStudent="true"
-			:oeDropdownAutocomplete="true"
 			:stylePv21="false"
 		>
 		</person-functions>

From a99cc966827193f8648deceafa0a3b4ac68f96e4 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 21 May 2025 16:37:00 +0200
Subject: [PATCH 167/572] fix missing "import VueDatePicker from
 '../../vueDatepicker.js.php';" statements for new cis4 pages abgabetool &
 raumsuche

---
 public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js | 1 +
 public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js     | 1 +
 public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js   | 1 +
 public/js/components/Cis/Raumsuche/Raumsuche.js                | 1 +
 4 files changed, 4 insertions(+)

diff --git a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
index c49dcfd0a..0900282ef 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeMitarbeiterDetail.js
@@ -1,4 +1,5 @@
 import BsModal from '../../Bootstrap/Modal.js';
+import VueDatePicker from '../../vueDatepicker.js.php';
 
 const today = new Date()
 export const AbgabeMitarbeiterDetail = {
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 9b57244e2..896c8fa64 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -1,5 +1,6 @@
 import Upload from '../../../components/Form/Upload/Dms.js';
 import BsModal from '../../Bootstrap/Modal.js';
+import VueDatePicker from '../../vueDatepicker.js.php';
 
 const today = new Date()
 export const AbgabeStudentDetail = {
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
index 327c53198..341d61920 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
@@ -2,6 +2,7 @@ import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
 import AbgabeDetail from "./AbgabeMitarbeiterDetail.js";
 import VerticalSplit from "../../verticalsplit/verticalsplit.js"
 import BsModal from '../../Bootstrap/Modal.js';
+import VueDatePicker from '../../vueDatepicker.js.php';
 
 export const AbgabetoolMitarbeiter = {
 	name: "AbgabetoolMitarbeiter",
diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index 20685fa09..7ec397a1a 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -1,4 +1,5 @@
 import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
+import VueDatePicker from '../../vueDatepicker.js.php';
 
 export const Raumsuche =  {
 	name: "Raumsuche",

From 12ca915b00355e6b48a995a77a91f2da18b3c79b Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 21 May 2025 18:16:01 +0200
Subject: [PATCH 168/572] ddi/ddo text in legende old anw liste;
 studentdropdown order changed; email datumformat d.m.y;

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

diff --git a/system/xsl/Anwesenheitsliste.xsl b/system/xsl/Anwesenheitsliste.xsl
index 55e72900c..fc9dede58 100644
--- a/system/xsl/Anwesenheitsliste.xsl
+++ b/system/xsl/Anwesenheitsliste.xsl
@@ -309,7 +309,8 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 			<text:p text:style-name="P4">(nz) ... nicht zugelassen</text:p>
 			<text:p text:style-name="P4">(ma) ... MitarbeiterIn</text:p>
 			<text:p text:style-name="P4">(a.o.) ... Außerordentliche/r HörerIn</text:p>
-			<text:p text:style-name="P4">(d.d.) ... Double Degree Program</text:p>
+			<text:p text:style-name="P4">(d.d.i) ... Double Degree Incoming Program</text:p>
+			<text:p text:style-name="P4">(d.d.o) ... Double Degree Outgoing Program</text:p>
 			<text:p text:style-name="P4"/>
 			<text:p text:style-name="P5">
 				<xsl:choose>

From 4c6c45ceec70061fbd71487b81b3687736ca1f01 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 22 May 2025 18:50:30 +0200
Subject: [PATCH 169/572] change Layout of Notizen component to use form in
 modal

---
 public/js/components/Stv/Studentenverwaltung/Details/Notizen.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 03376231f..d5f9174d2 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -22,7 +22,7 @@ export default {
 			class="overflow-hidden"
 			:endpoint="endpoint"
 			ref="formc"
-			notiz-layout="twoColumnsFormLeft"
+			notiz-layout="popupModal"
 			type-id="person_id"
 			:id="modelValue.person_id"
 			show-document

From 126b2d388b6afb57abdaad75f0bde785d927cb39 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 22 May 2025 18:55:34 +0200
Subject: [PATCH 170/572] fix upload and adapt styling of Abgabetool Student

---
 .../controllers/api/frontend/v1/Lehre.php     | 14 +++-
 public/css/Cis4/Cis.css                       | 44 +++++++++++
 .../Cis/Abgabetool/AbgabeStudentDetail.js     | 74 +++++++++++--------
 .../Cis/Abgabetool/AbgabetoolStudent.js       |  6 +-
 4 files changed, 102 insertions(+), 36 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Lehre.php b/application/controllers/api/frontend/v1/Lehre.php
index e42033d9c..d5d0282bd 100644
--- a/application/controllers/api/frontend/v1/Lehre.php
+++ b/application/controllers/api/frontend/v1/Lehre.php
@@ -206,7 +206,11 @@ class Lehre extends FHCAPI_Controller
 				exec('chmod 640 "'.PAABGABE_PATH.$paabgabe_id.'_'.$student_uid.'.pdf'.'"');
 
 				$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-				$res = $this->PaabgabeModel->updatePaabgabe($paabgabe_id);
+				$res = $this->PaabgabeModel->update($paabgabe_id, array(
+					'abgabedatum' => date('Y-m-d'),
+					'updatevon' => getAuthUID(),
+					'updateamum' => date('Y-m-d H:i:s')
+				));
 				
 				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
 				$this->terminateWithSuccess($res);
@@ -287,7 +291,11 @@ class Lehre extends FHCAPI_Controller
 				
 				// update paabgabe datum
 				$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-				$res = $this->PaabgabeModel->updatePaabgabe($paabgabe_id);
+				$res = $this->PaabgabeModel->update($paabgabe_id, array(
+					'abgabedatum' => date('Y-m-d'),
+					'updatevon' => getAuthUID(),
+					'updateamum' => date('Y-m-d H:i:s')
+				));
 				
 				$this->sendUploadEmail($bperson_id, $projektarbeit_id, $paabgabetyp_kurzbz, $student_uid);
 
@@ -345,7 +353,7 @@ class Lehre extends FHCAPI_Controller
 
 		$num_rows_sem = $projektarbeit_obj->projektarbeitIsCurrent($projektarbeit_id);
 
-		if(!is_numeric($num_rows_sem) || $num_rows_sem < 0)
+		if( null === $num_rows_sem || false === $num_rows_sem )
 		{
 			$this->terminateWithError($this->p->t('abgabetool','fehlerAktualitaetProjektarbeit'), 'general');
 		}
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index aa24641f8..075998776 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -583,4 +583,48 @@ html {
 
 .dashboard-item {
 	overscroll-behavior: none;
+}
+
+.abgabe-zieldatum-border-red,
+.abgabe-zieldatum-border-yellow,
+.abgabe-zieldatum-border-pink,
+.abgabe-zieldatum-border-green {
+	border: solid 3px lightgrey;
+}
+
+.abgabe-zieldatum-border-red {
+	border-color: red;
+}
+
+.abgabe-zieldatum-border-yellow {
+	border-color: yellow;
+}
+
+.abgabe-zieldatum-border-pink {
+	border-color: pink;
+}
+
+.abgabe-zieldatum-border-green {
+	border-color: green;
+}
+
+.abgabe-zieldatum-overlay {
+	top: 3px;
+	right: 3px;
+}
+
+.abgabe-zieldatum-border-red .abgabe-zieldatum-overlay {
+	color: red;
+}
+
+.abgabe-zieldatum-border-yellow .abgabe-zieldatum-overlay {
+	color: yellow;
+}
+
+.abgabe-zieldatum-border-pink .abgabe-zieldatum-overlay {
+	color: pink;
+}
+
+.abgabe-zieldatum-border-green .abgabe-zieldatum-overlay {
+	color: green;
 }
\ No newline at end of file
diff --git a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
index 896c8fa64..1eb5d099c 100644
--- a/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
+++ b/public/js/components/Cis/Abgabetool/AbgabeStudentDetail.js
@@ -138,7 +138,7 @@ export const AbgabeStudentDetail = {
 			const oneDayMs = 1000 * 60 * 60 * 24
 			return Math.round((new Date(datum) - new Date(today)) / oneDayMs)
 		},
-		getDateStyle(termin) {
+		getDateStyle(termin, mode) {
 			const datum = new Date(termin.datum)
 			const abgabedatum = new Date(termin.abgabedatum)
 			
@@ -146,21 +146,31 @@ export const AbgabeStudentDetail = {
 			// https://wiki.fhcomplete.info/doku.php?id=cis:abgabetool_fuer_studierende
 			let color = 'white'
 			let fontColor = 'black'
+			let icon = '';
 			if (termin.abgabedatum === null) {
 				if(datum < today) {
 					color = 'red'
 					fontColor = 'white'
+					icon = 'fa-triangle-exclamation'
 				} else if (datum > today && this.dateDiffInDays(datum, today) <= 12) {
 					color = 'yellow'
+					icon = 'fa-circle-exclamation'
 				}
 			} else if(abgabedatum > datum) {
 				color = 'pink' // aka "hellrot"
 				fontColor = 'white'
+				icon = 'fa-circle-question'
 			} else {
 				color = 'green'
+				icon = 'fa-square-check'
 			}
 			
-			return `font-color: ${fontColor} ; background-color: ${color}; border-radius: 50%;`
+			//return `font-color: ${fontColor} ; background-color: ${color}; border-radius: 50%;`
+			if(  typeof mode !== 'undefined' || mode === 'icon') {
+				return icon;
+			} else {
+				return 'abgabe-zieldatum-border-' + color;
+			}
 		},
 		openBeurteilungLink(link) {
 			window.open(link, '_blank')
@@ -205,23 +215,26 @@ export const AbgabeStudentDetail = {
 			</div>
 			<div id="uploadWrapper">
 				<div class="row" style="margin-bottom: 12px;">
-					<div style="width: 100px">{{$p.t('abgabetool/c4fixtermin')}}</div>
-					<div class="col-2">{{$p.t('abgabetool/c4zieldatum')}}</div>
-					<div class="col-2">{{$p.t('abgabetool/c4abgabetyp')}}</div>
-					<div class="col-4">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
-					<div class="col-1">{{$p.t('abgabetool/c4abgabedatum')}}</div>
-					<div class="col">
+					<div class="col-1 fw-bold text-center">{{$p.t('abgabetool/c4fixtermin')}}</div>
+					<div class="col-2 fw-bold">{{$p.t('abgabetool/c4zieldatum')}}</div>
+					<div class="col-2 fw-bold">{{$p.t('abgabetool/c4abgabetyp')}}</div>
+					<div class="col-3 fw-bold">{{$p.t('abgabetool/c4abgabekurzbz')}}</div>
+					<div class="col-1 fw-bold text-center">{{$p.t('abgabetool/c4abgabedatum')}}</div>
+					<div class="col-3 fw-bold">
 						{{$p.t('abgabetool/c4fileupload')}}
 					</div>
 				</div>
 				<div class="row" v-for="termin in projektarbeit.abgabetermine">
-					<div style="width: 100px" class="d-flex justify-content-center align-items-center">
+					<div class="col-1 d-flex justify-content-center align-items-start">
+						<i v-if="termin.fixtermin" class="fa-solid fa-2x fa-circle-check fhc-bullet-red"></i>
+						<i v-else="" class="fa-solid fa-2x fa-circle-xmark fhc-bullet-green"></i>
+<!--
 						<p class="fhc-bullet" :class="{ 'fhc-bullet-red': termin.fixtermin, 'fhc-bullet-green': !termin.fixtermin }"></p>
+-->
 					</div>
-					<div class="col-2 d-flex justify-content-center align-items-center">
-						<div :style="getDateStyle(termin)">
+					<div class="col-2 d-flex justify-content-start align-items-start">
+						<div class="position-relative" :class="getDateStyle(termin)">
 							<VueDatePicker
-								style="width: 95%;"
 								v-model="termin.datum"
 								:clearable="false"
 								:disabled="true"
@@ -230,24 +243,25 @@ export const AbgabeStudentDetail = {
 								:text-input="true"
 								auto-apply>
 							</VueDatePicker>
-						</div>				
+							<i class="position-absolute abgabe-zieldatum-overlay fa-solid fa-2x" :class="getDateStyle(termin, 'icon')"></i>
+						</div>
 					</div>
-					<div class="col-2 d-flex justify-content-center align-items-center">{{ termin.bezeichnung }}</div>
-					<div class="col-4 d-flex justify-content-center align-items-center">
-						<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="3" cols="60" :disabled="true"></Textarea>
+					<div class="col-2 d-flex justify-content-start align-items-start">{{ termin.bezeichnung }}</div>
+					<div class="col-3 d-flex justify-content-start align-items-start">
+						<Textarea style="margin-bottom: 4px;" v-model="termin.kurzbz" rows="3" cols="45" :disabled="true"></Textarea>
 					</div>
-					<div class="col-1 d-flex justify-content-center align-items-center">
+					<div class="col-1 d-flex flex-column justify-content-start align-items-center">
 						{{ termin.abgabedatum?.split("-").reverse().join(".") }}
 						<a v-if="termin?.abgabedatum" @click="downloadAbgabe(termin)" style="margin-left:4px; cursor: pointer;">
-							<i class="fa-solid fa-file-pdf"></i>
+							<i class="fa-solid fa-3x fa-file-pdf"></i>
 						</a>
 					</div>
-					<div class="col-2" v-if="!viewMode">
+					<div class="col-3" v-if="!viewMode">
 						<div class="row">
-							<div class="col-6">
+							<div class="col-8">
 								<Upload v-if="termin && termin.allowedToUpload" accept=".pdf" v-model="termin.file"></Upload>
 							</div>
-							<div class="col-6">
+							<div class="col-4">
 								<button class="btn btn-primary border-0" @click="upload(termin)" :disabled="!termin.allowedToUpload">
 									Upload
 									<i style="margin-left: 8px" class="fa-solid fa-upload"></i>
@@ -264,19 +278,19 @@ export const AbgabeStudentDetail = {
 				<div>
 					{{$p.t('abgabetool/c4enduploadZusatzdaten')}}
 				</div>
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3 align-items-start">
 					
 					<p class="ml-4 mr-4">Student UID: {{ projektarbeit?.student_uid}}</p>
 				
 				</div>
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3 align-items-start">
 					
 					<p class="ml-4 mr-4">Titel: {{ projektarbeit?.titel }}</p>
 				
 				</div>
 			</template>
 			<template v-slot:default>
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3 align-items-start">
 					<div class="row">{{$p.t('abgabetool/c4Sprache')}}</div>
 					<div class="row">
 						<Dropdown 
@@ -289,7 +303,7 @@ export const AbgabeStudentDetail = {
 				</div>
 				
 <!--				 lektor fills these out-->
-<!--				<div class="row mb-3 align-items-center">-->
+<!--				<div class="row mb-3 align-items-start">-->
 <!--					<div class="row">Kontrollierte Schlagwörter</div>-->
 <!--					<div class="row">-->
 <!--						<Textarea v-model="form.kontrollschlagwoerter"></Textarea>-->
@@ -297,35 +311,35 @@ export const AbgabeStudentDetail = {
 <!--					-->
 <!--				-->
 <!--				</div>-->
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3 align-items-start">
 					<div class="row">{{$p.t('abgabetool/c4schlagwoerterGer')}}</div>
 					<div class="row">
 						<Textarea v-model="form.schlagwoerter"></Textarea>
 					</div>
 				</div>
 				
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3 align-items-start">
 					<div class="row">{{$p.t('abgabetool/c4schlagwoerterEng')}}</div>
 					<div class="row">
 						<Textarea v-model="form.schlagwoerter_en"></Textarea>
 					</div>
 				</div>
 				
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3 align-items-start">
 					<div class="row">{{$p.t('abgabetool/c4abstractGer')}}</div>
 					<div class="row">
 						<Textarea v-model="form.abstract" rows="10"></Textarea>
 					</div>
 				</div>
 
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3 align-items-start">
 					<div class="row">{{$p.t('abgabetool/c4abstractEng')}}</div>
 					<div class="row">
 						<Textarea v-model="form.abstract_en" rows="10"></Textarea>
 					</div>				
 				</div>
 				
-				<div class="row mb-3 align-items-center">
+				<div class="row mb-3 align-items-start">
 					<div class="row">{{$p.t('abgabetool/c4seitenanzahl')}}</div>
 					<div class="row">
 						<InputNumber 
diff --git a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
index 7a8482a3f..d1eab7c6e 100644
--- a/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
+++ b/public/js/components/Cis/Abgabetool/AbgabetoolStudent.js
@@ -33,7 +33,7 @@ export const AbgabetoolStudent = {
 			tableBuiltResolve: null,
 			tableBuiltPromise: null,
 			abgabeTableOptions: {
-				height: 700,
+				minHeight: 250,
 				index: 'projektarbeit_id',
 				layout: 'fitColumns',
 				placeholder: this.$p.t('global/noDataAvailable'),
@@ -218,7 +218,7 @@ export const AbgabetoolStudent = {
 			this.loadProjektarbeiten()
 
 			this.$refs.verticalsplit.collapseBottom()
-			this.calcMaxTableHeight()
+			//this.calcMaxTableHeight()
 		}
 	},
 	watch: {
@@ -226,7 +226,7 @@ export const AbgabetoolStudent = {
 	},
 	computed: {
 		isViewMode() {
-			return this.student_uid !== null
+			return this.student_uid !== this.viewData.uid
 		}
 	},
 	created() {

From deec52b959422054e1028c99965f7903db523996 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 23 May 2025 09:11:22 +0200
Subject: [PATCH 171/572] refactor(Studium): disallows to store null or
 undefined to the localStorage and changes the next and previous button logic
 for the select fields

---
 public/js/components/Cis/Studium/Studium.js | 32 ++++++++++++---------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index 9e716d7df..a53f9a4e4 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -31,15 +31,15 @@ export default {
 	},
 	watch:{
 		selectedStudiensemester: function(newVal, oldVal){
-			if(newVal != oldVal){
+			if(newVal && newVal != oldVal){
 				const studiensemester =this.getDataFromLocalStorage("sudiensemester");
-				if (!studiensemester || (studiensemester && studiensemester != newVal)){
+				if (newVal && (!studiensemester || (studiensemester && studiensemester != newVal))){
 					this.storeDataToLocalStorage("sudiensemester", newVal);
 				}
 			}
 		},
 		selectedSemester: function (newVal, oldVal) {
-			if (newVal != oldVal) {
+			if (newVal && newVal != oldVal) {
 				const semester = this.getDataFromLocalStorage("semester");
 				if (!semester || (semester && semester != newVal)) {
 					this.storeDataToLocalStorage("semester", newVal);
@@ -47,7 +47,7 @@ export default {
 			}
 		},
 		selectedStudiengang: function (newVal, oldVal) {
-			if (newVal != oldVal) {
+			if (newVal && newVal != oldVal) {
 				const studiengang = this.getDataFromLocalStorage("studiengang");
 				if (!studiengang || (studiengang && studiengang != newVal)) {
 					this.storeDataToLocalStorage("studiengang", JSON.stringify(newVal));
@@ -55,7 +55,7 @@ export default {
 			}
 		},
 		selectedStudienordnung: function (newVal, oldVal) {
-			if (newVal != oldVal) {
+			if (newVal && newVal != oldVal) {
 				const studienordnung = this.getDataFromLocalStorage("studienordnung");
 				if (!studienordnung || (studienordnung && studienordnung != newVal)) {
 					this.storeDataToLocalStorage("studienordnung", JSON.stringify(newVal));
@@ -81,7 +81,11 @@ export default {
 		},
 		changeStudienordnung(value) {
 			let studienordnung = this.$refs.studienordnung;
-			studienordnung.selectedIndex = (studienordnung.selectedIndex + value + studienordnung.options.length) % studienordnung.options.length;
+			let newSelectIndex = (studienordnung.selectedIndex + value + studienordnung.options.length) % studienordnung.options.length;
+			if(studienordnung.options[newSelectIndex].disabled){
+				newSelectIndex = (newSelectIndex + value + studienordnung.options.length) % studienordnung.options.length;
+			}
+			studienordnung.selectedIndex = newSelectIndex;
 			this.changeSelectedStudienPlan(studienordnung.value);
 		},
 		
@@ -277,13 +281,13 @@ export default {
 		<div>
 		<h6>Studiensemester:</h6>
 		<div class="input-group">
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(-1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(1)">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="studiensemester" v-model="selectedStudiensemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 				<option v-for="semester in studienSemester" @click="changeSelectedStudienSemester(semester.studiensemester_kurzbz)" :key="semester" :value="semester.studiensemester_kurzbz">{{studiensemesterTitel(semester.studiensemester_kurzbz)	}}</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(-1)">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
 			</button>
 		</div>
@@ -292,13 +296,13 @@ export default {
 		<div>
 		<h6>Studiengang:</h6>
 		<div class="input-group">
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(-1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(1)">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="studiengaenge" v-model="selectedStudiengang" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 				<option v-for="studiengang in studiengaenge" @click="changeSelectedStudienGang(studiengang.studiengang_kz)" :key="studiengang.studiengang_kz" :value="studiengang.studiengang_kz" >{{studiengangTitel(studiengang)}}</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(-1)">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
 			</button>
 		</div>
@@ -307,13 +311,13 @@ export default {
 		<div>
 		<h6>Semester:</h6>
 		<div class="input-group">
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(-1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(1)">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="semester" v-model="selectedSemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 				<option v-for="sem in semester" @click="changeSelectedSemester(sem)" :key="semester" :value="sem">{{sem}}. Semester</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(-1)">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
 			</button>
 		</div>
@@ -322,13 +326,13 @@ export default {
 		<div>
 		<h6>Studienordnung:</h6>
 		<div class="input-group">
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(-1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(1)">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="studienordnung" v-model="selectedStudienordnung" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 				<option v-for="ordnung in computedStudienOrdnungSelectValues" :disabled="ordnung.disabled" @click="changeSelectedStudienPlan(ordnung?.studienplan?.studienplan_id)" :key="ordnung?.studienplan?.bezeichnung	" :value="ordnung?.studienplan?.studienplan_id">{{ordnung.bezeichnung}}</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(-1)">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
 			</button>
 		</div>

From ad8963e5b5939c6433da32dd7bc19685542da4dc Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 23 May 2025 11:33:58 +0200
Subject: [PATCH 172/572] refactor(Dashboard touch events): allows to scroll on
 mobile over widgets, fixes dragging bug on mobile

---
 public/js/components/Drop/Grid.js      | 29 +++++++++-----------------
 public/js/components/Drop/Grid/Item.js | 14 +++++++++----
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 55b9b1bbd..1ecdd29ae 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -132,15 +132,7 @@ export default {
 					return this.grid ? (this.grid.h+1) : 1;
 			}
 			return this.grid ? this.grid.h : 1;
-			/* if ((this.mode == MODE_MOVE || this.mode == MODE_RESIZE) && this.dragGrid){
-				return this.dragGrid.h;
-			}
-			if (this.mode == MODE_IDLE) {
-				if (this.additionalRowComputed) {
-					return this.grid ? (this.grid.h+1) : 1;
-				}
-			}
-			return this.grid ? this.grid.h : 1; */
+			
 		},
 		gridStyle() {
 			const addH = this.active ? this.marginForExtraRow : 0;
@@ -370,9 +362,8 @@ export default {
 			/* if (this.mode == MODE_IDLE) {
 				this.x = -1;
 				this.y = -1;
-				this.additionalRowComputed = false;
 				
-			} */
+			}  */
 		},
 		updateCursor(evt) {
 			if (!this.active) {
@@ -381,17 +372,17 @@ export default {
 			}
 			const addH = this.active ? this.marginForExtraRow : 0;
 			const rect = this.$refs.container.getBoundingClientRect();
-
-			if (!evt.clientX && !evt.clientY && evt.touches) {
+			
+			if (!evt.clientX && !evt.clientY && evt.touches){
 				evt.clientX = evt.touches[0].clientX;
 				evt.clientY = evt.touches[0].clientY;
 			}
 
 			this.clientX = (evt.clientX - rect.left);
 			this.clientY = (evt.clientY - rect.top);
-
 			const gridX = Math.floor(this.cols * (evt.clientX - rect.left) / this.$refs.container.clientWidth);
 			const gridY = Math.floor((this.rows + addH) * (evt.clientY - rect.top) / this.$refs.container.clientHeight);
+			
 			if (this.x == gridX && this.y == gridY)
 				return false;
 			
@@ -414,8 +405,8 @@ export default {
 			
 			this.mode = MODE_MOVE;
 			
-			this.grid.h += 1;
 			this.draggedItem = item;
+			
 			this.$emit('draggedItem',item);
 			
 			this.draggedNode = evt.target.closest(".drop-grid-item");
@@ -437,13 +428,13 @@ export default {
 			this._dragStart(evt);
 		},
 		dragOver(evt) {
-			if ((this.y + 1) > this.grid?.h && this.mode == MODE_MOVE) {
-				this.positionUpdates = this.positionUpdates.filter(item => {
+			if ((this.y + 1) > this.rows && this.mode == MODE_MOVE) {
+				this.positionUpdates = this.positionUpdates?.filter(item => {
 					return item.widgetid == this.draggedItem.data.widgetid;
 				})
 				this.dragEnd();
 				this.dragCancel();
-			}
+			} 
 			if (!this.active)
 				return this.dragCancel();
 			this.checkPinnedWidgetAnimation();
@@ -613,7 +604,7 @@ export default {
 		ref="container"
 		class="drop-grid position-relative h-0"
 		:style="gridStyle"
-		@touchmove.prevent="dragOver"
+		@touchmove="dragOver"
 		@touchend="dragCancel"
 		@dragover.prevent="dragOver"
 		@drop="dragEnd"
diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index a597c4f00..37bce4acf 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -64,19 +64,25 @@ export default {
 			this.registerDragAction(event); 
 			this.tryDragStart(event, this.item);
 		},
+		touchMove(event){
+			if(this.dragging){
+				event.preventDefault();
+				this.$emit('dragging', event);
+			}
+		}
 		
 	},
 	template: `
 	<div class="drop-grid-item"
 		@mousedown="registerDragAction"
 		@mouseup="$emit('mouseUp', $event)"
-		@touchstart.prevent="touchStart"
+		@touchstart="touchStart"
 		@touchend="touchDragEnd"
 		@dragstart="tryDragStart($event, item)"
 		@drag="$emit('dragging',$event)"
-		@touchmove.prevent="$emit('dragging',$event)"
-		@dragend="$emit('endDrag', $event)"
-		:draggable="active && !item.placeholder && dragAction != ''">
+		@touchmove="touchMove"
+		@dragend="$emit('endDrag', $event); dragging = false"
+		:draggable="active && !item.placeholder && dragging">
 		<slot v-bind="item"></slot>
 	</div>`
 }

From b5bacbbf7534e57a971b2280231f4b4ed62be04a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 23 May 2025 12:02:13 +0200
Subject: [PATCH 173/572] refactor(Studium): changes the query to fetch
 lehrveranstaltungen for the studienplan

---
 .../controllers/api/frontend/v1/Studium.php   | 46 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index be2e79800..b0be3cf41 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -222,7 +222,51 @@ class Studium extends FHCAPI_Controller
 	}
 
 	private function computeStudienplanLehrveranstaltungen($studienplan_id, $semester){
-		$lehrveranstaltungen = $this->StudienplanModel->getStudienplanLehrveranstaltung($studienplan_id, $semester);	
+
+/* 
+SELECT tbl_lehrveranstaltung.*,
+            tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id,
+            tbl_studienplan_lehrveranstaltung.semester as stpllv_semester,
+            tbl_studienplan_lehrveranstaltung.pflicht as stpllv_pflicht,
+            tbl_studienplan_lehrveranstaltung.koordinator as stpllv_koordinator,
+            tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id_parent,
+            tbl_studienplan_lehrveranstaltung.sort stpllv_sort,
+            tbl_studienplan_lehrveranstaltung.curriculum,
+            tbl_studienplan_lehrveranstaltung.export,
+            tbl_studienplan_lehrveranstaltung.genehmigung
+        FROM lehre.tbl_lehrveranstaltung
+        JOIN lehre.tbl_studienplan_lehrveranstaltung
+        USING(lehrveranstaltung_id)
+        WHERE tbl_studienplan_lehrveranstaltung.studienplan_id=" . $this->db_add_param($studienplan_id, FHC_INTEGER);
+        if (defined("CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN") && CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN)
+            $qry .= " AND tbl_lehrveranstaltung.lehrtyp_kurzbz != 'modul'";
+        if (!is_null($semester))
+        {
+            $qry.=" AND tbl_studienplan_lehrveranstaltung.semester=" . $this->db_add_param($semester, FHC_INTEGER);
+        } */
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		
+		$query = "
+		SELECT tbl_lehrveranstaltung.*,
+            tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id,
+            tbl_studienplan_lehrveranstaltung.semester as stpllv_semester,
+            tbl_studienplan_lehrveranstaltung.pflicht as stpllv_pflicht,
+            tbl_studienplan_lehrveranstaltung.koordinator as stpllv_koordinator,
+            tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id_parent,
+            tbl_studienplan_lehrveranstaltung.sort stpllv_sort,
+            tbl_studienplan_lehrveranstaltung.curriculum,
+            tbl_studienplan_lehrveranstaltung.export,
+            tbl_studienplan_lehrveranstaltung.genehmigung
+        FROM lehre.tbl_lehrveranstaltung
+        JOIN lehre.tbl_studienplan_lehrveranstaltung
+        USING(lehrveranstaltung_id)
+        WHERE tbl_studienplan_lehrveranstaltung.studienplan_id=? AND tbl_studienplan_lehrveranstaltung.semester=?";
+		
+        if (defined("CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN") && CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN)
+			$query .= " AND tbl_lehrveranstaltung.lehrtyp_kurzbz != 'modul'";
+		
+		$lehrveranstaltungen = $this->LehrveranstaltungModel->execReadOnlyQuery($query,[$studienplan_id, $semester]);
+		
 		$lehrveranstaltungen = $this->getDataOrTerminateWithError($lehrveranstaltungen);
 		usort($lehrveranstaltungen, function($a, $b){
 			if($a->lehrtyp_kurzbz == "modul"){

From fa0b534471185b9708de0bce7db1cad256c34a67 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 23 May 2025 13:27:18 +0200
Subject: [PATCH 174/572] Refactoring PrimeVue Autocomplete Dropdown Functions
 Refactoring PrimeVue Autocomplete Dropdown OrganisationUnits Change Search
 from Backend to Frontend Filtering minor changes Table Functions

---
 .../api/frontend/v1/funktionen/Funktionen.php |  68 ++++----
 .../Organisationseinheit_model.php            |  74 +--------
 .../models/ressource/Funktion_model.php       |  22 ---
 public/js/api/factory/functions.js            |  39 +----
 public/js/components/Funktionen/Funktionen.js | 155 +++++++++++-------
 system/phrasesupdate.php                      |  20 +++
 6 files changed, 162 insertions(+), 216 deletions(-)

diff --git a/application/controllers/api/frontend/v1/funktionen/Funktionen.php b/application/controllers/api/frontend/v1/funktionen/Funktionen.php
index 030994736..b2787072b 100644
--- a/application/controllers/api/frontend/v1/funktionen/Funktionen.php
+++ b/application/controllers/api/frontend/v1/funktionen/Funktionen.php
@@ -11,14 +11,10 @@ class Funktionen extends FHCAPI_Controller
 		//TODO(Manu) check permissions
 		parent::__construct(array(
 				'getAllFunctions' =>  ['admin:r', 'assistenz:r'],
-				'getContractFunctions' =>  ['admin:r', 'assistenz:r'],
-				'getCurrentFunctions' =>  ['admin:r', 'assistenz:r'],
 				'getAllUserFunctions' =>  ['admin:r', 'assistenz:r'],
 				'getOrgHeads' =>  ['admin:r', 'assistenz:r'],
 				'getOrgetsForCompany' => ['admin:r', 'assistenz:r'],
-				'loadAllOes' => ['admin:r', 'assistenz:r'],
-				'searchOes' => ['admin:r', 'assistenz:r'],
-				'searchFunctions' => ['admin:r', 'assistenz:r'],
+				'getAllOrgUnits' => ['admin:r', 'assistenz:r'],
 				'loadFunction' => ['admin:r', 'assistenz:r'],
 				'insertFunction' => ['admin:rw', 'assistenz:rw'],
 				'updateFunction' => ['admin:rw', 'assistenz:rw'],
@@ -43,6 +39,20 @@ class Funktionen extends FHCAPI_Controller
 		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
 	}
 
+	public function getAllFunctions()
+	{
+		$this->FunktionModel->addSelect("funktion_kurzbz");
+		$this->FunktionModel->addSelect("beschreibung");
+		$this->FunktionModel->addSelect("aktiv");
+		$this->FunktionModel->addSelect("beschreibung AS label");
+		$this->FunktionModel->addOrder("beschreibung");
+		$result = $this->FunktionModel->load();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
 	public function getOrgHeads()
 	{
 		$result = $this->OrganisationseinheitModel->getHeads();
@@ -97,7 +107,7 @@ class Funktionen extends FHCAPI_Controller
             WHERE
 				bf.uid = ?
             ORDER BY
-				f.beschreibung, bf.datum_von ASC";
+				bf.datum_von, bf.datum_von ASC";
 
 		$benutzerfunktionen = $this->BenutzerfunktionModel->execReadOnlyQuery($sql, array($uid));
 		$data = $this->getDataOrTerminateWithError($benutzerfunktionen);
@@ -106,14 +116,35 @@ class Funktionen extends FHCAPI_Controller
 	}
 
 	/*
-	 * return list of child orgets for a given company orget_kurzbz
+	 * returns list of all organisation units
 	 * as key value list to be used in select or autocomplete
 	 */
-	public function getOrgetsForCompany($companyOrgetkurzbz=null)
+	public function getAllOrgUnits()
 	{
 		$sql = "
 			SELECT
-				oe.oe_kurzbz,
+				oe.oe_kurzbz, oe.aktiv,
+				'[' || COALESCE(oet.bezeichnung, oet.organisationseinheittyp_kurzbz) ||
+				'] ' || COALESCE(oe.bezeichnung, oe.oe_kurzbz) AS label
+			FROM public.tbl_organisationseinheit oe
+			JOIN public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
+			ORDER BY oet.bezeichnung ASC, oe.bezeichnung ASC";
+
+		$result = $this->OrganisationseinheitModel->execReadOnlyQuery($sql);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/*
+	 * return list of child orgets for a given company orget_kurzbz
+	 * as key value list to be used in select or autocomplete
+	 */
+	public function getOrgetsForCompany($companyOrgetkurzbz = null)
+	{
+		$sql = "
+			SELECT
+				oe.oe_kurzbz, oe.aktiv,
 				'[' || COALESCE(oet.bezeichnung, oet.organisationseinheittyp_kurzbz) ||
 				'] ' || COALESCE(oe.bezeichnung, oe.oe_kurzbz) AS label
 			FROM (
@@ -139,25 +170,6 @@ class Funktionen extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	public function searchOes($companyOrgetKurzbz, $searchString = null)
-	{
-		$result = $this->OrganisationseinheitModel->getAutocompleteSuggestionsWithCompany($companyOrgetKurzbz, $searchString);
-		if (isError($result)) {
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess($result ?: []);
-	}
-
-	public function searchFunctions($searchString = null)
-	{
-
-		$result = $this->FunktionModel->getAutocompleteSuggestions($searchString);
-		if (isError($result)) {
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess($result ?: []);
-	}
-
 	public function loadFunction($benutzerfunktion_id)
 	{
 		$this->BenutzerfunktionModel->addSelect("*");
diff --git a/application/models/organisation/Organisationseinheit_model.php b/application/models/organisation/Organisationseinheit_model.php
index b146ee7e5..ba91964f6 100644
--- a/application/models/organisation/Organisationseinheit_model.php
+++ b/application/models/organisation/Organisationseinheit_model.php
@@ -191,7 +191,7 @@ class Organisationseinheit_model extends DB_Model
 
     /**
      * @param string $oe_kurzbz
-     * 
+     *
      * @return stdClass
      */
     public function getWithType($oe_kurzbz)
@@ -202,78 +202,6 @@ class Organisationseinheit_model extends DB_Model
     	return $this->load($oe_kurzbz);
     }
 
-	/**
-	 * Get OEs by eventQuery string. Use with autocomplete event queries.
-	 * @param $eventQuery String
-	 * @return array
-	 */
-	public function getAutocompleteSuggestions($eventQuery)
-	{
-		$this->addSelect('oe_kurzbz');
-		$this->addSelect('organisationseinheittyp_kurzbz, oe_kurzbz, bezeichnung, aktiv, lehre');
-		$this->addOrder('organisationseinheittyp_kurzbz, bezeichnung');
-
-		return $this->loadWhere("
-			oe_kurzbz ILIKE '%". $this->escapeLike($eventQuery). "%'
-		");
-	}
-
-	/**
-	 * Get OEs by eventQuery string and companyOrgetKurzbz
-	 * Use with autocomplete event queries in Function Component
-	 * @param $searchString String
-	 * @param $companyOrgetKurzbz String oe_kurzbz of the company (gst vs gmbh)
-	 * @return array
-	 */
-	public function getAutocompleteSuggestionsWithCompany($companyOrgetKurzbz, $searchString)
-	{
-		$sql = "
-        WITH RECURSIVE oes(oe_kurzbz, oe_parent_kurzbz) AS (
-            SELECT oe_kurzbz, oe_parent_kurzbz
-            FROM public.tbl_organisationseinheit
-            WHERE oe_kurzbz = ?
-            UNION ALL
-            SELECT o.oe_kurzbz, o.oe_parent_kurzbz
-            FROM public.tbl_organisationseinheit o
-            INNER JOIN oes ON o.oe_parent_kurzbz = oes.oe_kurzbz
-        )
-        SELECT
-            oe.oe_kurzbz, oe.aktiv,
-            '[' || COALESCE(oet.bezeichnung, oet.organisationseinheittyp_kurzbz) ||
-            '] ' || COALESCE(oe.bezeichnung, oe.oe_kurzbz) AS label
-        FROM (
-            SELECT oe_kurzbz FROM oes GROUP BY oe_kurzbz
-        ) c
-        JOIN public.tbl_organisationseinheit oe ON oe.oe_kurzbz = c.oe_kurzbz
-        JOIN public.tbl_organisationseinheittyp oet ON oe.organisationseinheittyp_kurzbz = oet.organisationseinheittyp_kurzbz
-    ";
-
-		$params = [$companyOrgetKurzbz];
-
-		if (!empty($searchString)) {
-			$escaped = $this->escapeLike($searchString);
-			$ilike = '%' . $escaped . '%';
-
-			$sql .= "
-            WHERE
-                oe.oe_kurzbz ILIKE ? OR
-                oe.bezeichnung ILIKE ? OR
-                oe.organisationseinheittyp_kurzbz ILIKE ?
-        ";
-
-			$params[] = $ilike;
-			$params[] = $ilike;
-			$params[] = $ilike;
-		}
-
-		$sql .= " ORDER BY oet.bezeichnung ASC, oe.bezeichnung ASC";
-
-		$result = $this->execQuery($sql, $params);
-
-		return $result;
-	}
-
-
 	/**
 	 * get highest organisation units
 	 */
diff --git a/application/models/ressource/Funktion_model.php b/application/models/ressource/Funktion_model.php
index 60965b438..43908167c 100644
--- a/application/models/ressource/Funktion_model.php
+++ b/application/models/ressource/Funktion_model.php
@@ -11,26 +11,4 @@ class Funktion_model extends DB_Model
 		$this->dbTable = 'public.tbl_funktion';
 		$this->pk = 'funktion_kurzbz';
 	}
-
-	/**
-	 * Get Functions by eventQuery string. Use with autocomplete event queries in Function Component
-	 * @param $eventQuery String
-	 * @return array
-	 */
-	public function getAutocompleteSuggestions($eventQuery)
-	{
-		$this->addSelect('funktion_kurzbz, beschreibung, aktiv');
-		$this->addSelect("beschreibung AS label");
-		$this->addOrder('beschreibung', 'ASC');
-
-		if($eventQuery === null)
-		{
-			return $this->load();
-		}
-
-		return $this->loadWhere("
-			funktion_kurzbz ILIKE '%". $this->escapeLike($eventQuery). "%'
-			OR beschreibung ILIKE '%". $this->escapeLike($eventQuery). "%'
-		");
-	}
 }
diff --git a/public/js/api/factory/functions.js b/public/js/api/factory/functions.js
index ac717050a..ef0be43cb 100644
--- a/public/js/api/factory/functions.js
+++ b/public/js/api/factory/functions.js
@@ -15,17 +15,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 export default {
-	getContractFunctions(filter) {
-		var url = 'api/frontend/v1/funktionen/Funktionen/getContractFunctions';
-		if( typeof filter !== 'undefined' && filter !== null ) {
-			url = url + '/' + filter;
-		}
-		return {
-			method: 'get',
-			url,
-		};
-
-	},
 	getOrgHeads() {
 		var url = 'api/frontend/v1/funktionen/Funktionen/getOrgHeads';
 		return {
@@ -41,30 +30,13 @@ export default {
 			url,
 		};
 	},
-	loadAllOes(filterStudent) {
-		var url = 'api/frontend/v1/funktionen/Funktionen/loadAllOes'
-			+ '/' + filterStudent;
+	getAllOrgUnits(filterStudent) {
+		var url = 'api/frontend/v1/funktionen/Funktionen/getAllOrgUnits';
 		return {
 			method: 'get',
 			url,
 		};
 	},
-	getCompanyByOrget(orget) {
-		var url = 'api/frontend/v1/funktionen/Funktionen/getCompanyByOrget'
-			+ '/' + orget;
-		return {
-			method: 'get',
-			url,
-		};
-	},
-	getCurrentFunctions(mitarbeiter_uid, unternehmen) {
-		var url = 'api/frontend/v1/funktionen/Funktionen/getCurrentFunctions'
-			+ '/' + mitarbeiter_uid + '/' + unternehmen;
-		return {
-			method: 'get',
-			url,
-		};
-	}  ,
 	getAllUserFunctions(mitarbeiter_uid) {
 		var url = 'api/frontend/v1/funktionen/Funktionen/getAllUserFunctions'
 			+ '/' + mitarbeiter_uid;
@@ -114,11 +86,4 @@ export default {
 			url: 'api/frontend/v1/funktionen/Funktionen/searchOes/' + head + '/' + searchString
 		};
 	},
-	getFunctions(searchString) {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/funktionen/Funktionen/searchFunctions/' + searchString
-		};
-	}
-
 };
\ No newline at end of file
diff --git a/public/js/components/Funktionen/Funktionen.js b/public/js/components/Funktionen/Funktionen.js
index 7bbd26702..4fdf5b6e4 100644
--- a/public/js/components/Funktionen/Funktionen.js
+++ b/public/js/components/Funktionen/Funktionen.js
@@ -43,10 +43,8 @@ export default {
 					{
 						title: "dienstverhaeltnis_unternehmen",
 						field: "dienstverhaeltnis_unternehmen",
-						width: 50,
 						headerFilter: "list",
 						headerFilterParams: {valuesLookup: true, autocomplete: true, sort: "asc"},
-						formatter: this.companyLinkFormatter
 					},
 					{
 						title: "funktion_beschreibung", field: "funktion_beschreibung", headerFilter: "list",
@@ -100,7 +98,6 @@ export default {
 							let container = document.createElement('div');
 							container.className = "d-flex gap-2";
 
-
 							if( cell.getRow().getData().dienstverhaeltnis_unternehmen === null ) {
 								let button = document.createElement('button');
 								button.className = 'btn btn-outline-secondary btn-action';
@@ -160,18 +157,19 @@ export default {
 						const column = cm.getColumnByField('dienstverhaeltnis_unternehmen');
 						const companyDv = {
 							title: this.$p.t('person', 'dv_unternehmen'),
-							width: 100,
+							width: 140,
 							visible: this.showDvCompany,
+							formatter: this.companyLinkFormatter
 						};
 						column.component.updateDefinition(companyDv);
 
 						cm.getColumnByField('funktion_beschreibung').component.updateDefinition({
 							title: this.$p.t('person', 'zuordnung_taetigkeit'),
-							width: 100
+							width: 140
 						});
 						cm.getColumnByField('funktion_oebezeichnung').component.updateDefinition({
 							title: this.$p.t('lehre', 'organisationseinheit'),
-							width: 100
+							width: 140
 						});
 						cm.getColumnByField('wochenstunden').component.updateDefinition({
 							title: this.$p.t('person', 'wochenstunden')
@@ -192,18 +190,25 @@ export default {
 
 						cm.getColumnByField('bezeichnung').component.updateDefinition({
 							title: this.$p.t('ui', 'bezeichnung'),
-							width: 100
+							width: 140
 						});
 
 					}
 				}
 			],
-			isFilterSet: false,
+			isFilterSet: true,
 			listOrgHeads: [],
-			listOrgUnits: [],
+			listOrgUnits: [], //Old
+			listAllOrgUnits: [],
+			listOrgUnits_GST: [],
+			listOrgUnits_GMBH: [],
 			formData: {
 				head: 'gst',
-				oe_kurzbz: ''
+				oe_kurzbz: '',
+				funktion_kurzbz: null,
+				label:'',
+				//funktion_label: '',
+				funktion: null,
 			},
 			statusNew: true,
 			listAllFunctions: [],
@@ -213,7 +218,17 @@ export default {
 			},
 			filteredOes: [],
 			filteredFunctions: [],
-			newBtnStyle: ''
+			newBtnStyle: '',
+			selectedFunction: null,
+			selectedOe: null
+		}
+	},
+	watch: {
+		selectedFunction(newVal) {
+			this.formData.funktion_kurzbz = newVal?.funktion_kurzbz || '';
+		},
+		selectedOe(newVal) {
+			this.formData.oe_kurzbz = newVal?.oe_kurzbz || '';
 		}
 	},
 	methods: {
@@ -229,6 +244,7 @@ export default {
 		actionNewFunction(){
 			this.resetModal();
 			this.statusNew = true;
+			this.formData.datum_von = new Date();
 			this.$refs.functionModal.show();
 		},
 		actionCopyFunction(benutzerfunktion_id) {
@@ -249,7 +265,15 @@ export default {
 		actionEditFunction(benutzerfunktion_id) {
 			this.resetModal();
 			this.statusNew = false;
-			this.loadFunction(benutzerfunktion_id);
+			this.loadFunction(benutzerfunktion_id).then(() => {
+				//set selectedFunction and selectedOd to enable viewing label in primevue autocomplete fields
+				this.selectedFunction = this.listAllFunctions.find(
+					item => item.funktion_kurzbz === this.formData.funktion_kurzbz
+				);
+				this.selectedOe = this.listAllOrgUnits.find(
+					item => item.oe_kurzbz === this.formData.oe_kurzbz
+				);
+			});
 			this.$refs.functionModal.show();
 		},
 		addFunction() {
@@ -304,14 +328,6 @@ export default {
 					this.reload();
 				});
 		},
-		getOrgetsForCompany(){
-			return this.$api
-				.call(ApiCoreFunktion.getOrgetsForCompany(this.formData.head))
-				.then(result => {
-					this.listOrgUnits = result.data;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
 		hideModal(modalRef) {
 			this.$refs[modalRef].hide();
 		},
@@ -324,32 +340,30 @@ export default {
 			this.formData.oe_kurzbz = '';
 			this.formData.funktion_kurzbz = '';
 		},
-		searchOe(event) {
-			if (this.abortController.oes) {
-				this.abortController.oes.abort();
-			}
-
-			this.abortController.oes = new AbortController();
-
-			return this.$api
-				.call(ApiCoreFunktion.getOes(this.formData.head, event.query))
-				.then(result => {
-					this.filteredOes = result.data.retval;
-				});
+		filterFunctions(event) {
+			const query = event.query.toLowerCase();
+			this.filteredFunctions = this.listAllFunctions.filter(item =>
+				item.label.toLowerCase().includes(query)
+			)
 		},
-		searchFunctions(event) {
-			if (this.abortController.functions) {
-				this.abortController.functions.abort();
+		filterOes(event) {
+			const query = event.query.toLowerCase();
+
+			if(!this.formData.head)
+				this.$fhcAlert.alertError(this.$p.t('ui', 'bitteUnternehmenWaehlen'));
+
+			if(this.formData.head == 'gst') {
+				this.filteredOes = this.listOrgUnits_GST.filter(item =>
+					item.label.toLowerCase().includes(query)
+				);
+			}
+			if(this.formData.head == 'gmbh') {
+				this.filteredOes = this.listOrgUnits_GMBH.filter(item =>
+					item.label.toLowerCase().includes(query)
+				);
 			}
-
-			this.abortController.functions = new AbortController();
-
-			return this.$api
-				.call(ApiCoreFunktion.getFunctions(event.query))
-				.then(result => {
-					this.filteredFunctions = result.data.retval;
-				});
 		},
+
 		styleNewButton(){
 			if(this.stylePv21) {
 				this.newBtnStyle = "btn-sm";
@@ -370,12 +384,38 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
+		this.$api
+			.call(ApiCoreFunktion.getAllFunctions())
+			.then(result => {
+				this.listAllFunctions = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		this.$api
+			.call(ApiCoreFunktion.getAllOrgUnits())
+			.then(result => {
+				this.listAllOrgUnits = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		this.$api
+			.call(ApiCoreFunktion.getOrgetsForCompany('gst'))
+			.then(result => {
+				this.listOrgUnits_GST = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+		this.$api
+			.call(ApiCoreFunktion.getOrgetsForCompany('gmbh'))
+			.then(result => {
+				this.listOrgUnits_GMBH = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
 		this.styleNewButton();
+
 	},
 	template: `
 		<div class="core-functions h-100 pb-3">
-
-			<div class="d-flex justify-content-end pb-3" v-if="stylePv21">
+		
+			<div class="d-flex justify-content-end" v-if="stylePv21">
 				<form-input
 					container-class="form-check"
 					type="checkbox"
@@ -418,35 +458,37 @@ export default {
 				</template>
 
 				<form-form class="row pt-3" ref="functionData">
+
 					<form-input
 						container-class="mb-3 col-8"
 						type="select"
 						name="companies"
 						:label="$p.t('core/unternehmen')"
 						v-model="formData.head"
-						@change="getOrgetsForCompany"
+						@change="getOrgetsForCompanyOld"
 						>
 						<option
 							v-for="org in listOrgHeads"
 							:key="org.head"
 							:value="org.head"
-							@change="handleChange"
 							>
 							{{ org.bezeichnung }}
 						</option>
-					</form-input>
+					</form-input>			
 
-					<!--DropDown Autocomplete Funktion-->
+					<!--DropDown Autocomplete Funktion -->
 					<form-input
 						container-class="mb-3 col-8"
 						type="autocomplete"
 						:label="$p.t('person/funktion') + ' *' "
 						name="funktion_kurzbz"
-						v-model="formData.funktion_kurzbz"
+						v-model="selectedFunction"
+						forceSelection
 						optionLabel="label"
+						optionValue="funktion_kurzbz"
 						:suggestions="filteredFunctions"
 						dropdown
-						@complete="searchFunctions"
+						@complete="filterFunctions"
 						>
 							<template #option="slotProps">
 								<div
@@ -454,7 +496,7 @@ export default {
 									? 'item-inactive'
 									: ''"
 									>
-										{{slotProps.option.label}}
+										 {{ slotProps.option.label}}
 								</div>
 							</template>
 					</form-input>
@@ -465,11 +507,13 @@ export default {
 						type="autocomplete"
 						:label="$p.t('lehre/organisationseinheit') + ' *'"
 						name="oe_kurzbz"
-						v-model="formData.oe_kurzbz"
+						v-model="selectedOe"
+						forceSelection
 						optionLabel="label"
+						optionValue="oe_kurzbz"
 						:suggestions="filteredOes"
 						dropdown
-						@complete="searchOe"
+						@complete="filterOes"
 						>
 							<template #option="slotProps">
 								<div
@@ -482,7 +526,6 @@ export default {
 							</template>
 					</form-input>
 
-					<!--DropDown Bezeichnung-->
 					<form-input
 						container-class="mb-3 col-8"
 						type="text"
@@ -531,7 +574,7 @@ export default {
 							>
 						</form-input>
 					</div>
-						<input type="hidden" class="form-control" id="oe_kurzbz" v-model="formData.oe_kurzbz">
+
 
 				</form-form>
 
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ed6f71a7f..d9ed01641 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41576,6 +41576,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'bitteUnternehmenWaehlen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vor Änderung der Organisationseinheit bitte Unternehmen wählen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Before changing the organizational unit, please select company',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-4 Studierendenverwaltung FUNCTIONS END
 
 );

From b40e1a2c6569cc117e7be05dc0b4ef1225e762cf Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 27 May 2025 11:05:24 +0200
Subject: [PATCH 175/572] fix syntax error

---
 system/phrasesupdate.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 69c3dc793..6ac891fb6 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31432,7 +31432,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unterricht laut Stundenplan',
+				'text' => 'Termine laut Stundenplan',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -31532,13 +31532,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Keine zugeteilten Studenten gefunden für den gewählten LV-Teil gefunden!',
+				'text' => 'Keine zugeteilten Studenten gefunden!',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'No assigned students for the selected teaching unit found!',
+				'text' => 'No assigned students found!',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -40369,11 +40369,9 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
 	//////////// FHC4 Phrases Gruppen End ////////////
 
-	),
-// FHC4 Phrases CleanUpTasks End
 array(
 	'app' => 'core',
 	'category' => 'person',
@@ -42217,9 +42215,8 @@ and represent the current state of research on the topic. The prescribed citatio
 				'insertvon' => 'system'
 			)
 		)
-	)
-	// PROJEKTARBEITSBEURTEILUNG SS2025 ENDE ---------------------------------------------------------------------------
 	),
+	// PROJEKTARBEITSBEURTEILUNG SS2025 ENDE ---------------------------------------------------------------------------
 	/////////// FHC4 Phrases Messages START ///////////
 	array(
 		'app' => 'core',

From a0fb34420e7e2d20446f69ba0cabc01ccf759b55 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 27 May 2025 14:30:34 +0200
Subject: [PATCH 176/572] fix(Stundenplan API):corrects little bug with if
 statement check

---
 application/controllers/api/frontend/v1/Stundenplan.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 61a9e8f54..35b7ccc56 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -81,14 +81,11 @@ class Stundenplan extends FHCAPI_Controller
 		$lv_id = $this->input->get('lv_id', TRUE);
 
 		$stundenplan_events = $this->stundenplanlib->getStundenplan($start_date,$end_date,$lv_id);
+		$stundenplan_events = $this->getDataOrTerminateWithError($stundenplan_events);
 		if( is_null($stundenplan_events) || isEmptyArray($stundenplan_events) )
 		{
 			$stundenplan_events = array();
 		}
-		else
-		{
-			$stundenplan_events = $this->getDataOrTerminateWithError($stundenplan_events);
-		}
 
 		// fetching moodle events
 		$moodle_events = [];

From 0ee5cc09cd59a333c053555f6d8a2c79fd382a03 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 27 May 2025 17:30:50 +0200
Subject: [PATCH 177/572] add missing .js file extension

---
 .../Details/Aufnahmetermine/Aufnahmetermine.js                | 2 +-
 .../Details/Aufnahmetermine/HeaderReihungstest.js             | 4 ++--
 .../Studentenverwaltung/Details/JointStudies/JointStudies.js  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index cf8a47dd3..a4ca66de6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -3,7 +3,7 @@ import BsModal from "../../../../Bootstrap/Modal.js";
 import FormForm from '../../../../Form/Form.js';
 import FormInput from '../../../../Form/Input.js';
 
-import ApiStvAdmissionDates from '../../../../../api/factory/stv/admissionDates';
+import ApiStvAdmissionDates from '../../../../../api/factory/stv/admissionDates.js';
 
 export default {
 	name: 'ListAdmissionDates',
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js
index fcda41f34..dbf6e3154 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/HeaderReihungstest.js
@@ -1,6 +1,6 @@
 import FormForm from "../../../../Form/Form.js";
 import FormInput from "../../../../Form/Input.js";
-import ApiStvAdmissionDates from '../../../../../api/factory/stv/admissionDates';
+import ApiStvAdmissionDates from '../../../../../api/factory/stv/admissionDates.js';
 
 export default {
 	name: 'HeaderPlacement',
@@ -154,4 +154,4 @@ export default {
 		
 		</div>
 	`
-}
\ No newline at end of file
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
index 16d1593d3..c24e4cba5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
@@ -4,7 +4,7 @@ import FormForm from "../../../../Form/Form.js";
 import FormInput from "../../../../Form/Input.js";
 
 import ApiStvJointstudies from '../../../../../api/factory/stv/jointstudies.js';
-import ApiStvMobility from "../../../../../api/factory/stv/mobility";
+import ApiStvMobility from "../../../../../api/factory/stv/mobility.js";
 
 export default {
 	name: 'Tbl_JointStudies',

From 390434050ecd7a5c46a8a32bfc3851349c45277d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 27 May 2025 17:39:33 +0200
Subject: [PATCH 178/572] add missing end tag, add missing .js file extension

---
 public/js/components/Messages/Details/NewMessage/NewDiv.js    | 4 ++--
 .../Details/Aufnahmetermine/Aufnahmetermine.js                | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index 34401f6ea..fbf7bd9d7 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -2,7 +2,7 @@ import FormForm from '../../../Form/Form.js';
 import FormInput from '../../../Form/Input.js';
 import ListBox from "../../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
 import DropdownComponent from '../../../VorlagenDropdown/VorlagenDropdown.js';
-import ApiMessages from "../../../../api/factory/messages/messages";
+import ApiMessages from "../../../../api/factory/messages/messages.js";
 
 export default {
 	name: "ComponentNewMessages",
@@ -558,4 +558,4 @@ export default {
 	</div>
 	`
 
-}
\ No newline at end of file
+}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index a4ca66de6..474854315 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -497,7 +497,8 @@ export default {
 			<button v-if="statusNew" class="btn btn-primary" @click="addNewPlacementTest()"> {{$p.t('ui', 'speichern')}}</button>
 			<button v-else class="btn btn-primary" @click="updatePlacementTest(formData.rt_id)"> {{$p.t('ui', 'speichern')}}</button>
 		</template>
-		
+	    </bs-modal>
+
 	</div>
 	`
 }

From bbf0d044fd29aeb241c8c75befde96196b766d8a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 28 May 2025 08:20:33 +0200
Subject: [PATCH 179/572] use existing phrasename

---
 application/controllers/api/frontend/v1/stv/Config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 92af856b0..813edad10 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -84,7 +84,7 @@ class Config extends FHCAPI_Controller
 			'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js'
 		];
 		$result['documents'] = [
-			'title' => $this->p->t('stv', 'tab_dokumente'),
+			'title' => $this->p->t('stv', 'tab_documents'),
 			'component' => './Stv/Studentenverwaltung/Details/Dokumente.js'
 		];
 		$result['banking'] = [

From c9b555db772008bb2544d4869fa543e6a97d47e3 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 28 May 2025 08:22:22 +0200
Subject: [PATCH 180/572] swap div and form-input end-tag

---
 .../Stv/Studentenverwaltung/Details/Archiv/Edit.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js
index e819eb252..6e271b4d0 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js
@@ -93,15 +93,15 @@ export default {
 						v-model="data.signiert"
 					>
 					</form-input>
-						<form-input
-							container-class="form-check"
-							type="checkbox"
-							name="stud_selfservice"
-							:label="'Selfservice'"
-							v-model="data.stud_selfservice"
+					<form-input
+						container-class="form-check"
+						type="checkbox"
+						name="stud_selfservice"
+						:label="'Selfservice'"
+						v-model="data.stud_selfservice"
 					>
+					</form-input>
 				</div>
-				</form-input>
 			</fieldset>
 
 			<template #title>

From a756881a48974367df9551ee1d7b15caed2d5900 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 28 May 2025 09:14:49 +0200
Subject: [PATCH 181/572] refactor delete refactor validation backend add
 permission check for studiengang backend

---
 .../api/frontend/v1/stv/Mobility.php          | 137 ++++++++++++------
 public/js/api/factory/stv/mobility.js         |   7 +-
 .../Details/Mobility/Mobility.js              |  34 +++--
 system/phrasesupdate.php                      |  22 ++-
 4 files changed, 137 insertions(+), 63 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Mobility.php b/application/controllers/api/frontend/v1/stv/Mobility.php
index 2ab0ac682..58b71f008 100644
--- a/application/controllers/api/frontend/v1/stv/Mobility.php
+++ b/application/controllers/api/frontend/v1/stv/Mobility.php
@@ -40,13 +40,54 @@ class Mobility extends FHCAPI_Controller
 
 		// Load models
 		$this->load->model('codex/Bisio_model', 'BisioModel');
+
+		//Permission checks for Studiengangsarray
+		$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
+
+		if ($this->router->method == 'insertMobility' || $this->router->method == 'updateMobility')
+		{
+			$student_uid = $this->input->post('uid');
+			if(!$student_uid)
+			{
+				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
+			}
+			$this->_checkAllowedStgsFromUid($student_uid, $allowedStgs);
+		}
+
+		if ($this->router->method == 'deleteMobility') {
+			$bisio_id = $this->input->post('bisio_id');
+			if(!$bisio_id)
+			{
+				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Bisio ID']), self::ERROR_TYPE_GENERAL);
+			}
+			$result = $this->BisioModel->load(
+				array('bisio_id' => $bisio_id)
+			);
+			$data = $this->getDataOrTerminateWithError($result);
+			$student_uid = current($data)->student_uid;
+
+			$this->_checkAllowedStgsFromUid($student_uid, $allowedStgs);
+		}
+	}
+
+	private function _checkAllowedStgsFromUid($student_uid, $allowedStgs)
+	{
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$result = $this->StudentModel->loadWhere(['student_uid' => $student_uid]);
+		$data = $this->getDataOrTerminateWithError($result);
+		$studiengang_kz = current($data)->studiengang_kz;
+
+		if (!in_array($studiengang_kz, $allowedStgs))
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_keineBerechtigungStg'), self::ERROR_TYPE_GENERAL);
+		}
 	}
 
 	public function getMobilitaeten($student_uid)
 	{
 		$this->BisioModel->addSelect("*");
 		$this->BisioModel->addJoin('bis.tbl_mobilitaetsprogramm mp', 'ON (mp.mobilitaetsprogramm_code = bis.tbl_bisio.mobilitaetsprogramm_code)', 'LEFT');
-		$this->BisioModel->addJoin('lehre.tbl_lehreinheit le', 'ON (le.lehreinheit_id = bis.tbl_bisio.lehreinheit_id)','LEFT');
+		$this->BisioModel->addJoin('lehre.tbl_lehreinheit le', 'ON (le.lehreinheit_id = bis.tbl_bisio.lehreinheit_id)', 'LEFT');
 		$this->BisioModel->addOrder('von', 'DESC');
 		$this->BisioModel->addOrder('bis', 'DESC');
 		$this->BisioModel->addOrder('bisio_id', 'DESC');
@@ -83,14 +124,20 @@ class Mobility extends FHCAPI_Controller
 
 		$formData = $this->input->post('formData');
 
-		$_POST['von'] =	(isset($formData['von']) && !empty($formData['von'])) ? $formData['von'] : null;
-		$_POST['bis'] =	(isset($formData['bis']) && !empty($formData['bis'])) ? $formData['bis'] : null;
-		$_POST['nation_code'] =	(isset($formData['nation_code']) && !empty($formData['nation_code'])) ? $formData['nation_code'] : 'A';
-		$_POST['mobilitaetsprogramm_code'] = (isset($formData['mobilitaetsprogramm_code']) && !empty($formData['mobilitaetsprogramm_code'])) ? $formData['mobilitaetsprogramm_code'] : null;
-		$_POST['herkunftsland_code'] = (isset($formData['herkunftsland_code']) && !empty($formData['herkunftsland_code'])) ? $formData['herkunftsland_code'] : 'A';
-		$_POST['ects_erworben'] = (isset($formData['ects_erworben']) && !empty($formData['ects_erworben'])) ? $formData['ects_erworben'] : null;
-		$_POST['ects_angerechnet'] = (isset($formData['ects_angerechnet']) && !empty($formData['ects_angerechnet'])) ? $formData['ects_angerechnet'] : null;
-		$_POST['lehreinheit_id'] = (isset($formData['lehreinheit_id']) && !empty($formData['lehreinheit_id'])) ? $formData['lehreinheit_id'] : null;
+		$von = $formData['von'] ?? null;
+		$bis = $formData['bis'] ?? null;
+		$nation_code = $formData['nation_code'] ?? null;
+		$mobilitaetsprogramm_code = $formData['mobilitaetsprogramm_code'] ?? null;
+		$herkunftsland_code = $formData['herkunftsland_code'] ?? null;
+		$ects_erworben = $formData['ects_erworben'] ?? null;
+		$ects_angerechnet = $formData['ects_angerechnet'] ?? null;
+		$lehreinheit_id = $formData['lehreinheit_id'] ?? null;
+		$ort = $formData['ort'] ?? null;
+		$universitaet = $formData['universitaet'] ?? null;
+		$localPurposes = $formData['localPurposes'] ?? null;
+		$localSupports = $formData['localSupports'] ?? null;
+
+		$this->form_validation->set_data($formData);
 
 		$this->form_validation->set_rules('nation_code', 'Nation_code', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Nation_code'])
@@ -126,23 +173,18 @@ class Mobility extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$ort =	(isset($formData['ort']) && !empty($formData['ort'])) ? $formData['ort'] : null;
-		$universitaet =	(isset($formData['universitaet']) && !empty($formData['universitaet'])) ? $formData['universitaet'] : null;
-		$localPurposes = (isset($formData['localPurposes']) && !empty($formData['localPurposes'])) ? $formData['localPurposes'] : null;
-		$localSupports = (isset($formData['localSupports']) && !empty($formData['localSupports'])) ? $formData['localSupports'] : null;
-
 		$result = $this->BisioModel->insert([
 			'student_uid' => $student_uid,
-			'von' => $_POST['von'],
-			'bis' => $_POST['bis'],
-			'mobilitaetsprogramm_code' => $_POST['mobilitaetsprogramm_code'],
-			'nation_code' => $_POST['nation_code'],
-			'herkunftsland_code' => $_POST['herkunftsland_code'],
-			'lehreinheit_id' => $_POST['lehreinheit_id'],
+			'von' => $von,
+			'bis' => $bis,
+			'mobilitaetsprogramm_code' => $mobilitaetsprogramm_code,
+			'nation_code' => $nation_code,
+			'herkunftsland_code' => $herkunftsland_code,
+			'lehreinheit_id' => $lehreinheit_id,
 			'ort' => $ort,
 			'universitaet' => $universitaet,
-			'ects_erworben' => $_POST['ects_erworben'] ,
-			'ects_angerechnet' => $_POST['ects_angerechnet'],
+			'ects_erworben' => $ects_erworben ,
+			'ects_angerechnet' => $ects_angerechnet,
 			'insertamum' => date('c'),
 			'insertvon' => $authUID,
 		]);
@@ -171,7 +213,7 @@ class Mobility extends FHCAPI_Controller
 	{
 		$this->BisioModel->addSelect("*");
 		$this->BisioModel->addJoin('bis.tbl_mobilitaetsprogramm mp', 'ON (mp.mobilitaetsprogramm_code = bis.tbl_bisio.mobilitaetsprogramm_code)', 'LEFT');
-		$this->BisioModel->addJoin('lehre.tbl_lehreinheit le', 'ON (le.lehreinheit_id = bis.tbl_bisio.lehreinheit_id)','LEFT');
+		$this->BisioModel->addJoin('lehre.tbl_lehreinheit le', 'ON (le.lehreinheit_id = bis.tbl_bisio.lehreinheit_id)', 'LEFT');
 		$result = $this->BisioModel->loadWhere(
 			array('bisio_id' => $bisio_id)
 		);
@@ -194,14 +236,18 @@ class Mobility extends FHCAPI_Controller
 		}
 		$formData = $this->input->post('formData');
 
-		$_POST['von'] =	(isset($formData['von']) && !empty($formData['von'])) ? $formData['von'] : null;
-		$_POST['bis'] =	(isset($formData['bis']) && !empty($formData['bis'])) ? $formData['bis'] : null;
-		$_POST['nation_code'] =	(isset($formData['nation_code']) && !empty($formData['nation_code'])) ? $formData['nation_code'] : 'A';
-		$_POST['mobilitaetsprogramm_code'] = (isset($formData['mobilitaetsprogramm_code']) && !empty($formData['mobilitaetsprogramm_code'])) ? $formData['mobilitaetsprogramm_code'] : null;
-		$_POST['herkunftsland_code'] = (isset($formData['herkunftsland_code']) && !empty($formData['herkunftsland_code'])) ? $formData['herkunftsland_code'] : 'A';
-		$_POST['ects_erworben']  = (isset($formData['ects_erworben']) && !empty($formData['ects_erworben'])) ? $formData['ects_erworben'] : null;
-		$_POST['ects_angerechnet'] = (isset($formData['ects_angerechnet']) && !empty($formData['ects_angerechnet'])) ? $formData['ects_angerechnet'] : null;
-		$_POST['lehreinheit_id'] = (isset($formData['lehreinheit_id']) && !empty($formData['lehreinheit_id'])) ? $formData['lehreinheit_id'] : null;
+		$von = $formData['von'] ?? null;
+		$bis = $formData['bis'] ?? null;
+		$nation_code = $formData['nation_code'] ?? null;
+		$mobilitaetsprogramm_code = $formData['mobilitaetsprogramm_code'] ?? null;
+		$herkunftsland_code = $formData['herkunftsland_code'] ?? null;
+		$ects_erworben = $formData['ects_erworben'] ?? null;
+		$ects_angerechnet = $formData['ects_angerechnet'] ?? null;
+		$lehreinheit_id = $formData['lehreinheit_id'] ?? null;
+		$ort = $formData['ort'] ?? null;
+		$universitaet = $formData['universitaet'] ?? null;
+
+		$this->form_validation->set_data($formData);
 
 		$this->form_validation->set_rules('nation_code', 'Nation_code', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Nation_code'])
@@ -209,6 +255,7 @@ class Mobility extends FHCAPI_Controller
 		$this->form_validation->set_rules('herkunftsland_code', 'Herkunftsland_code', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Herkunftsland_code'])
 		]);
+
 		$this->form_validation->set_rules('mobilitaetsprogramm_code', 'Mobilitaetsprogramm_code', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Mobilitaetsprogramm_code'])
 		]);
@@ -243,16 +290,17 @@ class Mobility extends FHCAPI_Controller
 			],
 			[
 				'student_uid' => $student_uid,
-				'von' => $_POST['von'],
-				'bis' => $_POST['bis'],
-				'mobilitaetsprogramm_code' => $_POST['mobilitaetsprogramm_code'],
-				'nation_code' => $_POST['nation_code'],
-				'herkunftsland_code' => $_POST['herkunftsland_code'],
-				'lehreinheit_id' => $_POST['lehreinheit_id'],
-				'ort' => $formData['ort'],
-				'universitaet' => $formData['universitaet'],
-				'ects_erworben' => $_POST['ects_erworben'] ,
-				'ects_angerechnet' => $_POST['ects_angerechnet'],
+
+				'von' => $von,
+				'bis' => $bis,
+				'mobilitaetsprogramm_code' => $mobilitaetsprogramm_code,
+				'nation_code' => $nation_code,
+				'herkunftsland_code' => $herkunftsland_code,
+				'lehreinheit_id' => $lehreinheit_id,
+				'ort' => $ort,
+				'universitaet' => $universitaet,
+				'ects_erworben' => $ects_erworben ,
+				'ects_angerechnet' => $ects_angerechnet,
 				'updateamum' => date('c'),
 				'updatevon' => $authUID,
 			]
@@ -263,12 +311,14 @@ class Mobility extends FHCAPI_Controller
 		$this->terminateWithSuccess(current($data));
 	}
 
-	public function deleteMobility($bisio_id)
+	public function deleteMobility()
 	{
-		//check if extension table exists
+		$bisio_id = $this->input->post('bisio_id');
+
 		$result =  $this->BisioModel->tableExists('extension', 'tbl_mo_bisioidzuordnung');
 		$data = $this->getDataOrTerminateWithError($result);
 
+
 		//if table exists check if existing entry
 		if(!empty($data))
 		{
@@ -475,7 +525,6 @@ class Mobility extends FHCAPI_Controller
 		if($local_support){
 			$aufenthaltfoerderung_code = $local_support;
 		}
-
 		$this->load->model('codex/Bisioaufenthaltfoerderung_model', 'BisioaufenthaltfoerderungModel');
 
 		if(!$local_support)
diff --git a/public/js/api/factory/stv/mobility.js b/public/js/api/factory/stv/mobility.js
index 262dbcf55..fc4fd17b4 100644
--- a/public/js/api/factory/stv/mobility.js
+++ b/public/js/api/factory/stv/mobility.js
@@ -51,7 +51,8 @@ export default {
 	deleteMobility(bisio_id) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/stv/mobility/deleteMobility/' + bisio_id
+			url: 'api/frontend/v1/stv/mobility/deleteMobility/',
+			params: { bisio_id }
 		};
 	},
 	getLVList(studiengang_kz) {
@@ -100,7 +101,7 @@ export default {
 	deleteMobilityPurpose(params) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/stv/mobility/deleteMobilityPurpose/' + params.bisio_id,
+			url: 'api/frontend/v1/stv/mobility/deleteMobilityPurpose/',
 			params
 		};
 	},
@@ -108,7 +109,7 @@ export default {
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/stv/mobility/addMobilityPurpose/' + params.bisio_id,
-			params
+			params: params
 		};
 	},
 	deleteMobilitySupport(params) {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
index a56987318..44f6b72fb 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
@@ -27,6 +27,10 @@ export default {
 		currentSemester: {
 			from: 'currentSemester',
 		},
+		hasAssistenzPermissionForStgs: {
+			from: 'hasAssistenzPermissionForStgs',
+			default: false
+		},
 	},
 	props: {
 		student: Object
@@ -160,8 +164,8 @@ export default {
 				bisio_id: null,
 				localPurposes: [],
 				localSupports: [],
-				lehrveranstaltung_id: '',
-				lehreinheit_id: ''
+				lehrveranstaltung_id: null,
+				lehreinheit_id: null
 			},
 			statusNew: true,
 			programsMobility: [],
@@ -184,6 +188,10 @@ export default {
 		lv_teile(){
 			return this.listLvsAndLes.filter(lv => lv.lehreinheit_id == this.formData.lehreinheit_id);
 		},
+		isBerechtigtForStudiengang(){
+			const currentKz = this.student.studiengang_kz.toString();
+			return this.hasAssistenzPermissionForStgs.includes(currentKz);
+		}
 	},
 	methods: {
 		actionNewMobility() {
@@ -239,7 +247,7 @@ export default {
 			this.loadItems();
 		},
 		resetLehreinheit(){
-			this.formData.lehreinheit_id = '';
+			this.formData.lehreinheit_id = null;
 		},
 		getLehreinheiten(lv_id, studiensemester_kurzbz) {
 			const data = {
@@ -264,12 +272,7 @@ export default {
 				.call(ApiStvMobility.loadMobility(bisio_id))
 				.then(result => {
 					this.formData = result.data;
-					if(this.formData.lehrveranstaltung_id === null) {
-						this.formData.lehrveranstaltung_id = '';
-					}
-					if(this.formData.lehreinheit_id === null) {
-						this.formData.lehreinheit_id = '';
-					}
+
 					if(this.formData.lehrveranstaltung_id > 0 ) {
 						this.loadItems();
 					}
@@ -291,6 +294,8 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					this.reload();
+					this.$refs.purposes.resetLocalData();
+					this.$refs.supports.resetLocalData();
 				});
 		},
 		deleteMobility(bisio_id) {
@@ -314,8 +319,8 @@ export default {
 			this.formData.bisio_id = null;
 			this.formData.localPurposes = [];
 			this.formData.localSupports = [];
-			this.formData.lehrveranstaltung_id = '',
-			this.formData.lehreinheit_id = '',
+			this.formData.lehrveranstaltung_id = null,
+			this.formData.lehreinheit_id = null,
 			this.statusNew = true;
 			this.listLes = [];
 		},
@@ -444,14 +449,13 @@ export default {
 				<p v-else class="fw-bold mt-3">{{$p.t('mobility', 'mobility_bearbeiten')}}</p>
 			</template>
 
-
 			<form-form v-if="!this.student.length" ref="formMobility" @submit.prevent>
 
 				<div class="row my-3">
 					<legend class="col-6">BIS</legend>
 					<legend class="col-6">Outgoing</legend>
 				</div>
-				
+
 				<div class="row mb-3">
 					<form-input
 						container-class="col-6 stv-details-mobility-von"
@@ -474,7 +478,7 @@ export default {
 						name="lehrveranstaltung_id"
 						@change="handleLVchanged"
 						>
-						<option value=""> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
+						<option value=null> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
 						<option
 							v-for="lv in listLvs"
 							:key="lv.lehrveranstaltung_id"
@@ -507,7 +511,7 @@ export default {
 						name="lehreinheit_id"
 						:disabled="listLes.length > 0 ? false : true"
 						>
-						<option value=""> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
+						<option value=null> -- {{ $p.t('fehlermonitoring', 'keineAuswahl') }} --</option>
 						<option
 							v-for="le in listLes"
 							:key="le.lehreinheit_id"
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0203b3c2f..4e8bde26f 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41873,8 +41873,28 @@ and represent the current state of research on the topic. The prescribed citatio
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
 	// PROJEKTARBEITSBEURTEILUNG SS2025 ENDE ---------------------------------------------------------------------------
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_keineBerechtigungStg',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sie haben keine Berechtigung, für diesen Studiengang Daten zu ändern',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'You do not have permission to change data for this study program',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From a5bb72baf6fe2337614453761f2561620ff2eb9b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 28 May 2025 12:30:38 +0200
Subject: [PATCH 182/572] feature(Stundenplan Moodle Events Dependency
 Injection): injects moodle components dependency to the Stundenplan

---
 .../api/frontend/v1/RendererLoader.php        | 72 +++++++++++++++
 public/css/components/calendar.css            | 75 ++++++++++++++++
 public/js/api/factory/renderers.js            | 12 +++
 public/js/apps/Dashboard/Fhc.js               | 16 +++-
 .../EventTypes/lehreinheitEvent.js            | 30 +++++++
 .../components/Cis/Stundenplan/Stundenplan.js | 89 +++++--------------
 public/js/helpers/moodleSVG.js                |  5 --
 7 files changed, 226 insertions(+), 73 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/RendererLoader.php
 create mode 100644 public/js/api/factory/renderers.js
 create mode 100644 public/js/components/Cis/Stundenplan/EventTypes/lehreinheitEvent.js
 delete mode 100644 public/js/helpers/moodleSVG.js

diff --git a/application/controllers/api/frontend/v1/RendererLoader.php b/application/controllers/api/frontend/v1/RendererLoader.php
new file mode 100644
index 000000000..dc16bb3fc
--- /dev/null
+++ b/application/controllers/api/frontend/v1/RendererLoader.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use CI3_Events as Events;
+
+class RendererLoader extends FHCAPI_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+
+		parent::__construct([
+			'GetRenderers' => self::PERM_LOGGED,
+           
+		]);
+
+        $this->load->library('LogLib');
+        $this->loglib->setConfigs(array(
+			'classIndex' => 5,
+			'functionIndex' => 5,
+			'lineIndex' => 4,
+			'dbLogType' => 'API', // required
+			'dbExecuteUser' => 'RESTful API'
+		));
+
+
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	 /**
+     * fetches Stundenplan and Moodle events together
+     * @access public
+     *
+     */
+	public function GetRenderers(){
+		$renderer_paths = [];
+		Events::trigger(
+				'loadRenderers',
+				function & () use (&$renderer_paths)
+				{
+					return $renderer_paths;
+				}
+			);
+		$this->terminateWithSuccess($renderer_paths);
+	}
+
+	
+	
+
+}
diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 1de5e575b..202768d90 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -320,4 +320,79 @@
 .selectedEvent {
 	background-color: #00649c !important;
 	color: white;
+}
+
+
+.dayPageContainer, .weekPageContainer{
+	container-type: inline-size;
+}
+
+.dayPageContainer .lehreinheitEventContent,
+.weekPageContainer .lehreinheitEventContent {
+	display: flex;
+	flex-direction: column;
+}
+
+.dayPageContainer .moodleEventContent,
+.weekPageContainer .moodleEventContent{
+	display: flex;
+	flex-direction: row;
+}
+
+.dayPageContainer .lehreinheitEventContent{
+	flex-grow:1;
+	align-items: center;
+	font-size: 0.875rem;
+	font-weight: 400;
+	line-height:1.25;
+}
+
+.dayPageContainer .lehreinheitEventHeader {
+	display: flex;
+	flex-direction: column;
+	padding: 1rem;
+	border-right: 1px solid gray;
+}
+
+.dayPageContainer .moodleEventContent {
+	align-items: center;
+	font-size: 0.875rem;
+	font-weight: 400;
+	line-height: 1.25;
+	width:100%;
+}
+
+.weekPageContainer .moodleEventContent {
+	align-items: center;
+	font-size: 0.875rem;
+	font-weight: 400;
+	line-height: 1.25;
+	width: 100%;
+}
+
+.weekPageContainer .lehreinheitEventHeader {
+	display: flex;
+	flex-direction: column;
+	padding: 1rem;
+	border-right: 1px solid gray;
+}
+
+.weekPageContainer .lehreinheitEventContent {
+	flex-grow: 1;
+	align-items: center;
+	font-size: 0.875rem;
+	font-weight: 400;
+	line-height: 1.25;
+}
+
+
+@container( min-width: 500px){
+	.dayPageContainer .lehreinheitEventContent,
+	.weekPageContainer .lehreinheitEventContent {
+		flex-direction: row;
+	}
+
+	.dayPageContainer .lehreinheitEventContent{
+		justify-content: space-evenly;
+	}
 }
\ No newline at end of file
diff --git a/public/js/api/factory/renderers.js b/public/js/api/factory/renderers.js
new file mode 100644
index 000000000..fee81e4df
--- /dev/null
+++ b/public/js/api/factory/renderers.js
@@ -0,0 +1,12 @@
+
+export default {
+		
+	loadRenderers() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/RendererLoader/GetRenderers',
+			params: {
+			}
+		};
+	},
+}
\ No newline at end of file
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index fc25fbdfe..cdd69362c 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -15,6 +15,8 @@ import AbgabetoolMitarbeiter from "../../components/Cis/Abgabetool/AbgabetoolMit
 import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.js";
 import Studium from "../../components/Cis/Studium/Studium.js";
 
+import ApiRenderers from '../../api/factory/renderers.js';
+
 const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 
 const router = VueRouter.createRouter({
@@ -234,7 +236,8 @@ const router = VueRouter.createRouter({
 const app = Vue.createApp({
 	name: 'FhcApp',
 	data: () => ({
-		appSideMenuEntries: {}
+		appSideMenuEntries: {},
+		renderers: {},
 	}),
 	components: {},
 	computed: {
@@ -244,7 +247,8 @@ const app = Vue.createApp({
 	},
 	provide() {
 		return { // provide injectable & watchable language property
-			language: Vue.computed(() => this.$p.user_language)
+			language: Vue.computed(() => this.$p.user_language),
+			renderers: Vue.computed(() => this.renderers),
 		}	
 	},
 	methods: {
@@ -282,6 +286,14 @@ const app = Vue.createApp({
 			}
 		}
 	},
+	async created(){
+		await this.$api
+			.call(ApiRenderers.loadRenderers())
+			.then(res => res.data)
+			.then(data => {
+				this.renderers = data;
+			});
+	},
 	mounted() {
 		document.addEventListener('click', this.handleClick);
 	},
diff --git a/public/js/components/Cis/Stundenplan/EventTypes/lehreinheitEvent.js b/public/js/components/Cis/Stundenplan/EventTypes/lehreinheitEvent.js
new file mode 100644
index 000000000..088fb42f9
--- /dev/null
+++ b/public/js/components/Cis/Stundenplan/EventTypes/lehreinheitEvent.js
@@ -0,0 +1,30 @@
+export default {
+	methods:{
+		convertTime: function ([hour, minute]) {
+			let date = new Date();
+			date.setHours(hour);
+			date.setMinutes(minute);
+			// returns date string as hh:mm
+			return date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', hour12: false });
+
+		},
+	},
+	props:{
+		event: {
+			type:Object,
+			required:true,
+		},
+	},
+	template: `
+	<div class="lehreinheitEventHeader" v-if="!event.allDayEvent && event?.beginn && event?.ende" >
+		<span class="small">{{convertTime(event.beginn.split(":"))}}</span>
+		<span class="small">{{convertTime(event.ende.split(":"))}}</span>
+	</div>
+	<div class="lehreinheitEventContent">
+		<span>{{event.topic}}</span>
+		<span v-for="lektor in event.lektor">{{lektor.kurzbz}}</span>
+		<span>{{event.ort_kurzbz}}</span>
+	</div>
+	
+	`,
+}
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index efb8c06ea..5b42d54f8 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -3,11 +3,12 @@ import CalendarDate from "../../../composables/CalendarDate.js";
 import LvModal from "../Mylv/LvModal.js";
 import LvInfo from "../Mylv/LvInfo.js"
 import LvMenu from "../Mylv/LvMenu.js"
-import moodleSvg from "../../../helpers/moodleSVG.js"
+import lehreinheitEvent from "./EventTypes/lehreinheitEvent.js"
 
 import ApiStundenplan from '../../../api/factory/stundenplan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
+
 export const DEFAULT_MODE_STUNDENPLAN = 'Week'
 
 const Stundenplan = {
@@ -46,6 +47,7 @@ const Stundenplan = {
 			eventMaxHeight: this.eventMaxHeight
 		}	
 	},
+	inject:["renderers"],
 	watch: {
 		weekFirstDay: {
 			handler: async function (newValue) {
@@ -69,7 +71,7 @@ const Stundenplan = {
 		}
 	},
 	components: {
-		FhcCalendar, LvModal, LvMenu, LvInfo, moodleSvg
+		FhcCalendar, LvModal, LvMenu, LvInfo, lehreinheitEvent, 
 	},
 	computed:{
 		downloadLinks: function(){
@@ -105,17 +107,16 @@ const Stundenplan = {
 		},
 	},
 	methods:{
+		renderComponent(name){
+			switch(name){
+				case 'lehreinheitEvent': return lehreinheitEvent;
+				default: return !this.renderers? null : Vue.defineAsyncComponent(() => import(this.renderers[name]))
+			}
+		},
 		fetchStudiensemesterDetails: async function (date) {
 			return this.$api.call(ApiStundenplan.studiensemesterDateInterval(date));
 		},
-		convertTime: function([hour,minute]){
-			let date = new Date();
-			date.setHours(hour);
-			date.setMinutes(minute);
-			// returns date string as hh:mm
-			return date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', hour12:false}); 
-
-		},
+		
 		setSelectedEvent: function (event) {
 			this.currentlySelectedEvent = event;
 		},
@@ -248,6 +249,7 @@ const Stundenplan = {
 			.then(data => {
 				this.uid = data.uid;
 			});
+		
 		// this.loadEvents();
 	},
 	beforeUnmount() {
@@ -285,68 +287,23 @@ const Stundenplan = {
 			</div>
 		</template>
 		<template #monthPage="{event,day}">
-			<div class="p-1" v-if="event.type=='moodle'" @click="showModal(event)">
-				<div class="d-flex small w-100" >
-					<moodle-svg></moodle-svg>
-					<span class="flex-grow-1 text-center "><strong v-html="event.titel"></strong> - {{event.topic}}</span>
-				</div>
-			</div>
-			<div v-else @click="showModal(event)" class="p-1">
-				<span>{{event.topic}}</span>
+			<div @click="showModal(event)" class="p-1">
+				<component :event="event" :is="renderComponent(event.type+'Event')"></component>
 			</div>
 		</template>
 		<template #weekPage="{event,day}">
-			<div @click="showModal(event)" type="button"
-			class=" position-relative border border-secondary border d-flex flex-col align-items-center justify-content-evenly h-100"
-			:class="{'p-1':event.allDayEvent}"
-			style="overflow: auto;">
-				<div v-if="!event.allDayEvent && event?.beginn && event?.ende" class="d-none d-xl-block" >
-					<div class="d-flex flex-column p-4 p-xl-2 border-end border-secondary">
-						<span class="small">{{convertTime(event.beginn.split(":"))}}</span>
-						<span class="small">{{convertTime(event.ende.split(":"))}}</span>
-					</div>
-				</div>
-				<div v-if="event.type=='moodle'" class="d-flex small w-100" >
-					<moodle-svg></moodle-svg>
-					<span class="flex-grow-1 text-center"><strong v-html="event.titel"></strong> - {{event.topic}}</span>
-				</div>
-				<div v-else class="d-flex flex-column flex-grow-1 align-items-center small">
-					<span>{{event.topic}}</span>
-					<span v-for="lektor in event.lektor">{{lektor.kurzbz}}</span>
-					<span>{{event.ort_kurzbz}}</span>
-				</div>
+			<div @click="showModal(event)" type = "button"
+				class="weekPageContainer position-relative border border-secondary border d-flex flex-col align-items-center justify-content-evenly h-100"
+				:class="{'p-1':event.allDayEvent}"
+				style = "overflow: auto;" >
+				<component :event="event" :is="renderComponent(event.type+'Event')"></component>
 			</div>
 		</template>
 		<template #dayPage="{event,day,mobile}">
-			<div @click="mobile? showModal(event):null" type="button" class="fhc-entry border border-secondary border m-0 h-100  text-center">
-				<template v-if="event.type=='moodle'">
-					<div class="d-flex small align-items-center w-100 p-1" >
-						<moodle-svg></moodle-svg>
-						<span class="flex-grow-1 text-center"><strong v-html="event.titel"></strong> - {{event.topic}}</span>
-					</div>
-				</template>
-				<template v-else>
-					<div class="row justify-content-center align-items-center">
-						<div class="col-auto" v-if="!event.allDayEvent && event?.beginn && event?.ende" >
-							<div class="d-flex flex-column p-4 border-end border-secondary">
-								<span class="small">{{convertTime(event.beginn.split(":"))}}</span>
-								<span class="small">{{convertTime(event.ende.split(":"))}}</span>
-							</div>
-						</div>
-						<div class="col">
-							<p>{{ $p.t('lehre/lehrveranstaltung') }}:</p>
-							<p class="m-0">{{event?.topic}}</p>
-						</div>
-						<div class="col" :style="'max-height: ' + eventMaxHeight + '; overflow: auto;'">
-							<p>{{ $p.t('lehre/lektor') }}:</p>
-							<p class="m-0" v-for="lektor in event?.lektor">{{lektor.kurzbz}}</p>
-						</div>
-						<div class="col">
-							<p>{{ $p.t('profil/Ort') }}: </p>
-							<p class="m-0">{{event?.ort_kurzbz}}</p>
-						</div>
-					</div>
-				</template>
+			<div @click="mobile? showModal(event):null" type="button" class="dayPageContainer fhc-entry border border-secondary border m-0 h-100  text-center">
+				<div class="h-100 d-flex flex-col justify-content-evenly align-items-center">
+					<component :is="renderComponent(event.type+'Event')" :event="event"></component>
+				</div>
 			</div>
 		</template>
 		<template #pageMobilContent="{lvMenu, event}">
diff --git a/public/js/helpers/moodleSVG.js b/public/js/helpers/moodleSVG.js
deleted file mode 100644
index 679c9b1a6..000000000
--- a/public/js/helpers/moodleSVG.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default {
-	template:`
-		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 20 130 90" style="height:1.5em" ><radialGradient id="moodle-original-a" cx="532.855" cy="-537.557" r="209.76" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#FAAF40" /><stop offset=".043" stop-color="#F9A538" /><stop offset=".112" stop-color="#F89D31" /><stop offset=".227" stop-color="#F89A2F" /><stop offset=".528" stop-color="#F7922D" /><stop offset="1" stop-color="#F37B28" /></radialGradient><path fill="white" stroke="black" stroke-width="1" d="M106.259 105.754V66.975c0-8.164-3.397-12.244-10.034-12.244-6.629 0-10.034 4.08-10.034 12.244v38.779H66.294V66.975c0-8.164-3.228-12.244-9.862-12.244-6.633 0-10.036 4.08-10.036 12.244v38.779H26.667V64.768c0-8.504 2.891-14.801 8.844-19.223 5.102-3.91 12.246-5.777 20.92-5.777 9.015 0 15.478 2.207 19.727 6.801 3.57-4.594 10.207-6.801 19.897-6.801 8.844 0 15.819 1.867 20.922 5.777 5.951 4.422 8.843 10.719 8.843 19.223v41.152h-19.563v-.166z" /><path fill="black" d="M28.539 49.627l-2.041 10.207c18.708 6.291 36.395.166 45.751-16.158-13.778-9.522-26.535.17-43.71 5.951" /><linearGradient id="moodle-original-b" gradientUnits="userSpaceOnUse" x1="324.268" y1="-509.952" x2="368.932" y2="-509.952" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#929497" /><stop offset=".124" stop-color="#757578" /><stop offset=".279" stop-color="#575658" /><stop offset=".44" stop-color="#403E3F" /><stop offset=".609" stop-color="#302D2E" /><stop offset=".788" stop-color="#262223" /><stop offset="1" stop-color="#231F20" /></linearGradient><path fill="black" d="M28.539 47.08c-.681 3.91-1.192 7.65-1.872 11.563 17.857 6.125 35.375.85 44.73-15.137-11.909-13.776-25.17-2.383-42.858 3.574" /><linearGradient id="moodle-original-c" gradientUnits="userSpaceOnUse" x1="332.834" y1="-495.051" x2="351.377" y2="-521.534" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#231F20" /><stop offset="1" stop-color="#231F20" stop-opacity="0" /></linearGradient><path fill="none" d="M49.799 51.668c-8.164-1.701-17.009 2.555-23.131 6.975-3.912-28.57 13.777-27.893 36.903-20.75-1.529 6.975-4.083 16.33-8.502 21.941-.169-3.744-1.869-6.293-5.27-8.166" /><linearGradient id="moodle-original-d" gradientUnits="userSpaceOnUse" x1="299.778" y1="-495.802" x2="381.412" y2="-495.802" gradientTransform="matrix(1 0 0 -1 -297.6 -460.9)"><stop offset="0" stop-color="#929497" /><stop offset=".124" stop-color="#757578" /><stop offset=".279" stop-color="#575658" /><stop offset=".44" stop-color="#403E3F" /><stop offset=".609" stop-color="#302D2E" /><stop offset=".788" stop-color="#262223" /><stop offset="1" stop-color="#231F20" /></linearGradient><path fill="black" d="M2.178 47.08c29.932-18.031 46.77-21.43 81.634-25-40.478 31.969-41.499 25-81.634 25" /><path stroke="#4A4A4C" stroke-width=".5" fill="black" d="M83.812 22.246L51.667 45.545" /><path opacity=".23" fill="black" d="M45.545 34.66c.34 3.744-.511-3.572 0 0" /><path stroke="#4A4A4C" stroke-width=".5" fill="black" d="M2.178 47.08l49.489-1.535" /><path stroke="#F16922" stroke-width=".5" d="M42.484 35.002C33.98 37.383 6.09 43.506 5.747 47.08c-.849 6.631-.167 17.176-.167 17.176" fill="none" /><path fill="#F16922" d="M8.131 89.596c-3.063-7.652-6.804-16.158-2.384-26.703C8.64 72.756 8.131 80.24 8.131 89.596" /><path fill="#6D6E70" d="M41.076 33.844c.708-.25 1.384-.17 1.509.184.126.355-.344.846-1.052 1.096-.709.256-1.384.172-1.51-.184-.127-.352.344-.844 1.053-1.096z" /></svg> 
-	`
-}

From cfa391677e6c27bfc12425a0cb549b9fd0eaa940 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 28 May 2025 13:22:27 +0200
Subject: [PATCH 183/572] remove duplicate tabulatorEvents in computed

---
 .../Details/Anrechnungen/Anrechnungen.js           |  3 ++-
 .../Details/Dokumente/List/Accepted.js             | 13 -------------
 .../Details/Dokumente/List/Unaccepted.js           | 14 --------------
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index 1d6bd20df..23e3819ff 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -299,7 +299,7 @@ export default {
 
 	},
 	template: `
-					<div class="stv-details-tab_exemptions h-100 pb-3">
+				<div class="stv-details-tab_exemptions h-100 pb-3">
 					<h5>{{$p.t('lehre', 'anrechnungen')}}</h5>
 					
 					<div v-if="showNotizen" class="border p-3 overflow-auto" style="height: 200px;">
@@ -438,5 +438,6 @@ export default {
 						</template>
 								
 					</bs-modal>
+				</div>
 	`
 }
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
index 7790e12f8..60456225d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -203,19 +203,6 @@ export default {
 			]
 		}
 	},
-	computed: {
-		tabulatorEvents() {
-			const events = [
-				{
-					event: "rowDblClick",
-					handler: (e, row) => {
-						this.actionDownloadFile(row.getData().akte_id);
-					}
-				}
-			];
-			return events;
-		}
-	},
 	methods: {
 		actionDownloadFile(akte_id){
 			window.open(
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
index 6cc25cb6f..68f2b2100 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -211,20 +211,6 @@ export default {
 			]
 		}
 	},
-	computed: {
-		tabulatorEvents() {
-			const events = [
-				{
-					event: "rowDblClick",
-					handler: (e, row) => {
-						this.actionDownloadFile(row.getData().akte_id);
-					}
-				}
-			];
-
-			return events;
-			}
-	},
 	methods: {
 		actionDownloadFile(akte_id){
 			window.open(

From 4d3d06e1d6a791dd4dba7f1753e6bc52b00735b5 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 28 May 2025 16:36:56 +0200
Subject: [PATCH 184/572] add function to output a file

---
 application/core/FHCAPI_Controller.php | 33 ++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/application/core/FHCAPI_Controller.php b/application/core/FHCAPI_Controller.php
index c1e57a0f2..e1323f80d 100644
--- a/application/core/FHCAPI_Controller.php
+++ b/application/core/FHCAPI_Controller.php
@@ -223,6 +223,39 @@ class FHCAPI_Controller extends Auth_Controller
 		return $result->retval;
 	}
 
+	protected function terminateWithFileOutput($contenttype, $content, $filename=null)
+	{
+		$this->clearOutputBuffering();
+		$this->output->set_status_header(200)
+			->set_content_type($contenttype)
+			->set_header('Expires: 0')
+			->set_header('Cache-Control: no-store, no-cache, must-revalidate')
+			->set_header('Pragma: public')
+			->set_header('Content-Length: ' . strlen($content));
+
+		if($filename)
+		{
+			$cleanedfilename = preg_replace('/[^a-zA-Z0-9\-_.]/', '_', $filename);
+			$this->output->set_header('Content-Disposition: attachment; filename="'
+				. $cleanedfilename . '"');
+		}
+		else
+		{
+			$this->output->set_header('Content-Disposition: inline');
+		}
+
+		$this->output->set_output($content)
+			->_display();
+		exit();
+	}
+
+	private function clearOutputBuffering()
+	{
+		while(ob_get_level() > 0)
+		{
+			ob_end_clean();
+		}
+	}
 
 	// ---------------------------------------------------------------
 	// Security

From 8bcf01d1bb9721de7c28ba484acd42ebd59fa58c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 28 May 2025 16:38:26 +0200
Subject: [PATCH 185/572] alter document download to use dmslib and new
 terminateWithFileOutput funtion of FHCAPI_Controller, render download button
 as link

---
 .../api/frontend/v1/stv/Dokumente.php         | 40 ++++++++++++-------
 .../Details/Dokumente/List/Accepted.js        | 17 ++++----
 .../Details/Dokumente/List/Unaccepted.js      | 17 ++++----
 3 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Dokumente.php b/application/controllers/api/frontend/v1/stv/Dokumente.php
index 2923f7204..eca3d02ad 100644
--- a/application/controllers/api/frontend/v1/stv/Dokumente.php
+++ b/application/controllers/api/frontend/v1/stv/Dokumente.php
@@ -24,6 +24,7 @@ class Dokumente extends FHCAPI_Controller
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 		$this->load->library('form_validation');
+		$this->load->library('DmsLib', array('who' => getAuthUID()));
 
 		// Load language phrases
 		$this->loadPhrases([
@@ -417,26 +418,35 @@ class Dokumente extends FHCAPI_Controller
 
 
 		$result = $this->AkteModel->load($akte_id);
-
 		if (!hasData($result)) $this->terminateWithError('Akte not found');
-
 		$data = getData($result)[0];
 
-		header('Content-Description: File Transfer');
-		header('Content-Type: '. $data->mimetype);
-		header('Content-Disposition: attachment; filename="'.$data->titel.'"');
-		header('Expires: 0');
-		header('Cache-Control: must-revalidate');
-		header('Pragma: public');
-		if (isset($data->inhalt) && !empty($data->inhalt)) {
-			$decodedContent = base64_decode($data->inhalt, true);
+		$mimetype = $data->mimetype;
+		$filecontentbase64 = $data->inhalt;
+		$filename = $data->titel;
 
-			if ($decodedContent === false) {
-				die('Error: Base64-Dekodierung failed.');
-			}
-			echo $decodedContent;
+		if(intval($data->dms_id) > 0)
+		{
+			$dmsdokres = $this->dmslib->read($data->dms_id);
+			if (!hasData($dmsdokres)) $this->terminateWithError('DMS File not found');
+			$dmsdok = getData($dmsdokres)[0];
+
+			$mimetype = $dmsdok->mimetype;
+			$filecontentbase64 = $dmsdok->file_content;
+			$filename = $dmsdok->name;
 		}
-		die();
+
+		$filecontent = '';
+
+		if (!empty($filecontentbase64)) {
+			$filecontent = base64_decode($filecontentbase64, true);
+
+			if ($filecontent === false) {
+				$this->terminateWithError('Base64-Dekodierung failed.');
+			}
+		}
+
+		$this->terminateWithFileOutput($mimetype, $filecontent, $filename);
 	}
 
 	private function _getMissingDocuments($studiengang_kz, $prestudent_id)
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
index 60456225d..eea3c3b48 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -101,13 +101,13 @@ export default {
 							container.className = "d-flex gap-2";
 
 							if(cell.getData().vorhanden){
-								let button = document.createElement('button');
+								let button = document.createElement('a');
 								button.className = 'btn btn-outline-secondary btn-action';
 								button.innerHTML = '<i class="fa fa-download"></i>';
 								button.title = this.$p.t('ui', 'downloadDok');
-								button.addEventListener('click', (event) =>
-									this.actionDownloadFile(cell.getData().akte_id)
-								);
+								button.href = this.actionDownloadFile(cell.getData().akte_id);
+								button.role = 'button';
+								button.target = '_blank';
 								container.append(button);
 
 								button = document.createElement('button');
@@ -205,11 +205,10 @@ export default {
 	},
 	methods: {
 		actionDownloadFile(akte_id){
-			window.open(
-				FHC_JS_DATA_STORAGE_OBJECT.app_root
-				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/api/frontend/v1/stv/dokumente/download?akte_id=' + encodeURIComponent(akte_id),
-				'_blank'
-			);
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router 
+				+ '/api/frontend/v1/stv/dokumente/download?akte_id=' 
+				+ encodeURIComponent(akte_id);
 		},
 		actionUploadFile(dokument_kurzbz){
 			this.$refs.modalUpload.open(this.prestudent_id, dokument_kurzbz);
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
index 68f2b2100..3ca9bc136 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -118,13 +118,13 @@ export default {
 							container.className = "d-flex gap-2";
 
 							if(cell.getData().akte_id){
-								let button = document.createElement('button');
+								let button = document.createElement('a');
 								button.className = 'btn btn-outline-secondary btn-action';
 								button.innerHTML = '<i class="fa fa-download"></i>';
 								button.title = this.$p.t('ui', 'downloadDok');
-								button.addEventListener('click', (event) =>
-									this.actionDownloadFile(cell.getData().akte_id)
-								);
+								button.href = this.actionDownloadFile(cell.getData().akte_id);
+								button.role = 'button';
+								button.target = '_blank';
 								container.append(button);
 
 								button = document.createElement('button');
@@ -213,11 +213,10 @@ export default {
 	},
 	methods: {
 		actionDownloadFile(akte_id){
-			window.open(
-				FHC_JS_DATA_STORAGE_OBJECT.app_root
-				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/api/frontend/v1/stv/dokumente/download?akte_id=' + encodeURIComponent(akte_id),
-				'_blank'
-			);
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router 
+				+ '/api/frontend/v1/stv/dokumente/download?akte_id=' 
+				+ encodeURIComponent(akte_id);
 		},
 		actionUploadFile(dokument_kurzbz){
 			this.$refs.modalUpload.open(this.prestudent_id, dokument_kurzbz);

From 3cebbc9fbab6705c190481d9ef6976afea5d073d Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 28 May 2025 17:04:07 +0200
Subject: [PATCH 186/572] modal optional expand to full size button - used for
 qr window; added missing phrase editEntschuldigung;

---
 public/js/components/Bootstrap/Modal.js | 26 ++++++--
 system/phrasesupdate.php                | 80 +++++++++++++++++++++++++
 2 files changed, 101 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
index 2b3223ff7..ee4495278 100644
--- a/public/js/components/Bootstrap/Modal.js
+++ b/public/js/components/Bootstrap/Modal.js
@@ -3,7 +3,8 @@
 export default {
 	name: 'BootstrapModal',
 	data: () => ({
-		modal: null
+		modal: null,
+		fullscreen: false
 	}),
 	props: {
 		backdrop: {
@@ -26,6 +27,10 @@ export default {
 		bodyClass: {
 			type: [String,Array,Object],
 			default: 'px-4 py-5'
+		},
+		allowFullscreenExpand: {
+			type: Boolean,
+			default: false
 		}
 	},
 	emits: [
@@ -50,6 +55,9 @@ export default {
 		},
 		toggle() {
 			return this.modal.toggle();
+		},
+		toggleFullscreen() {
+			this.fullscreen = !this.fullscreen
 		}
 	},
 	mounted() {
@@ -115,12 +123,20 @@ export default {
 		});
 	},
 	template: `<div ref="modal" class="bootstrap-modal modal" tabindex="-1" @[\`hide.bs.modal\`]="$emit('hideBsModal')" @[\`hidden.bs.modal\`]="$emit('hiddenBsModal')" @[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal')" @[\`show.bs.modal\`]="$emit('showBsModal')" >
-		<div class="modal-dialog" :class="dialogClass">
+		<div class="modal-dialog" :class="fullscreen ? 'modal-fullscreen' : dialogClass">
 			<div class="modal-content">
-				<div v-if="$slots.title" class="modal-header">
+				<div v-if="$slots.title" class="modal-header d-flex align-items-center">
 					<h5 class="modal-title"><slot name="title"/></h5>
-					<slot name="popoutButton"></slot>
-					<button v-if="!noCloseBtn" type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+					<div class="d-flex align-items-center ms-auto">
+						<slot name="popoutButton"></slot>
+					
+						<button type="button" class="btn ms-2" v-if="allowFullscreenExpand" @click="toggleFullscreen">
+						  <i v-if="!fullscreen" class="fa-solid fa-expand"></i>
+						  <i v-else class="fa-solid fa-compress"></i>
+						</button>
+					
+						<button v-if="!noCloseBtn" type="button" class="btn-close ms-2" data-bs-dismiss="modal" aria-label="Close"></button>
+					  </div>
 				</div>
 				<div class="modal-body" :class="bodyClass">
 					<slot></slot>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0203b3c2f..9a461650b 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -30004,6 +30004,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'kontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitskontrolle',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'attendance check',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -32420,6 +32440,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'kontrolleDatumOutOfRange',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Datum liegt außerhalb der erlaubten Kontrollspanne!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Date is outside the permitted control range!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'alertBetreuungSelected',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der ausgewählte LV-Teil hat die Lehrform Betreuung! Bitte überprüfen sie die korrekte Auswahl des LV-Teils um fehlerhafte Kontrollen zu vermeiden!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The selected course component is taught in a supervised format! Please check that you have selected the correct course component to avoid incorrect assessments!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'editEntschuldigung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit Excuse note',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//
 	// DIGITALE ANWESENHEITEN PHRASEN END
 	//

From 9d48b6ac5713d07307cad56162c254dec3c77fea Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 28 May 2025 17:29:02 +0200
Subject: [PATCH 187/572] use popupModal layout of notiz component

---
 public/js/components/Stv/Studentenverwaltung/Details/Notizen.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 03376231f..d5f9174d2 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -22,7 +22,7 @@ export default {
 			class="overflow-hidden"
 			:endpoint="endpoint"
 			ref="formc"
-			notiz-layout="twoColumnsFormLeft"
+			notiz-layout="popupModal"
 			type-id="person_id"
 			:id="modelValue.person_id"
 			show-document

From cb1f6e2e5fa4b44389017972c93dbc4822f88842 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 28 May 2025 17:29:54 +0200
Subject: [PATCH 188/572] allow description to be html instead of plain text

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

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index cf02dccf5..45fb2eca2 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -664,7 +664,7 @@ export const CoreFilterCmpt = {
 				</div>
 				<div class="d-flex gap-1 align-items-baseline flex-grow-1 justify-content-end">
 					<span v-if="!tableOnly">[ {{ filterName }} ]</span>
-					<span v-else-if="description">{{ description }}</span>
+					<span v-else-if="description" v-html="description"></span>
 					<a v-if="!tableOnly || $slots.filter" href="#" class="btn btn-link px-0 text-dark" data-bs-toggle="collapse" :data-bs-target="'#collapseFilters' + idExtra">
 						<span class="fa-solid fa-xl fa-filter"></span>
 					</a>

From 42b750e120013770c7fb300c0708493ed8f54e2d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 28 May 2025 17:31:24 +0200
Subject: [PATCH 189/572] add selectedcount add phrases for counts label

---
 .../Stv/Studentenverwaltung/List.js           | 23 ++++++-
 system/phrasesupdate.php                      | 62 +++++++++++++++++++
 2 files changed, 83 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index c5e029b7a..ed81f8e91 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -154,7 +154,8 @@ export default {
 			filterKontoCount0: undefined,
 			filterKontoMissingCounter: undefined,
 			count: 0,
-			filteredcount: 0
+			filteredcount: 0,
+			selectedcount: 0
 		}
 	},
 	methods: {
@@ -165,6 +166,7 @@ export default {
 			this.$refs.new.open();
 		},
 		rowSelectionChanged(data) {
+			this.selectedcount = data.length;
 			this.lastSelected = this.selected;
 			this.$emit('update:selected', data);
 		},
@@ -279,6 +281,23 @@ export default {
 			}
 		}
 	},
+	computed: {
+		countsToHTML: function() {
+			return this.$p.t('global/anzahl')
+				+ ' ('
+				+ this.$p.t('global/ausgewaehlt')
+				+ ' / '
+				+ this.$p.t('global/gefiltert')
+				+ ' / '
+				+ this.$p.t('global/gesamt')
+				+ '): '
+				+ '<strong>' + (this.selectedcount || 0) + '</strong>'
+				+ ' / '
+				+ '<strong>' + (this.filteredcount || 0) + '</strong>'
+				+ ' / '
+				+ '<strong>' + (this.count || 0) + '</strong>';
+		}
+	},
 	// TODO(chris): focusin, focusout, keydown and tabindex should be in the filter component
 	// TODO(chris): filter component column chooser has no accessibilty features
 	template: `
@@ -286,7 +305,7 @@ export default {
 		<div class="tabulator-container d-flex flex-column h-100" :class="{'has-filter': filterKontoCount0 || filterKontoMissingCounter}" tabindex="0" @focusin="onFocus" @keydown="onKeydown">
 			<core-filter-cmpt
 				ref="table"
-				:description="$p.t('global/anzahl') + ': ' + (filteredcount || 0) + ' / ' + (count || 0)"
+				:description="countsToHTML"
 				:tabulator-options="tabulatorOptions"
 				:tabulator-events="tabulatorEvents"
 				table-only
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 6ac891fb6..1c7b5432b 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44130,6 +44130,68 @@ and represent the current state of research on the topic. The prescribed citatio
 		)
 	),
 	// FHC4 STUDIERENDENVERWALTUNG AUFNAHMETERMINE ENDE	 ---------------------------------------------------------------
+	// FHC4 STUDIERENDENVERWALTUNG ANZAHL START	 ---------------------------------------------------------------
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'ausgewaehlt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'ausgewählt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'selected',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'gefiltert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'gefiltert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'filtered',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'gesamt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'gesamt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'total',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// FHC4 STUDIERENDENVERWALTUNG ANZAHL ENDE	 ---------------------------------------------------------------
 );
 
 

From b885a8c72dd933ca7f8fe625e1306658c099dca4 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 30 May 2025 12:34:18 +0200
Subject: [PATCH 190/572] fix  getting set to null if e.g. base64 images is
 sent in request json

---
 application/core/FHCAPI_Controller.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/core/FHCAPI_Controller.php b/application/core/FHCAPI_Controller.php
index e1323f80d..6697953bc 100644
--- a/application/core/FHCAPI_Controller.php
+++ b/application/core/FHCAPI_Controller.php
@@ -81,8 +81,11 @@ class FHCAPI_Controller extends Auth_Controller
 		
 		// For JSON Requests (as opposed to multipart/form-data) get the $_POST variable from the input stream instead
 		if ($this->input->get_request_header('Content-Type', true) == 'application/json')
-			$_POST = json_decode($this->security->xss_clean($this->input->raw_input_stream), true);
-		elseif (isset($_POST['_jsondata'])) {
+		{
+			$_POST = json_decode($this->input->raw_input_stream, true);
+		}
+		elseif (isset($_POST['_jsondata']))
+		{
 			$_POST = array_merge($_POST, json_decode($_POST['_jsondata'], true));
 			unset($_POST['_jsondata']);
 		}

From 0da195810b481ad51e1cc3de95205d95bd640bcf Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 30 May 2025 12:35:48 +0200
Subject: [PATCH 191/572] set updateamum and updatevon, store verband,
 semester, gruppe in tbl_student if selected semester is current semester

---
 .../api/frontend/v1/stv/Student.php           | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index f24ef62bb..ce2e2df8d 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -117,6 +117,19 @@ class Student extends FHCAPI_Controller
 		$this->terminateWithSuccess(current($student));
 	}
 
+	protected function isLaufendesSemester($selectedSemester)
+	{
+		$laufendesStudiensemester = '';
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$result = $this->StudiensemesterModel->getNearest();
+		if(hasData($result)) {
+			$laufendesStudiensemester = (getData($result))[0]->studiensemester_kurzbz;
+		}
+
+		$islaufendesSemester = $selectedSemester === $laufendesStudiensemester;
+		return $islaufendesSemester;
+	}
+
 	/**
 	 * Saves data to a prestudent
 	 *
@@ -125,8 +138,6 @@ class Student extends FHCAPI_Controller
 	 */
 	public function save($prestudent_id)
 	{
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
@@ -134,6 +145,11 @@ class Student extends FHCAPI_Controller
 
 		$this->load->library('form_validation');
 
+		$authuid = getAuthUID();
+		$now = date('c');
+
+		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+
 		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'is_valid_date');
 
 		$this->form_validation->set_rules('semester', 'Semester', 'integer');
@@ -215,6 +231,12 @@ class Student extends FHCAPI_Controller
 		}
 
 		$array_allowed_props_student = ['matrikelnr'];
+		$this->addMeta('bhtest1', $this->isLaufendesSemester($studiensemester_kurzbz));
+		if($this->isLaufendesSemester($studiensemester_kurzbz)) 
+		{
+			$array_allowed_props_student = ['matrikelnr', 'verband', 'semester', 'gruppe'];
+			$this->addMeta('bhtest2', $array_allowed_props_student);
+		}
 		$update_student = array();
 		foreach ($array_allowed_props_student as $prop) {
 			$val = $this->input->post($prop);
@@ -240,6 +262,8 @@ class Student extends FHCAPI_Controller
 
 			if(hasData($curstudlvb) && count(getData($curstudlvb)) > 0 )
 			{
+				$update_lehrverband['updatevon'] = $authuid;
+				$update_lehrverband['updateamum'] = $now;
 				$result = $this->StudentlehrverbandModel->update([
 					'studiensemester_kurzbz' => $studiensemester_kurzbz,
 					'student_uid' => $uid
@@ -247,6 +271,8 @@ class Student extends FHCAPI_Controller
 			}
 			else
 			{
+				$update_lehrverband['insertvon'] = $authuid;
+				$update_lehrverband['insertamum'] = $now;
 				$result = $this->StudentlehrverbandModel->insert(array_merge([
 					'studiensemester_kurzbz' => $studiensemester_kurzbz,
 					'student_uid' => $uid,
@@ -258,6 +284,8 @@ class Student extends FHCAPI_Controller
 		}
 
 		if (count($update_person)) {
+			$update_person['updatevon'] = $authuid;
+			$update_person['updateamum'] = $now;
 			$result = $this->PersonModel->update(
 				$person_id,
 				$update_person
@@ -267,6 +295,8 @@ class Student extends FHCAPI_Controller
 
 
 		if (count($update_student)) {
+			$update_student['updatevon'] = $authuid;
+			$update_student['updateamum'] = $now;
 			$result = $this->StudentModel->update(
 				[$uid],
 				$update_student

From ba1ef83ba63fdf57fa19344050a868d6440077eb Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 30 May 2025 12:38:35 +0200
Subject: [PATCH 192/572] delete entry in tbl_studentlehrverband only if last
 prestudent status for the semester is deleted, update possibly existing entry
 in tbl_studentlehrverband when advancing prestudentstatus

---
 .../api/frontend/v1/stv/Status.php            | 44 ++++++++++++++-----
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index 8167bd90f..fcc8007cd 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -739,8 +739,12 @@ class Status extends FHCAPI_Controller
 		// Start DB transaction
 		$this->db->trans_begin();
 
+		//Delete Studentlehrverband if no Status left in this semester
+		$cilsresult = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id, $studiensemester_kurzbz);
+		$isLastPrestudentStatusForSemester = $this->getDataOrTerminateWithError($cilsresult);
+
 		//Delete Status
-		$result = $this->PrestudentstatusModel->delete(
+		$delpsresult = $this->PrestudentstatusModel->delete(
 			[
 				'prestudent_id' => $prestudent_id,
 				'status_kurzbz' => $status_kurzbz,
@@ -748,14 +752,9 @@ class Status extends FHCAPI_Controller
 				'studiensemester_kurzbz' => $studiensemester_kurzbz
 			]
 		);
+		$this->getDataOrTerminateWithError($delpsresult);
 
-		$this->getDataOrTerminateWithError($result);
-
-		//Delete Studentlehrverband if no Status left in this semester
-		$result = $this->PrestudentstatusModel->checkIfLastStatusEntry($prestudent_id, $studiensemester_kurzbz);
-
-		$result = $this->getDataOrTerminateWithError($result);
-		if ($result)
+		if ($isLastPrestudentStatusForSemester)
 		{
 			//get student_uid
 			$this->load->model('crm/Student_model', 'StudentModel');
@@ -1529,9 +1528,32 @@ class Status extends FHCAPI_Controller
 			$newStudentlvb['semester'] = $ausbildungssemester;
 		} // If there is no lehrverband just use the same as in the previous studiensemester
 
-
-		//add studentlehrverband
-		$result = $this->StudentlehrverbandModel->insert($newStudentlvb);
+		$checkres = $this->StudentlehrverbandModel->load(array(
+			'student_uid' => $studentlvb->student_uid,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz
+		));
+		if(hasData($checkres)) 
+		{
+			$result = $this->StudentlehrverbandModel->update(
+				array(
+					'student_uid' => $studentlvb->student_uid,
+					'studiensemester_kurzbz' => $studiensemester_kurzbz
+				),
+				array(
+					'studiengang_kz' => $studentlvb->studiengang_kz,
+					'semester' => $studentlvb->semester,
+					'verband' => $studentlvb->verband,
+					'gruppe' => $studentlvb->gruppe,
+					'updateamum' => $now,
+					'updatevon' => $authUID
+				)
+			);
+		}
+		else
+		{
+			//add studentlehrverband
+			$result = $this->StudentlehrverbandModel->insert($newStudentlvb);
+		}
 
 		$this->getDataOrTerminateWithError($result);
 

From 8810657a619bb98842a0e7b6715265797953fb1d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 30 May 2025 18:22:53 +0200
Subject: [PATCH 193/572] adapt styling message modal, message newdiv, counter
 display in studentslist

---
 .../Messages/Details/NewMessage/Modal.js      | 86 ++++++++-----------
 .../Messages/Details/NewMessage/NewDiv.js     | 78 ++++++++---------
 .../Studentenverwaltung/Details/Messages.js   | 37 --------
 .../Stv/Studentenverwaltung/List.js           | 18 ++--
 .../VorlagenDropdown/VorlagenDropdown.js      |  8 --
 5 files changed, 81 insertions(+), 146 deletions(-)

diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index d44d0faeb..85d9d2763 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -341,7 +341,8 @@ export default {
 		<bs-modal
 			class="messages-detail-newmessage-modal"
 			ref="modalNewMessage" 
-			dialog-class="modal-xl"
+			dialog-class=" modal-dialog-scrollable modal-xl"
+			body-class="px-3 py-2"
 			@hidden.bs.modal="resetForm"
 			>
 
@@ -350,10 +351,6 @@ export default {
 			</template>
 
 			<form-form ref="formNewMassage">
-
-				<div class="overflow-auto" style="max-height: 500px; border: 1px solid #ccc;">
-
-
 				<div class="row">
 					<div class="col-sm-8">
 						<form-form class="row g-3 mt-2" ref="formMessage">
@@ -410,60 +407,56 @@ export default {
 					<div class="col-sm-4">
 						<div v-if="this.fieldsPrestudent.length > 0">
 							<strong>{{$p.t('ui', 'felder')}} {{$p.t('lehre', 'prestudent')}}</strong>
-							<div class="border p-3 overflow-auto" style="height: 200px;">
 
-								<list-box
-									v-model="selectedFieldPrestudent"
-									:options="itemsPrestudent"
-									optionLabel="label"
-								>
-								  <template #option="slotProps">
-									<div @dblclick="insertVariable(slotProps.option)">
-									  {{ slotProps.option.label }}
-									</div>
-								  </template>
-								</list-box>
-
-							</div>
+							<list-box
+								v-model="selectedFieldPrestudent"
+								:options="itemsPrestudent"
+								optionLabel="label"
+								listStyle="max-height:200px"
+							>
+							  <template #option="slotProps">
+								<div @dblclick="insertVariable(slotProps.option)">
+								  {{ slotProps.option.label }}
+								</div>
+							  </template>
+							</list-box>
 
 						</div>
 
 						<div v-if="this.fieldsPerson.length > 0">
 							<strong>Felder Person</strong>
-							<div class="border p-3 overflow-auto" style="height: 200px;">
 
-								<list-box
-									v-model="selectedFieldPerson"
-									:options="itemsPerson"
-									optionLabel="label"
-								>
-									<template #option="slotProps">
-										<div @dblclick="insertVariable(slotProps.option)">
-										  {{ slotProps.option.label }}
-										</div>
-								  </template>
-								</list-box>
+							<list-box
+								v-model="selectedFieldPerson"
+								:options="itemsPerson"
+								optionLabel="label"
+								listStyle="max-height:200px"
+							>
+								<template #option="slotProps">
+									<div @dblclick="insertVariable(slotProps.option)">
+									  {{ slotProps.option.label }}
+									</div>
+							  </template>
+							</list-box>
 
-							</div>
 						</div>
 
 						<div>
 							<strong>{{$p.t('messages', 'meineFelder')}}</strong>
-							<div class="border p-3 overflow-auto" style="height: 200px;">
 
-								<list-box
-									v-model="selectedFieldUser"
-									:options="itemsUser"
-									optionLabel="label"
-								>
-									<template #option="slotProps">
-										<div @dblclick="insertVariable(slotProps.option)">
-										  {{ slotProps.option.label }}
-										</div>
-								  </template>
-								</list-box>
+							<list-box
+								v-model="selectedFieldUser"
+								:options="itemsUser"
+								optionLabel="label"
+								listStyle="max-height:200px"
+							>
+								<template #option="slotProps">
+									<div @dblclick="insertVariable(slotProps.option)">
+									  {{ slotProps.option.label }}
+									</div>
+							  </template>
+							</list-box>
 
-							</div>
 						</div>
 
 					</div>
@@ -508,9 +501,6 @@ export default {
 					</div>
 
 				</div>
-
-			</div>
-
 			</form-form>
 
 			<template #footer>
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index fbf7bd9d7..d070ff379 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -402,21 +402,19 @@ export default {
 					<div class="col-sm-4">
 						<div v-if="this.fieldsPrestudent.length > 0"  class="mt-3">
 							<strong>{{$p.t('ui', 'felder')}} {{$p.t('lehre', 'prestudent')}}</strong>
-							<div class="border p-3 overflow-auto" style="height: 250px;">
 
-								<list-box
-									v-model="selectedFieldPrestudent"
-									:options="itemsPrestudent"
-									optionLabel="label"
-								>
-								  <template #option="slotProps">
-									<div @dblclick="insertVariable(slotProps.option)">
-									  {{ slotProps.option.label }}
-									</div>
-								  </template>
-								</list-box>
-
-							</div>
+							<list-box
+								v-model="selectedFieldPrestudent"
+								:options="itemsPrestudent"
+								optionLabel="label"
+								listStyle="max-height:250px"
+							>
+							  <template #option="slotProps">
+								<div @dblclick="insertVariable(slotProps.option)">
+								  {{ slotProps.option.label }}
+								</div>
+							  </template>
+							</list-box>
 
 						</div>
 
@@ -424,41 +422,37 @@ export default {
 
 						<div v-if="this.fieldsPerson.length > 0" class="mt-3">
 							<strong>Felder Person</strong>
-							<div class="border p-3 overflow-auto" style="height: 250px;">
 
-								<list-box
-									v-model="selectedFieldPerson"
-									:options="itemsPerson"
-									optionLabel="label"
-								>
-									<template #option="slotProps">
-										<div @dblclick="insertVariable(slotProps.option)">
-										  {{ slotProps.option.label }}
-										</div>
-								  </template>
-								</list-box>
-
-							</div>
+							<list-box
+								v-model="selectedFieldPerson"
+								:options="itemsPerson"
+								optionLabel="label"
+								listStyle="max-height:250px"
+							>
+								<template #option="slotProps">
+									<div @dblclick="insertVariable(slotProps.option)">
+									  {{ slotProps.option.label }}
+									</div>
+							  </template>
+							</list-box>
 
 						</div>
 
 						<div>
 							<strong>{{$p.t('messages', 'meineFelder')}}</strong>
-							<div class="border p-3 overflow-auto" style="height: 200px;">
 
-								<list-box
-									v-model="selectedFieldUser"
-									:options="itemsUser"
-									optionLabel="label"
-								>
-									<template #option="slotProps">
-										<div @dblclick="insertVariable(slotProps.option)">
-										  {{ slotProps.option.label }}
-										</div>
-								  </template>
-								</list-box>
-
-							</div>
+							<list-box
+								v-model="selectedFieldUser"
+								:options="itemsUser"
+								optionLabel="label"
+								listStyle="max-height:200px"
+							>
+								<template #option="slotProps">
+									<div @dblclick="insertVariable(slotProps.option)">
+									  {{ slotProps.option.label }}
+									</div>
+							  </template>
+							</list-box>
 
 						</div>
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index 0c46a6333..49600fe20 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -11,42 +11,6 @@ export default {
 	template: `
 	<div class="stv-details-messages h-100 pb-3 overflow-hidden">
 	
-	<!--TODO(Manu) Delete Testdata-->
-	
-<!--		<h3>Test Dominik Schneider</h3>
-		<core-messages
-			ref="formc"
-			endpoint="$fhcApi.factory.messages.person"
-			type-id="mitarbeiter_uid"
-			id="ma0130"
-			messageLayout="twoColumnsTableLeft"
-			show-table
-			open-mode="modal"
-			>
-		</core-messages>-->
-		
-<!--		<h3>Test Person fields</h3>
-		<core-messages
-			ref="formc"
-			endpoint="$fhcApi.factory.messages.person"
-			type-id="mitarbeiter_uid"
-			id="ma0158"
-			messageLayout="twoColumnsTableLeft"
-			show-table
-			open-mode="newTab"
-			>
-		</core-messages>-->
-		
-<!--		<h3>Test no table</h3>
-		<core-messages
-			ref="form2"
-			endpoint="$fhcApi.factory.messages.person"
-			type-id="prestudent_id"
-			:id="modelValue.prestudent_id"
-			open-mode="modal"
-			>
-		</core-messages>-->
-		
 	<template v-if="modelValue.prestudent_id">
 		<core-messages
 			ref="formc"
@@ -63,7 +27,6 @@ export default {
 		 <h3><strong>No valid prestudent_id!</strong></h3>
 		 <p>{{modelValue.anmerkungen}}</p>
 	</template>
-	
 
 	</div>
 	`
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index ed81f8e91..bdb9732fb 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -283,19 +283,15 @@ export default {
 	},
 	computed: {
 		countsToHTML: function() {
-			return this.$p.t('global/anzahl')
-				+ ' ('
-				+ this.$p.t('global/ausgewaehlt')
-				+ ' / '
+			return this.$p.t('global/ausgewaehlt')
+				+ ': <strong>' + (this.selectedcount || 0) + '</strong>'
+				+ ' | '
 				+ this.$p.t('global/gefiltert')
-				+ ' / '
-				+ this.$p.t('global/gesamt')
-				+ '): '
-				+ '<strong>' + (this.selectedcount || 0) + '</strong>'
-				+ ' / '
+				+ ': '
 				+ '<strong>' + (this.filteredcount || 0) + '</strong>'
-				+ ' / '
-				+ '<strong>' + (this.count || 0) + '</strong>';
+				+ ' | '
+				+ this.$p.t('global/gesamt')
+				+ ': <strong>' + (this.count || 0) + '</strong>';
 		}
 	},
 	// TODO(chris): focusin, focusout, keydown and tabindex should be in the filter component
diff --git a/public/js/components/VorlagenDropdown/VorlagenDropdown.js b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
index 03d8564d6..b9869270a 100644
--- a/public/js/components/VorlagenDropdown/VorlagenDropdown.js
+++ b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
@@ -13,14 +13,6 @@ export default {
 			type: String,
 			required: true
 		},
-		modelValue: {
-			type: String,
-			required: true
-		},
-/*		oe: {
-			type: Array,
-			required: false
-		}, */
 		isAdmin: {
 			type: Boolean,
 			required: false

From c62b5872999ba37fa9bd5c577aaff51baac0b420 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 2 Jun 2025 09:23:14 +0200
Subject: [PATCH 194/572] refactor(moodle Event Info):adds the component for
 moodle event information to the rendered components from the moodle Event

---
 public/js/components/Cis/Mylv/LvInfo.js       | 51 -------------------
 public/js/components/Cis/Mylv/LvModal.js      |  2 +-
 .../components/Cis/Stundenplan/Stundenplan.js | 12 ++++-
 3 files changed, 12 insertions(+), 53 deletions(-)

diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
index a17eb4b67..145fc1c19 100644
--- a/public/js/components/Cis/Mylv/LvInfo.js
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -10,13 +10,6 @@ export default {
 		}
 	},
 	computed: {
-		LV_TYPES: function () {
-			return {
-				lehreinheit: "lehreinheit",
-				reservierung: "reservierung",
-				moodle: "moodle",
-			};
-		},
 		lektorenLinks: function () {
 			if (!this.event || !Array.isArray(this.event.lektor) || !this.event.lektor.length) return "a";
 
@@ -56,49 +49,6 @@ export default {
 	},
 	template:/*html*/`
 		<table class="table table-hover mb-4">
-			<template v-if="event.type == LV_TYPES.moodle">
-				<tbody>
-					<tr>
-						<th>{{
-							$p.t('global','datum')?
-							$p.t('global','datum')+':'
-							:''
-						}}</th>
-						<td>{{methodFormatDate(event.datum)}}</td>
-					</tr>
-					<tr>
-						<th>{{$p.t('global','aktivitaet')}}:</th>
-						<td v-html="event?.assignment"></td>
-					</tr>
-					<tr>
-						<th>{{$p.t('global','typ')}}:</th>
-						<td><img v-if="event?.activityIcon" class="me-1" :src="event?.activityIcon" />{{event?.purpose}}</td>
-					</tr>
-					<tr>
-						<th>{{$p.t('fristenmanagement','frist')}}:</th>
-						<td>{{start_time}}</td>
-					</tr>
-					<tr v-if="event?.actionname">
-						<th>{{$p.t('lvinfo','actionname')}}:</th>
-						<td>
-							{{event?.actionname}}
-						</td>
-					</tr>
-					<tr v-if="event?.overdue">
-						<th>{{$p.t('lvinfo','overdue')}}:</th>
-						<td>
-							{{$p.t('lvinfo','overdueEvent')}}
-						</td>
-					</tr>
-					<tr >
-				    	<th>{{$p.t('lvinfo','moodleLink')}}</th>
-						<td>
-							<a :href="event?.url" target="_blank"><i class="fa fa-arrow-up-right-from-square me-1"></i></a>
-						</td>
-					</tr>
-				</tbody>
-			</template>
-			<template v-else>
 				<tbody>
 					<tr>
 						<th>{{
@@ -157,7 +107,6 @@ export default {
 						<td>{{event.organisationseinheit}}</td>
 					</tr>
 				</tbody>
-			</template>
 		</table>
 	`
 }
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index 19c444a21..6509e4dfc 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -89,7 +89,7 @@ export default {
 					{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}
 				</template>
 			</h3>
-			<lv-info :event="event"></lv-info>
+			<slot name="info"></slot>
 			<template v-if="showMenu && this.menu">
 				<h3>{{$p.t('lehre','lehrveranstaltungsmenue')}}</h3>
 				<lv-menu :menu="menu"></lv-menu>
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 5b42d54f8..76bd788cd 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -113,6 +113,12 @@ const Stundenplan = {
 				default: return !this.renderers? null : Vue.defineAsyncComponent(() => import(this.renderers[name]))
 			}
 		},
+		renderComponentInfo(name) {
+			switch (name) {
+				case 'moodleEvent': return !this.renderers? null: Vue.defineAsyncComponent(() => import(this.renderers[name]));
+				default: return LvInfo;
+			}
+		},
 		fetchStudiensemesterDetails: async function (date) {
 			return this.$api.call(ApiStundenplan.studiensemesterDateInterval(date));
 		},
@@ -262,7 +268,11 @@ const Stundenplan = {
 		<span style="padding-left: 0.5em;" v-show="propsViewData?.lv_id && lv"> {{ $p.user_language.value === 'German' ? lv?.bezeichnung : lv?.bezeichnung_english}}</span>
 	</h2>
 	<hr>
-	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal" />
+	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal" >
+		<template #info>
+			<component :is="renderComponentInfo(currentlySelectedEvent.type+'Event')" :event="currentlySelectedEvent" ></component>
+		</template>
+	</lv-modal>
 	<fhc-calendar
 		ref="calendar"
 		@selectedEvent="setSelectedEvent"

From f233b33093459af20ca5b9f19f342765fe5b8f53 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 2 Jun 2025 10:29:14 +0200
Subject: [PATCH 195/572] add information to header

---
 .../Stv/Studentenverwaltung/Details.js        | 46 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 483b6ca7d..a56c59e7f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -63,11 +63,53 @@ export default {
 		<div v-else-if="configStudent && configStudents" class="d-flex flex-column h-100 pb-3">
 			<div class="d-flex justify-content-start align-items-center w-100 pb-3 gap-3" style="max-height:8rem">
 				<img v-for="student in students" :key="student.person_id" class="d-block h-100 rounded" alt="profilbild" :src="appRoot + 'cis/public/bild.php?src=person&person_id=' + student.person_id">
+	
+
+					
 				<div v-if="students.length == 1">
-					<h2 class="h4">{{students[0].titlepre}} {{students[0].vorname}} {{students[0].nachname}} {{students[0].titlepost}}</h2>
+					<h2 class="h4">
+						{{students[0].titelpre}}
+						{{students[0].vorname}}
+						{{students[0].nachname}}
+						{{students[0].titelpost}}
+					</h2>
+					<h5 class="h6">
+						<strong class="text-muted">Studiengang </strong>
+						 {{students[0].studiengang}}
+						<strong v-if="students[0].semester" class="text-muted"> | Semester </strong>
+						  {{students[0].semester}}
+						<strong v-if="students[0].verband" class="text-muted"> | Verband </strong>
+						{{students[0].verband}}
+						<strong v-if="students[0].gruppe" class="text-muted"> | Gruppe </strong>
+						{{students[0].gruppe}}
+					  </h5>
+					  <h5 class="h6">
+						<strong class="text-muted">Email </strong>
+						<span>
+							<a :href="'mailto:'+students[0]?.mail_intern">{{students[0].mail_intern}}</a>
+						</span>
+						<strong class="text-muted"> | Status </strong>
+						 {{students[0].status}}
+						<strong class="text-muted"> | MatrNr </strong>
+						  {{students[0].matr_nr}}
+						<strong class="text-muted"> | UID </strong>
+						{{students[0].uid}}
+						<strong class="text-muted"> | Person ID </strong>
+						{{students[0].person_id}}
+					  </h5>
+
 				</div>
 			</div>
-			<fhc-tabs v-if="students.length == 1" ref="tabs" :modelValue="students[0]" :config="config" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
+			<fhc-tabs
+				v-if="students.length == 1"
+				ref="tabs"
+				:modelValue="students[0]"
+				:config="config"
+				:default="$route.params.tab"
+				style="flex: 1 1 0%; height: 0%"
+				@changed="reload"
+				>
+				</fhc-tabs>
 			<fhc-tabs v-else ref="tabs" :modelValue="students" :config="config" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
 		</div>
 		<div v-else>

From 96fcff3adef93e6c82f30b2e24049b171e610bc3 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 2 Jun 2025 13:47:49 +0200
Subject: [PATCH 196/572] add Event mobility_delete

---
 .../api/frontend/v1/stv/Mobility.php          | 26 +++----------------
 application/models/codex/Bisio_model.php      | 23 ----------------
 2 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Mobility.php b/application/controllers/api/frontend/v1/stv/Mobility.php
index 58b71f008..f61816086 100644
--- a/application/controllers/api/frontend/v1/stv/Mobility.php
+++ b/application/controllers/api/frontend/v1/stv/Mobility.php
@@ -3,6 +3,7 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 use \DateTime as DateTime;
+use CI3_Events as Events;
 
 class Mobility extends FHCAPI_Controller
 {
@@ -315,28 +316,8 @@ class Mobility extends FHCAPI_Controller
 	{
 		$bisio_id = $this->input->post('bisio_id');
 
-		$result =  $this->BisioModel->tableExists('extension', 'tbl_mo_bisioidzuordnung');
-		$data = $this->getDataOrTerminateWithError($result);
-
-
-		//if table exists check if existing entry
-		if(!empty($data))
-		{
-			$this->BisioModel->addSelect("count(*)");
-			$this->BisioModel->addJoin('extension.tbl_mo_bisioidzuordnung mo', 'ON (mo.bisio_id = bis.tbl_bisio.bisio_id)', 'LEFT');
-
-			$resultCheckMo = $this->BisioModel->loadWhere(
-				array('mo.bisio_id' => $bisio_id)
-			);
-
-			$resultCheckMo = $this->getDataOrTerminateWithError($resultCheckMo);
-			$count = current($resultCheckMo)->count;
-
-			$existsInExtension = $count > 0 ? true : false;
-
-			if($existsInExtension)
-				$this->terminateWithError($this->p->t('mobility', 'error_existingEntryInExtension'), self::ERROR_TYPE_GENERAL);
-		}
+		//check if entry in MobilityOnline extension exists
+		Events::trigger('mobility_delete', $bisio_id);
 
 		$result = $this->BisioModel->delete(
 			array('bisio_id' => $bisio_id)
@@ -344,6 +325,7 @@ class Mobility extends FHCAPI_Controller
 
 		$data = $this->getDataOrTerminateWithError($result);
 		$this->terminateWithSuccess($data);
+
 	}
 
 	public function getLVList($studiengang_kz)
diff --git a/application/models/codex/Bisio_model.php b/application/models/codex/Bisio_model.php
index 5ecd4bb51..1cff1dc54 100644
--- a/application/models/codex/Bisio_model.php
+++ b/application/models/codex/Bisio_model.php
@@ -44,27 +44,4 @@ class Bisio_model extends DB_Model
 		else
 			return success("Bisio not found");
 	}
-
-	/**
-	 * checks, if an (extension) table exists to avoid later errors
-	 * @param String $schema like 'extension'
-	 * @param String $table like 'tbl_mo_bisiozuordnung'
-	 * @return boolean
-	 */
-	public function tableExists($schema, $table)
-	{
-		$params = array($schema, $table);
-
-		$qry = "SELECT
-				  1
-				FROM
-				  information_schema.role_table_grants
-				WHERE
-				    table_schema = ?
-				AND table_name = ?";
-
-		$result =  $this->execQuery($qry, $params);
-
-		return $result;
-	}
 }

From 3ff0f55cc099c98b33534c75bd2b7ff04e7ce8f4 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 3 Jun 2025 08:05:38 +0200
Subject: [PATCH 197/572] tune layout of new message modal

---
 public/css/Fhc.css                            |  7 +++
 .../Messages/Details/NewMessage/Modal.js      | 57 +++++++++++++------
 .../VorlagenDropdown/VorlagenDropdown.js      |  4 +-
 3 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/public/css/Fhc.css b/public/css/Fhc.css
index 376206f6e..5e810da66 100644
--- a/public/css/Fhc.css
+++ b/public/css/Fhc.css
@@ -98,3 +98,10 @@
   padding-right: .375rem;
   background-image: none;
 }
+
+.modal-msg {
+	max-width: 1378px;
+}
+.modal-msg .modal-content {
+	height: 95vh;
+}
\ No newline at end of file
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index 85d9d2763..ab56f4a38 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -341,7 +341,7 @@ export default {
 		<bs-modal
 			class="messages-detail-newmessage-modal"
 			ref="modalNewMessage" 
-			dialog-class=" modal-dialog-scrollable modal-xl"
+			dialog-class=" modal-dialog-scrollable modal-xl modal-msg"
 			body-class="px-3 py-2"
 			@hidden.bs.modal="resetForm"
 			>
@@ -350,7 +350,20 @@ export default {
 				{{ $p.t('messages', 'neueNachricht') }}
 			</template>
 
+			<ul class="nav nav-tabs" id="msg_preview" role="tablist">
+				<li class="nav-item" role="presentation">
+					<button class="nav-link active" id="msg-tab" data-bs-toggle="tab" data-bs-target="#msg" type="button" role="tab" aria-controls="msg" aria-selected="true">Nachricht</button>
+				</li>
+				<li class="nav-item" role="presentation">
+					<button class="nav-link" id="preview-tab" data-bs-toggle="tab" data-bs-target="#preview" type="button" role="tab" aria-controls="preview" aria-selected="false">Vorschau</button>
+				</li>
+			</ul>
+
 			<form-form ref="formNewMassage">
+
+			<div class="tab-content" id="msg_preview_content">
+				<div class="tab-pane fade show active" id="msg" role="tabpanel" aria-labelledby="msg-tab">
+
 				<div class="row">
 					<div class="col-sm-8">
 						<form-form class="row g-3 mt-2" ref="formMessage">
@@ -385,34 +398,35 @@ export default {
 									type="textarea"
 									v-model="formData.body"
 									name="body"
-									rows="15"
+									rows="35"
 									cols="75"
 									>
 								</form-input>
 							</div>
 
-							<div class="row">
-								<dropdown-component
-									ref="dropdownComp"
-									:label="$p.t('global/vorlage')"
-									@change="handleSelectedVorlage"
-									useLoggedInUserOe
-								>
-								</dropdown-component>
-							</div>
-
 						</form-form>
 					</div>
 
 					<div class="col-sm-4">
+
+						<div class="row">
+							<dropdown-component
+								ref="dropdownComp"
+								:label="$p.t('global/vorlage')"
+								@change="handleSelectedVorlage"
+								useLoggedInUserOe
+							>
+							</dropdown-component>
+						</div>
+
 						<div v-if="this.fieldsPrestudent.length > 0">
-							<strong>{{$p.t('ui', 'felder')}} {{$p.t('lehre', 'prestudent')}}</strong>
+							<div class="mt-2"><strong>{{$p.t('ui', 'felder')}} {{$p.t('lehre', 'prestudent')}}</strong></div>
 
 							<list-box
 								v-model="selectedFieldPrestudent"
 								:options="itemsPrestudent"
 								optionLabel="label"
-								listStyle="max-height:200px"
+								listStyle="max-height:200px; overscroll-behavior: none;"
 							>
 							  <template #option="slotProps">
 								<div @dblclick="insertVariable(slotProps.option)">
@@ -424,13 +438,13 @@ export default {
 						</div>
 
 						<div v-if="this.fieldsPerson.length > 0">
-							<strong>Felder Person</strong>
+							<div class="mt-2"><strong>Felder Person</strong></div>
 
 							<list-box
 								v-model="selectedFieldPerson"
 								:options="itemsPerson"
 								optionLabel="label"
-								listStyle="max-height:200px"
+								listStyle="max-height:200px; overscroll-behavior: none;"
 							>
 								<template #option="slotProps">
 									<div @dblclick="insertVariable(slotProps.option)">
@@ -442,13 +456,13 @@ export default {
 						</div>
 
 						<div>
-							<strong>{{$p.t('messages', 'meineFelder')}}</strong>
+							<div class="mt-2"><strong>{{$p.t('messages', 'meineFelder')}}</strong></div>
 
 							<list-box
 								v-model="selectedFieldUser"
 								:options="itemsUser"
 								optionLabel="label"
-								listStyle="max-height:200px"
+								listStyle="max-height:200px; overscroll-behavior: none;"
 							>
 								<template #option="slotProps">
 									<div @dblclick="insertVariable(slotProps.option)">
@@ -463,6 +477,9 @@ export default {
 
 				</div>
 
+				</div>
+				<div class="tab-pane fade" id="preview" role="tabpanel" aria-labelledby="preview-tab">
+
 				<div class="row mt-4">
 
 					<h4>{{ $p.t('global', 'vorschau') }}:</h4>
@@ -501,6 +518,10 @@ export default {
 					</div>
 
 				</div>
+
+				</div>
+			</div>
+
 			</form-form>
 
 			<template #footer>
diff --git a/public/js/components/VorlagenDropdown/VorlagenDropdown.js b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
index b9869270a..0071d4a1d 100644
--- a/public/js/components/VorlagenDropdown/VorlagenDropdown.js
+++ b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
@@ -57,7 +57,7 @@ export default {
 	},
 template: `
 	<div class="core-vorlagen-dropdown">
-		<div v-if="isAdmin" class="col-sm-8 pt-3">
+		<div v-if="isAdmin" class="col-sm-12 pt-2">
 			<form-input
 				ref="dropdown"
 				type="select"
@@ -75,7 +75,7 @@ template: `
 			</form-input>
 		</div>
 		
-		<div v-if="useLoggedInUserOe" class="col-sm-8 pt-3">
+		<div v-if="useLoggedInUserOe" class="col-sm-12 pt-2">
 			<form-input
 				ref="dropdown"
 				type="select"

From a2dee4d6ba8e459e368335dbfbc311ced7be06c1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 3 Jun 2025 09:24:54 +0200
Subject: [PATCH 198/572] feature(FHC Core Renderer Event): adds the FHC Core
 renderer Event to the loadRenderer Event

---
 application/core/CI3_Events.php |  3 +++
 application/core/Events.php     | 15 +++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 application/core/Events.php

diff --git a/application/core/CI3_Events.php b/application/core/CI3_Events.php
index 37f6c3f21..e283230c9 100644
--- a/application/core/CI3_Events.php
+++ b/application/core/CI3_Events.php
@@ -49,6 +49,9 @@ require_once(APPPATH.'config/Events.php');
 
 $active_addons_array = explode(";", ACTIVE_ADDONS);
 
+// Load Events from FHC core
+require_once APPPATH.'core/Events.php';
+
 foreach (scandir(APPPATH.'config/extensions') as $dir)
 	if ($dir[0] != '.' && file_exists(APPPATH.'config/extensions/'.$dir.'/Events.php'))
 		require_once APPPATH.'config/extensions/'.$dir.'/Events.php';
diff --git a/application/core/Events.php b/application/core/Events.php
new file mode 100644
index 000000000..cc61cd509
--- /dev/null
+++ b/application/core/Events.php
@@ -0,0 +1,15 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use CI3_Events as Events;
+
+Events::on('loadRenderers', function ($renderers) {
+	$fhc_core_renderers =& $renderers();
+	$fhc_core_renderers["lehreinheit"] = array(
+		'calendarEvent' => APP_ROOT.'public/js/components/Cis/Stundenplan/EventTypes/calendarEvent.js',
+		'modalTitle' => APP_ROOT.'public/js/components/Cis/Mylv/modalTitle.js',
+		'modalContent' => APP_ROOT.'public/js/components/Cis/Mylv/modalContent.js'
+	);
+});
+
+

From 7e90771f89aac9bbc46ed85cf1bc332ae6b0dc33 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 3 Jun 2025 09:30:10 +0200
Subject: [PATCH 199/572] refactor(Moodle Events DependencyInjection): changes
 the lazy loading for the moodle events in Stundenplan

---
 public/js/apps/Dashboard/Fhc.js               | 18 ++++++-
 public/js/components/Cis/Mylv/LvModal.js      | 22 +++-----
 .../Cis/Mylv/{LvInfo.js => modalContent.js}   | 22 ++++----
 public/js/components/Cis/Mylv/modalTitle.js   | 12 +++++
 .../{lehreinheitEvent.js => calendarEvent.js} |  0
 .../components/Cis/Stundenplan/Stundenplan.js | 54 ++++++++++++-------
 6 files changed, 80 insertions(+), 48 deletions(-)
 rename public/js/components/Cis/Mylv/{LvInfo.js => modalContent.js} (95%)
 create mode 100644 public/js/components/Cis/Mylv/modalTitle.js
 rename public/js/components/Cis/Stundenplan/EventTypes/{lehreinheitEvent.js => calendarEvent.js} (100%)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index cdd69362c..830bd2ec3 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -237,7 +237,7 @@ const app = Vue.createApp({
 	name: 'FhcApp',
 	data: () => ({
 		appSideMenuEntries: {},
-		renderers: {},
+		renderers: null,
 	}),
 	components: {},
 	computed: {
@@ -291,7 +291,21 @@ const app = Vue.createApp({
 			.call(ApiRenderers.loadRenderers())
 			.then(res => res.data)
 			.then(data => {
-				this.renderers = data;
+				for (let rendertype of Object.keys(data)) {
+					
+					let modalTitel = Vue.defineAsyncComponent(() => import(data[rendertype].modalTitel));
+					let modalContent = Vue.defineAsyncComponent(() => import(data[rendertype].modalContent));
+					let calendarEvent = Vue.defineAsyncComponent(() => import(data[rendertype].calendarEvent));
+					if(this.renderers === null) {
+						this.renderers = {};
+					}
+					if (!this.renderers[rendertype]) {
+						this.renderers[rendertype] = {}
+					}
+					this.renderers[rendertype].modalTitel = modalTitel;
+					this.renderers[rendertype].modalContent = modalContent;
+					this.renderers[rendertype].calendarEvent = calendarEvent;
+				}
 			});
 	},
 	mounted() {
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index 6509e4dfc..969035711 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -1,7 +1,6 @@
 import BsModal from "../../Bootstrap/Modal.js";
 import Alert from "../../Bootstrap/Alert.js";
 import LvMenu from "./LvMenu.js"
-import LvInfo from "./LvInfo.js"
 
 import ApiStundenplan from '../../../api/factory/stundenplan.js';
 import ApiAddons from '../../../api/factory/addons.js';
@@ -11,7 +10,6 @@ export default {
 		BsModal,
 		Alert,
 		LvMenu,
-		LvInfo,
 	},
 	mixins: [BsModal],
 	props: {
@@ -44,6 +42,9 @@ export default {
 		};
 	},
 	methods:{
+		onHideModal: function(){
+			this.menu = null;
+		},
 		onModalShow: function()
 		{
 			// do not load the menu if the menu is not getting rendered
@@ -74,22 +75,13 @@ export default {
 		return BsModal.popup.bind(this)(null, options);
 	},
 	template: /*html*/ `
-	<bs-modal ref="modalContainer" @showBsModal="onModalShow" v-bind="$props" :bodyClass="''" dialogClass='modal-lg' class="bootstrap-alert" :backdrop="false" >
+	<bs-modal ref="modalContainer" @showBsModal="onModalShow" @hideBsModal="onHideModal" v-bind="$props" :bodyClass="''" dialogClass='modal-lg' class="bootstrap-alert" :backdrop="false" >
 		<template v-slot:title>
-			<template v-if="event?.type=='moodle'"><strong v-html="event.titel"></strong></template>
-			<template v-else-if="event.titel">{{ event.titel + ' - ' + event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
-			<template v-else>{{ event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</template>
+			<slot name="modalTitle"></slot>
 		</template>
 		<template v-slot:default>
-			<h3>
-				<template v-if="event?.type =='moodle'">
-					{{$p.t('lvinfo','Moodleinformationen')}}
-				</template>
-				<template v-else>
-					{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}
-				</template>
-			</h3>
-			<slot name="info"></slot>
+			<slot name="modalContent"></slot>
+			
 			<template v-if="showMenu && this.menu">
 				<h3>{{$p.t('lehre','lehrveranstaltungsmenue')}}</h3>
 				<lv-menu :menu="menu"></lv-menu>
diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/modalContent.js
similarity index 95%
rename from public/js/components/Cis/Mylv/LvInfo.js
rename to public/js/components/Cis/Mylv/modalContent.js
index 145fc1c19..c0050e9cc 100644
--- a/public/js/components/Cis/Mylv/LvInfo.js
+++ b/public/js/components/Cis/Mylv/modalContent.js
@@ -1,12 +1,11 @@
 import { numberPadding, formatDate } from "../../../helpers/DateHelpers.js"
 
-export default {
-	props: {
-		event: Object,
-	},
-	data() {
-		return {
 
+export default {
+	props:{
+		event: {
+			type: Object,
+			required: true,
 		}
 	},
 	computed: {
@@ -47,7 +46,10 @@ export default {
 			return formatDate(d);
 		},
 	},
-	template:/*html*/`
+	template: `
+		<h3>
+			{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}
+		</h3>
 		<table class="table table-hover mb-4">
 				<tbody>
 					<tr>
@@ -107,7 +109,5 @@ export default {
 						<td>{{event.organisationseinheit}}</td>
 					</tr>
 				</tbody>
-		</table>
-	`
-}
-
+		</table>`,
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/modalTitle.js b/public/js/components/Cis/Mylv/modalTitle.js
new file mode 100644
index 000000000..4acb90248
--- /dev/null
+++ b/public/js/components/Cis/Mylv/modalTitle.js
@@ -0,0 +1,12 @@
+export default {
+	props:{
+		event: {
+			type: Object,
+			required: true,
+		}
+	},
+	template:`
+			<div v-if="event.titel">{{ event.titel + ' - ' + event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</div>
+			<div v-else>{{ event.lehrfach_bez + ' [' + event.ort_kurzbz+']'}}</div>
+`
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Stundenplan/EventTypes/lehreinheitEvent.js b/public/js/components/Cis/Stundenplan/EventTypes/calendarEvent.js
similarity index 100%
rename from public/js/components/Cis/Stundenplan/EventTypes/lehreinheitEvent.js
rename to public/js/components/Cis/Stundenplan/EventTypes/calendarEvent.js
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 76bd788cd..4ca8bdc13 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -1,9 +1,8 @@
 import FhcCalendar from "../../Calendar/Calendar.js";
 import CalendarDate from "../../../composables/CalendarDate.js";
 import LvModal from "../Mylv/LvModal.js";
-import LvInfo from "../Mylv/LvInfo.js"
 import LvMenu from "../Mylv/LvMenu.js"
-import lehreinheitEvent from "./EventTypes/lehreinheitEvent.js"
+import lehreinheitEvent from "./EventTypes/calendarEvent.js"
 
 import ApiStundenplan from '../../../api/factory/stundenplan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
@@ -26,7 +25,8 @@ const Stundenplan = {
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
 			studiensemester_ende: null,
-			uid: null
+			uid: null,
+			renderComponents: {}
 		}
 	},
 	props: {
@@ -49,6 +49,7 @@ const Stundenplan = {
 	},
 	inject:["renderers"],
 	watch: {
+		
 		weekFirstDay: {
 			handler: async function (newValue) {
 				let data = await this.fetchStudiensemesterDetails(newValue);
@@ -71,9 +72,10 @@ const Stundenplan = {
 		}
 	},
 	components: {
-		FhcCalendar, LvModal, LvMenu, LvInfo, lehreinheitEvent, 
+		FhcCalendar, LvModal, LvMenu, lehreinheitEvent, 
 	},
 	computed:{
+		
 		downloadLinks: function(){
 			if(!this.studiensemester_start || !this.studiensemester_ende || !this.uid )return;
 			let start = new Date(this.studiensemester_start);
@@ -107,18 +109,18 @@ const Stundenplan = {
 		},
 	},
 	methods:{
-		renderComponent(name){
-			switch(name){
-				case 'lehreinheitEvent': return lehreinheitEvent;
-				default: return !this.renderers? null : Vue.defineAsyncComponent(() => import(this.renderers[name]))
-			}
+		// component renderers fetches from different addons
+		modalTitleComponent(type){
+			return this.renderers[type].modalTitel;
 		},
-		renderComponentInfo(name) {
-			switch (name) {
-				case 'moodleEvent': return !this.renderers? null: Vue.defineAsyncComponent(() => import(this.renderers[name]));
-				default: return LvInfo;
-			}
+		modalContentComponent(type) {
+			return this.renderers[type].modalContent;
 		},
+		calendarEventComponent(type){
+			return this.renderers[type].calendarEvent;
+		},
+		
+
 		fetchStudiensemesterDetails: async function (date) {
 			return this.$api.call(ApiStundenplan.studiensemesterDateInterval(date));
 		},
@@ -249,6 +251,8 @@ const Stundenplan = {
 		},
 	},
 	created() {
+		
+
 		this.$api
 			.call(ApiAuthinfo.getAuthUID())
 			.then(res => res.data)
@@ -262,6 +266,7 @@ const Stundenplan = {
 		if(this.$refs.lvmodal) this.$refs.lvmodal.hide()	
 	},
 	template:/*html*/`
+	<template v-if="renderers">
 	<h2>
 		{{$p.t('lehre/stundenplan')}}
 		<span style="padding-left: 0.4em;" v-show="studiensemester_kurzbz">{{studiensemester_kurzbz}}</span>
@@ -269,10 +274,18 @@ const Stundenplan = {
 	</h2>
 	<hr>
 	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal" >
-		<template #info>
-			<component :is="renderComponentInfo(currentlySelectedEvent.type+'Event')" :event="currentlySelectedEvent" ></component>
+		<template #modalTitle>
+			<Suspense>
+				<component :is="modalTitleComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
+			</Suspense>
+			</template>
+		<template #modalContent>
+			<Suspense>
+				<component :is="modalContentComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
+			</Suspense>
 		</template>
 	</lv-modal>
+
 	<fhc-calendar
 		ref="calendar"
 		@selectedEvent="setSelectedEvent"
@@ -298,7 +311,7 @@ const Stundenplan = {
 		</template>
 		<template #monthPage="{event,day}">
 			<div @click="showModal(event)" class="p-1">
-				<component :event="event" :is="renderComponent(event.type+'Event')"></component>
+				<component :is="calendarEventComponent(event.type)" :event="event" ></component>
 			</div>
 		</template>
 		<template #weekPage="{event,day}">
@@ -306,13 +319,13 @@ const Stundenplan = {
 				class="weekPageContainer position-relative border border-secondary border d-flex flex-col align-items-center justify-content-evenly h-100"
 				:class="{'p-1':event.allDayEvent}"
 				style = "overflow: auto;" >
-				<component :event="event" :is="renderComponent(event.type+'Event')"></component>
+				<component :is="calendarEventComponent(event.type)" :event="event" ></component>
 			</div>
 		</template>
 		<template #dayPage="{event,day,mobile}">
 			<div @click="mobile? showModal(event):null" type="button" class="dayPageContainer fhc-entry border border-secondary border m-0 h-100  text-center">
 				<div class="h-100 d-flex flex-col justify-content-evenly align-items-center">
-					<component :is="renderComponent(event.type+'Event')" :event="event"></component>
+					<component :is="calendarEventComponent(event.type)" :event="event"></component>
 				</div>
 			</div>
 		</template>
@@ -329,7 +342,8 @@ const Stundenplan = {
 		<template #pageMobilContentEmpty >
 			<h3>{{ $p.t('lehre/noLvFound') }}</h3>
 		</template>
-	</fhc-calendar>`
+	</fhc-calendar>
+	</template>`
 }
 
 export default Stundenplan
\ No newline at end of file

From 02dd466cc396dbc18978c1d2b76f9d6062baff99 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 3 Jun 2025 09:44:03 +0200
Subject: [PATCH 200/572] use green and red as for marking the datepickers

---
 public/css/Fhc.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/css/Fhc.css b/public/css/Fhc.css
index b7110943d..06dc5096e 100644
--- a/public/css/Fhc.css
+++ b/public/css/Fhc.css
@@ -145,9 +145,9 @@
 }
 
 .fhc-bullet-red::before {
-  color: #ff001e;
+  color: green;
 }
 
 .fhc-bullet-green::before {
-  color: #00ff26;
+  color: red;
 }
\ No newline at end of file

From 7da8a9ed79cb00c02ec1ef207f2ae6fd3c64808f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 3 Jun 2025 10:39:22 +0200
Subject: [PATCH 201/572] refactor header as component, show uid under
 profilpicture

---
 .../components/DetailHeader/DetailHeader.js   | 100 ++++++++++++++++++
 .../Stv/Studentenverwaltung/Details.js        |  48 ++-------
 2 files changed, 108 insertions(+), 40 deletions(-)
 create mode 100644 public/js/components/DetailHeader/DetailHeader.js

diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
new file mode 100644
index 000000000..49cbfbad8
--- /dev/null
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -0,0 +1,100 @@
+export default {
+	name: 'DetailHeader',
+	props: {
+		headerData: {
+			type: Object,
+			required: true
+		},
+		typeHeader: {
+			type: String,
+			default: 'student',
+			validator(value) {
+				return [
+					'student',
+					'mitarbeiter',
+				].includes(value)
+			}
+		}
+	},
+	computed: {
+		appRoot() {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root;
+		},
+	},
+	data(){
+		return{};
+	},
+	methods: {
+		//TODO(Manu) finish for Vertragsverwaltung
+		getVorgesetzer(){},
+	},
+	template: `
+		<div class="core-header d-flex justify-content-start align-items-center w-100 pb-3 gap-3" style="max-height:8rem">
+
+			<div
+				v-for="person in headerData"
+				:key="person.person_id"
+				class="d-flex flex-column align-items-center h-100"
+			>
+				<img
+				  class="d-block h-100 rounded"
+				  :alt="'Profilbild ' + person.uid"
+				  :src="appRoot + 'cis/public/bild.php?src=person&person_id=' + person.person_id"
+				/>
+				<small>{{person.uid}}</small>
+			</div>
+
+			<div v-if="headerData.length == 1">
+				<h2 class="h4">
+					{{headerData[0].titelpre}}
+					{{headerData[0].vorname}}
+					{{headerData[0].nachname}}
+					{{headerData[0].titelpost}}
+				</h2>
+
+				<h5 v-if="typeHeader==='student'" class="h6">
+					<strong class="text-muted">Studiengang </strong>
+					 {{headerData[0].studiengang}}
+					<strong v-if="headerData[0].semester" class="text-muted"> | Semester </strong>
+					  {{headerData[0].semester}}
+					<strong v-if="headerData[0].verband" class="text-muted"> | Verband </strong>
+					{{headerData[0].verband}}
+					<strong v-if="headerData[0].gruppe" class="text-muted"> | Gruppe </strong>
+					{{headerData[0].gruppe}}
+				 </h5>
+				<h5 v-if="typeHeader==='mitarbeiter'" class="h6">
+				<strong class="text-muted">Team </strong>
+				 {{headerData[0].studiengang}}
+				<strong v-if="headerData[0].semester" class="text-muted"> | Vorgesetzte*r </strong>
+				  {{headerData[0].semester}}
+			  </h5>
+
+			  <h5 v-if="typeHeader==='student'" class="h6">
+				<strong class="text-muted">Email </strong>
+				<span>
+					<a :href="'mailto:'+headerData[0]?.mail_intern">{{headerData[0].mail_intern}}</a>
+				</span>
+				<strong class="text-muted"> | Status </strong>
+				 {{headerData[0].status}}
+				<strong class="text-muted"> | MatrNr </strong>
+				  {{headerData[0].matr_nr}}
+				<strong class="text-muted"> | UID </strong>
+				{{headerData[0].uid}}
+				<strong class="text-muted"> | Person ID </strong>
+				{{headerData[0].person_id}}
+			  </h5>
+			  <h5 v-if="typeHeader==='mitarbeiter'" class="h6">
+				<strong class="text-muted">Email </strong>
+				<span>
+					<a :href="'mailto:'+headerData[0]?.mail_intern">{{headerData[0].mail_intern}}</a>
+				</span>
+				<strong class="text-muted"> | Durchwahl </strong>
+				 {{headerData[0].status}}
+			  </h5>
+
+			</div>
+
+		</div>
+
+	`
+}
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index a56c59e7f..3cfcc2061 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -1,4 +1,5 @@
 import FhcTabs from "../../Tabs.js";
+import FhcHeader from "../../DetailHeader/DetailHeader.js";
 
 import ApiStvApp from '../../../api/factory/stv/app.js';
 
@@ -8,7 +9,8 @@ import ApiStvApp from '../../../api/factory/stv/app.js';
 export default {
 	name: "DetailsPrestudent",
 	components: {
-		FhcTabs
+		FhcTabs,
+		FhcHeader
 	},
 	data() {
 		return {
@@ -61,45 +63,11 @@ export default {
 			Bitte StudentIn auswählen!
 		</div>
 		<div v-else-if="configStudent && configStudents" class="d-flex flex-column h-100 pb-3">
-			<div class="d-flex justify-content-start align-items-center w-100 pb-3 gap-3" style="max-height:8rem">
-				<img v-for="student in students" :key="student.person_id" class="d-block h-100 rounded" alt="profilbild" :src="appRoot + 'cis/public/bild.php?src=person&person_id=' + student.person_id">
-	
-
-					
-				<div v-if="students.length == 1">
-					<h2 class="h4">
-						{{students[0].titelpre}}
-						{{students[0].vorname}}
-						{{students[0].nachname}}
-						{{students[0].titelpost}}
-					</h2>
-					<h5 class="h6">
-						<strong class="text-muted">Studiengang </strong>
-						 {{students[0].studiengang}}
-						<strong v-if="students[0].semester" class="text-muted"> | Semester </strong>
-						  {{students[0].semester}}
-						<strong v-if="students[0].verband" class="text-muted"> | Verband </strong>
-						{{students[0].verband}}
-						<strong v-if="students[0].gruppe" class="text-muted"> | Gruppe </strong>
-						{{students[0].gruppe}}
-					  </h5>
-					  <h5 class="h6">
-						<strong class="text-muted">Email </strong>
-						<span>
-							<a :href="'mailto:'+students[0]?.mail_intern">{{students[0].mail_intern}}</a>
-						</span>
-						<strong class="text-muted"> | Status </strong>
-						 {{students[0].status}}
-						<strong class="text-muted"> | MatrNr </strong>
-						  {{students[0].matr_nr}}
-						<strong class="text-muted"> | UID </strong>
-						{{students[0].uid}}
-						<strong class="text-muted"> | Person ID </strong>
-						{{students[0].person_id}}
-					  </h5>
-
-				</div>
-			</div>
+			<fhc-header
+				:headerData="students"
+				typeHeader="student"
+			>
+			</fhc-header>
 			<fhc-tabs
 				v-if="students.length == 1"
 				ref="tabs"

From e89233d6ac39f41de538b1b3d259725a48d6a764 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 4 Jun 2025 09:41:33 +0200
Subject: [PATCH 202/572] update(LvInfo): adds the file LvInfo again because it
 is used in a different component

---
 public/js/components/Cis/Mylv/LvInfo.js | 113 ++++++++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 public/js/components/Cis/Mylv/LvInfo.js

diff --git a/public/js/components/Cis/Mylv/LvInfo.js b/public/js/components/Cis/Mylv/LvInfo.js
new file mode 100644
index 000000000..145fc1c19
--- /dev/null
+++ b/public/js/components/Cis/Mylv/LvInfo.js
@@ -0,0 +1,113 @@
+import { numberPadding, formatDate } from "../../../helpers/DateHelpers.js"
+
+export default {
+	props: {
+		event: Object,
+	},
+	data() {
+		return {
+
+		}
+	},
+	computed: {
+		lektorenLinks: function () {
+			if (!this.event || !Array.isArray(this.event.lektor) || !this.event.lektor.length) return "a";
+
+			let lektorenLinks = {};
+			this.event.lektor.forEach((lektor) => {
+				lektorenLinks[lektor.kurzbz] = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/Cis/Profil/View/${lektor.mitarbeiter_uid}`;
+			})
+			return lektorenLinks;
+		},
+		getOrtContentLink: function () {
+			if (!this.event || !this.event.ort_content_id) return "a";
+
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/CisVue/Cms/content/${this.event.ort_content_id}`
+		},
+		start_time: function () {
+			if (!this.event.start) return 'N/A';
+			if (!this.event.start instanceof Date) {
+				return this.event.start;
+			}
+			return numberPadding(this.event.start.getHours()) + ":" + numberPadding(this.event.start.getMinutes());
+		},
+		end_time: function () {
+			if (!this.event.end) return 'N/A';
+			if (!this.event.end instanceof Date) {
+				return this.event.end;
+			}
+			return numberPadding(this.event.end.getHours()) + ":" + numberPadding(this.event.end.getMinutes());
+		}
+	},
+	methods: {
+		mehtodNumberPadding: function (number) {
+			return numberPadding(number);
+		},
+		methodFormatDate: function (d) {
+			return formatDate(d);
+		},
+	},
+	template:/*html*/`
+		<table class="table table-hover mb-4">
+				<tbody>
+					<tr>
+						<th>{{
+							$p.t('global','datum')?
+							$p.t('global','datum')+':'
+							:''
+						}}</th>
+						<td>{{methodFormatDate(event.datum)}}</td>
+					</tr>
+					<tr>
+						<th>{{
+							$p.t('global','raum')?
+							$p.t('global','raum')+':'
+							:''
+						}}</th>
+						<td>
+							<a v-if="event.ort_content_id" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+							{{event.ort_kurzbz}}
+						</td>
+					</tr>
+					<tr>
+						<th>{{
+							$p.t('lehre','lehrveranstaltung')?
+							$p.t('lehre','lehrveranstaltung')+':'
+							:''
+						}}</th>
+						<td>{{'('+event.lehrform+') ' + event.lehrfach_bez}}</td>
+					</tr>
+					<tr>
+						<th>{{
+							$p.t('lehre','lektor')?
+							$p.t('lehre','lektor')+':'
+							:''
+						}}</th>
+						<td>
+							<div v-for="lektor in event.lektor" class="d-block">
+								<a v-if="lektorenLinks[lektor.kurzbz]" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+								{{lektor.kurzbz}}
+							</div>
+						</td>
+					</tr>
+					<tr>
+						<th>{{
+								$p.t('ui','zeitraum')?
+								$p.t('ui','zeitraum')+':'
+								:''
+							}}</th>
+						<td>{{start_time + ' - ' + end_time}}</td>
+					</tr>
+					<tr>
+						<th>{{
+							$p.t('lehre','organisationseinheit')?
+							$p.t('lehre','organisationseinheit')+':'
+							:''
+						}}</th>
+						<td>{{event.organisationseinheit}}</td>
+					</tr>
+				</tbody>
+		</table>
+	`
+}
+

From 826dd5245069ff1d13f811de28dc85a6cc8ad40c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 4 Jun 2025 13:59:00 +0200
Subject: [PATCH 203/572] - show Profilpicture with lock symbol if foto_sperre
 - enable scrolling for multi view - show uid beneath profile picture - use
 phrases in detail header

---
 .../api/frontend/v1/stv/Students.php          |  5 ++-
 .../components/DetailHeader/DetailHeader.js   | 38 +++++++++++--------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 5fb7b592c..b2044a6d5 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -622,6 +622,8 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('ersatzkennzeichen');
 		$this->PrestudentModel->addSelect('gebdatum');
 		$this->PrestudentModel->addSelect('geschlecht');
+		$this->PrestudentModel->addSelect('foto');
+		$this->PrestudentModel->addSelect('foto_sperre');
 
 		// semester
 		// verband
@@ -629,6 +631,7 @@ class Students extends FHCAPI_Controller
 
 		$this->PrestudentModel->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');
 		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
+		$this->PrestudentModel->addSelect('stg.bezeichnung AS stg_bezeichnung');
 		$this->PrestudentModel->addSelect("s.matrikelnr");
 		$this->PrestudentModel->addSelect('p.person_id');
 		$this->PrestudentModel->addSelect('pls.status_kurzbz AS status');
@@ -640,7 +643,7 @@ class Students extends FHCAPI_Controller
 		);
 		$this->PrestudentModel->addSelect("
 			CASE WHEN b.uid IS NOT NULL AND b.uid<>'' 
-			THEN b.uid || " . $this->PrestudentModel->escape(DOMAIN) . " 
+			THEN CONCAT(b.uid, '@', " . $this->PrestudentModel->escape(DOMAIN) . ")
 			ELSE '' END AS mail_intern", false);
 		$this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen');
 		$this->PrestudentModel->addSelect('tbl_prestudent.anmerkung');
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 49cbfbad8..a50b39e8c 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -29,19 +29,27 @@ export default {
 		getVorgesetzer(){},
 	},
 	template: `
-		<div class="core-header d-flex justify-content-start align-items-center w-100 pb-3 gap-3" style="max-height:8rem">
+		<div class="core-header d-flex justify-content-start align-items-center w-100 overflow-auto pb-3 gap-3" style="max-height:9rem; min-width: 37.5rem;">
 
 			<div
 				v-for="person in headerData"
 				:key="person.person_id"
 				class="d-flex flex-column align-items-center h-100"
+				class="position-relative d-inline-block"
 			>
 				<img
 				  class="d-block h-100 rounded"
-				  :alt="'Profilbild ' + person.uid"
-				  :src="appRoot + 'cis/public/bild.php?src=person&person_id=' + person.person_id"
+				  alt="Profilbild"
+				  :src="'data:image/jpeg;base64,' + person.foto"
 				/>
-				<small>{{person.uid}}</small>
+
+				<template v-if="person.foto_sperre">
+					<i
+					  class=" fa fa-lock text-secondary bg-light rounded d-flex justify-content-center align-items-center position-absolute top-0 end-0"
+					  style="z-index: 1; font-size: 1rem; width: 1.25rem; height: 1.25rem;"
+					></i>
+				</template>
+			<small class="text-muted">{{person.uid}}</small>
 			</div>
 
 			<div v-if="headerData.length == 1">
@@ -53,17 +61,19 @@ export default {
 				</h2>
 
 				<h5 v-if="typeHeader==='student'" class="h6">
-					<strong class="text-muted">Studiengang </strong>
-					 {{headerData[0].studiengang}}
-					<strong v-if="headerData[0].semester" class="text-muted"> | Semester </strong>
+				 <strong class="text-muted">Person ID </strong>
+				{{headerData[0].person_id}}
+					<strong class="text-muted">| {{$p.t('lehre', 'studiengang')}} </strong>
+					 {{headerData[0].stg_bezeichnung}} ({{headerData[0].studiengang}})
+					<strong v-if="headerData[0].semester" class="text-muted"> | {{$p.t('lehre', 'semester')}} </strong>
 					  {{headerData[0].semester}}
-					<strong v-if="headerData[0].verband" class="text-muted"> | Verband </strong>
+					<strong v-if="headerData[0].verband" class="text-muted"> | {{$p.t('lehre', 'verband')}}</strong>
 					{{headerData[0].verband}}
-					<strong v-if="headerData[0].gruppe" class="text-muted"> | Gruppe </strong>
+					<strong v-if="headerData[0].gruppe" class="text-muted"> | {{$p.t('lehre', 'gruppe')}} </strong>
 					{{headerData[0].gruppe}}
 				 </h5>
 				<h5 v-if="typeHeader==='mitarbeiter'" class="h6">
-				<strong class="text-muted">Team </strong>
+				<strong class="text-muted">Team / {{$p.t('lehre', 'kompetenzfeld')}}</strong>
 				 {{headerData[0].studiengang}}
 				<strong v-if="headerData[0].semester" class="text-muted"> | Vorgesetzte*r </strong>
 				  {{headerData[0].semester}}
@@ -76,19 +86,15 @@ export default {
 				</span>
 				<strong class="text-muted"> | Status </strong>
 				 {{headerData[0].status}}
-				<strong class="text-muted"> | MatrNr </strong>
+				<strong class="text-muted"> | {{$p.t('person', 'matrikelnummer')}} </strong>
 				  {{headerData[0].matr_nr}}
-				<strong class="text-muted"> | UID </strong>
-				{{headerData[0].uid}}
-				<strong class="text-muted"> | Person ID </strong>
-				{{headerData[0].person_id}}
 			  </h5>
 			  <h5 v-if="typeHeader==='mitarbeiter'" class="h6">
 				<strong class="text-muted">Email </strong>
 				<span>
 					<a :href="'mailto:'+headerData[0]?.mail_intern">{{headerData[0].mail_intern}}</a>
 				</span>
-				<strong class="text-muted"> | Durchwahl </strong>
+				<strong class="text-muted"> | {{$p.t('kvp', 'op.label.phone')}} </strong>
 				 {{headerData[0].status}}
 			  </h5>
 

From 68b6402981b42b8348866635783454a438ea6766 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 5 Jun 2025 11:28:37 +0200
Subject: [PATCH 204/572] fix height of calender exceeding viewport height

---
 public/css/components/calendar.css    | 4 ++++
 public/js/components/Calendar/Pane.js | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 733fd2bdc..580e0becf 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -20,6 +20,10 @@
 	--calendar-past: var(--fhc-beige-20);
 }
 
+.fhc-calendar-pane {
+	height: var(--calendar-pane-height);
+}
+
 .fhc-calendar-hour-indicator{
 	border-top: 1px solid var(--calendar-border);
 }
diff --git a/public/js/components/Calendar/Pane.js b/public/js/components/Calendar/Pane.js
index abcf03744..6bc00752b 100644
--- a/public/js/components/Calendar/Pane.js
+++ b/public/js/components/Calendar/Pane.js
@@ -85,8 +85,8 @@ export default {
 	},
 	template: `
 	<div ref="carousel" class="calendar-pane carousel slide" @[\`slide.bs.carousel\`]="slide" @[\`slid.bs.carousel\`]="slid" :data-queue="queue">
-		<div id="calendarContainer" @wheel.prevent="scrollBehavior" @scroll="scrollCalendar" ref="calendarContainer" class="carousel-inner " style="height:var(--fhc-calendar-pane-height);">
-			<div ref="carouselItems" v-for="i in [...Array(3).keys()]" :key="i" class="carousel-item" style="height:var(--fhc-calendar-pane-height);">
+		<div id="calendarContainer" @wheel.prevent="scrollBehavior" @scroll="scrollCalendar" ref="calendarContainer" class="carousel-inner fhc-calendar-pane">
+			<div ref="carouselItems" v-for="i in [...Array(3).keys()]" :key="i" class="carousel-item fhc-calendar-pane">
 				<slot :active="i == activeCarouselItemIndex" :index="i" :offset="offsets[i]" />
 			</div>
 		</div>

From 2821339c0a32307ecfb7ba785cf0675cc332352a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 5 Jun 2025 11:42:21 +0200
Subject: [PATCH 205/572] refactor(Dashboard dragging): removes dragging flag
 from the draggable state

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

diff --git a/public/js/components/Drop/Grid/Item.js b/public/js/components/Drop/Grid/Item.js
index 37bce4acf..bd256a1fb 100644
--- a/public/js/components/Drop/Grid/Item.js
+++ b/public/js/components/Drop/Grid/Item.js
@@ -82,7 +82,7 @@ export default {
 		@drag="$emit('dragging',$event)"
 		@touchmove="touchMove"
 		@dragend="$emit('endDrag', $event); dragging = false"
-		:draggable="active && !item.placeholder && dragging">
+		:draggable="active && !item.placeholder">
 		<slot v-bind="item"></slot>
 	</div>`
 }

From 970e950894e72b627e427b888fc52c261852f81a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 5 Jun 2025 17:06:55 +0200
Subject: [PATCH 206/572] tune layout of new message modal, fix pagination of
 message table

---
 application/models/system/Message_model.php         |  2 +-
 public/css/Studentenverwaltung.css                  | 12 ++++++++++++
 public/js/components/Bootstrap/Modal.js             | 13 +++++++++++--
 .../components/Messages/Details/NewMessage/Modal.js |  9 ++++++---
 .../js/components/Messages/Details/TableMessages.js | 13 +++++--------
 5 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/application/models/system/Message_model.php b/application/models/system/Message_model.php
index acbe3a44c..e0a185f9b 100644
--- a/application/models/system/Message_model.php
+++ b/application/models/system/Message_model.php
@@ -292,7 +292,7 @@ class Message_model extends DB_Model
 		if (isError($count))
 			return $count;
 
-		$count = floor(current(getData($count))->count/$limit);
+		$count = ceil(current(getData($count))->count/$limit);
 		$sql = "
 			SELECT * FROM (
 				" . $sql_base . "
diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index 4c359030c..d39cfc9b1 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -145,4 +145,16 @@ html {
 }
 .override_filtercmpt_actions_style div.d-flex.align-items-baseline {
 	align-items: end !important;
+}
+
+.stv-details-details-foto img {
+	max-width: 150px;
+}
+
+.msg_preview {
+	margin-bottom: -1px;
+}
+
+.tiny-90 div.tox.tox-tinymce {
+	height: 90% !important;
 }
\ No newline at end of file
diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
index 2b3223ff7..af81e469f 100644
--- a/public/js/components/Bootstrap/Modal.js
+++ b/public/js/components/Bootstrap/Modal.js
@@ -23,9 +23,17 @@ export default {
 		},
 		noCloseBtn: Boolean,
 		dialogClass: [String,Array,Object],
+		headerClass: {
+			type: [String,Array,Object],
+			default: ''
+		},
 		bodyClass: {
 			type: [String,Array,Object],
 			default: 'px-4 py-5'
+		},
+		footerClass: {
+			type: [String,Array,Object],
+			default: ''
 		}
 	},
 	emits: [
@@ -117,15 +125,16 @@ export default {
 	template: `<div ref="modal" class="bootstrap-modal modal" tabindex="-1" @[\`hide.bs.modal\`]="$emit('hideBsModal')" @[\`hidden.bs.modal\`]="$emit('hiddenBsModal')" @[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal')" @[\`show.bs.modal\`]="$emit('showBsModal')" >
 		<div class="modal-dialog" :class="dialogClass">
 			<div class="modal-content">
-				<div v-if="$slots.title" class="modal-header">
+				<div v-if="$slots.title" class="modal-header" :class="headerClass">
 					<h5 class="modal-title"><slot name="title"/></h5>
 					<slot name="popoutButton"></slot>
 					<button v-if="!noCloseBtn" type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+					<slot name="modal-header-content"></slot>
 				</div>
 				<div class="modal-body" :class="bodyClass">
 					<slot></slot>
 				</div>
-				<div v-if="$slots.footer" class="modal-footer">
+				<div v-if="$slots.footer" class="modal-footer" :class="footerClass">
 					<slot name="footer"/>
 				</div>
 			</div>
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index ab56f4a38..3503cbeb9 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -342,6 +342,7 @@ export default {
 			class="messages-detail-newmessage-modal"
 			ref="modalNewMessage" 
 			dialog-class=" modal-dialog-scrollable modal-xl modal-msg"
+			header-class="flex-wrap pb-0"
 			body-class="px-3 py-2"
 			@hidden.bs.modal="resetForm"
 			>
@@ -350,7 +351,8 @@ export default {
 				{{ $p.t('messages', 'neueNachricht') }}
 			</template>
 
-			<ul class="nav nav-tabs" id="msg_preview" role="tablist">
+			<template #modal-header-content>
+			<ul class="nav nav-tabs w-100 mt-3 msg_preview" id="msg_preview" role="tablist">
 				<li class="nav-item" role="presentation">
 					<button class="nav-link active" id="msg-tab" data-bs-toggle="tab" data-bs-target="#msg" type="button" role="tab" aria-controls="msg" aria-selected="true">Nachricht</button>
 				</li>
@@ -358,6 +360,7 @@ export default {
 					<button class="nav-link" id="preview-tab" data-bs-toggle="tab" data-bs-target="#preview" type="button" role="tab" aria-controls="preview" aria-selected="false">Vorschau</button>
 				</li>
 			</ul>
+			</template>
 
 			<form-form ref="formNewMassage">
 
@@ -366,7 +369,7 @@ export default {
 
 				<div class="row">
 					<div class="col-sm-8">
-						<form-form class="row g-3 mt-2" ref="formMessage">
+						<form-form class="row g-3 mt-2 h-100" ref="formMessage">
 
 							<div class="row mb-3">
 
@@ -391,7 +394,7 @@ export default {
 							</div>
 
 							<!--Tiny MCE-->
-							<div class="row mb-3">
+							<div class="row mb-3 h-100 tiny-90">
 								<form-input
 									ref="editor"
 									:label="$p.t('global','nachricht')  + ' *'"
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index ac3d616ec..878cdbfbb 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -207,12 +207,14 @@ export default {
 							this.previewBody = body;
 					}
 				},
+/*
 				{
 					event: 'pageLoaded',
 					handler: (pageno) => {
 						this.pageNo = pageno+1;
 					}
 				}
+*/
 			],
 			previewBody: "",
 			open: false,
@@ -288,16 +290,11 @@ export default {
 			// to avoid endless loop
 			if (iteration > messages.length) break;
 			}
-		return {data: messageNested, last_page};
+		return {data: messageNested, last_page: last_page};
 		},
-		loadAjaxCall(params){
+		loadAjaxCall(url, config, params){
 			return this.$api.call(
-				ApiMessages.getMessages({
-					id: this.id,
-					type: this.typeId,
-					size: this.tabulatorOptions.paginationSize,
-					page: this.pageNo
-				})
+				ApiMessages.getMessages(params)
 			);
 		}
 	},

From 6d7f8522f3d94e7edf448cfa44fd77231d4b2dc5 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 6 Jun 2025 09:57:59 +0200
Subject: [PATCH 207/572] refactor(Moodle Events DependencyInjection): resolves
 lazy loading bug

---
 public/js/apps/Dashboard/Fhc.js               |  8 ++--
 .../components/Cis/Stundenplan/Stundenplan.js | 41 +++++++++++++------
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 830bd2ec3..720bcd0b3 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -293,16 +293,16 @@ const app = Vue.createApp({
 			.then(data => {
 				for (let rendertype of Object.keys(data)) {
 					
-					let modalTitel = Vue.defineAsyncComponent(() => import(data[rendertype].modalTitel));
-					let modalContent = Vue.defineAsyncComponent(() => import(data[rendertype].modalContent));
-					let calendarEvent = Vue.defineAsyncComponent(() => import(data[rendertype].calendarEvent));
+					let modalTitle = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].modalTitle)));
+					let modalContent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].modalContent)));
+					let calendarEvent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].calendarEvent)));
 					if(this.renderers === null) {
 						this.renderers = {};
 					}
 					if (!this.renderers[rendertype]) {
 						this.renderers[rendertype] = {}
 					}
-					this.renderers[rendertype].modalTitel = modalTitel;
+					this.renderers[rendertype].modalTitle = modalTitle;
 					this.renderers[rendertype].modalContent = modalContent;
 					this.renderers[rendertype].calendarEvent = calendarEvent;
 				}
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/Stundenplan/Stundenplan.js
index 4ca8bdc13..700d8b463 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/Stundenplan/Stundenplan.js
@@ -26,7 +26,9 @@ const Stundenplan = {
 			studiensemester_start: null,
 			studiensemester_ende: null,
 			uid: null,
-			renderComponents: {}
+			renderComponents: {},
+			isModalContentResolved: false,
+			isModalTitleResolved: false,
 		}
 	},
 	props: {
@@ -109,9 +111,25 @@ const Stundenplan = {
 		},
 	},
 	methods:{
+		modalTitleResolved: function () {
+			this.isModalTitleResolved = true;
+			if(this.isModalContentResolved && this.isModalTitleResolved)
+				Vue.nextTick(() => {
+					if(this.$refs.lvmodal) 
+						this.$refs.lvmodal.show();
+				});
+		},
+		modalContentResolved: function () {
+			this.isModalContentResolved = true;
+			if (this.isModalContentResolved && this.isModalTitleResolved)
+				Vue.nextTick(() => {
+					if (this.$refs.lvmodal)
+						this.$refs.lvmodal.show();
+				});
+		},
 		// component renderers fetches from different addons
 		modalTitleComponent(type){
-			return this.renderers[type].modalTitel;
+			return this.renderers[type].modalTitle;
 		},
 		modalContentComponent(type) {
 			return this.renderers[type].modalContent;
@@ -186,9 +204,8 @@ const Stundenplan = {
 		},
 		showModal: function(event){
 			this.currentlySelectedEvent = event;
-			Vue.nextTick(() => {
-				this.$refs.lvmodal.show();
-			});
+			this.isModalTitleResolved = false;
+			this.isModalContentResolved = false;
 		},
 		updateRange: function ({start,end, mounted}) {
 			let checkDate = (date) => {
@@ -275,14 +292,14 @@ const Stundenplan = {
 	<hr>
 	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal" >
 		<template #modalTitle>
-			<Suspense>
-				<component :is="modalTitleComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
-			</Suspense>
-			</template>
+		<Suspense @resolve="modalTitleResolved">
+			<component :is="modalTitleComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
+		</Suspense>
+		</template>
 		<template #modalContent>
-			<Suspense>
-				<component :is="modalContentComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
-			</Suspense>
+		<Suspense @resolve="modalContentResolved">
+			<component :is="modalContentComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
+		</Suspense>
 		</template>
 	</lv-modal>
 

From 9faccfa32804cd879b677c2aa4ca491ef8cb3dfa Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 6 Jun 2025 11:27:17 +0200
Subject: [PATCH 208/572] update(Url Dashboard widget): makes edit buttons
 always available

---
 public/js/components/DashboardWidget/Url.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 0190b1479..1fcf01874 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -161,7 +161,7 @@ export default {
 	template: /*html*/ `
     <div class="widgets-url w-100 h-100 overflow-scroll" style="padding: 1rem 1rem;">
         <div class="d-flex flex-column justify-content-between">
-        	<button v-if="editModeIsActive" class="btn btn-outline-secondary btn-sm w-100 mt-2" @click="openCreateModal" type="button">{{$p.t('bookmark','newLink')}}</button>
+        	<button class="btn btn-outline-secondary btn-sm w-100 mt-2" @click="openCreateModal" type="button">{{$p.t('bookmark','newLink')}}</button>
 
             <template v-if="shared">
 
@@ -173,11 +173,11 @@ export default {
 
 						<div class="ms-auto">
 							<!--EDIT BOOKMARK-->
-							<a href="#" @click.prevent="openEditModal(link)" v-show="configMode || editModeIsActive">
+							<a href="#" @click.prevent="openEditModal(link)" >
 								<i class="fa fa-edit me-1"></i>
 							</a>
 							<!--DELETE BOOKMARK-->
-							<a id="deleteBookmark" href="#" @click.prevent="removeLink(link.bookmark_id)" v-show="configMode || editModeIsActive">
+							<a id="deleteBookmark" href="#" @click.prevent="removeLink(link.bookmark_id)">
 								<i class="fa fa-regular fa-trash-can"></i>
 							</a>
 						</div>
@@ -198,7 +198,7 @@ export default {
         </div>
     </div>
 	<!--EDIT MODAL-->
-	<core-form draggable="true" @dragstart="stopDrag" @drag="stopDrag" @dragend="stopDrag" v-if="editModeIsActive " ref="editForm">
+	<core-form draggable="true" @dragstart="stopDrag" @drag="stopDrag" @dragend="stopDrag" ref="editForm">
 		<bs-modal @[\`hide.bs.modal\`]="bookmark_id=null; clearInputs();" ref="editModal">
 			<template #title>
 				<h2>{{$p.t('bookmark','editLink')}}</h2>
@@ -216,7 +216,7 @@ export default {
 	</core-form>
 
 	<!--CREATE MODAL-->
-	<core-form draggable="true" @dragstart="stopDrag" @drag="stopDrag" @dragend="stopDrag" v-if="editModeIsActive " ref="createForm">
+	<core-form draggable="true" @dragstart="stopDrag" @drag="stopDrag" @dragend="stopDrag"  ref="createForm">
 		<bs-modal @[\`hide.bs.modal\`]="clearInputs();" ref="createModal">
 			<template #title>
 				<h2>{{$p.t('bookmark','newLink')}}</h2>

From a786dec9c1a73ae703df2b30ee541422f07e7de4 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 10 Jun 2025 10:23:28 +0200
Subject: [PATCH 209/572] fix(Dashboard grid):emit dragged item on resize and
 adjust z-index for overlay and dragged item

---
 public/css/components/dashboard.css | 15 +++++++--------
 public/js/components/Drop/Grid.js   |  3 ++-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index b4c82254f..beb5b649c 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -38,13 +38,6 @@
 	cursor:pointer;
 }
 
-.draggedItem {
-	height: 100%;
-	width: 100%;
-	background-color:white;
-	position:relative;
-}
-
 .dashboard-section > .newGridRow{
 	position:absolute;
 	width:20px;
@@ -128,6 +121,13 @@
 	cursor: move;
 }
 
+.draggedItem {
+	height: 100%;
+	width: 100%;
+	background-color: white;
+	position: relative;
+}
+
 .dashboard-item-overlay::before{
 	position:absolute;
 	content:"";
@@ -137,7 +137,6 @@
 	bottom:0;
 	background-color:rgba(0, 100, 156);
 	border:4px dashed lightgray;
-	z-index: 2;
 	opacity: 0.5;
 }
 
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 1ecdd29ae..00ffe7c52 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -425,6 +425,7 @@ export default {
 				return;
 			this.mode = MODE_RESIZE;
 			this.draggedItem = item;
+			this.$emit('draggedItem', item);
 			this._dragStart(evt);
 		},
 		dragOver(evt) {
@@ -627,7 +628,7 @@ export default {
 				class="position-absolute"
 				:active="active"
 				:style="{
-					zIndex: item.resizeOverlay ? -5 : 'auto',
+					zIndex: item.resizeOverlay ? 1 : 2,
 					top: 'calc(' + item.y + ' * var(--fhc-dg-row-height))',
 					left: 'calc(' + item.x + ' * var(--fhc-dg-col-width))',
 					width: 'calc(' + item.w + ' * var(--fhc-dg-col-width))',

From c080d1abb24b6af2143859577c4b87409754f48a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 10 Jun 2025 11:46:19 +0200
Subject: [PATCH 210/572] refactor(Rename Stundenplan to LvPlan):renames all
 methods and files from Stundenplan to LvPlan

---
 application/config/routes.php                 |  2 +-
 .../Cis/{Stundenplan.php => LvPlan.php}       |  4 +-
 .../v1/{Stundenplan.php => LvPlan.php}        | 42 ++++++-------
 .../controllers/api/frontend/v1/Studium.php   | 10 +--
 .../ressource/{Stundenplan.php => LvPlan.php} | 24 +++----
 .../{Stundenplandev.php => LvPlandev.php}     | 24 +++----
 .../Cis/{Stundenplan.php => LvPlan.php}       |  8 +--
 application/controllers/jobs/LVPlanJob.php    |  8 +--
 .../{StundenplanLib.php => LvPlanLib.php}     | 62 +++++++++----------
 .../models/ressource/Reservierung_model.php   |  6 +-
 .../models/ressource/Stundenplan_model.php    | 20 +++---
 .../models/ressource/Stundenplandev_model.php |  4 +-
 .../api/factory/{stundenplan.js => lvPlan.js} | 22 +++----
 public/js/api/fhcapifactory.js                |  4 +-
 public/js/api/{stundenplan.js => lvPlan.js}   | 18 +++---
 public/js/api/studium.js                      |  4 +-
 public/js/apps/Dashboard/Fhc.js               | 26 ++++----
 public/js/components/Calendar/Calendar.js     |  2 +-
 public/js/components/Calendar/Day/Page.js     |  4 +-
 .../Stundenplan.js => LvPlan/LvPlan.js}       | 26 ++++----
 public/js/components/Cis/Mylv/LvMenu.js       |  4 +-
 public/js/components/Cis/Mylv/LvModal.js      |  4 +-
 public/js/components/Cis/Mylv/LvUebersicht.js | 12 ++--
 .../js/components/Cis/Mylv/RoomInformation.js |  4 +-
 public/js/components/Cis/Studium/Studium.js   |  2 +-
 .../{Stundenplan.js => LvPlan.js}             | 10 +--
 26 files changed, 178 insertions(+), 178 deletions(-)
 rename application/controllers/Cis/{Stundenplan.php => LvPlan.php} (85%)
 rename application/controllers/api/frontend/v1/{Stundenplan.php => LvPlan.php} (82%)
 rename application/controllers/api/v1/ressource/{Stundenplan.php => LvPlan.php} (59%)
 rename application/controllers/api/v1/ressource/{Stundenplandev.php => LvPlandev.php} (58%)
 rename application/controllers/components/Cis/{Stundenplan.php => LvPlan.php} (80%)
 rename application/libraries/{StundenplanLib.php => LvPlanLib.php} (90%)
 rename public/js/api/factory/{stundenplan.js => lvPlan.js} (70%)
 rename public/js/api/{stundenplan.js => lvPlan.js} (55%)
 rename public/js/components/Cis/{Stundenplan/Stundenplan.js => LvPlan/LvPlan.js} (94%)
 rename public/js/components/DashboardWidget/{Stundenplan.js => LvPlan.js} (95%)

diff --git a/application/config/routes.php b/application/config/routes.php
index eb4c267ce..798d29ad0 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -61,7 +61,7 @@ $route['api/v1/organisation/[O|o]rganisationseinheit/(:any)'] = 'api/v1/organisa
 $route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/betriebsmittelperson2/$1';
 $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 
-$route['Cis/Stundenplan/.*'] = 'Cis/Stundenplan/index/$1';
+$route['Cis/LvPlan/.*'] = 'Cis/LvPlan/index/$1';
 
 // load routes from extensions
 $subdir = 'application/config/extensions';
diff --git a/application/controllers/Cis/Stundenplan.php b/application/controllers/Cis/LvPlan.php
similarity index 85%
rename from application/controllers/Cis/Stundenplan.php
rename to application/controllers/Cis/LvPlan.php
index 71e01be8b..ea48f09f0 100644
--- a/application/controllers/Cis/Stundenplan.php
+++ b/application/controllers/Cis/LvPlan.php
@@ -5,7 +5,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  *
  */
-class Stundenplan extends Auth_Controller
+class LvPlan extends Auth_Controller
 {
 	/**
 	 * Constructor
@@ -30,6 +30,6 @@ class Stundenplan extends Auth_Controller
 			'uid'=>getAuthUID(),
 		);
 		
-		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Stundenplan']);
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'LvPlan']);
 	}
 }
diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/LvPlan.php
similarity index 82%
rename from application/controllers/api/frontend/v1/Stundenplan.php
rename to application/controllers/api/frontend/v1/LvPlan.php
index 11a8a7034..55b59db37 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -20,7 +20,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 use CI3_Events as Events;
 
-class Stundenplan extends FHCAPI_Controller
+class LvPlan extends FHCAPI_Controller
 {
 
 	/**
@@ -33,10 +33,10 @@ class Stundenplan extends FHCAPI_Controller
 			'getRoomplan' => self::PERM_LOGGED,
             'Stunden' => self::PERM_LOGGED,
             'Reservierungen' => self::PERM_LOGGED,
-			'StundenplanEvents' => self::PERM_LOGGED,
+			'LvPlanEvents' => self::PERM_LOGGED,
 			'getLehreinheitStudiensemester' => self::PERM_LOGGED,
 			'studiensemesterDateInterval' => self::PERM_LOGGED,
-			'getLvStundenplanForStudiensemester' => self::PERM_LOGGED,
+			'getLvPlanForStudiensemester' => self::PERM_LOGGED,
 		]);
 
         $this->load->library('LogLib');
@@ -51,7 +51,7 @@ class Stundenplan extends FHCAPI_Controller
         $this->load->library('form_validation');
 
 		//load models
-		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		$this->load->model('ressource/Stundenplan_model', 'LvPlanModel');
 		$this->load->model('ressource/Reservierung_model', 'ReservierungModel');
 
 
@@ -61,12 +61,12 @@ class Stundenplan extends FHCAPI_Controller
 	// Public methods
 
 	 /**
-     * fetches Stundenplan and Moodle events together
+     * fetches LvPlan and Moodle events together
      * @access public
      *
      */
-	public function StundenplanEvents(){
-		$this->load->library('StundenplanLib');
+	public function LvPlanEvents(){
+		$this->load->library('LvPlanLib');
 
 		// form validation
 		$this->load->library('form_validation');
@@ -81,10 +81,10 @@ class Stundenplan extends FHCAPI_Controller
 		$end_date = $this->input->get('end_date', TRUE);
 		$lv_id = $this->input->get('lv_id', TRUE);
 
-		$stundenplan_events = $this->stundenplanlib->getStundenplan($start_date,$end_date,$lv_id);
-		if( is_null($stundenplan_events) || isEmptyArray($stundenplan_events) )
+		$lvplan_events = $this->lvplanlib->getLvPlan($start_date,$end_date,$lv_id);
+		if( is_null($lvplan_events) || isEmptyArray($lvplan_events) )
 		{
-			$stundenplan_events = array();
+			$lvplan_events = array();
 		}
 		// fetching moodle events
 		$moodle_events = [];
@@ -101,7 +101,7 @@ class Stundenplan extends FHCAPI_Controller
 			]
 		);
 		
-		$result = array_merge($stundenplan_events,$moodle_events);
+		$result = array_merge($lvplan_events,$moodle_events);
 		// sort array with moodle events first
 		usort($result, function($a, $b){
 			if ($a->type === 'moodle' && $b->type !== 'moodle') {
@@ -123,16 +123,16 @@ class Stundenplan extends FHCAPI_Controller
 		$this->terminateWithSuccess($studiensemester);
 	}
 
-	public function getLvStundenplanForStudiensemester($studiensemester,$lvid){
-		$this->load->library('StundenplanLib');
+	public function getLvPlanForStudiensemester($studiensemester,$lvid){
+		$this->load->library('LvPlanLib');
 		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
 		
 		$studiensemester_result = $this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz"=>$studiensemester]);
 		$studiensemester_result = current($this->getDataOrTerminateWithError($studiensemester_result));
 		$timespan_start = new DateTime($studiensemester_result->start);
 		$timespan_ende = new DateTime($studiensemester_result->ende);
-		$stundenplan = $this->stundenplanlib->getStundenplan(date_format($timespan_start, 'Y-m-d'),date_format($timespan_ende, 'Y-m-d'), $lvid);
-		$this->terminateWithSuccess($stundenplan);
+		$lvplan = $this->lvplanlib->getLvPlan(date_format($timespan_start, 'Y-m-d'),date_format($timespan_ende, 'Y-m-d'), $lvid);
+		$this->terminateWithSuccess($lvplan);
 		
 	}
 		
@@ -160,7 +160,7 @@ class Stundenplan extends FHCAPI_Controller
      */
 	public function getRoomplan()
 	{
-		$this->load->library('StundenplanLib');
+		$this->load->library('LvPlanLib');
         // form validation
         $this->load->library('form_validation');
         $this->form_validation->set_data($_GET);
@@ -174,19 +174,19 @@ class Stundenplan extends FHCAPI_Controller
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
-		$roomplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date));
+		$roomplan_data = $this->LvPlan->lvPlanGruppierung($this->LvPlan->getRoomQuery($ort_kurzbz, $start_date, $end_date));
 
         $roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
-		$this->stundenplanlib->expand_object_information($roomplan_data);
+		$this->lvplanlib->expand_object_information($roomplan_data);
 
 		$this->terminateWithSuccess($roomplan_data);
 
 	}
 	
-	// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the stundenplan of a student
+	// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the lvplan of a student
     public function Reservierungen($ort_kurzbz = null)
 	{
-		$this->load->library('StundenplanLib');
+		$this->load->library('LvPlanLib');
 		//form validation
 		$this->load->library('form_validation');
 		$this->form_validation->set_data($_GET);
@@ -200,7 +200,7 @@ class Stundenplan extends FHCAPI_Controller
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
-		$result = $this->stundenplanlib->getReservierungen($start_date,$end_date,$ort_kurzbz);
+		$result = $this->lvplanlib->getReservierungen($start_date,$end_date,$ort_kurzbz);
 		$result = $this->getDataOrTerminateWithError($result);	
 		$this->terminateWithSuccess($result);
 	}
diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index b0be3cf41..116217a84 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -39,7 +39,7 @@ class Studium extends FHCAPI_Controller
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 		$this->load->model('organisation/Studienordnung_model','StudienordnungModel');
 		$this->load->model('organisation/Studiensemester_model',"StudiensemesterModel");
-		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+		$this->load->model('organisation/Studienplan_model', 'LvPlanModel');
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 		$this->load->model('codex/Orgform_model','OrgformModel');
@@ -143,8 +143,8 @@ class Studium extends FHCAPI_Controller
 		if(!$aktuelles_studienplan){
 			$aktuelles_studienplan = null;
 		}
-		if(isset($parameter_studienplan) && !empty(array_filter( $semester_studienplan, function($stundenplan) use($parameter_studienplan){
-			return $stundenplan->studienplan_id == $parameter_studienplan->studienplan_id;
+		if(isset($parameter_studienplan) && !empty(array_filter( $semester_studienplan, function($lvplan) use($parameter_studienplan){
+			return $lvplan->studienplan_id == $parameter_studienplan->studienplan_id;
 		}))){
 			$aktuelles_studienplan = $parameter_studienplan ;
 		}
@@ -309,8 +309,8 @@ SELECT tbl_lehrveranstaltung.*,
 	}
 
 	private function computeLektorenFromLehrveranstaltung($lehreinheit_id, $semester, $studiengang, $studiensemester){
-		$this->load->library('StundenplanLib');
-		$lektoren = $this->stundenplanlib->getLektorenFromLehrveranstaltung($lehreinheit_id,$semester, $studiengang,$studiensemester);
+		$this->load->library('LvPlanLib');
+		$lektoren = $this->lvplanlib->getLektorenFromLehrveranstaltung($lehreinheit_id,$semester, $studiengang,$studiensemester);
 		if(!$lektoren){
 			return [];
 		}
diff --git a/application/controllers/api/v1/ressource/Stundenplan.php b/application/controllers/api/v1/ressource/LvPlan.php
similarity index 59%
rename from application/controllers/api/v1/ressource/Stundenplan.php
rename to application/controllers/api/v1/ressource/LvPlan.php
index 9a6614f21..06672c90b 100644
--- a/application/controllers/api/v1/ressource/Stundenplan.php
+++ b/application/controllers/api/v1/ressource/LvPlan.php
@@ -14,16 +14,16 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Stundenplan extends API_Controller
+class LvPlan extends API_Controller
 {
 	/**
-	 * Stundenplan API constructor.
+	 * LvPlan API constructor.
 	 */
 	public function __construct()
 	{
 		parent::__construct(array('Stundenplan' => 'basis/stundenplan:rw'));
-		// Load model StundenplanModel
-		$this->load->model('ressource/stundenplan_model', 'StundenplanModel');
+		// Load model LvPlanModel
+		$this->load->model('ressource/stundenplan_model', 'LvPlanModel');
 
 
 	}
@@ -31,13 +31,13 @@ class Stundenplan extends API_Controller
 	/**
 	 * @return void
 	 */
-	public function getStundenplan()
+	public function getLvPlan()
 	{
-		$stundenplanID = $this->get('stundenplan_id');
+		$lvPlanID = $this->get('stundenplan_id');
 
-		if (isset($stundenplanID))
+		if (isset($lvPlanID))
 		{
-			$result = $this->StundenplanModel->load($stundenplanID);
+			$result = $this->LvPlanModel->load($lvPlanID);
 
 			$this->response($result, REST_Controller::HTTP_OK);
 		}
@@ -50,17 +50,17 @@ class Stundenplan extends API_Controller
 	/**
 	 * @return void
 	 */
-	public function postStundenplan()
+	public function postLvPlan()
 	{
 		if ($this->_validate($this->post()))
 		{
 			if (isset($this->post()['stundenplan_id']))
 			{
-				$result = $this->StundenplanModel->update($this->post()['stundenplan_id'], $this->post());
+				$result = $this->LvPlanModel->update($this->post()['stundenplan_id'], $this->post());
 			}
 			else
 			{
-				$result = $this->StundenplanModel->insert($this->post());
+				$result = $this->LvPlanModel->insert($this->post());
 			}
 
 			$this->response($result, REST_Controller::HTTP_OK);
@@ -71,7 +71,7 @@ class Stundenplan extends API_Controller
 		}
 	}
 
-	private function _validate($stundenplan = NULL)
+	private function _validate($lvplan = NULL)
 	{
 		return true;
 	}
diff --git a/application/controllers/api/v1/ressource/Stundenplandev.php b/application/controllers/api/v1/ressource/LvPlandev.php
similarity index 58%
rename from application/controllers/api/v1/ressource/Stundenplandev.php
rename to application/controllers/api/v1/ressource/LvPlandev.php
index fa6e788c3..625e6038d 100644
--- a/application/controllers/api/v1/ressource/Stundenplandev.php
+++ b/application/controllers/api/v1/ressource/LvPlandev.php
@@ -14,16 +14,16 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Stundenplandev extends API_Controller
+class LvPlandev extends API_Controller
 {
 	/**
-	 * Stundenplandev API constructor.
+	 * LvPlandev API constructor.
 	 */
 	public function __construct()
 	{
 		parent::__construct(array('Stundenplandev' => 'basis/stundenplandev:rw'));
-		// Load model StundenplandevModel
-		$this->load->model('ressource/stundenplandev_model', 'StundenplandevModel');
+		// Load model LvPlandevModel
+		$this->load->model('ressource/stundenplandev_model', 'LvPlandevModel');
 
 
 	}
@@ -31,13 +31,13 @@ class Stundenplandev extends API_Controller
 	/**
 	 * @return void
 	 */
-	public function getStundenplandev()
+	public function getLvPlandev()
 	{
-		$stundenplandevID = $this->get('stundenplandev_id');
+		$lvplandevID = $this->get('stundenplandev_id');
 
-		if (isset($stundenplandevID))
+		if (isset($lvplandevID))
 		{
-			$result = $this->StundenplandevModel->load($stundenplandevID);
+			$result = $this->LvPlandevModel->load($lvplandevID);
 
 			$this->response($result, REST_Controller::HTTP_OK);
 		}
@@ -50,17 +50,17 @@ class Stundenplandev extends API_Controller
 	/**
 	 * @return void
 	 */
-	public function postStundenplandev()
+	public function postLvPlandev()
 	{
 		if ($this->_validate($this->post()))
 		{
 			if (isset($this->post()['stundenplandev_id']))
 			{
-				$result = $this->StundenplandevModel->update($this->post()['stundenplandev_id'], $this->post());
+				$result = $this->LvPlandevModel->update($this->post()['stundenplandev_id'], $this->post());
 			}
 			else
 			{
-				$result = $this->StundenplandevModel->insert($this->post());
+				$result = $this->LvPlandevModel->insert($this->post());
 			}
 
 			$this->response($result, REST_Controller::HTTP_OK);
@@ -71,7 +71,7 @@ class Stundenplandev extends API_Controller
 		}
 	}
 
-	private function _validate($stundenplandev = NULL)
+	private function _validate($lvplandev = NULL)
 	{
 		return true;
 	}
diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/LvPlan.php
similarity index 80%
rename from application/controllers/components/Cis/Stundenplan.php
rename to application/controllers/components/Cis/LvPlan.php
index a9f35c651..083cde03e 100644
--- a/application/controllers/components/Cis/Stundenplan.php
+++ b/application/controllers/components/Cis/LvPlan.php
@@ -5,7 +5,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * 
  */
-class Stundenplan extends Auth_Controller
+class LvPlan extends Auth_Controller
 {
 
 	/**
@@ -27,14 +27,14 @@ class Stundenplan extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		$this->load->model('ressource/Stundenplan_model', 'LvPlanModel');
 
-		/* $result = $this->StundenplanModel->loadForUid(getAuthUID());
+		/* $result = $this->LvPlanModel->loadForUid(getAuthUID());
 
 		if (isError($result))
 			return $this->outputJsonError(getError($result));
  		*/
-		$res = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(getAuthUID())); 
+		$res = $this->LvPlanModel->lvPlanGruppierung($this->LvPlanModel->getLvPlanQuery(getAuthUID())); 
 		
 		$res = getData($res);
 		
diff --git a/application/controllers/jobs/LVPlanJob.php b/application/controllers/jobs/LVPlanJob.php
index c3fe5495a..14ed473fb 100644
--- a/application/controllers/jobs/LVPlanJob.php
+++ b/application/controllers/jobs/LVPlanJob.php
@@ -39,7 +39,7 @@ class LVPlanJob extends JOB_Controller
 		$studiensemester_arr = array();
 
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->load->model('ressource/Stundenplandev_model', 'StundenplandevModel');
+		$this->load->model('ressource/Stundenplandev_model', 'LvPlandevModel');
 		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
 		$this->load->model('education/Lehreinheitgruppe_model', 'LehreinheitgruppeModel');
 
@@ -70,7 +70,7 @@ class LVPlanJob extends JOB_Controller
 			$fail = 0;
 
 			// get all schedule entries where group is missing
-			$result = $this->StundenplandevModel->getMissingDirectGroups($studiensemester);
+			$result = $this->LvPlandevModel->getMissingDirectGroups($studiensemester);
 			if(hasData($result))
 			{
 				foreach($result->retval as $row)
@@ -112,7 +112,7 @@ class LVPlanJob extends JOB_Controller
 					}
 
 					// add group to schedule
-					$result = $this->StundenplandevModel->insert(
+					$result = $this->LvPlandevModel->insert(
 						array(
 							'lehreinheit_id' => $row->lehreinheit_id,
 							'unr' => $unr,
@@ -159,7 +159,7 @@ class LVPlanJob extends JOB_Controller
     public function mailUpdatedZeitwuensche()
     {
         // Load models
-        $this->load->model('ressource/Stundenplandev_model', 'StundenplandevModel');
+        $this->load->model('ressource/Stundenplandev_model', 'LvPlandevModel');
         $this->load->model('organisation/Studiensemester_model', 'StundiensemesterModel');
         $this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
         $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/LvPlanLib.php
similarity index 90%
rename from application/libraries/StundenplanLib.php
rename to application/libraries/LvPlanLib.php
index b64fd226e..709762ddc 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/LvPlanLib.php
@@ -3,17 +3,17 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-class StundenplanLib{
+class LvPlanLib{
 
 	private $_ci; // Code igniter instance
 	
 
 	/**
-	 * fetches stundenplan events from a UID and start/end date
+	 * fetches LvPlan events from a UID and start/end date
 	 * @access public
 	 *
 	 */
-	public function getStundenplan($start_date, $end_date, $lv_id = null){
+	public function getLvPlan($start_date, $end_date, $lv_id = null){
 		
 		$this->_ci =& get_instance();
 
@@ -21,7 +21,7 @@ class StundenplanLib{
 		$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
 		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$this->_ci->load->model('person/Benutzergruppe_model','BenutzergruppeModel');
-		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		$this->_ci->load->model('ressource/Stundenplan_model', 'LvPlanModel');
 		
 
 		$student_uid = getAuthUID();
@@ -42,20 +42,20 @@ class StundenplanLib{
 			return $function_error;
 		}
 		
-		if($lv_id) { // fetch Stundenplan for lva, irrelevant of who is requesting it (for now)
+		if($lv_id) { // fetch LvPlan for lva, irrelevant of who is requesting it (for now)
 
-			$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanLVA($start_date, $end_date, $lv_id);
-			if(isError($stundenplan_data))
+			$lvplan_data = $this->_ci->LvPlanModel->getLvPlanLVA($start_date, $end_date, $lv_id);
+			if(isError($lvplan_data))
 			{
-				return error(getData($stundenplan_data));
+				return error(getData($lvplan_data));
 			}
-			$stundenplan_data = getData($stundenplan_data) ?? [];
-			$function_error = $this->expand_object_information($stundenplan_data);
+			$lvplan_data = getData($lvplan_data) ?? [];
+			$function_error = $this->expand_object_information($lvplan_data);
 			if(!is_null($function_error)){
 				return $function_error;
 			}
 
-			// query lv itself in case its Stundenplan is being queried and it has no entries
+			// query lv itself in case its LvPlan is being queried and it has no entries
 			$this->_ci->load->model('education/Lehrveranstaltung_model','LehrveranstaltungModel');
 			$lv_result = $this->_ci->LehrveranstaltungModel->load($lv_id);
 			if(isError($lv_result))
@@ -63,7 +63,7 @@ class StundenplanLib{
 				return error(getData($lv_result));
 			}
 			$lv = getData($lv_result)[0];
-			return $stundenplan_data;
+			return $lvplan_data;
 			
 		}
 		
@@ -71,17 +71,17 @@ class StundenplanLib{
 		if($is_mitarbeiter)
 		{
 			
-			$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanMitarbeiter($start_date, $end_date, $student_uid);
-			if(isError($stundenplan_data))
+			$lvplan_data = $this->_ci->LvPlanModel->getLvPlanMitarbeiter($start_date, $end_date, $student_uid);
+			if(isError($lvplan_data))
 			{
-				return error(getData($stundenplan_data));
+				return error(getData($lvplan_data));
 			}
-			$stundenplan_data = getData($stundenplan_data) ?? [];
-			$function_error = $this->expand_object_information($stundenplan_data);
+			$lvplan_data = getData($lvplan_data) ?? [];
+			$function_error = $this->expand_object_information($lvplan_data);
 			if(!is_null($function_error)){
 				return $function_error;
 			}
-			return $stundenplan_data;
+			return $lvplan_data;
 		} else {
 			// getting the gruppen_kurzbz of the student in the different studiensemester
 			$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($semester_range);
@@ -99,26 +99,26 @@ class StundenplanLib{
 			}
 			$student_lehrverband = getData($student_lehrverband);
 			
-			$stundenplan_query = $this->_ci->StundenplanModel->getStundenplanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
-			if(!$stundenplan_query)
+			$lvplan_query = $this->_ci->LvPlanModel->getLvPlanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
+			if(!$lvplan_query)
 			{
 				return [];
 			}
 			
 			
-			$stundenplan_data = $this->_ci->StundenplanModel->stundenplanGruppierung($stundenplan_query);
-			if(isError($stundenplan_data))
+			$lvplan_data = $this->_ci->LvPlanModel->lvPlanGruppierung($lvplan_query);
+			if(isError($lvplan_data))
 			{
-				return error(getData($stundenplan_data));
+				return error(getData($lvplan_data));
 			}
-			$stundenplan_data = getData($stundenplan_data) ?? [];
+			$lvplan_data = getData($lvplan_data) ?? [];
 
-			$function_error = $this->expand_object_information($stundenplan_data);
+			$function_error = $this->expand_object_information($lvplan_data);
 			if(!is_null($function_error)){
 				return $function_error;
 			}
 			
-			return success($stundenplan_data);
+			return success($lvplan_data);
 		}
 		
 	}
@@ -147,7 +147,7 @@ class StundenplanLib{
 
 	public function getLektorenFromLehrveranstaltung($lehrveranstaltung_id, $semester, $studiengang_kz, $studiensemester_kurzbz){
 		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		$this->_ci->load->model('ressource/Stundenplan_model', 'LvPlanModel');
 		$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
 		
 		$studiensemester = $this->_ci->StudiensemesterModel->loadWhere(["studiensemester_kurzbz"=>$studiensemester_kurzbz]);
@@ -156,7 +156,7 @@ class StundenplanLib{
 			return error(getData($studiensemester));
 		}
 		$studiensemester = current(getData($studiensemester));
-		$lektoren = $this->_ci->StundenplanModel->execReadOnlyQuery("
+		$lektoren = $this->_ci->LvPlanModel->execReadOnlyQuery("
 		SELECT DISTINCT uid 
 		FROM campus.vw_stundenplan
 		WHERE lehrveranstaltung_id = ? AND
@@ -190,8 +190,8 @@ class StundenplanLib{
 			// load lektor object
 			foreach ($item->lektor as $lv_lektor)
 			{
-				$this->_ci->StundenplanModel->addLimit(1);
-				$lektor_object = $this->_ci->StundenplanModel->execReadOnlyQuery("
+				$this->_ci->LvPlanModel->addLimit(1);
+				$lektor_object = $this->_ci->LvPlanModel->execReadOnlyQuery("
 				SELECT mitarbeiter_uid, vorname, nachname, kurzbz
 				FROM public.tbl_mitarbeiter
 				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
@@ -233,7 +233,7 @@ class StundenplanLib{
 			
 			if($item->ort_kurzbz) {
 
-				$ort_content_object = $this->_ci->StundenplanModel->execReadOnlyQuery("
+				$ort_content_object = $this->_ci->LvPlanModel->execReadOnlyQuery("
 				SELECT content_id
 				FROM public.tbl_ort
 				WHERE ort_kurzbz = ?", [$item->ort_kurzbz]);
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index f635d0cb1..789ff3d9c 100644
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -21,7 +21,7 @@ class Reservierung_model extends DB_Model
 	public function getReservierungen($start_date, $end_date, $ort_kurzbz = null)
 	{
 		
-		$stundenplan_reservierungen_query="SELECT r.* , stund.beginn, stund.ende,
+		$lvplan_reservierungen_query="SELECT r.* , stund.beginn, stund.ende,
 			CASE
 				WHEN r.gruppe_kurzbz IS NOT NULL THEN r.gruppe_kurzbz 
 				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(r.semester AS varchar),'/'),COALESCE(CAST(r.verband AS varchar),'/')) 
@@ -46,7 +46,7 @@ class Reservierung_model extends DB_Model
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
 			WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ?";
 
-		$subquery = is_null($ort_kurzbz)? $stundenplan_reservierungen_query:$raum_reservierungen_query;
+		$subquery = is_null($ort_kurzbz)? $lvplan_reservierungen_query:$raum_reservierungen_query;
 		
 		$query_result= $this->execReadOnlyQuery("
 		SELECT 
@@ -89,7 +89,7 @@ class Reservierung_model extends DB_Model
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
 			WHERE res.uid = ? AND datum >= ? AND datum <= ?";
 
-//		$subquery = is_null($ort_kurzbz)? $stundenplan_reservierungen_query:$raum_reservierungen_query;
+//		$subquery = is_null($ort_kurzbz)? $lvplan_reservierungen_query:$raum_reservierungen_query;
 		$subquery = $raum_reservierungen_query;
 
 		
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 012ce0a57..92a42a1df 100644
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -33,12 +33,12 @@ class Stundenplan_model extends DB_Model
 		*/
 
 
-		$raum_stundenplan= $this->execReadOnlyQuery("
+		$raum_lvplan= $this->execReadOnlyQuery("
 		SELECT CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, CONCAT(lehrfach,'-',lehrform) AS lv_info, * FROM lehre.vw_stundenplan sp
 		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ?
 		", [$ort_kurzbz, $start_date, $end_date]);
 
-		return $raum_stundenplan;
+		return $raum_lvplan;
 	}
 
 	/**
@@ -136,11 +136,11 @@ class Stundenplan_model extends DB_Model
 
 	/**
 	 * groups rows of a subquery that fetches data from the lehre.vw_stundenplan table
-	 * @param string $stundenplanViewQuery the subquery used to group the result
+	 * @param string $lvplanViewQuery the subquery used to group the result
 	 *
 	 * @return stdClass
 	 */
-	public function stundenplanGruppierung($stundenplanViewQuery)
+	public function lvPlanGruppierung($lvplanViewQuery)
 	{
 		$query_result = $this->execReadOnlyQuery("
 		SELECT
@@ -173,7 +173,7 @@ class Stundenplan_model extends DB_Model
 			)) as organisationseinheit,
 			ort_kurzbz, studiengang_kz, titel,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit,gruppe, verband, semester,stg_kurzbz
 
-			FROM (".$stundenplanViewQuery.") sp
+			FROM (".$lvplanViewQuery.") sp
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
 
 		) as subquery
@@ -187,11 +187,11 @@ class Stundenplan_model extends DB_Model
 	}
 
 	/**
-	 * queries Stundenplan but for a whole lva, irrespective of who is requesting it
+	 * queries LvPlan but for a whole lva, irrespective of who is requesting it
 	 * 
 	 * @return void
 	 */
-	public function getStundenplanLVA($start_date, $end_date, $lv_id) {
+	public function getLvPlanLVA($start_date, $end_date, $lv_id) {
 		return $this->execReadOnlyQuery("
 	
 		SELECT
@@ -242,11 +242,11 @@ class Stundenplan_model extends DB_Model
 	}
 
 	/**
-	 * queries Stundenplan and filters by assigned ma_kurzbz, very similar to get by LVA
+	 * queries LvPlan and filters by assigned ma_kurzbz, very similar to get by LVA
 	 *
 	 * @return void
 	 */
-	public function getStundenplanMitarbeiter($start_date, $end_date, $ma_uid) {
+	public function getLvPlanMitarbeiter($start_date, $end_date, $ma_uid) {
 		return $this->execReadOnlyQuery("
 	
 		SELECT
@@ -302,7 +302,7 @@ class Stundenplan_model extends DB_Model
 	 *
 	 * @return mixed
 	 */
-	public function getStundenplanQuery($start_date, $end_date,$semester,$gruppen,$studentlehrverbaende){
+	public function getLvPlanQuery($start_date, $end_date,$semester,$gruppen,$studentlehrverbaende){
 		
 		// helper function to check if either $gruppen or $studentlehrverbaende are empty for each semester
 		$emptyCheck = function($toBeCheckedArray) use ($semester){
diff --git a/application/models/ressource/Stundenplandev_model.php b/application/models/ressource/Stundenplandev_model.php
index 800540d60..1a74c6aa8 100644
--- a/application/models/ressource/Stundenplandev_model.php
+++ b/application/models/ressource/Stundenplandev_model.php
@@ -65,7 +65,7 @@ class Stundenplandev_model extends DB_Model
 	}
 
     /**
-     * Get Stundenplan data.
+     * Get LvPlan data.
      *
      * @param null $lehrveranstaltung_id
      * @param null $studiensemester_kurzbz
@@ -75,7 +75,7 @@ class Stundenplandev_model extends DB_Model
      * @param false $nurBevorstehende If true, only future data is retrieved.
      * @return array|false|stdClass|null
      */
-    public function getStundenplanData($lehrveranstaltung_id=null, $studiensemester_kurzbz=null, $lehreinheit_id=null, $mitarbeiter_uid=null, $student_uid=null, $nurBevorstehende = false)
+    public function getLvPlanData($lehrveranstaltung_id=null, $studiensemester_kurzbz=null, $lehreinheit_id=null, $mitarbeiter_uid=null, $student_uid=null, $nurBevorstehende = false)
     {
         $params = array();
 
diff --git a/public/js/api/factory/stundenplan.js b/public/js/api/factory/lvPlan.js
similarity index 70%
rename from public/js/api/factory/stundenplan.js
rename to public/js/api/factory/lvPlan.js
index c22071955..d8cad1c01 100644
--- a/public/js/api/factory/stundenplan.js
+++ b/public/js/api/factory/lvPlan.js
@@ -19,14 +19,14 @@ export default {
 	getRoomInfo(ort_kurzbz, start_date, end_date) {
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/Stundenplan/getRoomplan',
+			url: '/api/frontend/v1/LvPlan/getRoomplan',
 			params: { ort_kurzbz, start_date, end_date }
 		};
 	},
-	getStundenplan(start_date, end_date, lv_id) {
+	getLvPlan(start_date, end_date, lv_id) {
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/Stundenplan/getStundenplan',
+			url: '/api/frontend/v1/LvPlan/getLvPlan',
 			params: { start_date, end_date, lv_id }
 		};
 	},
@@ -34,39 +34,39 @@ export default {
 		// TODO(chris): seems to be called from nowhere?
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/Stundenplan/Stunden'
+			url: '/api/frontend/v1/LvPlan/Stunden'
 		};
 	},
 	getOrtReservierungen(ort_kurzbz, start_date, end_date) {
 		return {
 			method: 'get',
-			url: `/api/frontend/v1/Stundenplan/Reservierungen/${ort_kurzbz}`,
+			url: `/api/frontend/v1/LvPlan/Reservierungen/${ort_kurzbz}`,
 			params: { start_date, end_date }
 		};
 	},
-	getStundenplanReservierungen(start_date, end_date) {
+	getLvPlanReservierungen(start_date, end_date) {
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/Stundenplan/Reservierungen',
+			url: '/api/frontend/v1/LvPlan/Reservierungen',
 			params: { start_date, end_date }
 		};
 	},
 	getLehreinheitStudiensemester(lehreinheit_id) {
 		return {
 			method: 'get',
-			url: `/api/frontend/v1/Stundenplan/getLehreinheitStudiensemester/${lehreinheit_id}`
+			url: `/api/frontend/v1/LvPlan/getLehreinheitStudiensemester/${lehreinheit_id}`
 		};
 	},
 	studiensemesterDateInterval(date) {
 		return {
 			method: 'get',
-			url: `/api/frontend/v1/Stundenplan/studiensemesterDateInterval/${date}`
+			url: `/api/frontend/v1/LvPlan/studiensemesterDateInterval/${date}`
 		};
 	},
-	StundenplanEvents(start_date, end_date, lv_id) {
+	LvPlanEvents(start_date, end_date, lv_id) {
 		return {
 			method: 'get',
-			url: '/api/frontend/v1/Stundenplan/StundenplanEvents',
+			url: '/api/frontend/v1/LvPlan/LvPlanEvents',
 			params: { 
 				start_date: start_date, 
 				end_date: end_date, 
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index 0b7b6631c..1b34cd258 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -22,7 +22,7 @@ import filter from "./filter.js";
 import studstatus from "./studstatus.js";
 import profil from "./profil.js";
 import profilUpdate from "./profilUpdate.js";
-import stundenplan from "./stundenplan.js";
+import lvPlan from "./lvPlan.js";
 import bookmark from "./bookmark.js";
 import stv from "./stv.js";
 import notiz from "./notiz.js";
@@ -48,7 +48,7 @@ export default {
     studstatus,
     profil,
     profilUpdate,
-    stundenplan,
+    lvPlan,
     bookmark,
     stv,
     notiz,
diff --git a/public/js/api/stundenplan.js b/public/js/api/lvPlan.js
similarity index 55%
rename from public/js/api/stundenplan.js
rename to public/js/api/lvPlan.js
index 9b831b77e..a1d34b37c 100644
--- a/public/js/api/stundenplan.js
+++ b/public/js/api/lvPlan.js
@@ -2,43 +2,43 @@
 export default {
 	getRoomInfo(ort_kurzbz, start_date, end_date) {
 		return this.$fhcApi.get(
-			'/api/frontend/v1/Stundenplan/getRoomplan',
+			'/api/frontend/v1/LvPlan/getRoomplan',
 			{  ort_kurzbz, start_date, end_date}
 		);
 	},
 	getStunden() {
 		return this.$fhcApi.get(
-			'/api/frontend/v1/Stundenplan/Stunden',
+			'/api/frontend/v1/LvPlan/Stunden',
 			{}
 		);
 	},
 	getOrtReservierungen(ort_kurzbz, start_date, end_date) {
 		return this.$fhcApi.get(
-			`/api/frontend/v1/Stundenplan/Reservierungen/${ort_kurzbz}`,
+			`/api/frontend/v1/LvPlan/Reservierungen/${ort_kurzbz}`,
 			{ start_date, end_date}
 		);
 	},
-	getStundenplanReservierungen(start_date, end_date) {
+	getLvPlanReservierungen(start_date, end_date) {
 		return this.$fhcApi.get(
-			'/api/frontend/v1/Stundenplan/Reservierungen',
+			'/api/frontend/v1/LvPlan/Reservierungen',
 			{ start_date, end_date }
 		);
 	},
 	getLehreinheitStudiensemester(lehreinheit_id) {
 		return this.$fhcApi.get(
-			`/api/frontend/v1/Stundenplan/getLehreinheitStudiensemester/${lehreinheit_id}`,
+			`/api/frontend/v1/LvPlan/getLehreinheitStudiensemester/${lehreinheit_id}`,
 			{}
 		);
 	},
 	studiensemesterDateInterval(date) {
 		return this.$fhcApi.get(
-			`/api/frontend/v1/Stundenplan/studiensemesterDateInterval/${date}`,
+			`/api/frontend/v1/LvPlan/studiensemesterDateInterval/${date}`,
 			{}
 		);
 	},
-	StundenplanEvents(start_date, end_date, lv_id) {
+	LvPlanEvents(start_date, end_date, lv_id) {
 		return this.$fhcApi.get(
-			'/api/frontend/v1/Stundenplan/StundenplanEvents',
+			'/api/frontend/v1/LvPlan/LvPlanEvents',
 			{ start_date, end_date, lv_id }
 		);
 	},
diff --git a/public/js/api/studium.js b/public/js/api/studium.js
index 92bb58698..f15ffdcf3 100644
--- a/public/js/api/studium.js
+++ b/public/js/api/studium.js
@@ -29,9 +29,9 @@ export default {
 			}
 		);
 	},
-	getLvStundenplanForStudiensemester: function (studiensemester, lvid) {
+	getLvPlanForStudiensemester: function (studiensemester, lvid) {
 		return this.$fhcApi.get(
-			`/api/frontend/v1/Stundenplan/getLvStundenplanForStudiensemester/${studiensemester}/${lvid}`,
+			`/api/frontend/v1/LvPlan/getLvPlanForStudiensemester/${studiensemester}/${lvid}`,
 			{
 			}
 		);
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index a7c88874e..ebed7cdf4 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -3,7 +3,7 @@ import PluginsPhrasen from '../../plugins/Phrasen.js';
 import Theme from '../../plugin/Theme.js';
 import contrast from '../../directives/contrast.js';
 import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers.js";
-import Stundenplan, {DEFAULT_MODE_STUNDENPLAN} from "../../components/Cis/Stundenplan/Stundenplan.js";
+import LvPlan, {DEFAULT_MODE_LVPLAN} from "../../components/Cis/LvPlan/LvPlan.js";
 import MylvStudent from "../../components/Cis/Mylv/Student.js";
 import Profil from "../../components/Cis/Profil/Profil.js";
 import Raumsuche from "../../components/Cis/Raumsuche/Raumsuche.js";
@@ -148,13 +148,13 @@ const router = VueRouter.createRouter({
 		},
 		// Redirect old links to new format
 		{
-			// only trigger on first param being numeric to avoid paths like "Stundenplan/Month" entering here
-			path: "/Cis/Stundenplan/:lv_id(\\d+)", 
-			name: "StundenplanOld",
-			component: Stundenplan,
+			// only trigger on first param being numeric to avoid paths like "LvPlan/Month" entering here
+			path: "/Cis/LvPlan/:lv_id(\\d+)", 
+			name: "LvPlanOld",
+			component: LvPlan,
 			redirect: (to) => {
-				return { // redirect to longer Stundenplan url and map params
-					name: "Stundenplan",
+				return { // redirect to longer LvPlan url and map params
+					name: "LvPlan",
 					params: {
 						lv_id: to.params.lv_id
 					},
@@ -162,9 +162,9 @@ const router = VueRouter.createRouter({
 			},
 		},
 		{
-			path: `/Cis/Stundenplan/:mode?/:focus_date?/:lv_id?`,
-			name: 'Stundenplan',
-			component: Stundenplan,
+			path: `/Cis/LvPlan/:mode?/:focus_date?/:lv_id?`,
+			name: 'LvPlan',
+			component: LvPlan,
 			props: (route) => { // validate and set mode/focus date if for some reason missing
 				const validModes = ["Month", "Week", "Day"];
 
@@ -172,7 +172,7 @@ const router = VueRouter.createRouter({
 				const mode = route.params.mode &&
 					validModes.includes(route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase())
 						? route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase()
-						: DEFAULT_MODE_STUNDENPLAN;
+						: DEFAULT_MODE_LVPLAN;
 
 				// default to today date if not provided or string forms invalid date
 				const d = new Date(route.params.focus_date)
@@ -191,9 +191,9 @@ const router = VueRouter.createRouter({
 				//  missing mode or focus_date -> set defaults
 				if (!to.params.mode || !to.params.focus_date) {
 					next({
-						name: "Stundenplan",
+						name: "LvPlan",
 						params: {
-							mode: to.params.mode || DEFAULT_MODE_STUNDENPLAN,
+							mode: to.params.mode || DEFAULT_MODE_LVPLAN,
 							focus_date: to.params.focus_date || new Date().toISOString().split("T")[0],
 							lv_id: to.params.lv_id
 						}
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 5c2dc8bb0..0f53d5c04 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -78,7 +78,7 @@ export default {
 			if (newValue?.scrollTime == oldValue?.scrollTime && newValue?.focusDate.d==oldValue?.focusDate.d) {
 				return;
 			}
-			// scroll the Stundenplan to the closest event
+			// scroll the LvPlan to the closest event
 			let previousScrollAnchor = document.getElementById('scroll' + (newValue.scrollTime - 1) + this.focusDate.d + this.focusDate.w)
 			let scrollAnchor = document.getElementById('scroll' + newValue.scrollTime + this.focusDate.d + this.focusDate.w);
 			if (previousScrollAnchor) {
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 0e730a1ec..ef2c6ada7 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -1,7 +1,7 @@
 import CalendarDate from '../../../composables/CalendarDate.js';
 import LvModal from "../../../components/Cis/Mylv/LvModal.js";
 
-import ApiStundenplan from '../../../api/factory/stundenplan.js';
+import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAddons from '../../../api/factory/addons.js';
 
 function ggt(m, n) {
@@ -279,7 +279,7 @@ export default {
 		fetchLvMenu(event) {
 			if (event && event.type == 'lehreinheit') {
 				this.$api
-					.call(ApiStundenplan.getLehreinheitStudiensemester(event.lehreinheit_id[0]))
+					.call(ApiLvPlan.getLehreinheitStudiensemester(event.lehreinheit_id[0]))
 					.then(res => res.data)
 					.then(studiensemester_kurzbz => this.$api.call(
 						ApiAddons.getLvMenu(
diff --git a/public/js/components/Cis/Stundenplan/Stundenplan.js b/public/js/components/Cis/LvPlan/LvPlan.js
similarity index 94%
rename from public/js/components/Cis/Stundenplan/Stundenplan.js
rename to public/js/components/Cis/LvPlan/LvPlan.js
index efb8c06ea..871c2e10f 100644
--- a/public/js/components/Cis/Stundenplan/Stundenplan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -5,17 +5,17 @@ import LvInfo from "../Mylv/LvInfo.js"
 import LvMenu from "../Mylv/LvMenu.js"
 import moodleSvg from "../../../helpers/moodleSVG.js"
 
-import ApiStundenplan from '../../../api/factory/stundenplan.js';
+import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
-export const DEFAULT_MODE_STUNDENPLAN = 'Week'
+export const DEFAULT_MODE_LVPLAN = 'Week'
 
-const Stundenplan = {
-	name: 'Stundenplan',
+const LvPlan = {
+	name: 'LvPlan',
 	data() {
 		return {
 			events: null,
-			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_STUNDENPLAN,
+			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_LVPLAN,
 			calendarDate: new CalendarDate(new Date()),
 			eventCalendarDate: new CalendarDate(new Date()),
 			currentlySelectedEvent: null,
@@ -57,7 +57,7 @@ const Stundenplan = {
 			},
 			immediate: true,
 		},
-		// forward/backward on history entries happening in stundenplan
+		// forward/backward on history entries happening in lvplan
 		'propsViewData.lv_id'(newVal) {
 			// relevant if lv_id can be changed from within this component
 		},
@@ -106,7 +106,7 @@ const Stundenplan = {
 	},
 	methods:{
 		fetchStudiensemesterDetails: async function (date) {
-			return this.$api.call(ApiStundenplan.studiensemesterDateInterval(date));
+			return this.$api.call(ApiLvPlan.studiensemesterDateInterval(date));
 		},
 		convertTime: function([hour,minute]){
 			let date = new Date();
@@ -126,7 +126,7 @@ const Stundenplan = {
 			const capitalizedMode = this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1);
 
 			this.$router.push({
-				name: "Stundenplan",
+				name: "LvPlan",
 				params: {
 					mode: capitalizedMode,
 					focus_date: date,
@@ -148,7 +148,7 @@ const Stundenplan = {
 				String(this.currentDay.getDate()).padStart(2, "0");
 
 			this.$router.push({
-				name: "Stundenplan",
+				name: "LvPlan",
 				params: {
 					mode: this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1),
 					focus_date: date,
@@ -166,7 +166,7 @@ const Stundenplan = {
 			if (m == 'Weeks' || m == 'Years' || m == 'Months') return;
 			
 			this.$router.push({
-				name: "Stundenplan",
+				name: "LvPlan",
 				params: {
 					mode: m,
 					focus_date: date,
@@ -208,8 +208,8 @@ const Stundenplan = {
 		},
 		loadEvents: function(){
 			Promise.allSettled([
-				this.$api.call(ApiStundenplan.StundenplanEvents(this.monthFirstDay, this.monthLastDay, this.propsViewData.lv_id)),
-				this.$api.call(ApiStundenplan.getStundenplanReservierungen(this.monthFirstDay, this.monthLastDay))
+				this.$api.call(ApiLvPlan.LvPlanEvents(this.monthFirstDay, this.monthLastDay, this.propsViewData.lv_id)),
+				this.$api.call(ApiLvPlan.getLvPlanReservierungen(this.monthFirstDay, this.monthLastDay))
 			]).then((result) => {
 				let promise_events = [];
 				result.forEach((promise_result) => {
@@ -365,4 +365,4 @@ const Stundenplan = {
 	</fhc-calendar>`
 }
 
-export default Stundenplan
\ No newline at end of file
+export default LvPlan;
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index e7a96f6d8..5f25bff5d 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -7,7 +7,7 @@ export default {
 		},
 		containerStyles: Array,
 		rowStyles: Array,
-		hasLvStundenplanEintraege: {
+		hasLvPlanEintraege: {
 			required:false,
 			default:true,
 			type:Boolean,
@@ -23,7 +23,7 @@ export default {
 			if (!this.c4_link(menuItem) && !menuItem.c4_moodle_links?.length) {
 				return true;
 			}
-			if (menuItem.id == "addon_fhtw_menu_lvplan_lva" && !this.hasLvStundenplanEintraege){
+			if (menuItem.id == "addon_fhtw_menu_lvplan_lva" && !this.hasLvPlanEintraege){
 				return true;
 			}
 			return null;
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index 435caa97c..17244bc3d 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -3,7 +3,7 @@ import Alert from "../../Bootstrap/Alert.js";
 import LvMenu from "./LvMenu.js"
 import LvInfo from "./LvInfo.js"
 
-import ApiStundenplan from '../../../api/factory/stundenplan.js';
+import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAddons from '../../../api/factory/addons.js';
 
 export default {
@@ -51,7 +51,7 @@ export default {
 
 			if (this.event.type == 'lehreinheit') {
 				this.$api
-					.call(ApiStundenplan.getLehreinheitStudiensemester(Array.isArray(this.event.lehreinheit_id) ? this.event.lehreinheit_id[0] : this.event.lehreinheit_id))
+					.call(ApiLvPlan.getLehreinheitStudiensemester(Array.isArray(this.event.lehreinheit_id) ? this.event.lehreinheit_id[0] : this.event.lehreinheit_id))
 					.then(res => res.data)
 					.then(studiensemester_kurzbz => this.$api.call(
 						ApiAddons.getLvMenu(
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index e5162730c..1ec93590f 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -33,7 +33,7 @@ export default  {
             result: false,
             menu: [],
 			isMenuSelected:false,
-			hasLvStundenplanEintraege: true,
+			hasLvPlanEintraege: true,
 			lvEvaluierungMessage: "",
         }
     },
@@ -70,15 +70,15 @@ export default  {
 					})
 			}
 
-			// check if the lv has stundenplan entries for this studiensemester
+			// check if the lv has lvplan entries for this studiensemester
 			if (this.studiensemester && this.event) {
-				return this.$fhcApi.factory.studium.getLvStundenplanForStudiensemester(this.studiensemester, this.event.lehreinheit_id ?? this.event.lehrveranstaltung_id)
+				return this.$fhcApi.factory.studium.getLvPlanForStudiensemester(this.studiensemester, this.event.lehreinheit_id ?? this.event.lehrveranstaltung_id)
 					.then(data => data.data)
 					.then(res => {
 						if (Array.isArray(res) && res.length > 0) {
-							this.hasLvStundenplanEintraege = true;
+							this.hasLvPlanEintraege = true;
 						} else {
-							this.hasLvStundenplanEintraege = false;
+							this.hasLvPlanEintraege = false;
 						}
 					});
 			}
@@ -107,7 +107,7 @@ export default  {
         <template #default>
 			<div class="mb-4" v-if="lvEvaluierungMessage" v-html="lvEvaluierungMessage"></div>
 			<slot name="content"></slot>
-			<lv-menu v-model:isMenuSelected="isMenuSelected" :hasLvStundenplanEintraege="hasLvStundenplanEintraege" :preselectedMenu="preselectedMenu" :menu="menu" @hideModal="hide"></lv-menu>
+			<lv-menu v-model:isMenuSelected="isMenuSelected" :hasLvPlanEintraege="hasLvPlanEintraege" :preselectedMenu="preselectedMenu" :menu="menu" @hideModal="hide"></lv-menu>
         </template>
         
     </bs-modal>
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 3960b1d28..6a9a7dbcd 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -3,7 +3,7 @@ import CalendarDate from "../../../composables/CalendarDate.js";
 import LvModal from "../../../components/Cis/Mylv/LvModal.js";
 import LvInfo from "../../../components/Cis/Mylv/LvInfo.js"
 
-import ApiStudenplan from '../../../api/factory/stundenplan.js';
+import ApiStudenplan from '../../../api/factory/lvPlan.js';
 
 export const DEFAULT_MODE_RAUMINFO = 'Week'
 
@@ -107,7 +107,7 @@ const RoomInformation = {
 				String(this.currentDay.getDate()).padStart(2, "0");
 
 			this.$router.push({
-				name: "Stundenplan",
+				name: "LvPlan",
 				params: {
 					mode: this.calendarMode,
 					focus_date: date,
diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index a53f9a4e4..7ead07ffe 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -126,7 +126,7 @@ export default {
 		},
 		openLvUebersicht(lehrveranstaltung) {
 			this.selectedLehrveranstaltung = lehrveranstaltung;
-			//convert lehrveranstaltung properties for compatibility with Stundenplan LvModal
+			//convert lehrveranstaltung properties for compatibility with LvPlan LvModal
 			this.selectedLehrveranstaltung.type ="lehreinheit";
 			this.selectedLehrveranstaltung.lehreinheit_id = this.selectedLehrveranstaltung.lehrveranstaltung_id;
 			if(this.selectedLehrveranstaltung){
diff --git a/public/js/components/DashboardWidget/Stundenplan.js b/public/js/components/DashboardWidget/LvPlan.js
similarity index 95%
rename from public/js/components/DashboardWidget/Stundenplan.js
rename to public/js/components/DashboardWidget/LvPlan.js
index 1fc3a6a19..94e79328a 100644
--- a/public/js/components/DashboardWidget/Stundenplan.js
+++ b/public/js/components/DashboardWidget/LvPlan.js
@@ -6,11 +6,11 @@ import ContentModal from '../Cis/Cms/ContentModal.js'
 import CalendarDate from '../../composables/CalendarDate.js';
 import moodleSvg from "../../helpers/moodleSVG.js"
 
-import ApiStundenplan from '../../api/factory/stundenplan.js';
+import ApiLvPlan from '../../api/factory/lvPlan.js';
 import ApiOrt from '../../api/factory/ort.js';
 
 export default {
-	name: "WidgetsStundenplan",
+	name: "LvPlanWidget",
 	mixins: [
 		Phrasen,
 		AbstractWidget
@@ -128,8 +128,8 @@ export default {
 
 		loadEvents: function () {
 			Promise.allSettled([
-				this.$api.call(ApiStundenplan.StundenplanEvents(this.monthFirstDay, this.monthLastDay)),
-				this.$api.call(ApiStundenplan.getStundenplanReservierungen(this.monthFirstDay, this.monthLastDay))
+				this.$api.call(ApiLvPlan.LvPlanEvents(this.monthFirstDay, this.monthLastDay)),
+				this.$api.call(ApiLvPlan.getLvPlanReservierungen(this.monthFirstDay, this.monthLastDay))
 			]).then((result) => {
 				let promise_events = [];
 				result.forEach((promise_result) => {
@@ -170,7 +170,7 @@ export default {
 		this.loadEvents();
 	},
 	template: /*html*/`
-	<div class="dashboard-widget-stundenplan d-flex flex-column h-100">
+	<div class="dashboard-widget-lvplan d-flex flex-column h-100">
 		<lv-modal v-if="selectedEvent" ref="lvmodal" :event="selectedEvent"  />
 		<content-modal :content_id="roomInfoContentID" dialogClass="modal-lg" ref="contentModal"/>
 		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" :widget="true" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" >

From 83d3f515de44124e99f14ab788533a350bfe02f7 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 10 Jun 2025 13:18:31 +0200
Subject: [PATCH 211/572] refactor(Modals and z-index): ensures dashboard
 modals are in the forground

---
 application/controllers/api/frontend/v1/LvPlan.php |  2 +-
 public/js/components/DashboardWidget/Url.js        | 10 +++++-----
 public/js/components/Drop/Grid.js                  |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 55b59db37..b5ce2a737 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -81,7 +81,7 @@ class LvPlan extends FHCAPI_Controller
 		$end_date = $this->input->get('end_date', TRUE);
 		$lv_id = $this->input->get('lv_id', TRUE);
 
-		$lvplan_events = $this->lvplanlib->getLvPlan($start_date,$end_date,$lv_id);
+		$lvplan_events = $this->getDataOrTerminateWithError($this->lvplanlib->getLvPlan($start_date,$end_date,$lv_id));
 		if( is_null($lvplan_events) || isEmptyArray($lvplan_events) )
 		{
 			$lvplan_events = array();
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 1fcf01874..796726f04 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -198,7 +198,7 @@ export default {
         </div>
     </div>
 	<!--EDIT MODAL-->
-	<core-form draggable="true" @dragstart="stopDrag" @drag="stopDrag" @dragend="stopDrag" ref="editForm">
+	<teleport to="body">
 		<bs-modal @[\`hide.bs.modal\`]="bookmark_id=null; clearInputs();" ref="editModal">
 			<template #title>
 				<h2>{{$p.t('bookmark','editLink')}}</h2>
@@ -213,10 +213,9 @@ export default {
 				<button @click="editBookmark" class="btn btn-primary">{{$p.t('bookmark','saveLink')}}</button>
 			</template>
 		</bs-modal>
-	</core-form>
-
+	</teleport>
 	<!--CREATE MODAL-->
-	<core-form draggable="true" @dragstart="stopDrag" @drag="stopDrag" @dragend="stopDrag"  ref="createForm">
+	<teleport to="body">
 		<bs-modal @[\`hide.bs.modal\`]="clearInputs();" ref="createModal">
 			<template #title>
 				<h2>{{$p.t('bookmark','newLink')}}</h2>
@@ -231,7 +230,8 @@ export default {
 				<button @click="insertBookmark" class="btn btn-primary">{{$p.t('bookmark','saveLink')}}</button>
 			</template>
 		</bs-modal>
-	</core-form>`,
+	</teleport>
+	`,
 };
 
 /*
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 00ffe7c52..6955107e3 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -429,7 +429,7 @@ export default {
 			this._dragStart(evt);
 		},
 		dragOver(evt) {
-			if ((this.y + 1) > this.rows && this.mode == MODE_MOVE) {
+			if ((this.y + 1) > this.rows && (this.mode == MODE_MOVE || this.mode == MODE_RESIZE)) {
 				this.positionUpdates = this.positionUpdates?.filter(item => {
 					return item.widgetid == this.draggedItem.data.widgetid;
 				})
@@ -628,7 +628,7 @@ export default {
 				class="position-absolute"
 				:active="active"
 				:style="{
-					zIndex: item.resizeOverlay ? 1 : 2,
+					zIndex: item.resizeOverlay ? 1 : 'auto',
 					top: 'calc(' + item.y + ' * var(--fhc-dg-row-height))',
 					left: 'calc(' + item.x + ' * var(--fhc-dg-col-width))',
 					width: 'calc(' + item.w + ' * var(--fhc-dg-col-width))',

From d2e85056897655c7c37e331a9f44ee9d7f936070 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 10 Jun 2025 14:49:30 +0200
Subject: [PATCH 212/572] refactor(Profil alias): checks if user has alias,
 creates extern alias email if available otherwise not

---
 .../controllers/api/frontend/v1/Profil.php    |  5 ++--
 .../Cis/Profil/ProfilComponents/Kontakt.js    |  2 ++
 .../Profil/ProfilComponents/ProfilEmails.js   | 24 ++++++++++---------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php
index c52d8bae5..d8e22ec29 100644
--- a/application/controllers/api/frontend/v1/Profil.php
+++ b/application/controllers/api/frontend/v1/Profil.php
@@ -232,7 +232,8 @@ class Profil extends FHCAPI_Controller
 		$intern_email["email"] = $uid . "@" . DOMAIN;
 		$extern_email = array();
 		$extern_email["type"] = "alias";
-		$extern_email["email"] = $benutzer_res->alias . "@" . DOMAIN;
+
+		$extern_email["email"] = $benutzer_res->alias? ($benutzer_res->alias. "@" . DOMAIN) : null;
 		$res->emails = array($intern_email, $extern_email);
 
 		$res->funktionen = $benutzer_funktion_res;
@@ -345,7 +346,7 @@ class Profil extends FHCAPI_Controller
 		$intern_email["email"] = $this->uid . "@" . DOMAIN;
 		$extern_email = array();
 		$extern_email["type"] = "alias";
-		$extern_email["email"] = $mitarbeiter_res->alias . "@" . DOMAIN;
+		$extern_email["email"] = $mitarbeiter_res->alias? ($mitarbeiter_res->alias . "@" . DOMAIN) :null;
 		$res->emails = [$intern_email, $extern_email];
 
 		$res->funktionen = $benutzer_funktion_res;
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js b/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
index 3d703f6b6..6dd6edeb4 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Kontakt.js
@@ -12,6 +12,7 @@ export default{
 
     }, 
     template:/*html*/`
+	<template v-if="data.kontakt">
     <div class="gy-2 row align-items-center justify-content-center">
         <div class="col-1 text-center" >
             <i class="fa-solid fhc-link-color" :class="{...(data.kontakt.includes('@')?{'fa-envelope':true}:{'fa-phone':true})}" ></i>
@@ -35,5 +36,6 @@ export default{
             <i v-else="data.zustellung" class="fa-solid fa-xmark"></i>
         </div>
     </div>
+	</template>
 `,
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
index 1342aed8e..b5fc345ee 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilEmails.js
@@ -20,17 +20,19 @@ export default {
         <!-- HIER SIND DIE EMAILS -->
         <div  class="gy-3 row justify-content-center ">
             <div v-for="email in data" class="col-12 ">
-                <div class="row align-items-center">
-                    <div class="col-1 text-center">
-                        <i class="fa-solid fa-envelope fhc-link-color" ></i>
-                    </div>
-                    <div class="col-11">
-                        <div class="form-underline">
-                            <div class="form-underline-titel">{{email.type}}</div>
-                            <a :href="'mailto:'+email.email" class="form-underline-content">{{email.email}} </a>
-                        </div>
-                    </div>
-                </div>
+				<template v-if="email.email">
+					<div class="row align-items-center">
+						<div class="col-1 text-center">
+							<i class="fa-solid fa-envelope fhc-link-color" ></i>
+						</div>
+						<div class="col-11">
+							<div class="form-underline">
+								<div class="form-underline-titel">{{email?.type}}</div>
+								<a :href="'mailto:'+email?.email" class="form-underline-content">{{email?.email}} </a>
+							</div>
+						</div>
+					</div>
+				</template>
             </div>
         </div>
     </div>

From 49c510537a6b5d52fdfbf0691ee44a26d3b70cc3 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 11 Jun 2025 11:06:35 +0200
Subject: [PATCH 213/572] fix(Profil Mailverteiler): adds safeguards and checks
 on the return value of the Mailverteiler of a person

---
 .../controllers/api/frontend/v1/Profil.php    | 113 ++++++------------
 .../Profil/ProfilComponents/Mailverteiler.js  |   8 +-
 2 files changed, 39 insertions(+), 82 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php
index c52d8bae5..7e5a69255 100644
--- a/application/controllers/api/frontend/v1/Profil.php
+++ b/application/controllers/api/frontend/v1/Profil.php
@@ -75,10 +75,7 @@ class Profil extends FHCAPI_Controller
 		// if parsing the URL did not found a UID then the UID of the logged in user is used
 		if ($uid == "Profil" || $uid == $this->uid) {
 			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($this->uid);
-			if (isError($isMitarbeiter)) {
-				show_error("error while checking if UID: " . $this->uid . " is a mitarbeiter");
-			}
-			$isMitarbeiter = getData($isMitarbeiter);
+			$isMitarbeiter = $this->getDataOrTerminateWithError($isMitarbeiter);
 			if ($isMitarbeiter) {
 				$res->view = "MitarbeiterProfil";
 				$res->data = $this->mitarbeiterProfil();
@@ -95,18 +92,13 @@ class Profil extends FHCAPI_Controller
 		else {
 			$this->PersonModel->addSelect(["person_id"]);
 			$pid = $this->PersonModel->getByUid($uid);
-			if (isError($pid)) {
-				show_error("error while trying to update table public.tbl_person while searching for a person with UID: " . $uid);
-			}
-			$pid = hasData($pid) ? getData($pid)[0] : null;
+			$pid = $this->getDataOrTerminateWithError($pid);
+			$pid = $pid ? $pid[0] : null;
 			if (!$pid) {
-				show_error("Person with UID: " . $uid . " does not exist");
+				$this->terminateWithError("Person with UID: " . $uid . " does not exist");
 			}
 			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
-			if (isError($isMitarbeiter)) {
-				show_error("error while checking if UID: " . $uid . " is a mitarbeiter");
-			}
-			$isMitarbeiter = getData($isMitarbeiter);
+			$isMitarbeiter = $this->getDataOrTerminateWithError($isMitarbeiter);
 			if ($isMitarbeiter) {
 				$res->view = "ViewMitarbeiterProfil";
 				$res->data = $this->viewMitarbeiterProfil($uid);
@@ -134,14 +126,11 @@ class Profil extends FHCAPI_Controller
 
 		$res = $this->PersonModel->update($this->pid, ["foto_sperre" => $value]);
 		if (isError($res)) {
-			show_error("error while trying to update table public.tbl_person");
+			$this->terminateWithError("error while trying to update table public.tbl_person");
 		}
 		$this->PersonModel->addSelect("foto_sperre");
 		$res = $this->PersonModel->load($this->pid);
-		if (isError($res)) {
-			show_error("error while trying to query table public.tbl_person");
-		}
-
+		
         $res = $this->getDataOrTerminateWithError($res);
 		
         $this->terminateWithSuccess(current($res));
@@ -418,10 +407,8 @@ class Profil extends FHCAPI_Controller
 		$this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
 
 		$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $uid));
-		if (isError($mailverteiler_res)) {
-			show_error("was not able to query the table public.tbl_benutzer:" . getData($mailverteiler_res));
-		}
-		$mailverteiler_res = hasData($mailverteiler_res) ? getData($mailverteiler_res) : null;
+		$mailverteiler_res = $this->getDataOrTerminateWithError($mailverteiler_res);
+		$mailverteiler_res = gettype($mailverteiler_res) === 'array' ? $mailverteiler_res : [];
 		$mailverteiler_res = array_map(function ($element) {
 			$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
 			return $element;
@@ -441,10 +428,7 @@ class Profil extends FHCAPI_Controller
 		$this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit", "oe_kurzbz");
 
 		$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid' => $uid));
-		if (isError($benutzer_funktion_res)) {
-			show_error("was not able to query the table public.tbl_benutzerfunktion:" . getData($benutzer_funktion_res));
-		}
-		$benutzer_funktion_res = hasData($benutzer_funktion_res) ? getData($benutzer_funktion_res) : null;
+		$benutzer_funktion_res = $this->getDataOrTerminateWithError($benutzer_funktion_res);
 		return $benutzer_funktion_res;
 	}
 
@@ -460,10 +444,7 @@ class Profil extends FHCAPI_Controller
 
 		//? betriebsmittel are not needed in a view
 		$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel($pid);
-		if (isError($betriebsmittelperson_res)) {
-			show_error("was not able to query the table public.tbl_betriebsmittelperson:" . getData($betriebsmittelperson_res));
-		}
-		$betriebsmittelperson_res = hasData($betriebsmittelperson_res) ? getData($betriebsmittelperson_res) : null;
+		$betriebsmittelperson_res = $this->getDataOrTerminateWithError($betriebsmittelperson_res);
 		return $betriebsmittelperson_res;
 	}
 
@@ -477,12 +458,9 @@ class Profil extends FHCAPI_Controller
 	{
 		$this->BenutzerModel->addSelect(["alias"]);
 		$benutzer_res = $this->BenutzerModel->load([$uid]);
-		if (isError($benutzer_res)) {
-			show_error("was not able to query the table public.tbl_benutzer:" . getData($benutzer_res));
-		} else {
-			$benutzer_res = hasData($benutzer_res) ? getData($benutzer_res)[0] : null;
-		}
-
+		$benutzer_res = $this->getDataOrTerminateWithError($benutzer_res);
+		$benutzer_res = $benutzer_res ? current($benutzer_res) : null;
+			
 		return $benutzer_res;
 	}
 
@@ -505,11 +483,8 @@ class Profil extends FHCAPI_Controller
 		$this->BenutzerModel->addJoin("tbl_person", "person_id");
 
 		$person_res = $this->BenutzerModel->load([$uid]);
-		if (isError($person_res)) {
-			show_error("was not able to query the table public.tbl_benutzer:" . getData($person_res));
-		} else {
-			$person_res = hasData($person_res) ? getData($person_res)[0] : null;
-		}
+		$person_res = $this->getDataOrTerminateWithError($person_res);
+		$person_res = $person_res ? current($person_res) : null;
 
 		if( ($person_res->foto === null) || (($this->uid !== $uid) && ($person_res->foto_sperre !== false)) )
 		{
@@ -531,11 +506,8 @@ class Profil extends FHCAPI_Controller
 		$this->MitarbeiterModel->addSelect(["kurzbz", "telefonklappe", "alias", "ort_kurzbz"]);
 		$this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid");
 		$mitarbeiter_res = $this->MitarbeiterModel->load($uid);
-		if (isError($mitarbeiter_res)) {
-			show_error("was not able to query the table public.tbl_mitarbeiter:" . getData($mitarbeiter_res));
-		} else {
-			$mitarbeiter_res = hasData($mitarbeiter_res) ? getData($mitarbeiter_res)[0] : null;
-		}
+		$mitarbeiter_res = $this->getDataOrTerminateWithError($mitarbeiter_res);
+		$mitarbeiter_res = $mitarbeiter_res ? current($mitarbeiter_res) : null;
 
 		return $mitarbeiter_res;
 	}
@@ -552,10 +524,8 @@ class Profil extends FHCAPI_Controller
 		$this->MitarbeiterModel->addJoin("tbl_kontakt", "tbl_mitarbeiter.standort_id = tbl_kontakt.standort_id");
 		$this->MitarbeiterModel->addLimit(1);
 		$telefon_res = $this->MitarbeiterModel->loadWhere(["mitarbeiter_uid" => $uid, "kontakttyp" => "telefon"]);
-		if (isError($telefon_res)) {
-			show_error("was not able to query the table public.tbl_mitarbeiter:" . getData($telefon_res));
-		}
-		$telefon_res = hasData($telefon_res) ? getData($telefon_res)[0] : null;
+		$telefon_res = $this->getDataOrTerminateWithError($telefon_res);
+		$telefon_res = $telefon_res ? current($telefon_res) : null;
 		return $telefon_res;
 	}
 
@@ -571,10 +541,9 @@ class Profil extends FHCAPI_Controller
 		$this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz");
 
 		$student_res = $this->StudentModel->load([$uid]);
-		if (isError($student_res)) {
-			show_error("was not able to query the table public.tbl_student:" . getData($student_res));
-		}
-		$student_res = hasData($student_res) ? getData($student_res)[0] : null;
+		
+		$student_res = $this->getDataOrTerminateWithError($student_res);
+		$student_res = $student_res ? current($student_res) : null;
 		return $student_res;
 	}
 
@@ -587,10 +556,7 @@ class Profil extends FHCAPI_Controller
 	private function getProfilUpdates($uid)
 	{
 		$profilUpdates = $this->ProfilUpdateModel->getProfilUpdatesWhere(['uid' => $uid]);
-		if (isError($profilUpdates)) {
-			show_error("was not able to query the table public.tbl_profil_update:" . getData($profilUpdates));
-		}
-		$profilUpdates = hasData($profilUpdates) ? getData($profilUpdates) : null;
+		$profilUpdates = $this->getDataOrTerminateWithError($profilUpdates);
 		return $profilUpdates;
 	}
 
@@ -606,10 +572,9 @@ class Profil extends FHCAPI_Controller
 		$this->BenutzerModel->addJoin("tbl_person", "person_id");
 
 		$matr_res = $this->BenutzerModel->load([$uid]);
-		if (isError($matr_res)) {
-			show_error("was not able to query the table public.tbl_benutzer:" . getData($matr_res));
-		}
-		$matr_res = hasData($matr_res) ? getData($matr_res)[0] : [];
+		
+		$matr_res = $this->getDataOrTerminateWithError($matr_res);
+		$matr_res = $matr_res ? current($matr_res) : [];
 		return $matr_res;
 	}
 
@@ -625,10 +590,7 @@ class Profil extends FHCAPI_Controller
 		$this->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
 
 		$zutrittsgruppe_res = $this->BenutzergruppeModel->loadWhere(array("uid" => $uid, "zutrittssystem" => true));
-		if (isError($zutrittsgruppe_res)) {
-			show_error("was not able to query the table public.tbl_benutzergruppe:" . getData($zutrittsgruppe_res));
-		}
-		$zutrittsgruppe_res = hasData($zutrittsgruppe_res) ? getData($zutrittsgruppe_res) : null;
+		$zutrittsgruppe_res = $this->getDataOrTerminateWithError($zutrittsgruppe_res);
 		return $zutrittsgruppe_res;
 	}
 
@@ -645,10 +607,7 @@ class Profil extends FHCAPI_Controller
 		$adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz");
 
 		$adresse_res = $this->AdresseModel->loadWhere(["person_id" => $pid]);
-		if (isError($adresse_res)) {
-			show_error("was not able to query the table public.tbl_adresse:" . getData($adresse_res));
-		}
-		$adresse_res = hasData($adresse_res) ? getData($adresse_res) : null;
+		$adresse_res = $this->getDataOrTerminateWithError($adresse_res);
 		return $adresse_res;
 	}
 
@@ -666,10 +625,7 @@ class Profil extends FHCAPI_Controller
 		$this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum');
 
 		$kontakte_res = $this->KontaktModel->loadWhere(['person_id' => $pid]);
-		if (isError($kontakte_res)) {
-			show_error("was not able to query the table public.tbl_kontakt:" . getData($kontakte_res));
-		}
-		$kontakte_res = hasData($kontakte_res) ? getData($kontakte_res) : null;
+		$kontakte_res = $this->getDataOrTerminateWithError($kontakte_res);
 		return $kontakte_res;
 	}
 
@@ -682,11 +638,10 @@ class Profil extends FHCAPI_Controller
 	private function getZutrittskarteDatum($uid)
 	{
 		$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($uid, "Zutrittskarte");
-		if (isError($zutrittskarte_ausgegebenam)) {
-			show_error("was not able to query the table wavi.tbl_bentriebsmittelperson:" . getData($zutrittskarte_ausgegebenam));
-		}
-		$zutrittskarte_ausgegebenam = hasData($zutrittskarte_ausgegebenam) ? getData($zutrittskarte_ausgegebenam)[0]->ausgegebenam : null;
-
+		
+		$zutrittskarte_ausgegebenam = $this->getDataOrTerminateWithError($zutrittskarte_ausgegebenam);
+		$zutrittskarte_ausgegebenam = $zutrittskarte_ausgegebenam ? current($zutrittskarte_ausgegebenam)->ausgegebenam : null;
+		
 		//? formats date from 01-01-2000 to 01.01.2000
 		$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
 		return $zutrittskarte_ausgegebenam;
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
index 82b0aad57..4b85bbf63 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
@@ -10,6 +10,7 @@ export default {
 
     },
     template: /*html*/`
+	<template v-if="Array.isArray(data) && data.length >0">
     <div class="card">
         <div class="card-header">
             {{title}}
@@ -18,7 +19,7 @@ export default {
             <h6 class="card-title">{{$p.t('profil','mailverteilerMitglied')}}</h6>
             <div class="card-text row text-break mb-2" v-for="verteiler in data">
                 <div class="col-12 ">
-                    <div class="row">  
+                    <div class="row">
                         <div class="col-1 ">
                             <i class="fa-solid fa-envelope" style="color: #00649C;"></i>
                         </div>
@@ -26,9 +27,10 @@ export default {
                             <a :href="verteiler.mailto"><b>{{verteiler.gruppe_kurzbz}}</b></a>
                         </div>
                     </div>
-                </div> 
+                </div>
                 <div class="col-11 offset-1 ">{{verteiler.beschreibung}}</div>
             </div>
         </div>
-    </div>`,
+    </div>
+	</template>`,
 };

From 29f968f308bdfde9d442b8680e627b761f966291 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 11 Jun 2025 11:24:18 +0200
Subject: [PATCH 214/572] fix(Profil email extern):Profil endpoint does not
 provide the extern alias email if the benutzer has no alias defined

---
 application/controllers/api/frontend/v1/Profil.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php
index 7e5a69255..f234fc30e 100644
--- a/application/controllers/api/frontend/v1/Profil.php
+++ b/application/controllers/api/frontend/v1/Profil.php
@@ -221,8 +221,9 @@ class Profil extends FHCAPI_Controller
 		$intern_email["email"] = $uid . "@" . DOMAIN;
 		$extern_email = array();
 		$extern_email["type"] = "alias";
-		$extern_email["email"] = $benutzer_res->alias . "@" . DOMAIN;
-		$res->emails = array($intern_email, $extern_email);
+		
+		$extern_email["email"] = $benutzer_res->alias ? ($benutzer_res->alias . "@" . DOMAIN) : null;
+		$res->emails = $extern_email?[$intern_email, $extern_email]:[$intern_email];
 
 		$res->funktionen = $benutzer_funktion_res;
 		$res->mailverteiler = $mailverteiler_res;
@@ -334,8 +335,9 @@ class Profil extends FHCAPI_Controller
 		$intern_email["email"] = $this->uid . "@" . DOMAIN;
 		$extern_email = array();
 		$extern_email["type"] = "alias";
-		$extern_email["email"] = $mitarbeiter_res->alias . "@" . DOMAIN;
-		$res->emails = [$intern_email, $extern_email];
+		
+		$extern_email["email"] = $mitarbeiter_res->alias? ($mitarbeiter_res->alias . "@" . DOMAIN) : null;
+		$res->emails = $extern_email["email"]?[$intern_email, $extern_email]:[$intern_email];
 
 		$res->funktionen = $benutzer_funktion_res;
 		$res->standort_telefon = $telefon_res;

From 77ccfa46de7e9d0974b3227572874fccc76f0f67 Mon Sep 17 00:00:00 2001
From: kindlm <kindlm@technikum-wien.at>
Date: Wed, 11 Jun 2025 13:39:50 +0200
Subject: [PATCH 215/572] Task #62440 Ampelsystem Benutzercount

---
 include/ampel.class.php              | 42 ++++++++++++++++++++++++++++
 vilesci/stammdaten/ampel_details.php | 16 +++++++++--
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/include/ampel.class.php b/include/ampel.class.php
index 40f8a503d..bc23ac7e9 100644
--- a/include/ampel.class.php
+++ b/include/ampel.class.php
@@ -575,5 +575,47 @@ class ampel extends basis_db
 		}
 		
 	}
+
+	/**
+	 * Zählt die Anzahl der UIDs, welche mit einer Ampel adressiert werden
+	 * @param $ampel_id integer ID der Ampel, die geladen werden soll
+	 */
+	public function getAnzahlUserAmpel($ampel_id)
+	{
+		// Ampel laden
+		$qry_ampel = "SELECT benutzer_select FROM public.tbl_ampel WHERE ampel_id=".$this->db_add_param($ampel_id, FHC_INTEGER);
+
+		if($result_ampel = $this->db_query($qry_ampel))
+		{
+			// Anzahl User laden
+			if ($row_ampel = $this->db_fetch_object($result_ampel))
+			{
+				$qry_user = "SELECT count(*) AS anzahl FROM (SELECT uid FROM public.tbl_benutzer WHERE uid IN (".$row_ampel->benutzer_select."))subquery";
+			}
+
+			if ($result = $this->db_query($qry_user))
+			{
+				if ($row = $this->db_fetch_object($result))
+				{
+					return $row->anzahl;
+				}
+				else
+				{
+					$this->errormsg = 'Anzahl UIDs konnte nicht geladen werden';
+					return false;
+				}
+			}
+			else
+			{
+				$this->errormsg = 'Anzahl UIDs konnte nicht geladen werden';
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Ampel';
+			return false;
+		}
+	}
 }
 ?>
diff --git a/vilesci/stammdaten/ampel_details.php b/vilesci/stammdaten/ampel_details.php
index 74c3af829..277329e55 100644
--- a/vilesci/stammdaten/ampel_details.php
+++ b/vilesci/stammdaten/ampel_details.php
@@ -192,6 +192,15 @@ $datum_obj = new datum();
 			die('Invalid Action');
 			break;
 	}
+	if(isset($ampel_id) && $ampel->benutzer_select != '')
+	{
+		$anzahlUser = $ampel->getAnzahlUserAmpel($ampel_id);
+	}
+	else
+	{
+		$anzahlUser = 0;
+	}
+
 
 	echo '<form action="'.$_SERVER['PHP_SELF'].'?action=save" method="POST">
 		<input type="hidden" name="new" value="'.htmlspecialchars($new).'">
@@ -207,8 +216,11 @@ $datum_obj = new datum();
 				<td><input type="text" class="datepicker_datum" name="deadline" size="10" maxlength="10" value="'.htmlspecialchars($datum_obj->formatDatum($ampel->deadline,'Y-m-d')).'" required></td>
 			</tr>
 			<tr valign="top">
-				<td rowspan="3">Benutzer Select</td>
-				<td rowspan="3"><textarea name="benutzer_select" cols="60" rows="5" required>'.htmlspecialchars($ampel->benutzer_select).'</textarea></td>
+				<td rowspan="3">Benutzer*innen Select</td>
+				<td rowspan="3">
+					<textarea name="benutzer_select" cols="60" rows="5" required>'.htmlspecialchars($ampel->benutzer_select).'</textarea>
+					<br>Anzahl Benutzer*innen: '.$anzahlUser.'
+				</td>
 				<td></td>
 				<td valign="middle">Vorlaufzeit (in Tagen)&nbsp
 					<i class="fa fa-info-circle fa-lg" aria-hidden="true" data-toggle="tooltip" data-placement="left" title="Anzahl der Tage VOR der Deadline, an denen die Ampel gezeigt werden soll.&#013Wenn keine Angabe, dann wird die Ampel gleich nach ihrer Erstellung angezeigt."></i>

From ab059e9099b9c52406aa5b6eb629bbe6e40fd697 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 11 Jun 2025 15:29:54 +0200
Subject: [PATCH 216/572] refactored detailFilter for Mitarbeiter

---
 .../api/frontend/v1/stv/Config.php            |   7 +-
 public/js/api/factory/detailHeader.js         |  37 +++
 .../components/DetailHeader/DetailHeader.js   | 252 +++++++++++++-----
 3 files changed, 220 insertions(+), 76 deletions(-)
 create mode 100644 public/js/api/factory/detailHeader.js

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 42de1b02f..138bdec67 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -29,6 +29,8 @@ class Config extends FHCAPI_Controller
 {
 
 
+	private $arr;
+
 	public function __construct()
 	{
 		// TODO(chris): permissions
@@ -162,11 +164,12 @@ class Config extends FHCAPI_Controller
 				'changeStatusToAbsolvent' => $this->permissionlib->isBerechtigt('admin')
 			]
 		];
-		$result['finalexam'] = [
-			'title' =>  $this->p->t('stv', 'tab_finalexam'),
+		$this->arr = [
+			'title' => $this->p->t('stv', 'tab_finalexam'),
 			'component' => './Stv/Studentenverwaltung/Details/Abschlusspruefung.js',
 			'config' => $config['finalexam']
 		];
+		$result['finalexam'] = $this->arr;
 
 		Events::trigger('stv_conf_students', function & () use (&$result) {
 			return $result;
diff --git a/public/js/api/factory/detailHeader.js b/public/js/api/factory/detailHeader.js
new file mode 100644
index 000000000..f9f368bc7
--- /dev/null
+++ b/public/js/api/factory/detailHeader.js
@@ -0,0 +1,37 @@
+/**
+ * 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 {
+	getHeader(person_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/vertraege/getHeader/' + person_id,
+		};
+	},
+	getPersonAbteilung(person_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/vertraege/getPersonAbteilung/' + person_id,
+		};
+	},
+	getLeitungOrg(oekurzbz){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vertraege/vertraege/getLeitungOrg/' + oekurzbz,
+		};
+	},
+}
\ No newline at end of file
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index a50b39e8c..0b50c5153 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -1,9 +1,21 @@
+import ApiDetailHeader from "../../api/factory/detailHeader.js";
+
 export default {
 	name: 'DetailHeader',
+	inject: {
+		domain: {
+			from: 'configDomain',
+			default: 'technikum-wien.at'
+		},
+	},
 	props: {
 		headerData: {
 			type: Object,
-			required: true
+			required: false
+		},
+		person_id: {
+			type: Number,
+			required: false
 		},
 		typeHeader: {
 			type: String,
@@ -20,87 +32,179 @@ export default {
 		appRoot() {
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root;
 		},
+		validatedHeaderData() {
+			if (this.typeHeader === 'student') return this.headerData;
+			if (this.typeHeader === 'mitarbeiter') return this.person_id;
+			return null;
+		}
+	},
+	created(){
+		if(this.person_id) {
+			this.getHeader(this.person_id);
+
+			this.loadDepartmentData(this.person_id)
+				.then(() => {
+					// Call getLeitungOrg only after departmentData is loaded
+					this.getLeitungOrg(this.departmentData.oe_kurzbz);
+				})
+				.catch((error) => {
+					console.error("Error loading department data:", error);
+				});
+		}
+	},
+	watch: {
+		person_id: {
+			handler(newVal) {
+				if (newVal) {
+					this.getHeader(this.person_id);
+					this.loadDepartmentData(this.person_id).
+					then(() => {
+						this.getLeitungOrg(this.departmentData.oe_kurzbz);
+					});
+				}
+			},
+			deep: true,
+		},
 	},
 	data(){
-		return{};
+		return{
+			headerDataMa: {},
+			departmentData: {},
+			leitungData: {},
+		};
 	},
 	methods: {
-		//TODO(Manu) finish for Vertragsverwaltung
-		getVorgesetzer(){},
+		getHeader(person_id) {
+			return this.$api
+				.call(ApiDetailHeader.getHeader(person_id))
+				.then(result => {
+					this.headerDataMa = result.data;
+
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		loadDepartmentData(person_id) {
+			return this.$api
+				.call(ApiDetailHeader.getPersonAbteilung(person_id))
+				.then(result => {
+					this.departmentData = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		getLeitungOrg(oekurzbz){
+			return this.$api
+				.call(ApiDetailHeader.getLeitungOrg(oekurzbz))
+				.then(result => {
+					this.leitungData = result.data;
+				})
+				.catch(this.$fhcAlert.handleSystemError);
+		},
+		redirectToLeitung(){
+			this.$emit('redirectToLeitung', {
+				person_id: this.leitungData.person_id});
+		}
 	},
 	template: `
 		<div class="core-header d-flex justify-content-start align-items-center w-100 overflow-auto pb-3 gap-3" style="max-height:9rem; min-width: 37.5rem;">
+			<template v-if="typeHeader==='student'">
+					<div
+						v-for="person in headerData"
+						:key="person.person_id"
+						class="d-flex flex-column align-items-center h-100"
+						class="position-relative d-inline-block"
+					>
+						<img
+						  class="d-block h-100 rounded"
+						  alt="Profilbild"
+						  :src="'data:image/jpeg;base64,' + person.foto"
+						/>
 
-			<div
-				v-for="person in headerData"
-				:key="person.person_id"
-				class="d-flex flex-column align-items-center h-100"
-				class="position-relative d-inline-block"
-			>
-				<img
-				  class="d-block h-100 rounded"
-				  alt="Profilbild"
-				  :src="'data:image/jpeg;base64,' + person.foto"
-				/>
+						<template v-if="person.foto_sperre">
+							<i
+							  class=" fa fa-lock text-secondary bg-light rounded d-flex justify-content-center align-items-center position-absolute top-0 end-0"
+							  style="z-index: 1; font-size: 1rem; width: 1.25rem; height: 1.25rem;"
+							></i>
+						</template>
+					<small class="text-muted">{{person.uid}}</small>
+					</div>
 
-				<template v-if="person.foto_sperre">
-					<i
-					  class=" fa fa-lock text-secondary bg-light rounded d-flex justify-content-center align-items-center position-absolute top-0 end-0"
-					  style="z-index: 1; font-size: 1rem; width: 1.25rem; height: 1.25rem;"
-					></i>
-				</template>
-			<small class="text-muted">{{person.uid}}</small>
+					<div v-if="headerData.length == 1">
+						<h2 class="h4">
+							{{headerData[0].titelpre}}
+							{{headerData[0].vorname}}
+							{{headerData[0].nachname}},
+							{{headerData[0].titelpost}}
+						</h2>
+
+						<h5 class="h6">
+						 <strong class="text-muted">Person ID </strong>
+							{{headerData[0].person_id}}
+							<strong class="text-muted">| {{$p.t('lehre', 'studiengang')}} </strong>
+							 {{headerData[0].stg_bezeichnung}} ({{headerData[0].studiengang}})
+							<strong v-if="headerData[0].semester" class="text-muted"> | {{$p.t('lehre', 'semester')}} </strong>
+							  {{headerData[0].semester}}
+							<strong v-if="headerData[0].verband" class="text-muted"> | {{$p.t('lehre', 'verband')}}</strong>
+							{{headerData[0].verband}}
+							<strong v-if="headerData[0].gruppe" class="text-muted"> | {{$p.t('lehre', 'gruppe')}} </strong>
+							{{headerData[0].gruppe}}
+						 </h5>
+
+					  <h5 class="h6">
+						<strong class="text-muted">Email </strong>
+						<span>
+							<a :href="'mailto:'+headerData[0]?.mail_intern">{{headerData[0].mail_intern}}</a>
+						</span>
+						<strong class="text-muted"> | Status </strong>
+						 {{headerData[0].status}}
+						<strong class="text-muted"> | {{$p.t('person', 'matrikelnummer')}} </strong>
+						  {{headerData[0].matr_nr}}
+					  </h5>
+
+					</div>
+				</div>
+		</template>
+
+		<template v-if="typeHeader==='mitarbeiter'">
+			<div class="row">
+				<div class="col-md-2 d-flex justify-content-start align-items-center w-30 pb-3 gap-3 position-relative"
+						style="max-height: 8rem; max-width: 6rem; overflow: hidden;">
+					<img
+					  class="d-block h-100 rounded"
+					  alt="Profilbild"
+					  :src="'data:image/jpeg;base64,' + headerDataMa.foto"
+					/>
+					<template v-if="headerDataMa.foto_sperre">
+						<i
+						  class=" fa fa-lock text-secondary bg-light rounded d-flex justify-content-center align-items-center position-absolute top-0 end-0"
+						  style="z-index: 1; font-size: 1rem; width: 1.25rem; height: 1.25rem;"
+						></i>
+					</template>
+				</div>
+
+				<!--show Ma-Details-->
+				<div class="col-md-10">
+					<h5>{{headerDataMa.titelpre}} {{headerDataMa.vorname}} {{headerDataMa.nachname}}<span v-if="headerDataMa?.titelpost">, </span> {{headerDataMa.titelpost}}
+					</h5>
+					<strong class="text-muted">{{departmentData.organisationseinheittyp_kurzbz}}</strong>
+						{{departmentData.bezeichnung}}
+					<span v-if="leitungData.uid"> | </span>
+					<strong v-if="leitungData.uid" class="text-muted">Vorgesetzte*r </strong>
+					<a href="#" @click.prevent="redirectToLeitung">
+						{{leitungData.titelpre}} {{leitungData.vorname}} {{leitungData.nachname}}
+					</a>
+					<p>
+						<strong class="text-muted">Email </strong>
+						 <span v-if="!headerDataMa?.alias">
+							<a :href="'mailto:'+headerDataMa?.uid+'@'+domain">{{headerDataMa.uid}}@{{domain}}</a>
+						</span>
+						<span v-if="headerDataMa?.alias">
+							<a :href="'mailto:'+headerDataMa?.alias+'@'+domain">{{headerDataMa.alias}}@{{domain}}</a>
+						</span>
+						<span v-if="headerDataMa?.telefonklappe" class="mb-2"> | <strong class="text-muted">DW </strong>{{headerDataMa?.telefonklappe}}</span>
+					</p>
+				</div>
 			</div>
-
-			<div v-if="headerData.length == 1">
-				<h2 class="h4">
-					{{headerData[0].titelpre}}
-					{{headerData[0].vorname}}
-					{{headerData[0].nachname}}
-					{{headerData[0].titelpost}}
-				</h2>
-
-				<h5 v-if="typeHeader==='student'" class="h6">
-				 <strong class="text-muted">Person ID </strong>
-				{{headerData[0].person_id}}
-					<strong class="text-muted">| {{$p.t('lehre', 'studiengang')}} </strong>
-					 {{headerData[0].stg_bezeichnung}} ({{headerData[0].studiengang}})
-					<strong v-if="headerData[0].semester" class="text-muted"> | {{$p.t('lehre', 'semester')}} </strong>
-					  {{headerData[0].semester}}
-					<strong v-if="headerData[0].verband" class="text-muted"> | {{$p.t('lehre', 'verband')}}</strong>
-					{{headerData[0].verband}}
-					<strong v-if="headerData[0].gruppe" class="text-muted"> | {{$p.t('lehre', 'gruppe')}} </strong>
-					{{headerData[0].gruppe}}
-				 </h5>
-				<h5 v-if="typeHeader==='mitarbeiter'" class="h6">
-				<strong class="text-muted">Team / {{$p.t('lehre', 'kompetenzfeld')}}</strong>
-				 {{headerData[0].studiengang}}
-				<strong v-if="headerData[0].semester" class="text-muted"> | Vorgesetzte*r </strong>
-				  {{headerData[0].semester}}
-			  </h5>
-
-			  <h5 v-if="typeHeader==='student'" class="h6">
-				<strong class="text-muted">Email </strong>
-				<span>
-					<a :href="'mailto:'+headerData[0]?.mail_intern">{{headerData[0].mail_intern}}</a>
-				</span>
-				<strong class="text-muted"> | Status </strong>
-				 {{headerData[0].status}}
-				<strong class="text-muted"> | {{$p.t('person', 'matrikelnummer')}} </strong>
-				  {{headerData[0].matr_nr}}
-			  </h5>
-			  <h5 v-if="typeHeader==='mitarbeiter'" class="h6">
-				<strong class="text-muted">Email </strong>
-				<span>
-					<a :href="'mailto:'+headerData[0]?.mail_intern">{{headerData[0].mail_intern}}</a>
-				</span>
-				<strong class="text-muted"> | {{$p.t('kvp', 'op.label.phone')}} </strong>
-				 {{headerData[0].status}}
-			  </h5>
-
-			</div>
-
-		</div>
-
+		</template>
+	</div>
 	`
-}
\ No newline at end of file
+}

From dc4f8bc6403527a5d9859831b4a289ec523b357d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 11 Jun 2025 15:38:01 +0200
Subject: [PATCH 217/572] rename Stundenplan/EventTypes/calendarEvent.js ->
 LvPlan/EventTypes/calendarEvent.js

---
 .../Cis/{Stundenplan => LvPlan}/EventTypes/calendarEvent.js       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename public/js/components/Cis/{Stundenplan => LvPlan}/EventTypes/calendarEvent.js (100%)

diff --git a/public/js/components/Cis/Stundenplan/EventTypes/calendarEvent.js b/public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js
similarity index 100%
rename from public/js/components/Cis/Stundenplan/EventTypes/calendarEvent.js
rename to public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js

From 0f9c98ddedf88b5274153b62085f0f51875fff92 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 11 Jun 2025 16:56:58 +0200
Subject: [PATCH 218/572] messages add translation for tabulator pagination
 buttons, Tabs component add alternative rendering with primevue tabs and use
 it in stv details component

---
 .../Messages/Details/TableMessages.js         | 22 ++++++++-
 .../Stv/Studentenverwaltung/Details.js        |  4 +-
 public/js/components/Tabs.js                  | 45 +++++++++++++++++--
 3 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 878cdbfbb..05355b96c 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -145,7 +145,27 @@ export default {
 				dataTreeCollapseElement:"<i class='fas fa-minus-square'></i>",
 				dataTreeChildIndent: 15,
 				dataTreeStartExpanded: false,
-				persistenceID: 'core-message'
+				persistenceID: 'core-message',
+				locale: 'de',
+				"langs": {
+					"de":{ //German language definition
+						"data":{
+							"loading":"Lädt", //data loader text
+							"error":"Fehler", //data error text
+						},
+						"pagination":{
+							"first":"Erste",
+							"first_title":"Erste Seite",
+							"last":"Letzte",
+							"last_title":"Letzte Seite",
+							"prev":"Vorige",
+							"prev_title":"Vorige Seite",
+							"next":"Nächste",
+							"next_title":"Nächste Seite",
+							"all":"Alle"
+						},
+					},
+				}
 			},
 			tabulatorEvents: [
 				{
diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 483b6ca7d..dd046de63 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -67,8 +67,8 @@ export default {
 					<h2 class="h4">{{students[0].titlepre}} {{students[0].vorname}} {{students[0].nachname}} {{students[0].titlepost}}</h2>
 				</div>
 			</div>
-			<fhc-tabs v-if="students.length == 1" ref="tabs" :modelValue="students[0]" :config="config" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
-			<fhc-tabs v-else ref="tabs" :modelValue="students" :config="config" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
+			<fhc-tabs v-if="students.length == 1" ref="tabs" :useprimevue="true" :modelValue="students[0]" :config="config" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
+			<fhc-tabs v-else ref="tabs" :useprimevue="true" :modelValue="students" :config="config" :default="$route.params.tab" style="flex: 1 1 0%; height: 0%" @changed="reload"></fhc-tabs>
 		</div>
 		<div v-else>
 			Loading...
diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index bd81f44f5..850bdacae 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -1,6 +1,13 @@
 import accessibility from "../directives/accessibility.js";
 
+import TabView from '../../../index.ci.php/public/js/components/primevue/tabview/tabview.esm.min.js';
+import TabPanel from '../../../index.ci.php/public/js/components/primevue/tabpanel/tabpanel.esm.min.js';
+
 export default {
+	components: {
+		tabview: TabView,
+		tabpanel: TabPanel
+	},
 	directives: {
 		accessibility
 	},
@@ -17,7 +24,11 @@ export default {
 		default: String,
 		modelValue: [String, Number, Boolean, Array, Object, Date, Function, Symbol],
 		vertical: Boolean,
-		border: Boolean
+		border: Boolean,
+		useprimevue: {
+			type: Boolean,
+			default: false
+		}
 	},
 	data() {
 		return {
@@ -47,6 +58,10 @@ export default {
 		}
 	},
 	methods: {
+		handleTabClick: function(index) {
+			let keys = Object.keys(this.tabs);
+			this.change(key[index]);
+		},
 		change(key) {
 			this.$emit("change", key)
 			this.current = key;
@@ -77,7 +92,8 @@ export default {
 					component: Vue.markRaw(Vue.defineAsyncComponent(() => import(item.component))),
 					title: Vue.computed(() => item.title || key),
 					config: item.config,
-					key
+					key,
+					value: {}
 				}
 			}
 
@@ -99,6 +115,27 @@ export default {
 		this.initConfig(this.config);
 	},
 	template: `
+	<template v-if="useprimevue">
+
+	<tabview 
+		:scrollable="true" 
+		:lazy="true"
+		@tab-click="handleTabClick"
+	>
+		<tabpanel 
+			v-for="tab in tabs" 
+			:key="tab.key" 
+			:header="tab.title"
+		>
+			<keep-alive>
+				<component :is="tab.component" v-model="value" :config="tab.config"></component>
+			</keep-alive>
+		</tabpanel>
+	</tabview>
+
+	</template>
+	<template v-else="">
+
 	<div class="fhc-tabs d-flex" :class="vertical ? 'align-items-stretch gap-3' : (border ? 'flex-column' : 'flex-column gap-3')" v-if="Object.keys(tabs).length">
 		<div class="nav" :class="vertical ? 'nav-pills flex-column' : 'nav-tabs'">
 			<div
@@ -118,5 +155,7 @@ export default {
 				<component ref="current" :is="currentTab.component" v-model="value" :config="currentTab.config"></component>
 			</keep-alive>
 		</div>
-	</div>`
+	</div>
+
+	</template>`
 };

From 074403abf5bd6c4b61c1630e5b418cb05e97fe60 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 11 Jun 2025 17:27:33 +0200
Subject: [PATCH 219/572] Tab Notizen: show Name of verfasser and bearbeiter

---
 application/models/person/Notiz_model.php | 29 ++++++++++++++++++++---
 public/js/components/Notiz/Notiz.js       | 10 ++++----
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index 2e99d1cdd..1835296fe 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -154,8 +154,21 @@ class Notiz_model extends DB_Model
 	public function getNotizWithDocEntries($id, $type)
 	{
 			$qry = "
-				SELECT 
-						n.*, count(dms_id) as countDoc, z.notizzuordnung_id,
+				SELECT
+						n.*, 
+						  CASE
+							WHEN person_verfasser.vorname IS NOT NULL AND person_verfasser.vorname != ''
+							  OR person_verfasser.nachname IS NOT NULL AND person_verfasser.nachname != ''
+							THEN CONCAT(person_verfasser.vorname, ' ', person_verfasser.nachname)
+							ELSE NULL
+						  END AS verfasser,
+						  CASE
+							WHEN person_bearbeiter.vorname IS NOT NULL AND person_bearbeiter.vorname != ''
+							  OR person_bearbeiter.nachname IS NOT NULL AND person_bearbeiter.nachname != ''
+							THEN CONCAT(person_bearbeiter.vorname, ' ', person_bearbeiter.nachname)
+							ELSE NULL
+						  END AS bearbeiter,
+						count(dms_id) as countDoc, z.notizzuordnung_id,
 						(CASE
 							WHEN n.updateamum >= n.insertamum THEN n.updateamum 
 							ELSE n.insertamum
@@ -173,10 +186,20 @@ class Notiz_model extends DB_Model
 							public.tbl_notiz_dokument dok USING (notiz_id)
 				LEFT JOIN 
 							campus.tbl_dms_version USING (dms_id)
+				LEFT JOIN 
+						      public.tbl_benutzer p_verfasser ON (p_verfasser.uid = n.verfasser_uid)
+  				LEFT JOIN 
+						      public.tbl_person person_verfasser ON (person_verfasser.person_id = p_verfasser.person_id)
+  				LEFT JOIN 
+						      public.tbl_benutzer p_bearbeiter ON (p_bearbeiter.uid = n.bearbeiter_uid)
+				LEFT JOIN 
+						      public.tbl_person person_bearbeiter ON (person_bearbeiter.person_id = p_bearbeiter.person_id)
 				WHERE 
 				   z.$type  = ?
 				GROUP BY 
-					notiz_id, z.notizzuordnung_id
+					notiz_id, z.notizzuordnung_id,
+ 					person_verfasser.vorname, person_verfasser.nachname,
+					person_bearbeiter.vorname, person_bearbeiter.nachname
 			";
 
 		return $this->execQuery($qry, array($type, $id));
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 13e969c50..2e516514f 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -95,8 +95,10 @@ export default {
 							return el;
 						},
 					},
-					{title: "VerfasserIn", field: "verfasser_uid", width: 124, visible: false},
-					{title: "BearbeiterIn", field: "bearbeiter_uid", width: 126, visible: false},
+					{title: "VerfasserIn", field: "verfasser", width: 124},
+					{title: "BearbeiterIn", field: "bearbeiter", width: 126},
+					{title: "Verfasser UID", field: "verfasser_uid", width: 124, visible: false},
+					{title: "Bearbeiter UID", field: "bearbeiter_uid", width: 126, visible: false},
 					{title: "Start", field: "start_format", width: 86, visible: false},
 					{title: "Ende", field: "ende_format", width: 86, visible: false},
 					{title: "Dokumente", field: "countdoc", width: 100, visible: false},
@@ -187,7 +189,7 @@ export default {
 
 						let cm = this.$refs.table.tabulator.columnManager;
 
-						cm.getColumnByField('verfasser_uid').component.updateDefinition({
+						cm.getColumnByField('verfasser').component.updateDefinition({
 							title: this.$p.t('notiz', 'verfasser'),
 							visible: this.showVariables.showVerfasser
 						});
@@ -199,7 +201,7 @@ export default {
 							title: this.$p.t('global', 'text'),
 							//visible: this.showVariables.showText
 						});
-						cm.getColumnByField('bearbeiter_uid').component.updateDefinition({
+						cm.getColumnByField('bearbeiter').component.updateDefinition({
 							title: this.$p.t('notiz', 'bearbeiter'),
 							visible: this.showVariables.showBearbeiter
 						});

From bd5925e1d694ec730236cacd9086925b64f1db60 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 12 Jun 2025 10:58:43 +0200
Subject: [PATCH 220/572] phrases for author and editor UID

---
 public/js/components/Notiz/Notiz.js |  6 +++++
 system/phrasesupdate.php            | 40 +++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 2e516514f..44cc56374 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -193,6 +193,9 @@ export default {
 							title: this.$p.t('notiz', 'verfasser'),
 							visible: this.showVariables.showVerfasser
 						});
+						cm.getColumnByField('verfasser_uid').component.updateDefinition({
+							title: this.$p.t('ui', 'verfasser_uid'),
+						});
 						cm.getColumnByField('titel').component.updateDefinition({
 							title: this.$p.t('global', 'titel'),
 							//visible: this.showVariables.showTitel
@@ -205,6 +208,9 @@ export default {
 							title: this.$p.t('notiz', 'bearbeiter'),
 							visible: this.showVariables.showBearbeiter
 						});
+						cm.getColumnByField('bearbeiter_uid').component.updateDefinition({
+							title: this.$p.t('ui', 'bearbeiter_uid'),
+						});
 						cm.getColumnByField('start_format').component.updateDefinition({
 							title: this.$p.t('global', 'gueltigVon'),
 							visible: this.showVariables.showVon
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 1c7b5432b..2fc8ff900 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -24911,6 +24911,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'verfasser_uid',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Verfasser*in UID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'author UID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'bearbeiter_uid',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bearbeiter*in UID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'editor UID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'notiz',

From 7d9197670411601b37a629197bee38e8e9026019 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Jun 2025 11:18:54 +0200
Subject: [PATCH 221/572] remove use of component moodleSVG

---
 public/js/components/DashboardWidget/LvPlan.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/public/js/components/DashboardWidget/LvPlan.js b/public/js/components/DashboardWidget/LvPlan.js
index 94e79328a..f180c47e6 100644
--- a/public/js/components/DashboardWidget/LvPlan.js
+++ b/public/js/components/DashboardWidget/LvPlan.js
@@ -4,7 +4,6 @@ import FhcCalendar from '../Calendar/Calendar.js';
 import LvModal from '../Cis/Mylv/LvModal.js';
 import ContentModal from '../Cis/Cms/ContentModal.js'
 import CalendarDate from '../../composables/CalendarDate.js';
-import moodleSvg from "../../helpers/moodleSVG.js"
 
 import ApiLvPlan from '../../api/factory/lvPlan.js';
 import ApiOrt from '../../api/factory/ort.js';
@@ -18,8 +17,7 @@ export default {
 	components: {
 		FhcCalendar,
 		LvModal,
-		ContentModal,
-		moodleSvg
+		ContentModal
 	},
 	
 	data() {

From eb357012803400eac5518c9e609ba42ffe3eb9f4 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 12 Jun 2025 11:32:31 +0200
Subject: [PATCH 222/572] Tab Gruppen: rewrite inital filter and watcher for
 working in firefox

---
 .../Details/Gruppen/Gruppen.js                | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
index 67f422efb..4ecf26d6e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
@@ -23,13 +23,19 @@ export default {
 					ApiStvGroups.getGruppen(this.student.uid)
 				),
 				ajaxResponse: (url, params, response) => response.data,
-				initialFilter: [
-					{field: "uid", type: "=", value: this.student.uid},
-					[
-						{field: "studiensemester_kurzbz", type: "=", value: this.currentSemester},
-						{field: "studiensemester_kurzbz", type: "=", value: null}
+				initialFilter: {
+					logic: "and",
+					filters: [
+						{ field: "uid", operator: "eq", value: this.student.uid },
+						{
+							logic: "or",
+							filters: [
+								{ field: "studiensemester_kurzbz", operator: "eq", value: null },
+								{ field: "studiensemester_kurzbz", operator: "eq", value: this.currentSemester }
+							]
+						}
 					]
-				],
+				},
 				columns: [
 					{title: "Gruppe", field: "gruppe_kurzbz"},
 					{title: "Bezeichnung", field: "bezeichnung"},
@@ -146,18 +152,17 @@ export default {
 	watch: {
 		currentSemester(newVal) {
 			if (newVal) {
-
 				this.$refs.table.tabulator.clearFilter(); // Clear old filters
 
-				this.$refs.table.tabulator.setFilter([
-					{field: "uid", type: "=", value: this.student.uid},
-					[
-						{field: "studiensemester_kurzbz", type: "=", value: newVal},
-						{field: "studiensemester_kurzbz", type: "=", value: null}
-					]
-				]);
-
-
+				this.$refs.table.tabulator.setFilter((data) => {
+					return (
+						data.uid === this.student.uid &&
+						(
+							data.studiensemester_kurzbz === newVal ||
+							data.studiensemester_kurzbz === null
+						)
+					);
+				});
 			}
 		},
 		student() {

From 57d71be7924c95a5aedc051b4e74e827b7a71c29 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Jun 2025 11:39:23 +0200
Subject: [PATCH 223/572] revert change of loaded StudienplanModel name

---
 application/controllers/api/frontend/v1/Studium.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index 116217a84..e73fa6d85 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -39,7 +39,7 @@ class Studium extends FHCAPI_Controller
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 		$this->load->model('organisation/Studienordnung_model','StudienordnungModel');
 		$this->load->model('organisation/Studiensemester_model',"StudiensemesterModel");
-		$this->load->model('organisation/Studienplan_model', 'LvPlanModel');
+		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 		$this->load->model('codex/Orgform_model','OrgformModel');
@@ -143,8 +143,8 @@ class Studium extends FHCAPI_Controller
 		if(!$aktuelles_studienplan){
 			$aktuelles_studienplan = null;
 		}
-		if(isset($parameter_studienplan) && !empty(array_filter( $semester_studienplan, function($lvplan) use($parameter_studienplan){
-			return $lvplan->studienplan_id == $parameter_studienplan->studienplan_id;
+		if(isset($parameter_studienplan) && !empty(array_filter( $semester_studienplan, function($studienplan) use($parameter_studienplan){
+			return $studienplan->studienplan_id == $parameter_studienplan->studienplan_id;
 		}))){
 			$aktuelles_studienplan = $parameter_studienplan ;
 		}

From 44b538885f6a642c36a98eef9dbd9c4b2fd42c58 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Jun 2025 11:40:24 +0200
Subject: [PATCH 224/572] use additional result variable

---
 application/controllers/api/frontend/v1/LvPlan.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 00183cce8..63da7892c 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -81,7 +81,8 @@ class LvPlan extends FHCAPI_Controller
 		$end_date = $this->input->get('end_date', TRUE);
 		$lv_id = $this->input->get('lv_id', TRUE);
 
-		$lvplan_events = $this->getDataOrTerminateWithError($this->lvplanlib->getLvPlan($start_date,$end_date,$lv_id));
+		$res_lvplan_events = $this->lvplanlib->getLvPlan($start_date,$end_date,$lv_id);
+		$lvplan_events = $this->getDataOrTerminateWithError($res_lvplan_events);
 		if( is_null($lvplan_events) || isEmptyArray($lvplan_events) )
 		{
 			$lvplan_events = array();

From 43c868000cd85618d5f2a2b92cf36e90432a920b Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Jun 2025 12:05:17 +0200
Subject: [PATCH 225/572] LvPlanLib getLvPlan use success or error object for
 all returns

---
 application/libraries/LvPlanLib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/libraries/LvPlanLib.php b/application/libraries/LvPlanLib.php
index 709762ddc..ef0ad0920 100644
--- a/application/libraries/LvPlanLib.php
+++ b/application/libraries/LvPlanLib.php
@@ -79,9 +79,9 @@ class LvPlanLib{
 			$lvplan_data = getData($lvplan_data) ?? [];
 			$function_error = $this->expand_object_information($lvplan_data);
 			if(!is_null($function_error)){
-				return $function_error;
+				return error($function_error);
 			}
-			return $lvplan_data;
+			return success($lvplan_data);
 		} else {
 			// getting the gruppen_kurzbz of the student in the different studiensemester
 			$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($semester_range);
@@ -102,7 +102,7 @@ class LvPlanLib{
 			$lvplan_query = $this->_ci->LvPlanModel->getLvPlanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
 			if(!$lvplan_query)
 			{
-				return [];
+				return error([]);
 			}
 			
 			

From f017f096f11b413c1814a5f0608b186306b8c86d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Jun 2025 12:13:08 +0200
Subject: [PATCH 226/572] add missing component lvinfo, change path Stundenplan
 to LvPlan

---
 application/core/Events.php               | 2 +-
 public/js/components/Cis/LvPlan/LvPlan.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/core/Events.php b/application/core/Events.php
index cc61cd509..037ce90da 100644
--- a/application/core/Events.php
+++ b/application/core/Events.php
@@ -6,7 +6,7 @@ use CI3_Events as Events;
 Events::on('loadRenderers', function ($renderers) {
 	$fhc_core_renderers =& $renderers();
 	$fhc_core_renderers["lehreinheit"] = array(
-		'calendarEvent' => APP_ROOT.'public/js/components/Cis/Stundenplan/EventTypes/calendarEvent.js',
+		'calendarEvent' => APP_ROOT.'public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js',
 		'modalTitle' => APP_ROOT.'public/js/components/Cis/Mylv/modalTitle.js',
 		'modalContent' => APP_ROOT.'public/js/components/Cis/Mylv/modalContent.js'
 	);
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 3ddeaaa6f..b6d61fcb9 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -3,7 +3,7 @@ import CalendarDate from "../../../composables/CalendarDate.js";
 import LvModal from "../Mylv/LvModal.js";
 import LvMenu from "../Mylv/LvMenu.js"
 import lehreinheitEvent from "./EventTypes/calendarEvent.js"
-
+import LvInfo from '../Mylv/LvInfo.js';
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
@@ -73,7 +73,7 @@ const LvPlan = {
 		}
 	},
 	components: {
-		FhcCalendar, LvModal, LvMenu, lehreinheitEvent, 
+		FhcCalendar, LvModal, LvMenu, lehreinheitEvent, LvInfo
 	},
 	computed:{
 		

From e133f67de25d379b5f5a5165bdb1c235969f4f84 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 12 Jun 2025 12:32:48 +0200
Subject: [PATCH 227/572] fix(LvPlan calendarComponent renderer async modal):
 updates the logic to display the modal for the lv information

---
 public/js/components/Cis/LvPlan/LvPlan.js | 41 ++++++++++++++---------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index b6d61fcb9..575604d4c 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -28,6 +28,7 @@ const LvPlan = {
 			renderComponents: {},
 			isModalContentResolved: false,
 			isModalTitleResolved: false,
+			isShowModal: false,
 		}
 	},
 	props: {
@@ -50,7 +51,17 @@ const LvPlan = {
 	},
 	inject:["renderers"],
 	watch: {
-		
+		modalLoaded:{
+			handler: function (newValue) {
+				if (this.isShowModal && newValue.isModalContentResolved && newValue.isModalTitleResolved) {
+					this.$nextTick(() => {
+						if(this.$refs.lvmodal) this.$refs.lvmodal.show();
+						this.isShowModal = false;
+					});
+				}
+			}, 
+			immediate: true
+		},
 		weekFirstDay: {
 			handler: async function (newValue) {
 				let data = await this.fetchStudiensemesterDetails(newValue);
@@ -76,6 +87,9 @@ const LvPlan = {
 		FhcCalendar, LvModal, LvMenu, lehreinheitEvent, LvInfo
 	},
 	computed:{
+		modalLoaded: function(){
+			return { isModalContentResolved: this.isModalContentResolved, isModalTitleResolved:this.isModalTitleResolved};
+		},
 		
 		downloadLinks: function(){
 			if(!this.studiensemester_start || !this.studiensemester_ende || !this.uid )return;
@@ -112,19 +126,11 @@ const LvPlan = {
 	methods:{
 		modalTitleResolved: function () {
 			this.isModalTitleResolved = true;
-			if(this.isModalContentResolved && this.isModalTitleResolved)
-				Vue.nextTick(() => {
-					if(this.$refs.lvmodal) 
-						this.$refs.lvmodal.show();
-				});
+			
 		},
 		modalContentResolved: function () {
 			this.isModalContentResolved = true;
-			if (this.isModalContentResolved && this.isModalTitleResolved)
-				Vue.nextTick(() => {
-					if (this.$refs.lvmodal)
-						this.$refs.lvmodal.show();
-				});
+			
 		},
 		// component renderers fetches from different addons
 		modalTitleComponent(type){
@@ -203,8 +209,12 @@ const LvPlan = {
 		},
 		showModal: function(event){
 			this.currentlySelectedEvent = event;
-			this.isModalTitleResolved = false;
-			this.isModalContentResolved = false;
+			if(this.isModalContentResolved && this.isModalTitleResolved){
+				if(this.$refs.lvmodal) this.$refs.lvmodal.show();
+			} 
+			else{
+				this.isShowModal = true;
+			} 
 		},
 		updateRange: function ({start,end, mounted}) {
 			let checkDate = (date) => {
@@ -284,6 +294,7 @@ const LvPlan = {
 	template:/*html*/`
 	<template v-if="renderers">
 	<h2>
+		{{JSON.stringify(isShowModal,null,2)}}
 		{{$p.t('lehre/stundenplan')}}
 		<span style="padding-left: 0.4em;" v-show="studiensemester_kurzbz">{{studiensemester_kurzbz}}</span>
 		<span style="padding-left: 0.5em;" v-show="propsViewData?.lv_id && lv"> {{ $p.user_language.value === 'German' ? lv?.bezeichnung : lv?.bezeichnung_english}}</span>
@@ -291,12 +302,12 @@ const LvPlan = {
 	<hr>
 	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal" >
 		<template #modalTitle>
-		<Suspense @resolve="modalTitleResolved">
+		<Suspense @pending="isModalTitleResolved=false" @resolve="modalTitleResolved">
 			<component :is="modalTitleComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
 		</Suspense>
 		</template>
 		<template #modalContent>
-		<Suspense @resolve="modalContentResolved">
+		<Suspense @pending="isModalContentResolved=false" @resolve="modalContentResolved">
 			<component :is="modalContentComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
 		</Suspense>
 		</template>

From aed293f93d143373289edd90c5b4a615a47e3b5d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 12 Jun 2025 13:55:50 +0200
Subject: [PATCH 228/572] fix(removes debug print in LvPlan): removes debug
 prints and changes parameter for the showModal function in LvPlan Day View

---
 public/js/components/Calendar/Day/Page.js | 2 +-
 public/js/components/Cis/LvPlan/LvPlan.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index ef2c6ada7..91af3e48a 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -283,7 +283,7 @@ export default {
 					.then(res => res.data)
 					.then(studiensemester_kurzbz => this.$api.call(
 						ApiAddons.getLvMenu(
-							event.lehreinheit_id,
+							event.lehrveranstaltung_id,
 							studiensemester_kurzbz
 						)
 					))
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 575604d4c..c4dca0e5f 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -294,7 +294,6 @@ const LvPlan = {
 	template:/*html*/`
 	<template v-if="renderers">
 	<h2>
-		{{JSON.stringify(isShowModal,null,2)}}
 		{{$p.t('lehre/stundenplan')}}
 		<span style="padding-left: 0.4em;" v-show="studiensemester_kurzbz">{{studiensemester_kurzbz}}</span>
 		<span style="padding-left: 0.5em;" v-show="propsViewData?.lv_id && lv"> {{ $p.user_language.value === 'German' ? lv?.bezeichnung : lv?.bezeichnung_english}}</span>

From 06c822fd84cc56a8e9e05f7deae5748c4af83c34 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 12 Jun 2025 14:01:27 +0200
Subject: [PATCH 229/572] fix(foto for Studiengang information widget): adds
 foto property for studiengangs personen that are displayed with a foto

---
 application/models/organisation/Studiengang_model.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 7ea8a901c..0195c056f 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -716,13 +716,15 @@ class Studiengang_model extends DB_Model
 			return $gf_ltg;
 		$gf_ltg = getData($gf_ltg) ?: [];
 		$addEmailProperty($gf_ltg);
+		$addFotoProperty($stg_ltg);
 
 		$stv_ltg = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('stvLtg', $stg_obj->oe_kurzbz);
 		if (isError($stv_ltg))
 			return $stv_ltg;
 		$stv_ltg = getData($stv_ltg) ?: [];
 		$addEmailProperty($stv_ltg);
-		
+		$addFotoProperty($stg_ltg);
+
 		$ass = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('ass', $stg_obj->oe_kurzbz);
 		if (isError($ass))
 			return $ass;

From 565925abb29a73119bf8b7be29066f6d33fb94da Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 12 Jun 2025 14:03:32 +0200
Subject: [PATCH 230/572] fix(typo)

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

diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 0195c056f..3afdb493e 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -716,14 +716,14 @@ class Studiengang_model extends DB_Model
 			return $gf_ltg;
 		$gf_ltg = getData($gf_ltg) ?: [];
 		$addEmailProperty($gf_ltg);
-		$addFotoProperty($stg_ltg);
+		$addFotoProperty($gf_ltg);
 
 		$stv_ltg = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('stvLtg', $stg_obj->oe_kurzbz);
 		if (isError($stv_ltg))
 			return $stv_ltg;
 		$stv_ltg = getData($stv_ltg) ?: [];
 		$addEmailProperty($stv_ltg);
-		$addFotoProperty($stg_ltg);
+		$addFotoProperty($stv_ltg);
 
 		$ass = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('ass', $stg_obj->oe_kurzbz);
 		if (isError($ass))

From 982373d03b0633d019667c2fb1bf6ec1f649a450 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Jun 2025 15:53:35 +0200
Subject: [PATCH 231/572] style StudiengangInformation

---
 public/css/Cis4/Cis.css                       |  6 +++
 .../StudiengangInformation.js                 |  2 +-
 .../StudiengangPerson.js                      | 40 +++++++------------
 .../StudiengangVertretung.js                  |  2 +-
 4 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 61f70b68c..80948023c 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -774,4 +774,10 @@ html {
 
 .abgabe-zieldatum-border-green .abgabe-zieldatum-overlay {
 	color: green;
+}
+
+.stgkontaktinfo {
+	display: grid;
+	grid-template-columns: 25px auto;
+	word-wrap: anywhere;
 }
\ No newline at end of file
diff --git a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
index 5c3a80875..aa2438044 100644
--- a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
+++ b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
@@ -30,7 +30,7 @@ components:{
 template:/*html*/`
 		<div id="fhc-studiengang-informationen">
 		<template v-if="studiengang?.bezeichnung && semester">
-			<div class="card card-body mb-3">
+			<div class="card card-body mb-3 border-0">
 				<div class="mb-1">
 					<h2 class="h4 mb-1 pb-0">{{$p.t('lehre','studiengang')}}:</h2>
 					<span class="mb-1">{{studiengang?.bezeichnung}}</span>
diff --git a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js
index 3b9481013..4e15e0a42 100644
--- a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js
+++ b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js
@@ -15,37 +15,27 @@ export default {
 		}
 	},
 	template:/*html*/`
-	<div class="card" :style="{'width':displayWidget?'12rem':'15rem'}">
-		<div class="bg-dark d-flex justify-content-center">
+	<div class="card border-0" :style="{'width':displayWidget?'12rem':'15rem'}">
+		<div class="d-flex justify-content-center">
 			<img  :src="base64Image" alt="mitarbeiter_foto" style="width: 110px; height: auto; object-fir:scale-down;" class="card-img-top" >
 		</div>
-		<div class="card-body">
+		<div class="card-body p-2 flex-grow-0" style="min-height: 50px;">
 			<h6 class="text-center card-title mb-0">{{fullname}} <a v-if="profilViewLink" :href="profilViewLink"><i class="ms-2 fa fa-arrow-up-right-from-square fhc-primary-color" ></i></a></h6>
 		</div>
 		<hr class="my-0">
-		<div class="card-body">
+		<div class="card-body p-2">
+
+			<dl class="stgkontaktinfo">
+				<dt><i class="fa fa-phone me-2"></i></dt>
+				<dd class="mb-3"><a class="fhc-link-color" :href="phone.link">{{phone.number}}</a></dd>
+
+				<dt><i class="fa fa-home me-2"></i></dt>
+				<dd class="mb-3">{{ort}}</dd>
+
+				<dt><i class="fa-regular fa-envelope me-2"></i></dt>
+				<dd class="mb-3"><a class="fhc-link-color" :href="email_link" v-html="formattedEmail"></a></dd>
+			</dl>
 
-			<div class="flex flex-column gap-3">
-			<div class="mb-3">
-				<span>
-					<i class="fa fa-phone me-2"></i>
-					<a class="fhc-link-color" :href="phone.link">{{phone.number}}</a>
-				</span>
-			</div>
-			<div class="mb-3">
-				<span>
-					<i class="fa fa-home me-2"></i>
-					{{ort}}
-				</span>
-			</div>
-			<div>
-				<span>
-					<i class="fa-regular fa-envelope me-2"></i>
-					<a class="fhc-link-color" :href="email_link" v-html="formattedEmail"></a>
-				</span>
-			</div>
-			
-			</div>
 		</div>
 	</div>
 	`,
diff --git a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js
index 142050e9e..5fb86bba7 100644
--- a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js
+++ b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js
@@ -5,7 +5,7 @@ export default {
 		showBezeichnung:Boolean,
 	},
 	template:/*html*/`
-	<div class="card mb-3">
+	<div class="card mb-3 border-0">
 		<div class="card-header">
 			<span>{{title}}</span>
 		</div>

From 3adaf8a52847373467ddcc999cbbd9ab44a02a8c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Jun 2025 16:57:27 +0200
Subject: [PATCH 232/572] make logo configurable in theme, add fhcomplete logo
 as default

---
 application/config/theme.php                  |  1 +
 application/views/templates/CISVUE-Header.php |  2 +-
 public/css/Cis4/Cis.css                       |  4 ++++
 public/css/theme/default.css                  | 14 +++++++-------
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/application/config/theme.php b/application/config/theme.php
index f16482bea..715c4e39c 100644
--- a/application/config/theme.php
+++ b/application/config/theme.php
@@ -7,4 +7,5 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 $config['theme_name']='default';
 $config['theme_css']= "public/css/theme/default.css";
+$config['theme_logo']= "public/images/logo_fh-complete_300x46.png";
 $config['theme_modes']=['light','dark'];
\ No newline at end of file
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index 2f7a3877c..358fc75c9 100644
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -28,7 +28,7 @@ $this->load->view('templates/FHC-Header', $includesArray);
 <header id="cis-header" class="navbar-dark">
 	<cis-menu 
 		root-url="<?= site_url(''); ?>" 
-		logo-url="<?= base_url('/public/images/logo-300x160.png'); ?>" 
+		logo-url="<?= base_url($this->config->item('theme_logo')); ?>" 
 		avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" 
 		logout-url="<?= site_url('Cis/Auth/logout'); ?>"
 		:searchbaroptions="searchbaroptions" 
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 80948023c..57617ec8d 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -780,4 +780,8 @@ html {
 	display: grid;
 	grid-template-columns: 25px auto;
 	word-wrap: anywhere;
+}
+
+.mylv-semester-studiengang-lv .card-header {
+	min-height: 55px;
 }
\ No newline at end of file
diff --git a/public/css/theme/default.css b/public/css/theme/default.css
index 7f39cff54..fe05d8d8a 100644
--- a/public/css/theme/default.css
+++ b/public/css/theme/default.css
@@ -35,8 +35,8 @@
 	--fhc-blue-40: #61aed8;
 	--fhc-blue-50: #00507e;
 
-	--fhc-blue-primary: #00649c;
-	--fhc-blue-primary-highlight: #005585;
+	--fhc-blue-primary: #006095;
+	--fhc-blue-primary-highlight: #0086CB;
 
 	--fhc-red-10: #842029;
 	--fhc-red-20: #800000;
@@ -54,8 +54,8 @@
 
 
 	/* fhc base colors */
-	--fhc-primary: var(--fhc-blue-20);
-	--fhc-primary-highlight: var(--fhc-blue-40);
+	--fhc-primary: var(--fhc-blue-primary);
+	--fhc-primary-highlight: var(--fhc-blue-primary-highlight);
 
 	--fhc-secondary: var(--fhc-white-20);
 	--fhc-secondary-highlight: var(--fhc-white-40);
@@ -97,14 +97,14 @@
 	--fhc-dark: var(--fhc-black-30);
 	--fhc-light: var(--fhc-white-50);
 
-
+	--fhc-cis-menu-lvl-1-color: var(--fhc-white-50);
 }
 
 :root.dark {
 
 	/* fhc base colors */
-	--fhc-primary: var(--fhc-blue-primary-highlight);
-	--fhc-primary-highlight: var(--fhc-blue-primary);
+	--fhc-primary: var(--fhc-blue-primary);
+	--fhc-primary-highlight: var(--fhc-blue-primary-highlight);
 
 	--fhc-secondary: var(--fhc-black-50);
 	--fhc-secondary-highlight: var(--fhc-black-70);

From fce55e38aeb132123a2758367ac4e05f99b7a6d3 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 12 Jun 2025 17:18:52 +0200
Subject: [PATCH 233/572] more & better anw phrasen

---
 system/phrasesupdate.php | 114 +++++++++++++++++++++++++++++++++++----
 1 file changed, 105 insertions(+), 9 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 9a461650b..ad0f7e347 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -30087,18 +30087,58 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'entschuldigungAutoEmailBetreff',
+		'phrase' => 'entFullEmailBetreff',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Entschuldigung zur Befreiung der Anwesenheitspflicht: Neues Dokument wurde hochgeladen.',
+				'text' => 'Neue Entschuldigung zur Befreiung der Anwesenheitspflicht: Neues Dokument wurde hochgeladen.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Excuse note for digital attendances - a new document has been uploaded.',
+				'text' => 'New Excuse note for digital attendances - a new document has been uploaded.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entNewEmailBetreff',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neue Entschuldigung zur Befreiung der Anwesenheitspflicht: Dokument wird nachgereicht.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'New Excuse note for digital attendances - Document will be submitted later',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entEditEmailBetreff',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigung zur Befreiung der Anwesenheitspflicht: Dokument wurde eingereicht.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Excuse note for digital attendances - Document has been submitted',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -32004,17 +32044,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Im Entschuldigungsmanagement können Sie als Studiengangsassistenz beziehungsweise als Administrator die von Studenten hochgeladenen Entschuldigungsdokumente überprüfen und den Status entsprechend vergeben.
-
-				Bitte beachten Sie dass nur Entschuldigungen INNERHALB des angegebenen Zeitraumes angezeigt werden. Sollten Sie nach einer lang wirken Entschuldigung suchen, müssen Sie die Zeitspanne entsprechend weit setzen.',
+				'text' => 'Im Entschuldigungsmanagement können Sie als Studiengangsassistenz beziehungsweise als Administrator die von Studenten hochgeladenen Entschuldigungsdokumente überprüfen und den Status entsprechend vergeben.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'In the excuse management, you as a course assistant or administrator can check the excuse documents uploaded by students and assign the status accordingly.
-
-				Please note that only excuses WITHIN the specified time period are displayed. If you are looking for a long-lasting excuse, you must set the time period accordingly.',
+				'text' => 'In the excuse management, you as a course assistant or administrator can check the excuse documents uploaded by students and assign the status accordingly.',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -32500,6 +32536,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'anwUserEntry',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitseintrag',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendance Entry',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'highlightsettings',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Datumsmarkierung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Date Highlighting',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'editAnwKontrolle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheitskontrolle bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit Attendance Checks',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//
 	// DIGITALE ANWESENHEITEN PHRASEN END
 	//

From 40a0affed98af637f433c6d4df2087830b933204 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Jun 2025 17:38:17 +0200
Subject: [PATCH 234/572] add neutral fhcomplete logo for default theme

---
 public/images/logo_fh-complete_300x46.png | Bin 0 -> 10198 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 public/images/logo_fh-complete_300x46.png

diff --git a/public/images/logo_fh-complete_300x46.png b/public/images/logo_fh-complete_300x46.png
new file mode 100644
index 0000000000000000000000000000000000000000..86a96da17fa3de007b2b722237acd9ca41d00a26
GIT binary patch
literal 10198
zcmV;{Cn?y8P)<h;3K|Lk000e1NJLTq00Arj001rs1^@s6lENg)00004XF*Lt006O%
z3;baP00001b5ch_0olnce*gdgAY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007
zbV*G`2k8b34jm#Go2mc+03ZNKL_t(|+U=cpcpFu^|34$iO|s?QojC3(j-7<`UN%5T
z=skhJ!Ub-CrTuo{E-Xt~dR<ruEG%{Dp(i0^lK>&TS0^s99rq^Nk|h^e*39n@$&yCJ
zaT1f8+~|FtJn@Xq%$%7s=R4o`J#P`X@pXyQMU(*$8Ubo8goN3)+jP)Sj$i!Z7r&_f
zSFbK8Kof2UC@lnqc(w_T1!FUGwE0KNFMja@mQ4Z#f$5P!C<WWL<ifjp|CC&IN-lp`
zfh~q^x}{^0H35P(posu=nC)*taqM1dBK&~WACV+bD#0p(aN?&)2~;vUE|dV3f_jsg
zb-Io-_?gIGKfnAR0IZ7=G~9FXD8fU79H1nMB9bH_*@4RS9}-ANh@yQPiB@A5&#owB
zYg@OQnx}%WXd9CX4z+C`uc);reWS0PKY|OUj_7y${Y8~r^6#yV?c0aN@yA6o9ot*>
zm$B%Jo&7r3w~Hr}m!0C6L5p5k!4`ezN#E1Vs1R<RHH`f1Wa47Ni3n2@pi&}=62^`$
z48{%`bOtu>KgxaUiuyd)?=z!WI6If&8Og-QXi+K@4h-xxcT-i@%(jC^d1lo?4tHAm
z)xT$EWOCKqF|vLC`fe*v?WpY6@$X)o&&+W-vVBi|_%r`1Zt`wXP%0>Y;wpjzRR{_N
zN~ID62v8~M=@BuT%{1#x6qeWX@%lo(t~U6*_Sz-0Nl%Wk;hX@YA6|xD?4R{y=l%1E
z(rWtuZhp0im-f^Eu=3_<3`<Kq;di36vVpm8tp{LKcrai8>7wKK-bu`S@*AqUdQNY^
zx^V1Z!b1aPpd?BX$o{s0l(P*;lIYmhssounB9^UNYFy492!ls}D&XXL85m*%I_rr)
z$oNPNY4#VeKcZ`qzs!;9K-uv}Ynu9fuH@Ko$FUNi4p5xb<H%PB@Z6$F%osP6pa9Pg
zfI=w{8Kx#OOwEv_7y?vE@BvuUB7%AL#_3ELnSny#NkIew)WLz|q$QG*mdM4kM)BTv
zTex>^;W7I;Dl5t3nO`t5yWfEIyNSaXln^D`Hzp$vd;pe05J-uSL=b#XsnB5Jqr(}V
zk<3N2Mzdj85li0NK#`XTni3Zw>-+J1W(Oxk6B`-Y@Agrl!9K5hyka(+9e;<Yl*e^0
zQIZH$C^(%(1rQjZaIhr@s}e;UC?UBqEF7##bZsL_1i4Q{O~lEARqw3PghN~NSx<?t
z9vs2TcV0kZY()RTS8wvV|K_Y1p1J)3Vj}uKxxzz3xO>rTQWGM$?4zxHwoQokWX2=2
z2cc02v>$`5T%R6AiW^t~3`vX}m=|BEVAl9yd><dl+$X=K(jxlxtusX>lterD_)z~u
zNt6MV<i@;2*Y>VrF%Mi%)dLGyoA#7YR-^Mxt!r9NyTSThjGEW(y^xrQFxmd5RwMfg
zE2(bKBZ?vlg@VX%HK~bF3{H%pUgv55yF6LTi+@-^c$nI;&nikBD6VANfeK3NS_xDt
zNK1@l+=x_ivr-%kOaLyOGln->j4b(~z-ND>y|4^zXbAUDNac|&NBg|j%ctacH95sa
z_1`>D+t|uq-(5>fXAfzSAq-EAVfr~)WDSmYw8>6QVCkYsEO>v@Z!%`4PBY6^_iZ}Z
zQR-xj%QqCTuejQyP4?h8Cgf!}ws#ejbEv%D^PZcGKCg4MR>#lVi~3XvTf2Ksf4~x5
z0LT@19Ka;XfvOk0Y;4T_zvu<9I@>_Bf<k%nJq-yP&>P=VRLvh&A3meLE-&6PM+R1w
z9xI>!xPx22*+XX^j3q8W{`}PnfoE?!R|ZxshIXEOZw)W)t93iN3YPEZfpb!L@W#1l
zL!B$R*DsjJ=UdD8rNz@8rxXNYBE65<?6H~01gx>SL%gf@G5rUuu5JtO6xqR`vK98#
z!uR`G@%yRFpPuKm1&$xe;7_(v*=-&0G3)N`;im8Q^}GFFHkNta|IS5uGQcV>uV?XB
zdycCw&3e;u_2qOFMK3T}MbQB|Hjok##a_d@DBBh#(f-d4RH75e+#nme+6Shm0YMND
zeAZIo$0w(empw>kZ+P|7pSk|4-F<=;K%+%I5nrA+f{a0Nj_vkNGk3oHofoij%Cozw
zdGL)N=(ae&z?zUC{&ev<Ufa)02qiesX%1-baxTW?<qSfr@V#VrLq;@7v5{VnjgAOK
zqd2+czH2|&gs#;nyN`t<6Y<L#0$5IlC3*oWt0z$Pf|S_X-UeQxH@Aj?bVmpcKWhi-
ziaGhR?XCNc@W-EukNZ4I;KCVsvV9+|+{ULB`ePpZ`k@BaZIiRo3Hj+>+m26*k*OLb
z6;Aa<s|n%038}u-!Kpd)+RY87PT2xSNKhbCV>KuBERCYXk;+EdzLeN-KN_4d49fvN
zPN3>#RlVw;Xjct=0hMHTgYb}c{lN8BeRjT7GowPtPEC-rt8aFk(7Em$nJ6>Z>+~ib
zSXI#P<NvXI4^|gO7abnTO<A5RQJKk6GSzkW;VQX3Zd|6%Yn(H}sSZ}u=+L*x{lKPY
z#hvss?d*1Q&G7qZommXa>IPH}Rwde4l_ZKzpmMc$IrdB50n6M0J(hv#ZE)yW`DR@*
zCKaX9xdK~V-@@mWC-xzjkuPU9`->_ui2aYwTGeQxx?aBcF+MxNqg{fFt;t~OWaZAI
zGLu1W)*!-_o@04aRt!llfV#J+ie`h{tdN=zanjE;K1yz1t7<U#(claaRWD_iTvh^Q
z#&p}#A)+YaZ0q7sDoQff2d~m)gwUvy@2yg0^N#N_4b0v5HBXO$i%}7wJUt_;UzgE_
zg`8A3b5dhv+ed44Cw#87q-fdp!P5HUK1WSsE2&9NR+SRx$$VW|oZi^M*EI%e8e2(;
zx7nt`LqoWCd@7G_IqIek4s|j~QR0g&rOX>ONUpxcpPXyM4H?m74{_S8I=Z^~=s?|X
z!w3`t3)7>0{%-EE@>Qk&luY)(09BuTX>K>Oy1{fN0G8-*6cr^oP|4gJz>80oD0g%4
zChctl16W}5?HT~U`mf8TapT2PeExp>OW*SEBffzlKYI}Q*@I5WAVr7EZ8nX~CvF!E
z*Q#aPm3=IO`;x{M`STA`2YCXzOP||}HkEE)VWkXgW{=I30hR(7Gu+7lD{6JDtT&Qb
z(<*0g(b|&&t7n(YL*>F)H}5T>#$x?V#x5dE&BqU4?elk?p`EYp`QVhiM<cUR`s~Z@
zLlvxke&y*8SfYeurO(yF-5sc$p6@n#BDpay-+(occC0WM0C%k5z`lK#1C^(b>KPmy
zDBEu9=sxks=XS2{?&DY2EpEpMZgezKr64NY>4Vj)(tW+Dhzn-qJ6h*w4<cA0&}COi
zZy6d#LX4BG?L1Tgz|ZB)NRs66V2|pjqpLPFgxAg=PFqJeDKTLT&qyRMdyviZ-!4t9
zMjrfRt6$eT(^Nu-bEu2)+yP$n<@xReHGJ7Zdb**z3jzngEg?vKT0FS!9xG-`|D5cC
z162elPuv&H)qVw_R16%LDpksp?vMM2>hknx8H1^_JFdQ4qT`7sy+d8phK6we_*5R>
zYGYZKOmW5yN)mjz$+il*-_(uX*h!?F9Y%$Rk`}C@{1`EBF%e<harI2!Dv;j9pI%?d
z4x{-udrw43lDTDge9Jq#PuV+bv5Iu{@qubLTh0)`lKE2gr2=|!9(DD6@5?CEX&e~9
z8X)iakAB$354(Kl+1gm$w-I*Z?qcRF{kdP)+VRJEjLl6u;lB3t$kmmI&=a?bb-KNj
zapA}R0nmoYk8wAO4^5HVnChCHYUi#)6)c$Hv~SHFm+1hk(ZihTU{ymiU%1$IS`8)#
zU?~*>=M9PC&BDeLd!AO2?FUNvpAR>%p|$HbonZR54x;ZqhRSz}$o&4oO2$6_!~c3e
z28Lnz%+6p_{~W)2VOdTV)(2p97;L$%PI%T@Z0FEb57>+JY1xT~-w3C0fKBc4NtF_R
z;;UpvliVvkGbIWrJ+5=4#L2H;TrJnp)05=(%HldF_<y&#hy^p8K4rOCDX0|!i?U*f
zcd<?FIV2B|ZfI#E-No5;L~1k~1F*Wx7WBq;1VO;uZ9&&+qPU`wPd60teVy^t&9c)4
z2n5dfMRu1}LiY>}eb}kIu`pkLSPs5vu<?AMpHED*+PvgD47Ov<9h|LF=N1b%B>BXF
zzg}lxq|0K#@uo5vr3oZ0#R(i%QDoJD8d;kp7ncUBD6!_K(`f!qv5v=@^bXgBh%hy`
z<|Z&})DW3E`1NMFQ*3Rcobje69DAj(wyBkjhrje2e*O=M!lt|S*ceo=|CQt#j$^Z3
ziM=e$%@@n{ICEbS@1nJD(CH21X|0FqLMYvB`@f~`tOhH9ZHMKoGCCrZM<)$Ap>ypn
zmWSWuq$P6had?hDupo~hmj#Q`sz!cwizSS42~ak5bjeoWBw&x-nBFVX^HRypN_GKg
zJs+0JSzC3J9I)b}wf@<AwgT3wf+qAPvmJyyz1Y3(6P?baR#Bqa)Xkc*W4If%y7~NA
zx}dEI>Pl?@RapQ{m9}smN%D`5UH-nemR2`!@0%~4$l$=^H<&NoQZ6$B2dI=he9feO
z9eZh#mJ4UdLxfgt@br>*4SF^hJ3K6#UvH9U3>cQ4NJ_lZKWJ~EXTGd`N98UiuB(ZD
zIeSC}u+d;)%lAjf4^iQ|nlJS-A6(KT%UF?Z+bl{PGWR2&kg?fjG!F`~fs)1SAAx>|
zMUq&*vxrM(k9M(RMe+T8^H}`qYW8>Ze|4v_+sfuWCCr`V%)UBhbQbSk+|*|z|AK^2
zUb}lfnh>YYRe6n$2i@Ws^Fsp((>NDbn!V)WdbdQ!-(1wftkeYA%IAtLo-vZ^D_iNY
zijLLCsPIr!0`&O5YiA!|0azv2-Ej(X;dGe>&Qtv?lD~Yplc}RKW$YzCXD~lKc`d6p
z9ptl(C9JG>8j{C^1#xL!5>rMF!O-5trT^aI`0a^h+nF#j-H|Fr5Cm?#cnZVP6L@R+
zPTo7>RL4eY0=WPDTrQq9S_VX2W(!Y#@Dp8bOn6RaED9GpWs8sGfqM>DH~`BPtQuR|
zc=NEQF}=)e#bE3p+U|oDst#gmw3=T|QNH=X>HrdaEGk(g`b-<GIEEXF*GwnBl}dGt
zzKEi9W&oC7PH!pbwD7lg*YNZm3uMlp(Gj6sH-93FE|@@Pw}p-_3&DXZ)Ioucm-AqW
z+y?e*YbP&${1bn<`Fw{Hr69n>ybLCc%-|(c2L@9o0V*Z2kzq1NO8~Q_hvz?B%R42W
zkpS*44NZFQ>4lbWDPjKfd{5P{u+pb<Ok+!%1F!&QWXAG~uHuwD|Lw2b?DIE+sgvlt
z-}m}kq*g=MKX2{x+)uy1hDSD){pR;DdT45&eGw&z;rF~pS%<|BSbjNqdG%mDyuO0J
z+%%V1x8!(&AfOHkL>(09IcdT@jp~nYtw5#t5BDsZMVLC+<vg~PyNEFF{#m+KBhP%e
zju-cO&z+UzmZs%sgZC(hw+b71RA=z8MXlO?#OM7tx60XCT4E${Y5=P*XWhP7i(oH;
zaiZrQXm+LOBblZsNgh!Pr<*AJFmUF9*3<_-<*PNjXlgySFHx(pgTrOs1AG6vxtuE>
z{hVKR6w=Yvx5sshp`CBm?PlgfpZWwVfMhoxt+IOW4!DwCEtCP0!Ne>3eV@CkQ4W5C
z6C(XD#91anZ{_DJl0wLg4Mst)b0~I)P}h{mwpXp!dDKzvOM=oC3oDwuQ^{nN!0ZGi
zp#g%+d2vg}j4UL`wVYVD2s>H?j#y3{{jW&YlAGe3Oj}BItUeC=#}sW4bB8%|ftNKJ
z`LMjTU&r2(6-{!KljXd#yN0R(3bwr=BbrG=6N!%sMH3W&C`q(+bW^KqV|z&hpB(L9
zA2WkgEF7IeetJCNVIe4#3Ph`jPH$pcVJ)xiufx(0L(5$w;)x1%8s^{MQ^QdosfTAr
zg)lwK=~LEd=wxZ3?`lMIW7JH^aAt|9Y3bl?7qwIn1RfbT$l)B>YBKXmLBk0>*E@&D
z5fj$G$c!$Fm1lN4ebN3jDhW+c|CN`Yi<?;A+IQKv1@Rij4soue?yGF!o4USj!3hBh
zmW)ZE-&QFJUf5ZM=`^-u3EcR)bmI^W=jO+_WNYXJCb@?@_zvF@MTwOMjjYsp8txw&
z8AME|!XvwbdsYb1^*6V)H6}Csy)=*>{NfkCoUNh)NRJJ+Ie)r=Qm@l!UqIy=o|6`-
z0yn@4RY0^_;Q$~}6zu?oTOCBvtxAvl+-enM1WFWj`%^>u#V=<yV2N%Ob0oLwIZl=(
zIaE5)HIA@%zZdcuDA)kVqw0<*dQ{x$4W@R40=bnQ3lJpyxorL7m$MwO<f@;i`sa)#
zlqdUhXIZ}TVL8>nUa%9r0+mNVwF?syB@z5if`0LfAFz%~{qs?9wHJWAi6}~*b}F$i
zpu#(l`NzvIe(?jAFLltT`e*;GmzB9zfA-3-?CPJqy(m*TT~pNf0y4k&#V>xqax=2a
zt3LOc(9d0^^TL57z$%H*hx+Hrth^cA9oP1AEWh~04_ICk`1wreC;4<e@TC$;R<Zx;
zpKGE(k7N7;<`=*C0n5iKAuh&ruj!Gc-qk$Uq<@|a%R6iGVyAMkkKuM*KU(?4FMhED
zma9EV@<@ejvoX=9N+*fFZCJJla2p_j-QFek!MJ4C9T<j{9H1my8$?8)k~WK#bw0e@
zFHQ(Wlq8lncn0lG&;}71q~ho14$Lm-9IFtRnJAC#TUOJ?IblJhXaZ0O0^6HAsIhx|
zCn^P|Cdk{bs5O$W31Dz|Fw1J%7#^%*c(gN~uiGl}UA=eD<{?2U@*;!T*V;ve+35#2
zH9UyK&>(g<wNvWiZ9Y~LNLoZNW%^EbwcDZ-vV)Z5$7rZEn%UH5MgV5TsEG(v($dw#
zFD^;?E{xaEVG&tp-<KVzBtKTeeqB37X4`cF6#{c(HPm%j*zKjr!}&34!h%$MS<~iF
z^k+o|6Qd4fN27_OF3BJ#X@f`!3u2$Honrg>lT-?(#D~(=V|9#GPLPtk7!7-y+9|Q$
z?~ni`<Kmq6<xR$i2NNBn<QH8BouY(R5I8?6%+W6aSY2ntAWF=M3Lz>afDQFV>aDgG
zleIx4hXpzAe^`);+!)WXn;jWUv^tQI)=u`?1B~az+S-*G%;bAXq`0T4og;3M0%1x8
zGh@`0o4PsJ-p%DnVd%Sh9OE%OSjC8FH3ynID6|*qm>Z*}(<-sCwUarKAw;PIWasR(
zSXtfF&ZS9O*?q68H_~jC9DU!~V4|wWHZ~K(0vV(Yrl7flLtQ<m4zL`Ro%>^_^1-y6
zZViG5#j*jF^B7mg<qaTZDyf@#c%t&+C8M}%-UI}}2G9mm2S02$z@lZl9Bs~v)$rAm
z*CC1$)BpGZTMf2c>X#>LdG@w*Nl%FdLE!tJ_j1XHn;pkZj??hP6W7VEC;WaX|GxWt
zhGp0?X?9zBSi9vA^WWRZtYj@8KekB5LdV?mF89yR<I=ffS$@+}Zl09Jy^H5M+O)KF
zcw_{a85P2dH_u|Ey>wM~kCnl<zfFUEvcG-TJcgzx@!|KIx#63=j^qA%`B*NTHHx)c
z3Yh!WdH^21XcX68FoBJ`ikbG>TEYZ@b<f{O?+2}3r{{_H*0S_)Bmer-CDhcnFy@6-
z09=!w#ACN#$m9Q9$s=1UcyoR(*UlS{RuhaQ!MOY0W0zhYdh+%kFD4~El6zkIhF9!G
zOy9nD0U3khc=Vqud2FjQ&hU-f=aQc@m}RSXaMfo!Y!h%$IPd@UTCAeTA71#HHx4(l
zXmkn>-!`AWE?v&wc2oiI*n*KPzGyOqWwi|Z+qbelyfi0=YtB2z7Jw}Xn7ey;;+@s}
zT2#;HZsR%Yfe-nm(Ztd}%p-e90?)nwA0Ak53)Fsn$y`Pa9n8`%)^o?I0&W;Lm<Mh?
z-*IfKsgtNX-{aZe&tUAx4E7aOGU}NX04%-h0s!7$zMV&xEbw@5A6mMCr*=3K8h(7`
zIb1wzG@6h=EIn4@Z~qrh-7=Txh)}Zr_z|sEkyme+%9Jr#T=3_QxGF!HKU_VX=!h^t
z;<2|^anY1vj2R&>ic+sLFzunwJns9#hd*XTwSj-!aUR1nlKK0`>$rEVEdk>{Zkxl{
z5o!GE>kZtp{J<$>SfX#oQEyDhYdDQ4AxVN)l~8WDcV|xCi(2%$S;&q0CoY0u`*+h5
zpCKp|{MY<3EWBU>4J{__TW1@9>u2O3Nw(<vTW995)t=Dq&kLs#5vJzO7rv&g(}Gp>
zo~-cOwY&J}=R?kG0`*OL?*7M0?z(h5^QMjDlK<>?{QmWScJRsiLI8?<eEpw)Z#CPF
zG}3MLyylyCo=<W@6fb}D6T8Y98K0d%lO3#PM1_!<nt;VBGATa;TmUOB+Q#nkat0yT
z$7o#c5C9U~vMv1h>poWPEaj1#&*ko`rn2<0ulsz?Go#hqeCbp+>?-1o<+~Xi6H0Mg
zm&aiA=JlF4A(K}Q)G;qElr(#;de<xrd740mrYF&36&atG4tBum6{SMK-B(WG&Bwp-
z+MkJe>GW7dGE)<n8>?YWlZ}o2eeO{1x^@;j4wm!iyK69Y^)Nec5C^KAg-MqGw3`ps
z6(9h+b++T8B5W*Z+Ng9`e}tS66+`WL@lzAzf!{BE@E<l8H_&aBWZ&_;?7{qHd@4_D
zcY^XKduurO(7&0To6POk&gSJ0*RZLmp1m%bzzrGETr+PxKm59%57!<bHC9Wj#mbjI
z?d8Fn&gZc?IefgejLD<3*s!aZ4XvGgxo{?Rjji1M>I$?W0TeeF`L(c~sF003cH>Oq
zqO>e|>3h0d80`<g?B(4x2M~ZQ_Daybbtb3gr^DJJQUjF?w||UJWe~d4(_Qot<L6>u
z65Xmn%b8Md@UqeavP4&}c2`i6d^wBC9YzPz=zgHy$j){PU%k49(w7pLJuVCEfHg5M
zoucwOlHwwmGAaY?fEA_HAW0H6`VPLU^_?N1qpO>*+<v!OMZTyqFr&DJDWkK{2B{on
zyV^TF+q;Xdt<!6p+lI!Gla|QmKW^uN^(6p&QRU2xaMO$&1Oc|}EoI86OfF0aW4S%S
zUwlkBhW0MvqO{yPG>%f8iL~TcT8$mD0;pgs3-;=PdKOnVF(@JWn9nymMuSSJz-kp)
zSJy_1mvU*BB!&?jsG_B<gS;GDL5zjdvgtH;qf#nm6JW`VECN(YHtZ^9`Z+mVmlnlG
z<xWs((woRhOXS&^S#-H&oH#E|L&l&u*6%82_V}UPFe8UGU+xCr+VjU!Ro}womw&{r
z**OBmr-cXE$I~Kv_HhA9BD5L|?Olw>N<pI#`0vRXs8mV}rcUCb<ay?sy^LL}v4b#m
zFt=SciNEi(<^B?Yl5Q&{wMIq{v4MMw(ev1}*iaOLfThRE@){#u)wbd!4{t1E@%$F%
zPa8pEOc)A<z{}t5LM;e{X@aSdU{8aQ!<{Z_TWc2&_gJxtlH)p=_LSQlX8C&=qErwa
z5lUNo7sE1=NK`3UGBJ(dzySMwhn+IOQpi>bMOzTFjV+1tT<&5oXxX-{qE%MUQ0(=9
z_h!SgA0s*bIrGB1?(e;h?VtPg#R0u>gD6qk&`Pv@f?kvuMp{ZNoA;Hm=Wrz%gX5SN
zXZvm4_Clf}Liys+g{;4G4$~vO*9Dw8E{6kuzK{)f&T;Gu*Q(ik_gofVIFW-#s`=Pu
zvRyQLG<DA{r1;UxefIPI#dD~8ZXuiQK3BGXOr|Y!L_xXtQdbl6(>YSnz!yIsK%o%0
zZst%MBe8!icNH8(k|Y*P%w*BjY(z<7XTeb-!qf~2c4iug2n*r)Sy>ECPok{)*mVFu
zEzwb0)yVHAjo|Qei+JOL5gu*wQ*C9y_7+x>5FNqdjA+K^4xzldi8fQGEZ5i6Q5jU!
z=y>nPy@143(}&8=wQ+X|Jyww$E}Ve-8*=^h97IXt@z1xQYc(=4FCBpCQ6a=eYAGtO
zbAVNDh>BOv9mb*|POzLeeI#|yEu`#;D+v(bvdm~y3I)3k9Yw1N=H9V`m^vz*>V_7Y
zTG~8vd);^4Z0ep{$d-H0bL=ylE$k{NCnY|LR~C%KYVH4f{qf!!YMb<2I%f=}&s@U`
zv$E~;3s(GkfVAXT=1v;H)_q4<)nKAcl-O~gjFDL>Y<>QEmMt7lSU+-aojWC$y5|;B
z@zm8sC>2~bID!C`k{t!*XhMRxW8x5|k4dMdsg=4WJ+V>Yryj6uAR_tzs$M{Hsifm&
zpD&%wy&{i0fH^_R1*kkgP8@JQtbhO&oo3rtdC`oa^jJlHJy^}wgB2(h3KrWZ`7O&2
zu;ke<*;`n_v@zMde9LU_46D;jv))9DOJPxkATS{>lOvT4OnG{_V}bybRyMGHM-dzM
z_)c24x3GfsJBrwT@Ti;`+h06&aDb;l+s-WZ6jo8yWTL6n$OQXj&DRDIrU|C#Xgzg0
z1G!l#j2n?kS#=W?waq9L0vEZYe3><I1a~i-&5_Cm{@;7Q_W3*|Nx~>fOnB^T-dwgG
zQIxpt${9Q|afqy4PD(UZtH@`+97GV{@~Jtb4~k{yp-LKC+K9C?l?mD)a?%pnS6qd@
z-ArARp0Oi_$gHFWLpz)Iln@uCW%@ap@<o!7X_Qtq5)r7R;7AQ=DY0CZtR=wy>=X)T
zI=G>cA>4KCEar`I7IQ7HYGVD4A~x(Q!74#^k`2t>UA-TxRb=LvbcSUlaiF-G7K4e%
za18-2o!eJfX&bu(&aqP|1)lzVGv@9dF8kdWEXR?`rKGEesSkh7``>LMC@_F~ub;!s
z>S|8_00$09L_t)N;kFOgpI0BI#n6sAIFP@8v(s_Rlvmd9)H^?-YcX=g+_AiI+2~_l
z=V-P4zIPU57A0~A**-9z{8WIY$I8^aA&kgKrl6#T=2j!o5gN3oC<&pecNI@`sA-~1
z#q*~A`E>g9^6)JZK34=qna#@A>Z8-u!72^hL%B3bOImU)Yqr>`zKqXJBT%K}-;Z4D
zV*f~kFKmPVR#6jg75&J82QMPQM~SKJ2amGot37fRz|c-{Wf{}Q=CEXRGSBXErYkNu
zQp@6R_x0J&|7<_Pb6yhW?Jcvho#~^};nz|RW}#FlxMtpXu9-L9VK~1oEs{Y|p$I^Y
z&cwdLO6E?^rN?UJ+jV;=tFtA@%SwuXgSHAs->=)n9iQ)@+Qr7v)!jpIurudXguNnj
zwcW7ZY!zAZLjhmyILeymZXhcq3UE%^gcvP)Qzvg9ZshT11GB~tLm?>mV#^WIlA_2S
zl0agBf?H<h5TH_W$?P#)GJA|uO&lKYDDf@`@YrWtSe~24q`VBLu{a@&^prRh3W0B*
zUhLSvXy!03|9BfMZ6-!$r;rt-qQvZdg{!c<o@-ndWzv$OFk5<9d9<1GnkL5OrlSc7
zV%7Fi=AM(r_>mb*igK<FuG@Kpr*_M0HVO!QS8HVLmICI_$R{``kov~{7xXPRTlxLB
z`?#aHp4a|#IeDouaHs*jRiv`EiR8E_zO9wlv3zJ_8P9Gmr~1|3lbRTH%xe@^G|28d
zGdYSLtH`RdX3DA>88c!CVd`Mk>?~#C@D!#51~4r?l$EETIIRkx(Ihe`Qt(_A^kJuR
zf|`5<uhs0Cw5&rCXzNy>QCYm$seIY0Ji)D7R8lW0Px^)*xM&msDizbt$wF^z=jm^D
za^;|K1}8=H=?~jjzSYKdZoXhNvnCAV>cJ7r8ks^|qy|ZXw3Jvj?I}5~Yu@w0M%HBy
z;{Pq0#p=S(9Q%i7B=X4>wtKq&d+)$CcWefuG7~U$b#v>AgO2_GI9Sh;vRWpM&f?%h
zY8rHUVxz;E^V|w1j7;N5Wdncx*IJuVG&YQ<@4SesrVpduUN(MPMGLL%X68-HL#a^k
z)s_+}+RQvD!4Q|1+A2yiumU(#TFczYBUpXQbPUE$rjN~`wo%Xf#kOR6>;8KdjV*1Y
zCC6atv9fNjJhNzgbT|fMyPbtpao&_%j@If})nMX!oq+(Al9|cjOwLcIqE^SB-&}2T
z9|;fP<@+w>;wd?NvevmO^;2^PKm59%E6yG31g0575haNwPcOr0FA(wKALcVIHx1av
z=c{+}-&f9H?IV}7{Xm&4Pric*rp5Eg6=M*9M^+vnF-D8Ay%W7vV%MPxu0DS}I=zWE
z4mUV*+0V*!veVh;WRRO4PkWbzTUN+d(f<6!cBYKU@|lX-t41IQti5A4wGDcPrYF*A
zw($M#3i%3`n|!x;GF|3wBDHEXAwg`~fArXP$W-TjKmFrD5~8)VwRcfxv9i73DA%VY
zqBnN%`u<wtB5eJik{NgE0Bc#jl|ZFLbci4`w2Kaq>Rs)#`)^7D5`s%OjYNH?k{=D;
zvn>AHq+xVeCxHq#FLsx-G`;N19moK>MS<dOEuANkTBf13oyxjqrjE{{y{nro`^tFg
z>z!;im{~eGlLnoEf37>kdb=-6)P}?4W+pLvWC|fc0gTH{qo>Epnk@zV*C*R$=kDqe
zY0&90nB=Qr&3Y4E-4^zDSa@UE25!A{692OxpU;0Sq(P@AB_WEG1RFSn|5$+D*hzy<
zj|8-Jm}$`I8EH34w;DUa1+W0Fd2uCAUo(MWX^CW~C8BFJGCD?sIyjIYHWu({uMxh=
zz~ZtRlH($1Ywx1EzJ;B-cGfnUxU0O5Zc7heRvAzUP*K~2N-1Ck8gzQ}M$b%`w|=;p
zH${oz8A&LW3QDUQd12XBdL)S;g+P3amSJfLG`F?$*juY)Rd{+$1m)E>aQk6fF{5%)
z*lbse50o`BTc;-{DS|L{5WnmwmfgoqMO7rmgwxq=wLSB8+v@5)U+!X5P6}a~U`(AB
zQWGQDbLc2<6+1JMUb4G{8Ruj%KR%Q@Rvn^A-@zp_a+#E$L3fXpZTn04^<XvKR*43k
zp2XM)677|JUj3;MQIt4RVPm$-HkB}QY_>yHKUCRFgHDfD6GV%lg9e?R-0T#a+S=X)
zD-O_NXh);Av7ZAS7Cv3Ioy%sAlBK#fb#~LB(_`xL%-$Oxq$DXeg3Lj2G_@LeaOnzG
zH8_3qnhos)2FT}NWVo7)lvIozT`c|L7yf7c5tsL~9i@v}Y>^}ybq3;N!il%r<KEd&
z0s@p)+8FmI8;Y4bVHkS~D=|w@P}xF*PES}!;3-iF9VwFi;upX8<#d<-59W~R>DGbk
Q9{>OV07*qoM6N<$f}-}@-T(jq

literal 0
HcmV?d00001


From 3a7e14a95fe5401f20a6514f5934a64b79d2912d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Jun 2025 18:07:03 +0200
Subject: [PATCH 235/572] update composer.lock

---
 composer.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.lock b/composer.lock
index 2addc074e..70044eb58 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f97c6194d4d63e90a855add1cf7d0e86",
+    "content-hash": "1b8a408a43c62cb966fa89af338564a7",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -1784,10 +1784,10 @@
         },
         {
             "name": "twbs/bootstrap5",
-            "version": "5.1.3",
+            "version": "5.3.3",
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/twbs/bootstrap/archive/refs/tags/v5.1.3.zip"
+                "url": "https://github.com/twbs/bootstrap/archive/refs/tags/v5.3.3.zip"
             },
             "type": "library"
         },

From cd26667707c3380a8a00b46c4f6501f1f62d8cda Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 12 Jun 2025 18:40:01 +0200
Subject: [PATCH 236/572] refactor backend validierung

---
 .../api/frontend/v1/stv/Abschlusspruefung.php | 93 ++++++++-----------
 .../api/frontend/v1/stv/Aufnahmetermine.php   | 56 +++++------
 .../api/frontend/v1/stv/GemeinsameStudien.php | 32 ++++---
 3 files changed, 87 insertions(+), 94 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
index daaf043b5..d7581c3d1 100644
--- a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
+++ b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
@@ -224,19 +224,12 @@ class Abschlusspruefung extends FHCAPI_Controller
 
 		$formData = $this->input->post('formData');
 
-		$_POST['pruefungstyp_kurzbz'] = $formData['pruefungstyp_kurzbz'];
-		$_POST['akadgrad_id']= $formData['akadgrad_id'];
-		$_POST['vorsitz'] = isset($formData['vorsitz']['mitarbeiter_uid']) ? $formData['vorsitz']['mitarbeiter_uid'] :  $formData['vorsitz'];
-		$_POST['pruefer1'] = isset($formData['pruefer1']['person_id']) ? $formData['pruefer1']['person_id'] : $formData['pruefer1'];
-		$_POST['pruefer2'] = isset($formData['pruefer2']['person_id']) ? $formData['pruefer2']['person_id'] : $formData['pruefer2'];
-		$_POST['pruefer3'] = isset($formData['pruefer3']['person_id']) ? $formData['pruefer3']['person_id'] : $formData['pruefer3'];
-		$_POST['pruefungsantritt_kurzbz'] = $formData['pruefungsantritt_kurzbz'];
-		$_POST['abschlussbeurteilung_kurzbz'] = $formData['abschlussbeurteilung_kurzbz'];
-		$_POST['datum']= $formData['datum'];
-		$_POST['sponsion']= $formData['sponsion'];
-		$_POST['anmerkung'] = $formData['anmerkung'];
-		$_POST['protokoll']= $formData['protokoll'];
-		$_POST['note'] = $formData['note'];
+		$vorsitz = isset($formData['vorsitz']['mitarbeiter_uid']) ? $formData['vorsitz']['mitarbeiter_uid'] :  $formData['vorsitz'];
+		$pruefer1 = isset($formData['pruefer1']['person_id']) ? $formData['pruefer1']['person_id'] : $formData['pruefer1'];
+		$pruefer2 = isset($formData['pruefer2']['person_id']) ? $formData['pruefer2']['person_id'] : $formData['pruefer2'];
+		$pruefer3 = isset($formData['pruefer3']['person_id']) ? $formData['pruefer3']['person_id'] : $formData['pruefer3'];
+
+		$this->form_validation->set_data($formData);
 
 		$this->form_validation->set_rules('pruefungstyp_kurzbz', 'Typ', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
@@ -261,19 +254,19 @@ class Abschlusspruefung extends FHCAPI_Controller
 
 		$result = $this->AbschlusspruefungModel->insert([
 			'student_uid' => $student_uid,
-			'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
-			'akadgrad_id' => $this->input->post('akadgrad_id'),
-			'vorsitz' => $this->input->post('vorsitz'),
-			'pruefungsantritt_kurzbz' => $this->input->post('pruefungsantritt_kurzbz'),
-			'abschlussbeurteilung_kurzbz' => $this->input->post('abschlussbeurteilung_kurzbz'),
-			'datum' => $this->input->post('datum'), //TODO(Manu) check if minute format like FAS
-			'sponsion' => $this->input->post('sponsion'),
-			'pruefer1' => $this->input->post('pruefer1'),
-			'pruefer2' => $this->input->post('pruefer2'),
-			'pruefer3' => $this->input->post('pruefer3'),
-			'protokoll' => $this->input->post('protokoll'),
-			'note' => $this->input->post('note'),
-			'anmerkung' => $this->input->post('anmerkung'),
+			'pruefungstyp_kurzbz' => $formData['pruefungstyp_kurzbz'],
+			'akadgrad_id' => $formData['akadgrad_id'],
+			'vorsitz' => $vorsitz,
+			'pruefungsantritt_kurzbz' => $formData['pruefungsantritt_kurzbz'],
+			'abschlussbeurteilung_kurzbz' => $formData['abschlussbeurteilung_kurzbz'],
+			'datum' => $formData['datum'], //TODO(Manu) check if minute format like FAS
+			'sponsion' => $formData['sponsion'],
+			'pruefer1' => $pruefer1,
+			'pruefer2' => $pruefer2,
+			'pruefer3' => $pruefer3,
+			'protokoll' => $formData['protokoll'],
+			'note' => $formData['note'],
+			'anmerkung' => $formData['anmerkung'],
 			'insertamum' => date('c'),
 			'insertvon' => getAuthUID()
 		]);
@@ -295,20 +288,12 @@ class Abschlusspruefung extends FHCAPI_Controller
 		}
 
 		$formData = $this->input->post('formData');
-		$_POST['student_uid'] = $formData['student_uid'];
-		$_POST['pruefungstyp_kurzbz'] = $formData['pruefungstyp_kurzbz'];
-		$_POST['akadgrad_id']= $formData['akadgrad_id'];
-		$_POST['vorsitz'] =  isset($formData['vorsitz']['mitarbeiter_uid']) ? $formData['vorsitz']['mitarbeiter_uid'] :  $formData['vorsitz'];
-		$_POST['pruefer1'] = isset($formData['pruefer1']['person_id']) ? $formData['pruefer1']['person_id'] : $formData['pruefer1'];
-		$_POST['pruefer2'] = isset($formData['pruefer2']['person_id']) ? $formData['pruefer2']['person_id'] : $formData['pruefer2'];
-		$_POST['pruefer3'] = isset($formData['pruefer3']['person_id']) ? $formData['pruefer3']['person_id'] : $formData['pruefer3'];
-		$_POST['pruefungsantritt_kurzbz'] = $formData['pruefungsantritt_kurzbz'];
-		$_POST['abschlussbeurteilung_kurzbz'] = $formData['abschlussbeurteilung_kurzbz'];
-		$_POST['datum']= $formData['datum'];
-		$_POST['sponsion']= $formData['sponsion'];
-		$_POST['anmerkung'] = $formData['anmerkung'];
-		$_POST['protokoll']= $formData['protokoll'];
-		$_POST['note'] = $formData['note'];
+		$vorsitz = isset($formData['vorsitz']['mitarbeiter_uid']) ? $formData['vorsitz']['mitarbeiter_uid'] :  $formData['vorsitz'];
+		$pruefer1 = isset($formData['pruefer1']['person_id']) ? $formData['pruefer1']['person_id'] : $formData['pruefer1'];
+		$pruefer2 = isset($formData['pruefer2']['person_id']) ? $formData['pruefer2']['person_id'] : $formData['pruefer2'];
+		$pruefer3 = isset($formData['pruefer3']['person_id']) ? $formData['pruefer3']['person_id'] : $formData['pruefer3'];
+
+		$this->form_validation->set_data($formData);
 
 		$this->form_validation->set_rules('pruefungstyp_kurzbz', 'Typ', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
@@ -337,20 +322,20 @@ class Abschlusspruefung extends FHCAPI_Controller
 			'abschlusspruefung_id' => $abschlusspruefung_id
 			],
 			[
-			'student_uid' => $this->input->post('student_uid'),
-			'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
-			'akadgrad_id' => $this->input->post('akadgrad_id'),
-			'vorsitz' => $this->input->post('vorsitz'),
-			'pruefungsantritt_kurzbz' => $this->input->post('pruefungsantritt_kurzbz'),
-			'abschlussbeurteilung_kurzbz' => $this->input->post('abschlussbeurteilung_kurzbz'),
-			'datum' => $this->input->post('datum'),
-			'sponsion' => $this->input->post('sponsion'),
-			'pruefer1' => $this->input->post('pruefer1'),
-			'pruefer2' => $this->input->post('pruefer2'),
-			'pruefer3' => $this->input->post('pruefer3'),
-			'protokoll' => $this->input->post('protokoll'),
-			'note' => $this->input->post('note'),
-			'anmerkung' => $this->input->post('anmerkung'),
+			'student_uid' => $formData['student_uid'],
+			'pruefungstyp_kurzbz' => $formData['pruefungstyp_kurzbz'],
+			'akadgrad_id' => $formData['akadgrad_id'],
+			'vorsitz' => $vorsitz,
+			'pruefungsantritt_kurzbz' => $formData['pruefungsantritt_kurzbz'],
+			'abschlussbeurteilung_kurzbz' => $formData['abschlussbeurteilung_kurzbz'],
+			'datum' => $formData['datum'],
+			'sponsion' => $formData['sponsion'],
+			'pruefer1' => $pruefer1,
+			'pruefer2' => $pruefer2,
+			'pruefer3' => $pruefer3,
+			'protokoll' => $formData['protokoll'],
+			'note' => $formData['note'],
+			'anmerkung' => $formData['anmerkung'],
 			'insertamum' => date('c'),
 			'insertvon' => getAuthUID()
 			]
diff --git a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
index 538626789..b787ea225 100644
--- a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
+++ b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
@@ -61,12 +61,13 @@ class Aufnahmetermine extends FHCAPI_Controller
 		}
 
 
+		$rt_id =	(isset($formData['rt_id']) && !empty($formData['rt_id'])) ? $formData['rt_id'] : null;
+		$anmeldedatum =	(isset($formData['anmeldedatum']) && !empty($formData['anmeldedatum'])) ? $formData['anmeldedatum'] : null;
+		$teilgenommen =	(isset($formData['teilgenommen']) && !empty($formData['teilgenommen'])) ? $formData['teilgenommen'] : false;
+		$studienplan_id = (isset($formData['studienplan_id']) && !empty($formData['studienplan_id'])) ? $formData['studienplan_id'] : null;
+		$punkte = (isset($formData['punkte']) && !empty($formData['punkte'])) ? $formData['punkte'] : null;
 
-		$_POST['rt_id'] =	(isset($formData['rt_id']) && !empty($formData['rt_id'])) ? $formData['rt_id'] : null;
-		$_POST['anmeldedatum'] =	(isset($formData['anmeldedatum']) && !empty($formData['anmeldedatum'])) ? $formData['anmeldedatum'] : null;
-		$_POST['teilgenommen'] =	(isset($formData['teilgenommen']) && !empty($formData['teilgenommen'])) ? $formData['teilgenommen'] : false;
-		$_POST['studienplan_id'] = (isset($formData['studienplan_id']) && !empty($formData['studienplan_id'])) ? $formData['studienplan_id'] : null;
-		$_POST['punkte'] = (isset($formData['punkte']) && !empty($formData['punkte'])) ? $formData['punkte'] : null;
+		$this->form_validation->set_data($formData);
 
 		$this->form_validation->set_rules('punkte', 'Punkte', 'numeric', [
 			'required' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Punkte'])
@@ -90,11 +91,11 @@ class Aufnahmetermine extends FHCAPI_Controller
 
 		$result = $this->RtPersonModel->insert([
 			'person_id' => $person_id,
-			'rt_id' => $_POST['rt_id'],
-			'anmeldedatum' => $_POST['anmeldedatum'],
-			'teilgenommen' => $_POST['teilgenommen'],
-			'studienplan_id' => $_POST['studienplan_id'],
-			'punkte' => $_POST['punkte'],
+			'rt_id' => $rt_id,
+			'anmeldedatum' => $anmeldedatum,
+			'teilgenommen' => $teilgenommen,
+			'studienplan_id' => $studienplan_id,
+			'punkte' => $punkte,
 			'insertamum' => date('c'),
 			'insertvon' => $authUID,
 		]);
@@ -133,12 +134,13 @@ class Aufnahmetermine extends FHCAPI_Controller
 			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'RT_Person ID']), self::ERROR_TYPE_GENERAL);
 		}
 
+		$rt_id =	(isset($formData['rt_id']) && !empty($formData['rt_id'])) ? $formData['rt_id'] : null;
+		$anmeldedatum =	(isset($formData['anmeldedatum']) && !empty($formData['anmeldedatum'])) ? $formData['anmeldedatum'] : null;
+		$teilgenommen =	(isset($formData['teilgenommen']) && !empty($formData['teilgenommen'])) ? $formData['teilgenommen'] : false;
+		$studienplan_id = (isset($formData['studienplan_id']) && !empty($formData['studienplan_id'])) ? $formData['studienplan_id'] : null;
+		$punkte = (isset($formData['punkte']) && !empty($formData['punkte'])) ? $formData['punkte'] : null;
 
-		$_POST['rt_id'] =	(isset($formData['rt_id']) && !empty($formData['rt_id'])) ? $formData['rt_id'] : null;
-		$_POST['anmeldedatum'] =	(isset($formData['anmeldedatum']) && !empty($formData['anmeldedatum'])) ? $formData['anmeldedatum'] : null;
-		$_POST['teilgenommen'] =	(isset($formData['teilgenommen']) && !empty($formData['teilgenommen'])) ? $formData['teilgenommen'] : false;
-		$_POST['studienplan_id'] = (isset($formData['studienplan_id']) && !empty($formData['studienplan_id'])) ? $formData['studienplan_id'] : null;
-		$_POST['punkte'] = (isset($formData['punkte']) && !empty($formData['punkte'])) ? $formData['punkte'] : null;
+		$this->form_validation->set_data($formData);
 
 		$this->form_validation->set_rules('punkte', 'Punkte', 'numeric', [
 			'required' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Punkte'])
@@ -166,11 +168,11 @@ class Aufnahmetermine extends FHCAPI_Controller
 				'person_id' => $person_id,
 			],
 			[
-				'rt_id' => $_POST['rt_id'],
-				'anmeldedatum' => $_POST['anmeldedatum'],
-				'teilgenommen' => $_POST['teilgenommen'],
-				'studienplan_id' => $_POST['studienplan_id'],
-				'punkte' => $_POST['punkte'],
+				'rt_id' => $rt_id,
+				'anmeldedatum' => $anmeldedatum,
+				'teilgenommen' => $teilgenommen,
+				'studienplan_id' => $studienplan_id,
+				'punkte' => $punkte,
 				'insertamum' => date('c'),
 				'insertvon' => $authUID,
 			]
@@ -280,19 +282,21 @@ class Aufnahmetermine extends FHCAPI_Controller
 		{
 			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
 		}
-		$_POST['rt_gesamtpunkte'] =
+		$rt_gesamtpunkte =
 			(isset($formData['rt_gesamtpunkte']) && !empty($formData['rt_gesamtpunkte']))
 				? $formData['rt_gesamtpunkte']
 				: null;
-		$_POST['reihungstestangetreten'] =
+		$reihungstestangetreten =
 			(isset($formData['reihungstestangetreten']) && !empty($formData['reihungstestangetreten']))
 				? $formData['reihungstestangetreten']
 				: null;
-		$_POST['aufnahmegruppe_kurzbz'] =
+		$aufnahmegruppe_kurzbz =
 			(isset($formData['aufnahmegruppe_kurzbz']) && !empty($formData['aufnahmegruppe_kurzbz']))
 				? $formData['aufnahmegruppe_kurzbz']
 				: null;
 
+		$this->form_validation->set_data($formData);
+
 		$this->form_validation->set_rules('rt_gesamtpunkte', 'Rt_gesamtpunkte', 'numeric', [
 			'required' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Rt_gesamtpunkte'])
 		]);
@@ -309,9 +313,9 @@ class Aufnahmetermine extends FHCAPI_Controller
 				'prestudent_id' => $prestudent_id,
 			],
 			[
-				'reihungstestangetreten' => $_POST['reihungstestangetreten'],
-				'rt_gesamtpunkte' => $_POST['rt_gesamtpunkte'],
-				'aufnahmegruppe_kurzbz' => $_POST['aufnahmegruppe_kurzbz'],
+				'reihungstestangetreten' => $reihungstestangetreten,
+				'rt_gesamtpunkte' => $rt_gesamtpunkte,
+				'aufnahmegruppe_kurzbz' => $aufnahmegruppe_kurzbz,
 				'updateamum' => date('c'),
 				'updatevon' => $authUID,
 			]
diff --git a/application/controllers/api/frontend/v1/stv/GemeinsameStudien.php b/application/controllers/api/frontend/v1/stv/GemeinsameStudien.php
index dbf9efce1..97dad48fd 100644
--- a/application/controllers/api/frontend/v1/stv/GemeinsameStudien.php
+++ b/application/controllers/api/frontend/v1/stv/GemeinsameStudien.php
@@ -137,15 +137,17 @@ class GemeinsameStudien extends FHCAPI_Controller
 		}
 
 		$formData = $this->input->post('formData');
-		$_POST['ausbildungssemester'] = (isset($formData['ausbildungssemester']) && !empty($formData['ausbildungssemester']))
+		$ausbildungssemester = (isset($formData['ausbildungssemester']) && !empty($formData['ausbildungssemester']))
 			? $formData['ausbildungssemester']
 			: null;
-		$_POST['mobilitaetstyp_kurzbz'] = (isset($formData['mobilitaetstyp_kurzbz']) && !empty($formData['mobilitaetstyp_kurzbz']))
+		$mobilitaetstyp_kurzbz = (isset($formData['mobilitaetstyp_kurzbz']) && !empty($formData['mobilitaetstyp_kurzbz']))
 			? $formData['mobilitaetstyp_kurzbz']
 			: null;
-		$_POST['studiensemester_kurzbz'] = (isset($formData['studiensemester_kurzbz']) && !empty($formData['studiensemester_kurzbz']))
+		$studiensemester_kurzbz = (isset($formData['studiensemester_kurzbz']) && !empty($formData['studiensemester_kurzbz']))
 			? $formData['studiensemester_kurzbz'] : null;
 
+		$this->form_validation->set_data($formData);
+
 		$this->form_validation->set_rules('mobilitaetstyp_kurzbz', 'Typ', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
 		]);
@@ -177,13 +179,13 @@ class GemeinsameStudien extends FHCAPI_Controller
 
 		$result = $this->MobilitaetModel->insert([
 			'prestudent_id' => $prestudent_id,
-			'mobilitaetstyp_kurzbz' => $_POST['mobilitaetstyp_kurzbz'],
+			'mobilitaetstyp_kurzbz' =>$mobilitaetstyp_kurzbz,
 			'status_kurzbz' => $status_kurzbz,
-			'studiensemester_kurzbz' => $_POST['studiensemester_kurzbz'],
+			'studiensemester_kurzbz' =>$studiensemester_kurzbz,
 			'mobilitaetsprogramm_code' => $mobilitaetsprogramm_code,
 			'gsprogramm_id' => $gsprogramm_id,
 			'firma_id' => $firma_id,
-			'ausbildungssemester' => $_POST['ausbildungssemester'],
+			'ausbildungssemester' =>$ausbildungssemester,
 			'insertvon' => $authUID,
 			'insertamum' => date('c'),
 		]);
@@ -205,19 +207,21 @@ class GemeinsameStudien extends FHCAPI_Controller
 
 		$formData = $this->input->post('formData');
 
-		$_POST['mobilitaet_id'] = (isset($formData['mobilitaet_id']) && !empty($formData['mobilitaet_id']))
+		$mobilitaet_id = (isset($formData['mobilitaet_id']) && !empty($formData['mobilitaet_id']))
 			? $formData['mobilitaet_id'] :
 			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Mobilitaet ID']), self::ERROR_TYPE_GENERAL);
-		$_POST['ausbildungssemester'] = (isset($formData['ausbildungssemester']) && !empty($formData['ausbildungssemester']))
+		$ausbildungssemester = (isset($formData['ausbildungssemester']) && !empty($formData['ausbildungssemester']))
 			? $formData['ausbildungssemester']
 			: null;
-		$_POST['mobilitaetstyp_kurzbz'] = (isset($formData['mobilitaetstyp_kurzbz']) && !empty($formData['mobilitaetstyp_kurzbz']))
+		$mobilitaetstyp_kurzbz = (isset($formData['mobilitaetstyp_kurzbz']) && !empty($formData['mobilitaetstyp_kurzbz']))
 			? $formData['mobilitaetstyp_kurzbz']
 			: null;
-		$_POST['studiensemester_kurzbz'] = (isset($formData['studiensemester_kurzbz']) && !empty($formData['studiensemester_kurzbz']))
+		$studiensemester_kurzbz = (isset($formData['studiensemester_kurzbz']) && !empty($formData['studiensemester_kurzbz']))
 			? $formData['studiensemester_kurzbz']
 			: null;
 
+		$this->form_validation->set_data($formData);
+
 		$this->form_validation->set_rules('mobilitaetstyp_kurzbz', 'Typ', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
 		]);
@@ -247,17 +251,17 @@ class GemeinsameStudien extends FHCAPI_Controller
 
 		$result = $this->MobilitaetModel->update(
 			[
-				'mobilitaet_id' => $_POST['mobilitaet_id'],
+				'mobilitaet_id' => $mobilitaet_id,
 			],
 			[
 				'prestudent_id' => $prestudent_id,
-				'mobilitaetstyp_kurzbz' => $_POST['mobilitaetstyp_kurzbz'],
+				'mobilitaetstyp_kurzbz' => $mobilitaetstyp_kurzbz,
 				'status_kurzbz' => $status_kurzbz,
-				'studiensemester_kurzbz' => $_POST['studiensemester_kurzbz'],
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
 				'mobilitaetsprogramm_code' => $mobilitaetsprogramm_code,
 				'gsprogramm_id' => $gsprogramm_id,
 				'firma_id' => $firma_id,
-				'ausbildungssemester' => $_POST['ausbildungssemester'],
+				'ausbildungssemester' => $ausbildungssemester,
 				'updatevon' => $authUID,
 				'updateamum' => date('c'),
 			]

From 44c5b1dd5e19b8ef538ae5713a5dcb4a305ee6bc Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 12 Jun 2025 19:29:06 +0200
Subject: [PATCH 237/572] Tab Kontakt: refactor displaying of kontakttyp, add
 updateamum, updatevon, filter kontakttyp hidden

---
 application/controllers/api/frontend/v1/stv/Kontakt.php  | 7 +++++--
 .../Stv/Studentenverwaltung/Details/Kontakt/Contact.js   | 9 +++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php
index bcd38853c..b344baf85 100644
--- a/application/controllers/api/frontend/v1/stv/Kontakt.php
+++ b/application/controllers/api/frontend/v1/stv/Kontakt.php
@@ -46,6 +46,7 @@ class Kontakt extends FHCAPI_Controller
 		$this->load->model('organisation/standort_model', 'StandortModel');
 		$this->load->model('ressource/firma_model', 'FirmaModel');
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
+		$this->load->model('person/Kontakttyp_model', 'KontakttypModel');
 
 		// Extra Permissionchecks
 		$permsMa = [];
@@ -443,8 +444,10 @@ class Kontakt extends FHCAPI_Controller
 				THEN public.tbl_kontakt.updateamum
 				ELSE public.tbl_kontakt.insertamum
 			END) AS lastUpdate, st.bezeichnung, f.name");
+		$this->KontakttypModel->addSelect("kt.beschreibung as kontakttypbeschreibung");
 		$this->StandortModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT');
 		$this->FirmaModel->addJoin('public.tbl_firma f', 'ON (f.firma_id = st.firma_id)', 'LEFT');
+		$this->KontakttypModel->addJoin('public.tbl_kontakttyp kt', 'ON (public.tbl_kontakt.kontakttyp = kt.kontakttyp)');
 		$result = $this->KontaktModel->loadWhere(
 			array('person_id' => $person_id)
 		);
@@ -594,8 +597,8 @@ class Kontakt extends FHCAPI_Controller
 				'anmerkung' => $anmerkung,
 				'kontakt' => $kontakt,
 				'zustellung' => $_POST['zustellung'],
-				'insertvon' => 	$uid,
-				'insertamum' => date('c'),
+				'updatevon' => $uid,
+				'updateamum' => date('c'),
 				'standort_id' => $standort_id,
 				'ext_id' => $ext_id
 			]
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index e5bb76461..42896c8b7 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -26,7 +26,7 @@ export default{
 				ajaxRequestFunc: () => this.$api.call(ApiStvContact.get(this.uid)),
 				ajaxResponse: (url, params, response) => response.data,
 				columns:[
-					{title:"Typ", field:"kontakttyp"},
+					{title:"Typ", field:"kontakttypbeschreibung"},
 					{title:"Kontakt", field:"kontakt"},
 					{
 						title:"Zustellung",
@@ -109,7 +109,7 @@ export default{
 
 						let cm = this.$refs.table.tabulator.columnManager;
 
-						cm.getColumnByField('kontakttyp').component.updateDefinition({
+						cm.getColumnByField('kontakttypbeschreibung').component.updateDefinition({
 							title: this.$p.t('global', 'typ')
 						});
 						cm.getColumnByField('kontakt').component.updateDefinition({
@@ -303,7 +303,8 @@ export default{
 		this.$api
 			.call(ApiStvContact.getTypes())
 			.then(result => {
-				this.kontakttypen = result.data;
+				//this.kontakttypen = result.data;
+				this.kontakttypen = result.data.filter(item => item.kontakttyp !== 'hidden');
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
@@ -328,7 +329,7 @@ export default{
 						v-model="contactData.kontakttyp">
 					>
 						<option value="">keine Auswahl</option>
-						<option v-for="typ in kontakttypen" :key="typ.kontakttyp_kurzbz" :value="typ.kontakttyp" >{{typ.kontakttyp}}</option>
+						<option v-for="typ in kontakttypen" :key="typ.kontakttyp_kurzbz" :value="typ.kontakttyp" >{{typ.beschreibung}}</option>
 					</form-input>
 				</div>
 				

From e4100f5fb0bb945b0cdd964252c8b5688385725d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 13 Jun 2025 12:04:31 +0200
Subject: [PATCH 238/572] refactor(Calendar Events Layout): changes the layout
 of the calendar events adjusting to different renderer components

---
 application/core/Events.php                   |  3 +-
 public/css/Cis4/CoreCalendarEvents.css        | 75 +++++++++++++++++++
 public/css/components/calendar.css            | 74 +-----------------
 public/js/apps/Dashboard/Fhc.js               | 24 +++++-
 .../Cis/LvPlan/EventTypes/calendarEvent.js    | 19 ++---
 public/js/components/Cis/LvPlan/LvPlan.js     |  8 +-
 6 files changed, 112 insertions(+), 91 deletions(-)
 create mode 100644 public/css/Cis4/CoreCalendarEvents.css

diff --git a/application/core/Events.php b/application/core/Events.php
index 037ce90da..a7d4754cc 100644
--- a/application/core/Events.php
+++ b/application/core/Events.php
@@ -8,7 +8,8 @@ Events::on('loadRenderers', function ($renderers) {
 	$fhc_core_renderers["lehreinheit"] = array(
 		'calendarEvent' => APP_ROOT.'public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js',
 		'modalTitle' => APP_ROOT.'public/js/components/Cis/Mylv/modalTitle.js',
-		'modalContent' => APP_ROOT.'public/js/components/Cis/Mylv/modalContent.js'
+		'modalContent' => APP_ROOT.'public/js/components/Cis/Mylv/modalContent.js',
+		'calendarEventStyles' => APP_ROOT.'public/css/Cis4/CoreCalendarEvents.css'
 	);
 });
 
diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
new file mode 100644
index 000000000..5efe8b608
--- /dev/null
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -0,0 +1,75 @@
+/* Moodle Events in Month Page */
+.monthPageContainer .lehreinheitEventContent{
+	display: grid;
+	grid-template-columns: auto 1fr;
+	grid-template-rows: 1fr;
+	border-bottom: 1px solid var(--bs-border-color);
+	
+}
+
+.monthPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
+	display:grid;
+	padding: .25rem .5rem .25rem .25rem;
+	margin-right: .25rem;
+	align-content: center;
+}
+
+
+.monthPageContainer .lehreinheitEventContent #lehreinheitEventText {
+	display: flex;
+	flex-wrap: wrap;
+	column-gap: 5px;
+	font-size: .875em;
+	align-items:center;
+	justify-content: space-evenly;
+	
+}
+
+/* Moodle Events in Week Page */
+.weekPageContainer .lehreinheitEventContent {
+	display: grid;
+	grid-template-columns: auto 1fr;
+	grid-template-rows: 1fr;
+
+}
+
+.weekPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
+	display: grid;
+	padding: .25rem .5rem .25rem .25rem;
+	margin-right: .25rem;
+	align-content: center;
+}
+
+
+.weekPageContainer .lehreinheitEventContent #lehreinheitEventText {
+	display: flex;
+	flex-wrap: wrap;
+	column-gap: 5px;
+	align-items: center;
+	justify-content: space-evenly;
+
+}
+
+/* Moodle Events in Day Page */
+.dayPageContainer .lehreinheitEventContent {
+	display: flex;
+	padding-left:4rem;
+	justify-content: space-evenly;
+	align-items: center;
+
+}
+
+.dayPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
+	display:grid;
+	align-content: center;
+	border-right: 1px solid var(--bs-border-color);
+}
+
+.dayPageContainer .lehreinheitEventContent #lehreinheitEventText {
+	display: contents;
+}
+
+.dayPageContainer .lehreinheitEventContent #lehreinheitEventText *{
+	font-weight: 500;
+}
+
diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 7eb6487dc..4d082fa5a 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -413,77 +413,7 @@
 	opacity: 0.5;
 }
 
-
-.dayPageContainer, .weekPageContainer{
+.dayPageContainer,
+.weekPageContainer {
 	container-type: inline-size;
 }
-
-.dayPageContainer .lehreinheitEventContent,
-.weekPageContainer .lehreinheitEventContent {
-	display: flex;
-	flex-direction: column;
-}
-
-.dayPageContainer .moodleEventContent,
-.weekPageContainer .moodleEventContent{
-	display: flex;
-	flex-direction: row;
-}
-
-.dayPageContainer .lehreinheitEventContent{
-	flex-grow:1;
-	align-items: center;
-	font-size: 0.875rem;
-	font-weight: 400;
-	line-height:1.25;
-}
-
-.dayPageContainer .lehreinheitEventHeader {
-	display: flex;
-	flex-direction: column;
-	padding: 1rem;
-	border-right: 1px solid gray;
-}
-
-.dayPageContainer .moodleEventContent {
-	align-items: center;
-	font-size: 0.875rem;
-	font-weight: 400;
-	line-height: 1.25;
-	width:100%;
-}
-
-.weekPageContainer .moodleEventContent {
-	align-items: center;
-	font-size: 0.875rem;
-	font-weight: 400;
-	line-height: 1.25;
-	width: 100%;
-}
-
-.weekPageContainer .lehreinheitEventHeader {
-	display: flex;
-	flex-direction: column;
-	padding: 1rem;
-	border-right: 1px solid gray;
-}
-
-.weekPageContainer .lehreinheitEventContent {
-	flex-grow: 1;
-	align-items: center;
-	font-size: 0.875rem;
-	font-weight: 400;
-	line-height: 1.25;
-}
-
-
-@container( min-width: 500px){
-	.dayPageContainer .lehreinheitEventContent,
-	.weekPageContainer .lehreinheitEventContent {
-		flex-direction: row;
-	}
-
-	.dayPageContainer .lehreinheitEventContent{
-		justify-content: space-evenly;
-	}
-}
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index a40d28193..637e08cce 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -293,10 +293,26 @@ const app = Vue.createApp({
 			.then(res => res.data)
 			.then(data => {
 				for (let rendertype of Object.keys(data)) {
-					
-					let modalTitle = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].modalTitle)));
-					let modalContent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].modalContent)));
-					let calendarEvent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].calendarEvent)));
+					let modalTitle = null;
+					let modalContent = null;
+					let calendarEvent = null;
+					if (data[rendertype].modalTitle)
+						modalTitle = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].modalTitle)));
+					if (data[rendertype].modalContent) 	
+						modalContent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].modalContent)));
+					if (data[rendertype].calendarEvent) 	
+						calendarEvent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].calendarEvent)));
+
+					if (data[rendertype].calendarEventStyles){
+						console.log(data[rendertype].calendarEventStyles)
+						var head = document.head;
+						var link = document.createElement("link");
+						link.type = "text/css";
+						link.rel = "stylesheet";
+						link.href = data[rendertype].calendarEventStyles;
+						head.appendChild(link);
+					}
+
 					if(this.renderers === null) {
 						this.renderers = {};
 					}
diff --git a/public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js b/public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js
index 088fb42f9..6fa957d91 100644
--- a/public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js
+++ b/public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js
@@ -16,15 +16,16 @@ export default {
 		},
 	},
 	template: `
-	<div class="lehreinheitEventHeader" v-if="!event.allDayEvent && event?.beginn && event?.ende" >
-		<span class="small">{{convertTime(event.beginn.split(":"))}}</span>
-		<span class="small">{{convertTime(event.ende.split(":"))}}</span>
+	<div class="lehreinheitEventContent h-100 w-100 p-1" >
+		<div id="lehreinheitEventHeader" class="h-100 " v-if="!event.allDayEvent && event?.beginn && event?.ende" >
+			<span class="small">{{convertTime(event.beginn.split(":"))}}</span>
+			<span class="small">{{convertTime(event.ende.split(":"))}}</span>
+		</div>
+		<div id="lehreinheitEventText">
+			<span>{{event.topic}}</span>
+			<span v-for="lektor in event.lektor">{{lektor.kurzbz}}</span>
+			<span>{{event.ort_kurzbz}}</span>
+		</div>
 	</div>
-	<div class="lehreinheitEventContent">
-		<span>{{event.topic}}</span>
-		<span v-for="lektor in event.lektor">{{lektor.kurzbz}}</span>
-		<span>{{event.ort_kurzbz}}</span>
-	</div>
-	
 	`,
 }
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index c4dca0e5f..49fa88a60 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -336,13 +336,13 @@ const LvPlan = {
 			</div>
 		</template>
 		<template #monthPage="{event,day}">
-			<div @click="showModal(event)" class="p-1">
+			<div @click="showModal(event)" class="monthPageContainer " >
 				<component :is="calendarEventComponent(event.type)" :event="event" ></component>
 			</div>
 		</template>
 		<template #weekPage="{event,day}">
 			<div @click="showModal(event)" type = "button"
-				class="weekPageContainer position-relative border border-secondary border d-flex flex-col align-items-center justify-content-evenly h-100"
+				class="weekPageContainer position-relative border border-secondary border  h-100"
 				:class="{'p-1':event.allDayEvent}"
 				style = "overflow: auto;" >
 				<component :is="calendarEventComponent(event.type)" :event="event" ></component>
@@ -350,9 +350,7 @@ const LvPlan = {
 		</template>
 		<template #dayPage="{event,day,mobile}">
 			<div @click="mobile? showModal(event):null" type="button" class="dayPageContainer fhc-entry border border-secondary border m-0 h-100  text-center">
-				<div class="h-100 d-flex flex-col justify-content-evenly align-items-center">
-					<component :is="calendarEventComponent(event.type)" :event="event"></component>
-				</div>
+				<component :is="calendarEventComponent(event.type)" :event="event"></component>
 			</div>
 		</template>
 		<template #pageMobilContent="{lvMenu, event}">

From 7b5b6992c7b16d55592df6062bd2959711559a1d Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 13 Jun 2025 13:02:26 +0200
Subject: [PATCH 239/572] Tab Kontakt: Adresse: use Autocomplete and Dropdown
 for Firma, Bankverbindung: use authUID

---
 .../api/frontend/v1/stv/Kontakt.php           |  27 ++++-
 public/js/api/factory/stv/kontakt/address.js  |   6 +
 .../Details/Kontakt/Address.js                | 114 ++++++++----------
 3 files changed, 82 insertions(+), 65 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php
index b344baf85..e75802727 100644
--- a/application/controllers/api/frontend/v1/stv/Kontakt.php
+++ b/application/controllers/api/frontend/v1/stv/Kontakt.php
@@ -28,7 +28,8 @@ class Kontakt extends FHCAPI_Controller
 			'getStandorte' => ['admin:r', 'assistenz:r'],
 			'getStandorteByFirma' => ['admin:r', 'assistenz:r'],
 			'getKontakte' => ['admin:r', 'assistenz:r'],
-			'getBankverbindung' => ['mitarbeiter/bankdaten:r', 'student/bankdaten:r']
+			'getBankverbindung' => ['mitarbeiter/bankdaten:r', 'student/bankdaten:r'],
+			'getAllFirmen' => ['admin:r', 'assistenz:r']
 		]);
 
 		// Load Libraries
@@ -673,6 +674,7 @@ class Kontakt extends FHCAPI_Controller
 		$iban = $this->input->post('iban');
 		$typ = $this->input->post('typ');
 		$verrechnung = $this->input->post('verrechnung');
+		$uid = getAuthUID();
 
 		$result = $this->BankverbindungModel->insert(
 			[
@@ -683,7 +685,7 @@ class Kontakt extends FHCAPI_Controller
 				'iban' => $iban,
 				'blz' => $blz,
 				'kontonr' => $kontonr,
-				'insertvon' => 'uid',
+				'insertvon' =>  $uid,
 				'insertamum' => date('c'),
 				'typ' => $typ,
 				'verrechnung' => $verrechnung,
@@ -800,4 +802,25 @@ class Kontakt extends FHCAPI_Controller
 
 		return $this->GemeindeModel->checkLocation($_POST['plz'], $_POST['gemeinde'], $_POST['ort']);
 	}
+
+	/*
+	* returns list of all companies
+	* as key value list to be used in select or autocomplete
+	*/
+	public function getAllFirmen()
+	{
+		$sql = "
+			SELECT
+				f.firma_id, f.name,
+				f.name AS label
+			FROM public.tbl_firma f
+			ORDER BY f.name ASC";
+
+		$result = $this->FirmaModel->execReadOnlyQuery($sql);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+
 }
diff --git a/public/js/api/factory/stv/kontakt/address.js b/public/js/api/factory/stv/kontakt/address.js
index 78027835f..4402b50d6 100644
--- a/public/js/api/factory/stv/kontakt/address.js
+++ b/public/js/api/factory/stv/kontakt/address.js
@@ -67,5 +67,11 @@ export default {
 			method: 'get',
 			url: 'api/frontend/v1/stv/address/getNations/'
 		};
+	},
+	getAllFirmen(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/kontakt/getAllFirmen/'
+		}
 	}
 };
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 9e579351c..a69c34b3f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -208,11 +208,12 @@ export default{
 			nations: [],
 			adressentypen: [],
 			firmen: [],
+			listFirmen: [],
 			filteredFirmen: [],
+			selectedFirma: null,
 			abortController: {
 				suggestions: null,
-				places: null,
-				firmen: null
+				places: null
 			},
 		}
 	},
@@ -231,6 +232,9 @@ export default{
 		uid() {
 			this.reload();
 		},
+		selectedFirma(newVal) {
+			this.addressData.firma_id = newVal?.firma_id || '';
+		}
 	},
 	methods:{
 		actionNewAdress() {
@@ -243,7 +247,7 @@ export default{
 				if(this.addressData.adresse_id)
 				{
 					this.addressData.address.plz = this.addressData.plz;
-				//	delete this.addressData.plz;
+					//	delete this.addressData.plz;
 					this.loadPlaces(this.addressData.address.plz);
 					this.$refs.adressModal.show();
 
@@ -324,18 +328,13 @@ export default{
 					this.places = result.data;
 				});
 		},
-		search(event) {
-			if (this.abortController.firmen) {
-				this.abortController.firmen.abort();
-			}
+		filterFirmen(event) {
+			const query = event?.query?.toLowerCase()?.trim() || "";
 
-			this.abortController.firmen = new AbortController();
-
-			return this.$api
-				.call(ApiStvCompany.get(event.query))
-				.then(result => {
-					this.filteredFirmen = result.data.retval;
-				});
+			this.filteredFirmen = this.listFirmen.filter(item => {
+				const label = (item.label || "").toLowerCase();
+				return label.includes(query);
+			});
 		},
 		hideModal(modalRef) {
 			this.$refs[modalRef].hide();
@@ -372,10 +371,17 @@ export default{
 				this.adressentypen = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$api
+			.call(ApiStvAddress.getAllFirmen())
+			.then(result => {
+				this.listFirmen = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
 	<div class="stv-details-kontakt-address h-100 pt-3">
-		
+
 		<!--Modal: AddressModal-->
 		<bs-modal ref="adressModal" dialog-class="modal-dialog-scrollable">
 			<template #title>
@@ -400,7 +406,7 @@ export default{
 						</option>
 						</form-input>
 					</div>
-					
+
 					<div class="row mb-3">
 						<form-input
 							type="text"
@@ -410,7 +416,7 @@ export default{
 						>
 						</form-input>					
 				</div>
-				
+
 				<div class="row mb-3">
 					<form-input
 						type="select"
@@ -428,7 +434,7 @@ export default{
 						</option>
 						</form-input>
 				</div>
-													
+							
 				<div class="row mb-3">
 					<form-input
 						type="text"
@@ -440,7 +446,7 @@ export default{
 					>
 					</form-input>					
 				</div>
-											
+
 				<div class="row mb-3">
 					<form-input
 						v-if="addressData.nation == 'A'"
@@ -457,17 +463,17 @@ export default{
 							>
 							{{gemeinde.name}}
 						</option>
-						</form-input>
-						<form-input
+					</form-input>
+					<form-input
 							v-else
 							type="text"
 							:label="$p.t('person/gemeinde')"
 							name="addressData.gemeinde"
 							v-model="addressData.gemeinde"
 						>	
-						</form-input>
-					</div>
-				
+					</form-input>
+				</div>
+
 				<div class="row mb-3">
 					<form-input
 						v-if="addressData.nation == 'A'" 
@@ -494,7 +500,7 @@ export default{
 						>	
 					</form-input>
 				</div>
-				
+
 				<div class="row mb-3">
 					<div class="col-sm-4">
 						<form-input
@@ -507,7 +513,7 @@ export default{
 						</form-input>
 					</div>
 				</div>
-				
+
 				<div class="row mb-3">
 					<div class="col-sm-4">
 						<form-input
@@ -520,7 +526,7 @@ export default{
 						</form-input>
 					</div>
 				</div>
-				
+
 				<div class="row mb-3">
 					<form-input
 						type="text"
@@ -530,7 +536,7 @@ export default{
 					>
 					</form-input>
 				</div>
-				
+
 				<div class="row mb-3">
 					<div class="col-sm-4">
 						<form-input
@@ -543,58 +549,38 @@ export default{
 						</form-input>
 					</div>
 				</div>
-					
-				<div v-if="statusNew" class="row mb-3">
+
+				<div class="row mb-3">
 					<form-input
 						type="autocomplete"
 						:label="$p.t('person/firma')"
 						name="firma_name"
-						v-model="addressData.firma"  
-						optionLabel="name" 
+						v-model="selectedFirma"
+						optionLabel="label"
+						optionValue="firma_id"
+						dropdown
+						forceSelection
 						:suggestions="filteredFirmen" 
-						@complete="search" 
-						:min-length="3"
-					>
-					</form-input>
-				</div>				
-					
-				<div v-else class="row mb-3">
-					<form-input
-						v-if="addressData.firmenname" 
-						type="text"
-						name="name"
-						:label="$p.t('person/firma')"
-						v-model="addressData.firmenname"
-					>
-					</form-input>
-					<form-input
-						v-else 
-						type="autocomplete"
-						:label="$p.t('person/firma')"
-						name="firma_name"
-						v-model="addressData.firma"  
-						optionLabel="name" 
-						:suggestions="filteredFirmen" 
-						@complete="search" 
+						@complete="filterFirmen"
 						:min-length="3"
 					>
 					</form-input>
 				</div>
-				
+
 				<div class="row mb-3">
 					<input type="hidden" class="form-control" id="firma_id" v-model="addressData.firma_id">
 				</div>
-				
+
 				<div class="row mb-3">
 					<form-input
 						type="text"
 						name="firma_zusatz"
-						:label="$p.t('person/firma_zusatz')"
+						:label="$p.t('global/name')"
 						v-model="addressData.name"
 					>
 					</form-input>
 				</div>
-				
+
 				<div class="row mb-3">
 					<form-input
 							type="text"
@@ -604,16 +590,16 @@ export default{
 						>
 					</form-input>
 				</div>
-			
+
 			</form-form>
-			
+
 			<template #footer>
 				<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" @click="reload()">{{$p.t('ui', 'abbrechen')}}</button>
 				<button v-if="statusNew" type="button" class="btn btn-primary" @click="addNewAddress()">OK</button>
 				<button v-else type="button" class="btn btn-primary" @click="updateAddress(addressData.adresse_id)">OK</button>
             </template>
 		</bs-modal>
-			
+
 		<core-filter-cmpt
 			ref="table"
 			:tabulator-options="tabulatorOptions"
@@ -629,3 +615,5 @@ export default{
 	</div>`
 };
 
+
+

From 9e0bad76ac092b3eadfea373d654088598b3254d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 16 Jun 2025 09:30:40 +0200
Subject: [PATCH 240/572] refactor(Studium): uses link color that adjusts to
 dark mode and adjusts the button directions next to the select fields of the
 Studium View

---
 public/js/components/Cis/Studium/Studium.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index 7ead07ffe..246bbb296 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -272,7 +272,7 @@ export default {
 		<template #content>
 			<div v-if="Array.isArray(selectedLehrveranstaltung.lektoren) && selectedLehrveranstaltung.lektoren.length>0" class="mb-4">
 				<h4>Lektoren:</h4>
-				<a :href="'mailto:'+lektor?.email" class="mx-2" v-for="lektor in selectedLehrveranstaltung.lektoren">{{lektor.name}}</a>
+				<a :href="'mailto:'+lektor?.email" class="fhc-link-color mx-2" v-for="lektor in selectedLehrveranstaltung.lektoren">{{lektor.name}}</a>
 			</div>
 			<h4>Menu:</h4>
 		</template>
@@ -296,13 +296,13 @@ export default {
 		<div>
 		<h6>Studiengang:</h6>
 		<div class="input-group">
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(-1)">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="studiengaenge" v-model="selectedStudiengang" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 				<option v-for="studiengang in studiengaenge" @click="changeSelectedStudienGang(studiengang.studiengang_kz)" :key="studiengang.studiengang_kz" :value="studiengang.studiengang_kz" >{{studiengangTitel(studiengang)}}</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(-1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(1)">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
 			</button>
 		</div>
@@ -311,13 +311,13 @@ export default {
 		<div>
 		<h6>Semester:</h6>
 		<div class="input-group">
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(-1)">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="semester" v-model="selectedSemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 				<option v-for="sem in semester" @click="changeSelectedSemester(sem)" :key="semester" :value="sem">{{sem}}. Semester</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(-1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(1)">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
 			</button>
 		</div>
@@ -326,13 +326,13 @@ export default {
 		<div>
 		<h6>Studienordnung:</h6>
 		<div class="input-group">
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(-1)">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="studienordnung" v-model="selectedStudienordnung" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 				<option v-for="ordnung in computedStudienOrdnungSelectValues" :disabled="ordnung.disabled" @click="changeSelectedStudienPlan(ordnung?.studienplan?.studienplan_id)" :key="ordnung?.studienplan?.bezeichnung	" :value="ordnung?.studienplan?.studienplan_id">{{ordnung.bezeichnung}}</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(-1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(1)">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
 			</button>
 		</div>
@@ -351,7 +351,7 @@ export default {
 			<div class="card-body">
 				<ul class="list-group list-group-flush">
 					<li class="d-flex list-group-item" v-for="lv in lehrveranstaltung.lehrveranstaltungen">
-						<a class="link-dark d-block me-auto" href="#" @click="openLvUebersicht(lv)">{{lv.bezeichnung}}</a>
+						<a class="fhc-link-color d-block me-auto" href="#" @click="openLvUebersicht(lv)">{{lv.bezeichnung}}</a>
 						<p>{{lv.lehrform_kurzbz}}</p>
 					</li>	
 				</ul>

From f321e07731f6caffa12cdfecfc927d52bb6f5e75 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 16 Jun 2025 10:22:28 +0200
Subject: [PATCH 241/572] Move new SearchBarLib to SearchLib

---
 application/libraries/SearchBarLib.php | 1471 ++++++++----------------
 application/libraries/SearchLib.php    | 1080 +++++++++++++++++
 2 files changed, 1572 insertions(+), 979 deletions(-)
 create mode 100644 application/libraries/SearchLib.php

diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index a14319bba..13b0efdbb 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -32,12 +32,13 @@ class SearchBarLib
 	const ERROR_WRONG_TYPES = 'ERR004';
 	const ERROR_NOT_AUTH = 'ERR005';
 
+	// List of allowed types of search
+	const ALLOWED_TYPES = ['mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'organisationunit', 'raum', 'person', 'student','studentStv', 'prestudent', 'document', 'cms'];
+
+	const PHOTO_IMG_URL = '/cis/public/bild.php?src=person&person_id=';
+
 	private $_ci; // Code igniter instance
 
-	private $_searchfunction_priorities = [];
-	private $_numeric_searchfunctions = [];
-	private $_allowed_searchfunctions = [];
-	
 	/**
 	 * Gets the CI instance and loads model
 	 */
@@ -45,22 +46,8 @@ class SearchBarLib
 	{
 		$this->_ci =& get_instance(); // get code igniter instance
 
-		// It is loaded only to have the DB functions available
+		// It is loaded only to have the DB_Model available
 		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
-
-		// Load Config
-		$this->_ci->load->config('search', true);
-		$this->_ci->load->config('searchfunctions', true);
-
-		$this->_ci->load->library('PhrasesLib', [['search'], null], 'search_phrases');
-
-		// Precompute helper arrays
-		foreach ($this->_ci->config->item('searchfunctions') as $key => $arr) {
-			$this->_searchfunction_priorities[$key] = $arr['priority'];
-			if ($arr['force_integer'] ?? false)
-				$this->_numeric_searchfunctions[] = $key;
-			$this->_allowed_searchfunctions[] = $key;
-		}
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -68,1013 +55,539 @@ class SearchBarLib
 
 	/**
 	 * It performes the search of the given search string using the specified search types
-	 *
-	 * @param string							$searchstring
-	 * @param array								$types (optional)
-	 *
-	 * @return stdClass		containing an array with the result on index 0
-	 * 						and the overall query time on index 1.
 	 */
-	public function search($searchstring, $types = [])
+	public function search($searchstr, $types)
 	{
-		if (!$types) {
-			$types = $this->_ci->config->item('search');
-		} else {
-			$tmp = [];
-			$missing = [];
-			foreach ($types as $type) {
-				$typeconfig = $this->_ci->config->item($type, 'search');
-				if (!$typeconfig) {
-					$missing[] = $type;
-				} else {
-					$tmp[$type] = $typeconfig;
-				}
-			}
-			if ($missing) {
-				$p = $this->_ci->search_phrases;
-				return error(array_map(function ($type) use ($p) {
-					return $p->t('search', 'error_missing_config', [
-						'type' => $type
-					]);
-				}, $missing));
-			}
-			$types = $tmp;
-		}
+		// Checks if the given parameters are fine
+		$search = $this->_checkParameters($searchstr, $types);
 
+		// If the check was successful then perform the search
+		if (isSuccess($search)) $search = $this->_search($searchstr, $types);
 
-		// Convert searchstring into array
-		list($searchArray, $searchstring) = $this->_convertQuery($searchstring, $types);
-
-
-		$sql = $this->getDynamicSearchSqls($searchArray, array_keys($types));
-		if (isError($sql))
-			return $sql;
-		if (!hasData($sql)) {
-			$retval = success([]);
-			$retval->meta = ['time' => 0, 'searchstring' => $searchstring];
-			return $retval;
-		}
-
-		$msc = microtime(true);
-		$result = $this->_ci->BenutzerModel->execReadOnlyQuery(getData($sql));
-		$msc = microtime(true) - $msc;
-
-		if (isError($result))
-			return $result;
-
-		$retval = success($result->retval);
-		$retval->meta = [
-			'time' => $msc,
-			'searchstring' => $searchstring
-		];
-
-		return $retval;
-	}
-
-	/**
-	 * Generates the search query for the given search string and the
-	 * specified search type.
-	 *
-	 * @param array								$searchArray
-	 * @param string							$table
-	 *
-	 * @return stdClass		containing the query string.
-	 */
-	public function getDynamicSearchSql($searchArray, $table)
-	{
-		$res = $this->checkConfig($table);
-		if (isError($res))
-			return $res;
-		$table_config = getData($res);
-
-		$sql_with = [];
-		
-		$sql_select = $this->prepareDynamicSearchSql($sql_with, $searchArray, $table);
-
-		if (!$sql_select)
-			return success("");
-
-		$lang = getUserLanguage();
-
-		$output = "WITH";
-		if ($sql_with && $sql_with[0] === 'RECURSIVE') {
-			$output .= " RECURSIVE";
-			array_shift($sql_with);
-		}
-
-		$output .= "
-			lang (index) AS (
-				SELECT index
-				FROM public.tbl_sprache
-				WHERE sprache=" . $this->_ci->db->escape($lang) . "
-				LIMIT 1
-			),
-			auth (uid) AS (
-				SELECT " . $this->_ci->db->escape(getAuthUID()) . " AS uid
-			)";
-
-		if ($sql_with) {
-			$sql_with = array_unique($sql_with);
-			$output .= ", " . implode(", ", $sql_with);
-		}
-
-		$other_selects = "";
-		if (isset($table_config['resultfields']))
-			$other_selects = implode(", ", $table_config['resultfields']);
-		if ($other_selects)
-			$other_selects = ", " . $other_selects;
-
-		$output .= "
-			, q (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
-				SELECT " . $this->_formatPrimarykeys($table_config['primarykey']) . ", MAX(rank)
-				FROM (" . implode(" UNION ", $sql_select) . ") q
-				GROUP BY " . $this->_formatPrimarykeys($table_config['primarykey']) . "
-			)
-			SELECT
-				" . $this->_ci->db->escape($table) . " AS type,
-				q.rank
-				" . $other_selects . "
-			FROM q
-			" . ($table_config['resultjoin'] ?? "") . "
-			ORDER BY rank DESC
-		";
-
-		return success($output);
-	}
-
-	/**
-	 * Generates the search query for the given search string and the
-	 * specified search types.
-	 *
-	 * @param array								$searchArray
-	 * @param array								$types
-	 *
-	 * @return stdClass		containing the query string.
-	 */
-	public function getDynamicSearchSqls($searchArray, $types)
-	{
-		$with = [];
-		$selects = [];
-		foreach ($types as $type) {
-			$res = $this->checkConfig($type);
-			if (isError($res))
-				return $res;
-			$table_config = getData($res);
-
-			$select = $this->prepareDynamicSearchSql($with, $searchArray, $type);
-			if (!$select)
-				continue;
-
-			$with[] = "final_" . $type . " (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
-				SELECT " . $this->_formatPrimarykeys($table_config['primarykey']) . ", MAX(rank)
-				FROM (" . implode(" UNION ", $select) . ") q
-				GROUP BY " . $this->_formatPrimarykeys($table_config['primarykey']) . "
-			)";
-
-			$selects[] = "
-				SELECT
-					" . $this->_ci->db->escape($type) . " AS type,
-					rank,
-					TO_JSONB((SELECT x FROM (SELECT " . implode(", ", $table_config['resultfields'] ?? ['*']) . ") x)) AS data
-				FROM final_" . $type  . "
-				" . ($table_config['resultjoin'] ?? "");
-		}
-
-		if (!$selects)
-			return success("");
-
-		$recursive = "";
-		if ($with && $with[0] === "RECURSIVE") {
-			$recursive = "RECURSIVE ";
-			array_shift($with);
-		}
-
-		$with = array_unique($with);
-
-		$lang = getUserLanguage();
-		array_unshift($with, "lang (index) AS (
-			SELECT index
-			FROM public.tbl_sprache
-			WHERE sprache=" . $this->_ci->db->escape($lang) . "
-			LIMIT 1
-		)");
-		array_unshift($with, "auth (uid) AS (
-			SELECT " . $this->_ci->db->escape(getAuthUID()) . " AS uid
-		)");
-
-		return success("
-			WITH " . $recursive . implode(", ", $with) . "
-			SELECT *
-			FROM (" . implode(" UNION ", $selects) . ") q
-			ORDER BY rank DESC
-			LIMIT 100
-		");
-	}
-
-	//------------------------------------------------------------------------------------------------------------------
-	// Protected methods
-
-	/**
-	 * Check config
-	 *
-	 * @param string							$name
-	 *
-	 * @return stdClass
-	 */
-	protected function checkConfig($name)
-	{
-		$table_config = $this->_ci->config->item($name, 'search');
-
-		if (!$table_config)
-			return error($this->_ci->search_phrases->t('search', 'error_missing_config', [
-				'type' => $name
-			]));
-
-		$errors = [];
-		if (!isset($table_config['table'])
-			|| !is_string($table_config['table'])
-			|| !$table_config['table']
-		) {
-			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
-				'type' => $name,
-				'field' => 'table'
-			]);
-		}
-		if (!isset($table_config['primarykey'])
-			|| !is_string($table_config['primarykey'])
-			|| !$table_config['primarykey']
-		) {
-			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
-				'type' => $name,
-				'field' => 'primarykey'
-			]);
-		}
-		if (!isset($table_config['resultfields'])
-			|| !is_array($table_config['resultfields'])
-			|| !$table_config['resultfields']
-		) {
-			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
-				'type' => $name,
-				'field' => 'resultfields'
-			]);
-		}
-		if (!isset($table_config['searchfields'])
-			|| !is_array($table_config['searchfields'])
-			|| !$table_config['searchfields']
-		) {
-			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
-				'type' => $name,
-				'field' => 'searchfields'
-			]);
-		} else {
-			foreach ($table_config['searchfields'] as $searchfield => $config) {
-				if (!isset($config['field'])
-					|| !is_string($config['field'])
-					|| !$config['field']
-				) {
-					$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config_searchfield', [
-						'type' => $name,
-						'searchfield' => $searchfield,
-						'field' => 'field'
-					]);
-				}
-				if (!isset($config['comparison'])
-					|| !is_string($config['comparison'])
-					|| !in_array($config['comparison'], $this->_allowed_searchfunctions)
-				) {
-					$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config_searchfield', [
-						'type' => $name,
-						'searchfield' => $searchfield,
-						'field' => 'comparison'
-					]);
-				}
-			}
-		}
-
-		if ($errors)
-			return error($errors);
-
-		return success($table_config);
-	}
-
-	/**
-	 * Generates the with statements for the given search string and the
-	 * specified search type.
-	 *
-	 * @param array								&$sqlWith
-	 * @param array								$searchArray
-	 * @param string							$table
-	 *
-	 * @return string	a query string or the name of the prepared select.
-	 */
-	protected function prepareDynamicSearchSql(&$sqlWith, $searchArray, $table)
-	{
-		$table_config = $this->_ci->config->item($table, 'search');
-
-		$id_offset = count($sqlWith);
-
-
-		$allowed_codes_w_order = ['' => 0, '!' => -1];
-		$max = max($this->_searchfunction_priorities);
-		foreach ($table_config['searchfields'] as $code => $config) {
-			$allowed_codes_w_order[$code] = $this->_searchfunction_priorities[$config['comparison']];
-			$allowed_codes_w_order['!' . $code] = $this->_searchfunction_priorities[$config['comparison']] - $max - 2;
-		}
-
-		$check_order = $this->_searchfunction_priorities;
-		uasort($table_config['searchfields'], function ($a, $b) use ($check_order) {
-			return $check_order[$b['comparison']] - $check_order[$a['comparison']];
-		});
-
-		$integer_functions = $this->_numeric_searchfunctions;
-		$integer_fields = array_keys(array_filter($table_config['searchfields'], function ($a) use ($integer_functions) {
-				return in_array($a['comparison'], $integer_functions);
-		}));
-
-		$only_integer_fields = count($integer_fields) == count($table_config['searchfields']);
-
-		$aliases = [];
-		foreach ($table_config['searchfields'] as $field => $config) {
-			if (isset($config['alias'])) {
-				foreach ($config['alias'] as $alias) {
-					$aliases[$alias] = $field;
-					$aliases['!' . $alias] = '!' . $field;
-				}
-			}
-		}
-
-		$sql_select = [];
-
-		if (isset($table_config['prepare'])) {
-			$this->_addPreparesToSqlWith($sqlWith, $table_config['prepare']);
-		}
-
-		foreach ($searchArray as $or_search) {
-			if (isset($or_search['-filter']) && !in_array($table, $or_search['-filter']))
-				continue;
-			unset($or_search['-filter']);
-			
-			foreach ($aliases as $alias => $field) {
-				if (isset($or_search[$alias])) {
-					$or_search[$field] = array_merge($or_search[$alias], $or_search[$field] ?? []);
-					unset($or_search[$alias]);
-				}
-			}
-
-			// NOTE(chris): early out if not allowed fields are in the search array
-			$used_codes = array_keys($or_search);
-			if (count(array_intersect($used_codes, array_keys($allowed_codes_w_order))) != count($used_codes))
-				continue;
-
-			// NOTE(chris): expand general excludes to all fields
-			if (isset($or_search['!'])) {
-				$not = $or_search['!'];
-				unset($or_search['!']);
-				foreach ($table_config['searchfields'] as $code => $config) {
-					if (isset($or_search['!' . $code]))
-						$or_search['!' . $code] = array_unique(array_merge($or_search['!' . $code], $not));
-					else
-						$or_search['!' . $code] = $not;
-				}
-			}
-
-			// NOTE(chris): early out if all searchfields require an integer and at least one searchword is not a number
-			if ($only_integer_fields
-				&& isset($or_search[""])
-				&& $this->_hasAtLeastOneNaN($or_search[""])
-			) {
-				continue;
-			}
-
-			$skip = false;
-			foreach ($integer_fields as $code) {
-				// NOTE(chris): filter non integer for integer fields
-				if (isset($or_search['!' . $code])) {
-					$or_search['!' . $code] = array_filter($or_search['!' . $code], function ($a) {
-						return is_numeric($a);
-					});
-					if (!$or_search['!' . $code])
-						unset($or_search['!' . $code]);
-				}
-				// NOTE(chris): early out if a searchword that is not a number is compared to a searchfield that requires an integer
-				if (isset($or_search[$code])
-					&& $this->_hasAtLeastOneNaN($or_search[$code])
-				) {
-					$skip = true;
-					break;
-				}
-			}
-			if ($skip)
-				continue;
-
-			// NOTE(chris): sort for performance reasons
-			uksort($or_search, function ($a, $b) use ($allowed_codes_w_order) {
-				return $allowed_codes_w_order[$b] - $allowed_codes_w_order[$a];
-			});
-
-			$or_with = [];
-			$or_select = [];
-			$or_prepare = [];
-
-			if (substr(key($or_search), 0, 1) == '!') {
-				// NOTE(chris): only negative searchwords
-				$sql = [];
-				foreach ($or_search as $code => $words) {
-					$code = substr($code, 1);
-					// NOTE(chris): sort for performance reasons
-					usort($words, function ($a, $b) {
-						return strlen($b) - strlen($a);
-					});
-					$field_config = $table_config['searchfields'][$code];
-
-					if (isset($field_config['prepare'])) {
-						$this->_addPreparesToSqlWith($or_with, $field_config['prepare']);
-						$or_prepare[$code] = $field_config['prepare'];
-						unset($table_config['searchfields'][$code]['prepare']);
-						unset($field_config['prepare']);
-					}
-					$field_sql = "
-						SELECT
-							" . $this->_formatPrimarykeys($table_config['primarykey'], $table_config['table']) . "
-							FROM " . $table_config['table'] . "
-							" . $this->_makeJoin($field_config['join'] ?? '') . "
-							WHERE ";
-					foreach ($words as $word) {
-						$sql[] = $field_sql . $this->_makeCompareBool($field_config['comparison'], $field_config['field'], $word);
-					}
-				}
-
-				$or_select[] = "
-					SELECT 
-						" . $this->_formatPrimarykeys($table_config['primarykey'], $table_config['table']) . ",
-						1.0 AS rank
-					FROM " . $table_config['table'] . "
-					WHERE " . $table_config['primarykey'] . " NOT IN (" . implode(" UNION ", $sql) . ")";
-			} else {
-				$current_select = false;
-				$count = 0;
-				$skip = false;
-				foreach ($or_search as $code => $words) {
-					// NOTE(chris): sort for performance reasons
-					if ($code && substr($code, 0, 1) == '!') {
-						usort($words, function ($a, $b) {
-							return strlen($a) - strlen($b);
-						});
-					} else {
-						usort($words, function ($a, $b) {
-							return strlen($b) - strlen($a);
-						});
-					}
-					if ($code == '') {
-						foreach ($words as $i => $word) {
-							$field_sql = [];
-							foreach ($table_config['searchfields'] as $c => $field_config) {
-								if (in_array($field_config['comparison'], $integer_functions) && !is_numeric($word))
-									continue;
-
-								$word_from = $table_config['table'];
-								$word_join = "";
-								$word_rank = "0";
-								if ($current_select) {
-									$word_from = $current_select;
-									if ($this->_needBasicTableJoin($field_config['field'], $table_config['primarykey'])) {
-										$word_join .= " " . $this->_makeJoin($table_config);
-									}
-									$word_rank = "rank";
-								}
-								if (isset($field_config['prepare'])) {
-									$this->_addPreparesToSqlWith($or_with, $field_config['prepare']);
-									$or_prepare[$c] = $field_config['prepare'];
-									unset($table_config['searchfields'][$c]['prepare']);
-									unset($field_config['prepare']);
-								}
-								if (isset($field_config['join'])) {
-									$word_join .= " " . $this->_makeJoin($field_config['join']);
-								}
-								$field_sql[] = "
-									SELECT
-										" . $this->_formatPrimarykeys($table_config['primarykey'], $word_from) . ",
-										" . $word_rank . " AS w_rank,
-										" . $this->_makeRank($field_config['comparison'], $field_config['field'], $word) . " AS rank
-										FROM " . $word_from . "
-										" . $word_join . "
-										WHERE " . $this->_makeCompare($field_config['comparison'], $field_config['field'], $word);
-							}
-							// NOTE(chris): skip because the word is not numeric but all searchfields require integers
-							if (!$field_sql) {
-								$or_with = [];
-								$or_select = [];
-								$count = 0;
-								$skip = true;
-								foreach ($or_prepare as $k => $v)
-									$table_config['searchfields'][$k]['prepare'] = $v;
-								break;
-							}
-
-							$id = "w" . ($id_offset + count($or_with));
-							$or_with[] = "
-								" . $id . " (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
-								SELECT
-									" . $this->_formatPrimarykeys($table_config['primarykey']) . ",
-									(w_rank + 1.0 - CASE " .
-										"WHEN MIN(rank) = 0 THEN 0 " .
-										"ELSE EXP(SUM(LN(CASE WHEN rank = 0 THEN 1 ELSE rank " .
-										"END))) END) AS rank
-									FROM (" . implode(' UNION ALL ', $field_sql) . ") " . $id . "
-									GROUP BY " . $this->_formatPrimarykeys($table_config['primarykey']) . ", w_rank
-								)";
-							$current_select = $id;
-						}
-					} else {
-						foreach ($words as $i => $word) {
-							$where = "";
-							$rank = "";
-							$jointype = "";
-							if (substr($code, 0, 1) == '!') {
-								$c = substr($code, 1);
-								$field_config = $table_config['searchfields'][$c];
-								
-								$rank = "1";
-
-								$jointype = "LEFT";
-
-								$where = $field_config['field'] .
-									" IS NULL OR NOT (" .
-									$this->_makeCompareBool(
-										$field_config['comparison'],
-										$field_config['field'],
-										$word
-									) .
-									")";
-								if ($field_config['1-n'] ?? false) {
-									$where = "GROUP BY " .
-										$this->_formatPrimarykeys($table_config['primarykey'], $current_select ?: $table_config['table']) .
-										", rank HAVING MIN(CASE WHEN " .
-										$where .
-										" THEN 1 ELSE 0 END) = 1";
-								} else {
-									$where = "WHERE " . $where;
-								}
-							} else {
-								$field_config = $table_config['searchfields'][$code];
-
-								$rank = $this->_makeRank($field_config['comparison'], $field_config['field'], $word);
-
-								$where = $this->_makeCompare($field_config['comparison'], $field_config['field'], $word);
-								$where = "WHERE " . $where;
-							}
-							$word_from = $table_config['table'];
-							$word_join = "";
-							$word_rank = "";
-							if ($current_select) {
-								$word_from = $current_select;
-								if ($this->_needBasicTableJoin($field_config['field'], $table_config['primarykey'])) {
-									$word_join .= " " . $this->_makeJoin($table_config);
-								}
-								$word_rank = "rank + ";
-							}
-							if (isset($field_config['prepare'])) {
-								$this->_addPreparesToSqlWith($or_with, $field_config['prepare']);
-								$or_prepare[$code] = $field_config['prepare'];
-								unset($table_config['searchfields'][$code]['prepare']);
-								unset($field_config['prepare']);
-							}
-							if (isset($field_config['join'])) {
-								$word_join .= " " . $this->_makeJoin($field_config['join'], $jointype);
-							}
-
-							$id = "w" . ($id_offset + count($or_with));
-							$or_with[] = "
-								" . $id . " (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
-								SELECT
-									" . $this->_formatPrimarykeys($table_config['primarykey'], $word_from) . ",
-									" . $word_rank . $rank . " AS rank
-									FROM " . $word_from . "
-									" . $word_join . "
-									" . $where . "
-								)";
-							$current_select = $id;
-						}
-					}
-					if ($skip)
-						break;
-					$count += count($words);
-				}
-
-				if (!$count || !$current_select)
-					continue;
-
-				$or_select[] = "
-					SELECT " . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank / " . $count . " AS rank FROM " . $current_select;
-			}
-
-			if ($or_with[0] === "RECURSIVE") {
-				if ($sqlWith[0] !== "RECURSIVE")
-					array_unshift($sqlWith, "RECURSIVE");
-				array_shift($or_with);
-			}
-
-			$sqlWith = array_merge($sqlWith, $or_with);
-			$sql_select = array_merge($sql_select, $or_select);
-			$id_offset += count($or_with);
-		}
-
-		return $sql_select;
+		return $search; // return the result
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods
 
 	/**
-	 * Checks if the field is not one of the primarykeys.
-	 *
-	 * @param string							$field
-	 * @param array|string						$primarykeys
-	 *
-	 * @return boolean
+	 * Checks:
+	 * - The given searchstr is a not empty string
+	 * - The given types is a not empty array and contains allowed search types
 	 */
-	private function _needBasicTableJoin($field, $primarykeys)
+	private function _checkParameters($searchstr, $types)
 	{
-		if (!is_array($primarykeys) && strpos($primarykeys, ",") !== false) {
-			return $field != $primarykeys;
-		}
-		if (!is_array($primarykeys))
-			$primarykeys = explode(",", $primarykeys);
+		// If searchstr is empty
+		if (isEmptyString($searchstr)) return error(self::ERROR_WRONG_SEARCHSTR);
 
-		foreach ($primarykeys as $key) {
-			if ($field == trim($key))
-				return false;
-		}
-		return true;
+		// If types is not an array or it is empty
+		if (isEmptyArray($types)) return error(self::ERROR_NO_TYPES);
+
+		// If all the elements in types are allowed search types
+		if (!isEmptyArray(array_diff($types, self::ALLOWED_TYPES))) return error(self::ERROR_WRONG_TYPES);
+
+		return success(); // The check is fine!
 	}
 
 	/**
-	 * Returns comma separated primarykeys. Optionally with table prefix
-	 *
-	 * @param array|string						$primarykeys
-	 * @param string							$prefix
-	 *
-	 * @return string
+	 * Loops on types and perform the search of that type using searchstr
+	 * Then it collects all the returned data into an array as property of an object
 	 */
-	private function _formatPrimarykeys($primarykeys, $prefix = "")
+	private function _search($searchstr, $types)
 	{
-		if (is_array($primarykeys)) {
-			if ($prefix)
-				$prefix .= ".";
-			return $prefix . implode(", " . $prefix, $primarykeys);
-		}
-		if (!$prefix)
-			return $primarykeys;
+		// Object to be returned
+		$result = new stdClass();
+		$result->data = array();
 
-		return $prefix . "." . implode(", " . $prefix . ".", explode(",", $primarykeys));
+		// For each search type
+		foreach ($types as $type)
+		{
+			// Perform the search and then add the result to data
+			$result->data = array_merge($result->data, $this->{'_'.$type}($searchstr, $type));
+		}
+
+		return $result;
 	}
 
-	/**
-	 * Adds the prepare statement to the sqlWith stack and handles the
-	 * "RECURSIVE" modifier
-	 *
-	 * @param array								&$sqlWith
-	 * @param array								$prepares
-	 *
-	 * @return void
-	 */
-	private function _addPreparesToSqlWith(&$sqlWith, $prepares)
+	private function _mitarbeiter_ohne_zuordnung($searchstr, $type) 
 	{
-		$recursive = $sqlWith[0] ?? "" === "RECURSIVE";
-		if (!is_array($prepares))
-			$prepares = [$prepares];
+		$dbModel = new DB_Model();
+
+		$sql = '
+			SELECT
+				\''.$type.'\' AS type,
+				b.uid AS uid,
+				p.person_id AS person_id,
+				p.vorname || \' \' || p.nachname AS name,
+				ARRAY_AGG(DISTINCT(org.bezeichnung)) AS organisationunit_name,
+				COALESCE(b.alias, b.uid) || \''.'@'.DOMAIN.'\' AS email,
+				TRIM(COALESCE(k.kontakt, \'\') || \' \' || COALESCE(m.telefonklappe, \'\')) AS phone,
+				\''.base_url(self::PHOTO_IMG_URL).'\' || p.person_id AS photo_url, 
+				ARRAY_AGG(DISTINCT(stdkst.bezeichnung)) AS standardkostenstelle 
+			  FROM public.tbl_mitarbeiter m
+			  JOIN public.tbl_benutzer b ON(b.uid = m.mitarbeiter_uid)
+			  LEFT JOIN (
+				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
+				  FROM public.tbl_benutzerfunktion bf
+				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
+				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
+				 WHERE bf.funktion_kurzbz = \'kstzuordnung\'
+				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
+				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
+				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
+			) stdkst ON stdkst.uid = b.uid 
+			  JOIN public.tbl_person p USING(person_id)
+			  LEFT JOIN (
+				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
+				  FROM public.tbl_benutzerfunktion bf
+				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
+				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
+				 WHERE bf.funktion_kurzbz = \'oezuordnung\'
+				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
+				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
+				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
+			) org ON org.uid = b.uid 
+		     LEFT JOIN (
+				SELECT kontakt, standort_id
+				  FROM public.tbl_kontakt
+				 WHERE kontakttyp = \'telefon\'
+			) k ON(k.standort_id = m.standort_id)
+			 WHERE 
+				(stdkst.bezeichnung IS NULL 
+				OR org.bezeichnung IS NULL) 
+				AND (
+			' .
+			$this->buildSearchClause(
+				$dbModel, 
+				array('b.uid', 'p.vorname', 'p.nachname'), 
+				$searchstr
+			) .
+			'
+				)
+		      GROUP BY type, b.uid, p.person_id, name, email, m.telefonklappe, phone
+		';
+
+		$employees = $dbModel->execReadOnlyQuery($sql);
 		
-		foreach ($prepares as $prep) {
-			$prep = trim($prep);
-			if (strtoupper(substr($prep, 0, 10)) === "RECURSIVE ") {
-				$recursive = true;
-				$sqlWith[] = substr($prep, 10);
-			} else {
-				$sqlWith[] = $prep;
-			}
-		}
-		if ($recursive && $sqlWith[0] !== "RECURSIVE") {
-			array_unshift($sqlWith, "RECURSIVE");
-		}
+		// If something has been found then return it
+		if (hasData($employees)) return getData($employees);
+
+		// Otherwise return an empty array
+		return array();
+	}
+
+	protected function buildSearchClause(DB_Model $dbModel, array $columns, $searchstr)
+	{
+		$searchstr = preg_replace('/[[:punct:]]/', ' ', $searchstr);
+		$document			 = implode(' || \' \' || ', $columns);
+		$query				 = '\'' . implode(':* & ', explode(' ', trim($searchstr))) . ':*\'';
+		$reversequery		 = '\'*:' . implode(' & *:', explode(' ', trim($searchstr))) . '\'';
+		$nospacequery		 = '\'' . implode('', explode(' ', trim($searchstr))) . ':*\'';
+
+		$searchclause = <<<EOSC
+			to_tsvector(lower(regexp_replace({$document}, '[[:punct:]]', ' ', 'g'))) @@ to_tsquery(lower({$query}))
+			OR
+			to_tsvector(reverse(lower(regexp_replace({$document}, '[[:punct:]]', ' ', 'g')))) @@ to_tsquery(reverse(lower({$reversequery})))
+			OR
+			to_tsvector(lower(regexp_replace({$document}, '[[:punct:]]', ' ', 'g'))) @@ to_tsquery(lower({$nospacequery}))
+	
+EOSC;
+
+		return $searchclause;
 	}
 
 	/**
-	 * Checks if an array has at least on non numeric value.
-	 *
-	 * @param array								$arr
-	 *
-	 * @return boolean
+	 * Search for employees
 	 */
-	private function _hasAtLeastOneNaN($arr)
+	private function _mitarbeiter($searchstr, $type)
 	{
-		foreach ($arr as $value)
-			if (!is_numeric($value))
-				return true;
-		return false;
+		$dbModel = new DB_Model();
+
+		$employees = $dbModel->execReadOnlyQuery('
+			SELECT
+				\''.$type.'\' AS type,
+				b.uid AS uid,
+				p.person_id AS person_id,
+				p.vorname || \' \' || p.nachname AS name,
+				ARRAY_AGG(DISTINCT(org.bezeichnung)) AS organisationunit_name,
+				COALESCE(b.alias, b.uid) || \''.'@'.DOMAIN.'\' AS email,
+				TRIM(COALESCE(k.kontakt, \'\') || \' \' || COALESCE(m.telefonklappe, \'\')) AS phone,
+				\''.base_url(self::PHOTO_IMG_URL).'\' || p.person_id AS photo_url, 
+				ARRAY_AGG(DISTINCT(stdkst.bezeichnung)) AS standardkostenstelle 
+			  FROM public.tbl_mitarbeiter m
+			  JOIN public.tbl_benutzer b ON(b.uid = m.mitarbeiter_uid)
+			  JOIN (
+				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
+				  FROM public.tbl_benutzerfunktion bf
+				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
+				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
+				 WHERE bf.funktion_kurzbz = \'kstzuordnung\'
+				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
+				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
+				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
+			) stdkst ON stdkst.uid = b.uid 
+			  JOIN public.tbl_person p USING(person_id)
+			  JOIN (
+				SELECT \'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS bezeichnung, bf.uid
+				  FROM public.tbl_benutzerfunktion bf
+				  JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
+				  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
+				 WHERE bf.funktion_kurzbz = \'oezuordnung\'
+				   AND (bf.datum_von IS NULL OR bf.datum_von <= NOW())
+				   AND (bf.datum_bis IS NULL OR bf.datum_bis >= NOW())
+				GROUP BY o.bezeichnung, ot.bezeichnung, bf.uid
+			) org ON org.uid = b.uid 
+		     LEFT JOIN (
+				SELECT kontakt, standort_id
+				  FROM public.tbl_kontakt
+				 WHERE kontakttyp = \'telefon\'
+			) k ON(k.standort_id = m.standort_id)
+			 WHERE ' .
+			$this->buildSearchClause(
+				$dbModel, 
+				array('b.uid', 'p.vorname', 'p.nachname', 'org.bezeichnung', 'stdkst.bezeichnung'), 
+				$searchstr
+			) .
+			'
+		      GROUP BY type, b.uid, p.person_id, name, email, m.telefonklappe, phone
+		');
+
+		// If something has been found then return it
+		if (hasData($employees)) return getData($employees);
+
+		// Otherwise return an empty array
+		return array();
 	}
 
 	/**
-	 * Helper function for getDynamicSearchSql
-	 *
-	 * @param array								$join
-	 * @param string							$prefix
-	 *
-	 * @return string
+	 * Seach for organisation units
 	 */
-	private function _makeJoin($join, $prefix = "")
+	private function _organisationunit($searchstr, $type)
 	{
-		if (!is_array($join))
-			return "";
-		if (!isset($join['table'])) {
-			$output = [];
-			foreach ($join as $j)
-				$output[] = trim($this->_makeJoin($j, $prefix));
-			return implode(" ", $output);
-		}
-		if (!isset($join['on']) && !isset($join['using']) && !isset($join['primarykey']))
-			return "";
-		$output = $prefix . " JOIN " . $join['table'];
+		$dbModel = new DB_Model();
 
-		if (isset($join['using']))
-			return $output . " USING (" . $join['using'] . ")";
+		$ous = $dbModel->execReadOnlyQuery('
+			SELECT
+				\''.$type.'\' AS type,
+				o.oe_kurzbz AS oe_kurzbz,
+				\'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS name,
+				oParent.oe_kurzbz AS parentoe_kurzbz,
+				(CASE WHEN oParent.bezeichnung IS NOT NULL THEN \'[\' || otParent.bezeichnung || \'] \' || oParent.bezeichnung END) AS parentoe_name,
+				ARRAY_AGG(DISTINCT(bfLeader.uid)) AS leader_uid,
+				ARRAY_AGG(DISTINCT(bfLeader.vorname || \' \' || bfLeader.nachname)) AS leader_name,
+				COUNT(bfCount.benutzerfunktion_id) AS number_of_people,
+				(CASE WHEN o.mailverteiler = TRUE THEN o.oe_kurzbz || \''.'@'.DOMAIN.'\' END) AS mailgroup
+			  FROM public.tbl_organisationseinheit o
+			  JOIN public.tbl_organisationseinheittyp ot USING(organisationseinheittyp_kurzbz)
+		     LEFT JOIN public.tbl_organisationseinheit oParent ON(oParent.oe_kurzbz = o.oe_parent_kurzbz)
+			 LEFT JOIN public.tbl_organisationseinheittyp otParent ON(oParent.organisationseinheittyp_kurzbz = otParent.organisationseinheittyp_kurzbz)
+		     LEFT JOIN (
+				SELECT benutzerfunktion_id, oe_kurzbz
+				  FROM public.tbl_benutzerfunktion
+				 WHERE funktion_kurzbz = \'oezuordnung\'
+				   AND (datum_von IS NULL OR datum_von <= NOW())
+				   AND (datum_bis IS NULL OR datum_bis >= NOW())
+			) bfCount ON(bfCount.oe_kurzbz = o.oe_kurzbz)
+		     LEFT JOIN (
+				SELECT bf.oe_kurzbz, bf.uid, p.vorname, p.nachname
+				  FROM public.tbl_benutzerfunktion bf
+				  JOIN public.tbl_benutzer b USING(uid)
+				  JOIN public.tbl_person p USING(person_id)
+				 WHERE funktion_kurzbz = \'Leitung\'
+				   AND (datum_von IS NULL OR datum_von <= NOW())
+				   AND (datum_bis IS NULL OR datum_bis >= NOW())
+				   AND b.aktiv = TRUE
+			) bfLeader ON(bfLeader.oe_kurzbz = o.oe_kurzbz)
+			 WHERE 
+				o.aktiv = true
+				AND (' .
+			$this->buildSearchClause(
+				$dbModel, 
+				array('o.oe_kurzbz', 'o.bezeichnung', 'ot.bezeichnung'), 
+				$searchstr
+			) .
+			') 
+		      GROUP BY type, o.oe_kurzbz, o.bezeichnung, ot.bezeichnung, oParent.oe_kurzbz, oParent.bezeichnung, otParent.bezeichnung
+		');
 
-		if (isset($join['primarykey']))
-			return $output . " USING (" . $join['primarykey'] . ")";
+		// If something has been found
+		if (hasData($ous))
+		{
+			// Loop through the returned dataset
+			foreach (getData($ous) as $ou)
+			{
+				// Create the new property leaders as an empty array
+				$ou->leaders = array();
 
-		return $output . " ON (" . $join['on'] . ")";
-	}
-
-	/**
-	 * Helper function for _makeRank, _makeCompare and _makeCompareBool
-	 *
-	 * @param string							$function
-	 * @param string							$mode
-	 * @param string							$field
-	 * @param string							$word
-	 *
-	 * @return string
-	 */
-	private function _makeFunction($function, $mode, $field, $word)
-	{
-		$searchfunction = $this->_ci->config->item($mode, 'searchfunctions');
-
-		if (!$searchfunction)
-			return "";
-		$tpl = $searchfunction[$function] ?? "";
-		
-		if (strstr($tpl, '{field}'))
-			$tpl = str_replace('{field}', $field, $tpl);
-
-		if (strstr($tpl, '{word}'))
-			$tpl = str_replace('{word}', $this->_ci->db->escape($word), $tpl);
-		if (strstr($tpl, '{like:word}'))
-			$tpl = str_replace('{like:word}', "'%" . $this->_ci->db->escape_like_str($word) . "%'", $tpl);
-		
-		return $tpl;
-	}
-
-	/**
-	 * Helper function for getDynamicSearchSql
-	 *
-	 * @param string							$mode
-	 * @param string							$field
-	 * @param string							$word
-	 *
-	 * @return string
-	 */
-	private function _makeRank($mode, $field, $word)
-	{
-		return $this->_makeFunction('rank', $mode, $field, $word);
-	}
-
-	/**
-	 * Helper function for getDynamicSearchSql
-	 *
-	 * @param string							$mode
-	 * @param string							$field
-	 * @param string							$word
-	 *
-	 * @return string
-	 */
-	private function _makeCompare($mode, $field, $word)
-	{
-		return $this->_makeFunction('compare', $mode, $field, $word);
-	}
-
-	/**
-	 * Helper function for getDynamicSearchSql
-	 *
-	 * @param string							$mode
-	 * @param string							$field
-	 * @param string							$word
-	 *
-	 * @return string
-	 */
-	private function _makeCompareBool($mode, $field, $word)
-	{
-		$searchfunction = $this->_ci->config->item($mode, 'searchfunctions');
-
-		if (!$searchfunction)
-			return "";
-		$function = isset($searchfunction['compare_boolean']) ? 'compare_boolean' : 'compare';
-		return $this->_makeFunction($function, $mode, $field, $word);
-	}
-
-	/**
-	 * Converts the search string to an array.
-	 * First level should be joined with an OR.
-	 * Second level should be joined with an AND or AND NOT.
-	 * It is an associative array where the key is a code for the field
-	 * which the words should be compared with and the value is the array
-	 * of words.
-	 * Use AND NOT if the first letter in the key is "!".
-	 * Use AND if the first letter in the key is not "!".
-	 * E.g:
-	 * If the key is:
-	 * "": the words should be compared to all fields with AND.
-	 * "!": the words should be compared to all fields with AND NOT.
-	 * "somefield": the words should be compared to the field somefield with
-	 * AND.
-	 * "!somefield": the words should be compared to the field somefield with
-	 * AND NOT.
-	 *
-	 * @param string							$searchstring
-	 * @param array								$types
-	 *
-	 * @return array
-	 */
-	private function _convertQuery($searchstring, $types)
-	{
-		$searchAllTypes = count($types) == count($this->_ci->config->item('search'));
-		$allowedTypes = array_keys($types);
-
-		$currentArray = [];
-		$outputArray = [];
-		$cleanStrings = [];
-		$cleanSearchstring = '';
-		$filter = ['+' => [], '-' => []];
-		$typeAliases = [];
-
-		$tmp = explode(' ', strtolower($searchstring));
-		while ($tmp) {
-			$chunk = trim(array_shift($tmp));
-			if ($chunk == '')
-				continue;
-
-			if (strpos($chunk, '"') !== false) {
-				$test = explode('"', $chunk);
-				if (count($test) > 2) {
-					$rest = implode('"', array_slice($test, 2));
-					if ($rest) {
-						array_unshift($tmp, $rest);
-						$chunk = implode('"', array_slice($test, 0, 2)) . '"';
-					}
-				}
-				if (count($test) == 2) {
-					while ($tmp && strpos($test[1], '"') === false) {
-						$test[1] .= ' ' . trim(array_shift($tmp));
-					}
-					if (strpos($test[1], '"') === false) {
-						$chunk = implode('"', $test) . '"';
-					} else {
-						$test2 = explode('"', $test[1], 2);
-						$chunk = $test[0] . '"' . $test2[0] . '"';
-						if ($test2[1]) {
-							array_unshift($tmp, $test2[1]);
-						}
-					}
-				}
-				if (strpos($chunk, ' ') === false) {
-					$chunk = str_replace('"', '', $chunk);
-				}
-			}
-
-			if ($chunk == 'or') {
-				$this->_convertQueryCleanupOr($currentArray, $cleanStrings, $filter, $searchAllTypes, $allowedTypes);
-				$filter = ['+' => [], '-' => []];
-				if ($currentArray) {
-					$cleanSearchstring .= ($cleanSearchstring ? ' or ' : '') . implode(' ', $cleanStrings);
-					$cleanStrings = [];
-					$outputArray[] = $currentArray;
-					$currentArray = [];
-				}
-				continue;
-			}
-
-			if ($chunk == ':' || $chunk == '-' || substr($chunk, -1) == ':')
-				continue;
-
-			if ($chunk[0] == ':' || ($chunk[0] == '-' && $chunk[1] == ':')) {
-				if (!$typeAliases) {
-					foreach ($types as $type => $config) {
-						$typeAliases[$type] = $type;
-						if (isset($config['alias'])) {
-							foreach ($config['alias'] as $alias) {
-								if (!isset($typeAliases[$alias]))
-									$typeAliases[$alias] = $type;
-							}
-						}
+				// Loop through the found leaders for this organisation unit
+				for ($i = 0; $i < count($ou->leader_uid); $i++)
+				{
+					// If a leader exists for this organisationunit and has a name :D
+					if (!isEmptyString($ou->leader_uid[$i]) && !isEmptyString($ou->leader_name[$i]))
+					{
+						// Empty object that will contains the leader uid and name
+						$leader = new stdClass();
+						// Set the properties name and uid
+						$leader->uid = $ou->leader_uid[$i];
+						$leader->name = $ou->leader_name[$i];
+						// Add the leader object to the leaders array
+						$ou->leaders[] = $leader;
 					}
 				}
 
-				$test = explode(':', $chunk, 2);
-				if (isset($typeAliases[$test[1]]))
-					$chunk = $test[0] . ':' . $typeAliases[$test[1]];
-				elseif ($test[0] == '-')
-					continue;
+				// Remove the not needed properties leader_uid and leader_name
+				unset($ou->leader_uid);
+				unset($ou->leader_name);
 			}
 
-			if (in_array($chunk, $cleanStrings))
-				continue;
-
-			$cleanStrings[] = $chunk;
-
-			$chunk = str_replace('"', '', $chunk);
-			$code = '';
-
-			if ($chunk[0] == '-') {
-				$code = '!';
-				$chunk = substr($chunk, 1);
-			}
-			if (strpos($chunk, ':') !== false) {
-				$chunk = explode(':', $chunk, 2);
-				if (!$chunk[0]) {
-					$filter[$code ? '-' : '+'][] = $chunk[1];
-					continue;
-				}
-				$code .= $chunk[0];
-				$chunk = $chunk[1];
-			}
-
-			if (!isset($currentArray[$code]))
-				$currentArray[$code] = [];
-			
-			$currentArray[$code][] = $chunk;
+			// Returns the changed dataset
+			return getData($ous);
 		}
 
-		$this->_convertQueryCleanupOr($currentArray, $cleanStrings, $filter, $searchAllTypes, $allowedTypes);
-		if ($currentArray) {
-			$cleanSearchstring .= ($cleanSearchstring ? ' or ' : '') . implode(' ', $cleanStrings);
-			$outputArray[] = $currentArray;
-		}
-		return [$outputArray, $cleanSearchstring];
+		// Otherwise return an empty array
+		return array();
 	}
 
-	private function _convertQueryCleanupOr(&$currentArray, &$cleanStrings, $filter, $searchAllTypes, $allowedTypes)
+	/**
+	 * Search for persons
+	 */
+	private function _person($searchstr, $type)
 	{
-		if ($filter['+'] && $filter['-']) {
-			$double = array_intersect($filter['+'], $filter['-']);
-			if ($double) {
-				foreach ($double as $type) {
-					array_splice($cleanStrings, array_search(':' . $type, $cleanStrings), 1);
-					array_splice($cleanStrings, array_search('-:' . $type, $cleanStrings), 1);
-				}
-				$filter['+'] = array_diff($filter['+'], $double);
-				$filter['-'] = array_diff($filter['-'], $double);
-			}
-			if (!$filter['+'] && !$filter['-']) {
-				// All filters cancel each other out
-				$currentArray = [];
-				$cleanStrings = [];
-				return;
-			}
-			if ($filter['+']) {
-				foreach ($filter['-'] as $type) {
-					array_splice($cleanStrings, array_search('-:' . $type, $cleanStrings), 1);
-				}
-				$filter['-'] = [];
-			}
-		}
-		if ($filter['+']) {
-			$cleanFilter = array_intersect($allowedTypes, $filter['+']);
-			if (!$cleanFilter) {
-				// All filters are forbidden
-				$currentArray = [];
-				$cleanStrings = [];
-				return;
-			}
-			$forbiddenFilter = array_diff($cleanFilter, $filter['+']);
-			foreach ($forbiddenFilter as $type) {
-				array_splice($cleanStrings, array_search(':' . $type, $cleanStrings), 1);
-			}
-			$filter['+'] = $cleanFilter;
-		} elseif ($filter['-']) {
-			$filter['+'] = array_diff($allowedTypes, $filter['-']);
-			if (!$searchAllTypes) {
-				foreach ($filter['+'] as $type)
-					$cleanStrings[] = ':' . $type;
-				foreach ($filter['-'] as $type)
-					array_splice($cleanStrings, array_search('-:' . $type, $cleanStrings), 1);
-			}
-		} else {
-			if (!$searchAllTypes) {
-				foreach ($allowedTypes as $type)
-					$cleanStrings[] = ':' . $type;
-			}
+		return array();
+	}
+
+	/**
+	 * Search for students
+	 */
+	private function _student($searchstr, $type)
+	{
+		$dbModel = new DB_Model();
+		$gesperrtes_foto = base64_encode(file_get_contents(DOC_ROOT.'skin/images/profilbild_dummy.jpg'));
+		$students = $dbModel->execReadOnlyQuery('
+		SELECT
+			\''.$type.'\' AS type,
+			s.student_uid AS uid,
+			CONCAT(s.student_uid,\'@'.DOMAIN.'\') AS email,
+			s.matrikelnr,
+			CONCAT(UPPER(stg.typ),UPPER(stg.kurzbz),\'-\',s.semester,s.verband) as verband,
+			stg.bezeichnung AS studiengang,
+			p.person_id AS person_id,
+			p.vorname || \' \' || p.nachname AS name,
+			CASE 
+				when s.student_uid = \''.getAuthUID().'\' then p.foto
+				when p.foto IS NULL then \''.$gesperrtes_foto.'\' 
+				when p.foto_sperre = false then p.foto
+				else \''.$gesperrtes_foto.'\'
+			end as foto,
+			b.aktiv
+			FROM public.tbl_student s
+			JOIN public.tbl_studiengang stg USING(studiengang_kz)
+			JOIN public.tbl_benutzer b ON(b.uid = s.student_uid)
+			JOIN public.tbl_person p USING(person_id)
+			LEFT JOIN (
+				SELECT kontakt, person_id
+				FROM public.tbl_kontakt
+					WHERE kontakttyp = \'email\'
+			) as k USING(person_id)
+				WHERE 
+			b.aktiv = TRUE 
+			AND (b.uid ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			OR p.vorname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			OR p.nachname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\')
+			GROUP BY type, s.student_uid, s.matrikelnr, p.person_id, name, 
+				email, p.foto, s.verband, s.semester, stg.bezeichnung, 
+				stg.typ, stg.kurzbz, b.aktiv
+			ORDER BY b.aktiv DESC, p.nachname ASC, p.vorname ASC
+	');
+
+		// If something has been found then return it
+		if (hasData($students)) return getData($students);
+
+		// Otherwise return an empty array
+		return array();
+	}
+
+	private function _studentStv($searchstr, $type)
+	{
+		$dbModel = new DB_Model();
+
+		$students = $dbModel->execReadOnlyQuery('
+		SELECT
+			\''.$type.'\' AS type,
+			s.student_uid AS uid,
+			s.matrikelnr,
+			CONCAT(UPPER(stg.typ),UPPER(stg.kurzbz),\'-\',s.semester,s.verband) as verband,
+			stg.bezeichnung AS studiengang,
+			p.person_id AS person_id,
+			p.vorname || \' \' || p.nachname AS name,
+			k.kontakt AS email,
+			p.foto,
+			b.aktiv
+			FROM public.tbl_student s
+			JOIN public.tbl_studiengang stg USING(studiengang_kz)
+			JOIN public.tbl_benutzer b ON(b.uid = s.student_uid)
+			JOIN public.tbl_person p USING(person_id)
+			LEFT JOIN (
+				SELECT kontakt, person_id
+				FROM public.tbl_kontakt
+					WHERE kontakttyp = \'email\'
+			) as k USING(person_id)
+				WHERE 
+			b.uid ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			OR p.vorname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			OR p.nachname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+			GROUP BY type, s.student_uid, s.matrikelnr, p.person_id, name, 
+				k.kontakt, p.foto, s.verband, s.semester, stg.bezeichnung, 
+				stg.typ, stg.kurzbz, b.aktiv
+			ORDER BY b.aktiv DESC, p.nachname ASC, p.vorname ASC
+	');
+
+		// If something has been found then return it
+		if (hasData($students)) return getData($students);
+
+		// Otherwise return an empty array
+		return array();
+	}
+
+	/**
+	 * Search for prestudents
+	 */
+	private function _prestudent($searchstr, $type)
+	{
+		$dbModel = new DB_Model();
+
+		$prestudent = $dbModel->execReadOnlyQuery('
+		SELECT
+			\''.$type.'\' AS type,
+			ps.prestudent_id,
+			ps.studiengang_kz,
+			p.person_id AS person_id,
+			b.uid,
+			p.vorname || \' \' || p.nachname AS name,
+			(
+				SELECT kontakt
+				FROM public.tbl_kontakt
+				WHERE kontakttyp = \'email\'
+				AND person_id = p.person_id
+				LIMIT 1
+			) as email,
+			p.foto,
+			sg.bezeichnung
+			FROM public.tbl_prestudent ps
+			LEFT JOIN public.tbl_student s USING (prestudent_id)
+			LEFT JOIN public.tbl_benutzer b ON (b.uid = s.student_uid)
+			JOIN public.tbl_person p ON (p.person_id = ps.person_id)
+			LEFT JOIN public.tbl_studiengang sg ON (sg.studiengang_kz = ps.studiengang_kz)
+			WHERE b.uid ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+				OR p.vorname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+				OR p.nachname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\'
+				or cast(ps.prestudent_id as text) ILIKE \'%'.$dbModel->escapeLIKE($searchstr).'%\'
+			GROUP BY type, b.uid, ps.prestudent_id, ps.studiengang_kz, sg.bezeichnung, s.student_uid, s.matrikelnr, p.person_id, name, email, p.foto
+			');
+
+		// If something has been found then return it
+		if (hasData($prestudent)) return getData($prestudent);
+
+		// Otherwise return an empty array
+		return array();
+	}
+
+	/**
+	 * Search for documents
+	 */
+	private function _document($searchstr, $type)
+	{
+		return array();
+	}
+
+	/**
+	 * Search for CMSs
+	 */
+	private function _cms($searchstr, $type)
+	{
+		return array();
+	}
+
+	/**
+	 * Search for rooms
+	 */
+	private function _raum($searchstr, $type)
+	{
+		$dbModel = new DB_Model();
+
+		$rooms = $dbModel->execReadOnlyQuery('
+			SELECT
+				\''.$type.'\' AS type,
+				COALESCE(ort.ort_kurzbz, \'N/A\') as ort_kurzbz,
+				COALESCE(ort.gebteil, \'N/A\') as building,
+				COALESCE(ort.ausstattung, \'N/A\') as austattung,
+				COALESCE(CAST(ort.stockwerk AS VARCHAR), \'N/A\') as floor,
+				COALESCE(CAST(ort.dislozierung AS VARCHAR), \'N/A\') as room_number,
+				COALESCE(CAST(ort.content_id AS VARCHAR), \'N/A\') as content_id,
+				
+				CASE
+					WHEN standort.plz IS NULL OR standort.ort IS NULL THEN 
+						CASE
+							WHEN standort.strasse IS NULL THEN
+								CASE
+									WHEN ort.stockwerk IS NULL THEN \'N/A\'
+									ELSE CONCAT(ort.stockwerk,\' Stockwerk\')
+								END
+							ELSE 
+								CASE
+									WHEN ort.stockwerk IS NULL THEN standort.strasse
+									ELSE CONCAT(standort.strasse,\' / \',ort.stockwerk,\' Stockwerk\')
+								END
+						END
+					ELSE 
+						CASE 
+							WHEN standort.strasse IS NULL THEN
+								CASE
+									WHEN ort.stockwerk IS NULL THEN CONCAT(standort.plz,\' \',standort.ort)
+									ELSE CONCAT(standort.plz,\' \',standort.ort,\' / \',ort.stockwerk,\' Stockwerk\')
+								END
+							ELSE 
+								CASE
+									WHEN ort.stockwerk IS NULL THEN CONCAT(standort.plz,\' \',standort.ort,\' / \',standort.strasse)
+									ELSE CONCAT(standort.plz,\' \',standort.ort,\', \',standort.strasse,\' / \',ort.stockwerk,\' Stockwerk\')
+								END
+						END
+				END as standort,
+				
+				
+				CASE
+					WHEN ort.max_person IS NULL OR ort.arbeitsplaetze IS NULL THEN \'N/A\'
+					ELSE CONCAT(ort.max_person,\', davon \',ort.arbeitsplaetze,\' PC-Plätze\')
+				END as sitzplaetze
+				
+				FROM public.tbl_ort as ort
+				LEFT JOIN (
+					select ort,standort_id,strasse, plz
+					FROM public.tbl_standort
+					LEFT JOIN public.tbl_adresse USING(adresse_id)
+				) standort USING(standort_id)
+			 WHERE 
+				ort.aktiv = true 
+				AND 
+				ort.lehre = true
+				AND (' .
+					$this->buildSearchClause(
+						$dbModel, 
+						array('ort.ort_kurzbz', 'ort.bezeichnung'), 
+						$searchstr
+					) . 
+			')' 
+		);
+
+		// If something has been found
+		if (hasData($rooms))
+		{
+			// Returns the dataset
+			return getData($rooms);
 		}
 
-		if ($filter['+']) {
-			$currentArray['-filter'] = $filter['+'];
-		}
+		// Otherwise return an empty array
+		return array();
 	}
 }
+
diff --git a/application/libraries/SearchLib.php b/application/libraries/SearchLib.php
new file mode 100644
index 000000000..f48bf7e2e
--- /dev/null
+++ b/application/libraries/SearchLib.php
@@ -0,0 +1,1080 @@
+<?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');
+
+use \stdClass as stdClass;
+
+/**
+ * This is a alternative for SearchBarLib for advanced searches
+ */
+class SearchLib
+{
+	// Error constats
+	const ERROR_WRONG_JSON = 'ERR001';
+	const ERROR_WRONG_SEARCHSTR = 'ERR002';
+	const ERROR_NO_TYPES = 'ERR003';
+	const ERROR_WRONG_TYPES = 'ERR004';
+	const ERROR_NOT_AUTH = 'ERR005';
+
+	private $_ci; // Code igniter instance
+
+	private $_searchfunction_priorities = [];
+	private $_numeric_searchfunctions = [];
+	private $_allowed_searchfunctions = [];
+	
+	/**
+	 * Gets the CI instance and loads model
+	 */
+	public function __construct()
+	{
+		$this->_ci =& get_instance(); // get code igniter instance
+
+		// It is loaded only to have the DB functions available
+		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
+
+		// Load Config
+		$this->_ci->load->config('search', true);
+		$this->_ci->load->config('searchfunctions', true);
+
+		$this->_ci->load->library('PhrasesLib', [['search'], null], 'search_phrases');
+
+		// Precompute helper arrays
+		foreach ($this->_ci->config->item('searchfunctions') as $key => $arr) {
+			$this->_searchfunction_priorities[$key] = $arr['priority'];
+			if ($arr['force_integer'] ?? false)
+				$this->_numeric_searchfunctions[] = $key;
+			$this->_allowed_searchfunctions[] = $key;
+		}
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * It performes the search of the given search string using the specified search types
+	 *
+	 * @param string							$searchstring
+	 * @param array								$types (optional)
+	 *
+	 * @return stdClass		containing an array with the result on index 0
+	 * 						and the overall query time on index 1.
+	 */
+	public function search($searchstring, $types = [])
+	{
+		if (!$types) {
+			$types = $this->_ci->config->item('search');
+		} else {
+			$tmp = [];
+			$missing = [];
+			foreach ($types as $type) {
+				$typeconfig = $this->_ci->config->item($type, 'search');
+				if (!$typeconfig) {
+					$missing[] = $type;
+				} else {
+					$tmp[$type] = $typeconfig;
+				}
+			}
+			if ($missing) {
+				$p = $this->_ci->search_phrases;
+				return error(array_map(function ($type) use ($p) {
+					return $p->t('search', 'error_missing_config', [
+						'type' => $type
+					]);
+				}, $missing));
+			}
+			$types = $tmp;
+		}
+
+
+		// Convert searchstring into array
+		list($searchArray, $searchstring) = $this->_convertQuery($searchstring, $types);
+
+
+		$sql = $this->getDynamicSearchSqls($searchArray, array_keys($types));
+		if (isError($sql))
+			return $sql;
+		if (!hasData($sql)) {
+			$retval = success([]);
+			$retval->meta = ['time' => 0, 'searchstring' => $searchstring];
+			return $retval;
+		}
+
+		$msc = microtime(true);
+		$result = $this->_ci->BenutzerModel->execReadOnlyQuery(getData($sql));
+		$msc = microtime(true) - $msc;
+
+		if (isError($result))
+			return $result;
+
+		$retval = success($result->retval);
+		$retval->meta = [
+			'time' => $msc,
+			'searchstring' => $searchstring
+		];
+
+		return $retval;
+	}
+
+	/**
+	 * Generates the search query for the given search string and the
+	 * specified search type.
+	 *
+	 * @param array								$searchArray
+	 * @param string							$table
+	 *
+	 * @return stdClass		containing the query string.
+	 */
+	public function getDynamicSearchSql($searchArray, $table)
+	{
+		$res = $this->checkConfig($table);
+		if (isError($res))
+			return $res;
+		$table_config = getData($res);
+
+		$sql_with = [];
+		
+		$sql_select = $this->prepareDynamicSearchSql($sql_with, $searchArray, $table);
+
+		if (!$sql_select)
+			return success("");
+
+		$lang = getUserLanguage();
+
+		$output = "WITH";
+		if ($sql_with && $sql_with[0] === 'RECURSIVE') {
+			$output .= " RECURSIVE";
+			array_shift($sql_with);
+		}
+
+		$output .= "
+			lang (index) AS (
+				SELECT index
+				FROM public.tbl_sprache
+				WHERE sprache=" . $this->_ci->db->escape($lang) . "
+				LIMIT 1
+			),
+			auth (uid) AS (
+				SELECT " . $this->_ci->db->escape(getAuthUID()) . " AS uid
+			)";
+
+		if ($sql_with) {
+			$sql_with = array_unique($sql_with);
+			$output .= ", " . implode(", ", $sql_with);
+		}
+
+		$other_selects = "";
+		if (isset($table_config['resultfields']))
+			$other_selects = implode(", ", $table_config['resultfields']);
+		if ($other_selects)
+			$other_selects = ", " . $other_selects;
+
+		$output .= "
+			, q (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
+				SELECT " . $this->_formatPrimarykeys($table_config['primarykey']) . ", MAX(rank)
+				FROM (" . implode(" UNION ", $sql_select) . ") q
+				GROUP BY " . $this->_formatPrimarykeys($table_config['primarykey']) . "
+			)
+			SELECT
+				" . $this->_ci->db->escape($table) . " AS type,
+				q.rank
+				" . $other_selects . "
+			FROM q
+			" . ($table_config['resultjoin'] ?? "") . "
+			ORDER BY rank DESC
+		";
+
+		return success($output);
+	}
+
+	/**
+	 * Generates the search query for the given search string and the
+	 * specified search types.
+	 *
+	 * @param array								$searchArray
+	 * @param array								$types
+	 *
+	 * @return stdClass		containing the query string.
+	 */
+	public function getDynamicSearchSqls($searchArray, $types)
+	{
+		$with = [];
+		$selects = [];
+		foreach ($types as $type) {
+			$res = $this->checkConfig($type);
+			if (isError($res))
+				return $res;
+			$table_config = getData($res);
+
+			$select = $this->prepareDynamicSearchSql($with, $searchArray, $type);
+			if (!$select)
+				continue;
+
+			$with[] = "final_" . $type . " (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
+				SELECT " . $this->_formatPrimarykeys($table_config['primarykey']) . ", MAX(rank)
+				FROM (" . implode(" UNION ", $select) . ") q
+				GROUP BY " . $this->_formatPrimarykeys($table_config['primarykey']) . "
+			)";
+
+			$selects[] = "
+				SELECT
+					" . $this->_ci->db->escape($type) . " AS type,
+					rank,
+					TO_JSONB((SELECT x FROM (SELECT " . implode(", ", $table_config['resultfields'] ?? ['*']) . ") x)) AS data
+				FROM final_" . $type  . "
+				" . ($table_config['resultjoin'] ?? "");
+		}
+
+		if (!$selects)
+			return success("");
+
+		$recursive = "";
+		if ($with && $with[0] === "RECURSIVE") {
+			$recursive = "RECURSIVE ";
+			array_shift($with);
+		}
+
+		$with = array_unique($with);
+
+		$lang = getUserLanguage();
+		array_unshift($with, "lang (index) AS (
+			SELECT index
+			FROM public.tbl_sprache
+			WHERE sprache=" . $this->_ci->db->escape($lang) . "
+			LIMIT 1
+		)");
+		array_unshift($with, "auth (uid) AS (
+			SELECT " . $this->_ci->db->escape(getAuthUID()) . " AS uid
+		)");
+
+		return success("
+			WITH " . $recursive . implode(", ", $with) . "
+			SELECT *
+			FROM (" . implode(" UNION ", $selects) . ") q
+			ORDER BY rank DESC
+			LIMIT 100
+		");
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Protected methods
+
+	/**
+	 * Check config
+	 *
+	 * @param string							$name
+	 *
+	 * @return stdClass
+	 */
+	protected function checkConfig($name)
+	{
+		$table_config = $this->_ci->config->item($name, 'search');
+
+		if (!$table_config)
+			return error($this->_ci->search_phrases->t('search', 'error_missing_config', [
+				'type' => $name
+			]));
+
+		$errors = [];
+		if (!isset($table_config['table'])
+			|| !is_string($table_config['table'])
+			|| !$table_config['table']
+		) {
+			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
+				'type' => $name,
+				'field' => 'table'
+			]);
+		}
+		if (!isset($table_config['primarykey'])
+			|| !is_string($table_config['primarykey'])
+			|| !$table_config['primarykey']
+		) {
+			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
+				'type' => $name,
+				'field' => 'primarykey'
+			]);
+		}
+		if (!isset($table_config['resultfields'])
+			|| !is_array($table_config['resultfields'])
+			|| !$table_config['resultfields']
+		) {
+			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
+				'type' => $name,
+				'field' => 'resultfields'
+			]);
+		}
+		if (!isset($table_config['searchfields'])
+			|| !is_array($table_config['searchfields'])
+			|| !$table_config['searchfields']
+		) {
+			$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config', [
+				'type' => $name,
+				'field' => 'searchfields'
+			]);
+		} else {
+			foreach ($table_config['searchfields'] as $searchfield => $config) {
+				if (!isset($config['field'])
+					|| !is_string($config['field'])
+					|| !$config['field']
+				) {
+					$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config_searchfield', [
+						'type' => $name,
+						'searchfield' => $searchfield,
+						'field' => 'field'
+					]);
+				}
+				if (!isset($config['comparison'])
+					|| !is_string($config['comparison'])
+					|| !in_array($config['comparison'], $this->_allowed_searchfunctions)
+				) {
+					$errors[] = $this->_ci->search_phrases->t('search', 'error_invalid_config_searchfield', [
+						'type' => $name,
+						'searchfield' => $searchfield,
+						'field' => 'comparison'
+					]);
+				}
+			}
+		}
+
+		if ($errors)
+			return error($errors);
+
+		return success($table_config);
+	}
+
+	/**
+	 * Generates the with statements for the given search string and the
+	 * specified search type.
+	 *
+	 * @param array								&$sqlWith
+	 * @param array								$searchArray
+	 * @param string							$table
+	 *
+	 * @return string	a query string or the name of the prepared select.
+	 */
+	protected function prepareDynamicSearchSql(&$sqlWith, $searchArray, $table)
+	{
+		$table_config = $this->_ci->config->item($table, 'search');
+
+		$id_offset = count($sqlWith);
+
+
+		$allowed_codes_w_order = ['' => 0, '!' => -1];
+		$max = max($this->_searchfunction_priorities);
+		foreach ($table_config['searchfields'] as $code => $config) {
+			$allowed_codes_w_order[$code] = $this->_searchfunction_priorities[$config['comparison']];
+			$allowed_codes_w_order['!' . $code] = $this->_searchfunction_priorities[$config['comparison']] - $max - 2;
+		}
+
+		$check_order = $this->_searchfunction_priorities;
+		uasort($table_config['searchfields'], function ($a, $b) use ($check_order) {
+			return $check_order[$b['comparison']] - $check_order[$a['comparison']];
+		});
+
+		$integer_functions = $this->_numeric_searchfunctions;
+		$integer_fields = array_keys(array_filter($table_config['searchfields'], function ($a) use ($integer_functions) {
+				return in_array($a['comparison'], $integer_functions);
+		}));
+
+		$only_integer_fields = count($integer_fields) == count($table_config['searchfields']);
+
+		$aliases = [];
+		foreach ($table_config['searchfields'] as $field => $config) {
+			if (isset($config['alias'])) {
+				foreach ($config['alias'] as $alias) {
+					$aliases[$alias] = $field;
+					$aliases['!' . $alias] = '!' . $field;
+				}
+			}
+		}
+
+		$sql_select = [];
+
+		if (isset($table_config['prepare'])) {
+			$this->_addPreparesToSqlWith($sqlWith, $table_config['prepare']);
+		}
+
+		foreach ($searchArray as $or_search) {
+			if (isset($or_search['-filter']) && !in_array($table, $or_search['-filter']))
+				continue;
+			unset($or_search['-filter']);
+			
+			foreach ($aliases as $alias => $field) {
+				if (isset($or_search[$alias])) {
+					$or_search[$field] = array_merge($or_search[$alias], $or_search[$field] ?? []);
+					unset($or_search[$alias]);
+				}
+			}
+
+			// NOTE(chris): early out if not allowed fields are in the search array
+			$used_codes = array_keys($or_search);
+			if (count(array_intersect($used_codes, array_keys($allowed_codes_w_order))) != count($used_codes))
+				continue;
+
+			// NOTE(chris): expand general excludes to all fields
+			if (isset($or_search['!'])) {
+				$not = $or_search['!'];
+				unset($or_search['!']);
+				foreach ($table_config['searchfields'] as $code => $config) {
+					if (isset($or_search['!' . $code]))
+						$or_search['!' . $code] = array_unique(array_merge($or_search['!' . $code], $not));
+					else
+						$or_search['!' . $code] = $not;
+				}
+			}
+
+			// NOTE(chris): early out if all searchfields require an integer and at least one searchword is not a number
+			if ($only_integer_fields
+				&& isset($or_search[""])
+				&& $this->_hasAtLeastOneNaN($or_search[""])
+			) {
+				continue;
+			}
+
+			$skip = false;
+			foreach ($integer_fields as $code) {
+				// NOTE(chris): filter non integer for integer fields
+				if (isset($or_search['!' . $code])) {
+					$or_search['!' . $code] = array_filter($or_search['!' . $code], function ($a) {
+						return is_numeric($a);
+					});
+					if (!$or_search['!' . $code])
+						unset($or_search['!' . $code]);
+				}
+				// NOTE(chris): early out if a searchword that is not a number is compared to a searchfield that requires an integer
+				if (isset($or_search[$code])
+					&& $this->_hasAtLeastOneNaN($or_search[$code])
+				) {
+					$skip = true;
+					break;
+				}
+			}
+			if ($skip)
+				continue;
+
+			// NOTE(chris): sort for performance reasons
+			uksort($or_search, function ($a, $b) use ($allowed_codes_w_order) {
+				return $allowed_codes_w_order[$b] - $allowed_codes_w_order[$a];
+			});
+
+			$or_with = [];
+			$or_select = [];
+			$or_prepare = [];
+
+			if (substr(key($or_search), 0, 1) == '!') {
+				// NOTE(chris): only negative searchwords
+				$sql = [];
+				foreach ($or_search as $code => $words) {
+					$code = substr($code, 1);
+					// NOTE(chris): sort for performance reasons
+					usort($words, function ($a, $b) {
+						return strlen($b) - strlen($a);
+					});
+					$field_config = $table_config['searchfields'][$code];
+
+					if (isset($field_config['prepare'])) {
+						$this->_addPreparesToSqlWith($or_with, $field_config['prepare']);
+						$or_prepare[$code] = $field_config['prepare'];
+						unset($table_config['searchfields'][$code]['prepare']);
+						unset($field_config['prepare']);
+					}
+					$field_sql = "
+						SELECT
+							" . $this->_formatPrimarykeys($table_config['primarykey'], $table_config['table']) . "
+							FROM " . $table_config['table'] . "
+							" . $this->_makeJoin($field_config['join'] ?? '') . "
+							WHERE ";
+					foreach ($words as $word) {
+						$sql[] = $field_sql . $this->_makeCompareBool($field_config['comparison'], $field_config['field'], $word);
+					}
+				}
+
+				$or_select[] = "
+					SELECT 
+						" . $this->_formatPrimarykeys($table_config['primarykey'], $table_config['table']) . ",
+						1.0 AS rank
+					FROM " . $table_config['table'] . "
+					WHERE " . $table_config['primarykey'] . " NOT IN (" . implode(" UNION ", $sql) . ")";
+			} else {
+				$current_select = false;
+				$count = 0;
+				$skip = false;
+				foreach ($or_search as $code => $words) {
+					// NOTE(chris): sort for performance reasons
+					if ($code && substr($code, 0, 1) == '!') {
+						usort($words, function ($a, $b) {
+							return strlen($a) - strlen($b);
+						});
+					} else {
+						usort($words, function ($a, $b) {
+							return strlen($b) - strlen($a);
+						});
+					}
+					if ($code == '') {
+						foreach ($words as $i => $word) {
+							$field_sql = [];
+							foreach ($table_config['searchfields'] as $c => $field_config) {
+								if (in_array($field_config['comparison'], $integer_functions) && !is_numeric($word))
+									continue;
+
+								$word_from = $table_config['table'];
+								$word_join = "";
+								$word_rank = "0";
+								if ($current_select) {
+									$word_from = $current_select;
+									if ($this->_needBasicTableJoin($field_config['field'], $table_config['primarykey'])) {
+										$word_join .= " " . $this->_makeJoin($table_config);
+									}
+									$word_rank = "rank";
+								}
+								if (isset($field_config['prepare'])) {
+									$this->_addPreparesToSqlWith($or_with, $field_config['prepare']);
+									$or_prepare[$c] = $field_config['prepare'];
+									unset($table_config['searchfields'][$c]['prepare']);
+									unset($field_config['prepare']);
+								}
+								if (isset($field_config['join'])) {
+									$word_join .= " " . $this->_makeJoin($field_config['join']);
+								}
+								$field_sql[] = "
+									SELECT
+										" . $this->_formatPrimarykeys($table_config['primarykey'], $word_from) . ",
+										" . $word_rank . " AS w_rank,
+										" . $this->_makeRank($field_config['comparison'], $field_config['field'], $word) . " AS rank
+										FROM " . $word_from . "
+										" . $word_join . "
+										WHERE " . $this->_makeCompare($field_config['comparison'], $field_config['field'], $word);
+							}
+							// NOTE(chris): skip because the word is not numeric but all searchfields require integers
+							if (!$field_sql) {
+								$or_with = [];
+								$or_select = [];
+								$count = 0;
+								$skip = true;
+								foreach ($or_prepare as $k => $v)
+									$table_config['searchfields'][$k]['prepare'] = $v;
+								break;
+							}
+
+							$id = "w" . ($id_offset + count($or_with));
+							$or_with[] = "
+								" . $id . " (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
+								SELECT
+									" . $this->_formatPrimarykeys($table_config['primarykey']) . ",
+									(w_rank + 1.0 - CASE " .
+										"WHEN MIN(rank) = 0 THEN 0 " .
+										"ELSE EXP(SUM(LN(CASE WHEN rank = 0 THEN 1 ELSE rank " .
+										"END))) END) AS rank
+									FROM (" . implode(' UNION ALL ', $field_sql) . ") " . $id . "
+									GROUP BY " . $this->_formatPrimarykeys($table_config['primarykey']) . ", w_rank
+								)";
+							$current_select = $id;
+						}
+					} else {
+						foreach ($words as $i => $word) {
+							$where = "";
+							$rank = "";
+							$jointype = "";
+							if (substr($code, 0, 1) == '!') {
+								$c = substr($code, 1);
+								$field_config = $table_config['searchfields'][$c];
+								
+								$rank = "1";
+
+								$jointype = "LEFT";
+
+								$where = $field_config['field'] .
+									" IS NULL OR NOT (" .
+									$this->_makeCompareBool(
+										$field_config['comparison'],
+										$field_config['field'],
+										$word
+									) .
+									")";
+								if ($field_config['1-n'] ?? false) {
+									$where = "GROUP BY " .
+										$this->_formatPrimarykeys($table_config['primarykey'], $current_select ?: $table_config['table']) .
+										", rank HAVING MIN(CASE WHEN " .
+										$where .
+										" THEN 1 ELSE 0 END) = 1";
+								} else {
+									$where = "WHERE " . $where;
+								}
+							} else {
+								$field_config = $table_config['searchfields'][$code];
+
+								$rank = $this->_makeRank($field_config['comparison'], $field_config['field'], $word);
+
+								$where = $this->_makeCompare($field_config['comparison'], $field_config['field'], $word);
+								$where = "WHERE " . $where;
+							}
+							$word_from = $table_config['table'];
+							$word_join = "";
+							$word_rank = "";
+							if ($current_select) {
+								$word_from = $current_select;
+								if ($this->_needBasicTableJoin($field_config['field'], $table_config['primarykey'])) {
+									$word_join .= " " . $this->_makeJoin($table_config);
+								}
+								$word_rank = "rank + ";
+							}
+							if (isset($field_config['prepare'])) {
+								$this->_addPreparesToSqlWith($or_with, $field_config['prepare']);
+								$or_prepare[$code] = $field_config['prepare'];
+								unset($table_config['searchfields'][$code]['prepare']);
+								unset($field_config['prepare']);
+							}
+							if (isset($field_config['join'])) {
+								$word_join .= " " . $this->_makeJoin($field_config['join'], $jointype);
+							}
+
+							$id = "w" . ($id_offset + count($or_with));
+							$or_with[] = "
+								" . $id . " (" . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank) AS (
+								SELECT
+									" . $this->_formatPrimarykeys($table_config['primarykey'], $word_from) . ",
+									" . $word_rank . $rank . " AS rank
+									FROM " . $word_from . "
+									" . $word_join . "
+									" . $where . "
+								)";
+							$current_select = $id;
+						}
+					}
+					if ($skip)
+						break;
+					$count += count($words);
+				}
+
+				if (!$count || !$current_select)
+					continue;
+
+				$or_select[] = "
+					SELECT " . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank / " . $count . " AS rank FROM " . $current_select;
+			}
+
+			if ($or_with[0] === "RECURSIVE") {
+				if ($sqlWith[0] !== "RECURSIVE")
+					array_unshift($sqlWith, "RECURSIVE");
+				array_shift($or_with);
+			}
+
+			$sqlWith = array_merge($sqlWith, $or_with);
+			$sql_select = array_merge($sql_select, $or_select);
+			$id_offset += count($or_with);
+		}
+
+		return $sql_select;
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Private methods
+
+	/**
+	 * Checks if the field is not one of the primarykeys.
+	 *
+	 * @param string							$field
+	 * @param array|string						$primarykeys
+	 *
+	 * @return boolean
+	 */
+	private function _needBasicTableJoin($field, $primarykeys)
+	{
+		if (!is_array($primarykeys) && strpos($primarykeys, ",") !== false) {
+			return $field != $primarykeys;
+		}
+		if (!is_array($primarykeys))
+			$primarykeys = explode(",", $primarykeys);
+
+		foreach ($primarykeys as $key) {
+			if ($field == trim($key))
+				return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Returns comma separated primarykeys. Optionally with table prefix
+	 *
+	 * @param array|string						$primarykeys
+	 * @param string							$prefix
+	 *
+	 * @return string
+	 */
+	private function _formatPrimarykeys($primarykeys, $prefix = "")
+	{
+		if (is_array($primarykeys)) {
+			if ($prefix)
+				$prefix .= ".";
+			return $prefix . implode(", " . $prefix, $primarykeys);
+		}
+		if (!$prefix)
+			return $primarykeys;
+
+		return $prefix . "." . implode(", " . $prefix . ".", explode(",", $primarykeys));
+	}
+
+	/**
+	 * Adds the prepare statement to the sqlWith stack and handles the
+	 * "RECURSIVE" modifier
+	 *
+	 * @param array								&$sqlWith
+	 * @param array								$prepares
+	 *
+	 * @return void
+	 */
+	private function _addPreparesToSqlWith(&$sqlWith, $prepares)
+	{
+		$recursive = $sqlWith[0] ?? "" === "RECURSIVE";
+		if (!is_array($prepares))
+			$prepares = [$prepares];
+		
+		foreach ($prepares as $prep) {
+			$prep = trim($prep);
+			if (strtoupper(substr($prep, 0, 10)) === "RECURSIVE ") {
+				$recursive = true;
+				$sqlWith[] = substr($prep, 10);
+			} else {
+				$sqlWith[] = $prep;
+			}
+		}
+		if ($recursive && $sqlWith[0] !== "RECURSIVE") {
+			array_unshift($sqlWith, "RECURSIVE");
+		}
+	}
+
+	/**
+	 * Checks if an array has at least on non numeric value.
+	 *
+	 * @param array								$arr
+	 *
+	 * @return boolean
+	 */
+	private function _hasAtLeastOneNaN($arr)
+	{
+		foreach ($arr as $value)
+			if (!is_numeric($value))
+				return true;
+		return false;
+	}
+
+	/**
+	 * Helper function for getDynamicSearchSql
+	 *
+	 * @param array								$join
+	 * @param string							$prefix
+	 *
+	 * @return string
+	 */
+	private function _makeJoin($join, $prefix = "")
+	{
+		if (!is_array($join))
+			return "";
+		if (!isset($join['table'])) {
+			$output = [];
+			foreach ($join as $j)
+				$output[] = trim($this->_makeJoin($j, $prefix));
+			return implode(" ", $output);
+		}
+		if (!isset($join['on']) && !isset($join['using']) && !isset($join['primarykey']))
+			return "";
+		$output = $prefix . " JOIN " . $join['table'];
+
+		if (isset($join['using']))
+			return $output . " USING (" . $join['using'] . ")";
+
+		if (isset($join['primarykey']))
+			return $output . " USING (" . $join['primarykey'] . ")";
+
+		return $output . " ON (" . $join['on'] . ")";
+	}
+
+	/**
+	 * Helper function for _makeRank, _makeCompare and _makeCompareBool
+	 *
+	 * @param string							$function
+	 * @param string							$mode
+	 * @param string							$field
+	 * @param string							$word
+	 *
+	 * @return string
+	 */
+	private function _makeFunction($function, $mode, $field, $word)
+	{
+		$searchfunction = $this->_ci->config->item($mode, 'searchfunctions');
+
+		if (!$searchfunction)
+			return "";
+		$tpl = $searchfunction[$function] ?? "";
+		
+		if (strstr($tpl, '{field}'))
+			$tpl = str_replace('{field}', $field, $tpl);
+
+		if (strstr($tpl, '{word}'))
+			$tpl = str_replace('{word}', $this->_ci->db->escape($word), $tpl);
+		if (strstr($tpl, '{like:word}'))
+			$tpl = str_replace('{like:word}', "'%" . $this->_ci->db->escape_like_str($word) . "%'", $tpl);
+		
+		return $tpl;
+	}
+
+	/**
+	 * Helper function for getDynamicSearchSql
+	 *
+	 * @param string							$mode
+	 * @param string							$field
+	 * @param string							$word
+	 *
+	 * @return string
+	 */
+	private function _makeRank($mode, $field, $word)
+	{
+		return $this->_makeFunction('rank', $mode, $field, $word);
+	}
+
+	/**
+	 * Helper function for getDynamicSearchSql
+	 *
+	 * @param string							$mode
+	 * @param string							$field
+	 * @param string							$word
+	 *
+	 * @return string
+	 */
+	private function _makeCompare($mode, $field, $word)
+	{
+		return $this->_makeFunction('compare', $mode, $field, $word);
+	}
+
+	/**
+	 * Helper function for getDynamicSearchSql
+	 *
+	 * @param string							$mode
+	 * @param string							$field
+	 * @param string							$word
+	 *
+	 * @return string
+	 */
+	private function _makeCompareBool($mode, $field, $word)
+	{
+		$searchfunction = $this->_ci->config->item($mode, 'searchfunctions');
+
+		if (!$searchfunction)
+			return "";
+		$function = isset($searchfunction['compare_boolean']) ? 'compare_boolean' : 'compare';
+		return $this->_makeFunction($function, $mode, $field, $word);
+	}
+
+	/**
+	 * Converts the search string to an array.
+	 * First level should be joined with an OR.
+	 * Second level should be joined with an AND or AND NOT.
+	 * It is an associative array where the key is a code for the field
+	 * which the words should be compared with and the value is the array
+	 * of words.
+	 * Use AND NOT if the first letter in the key is "!".
+	 * Use AND if the first letter in the key is not "!".
+	 * E.g:
+	 * If the key is:
+	 * "": the words should be compared to all fields with AND.
+	 * "!": the words should be compared to all fields with AND NOT.
+	 * "somefield": the words should be compared to the field somefield with
+	 * AND.
+	 * "!somefield": the words should be compared to the field somefield with
+	 * AND NOT.
+	 *
+	 * @param string							$searchstring
+	 * @param array								$types
+	 *
+	 * @return array
+	 */
+	private function _convertQuery($searchstring, $types)
+	{
+		$searchAllTypes = count($types) == count($this->_ci->config->item('search'));
+		$allowedTypes = array_keys($types);
+
+		$currentArray = [];
+		$outputArray = [];
+		$cleanStrings = [];
+		$cleanSearchstring = '';
+		$filter = ['+' => [], '-' => []];
+		$typeAliases = [];
+
+		$tmp = explode(' ', strtolower($searchstring));
+		while ($tmp) {
+			$chunk = trim(array_shift($tmp));
+			if ($chunk == '')
+				continue;
+
+			if (strpos($chunk, '"') !== false) {
+				$test = explode('"', $chunk);
+				if (count($test) > 2) {
+					$rest = implode('"', array_slice($test, 2));
+					if ($rest) {
+						array_unshift($tmp, $rest);
+						$chunk = implode('"', array_slice($test, 0, 2)) . '"';
+					}
+				}
+				if (count($test) == 2) {
+					while ($tmp && strpos($test[1], '"') === false) {
+						$test[1] .= ' ' . trim(array_shift($tmp));
+					}
+					if (strpos($test[1], '"') === false) {
+						$chunk = implode('"', $test) . '"';
+					} else {
+						$test2 = explode('"', $test[1], 2);
+						$chunk = $test[0] . '"' . $test2[0] . '"';
+						if ($test2[1]) {
+							array_unshift($tmp, $test2[1]);
+						}
+					}
+				}
+				if (strpos($chunk, ' ') === false) {
+					$chunk = str_replace('"', '', $chunk);
+				}
+			}
+
+			if ($chunk == 'or') {
+				$this->_convertQueryCleanupOr($currentArray, $cleanStrings, $filter, $searchAllTypes, $allowedTypes);
+				$filter = ['+' => [], '-' => []];
+				if ($currentArray) {
+					$cleanSearchstring .= ($cleanSearchstring ? ' or ' : '') . implode(' ', $cleanStrings);
+					$cleanStrings = [];
+					$outputArray[] = $currentArray;
+					$currentArray = [];
+				}
+				continue;
+			}
+
+			if ($chunk == ':' || $chunk == '-' || substr($chunk, -1) == ':')
+				continue;
+
+			if ($chunk[0] == ':' || ($chunk[0] == '-' && $chunk[1] == ':')) {
+				if (!$typeAliases) {
+					foreach ($types as $type => $config) {
+						$typeAliases[$type] = $type;
+						if (isset($config['alias'])) {
+							foreach ($config['alias'] as $alias) {
+								if (!isset($typeAliases[$alias]))
+									$typeAliases[$alias] = $type;
+							}
+						}
+					}
+				}
+
+				$test = explode(':', $chunk, 2);
+				if (isset($typeAliases[$test[1]]))
+					$chunk = $test[0] . ':' . $typeAliases[$test[1]];
+				elseif ($test[0] == '-')
+					continue;
+			}
+
+			if (in_array($chunk, $cleanStrings))
+				continue;
+
+			$cleanStrings[] = $chunk;
+
+			$chunk = str_replace('"', '', $chunk);
+			$code = '';
+
+			if ($chunk[0] == '-') {
+				$code = '!';
+				$chunk = substr($chunk, 1);
+			}
+			if (strpos($chunk, ':') !== false) {
+				$chunk = explode(':', $chunk, 2);
+				if (!$chunk[0]) {
+					$filter[$code ? '-' : '+'][] = $chunk[1];
+					continue;
+				}
+				$code .= $chunk[0];
+				$chunk = $chunk[1];
+			}
+
+			if (!isset($currentArray[$code]))
+				$currentArray[$code] = [];
+			
+			$currentArray[$code][] = $chunk;
+		}
+
+		$this->_convertQueryCleanupOr($currentArray, $cleanStrings, $filter, $searchAllTypes, $allowedTypes);
+		if ($currentArray) {
+			$cleanSearchstring .= ($cleanSearchstring ? ' or ' : '') . implode(' ', $cleanStrings);
+			$outputArray[] = $currentArray;
+		}
+		return [$outputArray, $cleanSearchstring];
+	}
+
+	private function _convertQueryCleanupOr(&$currentArray, &$cleanStrings, $filter, $searchAllTypes, $allowedTypes)
+	{
+		if ($filter['+'] && $filter['-']) {
+			$double = array_intersect($filter['+'], $filter['-']);
+			if ($double) {
+				foreach ($double as $type) {
+					array_splice($cleanStrings, array_search(':' . $type, $cleanStrings), 1);
+					array_splice($cleanStrings, array_search('-:' . $type, $cleanStrings), 1);
+				}
+				$filter['+'] = array_diff($filter['+'], $double);
+				$filter['-'] = array_diff($filter['-'], $double);
+			}
+			if (!$filter['+'] && !$filter['-']) {
+				// All filters cancel each other out
+				$currentArray = [];
+				$cleanStrings = [];
+				return;
+			}
+			if ($filter['+']) {
+				foreach ($filter['-'] as $type) {
+					array_splice($cleanStrings, array_search('-:' . $type, $cleanStrings), 1);
+				}
+				$filter['-'] = [];
+			}
+		}
+		if ($filter['+']) {
+			$cleanFilter = array_intersect($allowedTypes, $filter['+']);
+			if (!$cleanFilter) {
+				// All filters are forbidden
+				$currentArray = [];
+				$cleanStrings = [];
+				return;
+			}
+			$forbiddenFilter = array_diff($cleanFilter, $filter['+']);
+			foreach ($forbiddenFilter as $type) {
+				array_splice($cleanStrings, array_search(':' . $type, $cleanStrings), 1);
+			}
+			$filter['+'] = $cleanFilter;
+		} elseif ($filter['-']) {
+			$filter['+'] = array_diff($allowedTypes, $filter['-']);
+			if (!$searchAllTypes) {
+				foreach ($filter['+'] as $type)
+					$cleanStrings[] = ':' . $type;
+				foreach ($filter['-'] as $type)
+					array_splice($cleanStrings, array_search('-:' . $type, $cleanStrings), 1);
+			}
+		} else {
+			if (!$searchAllTypes) {
+				foreach ($allowedTypes as $type)
+					$cleanStrings[] = ':' . $type;
+			}
+		}
+
+		if ($filter['+']) {
+			$currentArray['-filter'] = $filter['+'];
+		}
+	}
+}

From 2aa3e7704f0521fffaabf2010e4a4c78366a7dfb Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 16 Jun 2025 10:57:16 +0200
Subject: [PATCH 242/572] fix(style):adds missing border

---
 public/css/Cis4/CoreCalendarEvents.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index 5efe8b608..cf88e328c 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -38,6 +38,7 @@
 	padding: .25rem .5rem .25rem .25rem;
 	margin-right: .25rem;
 	align-content: center;
+	border-right: 1px solid var(--bs-secondary);
 }
 
 

From 57b0ae12d536fb92a5fa579fff06ef19fa95261d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 16 Jun 2025 10:58:23 +0200
Subject: [PATCH 243/572] update(LvPlan router):changes the route parameters
 when changing the week in the weeks overview

---
 public/js/components/Calendar/Weeks.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Calendar/Weeks.js b/public/js/components/Calendar/Weeks.js
index 260540adb..bed39d624 100644
--- a/public/js/components/Calendar/Weeks.js
+++ b/public/js/components/Calendar/Weeks.js
@@ -9,7 +9,8 @@ export default {
 	],
 	inject: [
 		'size',
-		'focusDate'
+		'focusDate',
+		'mode',
 	],
 	props: {
 		header: {
@@ -30,6 +31,20 @@ export default {
 			// TODO(chris): test is there a week jump on year select? => yes there is if the same month/day are in different weeks ... should we prevent that?
 			this.focusDate.w = week;
 			this.$emit('updateMode', 'week');
+			Vue.nextTick(()=>{
+				let date = new Date(this.focusDate.y, this.focusDate.m, this.focusDate.d);
+				date = date.getFullYear() + "-" +
+					String(date.getMonth() + 1).padStart(2, "0") + "-" +
+					String(date.getDate()).padStart(2, "0");
+				this.$router.push({
+					name: "LvPlan",
+					params: {
+						mode: this.mode[0].toUpperCase() + this.mode.slice(1),
+						focus_date: date,
+						lv_id: this.$route.params.lv_id || null
+					}
+				})
+			})
 		},
 		prev(){
 			this.focusDate.y--;

From 9ed68648f648421521571595e0c44c3c02387db9 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 16 Jun 2025 11:33:15 +0200
Subject: [PATCH 244/572] declare css variables per component file with
 fallback default

---
 public/css/FilterWidget.css                   |   8 +-
 public/css/components/FilterComponent.css     |   6 +-
 public/css/components/FormUnderline.css       |   9 +-
 public/css/components/MyLv.css                |   4 +-
 public/css/components/NavigationComponent.css |  30 ++---
 public/css/components/Profil.css              |  16 +--
 public/css/components/Sprachen.css            |  14 ++-
 public/css/components/calendar.css            | 104 +++++++++---------
 public/css/components/dashboard.css           |  38 ++++---
 public/css/components/dashboard/news.css      |  26 ++---
 public/css/components/searchbar/searchbar.css |  18 +--
 public/css/components/searchbar/switches.css  |   8 +-
 public/css/components/verticalsplit.css       |   6 +-
 13 files changed, 154 insertions(+), 133 deletions(-)

diff --git a/public/css/FilterWidget.css b/public/css/FilterWidget.css
index 5723de69e..98573560f 100644
--- a/public/css/FilterWidget.css
+++ b/public/css/FilterWidget.css
@@ -1,8 +1,8 @@
 :root{
-	--filter-widget-border: var(--fhc-dark);
-	--filter-widget-color: var(--fhc-dark);
-	--filter-widget-primary: var(--fhc-primary);
-	--filter-widget-border-light: var(--fhc-border);
+	--filter-widget-border: var(--fhc-dark, black);
+	--filter-widget-color: var(--fhc-dark, black);
+	--filter-widget-primary: var(--fhc-primary, #428bca);
+	--filter-widget-border-light: var(--fhc-border, #ddd);
 }
 
 .filter-name-title {
diff --git a/public/css/components/FilterComponent.css b/public/css/components/FilterComponent.css
index b3df05a19..3edf989a6 100644
--- a/public/css/components/FilterComponent.css
+++ b/public/css/components/FilterComponent.css
@@ -1,7 +1,7 @@
 :root{
-	--fhc-filtercomponent-primary: var(--fhc-primary);
-	--fhc-filtercomponent-bg:var(--fhc-background);
-	--fhc-filtercomponent-border:var(--fhc-border);
+	--fhc-filtercomponent-primary: var(--fhc-primary, #428bca);
+	--fhc-filtercomponent-bg:var(--fhc-background, white);
+	--fhc-filtercomponent-border:var(--fhc-border, black);
 }
 
 .filter-header-title {
diff --git a/public/css/components/FormUnderline.css b/public/css/components/FormUnderline.css
index f41883265..0d1fd991f 100644
--- a/public/css/components/FormUnderline.css
+++ b/public/css/components/FormUnderline.css
@@ -1,5 +1,10 @@
 /* FORM UNDERLINE
 */
+:root {
+	--fhc-formunderline-border: var(--fhc-border, #dee2e6);
+	--fhc-formunderline-link: var(--fhc-link, initial);
+}
+
 .form-underline{
     display: flex;
     flex-direction: column;
@@ -9,12 +14,12 @@
   }
   
   a.form-underline-content{
-	color: var(--fhc-link);
+	color: var(--fhc-formunderline-link);
   }
   
   .form-underline .form-underline-content{
     border-width: 1px;
-    border-color: transparent transparent var(--fhc-border) transparent;
+    border-color: transparent transparent var(--fhc-formunderline-border) transparent;
     border-style: solid;
     padding-bottom: 0.25rem;
     padding-left: 0.5rem;
diff --git a/public/css/components/MyLv.css b/public/css/components/MyLv.css
index b7176fb35..267e2f45e 100644
--- a/public/css/components/MyLv.css
+++ b/public/css/components/MyLv.css
@@ -1,8 +1,8 @@
 :root{
-	--myLv-disabled: var(--fhc-disabled);
+	--fhc-myLv-disabled: var(--fhc-disabled, #565e647f);
 }
 
 .unavailable, .unavailable:hover{
-	color: var(--myLv-disabled) !important;
+	color: var(--fhc-myLv-disabled) !important;
 	cursor: default;
 }
diff --git a/public/css/components/NavigationComponent.css b/public/css/components/NavigationComponent.css
index e922d4812..4799e2f26 100644
--- a/public/css/components/NavigationComponent.css
+++ b/public/css/components/NavigationComponent.css
@@ -3,22 +3,22 @@
  */
 
  :root{
-	--nav-component-bg: var(--fhc-tertiary);
-	--nav-component-border: var(--fhc-border);
-	--nav-component-color: var(--fhc-text);
-	--nav-left-component-border: var(--fhc-border);
-	--nav-left-component-bg: var(--fhc-tertiary);
-	--nav-left-component-color: var(--fhc-primary);
-	--nav-left-component-hover: var(--fhc-secondary-highlight);
+	--fhc-nav-component-bg: var(--fhc-tertiary, #f8f8f8);
+	--fhc-nav-component-border: var(--fhc-border, #5e5e5e);
+	--fhc-nav-component-color: var(--fhc-text, #5e5e5e);
+	--fhc-nav-left-component-border: var(--fhc-border, #e7e7e7);
+	--fhc-nav-left-component-bg: var(--fhc-tertiary, #f8f8f8);
+	--fhc-nav-left-component-color: var(--fhc-primary, #23527c);
+	--fhc-nav-left-component-hover: var(--fhc-secondary-highlight, #eee);
  }
 
 .navbar-header {
-	background-color: var(--nav-component-bg);
+	background-color: var(--fhc-nav-component-bg);
 	padding-top: 0px;
 	padding-bottom: 0px;
 	padding-left: 10px;
 	border-style: solid;
-	border-color: var(--nav-component-border);
+	border-color: var(--fhc-nav-component-border);
 	border-width: 0 0 1px;
 }
 
@@ -26,7 +26,7 @@
 	font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
 	font-size: 18px;
 	line-height: 1.42857143;
-	color: var(--nav-component-color) !important;
+	color: var(--fhc-nav-component-color) !important;
 	padding-top: 15px !important;
 	padding-right: 7px !important;
 	padding-left: 7px !important;
@@ -45,8 +45,8 @@
 	z-index: 1;
 	position: absolute;
 	width: 250px;
-	border-right: 1px solid ;
-	background-color:var(--nav-left-component-bg);
+	border-right: 1px solid var(--fhc-nav-left-component-border);
+	background-color:var(--fhc-nav-left-component-bg);
 }
 
 .navbar-left-side ul {
@@ -54,7 +54,7 @@
 }
 
 .navbar-left-side ul li {
-	border-bottom: 1px solid var(--nav-left-component-border);
+	border-bottom: 1px solid var(--fhc-nav-left-component-border);
 }
 
 .left-side-menu-second-level {
@@ -78,7 +78,7 @@
 	font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
 	font-size: 14px;
 	line-height: 1.42857143;
-	color: var(--nav-left-component-color);
+	color: var(--fhc-nav-left-component-color);
 	padding-top: 10px !important;
 	padding-bottom: 10px !important;
 	padding-left: 7px !important;
@@ -87,7 +87,7 @@
 }
 
 .left-side-menu-link-entry:hover {
-	background-color: var(--nav-left-component-hover);
+	background-color: var(--fhc-nav-left-component-hover);
 }
 
 /*
diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
index de6adbee7..b1ac8d67a 100644
--- a/public/css/components/Profil.css
+++ b/public/css/components/Profil.css
@@ -1,14 +1,13 @@
 
 :root{
-	--profil-border: var(--fhc-border);
-	--profil-tabulator-shadow:var(--fhc-shadow-20);
+	--fhc-profil-border: var(--fhc-border, white);
+	--fhc-profil-tabulator-shadow: var(--fhc-shadow-20, rgba(0,0,0,0.1));
 }
 
-
 .image-lock{
   height:22px; 
   width:21px; 
-  background-color:var(--profil-border); 
+  background-color:var(--fhc-profil-border); 
   position:absolute;
   /* top: 1px is important, otherwise it goes over the border of the thumbnail*/ 
   top:1px; 
@@ -21,7 +20,7 @@
 
 .tabulator-collapsed-row{
     padding:15px;
-    background-color: var(--profil-tabulator-shadow);
+    background-color: var(--fhc-profil-tabulator-shadow);
 
 }
 
@@ -33,9 +32,6 @@
   padding:0 !important;
 }
 
-
-
-
 .btn-circle {
   width: 30px;
   height: 30px;
@@ -45,7 +41,3 @@
   font-size: 12px;
   line-height: 1.42857;
 }
-
-
-
-
diff --git a/public/css/components/Sprachen.css b/public/css/components/Sprachen.css
index 028b4f2f2..3175bbd1d 100644
--- a/public/css/components/Sprachen.css
+++ b/public/css/components/Sprachen.css
@@ -1,13 +1,21 @@
+
+:root {
+	--fhc-sprachen-color: var(--fhc-text, white);
+	--fhc-sprachen-background: var(--fhc-primary, #005585);
+	--fhc-sprachen-background-highlight: var(--fhc-primary-highlight, #00649c);
+}
+
 .sprachen-entry{
-	background-color: var(--fhc-primary);
+	color: var(--fhc-sprachen-color);
+	background-color: var(--fhc-sprachen-background);
 }
 
 .sprachen-entry:hover {
-	background-color: var(--fhc-primary);
+	background-color: var(--fhc-sprachen-background);
 }
 
 [selected="true"].sprachen-entry {
-	background-color: var(--fhc-primary-highlight);
+	background-color: var(--fhc-sprachen-background-highlight);
 }
 
 .sprachen-entry.btn {
diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 4d082fa5a..fe8841867 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -1,48 +1,50 @@
 :root{
-	--calendar-pane-height: calc(100vh - 220px);
+	--fhc-calendar-pane-height: calc(100vh - 220px);
 	
-	--calendar-primary: var(--fhc-primary);
-	--calendar-border: var(--fhc-border);
-	--calendar-border-highlight: var(--fhc-border-highlight);
-	--calendar-text: var(--fhc-text);
-	--calendar-text-light: var(--fhc-text);
-	--calendar-bg: var(--fhc-background);
-	--calendar-hour-indicator-bg: var(--fhc-background);
-	--calendar-week-page-header-background: var(--fhc-background);
-	--calendar-week-page-header-color: var(--fhc-text);
-	--calendar-week-page-header-border: var(--fhc-border);
-	--calendar-week-page-header-hover-background: var(--fhc-background-highlight);
-	--calendar-all-day-event-background: var(--fhc-background);
-	--calendar-past: var(--fhc-beige-10);
+	--fhc-calendar-primary: var(--fhc-primary, #006095);
+	--fhc-calendar-border: var(--fhc-border, #dee2e6);
+	--fhc-calendar-border-highlight: var(--fhc-border-highlight, #495057);
+	--fhc-calendar-text: var(--fhc-text, #212529);
+	--fhc-calendar-text-light: var(--fhc-text, #212529);
+	--fhc-calendar-background: var(--fhc-background, #fff);
+	--fhc-calendar-dark: var(--fhc-dark, #212529);
+	--fhc-calendar-hour-indicator-bg: var(--fhc-background, #fff);
+	--fhc-calendar-week-page-header-background: var(--fhc-background, #fff);
+	--fhc-calendar-week-page-header-color: var(--fhc-text, #212529);
+	--fhc-calendar-week-page-header-border: var(--fhc-border, #dee2e6);
+	--fhc-calendar-week-page-header-hover-background: var(--fhc-background-highlight, #d5dae0);
+	--fhc-calendar-all-day-event-background: var(--fhc-background, #fff);
+	--fhc-calendar-past: var(--fhc-beige-10, rgba(245, 233, 215, 0.5));
+	--fhc-calendar-box-shadow: var(--fhc-box-shadow, #dee2e6);
 }
 
 :root.dark{
-	--calendar-past: var(--fhc-beige-20);
+	--fhc-calendar-past: var(--fhc-beige-20, rgba(172, 153, 125, 0.5));
 }
 
 .fhc-calendar-pane {
-	height: var(--calendar-pane-height);
+	height: var(--fhc-calendar-pane-height);
 }
 
 .fhc-calendar-hour-indicator{
-	border-top: 1px solid var(--calendar-border);
+	border-top: 1px solid var(--fhc-calendar-border);
 }
 
 .fhc-calendar-hour-indicator span{
-	background-color: var(--calendar-hour-indicator-bg) !important;
+	background-color: var(--fhc-calendar-hour-indicator-bg) !important;
 }
 
 .fhc-calendar-week-page-header{
-	color: var(--calendar-text);
-	background-color: var(--calendar-week-page-header-background);
+	color: var(--fhc-calendar-text);
+	background-color: var(--fhc-calendar-week-page-header-background);
 }
 
 .fhc-calendar-week-page-header > div {
-	border-right: 1px solid var(--calendar-border);
+	border-right: 1px solid var(--fhc-calendar-border);
 }
 
 .fhc-calendar-week-page-header > div:hover{
-	background-color: var(--calendar-week-page-header-hover-background);
+	background-color: var(--fhc-calendar-week-page-header-hover-background);
 }
 
 .fhc-calendar-months .col-4,
@@ -104,7 +106,7 @@
 }
 
 .fhc-calendar-week-page .all-day-event-border{
-	box-shadow: 1px 1px 0 var(--fhc-box-shadow);
+	box-shadow: 1px 1px 0 var(--fhc-calendar-box-shadow);
 }
 
 .fhc-calendar-week-page .all-day-event {
@@ -120,7 +122,7 @@
 	grid-template-columns:repeat(7,1fr);
 	width:100%;
 	z-index:3;
-	background-color:var(--calendar-all-day-event-background);
+	background-color:var(--fhc-calendar-all-day-event-background);
 }
 
 .fhc-calendar-week-page .all-day-event-container::before {
@@ -130,12 +132,12 @@
 	bottom: 0;
 	left: -3em;
 	right: 100%;
-	background-color: var(--calendar-all-day-event-background);
-	box-shadow: 1px 1px 0 var(--fhc-box-shadow);
+	background-color: var(--fhc-calendar-all-day-event-background);
+	box-shadow: 1px 1px 0 var(--fhc-calendar-box-shadow);
 }
 
 .fhc-calendar-day-page .all-day-event-border {
-	box-shadow: 0 0 0 1px var(--fhc-box-shadow);
+	box-shadow: 0 0 0 1px var(--fhc-calendar-box-shadow);
 }
 
 .fhc-calendar-day-page .all-day-event {
@@ -151,13 +153,13 @@
 	grid-template-columns: 3em 1fr;
 	width: 100%;
 	z-index: 3;
-	background-color:var(--calendar-all-day-event-background);
-	box-shadow: 1px 1px 0 var(--fhc-box-shadow);
+	background-color:var(--fhc-calendar-all-day-event-background);
+	box-shadow: 1px 1px 0 var(--fhc-calendar-box-shadow);
 }
 
 /* grid hour lines of the Stundenplan use box-shadow instead of border because box-shadow renders consistently on different viewports*/
 .box-shadow-border{
-	box-shadow: 0 0 0 1px var(--calendar-border) !important;
+	box-shadow: 0 0 0 1px var(--fhc-calendar-border) !important;
 }
 
 .fhc-calendar-no-events-overlay{
@@ -172,7 +174,7 @@
 	margin:auto;
 	width: 100%;
 	height: 100%;
-	background-image: linear-gradient(120deg, var(--fhc-background), var(--fhc-dark) );
+	background-image: linear-gradient(120deg, var(--fhc-calendar-background), var(--fhc-calendar-dark) );
 	opacity: .7;
 }
 .fhc-calendar-day-page {
@@ -198,18 +200,18 @@
 }
 
 .fhc-calendar-month-page-day{
-	color: var(--calendar-text) !important;
+	color: var(--fhc-calendar-text) !important;
 }
 
 .fhc-calendar-month-page-day.fhc-calendar-past:not(.fhc-calendar-month-page-day-focusday) {
-	color: var(--fhc-text) !important;
+	color: var(--fhc-calendar-text) !important;
 }
 
 .fhc-calendar-lg .fhc-calendar-month-page-day,
 .fhc-calendar-lg .fhc-calendar-month-page-weekday,
 .fhc-calendar-md .fhc-calendar-month-page-day,
 .fhc-calendar-md .fhc-calendar-month-page-weekday {
-  border: solid 1px var(--calendar-border);
+  border: solid 1px var(--fhc-calendar-border);
 }
 .fhc-calendar-lg .fhc-calendar-month-page-day,
 .fhc-calendar-md .fhc-calendar-month-page-day {
@@ -219,7 +221,7 @@
 }
 .fhc-calendar-lg .fhc-calendar-month-page-day.active,
 .fhc-calendar-md .fhc-calendar-month-page-day.active {
-  border-color: var(--calendar-border-highlight);
+  border-color: var(--fhc-calendar-border-highlight);
 }
 /*.fhc-calendar-lg .fhc-calendar-month-page-day .events,*/
 /*.fhc-calendar-md .fhc-calendar-month-page-day .events {*/
@@ -264,8 +266,8 @@
 }
 
 .fhc-calendar-month-page-weekday:hover {
-	background-color:var(--calendar-primary);
-	color:var(--calendar-text-light);
+	background-color:var(--fhc-calendar-primary);
+	color:var(--fhc-calendar-text-light);
 	
 }
 
@@ -278,14 +280,14 @@
 
 
 .fhc-calendar-past {
-	background-color: var(--calendar-past);
-	border-color: var(--calendar-border);
+	background-color: var(--fhc-calendar-past);
+	border-color: var(--fhc-calendar-border);
 	opacity: 0.5;
 }
 
 .fhc-calendar-month-page-day-focusday {
-	border-color: var(--calendar-border-highlight) !important;
-	background-color: var(--calendar-bg);
+	border-color: var(--fhc-calendar-border-highlight) !important;
+	background-color: var(--fhc-calendar-background);
 	position: relative;
 	animation: dash-animation 2.5s linear infinite;
 }
@@ -317,20 +319,20 @@
 	bottom:0;
 	left:0;
 	right:0;
-	box-shadow: inset 0 0 0 2px var(--calendar-border) !important;
+	box-shadow: inset 0 0 0 2px var(--fhc-calendar-border) !important;
 	pointer-events: none;
 	z-index: 2;
 }
 
 .fhc-calendar-sm .fhc-calendar-month-page-day.active .no,
 .fhc-calendar-xs .fhc-calendar-month-page-day.active .no {
-  background-color: var(--calendar-primary);
+  background-color: var(--fhc-calendar-primary);
   border-radius: 50%;
   font-weight: bold;
 }
 .fhc-calendar-sm .fhc-calendar-month-page-day:not(.active):hover .no,
 .fhc-calendar-xs .fhc-calendar-month-page-day:not(.active):hover .no {
-  background-color: var(--calendar-primary);
+  background-color: var(--fhc-calendar-primary);
   border-radius: 50%;
 }
 /*.fhc-calendar-sm .fhc-calendar-month-page-day .no,*/
@@ -358,8 +360,8 @@
 }
 
 .selectedEvent {
-	background-color: var(--calendar-primary) !important;
-	color: var(--calendar-text-light);
+	background-color: var(--fhc-calendar-primary) !important;
+	color: var(--fhc-calendar-text-light);
 }
 
 .fhc-calendar-day-page .curTimeIndicator{
@@ -370,7 +372,7 @@
 	padding-left: 7rem;
 	margin-top: -1px;
 	z-index: 2;
-	border-color: var(--calendar-border)!important;
+	border-color: var(--fhc-calendar-border)!important;
 }
 
 .fhc-calendar-week-page .curTimeIndicator {
@@ -381,12 +383,12 @@
 	padding-left: 1rem;
 	margin-top: -1px;
 	z-index: 2;
-	border-color: var(--calendar-border) !important;
+	border-color: var(--fhc-calendar-border) !important;
 }
 
 .fhc-calendar-week-page .past::before{
 	content:"";
-	background-color: var(--calendar-past);
+	background-color: var(--fhc-calendar-past);
 	position: absolute;
 	pointer-events: none;
 	z-index: 2;
@@ -398,7 +400,7 @@
 }
 
 .fhc-calendar-week-page .overlay {
-	background-color: var(--calendar-past);
+	background-color: var(--fhc-calendar-past);
 	position: absolute;
 	pointer-events: none;
 	z-index: 2;
@@ -406,7 +408,7 @@
 }
 
 .fhc-calendar-day-page .overlay {
-	background-color: var(--calendar-past);
+	background-color: var(--fhc-calendar-past);
 	position: absolute;
 	pointer-events: none;
 	z-index: 2;
diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index beb5b649c..78567be2b 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -2,8 +2,18 @@
 @import './dashboard/news.css';
 
 :root{
-	--dashboard-danger: var(--fhc-danger);
+	--fhc-dashboard-danger: var(--fhc-danger, #842029);
 	--fhc-dashboard-grid-size: 4;
+	--fhc-dashboard-link: var(--fhc-link, #0a57ca);
+	--fhc-dashboard-gridrow-background: var(--fhc-background, white);
+	--fhc-dashboard-gridrow-background-highlight: var(--fhc-background-highlight, #6c757d);
+	--fhc-dashboard-draggeditem-background: var(--fhc-background, white);
+	--fhc-dashboard-item-overlay-background: var(--fhc-background-highlight, rgba(0, 100, 156, 1));
+	--fhc-dashboard-item-overly-border-color: var(--fhc-border, lightgray);
+	--fhc-dashboard-denied-dragging-animation-color: var(--fhc-danger, red);
+	--fhc-dashboard-pin-pinned-hover-color: var(--fhc-fifth-highlight, rgb(153, 116, 116));
+	--fhc-dashboard-section-info-color: var(--fhc-primary, #00649c);
+	--fhc-dashboard-section-info-color-hover: var(--fhc-primary-highlight, #005585);
 }
 
 @media(max-width: 577px) {
@@ -13,7 +23,7 @@
 }
 
 .core-dashboard a{
-	color: var(--fhc-link);
+	color: var(--fhc-dashboard-link);
 }
 
 @media (max-width: 576px){
@@ -46,12 +56,12 @@
 	bottom:0;
 	left:50%;
 	transform:translate(-50%, 50%);
-	background-color:white;
+	background-color: var(--fhc-dashboard-gridrow-background);
 }
 
 .newGridRow:hover {
 	color:white;
-	background-color:#6c757d;
+	background-color: var(--fhc-dashboard-gridrow-background-highlight);
 }
 
 .empty-tile-hover:hover {
@@ -59,8 +69,8 @@
 }
 
 .alert-danger .form-check-input:checked {
-	border-color: var(--dashboard-danger);
-	background-color: var(--dashboard-danger);
+	border-color: var(--fhc-dashboard-danger);
+	background-color: var(--fhc-dashboard-danger);
 }
 
 :root {
@@ -124,7 +134,7 @@
 .draggedItem {
 	height: 100%;
 	width: 100%;
-	background-color: white;
+	background-color: var(--fhc-dashboard-draggeditem-background);
 	position: relative;
 }
 
@@ -135,13 +145,13 @@
 	left:0;
 	right:0;
 	bottom:0;
-	background-color:rgba(0, 100, 156);
-	border:4px dashed lightgray;
+	background-color:var(--fhc-dashboard-item-overlay-background);
+	border:4px dashed var(--fhc-dashboard-item-overly-border-color);
 	opacity: 0.5;
 }
 
 #deleteBookmark i{
-	color: var(--fhc-danger);
+	color: var(--fhc-dashboard-danger);
 }
 
 .pin:hover{
@@ -149,21 +159,21 @@
 }
 
 .pin[pinned]:hover{
-	color:rgb(153, 116, 116);
+	color: var(--fhc-dashboard-pin-pinned-hover-color);
 }
 
 .section-info{
-	color: #00649c;
+	color: var(--fhc-dashboard-section-info-color);
 	cursor:pointer;
 }
 
 .section-info:hover {
-	color: #005585;
+	color: var(--fhc-dashboard-section-info-color-hover);
 }
 
 .denied-dragging-animation {
 	animation: wiggle 0.5s linear;
-	color:red !important;
+	color: var(--fhc-dashboard-denied-dragging-animation-color) !important;
 }
 
 @keyframes wiggle {
diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index d65b51592..ca584c235 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -1,10 +1,10 @@
 :root{
-    --news-widget-height: 1;
-	--news-widget-bg: var(--fhc-primary);
-	--news-widget-highlight-color: var(--fhc-primary-highlight);
-	--news-widget-border: var(--fhc-border);
-	--news-widget-border-highlight: var(--fhc-border-highlight);
-	--news-widget-text-light: var(--fhc-text);
+    --fhc-news-widget-height: 1;
+	--fhc-news-widget-bg: var(--fhc-primary);
+	--fhc-news-widget-highlight-color: var(--fhc-primary-highlight);
+	--fhc-news-widget-border: var(--fhc-border);
+	--fhc-news-widget-border-highlight: var(--fhc-border-highlight);
+	--fhc-news-widget-text-light: var(--fhc-text);
 }
 
 
@@ -53,26 +53,26 @@
 
 .fhc-news-menu-item {
     padding: 0.375rem;
-    color: var(--news-widget-text-light);
+    color: var(--fhc-news-widget-text-light);
     min-height: 5%;
     max-height: 30%;
     width: 100%;
     justify-content: space-between;
     align-items: center;
-    background-color: var(--news-widget-bg);
-    border: 1px solid var(--news-widget-border);
+    background-color: var(--fhc-news-widget-bg);
+    border: 1px solid var(--fhc-news-widget-border);
     cursor: pointer;
     transition: background-color 0.2s ease, border-color 0.2s ease; /* Smooth transition */
 }
 
 .fhc-news-menu-item:hover {
-    background-color: var(--news-widget-highlight-color);
-    border-color: var(--news-widget-border-highlight);
+    background-color: var(--fhc-news-widget-highlight-color);
+    border-color: var(--fhc-news-widget-border-highlight);
 }
 
 .fhc-news-menu-item.selected {
-    background-color: var(--news-widget-highlight-color);
-    border: 2px solid var(--news-widget-border-highlight);
+    background-color: var(--fhc-news-widget-highlight-color);
+    border: 2px solid var(--fhc-news-widget-border-highlight);
     
 }
 
diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css
index 6aa84c716..603f2046a 100644
--- a/public/css/components/searchbar/searchbar.css
+++ b/public/css/components/searchbar/searchbar.css
@@ -6,20 +6,20 @@
 @import url(./switches.css);
 
 :root{
-	--searchbar-shadow: var(--fhc-shadow-40);
+	--searchbar-shadow: var(--fhc-shadow-40, #ced4da);
 }
 
 .searchbar_settings {
 	position: absolute; 
     z-index: 9999; 
-    background-color: var(--fhc-dark);
+    background-color: var(--fhc-dark, #343a40);
 }
 
 .searchbar_results {
     position: absolute; 
     z-index: 9998; 
-    background-color: var(--fhc-background); 
-    border: 1px solid var(--fhc-border);
+    background-color: var(--fhc-background, #fff); 
+    border: 1px solid var(--fhc-border, lightgrey);
     padding: .5rem;
     top: 100%;
     width: 100%;
@@ -29,12 +29,16 @@
 }
 
 .searchbar_results a{
-	color: var(--fhc-link);
+	color: var(--fhc-link, #0d6efd);
 }
-
+/*
 .searchbar_results a:not(a~i) {
 	color: inherit;
 }
+*/
+.searchbar_results a.btn {
+	color: var(--bs-btn-color, white);
+}
 
 .searchbar_results_scroller {
     overflow-y: auto;
@@ -42,7 +46,7 @@
 }
 
 .searchbar_result {
-    border-bottom: 1px solid var(--fhc-border);
+    border-bottom: 1px solid var(--fhc-border, lightgrey);
     margin-bottom: 1rem;
 }
 
diff --git a/public/css/components/searchbar/switches.css b/public/css/components/searchbar/switches.css
index 64da02ce8..c10d63d00 100644
--- a/public/css/components/searchbar/switches.css
+++ b/public/css/components/searchbar/switches.css
@@ -1,7 +1,7 @@
 :root{
-	--fhc-switches-checked-bg: var(--fhc-light);
-	--fhc-switches-unchecked-bg: var(--fhc-disabled);
-	--fhc-switches-shadow: var(--fhc-shadow-20);
+	--fhc-switches-checked-bg: var(--fhc-light, white);
+	--fhc-switches-unchecked-bg: var(--fhc-disabled, var(--bs-gray-600));
+	--fhc-switches-shadow: var(--fhc-shadow-20, rgba(108, 117, 125,.25));
 }
 
 .fhc-switches:checked  {
@@ -15,7 +15,7 @@
     background-color: var(--fhc-switches-unchecked-bg) !important;
     border-color: transparent;
     background-position: left center !important;
-    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%236b747a'/%3e%3c/svg%3e") !important;
+    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%238e99a3'/%3e%3c/svg%3e") !important;
 }
 
 .fhc-switches:focus  {
diff --git a/public/css/components/verticalsplit.css b/public/css/components/verticalsplit.css
index 1d5a56788..e0e2599e8 100644
--- a/public/css/components/verticalsplit.css
+++ b/public/css/components/verticalsplit.css
@@ -3,9 +3,9 @@
     Author     : bambi
 */
 :root {
-    --fhc-verticalsplit-vsplitter-bg-color: var(--fhc-background);
-    --fhc-verticalsplit-vsplitter-border-color: var(--fhc-border);
-    --fhc-verticalsplit-vsplitter-splitactions-color: var(--fhc-dark);
+    --fhc-verticalsplit-vsplitter-bg-color: var(--fhc-background, #eee);
+    --fhc-verticalsplit-vsplitter-border-color: var(--fhc-border, #eee);
+    --fhc-verticalsplit-vsplitter-splitactions-color: var(--fhc-dark, #000);
 }
 
 .verticalsplitted {

From 688f87e2ba95ee56fd76644eda2144573910fa8e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 16 Jun 2025 11:57:27 +0200
Subject: [PATCH 245/572] New Endpoint for advanced search

---
 .../controllers/api/frontend/v1/Searchbar.php | 30 +++++++++++++++----
 public/js/api/search.js                       |  4 +++
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Searchbar.php b/application/controllers/api/frontend/v1/Searchbar.php
index d630d3afd..95ae6a6b3 100644
--- a/application/controllers/api/frontend/v1/Searchbar.php
+++ b/application/controllers/api/frontend/v1/Searchbar.php
@@ -37,9 +37,6 @@ class Searchbar extends FHCAPI_Controller
 		parent::__construct([
 			'search' => self::PERM_LOGGED
 		]);
-
-		// Load the library SearchBarLib
-		$this->load->library('SearchBarLib');
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -50,6 +47,29 @@ class Searchbar extends FHCAPI_Controller
 	 */
 	public function search()
 	{
+		$this->load->library('SearchBarLib');
+		$this->load->library('form_validation');
+
+		// Checks if the searchstr and the types parameters are in the POSTed JSON
+		$this->form_validation->set_rules(self::SEARCHSTR_PARAM, null, 'required');
+		$this->form_validation->set_rules(self::TYPES_PARAM . '[]', null, 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithError(SearchBarLib::ERROR_WRONG_JSON, self::ERROR_TYPE_GENERAL);
+
+		// Convert to json the result from searchbarlib->search
+		$result = $this->searchbarlib->search($this->input->post(self::SEARCHSTR_PARAM), $this->input->post(self::TYPES_PARAM));
+		if (property_exists($result, 'error'))
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		$this->terminateWithSuccess($result);
+	}
+
+	/**
+	 * Gets a JSON body via HTTP POST and provides the parameters
+	 */
+	public function searchAdvanced()
+	{
+		$this->load->library('SearchLib');
 		$this->load->library('form_validation');
 
 		// Checks if the searchstr and the types parameters are in the POSTed JSON
@@ -59,8 +79,8 @@ class Searchbar extends FHCAPI_Controller
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
-		// Convert to json the result from searchbarlib->search
-		$result = $this->searchbarlib->search($this->input->post(self::SEARCHSTR_PARAM), $this->input->post(self::TYPES_PARAM));
+		// Convert to json the result from searchlib->search
+		$result = $this->searchlib->search($this->input->post(self::SEARCHSTR_PARAM), $this->input->post(self::TYPES_PARAM));
 
 		$data = $this->getDataOrTerminateWithError($result);
 
diff --git a/public/js/api/search.js b/public/js/api/search.js
index c6a5d77a5..76b3fcd9b 100644
--- a/public/js/api/search.js
+++ b/public/js/api/search.js
@@ -20,6 +20,10 @@ export default {
 		const url = '/api/frontend/v1/searchbar/search';
 		return this.$fhcApi.post(url, searchsettings, config);
 	},
+	searchAdvanced(searchsettings, config) {
+		const url = '/api/frontend/v1/searchbar/searchAdvanced';
+		return this.$fhcApi.post(url, searchsettings, config);
+	},
 	searchdummy(searchsettings) {
 		const url = 'public/js/apps/api/dummyapi.php/Search';
 		return this.$fhcApi.post(url, searchsettings);

From 66ccd83b5510dc3232f1902ed82e2df68048670c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 16 Jun 2025 14:14:49 +0200
Subject: [PATCH 246/572] refactor(LvPlan): changes the lvInfo and lvMenu
 component in the Page View to use the renderer components based on the event
 type

---
 public/css/Cis4/CoreCalendarEvents.css        |  1 -
 public/css/components/searchbar/searchbar.css |  4 +--
 public/js/apps/Dashboard/Fhc.js               |  1 -
 public/js/components/Calendar/Day/Page.js     |  4 +--
 public/js/components/Cis/LvPlan/LvPlan.js     | 29 ++++++++++---------
 public/js/components/Cis/Mylv/modalContent.js | 19 ++++++++++--
 6 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index cf88e328c..79ca36d00 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -63,7 +63,6 @@
 .dayPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
 	display:grid;
 	align-content: center;
-	border-right: 1px solid var(--bs-border-color);
 }
 
 .dayPageContainer .lehreinheitEventContent #lehreinheitEventText {
diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css
index 603f2046a..bf091eef5 100644
--- a/public/css/components/searchbar/searchbar.css
+++ b/public/css/components/searchbar/searchbar.css
@@ -6,7 +6,7 @@
 @import url(./switches.css);
 
 :root{
-	--searchbar-shadow: var(--fhc-shadow-40, #ced4da);
+	--fhc-searchbar-shadow: var(--fhc-shadow-40, #ced4da);
 }
 
 .searchbar_settings {
@@ -25,7 +25,7 @@
     width: 100%;
     left: 0;
     right: 0;
-	box-shadow: 2px 2px 4px var(--searchbar-shadow);
+	box-shadow: 2px 2px 4px var(--fhc-searchbar-shadow);
 }
 
 .searchbar_results a{
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 637e08cce..f04d25efc 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -304,7 +304,6 @@ const app = Vue.createApp({
 						calendarEvent = Vue.markRaw(Vue.defineAsyncComponent(() => import(data[rendertype].calendarEvent)));
 
 					if (data[rendertype].calendarEventStyles){
-						console.log(data[rendertype].calendarEventStyles)
 						var head = document.head;
 						var link = document.createElement("link");
 						link.type = "text/css";
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 91af3e48a..180122e6a 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -467,8 +467,7 @@ export default {
 				</div>
 			</div>
 			<div class="d-xl-block col-xl-6 p-4 d-none" style="max-height: 100%">
-				<div style="z-index:0; max-height: 100%" class="sticky-top d-flex justify-content-center align-items-center flex-column">
-					<div style="max-height: 100%; overflow-y:auto;" class="w-100">
+					<div @wheel.stop style="max-height: 100%; overflow-y:auto;" class="w-100">
 						<template v-if="selectedEvent ">
 							<slot name="pageMobilContent" :event="selectedEvent" :lvMenu="lvMenu" >
 								<p>this is a slot placeholder</p>
@@ -483,7 +482,6 @@ export default {
 							</div>
 						</template>
 					</div>
-				</div>
 			</div>
 		</div>	
 	</div>
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 49fa88a60..64f67d8cb 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -3,7 +3,6 @@ import CalendarDate from "../../../composables/CalendarDate.js";
 import LvModal from "../Mylv/LvModal.js";
 import LvMenu from "../Mylv/LvMenu.js"
 import lehreinheitEvent from "./EventTypes/calendarEvent.js"
-import LvInfo from '../Mylv/LvInfo.js';
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
@@ -51,6 +50,17 @@ const LvPlan = {
 	},
 	inject:["renderers"],
 	watch: {
+		/* events:{
+			handler: function(newValue){
+				if(newValue == null)
+					setTimeout(()=>{
+						if(this.events == null){
+							this.loadEvents();
+						}
+					},500);
+			},
+			immediate: true,
+		}, */
 		modalLoaded:{
 			handler: function (newValue) {
 				if (this.isShowModal && newValue.isModalContentResolved && newValue.isModalTitleResolved) {
@@ -84,7 +94,7 @@ const LvPlan = {
 		}
 	},
 	components: {
-		FhcCalendar, LvModal, LvMenu, lehreinheitEvent, LvInfo
+		FhcCalendar, LvModal, LvMenu, lehreinheitEvent
 	},
 	computed:{
 		modalLoaded: function(){
@@ -134,13 +144,13 @@ const LvPlan = {
 		},
 		// component renderers fetches from different addons
 		modalTitleComponent(type){
-			return this.renderers[type].modalTitle;
+			return this.renderers[type]?.modalTitle;
 		},
 		modalContentComponent(type) {
-			return this.renderers[type].modalContent;
+			return this.renderers[type]?.modalContent;
 		},
 		calendarEventComponent(type){
-			return this.renderers[type].calendarEvent;
+			return this.renderers[type]?.calendarEvent;
 		},
 		
 
@@ -354,14 +364,7 @@ const LvPlan = {
 			</div>
 		</template>
 		<template #pageMobilContent="{lvMenu, event}">
-			<h3 >{{event.type=='moodle'?$p.t('lvinfo','Moodleinformationen'):$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
-			<div class="w-100">
-				<lv-info  :event="event" />
-			</div>
-			<template v-if="event.type != 'moodle'">
-				<h3 >{{$p.t('lehre','lehrveranstaltungsmenue')}}</h3>
-				<lv-menu :containerStyles="['p-0']" :rowStyles="['m-0']" v-show="lvMenu" :menu="lvMenu" />
-			</template>
+			<component :is="modalContentComponent(currentlySelectedEvent.type)" v-if="event" :event="event" :lvMenu="lvMenu" ></component>
 		</template>
 		<template #pageMobilContentEmpty >
 			<h3>{{ $p.t('lehre/noLvFound') }}</h3>
diff --git a/public/js/components/Cis/Mylv/modalContent.js b/public/js/components/Cis/Mylv/modalContent.js
index c0050e9cc..d3ed0b0db 100644
--- a/public/js/components/Cis/Mylv/modalContent.js
+++ b/public/js/components/Cis/Mylv/modalContent.js
@@ -1,12 +1,20 @@
 import { numberPadding, formatDate } from "../../../helpers/DateHelpers.js"
-
+import LvMenu from "./LvMenu.js";
 
 export default {
 	props:{
 		event: {
 			type: Object,
 			required: true,
-		}
+		},
+		lvMenu:{
+			type: Object,
+			required: false,
+			default: null,
+		},
+	},
+	components:{
+		LvMenu,
 	},
 	computed: {
 		lektorenLinks: function () {
@@ -47,6 +55,7 @@ export default {
 		},
 	},
 	template: `
+	<div>
 		<h3>
 			{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}
 		</h3>
@@ -109,5 +118,9 @@ export default {
 						<td>{{event.organisationseinheit}}</td>
 					</tr>
 				</tbody>
-		</table>`,
+		</table>
+		
+		<h3>{{$p.t('lehre','lehrveranstaltungsmenue')}}</h3>
+		<lv-menu :containerStyles="['p-0']" :rowStyles="['m-0']" v-if="lvMenu" :menu="lvMenu" />
+	</div>`,
 }
\ No newline at end of file

From 0804c5670ed374c9d00694b7727cd70a3413281d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 16 Jun 2025 15:36:32 +0200
Subject: [PATCH 247/572] refactor css variables

---
 public/css/components/searchbar/searchbar.css | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css
index bf091eef5..867273962 100644
--- a/public/css/components/searchbar/searchbar.css
+++ b/public/css/components/searchbar/searchbar.css
@@ -7,19 +7,24 @@
 
 :root{
 	--fhc-searchbar-shadow: var(--fhc-shadow-40, #ced4da);
+	--fhc-searchbar-settings-background-color: var(--fhc-dark, #343a40);
+	--fhc-searchbar-results-background-color: var(--fhc-background, #fff);
+	--fhc-searchbar-results-border-color: var(--fhc-border, lightgrey);
+	--fhc-searchbar-results-link-color: var(--fhc-link, #0d6efd);
+	--fhc-searchbar-results-btn-color: var(--bs-btn-color, white);
 }
 
 .searchbar_settings {
 	position: absolute; 
     z-index: 9999; 
-    background-color: var(--fhc-dark, #343a40);
+    background-color: var(--fhc-searchbar-settings-background-color);
 }
 
 .searchbar_results {
     position: absolute; 
     z-index: 9998; 
-    background-color: var(--fhc-background, #fff); 
-    border: 1px solid var(--fhc-border, lightgrey);
+    background-color: var(--fhc-searchbar-results-background-color);
+    border: 1px solid var(--fhc-searchbar-results-border-color);
     padding: .5rem;
     top: 100%;
     width: 100%;
@@ -29,7 +34,7 @@
 }
 
 .searchbar_results a{
-	color: var(--fhc-link, #0d6efd);
+	color: var(--fhc-searchbar-results-link-color);
 }
 /*
 .searchbar_results a:not(a~i) {
@@ -37,7 +42,7 @@
 }
 */
 .searchbar_results a.btn {
-	color: var(--bs-btn-color, white);
+	color: var(--fhc-searchbar-results-btn-color);
 }
 
 .searchbar_results_scroller {
@@ -46,7 +51,7 @@
 }
 
 .searchbar_result {
-    border-bottom: 1px solid var(--fhc-border, lightgrey);
+    border-bottom: 1px solid var(--fhc-searchbar-results-border-color);
     margin-bottom: 1rem;
 }
 

From 5140d9de31fae5b5b63595823f5933ddb478eedf Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 16 Jun 2025 15:38:56 +0200
Subject: [PATCH 248/572] refactor Accepting and Unaccepting Documents, new
 Error Message if more than one document per type, refactor List Accepted
 Documents

---
 .../api/frontend/v1/stv/Dokumente.php         | 35 +++++++++----------
 .../Details/Dokumente/List/Accepted.js        | 21 +++++++++++
 .../Details/Dokumente/List/Unaccepted.js      | 23 ++++++++++++
 system/phrasesupdate.php                      | 20 +++++++++++
 4 files changed, 81 insertions(+), 18 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Dokumente.php b/application/controllers/api/frontend/v1/stv/Dokumente.php
index eca3d02ad..686094620 100644
--- a/application/controllers/api/frontend/v1/stv/Dokumente.php
+++ b/application/controllers/api/frontend/v1/stv/Dokumente.php
@@ -94,33 +94,29 @@ class Dokumente extends FHCAPI_Controller
 			if (hasData($result))
 			{
 				$data = getData($result);
-				array_push($arrayAccepted, current($data));
+				foreach ($data as $value)
+				{
+					array_push($arrayAccepted, $value);
+				}
 			}
 		}
 
-		//Merge with Data of Akte
+		//Array for total list of accepted documents
 		$newDataMap = [];
-		//helper, lookupArray
 		foreach ($arrayAccepted as $item) {
-			$newDataMap[$item->dokument_kurzbz] = $item;
+			$newDataMap[] = (array)$item;
 		}
 
-		//add Data of Akte to PrestudentData
-		foreach ($resultPreDoc as $obj) {
-			if (isset($newDataMap[$obj->dokument_kurzbz])) {
-				$obj->akte_id = $newDataMap[$obj->dokument_kurzbz]->akte_id;
-				$obj->hochgeladenamum = $newDataMap[$obj->dokument_kurzbz]->hochgeladenamum;
-				$obj->titel_intern = $newDataMap[$obj->dokument_kurzbz]->titel_intern;
-				$obj->nachgereicht = $newDataMap[$obj->dokument_kurzbz]->nachgereicht;
-				$obj->akzeptiertamum = $newDataMap[$obj->dokument_kurzbz]->akzeptiertamum;
-				$obj->dms_id = $newDataMap[$obj->dokument_kurzbz]->dms_id;
-				$obj->infotext = $newDataMap[$obj->dokument_kurzbz]->infotext;
-				$obj->anmerkung_intern = $newDataMap[$obj->dokument_kurzbz]->anmerkung_intern;
-				$obj->nachgereicht_am = $newDataMap[$obj->dokument_kurzbz]->nachgereicht_am;
-				$obj->vorhanden = $newDataMap[$obj->dokument_kurzbz]->vorhanden;
+		$listExistingKurzbz = array_column($newDataMap, 'dokument_kurzbz');
+
+		foreach ($resultPreDoc as $item)
+		{
+			if (!in_array($item->dokument_kurzbz, $listExistingKurzbz))
+			{
+				$newDataMap[] = (array)$item;
 			}
 		}
-		$this->terminateWithSuccess($resultPreDoc);
+		$this->terminateWithSuccess($newDataMap);
 	}
 
 	public function deleteZuordnung($prestudent_id, $dokument_kurzbz)
@@ -215,6 +211,9 @@ class Dokumente extends FHCAPI_Controller
 
 		$uid = getAuthUid();
 
+		//check if more than 1 dokumentkurzbz
+		//if()
+
 		$result = $this->DokumentprestudentModel->insert(
 			[
 				'prestudent_id' => $prestudent_id,
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
index eea3c3b48..742d01360 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -237,6 +237,27 @@ export default {
 				});
 		},
 		deleteZuordnung(selected) {
+
+			//Check if more than one document per dokument_kurzbz should be unaccepted
+			const counts = {};
+			for (const item of selected)
+			{
+				const value = item.dokument_kurzbz;
+				if (!counts[value]) {
+					counts[value] = 1;
+				}
+				else {
+					counts[value]++;
+				}
+
+				if (counts[value] > 1) {
+					{
+						this.$fhcAlert.alertError(this.$p.t('dokumente', 'error_duplicateDokument_kurzbz'));
+						return;
+					}
+				}
+			}
+
 			Promise.allSettled(
 				selected.map(e =>
 					this.$api
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
index 3ca9bc136..8a0a24667 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -234,6 +234,27 @@ export default {
 			this.$refs.modalEdit.open(akte_id);
 		},
 		acceptDocuments(selected){
+
+			//Check if more than one document per dokument_kurzbz should be accepted
+			const counts = {};
+			for (const item of selected)
+			{
+				const value = item.dokument_kurzbz;
+				if (!counts[value]) {
+					counts[value] = 1;
+				}
+				else {
+					counts[value]++;
+				}
+
+				if (counts[value] > 1) {
+					{
+						this.$fhcAlert.alertError(this.$p.t('dokumente', 'error_duplicateDokument_kurzbz'));
+						return;
+					}
+				}
+			}
+
 			Promise
 				.allSettled(
 					selected.map(e =>
@@ -318,6 +339,8 @@ export default {
 			@click:new="actionUploadFile"
 		>
 			<template #actions="{selected}">
+			<p v-for="name in selected">
+			{{name.dokument_kurzbz}}</p>
 				<button
 					class="btn btn-primary"
 					@click="acceptDocuments(selected)"
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 2fc8ff900..1251efff5 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -43261,6 +43261,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'dokumente',
+		'phrase' => 'error_duplicateDokument_kurzbz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Akzeptieren / Entakzeptieren von mehr als einem Dokument pro Dokumenttyp nicht zulässig',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Accepting / unaccepting more than one document per document type is not permitted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC4 Studierendenverwaltung Dokumente END
 	// FHC4 Phrases Anrechnungen Start
 	array(

From cb2ed4696c2680aa15f009eece519adac454ec70 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 16 Jun 2025 16:01:41 +0200
Subject: [PATCH 249/572] Tab Betriebsmittel: change type of field Kaution to
 number, add validation if numeric

---
 .../api/frontend/v1/betriebsmittel/BetriebsmittelP.php   | 9 +++++++++
 public/js/components/Betriebsmittel/Betriebsmittel.js    | 9 ++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
index 8e9d931f2..4405952a4 100644
--- a/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
+++ b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
@@ -158,6 +158,11 @@ class BetriebsmittelP extends FHCAPI_Controller
 		], [
 			'uid_in_person' => $this->p->t('person', 'error_uidNotInPerson')
 		]);
+
+		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
+		]);
+
 		$this->validateNewOrUpdate();
 
 		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
@@ -241,6 +246,10 @@ class BetriebsmittelP extends FHCAPI_Controller
 
 	public function updateBetriebsmittel($betriebsmittelperson_id)
 	{
+		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
+		]);
+
 		$this->validateNewOrUpdate();
 
 		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 39681ffb4..95678d8dd 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -292,6 +292,12 @@ export default {
 			this.formData.anmerkung = null;
 			this.formData.beschreibung = null;
 			this.statusNew = true;
+		},
+		//helper function: workaround to trigger validation if input is not a number
+		normalizeKaution() {
+			if (this.formData.kaution === null || this.formData.kaution === '') {
+				this.formData.kaution = 'xxx'
+			}
 		}
 	},
 	created() {
@@ -401,9 +407,10 @@ export default {
 				
 				<div class="row mb-3">
 					<form-input
-						type="text"
+						type="number"
 						:label="$p.t('infocenter/kaution')"
 						name="kaution"
+						@blur="normalizeKaution"
 						v-model="formData.kaution"
 						>
 					</form-input>

From 329da58ce68018825430d9b5ff1e660ecce9769e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 16 Jun 2025 17:14:55 +0200
Subject: [PATCH 250/572] Tab Aufnahmetermine: add validation for existing
 RT-Data

---
 .../api/frontend/v1/stv/Aufnahmetermine.php      | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
index b787ea225..153079789 100644
--- a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
+++ b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
@@ -61,12 +61,24 @@ class Aufnahmetermine extends FHCAPI_Controller
 		}
 
 
-		$rt_id =	(isset($formData['rt_id']) && !empty($formData['rt_id'])) ? $formData['rt_id'] : null;
+		$rt_id = (isset($formData['rt_id']) && !empty($formData['rt_id'])) ? $formData['rt_id'] : null;
 		$anmeldedatum =	(isset($formData['anmeldedatum']) && !empty($formData['anmeldedatum'])) ? $formData['anmeldedatum'] : null;
 		$teilgenommen =	(isset($formData['teilgenommen']) && !empty($formData['teilgenommen'])) ? $formData['teilgenommen'] : false;
 		$studienplan_id = (isset($formData['studienplan_id']) && !empty($formData['studienplan_id'])) ? $formData['studienplan_id'] : null;
 		$punkte = (isset($formData['punkte']) && !empty($formData['punkte'])) ? $formData['punkte'] : null;
 
+		//validation if there is already an RT with chosen data existing
+		$result = $this->RtPersonModel->loadWhere(
+			array(
+				'rt_id' => $rt_id,
+				'person_id' => $person_id,
+				'studienplan_id' => $studienplan_id,
+				)
+		);
+		$data = getData($result);
+		if($data)
+			return $this->terminateWithError("Error", self::ERROR_TYPE_GENERAL);
+
 		$this->form_validation->set_data($formData);
 
 		$this->form_validation->set_rules('punkte', 'Punkte', 'numeric', [
@@ -78,12 +90,10 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$this->form_validation->set_rules('rt_id', 'Reihungstest_id', 'required', [
 			'is_valid_date' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Reihungstest'])
 		]);
-
 		$this->form_validation->set_rules('anmeldedatum', 'AnmeldeDatum', 'is_valid_date', [
 			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Anmeldedatum'])
 		]);
 
-
 		if ($this->form_validation->run() == false)
 		{
 			$this->terminateWithValidationErrors($this->form_validation->error_array());

From 0aa92debeaad934e2cc7660bb4c9d13b852877e9 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 17 Jun 2025 09:25:40 +0200
Subject: [PATCH 251/572] Phrasen

---
 system/phrasesupdate.php | 684 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 683 insertions(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0203b3c2f..be3dd4895 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41873,8 +41873,690 @@ and represent the current state of research on the topic. The prescribed citatio
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
 	// PROJEKTARBEITSBEURTEILUNG SS2025 ENDE ---------------------------------------------------------------------------
+	
+	//****************************	 CORE/search
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'input_search_label',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Suche...',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Search...',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'button_filter_label',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Filter',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Filter',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'button_applyfilter_label',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Übernehmen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Apply',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'action_default_label',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Standard Aktion',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Default Action',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_student_uid',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Student UID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student UID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_prestudent_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Prestudent ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Prestudent ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_emails',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Emails',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Emails',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_group_emails',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gruppen-Email',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Group-Email',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_employee',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'MitarbeiterIn',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Employee',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_stdkst',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Standard-Kostenstelle',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Standard cost center',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_stdkst_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'keine',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'none',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_parent_oe',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Übergeordnete OE',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Parent OU',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_oe_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'keine',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'none',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_room_address',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Standort',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Site',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_address_floor',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{floor} Stockwerk',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{floor} floor',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_address_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'N/A',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'N/A',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_workplaces',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sitzplätze',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Seats',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_workplaces_pc',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{max_person}, davon {workplaces} PC-Plätze',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{max_person}, of which {workplaces} PC-Workstations',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_workplaces_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'N/A',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'N/A',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_building',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gebäude',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Building',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_equipment',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zusatz Informationen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Additional information',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_leader',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Leiter',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Leader',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_leader_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'N.N.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'N/A',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_number_of_employees',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mitarbeiter-Anzahl',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Number of employees',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_dms_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'DMS ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'DMS ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_version',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Version',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Version',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_keywords',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Schlagwörter',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Keywords',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'result_content_none',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Inhalt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No Content',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_no_results',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Es wurden keine Ergebnisse gefunden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No results were found.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_unknown_type',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Unbekannter Ergebnistyp: '{type}'.",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Unknown resulttype: '{type}'.",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_general',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bei der Suche ist ein Fehler aufgetreten. {message}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'An error occurred while searching. {message}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_missing_config',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Such-Konfiguration $config["{type}"] nicht gefunden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Search config $config["{type}"] not found.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_invalid_config',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Such-Konfiguration für $config["{type}"] ist ungültig: Feld "{field}" fehlt, ist leer oder hat einen ungültigen Typ.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Search config for $config["{type}"] is invalid: field {field} is missing, empty or has an invalid type.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_invalid_config_searchfield',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Such-Konfiguration $config["{type}"]["searchfields"]["{searchfield}"] ist ungültig: Feld "{field}" fehlt oder ist unglültig.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Search config $config["{type}"]["searchfields"]["{searchfield}"] is invalid: field {field} is missing or invalid.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	)
 );
 
 

From fa20652fefee1a6cef90f2a7b37c64a776c7074f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 17 Jun 2025 09:48:20 +0200
Subject: [PATCH 252/572] Permissions for searchAdvanced

---
 application/controllers/api/frontend/v1/Searchbar.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/Searchbar.php b/application/controllers/api/frontend/v1/Searchbar.php
index 95ae6a6b3..8273e0cd9 100644
--- a/application/controllers/api/frontend/v1/Searchbar.php
+++ b/application/controllers/api/frontend/v1/Searchbar.php
@@ -35,7 +35,8 @@ class Searchbar extends FHCAPI_Controller
 	{
 		// NOTE(chris): additional permission checks will be done in SearchBarLib
 		parent::__construct([
-			'search' => self::PERM_LOGGED
+			'search' => self::PERM_LOGGED,
+			'searchAdvanced' => self::PERM_LOGGED
 		]);
 	}
 

From e8d6d751e6cbeff4f2a6e8cc22137ce3a4cc51f6 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 17 Jun 2025 09:48:35 +0200
Subject: [PATCH 253/572] searchAdvanced in new API

---
 public/js/api/factory/searchbar.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/public/js/api/factory/searchbar.js b/public/js/api/factory/searchbar.js
index a7bd73b88..6bff98cbc 100644
--- a/public/js/api/factory/searchbar.js
+++ b/public/js/api/factory/searchbar.js
@@ -22,5 +22,12 @@ export default {
 			url: '/api/frontend/v1/searchbar/search',
 			params
 		};
+	},
+	searchAdvanced(params) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/searchbar/searchAdvanced',
+			params
+		};
 	}
 };
\ No newline at end of file

From a080daa27a88799499a307236c31ea43a194a43b Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 17 Jun 2025 10:16:54 +0200
Subject: [PATCH 254/572] stundenplan/lvplan revert changes to legacy api
 endpoints

---
 .../ressource/{LvPlan.php => Stundenplan.php} | 24 +++++++++----------
 .../{LvPlandev.php => Stundenplandev.php}     | 24 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)
 rename application/controllers/api/v1/ressource/{LvPlan.php => Stundenplan.php} (59%)
 rename application/controllers/api/v1/ressource/{LvPlandev.php => Stundenplandev.php} (58%)

diff --git a/application/controllers/api/v1/ressource/LvPlan.php b/application/controllers/api/v1/ressource/Stundenplan.php
similarity index 59%
rename from application/controllers/api/v1/ressource/LvPlan.php
rename to application/controllers/api/v1/ressource/Stundenplan.php
index 06672c90b..9a6614f21 100644
--- a/application/controllers/api/v1/ressource/LvPlan.php
+++ b/application/controllers/api/v1/ressource/Stundenplan.php
@@ -14,16 +14,16 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class LvPlan extends API_Controller
+class Stundenplan extends API_Controller
 {
 	/**
-	 * LvPlan API constructor.
+	 * Stundenplan API constructor.
 	 */
 	public function __construct()
 	{
 		parent::__construct(array('Stundenplan' => 'basis/stundenplan:rw'));
-		// Load model LvPlanModel
-		$this->load->model('ressource/stundenplan_model', 'LvPlanModel');
+		// Load model StundenplanModel
+		$this->load->model('ressource/stundenplan_model', 'StundenplanModel');
 
 
 	}
@@ -31,13 +31,13 @@ class LvPlan extends API_Controller
 	/**
 	 * @return void
 	 */
-	public function getLvPlan()
+	public function getStundenplan()
 	{
-		$lvPlanID = $this->get('stundenplan_id');
+		$stundenplanID = $this->get('stundenplan_id');
 
-		if (isset($lvPlanID))
+		if (isset($stundenplanID))
 		{
-			$result = $this->LvPlanModel->load($lvPlanID);
+			$result = $this->StundenplanModel->load($stundenplanID);
 
 			$this->response($result, REST_Controller::HTTP_OK);
 		}
@@ -50,17 +50,17 @@ class LvPlan extends API_Controller
 	/**
 	 * @return void
 	 */
-	public function postLvPlan()
+	public function postStundenplan()
 	{
 		if ($this->_validate($this->post()))
 		{
 			if (isset($this->post()['stundenplan_id']))
 			{
-				$result = $this->LvPlanModel->update($this->post()['stundenplan_id'], $this->post());
+				$result = $this->StundenplanModel->update($this->post()['stundenplan_id'], $this->post());
 			}
 			else
 			{
-				$result = $this->LvPlanModel->insert($this->post());
+				$result = $this->StundenplanModel->insert($this->post());
 			}
 
 			$this->response($result, REST_Controller::HTTP_OK);
@@ -71,7 +71,7 @@ class LvPlan extends API_Controller
 		}
 	}
 
-	private function _validate($lvplan = NULL)
+	private function _validate($stundenplan = NULL)
 	{
 		return true;
 	}
diff --git a/application/controllers/api/v1/ressource/LvPlandev.php b/application/controllers/api/v1/ressource/Stundenplandev.php
similarity index 58%
rename from application/controllers/api/v1/ressource/LvPlandev.php
rename to application/controllers/api/v1/ressource/Stundenplandev.php
index 625e6038d..fa6e788c3 100644
--- a/application/controllers/api/v1/ressource/LvPlandev.php
+++ b/application/controllers/api/v1/ressource/Stundenplandev.php
@@ -14,16 +14,16 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class LvPlandev extends API_Controller
+class Stundenplandev extends API_Controller
 {
 	/**
-	 * LvPlandev API constructor.
+	 * Stundenplandev API constructor.
 	 */
 	public function __construct()
 	{
 		parent::__construct(array('Stundenplandev' => 'basis/stundenplandev:rw'));
-		// Load model LvPlandevModel
-		$this->load->model('ressource/stundenplandev_model', 'LvPlandevModel');
+		// Load model StundenplandevModel
+		$this->load->model('ressource/stundenplandev_model', 'StundenplandevModel');
 
 
 	}
@@ -31,13 +31,13 @@ class LvPlandev extends API_Controller
 	/**
 	 * @return void
 	 */
-	public function getLvPlandev()
+	public function getStundenplandev()
 	{
-		$lvplandevID = $this->get('stundenplandev_id');
+		$stundenplandevID = $this->get('stundenplandev_id');
 
-		if (isset($lvplandevID))
+		if (isset($stundenplandevID))
 		{
-			$result = $this->LvPlandevModel->load($lvplandevID);
+			$result = $this->StundenplandevModel->load($stundenplandevID);
 
 			$this->response($result, REST_Controller::HTTP_OK);
 		}
@@ -50,17 +50,17 @@ class LvPlandev extends API_Controller
 	/**
 	 * @return void
 	 */
-	public function postLvPlandev()
+	public function postStundenplandev()
 	{
 		if ($this->_validate($this->post()))
 		{
 			if (isset($this->post()['stundenplandev_id']))
 			{
-				$result = $this->LvPlandevModel->update($this->post()['stundenplandev_id'], $this->post());
+				$result = $this->StundenplandevModel->update($this->post()['stundenplandev_id'], $this->post());
 			}
 			else
 			{
-				$result = $this->LvPlandevModel->insert($this->post());
+				$result = $this->StundenplandevModel->insert($this->post());
 			}
 
 			$this->response($result, REST_Controller::HTTP_OK);
@@ -71,7 +71,7 @@ class LvPlandev extends API_Controller
 		}
 	}
 
-	private function _validate($lvplandev = NULL)
+	private function _validate($stundenplandev = NULL)
 	{
 		return true;
 	}

From 3db82aea95d318bdaaf4b49c751a468642b8404e Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 17 Jun 2025 10:26:29 +0200
Subject: [PATCH 255/572] stundenplan/lvplan revert changes to
 stundenplan_model and stundenplandev_model

---
 .../models/ressource/Stundenplan_model.php    | 20 +++++++++----------
 .../models/ressource/Stundenplandev_model.php |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 92a42a1df..012ce0a57 100644
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -33,12 +33,12 @@ class Stundenplan_model extends DB_Model
 		*/
 
 
-		$raum_lvplan= $this->execReadOnlyQuery("
+		$raum_stundenplan= $this->execReadOnlyQuery("
 		SELECT CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, CONCAT(lehrfach,'-',lehrform) AS lv_info, * FROM lehre.vw_stundenplan sp
 		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ?
 		", [$ort_kurzbz, $start_date, $end_date]);
 
-		return $raum_lvplan;
+		return $raum_stundenplan;
 	}
 
 	/**
@@ -136,11 +136,11 @@ class Stundenplan_model extends DB_Model
 
 	/**
 	 * groups rows of a subquery that fetches data from the lehre.vw_stundenplan table
-	 * @param string $lvplanViewQuery the subquery used to group the result
+	 * @param string $stundenplanViewQuery the subquery used to group the result
 	 *
 	 * @return stdClass
 	 */
-	public function lvPlanGruppierung($lvplanViewQuery)
+	public function stundenplanGruppierung($stundenplanViewQuery)
 	{
 		$query_result = $this->execReadOnlyQuery("
 		SELECT
@@ -173,7 +173,7 @@ class Stundenplan_model extends DB_Model
 			)) as organisationseinheit,
 			ort_kurzbz, studiengang_kz, titel,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit,gruppe, verband, semester,stg_kurzbz
 
-			FROM (".$lvplanViewQuery.") sp
+			FROM (".$stundenplanViewQuery.") sp
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
 
 		) as subquery
@@ -187,11 +187,11 @@ class Stundenplan_model extends DB_Model
 	}
 
 	/**
-	 * queries LvPlan but for a whole lva, irrespective of who is requesting it
+	 * queries Stundenplan but for a whole lva, irrespective of who is requesting it
 	 * 
 	 * @return void
 	 */
-	public function getLvPlanLVA($start_date, $end_date, $lv_id) {
+	public function getStundenplanLVA($start_date, $end_date, $lv_id) {
 		return $this->execReadOnlyQuery("
 	
 		SELECT
@@ -242,11 +242,11 @@ class Stundenplan_model extends DB_Model
 	}
 
 	/**
-	 * queries LvPlan and filters by assigned ma_kurzbz, very similar to get by LVA
+	 * queries Stundenplan and filters by assigned ma_kurzbz, very similar to get by LVA
 	 *
 	 * @return void
 	 */
-	public function getLvPlanMitarbeiter($start_date, $end_date, $ma_uid) {
+	public function getStundenplanMitarbeiter($start_date, $end_date, $ma_uid) {
 		return $this->execReadOnlyQuery("
 	
 		SELECT
@@ -302,7 +302,7 @@ class Stundenplan_model extends DB_Model
 	 *
 	 * @return mixed
 	 */
-	public function getLvPlanQuery($start_date, $end_date,$semester,$gruppen,$studentlehrverbaende){
+	public function getStundenplanQuery($start_date, $end_date,$semester,$gruppen,$studentlehrverbaende){
 		
 		// helper function to check if either $gruppen or $studentlehrverbaende are empty for each semester
 		$emptyCheck = function($toBeCheckedArray) use ($semester){
diff --git a/application/models/ressource/Stundenplandev_model.php b/application/models/ressource/Stundenplandev_model.php
index 1a74c6aa8..800540d60 100644
--- a/application/models/ressource/Stundenplandev_model.php
+++ b/application/models/ressource/Stundenplandev_model.php
@@ -65,7 +65,7 @@ class Stundenplandev_model extends DB_Model
 	}
 
     /**
-     * Get LvPlan data.
+     * Get Stundenplan data.
      *
      * @param null $lehrveranstaltung_id
      * @param null $studiensemester_kurzbz
@@ -75,7 +75,7 @@ class Stundenplandev_model extends DB_Model
      * @param false $nurBevorstehende If true, only future data is retrieved.
      * @return array|false|stdClass|null
      */
-    public function getLvPlanData($lehrveranstaltung_id=null, $studiensemester_kurzbz=null, $lehreinheit_id=null, $mitarbeiter_uid=null, $student_uid=null, $nurBevorstehende = false)
+    public function getStundenplanData($lehrveranstaltung_id=null, $studiensemester_kurzbz=null, $lehreinheit_id=null, $mitarbeiter_uid=null, $student_uid=null, $nurBevorstehende = false)
     {
         $params = array();
 

From 2b3d772a9002dd2a5087280d970558558c85408f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 17 Jun 2025 10:50:29 +0200
Subject: [PATCH 256/572] Both searches usable

---
 .../controllers/api/frontend/v1/Searchbar.php |  2 +-
 .../js/components/Stv/Studentenverwaltung.js  |  4 +-
 public/js/components/searchbar/searchbar.js   | 84 +++++++++++++++----
 3 files changed, 72 insertions(+), 18 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Searchbar.php b/application/controllers/api/frontend/v1/Searchbar.php
index 8273e0cd9..d1444cbad 100644
--- a/application/controllers/api/frontend/v1/Searchbar.php
+++ b/application/controllers/api/frontend/v1/Searchbar.php
@@ -62,7 +62,7 @@ class Searchbar extends FHCAPI_Controller
 		$result = $this->searchbarlib->search($this->input->post(self::SEARCHSTR_PARAM), $this->input->post(self::TYPES_PARAM));
 		if (property_exists($result, 'error'))
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		$this->terminateWithSuccess($result);
+		$this->terminateWithSuccess($result->data);
 	}
 
 	/**
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 352df5e9e..9146bc144 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -137,8 +137,8 @@ export default {
 		reloadList() {
 			this.$refs.stvList.reload();
 		},
-		searchfunction(params) {
-			return this.$api.call(ApiSearchbar.search(params));
+		searchfunction(params, config) {
+			return this.$api.call(ApiSearchbar.search(params), config);
 		}
 	},
 	created() {
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 7b28c8bea..8e1711e90 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -19,7 +19,8 @@ export default {
         showresult: false,  
         searching: false,
         error: null,
-		settingsDropdown:null,
+            abortController: null,
+        settingsDropdown:null,
       };
     },
     components: {
@@ -201,27 +202,80 @@ export default {
             this.searchresult.splice(0, this.searchresult.length);
             this.searching = true;
             this.showsearchresult();
-			if(this.searchsettings.types.length === 0) {
-				this.error = 'Kein Ergebnistyp ausgewählt. Bitte mindestens einen Ergebnistyp auswählen.';
-				this.searching = false;
-				return;
-			}
-            this.searchfunction(this.searchsettings)
+            if(this.searchsettings.types.length === 0) {
+                this.error = 'Kein Ergebnistyp ausgewählt. Bitte mindestens einen Ergebnistyp auswählen.';
+                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?.error === 1 ) {
-                    this.error = 'Bei der Suche ist ein Fehler aufgetreten.';
+                if (!response.data) {
+                    this.error = this.$p.t('search/error_general');
                 } else {
-                    for(let element of response.data.data){
-                        this.searchresult.push(element);
+                    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', 'unassigned_employee', 'mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'student', 'prestudent'];
+                            mergedType += this.searchoptions.mergeResults;
+                            mergeKey = 'person_id';
+                            break;
+                        }
+
+                        if (mergeTypes.length) {
+                            res = Object.values(res.reduce((a, c) => {
+                                if (!mergeTypes.includes(c.type)) {
+                                    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,
+                                        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.searching = false;
+                this.retry = 0;
             })
             .catch(error=> {
-                this.error = 'Bei der Suche ist ein Fehler aufgetreten.' 
-                    + ' ' + error.message;
-            })
-            .finally(()=> {
+                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() {

From 4db21d9abb89efa1bb54d6ec02abaf6f8b8e89d0 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 17 Jun 2025 11:05:31 +0200
Subject: [PATCH 257/572] stundenplan/lvplan use reverted classes and function
 names again

---
 .../controllers/api/frontend/v1/LvPlan.php    | 18 +++---
 .../controllers/api/frontend/v1/Studium.php   |  4 +-
 .../controllers/components/Cis/LvPlan.php     |  6 +-
 .../{LvPlanLib.php => StundenplanLib.php}     | 64 +++++++++----------
 4 files changed, 46 insertions(+), 46 deletions(-)
 rename application/libraries/{LvPlanLib.php => StundenplanLib.php} (90%)

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 63da7892c..07435c9e5 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -51,7 +51,7 @@ class LvPlan extends FHCAPI_Controller
         $this->load->library('form_validation');
 
 		//load models
-		$this->load->model('ressource/Stundenplan_model', 'LvPlanModel');
+		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 		$this->load->model('ressource/Reservierung_model', 'ReservierungModel');
 
 
@@ -66,7 +66,7 @@ class LvPlan extends FHCAPI_Controller
      *
      */
 	public function LvPlanEvents(){
-		$this->load->library('LvPlanLib');
+		$this->load->library('StundenplanLib');
 
 		// form validation
 		$this->load->library('form_validation');
@@ -81,7 +81,7 @@ class LvPlan extends FHCAPI_Controller
 		$end_date = $this->input->get('end_date', TRUE);
 		$lv_id = $this->input->get('lv_id', TRUE);
 
-		$res_lvplan_events = $this->lvplanlib->getLvPlan($start_date,$end_date,$lv_id);
+		$res_lvplan_events = $this->stundenplanlib->getStundenplan($start_date,$end_date,$lv_id);
 		$lvplan_events = $this->getDataOrTerminateWithError($res_lvplan_events);
 		if( is_null($lvplan_events) || isEmptyArray($lvplan_events) )
 		{
@@ -126,14 +126,14 @@ class LvPlan extends FHCAPI_Controller
 	}
 
 	public function getLvPlanForStudiensemester($studiensemester,$lvid){
-		$this->load->library('LvPlanLib');
+		$this->load->library('StundenplanLib');
 		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
 		
 		$studiensemester_result = $this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz"=>$studiensemester]);
 		$studiensemester_result = current($this->getDataOrTerminateWithError($studiensemester_result));
 		$timespan_start = new DateTime($studiensemester_result->start);
 		$timespan_ende = new DateTime($studiensemester_result->ende);
-		$lvplan = $this->lvplanlib->getLvPlan(date_format($timespan_start, 'Y-m-d'),date_format($timespan_ende, 'Y-m-d'), $lvid);
+		$lvplan = $this->stundenplanlib->getStundenplan(date_format($timespan_start, 'Y-m-d'),date_format($timespan_ende, 'Y-m-d'), $lvid);
 		$this->terminateWithSuccess($lvplan);
 		
 	}
@@ -162,7 +162,7 @@ class LvPlan extends FHCAPI_Controller
      */
 	public function getRoomplan()
 	{
-		$this->load->library('LvPlanLib');
+		$this->load->library('StundenplanLib');
         // form validation
         $this->load->library('form_validation');
         $this->form_validation->set_data($_GET);
@@ -179,7 +179,7 @@ class LvPlan extends FHCAPI_Controller
 		$roomplan_data = $this->LvPlan->lvPlanGruppierung($this->LvPlan->getRoomQuery($ort_kurzbz, $start_date, $end_date));
 
         $roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
-		$this->lvplanlib->expand_object_information($roomplan_data);
+		$this->stundenplanlib->expand_object_information($roomplan_data);
 
 		$this->terminateWithSuccess($roomplan_data);
 
@@ -188,7 +188,7 @@ class LvPlan extends FHCAPI_Controller
 	// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the lvplan of a student
     public function Reservierungen($ort_kurzbz = null)
 	{
-		$this->load->library('LvPlanLib');
+		$this->load->library('StundenplanLib');
 		//form validation
 		$this->load->library('form_validation');
 		$this->form_validation->set_data($_GET);
@@ -202,7 +202,7 @@ class LvPlan extends FHCAPI_Controller
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
-		$result = $this->lvplanlib->getReservierungen($start_date,$end_date,$ort_kurzbz);
+		$result = $this->stundenplanlib->getReservierungen($start_date,$end_date,$ort_kurzbz);
 		$result = $this->getDataOrTerminateWithError($result);	
 		$this->terminateWithSuccess($result);
 	}
diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index e73fa6d85..e4cf9e6a3 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -309,8 +309,8 @@ SELECT tbl_lehrveranstaltung.*,
 	}
 
 	private function computeLektorenFromLehrveranstaltung($lehreinheit_id, $semester, $studiengang, $studiensemester){
-		$this->load->library('LvPlanLib');
-		$lektoren = $this->lvplanlib->getLektorenFromLehrveranstaltung($lehreinheit_id,$semester, $studiengang,$studiensemester);
+		$this->load->library('StundenplanLib');
+		$lektoren = $this->stundenplanlib->getLektorenFromLehrveranstaltung($lehreinheit_id,$semester, $studiengang,$studiensemester);
 		if(!$lektoren){
 			return [];
 		}
diff --git a/application/controllers/components/Cis/LvPlan.php b/application/controllers/components/Cis/LvPlan.php
index 083cde03e..d4cf63520 100644
--- a/application/controllers/components/Cis/LvPlan.php
+++ b/application/controllers/components/Cis/LvPlan.php
@@ -27,14 +27,14 @@ class LvPlan extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->model('ressource/Stundenplan_model', 'LvPlanModel');
+		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 
-		/* $result = $this->LvPlanModel->loadForUid(getAuthUID());
+		/* $result = $this->StundenplanModel->loadForUid(getAuthUID());
 
 		if (isError($result))
 			return $this->outputJsonError(getError($result));
  		*/
-		$res = $this->LvPlanModel->lvPlanGruppierung($this->LvPlanModel->getLvPlanQuery(getAuthUID())); 
+		$res = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(getAuthUID())); 
 		
 		$res = getData($res);
 		
diff --git a/application/libraries/LvPlanLib.php b/application/libraries/StundenplanLib.php
similarity index 90%
rename from application/libraries/LvPlanLib.php
rename to application/libraries/StundenplanLib.php
index ef0ad0920..8cb37658e 100644
--- a/application/libraries/LvPlanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -3,17 +3,17 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-class LvPlanLib{
+class StundenplanLib{
 
 	private $_ci; // Code igniter instance
 	
 
 	/**
-	 * fetches LvPlan events from a UID and start/end date
+	 * fetches Stundenplan events from a UID and start/end date
 	 * @access public
 	 *
 	 */
-	public function getLvPlan($start_date, $end_date, $lv_id = null){
+	public function getStundenplan($start_date, $end_date, $lv_id = null){
 		
 		$this->_ci =& get_instance();
 
@@ -21,7 +21,7 @@ class LvPlanLib{
 		$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
 		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$this->_ci->load->model('person/Benutzergruppe_model','BenutzergruppeModel');
-		$this->_ci->load->model('ressource/Stundenplan_model', 'LvPlanModel');
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 		
 
 		$student_uid = getAuthUID();
@@ -42,20 +42,20 @@ class LvPlanLib{
 			return $function_error;
 		}
 		
-		if($lv_id) { // fetch LvPlan for lva, irrelevant of who is requesting it (for now)
+		if($lv_id) { // fetch Stundenplan for lva, irrelevant of who is requesting it (for now)
 
-			$lvplan_data = $this->_ci->LvPlanModel->getLvPlanLVA($start_date, $end_date, $lv_id);
-			if(isError($lvplan_data))
+			$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanLVA($start_date, $end_date, $lv_id);
+			if(isError($stundenplan_data))
 			{
-				return error(getData($lvplan_data));
+				return error(getData($stundenplan_data));
 			}
-			$lvplan_data = getData($lvplan_data) ?? [];
-			$function_error = $this->expand_object_information($lvplan_data);
+			$stundenplan_data = getData($stundenplan_data) ?? [];
+			$function_error = $this->expand_object_information($stundenplan_data);
 			if(!is_null($function_error)){
 				return $function_error;
 			}
 
-			// query lv itself in case its LvPlan is being queried and it has no entries
+			// query lv itself in case its Stundenplan is being queried and it has no entries
 			$this->_ci->load->model('education/Lehrveranstaltung_model','LehrveranstaltungModel');
 			$lv_result = $this->_ci->LehrveranstaltungModel->load($lv_id);
 			if(isError($lv_result))
@@ -63,7 +63,7 @@ class LvPlanLib{
 				return error(getData($lv_result));
 			}
 			$lv = getData($lv_result)[0];
-			return $lvplan_data;
+			return $stundenplan_data;
 			
 		}
 		
@@ -71,17 +71,17 @@ class LvPlanLib{
 		if($is_mitarbeiter)
 		{
 			
-			$lvplan_data = $this->_ci->LvPlanModel->getLvPlanMitarbeiter($start_date, $end_date, $student_uid);
-			if(isError($lvplan_data))
+			$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanMitarbeiter($start_date, $end_date, $student_uid);
+			if(isError($stundenplan_data))
 			{
-				return error(getData($lvplan_data));
+				return error(getData($stundenplan_data));
 			}
-			$lvplan_data = getData($lvplan_data) ?? [];
-			$function_error = $this->expand_object_information($lvplan_data);
+			$stundenplan_data = getData($stundenplan_data) ?? [];
+			$function_error = $this->expand_object_information($stundenplan_data);
 			if(!is_null($function_error)){
 				return error($function_error);
 			}
-			return success($lvplan_data);
+			return success($stundenplan_data);
 		} else {
 			// getting the gruppen_kurzbz of the student in the different studiensemester
 			$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($semester_range);
@@ -99,26 +99,26 @@ class LvPlanLib{
 			}
 			$student_lehrverband = getData($student_lehrverband);
 			
-			$lvplan_query = $this->_ci->LvPlanModel->getLvPlanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
-			if(!$lvplan_query)
+			$stundenplan_query = $this->_ci->StundenplanModel->getStundenplanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
+			if(!$stundenplan_query)
 			{
 				return error([]);
 			}
 			
 			
-			$lvplan_data = $this->_ci->LvPlanModel->lvPlanGruppierung($lvplan_query);
-			if(isError($lvplan_data))
+			$stundenplan_data = $this->_ci->StundenplanModel->stundenplanGruppierung($stundenplan_query);
+			if(isError($stundenplan_data))
 			{
-				return error(getData($lvplan_data));
+				return error(getData($stundenplan_data));
 			}
-			$lvplan_data = getData($lvplan_data) ?? [];
+			$stundenplan_data = getData($stundenplan_data) ?? [];
 
-			$function_error = $this->expand_object_information($lvplan_data);
+			$function_error = $this->expand_object_information($stundenplan_data);
 			if(!is_null($function_error)){
 				return $function_error;
 			}
 			
-			return success($lvplan_data);
+			return success($stundenplan_data);
 		}
 		
 	}
@@ -147,7 +147,7 @@ class LvPlanLib{
 
 	public function getLektorenFromLehrveranstaltung($lehrveranstaltung_id, $semester, $studiengang_kz, $studiensemester_kurzbz){
 		$this->_ci =& get_instance();
-		$this->_ci->load->model('ressource/Stundenplan_model', 'LvPlanModel');
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 		$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
 		
 		$studiensemester = $this->_ci->StudiensemesterModel->loadWhere(["studiensemester_kurzbz"=>$studiensemester_kurzbz]);
@@ -156,7 +156,7 @@ class LvPlanLib{
 			return error(getData($studiensemester));
 		}
 		$studiensemester = current(getData($studiensemester));
-		$lektoren = $this->_ci->LvPlanModel->execReadOnlyQuery("
+		$lektoren = $this->_ci->StundenplanModel->execReadOnlyQuery("
 		SELECT DISTINCT uid 
 		FROM campus.vw_stundenplan
 		WHERE lehrveranstaltung_id = ? AND
@@ -190,8 +190,8 @@ class LvPlanLib{
 			// load lektor object
 			foreach ($item->lektor as $lv_lektor)
 			{
-				$this->_ci->LvPlanModel->addLimit(1);
-				$lektor_object = $this->_ci->LvPlanModel->execReadOnlyQuery("
+				$this->_ci->StundenplanModel->addLimit(1);
+				$lektor_object = $this->_ci->StundenplanModel->execReadOnlyQuery("
 				SELECT mitarbeiter_uid, vorname, nachname, kurzbz
 				FROM public.tbl_mitarbeiter
 				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
@@ -233,7 +233,7 @@ class LvPlanLib{
 			
 			if($item->ort_kurzbz) {
 
-				$ort_content_object = $this->_ci->LvPlanModel->execReadOnlyQuery("
+				$ort_content_object = $this->_ci->StundenplanModel->execReadOnlyQuery("
 				SELECT content_id
 				FROM public.tbl_ort
 				WHERE ort_kurzbz = ?", [$item->ort_kurzbz]);
@@ -590,4 +590,4 @@ class LvPlanLib{
 		}
 		return success($semester_range);
 	}
-}
\ No newline at end of file
+}

From 1c7d339e14e53572c4737fcbdf6eb7f65f5a5075 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 17 Jun 2025 11:06:29 +0200
Subject: [PATCH 258/572] stundenplan/lvplan revert changes to jobs/LVPlanJob

---
 application/controllers/jobs/LVPlanJob.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/controllers/jobs/LVPlanJob.php b/application/controllers/jobs/LVPlanJob.php
index 14ed473fb..c3fe5495a 100644
--- a/application/controllers/jobs/LVPlanJob.php
+++ b/application/controllers/jobs/LVPlanJob.php
@@ -39,7 +39,7 @@ class LVPlanJob extends JOB_Controller
 		$studiensemester_arr = array();
 
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->load->model('ressource/Stundenplandev_model', 'LvPlandevModel');
+		$this->load->model('ressource/Stundenplandev_model', 'StundenplandevModel');
 		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
 		$this->load->model('education/Lehreinheitgruppe_model', 'LehreinheitgruppeModel');
 
@@ -70,7 +70,7 @@ class LVPlanJob extends JOB_Controller
 			$fail = 0;
 
 			// get all schedule entries where group is missing
-			$result = $this->LvPlandevModel->getMissingDirectGroups($studiensemester);
+			$result = $this->StundenplandevModel->getMissingDirectGroups($studiensemester);
 			if(hasData($result))
 			{
 				foreach($result->retval as $row)
@@ -112,7 +112,7 @@ class LVPlanJob extends JOB_Controller
 					}
 
 					// add group to schedule
-					$result = $this->LvPlandevModel->insert(
+					$result = $this->StundenplandevModel->insert(
 						array(
 							'lehreinheit_id' => $row->lehreinheit_id,
 							'unr' => $unr,
@@ -159,7 +159,7 @@ class LVPlanJob extends JOB_Controller
     public function mailUpdatedZeitwuensche()
     {
         // Load models
-        $this->load->model('ressource/Stundenplandev_model', 'LvPlandevModel');
+        $this->load->model('ressource/Stundenplandev_model', 'StundenplandevModel');
         $this->load->model('organisation/Studiensemester_model', 'StundiensemesterModel');
         $this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
         $this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');

From d3b3c9db41e3b43eb676339dfaaf92ef255d1929 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 17 Jun 2025 11:44:26 +0200
Subject: [PATCH 259/572] fix typo

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

diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index 850bdacae..1467f96f9 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -60,7 +60,7 @@ export default {
 	methods: {
 		handleTabClick: function(index) {
 			let keys = Object.keys(this.tabs);
-			this.change(key[index]);
+			this.change(keys[index]);
 		},
 		change(key) {
 			this.$emit("change", key)

From 52c4ac64f13eef3174f8429e5dcbaf2019b2bd82 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 17 Jun 2025 12:44:24 +0200
Subject: [PATCH 260/572] remove unused import and uuid helper

---
 public/js/components/searchbar/searchbar.js | 1 -
 public/js/helpers/UUID.js                   | 8 --------
 2 files changed, 9 deletions(-)
 delete mode 100644 public/js/helpers/UUID.js

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index ce08e3bfd..15d2a8c1d 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -4,7 +4,6 @@ import employee from "./employee.js";
 import organisationunit from "./organisationunit.js";
 import student from "./student.js";
 import prestudent from "./prestudent.js";
-import uuid from "../../helpers/UUID.js";
 
 export default {
     props: [ "searchoptions", "searchfunction" ],
diff --git a/public/js/helpers/UUID.js b/public/js/helpers/UUID.js
deleted file mode 100644
index 1c08c1237..000000000
--- a/public/js/helpers/UUID.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const uuid41 = () => {
-	const b = crypto.getRandomValues(new Uint16Array(8));
-	const d = [].map.call(b, a => a.toString(16).padStart(4, '0')).join('');
-	const vr = (((b[5] >> 12) & 3) | 8).toString(16);
-	return `${d.substr(0, 8)}-${d.substr(8, 4)}-4${d.substr(13, 3)}-${vr}${d.substr(17, 3)}-${d.substr(20, 12)}`;
-};
-
-export default uuid41;
\ No newline at end of file

From ae10ac877fe9282574a5ccab86df570e37dddc5f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 18 Jun 2025 09:02:24 +0200
Subject: [PATCH 261/572] Tab Adressen: add handling selected Firma for edit
 and save

---
 .../api/frontend/v1/stv/Kontakt.php           | 20 ++-----------------
 .../Details/Kontakt/Address.js                | 11 +++++++---
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Kontakt.php b/application/controllers/api/frontend/v1/stv/Kontakt.php
index e75802727..9b713b5f9 100644
--- a/application/controllers/api/frontend/v1/stv/Kontakt.php
+++ b/application/controllers/api/frontend/v1/stv/Kontakt.php
@@ -198,13 +198,7 @@ class Kontakt extends FHCAPI_Controller
 		$name = isset($_POST['name']) ? $_POST['name'] : null;
 		$typ = isset($_POST['typ']) ? $_POST['typ'] : null;
 		$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
-
-		if(isset($_POST['firma']))
-		{
-			$firma_id = $_POST['firma']['firma_id'];
-		}
-		else
-			$firma_id = null;
+		$firma_id = isset($_POST['firma_id']) ? $_POST['firma_id'] : null;
 
 		$result = $this->AdresseModel->insert(
 			[
@@ -271,17 +265,6 @@ class Kontakt extends FHCAPI_Controller
 			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Adresse_id']), self::ERROR_TYPE_GENERAL);
 		}
 
-		if(isset($_POST['firma']))
-		{
-			$firma_id = $_POST['firma']['firma_id'];
-		}
-		elseif(isset($_POST['firma_id']))
-		{
-			$firma_id = $_POST['firma_id'];
-		}
-		else
-			$firma_id = null;
-
 		$person_id = isset($_POST['person_id']) ? $_POST['person_id'] : null;
 		$co_name = isset($_POST['co_name']) ? $_POST['co_name'] : null;
 		$strasse = isset($_POST['strasse']) ? $_POST['strasse'] : null;
@@ -291,6 +274,7 @@ class Kontakt extends FHCAPI_Controller
 		$name = isset($_POST['name']) ? $_POST['name'] : null;
 		$typ = isset($_POST['typ']) ? $_POST['typ'] : null;
 		$anmerkung = isset($_POST['anmerkung']) ? $_POST['anmerkung'] : null;
+		$firma_id = isset($_POST['firma_id']) ? $_POST['firma_id'] : null;
 
 		$result = $this->AdresseModel->update(
 			[
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index a69c34b3f..943dfa94f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -188,8 +188,8 @@ export default{
 							title: this.$p.t('person', 'person_id')
 						});
 /*						cm.getColumnByField('actions').component.updateDefinition({
-							title: this.$p.t('global', 'aktionen')
-						});*/
+													title: this.$p.t('global', 'aktionen')
+												});*/
 					}
 				}
 			],
@@ -200,7 +200,7 @@ export default{
 				typ: 'h',
 				nation: 'A',
 				address: {plz: null},
-				plz: null
+				plz: null,
 			},
 			statusNew: true,
 			places: [],
@@ -246,6 +246,10 @@ export default{
 			this.loadAdress(adresse_id).then(() => {
 				if(this.addressData.adresse_id)
 				{
+					this.selectedFirma = this.listFirmen.find(
+						item => item.firma_id === this.addressData.firma_id
+					);
+
 					this.addressData.address.plz = this.addressData.plz;
 					//	delete this.addressData.plz;
 					this.loadPlaces(this.addressData.address.plz);
@@ -353,6 +357,7 @@ export default{
 			this.addressData.typ = 'h';
 			this.addressData.nation = 'A';
 			this.addressData.address = {plz: null};
+			this.selectedFirma = null;
 
 			this.statusNew = true;
 		},

From 23e32a51b2a6617f914765511c8d65208f04f495 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 18 Jun 2025 12:26:20 +0200
Subject: [PATCH 262/572] update(LvPlan Reservierungen):renderer componente
 erstellt und in Events geladen + styling fixes

---
 application/core/Events.php                   |  16 ++-
 public/css/Cis4/CoreCalendarEvents.css        |  31 +++--
 public/js/apps/Dashboard/Fhc.js               |  12 +-
 public/js/components/Calendar/Day/Page.js     |   8 +-
 public/js/components/Calendar/Week/Page.js    |   4 +-
 public/js/components/Cis/LvPlan/LvPlan.js     |   6 +-
 .../Cis/Renderer/Lehreinheit/calendarEvent.js |  31 +++++
 .../Lehreinheit}/modalContent.js              |   4 +-
 .../Lehreinheit}/modalTitle.js                |   0
 .../Reservierungen}/calendarEvent.js          |   8 +-
 .../Renderer/Reservierungen/modalContent.js   | 109 ++++++++++++++++++
 .../Cis/Renderer/Reservierungen/modalTitle.js |  11 ++
 12 files changed, 201 insertions(+), 39 deletions(-)
 create mode 100644 public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
 rename public/js/components/Cis/{Mylv => Renderer/Lehreinheit}/modalContent.js (96%)
 rename public/js/components/Cis/{Mylv => Renderer/Lehreinheit}/modalTitle.js (100%)
 rename public/js/components/Cis/{LvPlan/EventTypes => Renderer/Reservierungen}/calendarEvent.js (93%)
 create mode 100644 public/js/components/Cis/Renderer/Reservierungen/modalContent.js
 create mode 100644 public/js/components/Cis/Renderer/Reservierungen/modalTitle.js

diff --git a/application/core/Events.php b/application/core/Events.php
index a7d4754cc..9ad474fc5 100644
--- a/application/core/Events.php
+++ b/application/core/Events.php
@@ -6,9 +6,19 @@ use CI3_Events as Events;
 Events::on('loadRenderers', function ($renderers) {
 	$fhc_core_renderers =& $renderers();
 	$fhc_core_renderers["lehreinheit"] = array(
-		'calendarEvent' => APP_ROOT.'public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js',
-		'modalTitle' => APP_ROOT.'public/js/components/Cis/Mylv/modalTitle.js',
-		'modalContent' => APP_ROOT.'public/js/components/Cis/Mylv/modalContent.js',
+		'calendarEvent' => APP_ROOT.'public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js',
+		'modalTitle' => APP_ROOT.'public/js/components/Cis/Renderer/Lehreinheit/modalTitle.js',
+		'modalContent' => APP_ROOT.'public/js/components/Cis/Renderer/Lehreinheit/modalContent.js',
+		'calendarEventStyles' => APP_ROOT.'public/css/Cis4/CoreCalendarEvents.css'
+	);
+});
+
+Events::on('loadRenderers', function ($renderers) {
+	$fhc_core_renderers =& $renderers();
+	$fhc_core_renderers["reservierung"] = array(
+		'calendarEvent' => APP_ROOT.'public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js',
+		'modalTitle' => APP_ROOT.'public/js/components/Cis/Renderer/Reservierungen/modalTitle.js',
+		'modalContent' => APP_ROOT.'public/js/components/Cis/Renderer/Reservierungen/modalContent.js',
 		'calendarEventStyles' => APP_ROOT.'public/css/Cis4/CoreCalendarEvents.css'
 	);
 });
diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index 79ca36d00..17dc817ef 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -1,30 +1,29 @@
 /* Moodle Events in Month Page */
 .monthPageContainer .lehreinheitEventContent{
-	display: grid;
-	grid-template-columns: auto 1fr;
-	grid-template-rows: 1fr;
-	border-bottom: 1px solid var(--bs-border-color);
-	
+	display: flex;
+	border-bottom: 1px solid var(--bs-border-color);	
 }
 
 .monthPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
-	display:grid;
-	padding: .25rem .5rem .25rem .25rem;
-	margin-right: .25rem;
-	align-content: center;
+	display:none;
 }
 
 
 .monthPageContainer .lehreinheitEventContent #lehreinheitEventText {
-	display: flex;
-	flex-wrap: wrap;
-	column-gap: 5px;
+	width: 100%;
 	font-size: .875em;
-	align-items:center;
-	justify-content: space-evenly;
+	overflow:hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	display:flex;
+	place-content: center space-evenly;
 	
 }
 
+.monthPageContainer .lehreinheitEventContent #lehreinheitEventText #lehreinheitLektoren{
+	display:none;
+}
+
 /* Moodle Events in Week Page */
 .weekPageContainer .lehreinheitEventContent {
 	display: grid;
@@ -44,10 +43,10 @@
 
 .weekPageContainer .lehreinheitEventContent #lehreinheitEventText {
 	display: flex;
+	flex-direction: column;
+	place-content: center space-evenly;
 	flex-wrap: wrap;
 	column-gap: 5px;
-	align-items: center;
-	justify-content: space-evenly;
 
 }
 
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index f04d25efc..075a399d8 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -305,11 +305,13 @@ const app = Vue.createApp({
 
 					if (data[rendertype].calendarEventStyles){
 						var head = document.head;
-						var link = document.createElement("link");
-						link.type = "text/css";
-						link.rel = "stylesheet";
-						link.href = data[rendertype].calendarEventStyles;
-						head.appendChild(link);
+						if(!head.querySelector(`link[href="${data[rendertype].calendarEventStyles}"]`)){
+							var link = document.createElement("link");
+							link.type = "text/css";
+							link.rel = "stylesheet";
+							link.href = data[rendertype].calendarEventStyles;
+							head.appendChild(link);
+						}
 					}
 
 					if(this.renderers === null) {
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 180122e6a..4247ffcd5 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -441,10 +441,10 @@ export default {
 										<div v-for="hour in hours" :style="'min-height:' + rowMinHeight " :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 									</div>
 									<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start" :style="dayGridStyle(day)">
-										
+
 										<div v-if="lookingAtToday && !noEventsCondition" class="overlay" :style="overlayStyle"></div>
-										<div v-for="event in day.events" :key="event" :style="eventGridStyle(day,event)" v-contrast 
-											:selected="event.orig == selectedEvent" class="fhc-entry mx-2 small rounded overflow-hidden" >
+										<div v-for="event in day.events" :key="event" :style="eventGridStyle(day,event)" v-contrast
+											:selected="event.orig == selectedEvent" class="fhc-entry mx-2 small border border-secondary rounded overflow-hidden" >
 											<!-- desktop version of the page template, parent receives slotProp mobile = false -->
 											<div class="d-none d-xl-block h-100 "  @click.prevent="eventClick(event)">
 												<slot  name="dayPage" :event="event.orig" :day="day" :mobile="false">
@@ -452,7 +452,7 @@ export default {
 												</slot>
 											</div>
 											<!-- mobile version of the page template, parent receives slotProp mobile = true -->
-											<div class="d-block d-xl-none h-100" @click.prevent="eventClick(event)">
+											<div class="d-block d-xl-none h-100 " @click.prevent="eventClick(event)">
 												<slot  name="dayPage" :event="event.orig" :day="day" :mobile="true">
 													<p>this is a slot placeholder</p>
 												</slot>
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index b7705b1ed..cec65e577 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -369,10 +369,10 @@ export default {
 							</div>
 						</Transition>
 						<div v-if="day.isToday" class="overlay" :style="overlayStyle"></div>
-						<div v-for="event in day.events" :key="event" @click.prevent="weekPageClick(event.orig, day)" 
+						<div v-for="event in day.events" :key="event" @click.prevent="weekPageClick(event.orig, day)"
 						:selected="event.orig == selectedEvent"
 						:style="eventGridStyle(day,event)"
-						class="mx-2 small rounded overflow-hidden fhc-entry "
+						class="mx-2 small rounded overflow-hidden fhc-entry border border-secondary"
 						v-contrast >
 							<slot name="weekPage" :event="event.orig" :day="day">
 								<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 64f67d8cb..a0b93062a 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -2,7 +2,7 @@ import FhcCalendar from "../../Calendar/Calendar.js";
 import CalendarDate from "../../../composables/CalendarDate.js";
 import LvModal from "../Mylv/LvModal.js";
 import LvMenu from "../Mylv/LvMenu.js"
-import lehreinheitEvent from "./EventTypes/calendarEvent.js"
+import lehreinheitEvent from "../Renderer/Lehreinheit/calendarEvent.js"
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
@@ -352,14 +352,14 @@ const LvPlan = {
 		</template>
 		<template #weekPage="{event,day}">
 			<div @click="showModal(event)" type = "button"
-				class="weekPageContainer position-relative border border-secondary border  h-100"
+				class="weekPageContainer position-relative h-100"
 				:class="{'p-1':event.allDayEvent}"
 				style = "overflow: auto;" >
 				<component :is="calendarEventComponent(event.type)" :event="event" ></component>
 			</div>
 		</template>
 		<template #dayPage="{event,day,mobile}">
-			<div @click="mobile? showModal(event):null" type="button" class="dayPageContainer fhc-entry border border-secondary border m-0 h-100  text-center">
+			<div @click="mobile? showModal(event):null" type="button" class="dayPageContainer fhc-entry m-0 h-100  text-center">
 				<component :is="calendarEventComponent(event.type)" :event="event"></component>
 			</div>
 		</template>
diff --git a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
new file mode 100644
index 000000000..b5f9ae617
--- /dev/null
+++ b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
@@ -0,0 +1,31 @@
+export default {
+	methods:{
+		convertTime: function ([hour, minute]) {
+			let date = new Date();
+			date.setHours(hour);
+			date.setMinutes(minute);
+			// returns date string as hh:mm
+			return date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', hour12: false });
+
+		},
+	},
+	props:{
+		event: {
+			type:Object,
+			required:true,
+		},
+	},
+	template: `
+	<div class="lehreinheitEventContent h-100 w-100 p-1" >
+		<div id="lehreinheitEventHeader" class="h-100 " v-if="!event.allDayEvent && event?.beginn && event?.ende" >
+			<span class="small">{{convertTime(event.beginn.split(":"))}}</span>
+			<span class="small">{{convertTime(event.ende.split(":"))}}</span>
+		</div>
+		<div id="lehreinheitEventText">
+			<span id="lehreinheitTopic">{{event.topic}}</span>
+			<span id="lehreinheitLektoren" v-for="lektor in event.lektor">{{lektor.kurzbz}}</span>
+			<span id="lehreinheitOrt">{{event.ort_kurzbz}}</span>
+		</div>
+	</div>
+	`,
+}
diff --git a/public/js/components/Cis/Mylv/modalContent.js b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
similarity index 96%
rename from public/js/components/Cis/Mylv/modalContent.js
rename to public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
index d3ed0b0db..d6dce547c 100644
--- a/public/js/components/Cis/Mylv/modalContent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
@@ -1,5 +1,5 @@
-import { numberPadding, formatDate } from "../../../helpers/DateHelpers.js"
-import LvMenu from "./LvMenu.js";
+import { numberPadding, formatDate } from "../../../../helpers/DateHelpers.js"
+import LvMenu from "../../Mylv/LvMenu.js";
 
 export default {
 	props:{
diff --git a/public/js/components/Cis/Mylv/modalTitle.js b/public/js/components/Cis/Renderer/Lehreinheit/modalTitle.js
similarity index 100%
rename from public/js/components/Cis/Mylv/modalTitle.js
rename to public/js/components/Cis/Renderer/Lehreinheit/modalTitle.js
diff --git a/public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js b/public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js
similarity index 93%
rename from public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js
rename to public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js
index 6fa957d91..c6b8054c2 100644
--- a/public/js/components/Cis/LvPlan/EventTypes/calendarEvent.js
+++ b/public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js
@@ -1,5 +1,5 @@
 export default {
-	methods:{
+	methods: {
 		convertTime: function ([hour, minute]) {
 			let date = new Date();
 			date.setHours(hour);
@@ -9,10 +9,10 @@ export default {
 
 		},
 	},
-	props:{
+	props: {
 		event: {
-			type:Object,
-			required:true,
+			type: Object,
+			required: true,
 		},
 	},
 	template: `
diff --git a/public/js/components/Cis/Renderer/Reservierungen/modalContent.js b/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
new file mode 100644
index 000000000..6dcef418c
--- /dev/null
+++ b/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
@@ -0,0 +1,109 @@
+import { numberPadding, formatDate } from "../../../../helpers/DateHelpers.js"
+import LvMenu from "../../Mylv/LvMenu.js";
+
+export default {
+	props:{
+		event: {
+			type: Object,
+			required: true,
+		},
+		lvMenu:{
+			type: Object,
+			required: false,
+			default: null,
+		},
+	},
+	components:{
+		LvMenu,
+	},
+	computed: {
+		lektorenLinks: function () {
+			if (!this.event || !Array.isArray(this.event.lektor) || !this.event.lektor.length) return "a";
+
+			let lektorenLinks = {};
+			this.event.lektor.forEach((lektor) => {
+				lektorenLinks[lektor.kurzbz] = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/Cis/Profil/View/${lektor.mitarbeiter_uid}`;
+			})
+			return lektorenLinks;
+		},
+		getOrtContentLink: function () {
+			if (!this.event || !this.event.ort_content_id) return "a";
+
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/CisVue/Cms/content/${this.event.ort_content_id}`
+		},
+		start_time: function () {
+			if (!this.event.start) return 'N/A';
+			if (!this.event.start instanceof Date) {
+				return this.event.start;
+			}
+			return numberPadding(this.event.start.getHours()) + ":" + numberPadding(this.event.start.getMinutes());
+		},
+		end_time: function () {
+			if (!this.event.end) return 'N/A';
+			if (!this.event.end instanceof Date) {
+				return this.event.end;
+			}
+			return numberPadding(this.event.end.getHours()) + ":" + numberPadding(this.event.end.getMinutes());
+		}
+	},
+	methods: {
+		mehtodNumberPadding: function (number) {
+			return numberPadding(number);
+		},
+		methodFormatDate: function (d) {
+			return formatDate(d);
+		},
+	},
+	template: `
+	<div>
+		<h3>
+			{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}
+		</h3>
+		<table class="table table-hover mb-4">
+				<tbody>
+					<tr>
+						<th>{{
+							$p.t('global','datum')?
+							$p.t('global','datum')+':'
+							:''
+						}}</th>
+						<td>{{methodFormatDate(event.datum)}}</td>
+					</tr>
+					<tr>
+						<th>{{
+							$p.t('global','raum')?
+							$p.t('global','raum')+':'
+							:''
+						}}</th>
+						<td>
+							<a v-if="event.ort_content_id" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+							{{event.ort_kurzbz}}
+						</td>
+					</tr>
+					<tr>
+						<th>{{
+							$p.t('lehre','lektor')?
+							$p.t('lehre','lektor')+':'
+							:''
+						}}</th>
+						<td>
+							<div v-for="lektor in event.lektor" class="d-block">
+								<a v-if="lektorenLinks[lektor.kurzbz]" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+								{{lektor.kurzbz}}
+							</div>
+						</td>
+					</tr>
+					<tr>
+						<th>{{
+								$p.t('ui','zeitraum')?
+								$p.t('ui','zeitraum')+':'
+								:''
+							}}</th>
+						<td>{{start_time + ' - ' + end_time}}</td>
+					</tr>
+					
+				</tbody>
+		</table>
+		
+	</div>`,
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Renderer/Reservierungen/modalTitle.js b/public/js/components/Cis/Renderer/Reservierungen/modalTitle.js
new file mode 100644
index 000000000..c5f195ddb
--- /dev/null
+++ b/public/js/components/Cis/Renderer/Reservierungen/modalTitle.js
@@ -0,0 +1,11 @@
+export default {
+	props:{
+		event: {
+			type: Object,
+			required: true,
+		}
+	},
+	template:`
+			<div >{{ event.topic + ' [' + event.ort_kurzbz+']'}}</div>
+`
+}
\ No newline at end of file

From 85c16b7f5dc4526c8f52ec28ba28e6b530e5b34b Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 18 Jun 2025 15:04:08 +0200
Subject: [PATCH 263/572] Refactor dropdowns

- use allPersons for Dropdown Autocomplete Pruefer1, Pruefer2, Pruefer3
- use allMitarbeiter for Dropdown Autocomplete Vorsitz
---
 .../api/frontend/v1/stv/Abschlusspruefung.php | 121 +++++--
 ...875_61229_61230_61231_TabAbschlusspruefung |   0
 .../js/api/factory/stv/abschlusspruefung.js   |  12 +
 .../Abschlusspruefung/Abschlusspruefung.js    | 334 ++++++++----------
 4 files changed, 237 insertions(+), 230 deletions(-)
 create mode 100644 merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231_TabAbschlusspruefung

diff --git a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
index d7581c3d1..54a0e3278 100644
--- a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
+++ b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
@@ -20,6 +20,8 @@ class Abschlusspruefung extends FHCAPI_Controller
 			'getBeurteilungen' => ['admin:rw', 'assistenz:rw'],
 			'getAkadGrade' => ['admin:rw', 'assistenz:rw'],
 			'getMitarbeiter' => ['admin:rw', 'assistenz:rw'],
+			'getAllMitarbeiter' => ['admin:rw', 'assistenz:rw'],
+			'getAllPersons' => ['admin:rw', 'assistenz:rw'],
 			'getPruefer' => ['admin:rw', 'assistenz:rw'],
 			'getTypStudiengang' => ['admin:rw', 'assistenz:rw'],
 			'checkForExistingExams' => ['admin:rw', 'assistenz:rw'],
@@ -149,16 +151,16 @@ class Abschlusspruefung extends FHCAPI_Controller
 	{
 		$studiengang_kz= $this->input->post('studiengang_kz');
 
-/*		if (!$studiengang_kzs || !is_array($studiengang_kzs)) {
-			$this->load->library('form_validation');
+		/*		if (!$studiengang_kzs || !is_array($studiengang_kzs)) {
+					$this->load->library('form_validation');
 
-			$this->form_validation->set_rules('studiengang_kzs', '', 'required|is_null', [
-				'is_null' => $this->p->t('ui', 'error_fieldMustBeArray')
-			]);
+					$this->form_validation->set_rules('studiengang_kzs', '', 'required|is_null', [
+						'is_null' => $this->p->t('ui', 'error_fieldMustBeArray')
+					]);
 
-			if (!$this->form_validation->run())
-				$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}*/
+					if (!$this->form_validation->run())
+						$this->terminateWithValidationErrors($this->form_validation->error_array());
+				}*/
 
 
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
@@ -224,11 +226,6 @@ class Abschlusspruefung extends FHCAPI_Controller
 
 		$formData = $this->input->post('formData');
 
-		$vorsitz = isset($formData['vorsitz']['mitarbeiter_uid']) ? $formData['vorsitz']['mitarbeiter_uid'] :  $formData['vorsitz'];
-		$pruefer1 = isset($formData['pruefer1']['person_id']) ? $formData['pruefer1']['person_id'] : $formData['pruefer1'];
-		$pruefer2 = isset($formData['pruefer2']['person_id']) ? $formData['pruefer2']['person_id'] : $formData['pruefer2'];
-		$pruefer3 = isset($formData['pruefer3']['person_id']) ? $formData['pruefer3']['person_id'] : $formData['pruefer3'];
-
 		$this->form_validation->set_data($formData);
 
 		$this->form_validation->set_rules('pruefungstyp_kurzbz', 'Typ', 'required', [
@@ -256,14 +253,14 @@ class Abschlusspruefung extends FHCAPI_Controller
 			'student_uid' => $student_uid,
 			'pruefungstyp_kurzbz' => $formData['pruefungstyp_kurzbz'],
 			'akadgrad_id' => $formData['akadgrad_id'],
-			'vorsitz' => $vorsitz,
+			'vorsitz' => $formData['vorsitz'],
 			'pruefungsantritt_kurzbz' => $formData['pruefungsantritt_kurzbz'],
 			'abschlussbeurteilung_kurzbz' => $formData['abschlussbeurteilung_kurzbz'],
 			'datum' => $formData['datum'], //TODO(Manu) check if minute format like FAS
 			'sponsion' => $formData['sponsion'],
-			'pruefer1' => $pruefer1,
-			'pruefer2' => $pruefer2,
-			'pruefer3' => $pruefer3,
+			'pruefer1' => $formData['pruefer1'],
+			'pruefer2' => $formData['pruefer2'],
+			'pruefer3' => $formData['pruefer3'],
 			'protokoll' => $formData['protokoll'],
 			'note' => $formData['note'],
 			'anmerkung' => $formData['anmerkung'],
@@ -298,7 +295,7 @@ class Abschlusspruefung extends FHCAPI_Controller
 		$this->form_validation->set_rules('pruefungstyp_kurzbz', 'Typ', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Typ'])
 		]);
-		
+
 		$this->form_validation->set_rules('akadgrad_id', 'AkadGrad', 'required', [
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'AkadGrad'])
 		]);
@@ -319,25 +316,25 @@ class Abschlusspruefung extends FHCAPI_Controller
 
 		$result = $this->AbschlusspruefungModel->update(
 			[
-			'abschlusspruefung_id' => $abschlusspruefung_id
+				'abschlusspruefung_id' => $abschlusspruefung_id
 			],
 			[
-			'student_uid' => $formData['student_uid'],
-			'pruefungstyp_kurzbz' => $formData['pruefungstyp_kurzbz'],
-			'akadgrad_id' => $formData['akadgrad_id'],
-			'vorsitz' => $vorsitz,
-			'pruefungsantritt_kurzbz' => $formData['pruefungsantritt_kurzbz'],
-			'abschlussbeurteilung_kurzbz' => $formData['abschlussbeurteilung_kurzbz'],
-			'datum' => $formData['datum'],
-			'sponsion' => $formData['sponsion'],
-			'pruefer1' => $pruefer1,
-			'pruefer2' => $pruefer2,
-			'pruefer3' => $pruefer3,
-			'protokoll' => $formData['protokoll'],
-			'note' => $formData['note'],
-			'anmerkung' => $formData['anmerkung'],
-			'insertamum' => date('c'),
-			'insertvon' => getAuthUID()
+				'student_uid' => $formData['student_uid'],
+				'pruefungstyp_kurzbz' => $formData['pruefungstyp_kurzbz'],
+				'akadgrad_id' => $formData['akadgrad_id'],
+				'vorsitz' => $vorsitz,
+				'pruefungsantritt_kurzbz' => $formData['pruefungsantritt_kurzbz'],
+				'abschlussbeurteilung_kurzbz' => $formData['abschlussbeurteilung_kurzbz'],
+				'datum' => $formData['datum'],
+				'sponsion' => $formData['sponsion'],
+				'pruefer1' => $pruefer1,
+				'pruefer2' => $pruefer2,
+				'pruefer3' => $pruefer3,
+				'protokoll' => $formData['protokoll'],
+				'note' => $formData['note'],
+				'anmerkung' => $formData['anmerkung'],
+				'insertamum' => date('c'),
+				'insertvon' => getAuthUID()
 			]
 		);
 
@@ -402,4 +399,58 @@ class Abschlusspruefung extends FHCAPI_Controller
 		}
 		$this->terminateWithSuccess('step3');
 	}
+
+	/*
+	* returns list of all Mitarbeiter
+	* as key value list to be used in select or autocomplete
+	*/
+	public function getAllMitarbeiter()
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+
+		$sql = "
+			SELECT
+			    ma.mitarbeiter_uid as mitarbeiter_uid,
+				CONCAT(p.nachname, ' ', p.vorname, ' (', ma.mitarbeiter_uid, ')') as label
+			FROM
+			  public.tbl_mitarbeiter ma
+			  JOIN public.tbl_benutzer bn ON (bn.uid = ma.mitarbeiter_uid)
+			  JOIN public.tbl_person p ON (p.person_id = bn.person_id)
+			ORDER BY
+			p.nachname ASC
+			";
+
+		$result = $this->MitarbeiterModel->execReadOnlyQuery($sql);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/*
+	* returns list of all Persons
+	* as key value list to be used in select or autocomplete
+	*/
+	public function getAllPersons()
+	{
+		$this->load->model('person/Person_model', 'PersonModel');
+
+		$sql = "
+			SELECT
+			    p.vorname, p.nachname, p.person_id,
+				CONCAT(p.nachname, ' ', p.vorname) as label
+			FROM
+			  public.tbl_person p
+			 -- JOIN public.tbl_benutzer bn ON (p.person_id = bn.person_id)
+			  -- and bn.aktiv = 'true'
+			ORDER BY
+			p.nachname ASC
+			";
+
+		//TODO(manu) check if filter active benutzer
+
+		$result = $this->PersonModel->execReadOnlyQuery($sql);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
 }
diff --git a/merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231_TabAbschlusspruefung b/merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231_TabAbschlusspruefung
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/js/api/factory/stv/abschlusspruefung.js b/public/js/api/factory/stv/abschlusspruefung.js
index 37e442b19..e318d0d37 100644
--- a/public/js/api/factory/stv/abschlusspruefung.js
+++ b/public/js/api/factory/stv/abschlusspruefung.js
@@ -107,5 +107,17 @@ export default {
 			url: 'api/frontend/v1/stv/abschlusspruefung/checkForExistingExams/',
 			params: { uid }
 		};
+	},
+	getAllMitarbeiter(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/abschlusspruefung/getAllMitarbeiter/'
+		};
+	},
+	getAllPersons(){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/abschlusspruefung/getAllPersons/'
+		};
 	}
 };
\ No newline at end of file
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index 76987aefc..5c9f881bb 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -7,6 +7,7 @@ import AbschlusspruefungDropdown from "./AbschlusspruefungDropdown.js";
 
 import ApiStudiengang from '../../../../../api/factory/studiengang.js';
 import ApiStvAbschlusspruefung from '../../../../../api/factory/stv/abschlusspruefung.js';
+import ApiStvAddress from "../../../../../api/factory/stv/kontakt/address";
 
 export default {
 	components: {
@@ -78,7 +79,7 @@ export default {
 					{title: "prueferIn2", field: "p2_nachname", visible: false},
 					{title: "prueferIn3", field: "p3_nachname", visible: false},
 					{
-						title: "datum", 
+						title: "datum",
 						field: "datum",
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
@@ -95,7 +96,7 @@ export default {
 					},
 					{title: "uhrzeit", field: "uhrzeit"},
 					{
-						title: "freigabe", 
+						title: "freigabe",
 						field: "freigabedatum",
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
@@ -112,7 +113,7 @@ export default {
 					},
 					{title: "pruefungsantritt", field: "antritt_bezeichnung"},
 					{
-						title: "sponsion", 
+						title: "sponsion",
 						field: "sponsion",
 						formatter: function (cell) {
 							const dateStr = cell.getValue();
@@ -259,12 +260,14 @@ export default {
 			arrBeurteilungen: [],
 			arrAkadGrad: [],
 			arrNoten: [],
-			filteredMitarbeiter: [],
-			filteredPruefer: [],
-			abortController: {
-				mitarbeiter: null,
-				pruefer: null
-			},
+			selectedVorsitz: null,
+			listeFilteredMitarbeiter: [],
+			listeAllMitarbeiter: [],
+			listeAllPersons: [],
+			selectedPruefer1: null,
+			selectedPruefer2: null,
+			selectedPruefer3: null,
+			listeFilteredPersons: [],
 			stgInfo: { typ: '', oe_kurzbz: '' }
 		}
 	},
@@ -274,6 +277,19 @@ export default {
 				this.$refs.table.reloadTable();
 			}
 			this.getStudiengangByKz();
+		},
+		selectedVorsitz(newVal) {
+			this.formData.vorsitz = newVal?.mitarbeiter_uid || '';
+			console.log("newVal: " + newVal.mitarbeiter_uid);
+		},
+		selectedPruefer1(newVal) {
+			this.formData.pruefer1 = newVal?.person_id || '';
+		},
+		selectedPruefer2(newVal) {
+			this.formData.pruefer2 = newVal?.person_id || '';
+		},
+		selectedPruefer3(newVal) {
+			this.formData.pruefer3 = newVal?.person_id || '';
 		}
 	},
 	methods: {
@@ -293,8 +309,22 @@ export default {
 		actionEditAbschlusspruefung(abschlusspruefung_id) {
 			this.resetForm();
 			this.statusNew = false;
+			this.loadAbschlusspruefung(abschlusspruefung_id).then(() => {
+				//set selectedData to enable viewing label in primevue autocomplete fields
+				this.selectedVorsitz = this.listeAllMitarbeiter.find(
+					item => item.mitarbeiter_uid === this.formData.vorsitz
+				);
+				this.selectedPruefer1 = this.listeAllPersons.find(
+					item => item.person_id === this.formData.pruefer1
+				);
+				this.selectedPruefer2= this.listeAllPersons.find(
+					item => item.person_id === this.formData.pruefer2
+				);
+				this.selectedPruefer3= this.listeAllPersons.find(
+					item => item.person_id === this.formData.pruefer3
+				);
+			});
 			this.$refs.finalexamModal.show();
-			this.loadAbschlusspruefung(abschlusspruefung_id);
 		},
 		actionDeleteAbschlusspruefung(abschlusspruefung_id) {
 			this.$fhcAlert
@@ -374,7 +404,7 @@ export default {
 			this.formData.vorsitz = null;
 			this.formData.pruefungsantritt_kurzbz = null;
 			this.formData.abschlussbeurteilung_kurzbz = null;
-			this.formData.datum = null; //oder new Date();
+			this.formData.datum = null;
 			this.formData.sponsion = null;
 			this.formData.pruefer1 = null;
 			this.formData.pruefer2 = null;
@@ -382,34 +412,11 @@ export default {
 			this.formData.anmerkung = null;
 			this.formData.protokoll = null;
 			this.formData.note = null;
-			this.formData.p1 = null;
-			this.formData.p2 = null;
-			this.formData.p3 = null;
-			this.formData.pv = null;
-		},
-		search(event) {
-			if (this.abortController.mitarbeiter) {
-				this.abortController.mitarbeiter.abort();
-			}
-			this.abortController.mitarbeiter = new AbortController();
+			this.selectedVorsitz = null;
+			this.selectedPruefer1 = null;
+			this.selectedPruefer2 = null;
+			this.selectedPruefer3 = null;
 
-			return this.$api
-				.call(ApiStvAbschlusspruefung.getMitarbeiter(event.query))
-				.then(result => {
-					this.filteredMitarbeiter = result.data.retval;
-				});
-		},
-		searchNotAkad(event) {
-			if (this.abortController.pruefer) {
-				this.abortController.pruefer.abort();
-			}
-			this.abortController.pruefer = new AbortController();
-
-			return this.$api
-				.call(ApiStvAbschlusspruefung.getPruefer(event.query))
-				.then(result => {
-					this.filteredPruefer = result.data.retval;
-				});
 		},
 		setDefaultFormData() {
 
@@ -434,6 +441,22 @@ export default {
 		printDocument(link) {
 			window.open(link, '_blank');
 		},
+		filterMitarbeiter(event){
+			const query = event?.query?.toLowerCase()?.trim() || "";
+
+			this.listeFilteredMitarbeiter = this.listeAllMitarbeiter.filter(item => {
+				const label = (item.label || "").toLowerCase();
+				return label.includes(query);
+			});
+		},
+		filterPersons(event){
+			const query = event?.query?.toLowerCase()?.trim() || "";
+
+			this.listeFilteredPersons = this.listeAllPersons.filter(item => {
+				const label = (item.label || "").toLowerCase();
+				return label.includes(query);
+			});
+		}
 	},
 	created() {
 		this.$api
@@ -470,6 +493,21 @@ export default {
 				this.arrAkadGrad = result.data;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$api
+			.call(ApiStvAbschlusspruefung.getAllMitarbeiter())
+			.then(result => {
+				this.listeAllMitarbeiter = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
+		this.$api
+			.call(ApiStvAbschlusspruefung.getAllPersons())
+			.then(result => {
+				this.listeAllPersons = result.data;
+			})
+			.catch(this.$fhcAlert.handleSystemError);
+
 		if (!this.student.length) {
 			this.$api
 				.call(ApiStudiengang.getStudiengangByKz(this.student.studiengang_kz))
@@ -484,7 +522,7 @@ export default {
 	template: `
 	<div class="stv-details-abschlusspruefung h-100 pb-3">
 		<h4>{{this.$p.t('stv','tab_finalexam')}}</h4>
-		
+
 		<div v-if="this.student.length">
 			<abschlusspruefung-dropdown
 				:showAllFormats="showAllFormats"
@@ -510,7 +548,7 @@ export default {
 			@click:new="actionNewAbschlusspruefung"
 			>
 		</core-filter-cmpt>
-		
+
 		<!--Modal: finalexamModal-->
 		<bs-modal ref="finalexamModal" dialog-class="modal-xl modal-dialog-scrollable">
 			<template #title>
@@ -576,87 +614,39 @@ export default {
 				</div>
 
 				<div class="row mb-3">
-					<template v-if="statusNew">
-						<form-input
-							container-class="col-6 stv-details-abschlusspruefung-vorsitz"
-							:label="$p.t('abschlusspruefung', 'vorsitz_header')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.vorsitz"
-							name="vorsitz"
-							:suggestions="filteredMitarbeiter"
-							@complete="search"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
-					<template v-else >
-						<form-input
-							v-if= "formData.pv"
-							container-class="col-6 stv-details-abschlusspruefung-vorsitz"
-							type="text"
-							name="name"
-							:label="$p.t('abschlusspruefung', 'vorsitz_header')"
-							v-model="formData.pv"
-							>
-						</form-input>
-						<form-input
-							v-else
-							container-class="col-6 stv-details-abschlusspruefung-vorsitz"
-							:label="$p.t('abschlusspruefung', 'vorsitz_header')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.vorsitz"
-							name="vorsitz"
-							:suggestions="filteredMitarbeiter"
-							@complete="search"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
-
-					<template v-if="statusNew">
-						<form-input
-							container-class="col-6 stv-details-abschlusspruefung-pruefer1"
-							:label="$p.t('abschlusspruefung', 'pruefer1')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.pruefer1"
-							name="pruefer1"
-							:suggestions="filteredPruefer"
-							@complete="searchNotAkad"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
-					<template v-else >
-						<form-input
-							v-if= "formData.p1"
-							container-class="col-6 stv-details-abschlusspruefung-pruefer1"
-							type="text"
-							name="name"
-							:label="$p.t('abschlusspruefung', 'pruefer1')"
-							v-model="formData.p1"
-							>
-						</form-input>
-						<form-input
-							v-else
-							container-class="col-6 stv-details-abschlusspruefung-pruefer1"
-							:label="$p.t('abschlusspruefung', 'pruefer1')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.pruefer1"
-							name="pruefer1"
-							:suggestions="filteredPruefer"
-							@complete="searchNotAkad"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
+					<form-input
+						type="autocomplete"
+						container-class="col-6 stv-details-abschlusspruefung-vorsitz"
+						label="VORSITZ"
+						name="vorsitz"
+						v-model="selectedVorsitz"
+						optionLabel="label"
+						optionValue="mitarbeiter_uid"
+						dropdown
+						forceSelection
+						:suggestions="listeFilteredMitarbeiter"
+						@complete="filterMitarbeiter"
+						:min-length="3"
+					>
+					</form-input>
+					<form-input
+						type="autocomplete"
+						container-class="col-6 stv-details-abschlusspruefung-pruefer1"
+						:label="$p.t('abschlusspruefung', 'pruefer1')"
+						name="pruefer1"
+						v-model="selectedPruefer1"
+						optionLabel="label"
+						optionValue="person_id"
+						dropdown
+						forceSelection
+						:suggestions="listeFilteredPersons"
+						@complete="filterPersons"
+						:min-length="3"
+					>
+					</form-input>
 				</div>
-
+				
 				<div class="row mb-3">
-
 					<form-input
 						container-class="col-6 stv-details-abschlusspruefung-abschlussbeurteilung_kurzbz"
 						:label="$p.t('abschlusspruefung', 'abschlussbeurteilung')"
@@ -673,44 +663,21 @@ export default {
 							{{beurteilung.bezeichnung}}
 						</option>
 					</form-input>
-					<template v-if="statusNew">
-						<form-input
-							container-class="col-6 stv-details-abschlusspruefung-pruefer2"
-							:label="$p.t('abschlusspruefung', 'pruefer2')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.pruefer2"
-							name="pruefer2"
-							:suggestions="filteredPruefer"
-							@complete="searchNotAkad"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
-					<template v-else >
-						<form-input
-							v-if= "formData.p2"
-							container-class="col-6 stv-details-abschlusspruefung-pruefer2"
-							type="text"
-							name="name"
-							:label="$p.t('abschlusspruefung', 'pruefer2')"
-							v-model="formData.p2"
-							>
-						</form-input>
-						<form-input
-							v-else
-							container-class="col-6 stv-details-abschlusspruefung-pruefer2"
-							:label="$p.t('abschlusspruefung', 'pruefer2')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.pruefer2"
-							name="pruefer2"
-							:suggestions="filteredPruefer"
-							@complete="searchNotAkad"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
+					<form-input
+						type="autocomplete"
+						container-class="col-6 stv-details-abschlusspruefung-pruefer2"
+						:label="$p.t('abschlusspruefung', 'pruefer2')"
+						name="pruefer2"
+						v-model="selectedPruefer2"
+						optionLabel="label"
+						optionValue="person_id"
+						dropdown
+						forceSelection
+						:suggestions="listeFilteredPersons" 
+						@complete="filterPersons"
+						:min-length="3"
+					>
+					</form-input>
 				</div>
 
 				<div class="row mb-3">
@@ -729,44 +696,21 @@ export default {
 							{{grad.titel}}
 						</option>
 					</form-input>
-					<template v-if="statusNew">
-						<form-input
-							container-class="col-6 stv-details-abschlusspruefung-pruefer3"
-							:label="$p.t('abschlusspruefung', 'pruefer3')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.pruefer3"
-							name="pruefer3"
-							:suggestions="filteredPruefer"
-							@complete="searchNotAkad"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
-					<template v-else >
-						<form-input
-							v-if= "formData.p3"
-							container-class="col-6 stv-details-abschlusspruefung-pruefer3"
-							type="text"
-							name="name"
-							:label="$p.t('abschlusspruefung', 'pruefer3')"
-							v-model="formData.p3"
-							>
-						</form-input>
-						<form-input
-							v-else
-							container-class="col-6 stv-details-abschlusspruefung-pruefer3"
-							:label="$p.t('abschlusspruefung', 'pruefer3')"
-							type="autocomplete"
-							optionLabel="mitarbeiter"
-							v-model="formData.pruefer3"
-							name="pruefer3"
-							:suggestions="filteredPruefer"
-							@complete="searchNotAkad"
-							:min-length="3"
-							>
-						</form-input>
-					</template>
+					<form-input
+						type="autocomplete"
+						container-class="col-6 stv-details-abschlusspruefung-pruefer3"
+						:label="$p.t('abschlusspruefung', 'pruefer3')"
+						name="pruefer3"
+						v-model="selectedPruefer3"
+						optionLabel="label"
+						optionValue="person_id"
+						dropdown
+						forceSelection
+						:suggestions="listeFilteredPersons" 
+						@complete="filterPersons"
+						:min-length="3"
+					>
+					</form-input>
 				</div>
 
 				<div class="row mb-3">

From 6e9650ddfad8307611623d1978d9793f6e1d23ec Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 18 Jun 2025 15:19:30 +0200
Subject: [PATCH 264/572] Bugfixes: Searchbar state in
 localStorage/sessionStorage

---
 public/js/components/searchbar/searchbar.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 95b16232d..aa2213310 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -105,7 +105,7 @@ export default {
 				this.searchsettings.types = this.allSearchTypes();
 			}
 			// stores the search types in the localstorage, only if the newValue is also an array
-			if(Array.isArray(newValue), this.searchoptions.origin){
+			if(Array.isArray(newValue) && this.searchoptions.origin){
 				localStorage.setItem(`${this.searchoptions.origin}_searchtypes`, JSON.stringify(newValue));
 			}
 			this.search();
@@ -130,9 +130,11 @@ export default {
     methods: {
 		getSearchTypes: function () {
 			let result = this.allSearchTypes();
-			let localStorageValue = localStorage.getItem('searchtypes');
-			if (localStorageValue) {
-				result = JSON.parse(localStorageValue);
+			if (this.searchoptions.origin) {
+				let localStorageValue = localStorage.getItem(`${this.searchoptions.origin}_searchtypes`);
+				if (localStorageValue) {
+					result = JSON.parse(localStorageValue);
+				}
 			}
 			return result;
 		},
@@ -144,7 +146,9 @@ export default {
 			return allTypes;
 		},
 		getSearchStr: function(){
-			return sessionStorage.getItem("searchstr") ?? '';
+			if (!this.searchoptions.origin)
+				return '';
+			return sessionStorage.getItem(`${this.searchoptions.origin}_searchstr`) ?? '';
 		},
 		checkSettingsVisibility: function(event) {
 			// hides the settings collapsible if the user clicks somewhere else

From 913211e84d9a8c5060925212691201a2f1fcc784 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 18 Jun 2025 16:23:35 +0200
Subject: [PATCH 265/572] even more & better anw phrasen

---
 system/phrasesupdate.php | 80 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ad0f7e347..66f5f6c05 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -30024,6 +30024,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'offen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Offen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Open',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -31984,6 +32004,66 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'kontrolleTimeOverlap',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kontrollzeiten überlappen mit Kontrolle von {0} bis {1}.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Times overlap with attendance check from {0} to {1}.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'keineKontrollenAnDatumFallback',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Kontrollen an {0} gefunden, es werden alle Kontrollen angezeigt.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No attendance checks found on {0}, all attendance checks are being shown.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'noLePreselectTermineTooOld',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine intelligente LV-Teil Vorauswahl möglich, da sämtliche Termine außerhalb des erlaubten Kontrollzeitraums liegen. Bitte wählen Sie sorgfältig den gewünschten LV-Teil aus.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No intelligent pre-selection of teaching unit is possible, as all dates fall outside the permitted control period. Please carefully select the desired teaching unit.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',

From 96e032bad9f8cac321a4cbab0c64d3c55aa3cc8c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 18 Jun 2025 16:46:47 +0200
Subject: [PATCH 266/572] add missing .js file extension

---
 .../Details/Abschlusspruefung/Abschlusspruefung.js              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index 5c9f881bb..9a1559df0 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -7,7 +7,7 @@ import AbschlusspruefungDropdown from "./AbschlusspruefungDropdown.js";
 
 import ApiStudiengang from '../../../../../api/factory/studiengang.js';
 import ApiStvAbschlusspruefung from '../../../../../api/factory/stv/abschlusspruefung.js';
-import ApiStvAddress from "../../../../../api/factory/stv/kontakt/address";
+import ApiStvAddress from "../../../../../api/factory/stv/kontakt/address.js";
 
 export default {
 	components: {

From 37701dbdfd57b82b77064255dba36bc91914affb Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 18 Jun 2025 16:57:22 +0200
Subject: [PATCH 267/572] disable dropdown property for pruefer

---
 .../Details/Abschlusspruefung/Abschlusspruefung.js           | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index 5c9f881bb..65aa8aa41 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -617,7 +617,7 @@ export default {
 					<form-input
 						type="autocomplete"
 						container-class="col-6 stv-details-abschlusspruefung-vorsitz"
-						label="VORSITZ"
+						:label="$p.t('abschlusspruefung', 'vorsitz')"
 						name="vorsitz"
 						v-model="selectedVorsitz"
 						optionLabel="label"
@@ -637,7 +637,6 @@ export default {
 						v-model="selectedPruefer1"
 						optionLabel="label"
 						optionValue="person_id"
-						dropdown
 						forceSelection
 						:suggestions="listeFilteredPersons"
 						@complete="filterPersons"
@@ -671,7 +670,6 @@ export default {
 						v-model="selectedPruefer2"
 						optionLabel="label"
 						optionValue="person_id"
-						dropdown
 						forceSelection
 						:suggestions="listeFilteredPersons" 
 						@complete="filterPersons"
@@ -704,7 +702,6 @@ export default {
 						v-model="selectedPruefer3"
 						optionLabel="label"
 						optionValue="person_id"
-						dropdown
 						forceSelection
 						:suggestions="listeFilteredPersons" 
 						@complete="filterPersons"

From 707a05f6cde09e9d677078dad7720952004ffec7 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 20 Jun 2025 12:41:20 +0200
Subject: [PATCH 268/572] Adding changes from merge_c4 branch to searchbar
 component

---
 public/js/components/searchbar/searchbar.js | 30 ++++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 8e1711e90..38e07388d 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -34,14 +34,14 @@ export default {
     template: /*html*/`
           <form ref="searchform" class="d-flex me-3" :class="searchoptions.cssclass" action="javascript:void(0);"
 		 	 @focusin="this.searchfocusin" @focusout="this.searchfocusout">
-			<div ref="searchbox" class="h-100 input-group me-2 bg-white">
-				<span style="background-color:inherit" class="input-group-text">
+			<div ref="searchbox" class="h-100 input-group me-2">
+				<span class="input-group-text">
 					<i class="fa-solid fa-magnifying-glass"></i>
 				</span>
                 <input @keyup="this.search" @focus="this.showsearchresult"
                     v-model="this.searchsettings.searchstr" class="form-control"
                     type="search" :placeholder="'Search: '+ search_types_string" aria-label="Search">
-                <button data-bs-toggle="collapse" data-bs-target="#searchSettings" aria-expanded="false" aria-controls="searchSettings" ref="settingsbutton"  class="btn btn-outline-secondary" type="button" id="search-filter"><i class="fas fa-cog"></i></button>
+                <span data-bs-toggle="collapse" data-bs-target="#searchSettings" aria-expanded="false" aria-controls="searchSettings" ref="settingsbutton"  class="input-group-text" type="button"><i class="fas fa-cog"></i></span>
             </div>
 
             <div v-show="this.showresult"
@@ -85,11 +85,12 @@ export default {
     `,
     watch:{
 		'searchsettings.searchstr': function (newSearchValue, oldSearchValue) {
-			sessionStorage.setItem('searchstr',newSearchValue);
+			if(this.searchoptions.origin){
+				sessionStorage.setItem(`${this.searchoptions.origin}_searchstr`,newSearchValue);
+			}
 		},
     },
 	computed:{
-		
 		search_types_string(){
 			if (Array.isArray(this.searchsettings.types) && this.searchsettings.types.length > 0){
 				return this.searchsettings.types.join(' / ');
@@ -105,8 +106,8 @@ export default {
 				this.searchsettings.types = this.allSearchTypes();
 			}
 			// stores the search types in the localstorage, only if the newValue is also an array
-			if(Array.isArray(newValue)){
-				localStorage.setItem('searchtypes', JSON.stringify(newValue));
+			if(Array.isArray(newValue) && this.searchoptions.origin){
+				localStorage.setItem(`${this.searchoptions.origin}_searchtypes`, JSON.stringify(newValue));
 			}
 			this.search();
 		});
@@ -115,6 +116,10 @@ export default {
 		this.settingsDropdown = new bootstrap.Collapse(this.$refs.settings, {
 			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.");
+		}
 	},
 	updated() {
 		if(this.showresult) {
@@ -126,8 +131,11 @@ export default {
     methods: {
 		getSearchTypes: function () {
 			let result = this.allSearchTypes();
-			if (localStorage.getItem('searchtypes')) {
-				result = JSON.parse(localStorage.getItem('searchtypes'));
+			if (this.searchoptions.origin) {
+				let localStorageValue = localStorage.getItem(`${this.searchoptions.origin}_searchtypes`);
+				if (localStorageValue) {
+					result = JSON.parse(localStorageValue);
+				}
 			}
 			return result;
 		},
@@ -139,7 +147,9 @@ export default {
 			return allTypes;
 		},
 		getSearchStr: function(){
-			return sessionStorage.getItem('searchstr') ?? '';
+			if (!this.searchoptions.origin)
+				return '';
+			return sessionStorage.getItem(`${this.searchoptions.origin}_searchstr`) ?? '';
 		},
 		checkSettingsVisibility: function(event) {
 			// hides the settings collapsible if the user clicks somewhere else

From 4f56d799accf77eab4cbf3065f41d5229fe25a6a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 23 Jun 2025 07:43:39 +0200
Subject: [PATCH 269/572] remove private attribute

---
 application/controllers/api/frontend/v1/stv/Config.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 138bdec67..aed00ef27 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -29,8 +29,6 @@ class Config extends FHCAPI_Controller
 {
 
 
-	private $arr;
-
 	public function __construct()
 	{
 		// TODO(chris): permissions
@@ -164,12 +162,11 @@ class Config extends FHCAPI_Controller
 				'changeStatusToAbsolvent' => $this->permissionlib->isBerechtigt('admin')
 			]
 		];
-		$this->arr = [
+		$result['finalexam'] = [
 			'title' => $this->p->t('stv', 'tab_finalexam'),
 			'component' => './Stv/Studentenverwaltung/Details/Abschlusspruefung.js',
 			'config' => $config['finalexam']
 		];
-		$result['finalexam'] = $this->arr;
 
 		Events::trigger('stv_conf_students', function & () use (&$result) {
 			return $result;

From a2250fc727cf2e17374e1831fd05ee153d7fd90b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 09:01:11 +0200
Subject: [PATCH 270/572] Add meta information for search mode

---
 application/controllers/api/frontend/v1/Searchbar.php | 4 ++++
 public/js/components/searchbar/searchbar.js           | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/application/controllers/api/frontend/v1/Searchbar.php b/application/controllers/api/frontend/v1/Searchbar.php
index d1444cbad..1f51334fc 100644
--- a/application/controllers/api/frontend/v1/Searchbar.php
+++ b/application/controllers/api/frontend/v1/Searchbar.php
@@ -62,6 +62,9 @@ class Searchbar extends FHCAPI_Controller
 		$result = $this->searchbarlib->search($this->input->post(self::SEARCHSTR_PARAM), $this->input->post(self::TYPES_PARAM));
 		if (property_exists($result, 'error'))
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		
+		$this->addMeta('mode', 'simple');
+		
 		$this->terminateWithSuccess($result->data);
 	}
 
@@ -87,6 +90,7 @@ class Searchbar extends FHCAPI_Controller
 
 		$this->addMeta('time', $result->meta['time']);
 		$this->addMeta('searchstring', $result->meta['searchstring']);
+		$this->addMeta('mode', 'advanced');
 		
 		$this->terminateWithSuccess($data);
 	}
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 38e07388d..4db7869c7 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -16,6 +16,7 @@ export default {
             types: this.getSearchTypes(),
         },
         searchresult: [],
+        searchmode: '',
         showresult: false,  
         searching: false,
         error: null,
@@ -270,6 +271,7 @@ export default {
                         }
                     }
                     this.searchresult = res;
+                    this.searchmode = response.meta.mode;
                 }
                 this.searching = false;
                 this.retry = 0;

From bc79fe2dd60326deedd8040e258ae2fa9ce2fff2 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 09:26:09 +0200
Subject: [PATCH 271/572] Prestudent Results

---
 .../components/searchbar/result/prestudent.js | 19 +++++++++++++++++--
 public/js/components/searchbar/searchbar.js   |  4 ++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/public/js/components/searchbar/result/prestudent.js b/public/js/components/searchbar/result/prestudent.js
index c33877bf0..ba647e865 100644
--- a/public/js/components/searchbar/result/prestudent.js
+++ b/public/js/components/searchbar/result/prestudent.js
@@ -6,11 +6,26 @@ export default {
 	},
 	emits: [ 'actionexecuted' ],
 	props: {
+		mode: String,
 		res: Object,
 		actions: Object
 	},
 	computed: {
+		title() {
+			if (this.mode == 'simple')
+				return this.res.name;
+			return this.res.name + ' (' + this.res.status + ' ' + this.res.stg_kuerzel + ')';
+		},
+		photo_url() {
+			if (this.mode != 'simple')
+				return this.photo_url;
+			if (this.res.foto)
+				return 'data:image/jpeg;base64,' + this.res.foto;
+			return null;
+		},
 		emails() {
+			if (this.mode == 'simple')
+				return new Set([this.res.email]);
 			return new Set(this.res.email);
 		}
 	},
@@ -19,8 +34,8 @@ export default {
 		class="searchbar-result-prestudent"
 		:res="res"
 		:actions="actions"
-		:title="res.name + ' (' + res.status + ' ' + res.stg_kuerzel + ')'"
-		:image="res.photo_url"
+		:title="title"
+		:image="photo_url"
 		image-fallback="fas fa-user fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 4db7869c7..7e826399b 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -3,7 +3,7 @@ import raum from "./raum.js";
 import employee from "./employee.js";
 import organisationunit from "./organisationunit.js";
 import student from "./student.js";
-import prestudent from "./prestudent.js";
+import prestudent from "./result/prestudent.js";
 
 export default {
     props: [ "searchoptions", "searchfunction" ],
@@ -57,7 +57,7 @@ export default {
                   <template v-else="" v-for="res in searchresult">
                     <person v-if="res.type === 'person'" :res="res" :actions="this.searchoptions.actions.person" @actionexecuted="this.hideresult"></person>
                     <student v-else-if="res.type === 'student' || res.type === 'studentStv'" :res="res" :actions="this.searchoptions.actions.student" @actionexecuted="this.hideresult"></student>
-                    <prestudent v-else-if="res.type === 'prestudent'" :res="res" :actions="this.searchoptions.actions.prestudent" @actionexecuted="this.hideresult"></prestudent>
+                    <prestudent v-else-if="res.type === 'prestudent'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.prestudent" @actionexecuted="this.hideresult"></prestudent>
                     <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
                     <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
                     <raum v-else-if="res.type === 'raum'" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>

From 0b00e393daa051db398efeafcfe984028ae6641e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 09:51:52 +0200
Subject: [PATCH 272/572] Student Results

---
 public/js/components/searchbar/result/student.js | 12 +++++++++++-
 public/js/components/searchbar/searchbar.js      |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/public/js/components/searchbar/result/student.js b/public/js/components/searchbar/result/student.js
index e85716a94..13354b818 100644
--- a/public/js/components/searchbar/result/student.js
+++ b/public/js/components/searchbar/result/student.js
@@ -6,11 +6,21 @@ export default {
 	},
 	emits: [ 'actionexecuted' ],
 	props: {
+		mode: String,
 		res: Object,
 		actions: Object
 	},
 	computed: {
+		photo_url() {
+			if (this.mode != 'simple')
+				return this.photo_url;
+			if (this.res.foto)
+				return 'data:image/jpeg;base64,' + this.res.foto;
+			return null;
+		},
 		emails() {
+			if (this.mode == 'simple')
+				return new Set([this.res.email]);
 			return new Set(this.res.email);
 		}
 	},
@@ -20,7 +30,7 @@ export default {
 		:res="res"
 		:actions="actions"
 		:title="res.name"
-		:image="res.photo_url"
+		:image="photo_url"
 		image-fallback="fas fa-user fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 7e826399b..8359b932d 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -2,7 +2,7 @@ import person from "./person.js";
 import raum from "./raum.js";
 import employee from "./employee.js";
 import organisationunit from "./organisationunit.js";
-import student from "./student.js";
+import student from "./result/student.js";
 import prestudent from "./result/prestudent.js";
 
 export default {
@@ -56,7 +56,7 @@ export default {
                   <div v-else-if="searchresult.length < 1">Es wurden keine Ergebnisse gefunden.</div>
                   <template v-else="" v-for="res in searchresult">
                     <person v-if="res.type === 'person'" :res="res" :actions="this.searchoptions.actions.person" @actionexecuted="this.hideresult"></person>
-                    <student v-else-if="res.type === 'student' || res.type === 'studentStv'" :res="res" :actions="this.searchoptions.actions.student" @actionexecuted="this.hideresult"></student>
+                    <student v-else-if="res.type === 'student' || res.type === 'studentStv'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.student" @actionexecuted="this.hideresult"></student>
                     <prestudent v-else-if="res.type === 'prestudent'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.prestudent" @actionexecuted="this.hideresult"></prestudent>
                     <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
                     <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>

From 0202bb261f9d7f674366af92fbd502a55db1cc65 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 10:45:28 +0200
Subject: [PATCH 273/572] MergedStudent Results

---
 public/js/components/searchbar/result/mergedstudent.js | 3 +++
 public/js/components/searchbar/searchbar.js            | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/public/js/components/searchbar/result/mergedstudent.js b/public/js/components/searchbar/result/mergedstudent.js
index aa5d7739f..e8ed89b65 100644
--- a/public/js/components/searchbar/result/mergedstudent.js
+++ b/public/js/components/searchbar/result/mergedstudent.js
@@ -8,6 +8,7 @@ export default {
 	},
 	emits: [ 'actionexecuted' ],
 	props: {
+		mode: String,
 		res: Object,
 		actions: Object
 	},
@@ -20,6 +21,7 @@ export default {
 	template: `
 	<result-prestudent
 		v-if="prestudent"
+		:mode="mode"
 		:res="prestudent"
 		:actions="actions"
 		@actionexecuted="$emit('actionexecuted')"
@@ -27,6 +29,7 @@ export default {
 	></result-prestudent>
 	<result-student
 		v-else
+		:mode="mode"
 		:res="res.list[0]"
 		:actions="actions"
 		@actionexecuted="$emit('actionexecuted')"
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 8359b932d..49cbdb2ff 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -4,6 +4,7 @@ import employee from "./employee.js";
 import organisationunit from "./organisationunit.js";
 import student from "./result/student.js";
 import prestudent from "./result/prestudent.js";
+import mergedStudent from "./result/mergedstudent.js";
 
 export default {
     props: [ "searchoptions", "searchfunction" ],
@@ -30,7 +31,8 @@ export default {
       employee: employee,
       organisationunit: organisationunit,
       student: student,
-      prestudent: prestudent
+      prestudent: prestudent,
+      mergedStudent
     },
     template: /*html*/`
           <form ref="searchform" class="d-flex me-3" :class="searchoptions.cssclass" action="javascript:void(0);"
@@ -58,6 +60,7 @@ export default {
                     <person v-if="res.type === 'person'" :res="res" :actions="this.searchoptions.actions.person" @actionexecuted="this.hideresult"></person>
                     <student v-else-if="res.type === 'student' || res.type === 'studentStv'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.student" @actionexecuted="this.hideresult"></student>
                     <prestudent v-else-if="res.type === 'prestudent'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.prestudent" @actionexecuted="this.hideresult"></prestudent>
+                    <merged-student v-else-if="res.type === 'mergedstudent'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.mergedstudent" @actionexecuted="this.hideresult"></merged-student>
                     <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
                     <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
                     <raum v-else-if="res.type === 'raum'" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
@@ -238,12 +241,12 @@ export default {
 
                         switch (this.searchoptions.mergeResults) {
                         case 'student':
-                            mergeTypes = ['student', 'prestudent'];
+                            mergeTypes = ['student', 'studentStv', 'prestudent'];
                             mergedType += this.searchoptions.mergeResults;
                             mergeKey = 'uid';
                             break;
                         case 'person':
-                            mergeTypes = ['person', 'employee', 'unassigned_employee', 'mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'student', 'prestudent'];
+                            mergeTypes = ['person', 'employee', 'unassigned_employee', 'mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'student', 'studentStv', 'prestudent'];
                             mergedType += this.searchoptions.mergeResults;
                             mergeKey = 'person_id';
                             break;

From 819ef7bc3220f361869d1cd9cf46e986bcfd6f71 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 10:48:50 +0200
Subject: [PATCH 274/572] Bugfix this => this.res

---
 public/js/components/searchbar/result/prestudent.js | 2 +-
 public/js/components/searchbar/result/student.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/searchbar/result/prestudent.js b/public/js/components/searchbar/result/prestudent.js
index ba647e865..7852bbe57 100644
--- a/public/js/components/searchbar/result/prestudent.js
+++ b/public/js/components/searchbar/result/prestudent.js
@@ -18,7 +18,7 @@ export default {
 		},
 		photo_url() {
 			if (this.mode != 'simple')
-				return this.photo_url;
+				return this.res.photo_url;
 			if (this.res.foto)
 				return 'data:image/jpeg;base64,' + this.res.foto;
 			return null;
diff --git a/public/js/components/searchbar/result/student.js b/public/js/components/searchbar/result/student.js
index 13354b818..1d6eb2a61 100644
--- a/public/js/components/searchbar/result/student.js
+++ b/public/js/components/searchbar/result/student.js
@@ -13,7 +13,7 @@ export default {
 	computed: {
 		photo_url() {
 			if (this.mode != 'simple')
-				return this.photo_url;
+				return this.res.photo_url;
 			if (this.res.foto)
 				return 'data:image/jpeg;base64,' + this.res.foto;
 			return null;

From 04d46b39ed83699c4ab5803431f7963e1b87d212 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 11:16:20 +0200
Subject: [PATCH 275/572] MergedPerson Results

---
 .../searchbar/result/mergedperson.js          | 21 ++++++++++++++++---
 public/js/components/searchbar/searchbar.js   |  5 ++++-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
index be9d1e735..fb9684303 100644
--- a/public/js/components/searchbar/result/mergedperson.js
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -8,6 +8,7 @@ export default {
 	},
 	emits: [ 'actionexecuted' ],
 	props: {
+		mode: String,
 		res: Object,
 		actions: Object
 	},
@@ -24,14 +25,23 @@ export default {
 			 // Those properties should be the same in all entries
 			const { person_id, name } = this.res.list[0];
 			 // Get first photo (prefer student photo if available)
-			const photo_url = ((this.students ? this.students.find(el => el.photo_url) : null) || this.employee)?.photo_url;
+			let photo_url;
+			if (this.mode == 'simple') {
+				let foto = (this.students ? this.students.find(el => el.foto) : null)?.foto;
+				if (foto)
+					foto = 'data:image/jpeg;base64,' + foto;
+				photo_url = foto || this.employee?.photo_url;
+			} else
+				photo_url = ((this.students ? this.students.find(el => el.photo_url) : null) || this.employee)?.photo_url;
 
 			return { person_id, name, photo_url, email };
 		},
 		employee() {
 			return this.res.list.find(item => [
 				'employee',
-				'unassigned_employee'
+				'unassigned_employee',
+				'mitarbeiter',
+				'mitarbeiter_ohne_zuordnung'
 			].includes(item.type)) || null;
 		},
 		students() {
@@ -132,7 +142,12 @@ export default {
 								:action="actions.defaultactionstudent || actions.defaultaction"
 								@actionexecuted="$emit('actionexecuted')"
 								>
-								{{ student.status }} ({{ student.stg_kuerzel }})
+								<template v-if="mode == 'simple'">
+									{{ student.studiengang_kz }}
+								</template>
+								<template v-else>
+									{{ student.status }} ({{ student.stg_kuerzel }})
+								</template>
 							</template-action>
 						</div>
 					</div>
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 49cbdb2ff..fe4b850f1 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -5,6 +5,7 @@ import organisationunit from "./organisationunit.js";
 import student from "./result/student.js";
 import prestudent from "./result/prestudent.js";
 import mergedStudent from "./result/mergedstudent.js";
+import mergedPerson from "./result/mergedperson.js";
 
 export default {
     props: [ "searchoptions", "searchfunction" ],
@@ -32,7 +33,8 @@ export default {
       organisationunit: organisationunit,
       student: student,
       prestudent: prestudent,
-      mergedStudent
+      mergedStudent,
+      mergedPerson
     },
     template: /*html*/`
           <form ref="searchform" class="d-flex me-3" :class="searchoptions.cssclass" action="javascript:void(0);"
@@ -61,6 +63,7 @@ export default {
                     <student v-else-if="res.type === 'student' || res.type === 'studentStv'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.student" @actionexecuted="this.hideresult"></student>
                     <prestudent v-else-if="res.type === 'prestudent'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.prestudent" @actionexecuted="this.hideresult"></prestudent>
                     <merged-student v-else-if="res.type === 'mergedstudent'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.mergedstudent" @actionexecuted="this.hideresult"></merged-student>
+                    <merged-person v-else-if="res.type === 'mergedperson'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.mergedperson" @actionexecuted="this.hideresult"></merged-person>
                     <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
                     <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
                     <raum v-else-if="res.type === 'raum'" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>

From b46da92f255368eb8a2936c3e235c576194c4ebb Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 11:16:57 +0200
Subject: [PATCH 276/572] Employee Results

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

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index fe4b850f1..8945465d3 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -1,6 +1,6 @@
 import person from "./person.js";
 import raum from "./raum.js";
-import employee from "./employee.js";
+import employee from "./result/employee.js";
 import organisationunit from "./organisationunit.js";
 import student from "./result/student.js";
 import prestudent from "./result/prestudent.js";
@@ -64,7 +64,7 @@ export default {
                     <prestudent v-else-if="res.type === 'prestudent'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.prestudent" @actionexecuted="this.hideresult"></prestudent>
                     <merged-student v-else-if="res.type === 'mergedstudent'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.mergedstudent" @actionexecuted="this.hideresult"></merged-student>
                     <merged-person v-else-if="res.type === 'mergedperson'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.mergedperson" @actionexecuted="this.hideresult"></merged-person>
-                    <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
+                    <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung' || res.type === 'employee'  || res.type === 'unassigned_employee'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
                     <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
                     <raum v-else-if="res.type === 'raum'" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
                     <div v-else="">Unbekannter Ergebnistyp: '{{ res.type }}'.</div>

From 1d9936757ce076976b67e81496642b6f8dcaafae Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 23 Jun 2025 11:37:33 +0200
Subject: [PATCH 277/572] update(LvPlan router) manages the route changes in
 the Calendar component instead of the LvPlan

---
 public/js/components/Calendar/Calendar.js | 24 ++++++++++++++++++++++-
 public/js/components/Cis/LvPlan/LvPlan.js | 20 -------------------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 0f53d5c04..92b1cf999 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -202,6 +202,28 @@ export default {
 		},
 	},
 	methods: {
+		handleChangeOffset(offset){
+			
+			let date = new Date(
+				this.focusDate.y,
+				this.focusDate.m,
+				this.focusDate.d
+			);
+			
+			date = date.getFullYear() + "-" +
+				String(date.getMonth() + 1).padStart(2, "0") + "-" +
+				String(date.getDate()).padStart(2, "0");
+
+			
+			this.$router.push({
+				name: "LvPlan",
+				params: {
+					mode: this.mode[0].toUpperCase() + this.mode.slice(1),
+					focus_date: date,
+					lv_id: this.$route.params.lv_id || null
+				}
+			})
+		},
 		setMode(mode) {
 			this.mode = mode
 		},
@@ -253,7 +275,7 @@ export default {
 	template: /*html*/`
 	<div ref="container" class="fhc-calendar card h-100" :class="sizeClass">
 		<component :is="'calendar-' + mode" @updateMode="mode = $event" @change:range="$emit('change:range',$event)"
-		 @input="handleInput" @change:offset="$emit('change:offset', $event)">
+		 @input="handleInput" @change:offset="handleChangeOffset">
 			<template #calendarDownloads>
 				<slot name="calendarDownloads" ></slot>
 			</template>
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index a0b93062a..08c022182 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -178,26 +178,6 @@ const LvPlan = {
 			
 			this.currentDay = day;
 		},
-		handleOffset: function(offset)  {
-			this.currentDay = new Date(
-				this.currentDay.getFullYear() + offset.y, 
-				this.currentDay.getMonth() + offset.m,
-				this.currentDay.getDate() + offset.d
-			)
-
-			const date = this.currentDay.getFullYear() + "-" +
-				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
-				String(this.currentDay.getDate()).padStart(2, "0");
-
-			this.$router.push({
-				name: "LvPlan",
-				params: {
-					mode: this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1),
-					focus_date: date,
-					lv_id: this.propsViewData?.lv_id || null
-				}
-			})
-		},
 		handleChangeMode(mode) {
 			let m = mode[0].toUpperCase() + mode.slice(1)
 			if(m === this.calendarMode) return; // TODO(chris): check for date and lv_id too!

From 30e4459f672ebe270423f71f4f25e1c1810ba7a3 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 23 Jun 2025 11:44:08 +0200
Subject: [PATCH 278/572] fix(LvPlan renderer) uses Vue.nextTick to acknowledge
 the suspense state of the dynamically loaded component

---
 public/js/components/Cis/LvPlan/LvPlan.js          | 14 ++++++++------
 .../Cis/Renderer/Lehreinheit/modalContent.js       |  1 -
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 08c022182..2ada75802 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -199,12 +199,14 @@ const LvPlan = {
 		},
 		showModal: function(event){
 			this.currentlySelectedEvent = event;
-			if(this.isModalContentResolved && this.isModalTitleResolved){
-				if(this.$refs.lvmodal) this.$refs.lvmodal.show();
-			} 
-			else{
-				this.isShowModal = true;
-			} 
+			Vue.nextTick(()=>{
+				if(this.isModalContentResolved && this.isModalTitleResolved){
+					if(this.$refs.lvmodal) this.$refs.lvmodal.show();
+				} 
+				else{
+					this.isShowModal = true;
+				}
+			})
 		},
 		updateRange: function ({start,end, mounted}) {
 			let checkDate = (date) => {
diff --git a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
index d6dce547c..c03a1cd64 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
@@ -120,7 +120,6 @@ export default {
 				</tbody>
 		</table>
 		
-		<h3>{{$p.t('lehre','lehrveranstaltungsmenue')}}</h3>
 		<lv-menu :containerStyles="['p-0']" :rowStyles="['m-0']" v-if="lvMenu" :menu="lvMenu" />
 	</div>`,
 }
\ No newline at end of file

From 4d61cdeb9146a4f7b9cf73021242a5ccd965b630 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 23 Jun 2025 11:54:42 +0200
Subject: [PATCH 279/572] fix(LvPlan route): changes the route on change:range
 instead of change:offset because the focusdate is updates in change:range

---
 public/js/components/Calendar/Calendar.js | 10 ++++++----
 public/js/components/Cis/LvPlan/LvPlan.js |  5 +----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 92b1cf999..ab7dac2b3 100644
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -202,7 +202,7 @@ export default {
 		},
 	},
 	methods: {
-		handleChangeOffset(offset){
+		handleRangeOffset(event){
 			
 			let date = new Date(
 				this.focusDate.y,
@@ -222,7 +222,9 @@ export default {
 					focus_date: date,
 					lv_id: this.$route.params.lv_id || null
 				}
-			})
+			});
+
+			this.$emit('change:range',event);
 		},
 		setMode(mode) {
 			this.mode = mode
@@ -274,8 +276,8 @@ export default {
 	},
 	template: /*html*/`
 	<div ref="container" class="fhc-calendar card h-100" :class="sizeClass">
-		<component :is="'calendar-' + mode" @updateMode="mode = $event" @change:range="$emit('change:range',$event)"
-		 @input="handleInput" @change:offset="handleChangeOffset">
+		<component :is="'calendar-' + mode" @updateMode="mode = $event" @change:range="handleRangeOffset"
+		 @input="handleInput" >
 			<template #calendarDownloads>
 				<slot name="calendarDownloads" ></slot>
 			</template>
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 2ada75802..d9b82bbcc 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -221,10 +221,7 @@ const LvPlan = {
 				// reset the events before querying the new events to activate the loading spinner
 				this.events = null;
 				this.eventCalendarDate = new CalendarDate(end);
-				Vue.nextTick(() => {
-					this.loadEvents();
-					
-				});
+				this.loadEvents();
 			}
 		},
 		calendarDateToString: function (calendarDate) {

From b96a7ab180f10dc20605eb4437fb2f779bba7771 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 13:28:56 +0200
Subject: [PATCH 280/572] Person Results

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

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 8945465d3..49642620c 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -1,4 +1,4 @@
-import person from "./person.js";
+import person from "./result/person.js";
 import raum from "./raum.js";
 import employee from "./result/employee.js";
 import organisationunit from "./organisationunit.js";

From cf62563fa38b44bb046f6eb56693f2ac9e8d9712 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 13:48:52 +0200
Subject: [PATCH 281/572] Room Results

---
 public/js/components/searchbar/result/room.js | 9 +++++++--
 public/js/components/searchbar/searchbar.js   | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/public/js/components/searchbar/result/room.js b/public/js/components/searchbar/result/room.js
index 46fce1c71..8a7d8c124 100644
--- a/public/js/components/searchbar/result/room.js
+++ b/public/js/components/searchbar/result/room.js
@@ -6,6 +6,7 @@ export default {
 	},
 	emits: [ 'actionexecuted' ],
 	props: {
+		mode: String,
 		res: Object,
 		actions: Object
 	},
@@ -46,7 +47,10 @@ export default {
 
 			<div class="searchbar_tablerow">
 				<div class="searchbar_tablecell">{{ $p.t('search/result_workplaces') }}</div>
-				<div class="searchbar_tablecell">
+				<div v-if="mode == 'simple'" class="searchbar_tablecell">
+					{{ res.sitzplaetze }}
+				</div>
+				<div v-else class="searchbar_tablecell">
 					<template v-if="res.max_person !== null && res.workplaces !== null">
 						{{ $p.t('search/result_workplaces_pc', res) }}
 					</template>
@@ -66,7 +70,8 @@ export default {
 			<div class="searchbar_tablerow">
 				<div class="searchbar_tablecell">{{ $p.t('search/result_equipment') }}</div>
 				<div class="searchbar_tablecell">
-					<div class="no-margin-paragraphs" v-html="equipment"></div>
+					<div v-if="mode == 'simple'" class="no-margin-paragraphs" v-html="res.austattung.replace('<br />','')"></div>
+					<div v-else class="no-margin-paragraphs" v-html="equipment"></div>
 				</div>
 			</div>
 		</div>
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 49642620c..295b97984 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -1,5 +1,5 @@
 import person from "./result/person.js";
-import raum from "./raum.js";
+import raum from "./result/room.js";
 import employee from "./result/employee.js";
 import organisationunit from "./organisationunit.js";
 import student from "./result/student.js";
@@ -66,7 +66,7 @@ export default {
                     <merged-person v-else-if="res.type === 'mergedperson'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.mergedperson" @actionexecuted="this.hideresult"></merged-person>
                     <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung' || res.type === 'employee'  || res.type === 'unassigned_employee'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
                     <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
-                    <raum v-else-if="res.type === 'raum'" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
+                    <raum v-else-if="res.type === 'raum' || res.type === 'room'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
                     <div v-else="">Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
                   </template>
                 </div>

From d00530d6d67409ede2cc25c6fc2404fa73806919 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 13:54:36 +0200
Subject: [PATCH 282/572] Organisationsunit Results

---
 public/js/components/searchbar/result/organisationunit.js | 3 ++-
 public/js/components/searchbar/searchbar.js               | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/js/components/searchbar/result/organisationunit.js b/public/js/components/searchbar/result/organisationunit.js
index fe5d6512a..1d9c03b08 100644
--- a/public/js/components/searchbar/result/organisationunit.js
+++ b/public/js/components/searchbar/result/organisationunit.js
@@ -29,9 +29,10 @@ export default {
 			<div class="searchbar_tablerow">
 				<div class="searchbar_tablecell">{{ $p.t('search/result_group_emails') }}</div>
 				<div class="searchbar_tablecell">
-					<a :href="'mailto:' + res.mailgroup">
+					<a v-if="res.mailgroup" :href="'mailto:' + res.mailgroup">
 						{{ res.mailgroup }}
 					</a>
+					<template v-else>-</template>
 				</div>
 			</div>
 
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 295b97984..01d4f659e 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -1,7 +1,7 @@
 import person from "./result/person.js";
 import raum from "./result/room.js";
 import employee from "./result/employee.js";
-import organisationunit from "./organisationunit.js";
+import organisationunit from "./result/organisationunit.js";
 import student from "./result/student.js";
 import prestudent from "./result/prestudent.js";
 import mergedStudent from "./result/mergedstudent.js";

From ad7e473cbd268c6bd771a1e65e98a82799cbc694 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 14:14:51 +0200
Subject: [PATCH 283/572] Dms Results

---
 public/js/components/searchbar/searchbar.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 01d4f659e..5ef5f8451 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -4,6 +4,7 @@ import employee from "./result/employee.js";
 import organisationunit from "./result/organisationunit.js";
 import student from "./result/student.js";
 import prestudent from "./result/prestudent.js";
+import dms from "./result/dms.js";
 import mergedStudent from "./result/mergedstudent.js";
 import mergedPerson from "./result/mergedperson.js";
 
@@ -33,6 +34,7 @@ export default {
       organisationunit: organisationunit,
       student: student,
       prestudent: prestudent,
+      dms,
       mergedStudent,
       mergedPerson
     },
@@ -67,6 +69,7 @@ export default {
                     <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung' || res.type === 'employee'  || res.type === 'unassigned_employee'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
                     <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
                     <raum v-else-if="res.type === 'raum' || res.type === 'room'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
+                    <dms v-else-if="res.type === 'dms'" :res="res" :actions="searchoptions.actions.dms" @actionexecuted="hideresult"></dms>
                     <div v-else="">Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
                   </template>
                 </div>

From 5bf8f647cba3129ea7c5dbb6409e2a96dc655899 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 14:21:06 +0200
Subject: [PATCH 284/572] Cms Results

---
 public/js/components/searchbar/searchbar.js | 24 +++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 5ef5f8451..3e77d2c9e 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -5,11 +5,20 @@ import organisationunit from "./result/organisationunit.js";
 import student from "./result/student.js";
 import prestudent from "./result/prestudent.js";
 import dms from "./result/dms.js";
+import cms from "./result/cms.js";
 import mergedStudent from "./result/mergedstudent.js";
 import mergedPerson from "./result/mergedperson.js";
 
+import ApiLanguage from "../../api/factory/language.js"
+
 export default {
     props: [ "searchoptions", "searchfunction" ],
+    provide() {
+        return {
+            languages: Vue.computed(() => this.languages),
+            query: Vue.computed(() => this.lastQuery)
+        };
+    },
     data: function() {
       return {
         searchtimer: null,
@@ -25,6 +34,8 @@ export default {
         error: null,
             abortController: null,
         settingsDropdown:null,
+            languages: null,
+            lastQuery: ''
       };
     },
     components: {
@@ -35,6 +46,7 @@ export default {
       student: student,
       prestudent: prestudent,
       dms,
+      cms,
       mergedStudent,
       mergedPerson
     },
@@ -70,6 +82,7 @@ export default {
                     <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
                     <raum v-else-if="res.type === 'raum' || res.type === 'room'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
                     <dms v-else-if="res.type === 'dms'" :res="res" :actions="searchoptions.actions.dms" @actionexecuted="hideresult"></dms>
+                    <cms v-else-if="res.type === 'cms'" :res="res" :actions="searchoptions.actions.cms" @actionexecuted="hideresult"></cms>
                     <div v-else="">Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
                   </template>
                 </div>
@@ -110,6 +123,17 @@ export default {
 		},
 		
 	},
+    created() {
+        this.$api
+            .call(ApiLanguage.getAll())
+            .then(result => {
+                this.languages = result.data.reduce((a, c) => {
+                    a[c.sprache] = c;
+                    return a;
+                }, {});
+            })
+            .catch(this.$fhcAlert.handleSystemError);
+    },
     beforeMount: function() {
 		this.$watch('searchsettings.types', (newValue, oldValue) => {
 			if (Array.isArray(newValue) && newValue.length === 0){

From 5645f6a41fef2756970b5c381a259521d82a1408 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 14:24:11 +0200
Subject: [PATCH 285/572] Language API Endpoint

---
 public/js/api/factory/language.js | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 public/js/api/factory/language.js

diff --git a/public/js/api/factory/language.js b/public/js/api/factory/language.js
new file mode 100644
index 000000000..8175ccc0e
--- /dev/null
+++ b/public/js/api/factory/language.js
@@ -0,0 +1,25 @@
+/**
+ * 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 {
+	getAll() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/language/get'
+		};
+	}
+};
\ No newline at end of file

From 2ec20423e9f0fe5302e9b590810b5c0e17fe08a8 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 23 Jun 2025 14:24:20 +0200
Subject: [PATCH 286/572] Stv: Search-Origin

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

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 9146bc144..5f0569973 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -72,6 +72,7 @@ export default {
 		return {
 			selected: [],
 			searchbaroptions: {
+				origin: 'stv',
 				cssclass: "position-relative",
 				calcheightonly: true,
 				types: [

From ce8f0843cc3bfd97a6af8268c8abed41ae00e6e0 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 23 Jun 2025 17:31:43 +0200
Subject: [PATCH 287/572] calc active tab from router param when using primevue
 tabsview

---
 public/js/components/Tabs.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index 1467f96f9..5c2a5a3d9 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -50,6 +50,15 @@ export default {
 			set(v) {
 				this.$emit('update:modelValue', v);
 			}
+		},
+		calcActiveIndex: function() {
+			let keys = Object.keys(this.tabs);
+			let index = keys.indexOf(this.default);
+			if( index === -1 ) {
+				return 0;
+			} else {
+				return index;
+			}
 		}
 	},
 	watch: {
@@ -120,6 +129,7 @@ export default {
 	<tabview 
 		:scrollable="true" 
 		:lazy="true"
+		:activeIndex="calcActiveIndex"
 		@tab-click="handleTabClick"
 	>
 		<tabpanel 

From 9426ed9e59160e1579042e96d86993a5bfa775ea Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 23 Jun 2025 17:36:37 +0200
Subject: [PATCH 288/572] disable headerSort for actions column

---
 public/js/components/Funktionen/Funktionen.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/js/components/Funktionen/Funktionen.js b/public/js/components/Funktionen/Funktionen.js
index 4fdf5b6e4..4fc7706de 100644
--- a/public/js/components/Funktionen/Funktionen.js
+++ b/public/js/components/Funktionen/Funktionen.js
@@ -94,6 +94,7 @@ export default {
 					{
 						//title: 'Aktionen', field: 'actions',
 						minWidth: 150, // Ensures Action-buttons will be always fully displayed
+						headerSort:false,
 						formatter: (cell, formatterParams, onRendered) => {
 							let container = document.createElement('div');
 							container.className = "d-flex gap-2";

From d76e3feb2a37deb17ef6cca087dd7e5b823d4c8a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 24 Jun 2025 09:32:19 +0200
Subject: [PATCH 289/572] update(LvPlan Month Event tooltip): adds a tooltip to
 the month lv plan events that contains more detailed information about the lv
 event

---
 .../Cis/Renderer/Lehreinheit/calendarEvent.js | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
index b5f9ae617..499a071a8 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
@@ -9,19 +9,41 @@ export default {
 
 		},
 	},
+	computed:{
+		calendarEventTooltip: function(){
+			let lektorenEmpty = true;
+			let tooltipString = `${this.$p.t('global','uhrzeit')}: ${this.convertTime(this.event.beginn.split(":"))} / ${this.convertTime(this.event.ende.split(":")) }`;
+			
+			tooltipString += `\n${this.$p.t('profilUpdate', 'topic')}: ${this.event.topic}`;
+			
+			if(Array.isArray(this.event.lektor) && this.event.lektor.length > 0){
+				lektorenEmpty = false;
+				tooltipString += `\n${this.$p.t('lehre','lektor')}: `;
+				this.event.lektor.forEach(lektor => {
+					tooltipString += `${lektor.kurzbz}\n`;
+				})
+			}
+			if(lektorenEmpty){
+				tooltipString += "\n";	
+			}
+			tooltipString += `${this.$p.t('person','ort')}: ${this.event.ort_kurzbz}`;
+			
+			return tooltipString;
+		},
+	},
 	props:{
 		event: {
 			type:Object,
 			required:true,
 		},
 	},
-	template: `
+	template: /*html*/`
 	<div class="lehreinheitEventContent h-100 w-100 p-1" >
 		<div id="lehreinheitEventHeader" class="h-100 " v-if="!event.allDayEvent && event?.beginn && event?.ende" >
 			<span class="small">{{convertTime(event.beginn.split(":"))}}</span>
 			<span class="small">{{convertTime(event.ende.split(":"))}}</span>
 		</div>
-		<div id="lehreinheitEventText">
+		<div id="lehreinheitEventText" v-tooltip="calendarEventTooltip">
 			<span id="lehreinheitTopic">{{event.topic}}</span>
 			<span id="lehreinheitLektoren" v-for="lektor in event.lektor">{{lektor.kurzbz}}</span>
 			<span id="lehreinheitOrt">{{event.ort_kurzbz}}</span>

From b217118df41bd56fff3a0409cc8056378cd324c3 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 24 Jun 2025 10:00:35 +0200
Subject: [PATCH 290/572] Cleanup & Phrases

---
 public/js/components/searchbar/searchbar.js | 78 ++++++++++++++-------
 system/phrasesupdate.php                    | 30 ++++++--
 2 files changed, 78 insertions(+), 30 deletions(-)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 3e77d2c9e..5684623db 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -51,39 +51,63 @@ export default {
       mergedPerson
     },
     template: /*html*/`
-          <form ref="searchform" class="d-flex me-3" :class="searchoptions.cssclass" action="javascript:void(0);"
-		 	 @focusin="this.searchfocusin" @focusout="this.searchfocusout">
+        <form
+            ref="searchform"
+            class="d-flex me-3"
+            :class="searchoptions.cssclass"
+            action="javascript:void(0);"
+		 	@focusin="searchfocusin"
+            @focusout="searchfocusout"
+        >
 			<div ref="searchbox" class="h-100 input-group me-2">
 				<span class="input-group-text">
 					<i class="fa-solid fa-magnifying-glass"></i>
 				</span>
-                <input @keyup="this.search" @focus="this.showsearchresult"
-                    v-model="this.searchsettings.searchstr" class="form-control"
-                    type="search" :placeholder="'Search: '+ search_types_string" aria-label="Search">
-                <span data-bs-toggle="collapse" data-bs-target="#searchSettings" aria-expanded="false" aria-controls="searchSettings" ref="settingsbutton"  class="input-group-text" type="button"><i class="fas fa-cog"></i></span>
+                <input
+                    @keyup="search"
+                    @focus="showsearchresult"
+                    v-model="searchsettings.searchstr"
+                    class="form-control"
+                    type="search"
+                    :placeholder="$p.t('search/input_search_label', {types:search_types_string})"
+                    :aria-label="$p.t('search/input_search_label', {types:search_types_string})"
+                >
+                <span
+                    data-bs-toggle="collapse"
+                    data-bs-target="#searchSettings"
+                    aria-expanded="false"
+                    aria-controls="searchSettings"
+                    ref="settingsbutton"
+                    class="input-group-text"
+                    type="button"
+                    :title="$p.t('search/button_filter_label')"
+                    :aria-label="$p.t('search/button_filter_label')"
+                >
+                    <i class="fas fa-cog"></i>
+                </span>
             </div>
 
-            <div v-show="this.showresult"
+            <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="this.searching">
+                  <div v-if="searching">
                     <i class="fas fa-spinner fa-spin fa-2x"></i>
                   </div>
-                  <div v-else-if="this.error !== null">{{ this.error }}</div>
-                  <div v-else-if="searchresult.length < 1">Es wurden keine Ergebnisse gefunden.</div>
+                  <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">
-                    <person v-if="res.type === 'person'" :res="res" :actions="this.searchoptions.actions.person" @actionexecuted="this.hideresult"></person>
-                    <student v-else-if="res.type === 'student' || res.type === 'studentStv'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.student" @actionexecuted="this.hideresult"></student>
-                    <prestudent v-else-if="res.type === 'prestudent'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.prestudent" @actionexecuted="this.hideresult"></prestudent>
-                    <merged-student v-else-if="res.type === 'mergedstudent'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.mergedstudent" @actionexecuted="this.hideresult"></merged-student>
-                    <merged-person v-else-if="res.type === 'mergedperson'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.mergedperson" @actionexecuted="this.hideresult"></merged-person>
-                    <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung' || res.type === 'employee'  || res.type === 'unassigned_employee'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
-                    <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
-                    <raum v-else-if="res.type === 'raum' || res.type === 'room'" :mode="searchmode" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
+                    <person v-if="res.type === 'person'" :res="res" :actions="searchoptions.actions.person" @actionexecuted="hideresult"></person>
+                    <student v-else-if="res.type === 'student' || res.type === 'studentStv'" :mode="searchmode" :res="res" :actions="searchoptions.actions.student" @actionexecuted="hideresult"></student>
+                    <prestudent v-else-if="res.type === 'prestudent'" :mode="searchmode" :res="res" :actions="searchoptions.actions.prestudent" @actionexecuted="hideresult"></prestudent>
+                    <merged-student v-else-if="res.type === 'mergedstudent'" :mode="searchmode" :res="res" :actions="searchoptions.actions.mergedstudent" @actionexecuted="hideresult"></merged-student>
+                    <merged-person v-else-if="res.type === 'mergedperson'" :mode="searchmode" :res="res" :actions="searchoptions.actions.mergedperson" @actionexecuted="hideresult"></merged-person>
+                    <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung' || res.type === 'employee'  || res.type === 'unassigned_employee'" :res="res" :actions="searchoptions.actions.employee" @actionexecuted="hideresult"></employee>
+                    <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="searchoptions.actions.organisationunit" @actionexecuted="hideresult"></organisationunit>
+                    <raum v-else-if="res.type === 'raum' || res.type === 'room'" :mode="searchmode" :res="res" :actions="searchoptions.actions.raum" @actionexecuted="hideresult"></raum>
                     <dms v-else-if="res.type === 'dms'" :res="res" :actions="searchoptions.actions.dms" @actionexecuted="hideresult"></dms>
                     <cms v-else-if="res.type === 'cms'" :res="res" :actions="searchoptions.actions.cms" @actionexecuted="hideresult"></cms>
-                    <div v-else="">Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
+                    <div v-else class="searchbar-result text-danger fw-bold">{{ $p.t('search/error_unknown_type', res) }}</div>
                   </template>
                 </div>
               </div>
@@ -93,12 +117,12 @@ export default {
 				@[\`shown.bs.collapse\`]="handleShowSettings"
 				@[\`hide.bs.collapse\`]="handleHideSettings"
                 class="top-100 end-0 searchbar_settings text-white collapse" tabindex="-1">
-              <div class="d-flex flex-column m-3" v-if="this.searchoptions.types.length > 0">
-              <span class="fw-light mb-2">Suche filtern nach:</span>  
-              <template v-for="(type, index) in this.searchoptions.types" :key="type">
+              <div class="d-flex flex-column m-3" v-if="searchoptions.types.length > 0">
+              <span class="fw-light mb-2">{{ $p.t('search/applyfilter_label') }}</span>  
+              <template v-for="(type, index) in searchoptions.types" :key="type">
                     <div class="form-check form-switch">
-                        <input class="fhc-switches form-check-input" type="checkbox" role="switch" :id="this.$.uid + 'search_type_' + index" :value="type" v-model="searchsettings.types"  />
-                        <label class="ps-2 form-check-label non-selectable" :for="this.$.uid + 'search_type_' + index">{{ type }}</label>
+                        <input class="fhc-switches form-check-input" type="checkbox" role="switch" :id="$.uid + 'search_type_' + index" :value="type" v-model="searchsettings.types">
+                        <label class="ps-2 form-check-label non-selectable" :for="$.uid + 'search_type_' + index">{{ type }}</label>
                     </div>
                 </template>
               </div>
@@ -231,6 +255,10 @@ export default {
             if( this.searchtimer !== null ) {
                 clearTimeout(this.searchtimer);
             }
+            if (this.abortController) {
+                this.abortController.abort();
+                this.abortController = null;
+            }
             if( this.searchsettings.searchstr.length >= 2 ) {
                 this.calcSearchResultExtent();
                 this.searchtimer = setTimeout(
@@ -247,7 +275,7 @@ export default {
             this.searching = true;
             this.showsearchresult();
             if(this.searchsettings.types.length === 0) {
-                this.error = 'Kein Ergebnistyp ausgewählt. Bitte mindestens einen Ergebnistyp auswählen.';
+                this.error = this.$p.t('search/error_missing_type');
                 this.searching = false;
                 return;
             }
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index be3dd4895..bd674e514 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41885,13 +41885,13 @@ and represent the current state of research on the topic. The prescribed citatio
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Suche...',
+				'text' => 'Suche: {types}',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Search...',
+				'text' => 'Search: {types}',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -41920,18 +41920,18 @@ and represent the current state of research on the topic. The prescribed citatio
 	array(
 		'app' => 'core',
 		'category' => 'search',
-		'phrase' => 'button_applyfilter_label',
+		'phrase' => 'applyfilter_label',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Übernehmen',
+				'text' => 'Suche filtern nach:',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Apply',
+				'text' => 'Filter search for:',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -42437,6 +42437,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'error_missing_type',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Ergebnistyp ausgewählt. Bitte mindestens einen Ergebnistyp auswählen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No result type selected. Please select at least one result type.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'search',

From f7c03b29db3b5132302cd20b9f7052f2552ec001 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 24 Jun 2025 10:35:20 +0200
Subject: [PATCH 291/572] refactor(Studiengang Widget Data): filters only
 active persons of studiengang information

---
 .../models/organisation/Studiengang_model.php | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 3afdb493e..02f972690 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -709,12 +709,18 @@ class Studiengang_model extends DB_Model
 		if (isError($stg_ltg))
 			return $stg_ltg;
 		$stg_ltg = getData($stg_ltg) ?: [];
+		$stg_ltg = array_values(array_filter($stg_ltg, function($stg_leitung){
+			return $stg_leitung->aktiv;
+		}));
 		$addFotoProperty($stg_ltg);
 
 		$gf_ltg = $this->BenutzerfunktionModel->getBenutzerFunktionenDetailed('gLtg', $stg_obj->oe_kurzbz);
 		if (isError($gf_ltg))
 			return $gf_ltg;
 		$gf_ltg = getData($gf_ltg) ?: [];
+		$gf_ltg = array_values(array_filter($gf_ltg, function($gf_leitung){
+			return $gf_leitung->aktiv;
+		}));
 		$addEmailProperty($gf_ltg);
 		$addFotoProperty($gf_ltg);
 
@@ -722,6 +728,9 @@ class Studiengang_model extends DB_Model
 		if (isError($stv_ltg))
 			return $stv_ltg;
 		$stv_ltg = getData($stv_ltg) ?: [];
+		$stv_ltg = array_values(array_filter($stv_ltg, function($stv_leitung){
+			return $stv_leitung->aktiv;
+		}));
 		$addEmailProperty($stv_ltg);
 		$addFotoProperty($stv_ltg);
 
@@ -729,6 +738,9 @@ class Studiengang_model extends DB_Model
 		if (isError($ass))
 			return $ass;
 		$ass = getData($ass) ?: [];
+		$ass = array_values(array_filter($ass, function($assistenz){
+			return $assistenz->aktiv;
+		}));
 		$addEmailProperty($ass);
 		$addFotoProperty($ass);
 
@@ -736,6 +748,9 @@ class Studiengang_model extends DB_Model
 		if (isError($hochschulvertr))
 			return $hochschulvertr;
 		$hochschulvertr = getData($hochschulvertr) ?: [];
+		$hochschulvertr = array_values(array_filter($hochschulvertr, function($hochschul_vertreter){
+			return $hochschul_vertreter->aktiv;
+		}));
 		$addEmailProperty($hochschulvertr);
 
 
@@ -743,6 +758,9 @@ class Studiengang_model extends DB_Model
 		if (isError($stdv))
 			return $stdv;
 		$stdv = getData($stdv) ?: [];
+		$stdv = array_values(array_filter($stdv, function($std_vertreter){
+			return $std_vertreter->aktiv;
+		}));
 		$addEmailProperty($stdv);
 
 
@@ -750,6 +768,9 @@ class Studiengang_model extends DB_Model
 		if (isError($jahrgangsvertr))
 			return $jahrgangsvertr;
 		$jahrgangsvertr = getData($jahrgangsvertr) ?: [];
+		$jahrgangsvertr = array_values(array_filter($jahrgangsvertr, function($jahrgang_vertreter){
+			return $jahrgang_vertreter->aktiv;
+		}));
 		$addEmailProperty($jahrgangsvertr);
 
 

From 8c1c56077e1921c66295ab0ee78a350518f6107c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 24 Jun 2025 11:00:51 +0200
Subject: [PATCH 292/572] CIS: Search-Origin

---
 public/js/apps/Cis.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index b62592ebd..962dec5c1 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -12,6 +12,7 @@ const app = Vue.createApp({
     data: function() {
         return {
             searchbaroptions: {
+            	origin: "cis",
 				cssclass: "",
 				calcheightonly: true,
                 types: [

From 301818be6972428a55ecd585bba857cfbaaa0797 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 24 Jun 2025 11:17:00 +0200
Subject: [PATCH 293/572] Fallback "room" for "raum" searchactions

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

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 5684623db..362a96bb9 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -104,7 +104,7 @@ export default {
                     <merged-person v-else-if="res.type === 'mergedperson'" :mode="searchmode" :res="res" :actions="searchoptions.actions.mergedperson" @actionexecuted="hideresult"></merged-person>
                     <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung' || res.type === 'employee'  || res.type === 'unassigned_employee'" :res="res" :actions="searchoptions.actions.employee" @actionexecuted="hideresult"></employee>
                     <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="searchoptions.actions.organisationunit" @actionexecuted="hideresult"></organisationunit>
-                    <raum v-else-if="res.type === 'raum' || res.type === 'room'" :mode="searchmode" :res="res" :actions="searchoptions.actions.raum" @actionexecuted="hideresult"></raum>
+                    <raum v-else-if="res.type === 'raum' || res.type === 'room'" :mode="searchmode" :res="res" :actions="searchoptions.actions.raum || searchoptions.actions.room" @actionexecuted="hideresult"></raum>
                     <dms v-else-if="res.type === 'dms'" :res="res" :actions="searchoptions.actions.dms" @actionexecuted="hideresult"></dms>
                     <cms v-else-if="res.type === 'cms'" :res="res" :actions="searchoptions.actions.cms" @actionexecuted="hideresult"></cms>
                     <div v-else class="searchbar-result text-danger fw-bold">{{ $p.t('search/error_unknown_type', res) }}</div>

From 7233bc3cdd9d88bb4381f4e55de48b8da1e44621 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 24 Jun 2025 11:23:22 +0200
Subject: [PATCH 294/572] Bugfix missing css variable

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

diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css
index 68a8484ed..c55e13f7e 100644
--- a/public/css/components/searchbar/searchbar.css
+++ b/public/css/components/searchbar/searchbar.css
@@ -142,7 +142,7 @@
 	align-items: center;
 	overflow: hidden;
 	color: rgba(var(--bs-white-rgb),1);
-	background-color: rgba(var(--bs-primary-rgb),var(--bs-bg-opacity));
+	background-color: rgba(var(--bs-primary-rgb), 1);
 }
 .searchbar-square-image.rounded-circle > img,
 .searchbar-square-image.rounded-circle > div {
@@ -162,7 +162,7 @@
 	align-items: center;
 	overflow: hidden;
 	color: rgba(var(--bs-white-rgb),1);
-	background-color: rgba(var(--bs-primary-rgb),var(--bs-bg-opacity));
+	background-color: rgba(var(--bs-primary-rgb), 1);
 	height: calc((100px - .75em) * 1.3);
 }
 .searchbar-rounded-image > img,

From cc40fd43934fb36abf89dd1bf6e617b9c511b780 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 24 Jun 2025 12:15:10 +0200
Subject: [PATCH 295/572] Safetycheck FHCAPI plugin

---
 public/js/plugins/Api.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/js/plugins/Api.js b/public/js/plugins/Api.js
index b087a6235..0c50162eb 100644
--- a/public/js/plugins/Api.js
+++ b/public/js/plugins/Api.js
@@ -42,6 +42,8 @@ export default {
 		function _clean_return_value(response) {
 			const result = response.data;
 			delete response.data;
+			if (!result)
+				return {meta: {response}, data: null};
 			if (!result.meta)
 				result.meta = {response};
 			else

From e99cbc9f3d49f5a2b18f2aff5e257300c7d86c9b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 24 Jun 2025 13:28:32 +0200
Subject: [PATCH 296/572] fix(lvMenu optionen):fixes click event bugs with the
 lv menu and changes the styling for some lvmenu options

---
 public/css/Cis4/Cis.css                 | 21 ++++++++++++++++++++-
 public/js/components/Cis/Mylv/LvMenu.js | 23 ++---------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 57617ec8d..3b382d1b4 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -154,11 +154,30 @@ html {
 	color: var(--fhc-text);
 }
 
+#cis-menu .menu-entry .submenu{
+	background-color: var(--fhc-background-highlight);
+	color: inherit;
+}
+
+#cis-menu .menu-entry:hover .submenu{
+	background-color: var(--fhc-primary-highlight);
+	color: inherit;
+}
+
+#cis-menu .menu-entry:hover .submenu:hover{
+	color: var(--fhc-dark);
+}
+
+#cis-menu [disabled="true"].menu-entry .submenu{
+	opacity: 0.5;
+	background-color: var(--fhc-secondary)
+}
+
 [disabled="true"].menu-entry {
 	pointer-events: none;
 	cursor: default;
 	background-color: var(--fhc-disabled) !important;
-	color: black !important;
+	color: var(--fhc-dark) !important;
 	opacity: 0.75;
 	-webkit-touch-callout: none;
 	/* iOS Safari */
diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index 5f25bff5d..06a63915d 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -31,25 +31,6 @@ export default {
 		c4_target: function (menuItem) {
 			if (menuItem.c4_moodle_links?.length > 0) return null;
 			return menuItem.c4_target ?? null;
-		},
-		selectMenu: function (menuItem, index = null) {
-
-			// early return if link is #
-			if (index != null && menuItem.c4_linkList[index][1] == '#') return;
-
-			switch (menuItem.id) {
-				case "core_menu_mailanstudierende": window.location.href = menuItem.c4_link; break;
-				default:
-					this.selectedMenu = { ...menuItem };
-					this.$emit("update:isMenuSelected", true);
-			}
-
-			if (this.selectedMenu && index != null && menuItem.c4_linkList[index][1] != '#') {
-				this.selectedMenu.c4_link = menuItem.c4_linkList[index][1];
-				this.selectedMenu.name += ' - ' + menuItem.c4_linkList[index][0];
-			}
-
-			
 		},
 		c4_link(menuItem) {
 			if (!menuItem) return null;
@@ -73,8 +54,8 @@ export default {
 					:disabled="c4_disabled(menuItem)" :data-bs-toggle="menuItem.c4_moodle_links?.length?'dropdown':null"
 					class="menu-entry p-2 w-100 text-wrap border border-1 rounded-3 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link h-100">
 						<img :src="menuItem.c4_icon" :alt="menuItem.name" />
-						<p @click="selectMenu(menuItem)" class="w-100 mt-2">{{menuItem.name}}</p>
-						<p v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)" class="mt-1 w-100" :index="index">{{text}}</p>
+						<p class="w-100 mt-2 mb-0">{{menuItem.name}}</p>
+						<a v-for="([text,link],index) in menuItem.c4_linkList" target="_blank" :href="link" class="my-1 w-100 submenu text-decoration-none" :index="index">{{text}}</p>
 					</a>
 					<ul v-if="menuItem.c4_moodle_links?.length" class="dropdown-menu p-0" :aria-labelledby="menuItem.name">
 						<li v-for="item in menuItem.c4_moodle_links"><a class="dropdown-item border-bottom" :href="item.url">{{item.lehrform}}</a></li>

From 7b627484c22b3e4a8432f7dfda80faf91c496475 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 24 Jun 2025 15:01:26 +0200
Subject: [PATCH 297/572] Code Quality

---
 application/config/search.php               | 11 ++++++--
 public/js/components/searchbar/searchbar.js |  4 +--
 system/dbupdate_3.4/40128_search.php        | 31 +++++++++++++++++----
 system/phrasesupdate.php                    |  4 ++-
 4 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/application/config/search.php b/application/config/search.php
index 3a2c27a18..e4876ec8f 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -516,7 +516,10 @@ $config['unassigned_employee']['prepare'] = "unassigned_employee AS (
 	WHERE tbl_benutzerfunktion.bezeichnung IS NULL
 )";
 $config['unassigned_employee']['table'] = "unassigned_employee";
-$config['unassigned_employee']['searchfields']['tel']['join']['on'] = "kontakttyp = 'telefon' AND tbl_kontakt.standort_id = unassigned_employee.standort_id";
+$config['unassigned_employee']['searchfields']['tel']['join']['on'] = "
+	kontakttyp = 'telefon' 
+	AND tbl_kontakt.standort_id = unassigned_employee.standort_id
+";
 
 $config['organisationunit'] = [
 	'alias' => ['ou', 'organisationseinheit', 'oe'],
@@ -722,7 +725,11 @@ $config['cms'] = [
 		'content' => [
 			'alias' => ['inhalt'],
 			'comparison' => "vector",
-			'field' => "(setweight(to_tsvector('simple', COALESCE(titel, '')), 'A') || setweight(to_tsvector('simple', COALESCE(content, '')::text), 'B'))"
+			'field' => "(
+				setweight(to_tsvector('simple', COALESCE(titel, '')), 'A') 
+				|| 
+				setweight(to_tsvector('simple', COALESCE(content, '')::text), 'B')
+			)"
 		],
 		'content_id' => [
 			'alias' => ['id'],
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 362a96bb9..1bfb26032 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -131,7 +131,7 @@ export default {
           </form>
     `,
     watch:{
-		'searchsettings.searchstr': function (newSearchValue, oldSearchValue) {
+		'searchsettings.searchstr': function (newSearchValue) {
 			if(this.searchoptions.origin){
 				sessionStorage.setItem(`${this.searchoptions.origin}_searchstr`,newSearchValue);
 			}
@@ -159,7 +159,7 @@ export default {
             .catch(this.$fhcAlert.handleSystemError);
     },
     beforeMount: function() {
-		this.$watch('searchsettings.types', (newValue, oldValue) => {
+		this.$watch('searchsettings.types', newValue => {
 			if (Array.isArray(newValue) && newValue.length === 0){
 				this.searchsettings.types = this.allSearchTypes();
 			}
diff --git a/system/dbupdate_3.4/40128_search.php b/system/dbupdate_3.4/40128_search.php
index 8ca0fd246..f207d77dd 100644
--- a/system/dbupdate_3.4/40128_search.php
+++ b/system/dbupdate_3.4/40128_search.php
@@ -37,9 +37,15 @@ if (!$db->db_num_rows(@$db->db_query("SELECT 1 FROM pg_proc WHERE proname = 'tr_
 		$$
 		BEGIN
 			IF TG_TABLE_NAME = 'tbl_organisationseinheit' THEN
-				NEW.fts_bezeichnung := to_tsvector('simple', COALESCE((SELECT bezeichnung FROM public.tbl_organisationseinheittyp WHERE organisationseinheittyp_kurzbz = NEW.organisationseinheittyp_kurzbz), '') || ' ' || COALESCE(NEW.bezeichnung, ''));
+				NEW.fts_bezeichnung := to_tsvector('simple', COALESCE((
+					SELECT bezeichnung 
+					FROM public.tbl_organisationseinheittyp 
+					WHERE organisationseinheittyp_kurzbz = NEW.organisationseinheittyp_kurzbz
+				), '') || ' ' || COALESCE(NEW.bezeichnung, ''));
 			ELSIF TG_TABLE_NAME = 'tbl_organisationseinheittyp' THEN
-				UPDATE public.tbl_organisationseinheit SET fts_bezeichnung = to_tsvector('simple', COALESCE(NEW.bezeichnung, '') || ' ' || COALESCE(bezeichnung, '')) WHERE organisationseinheittyp_kurzbz = NEW.organisationseinheittyp_kurzbz;
+				UPDATE public.tbl_organisationseinheit 
+					SET fts_bezeichnung = to_tsvector('simple', COALESCE(NEW.bezeichnung, '') || ' ' || COALESCE(bezeichnung, '')) 
+					WHERE organisationseinheittyp_kurzbz = NEW.organisationseinheittyp_kurzbz;
 			END IF;
 			RETURN NEW;
 		END;
@@ -53,7 +59,13 @@ if (!$db->db_num_rows(@$db->db_query("SELECT 1 FROM pg_proc WHERE proname = 'tr_
 
 $update_column = false;
 // Add trigger tr_organisationseinheit_update_organisationseinheittyp_kurzbz to public.tbl_organisationseinheit
-if (!$db->db_num_rows(@$db->db_query("SELECT 1 FROM information_schema.triggers WHERE event_object_table ='tbl_organisationseinheit' AND trigger_name = 'tr_organisationseinheit_update_organisationseinheittyp_kurzbz' LIMIT 1;")))
+if (!$db->db_num_rows(@$db->db_query("
+	SELECT 1 
+	FROM information_schema.triggers 
+	WHERE event_object_table ='tbl_organisationseinheit' 
+	AND trigger_name = 'tr_organisationseinheit_update_organisationseinheittyp_kurzbz' 
+	LIMIT 1;
+")))
 {
 	$qry = "CREATE TRIGGER tr_organisationseinheit_update_organisationseinheittyp_kurzbz
 		BEFORE UPDATE OF organisationseinheittyp_kurzbz OR INSERT
@@ -70,7 +82,13 @@ if (!$db->db_num_rows(@$db->db_query("SELECT 1 FROM information_schema.triggers
 }
 
 // Add trigger tr_organisationseinheittyp_update_bezeichnung to public.tbl_organisationseinheittyp
-if (!$db->db_num_rows(@$db->db_query("SELECT 1 FROM information_schema.triggers WHERE event_object_table ='tbl_organisationseinheittyp' AND trigger_name = 'tr_organisationseinheittyp_update_bezeichnung' LIMIT 1;")))
+if (!$db->db_num_rows(@$db->db_query("
+	SELECT 1 
+	FROM information_schema.triggers 
+	WHERE event_object_table ='tbl_organisationseinheittyp' 
+	AND trigger_name = 'tr_organisationseinheittyp_update_bezeichnung' 
+	LIMIT 1;
+")))
 {
 	$qry = "CREATE TRIGGER tr_organisationseinheittyp_update_bezeichnung
 		BEFORE UPDATE OF bezeichnung
@@ -176,7 +194,10 @@ FROM pg_indexes WHERE indexname = 'idx_tbl_contentsprache_fts_titel_content_vect
 	$qry = "
 		CREATE INDEX idx_tbl_contentsprache_fts_titel_content_vector 
 		ON campus.tbl_contentsprache 
-		USING GIN ((setweight(to_tsvector('simple', COALESCE(titel, '')), 'A') || setweight(to_tsvector('simple', COALESCE(content, '')::text), 'B')));
+		USING GIN ((
+			setweight(to_tsvector('simple', COALESCE(titel, '')), 'A') 
+			|| setweight(to_tsvector('simple', COALESCE(content, '')::text), 'B')
+		));
 	";
 
 	if (!$db->db_query($qry))
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index bd674e514..88ef35fff 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -42565,7 +42565,9 @@ and represent the current state of research on the topic. The prescribed citatio
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Such-Konfiguration $config["{type}"]["searchfields"]["{searchfield}"] ist ungültig: Feld "{field}" fehlt oder ist unglültig.',
+				'text' => 'Such-Konfiguration ' .
+					'$config["{type}"]["searchfields"]["{searchfield}"] ' .
+					'ist ungültig: Feld "{field}" fehlt oder ist unglültig.',
 				'description' => '',
 				'insertvon' => 'system'
 			),

From b344b5925af82a6f32d15498ae8e49c83fd67ea8 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 24 Jun 2025 15:19:21 +0200
Subject: [PATCH 298/572] Use Advanced search for CIS & StV

---
 public/js/apps/Cis.js                           | 6 +++---
 public/js/components/Stv/Studentenverwaltung.js | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 962dec5c1..bd538a067 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -16,9 +16,9 @@ const app = Vue.createApp({
 				cssclass: "",
 				calcheightonly: true,
                 types: [
-                    "mitarbeiter",
+                    "employee",
 					"student",
-                    "raum",
+                    "room",
                     "organisationunit"
                 ],
                 actions: {
@@ -112,7 +112,7 @@ const app = Vue.createApp({
     },
     methods: {
         searchfunction: function(searchsettings) {
-        	return this.$api.call(ApiSearchbar.search(searchsettings));
+        	return this.$api.call(ApiSearchbar.searchAdvanced(searchsettings));
         }
     }
 });
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 5f0569973..6cd472ea8 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -76,7 +76,7 @@ export default {
 				cssclass: "position-relative",
 				calcheightonly: true,
 				types: [
-					"studentStv",
+					"student",
 					"prestudent"
 				],
 				actions: {
@@ -139,7 +139,7 @@ export default {
 			this.$refs.stvList.reload();
 		},
 		searchfunction(params, config) {
-			return this.$api.call(ApiSearchbar.search(params), config);
+			return this.$api.call(ApiSearchbar.searchAdvanced(params), config);
 		}
 	},
 	created() {

From e385a06b73f3811a6fe269845278fe30fd07170f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 25 Jun 2025 09:36:47 +0200
Subject: [PATCH 299/572] merge_C4 compatibility

---
 public/js/apps/Cis.js                       | 2 +-
 public/js/components/searchbar/searchbar.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index bd538a067..29784b225 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -12,7 +12,7 @@ const app = Vue.createApp({
     data: function() {
         return {
             searchbaroptions: {
-            	origin: "cis",
+				origin: "cis",
 				cssclass: "",
 				calcheightonly: true,
                 types: [
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 1bfb26032..4acdf0288 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -56,7 +56,7 @@ export default {
             class="d-flex me-3"
             :class="searchoptions.cssclass"
             action="javascript:void(0);"
-		 	@focusin="searchfocusin"
+            @focusin="searchfocusin"
             @focusout="searchfocusout"
         >
 			<div ref="searchbox" class="h-100 input-group me-2">

From c3ec34a038ba531a82266118cedc1f9f070258b1 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 25 Jun 2025 09:39:19 +0200
Subject: [PATCH 300/572] Code Quality to be compatibler with feature-40128

---
 public/js/components/searchbar/searchbar.js | 34 +++++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index aa2213310..197800c29 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -31,16 +31,38 @@ export default {
       prestudent: prestudent
     },
     template: /*html*/`
-          <form ref="searchform" class="d-flex me-3" :class="searchoptions.cssclass" action="javascript:void(0);"
-		 	 @focusin="this.searchfocusin" @focusout="this.searchfocusout">
+        <form
+            ref="searchform"
+            class="d-flex me-3"
+            :class="searchoptions.cssclass"
+            action="javascript:void(0);"
+            @focusin="searchfocusin"
+            @focusout="searchfocusout"
+        >
 			<div ref="searchbox" class="h-100 input-group me-2">
 				<span class="input-group-text">
 					<i class="fa-solid fa-magnifying-glass"></i>
 				</span>
-                <input @keyup="this.search" @focus="this.showsearchresult"
-                    v-model="this.searchsettings.searchstr" class="form-control"
-                    type="search" :placeholder="'Search: '+ search_types_string" aria-label="Search">
-                <span data-bs-toggle="collapse" data-bs-target="#searchSettings" aria-expanded="false" aria-controls="searchSettings" ref="settingsbutton"  class="input-group-text" type="button"><i class="fas fa-cog"></i></span>
+                <input
+                    @keyup="search"
+                    @focus="showsearchresult"
+                    v-model="searchsettings.searchstr"
+                    class="form-control"
+                    type="search"
+                    :placeholder="'Search: '+ search_types_string"
+                    aria-label="Search"
+                >
+                <span
+                    data-bs-toggle="collapse"
+                    data-bs-target="#searchSettings"
+                    aria-expanded="false"
+                    aria-controls="searchSettings"
+                    ref="settingsbutton"
+                    class="input-group-text"
+                    type="button"
+                >
+                    <i class="fas fa-cog"></i>
+                </span>
             </div>
 
             <div v-show="this.showresult"

From cbc9a87a475e9baa7c8d38fde08f3d498687a9ee Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 25 Jun 2025 11:22:14 +0200
Subject: [PATCH 301/572] update(Profil Profilbild): adds button to upload new
 profil foto if foto is not yet acepted

---
 .../controllers/api/frontend/v1/Profil.php    | 24 +++++++++++++++++++
 public/css/components/Profil.css              | 14 ++++++++++-
 .../Cis/Profil/MitarbeiterProfil.js           |  5 +++-
 .../Cis/Profil/MitarbeiterViewProfil.js       |  5 +++-
 .../ProfilComponents/ProfilInformation.js     |  7 ++++++
 .../js/components/Cis/Profil/StudentProfil.js | 17 +++++++------
 .../Cis/Profil/StudentViewProfil.js           |  5 +++-
 7 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php
index f234fc30e..b58d90d07 100644
--- a/application/controllers/api/frontend/v1/Profil.php
+++ b/application/controllers/api/frontend/v1/Profil.php
@@ -108,6 +108,7 @@ class Profil extends FHCAPI_Controller
 				$res->data = $this->viewStudentProfil($uid);
 			}
 		}
+		$res->data->fotoStatus=$this->isFotoAkzeptiert($this->pid);
 		$res->data->editAllowed = $editAllowed;
 		$this->terminateWithSuccess($res);
 	}
@@ -648,5 +649,28 @@ class Profil extends FHCAPI_Controller
 		$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
 		return $zutrittskarte_ausgegebenam;
 	}
+
+	/**
+	 * checks whether the foto of a user is accepted or not
+	 * @access private
+	 * @param  integer $pid the personId of the student or mitarbeiter
+	 * @return bool whether the foto is accepted or not
+	 */
+	private function isFotoAkzeptiert($pid)
+	{
+		$this->load->model('person/Fotostatusperson_model','FotostatusModel');
+		$fotostatus = $this->FotostatusModel->execReadOnlyQuery("
+		select distinct on (person_id) person_id, insertamum, fotostatus_kurzbz
+		from public.tbl_person_fotostatus
+		where person_id = ? 
+		order by person_id, insertamum desc",[$pid]);
+		$fotostatus = $this->getDataOrTerminateWithError($fotostatus);
+		if(is_array($fotostatus) && count($fotostatus) > 0){
+			$fotostatus = current($fotostatus)->fotostatus_kurzbz == 'akzeptiert';
+		}
+		else
+			$fotostatus = false;
+		return $fotostatus;
+	}
 }
 
diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
index b1ac8d67a..220c2ebfe 100644
--- a/public/css/components/Profil.css
+++ b/public/css/components/Profil.css
@@ -9,7 +9,6 @@
   width:21px; 
   background-color:var(--fhc-profil-border); 
   position:absolute;
-  /* top: 1px is important, otherwise it goes over the border of the thumbnail*/ 
   top:1px; 
   right:12px; 
   display:flex; 
@@ -18,6 +17,19 @@
   border-radius:3px;
 }
 
+.image-upload {
+	height: 22px;
+	width: 21px;
+	background-color: var(--fhc-profil-border);
+	position: absolute;
+	bottom: 4.5px;
+	left: 14.5px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border-radius: 3px 3px 3px 0;
+}
+
 .tabulator-collapsed-row{
     padding:15px;
     background-color: var(--fhc-profil-tabulator-shadow);
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 07a6339e4..0bb628e19 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -218,6 +218,9 @@ export default {
 		editable() {
 			return this.data?.editAllowed ?? false;
 		},
+		fotoStatus() {
+			return this.data?.fotoStatus ?? false;
+		},
 		getTelefonValue() {
 			if(this.data.standort_telefon?.kontakt) {
 				return this.data.standort_telefon.kontakt + " " + this.data.telefonklappe
@@ -337,7 +340,7 @@ export default {
                     <div class="row mb-4">
                         <div class="col">
                             <!-- PROFIL INFORMATION -->
-                            <profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation" :editable="editable"></profil-information>
+                            <profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation" :editable="editable" :fotoStatus="fotoStatus"></profil-information>
                         </div>
                     </div>
                     <div class="row mb-4">
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index cef970ec2..23a86b5f9 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -113,6 +113,9 @@ export default {
 		editable() {
 			return this.data?.editAllowed ?? false;
 		},
+		fotoStatus() {
+			return this.data?.fotoStatus ?? false;
+		},
 
 		personEmails() {
 			return this.data?.emails ? this.data.emails : [];
@@ -189,7 +192,7 @@ export default {
                     <div class="row mb-4">
                         <div class="col">
                             <!-- Profil Informationen -->
-                            <profil-information :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation" :editable="editable"></profil-information>
+                            <profil-information :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation" :editable="editable" :fotoStatus="fotoStatus"></profil-information>
                         </div>
                     </div>
                     <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index e39b4d57d..2881ecec1 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -11,6 +11,10 @@ export default {
 		editable: {
 			type: Boolean,
 			default: false
+		},
+		fotoStatus:{
+			type: Boolean,
+			default: true
 		}
 	},
 	data() {
@@ -83,6 +87,9 @@ export default {
                         <!-- LOCKING IMAGE FUNCTIONALITY -->
                         <div v-if="editable" role="button" @click.prevent="sperre_foto_function" class="image-lock">
                             <i :class="{'fa':true, ...(FotoSperre?{'fa-lock':true}:{'fa-lock-open':true})} "></i>
+                        </div>
+						<div v-if="!fotoStatus" role="button" @click.prevent="" class="image-upload">
+                            <i class="fa fa-upload"></i>
                         </div>
                     </div>
                 </div>
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 635033fda..2c0d5ba2b 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -166,6 +166,9 @@ export default {
 		editable() {
 			return this.data?.editAllowed ?? false;
 		},
+		fotoStatus() {
+			return this.data?.fotoStatus ?? false;
+		},
 
 		filteredEditData() {
 			return this.editDataFilter
@@ -239,9 +242,9 @@ export default {
 	},
 	template: /*html*/ `
 <div class="container-fluid text-break fhc-form">
-    <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" 
+    <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal"
     :value="JSON.parse(JSON.stringify(filteredEditData))" :title="$p.t('profil','profilBearbeiten')"></edit-profil>
-    <!-- ROW --> 
+    <!-- ROW -->
     <div class="row">
         <!-- HIDDEN QUICK LINKS -->
         <div  class="d-md-none col-12 ">
@@ -251,7 +254,7 @@ export default {
                     <quick-links :title="$p.t('profil','quickLinks')" :mobile="true"></quick-links>
                 </div>
             </div>-->
-            
+
 			<!-- Bearbeiten Button -->
 			<div v-if="editable" class="row ">
 				<div class="col mb-3">
@@ -267,24 +270,24 @@ export default {
 			</div>
 				<div v-if="data.profilUpdates" class="row mb-3">
 					<div class="col">
-						<!-- MOBILE PROFIL UPDATES -->  
+						<!-- MOBILE PROFIL UPDATES -->
 						<fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates"  :data="data.profilUpdates"></fetch-profil-updates>
 					</div>
 				</div>
 			</div>
 			<!-- END OF HIDDEN QUCK LINKS -->
-			
+
 			<!-- MAIN PANNEL -->
 			<div class="col-sm-12 col-md-8 col-xxl-9 ">
 				<!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
 				<!-- INFORMATION CONTENT START -->
-				<!-- ROW WITH THE PROFIL INFORMATION --> 
+				<!-- ROW WITH THE PROFIL INFORMATION -->
 				<div class="row mb-4 ">
 					<div  class="col-lg-12 col-xl-6 ">
 						<div class="row mb-4">
 							<div class="col">
 								<!-- PROFIL INFORMATION -->
-								<profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','studentIn')" :data="profilInformation" :editable="editable"></profil-information>
+								<profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','studentIn')" :data="profilInformation" :editable="editable" :fotoStatus="fotoStatus"></profil-information>
 							</div>
 						</div>
 						<div class="row mb-4">
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index 1c2044441..f7ad03b98 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -29,6 +29,9 @@ export default {
 		editable() {
 			return this.data?.editAllowed ?? false;
 		},
+		fotoStatus() {
+			return this.data?.fotoStatus ?? false;
+		},
 		profilInformation() {
 			if (!this.data) {
 				return {};
@@ -115,7 +118,7 @@ export default {
                 <div  class="col-lg-12 col-xl-6 ">
                     <div class="row mb-4">
                         <div class="col">
-                            <profil-information :data="profilInformation" :title="$p.t('profil','studentIn')" :editable="editable"></profil-information>
+                            <profil-information :data="profilInformation" :title="$p.t('profil','studentIn')" :editable="editable" :fotoStatus="fotoStatus"></profil-information>
                         </div>
                     </div>
                     <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->

From 057288a4a5312f052dd196021172b42ad2ffb44a Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 25 Jun 2025 16:02:51 +0200
Subject: [PATCH 302/572] phrasen & rechte rename

---
 include/tw/cis_menu_lv.inc.php |   8 +--
 system/phrasesupdate.php       | 126 ++++++++++++++++++++++++++++++++-
 2 files changed, 127 insertions(+), 7 deletions(-)

diff --git a/include/tw/cis_menu_lv.inc.php b/include/tw/cis_menu_lv.inc.php
index 73a347dc3..29ba54724 100644
--- a/include/tw/cis_menu_lv.inc.php
+++ b/include/tw/cis_menu_lv.inc.php
@@ -244,10 +244,10 @@ function checkZeilenUmbruch()
 	if(defined('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN') && CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN && $angemeldet
 		&& (!defined('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_STG') || in_array($lv->studiengang_kz, unserialize(CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_STG)))
 		&& (!defined('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_LVA') || in_array($lv->lehrveranstaltung_id, unserialize(CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_LVA)))
-		&& ($rechte->isBerechtigt('extension/anw_ent_admin')
-				|| $rechte->isBerechtigt('extension/anwesenheit_lektor')
-				|| $rechte->isBerechtigt('extension/anwesenheit_student')
-				|| $rechte->isBerechtigt('extension/anwesenheit_admin')))
+		&& ($rechte->isBerechtigt('extension/anw_r_ent_assistenz')
+				|| $rechte->isBerechtigt('extension/anw_r_lektor')
+				|| $rechte->isBerechtigt('extension/anw_r_student')
+				|| $rechte->isBerechtigt('extension/anw_r_full_assistenz')))
 	{
 		$link='';
 		$text='';
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 66f5f6c05..8ee5685d6 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31447,18 +31447,78 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'studentConfig',
+		'phrase' => 'errorCodeTooOld',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Studenten auswählen.',
+				'text' => 'Der Zugangscode ist zeitlich abgelaufen.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Configure student profile.',
+				'text' => 'The access code has expired.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'profil',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Profil',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'profile',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'admin',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Entschuldigungsmanagement',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'excuse note management',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'allowed',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Aktuell prüfbar',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'allowed to test',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -31504,6 +31564,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'termine',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Unterricht laut Stundenplan',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Lesson as per Timetable',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -31644,6 +31724,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'kontrollen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kontrollen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attendance Checks',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -32296,6 +32396,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'file',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokument',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Document',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',

From aec0162c0174977d61de9571b12e390bcff86802 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 25 Jun 2025 16:49:29 +0200
Subject: [PATCH 303/572] Konto: Buchungstypen order

---
 application/controllers/api/frontend/v1/stv/Konto.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/controllers/api/frontend/v1/stv/Konto.php b/application/controllers/api/frontend/v1/stv/Konto.php
index ac36b5d8f..a33680ea0 100644
--- a/application/controllers/api/frontend/v1/stv/Konto.php
+++ b/application/controllers/api/frontend/v1/stv/Konto.php
@@ -116,6 +116,8 @@ class Konto extends FHCAPI_Controller
 	{
 		$this->load->model('crm/Buchungstyp_model', 'BuchungstypModel');
 
+		$this->BuchungstypModel->addOrder('beschreibung');
+		
 		$result = $this->BuchungstypModel->load();
 
 		$data = $this->getDataOrTerminateWithError($result);

From c9cc86fdbd9fbf5053be63611ef5c53c9d1a9b43 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 25 Jun 2025 16:50:03 +0200
Subject: [PATCH 304/572] Archiv: Downloadbutton in actions column

---
 .../Stv/Studentenverwaltung/Details/Archiv.js          | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index fd174e16f..7f615f8b5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -115,6 +115,16 @@ export default {
 						let container = document.createElement('div');
 						container.className = "d-flex gap-2";
 
+						let downloadButton = document.createElement('button');
+						downloadButton.className = 'btn btn-outline-secondary';
+						downloadButton.innerHTML = '<i class="fa fa-download"></i>';
+						downloadButton.title = this.$p.t('ui', 'downloadDok');
+						downloadButton.addEventListener('click', evt => {
+							evt.stopPropagation();
+							this.actionDownload(cell.getData().akte_id);
+						});
+						container.append(downloadButton);
+
 						if (this.config.showEdit)
 						{
 							let editButton = document.createElement('button');

From af2aa416aae48a8a5ef2450ed2b973abb86be054 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 25 Jun 2025 16:50:36 +0200
Subject: [PATCH 305/572] Documents: Doubleclick-Download like in Archive

---
 .../Details/Dokumente/List/Accepted.js                 | 10 ++++++++++
 .../Details/Dokumente/List/Unaccepted.js               | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
index 742d01360..9994a230e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -199,6 +199,16 @@ export default {
 							title: this.$p.t('global', 'dokument')
 						});
 					}
+				},
+				{
+					event: "rowDblClick",
+					handler: (e, row) => {
+						if (row.getData().vorhanden) {
+							window.open(
+								this.actionDownloadFile(row.getData().akte_id)
+							);
+						}
+					}
 				}
 			]
 		}
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
index 8a0a24667..949f7d4c8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -207,6 +207,16 @@ export default {
 							title: this.$p.t('global', 'dokument')
 						});
 					}
+				},
+				{
+					event: "rowDblClick",
+					handler: (e, row) => {
+						if (row.getData().vorhanden) {
+							window.open(
+								this.actionDownloadFile(row.getData().akte_id)
+							);
+						}
+					}
 				}
 			]
 		}

From 4dbffc352728f0d3a4a9b8bf2d85cb9c3edf595b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 25 Jun 2025 17:48:09 +0200
Subject: [PATCH 306/572] Projektliste zieht die Pflichtpuase nicht mehr
 automatisch ab wenn keine Pause manuell gebucht wurde. (Task 62601)

---
 cis/private/tools/zeitaufzeichnung_projektliste.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/cis/private/tools/zeitaufzeichnung_projektliste.php b/cis/private/tools/zeitaufzeichnung_projektliste.php
index 32c45c06a..69e803655 100644
--- a/cis/private/tools/zeitaufzeichnung_projektliste.php
+++ b/cis/private/tools/zeitaufzeichnung_projektliste.php
@@ -384,17 +384,6 @@ for ($i = 0; $i < count($ztaufdata); $i++)
 			}
 		}
 
-		//worktime with no break greater 6 -> compulsory break of half an hour
-		if ($pauseSubtracted < 0.5 && !$lehreExternExists)
-		{
-			if ($projektlines[$day]->arbeitszeit >= 6.5)
-				$projektlines[$day]->arbeitszeit -= 0.5;
-
-			//ensure that no worktime gets smaller than 6 hours because of compulsory break
-			elseif ($projektlines[$day]->arbeitszeit > 6)
-				$projektlines[$day]->arbeitszeit -= $projektlines[$day]->arbeitszeit - 6;
-		}
-
 		$projektlines[$day]->arbeitszeit = round($projektlines[$day]->arbeitszeit, 2);
 
 		//calculate sums

From 9610ca55f7c337adbbdedd2ac64e562ad2acf8fb Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 26 Jun 2025 15:21:09 +0200
Subject: [PATCH 307/572] update(Profil Profilbild): first version of the
 profilbild upload endpoint

---
 .../api/frontend/v1/ProfilUpdate.php          | 101 ++++++++++++++++++
 public/js/api/factory/profilUpdate.js         |   7 ++
 .../ProfilComponents/ProfilInformation.js     |  10 +-
 .../EditProfilComponents/ImageUpload.js       |  83 ++++++++++++++
 4 files changed, 200 insertions(+), 1 deletion(-)
 create mode 100644 public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/ImageUpload.js

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index 827654d21..4a26e5bf8 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -44,6 +44,7 @@ class ProfilUpdate extends FHCAPI_Controller
 			'updateProfilRequest' => self::PERM_LOGGED,
 			'deleteProfilRequest' => self::PERM_LOGGED,
 			'insertFile' => self::PERM_LOGGED,
+			'updateProfilbild' => self::PERM_LOGGED,
 			'show' => self::PERM_LOGGED,
 			]);
 
@@ -478,6 +479,106 @@ class ProfilUpdate extends FHCAPI_Controller
 		$this->terminateWithSuccess($res);
 	}
 
+	public function updateProfilbild()
+	{
+
+		$resize = function($filename, $width, $height){
+			// Hoehe und Breite neu berechnen
+			list($width_orig, $height_orig) = getimagesize($filename);
+			
+			if ($width && ($width_orig < $height_orig))
+			{
+				$width = ($height / $height_orig) * $width_orig;
+			}
+			else
+			{
+				$height = ($width / $width_orig) * $height_orig;
+			}
+
+			$image_p = imagecreatetruecolor($width, $height);
+
+			$image = imagecreatefromjpeg($filename);
+
+			//Bild nur verkleinern aber nicht vergroessern
+			if($width_orig>$width || $height_orig>$height)
+				imagecopyresampled($image_p, $image, 0, 0, 0, 0, $width, $height, $width_orig, $height_orig);
+			else
+				$image_p = $image;
+
+			imagejpeg($image_p, $filename, 80);
+
+			@imagedestroy($image_p);
+			@imagedestroy($image);
+		};
+		
+		if (!count($_FILES)) {
+			$this->terminateWithError("No file available for upload");
+		}
+
+		//? if replace is set it contains the profil_update_id in which the attachment_id has to be replaced
+		$files = $_FILES['files'];
+		$file_count = count($files['name']);
+		$count = 0;
+		for ($i = 0; $i < $file_count; $i++) {
+			$count++;
+			$_FILES['files']['name'] = $files['name'][$i];
+			$_FILES['files']['type'] = $files['type'][$i];
+			$_FILES['files']['tmp_name'] = $files['tmp_name'][$i];
+			$_FILES['files']['error'] = $files['error'][$i];
+			$_FILES['files']['size'] = $files['size'][$i];
+			$_FILES['files']['tmp_name'] = $files['tmp_name'][$i];
+
+			$filename = $_FILES['files']['tmp_name'];
+
+			$ext = substr($files['name'][$i], strrpos($files['name'][$i], '.') + 1);
+			if($ext!='jpg' && $ext!='jpeg'){
+				$this->terminateWithError("Only jpg and jpeg files are allowed for profilbild upload");
+			}
+			
+			$width = 827;
+			$height = 1063;
+			// resize
+			$resize($filename, $width, $height);
+
+
+			//akte
+			$fp = fopen($filename,'r');
+			//auslesen
+			$content = fread($fp, filesize($filename));
+			$base64_content = base64_encode($content);
+			$this->load->library('AkteLib');
+			$aktenInsertResult = $this->aktelib->add($this->pid,'Lichtbil',"Lichtbild_".$this->pid.".jpg","image/jpg",$fp,"Lichtbild gross");
+			fclose($fp);
+			if (isError($aktenInsertResult)) {
+				$this->terminateWithError(getError($aktenInsertResult));
+			}
+
+			// in person abspeichern
+			$resize($filename, 101, 130);
+			$fp = fopen($filename,'r');
+			$content = fread($fp, filesize($filename));
+			fclose($fp);
+			$base64_content = base64_encode($content);
+			$this->load->model('person/Person_model','PersonModel');
+			$personUpdate = $this->PersonModel->update($this->pid, ["foto"=>$base64_content]);
+			if(isError($personUpdate)){
+				$this->terminateWithError(getError($personUpdate));
+			}
+			// update foto status
+			$this->load->model('person/Fotostatusperson_model','FotostatusModel');
+			$fotoInsert = $this->FotostatusModel->insert(["person_id"=>$this->pid,"fotostatus_kurzbz"=>"hochgeladen","datum"=>date('Y-m-d'),"insertamum"=>date('Y-m-d H:i:s'),"insertvon"=>$this->uid,"updateamum"=>date('Y-m-d H:i:s'),"updatevon"=>$this->uid]);
+			if(isError($fotoInsert)){
+				$this->terminateWithError(getError($fotoInsert));
+			}
+
+		}
+		
+		
+		$this->terminateWithSuccess(["fotoStatus"=>getData($fotoInsert),"personUpdate"=>getData($personUpdate),"akteInsert"=>getData($aktenInsertResult)]);
+
+
+	}
+
 	public function getProfilUpdateWithPermission($status = null)
 	{
 		// early return if no status has been passed as argument
diff --git a/public/js/api/factory/profilUpdate.js b/public/js/api/factory/profilUpdate.js
index 42e87ae0e..dfef399bf 100644
--- a/public/js/api/factory/profilUpdate.js
+++ b/public/js/api/factory/profilUpdate.js
@@ -61,6 +61,13 @@ export default {
 			params: dms
 		};
 	},
+	updateProfilbild(dms) {
+		return {
+			method: 'post',
+			url: `/api/frontend/v1/ProfilUpdate/updateProfilbild`,
+			params: dms
+		};
+	},
 	getProfilRequestFiles(requestID) {
 		return {
 			method: 'get',
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index 2881ecec1..e0ed7da5b 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -1,4 +1,5 @@
 import ApiProfil from '../../../../api/factory/profil.js';
+import ImageUpload from '../../Profil/ProfilModal/EditProfilComponents/ImageUpload.js';
 
 export default {
 	props: {
@@ -17,6 +18,9 @@ export default {
 			default: true
 		}
 	},
+	components:{
+		ImageUpload,
+	},
 	data() {
 		return {
 			FotoSperre: this.data.foto_sperre,
@@ -25,6 +29,9 @@ export default {
 	emits: ["showEditProfilModal"],
 
 	methods: {
+		showModal(){
+			this.$refs.imageUpload.show();
+		},
 		sperre_foto_function() {
 			//TODO: refactor
 			if (!this.data) {
@@ -66,6 +73,7 @@ export default {
 	template: /*html*/ `
 
 <div class="card h-100">
+	<image-upload ref="imageUpload" titel="test"></image-upload>
     <div class="card-header">
         <div class="row">
             <div v-if="editable" @click="$emit('showEditProfilModal','Personen_Informationen')" class="col-auto" type="button">
@@ -88,7 +96,7 @@ export default {
                         <div v-if="editable" role="button" @click.prevent="sperre_foto_function" class="image-lock">
                             <i :class="{'fa':true, ...(FotoSperre?{'fa-lock':true}:{'fa-lock-open':true})} "></i>
                         </div>
-						<div v-if="!fotoStatus" role="button" @click.prevent="" class="image-upload">
+						<div v-if="!fotoStatus" role="button" @click.prevent="showModal" class="image-upload">
                             <i class="fa fa-upload"></i>
                         </div>
                     </div>
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/ImageUpload.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/ImageUpload.js
new file mode 100644
index 000000000..b7ab16755
--- /dev/null
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/ImageUpload.js
@@ -0,0 +1,83 @@
+import Dms from "../../../../Form/Upload/Dms.js";
+import BsModal from "../../../../Bootstrap/Modal.js";
+
+import ApiProfilUpdate from '../../../../../api/factory/profilUpdate.js';
+
+export default {
+	data() {
+		return {
+			dmsData: [],
+		};
+	},
+	components: {
+		Dms,
+		BsModal,
+	},
+	mixins: [BsModal],
+	props: {
+		titel: {
+			type: Object,
+		},
+		files: {
+			type: Array,
+		},
+		updateID: {
+			type: Boolean,
+		},
+		onHideBsModal: Function,
+		onHiddenBsModal: Function,
+		onHidePreventedBsModal: Function,
+		onShowBsModal: Function,
+		onShownBsModal: Function,
+	},
+	methods:{
+		async uploadImage(){
+			if(this.dmsData){
+				let formData = new FormData();
+				formData.append("files[]", this.dmsData[0]);
+				await this.$api
+					.call(ApiProfilUpdate.updateProfilbild(formData))
+					.then((res) => {
+						console.log("here", res.data?.map((file) => file.dms_id)) ;
+					});	
+			}
+			
+		}
+	},
+	mounted() {
+		this.modal = this.$refs.modalContainer.modal;
+		if (this.files) {
+			this.dmsData = this.files;
+		}
+	},
+	popup(options) {
+			BsModal.popup.bind(this);
+			return BsModal.popup(null, options);
+	},
+	template: /*html*/`
+
+	<bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" :backdrop="false">
+		<template #title>
+			<p style="opacity:0.8" class="ms-2" v-if="!updateID">{{$p.t('profilUpdate','profilUpdateInformationMessage',[titel])}}</p>
+		</template>
+		<template #default>
+			<div class="form-underline">
+				<div class="form-underline-titel">{{titel?titel:$p.t('global','titel')}}</div>
+			</div>
+			<div class="row gx-2">
+				<div class="col">
+					<dms ref="update" id="files" name="files" :multiple="false" v-model="dmsData" @update:model-value="didFilesChange"  ></dms>
+				</div>
+				<div class="col-auto">
+					<button @click="dmsData=[]" class="btn btn-danger"><i style="color:white" class="fa fa-trash"></i></button>
+				</div>
+			</div>
+			<div class="d-flex" style="margin-left:auto;">
+				<button @click="uploadImage" class="btn btn-primary">upload</button>
+			</div>
+		</template>
+		<template #footer>
+		</template>
+	</bs-modal>
+    `,
+};

From 0adf7ee9dc9b9c19cbcff4ab34e8f02bce3da1ea Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 27 Jun 2025 09:52:18 +0200
Subject: [PATCH 308/572] Fix "Spaltenbreite wird nicht gespeichert" for
 Kontakt Tabs: use Filtercomponent default layout

---
 .../Stv/Studentenverwaltung/Details/Kontakt/Address.js          | 2 --
 .../Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js      | 2 --
 .../Stv/Studentenverwaltung/Details/Kontakt/Contact.js          | 2 --
 3 files changed, 6 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 943dfa94f..ed32e2eab 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -122,8 +122,6 @@ export default{
 						frozen: true
 					},
 				],
-				layout: 'fitDataFill',
-				layoutColumnsOnNewData:	false,
 				height:	'auto',
 				selectable:	true,
 				index: 'adresse_id',
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index b6896fb6b..6c02677ce 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -86,8 +86,6 @@ export default{
 						frozen: true
 					},
 				],
-				layout: 'fitDataFill',
-				layoutColumnsOnNewData:	false,
 				height:	'auto',
 				selectable:	true,
 				index: 'bankverbindung_id',
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index 42896c8b7..ee37427b1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -94,8 +94,6 @@ export default{
 						frozen: true
 					},
 				],
-				layout: 'fitDataFill',
-				layoutColumnsOnNewData:	false,
 				height:	'auto',
 				selectable:	true,
 				index: 'kontakt_id',

From e3fe20831e311d5e2124ea75011272da9a2825ad Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 27 Jun 2025 11:36:40 +0200
Subject: [PATCH 309/572] update(Profil Profilbild): changes styling layout and
 polishment

---
 .../api/frontend/v1/ProfilUpdate.php          | 102 ++++++++----------
 public/css/components/dashboard.css           |  13 ++-
 .../ProfilComponents/ProfilInformation.js     |   2 +-
 .../EditProfilComponents/ImageUpload.js       |  13 ++-
 system/phrasesupdate.php                      |  40 +++++++
 5 files changed, 101 insertions(+), 69 deletions(-)

diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php
index 4a26e5bf8..929ea49d6 100644
--- a/application/controllers/api/frontend/v1/ProfilUpdate.php
+++ b/application/controllers/api/frontend/v1/ProfilUpdate.php
@@ -515,68 +515,58 @@ class ProfilUpdate extends FHCAPI_Controller
 			$this->terminateWithError("No file available for upload");
 		}
 
-		//? if replace is set it contains the profil_update_id in which the attachment_id has to be replaced
 		$files = $_FILES['files'];
-		$file_count = count($files['name']);
-		$count = 0;
-		for ($i = 0; $i < $file_count; $i++) {
-			$count++;
-			$_FILES['files']['name'] = $files['name'][$i];
-			$_FILES['files']['type'] = $files['type'][$i];
-			$_FILES['files']['tmp_name'] = $files['tmp_name'][$i];
-			$_FILES['files']['error'] = $files['error'][$i];
-			$_FILES['files']['size'] = $files['size'][$i];
-			$_FILES['files']['tmp_name'] = $files['tmp_name'][$i];
+		
+		$_FILES['files']['name'] = current($files['name']);
+		$_FILES['files']['type'] = current($files['type']);
+		$_FILES['files']['tmp_name'] = current($files['tmp_name']);
+		$_FILES['files']['error'] = current($files['error']);
+		$_FILES['files']['size'] = current($files['size']);
+		$_FILES['files']['tmp_name'] = current($files['tmp_name']);
 
-			$filename = $_FILES['files']['tmp_name'];
-
-			$ext = substr($files['name'][$i], strrpos($files['name'][$i], '.') + 1);
-			if($ext!='jpg' && $ext!='jpeg'){
-				$this->terminateWithError("Only jpg and jpeg files are allowed for profilbild upload");
-			}
-			
-			$width = 827;
-			$height = 1063;
-			// resize
-			$resize($filename, $width, $height);
-
-
-			//akte
-			$fp = fopen($filename,'r');
-			//auslesen
-			$content = fread($fp, filesize($filename));
-			$base64_content = base64_encode($content);
-			$this->load->library('AkteLib');
-			$aktenInsertResult = $this->aktelib->add($this->pid,'Lichtbil',"Lichtbild_".$this->pid.".jpg","image/jpg",$fp,"Lichtbild gross");
-			fclose($fp);
-			if (isError($aktenInsertResult)) {
-				$this->terminateWithError(getError($aktenInsertResult));
-			}
-
-			// in person abspeichern
-			$resize($filename, 101, 130);
-			$fp = fopen($filename,'r');
-			$content = fread($fp, filesize($filename));
-			fclose($fp);
-			$base64_content = base64_encode($content);
-			$this->load->model('person/Person_model','PersonModel');
-			$personUpdate = $this->PersonModel->update($this->pid, ["foto"=>$base64_content]);
-			if(isError($personUpdate)){
-				$this->terminateWithError(getError($personUpdate));
-			}
-			// update foto status
-			$this->load->model('person/Fotostatusperson_model','FotostatusModel');
-			$fotoInsert = $this->FotostatusModel->insert(["person_id"=>$this->pid,"fotostatus_kurzbz"=>"hochgeladen","datum"=>date('Y-m-d'),"insertamum"=>date('Y-m-d H:i:s'),"insertvon"=>$this->uid,"updateamum"=>date('Y-m-d H:i:s'),"updatevon"=>$this->uid]);
-			if(isError($fotoInsert)){
-				$this->terminateWithError(getError($fotoInsert));
-			}
+		$filename = $_FILES['files']['tmp_name'];
 
+		$ext = substr(current($files['name']), strrpos(current($files['name']), '.') + 1);
+		if($ext!='jpg' && $ext!='jpeg'){
+			$this->terminateWithError("Only jpg and jpeg files are allowed for profilbild upload");
 		}
 		
+		// resize
+		$resize($filename, 827, 1063);
+
+		//akte
+		$fp = fopen($filename,'r');
+		//auslesen
+		$content = fread($fp, filesize($filename));
+		$base64_content = base64_encode($content);
+		$this->load->library('AkteLib');
+		$aktenInsertResult = $this->aktelib->add($this->pid,'Lichtbil',"Lichtbild_".$this->pid.".jpg","image/jpg",$fp,"Lichtbild gross");
+		fclose($fp);
+		if (isError($aktenInsertResult)) {
+			$this->terminateWithError(getError($aktenInsertResult));
+		}
+
+		// in person abspeichern
+		$resize($filename, 101, 130);
+		$fp = fopen($filename,'r');
+		$content = fread($fp, filesize($filename));
+		fclose($fp);
+		$base64_content = base64_encode($content);
+		$this->load->model('person/Person_model','PersonModel');
+		$personUpdate = $this->PersonModel->update($this->pid, ["foto"=>$base64_content]);
+		if(isError($personUpdate)){
+			$this->terminateWithError(getError($personUpdate));
+		}
+
+
+		// update foto status
+		$this->load->model('person/Fotostatusperson_model','FotostatusModel');
+		$fotoInsert = $this->FotostatusModel->insert(["person_id"=>$this->pid,"fotostatus_kurzbz"=>"hochgeladen","datum"=>date('Y-m-d'),"insertamum"=>date('Y-m-d H:i:s'),"insertvon"=>$this->uid,"updateamum"=>date('Y-m-d H:i:s'),"updatevon"=>$this->uid]);
+		if(isError($fotoInsert)){
+			$this->terminateWithError(getError($fotoInsert));
+		}
 		
-		$this->terminateWithSuccess(["fotoStatus"=>getData($fotoInsert),"personUpdate"=>getData($personUpdate),"akteInsert"=>getData($aktenInsertResult)]);
-
-
+		$this->terminateWithSuccess();
 	}
 
 	public function getProfilUpdateWithPermission($status = null)
diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index 78567be2b..d030e80cd 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -138,14 +138,17 @@
 	position: relative;
 }
 
+.dashboard-item-overlay{
+	background-color: var(--fhc-dashboard-item-overlay-background);
+}
+
 .dashboard-item-overlay::before{
 	position:absolute;
 	content:"";
-	top:0;
-	left:0;
-	right:0;
-	bottom:0;
-	background-color:var(--fhc-dashboard-item-overlay-background);
+	top:0.25rem;
+	left:0.25rem;
+	right:0.25rem;
+	bottom:0.25rem;
 	border:4px dashed var(--fhc-dashboard-item-overly-border-color);
 	opacity: 0.5;
 }
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index e0ed7da5b..50399edf5 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -73,7 +73,7 @@ export default {
 	template: /*html*/ `
 
 <div class="card h-100">
-	<image-upload ref="imageUpload" titel="test"></image-upload>
+	<image-upload ref="imageUpload" :titel="$p.t('profilUpdate','profilBild')"></image-upload>
     <div class="card-header">
         <div class="row">
             <div v-if="editable" @click="$emit('showEditProfilModal','Personen_Informationen')" class="col-auto" type="button">
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/ImageUpload.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/ImageUpload.js
index b7ab16755..672b4ce4a 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/ImageUpload.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/ImageUpload.js
@@ -38,7 +38,8 @@ export default {
 				await this.$api
 					.call(ApiProfilUpdate.updateProfilbild(formData))
 					.then((res) => {
-						console.log("here", res.data?.map((file) => file.dms_id)) ;
+						this.$fhcAlert.alertSuccess(this.$p.t('global','hochgeladen'));
+						this.modal.hide();
 					});	
 			}
 			
@@ -58,7 +59,7 @@ export default {
 
 	<bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" :backdrop="false">
 		<template #title>
-			<p style="opacity:0.8" class="ms-2" v-if="!updateID">{{$p.t('profilUpdate','profilUpdateInformationMessage',[titel])}}</p>
+			<p style="opacity:0.8" class="ms-2" v-if="!updateID">{{$p.t('profilUpdate','profilBildUpdateMessage',[titel])}}</p>
 		</template>
 		<template #default>
 			<div class="form-underline">
@@ -66,18 +67,16 @@ export default {
 			</div>
 			<div class="row gx-2">
 				<div class="col">
-					<dms ref="update" id="files" name="files" :multiple="false" v-model="dmsData" @update:model-value="didFilesChange"  ></dms>
+					<dms ref="update" id="files" name="files" :multiple="false" v-model="dmsData"  ></dms>
 				</div>
 				<div class="col-auto">
 					<button @click="dmsData=[]" class="btn btn-danger"><i style="color:white" class="fa fa-trash"></i></button>
 				</div>
 			</div>
-			<div class="d-flex" style="margin-left:auto;">
-				<button @click="uploadImage" class="btn btn-primary">upload</button>
+			<div class="d-flex" >
+				<button @click="uploadImage" class="btn fhc-primary-bg mt-4 text-light" style="margin-left:auto;">{{$p.t('global','upload')}}</button>
 			</div>
 		</template>
-		<template #footer>
-		</template>
 	</bs-modal>
     `,
 };
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 26c9d7bee..43913661a 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -28138,6 +28138,26 @@ array(
 	),
 		//Profil Phrasen ende
 		//ProfilUpdate Phrasen start
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilBild',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Profilbild',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Profile picture',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 		array(
 			'app' => 'core',
 			'category' => 'profilUpdate',
@@ -28459,6 +28479,26 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'profilBildUpdateMessage',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Bitte laden Sie ihr {0} hoch',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Please upload your {0}',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 		array(
 			'app' => 'core',
 			'category' => 'profilUpdate',

From fbb00a2616ee5294ca99a41a7b6a8faf343c43c0 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 30 Jun 2025 08:52:40 +0200
Subject: [PATCH 310/572] Tab Abschlusspruefung

- set textfield protokoll readonly
- update: add updatevon, updateamum
- selectedFields vorsitz, pruefer: set default null
---
 .../api/frontend/v1/stv/Abschlusspruefung.php          |  4 ++--
 .../Details/Abschlusspruefung/Abschlusspruefung.js     | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
index 54a0e3278..da9e79d16 100644
--- a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
+++ b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
@@ -333,8 +333,8 @@ class Abschlusspruefung extends FHCAPI_Controller
 				'protokoll' => $formData['protokoll'],
 				'note' => $formData['note'],
 				'anmerkung' => $formData['anmerkung'],
-				'insertamum' => date('c'),
-				'insertvon' => getAuthUID()
+				'updateamum' => date('c'),
+				'updatevon' => getAuthUID()
 			]
 		);
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index ab9c5134a..5184de62d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -279,17 +279,16 @@ export default {
 			this.getStudiengangByKz();
 		},
 		selectedVorsitz(newVal) {
-			this.formData.vorsitz = newVal?.mitarbeiter_uid || '';
-			console.log("newVal: " + newVal.mitarbeiter_uid);
+			this.formData.vorsitz = newVal?.mitarbeiter_uid || null;
 		},
 		selectedPruefer1(newVal) {
-			this.formData.pruefer1 = newVal?.person_id || '';
+			this.formData.pruefer1 = newVal?.person_id || null;
 		},
 		selectedPruefer2(newVal) {
-			this.formData.pruefer2 = newVal?.person_id || '';
+			this.formData.pruefer2 = newVal?.person_id || null;
 		},
 		selectedPruefer3(newVal) {
-			this.formData.pruefer3 = newVal?.person_id || '';
+			this.formData.pruefer3 = newVal?.person_id || null;
 		}
 	},
 	methods: {
@@ -753,6 +752,7 @@ export default {
 						v-model="formData.protokoll"
 						name="protokoll"
 						:rows= 10
+						readonly
 						>
 					</form-input>
 				</div>

From 19ef7c2ce1461b13c96ddfb155d974c81313f453 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 30 Jun 2025 10:32:28 +0200
Subject: [PATCH 311/572] Tab Abschlusspruefung: bugfix printDocument

---
 public/js/api/factory/stv/abschlusspruefung.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/api/factory/stv/abschlusspruefung.js b/public/js/api/factory/stv/abschlusspruefung.js
index e318d0d37..db8403b48 100644
--- a/public/js/api/factory/stv/abschlusspruefung.js
+++ b/public/js/api/factory/stv/abschlusspruefung.js
@@ -105,7 +105,7 @@ export default {
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/stv/abschlusspruefung/checkForExistingExams/',
-			params: { uid }
+			params: { uids }
 		};
 	},
 	getAllMitarbeiter(){

From 414e4c95651e5e6b943ee424a9a9f33ba9c3a935 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 30 Jun 2025 11:39:16 +0200
Subject: [PATCH 312/572] Tab Abschlusspruefung: add Berechtigungen Studiengang
 backend: insert, update, delete

---
 .../api/frontend/v1/stv/Abschlusspruefung.php | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
index da9e79d16..d8bc067f9 100644
--- a/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
+++ b/application/controllers/api/frontend/v1/stv/Abschlusspruefung.php
@@ -40,6 +40,51 @@ class Abschlusspruefung extends FHCAPI_Controller
 
 		// Load models
 		$this->load->model('education/Abschlusspruefung_model', 'AbschlusspruefungModel');
+
+
+		//Permission checks for Studiengangsarray
+		$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
+
+		if ($this->router->method == 'insertAbschlusspruefung' || $this->router->method == 'updateAbschlusspruefung')
+		{
+			$student_uid = $this->input->post('uid') ?: ($this->input->post('formData')['student_uid'] ?? null);
+
+			if(!$student_uid)
+			{
+				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
+			}
+			$this->_checkAllowedStgsFromUid($student_uid, $allowedStgs);
+		}
+
+		if ($this->router->method == 'deleteAbschlusspruefung')
+		{
+			$abschlusspruefung_id = $this->input->post('id');
+
+			if(!$abschlusspruefung_id)
+			{
+				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Abschlusspruefung ID']), self::ERROR_TYPE_GENERAL);
+			}
+			$result = $this->AbschlusspruefungModel->load(
+				array('abschlusspruefung_id' => $abschlusspruefung_id)
+			);
+			$data = $this->getDataOrTerminateWithError($result);
+			$student_uid = current($data)->student_uid;
+
+			$this->_checkAllowedStgsFromUid($student_uid, $allowedStgs);
+		}
+	}
+
+	private function _checkAllowedStgsFromUid($student_uid, $allowedStgs)
+	{
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$result = $this->StudentModel->loadWhere(['student_uid' => $student_uid]);
+		$data = $this->getDataOrTerminateWithError($result);
+		$studiengang_kz = current($data)->studiengang_kz;
+
+		if (!in_array($studiengang_kz, $allowedStgs))
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_keineBerechtigungStg'), self::ERROR_TYPE_GENERAL);
+		}
 	}
 
 	public function getAbschlusspruefung($student_uid)

From 1c29bcd685d1b5a78383274738d52c12fa1d2dcc Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 30 Jun 2025 11:40:18 +0200
Subject: [PATCH 313/572] feature(LvPlan Feiertage): adds endpoint to fetch
 feiertage and adds renderer components for the feiertage in the LvPlan

---
 .../controllers/api/frontend/v1/LvPlan.php    | 24 +++++++-
 application/core/Events.php                   | 10 ++++
 application/libraries/StundenplanLib.php      | 60 +++++++++++++++++++
 public/css/Cis4/CoreCalendarEvents.css        | 54 ++++++++++++++++-
 .../Cis/Renderer/Feiertage/calendarEvent.js   | 14 +++++
 .../Cis/Renderer/Feiertage/modalContent.js    | 21 +++++++
 .../Cis/Renderer/Feiertage/modalTitle.js      | 11 ++++
 system/phrasesupdate.php                      | 20 +++++++
 8 files changed, 208 insertions(+), 6 deletions(-)
 create mode 100644 public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
 create mode 100644 public/js/components/Cis/Renderer/Feiertage/modalContent.js
 create mode 100644 public/js/components/Cis/Renderer/Feiertage/modalTitle.js

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 07435c9e5..3e0bf3d50 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -102,19 +102,37 @@ class LvPlan extends FHCAPI_Controller
 				'username' => getAuthUID()
 			]
 		);
+
+		$lvAndMoodleEvents = array_merge($lvplan_events,$moodle_events);
+
+		$this->load->model('education/Studentlehrverband_model','StudentLehrverbandModel');
+		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+		$current_Studiensemester = $this->StudiensemesterModel->getAkt();
+		$current_Studiensemester = $this->getDataOrTerminateWithError($current_Studiensemester);
+		$current_Studiensemester = current($current_Studiensemester)->studiensemester_kurzbz;
+		$studiengang = $this->StudentLehrverbandModel->loadWhere(["student_uid"=>getAuthUID(),"studiensemester_kurzbz"=>$current_Studiensemester]);
+		$studiengang = $this->getDataOrTerminateWithError($studiengang);
+		$studiengang = current($studiengang)->studiengang_kz;
+
+		$ferienEvents = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $studiengang);
 		
-		$result = array_merge($lvplan_events,$moodle_events);
+		$allEvents = array_merge($lvAndMoodleEvents,$ferienEvents);
 		// sort array with moodle events first
-		usort($result, function($a, $b){
+		usort($lvAndMoodleEvents, function($a, $b){
 			if ($a->type === 'moodle' && $b->type !== 'moodle') {
 				return -1;
 			} elseif ($a->type !== 'moodle' && $b->type === 'moodle') {
 				return 1;
+			} elseif ($a->type === 'ferien' && ($b->type !== 'moodle' && $b->type !== 'ferien')) {
+				return -1;
+			} elseif (($a->type !== 'ferien' && $a->type !== 'moodle') && $b->type === 'ferien') {
+				return 1;
 			} else {
 				return 0;
 			}
 		});
-		$this->terminateWithSuccess($result);
+
+		$this->terminateWithSuccess($allEvents);
 	}
 
 	//TODO: delete this function if we don't use the old calendar export endpoints anymore
diff --git a/application/core/Events.php b/application/core/Events.php
index 9ad474fc5..b689a99d3 100644
--- a/application/core/Events.php
+++ b/application/core/Events.php
@@ -23,4 +23,14 @@ Events::on('loadRenderers', function ($renderers) {
 	);
 });
 
+Events::on('loadRenderers', function ($renderers) {
+	$fhc_core_renderers =& $renderers();
+	$fhc_core_renderers["ferien"] = array(
+		'calendarEvent' => APP_ROOT.'public/js/components/Cis/Renderer/Feiertage/calendarEvent.js',
+		'modalTitle' => APP_ROOT.'public/js/components/Cis/Renderer/Feiertage/modalTitle.js',
+		'modalContent' => APP_ROOT.'public/js/components/Cis/Renderer/Feiertage/modalContent.js',
+		'calendarEventStyles' => APP_ROOT.'public/css/Cis4/CoreCalendarEvents.css'
+	);
+});
+
 
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index 8cb37658e..b2c82fd77 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -254,6 +254,66 @@ class StundenplanLib{
 		}
 	}
 
+	public function fetchFerienTageEvents($start_date, $end_date, $studiengang_kz){
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('organisation/Ferien_model','FerienModel');
+		$ferienEvents = $this->_ci->FerienModel->execReadOnlyQuery("
+		SELECT * 
+		FROM lehre.tbl_ferien
+		WHERE (bisdatum BETWEEN ? AND ?) AND (studiengang_kz = 0 OR studiengang_kz = ?)
+		",[$start_date, $end_date, $studiengang_kz]);
+
+		if (isError($ferienEvents)) {
+			return error(getData($ferienEvents));
+		}
+		$ferienEvents = getData($ferienEvents);
+
+		$ferienEvents = array_map(function($event){
+			$event_start = new DateTime($event->vondatum);
+			$event_end = new DateTime($event->bisdatum);
+			$event_end->modify('+1 day');
+
+			$interval = new DateInterval('P1D');
+			$period = new DatePeriod($event_start, $interval, $event_end);
+			$event->dates = array_map(function($date){
+				return $date->format('Y-m-d');
+			}, iterator_to_array($period));
+			return $event;
+		}, $ferienEvents);
+
+		$ferienEventsFlattened=[];
+		foreach($ferienEvents as $ferien_event){
+			foreach($ferien_event->dates as $date){
+				$event = new stdClass();
+				$event->bezeichnung = $ferien_event->bezeichnung;
+				$event->datum = $date;
+				$event->type = 'ferien';
+				$ferienEventsFlattened[] = $event;
+			}
+		};
+
+		$today=new DateTime();
+		$ferienEventsFlattened = array_map(function($event) use($today){
+			$ferien_event = (object) array(
+				'type' => 'ferien',
+				'beginn' => $today->format('H:i:s'),
+				'ende' => $today->format('H:i:s'),
+				'allDayEvent' => true,
+				'datum' => $event->datum,
+				'topic' => $event->bezeichnung,
+				'titel' => $event->bezeichnung,
+				'farbe' => '00689E'
+				
+			);
+			return $ferien_event;
+		}, $ferienEventsFlattened);
+		 
+
+		return $ferienEventsFlattened;
+	}
+
+	// start of the private functions ########################################################################################################
+
 	// function used to sort an array of studiensemester strings
 	private function sortStudienSemester(&$semester_range){
 		usort(
diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index 17dc817ef..99dd58b49 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -1,4 +1,4 @@
-/* Moodle Events in Month Page */
+/* Lehreinheits Events in Month Page */
 .monthPageContainer .lehreinheitEventContent{
 	display: flex;
 	border-bottom: 1px solid var(--bs-border-color);	
@@ -24,7 +24,7 @@
 	display:none;
 }
 
-/* Moodle Events in Week Page */
+/* Lehreinheits Events in Week Page */
 .weekPageContainer .lehreinheitEventContent {
 	display: grid;
 	grid-template-columns: auto 1fr;
@@ -50,7 +50,7 @@
 
 }
 
-/* Moodle Events in Day Page */
+/* Lehreinheits Events in Day Page */
 .dayPageContainer .lehreinheitEventContent {
 	display: flex;
 	padding-left:4rem;
@@ -72,3 +72,51 @@
 	font-weight: 500;
 }
 
+/* Ferientage Events in Month Page */
+.monthPageContainer .feiertagEventContent {
+	display: grid;
+	grid-template-columns: auto 1fr;
+	justify-items: center;
+	align-items:center;
+	color: var(--fhc-light);
+}
+
+.monthPageContainer .feiertagEventContent #ferienEventIcon{
+	margin: 0.5rem;
+}
+
+.monthPageContainer .feiertagEventContent #ferienEventTitle {
+
+}
+
+/* Ferientage Events in Week Page */
+.weekPageContainer .feiertagEventContent {
+	display: grid;
+	grid-template-columns: auto 1fr;
+	justify-items: center;
+	align-items:center;
+	color: var(--fhc-light);
+}
+
+.weekPageContainer .feiertagEventContent #ferienEventIcon {
+	margin: 0.25rem;
+}
+
+.weekPageContainer .feiertagEventContent #ferienEventTitle {
+	
+}
+
+/* Ferientage Events in Day Page */
+.dayPageContainer .feiertagEventContent {
+	display: grid;
+	grid-template-columns: auto 1fr;
+	justify-items: center;
+	align-items: center;
+	color: var(--fhc-light);
+}
+
+.dayPageContainer .feiertagEventContent #ferienEventIcon {
+	margin: 0.5rem;
+}
+
+.dayPageContainer .feiertagEventContent #ferienEventTitle {}
\ No newline at end of file
diff --git a/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js b/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
new file mode 100644
index 000000000..b3367b64e
--- /dev/null
+++ b/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
@@ -0,0 +1,14 @@
+
+export default {
+	props: {
+		event: {
+			type: Object,
+			required: true,
+		},
+	},
+	template: `
+		<div class="feiertagEventContent " >
+			<i id="ferienEventIcon" class="fa-regular fa-calendar"></i>
+			<span id="ferienEventTitle" ><strong>{{event.titel}}</strong></span>
+		</div>`,
+};
\ No newline at end of file
diff --git a/public/js/components/Cis/Renderer/Feiertage/modalContent.js b/public/js/components/Cis/Renderer/Feiertage/modalContent.js
new file mode 100644
index 000000000..aa0db470c
--- /dev/null
+++ b/public/js/components/Cis/Renderer/Feiertage/modalContent.js
@@ -0,0 +1,21 @@
+import { formatDate } from "../../../../helpers/DateHelpers.js"
+
+export default {
+	props:{
+		event: {
+			type: Object,
+			required: true,
+		},
+		
+	},
+	methods:{
+		methodFormatDate: function (d) {
+			return formatDate(d);
+		},
+	},
+	template: `
+	<div>
+	<h2>{{event.titel ? event.titel : event.topic}}</h2>
+	<p><i id="ferienEventIcon" class="fa-regular fa-calendar me-2"></i>{{methodFormatDate(event?.datum)}}</p>
+	</div>`,
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Renderer/Feiertage/modalTitle.js b/public/js/components/Cis/Renderer/Feiertage/modalTitle.js
new file mode 100644
index 000000000..59feee375
--- /dev/null
+++ b/public/js/components/Cis/Renderer/Feiertage/modalTitle.js
@@ -0,0 +1,11 @@
+export default {
+	props:{
+		event: {
+			type: Object,
+			required: true,
+		}
+	},
+	template:`
+			<div>{{ $p.t('global','feiertag') }}</div>
+`
+}
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 43913661a..6aeeca9cd 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -188,6 +188,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'feiertag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Feiertag',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Holiday',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',

From 1c73fdc83c18dba48755dec89ef6a68ba1464b98 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 30 Jun 2025 13:12:21 +0200
Subject: [PATCH 314/572] phrasen

---
 system/phrasesupdate.php | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 8ee5685d6..bb8a09605 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31692,7 +31692,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Keine zugeteilten Studenten gefunden für den gewählten LV-Teil gefunden!',
+				'text' => 'Keine zugeteilten Studenten für den gewählten LV-Teil gefunden!',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -32376,6 +32376,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'studentenInLVTeil',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studenten in LV-Teil',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Students in teaching unit',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',

From 5b10c87e9bbf8c59cdf353b3227077858dbbd5c4 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 30 Jun 2025 14:31:05 +0200
Subject: [PATCH 315/572] update(LvPlan Feiertage):if loggedin person does not
 have a studiengang, only consider studiengang 0

---
 application/controllers/api/frontend/v1/LvPlan.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 3e0bf3d50..63ca5b159 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -112,7 +112,11 @@ class LvPlan extends FHCAPI_Controller
 		$current_Studiensemester = current($current_Studiensemester)->studiensemester_kurzbz;
 		$studiengang = $this->StudentLehrverbandModel->loadWhere(["student_uid"=>getAuthUID(),"studiensemester_kurzbz"=>$current_Studiensemester]);
 		$studiengang = $this->getDataOrTerminateWithError($studiengang);
-		$studiengang = current($studiengang)->studiengang_kz;
+		if(!empty($studiengang)){
+			$studiengang = current($studiengang)->studiengang_kz;
+		}else{
+			$studiengang = 0;
+		}
 
 		$ferienEvents = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $studiengang);
 		

From ed17e87afd2f9ded0daffe31ad1da4434692f807 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 30 Jun 2025 14:51:42 +0200
Subject: [PATCH 316/572] dbupdate create Cis40 dashboard if it does not exist,
 61730_Dashboard_Anpassungen only output message if something was updated

---
 system/dbupdate_3.4.php                       |   1 +
 system/dbupdate_3.4/25999_C4_dashboard.php    | 352 ++++++++++++++++++
 .../61730_Dashboard_Anpassungen.php           |   7 +-
 3 files changed, 359 insertions(+), 1 deletion(-)
 create mode 100644 system/dbupdate_3.4/25999_C4_dashboard.php

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 8ff7fab2b..feccdb0f1 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -74,6 +74,7 @@ require_once('dbupdate_3.4/55968_index_anrechnung.php');
 require_once('dbupdate_3.4/25999_locale_update.php');
 require_once('dbupdate_3.4/55289_pep_fine_tuning.php');
 require_once('dbupdate_3.4/55614_perm_verwaltetoe.php');
+require_once('dbupdate_3.4/25999_C4_dashboard.php');
 require_once('dbupdate_3.4/61730_Dashboard_Anpassungen.php');
 
 
diff --git a/system/dbupdate_3.4/25999_C4_dashboard.php b/system/dbupdate_3.4/25999_C4_dashboard.php
new file mode 100644
index 000000000..aab20089c
--- /dev/null
+++ b/system/dbupdate_3.4/25999_C4_dashboard.php
@@ -0,0 +1,352 @@
+<?php
+/* Copyright (C) 2017 fhcomplete.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Harald Bamberger <harald.bamberger@technikum-wien.at>,
+ *
+ * Beschreibung:
+ * CIS 4.0 Dashboard
+ */
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// Add widget: Hallo Welt
+if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_widget WHERE widget_kurzbz = 'hallowelt';"))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = <<<EOWHW
+			INSERT INTO 
+				dashboard.tbl_widget (
+					widget_kurzbz, 
+					beschreibung, 
+					arguments, 
+					setup
+				) 
+			VALUES (
+				'hallowelt', 
+				'Hallo Welt Widget', 
+				'{"css": "d-flex justify-content-center align-items-center h-100", "title": "Hallo Welt"}'::jsonb,
+				'{"file": "DashboardWidget/Default.js", "icon": "https://upload.wikimedia.org/wikipedia/commons/8/8a/Farben-Testbild.svg", "name": "Hallo Welt", "width": {"max": 99}, "height": {"max": 99}, "hideFooter": false}'::jsonb
+			);
+EOWHW;
+
+		if(!$db->db_query($qry))
+		{
+			echo '<strong>dashboard.tbl_widget '.$db->db_last_error().'</strong><br>';
+		}
+		else
+		{
+			echo 'dashboard.tbl_widget: Added Widget "Hallo Welt"<br>';
+		}
+	}
+}
+
+// Add widget: News
+if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_widget WHERE widget_kurzbz = 'news';"))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = <<<EOWHW
+			INSERT INTO 
+				dashboard.tbl_widget (
+					widget_kurzbz, 
+					beschreibung, 
+					arguments, 
+					setup
+				) 
+			VALUES (
+				'news', 
+				'News Widget', 
+				'{}'::jsonb,
+				'{"file": "DashboardWidget/News.js", "icon": "/skin/images/fh_technikum_wien_illustration_klein.png", "name": "News", "width": {"max": 4, "min": 1}, "height": {"max": 2, "min": 1}, "cis4link": "/CisVue/Cms/news", "hideFooter": false}'::jsonb
+			);
+EOWHW;
+
+		if(!$db->db_query($qry))
+		{
+			echo '<strong>dashboard.tbl_widget '.$db->db_last_error().'</strong><br>';
+		}
+		else
+		{
+			echo 'dashboard.tbl_widget: Added Widget "News"<br>';
+		}
+	}
+}
+
+// Add widget: Bookmark
+if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_widget WHERE widget_kurzbz = 'url';"))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = <<<EOWHW
+			INSERT INTO 
+				dashboard.tbl_widget (
+					widget_kurzbz, 
+					beschreibung, 
+					arguments, 
+					setup
+				) 
+			VALUES (
+				'url', 
+				'Bookmark Widget', 
+				'{}'::jsonb,
+				'{"file": "DashboardWidget/Url.js", "icon": "/skin/images/fh_technikum_wien_illustration_klein.png", "name": "Bookmark", "width": 1, "height": {"max": 2, "min": 1}, "hideFooter": true}'::jsonb
+			);
+EOWHW;
+
+		if(!$db->db_query($qry))
+		{
+			echo '<strong>dashboard.tbl_widget '.$db->db_last_error().'</strong><br>';
+		}
+		else
+		{
+			echo 'dashboard.tbl_widget: Added Widget "Bookmark"<br>';
+		}
+	}
+}
+
+// Add widget: Ampel
+if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_widget WHERE widget_kurzbz = 'ampel';"))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = <<<EOWHW
+			INSERT INTO 
+				dashboard.tbl_widget (
+					widget_kurzbz, 
+					beschreibung, 
+					arguments, 
+					setup
+				) 
+			VALUES (
+				'ampel', 
+				'Ampel Widget', 
+				'{}'::jsonb,
+				'{"file": "DashboardWidget/Ampel.js", "icon": "/skin/images/fh_technikum_wien_illustration_klein.png", "name": "Ampel", "width": 1, "height": {"max": 2, "min": 1}, "hideFooter": false}'::jsonb
+			);
+EOWHW;
+
+		if(!$db->db_query($qry))
+		{
+			echo '<strong>dashboard.tbl_widget '.$db->db_last_error().'</strong><br>';
+		}
+		else
+		{
+			echo 'dashboard.tbl_widget: Added Widget "Ampel"<br>';
+		}
+	}
+}
+
+// update stundenplan widget
+if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_widget WHERE widget_kurzbz = 'stundenplan';"))
+{
+	if($db->db_num_rows($result) > 0)
+	{
+		$qry = <<<EOWHW
+			UPDATE 
+				dashboard.tbl_widget 
+			SET
+				widget_kurzbz = 'lvplan', 
+				beschreibung = 'LV-Plan Widget', 
+				arguments = '{"bodyClass": "p-0"}'::jsonb, 
+				setup = '{"file": "DashboardWidget/LvPlan.js", "icon": "/skin/images/fh_technikum_wien_illustration_klein.png", "name": "LV-Plan", "width": {"max": 4, "min": 1}, "height": {"max": 3, "min": 1}, "cis4link": "/Cis/LvPlan", "hideFooter": false}'::jsonb 
+			WHERE
+				widget_kurzbz = 'stundenplan';
+EOWHW;
+
+		if(!$db->db_query($qry))
+		{
+			echo '<strong>dashboard.tbl_widget '.$db->db_last_error().'</strong><br>';
+		}
+		else
+		{
+			echo 'dashboard.tbl_widget: Renamed Widget "Stundenplan" to "LV-Plan"<br>';
+		}
+	}
+}
+
+// Add widget: LV-Plan
+if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_widget WHERE widget_kurzbz = 'lvplan';"))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = <<<EOWHW
+			INSERT INTO 
+				dashboard.tbl_widget (
+					widget_kurzbz, 
+					beschreibung, 
+					arguments, 
+					setup
+				) 
+			VALUES (
+				'lvplan', 
+				'LV-Plan Widget', 
+				'{"bodyClass": "p-0"}'::jsonb,
+				'{"file": "DashboardWidget/LvPlan.js", "icon": "/skin/images/fh_technikum_wien_illustration_klein.png", "name": "LV-Plan", "width": {"max": 4, "min": 1}, "height": {"max": 3, "min": 1}, "cis4link": "/Cis/LvPlan", "hideFooter": false}'::jsonb
+			);
+EOWHW;
+
+		if(!$db->db_query($qry))
+		{
+			echo '<strong>dashboard.tbl_widget '.$db->db_last_error().'</strong><br>';
+		}
+		else
+		{
+			echo 'dashboard.tbl_widget: Added Widget "LV-Plan"<br>';
+		}
+	}
+}
+
+// Add widget: Studiengang
+if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_widget WHERE widget_kurzbz = 'studiengang';"))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = <<<EOWHW
+			INSERT INTO 
+				dashboard.tbl_widget (
+					widget_kurzbz, 
+					beschreibung, 
+					arguments, 
+					setup
+				) 
+			VALUES (
+				'studiengang', 
+				'Das Studiengang-Widget enthält Informationen über den Studiengang eines Studenten.', 
+				'{}'::jsonb,
+				'{"file": "DashboardWidget/Studiengang.js", "icon": "/skin/images/fh_technikum_wien_illustration_klein.png", "name": "Studiengang", "width": {"max": 2, "min": 1}, "height": {"max": 4, "min": 1}, "hideFooter": true}'::jsonb
+			);
+EOWHW;
+
+		if(!$db->db_query($qry))
+		{
+			echo '<strong>dashboard.tbl_widget '.$db->db_last_error().'</strong><br>';
+		}
+		else
+		{
+			echo 'dashboard.tbl_widget: Added Widget "Studiengang"<br>';
+		}
+	}
+}
+
+// Add dashboard: CIS
+if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_dashboard WHERE dashboard_kurzbz = 'CIS';"))
+{
+    if($db->db_num_rows($result) == 0)
+    {
+        $qry = "INSERT INTO dashboard.tbl_dashboard(dashboard_kurzbz, beschreibung) VALUES('CIS', 'CIS 4.0 Dashboard');";
+
+        if(!$db->db_query($qry))
+        {
+            echo '<strong>dashboard.tbl_dashboard '.$db->db_last_error().'</strong><br>';
+        }
+        else
+        {
+            echo 'dashboard.tbl_dashboard: Added Dashboard "CIS"<br>';
+        }
+
+		$widgetmappingqry = <<<EOWMQ
+			insert into 
+				dashboard.tbl_dashboard_widget (
+					dashboard_id, 
+					widget_id
+				) 
+				(
+					select 
+						td.dashboard_id, tw.widget_id 
+					from 
+						dashboard.tbl_dashboard td 
+					cross join 
+						dashboard.tbl_widget tw 
+					where 
+						td.dashboard_kurzbz = 'CIS' 
+						and 
+						tw.widget_kurzbz in ('hallowelt', 'news', 'url', 'ampel', 'studiengang')
+					order by td.dashboard_id, tw.widget_id
+				) 
+			ON CONFLICT (dashboard_id, widget_id) DO NOTHING
+EOWMQ;
+
+        if(!$db->db_query($widgetmappingqry))
+        {
+            echo '<strong>dashboard.tbl_dashboard_widget '.$db->db_last_error().'</strong><br>';
+        }
+        else
+        {
+            echo 'dashboard.tbl_dashboard_widget: Added WidgetMapping for Dashboard "CIS"<br>';
+        }
+    }
+}
+
+// Add general preset for dashboard: CIS
+if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_dashboard_preset WHERE funktion_kurzbz IS NULL AND dashboard_id = (select dashboard_id from dashboard.tbl_dashboard where dashboard_kurzbz = 'CIS');"))
+{
+    if($db->db_num_rows($result) == 0)
+    {
+        $qry = <<<EOGP
+			insert into 
+				dashboard.tbl_dashboard_preset (
+					dashboard_id,
+					funktion_kurzbz,
+					preset
+				)
+				values (
+					(select dashboard_id from dashboard.tbl_dashboard where dashboard_kurzbz = 'CIS'),
+					NULL,
+					(SELECT '{"general": {"widgets": {"2ad7f459a8218ae39f0b68201a9545a4": {"place": {"4": {"h": 2, "w": 3, "x": 0, "y": 0}}, "config": [], "preset": 1, "widget": ' || (select widget_id from dashboard.tbl_widget where widget_kurzbz = 'news')  || ', "widgetid": "2ad7f459a8218ae39f0b68201a9545a4"}, "4590326a80c27e61d861b18b46858084": {"place": {"4": {"h": 1, "w": 1, "x": 3, "y": 2}}, "config": [], "preset": 1, "widget": ' || (select widget_id from dashboard.tbl_widget where widget_kurzbz = 'lvplan')  || ', "widgetid": "4590326a80c27e61d861b18b46858084"}, "8ec3f441d4adc9dd2bc5cc14a663eae9": {"place": {"4": {"h": 1, "w": 1, "x": 0, "y": 2}}, "config": [], "preset": 1, "widget": ' || (select widget_id from dashboard.tbl_widget where widget_kurzbz = 'url')  || ', "widgetid": "8ec3f441d4adc9dd2bc5cc14a663eae9"}, "e4214d3f2bed8740d4c9cede165ccd07": {"place": {"4": {"h": 2, "w": 1, "x": 3, "y": 0}}, "config": [], "preset": 1, "widget": ' || (select widget_id from dashboard.tbl_widget where widget_kurzbz = 'ampel')  || ', "widgetid": "e4214d3f2bed8740d4c9cede165ccd07"}}}}')::jsonb
+				)
+EOGP;
+
+        if(!$db->db_query($qry))
+        {
+            echo '<strong>dashboard.tbl_dashboard_preset '.$db->db_last_error().'</strong><br>';
+        }
+        else
+        {
+            echo 'dashboard.tbl_dashboard_preset: Added General Preset for Dashboard "CIS"<br>';
+        }
+	}
+}
+
+// Add general preset for dashboard: CIS
+if($result = @$db->db_query("SELECT 1 FROM dashboard.tbl_dashboard_preset WHERE funktion_kurzbz = 'Student' AND dashboard_id = (select dashboard_id from dashboard.tbl_dashboard where dashboard_kurzbz = 'CIS');"))
+{
+    if($db->db_num_rows($result) == 0)
+    {
+        $qry = <<<EOGP
+			insert into 
+				dashboard.tbl_dashboard_preset (
+					dashboard_id,
+					funktion_kurzbz,
+					preset
+				)
+				values (
+					(select dashboard_id from dashboard.tbl_dashboard where dashboard_kurzbz = 'CIS'),
+					'Student',
+					(SELECT '{"Student": {"widgets": {"3c448b2a774ff361bf59516ef0b841ef": {"place": {"4": {"h": 1, "w": 1, "x": 3, "y": 0}}, "config": [], "preset": 1, "widget": 6, "widgetid": "3c448b2a774ff361bf59516ef0b841ef"}, "83808e47ccf95db1afb4fe014d221ca9": {"place": {"4": {"h": 1, "w": 1, "x": 0, "y": 0}}, "config": {}, "preset": 1, "widget": ' || (select widget_id from dashboard.tbl_widget where widget_kurzbz = 'studiengang')  || ', "widgetid": "83808e47ccf95db1afb4fe014d221ca9"}}}}')::jsonb
+				)
+EOGP;
+
+        if(!$db->db_query($qry))
+        {
+            echo '<strong>dashboard.tbl_dashboard_preset '.$db->db_last_error().'</strong><br>';
+        }
+        else
+        {
+            echo 'dashboard.tbl_dashboard_preset: Added Student Preset for Dashboard "CIS"<br>';
+        }
+	}
+}
\ No newline at end of file
diff --git a/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php b/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php
index e59df948a..60ad958a6 100644
--- a/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php
+++ b/system/dbupdate_3.4/61730_Dashboard_Anpassungen.php
@@ -1,7 +1,9 @@
 <?php
 
+$rowcount = 0;
 $result = @$db->db_query("SELECT preset_id FROM dashboard.tbl_dashboard_preset WHERE preset ? 'widgets'");
 $result_num_rows = $db->db_num_rows($result);
+$rowcount += $result_num_rows;
 $errorList = array();
 for($i = 0; $i < $result_num_rows; $i++)
 {
@@ -26,6 +28,7 @@ for($i = 0; $i < $result_num_rows; $i++)
 
 $result = @$db->db_query("SELECT override_id FROM dashboard.tbl_dashboard_benutzer_override WHERE override ? 'widgets'");
 $result_num_rows = $db->db_num_rows($result);
+$rowcount += $result_num_rows;
 for($i = 0; $i < $result_num_rows; $i++)
 {
 	$row = $db->db_fetch_object($result, $i);
@@ -48,7 +51,9 @@ for($i = 0; $i < $result_num_rows; $i++)
 }
 
 if(empty($errorList)){
-	echo '<br>successfully updated dashboard.tbl_dashboard_preset and dashboard.tbl_dashboard_benutzer_override';
+	if($rowcount > 0) {
+		echo '<br>successfully updated dashboard.tbl_dashboard_preset and dashboard.tbl_dashboard_benutzer_override';
+	}
 }
 else{
 	foreach($errorList as $error){

From 9c30b5438fd5f21cb1fed774752d1822bd8f369a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 30 Jun 2025 15:07:16 +0200
Subject: [PATCH 317/572] update(StundenplanLib StundenplanQuery): removes the
 ort_kurzbz from the group by because the ort_kurzbz should be grouped in the
 aggregate function

---
 application/models/ressource/Stundenplan_model.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 012ce0a57..672bacfc3 100644
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -178,7 +178,7 @@ class Stundenplan_model extends DB_Model
 
 		) as subquery
 
-		GROUP BY unr, datum, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
+		GROUP BY unr, datum, beginn, ende, titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
 
 		ORDER BY datum, beginn
 		");
@@ -235,7 +235,7 @@ class Stundenplan_model extends DB_Model
 			
 		) as subquery
 
-		GROUP BY unr, datum, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
+		GROUP BY unr, datum, beginn, ende, titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
 
 		ORDER BY datum, beginn
 		", [$start_date, $end_date, $lv_id]);
@@ -292,7 +292,7 @@ class Stundenplan_model extends DB_Model
 		
 			) as subquery
 		
-		GROUP BY unr, datum, beginn, ende, ort_kurzbz,  titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
+		GROUP BY unr, datum, beginn, ende,  titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
 		
 		ORDER BY datum, beginn", [$start_date, $end_date, $ma_uid]);
 	}

From 83ac1abcf6ae876319ed90446a790135bed4b2b9 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 30 Jun 2025 15:26:25 +0200
Subject: [PATCH 318/572] update(LvPlan Events): overflow css fix for the
 LvPlan Events

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

diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index 99dd58b49..1611ac123 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -44,9 +44,9 @@
 .weekPageContainer .lehreinheitEventContent #lehreinheitEventText {
 	display: flex;
 	flex-direction: column;
-	place-content: center space-evenly;
-	flex-wrap: wrap;
 	column-gap: 5px;
+	overflow-y: scroll;
+	min-height:0;
 
 }
 

From 986d1cfb5fde770bf18a96159cbffc45b244b83f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 30 Jun 2025 17:02:45 +0200
Subject: [PATCH 319/572] add aria-label to skip link and raumsuche tabulator
 links, move skip link to html body, change raumsuche h2 to h1

---
 application/helpers/hlp_header_helper.php       |  2 +-
 application/views/templates/FHC-Header.php      |  5 +++--
 public/js/components/Cis/Raumsuche/Raumsuche.js | 14 ++++++++++----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/application/helpers/hlp_header_helper.php b/application/helpers/hlp_header_helper.php
index cbc1319c7..24c02eac5 100644
--- a/application/helpers/hlp_header_helper.php
+++ b/application/helpers/hlp_header_helper.php
@@ -243,6 +243,6 @@ function generateSkipLink($skipID)
 {
 	$toPrint = '<a id="skiplink" href="';
 	$toPrint.=$skipID;
-	$toPrint.='" class="fhcSkipLink"></a>';
+	$toPrint.='" class="fhcSkipLink" aria-label="Skip to main content"></a>';
 	echo $toPrint;
 }
diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php
index e486ac8f9..f7b5491a1 100644
--- a/application/views/templates/FHC-Header.php
+++ b/application/views/templates/FHC-Header.php
@@ -16,8 +16,7 @@
 <!DOCTYPE HTML>
 <html>
 	<head>
-		<?php if($skipID) generateSkipLink($skipID); ?>
-		
+
 		<title><?php printPageTitle($title); ?></title>
 
 		<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -139,5 +138,7 @@
 	</head>
 	<body>
 
+		<?php if($skipID) generateSkipLink($skipID); ?>
+
 <!-- Header end -->
 
diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index ab2ceb563..978e92407 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -56,7 +56,7 @@ export const Raumsuche =  {
 					{title: Vue.computed(() => this.$p.t('global/bezeichnung')), field: 'bezeichnung', widthGrow: 2},
 					{title: Vue.computed(() => this.$p.t('global/nummer')), field: 'nummer', widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('global/personen')), field: 'personen', widthGrow: 1},
-					{title: Vue.computed(() => this.$p.t('rauminfo/raumInfo')),
+					{title: Vue.computed(() => this.$p.t('rauminfo/rauminfo')),
 						field: 'linkInfo', formatter: this.linkFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('rauminfo/roomReservations')), 
 						field: 'linkRes', formatter: this.linkFormatter, widthGrow: 1}
@@ -87,10 +87,16 @@ export const Raumsuche =  {
 			this.tableBuiltResolve = resolve
 		},
 		linkFormatter(cell) {
-			const val = cell.getValue()
+			const val = cell.getValue();
+			const field = cell.getField();
+			const arialabel = (field === 'linkInfo') 
+							? this.$p.t('rauminfo/rauminfo') 
+							: this.$p.t('rauminfo/roomReservations');
 			if(val) {
 				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
-				'<a href="'+val+'"><i class="fa fa-arrow-up-right-from-square me-1 fhc-primary-color" ></i></a></div>'
+				'<a href="'+val+'" aria-label="' + arialabel + '">' +
+				'<i class="fa fa-arrow-up-right-from-square me-1 fhc-primary-color" ></i>' +
+				'</a></div>'
 			} else {
 				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
 					'-</div>'
@@ -192,7 +198,7 @@ export const Raumsuche =  {
 		this.setupMounted()
 	},
 	template: `
-	<h2>{{$p.t('lvplan/raumsuche')}}</h2>
+	<h1 class="h3">{{$p.t('lvplan/raumsuche')}}</h1>
 	<hr>
 	<div class="row">
 		<div class="col-12 col-lg-2">

From 34220a8f390a7b454875e7ee51133ccdd31c7f8c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 30 Jun 2025 17:10:13 +0200
Subject: [PATCH 320/572] add alt text to profile picture

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

diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 99a281ec4..7a2d174ee 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -98,7 +98,7 @@ export default {
 		this.fetchMenu();
 	},
 	mounted(){
-		this.$p.loadCategory(['ui', 'global'])
+		this.$p.loadCategory(['ui', 'global', 'profilUpdate'])
 		this.navUserDropdown = new bootstrap.Collapse(this.$refs.navUserDropdown,{
 			toggle: false
 		});
@@ -118,7 +118,7 @@ export default {
     </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" class="bg-dark avatar rounded-circle border border-dark"/>
+			<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"

From e9614e8ca8fe4858cd627ada4864b1e8804c7c93 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 1 Jul 2025 12:12:48 +0200
Subject: [PATCH 321/572] add css classes searchbar_label and searchbar_value
 to improve responsiveness of results in Cis4

---
 public/js/components/searchbar/result/dms.js  | 16 ++++-----
 .../components/searchbar/result/employee.js   | 16 ++++-----
 .../searchbar/result/mergedperson.js          | 36 +++++++++----------
 .../searchbar/result/organisationunit.js      | 16 ++++-----
 .../js/components/searchbar/result/person.js  |  8 ++---
 .../components/searchbar/result/prestudent.js | 24 ++++++-------
 public/js/components/searchbar/result/room.js | 18 +++++-----
 .../js/components/searchbar/result/student.js | 16 ++++-----
 8 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/public/js/components/searchbar/result/dms.js b/public/js/components/searchbar/result/dms.js
index 75b281541..8516c1555 100644
--- a/public/js/components/searchbar/result/dms.js
+++ b/public/js/components/searchbar/result/dms.js
@@ -46,26 +46,26 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_dms_id') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_dms_id') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.dms_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_version') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_version') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.version }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_keywords') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_keywords') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.keywords }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('global/beschreibung') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('global/beschreibung') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.description }}
 				</div>
 			</div>
diff --git a/public/js/components/searchbar/result/employee.js b/public/js/components/searchbar/result/employee.js
index a86fc6cbf..b86aa3ca5 100644
--- a/public/js/components/searchbar/result/employee.js
+++ b/public/js/components/searchbar/result/employee.js
@@ -21,8 +21,8 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_stdkst') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_stdkst') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					<ul class="searchbar_inline_ul" v-if="res.standardkostenstelle.length > 0">
 						<li v-for="(stdkst, idx) in res.standardkostenstelle" :key="idx">{{ stdkst }}</li>
 					</ul>
@@ -30,8 +30,8 @@ export default {
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('lehre/organisationseinheit') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('lehre/organisationseinheit') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					<ul class="searchbar_inline_ul" v-if="res.organisationunit_name.length > 0">
 						<li v-for="(oe, idx) in res.organisationunit_name" :key="idx">{{ oe }}</li>
 					</ul>
@@ -39,16 +39,16 @@ export default {
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_emails') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_emails') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					<a :href="'mailto:' + res.email" class="d-block">
 						{{ res.email }}
 					</a>
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('person/telefon') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('person/telefon') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					<a :href="'tel:' + res.phone" class="d-block">
 						{{ res.phone }}
 					</a>
diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
index fb9684303..f02febf6f 100644
--- a/public/js/components/searchbar/result/mergedperson.js
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -68,14 +68,14 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('person/person_id') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('person/person_id') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ person.person_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_emails') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_emails') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
 						{{ email }}
 					</a>
@@ -95,8 +95,8 @@ export default {
 					</div>
 				</div>
 				<div class="searchbar_tablerow">
-					<div class="searchbar_tablecell ps-3">{{ $p.t('search/result_stdkst') }}</div>
-					<div class="searchbar_tablecell">
+					<div class="searchbar_tablecell searchbar_label ps-3">{{ $p.t('search/result_stdkst') }}</div>
+					<div class="searchbar_tablecell searchbar_value">
 						<ul class="searchbar_inline_ul" v-if="employee.standardkostenstelle.length > 0">
 							<li
 								v-for="(stdkst, idx) in employee.standardkostenstelle"
@@ -109,8 +109,8 @@ export default {
 					</div>
 				</div>
 				<div class="searchbar_tablerow">
-					<div class="searchbar_tablecell ps-3">{{ $p.t('lehre/organisationseinheit') }}</div>
-					<div class="searchbar_tablecell">
+					<div class="searchbar_tablecell searchbar_label ps-3">{{ $p.t('lehre/organisationseinheit') }}</div>
+					<div class="searchbar_tablecell searchbar_value">
 						<ul class="searchbar_inline_ul" v-if="employee.organisationunit_name.length > 0">
 							<li
 								v-for="(oe, idx) in employee.organisationunit_name"
@@ -123,8 +123,8 @@ export default {
 					</div>
 				</div>
 				<div class="searchbar_tablerow">
-					<div class="searchbar_tablecell ps-3">{{ $p.t('person/telefon') }}</div>
-					<div class="searchbar_tablecell">
+					<div class="searchbar_tablecell searchbar_label ps-3">{{ $p.t('person/telefon') }}</div>
+					<div class="searchbar_tablecell searchbar_value">
 						<a :href="telurl">
 							{{ employee.phone }}
 						</a>
@@ -152,26 +152,26 @@ export default {
 						</div>
 					</div>
 					<div class="searchbar_tablerow">
-						<div class="searchbar_tablecell ps-3">{{ $p.t('lehre/studiengang') }}</div>
-						<div class="searchbar_tablecell">
+						<div class="searchbar_tablecell searchbar_label ps-3">{{ $p.t('lehre/studiengang') }}</div>
+						<div class="searchbar_tablecell searchbar_value">
 							{{ student.bezeichnung }} {{ student.orgform ? '(' + student.orgform + ')' : '' }}
 						</div>
 					</div>
 					<div class="searchbar_tablerow">
-						<div class="searchbar_tablecell ps-3">{{ $p.t('search/result_prestudent_id') }}</div>
-						<div class="searchbar_tablecell">
+						<div class="searchbar_tablecell searchbar_label ps-3">{{ $p.t('search/result_prestudent_id') }}</div>
+						<div class="searchbar_tablecell searchbar_value">
 							{{ student.prestudent_id }}
 						</div>
 					</div>
 					<div v-if="student.uid" class="searchbar_tablerow">
-						<div class="searchbar_tablecell ps-3">{{ $p.t('search/result_student_uid') }}</div>
-						<div class="searchbar_tablecell">
+						<div class="searchbar_tablecell searchbar_label ps-3">{{ $p.t('search/result_student_uid') }}</div>
+						<div class="searchbar_tablecell searchbar_value">
 							{{ student.uid }}
 						</div>
 					</div>
 					<div v-if="student.matrikelnr" class="searchbar_tablerow">
-						<div class="searchbar_tablecell ps-3">{{ $p.t('person/matrikelnummer') }}</div>
-						<div class="searchbar_tablecell">
+						<div class="searchbar_tablecell searchbar_label ps-3">{{ $p.t('person/matrikelnummer') }}</div>
+						<div class="searchbar_tablecell searchbar_value">
 							{{ student.matrikelnr }}
 						</div>
 					</div>
diff --git a/public/js/components/searchbar/result/organisationunit.js b/public/js/components/searchbar/result/organisationunit.js
index 1d9c03b08..66dda9726 100644
--- a/public/js/components/searchbar/result/organisationunit.js
+++ b/public/js/components/searchbar/result/organisationunit.js
@@ -20,15 +20,15 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_parent_oe') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_parent_oe') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.parentoe_name }}
 				</div>
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_group_emails') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_group_emails') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					<a v-if="res.mailgroup" :href="'mailto:' + res.mailgroup">
 						{{ res.mailgroup }}
 					</a>
@@ -37,8 +37,8 @@ export default {
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_leader') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_leader') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					<ul class="searchbar_inline_ul" v-if="res.leaders.length > 0">
 						<li v-for="(leader, idx) in res.leaders" :key="idx">{{ leader.name }}</li>
 					</ul>
@@ -47,8 +47,8 @@ export default {
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_number_of_employees') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_number_of_employees') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.number_of_people }}
 				</div>
 			</div>
diff --git a/public/js/components/searchbar/result/person.js b/public/js/components/searchbar/result/person.js
index f6ce0a5f0..f255caffe 100644
--- a/public/js/components/searchbar/result/person.js
+++ b/public/js/components/searchbar/result/person.js
@@ -26,14 +26,14 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('person/person_id') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('person/person_id') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.person_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_emails') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_emails') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
 						{{ email }}
 					</a>
diff --git a/public/js/components/searchbar/result/prestudent.js b/public/js/components/searchbar/result/prestudent.js
index 7852bbe57..574f9c4fb 100644
--- a/public/js/components/searchbar/result/prestudent.js
+++ b/public/js/components/searchbar/result/prestudent.js
@@ -41,40 +41,40 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('person/person_id') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('person/person_id') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.person_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_emails') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_emails') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
 						{{ email }}
 					</a>
 				</div>
 			</div>
 			<div v-if="res.uid" class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_student_uid') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_student_uid') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.uid }}
 				</div>
 			</div>
 			<div v-if="res.matrikelnr" class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('person/matrikelnummer') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('person/matrikelnummer') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.matrikelnr }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_prestudent_id') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_prestudent_id') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.prestudent_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('lehre/studiengang') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('lehre/studiengang') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.bezeichnung }} {{ res.orgform ? '(' + res.orgform + ')' : '' }}
 				</div>
 			</div>
diff --git a/public/js/components/searchbar/result/room.js b/public/js/components/searchbar/result/room.js
index 8a7d8c124..03c59deb5 100644
--- a/public/js/components/searchbar/result/room.js
+++ b/public/js/components/searchbar/result/room.js
@@ -39,18 +39,18 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_room_address') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_room_address') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ address }}
 				</div>
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_workplaces') }}</div>
-				<div v-if="mode == 'simple'" class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_workplaces') }}</div>
+				<div v-if="mode == 'simple'" class="searchbar_tablecell searchbar_value">
 					{{ res.sitzplaetze }}
 				</div>
-				<div v-else class="searchbar_tablecell">
+				<div v-else class="searchbar_tablecell searchbar_value">
 					<template v-if="res.max_person !== null && res.workplaces !== null">
 						{{ $p.t('search/result_workplaces_pc', res) }}
 					</template>
@@ -61,15 +61,15 @@ export default {
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_building') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_building') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.building }}
 				</div>
 			</div>
 
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_equipment') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_equipment') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					<div v-if="mode == 'simple'" class="no-margin-paragraphs" v-html="res.austattung.replace('<br />','')"></div>
 					<div v-else class="no-margin-paragraphs" v-html="equipment"></div>
 				</div>
diff --git a/public/js/components/searchbar/result/student.js b/public/js/components/searchbar/result/student.js
index 1d6eb2a61..6a38ba9bc 100644
--- a/public/js/components/searchbar/result/student.js
+++ b/public/js/components/searchbar/result/student.js
@@ -36,26 +36,26 @@ export default {
 		>
 		<div class="searchbar_table">
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_student_uid') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_student_uid') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.uid }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('person/person_id') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('person/person_id') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.person_id }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('person/matrikelnummer') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('person/matrikelnummer') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					{{ res.matrikelnr }}
 				</div>
 			</div>
 			<div class="searchbar_tablerow">
-				<div class="searchbar_tablecell">{{ $p.t('search/result_emails') }}</div>
-				<div class="searchbar_tablecell">
+				<div class="searchbar_tablecell searchbar_label">{{ $p.t('search/result_emails') }}</div>
+				<div class="searchbar_tablecell searchbar_value">
 					<a v-for="email in emails" :key="email" :href="'mailto:' + email" class="d-block">
 						{{ email }}
 					</a>

From c353e854e8cacffc2490db255932ec87c1f9be1e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 1 Jul 2025 14:32:33 +0200
Subject: [PATCH 322/572] Tab Anrechnungen/Exemptions

- bugfix handle overflow in textfield of Notiz
- bugfix delete: remove anrechnung_id also from lehre.tbl_anrechnung_anrechnungstatus
- redesign Notizen of Anrechnungen: header with title Lehrveranstaltungen
- add reload functionality to update count of notizen in action buttons
---
 .../api/frontend/v1/stv/Anrechnungen.php      | 15 +++++++++++++
 .../Anrechnunganrechnungstatus_model.php      | 14 ++++++++++++
 public/css/Studentenverwaltung.css            |  3 ++-
 public/css/components/Notiz.css               | 22 ++++++++++++++++++-
 public/js/components/Notiz/Notiz.js           | 19 ++++++++++++----
 .../Details/Anrechnungen/Anrechnungen.js      | 12 ++++++++--
 6 files changed, 77 insertions(+), 8 deletions(-)
 create mode 100644 application/models/education/Anrechnunganrechnungstatus_model.php

diff --git a/application/controllers/api/frontend/v1/stv/Anrechnungen.php b/application/controllers/api/frontend/v1/stv/Anrechnungen.php
index 85019334f..251e2d5bd 100644
--- a/application/controllers/api/frontend/v1/stv/Anrechnungen.php
+++ b/application/controllers/api/frontend/v1/stv/Anrechnungen.php
@@ -157,6 +157,7 @@ class Anrechnungen extends FHCAPI_Controller
 
 	public function loadAnrechnung($anrechnung_id)
 	{
+		$this->AnrechnungsModel->addJoin('lehre.tbl_lehrveranstaltung lv', 'ON (lv.lehrveranstaltung_id = lehre.tbl_anrechnung.lehrveranstaltung_id)');
 		$result = $this->AnrechnungsModel->loadWhere(
 			array('anrechnung_id' => $anrechnung_id)
 		);
@@ -231,11 +232,25 @@ class Anrechnungen extends FHCAPI_Controller
 
 	public function deleteAnrechnung($anrechnung_id)
 	{
+		// Start DB transaction
+		$this->db->trans_begin();
+
+		//delete anrechnung_id of table tbl_anrechnung_anrechnungstatus
+		$this->load->model('education/Anrechnunganrechnungstatus_model','AnrechnungAnrechnungstatusModel');
+		$result = $this->AnrechnungAnrechnungstatusModel->delete(
+			array('anrechnung_id' => $anrechnung_id)
+		);
+		$this->getDataOrTerminateWithError($result);
+
+		//delete anrechnung_id of table tbl_anrechnung
 		$result = $this->AnrechnungsModel->delete(
 			array('anrechnung_id' => $anrechnung_id)
 		);
 
 		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->db->trans_commit();
+
 		$this->terminateWithSuccess($data);
 	}
 }
diff --git a/application/models/education/Anrechnunganrechnungstatus_model.php b/application/models/education/Anrechnunganrechnungstatus_model.php
new file mode 100644
index 000000000..68b319506
--- /dev/null
+++ b/application/models/education/Anrechnunganrechnungstatus_model.php
@@ -0,0 +1,14 @@
+<?php
+
+class Anrechnunganrechnungstatus_model extends DB_Model
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_anrechnung_anrechnungstatus';
+		$this->pk = 'anrechnungstatus_id';
+	}
+}
diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index d39cfc9b1..0b62e2809 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -58,7 +58,8 @@ html {
 	overflow: visible !important;
 }
 
-.tabulator-cell {
+/* to avoid interference with Notiz.css and overflow for textfield */
+.stv-details-abschlusspruefung .tabulator-cell {
 	overflow: visible !important;
 }
 
diff --git a/public/css/components/Notiz.css b/public/css/components/Notiz.css
index 75c69ec80..badfa4538 100644
--- a/public/css/components/Notiz.css
+++ b/public/css/components/Notiz.css
@@ -3,4 +3,24 @@
 }
 .notizText {
     color: darkblue;
-}
\ No newline at end of file
+}
+
+/* Enforce content clipping in the scrollable section */
+.tabulator .tabulator-tableHolder {
+    overflow-x: hidden;
+    position: relative;
+}
+
+.tabulator .tabulator-table {
+    overflow-x: hidden;
+    table-layout: fixed;
+    width: 100%;
+}
+
+.tabulator .tabulator-cell {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-width: 100%;
+}
+
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 44cc56374..0d180d2ff 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -81,6 +81,7 @@ export default {
 						title: "Text",
 						field: "text_stripped",
 						width: 250,
+						clipContents: true,
 						tooltip:function(e, cell, onRendered){
 							var el = document.createElement("div");
 							el.style.backgroundColor = "white";
@@ -174,6 +175,7 @@ export default {
 					}],
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
+				responsiveLayout: "collapse",
 				height: '250',
 				selectableRangeMode: 'click',
 				selectable: true,
@@ -200,10 +202,6 @@ export default {
 							title: this.$p.t('global', 'titel'),
 							//visible: this.showVariables.showTitel
 						});
-						cm.getColumnByField('text_stripped').component.updateDefinition({
-							title: this.$p.t('global', 'text'),
-							//visible: this.showVariables.showText
-						});
 						cm.getColumnByField('bearbeiter').component.updateDefinition({
 							title: this.$p.t('notiz', 'bearbeiter'),
 							visible: this.showVariables.showBearbeiter
@@ -250,6 +248,16 @@ export default {
 						cm.getColumnByField('actions').component.updateDefinition({
 							title: this.$p.t('global', 'aktionen')
 						});
+
+						cm.getColumnByField('text_stripped').component.updateDefinition({
+							title: this.$p.t('global', 'text'),
+							width: 250,
+							tooltip: true,
+							clipContents: true,
+						});
+
+						// Force layout recalculation for handling overflow text
+						this.$refs.table.tabulator.redraw(true);
 					}
 				}
 			],
@@ -355,6 +363,7 @@ export default {
 						this.$refs.NotizModal.hide();
 					}
 					this.reload();
+					this.$emit('reload');
 				})
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
@@ -367,6 +376,7 @@ export default {
 				.then(result => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 					this.reload();
+					this.$emit('reload');
 					this.resetFormData();
 				})
 				.catch(this.$fhcAlert.handleSystemError)
@@ -410,6 +420,7 @@ export default {
 						this.$refs.NotizModal.hide();
 					}
 					this.reload();
+					this.$emit('reload');
 				})
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index 23e3819ff..abe5d177d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -182,6 +182,7 @@ export default {
 		},
 		addNote(anrechnung_id){
 			this.currentAnrechnung_id = anrechnung_id;
+			this.loadAnrechnung(this.currentAnrechnung_id);
 			this.showNotizen = true;
 		},
 		addNewAnrechnung(){
@@ -266,6 +267,9 @@ export default {
 		reload() {
 			this.$refs.table.reloadTable();
 		},
+		handleReload(){
+			this.reload();
+		},
 		resetForm(){
 			this.formData = {};
 			this.statusNew = true;
@@ -303,7 +307,7 @@ export default {
 					<h5>{{$p.t('lehre', 'anrechnungen')}}</h5>
 					
 					<div v-if="showNotizen" class="border p-3 overflow-auto" style="height: 200px;">
-							<div class="justify-content-end pb-3">
+							<!-- <div class="justify-content-end pb-3">
 								<form-input
 									container-class="form-switch"
 									type="checkbox"
@@ -312,7 +316,10 @@ export default {
 									@change="onSwitchHide"
 									>
 								</form-input>
-							</div>
+							</div> -->
+						<h6><strong>LV {{formData.lehrveranstaltung_id}}:
+							{{formData.bezeichnung}} | {{formData.bezeichnung_english}}</strong></h6>
+
 						<core-notiz
 							:endpoint="endpoint"
 							ref="formNotes"
@@ -322,6 +329,7 @@ export default {
 							show-document
 							show-tiny-mce
 							:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
+							@reload="handleReload"
 							>
 						</core-notiz>
 					

From 9315503ec162fdd799e98eb3b45e28a2ea3b8146 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 1 Jul 2025 15:46:09 +0200
Subject: [PATCH 323/572] Header: use comma in name only if posttitel exists

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

diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 0b50c5153..96cd2e4b7 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -132,7 +132,8 @@ export default {
 						<h2 class="h4">
 							{{headerData[0].titelpre}}
 							{{headerData[0].vorname}}
-							{{headerData[0].nachname}},
+							{{headerData[0].nachname}}
+							<span v-if="headerData[0].titelpost">, </span>
 							{{headerData[0].titelpost}}
 						</h2>
 

From bf1dac3fd9844d019cdc01d4f663062df71b92de Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 2 Jul 2025 08:55:21 +0200
Subject: [PATCH 324/572] update(LvPlan Feiertage): checks if the query result
 is array before performing array operations and returns success status
 instead of raw data

---
 .../controllers/api/frontend/v1/LvPlan.php    |  2 +-
 .../controllers/api/frontend/v1/Studium.php   |  4 +-
 application/libraries/StundenplanLib.php      | 93 ++++++++++---------
 3 files changed, 52 insertions(+), 47 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 63ca5b159..69d08110a 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -119,7 +119,7 @@ class LvPlan extends FHCAPI_Controller
 		}
 
 		$ferienEvents = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $studiengang);
-		
+		$ferienEvents = $this->getDataOrTerminateWithError($ferienEvents);
 		$allEvents = array_merge($lvAndMoodleEvents,$ferienEvents);
 		// sort array with moodle events first
 		usort($lvAndMoodleEvents, function($a, $b){
diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index e4cf9e6a3..23c6b87d5 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -311,9 +311,7 @@ SELECT tbl_lehrveranstaltung.*,
 	private function computeLektorenFromLehrveranstaltung($lehreinheit_id, $semester, $studiengang, $studiensemester){
 		$this->load->library('StundenplanLib');
 		$lektoren = $this->stundenplanlib->getLektorenFromLehrveranstaltung($lehreinheit_id,$semester, $studiengang,$studiensemester);
-		if(!$lektoren){
-			return [];
-		}
+		$lektoren = $this->getDataOrTerminateWithError($lektoren);
 		$lektoren = array_map(function($lektor){
 			return ["name"=>$this->getDataOrTerminateWithError($this->PersonModel->getFullName($lektor)), "email"=>$lektor."@".DOMAIN];
 		},$lektoren);
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index b2c82fd77..a16c8e02e 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -176,7 +176,7 @@ class StundenplanLib{
 			},$lektoren);
 
 		}
-		return $lektoren;
+		return success($lektoren);
 	}
 
 	public function expand_object_information($data){
@@ -267,49 +267,56 @@ class StundenplanLib{
 			return error(getData($ferienEvents));
 		}
 		$ferienEvents = getData($ferienEvents);
+		
+		if(is_array($ferienEvents) && count($ferienEvents) > 0){
+			
+			$ferienEvents = array_map(function($event){
+				$event_start = new DateTime($event->vondatum);
+				$event_end = new DateTime($event->bisdatum);
+				$event_end->modify('+1 day');
+	
+				$interval = new DateInterval('P1D');
+				$period = new DatePeriod($event_start, $interval, $event_end);
+				$event->dates = array_map(function($date){
+					return $date->format('Y-m-d');
+				}, iterator_to_array($period));
+				return $event;
+			}, $ferienEvents);
+	
+			$ferienEventsFlattened=[];
+			foreach($ferienEvents as $ferien_event){
+				foreach($ferien_event->dates as $date){
+					$event = new stdClass();
+					$event->bezeichnung = $ferien_event->bezeichnung;
+					$event->datum = $date;
+					$event->type = 'ferien';
+					$ferienEventsFlattened[] = $event;
+				}
+			};
+	
+			$today=new DateTime();
+			$ferienEventsFlattened = array_map(function($event) use($today){
+				$ferien_event = (object) array(
+					'type' => 'ferien',
+					'beginn' => $today->format('H:i:s'),
+					'ende' => $today->format('H:i:s'),
+					'allDayEvent' => true,
+					'datum' => $event->datum,
+					'topic' => $event->bezeichnung,
+					'titel' => $event->bezeichnung,
+					'farbe' => '00689E'
+					
+				);
+				return $ferien_event;
+			}, $ferienEventsFlattened);
+			
+			return success($ferienEventsFlattened);
+		}
+		else{
+			return success([]);
+		}
 
-		$ferienEvents = array_map(function($event){
-			$event_start = new DateTime($event->vondatum);
-			$event_end = new DateTime($event->bisdatum);
-			$event_end->modify('+1 day');
-
-			$interval = new DateInterval('P1D');
-			$period = new DatePeriod($event_start, $interval, $event_end);
-			$event->dates = array_map(function($date){
-				return $date->format('Y-m-d');
-			}, iterator_to_array($period));
-			return $event;
-		}, $ferienEvents);
-
-		$ferienEventsFlattened=[];
-		foreach($ferienEvents as $ferien_event){
-			foreach($ferien_event->dates as $date){
-				$event = new stdClass();
-				$event->bezeichnung = $ferien_event->bezeichnung;
-				$event->datum = $date;
-				$event->type = 'ferien';
-				$ferienEventsFlattened[] = $event;
-			}
-		};
-
-		$today=new DateTime();
-		$ferienEventsFlattened = array_map(function($event) use($today){
-			$ferien_event = (object) array(
-				'type' => 'ferien',
-				'beginn' => $today->format('H:i:s'),
-				'ende' => $today->format('H:i:s'),
-				'allDayEvent' => true,
-				'datum' => $event->datum,
-				'topic' => $event->bezeichnung,
-				'titel' => $event->bezeichnung,
-				'farbe' => '00689E'
-				
-			);
-			return $ferien_event;
-		}, $ferienEventsFlattened);
-		 
-
-		return $ferienEventsFlattened;
+		
 	}
 
 	// start of the private functions ########################################################################################################

From 5ddc4749fa6f9702012666c7d955b916c88ef2ce Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 2 Jul 2025 14:35:07 +0200
Subject: [PATCH 325/572] update(Accessability changes):adds aria-label to
 empty buttons and more accessability changes

---
 public/css/Cis4/CoreCalendarEvents.css        |   4 +-
 public/js/components/Calendar/Header.js       |  36 +-
 public/js/components/Calendar/Week/Page.js    |   2 +-
 public/js/components/Cis/LvPlan/LvPlan.js     |   4 +-
 public/js/components/Cis/Menu.js              |  14 +-
 public/js/components/Cis/Mylv/Student.js      |   4 +-
 .../Profil/ProfilComponents/Mailverteiler.js  |   2 +-
 .../ProfilComponents/ProfilInformation.js     |   2 +-
 .../ProfilComponents/RoleInformation.js       |  12 +-
 .../Cis/Renderer/Lehreinheit/calendarEvent.js |   4 +-
 public/js/components/Cis/ThemeSwitch.js       |  11 +-
 public/js/components/filter/Filter.js         |   6 +-
 system/phrasesupdate.php                      | 464 +++++++++++++++++-
 13 files changed, 532 insertions(+), 33 deletions(-)

diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index 1611ac123..fd418a9f8 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -46,7 +46,9 @@
 	flex-direction: column;
 	column-gap: 5px;
 	overflow-y: scroll;
-	min-height:0;
+	height: 100%;
+	min-height:auto;
+	justify-content: space-evenly;
 
 }
 
diff --git a/public/js/components/Calendar/Header.js b/public/js/components/Calendar/Header.js
index 5ee3d51e7..c1b53d9c8 100644
--- a/public/js/components/Calendar/Header.js
+++ b/public/js/components/Calendar/Header.js
@@ -27,13 +27,39 @@ export default {
 		'next',
 		'click'
 	],
+	methods:{
+		modeAriaLabelText(mode) {
+			switch (mode.toLowerCase()) {
+				case "day": return this.$p.t('LvPlan', 'modeDay');
+				case "week": return this.$p.t('LvPlan', 'modeWeek');
+				case "month": return this.$p.t('LvPlan', 'modeMonth');
+			}
+		},
+	},
 	computed: {
 		getHeaderClassSide() {
 			return this.containerWidth > 780 ? 'col-3' : 'col-12'
 		},
 		getHeaderClassMiddle() {
 			return this.containerWidth > 780 ? 'col-6' : 'col-12'
-		}
+		},
+		previousButtonAriaLabelText(){
+			switch(this.mode.toLowerCase()){
+				case "day": return this.$p.t('LvPlan', 'previousDay');
+				case "week": return this.$p.t('LvPlan', 'previousWeek');
+				case "weeks": return this.$p.t('LvPlan', 'previousYear');
+				case "month": return this.$p.t('LvPlan', 'previousMonth');
+			}
+		},
+		nextButtonAriaLabelText() {
+			switch (this.mode.toLowerCase()) {
+				case "day": return this.$p.t('LvPlan', 'nextDay');
+				case "week": return this.$p.t('LvPlan', 'nextWeek');
+				case "weeks": return this.$p.t('LvPlan', 'nextYear');
+				case "month": return this.$p.t('LvPlan', 'nextMonth');
+			}
+		},
+		
 	},
 	template: /*html*/`
 	<div class="calendar-header card-header w-100">
@@ -44,7 +70,7 @@ export default {
 			<div :class="getHeaderClassMiddle" :style="{'padding-left':headerPadding}">
 				<div class="row align-items-center justify-content-center">
 					<div class="col-auto p-2">
-						<button class="btn btn-outline-secondary border-0" :class="{'btn-sm':!this.size}" @click="$emit('prev')"><i class="fa fa-chevron-left"></i></button>
+						<button class="btn btn-outline-secondary border-0" :class="{'btn-sm':!this.size}" @click="$emit('prev')" v-tooltip.top="{ value: previousButtonAriaLabelText, showDelay: 1000}" :aria-label="previousButtonAriaLabelText"><i class="fa fa-chevron-left" aria-hidden="true"></i></button>
 					</div>
 					<div class="justify-content-center text-center col-auto">
 						<div class="d-flex justify-content-center align-items-center">
@@ -55,15 +81,15 @@ export default {
 						</div>
 					</div>
 					<div class="col-auto p-2">
-						<button class="btn btn-outline-secondary border-0" :class="{'btn-sm': !this.size}" @click="$emit('next')"><i class="fa fa-chevron-right"></i></button>
+						<button class="btn btn-outline-secondary border-0" :class="{'btn-sm': !this.size}" @click="$emit('next')" v-tooltip.top="{value:nextButtonAriaLabelText, showDelay:1000}" :aria-label="previousButtonAriaLabelText"><i class="fa fa-chevron-right" aria-hide="true"></i></button>
 					</div>
 				</div>
 			</div>
 			<div ref="viewButtons" v-if="!noWeekView && !noMonthView" :class="getHeaderClassSide" class="d-flex justify-content-center justify-content-md-end align-items-center" style="pointer-events: none;">
 				<div  style="pointer-events: all;">
 					<div  role="group" aria-label="Kalender Modus">
-						<button type="button" :class="{'active':mode_kurzbz.toLowerCase() === mode.toLowerCase()}" style="margin-right: 4px;" @click.prevent="$emit('updateMode',mode_kurzbz)" class="btn btn-outline-secondary" v-for="({mode_bezeichnung,icon,condition},mode_kurzbz) in modes">
-							<i v-if="condition" class="fa" :class="icon" ></i>
+						<button :aria-label="modeAriaLabelText(mode_bezeichnung)" v-tooltip.top="{value:modeAriaLabelText(mode_bezeichnung), showDelay:1000}" type="button" :class="{'active':mode_kurzbz.toLowerCase() === mode.toLowerCase()}" style="margin-right: 4px;" @click.prevent="$emit('updateMode',mode_kurzbz)" class="btn btn-outline-secondary" v-for="({mode_bezeichnung,icon,condition},mode_kurzbz) in modes">
+							<i aria-hidden="true" v-if="condition" class="fa" :class="icon" ></i>
 						</button>
 					</div>
 				</div>
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index cec65e577..3bfc7b668 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -326,7 +326,7 @@ export default {
 			<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="pageHeaderStyle" >
 				<div type="button" v-for="day in days" :key="day" class="flex-grow-1" :title="dayText[day]?.heading" @click.prevent="changeToDay(day)">
 					<div class="fw-bold">{{dayText[day]?.tag}}</div>
-					<a href="#" class="small text-secondary text-decoration-none" >{{dayText[day]?.datum}}</a>
+					<a href="#" class="small text-muted text-decoration-none" >{{dayText[day]?.datum}}</a>
 				</div>
 			</div>
 			<div ref="eventcontainer" class="position-relative flex-grow-1"  >
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index d9b82bbcc..7aeaa0f1b 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -316,9 +316,9 @@ const LvPlan = {
 	>
 		<template #calendarDownloads>
 			<div v-for="{title,icon,link} in downloadLinks">
-				<a :href="link" :title="title" class="py-1 px-2 m-1 btn btn-outline-secondary">
+				<a :href="link" :aria-label="title" class="py-1 px-2 m-1 btn btn-outline-secondary">
 					<div class="d-flex flex-column">
-						<i :class="icon"></i>
+						<i aria-hidden="true" :class="icon"></i>
 						<span class="small">{{title}}</span>
 					</div>
 				</a>
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 7a2d174ee..ee1b671e6 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -27,6 +27,7 @@ export default {
 			url:null,
 			urlMatchRankings:[],
 			navUserDropdown:null,
+			menuOpen:true,
         };
     },
 	provide(){
@@ -37,6 +38,13 @@ export default {
 		}
 	},
 	computed:{
+		menuCollapseAriaLabel(){
+			if(this.menuOpen){
+				return this.$p.t('global', 'collapseMenu');
+			}else{
+				return this.$p.t('global', 'extendMenu');
+			}
+		},
 		highestMatchingUrlCount(){
 			// gets the hightest ranking inside the array
 			let highestMatch = Math.max(...this.urlMatchRankings);
@@ -111,7 +119,7 @@ export default {
     <div id="nav-logo" class="d-none d-lg-block">
 		<div class="d-flex h-100">
 			<a :href="rootUrl">
-				<img :src="logoUrl" alt="Logo">
+				<img :src="logoUrl" alt="Corporate Identity Logo">
 			</a>
 			<theme-switch></theme-switch>
 		</div>
@@ -135,8 +143,8 @@ export default {
     <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 ">
-				<button type="button" class="btn text-light rounded-0 p-1 d-flex align-items-center" data-bs-toggle="collapse" data-bs-target=".nav-menu-collapse" aria-expanded="true" aria-controls="nav-sprachen nav-main-menu">
-					<i class="fa fa-arrow-circle-left fhc-text"></i>
+				<button :aria-label="menuCollapseAriaLabel"  type="button" @click="menuOpen = !menuOpen"  class="btn text-light rounded-0 p-1 d-flex align-items-center" data-bs-toggle="collapse" data-bs-target=".nav-menu-collapse" aria-expanded="true" aria-controls="nav-sprachen nav-main-menu">
+					<i aria-hidden="true" class="fa fa-arrow-circle-left fhc-text"></i>
 				</button>
 			</div>
 			<div class="offcanvas-body p-0">
diff --git a/public/js/components/Cis/Mylv/Student.js b/public/js/components/Cis/Mylv/Student.js
index 300ed44f8..508acb883 100644
--- a/public/js/components/Cis/Mylv/Student.js
+++ b/public/js/components/Cis/Mylv/Student.js
@@ -101,13 +101,13 @@ export default {
 			</div>
 			<div class="col-auto">
 				<div class="input-group">
-					<button class="btn btn-outline-secondary" type="button" :disabled="currentIsFirst" @click="prevSem">
+					<button :aria-label="$p.t('lehre','previousStudSemester')" v-tooltip.top="{showDelay:1000, value:$p.t('lehre','previousStudSemester')}" class="btn btn-outline-secondary" type="button" :disabled="currentIsFirst" @click="prevSem">
 						<i class="fa fa-caret-left" aria-hidden="true"></i>
 					</button>
 					<select ref="studiensemester" v-model="currentSemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 						<option v-for="semester in studiensemester" :key="semester.studiensemester_kurzbz">{{semester.studiensemester_kurzbz}}</option>
 					</select>
-					<button class="btn btn-outline-secondary" type="button" :disabled="currentIsLast" @click="nextSem">
+					<button class="btn btn-outline-secondary" :aria-label="$p.t('lehre','nextStudSemester')" v-tooltip.top="{showDelay:1000, value:$p.t('lehre','nextStudSemester')}" type="button" :disabled="currentIsLast" @click="nextSem">
 						<i class="fa fa-caret-right" aria-hidden="true"></i>
 					</button>
 				</div>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
index e911453f1..8b5ca885c 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/Mailverteiler.js
@@ -16,7 +16,7 @@ export default {
             {{title}}
         </div>
         <div class="card-body">
-            <h6 class="card-title">{{$p.t('profil','mailverteilerMitglied')}}</h6>
+            <h4 class="card-title">{{$p.t('profil','mailverteilerMitglied')}}</h4>
             <div class="card-text row text-break mb-2" v-for="verteiler in data">
                 <div class="col-12 ">
                     <div class="row">
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index 50399edf5..7cd6f213e 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -91,7 +91,7 @@ export default {
             <div class="col-12 col-sm-6 mb-2">
                 <div class="row justify-content-center">
                     <div class="col-auto " style="position:relative">
-                        <img class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"/>
+                        <img alt="profile picture" class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"/>
                         <!-- LOCKING IMAGE FUNCTIONALITY -->
                         <div v-if="editable" role="button" @click.prevent="sperre_foto_function" class="image-lock">
                             <i :class="{'fa':true, ...(FotoSperre?{'fa-lock':true}:{'fa-lock-open':true})} "></i>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js b/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
index 2e2ec0c6e..ae1a4f2b9 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/RoleInformation.js
@@ -48,24 +48,24 @@ export default {
 						<!-- print semester link -->
 						<span v-else-if="key == 'semester' && entry.value"  class="form-underline-content">
 							{{ entry.value }}
-							<a class="ms-auto mb-2" target="_blank" :href="getLinkSemesterListe">
-								<i class="fa fa-arrow-up-right-from-square me-1 fhc-link-color"></i>
+							<a :aria-label="$p.t('profil','semesterLink')" class="ms-auto mb-2" target="_blank" :href="getLinkSemesterListe">
+								<i aria-hidden="true" class="fa fa-arrow-up-right-from-square me-1 fhc-link-color"></i>
 							</a>
 						</span>
 						
 						<!-- print verband link -->
 						<span v-else-if="key =='verband' && entry.value"  class="form-underline-content">
 							{{ entry.value }}
-							<a class="ms-auto mb-2" target="_blank" :href="getLinkVerbandListe">
-								<i class="fa fa-arrow-up-right-from-square me-1 fhc-link-color"></i>
+							<a :aria-label="$p.t('profil','verbandLink')" class="ms-auto mb-2" target="_blank" :href="getLinkVerbandListe">
+								<i aria-hidden="true" class="fa fa-arrow-up-right-from-square me-1 fhc-link-color"></i>
 							</a>
 						</span>
 						
 						<!-- print gruppe link -->
 						<span v-else-if="key == 'gruppe' && entry.value"  class="form-underline-content">
 							{{ entry.value }}
-							<a class="ms-auto mb-2" target="_blank" :href="getLinkGruppeListe">
-								<i class="fa fa-arrow-up-right-from-square me-1 fhc-link-color"></i>
+							<a :aria-label="$p.t('profil','gruppenLink')" class="ms-auto mb-2" target="_blank" :href="getLinkGruppeListe">
+								<i aria-hidden="true" class="fa fa-arrow-up-right-from-square me-1 fhc-link-color"></i>
 							</a>
 						</span>
 						
diff --git a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
index 499a071a8..dc3cdb443 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
@@ -40,8 +40,8 @@ export default {
 	template: /*html*/`
 	<div class="lehreinheitEventContent h-100 w-100 p-1" >
 		<div id="lehreinheitEventHeader" class="h-100 " v-if="!event.allDayEvent && event?.beginn && event?.ende" >
-			<span class="small">{{convertTime(event.beginn.split(":"))}}</span>
-			<span class="small">{{convertTime(event.ende.split(":"))}}</span>
+			<span >{{convertTime(event.beginn.split(":"))}}</span>
+			<span >{{convertTime(event.ende.split(":"))}}</span>
 		</div>
 		<div id="lehreinheitEventText" v-tooltip="calendarEventTooltip">
 			<span id="lehreinheitTopic">{{event.topic}}</span>
diff --git a/public/js/components/Cis/ThemeSwitch.js b/public/js/components/Cis/ThemeSwitch.js
index 7f560376e..bff06a70c 100644
--- a/public/js/components/Cis/ThemeSwitch.js
+++ b/public/js/components/Cis/ThemeSwitch.js
@@ -8,7 +8,8 @@ export default {
 		switchTheme(nextTheme){
 			this.theme = nextTheme;
 			this.$theme.switchTheme(this.theme);
-		}
+		},
+		
 	},
 	computed:{
 		nextTheme(){
@@ -23,10 +24,10 @@ export default {
 	},
 	template:/*html*/`
 
-	<button @click="switchTheme(nextTheme)" class="fhc-primary-highlight-bg align-self-center btn btn-secondary rounded-5">
-		<i v-if="theme == 'light'" class="fa-solid fa-sun fhc-text"></i>
-		<i v-else-if="theme == 'dark'" class="fa-solid fa-moon fhc-text"></i>
-		<i v-else-if="theme == 'purple'" class="fa-solid fa-wine-bottle"></i>
+	<button :aria-label="$p.t('global','switchTheme',[nextTheme])" @click="switchTheme(nextTheme)" class="fhc-primary-highlight-bg align-self-center btn btn-secondary rounded-5">
+		<i v-if="theme == 'light'" class="fa-solid fa-sun fhc-text" aria-hidden="true"></i>
+		<i v-else-if="theme == 'dark'" class="fa-solid fa-moon fhc-text" aria-hidden="true"></i>
+		<i v-else-if="theme == 'purple'" class="fa-solid fa-wine-bottle" aria-hidden="true"></i>
 	</button>
 	`
 }
\ No newline at end of file
diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 3cf069ff8..e5e804db1 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -669,13 +669,13 @@ export const CoreFilterCmpt = {
 				<div class="d-flex gap-1 align-items-baseline flex-grow-1 justify-content-end">
 					<span v-if="!tableOnly">[ {{ filterName }} ]</span>
 					<span v-else-if="description">{{ description }}</span>
-					<a v-if="!tableOnly || $slots.filter" href="#" class="btn btn-link px-0 text-dark" data-bs-toggle="collapse" :data-bs-target="'#collapseFilters' + idExtra">
+					<a aria-label="filter" v-if="!tableOnly || $slots.filter" href="#" class="btn btn-link px-0 text-dark" data-bs-toggle="collapse" :data-bs-target="'#collapseFilters' + idExtra">
 						<span class="fa-solid fa-xl fa-filter"></span>
 					</a>
-					<a v-if="filterActive"  class="btn btn-link px-0 text-dark" :title="$p.t('ui','filterdelete')" @click="clearFilters">
+					<a aria-label="filter" v-if="filterActive"  class="btn btn-link px-0 text-dark" :title="$p.t('ui','filterdelete')" @click="clearFilters">
 						<span class="fa-solid fa-xl fa-filter-circle-xmark"></span>
 					</a>
-					<a href="#" class="btn btn-link px-0 text-dark" data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra">
+					<a aria-label="filter" href="#" class="btn btn-link px-0 text-dark" data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra">
 						<span class="fa-solid fa-xl fa-table-columns"></span>
 					</a>
 					<table-download class="btn btn-link px-0 text-dark" :tabulator="tabulator" :config="download"></table-download>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 6aeeca9cd..40640a186 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -268,6 +268,106 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'collapseMenu',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Menu einklappen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Collapse menu',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'extendMenu',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Menu ausklappen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Extend menu',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'sender',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sender',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'sender',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'collapseMenu',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Menu einklappen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Collapse menu',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'extendMenu',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Menu ausklappen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Extend menu',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',
@@ -27276,6 +27376,86 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'gruppenLink',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Gruppen Link',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'group link',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'verbandLink',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Verband Link',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Verband link',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+			array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'verbandLink',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Verband Link',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Verband link',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'semesterLink',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Semester Link',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Semester link',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 		array(
 			'app' => 'core',
 			'category' => 'profil',
@@ -28156,7 +28336,229 @@ array(
 			)
 		)
 	),
-		//Profil Phrasen ende
+	//Profil Phrasen ende
+	// LvPlan Phrasen start
+	array(
+			'app' => 'core',
+			'category' => 'LvPlan',
+			'phrase' => 'previousWeek',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Vorherige Woche',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Previous week',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'LvPlan',
+			'phrase' => 'previousYear',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Vorheriges Jahr',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Previous year',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'LvPlan',
+			'phrase' => 'previousMonth',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Vorheriges Monat',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Previous month',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'LvPlan',
+			'phrase' => 'previousDay',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Vorheriger Tag',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Previous day',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'LvPlan',
+			'phrase' => 'nextDay',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Nächster Tag',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Next day',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'LvPlan',
+			'phrase' => 'nextWeek',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Nächste Woche',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Next week',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'LvPlan',
+			'phrase' => 'nextMonth',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Nächster Monat',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Next month',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'LvPlan',
+			'phrase' => 'nextYear',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Nächstes Jahr',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Next year',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'LvPlan',
+			'phrase' => 'modeDay',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Tages Ansicht',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Daily view',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'LvPlan',
+			'phrase' => 'modeWeek',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Wochen Ansicht',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Week view',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'LvPlan',
+			'phrase' => 'modeMonth',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Monats Ansicht',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Month view',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		// LvPlan Phrasen ende
 		//ProfilUpdate Phrasen start
 		array(
 			'app' => 'core',
@@ -29661,6 +30063,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'switchTheme',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zum {0} Theme wechseln',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Switch to {0} theme',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',
@@ -40144,6 +40566,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'previousStudSemester',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Vorheriges Studiensemester",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Previous study semester",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'nextStudSemester',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Nächstes Studiensemester",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Next study semester",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'abgabetool',

From ac1335a50d6f75c859573f9fbdd4fd191acc7df7 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 2 Jul 2025 14:53:44 +0200
Subject: [PATCH 326/572] Notizen as Modal

---
 public/js/components/Notiz/Notiz.js           | 17 +++---
 .../Details/Anrechnungen/Anrechnungen.js      | 54 +++++++++----------
 2 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 0d180d2ff..1237db868 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -176,7 +176,7 @@ export default {
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
 				responsiveLayout: "collapse",
-				height: '250',
+				height: '200',
 				selectableRangeMode: 'click',
 				selectable: true,
 				index: 'notiz_id',
@@ -572,10 +572,9 @@ export default {
 				>
 			</core-filter-cmpt>
 			
-			<br>
 		
-			<form-form ref="formNotiz" @submit.prevent class="row pt-3">
-				<br><br>
+			<form-form ref="formNotiz" @submit.prevent class="row">
+
 				<div class="pt-2">
 					<div class="row mb-3">
 						<div class="col-sm-7">
@@ -708,9 +707,13 @@ export default {
 						<p class="small">{{notizData.lastupdate}}</p>
 					</div>
 				</div>
-				
-				<button v-if="notizData.statusNew"  type="button" class="btn btn-primary" @click="addNewNotiz()"> {{$p.t('studierendenantrag', 'btn_new')}}</button>
-				<button v-else type="button" class="btn btn-primary" @click="updateNotiz(notizData.notiz_id)"> {{$p.t('ui', 'speichern')}}</button>
+				<div class="row">
+					<div class="text-end">
+						<button v-if="notizData.statusNew"  type="button" class="btn btn-primary" @click="addNewNotiz()"> {{$p.t('studierendenantrag', 'btn_new')}}</button>
+						<button v-else type="button" class="btn btn-primary" @click="updateNotiz(notizData.notiz_id)"> {{$p.t('ui', 'speichern')}}</button>
+					</div>
+				</div>
+
 			</form-form>
 		</div>
 
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index abe5d177d..a85ee77f5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -184,6 +184,7 @@ export default {
 			this.currentAnrechnung_id = anrechnung_id;
 			this.loadAnrechnung(this.currentAnrechnung_id);
 			this.showNotizen = true;
+			this.$refs.anrechnungsnotizModal.show();
 		},
 		addNewAnrechnung(){
 			const dataToSend = {
@@ -304,36 +305,31 @@ export default {
 	},
 	template: `
 				<div class="stv-details-tab_exemptions h-100 pb-3">
-					<h5>{{$p.t('lehre', 'anrechnungen')}}</h5>
-					
-					<div v-if="showNotizen" class="border p-3 overflow-auto" style="height: 200px;">
-							<!-- <div class="justify-content-end pb-3">
-								<form-input
-									container-class="form-switch"
-									type="checkbox"
-									label="Notizen"
-									v-model="showNotizen"
-									@change="onSwitchHide"
-									>
-								</form-input>
-							</div> -->
-						<h6><strong>LV {{formData.lehrveranstaltung_id}}:
-							{{formData.bezeichnung}} | {{formData.bezeichnung_english}}</strong></h6>
 
-						<core-notiz
-							:endpoint="endpoint"
-							ref="formNotes"
-							notiz-layout="popupModal"
-							typeId="anrechnung_id"
-							:id="currentAnrechnung_id"
-							show-document
-							show-tiny-mce
-							:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
-							@reload="handleReload"
-							>
-						</core-notiz>
-					
-					</div>
+					<bs-modal ref="anrechnungsnotizModal" dialog-class="modal-dialog-scrollable modal-xl">
+
+						<template #title>
+							<h5>
+								<strong>LV {{formData.lehrveranstaltung_id}}: {{formData.bezeichnung}} | {{formData.bezeichnung_english}}
+								</strong>
+							</h5>
+						</template>
+
+						<div v-if="showNotizen" class="border p-3 overflow-auto" style="height: 800px;">
+							<core-notiz
+										:endpoint="endpoint"
+										ref="formNotes"
+										notiz-layout="classicFas"
+										typeId="anrechnung_id"
+										:id="currentAnrechnung_id"
+										show-document
+										show-tiny-mce
+										:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
+										@reload="handleReload"
+										>
+								</core-notiz>
+							</bs-modal>
+						</div>
 					
 					<template v-if="config.editableAnrechnungen" >
 						<core-filter-cmpt

From 4b260673809429ee645242fdfe9cdd0bf474c636 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 2 Jul 2025 15:20:17 +0200
Subject: [PATCH 327/572] moar anw phrasen

---
 system/phrasesupdate.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index bb8a09605..72baff627 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -29944,6 +29944,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'kontrolleOhneQR',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anwesenheiten ohne QR-Code einfügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Insert attendances without QR-Code',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',

From 919471d067c797cce4394d70b552a0c00f167365 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 3 Jul 2025 11:32:00 +0200
Subject: [PATCH 328/572] phrasen adjustment & error catch cases

---
 system/phrasesupdate.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 72baff627..ea1ca3a30 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31707,18 +31707,18 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'noStudentsFound',
+		'phrase' => 'noStudentsFoundV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Keine zugeteilten Studenten für den gewählten LV-Teil gefunden!',
+				'text' => 'Keine zugeteilten Studenten für Mitarbeiter {0} in dem gewählten LV-Teil {1} gefunden!',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'No assigned students for the selected teaching unit found!',
+				'text' => 'No assigned students for employee {0} in the selected teaching unit {1} found!',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From 7fc98bd6a492159aba39aa119f94cb0f7ddb2ed5 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 3 Jul 2025 13:23:47 +0200
Subject: [PATCH 329/572] tooltip update

---
 system/phrasesupdate.php | 48 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ea1ca3a30..4ba179ef8 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -29684,6 +29684,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigtLegendeBlau',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Student ist am gewählten Datum bestätigt entschuldigt.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student is confirmed excused on the selected date.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'entschuldigtLegendeTuerkis',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Student hat eine offene Entschuldigung am gewählten Datum.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student has an open excuse on the selected date.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -32239,7 +32279,7 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'tooltipAssistenz',
+		'phrase' => 'tooltipAssistenzV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -32283,7 +32323,7 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'tooltipLektorStartKontrolle',
+		'phrase' => 'tooltipLektorStartKontrolleV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -32292,7 +32332,7 @@ array(
 
 				Die Gültigkeitsdauer bestimmt die Gewichtung der Anwesenheit in Relation zum Gesamtausmaß, sie können diese aber nach eigenem Ermessen anpassen und müssen sich nicht streng an die Termine im Stundenplan halten.
 
-				Sie können pro Datum und Unterrichtsgruppe eine Anwesenheitskontrolle pro Tag eröffnen, welche jedoch beliebig oft aufgerufen und von Studenten eingecheckt werden kann. Es gelten dabei ihre zuletzt eingetragenen Zeiten. Ein Student muss nur einmal am Tag pro Gruppe einchecken um als anwesend registriert zu sein, egal wie oft Sie die Kontrolle starten.',
+				Sie können pro Datum und Unterrichtsgruppe mehrere Anwesenheitskontrollen am Tag durchführen, solange sich diese nicht in Ihren Zeiten überschneiden und eine Mindestlänge von {0} Minuten beträgt.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -32302,7 +32342,7 @@ array(
 
 				The validity period determines the weighting of attendance in relation to the overall extent, but you can adjust this at your own discretion and do not have to stick strictly to the dates in the timetable.
 
-				You can open one attendance check per day for each date and class group, which can be called up and checked in by students as often as you like. The times they last entered apply. A student only has to check in once a day per group to be registered as present, regardless of how often you start the check.',
+				You can conduct multiple attendance checks per day per date and lesson group, as long as they do not overlap in your times and are at least {0} minutes long.',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From 014a034ce81fc20d0d10c4efbe2135def0c3c79c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 3 Jul 2025 14:53:53 +0200
Subject: [PATCH 330/572] add VB function to get last vb stunden before
 altersteilzeit

---
 .../VertragsbestandteilLib.php                |  5 +++
 .../Vertragsbestandteil_model.php             | 40 +++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/application/libraries/vertragsbestandteil/VertragsbestandteilLib.php b/application/libraries/vertragsbestandteil/VertragsbestandteilLib.php
index 2e6182957..1ecb9ac60 100644
--- a/application/libraries/vertragsbestandteil/VertragsbestandteilLib.php
+++ b/application/libraries/vertragsbestandteil/VertragsbestandteilLib.php
@@ -131,6 +131,11 @@ class VertragsbestandteilLib
 		return $this->VertragsbestandteilModel->getVertragsbestandteil($vertragsbestandteil_id);
 	}
 
+	public function fetchLastVertragsbestandteilStundenBeforeAltersteilzeit($dienstverhaeltnis_id)
+	{
+		return $this->VertragsbestandteilModel->getLastVertragsbestanteilStundenBeforeAltersteilzeit($dienstverhaeltnis_id);
+	}
+
 	public function storeDienstverhaeltnis(Dienstverhaeltnis $dv)
 	{
 		if( intval($dv->getDienstverhaeltnis_id()) > 0 )
diff --git a/application/models/vertragsbestandteil/Vertragsbestandteil_model.php b/application/models/vertragsbestandteil/Vertragsbestandteil_model.php
index cbc529d83..ce741268d 100644
--- a/application/models/vertragsbestandteil/Vertragsbestandteil_model.php
+++ b/application/models/vertragsbestandteil/Vertragsbestandteil_model.php
@@ -183,6 +183,46 @@ EOSQL;
 		return $vbcount[0]->overlappingvbs;
 	}
 
+	public function getLastVertragsbestanteilStundenBeforeAltersteilzeit($dienstverhaeltnis_id)
+	{
+		$sql = <<<EOATZSQL
+			select 
+				* 
+			from
+				hr.tbl_vertragsbestandteil vb
+			join 
+				hr.tbl_vertragsbestandteil_stunden vbs USING(vertragsbestandteil_id)
+			where
+				vb.dienstverhaeltnis_id = ? 
+				and (
+					vbs.teilzeittyp_kurzbz != 'altersteilzeit'
+					or
+					vbs.teilzeittyp_kurzbz is NULL
+				)
+			order by 
+				vb.bis desc
+			limit 1
+EOATZSQL;
+		$query = $this->execReadOnlyQuery($sql, array($dienstverhaeltnis_id));
+		$data = getData($query);
+
+		if ($data == null)
+		{
+			return null;
+		}
+
+		$vertragsbestandteil = null;
+		try
+		{
+			$vertragsbestandteil = VertragsbestandteilFactory::getVertragsbestandteil($data[0], true);
+		}
+		catch (Exception $ex)
+		{
+			echo $ex->getMessage() . "\n";
+		}
+		return $vertragsbestandteil;
+	}
+
 	/**
 	 * Checks if sap sync table exists.
 	 * @return bool

From e659e8e12cf7cd7f2311e37b72cde155f0ede50b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 3 Jul 2025 15:30:02 +0200
Subject: [PATCH 331/572] update(Profil Tabulator Columns):preloads phrasen for
 the tabulator tables, otherwise the column titles are not displayed

---
 .../Cis/Profil/MitarbeiterProfil.js           | 52 ++++++++++++-------
 .../Cis/Profil/MitarbeiterViewProfil.js       | 18 +++++--
 .../js/components/Cis/Profil/StudentProfil.js | 42 +++++++++------
 3 files changed, 73 insertions(+), 39 deletions(-)

diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 0bb628e19..840cdefc1 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -33,7 +33,7 @@ export default {
 		return {
 			showModal: false,
 			editDataFilter: null,
-
+			preloadedPhrasen:{},
 			// tabulator options
 			funktionen_table_options: {
 				persistenceID: "filterTableMaProfilFunktionen",
@@ -58,21 +58,21 @@ export default {
 						visible: true
 					},
 					{
-						title: Vue.computed(() => this.$p.t('ui/bezeichnung')),
+						title: Vue.computed(() => this.preloadedPhrasen.bezeichnungPhrase),
 						field: "Bezeichnung",
 						headerFilter: true,
 						minWidth: 200,
 						visible: true
 					},
 					{
-						title: Vue.computed(() => this.$p.t('lehre/organisationseinheit')),
+						title: Vue.computed(() => this.preloadedPhrasen.organisationseinheitPhrase),
 						field: "Organisationseinheit",
 						headerFilter: true,
 						minWidth: 200,
 						visible: true
 					},
 					{
-						title: Vue.computed(() => this.$p.t('global/gueltigVon')),
+						title: Vue.computed(() => this.preloadedPhrasen.gueltigVonPhrase),
 						field: "Gültig_von",
 						headerFilter: true,
 						resizable: true,
@@ -80,7 +80,7 @@ export default {
 						visible: true
 					},
 					{
-						title: Vue.computed(() => this.$p.t('global/gueltigBis')),
+						title: Vue.computed(() => this.preloadedPhrasen.gueltigBisPhrase),
 						field: "Gültig_bis",
 						headerFilter: true,
 						resizable: true,
@@ -88,7 +88,7 @@ export default {
 						visible: true
 					},
 					{
-						title: Vue.computed(() => this.$p.t('profil/wochenstunden')),
+						title: Vue.computed(() => this.preloadedPhrasen.wochenstundenPhrase),
 						field: "Wochenstunden",
 						headerFilter: true,
 						minWidth: 200,
@@ -121,14 +121,14 @@ export default {
 						visible: true
 					},
 					{
-						title:  Vue.computed(() => this.$p.t('profil/entlehnteBetriebsmittel')),
+						title: Vue.computed(() => this.preloadedPhrasen.entlehnteBetriebsmittelPhrase),
 						field: "betriebsmittel",
 						headerFilter: true,
 						minWidth: 200,
 						visible: true
 					},
 					{
-						title:  Vue.computed(() => this.$p.t('profil/inventarnummer')),
+						title: Vue.computed(() => this.preloadedPhrasen.inventarnummerPhrase),
 						field: "Nummer",
 						headerFilter: true,
 						resizable: true,
@@ -136,7 +136,7 @@ export default {
 						visible: true
 					},
 					{
-						title: Vue.computed(() => this.$p.t('profil/ausgabedatum')),
+						title: Vue.computed(() => this.preloadedPhrasen.ausgabedatumPhrase),
 						field: "Ausgegeben_am",
 						headerFilter: true,
 						minWidth: 200,
@@ -283,6 +283,18 @@ export default {
 	},
 
 	created() {
+		// preload phrasen
+		this.$p.loadCategory(["ui","lehre","global","profil"]).then(() => {
+			this.preloadedPhrasen.bezeichnungPhrase = this.$p.t('ui/bezeichnung');
+			this.preloadedPhrasen.organisationseinheitPhrase = this.$p.t('lehre/organisationseinheit');
+			this.preloadedPhrasen.gueltigVonPhrase = this.$p.t('global/gueltigVon');
+			this.preloadedPhrasen.gueltigBisPhrase = this.$p.t('global/gueltigBis');
+			this.preloadedPhrasen.wochenstundenPhrase = this.$p.t('profil/wochenstunden');
+			this.preloadedPhrasen.entlehnteBetriebsmittelPhrase = this.$p.t('profil/entlehnteBetriebsmittel');
+			this.preloadedPhrasen.inventarnummerPhrase = this.$p.t('profil/inventarnummer');
+			this.preloadedPhrasen.ausgabedatumPhrase = this.$p.t('profil/ausgabedatum');
+			this.preloadedPhrasen.loaded=true;
+		});
 		//? sorts the profil Updates: pending -> accepted -> rejected
 		this.data.profilUpdates?.sort(this.sortProfilUpdates);
 
@@ -298,7 +310,7 @@ export default {
 			this.setTableColumnTitles()
 		}
 	},
-	template: /*html*/ ` 
+	template: /*html*/ `
 <div class="container-fluid text-break fhc-form"  >
     <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(filteredEditData))" :title="$p.t('profil','profilBearbeiten')"></edit-profil>
     <div class="row">
@@ -306,7 +318,7 @@ export default {
             <!--TODO: uncomment when implemented
                 <div class="row mb-3">
                            <div class="col">
-                           <quick-links :title="$p.t('profil','quickLinks')" :mobile="true"></quick-links>    
+                           <quick-links :title="$p.t('profil','quickLinks')" :mobile="true"></quick-links>
                            </div>
                          </div>-->
             <!-- Bearbeiten Button -->
@@ -324,7 +336,7 @@ export default {
             </div>
             <div v-if="data.profilUpdates" class="row mb-3">
                 <div class="col">
-                    <!-- MOBILE PROFIL UPDATES -->  
+                    <!-- MOBILE PROFIL UPDATES -->
                     <fetch-profil-updates v-if="data.profilUpdates && data.profilUpdates.length" @fetchUpdates="fetchProfilUpdates"  :data="data.profilUpdates" ></fetch-profil-updates>
                 </div>
             </div>
@@ -334,7 +346,7 @@ export default {
         <div class="col-sm-12 col-md-8 col-xxl-9 ">
             <!-- ROW WITH PROFIL IMAGE AND INFORMATION -->
             <!-- INFORMATION CONTENT START -->
-            <!-- ROW WITH THE PROFIL INFORMATION --> 
+            <!-- ROW WITH THE PROFIL INFORMATION -->
             <div class="row mb-4">
                 <div  class="col-lg-12 col-xl-6 ">
                     <div class="row mb-4">
@@ -411,18 +423,20 @@ export default {
             <div class="row">
                 <div class="col-12 mb-4" >
                     <!-- FUNKTIONEN TABELLE -->
-                    <core-filter-cmpt 
+                    <core-filter-cmpt
+						v-if="preloadedPhrasen.loaded"
                     	@tableBuilt="funktionenTableBuilt"
-						:title="$p.t('person','funktionen')"  
-						ref="funktionenTable" 
-						:tabulator-options="funktionen_table_options"  
-						tableOnly 
+						:title="$p.t('person','funktionen')"
+						ref="funktionenTable"
+						:tabulator-options="funktionen_table_options"
+						tableOnly
 						:sideMenu="false"
                      />
                 </div>
                 <div class="col-12 mb-4" >
                     <!-- BETRIEBSMITTEL TABELLE -->
-                    <core-filter-cmpt 
+                    <core-filter-cmpt
+						v-if="preloadedPhrasen.loaded"
                     	@tableBuilt="betriebsmittelTableBuilt"
 						:title="$p.t('profil','entlehnteBetriebsmittel')"
 						ref="betriebsmittelTable"
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 23a86b5f9..56c7ab84b 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -18,7 +18,7 @@ export default {
 	data() {
 		return {
 			collapseIconFunktionen: true,
-
+			preloadedPhrasen:{},
 			funktionen_table_options: {
 				persistenceID: "filterTableMaViewProfilFunktionen",
 				persistence: {
@@ -166,6 +166,16 @@ export default {
 			};
 		},
 	},
+	created(){
+		this.$p.loadCategory(["ui", "lehre", "global", "profil"]).then(() => {
+			this.preloadedPhrasen.bezeichnungPhrase = this.$p.t('ui/bezeichnung');
+			this.preloadedPhrasen.organisationseinheitPhrase = this.$p.t('lehre/organisationseinheit');
+			this.preloadedPhrasen.gueltigVonPhrase = this.$p.t('global/gueltigVon');
+			this.preloadedPhrasen.gueltigBisPhrase = this.$p.t('global/gueltigBis');
+			this.preloadedPhrasen.wochenstundenPhrase = this.$p.t('profil/wochenstunden');
+			this.preloadedPhrasen.loaded = true;
+		});
+	},
 
 	template: /*html*/ `
 
@@ -175,9 +185,9 @@ export default {
         <!-- HIDDEN QUICK LINKS -->
         <!-- TODO: uncomment when implemented
             <div  class="d-md-none col-12 ">
-            
+
             <quick-links :title="$p.t('profil','quickLinks')" :mobile="true" ></quick-links>
-            
+
             </div>
             -->
         <!-- END OF HIDDEN QUCK LINKS -->
@@ -223,7 +233,7 @@ export default {
             <div class="row">
                 <!-- FIRST TABLE -->
                 <div class="col-12 mb-4" >
-                    <core-filter-cmpt @tableBuilt="funktionenTableBuilt" :title="$p.t('person','funktionen')"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
+                    <core-filter-cmpt v-if="preloadedPhrasen.loaded" @tableBuilt="funktionenTableBuilt" :title="$p.t('person','funktionen')"  ref="funktionenTable" :tabulator-options="funktionen_table_options"  tableOnly :sideMenu="false" />
                 </div>
                 <!-- END OF THE ROW WITH THE TABLES UNDER THE PROFIL INFORMATION -->
             </div>
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 2c0d5ba2b..5d9b441e0 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -32,7 +32,7 @@ export default {
 			showModal: false,
 			collapseIconBetriebsmittel: true,
 			editDataFilter: null,
-
+			preloadedPhrasen:{},
 			// tabulator options
 			zutrittsgruppen_table_options: {
 				persistenceID: "filterTableStudentProfilZutrittsgruppen",
@@ -42,7 +42,7 @@ export default {
 				height: 200,
 				layout: "fitColumns",
 				columns: [{
-					title: Vue.computed(() => this.$p.t('profil/zutrittsGruppen')),
+					title: Vue.computed(() => this.preloadedPhrasen.zutrittsGruppenPhrase),
 					field: "bezeichnung"
 				}],
 			},
@@ -68,14 +68,14 @@ export default {
 						headerClick: this.collapseFunction,
 					},
 					{
-						title:  Vue.computed(() => this.$p.t('profil/entlehnteBetriebsmittel')),
+						title: Vue.computed(()=>this.preloadedPhrasen.entlehnteBetriebsmittelPhrase),
 						field: "betriebsmittel",
 						headerFilter: true,
 						minWidth: 200,
 						visible: true
 					},
 					{
-						title:  Vue.computed(() => this.$p.t('profil/inventarnummer')),
+						title: Vue.computed(() =>this.preloadedPhrasen.inventarnummerPhrase) ,
 						field: "Nummer",
 						headerFilter: true,
 						resizable: true,
@@ -83,7 +83,7 @@ export default {
 						visible: true
 					},
 					{
-						title: Vue.computed(() => this.$p.t('profil/ausgabedatum')),
+						title: Vue.computed(() =>this.preloadedPhrasen.ausgabedatum) ,
 						field: "Ausgegeben_am",
 						headerFilter: true,
 						minWidth: 200,
@@ -231,6 +231,14 @@ export default {
 		},
 	},
 	created() {
+		// preload phrasen
+		this.$p.loadCategory('profil').then(() => {
+			this.preloadedPhrasen.zutrittsGruppenPhrase = this.$p.t('profil/zutrittsGruppen');
+			this.preloadedPhrasen.entlehnteBetriebsmittelPhrase = this.$p.t('profil/entlehnteBetriebsmittel');
+			this.preloadedPhrasen.inventarnummerPhrase = this.$p.t('profil/inventarnummer');
+			this.preloadedPhrasen.ausgabedatum = this.$p.t('profil/ausgabedatum');
+			this.preloadedPhrasen.loaded = true;
+		});
 		//? sorts the profil Updates: pending -> accepted -> rejected
 		this.data.profilUpdates?.sort(this.sortProfilUpdates);
 	},
@@ -294,7 +302,7 @@ export default {
 							<div  class=" col-lg-12">
 								<!-- STUDENT INFO -->
 								<role-information :title="$p.t('profil','studentInformation')" :data="roleInformation"></role-information>
-							</div> 
+							</div>
 						</div>
 					<!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
 					</div>
@@ -329,7 +337,7 @@ export default {
 							</div>
 						</div>
 					</div>
-			
+
 					<div class="row mb-4">
 						<div class="col">
 							<!-- PRIVATE ADRESSEN-->
@@ -347,7 +355,7 @@ export default {
 								<div class="card-body">
 									<div class="gy-3 row ">
 										<div v-for="element in data.adressen" class="col-12">
-											<Adresse :data="element"></Adresse> 
+											<Adresse :data="element"></Adresse>
 										</div>
 									</div>
 								</div>
@@ -359,16 +367,18 @@ export default {
 			<!-- SECOND ROW UNDER THE PROFIL IMAGE AND INFORMATION WITH THE TABLES -->
 			<div class="row">
 				<div class="col-12 mb-4" >
-					<core-filter-cmpt 
-					@tableBuilt="betriebsmittelTableBuilt" 
-					:title="$p.t('profil','entlehnteBetriebsmittel')"  
-					ref="betriebsmittelTable" 
-					:tabulator-options="betriebsmittel_table_options" 
-					tableOnly 
+					<core-filter-cmpt
+					v-if="preloadedPhrasen.loaded"
+					@tableBuilt="betriebsmittelTableBuilt"
+					:title="$p.t('profil','entlehnteBetriebsmittel')"
+					ref="betriebsmittelTable"
+					:tabulator-options="betriebsmittel_table_options"
+					tableOnly
 					:sideMenu="false" />
-				</div> 
+				</div>
 				<div class="col-12 mb-4" >
-					<core-filter-cmpt 
+					<core-filter-cmpt
+					v-if="preloadedPhrasen.loaded"
 					@tableBuilt="zutrittsgruppenTableBuilt" 
 					:title="$p.t('profil','zutrittsGruppen')" 
 					ref="zutrittsgruppenTable" 

From b46c0147a049b9ee12e4f039bfa3fa642e308b6d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 3 Jul 2025 15:30:38 +0200
Subject: [PATCH 332/572] update(Filter Component): uses fhc-text instead of
 text-dark for the filter icon of the filter component

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

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index e5e804db1..aae6ed5c6 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -669,16 +669,16 @@ export const CoreFilterCmpt = {
 				<div class="d-flex gap-1 align-items-baseline flex-grow-1 justify-content-end">
 					<span v-if="!tableOnly">[ {{ filterName }} ]</span>
 					<span v-else-if="description">{{ description }}</span>
-					<a aria-label="filter" v-if="!tableOnly || $slots.filter" href="#" class="btn btn-link px-0 text-dark" data-bs-toggle="collapse" :data-bs-target="'#collapseFilters' + idExtra">
+					<a aria-label="filter" v-if="!tableOnly || $slots.filter" href="#" class="btn btn-link px-0 fhc-text" data-bs-toggle="collapse" :data-bs-target="'#collapseFilters' + idExtra">
 						<span class="fa-solid fa-xl fa-filter"></span>
 					</a>
-					<a aria-label="filter" v-if="filterActive"  class="btn btn-link px-0 text-dark" :title="$p.t('ui','filterdelete')" @click="clearFilters">
+					<a aria-label="filter" v-if="filterActive"  class="btn btn-link px-0 fhc-text" :title="$p.t('ui','filterdelete')" @click="clearFilters">
 						<span class="fa-solid fa-xl fa-filter-circle-xmark"></span>
 					</a>
-					<a aria-label="filter" href="#" class="btn btn-link px-0 text-dark" data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra">
+					<a aria-label="filter" href="#" class="btn btn-link px-0 fhc-text" data-bs-toggle="collapse" :data-bs-target="'#collapseColumns' + idExtra">
 						<span class="fa-solid fa-xl fa-table-columns"></span>
 					</a>
-					<table-download class="btn btn-link px-0 text-dark" :tabulator="tabulator" :config="download"></table-download>
+					<table-download class="btn btn-link px-0 fhc-text" :tabulator="tabulator" :config="download"></table-download>
 				</div>
 			</div>
 

From 475290e3eff3c09b60d4f053645b901ca2708948 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Thu, 3 Jul 2025 15:47:06 +0200
Subject: [PATCH 333/572] yet another phrase

---
 system/phrasesupdate.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 4ba179ef8..260c1720c 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -32876,6 +32876,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'lehreinheit_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV-Teil ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Teaching unit ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//
 	// DIGITALE ANWESENHEITEN PHRASEN END
 	//

From c8e7adc0748fbfdbd4aa146ef6d94fa0ff5a8f3b Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 3 Jul 2025 16:17:31 +0200
Subject: [PATCH 334/572] alter ferien query to get overlapping events e.g.
 summer holidays

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

diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index a16c8e02e..8bc5a7c70 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -260,7 +260,7 @@ class StundenplanLib{
 		$ferienEvents = $this->_ci->FerienModel->execReadOnlyQuery("
 		SELECT * 
 		FROM lehre.tbl_ferien
-		WHERE (bisdatum BETWEEN ? AND ?) AND (studiengang_kz = 0 OR studiengang_kz = ?)
+		WHERE (bisdatum >= ? AND vondatum <= ?) AND (studiengang_kz = 0 OR studiengang_kz = ?)
 		",[$start_date, $end_date, $studiengang_kz]);
 
 		if (isError($ferienEvents)) {

From d48865d2a1ee8b913d337f3127369e44bff391f7 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 3 Jul 2025 16:37:45 +0200
Subject: [PATCH 335/572] only show lvs with lehre flag true in degree programs
 overview

---
 application/controllers/api/frontend/v1/Studium.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index 23c6b87d5..6f1eff18f 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -260,7 +260,9 @@ SELECT tbl_lehrveranstaltung.*,
         FROM lehre.tbl_lehrveranstaltung
         JOIN lehre.tbl_studienplan_lehrveranstaltung
         USING(lehrveranstaltung_id)
-        WHERE tbl_studienplan_lehrveranstaltung.studienplan_id=? AND tbl_studienplan_lehrveranstaltung.semester=?";
+        WHERE 
+			tbl_lehrveranstaltung.lehre = true AND
+			tbl_studienplan_lehrveranstaltung.studienplan_id=? AND tbl_studienplan_lehrveranstaltung.semester=?";
 		
         if (defined("CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN") && CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN)
 			$query .= " AND tbl_lehrveranstaltung.lehrtyp_kurzbz != 'modul'";

From a0e4c3d93b9405c3386529e0365ab39080413695 Mon Sep 17 00:00:00 2001
From: kindlm <kindlm@technikum-wien.at>
Date: Thu, 3 Jul 2025 17:37:16 +0200
Subject: [PATCH 336/572] GUI-Optimierung Testtool-Admin Seite
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Vorschau vs. Derzeit
- Tab-Zeichen wird bei Tab-Taste eingefügt
- Parse-Error wird bei nicht-wohlgeformtem XML angezeigt
- Button um MathML größer anzuzeigen
---
 cis/testtool/admin/index.php | 255 ++++++++++++++++++++++++++++++++---
 1 file changed, 234 insertions(+), 21 deletions(-)

diff --git a/cis/testtool/admin/index.php b/cis/testtool/admin/index.php
index 6da5040ed..5080a6ffa 100644
--- a/cis/testtool/admin/index.php
+++ b/cis/testtool/admin/index.php
@@ -102,29 +102,175 @@ echo '<?xml version="1.0" encoding="UTF-8"?>';
 <link href="../../../skin/style.css.php" rel="stylesheet" type="text/css" />
 <script language="Javascript">
 //Vorschau anzeigen
-function preview()
-{
-	document.getElementById('vorschau').innerHTML = document.getElementById('text').value;
+function preview(input) {
+	const xmlText = document.getElementById('text_'+input).value;
+	const vorschau = document.getElementById('vorschau_'+input);
+
+	// Zurücksetzen der Styles
+	vorschau.style.textAlign = 'center';
+	vorschau.style.backgroundColor = 'initial';
+	vorschau.style.color = 'initial';
+
+	// Prüfen ob überhaupt Inhalt vorhanden ist
+	if (!xmlText.trim()) {
+		vorschau.innerHTML = '';
+		return;
+	}
+
+	// Prüfe ob HTML/XML-Tags vorhanden sind
+	const hatTags = xmlText.indexOf('&lt;') != -1 &amp;&amp; xmlText.indexOf('&gt;') != -1;
+
+	if (!hatTags) {
+		// Kein HTML/XML - zeige als normalen Text
+		vorschau.innerText = xmlText;
+		return;
+	}
+
+	// Versuche HTML/MathML zu rendern
+	try {
+		// Erstelle einen temporären Container für die Validierung
+		const tempDiv = document.createElement('div');
+		tempDiv.innerHTML = xmlText;
+
+		// Prüfe auf MathML-Elemente und stelle sicher, dass sie korrekt sind
+		const mathElements = tempDiv.querySelectorAll('math');
+		let mathmlValid = true;
+
+		// Verwende eine while-Schleife statt for-Schleife um XML-Probleme zu vermeiden
+		let i = 0;
+		while (i &lt; mathElements.length) {
+			const mathEl = mathElements[i];
+			// Prüfe ob das MathML-Element den korrekten Namespace hat
+			if (!mathEl.hasAttribute('xmlns')) {
+				mathEl.setAttribute('xmlns', 'http://www.w3.org/1998/Math/MathML');
+			}
+
+			// Grundlegende MathML-Validierung
+			const mathmlContent = mathEl.innerHTML;
+			if (mathmlContent.trim() === '') {
+				mathmlValid = false;
+				break;
+			}
+			i++;
+		}
+
+		if (mathmlValid) {
+			// Wenn alles ok ist, zeige den Inhalt an
+			vorschau.innerHTML = xmlText;
+
+			// Versuche MathML zu rendern falls MathJax verfügbar ist
+			if (typeof MathJax != 'undefined' &amp;&amp; MathJax.typesetPromise) {
+				MathJax.typesetPromise([vorschau]).catch(function (err) {
+					console.log('MathJax-Fehler:', err.message);
+				});
+			}
+		} else {
+			throw new Error('Ungültiges MathML');
+		}
+
+	} catch (error) {
+		// HTML-Parsing fehlgeschlagen - prüfe ob es sich um reines XML handelt
+		const startetMitTag = xmlText.trim().charAt(0) === '&lt;';
+		const endetMitTag = xmlText.trim().charAt(xmlText.trim().length - 1) === '&gt;';
+		const hatNurTags = xmlText.indexOf('&lt;') === 0 &amp;&amp; xmlText.lastIndexOf('&gt;') === xmlText.length - 1;
+
+		if (startetMitTag &amp;&amp; endetMitTag &amp;&amp; hatNurTags) {
+			// Versuche XML-Parsing
+			try {
+				const parser = new DOMParser();
+				const parsed = parser.parseFromString(xmlText, 'application/xml');
+				const parsererror = parsed.getElementsByTagName('parsererror');
+
+				if (parsererror.length &gt; 0) {
+					let fehlertext = parsererror[0].textContent;
+					const zeileninfoStart = fehlertext.indexOf("Zeile Nr.");
+					if (zeileninfoStart != -1) {
+						const zeileninfo = fehlertext.substring(zeileninfoStart);
+						fehlertext = 'XML-Verarbeitungsfehler:\n' + zeileninfo;
+					}
+					vorschau.innerText = fehlertext;
+					vorschau.style.textAlign = 'left';
+					vorschau.style.backgroundColor = 'lightyellow';
+					vorschau.style.color = 'red';
+					return;
+				} else {
+					// XML ist gültig
+					vorschau.innerText = xmlText;
+					return;
+				}
+			} catch (xmlError) {
+				// XML-Parsing fehlgeschlagen
+				vorschau.innerText = 'XML-Formatfehler: ' + xmlError.message;
+				vorschau.style.textAlign = 'left';
+				vorschau.style.backgroundColor = 'lightyellow';
+				vorschau.style.color = 'red';
+				return;
+			}
+		} else {
+			// Gemischter Inhalt oder HTML mit Fehlern - zeige Fehlermeldung
+			vorschau.innerText = 'HTML/MathML-Formatfehler: ' + error.message;
+			vorschau.style.textAlign = 'left';
+			vorschau.style.backgroundColor = 'lightyellow';
+			vorschau.style.color = 'red';
+		}
+	}
 }
-function previewvorschlag()
-{
-	document.getElementById('vorschauvorschlag').innerHTML = document.getElementById('text_vorschlag').value;
+function previewvorschlag() {
+	const xmlText = document.getElementById('text_vorschlag').value;
+	const vorschau = document.getElementById('vorschauvorschlag');
+	const parser = new DOMParser();
+	const parsed = parser.parseFromString(xmlText, 'application/xml');
+
+	const parsererror = parsed.getElementsByTagName('parsererror');
+
+	if (parsererror.length > 0) {
+		var fehlertext = parsererror[0].textContent;
+		const zeileninfoStart = fehlertext.indexOf("Zeile Nr.");
+
+		if (zeileninfoStart !== -1) {
+		    const zeileninfo = fehlertext.substring(zeileninfoStart);
+			fehlertext = 'XML-Verarbeitungsfehler:\n ' + zeileninfo;
+		} else {
+			fehlertext = fehlertext; // Fallback
+		}
+		vorschau.innerText = fehlertext;
+		vorschau.style.textAlign = 'left';
+		vorschau.style.backgroundColor = 'lightyellow';
+	} else {
+		// Zeige XML als Text (nicht als HTML rendern!)
+		vorschau.innerHTML = xmlText;
+		vorschau.style.textAlign = 'center';
+		vorschau.style.backgroundColor = 'initial';
+	}
 }
 function insertfrage(aTag, eTag)
 {
-	var input = document.forms['formular_frage'].elements['text'];
+	var input = document.forms['formular_frage'].elements['text_frage'];
 	input.focus();
 	/* Einfügen des Formatierungscodes */
 	var start = input.selectionStart;
 	var end = input.selectionEnd;
 	var insText = input.value.substring(start, end);
-	input.value = input.value.substr(0, start) + aTag + insText + eTag + input.value.substr(end);
+	if (eTag)
+	{
+		input.value = input.value.substr(0, start) + aTag + insText + eTag + input.value.substr(end);
+	}
+	else
+	{
+		input.value = input.value.substr(0, start) + aTag + input.value.substr(end);
+	}
 	/* Anpassen der Cursorposition */
 	var pos;
 	if (insText.length == 0) {
 		pos = start + aTag.length;
-	} else {
-		pos = start + aTag.length + insText.length + eTag.length;
+	} else
+	{
+		if (eTag) {
+			pos = start + aTag.length + insText.length + eTag.length;
+		}
+		else {
+			pos = start + aTag.length + insText.length;
+		}
 	}
 	input.selectionStart = pos;
 	input.selectionEnd = pos;
@@ -137,13 +283,25 @@ function insertvorschlag(aTag, eTag)
 	var start = input.selectionStart;
 	var end = input.selectionEnd;
 	var insText = input.value.substring(start, end);
-	input.value = input.value.substr(0, start) + aTag + insText + eTag + input.value.substr(end);
+	if (eTag)
+	{
+		input.value = input.value.substr(0, start) + aTag + insText + eTag + input.value.substr(end);
+	}
+	else
+	{
+		input.value = input.value.substr(0, start) + aTag + input.value.substr(end);
+	}
 	/* Anpassen der Cursorposition */
 	var pos;
 	if (insText.length == 0) {
 		pos = start + aTag.length;
 	} else {
-		pos = start + aTag.length + insText.length + eTag.length;
+		if (eTag) {
+			pos = start + aTag.length + insText.length + eTag.length;
+		}
+		else {
+			pos = start + aTag.length + insText.length;
+		}
 	}
 	input.selectionStart = pos;
 	input.selectionEnd = pos;
@@ -153,6 +311,14 @@ function confirmDeleteFrage()
 {
 	return confirm('Wollen Sie diese Frage wirklich löschen?');
 }
+
+function increaseMATHML()
+{
+	const mathTags = document.querySelectorAll('math');
+	mathTags.forEach(tag => {
+		tag.style.fontSize = '200%';
+	});
+}
 </script>
 <style type="text/css">
 
@@ -931,7 +1097,7 @@ if ($frage_id != '')
 	//Bei Aenderungen im Textfeld werden diese sofort in der Vorschau angezeigt
 	//Wenn beim Speichern der Text kein Gueltiges XML ist, wird der vorige Text erneut angezeigt
 
-	echo "<tr valign='top'><td colspan='2'>\n<textarea name='text' id='text' cols='50' rows='27' oninput='preview()' ".($frage->aktiv == false?'disabled="disabled"':'')."><![CDATA[".(isset($frage_error_text)?$frage_error_text:$frage->text)."]]></textarea>\n</td>";
+	echo "<tr valign='top'><td colspan='2'>\n<textarea name='text' id='text_frage' cols='50' rows='27' oninput='preview(\"frage\")' ".($frage->aktiv == false?'disabled="disabled"':'')."><![CDATA[".(isset($frage_error_text)?$frage_error_text:$frage->text)."]]></textarea>\n</td>";
 	echo "<table><tr><td><input type='button' value='br' onclick='insertfrage(\"&lt;br/&gt;\", \"\")' />";
 	echo "<input type='button' value='F' style='font-weight:bold' onclick='insertfrage(\"&lt;strong&gt;\", \"&lt;/strong&gt;\")' />";
 	echo "<input type='button' value='K' style='font-style:italic' onclick='insertfrage(\"&lt;i&gt;\", \"&lt;/i&gt;\")' /><br/><br/>";
@@ -948,8 +1114,14 @@ if ($frage_id != '')
 	echo "<input type='button' value='msqrt' onclick='insertfrage(\"&lt;msqrt&gt;\", \"&lt;/msqrt&gt;\")' title='Wurzel' /><br/>";
 	echo "<input type='button' value='munderover' onclick='insertfrage(\"&lt;munderover&gt;&lt;mo movablelimits=\&quot;false\&quot;&gt;Das steht mittig&lt;/mo&gt;&lt;mo&gt;Das steht unten&lt;/mo&gt;&lt;mo&gt;Das steht oben&lt;/mo&gt;&lt;/munderover&gt;\", \"\")' title='Oben und unten' /><br/>";
 	echo "<input type='button' value='mtext' onclick='insertfrage(\"&lt;mtext&gt;\", \"&lt;/mtext&gt;\")' title='Text' /><br/>";
-	echo "Operatoren:<br/>π<br/>·<br/>∑<br/>∫<br/><a href='http://de.selfhtml.org/html/referenz/zeichen.htm#benannte_iso8859_1' target='blank'>Weitere</a>";
-	echo "</td>";
+	echo "Operatoren:<p>";
+	echo "<button type='button' onclick='insertfrage(\"&lt;mo&gt;π&lt;/mo&gt;\")'>π</button>&nbsp;";
+	echo "<button type='button' onclick='insertfrage(\"&lt;mo&gt;·&lt;/mo&gt;\")'>·</button>&nbsp;";
+	echo "<button type='button' onclick='insertfrage(\"&lt;mo&gt;∑&lt;/mo&gt;\")'>∑</button>&nbsp;";
+	echo "<button type='button' onclick='insertfrage(\"&lt;mo&gt;∫&lt;/mo&gt;\")'>∫</button>";
+	echo "<p><a href='http://de.selfhtml.org/html/referenz/zeichen.htm#benannte_iso8859_1' target='blank'>Weitere</a></p>";
+	echo "<button type='button' onclick='increaseMATHML()'>MathML größer</button>";
+	echo "</p></td>";
 	echo "</tr></table></tr>";
 	echo "<tr><td>Demo <input type='checkbox' name='demo' ".($frage->demo?'checked="true"':'')." />
 			Level <input type='text' name='level' value='$frage->level' size='1' />
@@ -960,7 +1132,10 @@ if ($frage_id != '')
 	echo "</form>";
 	echo "</td></tr>";
 	//Vorschau fuer das Text-Feld
-	echo "<tr><td colspan='2'>Vorschau:<br /><div id='vorschau' style='border: 1px solid black' align='center'>$frage->text</div></td></tr>";
+	echo "<tr><td style='width: 50%'>Vorschau:<br />
+			<div id='vorschau_frage' style='border: 1px solid black' align='center'>$frage->text</div></td>
+			<td style='width: 50%'>Derzeit:<br /><div id='aktuell' style='border: 1px solid black' align='center'>$frage->text</div>
+			</td></tr>";
 	echo "</table>";
 	echo '</td><td style="border-left: 1px solid black" valign="top">';
 
@@ -1022,7 +1197,7 @@ if ($frage_id != '')
 	echo "<input type='button' value='+1/2' style='background-color:#C5FFBF' onclick='document.getElementById(\"punkte\").value=\"0.5\";' /></td>";
 	echo '</tr>';
 	echo '<tr valign="top">';
-	echo '<td>Text:</td><td><textarea name="text" id="text_vorschlag" rows="25" cols="45" oninput="previewvorschlag()" '.($vorschlag->aktiv == true || is_null($vorschlag->aktiv)?'':'disabled="disabled"').'><![CDATA['.$vorschlag->text."]]></textarea>\n</td>";
+	echo '<td>Text:</td><td><textarea name="text" id="text_vorschlag" rows="25" cols="45" oninput="preview(\'vorschlag\')" '.($vorschlag->aktiv == true || is_null($vorschlag->aktiv)?'':'disabled="disabled"').'><![CDATA['.$vorschlag->text."]]></textarea>\n</td>";
 	echo "<td><input type='button' value='br' onclick='insertvorschlag(\"&lt;br/&gt;\", \"\")' />";
 	echo "<input type='button' value='F' style='font-weight:bold' onclick='insertvorschlag(\"&lt;strong&gt;\", \"&lt;/strong&gt;\")' />";
 	echo "<input type='button' value='K' style='font-style:italic' onclick='insertvorschlag(\"&lt;i&gt;\", \"&lt;/i&gt;\")' /><br/><br/>";
@@ -1039,8 +1214,12 @@ if ($frage_id != '')
 	echo "<input type='button' value='msqrt' onclick='insertvorschlag(\"&lt;msqrt&gt;\", \"&lt;/msqrt&gt;\")' title='Wurzel' /><br/>";
 	echo "<input type='button' value='munderover' onclick='insertvorschlag(\"&lt;munderover&gt;&lt;mo movablelimits=\&quot;false\&quot;&gt;Das steht mittig&lt;/mo&gt;&lt;mo&gt;Das steht unten&lt;/mo&gt;&lt;mo&gt;Das steht oben&lt;/mo&gt;&lt;/munderover&gt;\", \"\")' title='Oben und unten' /><br/>";
 	echo "<input type='button' value='mtext' onclick='insertvorschlag(\"&lt;mtext&gt;\", \"&lt;/mtext&gt;\")' title='Text' /><br/>";
-	echo "Operatoren:<br/>π<br/>·<br/>∑<br/>∫<br/><a href='http://de.selfhtml.org/html/referenz/zeichen.htm#benannte_iso8859_1' target='blank'>Weitere</a>";
-	echo "</td>";
+	echo "Operatoren:<p>";
+	echo "<button type='button' onclick='insertvorschlag(\"&lt;mo&gt;π&lt;/mo&gt;\")'>π</button>&nbsp;";
+	echo "<button type='button' onclick='insertvorschlag(\"&lt;mo&gt;·&lt;/mo&gt;\")'>·</button>&nbsp;";
+	echo "<button type='button' onclick='insertvorschlag(\"&lt;mo&gt;∑&lt;/mo&gt;\")'>∑</button>&nbsp;";
+	echo "<button type='button' onclick='insertvorschlag(\"&lt;mo&gt;∫&lt;/mo&gt;\")'>∫</button>";
+	echo "</p></td>";
 	echo '</tr><tr valign="top">';
 	//Upload Feld fuer Bild
 	echo "<td>Bild:</td><td><input type='file' name='bild' /></td>";
@@ -1062,10 +1241,10 @@ if ($frage_id != '')
 	echo "/></td></tr>";
 	echo "<tr><td colspan='2' align='right'><input type='submit' name='submitvorschlag' value='Speichern' />".($vorschlag_id != ''?"<input type='button' value='Abbrechen' onclick=\"document.location.href='$PHP_SELF?gebiet_id=$gebiet_id&amp;stg_kz=$stg_kz&amp;nummer=$nummer&amp;frage_id=$frage->frage_id'\" />":'')."</td></tr>";
 	//Vorschau fuer das Text-Feld
-	echo "<tr><td colspan='2'>Vorschau:<br /><div id='vorschauvorschlag' style='border: 1px solid black' align='center'>$vorschlag->text</div></td></tr>";
+	echo "<tr><td colspan='2'>Vorschau:<br /><div id='vorschau_vorschlag' style='border: 1px solid black' align='center'>$vorschlag->text</div>
+			Derzeit:<br /><div id='aktuellvorschlag' style='border: 1px solid black' align='center'>$vorschlag->text</div></td></tr>";
 	echo "</table>";
 	echo "</form>";
-
 	echo '</td></tr></table>';
 
 	$vorschlag = new vorschlag();
@@ -1115,6 +1294,40 @@ if ($frage_id != '')
 		echo '<tr><td><input type="hidden" name="allevorschlaege" value="'.$allevorschlaege.'" />Summe:</td><td align="left">'.number_format(array_sum($a), 2, ".", "").'&nbsp;&nbsp;</td><td></td><td></td><td></td><td></td><td></td><td><input type="submit" value="Speichern"/></td></tr>';
 		echo '</table></form><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>';
 	}
+	echo "<script>
+			document.getElementById('text_vorschlag').addEventListener('keydown', function(e) 
+			{
+				if (e.key === 'Tab') {
+				e.preventDefault();
+		
+				const textarea = e.target;
+				const start = textarea.selectionStart;
+				const end = textarea.selectionEnd;
+		
+				// Tabulator-Zeichen einfügen
+				textarea.value = textarea.value.substring(0, start) + '\t' + textarea.value.substring(end);
+		
+				// Cursor hinter den Tab setzen
+				textarea.selectionStart = textarea.selectionEnd = start + 1;
+				}
+			});
+			document.getElementById('text_frage').addEventListener('keydown', function(e) 
+			{
+				if (e.key === 'Tab') {
+				e.preventDefault();
+		
+				const textarea = e.target;
+				const start = textarea.selectionStart;
+				const end = textarea.selectionEnd;
+		
+				// Tabulator-Zeichen einfügen
+				textarea.value = textarea.value.substring(0, start) + '\t' + textarea.value.substring(end);
+		
+				// Cursor hinter den Tab setzen
+				textarea.selectionStart = textarea.selectionEnd = start + 1;
+				}
+			});
+		</script>";
 }
 
 

From 88adb8b139f0dd62d054ad8655d52a2b2d79946b Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 4 Jul 2025 07:43:21 +0200
Subject: [PATCH 337/572] Tab Messages: fix input Variables in TinyMCE

---
 .../Messages/Details/NewMessage/Modal.js           | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index 3503cbeb9..9c9bcd4cd 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -153,17 +153,11 @@ export default {
 		insertVariable(selectedItem){
 			if (this.editor) {
 				this.editor.insertContent(selectedItem.value + " ");
-				//TODO(Manu) check: nicht mal mit Punkt adden gehts ohne eintrag nach vars
-				/*				this.editor.focus();
-								this.editor.setDirty(true);*/
 
-				//this.editor.fire('change'); //forces
-
-				//this.editor.undoManager.add();
-
-				//this.editor.insertContent(selectedItem.value + "\u00A0");
-				//this.editor.insertContent(`<span>${selectedItem.value}&nbsp;</span>`);
-				//this.editor.selection.setCursorLocation(this.editor.getBody(), 1);
+				this.editor.fire('input');
+				this.editor.fire('change');
+				this.editor.setDirty(true);
+				this.editor.save();
 
 			} else {
 				console.error("Editor instance is not available.");

From 101636e9fcd48dec5d1861074d33e511d21df4b1 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 4 Jul 2025 11:31:13 +0200
Subject: [PATCH 338/572] timeline tooltip

---
 system/phrasesupdate.php | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 260c1720c..26472be29 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -32876,6 +32876,38 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'anwesenheiten',
+		'category' => 'global',
+		'phrase' => 'tooltipAnwTimeline',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die "Digitale Anwesenheiten Timeline" ist ein experimentelles feature, welches eine zeitliche Visualisierung von Entschuldigungszeiträumen und Kontrollzeiträumen im Kontext eines Studenten anzeigt.
+				
+					Wenn Sie auf eine aufgelistete Entschuldigung oder Kontrolle klicken, versucht die Timeline diese zu finden, falls diese im angegebenen Zeitraum liegt, welcher standardmäßig das gesamte aktuelle Jahr beträgt. Sie können diese Grenzen manuell anpassen.
+					
+					Wenn man innerhalb der Timeline scrollt, ändert sich der visuelle Abstand zwischen einzelnen Tagen.
+					
+					Bei Klick auf eine gerenderte Datumsreichweite in der Timeline, listet sich oben rechts eine Liste von zugehörigen Attributen auf, welche Administratoren und Entwicklern in Fehlerfällen helfen sollen den Zustand der digitalen Amwesenheiten im Kontext eines Studierenden nachzuvollziehen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The "Digital Attendance Timeline" is an experimental feature that displays a temporal visualization of excuse periods and check-in periods in the context of a student.
+
+					When you click on a listed excuse or check-in period, the timeline attempts to find it if it falls within the specified period, which by default is the entire current year. You can adjust these boundaries manually.
+					
+					Scrolling within the timeline changes the visual spacing between individual days.
+					
+					Clicking on a rendered date range in the timeline displays a list of associated attributes in the upper right corner. These attributes are intended to help administrators and developers understand the status of digital attendance in the context of a student in case of errors.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',

From 5280943099901617c81318d27c225c64c0553780 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 7 Jul 2025 10:10:38 +0200
Subject: [PATCH 339/572] fix(Studium):checks if the query of the data in the
 studium endpoints returns an array otherwise return empty array to avoid
 breaking the endpoint

---
 application/controllers/api/frontend/v1/Studium.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index 6f1eff18f..fb4d3ce3c 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -313,10 +313,12 @@ SELECT tbl_lehrveranstaltung.*,
 	private function computeLektorenFromLehrveranstaltung($lehreinheit_id, $semester, $studiengang, $studiensemester){
 		$this->load->library('StundenplanLib');
 		$lektoren = $this->stundenplanlib->getLektorenFromLehrveranstaltung($lehreinheit_id,$semester, $studiengang,$studiensemester);
-		$lektoren = $this->getDataOrTerminateWithError($lektoren);
+		$lektoren = $this->getDataOrTerminateWithError($lektoren) ?? [];
+		
 		$lektoren = array_map(function($lektor){
 			return ["name"=>$this->getDataOrTerminateWithError($this->PersonModel->getFullName($lektor)), "email"=>$lektor."@".DOMAIN];
 		},$lektoren);
+		
 		return $lektoren;
 	}
 

From 4937c1190aea2d13e33c4131237ad5e953948573 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 7 Jul 2025 11:13:37 +0200
Subject: [PATCH 340/572] bugfix: warning html-tags

---
 public/js/components/DetailHeader/DetailHeader.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 96cd2e4b7..4cf2571a8 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -110,8 +110,7 @@ export default {
 					<div
 						v-for="person in headerData"
 						:key="person.person_id"
-						class="d-flex flex-column align-items-center h-100"
-						class="position-relative d-inline-block"
+						class="d-flex flex-column align-items-center h-100 position-relative d-inline-block"
 					>
 						<img
 						  class="d-block h-100 rounded"
@@ -162,7 +161,6 @@ export default {
 					  </h5>
 
 					</div>
-				</div>
 		</template>
 
 		<template v-if="typeHeader==='mitarbeiter'">

From cfe76e09b1ffeb176408051dae936d854e7d1a52 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 7 Jul 2025 11:47:06 +0200
Subject: [PATCH 341/572] AntragJob StglSammelmail an alle Stgleiter senden

---
 application/controllers/jobs/AntragJob.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 11b950174..debcfe391 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -95,12 +95,15 @@ class AntragJob extends JOB_Controller
 					continue;
 				}
 
-				$leitung = current(getData($result));
-				if (!isset($stgLeitungen[$leitung->uid]))
+				$leitungen = getData($result);
+				foreach ($leitungen as $leitung)
 				{
-					$stgLeitungen[$leitung->uid] = [ 'Details' => $leitung, 'stgs' => [] ];
+					if (!isset($stgLeitungen[$leitung->uid]))
+					{
+						$stgLeitungen[$leitung->uid] = ['Details' => $leitung, 'stgs' => []];
+					}
+					$stgLeitungen[$leitung->uid]['stgs'][] = $antrag->studiengang_kz;
 				}
-				$stgLeitungen[$leitung->uid]['stgs'][] = $antrag->studiengang_kz;
 
 				$result = $this->StudierendenantragModel->getStgAndSem($antrag->studierendenantrag_id);
 				if (isError($result))

From b1ab0ddf18ff50ba5671d3bd897b857756daf055 Mon Sep 17 00:00:00 2001
From: kindlm <kindlm@technikum-wien.at>
Date: Mon, 7 Jul 2025 14:23:59 +0200
Subject: [PATCH 342/572] Zeilenumbruch, wenn Fragen-Liste zu lang

---
 cis/testtool/admin/index.php | 107 ++++++++++++++++++++++++-----------
 1 file changed, 73 insertions(+), 34 deletions(-)

diff --git a/cis/testtool/admin/index.php b/cis/testtool/admin/index.php
index 5080a6ffa..4f010784f 100644
--- a/cis/testtool/admin/index.php
+++ b/cis/testtool/admin/index.php
@@ -65,7 +65,7 @@ if (isset($_GET['nummer']))
 }
 else
 {
-	$nummer = '';
+	$nummer = '0';
 }
 
 if (isset($_GET['frage_id']))
@@ -944,44 +944,83 @@ if (($anzahl !== 0) || ($stg_kz == '-1') && ($stg_kz !== ''))
 					<a href="'.$PHP_SELF.'?gebiet_id='.$gebiet_id.'&amp;stg_kz='.$stg_kz.'&amp;nummer='.$nummer.'&amp;filter=aktiv">
 					<input type="checkbox" name="inaktiv" '.$inaktivchecked.' onclick="window.location.assign(\''.$PHP_SELF.'?gebiet_id='.$gebiet_id.'&amp;stg_kz='.$stg_kz.'&amp;nummer='.$nummer.'&amp;filter=aktiv\');"/>inaktiv</a>';
 		}
-		echo '<br/><table class="nummern" style="display: inline-table;"><tbody><tr>
-				<td>Nummer:</td>';
-		foreach ($resultArray AS $key=>$value)
-		{
-			if ($nummer == '')
-				$nummer = $value['nummer'];
+		echo '<br/>';
 
-			$style = '';
-			if ($db->db_parse_bool($value['aktiv']) == false)
-				$style = 'style="color: lightgrey"';
+		$counter = 0;
+		$maxPerTable = 50;
+		$totalItems = count($resultArray);
 
-			$styleSelected = '';
-			if ($nummer == $value['nummer'])
-			{
-				$styleSelected = 'style="background-color: lightblue"';
-			}
+		// Erste Tabelle öffnen
+		echo '<table class="nummern" style="display: inline-table; margin-bottom: 10px;"><tbody><tr>
+		            <td>Nummer:</td>';
 
-			echo '<td class="nummern" '.$styleSelected.'><a href="'.$PHP_SELF.'?gebiet_id='.$gebiet_id.'&amp;stg_kz='.$stg_kz.'&amp;nummer='.$value['nummer'].'&amp;filter='.$filter.'" '.$style.'>'.$value['nummer'].'</a></td>';
+		foreach ($resultArray AS $key=>$value) {
+		    // Neue Tabelle starten, wenn 50 Einträge erreicht sind
+		    if ($counter > 0 && $counter % $maxPerTable == 0) {
+		        // Aktuelle Tabelle schließen
+		        echo '</tr><tr><td>Level:</td>';
+
+		        // Level-Zeile für die vorherigen Einträge
+		        $startIndex = $counter - $maxPerTable;
+		        $endIndex = $counter;
+		        $tempArray = array_slice($resultArray, $startIndex, $maxPerTable, true);
+
+		        foreach ($tempArray AS $tempKey=>$tempValue) {
+		            $leveltext = '';
+		            if ($tempValue['level'] == '') {
+		                $leveltext = '-';
+		            } else {
+		                $leveltext = $tempValue['level'];
+		                if ($tempValue['demo'] == 't') {
+		                    $leveltext .= '*';
+		                }
+		            }
+		            echo '<td class="nummern" style="color: grey">'.$leveltext.'</td>';
+		        }
+
+		        echo '</tr></tbody></table><br/>';
+
+		        // Neue Tabelle starten
+		        echo '<table class="nummern" style="display: inline-table; margin-bottom: 10px;"><tbody><tr>
+		                    <td>Nummer:</td>';
+		    }
+
+		    if ($nummer == '')
+		        $nummer = $value['nummer'];
+		    $style = '';
+		    if ($db->db_parse_bool($value['aktiv']) == false)
+		        $style = 'style="color: lightgrey"';
+		    $styleSelected = '';
+		    if ($nummer == $value['nummer']) {
+		        $styleSelected = 'style="background-color: lightblue"';
+		    }
+		    echo '<td class="nummern" '.$styleSelected.'><a href="'.$PHP_SELF.'?gebiet_id='.$gebiet_id.'&amp;stg_kz='.$stg_kz.'&amp;nummer='.$value['nummer'].'&amp;filter='.$filter.'" '.$style.'>'.$value['nummer'].'</a></td>';
+
+		    $counter++;
 		}
-		echo '</tr><tr>
-				<td>Level:</td>';
-		$leveltext = '';
-		foreach ($resultArray AS $key=>$value)
-		{
-			if ($value['level'] == '')
-			{
-				$leveltext = '-';
-			}
-			else
-			{
-				$leveltext = $value['level'];
-				if ($value['demo'] == 't')
-				{
-					$leveltext .= '*';
-				}
-			}
-			echo '<td class="nummern" style="color: grey">'.$leveltext.'</td>';
+
+		// Letzte Tabelle schließen
+		echo '</tr><tr><td>Level:</td>';
+
+		// Level-Zeile für die letzten Einträge
+		$remainingItems = $counter % $maxPerTable;
+		if ($remainingItems == 0) $remainingItems = $maxPerTable;
+		$startIndex = $counter - $remainingItems;
+		$tempArray = array_slice($resultArray, $startIndex, $remainingItems, true);
+
+		foreach ($tempArray AS $tempKey=>$tempValue) {
+		    $leveltext = '';
+		    if ($tempValue['level'] == '') {
+		        $leveltext = '-';
+		    } else {
+		        $leveltext = $tempValue['level'];
+		        if ($tempValue['demo'] == 't') {
+		            $leveltext .= '*';
+		        }
+		    }
+		    echo '<td class="nummern" style="color: grey">'.$leveltext.'</td>';
 		}
+
 		echo '</tr></tbody></table>';
 		echo " <a href='$PHP_SELF?gebiet_id=$gebiet_id&amp;stg_kz=$stg_kz&amp;type=neuefrage&amp;filter=$filter' class='Item'>neue Frage hinzufuegen</a>";
 		$frage_obj = new frage();

From ddea3afde48e8e2d946523302ced6c96366c2cde Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 7 Jul 2025 15:36:12 +0200
Subject: [PATCH 343/572] =?UTF-8?q?Adaptions=20FHC-Alert=20-=20restructure?=
 =?UTF-8?q?=20plugins=20Api,=20FhcAlert=20ans=20Phrasen=20to=20use=20Phras?=
 =?UTF-8?q?en=20in=20Fhc-Alert=20=E2=80=93=20fix=20behaviour=20alert=20war?=
 =?UTF-8?q?ning:=20show=20always=20clossing=20cross,=20and=20symbol=20-=20?=
 =?UTF-8?q?fix=20behaviour=20alert=20error:=20add=20scrolling=20to=20Text?=
 =?UTF-8?q?=20MessageError=20-=20phrases=20alerts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/components/primevue.css            | 11 ++++
 .../js/components/Stv/Studentenverwaltung.js  |  2 +
 public/js/plugins/Api.js                      |  4 +-
 public/js/plugins/FhcAlert.js                 | 23 ++++---
 public/js/plugins/Phrasen.js                  |  6 +-
 system/phrasesupdate.php                      | 62 +++++++++++++++++++
 6 files changed, 97 insertions(+), 11 deletions(-)

diff --git a/public/css/components/primevue.css b/public/css/components/primevue.css
index 38b15004b..fbbae4e58 100644
--- a/public/css/components/primevue.css
+++ b/public/css/components/primevue.css
@@ -5249,6 +5249,8 @@
 }
 .p-toast .p-toast-message .p-toast-message-content .p-toast-message-text {
   margin: 0 0 0 1rem;
+  flex: 1 0 0%;
+  word-break: break-word;
 }
 .p-toast .p-toast-message .p-toast-message-content .p-toast-message-icon {
   font-size: 2rem;
@@ -5314,6 +5316,15 @@
 .p-toast .p-toast-message.p-toast-message-error .p-toast-icon-close {
   color: #721c24;
 }
+.p-toast.p-component.p-toast-top-right.fhc-alert {
+  max-height: calc(100vh - 20px - 1rem);
+  overflow: auto;
+}
+
+.p-toast-message-text .alertCollapseText {
+  overflow: auto;
+  max-height: 30rem;
+}
 
 .p-galleria .p-galleria-close {
   margin: 0.5rem;
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 36340a767..96846f76d 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -192,6 +192,8 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	mounted() {
+		//Test manu Systemerror
+		//FHC_JS_DATA_STORAGE_OBJECT.systemerror_mailto = 'ma0068@technikum-wien.at';this.$fhcAlert.handleSystemError(1);
 		if (this.$route.params.id) {
 			this.$refs.stvList.updateUrl(
 				ApiStv.students.uid(this.$route.params.id),
diff --git a/public/js/plugins/Api.js b/public/js/plugins/Api.js
index b087a6235..d0ffaa439 100644
--- a/public/js/plugins/Api.js
+++ b/public/js/plugins/Api.js
@@ -6,7 +6,9 @@ export default {
 		if (app.config.globalProperties.$api) {
 			return;
 		}
-		app.use(FhcAlert);
+
+		if (!app.config.globalProperties.$fhcAlert)
+			app.use(FhcAlert);
 
 		function _get_config(form, uri, data, config) {
 			if (typeof form == 'string' && config === undefined) {
diff --git a/public/js/plugins/FhcAlert.js b/public/js/plugins/FhcAlert.js
index c6aaee33e..ad3975a73 100644
--- a/public/js/plugins/FhcAlert.js
+++ b/public/js/plugins/FhcAlert.js
@@ -96,6 +96,7 @@ import PvConfig from "../../../index.ci.php/public/js/components/primevue/config
 import PvToast from "../../../index.ci.php/public/js/components/primevue/toast/toast.esm.min.js";
 import PvConfirm from "../../../index.ci.php/public/js/components/primevue/confirmdialog/confirmdialog.esm.min.js";
 import PvConfirmationService from "../../../index.ci.php/public/js/components/primevue/confirmationservice/confirmationservice.esm.min.js";
+import FhcPhrasen from "./Phrasen.js";
 
 import {CoreRESTClient} from '../RESTClient.js';
 
@@ -138,7 +139,7 @@ const helperApp = Vue.createApp({
 			return FHC_JS_DATA_STORAGE_OBJECT.systemerror_mailto !== '';
 		}
 	},
-	template: `
+	template: /* html */`
 	<pv-toast ref="toast" class="fhc-alert" :base-z-index="99999"></pv-toast>
 	<pv-toast ref="alert" class="fhc-alert" :base-z-index="99999" position="center">
 		<template #message="slotProps">
@@ -168,7 +169,7 @@ const helperApp = Vue.createApp({
 					</a>
 				</div>
 				<div ref="messageCard" :id="'fhcAlertCollapseMessageCard' + slotProps.message.id" class="collapse mt-3">
-					<div class="card card-body text-body small">
+					<div class="card card-body text-body small alertCollapseText">
 						{{slotProps.message.detail}}
 					</div>
 				</div>
@@ -180,6 +181,7 @@ const helperApp = Vue.createApp({
 
 helperApp.use(PvConfig);
 helperApp.use(PvConfirmationService);
+//helperApp.use(FhcPhrasen);
 
 const helperAppInstance = helperApp.mount(helperAppContainer);
 
@@ -188,6 +190,9 @@ document.body.appendChild(helperAppContainer);
 
 export default {
 	install: (app, options) => {
+		if (!app.config.globalProperties.$p)
+			app.use(FhcPhrasen);
+
 		const $fhcAlert = {
 			alertSuccess(message) {
 				if (Array.isArray(message))
@@ -210,6 +215,8 @@ export default {
 				helperAppInstance.$refs.toast.add({ severity: 'error', summary: 'Achtung', detail: message });
 			},
 			alertSystemError(message) {
+				//TODO(Manu) for translation of content of template: restructure in data
+				//and update definitions with  translations
 				if (Array.isArray(message))
 					return message.forEach(this.alertSystemError);
 				helperAppInstance.$refs.alert.add({ severity: 'error', summary: 'Systemfehler', detail: message});
@@ -218,11 +225,11 @@ export default {
 				return new Promise((resolve, reject) => {
 					helperAppInstance.$confirm.require({
 						group: 'fhcAlertConfirm',
-						header: 'Achtung',
-						message: 'Möchten Sie sicher löschen?',
-						acceptLabel: 'Löschen',
+						header: Vue.computed(() => app.config.globalProperties.$p.t('alert/attention')),
+						message: Vue.computed(() => app.config.globalProperties.$p.t('alert/confirm_delete')),
+						acceptLabel: Vue.computed(() => app.config.globalProperties.$p.t('ui/loeschen')),
 						acceptClass: 'p-button-danger',
-						rejectLabel: 'Abbrechen',
+						rejectLabel: Vue.computed(() => app.config.globalProperties.$p.t('ui/abbrechen')),
 						rejectClass: 'p-button-secondary',
 						accept() {
 							resolve(true);
@@ -237,11 +244,11 @@ export default {
 				return new Promise((resolve, reject) => {
 					helperAppInstance.$confirm.require({
 						group: options?.group ?? 'fhcAlertConfirm',
-						header: options?.header ?? 'Achtung',
+						header: options?.header ?? Vue.computed(() => app.config.globalProperties.$p.t('alert/attention')),
 						message: options?.message ?? '',
 						acceptLabel: options?.acceptLabel ?? 'Ok',
 						acceptClass: options?.acceptClass ?? 'btn btn-primary',
-						rejectLabel: options?.rejectLabel ?? 'Abbrechen',
+						rejectLabel: options?.rejectLabel ?? Vue.computed(() => app.config.globalProperties.$p.t('ui/abbrechen')),
 						rejectClass: options?.rejectClass ?? 'btn btn-outline-secondary',
 						accept() {
 							resolve(true);
diff --git a/public/js/plugins/Phrasen.js b/public/js/plugins/Phrasen.js
index 70f4fb64f..303e74358 100644
--- a/public/js/plugins/Phrasen.js
+++ b/public/js/plugins/Phrasen.js
@@ -87,8 +87,10 @@ const phrasen = {
 
 export default {
 	install(app, options) {
-		app.use(OldFhcApi); // TODO(chris): remove at some point
-		app.use(PluginsApi);
+		if (!app.config.globalProperties.$fhcApi)
+			app.use(OldFhcApi); // TODO(chris): remove at some point
+		if (!app.config.globalProperties.$api)
+			app.use(PluginsApi);
 		app.config.globalProperties.$p = {
 			t: phrasen.t,
 			loadCategory: cat => phrasen.loadCategory.call(app, cat),
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index abe07745e..34180326d 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44414,6 +44414,68 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	// FHC-4 Studierendenverwaltung FHC-ALERTS START
+	array(
+		'app' => 'core',
+		'category' => 'alert',
+		'phrase' => 'attention',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Achtung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attention',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'alert',
+		'phrase' => 'confirm_delete',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Möchten Sie wirklich löschen?',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Do you really want to delete?',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'alert',
+		'phrase' => 'attention',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Achtung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attention',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	// FHC-4 Studierendenverwaltung FHC-ALERTS END
 );
 
 

From 2262169699a8283e417a53da7f73d75524b0c780 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 7 Jul 2025 15:47:34 +0200
Subject: [PATCH 344/572] filter component set default height only if no height
 attribute is set in tabulatoroptions. remove reactivedata default setting and
 old todo comments

---
 public/js/components/filter/Filter.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index cf02dccf5..37bea4c84 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -75,7 +75,7 @@ export const CoreFilterCmpt = {
 		newBtnDisabled: Boolean,
 		newBtnLabel: String,
 		uniqueId: String,
-		// TODO soll im master kommen?
+
 		idField: String,
 		parentIdField: String,
 		countOnly: Boolean
@@ -216,17 +216,22 @@ export const CoreFilterCmpt = {
 			}
 			// Define a default tabulator options in case it was not provided
 			let tabulatorOptions = {...{
-					height: 500,
 					layout: "fitDataStretchFrozen",
 					movableColumns: true,
 					columnDefaults:{
 						tooltip: true
 					},
 					placeholder,
-					reactiveData: true,
 					persistence: this.persistence,
 				}, ...(this.tabulatorOptions || {})};
 
+			// set default height if no height property is set
+			if (tabulatorOptions.height === undefined &&
+				tabulatorOptions.minHeight === undefined &&
+				tabulatorOptions.maxHeight === undefined) {
+				tabulatorOptions.height = 500;
+			}
+
 			if (!this.tableOnly) {
 				tabulatorOptions.data = this.filteredData;
 				tabulatorOptions.columns = this.filteredColumns;
@@ -234,7 +239,7 @@ export const CoreFilterCmpt = {
 
 			if (tabulatorOptions.selectable || (tabulatorOptions.columns && tabulatorOptions.columns.filter(el => el.formatter == 'rowSelection').length))
 				this.tabulatorHasSelector = true;
-			// TODO check ob im core bleiben soll
+
 			if (this.idField) {
 				// enable nested tabulator if parent Id given
 				if (this.parentIdField) tabulatorOptions.dataTree = true;
@@ -258,7 +263,7 @@ export const CoreFilterCmpt = {
 			this.tabulator.on("rowSelectionChanged", data => {
 				this.selectedData = data;
 			});
-			// TODO check ob im core so bleiben soll
+
 			// if nested tabulator, restructure data
 			if (this.parentIdField && this.idField) {
 				this.tabulator.on("dataLoading", data => {
@@ -575,7 +580,7 @@ export const CoreFilterCmpt = {
 				this.getFilter
 			);
 		},
-		// TODO check ob im core so bleiben soll
+
 		// append child to it's parent
 		appendChild(data, child) {
 			// get parent id

From 3f9564b686c77f5ac09cc39341a8caa36c286725 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 7 Jul 2025 16:21:04 +0200
Subject: [PATCH 345/572] anrechnungen notiz layout cleanup, use tabulator
 layout fitDataStretchFrozen

---
 public/js/components/Notiz/Notiz.js           | 24 +++++++++----------
 .../Details/Anrechnungen/Anrechnungen.js      |  8 +++----
 .../Details/Dokumente/List/Accepted.js        |  2 +-
 .../Details/Dokumente/List/Unaccepted.js      |  2 +-
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 1237db868..783987363 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -173,12 +173,12 @@ export default {
 						},
 						frozen: true
 					}],
-				layout: 'fitColumns',
+				layout: 'fitDataStretchFrozen',
 				layoutColumnsOnNewData: false,
-				responsiveLayout: "collapse",
-				height: '200',
-				selectableRangeMode: 'click',
-				selectable: true,
+				//responsiveLayout: "collapse",
+				maxHeight: '200px',
+				//selectableRangeMode: 'click',
+				//selectable: true,
 				index: 'notiz_id',
 				persistenceID: 'core-notiz'
 			},
@@ -576,16 +576,14 @@ export default {
 			<form-form ref="formNotiz" @submit.prevent class="row">
 
 				<div class="pt-2">
-					<div class="row mb-3">
-						<div class="col-sm-7">
-							<span class="small">[{{notizData.typeId}}]</span>
-						</div>
-					</div>
 					
-					<div class="row mb-3">
+					<div class="row mt-4 mb-1">
 						<div class="col-sm-7">
-							<p v-if="notizData.statusNew" class="fw-bold"> {{$p.t('notiz','notiz_new')}}</p>
-							<p v-else class="fw-bold">{{$p.t('notiz','notiz_edit')}}</p>
+							<p>
+								<span v-if="notizData.statusNew" class="fw-bold">{{$p.t('notiz','notiz_new')}}</span>
+								<span v-else class="fw-bold">{{$p.t('notiz','notiz_edit')}}</span>
+								<span class="small"> [{{notizData.typeId}}]</span>
+							</p>
 						</div>
 					</div>
 		
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index a85ee77f5..c11c0b39a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -306,7 +306,7 @@ export default {
 	template: `
 				<div class="stv-details-tab_exemptions h-100 pb-3">
 
-					<bs-modal ref="anrechnungsnotizModal" dialog-class="modal-dialog-scrollable modal-xl">
+					<bs-modal ref="anrechnungsnotizModal" dialog-class="modal-dialog-scrollable modal-xl" body-class="p-0">
 
 						<template #title>
 							<h5>
@@ -315,7 +315,7 @@ export default {
 							</h5>
 						</template>
 
-						<div v-if="showNotizen" class="border p-3 overflow-auto" style="height: 800px;">
+						<div v-if="showNotizen" class="border p-3 overflow-auto" style="height: 825px;">
 							<core-notiz
 										:endpoint="endpoint"
 										ref="formNotes"
@@ -327,9 +327,9 @@ export default {
 										:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
 										@reload="handleReload"
 										>
-								</core-notiz>
-							</bs-modal>
+							</core-notiz>
 						</div>
+					</bs-modal>
 					
 					<template v-if="config.editableAnrechnungen" >
 						<core-filter-cmpt
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
index 9994a230e..451e4f5f4 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -146,7 +146,7 @@ export default {
 						frozen: true
 					},
 				],
-				layout: 'fitColumns',
+				layout: 'fitDataStretchFrozen',
 				layoutColumnsOnNewData: false,
 				height: 300,
 				selectable: true,
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
index 949f7d4c8..21dec91e8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -162,7 +162,7 @@ export default {
 						frozen: true
 					},
 				],
-				layout: 'fitColumns',
+				layout: 'fitDataStretchFrozen',
 				layoutColumnsOnNewData: false,
 				height: 300,
 				selectable: true,

From 1a0374bf18ad3b88d649f8fac9a5ffbafd03fe85 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 8 Jul 2025 11:07:07 +0200
Subject: [PATCH 346/572] fix stv list filters

---
 application/controllers/api/frontend/v1/stv/Students.php | 7 ++++++-
 public/js/components/Stv/Studentenverwaltung/List.js     | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index b2044a6d5..41c5fc613 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -712,7 +712,12 @@ class Students extends FHCAPI_Controller
 	 */
 	protected function addFilter($studiensemester_kurzbz)
 	{
-		$filter = $this->input->get('filter');
+		$filter = json_decode($this->input->get('filter'), true);
+		if (!is_array($filter))
+		{
+			$this->addMeta('addfilter', 'invalid filter: ' . $this->input->get('filter'));
+			return;
+		}
 		if (isset($filter['konto_count_0'])) {
 			$bt = $this->PrestudentModel->escape($filter['konto_count_0']);
 			$stdsem = $this->PrestudentModel->escape($studiensemester_kurzbz);
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index bdb9732fb..c5f7a07c0 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -108,7 +108,7 @@ export default {
 					}
 				},
 
-				ajaxRequestFunc: (url, params) => {
+				ajaxRequestFunc: (url, config, params) => {
 					if( url === '' ) 
 					{
 						return Promise.resolve({ data: []});

From 8ce672d9140f981f3dd005a9dcc1e426e3c95125 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 8 Jul 2025 13:33:00 +0200
Subject: [PATCH 347/572] refactor(Profil Library): exports Profil functions in
 its own library to reuse functionalities

---
 application/controllers/Cis/Profil.php        |  19 +-
 .../controllers/api/frontend/v1/Profil.php    |  29 +-
 application/libraries/ProfilLib.php           | 583 ++++++++++++++++++
 public/js/api/factory/profil.js               |   8 +-
 .../Cis/Profil/MitarbeiterProfil.js           |   9 +-
 .../Cis/Profil/MitarbeiterViewProfil.js       |   5 +-
 public/js/components/Cis/Profil/Profil.js     |  33 +-
 .../ProfilComponents/ProfilInformation.js     |   9 +-
 .../js/components/Cis/Profil/StudentProfil.js |  10 +-
 .../Cis/Profil/StudentViewProfil.js           |   5 +-
 10 files changed, 661 insertions(+), 49 deletions(-)
 create mode 100644 application/libraries/ProfilLib.php

diff --git a/application/controllers/Cis/Profil.php b/application/controllers/Cis/Profil.php
index 8c3088bd7..c287d87d0 100644
--- a/application/controllers/Cis/Profil.php
+++ b/application/controllers/Cis/Profil.php
@@ -55,8 +55,13 @@ class Profil extends Auth_Controller
 	 */
 	public function index()
 	{
+		
+		$this->load->library('ProfilLib');
+		$profil_data = $this->profillib->getView(getAuthUID());
+		$profil_data = hasData($profil_data) ? getData($profil_data) : null;
 		$viewData = array(
-
+			'editable'=>true,
+			'profil_data' => $profil_data,
 		);
 		$this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'profilIndex']);
 	}
@@ -68,8 +73,16 @@ class Profil extends Auth_Controller
 	 */
 	public function View($uid)
 	{
-		$viewData = array ('uid' => $uid);
-		
+		$this->load->library('ProfilLib');
+		$profil_data = $this->profillib->getView($uid);
+		$profil_data = hasData($profil_data) ? getData($profil_data) : null;
+		$viewData = array (
+			'uid' => $uid,
+			'profil_data'=>$profil_data,
+		);
+		if($uid == getAuthUID()){
+			$viewData['editable'] = true;
+		}
 		$this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'profilViewUid']);
 	}
 
diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php
index b58d90d07..57af6aa37 100644
--- a/application/controllers/api/frontend/v1/Profil.php
+++ b/application/controllers/api/frontend/v1/Profil.php
@@ -32,7 +32,7 @@ class Profil extends FHCAPI_Controller
 			'getGemeinden' => self::PERM_LOGGED,
 			'getAllNationen' => self::PERM_LOGGED,
 			'isMitarbeiter' => self::PERM_LOGGED,
-			
+			'profilViewData' => self::PERM_LOGGED,
 		]);
 		
 		$this->load->library('PermissionLib');
@@ -58,7 +58,28 @@ class Profil extends FHCAPI_Controller
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
-
+	public function profilViewData($uid){
+		$uid = json_decode($uid);
+		$this->load->library('ProfilLib');
+		$editable = false;
+		if(isset($uid) && $uid != null){
+			$profil_data = $this->profillib->getView($uid);
+			if($uid == getAuthUID()){
+				$editable = true;
+			}
+		}else{
+			$editable = true;
+			$profil_data = $this->profillib->getView(getAuthUID());
+		}
+		
+		$profil_data = hasData($profil_data) ? getData($profil_data) : null;
+		$viewData = array(
+			'editable'=>$editable,
+			'profil_data' => $profil_data,
+		);
+		$this->terminateWithSuccess($viewData);
+	}
+	
 	
     /**
 	 * function that returns the data used for the corresponding view
@@ -70,7 +91,6 @@ class Profil extends FHCAPI_Controller
 	public function getView($uid)
 	{
 		$res = new stdClass();
-		$editAllowed = getAuthUID() == $uid || $this->permissionlib->isBerechtigt('admin');
 
 		// if parsing the URL did not found a UID then the UID of the logged in user is used
 		if ($uid == "Profil" || $uid == $this->uid) {
@@ -85,8 +105,6 @@ class Profil extends FHCAPI_Controller
 				$res->data = $this->studentProfil();
 				$res->data->pid = $this->pid;
 			}
-			// editing your own profil - true
-			$editAllowed = true;
 		}
 		// UID is availabe when accessing Profil/View/:uid
 		else {
@@ -109,7 +127,6 @@ class Profil extends FHCAPI_Controller
 			}
 		}
 		$res->data->fotoStatus=$this->isFotoAkzeptiert($this->pid);
-		$res->data->editAllowed = $editAllowed;
 		$this->terminateWithSuccess($res);
 	}
 
diff --git a/application/libraries/ProfilLib.php b/application/libraries/ProfilLib.php
new file mode 100644
index 000000000..08caa0035
--- /dev/null
+++ b/application/libraries/ProfilLib.php
@@ -0,0 +1,583 @@
+<?php
+
+if (! defined("BASEPATH")) exit("No direct script access allowed");
+
+class ProfilLib{
+	public function __construct()
+	{
+		$this->ci =& get_instance();
+
+		
+	}
+
+	public function getView($uid)
+	{
+		// loading required models
+		$this->ci->load->model("ressource/Mitarbeiter_model","MitarbeiterModel");
+		$this->ci->load->model("person/Person_model","PersonModel");
+		$res = new stdClass();
+
+		// checking the uid
+		if ($uid == getAuthUID()) {
+			$isMitarbeiter = $this->ci->MitarbeiterModel->isMitarbeiter(getAuthUID());
+			if(isError($isMitarbeiter))
+			{
+				return error(getData($isMitarbeiter));
+			}
+			$isMitarbeiter = getData($isMitarbeiter);
+			$isMitarbeiter = $isMitarbeiter ? current($isMitarbeiter) : false;
+			if ($isMitarbeiter) {
+				$res->view = "MitarbeiterProfil";
+				$res->data = $this->mitarbeiterProfil();
+				$res->data->pid = getAuthPersonId();
+			} else {
+				$res->view = "StudentProfil";
+				$res->data = $this->studentProfil();
+				$res->data->pid = getAuthPersonId();
+			}
+		}
+		// UID is availabe when accessing Profil/View/:uid
+		else {
+			$isMitarbeiter = $this->ci->MitarbeiterModel->isMitarbeiter($uid);
+			if(isError($isMitarbeiter))
+			{
+				return error(getData($isMitarbeiter));
+			}
+			$isMitarbeiter = getData($isMitarbeiter);
+			$isMitarbeiter = $isMitarbeiter ? current($isMitarbeiter) : false;
+			if ($isMitarbeiter) {
+				$res->view = "ViewMitarbeiterProfil";
+				$res->data = $this->viewMitarbeiterProfil($uid);
+
+			} else {
+				$res->view = "ViewStudentProfil";
+				$res->data = $this->viewStudentProfil($uid);
+			}
+		}
+		$res->data->fotoStatus=$this->isFotoAkzeptiert(getAuthPersonId());
+		return success($res);
+	}
+
+	//PRIVATE METHODS ###############################################
+
+	/**
+	 * function that returns the data used for the student profile
+	 * @access private 
+	 * @return stdClass student data
+	 */
+	private function studentProfil()
+	{
+		$pid = getAuthPersonId();
+		$uid = getAuthUID();
+		$betriebsmittelperson_res = $this->getBetriebsmittelInfo($pid);
+		$kontakte_res = $this->getKontaktInfo($pid);
+		$zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($uid);
+		$adresse_res = $this->getAdressenInfo($pid);
+		$mailverteiler_res = $this->getMailverteiler($uid);
+		$person_res = $this->getPersonInfo($uid, true);
+		$zutrittsgruppe_res = $this->getZutrittsgruppen($uid);
+		$student_res = $this->getStudentInfo($uid);
+		$matr_res = $this->getMatrikelNummer($uid);
+		$profilUpdates = $this->getProfilUpdates($uid);
+
+		$res = new stdClass();
+		$res->username = $uid;
+
+		//? Person Information
+		foreach ($person_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		//? Student Information
+		foreach ($student_res as $key => $value) {
+			$res->$key = trim($value);
+		}
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = DOMAIN? $uid . "@" . DOMAIN :"";
+
+		$res->emails = [$intern_email];
+		$res->adressen = $adresse_res;
+		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
+		$res->kontakte = $kontakte_res;
+		$res->mittel = $betriebsmittelperson_res;
+		$res->matrikelnummer = $matr_res->matr_nr;
+		$res->zuttritsgruppen = $zutrittsgruppe_res;
+		$res->mailverteiler = $mailverteiler_res;
+		$res->profilUpdates = $profilUpdates;
+
+		return $res;
+	}
+
+	/**
+	 * function that returns the data used for the mitarbeiter profile
+	 * @access private 
+	 * @return stdClass mitarbeiter data
+	 */
+	private function mitarbeiterProfil()
+	{
+		$pid = getAuthPersonId();
+		$uid = getAuthUID();
+		$zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($uid);
+		$adresse_res = $this->getAdressenInfo($pid);
+		$kontakte_res = $this->getKontaktInfo($pid);
+		$mailverteiler_res = $this->getMailverteiler($uid);
+		$person_res = $this->getPersonInfo($uid, true);
+		$benutzer_funktion_res = $this->getBenutzerFunktion($uid);
+		$betriebsmittelperson_res = $this->getBetriebsmittelInfo($pid);
+		$profilUpdates = $this->getProfilUpdates($uid);
+		$telefon_res = $this->getTelefonInfo($uid);
+		$mitarbeiter_res = $this->getMitarbeiterInfo($uid);
+
+		$res = new stdClass();
+		$res->username = $uid;
+
+		//? Person Information
+		foreach ($person_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		//? Mitarbeiter Information
+		foreach ($mitarbeiter_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		$res->adressen = $adresse_res;
+		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
+		$res->kontakte = $kontakte_res;
+		$res->mittel = $betriebsmittelperson_res;
+		$res->mailverteiler = $mailverteiler_res;
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = DOMAIN? $uid . "@" . DOMAIN : "";
+		$extern_email = array();
+		$extern_email["type"] = "alias";
+		
+		$extern_email["email"] = $mitarbeiter_res->alias? ($mitarbeiter_res->alias . "@" . DOMAIN) : null;
+		$res->emails = $extern_email["email"]?[$intern_email, $extern_email]:[$intern_email];
+
+		$res->funktionen = $benutzer_funktion_res;
+		$res->standort_telefon = $telefon_res;
+		$res->profilUpdates = $profilUpdates;
+
+		return $res;
+	}
+
+	/**
+	 * gets the date of issue of the FH access card corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the date of issue of the FH access card
+	 * @return string the date of issue of the FH access card corresponding to a userID
+	 */
+	private function getZutrittskarteDatum($uid)
+	{
+		$this->ci->load->model("ressource/Betriebsmittelperson_model","BetriebsmittelpersonModel");
+		$zutrittskarte_ausgegebenam = $this->ci->BetriebsmittelpersonModel->getBetriebsmittelByUid($uid, "Zutrittskarte");
+		
+		if(isError($zutrittskarte_ausgegebenam)){
+			return error(getData($zutrittskarte_ausgegebenam));
+		}
+		$zutrittskarte_ausgegebenam = getData($zutrittskarte_ausgegebenam);
+		$zutrittskarte_ausgegebenam = $zutrittskarte_ausgegebenam ? current($zutrittskarte_ausgegebenam)->ausgegebenam : null;
+		
+		//? formats date from 01-01-2000 to 01.01.2000
+		$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
+		return $zutrittskarte_ausgegebenam;
+	}
+
+	/**
+	 * gets the address information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the address information
+	 * @return array all the address information corresponding to a userID
+	 */
+	private function getAdressenInfo($pid)
+	{
+		$this->ci->load->model("person/Adresse_model","AdresseModel");
+		$adresse_res = $this->ci->AdresseModel->addSelect(["adresse_id", "strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort", "zustelladresse", "gemeinde", "nation"]);
+		$adresse_res = $this->ci->AdresseModel->addOrder("zustelladresse", "DESC");
+		$adresse_res = $this->ci->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz");
+
+		$adresse_res = $this->ci->AdresseModel->loadWhere(["person_id" => $pid]);
+		if(isError($adresse_res)){
+			return error(getData($adresse_res));
+		}
+		$adresse_res = getData($adresse_res) ?? [];
+		return $adresse_res;
+	}
+
+	/**
+	 * gets the kontakt information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the kontakt information
+	 * @return array all the kontakt information corresponding to a userID
+	 */
+	private function getKontaktInfo($pid)
+	{
+		$this->ci->load->model("person/Kontakt_model","KontaktModel");
+		$this->ci->KontaktModel->addSelect(['kontakttyp', 'kontakt_id', 'kontakt', 'tbl_kontakt.anmerkung', 'tbl_kontakt.zustellung']);
+		$this->ci->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT');
+		$this->ci->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT');
+		$this->ci->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum');
+
+		$kontakte_res = $this->ci->KontaktModel->loadWhere(['person_id' => $pid]);
+		if(isError($kontakte_res)){
+			return error(getData($kontakte_res));
+		}
+		$kontakte_res = getData($kontakte_res);
+		return $kontakte_res;
+	}
+
+	/**
+	 * gets all the mailverteiler using the tables: tbl_benutzer, tbl_benutzergruppe, tbl_gruppe
+	 * @access private
+	 * @param  integer $uid  the userID used to retrieve the mailverteiler 
+	 * @return array returns the mailvertailer corresponding to a userID 
+	 */
+	private function getMailverteiler($uid)
+	{
+		$this->ci->load->model("person/Person_model","PersonModel");
+		$this->ci->PersonModel->addSelect('gruppe_kurzbz, beschreibung');
+		$this->ci->PersonModel->addJoin('tbl_benutzer', 'person_id');
+		$this->ci->PersonModel->addJoin('tbl_benutzergruppe', 'uid');
+		$this->ci->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
+
+		$mailverteiler_res = $this->ci->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $uid));
+		if(isError($mailverteiler_res)){
+			return error(getData($mailverteiler_res));
+		}
+		$mailverteiler_res = getData($mailverteiler_res) ?? [];
+		$mailverteiler_res = gettype($mailverteiler_res) === 'array' ? $mailverteiler_res : [];
+		$mailverteiler_res = array_map(function ($element) {
+			$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
+			return $element;
+		}, $mailverteiler_res);
+		return $mailverteiler_res;
+	}
+
+	/**
+	 * gets the person information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the person information
+	 * @param  integer $geburtsInfo flag wether to add the columns gebort, gebdatum, foto_sperre or not
+	 * @return array all the person informaion corresponding to a userID
+	 */
+	private function getPersonInfo($uid, $geburtsInfo = null)
+	{
+		$this->ci->load->model("person/Benutzer_model","BenutzerModel");
+		$selectClause = ["foto", "foto_sperre", "anrede", "titelpost as postnomen", "titelpre as titel", "vorname", "nachname"];
+		/** @param integer $geburtsInfo */
+		if ($geburtsInfo) {
+			array_push($selectClause, "gebort");
+			array_push($selectClause, "TO_CHAR(gebdatum, 'DD.MM.YYYY') as gebdatum");
+		}
+		$this->ci->BenutzerModel->addSelect($selectClause);
+		$this->ci->BenutzerModel->addJoin("tbl_person", "person_id");
+
+		$person_res = $this->ci->BenutzerModel->load([$uid]);
+		if(isError($person_res)){
+			return error(getData($person_res));
+		}
+		$person_res = getData($person_res);
+		$person_res = $person_res ? current($person_res) : null;
+
+		if(isset($person_res)){
+			if( ($person_res->foto === null) || ((getAuthUID() !== $uid) && ($person_res->foto_sperre !== false)) )
+			{
+				$dummy_foto = base64_encode(file_get_contents(DOC_ROOT.'skin/images/profilbild_dummy.jpg'));
+				$person_res->foto = $dummy_foto;
+			}
+		}
+
+		return $person_res;
+	}
+
+	/**
+	 * gets all the Benutzerfunktionen of a corresponding user
+	 * @access private
+	 * @param  integer $uid  the userID used to retrieve the Benutzerfunktionen 
+	 * @return array returns the Benutzerfunktionen corresponding to a userID 
+	 */
+	private function getBenutzerFunktion($uid)
+	{
+		$this->ci->load->model("person/Benutzerfunktion_model","BenutzerfunktionModel");
+		$this->ci->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung", "tbl_organisationseinheit.bezeichnung as Organisationseinheit", "datum_von as Gültig_von", "datum_bis as Gültig_bis", "wochenstunden as Wochenstunden"]);
+		$this->ci->BenutzerfunktionModel->addJoin("tbl_organisationseinheit", "oe_kurzbz");
+
+		$benutzer_funktion_res = $this->ci->BenutzerfunktionModel->loadWhere(array('uid' => $uid));
+		if(isError($benutzer_funktion_res)){
+			return error(getData($benutzer_funktion_res));
+		}
+		$benutzer_funktion_res = getData($benutzer_funktion_res);
+		return $benutzer_funktion_res;
+	}
+
+	/**
+	 * gets all the Betriebsmittel of a corresponding user
+	 * @access private
+	 * @param  integer $uid  the userID used to retrieve the Betriebsmittel 
+	 * @return array returns the Betriebsmittel corresponding to a userID 
+	 */
+	private function getBetriebsmittelInfo($pid)
+	{
+		$this->ci->load->model("ressource/Betriebsmittelperson_model","BetriebsmittelpersonModel");
+		$this->ci->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel", "nummer as Nummer", "ausgegebenam as Ausgegeben_am"]);
+
+		//? betriebsmittel are not needed in a view
+		$betriebsmittelperson_res = $this->ci->BetriebsmittelpersonModel->getBetriebsmittel($pid);
+		if(isError($betriebsmittelperson_res)){
+			return error(getData($betriebsmittelperson_res));
+		}
+		$betriebsmittelperson_res = getData($betriebsmittelperson_res);
+		return $betriebsmittelperson_res;
+	}
+
+	/**
+	 * gets the profil updates corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the profil updates
+	 * @return array all the profil updates corresponding to a userID
+	 */
+	private function getProfilUpdates($uid)
+	{
+		$this->ci->load->model("person/Profil_update_model","ProfilUpdateModel");
+		$profilUpdates = $this->ci->ProfilUpdateModel->getProfilUpdatesWhere(['uid' => $uid]);
+		if(isError($profilUpdates)){
+			return error(getData($profilUpdates));
+		}
+		$profilUpdates = getData($profilUpdates);
+		return $profilUpdates;
+	}
+
+	/**
+	 * gets the telefon information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the telefon information
+	 * @return array all the telefon informaion corresponding to a userID
+	 */
+	private function getTelefonInfo($uid)
+	{
+		$this->ci->load->model("ressource/Mitarbeiter_model","MitarbeiterModel");
+		$this->ci->MitarbeiterModel->addSelect(["kontakt"]);
+		$this->ci->MitarbeiterModel->addJoin("tbl_kontakt", "tbl_mitarbeiter.standort_id = tbl_kontakt.standort_id");
+		$this->ci->MitarbeiterModel->addLimit(1);
+		$telefon_res = $this->ci->MitarbeiterModel->loadWhere(["mitarbeiter_uid" => $uid, "kontakttyp" => "telefon"]);
+		if(isError($telefon_res)){
+			return error(getData($telefon_res));
+		}
+		$telefon_res = getData($telefon_res);
+		$telefon_res = $telefon_res ? current($telefon_res) : null;
+		return $telefon_res;
+	}
+
+	/**
+	 * gets the mitarbeiter information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the mitarbeiter information
+	 * @return array all the mitarbeiter informaion corresponding to a userID
+	 */
+	private function getMitarbeiterInfo($uid)
+	{
+		$this->ci->load->model("ressource/Mitarbeiter_model","MitarbeiterModel");
+		$this->ci->MitarbeiterModel->addSelect(["kurzbz", "telefonklappe", "alias", "ort_kurzbz"]);
+		$this->ci->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid");
+		$mitarbeiter_res = $this->ci->MitarbeiterModel->load($uid);
+		if(isError($mitarbeiter_res)){
+			return error(getData($mitarbeiter_res));
+		}
+		$mitarbeiter_res = getData($mitarbeiter_res);
+		$mitarbeiter_res = $mitarbeiter_res ? current($mitarbeiter_res) : null;
+
+		return $mitarbeiter_res;
+	}
+
+	/**
+	 * gets the Zutrittsgruppen corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the Zutrittsgruppen
+	 * @return array all the Zutrittsgruppen corresponding to a userID
+	 */
+	private function getZutrittsgruppen($uid)
+	{
+		$this->ci->load->model("person/Benutzergruppe_model","BenutzergruppeModel");
+		$this->ci->BenutzergruppeModel->addSelect(['bezeichnung']);
+		$this->ci->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
+
+		$zutrittsgruppe_res = $this->ci->BenutzergruppeModel->loadWhere(array("uid" => $uid, "zutrittssystem" => true));
+		if(isError($zutrittsgruppe_res)){
+			return error(getData($zutrittsgruppe_res));	
+		}
+		$zutrittsgruppe_res = getData($zutrittsgruppe_res);
+		return $zutrittsgruppe_res;
+	}
+
+	/**
+	 * gets the student information corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the student information
+	 * @return array all the student informaion corresponding to a userID
+	 */
+	private function getStudentInfo($uid)
+	{
+		$this->ci->load->model("crm/Student_model","StudentModel");
+		$this->ci->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang', 'tbl_studiengang.studiengang_kz as studiengang_kz', 'tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe', 'tbl_student.matrikelnr as personenkennzeichen']);
+		$this->ci->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz");
+
+		$student_res = $this->ci->StudentModel->load([$uid]);
+		
+		if(isError($student_res)){
+			return error(getData($student_res));
+		}
+		$student_res = getData($student_res);
+		$student_res = $student_res ? current($student_res) : null;
+		return $student_res;
+	}
+
+	/**
+	 * gets the Matrikelnummer corresponding to a user
+	 * @access private
+	 * @param  integer $uid the userID used to get the Matrikelnummer
+	 * @return object the Matrikelnummer corresponding to a userID
+	 */
+	private function getMatrikelNummer($uid)
+	{
+		$this->ci->load->model("person/Benutzer_model","BenutzerModel");
+		$this->ci->BenutzerModel->addSelect(["matr_nr"]);
+		$this->ci->BenutzerModel->addJoin("tbl_person", "person_id");
+
+		$matr_res = $this->ci->BenutzerModel->load([$uid]);
+		
+		if(isError($matr_res)){
+			return error(getData($matr_res));
+		}
+		$matr_res = getData($matr_res);
+		$matr_res = $matr_res ? current($matr_res) : [];
+		return $matr_res;
+	}
+
+	/**
+	 * checks whether the foto of a user is accepted or not
+	 * @access private
+	 * @param  integer $pid the personId of the student or mitarbeiter
+	 * @return bool whether the foto is accepted or not
+	 */
+	private function isFotoAkzeptiert($pid)
+	{
+		$this->ci->load->model('person/Fotostatusperson_model','FotostatusModel');
+		$fotostatus = $this->ci->FotostatusModel->execReadOnlyQuery("
+		select distinct on (person_id) person_id, insertamum, fotostatus_kurzbz
+		from public.tbl_person_fotostatus
+		where person_id = ? 
+		order by person_id, insertamum desc",[$pid]);
+		if(isError($fotostatus)){
+			return error(getData($fotostatus));
+		}
+		$fotostatus = getData($fotostatus);
+		if(is_array($fotostatus) && count($fotostatus) > 0){
+			$fotostatus = current($fotostatus)->fotostatus_kurzbz == 'akzeptiert';
+		}
+		else
+			$fotostatus = false;
+		return $fotostatus;
+	}
+
+	/**
+	 * function that returns the data used for viewing another mitarbeiter profile
+	 * @access private 
+	 * @param  integer $uid the userID to retrieve the mitarbeiter data
+	 * @return stdClass restricted mitarbeiter data
+	 */
+	private function viewMitarbeiterProfil($uid)
+	{
+		$mailverteiler_res = $this->getMailverteiler($uid);
+		$benutzer_funktion_res = $this->getBenutzerFunktion($uid);
+		$benutzer_res = $this->getBenutzerAlias($uid);
+		$person_res = $this->getPersonInfo($uid);
+		$mitarbeiter_res = $this->getMitarbeiterInfo($uid);
+		$telefon_res = $this->getTelefonInfo($uid);
+
+		$res = new stdClass();
+		$res->username = $uid;
+
+		//? Person Info
+		foreach ($person_res as $key => $val) {
+			$res->$key = $val;
+		}
+
+		//? Mitarbeiter Info
+		foreach ($mitarbeiter_res as $key => $val) {
+			$res->$key = $val;
+
+		}
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = DOMAIN? $uid . "@" . DOMAIN:"";
+		$extern_email = array();
+		$extern_email["type"] = "alias";
+		
+		$extern_email["email"] = $benutzer_res->alias ? ($benutzer_res->alias . "@" . DOMAIN) : null;
+		$res->emails = $extern_email?[$intern_email, $extern_email]:[$intern_email];
+
+		$res->funktionen = $benutzer_funktion_res;
+		$res->mailverteiler = $mailverteiler_res;
+		$res->standort_telefon = isset($telefon_res) ? $telefon_res->kontakt : null;
+
+		return $res;
+	}
+
+	/**
+	 * gets the alias of a corresponding user
+	 * @access private
+	 * @param  integer $uid the userID used to get the alias
+	 * @return string the alias of the userID
+	 */
+	private function getBenutzerAlias($uid)
+	{
+		$this->BenutzerModel->addSelect(["alias"]);
+		$benutzer_res = $this->BenutzerModel->load([$uid]);
+		$benutzer_res = $this->getDataOrTerminateWithError($benutzer_res);
+		$benutzer_res = $benutzer_res ? current($benutzer_res) : null;
+			
+		return $benutzer_res;
+	}
+
+	/**
+	 * function that returns the data used for viewing another student profile
+	 * @access private 
+	 * @param  integer $uid the userID to retrieve the student data
+	 * @return stdClass restricted student data
+	 */
+	private function viewStudentProfil($uid)
+	{
+		$mailverteiler_res = $this->getMailverteiler($uid);
+		$person_res = $this->getPersonInfo($uid);
+		$student_res = $this->getStudentInfo($uid);
+		$matr_res = $this->getMatrikelNummer($uid);
+
+		$res = new stdClass();
+		$res->username = $uid;
+
+		//? Person Information
+		foreach ($person_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		//? Student Information
+		foreach ($student_res as $key => $value) {
+			$res->$key = $value;
+		}
+
+		$intern_email = array();
+		$intern_email["type"] = "intern";
+		$intern_email["email"] = DOMAIN? $uid . "@" . DOMAIN:"";
+
+		$res->emails = [$intern_email];
+		$res->matrikelnummer = $matr_res->matr_nr;
+		$res->mailverteiler = $mailverteiler_res;
+
+		return $res;
+	}
+}
\ No newline at end of file
diff --git a/public/js/api/factory/profil.js b/public/js/api/factory/profil.js
index 5da1f202d..49d0263c6 100644
--- a/public/js/api/factory/profil.js
+++ b/public/js/api/factory/profil.js
@@ -22,6 +22,12 @@ export default {
 			url: `/api/frontend/v1/Profil/getView/${uid}`
 		};
 	},
+	profilViewData(uid) {
+		return {
+			method: 'get',
+			url: `/api/frontend/v1/Profil/profilViewData/${uid}`
+		};
+	},
 	fotoSperre(value) {
 		return {
 			method: 'get',
@@ -69,5 +75,5 @@ export default {
 			method: 'get',
 			url: '/api/frontend/v1/Profil/getAllNationen'
 		};
-	}
+	},
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 840cdefc1..456d32375 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -27,7 +27,7 @@ export default {
 		ProfilInformation,
 	},
 
-	inject: ["sortProfilUpdates", "collapseFunction", "language"],
+	inject: ["sortProfilUpdates", "collapseFunction", "language","isEditable"],
 
 	data() {
 		return {
@@ -215,9 +215,6 @@ export default {
 	},
 
 	computed: {
-		editable() {
-			return this.data?.editAllowed ?? false;
-		},
 		fotoStatus() {
 			return this.data?.fotoStatus ?? false;
 		},
@@ -322,7 +319,7 @@ export default {
                            </div>
                          </div>-->
             <!-- Bearbeiten Button -->
-            <div class="row mb-3 ">
+            <div v-if="isEditable" class="row mb-3 ">
                 <div class="col">
                     <button @click="()=>showEditProfilModal()" type="button" class="text-start  w-100 btn btn-outline-secondary" >
                         <div class="row">
@@ -352,7 +349,7 @@ export default {
                     <div class="row mb-4">
                         <div class="col">
                             <!-- PROFIL INFORMATION -->
-                            <profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation" :editable="editable" :fotoStatus="fotoStatus"></profil-information>
+                            <profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation" :fotoStatus="fotoStatus"></profil-information>
                         </div>
                     </div>
                     <div class="row mb-4">
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 56c7ab84b..4d2b080b6 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -110,9 +110,6 @@ export default {
 				return this.data.telefonklappe
 			}
 		},
-		editable() {
-			return this.data?.editAllowed ?? false;
-		},
 		fotoStatus() {
 			return this.data?.fotoStatus ?? false;
 		},
@@ -202,7 +199,7 @@ export default {
                     <div class="row mb-4">
                         <div class="col">
                             <!-- Profil Informationen -->
-                            <profil-information :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation" :editable="editable" :fotoStatus="fotoStatus"></profil-information>
+                            <profil-information :title="$p.t('profil','mitarbeiterIn')" :data="profilInformation" :fotoStatus="fotoStatus"></profil-information>
                         </div>
                     </div>
                     <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js
index edb55e6b3..8ca2cfe8e 100644
--- a/public/js/components/Cis/Profil/Profil.js
+++ b/public/js/components/Cis/Profil/Profil.js
@@ -46,7 +46,10 @@ export const Profil = {
 	props: {
 		uid: {
 			type: String,
-			default: 'Profil'
+			required:false,
+		},
+		viewData: {
+			type: Object,
 		}
 	},
 	data() {
@@ -59,10 +62,12 @@ export const Profil = {
 			data: null,
 			// notfound is null by default, but contains an UID if no user exists with that UID
 			notFoundUID: null,
+			isEditable: this.viewData.editable ?? false,
 		};
 	},
 	provide() {
 		return {
+			isEditable: Vue.computed(()=>this.isEditable),
 			profilUpdateStates: Vue.computed(() =>
 				this.profilUpdateStates ? this.profilUpdateStates : false
 			),
@@ -153,18 +158,19 @@ export const Profil = {
 					console.error(error);
 				});
 			
-			let uid = this.uid ?? location.pathname.split("/").pop();
-
+			
 			this.$api
-				.call(ApiProfil.getView(uid))
-				.then((res) => {
-					if (!res.data) {
-						this.notFoundUID = uid;
-					} else {
-						this.view = res.data?.view;
-						this.data = res.data?.data;
-					}
-				});	
+				.call(ApiProfil.profilViewData(this.$route.params.uid??null))
+				.then((response) => response.data).then(data=>{
+					this.view = data?.profil_data.view;
+					this.data = data?.profil_data.data;
+					this.isEditable = data?.editable ?? false;
+				})
+				.catch((error) => {
+					console.error(error);
+				});
+			
+			
 		},
 		zustellAdressenCount() {
 			if (!this.data || !this.data.adressen) {
@@ -254,6 +260,7 @@ export const Profil = {
 		},
 	},
 	computed: {
+		
 		filteredEditData() {
 			if (!this.data) {
 				return;
@@ -365,7 +372,7 @@ export const Profil = {
 			this.load()
 		}
 	},
-	async created() {
+	created() {
 		this.load()
 	},
 	template: `
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index 7cd6f213e..b8c855b46 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -9,10 +9,6 @@ export default {
 		data: {
 			type: Object,
 		},
-		editable: {
-			type: Boolean,
-			default: false
-		},
 		fotoStatus:{
 			type: Boolean,
 			default: true
@@ -27,6 +23,7 @@ export default {
 		};
 	},
 	emits: ["showEditProfilModal"],
+	inject:["isEditable"],
 
 	methods: {
 		showModal(){
@@ -76,7 +73,7 @@ export default {
 	<image-upload ref="imageUpload" :titel="$p.t('profilUpdate','profilBild')"></image-upload>
     <div class="card-header">
         <div class="row">
-            <div v-if="editable" @click="$emit('showEditProfilModal','Personen_Informationen')" class="col-auto" type="button">
+            <div v-if="isEditable" @click="$emit('showEditProfilModal','Personen_Informationen')" class="col-auto" type="button">
                 <i class="fa fa-edit"></i>
             </div>
             <div class="col">
@@ -93,7 +90,7 @@ export default {
                     <div class="col-auto " style="position:relative">
                         <img alt="profile picture" class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"/>
                         <!-- LOCKING IMAGE FUNCTIONALITY -->
-                        <div v-if="editable" role="button" @click.prevent="sperre_foto_function" class="image-lock">
+                        <div v-if="isEditable" role="button" @click.prevent="sperre_foto_function" class="image-lock">
                             <i :class="{'fa':true, ...(FotoSperre?{'fa-lock':true}:{'fa-lock-open':true})} "></i>
                         </div>
 						<div v-if="!fotoStatus" role="button" @click.prevent="showModal" class="image-upload">
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 5d9b441e0..e0cf5826b 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -26,7 +26,7 @@ export default {
 		FetchProfilUpdates,
 		EditProfil,
 	},
-	inject: ["sortProfilUpdates", "collapseFunction", "language"],
+	inject: ["sortProfilUpdates", "collapseFunction", "language","isEditable"],
 	data() {
 		return {
 			showModal: false,
@@ -163,9 +163,7 @@ export default {
 	},
 
 	computed: {
-		editable() {
-			return this.data?.editAllowed ?? false;
-		},
+		
 		fotoStatus() {
 			return this.data?.fotoStatus ?? false;
 		},
@@ -264,7 +262,7 @@ export default {
             </div>-->
 
 			<!-- Bearbeiten Button -->
-			<div v-if="editable" class="row ">
+			<div v-if="isEditable" class="row ">
 				<div class="col mb-3">
 					<button @click="showEditProfilModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
 						<div class="row">
@@ -295,7 +293,7 @@ export default {
 						<div class="row mb-4">
 							<div class="col">
 								<!-- PROFIL INFORMATION -->
-								<profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','studentIn')" :data="profilInformation" :editable="editable" :fotoStatus="fotoStatus"></profil-information>
+								<profil-information @showEditProfilModal="showEditProfilModal" :title="$p.t('profil','studentIn')" :data="profilInformation" :fotoStatus="fotoStatus"></profil-information>
 							</div>
 						</div>
 						<div class="row mb-4">
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index f7ad03b98..ccc55362e 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -26,9 +26,6 @@ export default {
 	methods: {},
 
 	computed: {
-		editable() {
-			return this.data?.editAllowed ?? false;
-		},
 		fotoStatus() {
 			return this.data?.fotoStatus ?? false;
 		},
@@ -118,7 +115,7 @@ export default {
                 <div  class="col-lg-12 col-xl-6 ">
                     <div class="row mb-4">
                         <div class="col">
-                            <profil-information :data="profilInformation" :title="$p.t('profil','studentIn')" :editable="editable" :fotoStatus="fotoStatus"></profil-information>
+                            <profil-information :data="profilInformation" :title="$p.t('profil','studentIn')" :fotoStatus="fotoStatus"></profil-information>
                         </div>
                     </div>
                     <!-- START OF SECOND PROFIL  INFORMATION COLUMN -->

From d526a770c5b6aba74c9084ccd74f8f26587c7862 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 9 Jul 2025 13:35:21 +0200
Subject: [PATCH 348/572] refactor(Wave accessability changes): changes color
 contrasts and fixes other little bugs

---
 application/libraries/ProfilLib.php           |  1 -
 public/css/Cis4/Cis.css                       |  8 ++++++--
 public/css/Cis4/CoreCalendarEvents.css        |  3 ++-
 public/css/components/FormUnderline.css       |  2 ++
 public/css/components/Profil.css              |  2 +-
 public/js/components/Cis/Mylv/LvModal.js      |  4 ++--
 .../Cis/Profil/MitarbeiterProfil.js           |  4 ++--
 .../ProfilComponents/ProfilInformation.js     |  2 +-
 .../js/components/Cis/Profil/StudentProfil.js |  4 ++--
 .../Cis/Renderer/Lehreinheit/modalContent.js  |  8 ++++----
 public/js/components/Cis/ThemeSwitch.js       |  8 ++++----
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 12 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/application/libraries/ProfilLib.php b/application/libraries/ProfilLib.php
index 08caa0035..17d2218ad 100644
--- a/application/libraries/ProfilLib.php
+++ b/application/libraries/ProfilLib.php
@@ -25,7 +25,6 @@ class ProfilLib{
 				return error(getData($isMitarbeiter));
 			}
 			$isMitarbeiter = getData($isMitarbeiter);
-			$isMitarbeiter = $isMitarbeiter ? current($isMitarbeiter) : false;
 			if ($isMitarbeiter) {
 				$res->view = "MitarbeiterProfil";
 				$res->data = $this->mitarbeiterProfil();
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 3b382d1b4..99ab609b9 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -108,9 +108,9 @@ html {
 	--fhc-cis-main-py: 1.5rem;
 
 	--fhc-cis-menu-lvl-1-bg: var(--fhc-primary);
-	--fhc-cis-menu-lvl-1-color: var(--fhc-text);
+	--fhc-cis-menu-lvl-1-color: var(--fhc-light);
 	--fhc-cis-menu-lvl-1-bg-hover: var(--fhc-primary-highlight);
-	--fhc-cis-menu-lvl-1-color-hover: var(--fhc-text);
+	--fhc-cis-menu-lvl-1-color-hover: var(--fhc-light);
 
 	--fhc-cis-menu-lvl-2-bg: var(--fhc-secondary);
 	--fhc-cis-menu-lvl-2-color: var(--fhc-text);
@@ -135,6 +135,10 @@ html {
 	--fhc-cis-grade-negative: var(--fhc-danger);
 }
 
+#themeSwitch i{
+	color: var(fhc-light) !important;
+}
+
 @media (min-width: 992px) {
 	:root {
 		--fhc-cis-menu-width: 250px;
diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index fd418a9f8..9111d21cd 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -48,7 +48,8 @@
 	overflow-y: scroll;
 	height: 100%;
 	min-height:auto;
-	justify-content: space-evenly;
+	justify-content: space-between;
+	align-items:center;
 
 }
 
diff --git a/public/css/components/FormUnderline.css b/public/css/components/FormUnderline.css
index 0d1fd991f..a3cbdc7ff 100644
--- a/public/css/components/FormUnderline.css
+++ b/public/css/components/FormUnderline.css
@@ -3,6 +3,7 @@
 :root {
 	--fhc-formunderline-border: var(--fhc-border, #dee2e6);
 	--fhc-formunderline-link: var(--fhc-link, initial);
+	--fhc-formunderline-titel-color: var(--fhc-text,gray);
 }
 
 .form-underline{
@@ -39,4 +40,5 @@
     opacity: 0.65;
     font-size: .85rem;
     padding-left: 0.5rem;
+	color: var(--fhc-formunderline-titel-color) !important;
   }
\ No newline at end of file
diff --git a/public/css/components/Profil.css b/public/css/components/Profil.css
index 220c2ebfe..4800e749f 100644
--- a/public/css/components/Profil.css
+++ b/public/css/components/Profil.css
@@ -1,6 +1,6 @@
 
 :root{
-	--fhc-profil-border: var(--fhc-border, white);
+	--fhc-profil-border: var(--fhc-background-highlight, gray);
 	--fhc-profil-tabulator-shadow: var(--fhc-shadow-20, rgba(0,0,0,0.1));
 }
 
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index 537012ee6..7725fa93f 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -83,13 +83,13 @@ export default {
 			<slot name="modalContent"></slot>
 			
 			<template v-if="showMenu && this.menu">
-				<h3>{{$p.t('lehre','lehrveranstaltungsmenue')}}</h3>
+				<h5>{{$p.t('lehre','lehrveranstaltungsmenue')}}</h5>
 				<lv-menu :menu="menu"></lv-menu>
 			</template>
 		</template>
 		<!-- optional footer -->
 		<template  v-slot:footer >
-			<button class="btn btn-outline-secondary " @click="hide">{{$p.t('ui','cancel')}}</button>    
+			<button class="btn btn-outline-secondary card" @click="hide">{{$p.t('ui','cancel')}}</button>    
 		</template>
 		<!-- end of optional footer --> 
 	</bs-modal>`,
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 456d32375..873984c1b 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -321,7 +321,7 @@ export default {
             <!-- Bearbeiten Button -->
             <div v-if="isEditable" class="row mb-3 ">
                 <div class="col">
-                    <button @click="()=>showEditProfilModal()" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+                    <button @click="()=>showEditProfilModal()" type="button" class="text-start card w-100 btn btn-outline-secondary" >
                         <div class="row">
                             <div class="col-auto">
                                 <i class="fa fa-edit"></i>
@@ -460,7 +460,7 @@ export default {
             <!-- Bearbeiten Button -->
             <div class="row d-none d-md-block ">
                 <div class="col mb-3">
-                    <button @click="()=>showEditProfilModal()" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+                    <button @click="()=>showEditProfilModal()" type="button" class="text-start card w-100 btn btn-outline-secondary" >
                         <div class="row">
                             <div class="col-auto">
                                 <i class="fa fa-edit"></i>
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index b8c855b46..438b3cca8 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -87,7 +87,7 @@ export default {
             <!-- START OF THE FIRST ROW WITH THE PROFIL IMAGE -->
             <div class="col-12 col-sm-6 mb-2">
                 <div class="row justify-content-center">
-                    <div class="col-auto " style="position:relative">
+                    <div class="col-auto profil-image" style="position:relative">
                         <img alt="profile picture" class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"/>
                         <!-- LOCKING IMAGE FUNCTIONALITY -->
                         <div v-if="isEditable" role="button" @click.prevent="sperre_foto_function" class="image-lock">
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index e0cf5826b..480130cbb 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -264,7 +264,7 @@ export default {
 			<!-- Bearbeiten Button -->
 			<div v-if="isEditable" class="row ">
 				<div class="col mb-3">
-					<button @click="showEditProfilModal" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+					<button @click="showEditProfilModal" type="button" class="card text-start  w-100 btn btn-outline-secondary" >
 						<div class="row">
 							<div class="col-2">
 								<i class="fa fa-edit"></i>
@@ -399,7 +399,7 @@ export default {
 			<!-- Bearbeiten Button -->
 			<div class="row d-none d-md-block">
 				<div class="col mb-3">
-					<button @click="()=>showEditProfilModal()" type="button" class="text-start  w-100 btn btn-outline-secondary" >
+					<button @click="()=>showEditProfilModal()" type="button" class="card text-start  w-100 btn btn-outline-secondary" >
 						<div class="row">
 							<div class="col-2">
 								<i class="fa fa-edit"></i>
diff --git a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
index c03a1cd64..2d5f34eee 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
@@ -56,9 +56,9 @@ export default {
 	},
 	template: `
 	<div>
-		<h3>
+		<h5>
 			{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}
-		</h3>
+		</h5>
 		<table class="table table-hover mb-4">
 				<tbody>
 					<tr>
@@ -76,7 +76,7 @@ export default {
 							:''
 						}}</th>
 						<td>
-							<a v-if="event.ort_content_id" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+							<a v-if="event.ort_content_id" :aria-label="$p.t('global','raum')" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
 							{{event.ort_kurzbz}}
 						</td>
 					</tr>
@@ -96,7 +96,7 @@ export default {
 						}}</th>
 						<td>
 							<div v-for="lektor in event.lektor" class="d-block">
-								<a v-if="lektorenLinks[lektor.kurzbz]" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+								<a v-if="lektorenLinks[lektor.kurzbz]" :aria-label="$p.t('lehre','lektor')" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
 								{{lektor.kurzbz}}
 							</div>
 						</td>
diff --git a/public/js/components/Cis/ThemeSwitch.js b/public/js/components/Cis/ThemeSwitch.js
index bff06a70c..d7840be22 100644
--- a/public/js/components/Cis/ThemeSwitch.js
+++ b/public/js/components/Cis/ThemeSwitch.js
@@ -24,10 +24,10 @@ export default {
 	},
 	template:/*html*/`
 
-	<button :aria-label="$p.t('global','switchTheme',[nextTheme])" @click="switchTheme(nextTheme)" class="fhc-primary-highlight-bg align-self-center btn btn-secondary rounded-5">
-		<i v-if="theme == 'light'" class="fa-solid fa-sun fhc-text" aria-hidden="true"></i>
-		<i v-else-if="theme == 'dark'" class="fa-solid fa-moon fhc-text" aria-hidden="true"></i>
-		<i v-else-if="theme == 'purple'" class="fa-solid fa-wine-bottle" aria-hidden="true"></i>
+	<button id="themeSwitch" :aria-label="$p.t('global','switchTheme',[nextTheme])" @click="switchTheme(nextTheme)" class="fhc-primary-highlight-bg align-self-center btn btn-secondary rounded-5">
+		<i v-if="theme == 'light'" class="fa-solid fa-sun " aria-hidden="true"></i>
+		<i v-else-if="theme == 'dark'" class="fa-solid fa-moon " aria-hidden="true"></i>
+		<!--<i v-else-if="theme == 'purple'" class="fa-solid fa-wine-bottle" aria-hidden="true"></i>-->
 	</button>
 	`
 }
\ No newline at end of file
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 40640a186..b0e9f8888 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -188,6 +188,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'raum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Raum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Room',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',

From 8138e23e71f5226503af877a6e0d95949ff86cb1 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 10 Jul 2025 09:12:01 +0200
Subject: [PATCH 349/572] set tabulator_row overflow just jor abschlusspruefung
 to visible

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

diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css
index 0b62e2809..bb2588926 100644
--- a/public/css/Studentenverwaltung.css
+++ b/public/css/Studentenverwaltung.css
@@ -54,7 +54,7 @@ html {
 }
 
 /* Dropdown AbschlusspruefungList.js */
-.tabulator-row {
+.stv-details-abschlusspruefung .tabulator-row {
 	overflow: visible !important;
 }
 

From 08a394cad0b41cf80aabeb26fa7efaeefee4bca0 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 10 Jul 2025 09:47:09 +0200
Subject: [PATCH 350/572] add eventListener to prevent bootstrap dialog from
 blocking focusin in tinymce linking popup

---
 .../Messages/Details/NewMessage/Modal.js      | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index 9c9bcd4cd..57573a9ba 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -68,7 +68,16 @@ export default {
 				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
 				//height: 800,
 				//plugins: ['lists'],
-				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify',
+				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify | link',
+				plugins: 'link linktitle',
+				link_context_toolbar: true,
+				automatic_uploads: true,
+				default_link_target: "_blank",
+				link_title: true,
+				target_list: [
+					{ title: 'New tab', value: '_blank' },
+					{ title: 'Same tab', value: '_self' }
+				],
 				style_formats: [
 					{title: 'Blocks', block: 'div'},
 					{title: 'Paragraph', block: 'p'},
@@ -88,7 +97,15 @@ export default {
 						const newContent = editor.getContent();
 						vm.formData.body = newContent;
 					});
+
+					// Prevent Bootstrap dialog from blocking focusin
+					document.addEventListener('focusin', (e) => {
+						if (e.target.closest(".tox-tinymce-aux, .moxman-window, .tam-assetmanager-root") !== null) {
+							e.stopImmediatePropagation();
+						}
+					});
 				},
+
 			});
 		},
 		updateText(value) {

From 7039719700d8f44b76d331570713056eef99fd17 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 10 Jul 2025 11:31:24 +0200
Subject: [PATCH 351/572] Tab Messages: show reply button only if not disabled

---
 public/js/components/Messages/Details/TableMessages.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 05355b96c..65c090327 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -29,7 +29,6 @@ export default {
 	},
 	data(){
 		return {
-			pageNo: 1,
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: this.loadAjaxCall,
@@ -102,8 +101,12 @@ export default {
 							container.className = "d-flex gap-2";
 
 							let button = document.createElement('button');
-							if (this.personId != cell.getData().sender_id)
+							if (this.personId != cell.getData().sender_id) {
 								button.disabled = true;
+								button.style = "visibility: hidden";
+								button.ariaHidden = true;
+							}
+
 							button.className = 'btn btn-outline-secondary btn-action';
 							button.title = this.$p.t('global', 'reply');
 							button.innerHTML = '<i class="fa fa-reply"></i>';
@@ -112,6 +115,7 @@ export default {
 								(event) =>
 									this.actionReplyToMessage(cell.getData().message_id)
 							);
+
 							container.append(button);
 
 							button = document.createElement('button');

From 129b8b2e491a6eb014e54c20a9c5cfcac4909187 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 10 Jul 2025 11:47:22 +0200
Subject: [PATCH 352/572] refactor(LvPlan Widget renderer component): adds the
 renderer component to the lvplan widget

---
 public/css/Cis4/CoreCalendarEvents.css        | 43 +++++++++-
 .../Cis/Renderer/Feiertage/calendarEvent.js   |  2 +-
 .../js/components/DashboardWidget/LvPlan.js   | 82 ++++++++++++++-----
 3 files changed, 106 insertions(+), 21 deletions(-)

diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index 9111d21cd..f248f4a61 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -122,4 +122,45 @@
 	margin: 0.5rem;
 }
 
-.dayPageContainer .feiertagEventContent #ferienEventTitle {}
\ No newline at end of file
+.dayPageContainer .feiertagEventContent #ferienEventTitle {}
+
+/* Minimized Container Styles */
+
+/* Ferientage Events for Minimized */
+
+.minimizedContainer .feiertagEventContent{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	color: var(--fhc-light);
+}
+
+.minimizedContainer .feiertagEventContent #ferienEventIcon{
+	margin: 0.5rem;
+}
+
+.minimizedContainer .feiertagEventContent #ferienEventTitle{
+	flex-grow: 1;
+}
+
+/* Lehreinheits Events in Minimized */
+.dayPageContainer .lehreinheitEventContent {
+	display: flex;
+	padding-left: 4rem;
+	justify-content: space-evenly;
+	align-items: center;
+
+}
+
+.dayPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
+	display: grid;
+	align-content: center;
+}
+
+.dayPageContainer .lehreinheitEventContent #lehreinheitEventText {
+	display: contents;
+}
+
+.dayPageContainer .lehreinheitEventContent #lehreinheitEventText * {
+	font-weight: 500;
+}
\ No newline at end of file
diff --git a/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js b/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
index b3367b64e..ffc164117 100644
--- a/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
+++ b/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
@@ -9,6 +9,6 @@ export default {
 	template: `
 		<div class="feiertagEventContent " >
 			<i id="ferienEventIcon" class="fa-regular fa-calendar"></i>
-			<span id="ferienEventTitle" ><strong>{{event.titel}}</strong></span>
+			<span id="ferienEventTitle" class="fw-bold text-center">{{event.titel}}</span>
 		</div>`,
 };
\ No newline at end of file
diff --git a/public/js/components/DashboardWidget/LvPlan.js b/public/js/components/DashboardWidget/LvPlan.js
index f180c47e6..1e2588161 100644
--- a/public/js/components/DashboardWidget/LvPlan.js
+++ b/public/js/components/DashboardWidget/LvPlan.js
@@ -30,9 +30,29 @@ export default {
 			roomInfoContentID: null,
 			ort_kurzbz: null,
 			selectedEvent: null,
+			isModalContentResolved: false,
+			isModalTitleResolved: false,
+			isShowModal: false,
 		}
 	},
+	inject: ["renderers"],
+	watch:{
+		modalLoaded: {
+			handler: function (newValue) {
+				if (this.isShowModal && newValue.isModalContentResolved && newValue.isModalTitleResolved) {
+					this.$nextTick(() => {
+						if (this.$refs.lvmodal) this.$refs.lvmodal.show();
+						this.isShowModal = false;
+					});
+				}
+			},
+			immediate: true
+		},
+	},
 	computed: {
+		modalLoaded: function () {
+			return { isModalContentResolved: this.isModalContentResolved, isModalTitleResolved: this.isModalTitleResolved };
+		},
 		allEventsGrouped() {
 			// groups all events of the next 7 days together
 			const currentCalendarDate = new CalendarDate(this.currentDay)
@@ -46,7 +66,7 @@ export default {
 				arr[1].push(cur)
 				
 				return acc
-			}, mapArr))
+			}, mapArr));
 		},
 		currentEvents() {
 			return (this.events || []).filter(evt => evt.end < this.dayAfterCurrentDay && evt.start >= this.currentDay);
@@ -64,6 +84,34 @@ export default {
 		},
 	},
 	methods: {
+		showModal: function (event) {
+			this.currentlySelectedEvent = event;
+			Vue.nextTick(() => {
+				if (this.isModalContentResolved && this.isModalTitleResolved) {
+					if (this.$refs.lvmodal) this.$refs.lvmodal.show();
+				}
+				else {
+					this.isShowModal = true;
+				}
+			})
+		},
+		modalTitleResolved: function () {
+			this.isModalTitleResolved = true;
+
+		},
+		modalContentResolved: function () {
+			this.isModalContentResolved = true;
+
+		},
+		modalTitleComponent(type) {
+			return this.renderers[type]?.modalTitle;
+		},
+		modalContentComponent(type) {
+			return this.renderers[type]?.modalContent;
+		},
+		calendarEventComponent(type) {
+			return this.renderers[type]?.calendarEvent;
+		},
 		getEventStyle: function(evt) {
 			const styles = {'background-color': evt.color};
 			if(evt.start.getTime() < Date.now()) styles.opacity = 0.5;
@@ -169,7 +217,18 @@ export default {
 	},
 	template: /*html*/`
 	<div class="dashboard-widget-lvplan d-flex flex-column h-100">
-		<lv-modal v-if="selectedEvent" ref="lvmodal" :event="selectedEvent"  />
+		<lv-modal v-if="selectedEvent" ref="lvmodal" :event="selectedEvent"  >
+			<template #modalTitle>
+				<Suspense @pending="isModalTitleResolved=false" @resolve="modalTitleResolved">
+					<component :is="modalTitleComponent(selectedEvent.type)" v-if="selectedEvent" :event="selectedEvent" ></component>
+				</Suspense>
+			</template>
+			<template #modalContent>
+				<Suspense @pending="isModalContentResolved=false" @resolve="modalContentResolved">
+					<component :is="modalContentComponent(selectedEvent.type)" v-if="selectedEvent" :event="selectedEvent" ></component>
+				</Suspense>
+			</template>
+		</lv-modal>
 		<content-modal :content_id="roomInfoContentID" dialogClass="modal-lg" ref="contentModal"/>
 		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" :widget="true" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" >
 			<template #monthPage="{event,day}">
@@ -184,7 +243,7 @@ export default {
 				</span>
 			</template>
 			<template #minimizedPage >
-				<div class="flex-grow-1" style="overflow-y: auto; overflow-x: hidden">
+				<div class="minimizedContainer flex-grow-1" style="overflow-y: auto; overflow-x: hidden">
 					<div v-if="events === null" class="d-flex h-100 justify-content-center align-items-center">
 						<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
 					</div>
@@ -193,22 +252,7 @@ export default {
 							<button class="btn fhc-tertiary text-decoration-none" @click="setCalendarMaximized">{{ key.format({dateStyle: "full"}, $p.user_locale.value)}}</button>
 						</div>
 						<div role="button" @click="showLvUebersicht(evt)" v-for="evt in value" :key="evt.id" class="list-group-item small" :style="getEventStyle(evt)">
-							<template v-if="evt.type=='moodle'">
-								<div class="d-flex align-items-center ">
-									<moodle-svg></moodle-svg>
-									<b v-contrast class="flex-grow-1 text-center"><strong v-html="evt.titel"></strong> - {{evt.topic}}</b>
-								</div>
-							</template>
-							<template v-else>
-								<b>{{evt.topic}}</b>
-								<br>
-								<small v-if="evt.ort_kurzbz" class="d-flex w-100 justify-content-between">
-									<!-- event modifier stop to prevent opening the modal for the lv Uebersicht when clicking on the ort_kurzbz -->
-									<span @click.stop="showRoomInfoModal(evt.ort_kurzbz)" style="text-decoration:underline" type="button">{{evt.ort_kurzbz}}</span>
-									<span>{{evt.start.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}-{{evt.end.toLocaleTimeString(undefined, {hour:'numeric',minute:'numeric'})}}</span>
-								</small>
-							</template>
-							
+							<component :is="calendarEventComponent(evt.type)" :event="evt" ></component>
 						</div>
 						<div v-if="!value.length" class="list-group-item small text-center">
 							{{ $p.t('lehre/noLvFound') }}

From 6f3759d95d4fb251d500acb7ab43ebca1099322b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 10 Jul 2025 11:47:51 +0200
Subject: [PATCH 353/572] update(Wave accessability): updates aria labels for
 accessability

---
 public/css/components/dashboard.css         | 10 +++---
 public/js/components/Cis/LvPlan/LvPlan.js   |  4 +--
 public/js/components/Dashboard/Dashboard.js |  2 +-
 public/js/components/Dashboard/Item.js      | 34 ++++++++++-----------
 public/js/components/DashboardWidget/Url.js | 10 +++---
 5 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index d030e80cd..ae2bb252f 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -112,23 +112,23 @@
 }
 
 .cursor-nw-resize {
-	cursor: nw-resize;
+	cursor: nw-resize !important;
 }
 
 .cursor-ew-resize {
-	cursor: ew-resize;
+	cursor: ew-resize !important;
 }
 
 .cursor-ns-resize {
-	cursor: ns-resize;
+	cursor: ns-resize !important;
 }
 
 .no-drag-drop {
-	cursor: not-allowed;
+	cursor: not-allowed !important;
 }
 
 .cursor-move {
-	cursor: move;
+	cursor: move !important;
 }
 
 .draggedItem {
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 7aeaa0f1b..a095f9f31 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -2,7 +2,6 @@ import FhcCalendar from "../../Calendar/Calendar.js";
 import CalendarDate from "../../../composables/CalendarDate.js";
 import LvModal from "../Mylv/LvModal.js";
 import LvMenu from "../Mylv/LvMenu.js"
-import lehreinheitEvent from "../Renderer/Lehreinheit/calendarEvent.js"
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
@@ -24,7 +23,6 @@ const LvPlan = {
 			studiensemester_start: null,
 			studiensemester_ende: null,
 			uid: null,
-			renderComponents: {},
 			isModalContentResolved: false,
 			isModalTitleResolved: false,
 			isShowModal: false,
@@ -94,7 +92,7 @@ const LvPlan = {
 		}
 	},
 	components: {
-		FhcCalendar, LvModal, LvMenu, lehreinheitEvent
+		FhcCalendar, LvModal, LvMenu
 	},
 	computed:{
 		modalLoaded: function(){
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 825bad3f7..81eabd31c 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -196,7 +196,7 @@ export default {
 	<div class="core-dashboard">
 		<h3 v-show="viewDataInternal?.name">
 			{{ $p.t('global/personalGreeting', [ viewDataInternal?.name ]) }}
-			<button style="margin-left: 8px;" class="btn" @click="editMode = !editMode"><i class="fa-solid fa-gear"></i></button>
+			<button style="margin-left: 8px;" class="btn" @click="editMode = !editMode" aria-label="edit dashboard" v-tooltip="{showDelay:1000,value:'edit dashboard'}"><i class="fa-solid fa-gear" aria-hidden="true"></i></button>
 		</h3>
 		<dashboard-section v-for="(section, index) in sections" :key="section.name" :seperator="index" :name="section.name" :widgets="section.widgets" @widgetAdd="widgetAdd" @widgetUpdate="widgetUpdate" @widgetRemove="widgetRemove"></dashboard-section>
 		<dashboard-widget-picker ref="widgetpicker" :widgets="widgets"></dashboard-widget-picker>
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 68a92e701..e1a03e2f3 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -160,32 +160,32 @@ export default {
 	<div v-show="!dragstate" class="h-100 card border-0">
 		<div v-if="widget" class="card-header d-flex ps-0 pe-2 align-items-center">
 			<Transition>
-				<span v-if="editMode && !isPinned" drag-action="move" class="col-auto mx-2 px-2 cursor-move"><i class="fa-solid fa-grip-vertical"></i></span>
+				<span type="button" v-if="editMode && !isPinned" drag-action="move" class="col-auto mx-2 px-2 cursor-move" aria-label="move widget" v-tooltip="{showDelay:1000, value:'move widget'}"><i class="fa-solid fa-grip-vertical" aria-hidden="true"></i></span>
 			</Transition>
 			<span class="col mx-2 px-2">{{ widget.setup.name }}</span>
 			<template v-if="isPinned">
-				<div v-if="editMode" pinned="true" @click="unpin" class="pin cursor-pointer col-auto me-2">
-					<i class="fa-solid fa-thumbtack "></i>
+				<div type="button" v-if="editMode" pinned="true" @click="unpin" v-tooltip="{showDelay:1000, value: 'unpin item'}" aria-label="unpin item" class="pin cursor-pointer col-auto me-2">
+					<i class="fa-solid fa-thumbtack " aria-hidden="true"></i>
 				</div>
 				<div v-else class="col-auto me-2">
 					<i class="fa-solid fa-thumbtack "></i>
 				</div>
 			</template>
 			<template v-else>
-				<div v-if="editMode"  class="col-auto me-2 pin" @click="pinItem">
-					<i class="fa-solid fa-thumbtack" style="color:lightgray;"></i>
+				<div type="button" v-if="editMode"  class="col-auto me-2 pin" @click="pinItem" aria-label="pin item" v-tooltip="{showDelay:1000, value: 'pin item'}">
+					<i class="fa-solid fa-thumbtack" aria-hidden="true" style="color:lightgray;"></i>
 				</div>
 			</template>
-			<a v-if="widget.setup.cis4link" :href="getWidgetC4Link(widget)" class="col-auto ms-auto ">
-          		<i class="fa fa-arrow-up-right-from-square me-1"></i>
+			<a type="button" v-if="widget.setup.cis4link" :href="getWidgetC4Link(widget)" aria-label="widget link" v-tooltip="{showDelay:1000, value:'widget link'}" class="col-auto ms-auto ">
+          		<i class="fa fa-arrow-up-right-from-square me-1" aria-hidden="true"></i>
           	</a>
-			<a v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig"><i class="fa-solid fa-gear"></i></a>
-			<a v-if="custom && editMode" class="col-auto px-1" href="#" @click.prevent="$emit('remove')">
-				<i class="fa-solid fa-trash"></i>
+			<a type="button" v-if="hasConfig" class="col-auto px-1" href="#" @click.prevent="openConfig" aria-label="configure widget" v-tooltip="{showDelay:1000,value:'configure widget'}"><i class="fa-solid fa-gear" aria-hidden="true"></i></a>
+			<a type="button" v-if="custom && editMode" class="col-auto px-1" aria-label="delete widget" v-tooltip="{showDelay:1000,value:'delete widget'}" href="#" @click.prevent="$emit('remove')">
+				<i class="fa-solid fa-trash" aria-hidden="true"></i>
 			</a>
 			<Transition>
 				<div v-if="!custom && editMode" class="col-auto px-1 form-switch">
-					<input class="form-check-input ms-0" type="checkbox" role="switch" id="flexSwitchCheckChecked" :checked="!hidden" @input="$emit('remove', hidden)">
+					<input class="form-check-input ms-0" type="checkbox" role="switch" aria-label="toggle widget" id="flexSwitchCheckChecked" :checked="!hidden" @input="$emit('remove', hidden)">
 				</div>
 			</Transition>
 		</div>
@@ -209,18 +209,18 @@ export default {
 		<height-transition>
 			<div v-if="editMode && isResizeable && !isPinned " class="card-footer d-flex justify-content-end p-0">
 				<template v-if="maxWidth < 2">
-					<span drag-action="resize" class="col-auto px-1 cursor-ns-resize">
-						<i  class="fa-solid fa-up-down pe-2"></i>
+					<span type="button" drag-action="resize" class="col-auto px-1 cursor-ns-resize" aria-label="resize widget" v-tooltip="{showDelay:1000, value:'resize widget'}">
+						<i  class="fa-solid fa-up-down pe-2" aria-hidden="true"></i>
 					</span>
 				</template>
 				<template v-else-if="maxHeight < 2">
-					<span drag-action="resize" class="col-auto px-1 cursor-ew-resize">
-						<i class="fa-solid fa-left-right pe-2"></i>
+					<span type="button" drag-action="resize" class="col-auto px-1 cursor-ew-resize" aria-label="resize widget" v-tooltip="{showDelay:1000, value:'resize widget'}">
+						<i class="fa-solid fa-left-right pe-2" aria-hidden="true"></i>
 					</span>
 				</template>
 				<template v-else>
-					<span drag-action="resize" class="col-auto px-1 cursor-nw-resize">
-						<i  class="fa-solid fa-up-right-and-down-left-from-center mirror-x"></i>
+					<span type="button" drag-action="resize" class="col-auto px-1 cursor-nw-resize" aria-label="resize widget" v-tooltip="{showDelay:1000, value:'resize widget'}">
+						<i  class="fa-solid fa-up-right-and-down-left-from-center mirror-x" aria-hidden="true"></i>
 					</span>
 				</template>
 			</div>
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 796726f04..93718a10c 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -161,7 +161,7 @@ export default {
 	template: /*html*/ `
     <div class="widgets-url w-100 h-100 overflow-scroll" style="padding: 1rem 1rem;">
         <div class="d-flex flex-column justify-content-between">
-        	<button class="btn btn-outline-secondary btn-sm w-100 mt-2" @click="openCreateModal" type="button">{{$p.t('bookmark','newLink')}}</button>
+        	<button class="btn btn-outline-secondary btn-sm w-100 mt-2 card" @click="openCreateModal" type="button">{{$p.t('bookmark','newLink')}}</button>
 
             <template v-if="shared">
 
@@ -173,12 +173,12 @@ export default {
 
 						<div class="ms-auto">
 							<!--EDIT BOOKMARK-->
-							<a href="#" @click.prevent="openEditModal(link)" >
-								<i class="fa fa-edit me-1"></i>
+							<a type="button" href="#" @click.prevent="openEditModal(link)" aria-label="edit bookmark" v-tooltip="{showDelay:1000,value:'edit bookmark'}">
+								<i class="fa fa-edit me-1" aria-hidden="true"></i>
 							</a>
 							<!--DELETE BOOKMARK-->
-							<a id="deleteBookmark" href="#" @click.prevent="removeLink(link.bookmark_id)">
-								<i class="fa fa-regular fa-trash-can"></i>
+							<a type="button" id="deleteBookmark" href="#" aria-label="delete bookmark" v-tooltip="{showDelay:1000,value:'delete bookmark'}" @click.prevent="removeLink(link.bookmark_id)">
+								<i class="fa fa-regular fa-trash-can" aria-hidden="true"></i>
 							</a>
 						</div>
 					</div>

From dba435dafb6ba91ea790dad97bd5ccb7b8d5ddd4 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 10 Jul 2025 12:10:39 +0200
Subject: [PATCH 354/572] fix(VueDatepicker darkmode): updates the dark mode
 property of the vueDatePicker if the theme is switched to light or dark mode

---
 public/js/components/Cis/Raumsuche/Raumsuche.js | 10 ++++++----
 public/js/plugin/Theme.js                       |  5 +++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index 978e92407..6878cefc2 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -184,12 +184,11 @@ export const Raumsuche =  {
 			}
 
 		}
-	},
-	watch: {
-
 	},
 	computed: {
-
+		isDarkMode(){
+			return this.$theme.theme_name.value == 'dark';
+		}
 	},
 	created() {
 		
@@ -203,6 +202,7 @@ export const Raumsuche =  {
 	<div class="row">
 		<div class="col-12 col-lg-2">
 			<VueDatePicker
+				:dark="isDarkMode"
 				v-model="datum"
 				:clearable="false"
 				date-picker
@@ -215,6 +215,7 @@ export const Raumsuche =  {
 		</div>
 		<div class="col-12 col-lg-1">
 			<VueDatePicker
+				:dark="isDarkMode"
 				v-model="von"
 				:clearable="false"
 				time-picker
@@ -227,6 +228,7 @@ export const Raumsuche =  {
 		</div>
 		<div class="col-12 col-lg-1">
 			<VueDatePicker
+				:dark="isDarkMode"
 				v-model="bis"
 				:clearable="false"
 				time-picker
diff --git a/public/js/plugin/Theme.js b/public/js/plugin/Theme.js
index d063b4d46..a6360d4a6 100644
--- a/public/js/plugin/Theme.js
+++ b/public/js/plugin/Theme.js
@@ -1,4 +1,4 @@
-const theme_name= FHC_JS_DATA_STORAGE_OBJECT.theme.name;
+let theme_name = Vue.ref(FHC_JS_DATA_STORAGE_OBJECT.theme.name);
 const theme_modes = FHC_JS_DATA_STORAGE_OBJECT.theme.modes;
 
 const toggleTheme = (theme)=>{
@@ -7,6 +7,7 @@ const toggleTheme = (theme)=>{
 	for (const theme of theme_modes) {
 		document.documentElement.classList.remove(theme);
 	}
+	theme_name.value = theme;
 	document.documentElement.classList.add(theme);
 
 	document.body.setAttribute("data-bs-theme", theme);
@@ -40,7 +41,7 @@ const initializeTheme = ()=>{
 export default {
 	install: (app,options)=>{
 		
-		document.documentElement.classList.add(theme_name);
+		document.documentElement.classList.add(theme_name.value);
 
 		initializeTheme();
 

From 2deef8039dbe9306f982fbe6eb1db933373497fb Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 10 Jul 2025 14:32:26 +0200
Subject: [PATCH 355/572] update(LvPlan color contrast): changes the colors for
 some of the text in the lvplan component for more contrast

---
 public/css/components/calendar.css          | 28 ++++++++++++++++++---
 public/js/components/Calendar/Day/Page.js   |  6 ++---
 public/js/components/Calendar/Header.js     |  4 +--
 public/js/components/Calendar/Month/Page.js |  2 +-
 public/js/components/Calendar/Week/Page.js  |  6 ++---
 public/js/components/Calendar/Weeks.js      |  2 +-
 public/js/components/Calendar/Years/Page.js |  2 +-
 public/js/components/Cis/LvPlan/LvPlan.js   |  2 +-
 8 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index fe8841867..85962d4e0 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -170,7 +170,7 @@
 	content: "";
 	position: absolute;
 	top: 0;
-	left: 0;
+	left: 3rem;
 	margin:auto;
 	width: 100%;
 	height: 100%;
@@ -208,11 +208,16 @@
 }
 
 .fhc-calendar-lg .fhc-calendar-month-page-day,
-.fhc-calendar-lg .fhc-calendar-month-page-weekday,
-.fhc-calendar-md .fhc-calendar-month-page-day,
-.fhc-calendar-md .fhc-calendar-month-page-weekday {
+.fhc-calendar-md .fhc-calendar-month-page-day {
   border: solid 1px var(--fhc-calendar-border);
 }
+
+.fhc-calendar-lg .fhc-calendar-month-page-weekday,
+.fhc-calendar-md .fhc-calendar-month-page-weekday{
+	border: solid 1px var(--fhc-secondary);
+}
+
+
 .fhc-calendar-lg .fhc-calendar-month-page-day,
 .fhc-calendar-md .fhc-calendar-month-page-day {
   aspect-ratio: 1;
@@ -419,3 +424,18 @@
 .weekPageContainer {
 	container-type: inline-size;
 }
+
+#calendarHeaderTitle{
+	color: var(--fhc-text);
+}
+
+.fhc-calendar-day-page .hours,
+.fhc-calendar-day-page .curTimeIndicator,
+.fhc-calendar-day-page .fhc-calendar-hour-indicator,
+.fhc-calendar-week-page .hours,
+.fhc-calendar-week-page .curTimeIndicator,
+.fhc-calendar-week-page .fhc-calendar-hour-indicator,
+.fhc-calendar-day-page .date,
+.fhc-calendar-week-page .date {
+	color: var(--fhc-text-secondary) !important;
+}
\ No newline at end of file
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
index 4247ffcd5..43154aa0a 100644
--- a/public/js/components/Calendar/Day/Page.js
+++ b/public/js/components/Calendar/Day/Page.js
@@ -385,8 +385,8 @@ export default {
 				<div class="d-flex flex-column h-100 border">
 					<div ref="header" class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="pageHeaderStyle">
 						<div type="button" class="flex-grow-1" :title="dayText.heading" @click.prevent="changeToMonth(day)">
-							<div class="fw-bold">{{dayText.tag}}</div>
-							<a href="#" class="small text-secondary text-decoration-none" >{{dayText.datum}}</a>
+							<div class="day fw-bold">{{dayText.tag}}</div>
+							<a href="#" class="small date text-decoration-none" >{{dayText.datum}}</a>
 						</div>
 					</div>
 					<div @wheel.prevent="dayScrollBehavior" id="scrollContainer" ref="dayScrollContainer" style="height: 100%; overflow-y: scroll;">
@@ -438,7 +438,7 @@ export default {
 									</Transition>
 									<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border" :style="hourGridStyle(hour)"></div>
 									<div class="hours">
-										<div v-for="hour in hours" :style="'min-height:' + rowMinHeight " :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
+										<div v-for="hour in hours" :style="'min-height:' + rowMinHeight " :key="hour" class="text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 									</div>
 									<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start" :style="dayGridStyle(day)">
 
diff --git a/public/js/components/Calendar/Header.js b/public/js/components/Calendar/Header.js
index c1b53d9c8..7ddb384f2 100644
--- a/public/js/components/Calendar/Header.js
+++ b/public/js/components/Calendar/Header.js
@@ -74,7 +74,7 @@ export default {
 					</div>
 					<div class="justify-content-center text-center col-auto">
 						<div class="d-flex justify-content-center align-items-center">
-							<button class="btn btn-link link-secondary text-decoration-none" :class="{'btn-sm': !this.size}" @click="$emit('click')">
+							<button id="calendarHeaderTitle" class="btn btn-link text-decoration-none" :class="{'btn-sm': !this.size}" @click="$emit('click')">
 								{{ title }}
 								<i v-if="eventsAreNull" class="fa fa-spinner fa-pulse"></i>
 							</button>
@@ -88,7 +88,7 @@ export default {
 			<div ref="viewButtons" v-if="!noWeekView && !noMonthView" :class="getHeaderClassSide" class="d-flex justify-content-center justify-content-md-end align-items-center" style="pointer-events: none;">
 				<div  style="pointer-events: all;">
 					<div  role="group" aria-label="Kalender Modus">
-						<button :aria-label="modeAriaLabelText(mode_bezeichnung)" v-tooltip.top="{value:modeAriaLabelText(mode_bezeichnung), showDelay:1000}" type="button" :class="{'active':mode_kurzbz.toLowerCase() === mode.toLowerCase()}" style="margin-right: 4px;" @click.prevent="$emit('updateMode',mode_kurzbz)" class="btn btn-outline-secondary" v-for="({mode_bezeichnung,icon,condition},mode_kurzbz) in modes">
+						<button :aria-label="modeAriaLabelText(mode_bezeichnung)" v-tooltip.top="{value:modeAriaLabelText(mode_bezeichnung), showDelay:1000}" type="button" :class="{'active':mode_kurzbz.toLowerCase() === mode.toLowerCase()}" style="margin-right: 4px;" @click.prevent="$emit('updateMode',mode_kurzbz)" class="btn btn-outline-secondary card d-inline-block" v-for="({mode_bezeichnung,icon,condition},mode_kurzbz) in modes">
 							<i aria-hidden="true" v-if="condition" class="fa" :class="icon" ></i>
 						</button>
 					</div>
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
index 3f9d9ad67..bd974afde 100644
--- a/public/js/components/Calendar/Month/Page.js
+++ b/public/js/components/Calendar/Month/Page.js
@@ -143,7 +143,7 @@ export default {
 		</div>
 		<template v-for="week in weeks"
 		:key="week.no">
-			<a href="#" v-if="showWeeks" class="fhc-calendar-month-page-weekday text-decoration-none text-end opacity-25"
+			<a href="#" v-if="showWeeks" class="fhc-calendar-month-page-weekday text-decoration-none text-end "
 			@click.prevent="changeToWeek(week)">{{week.no}}</a>
 			<a href="#"
 			@click.prevent="clickEvent(day,week)"
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 3bfc7b668..b5bfcd3c3 100644
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -325,8 +325,8 @@ export default {
 	<div class="d-flex flex-column">
 			<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="pageHeaderStyle" >
 				<div type="button" v-for="day in days" :key="day" class="flex-grow-1" :title="dayText[day]?.heading" @click.prevent="changeToDay(day)">
-					<div class="fw-bold">{{dayText[day]?.tag}}</div>
-					<a href="#" class="small text-muted text-decoration-none" >{{dayText[day]?.datum}}</a>
+					<div class="day fw-bold">{{dayText[day]?.tag}}</div>
+					<a href="#" class="date small text-decoration-none" >{{dayText[day]?.datum}}</a>
 				</div>
 			</div>
 			<div ref="eventcontainer" class="position-relative flex-grow-1"  >
@@ -360,7 +360,7 @@ export default {
 						</div>
 					</Transition>
 					<div class="hours">
-						<div v-for="hour in hours" :style="getGridStyle" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
+						<div v-for="hour in hours" :style="getGridStyle" :key="hour" class="text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
 					<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" :class="{'past':day.isPast}" class=" day border-start position-relative" :style="dayGridStyle(day)">
 						<Transition>
diff --git a/public/js/components/Calendar/Weeks.js b/public/js/components/Calendar/Weeks.js
index bed39d624..057889e83 100644
--- a/public/js/components/Calendar/Weeks.js
+++ b/public/js/components/Calendar/Weeks.js
@@ -60,7 +60,7 @@ export default {
 		<calendar-header v-if="header" :title="title" @prev="prev" @next="next" @click="$emit('updateMode', 'years')" @updateMode="$emit('updateMode', $event)" />
 		<div class="d-flex flex-wrap">
 			<div v-for="(week, key) in weeks" :key="key" class="d-grid col-2">
-				<button @click="setWeek(week)" class="btn btn-outline-secondary" :class="{'border-0': week != focusDate.w}">
+				<button @click="setWeek(week)" class="btn btn-outline-secondary card" :class="{'border-0': week != focusDate.w}">
 					{{week}}
 				</button>
 			</div>
diff --git a/public/js/components/Calendar/Years/Page.js b/public/js/components/Calendar/Years/Page.js
index 3d78fc38d..b7461cd03 100644
--- a/public/js/components/Calendar/Years/Page.js
+++ b/public/js/components/Calendar/Years/Page.js
@@ -28,7 +28,7 @@ export default {
 	template: `
 	<div class="fhc-calendar-years-page d-flex flex-wrap">
 		<div v-for="year in years" :key="year" class="d-grid col-4">
-			<button class="btn btn-outline-secondary" :class="{'border-0': year != focusDate.y}" @click="focusDate.y = year; $emit('updateMode')">
+			<button class="btn btn-outline-secondary card justify-content-center" :class="{'border-0': year != focusDate.y}" @click="focusDate.y = year; $emit('updateMode')">
 				{{year}}
 			</button>
 		</div>
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index a095f9f31..14c9b77a2 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -314,7 +314,7 @@ const LvPlan = {
 	>
 		<template #calendarDownloads>
 			<div v-for="{title,icon,link} in downloadLinks">
-				<a :href="link" :aria-label="title" class="py-1 px-2 m-1 btn btn-outline-secondary">
+				<a :href="link" :aria-label="title" class="py-1 px-2 m-1 btn btn-outline-secondary card">
 					<div class="d-flex flex-column">
 						<i aria-hidden="true" :class="icon"></i>
 						<span class="small">{{title}}</span>

From c2cc1c5870a6999e898ea879f00dc6c169fce481 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 11 Jul 2025 09:14:34 +0200
Subject: [PATCH 356/572] fix(Profil viewData): fixes little data conversion
 error in the endpoint

---
 application/controllers/api/frontend/v1/Profil.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php
index 57af6aa37..c048e51d6 100644
--- a/application/controllers/api/frontend/v1/Profil.php
+++ b/application/controllers/api/frontend/v1/Profil.php
@@ -59,10 +59,10 @@ class Profil extends FHCAPI_Controller
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 	public function profilViewData($uid){
-		$uid = json_decode($uid);
+		$uid = $uid;
 		$this->load->library('ProfilLib');
 		$editable = false;
-		if(isset($uid) && $uid != null){
+		if(isset($uid) && $uid != "null"){
 			$profil_data = $this->profillib->getView($uid);
 			if($uid == getAuthUID()){
 				$editable = true;

From 75a93523e00a39be1e273bbdd26fff75d13b7f79 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 11 Jul 2025 11:01:18 +0200
Subject: [PATCH 357/572] refactor(Profil endpoint): changes how the parameter
 is passed to the profil endpoint

---
 .../controllers/api/frontend/v1/Profil.php    | 533 +-----------------
 public/js/api/factory/profil.js               |  13 +-
 2 files changed, 12 insertions(+), 534 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Profil.php b/application/controllers/api/frontend/v1/Profil.php
index c048e51d6..3133b107a 100644
--- a/application/controllers/api/frontend/v1/Profil.php
+++ b/application/controllers/api/frontend/v1/Profil.php
@@ -27,7 +27,6 @@ class Profil extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getView' => self::PERM_LOGGED,
             'fotoSperre' => self::PERM_LOGGED,
 			'getGemeinden' => self::PERM_LOGGED,
 			'getAllNationen' => self::PERM_LOGGED,
@@ -38,16 +37,7 @@ class Profil extends FHCAPI_Controller
 		$this->load->library('PermissionLib');
 
 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 		$this->load->model('person/Person_model', 'PersonModel');
-		$this->load->model('person/Adresse_model', 'AdresseModel');
-		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
-		$this->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
-		$this->load->model('ressource/Betriebsmittelperson_model', 'BetriebsmittelpersonModel');
-		$this->load->model('person/Kontakt_model', 'KontaktModel');
-		$this->load->model('person/Profil_update_model', 'ProfilUpdateModel');
-		$this->load->model('content/DmsVersion_model', 'DmsVersionModel');
 
 
 		//? put the uid and pid inside the controller for reusability
@@ -58,11 +48,10 @@ class Profil extends FHCAPI_Controller
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
-	public function profilViewData($uid){
-		$uid = $uid;
+	public function profilViewData($uid=null){
 		$this->load->library('ProfilLib');
 		$editable = false;
-		if(isset($uid) && $uid != "null"){
+		if(isset($uid) && $uid != null){
 			$profil_data = $this->profillib->getView($uid);
 			if($uid == getAuthUID()){
 				$editable = true;
@@ -79,56 +68,6 @@ class Profil extends FHCAPI_Controller
 		);
 		$this->terminateWithSuccess($viewData);
 	}
-	
-	
-    /**
-	 * function that returns the data used for the corresponding view
-	 * the client side parses the @param $uid and calls this function to get the data to the correct view 
-	 * @access public
-	 * @param  boolean $uid the userID used to identify which information should be retrieved for which view 
-	 * @return stdClass all the data corresponding to a view of a user
-	 */
-	public function getView($uid)
-	{
-		$res = new stdClass();
-
-		// if parsing the URL did not found a UID then the UID of the logged in user is used
-		if ($uid == "Profil" || $uid == $this->uid) {
-			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($this->uid);
-			$isMitarbeiter = $this->getDataOrTerminateWithError($isMitarbeiter);
-			if ($isMitarbeiter) {
-				$res->view = "MitarbeiterProfil";
-				$res->data = $this->mitarbeiterProfil();
-				$res->data->pid = $this->pid;
-			} else {
-				$res->view = "StudentProfil";
-				$res->data = $this->studentProfil();
-				$res->data->pid = $this->pid;
-			}
-		}
-		// UID is availabe when accessing Profil/View/:uid
-		else {
-			$this->PersonModel->addSelect(["person_id"]);
-			$pid = $this->PersonModel->getByUid($uid);
-			$pid = $this->getDataOrTerminateWithError($pid);
-			$pid = $pid ? $pid[0] : null;
-			if (!$pid) {
-				$this->terminateWithError("Person with UID: " . $uid . " does not exist");
-			}
-			$isMitarbeiter = $this->MitarbeiterModel->isMitarbeiter($uid);
-			$isMitarbeiter = $this->getDataOrTerminateWithError($isMitarbeiter);
-			if ($isMitarbeiter) {
-				$res->view = "ViewMitarbeiterProfil";
-				$res->data = $this->viewMitarbeiterProfil($uid);
-
-			} else {
-				$res->view = "ViewStudentProfil";
-				$res->data = $this->viewStudentProfil($uid);
-			}
-		}
-		$res->data->fotoStatus=$this->isFotoAkzeptiert($this->pid);
-		$this->terminateWithSuccess($res);
-	}
 
     /**
 	 * update column foto_sperre in public.tbl_person
@@ -201,92 +140,7 @@ class Profil extends FHCAPI_Controller
 		
 	}
 
-
-    // -----------------------------------------------------------------------------------------------------------------
-	// Private methods
-
-	/**
-	 * function that returns the data used for viewing another mitarbeiter profile
-	 * @access private 
-	 * @param  integer $uid the userID to retrieve the mitarbeiter data
-	 * @return stdClass restricted mitarbeiter data
-	 */
-	private function viewMitarbeiterProfil($uid)
-	{
-		$mailverteiler_res = $this->getMailverteiler($uid);
-		$benutzer_funktion_res = $this->getBenutzerFunktion($uid);
-		$benutzer_res = $this->getBenutzerAlias($uid);
-		$person_res = $this->getPersonInfo($uid);
-		$mitarbeiter_res = $this->getMitarbeiterInfo($uid);
-		$telefon_res = $this->getTelefonInfo($uid);
-
-		$res = new stdClass();
-		$res->username = $uid;
-
-		//? Person Info
-		foreach ($person_res as $key => $val) {
-			$res->$key = $val;
-		}
-
-		//? Mitarbeiter Info
-		foreach ($mitarbeiter_res as $key => $val) {
-			$res->$key = $val;
-
-		}
-
-		$intern_email = array();
-		$intern_email["type"] = "intern";
-		$intern_email["email"] = $uid . "@" . DOMAIN;
-		$extern_email = array();
-		$extern_email["type"] = "alias";
-		
-		$extern_email["email"] = $benutzer_res->alias ? ($benutzer_res->alias . "@" . DOMAIN) : null;
-		$res->emails = $extern_email?[$intern_email, $extern_email]:[$intern_email];
-
-		$res->funktionen = $benutzer_funktion_res;
-		$res->mailverteiler = $mailverteiler_res;
-		$res->standort_telefon = isset($telefon_res) ? $telefon_res->kontakt : null;
-
-		return $res;
-	}
-
-	/**
-	 * function that returns the data used for viewing another student profile
-	 * @access private 
-	 * @param  integer $uid the userID to retrieve the student data
-	 * @return stdClass restricted student data
-	 */
-	private function viewStudentProfil($uid)
-	{
-		$mailverteiler_res = $this->getMailverteiler($uid);
-		$person_res = $this->getPersonInfo($uid);
-		$student_res = $this->getStudentInfo($uid);
-		$matr_res = $this->getMatrikelNummer($uid);
-
-		$res = new stdClass();
-		$res->username = $uid;
-
-		//? Person Information
-		foreach ($person_res as $key => $value) {
-			$res->$key = $value;
-		}
-
-		//? Student Information
-		foreach ($student_res as $key => $value) {
-			$res->$key = $value;
-		}
-
-		$intern_email = array();
-		$intern_email["type"] = "intern";
-		$intern_email["email"] = $uid . "@" . DOMAIN;
-
-		$res->emails = [$intern_email];
-		$res->matrikelnummer = $matr_res->matr_nr;
-		$res->mailverteiler = $mailverteiler_res;
-
-		return $res;
-	}
-
+    
 	/**
 	 * checks whether a specific userID is a mitarbeiter or not (foreword declaration of the function isMitarbeiter in Mitarbeiter_model.php)
 	 * @access public
@@ -310,384 +164,9 @@ class Profil extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
-	/**
-	 * function that returns the data used for the mitarbeiter profile
-	 * @access private 
-	 * @return stdClass mitarbeiter data
-	 */
-	private function mitarbeiterProfil()
-	{
+	// -----------------------------------------------------------------------------------------------------------------
+	// Private methods
 
-		$zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($this->uid);
-		$adresse_res = $this->getAdressenInfo($this->pid);
-		$kontakte_res = $this->getKontaktInfo($this->pid);
-		$mailverteiler_res = $this->getMailverteiler($this->uid);
-		$person_res = $this->getPersonInfo($this->uid, true);
-		$benutzer_funktion_res = $this->getBenutzerFunktion($this->uid);
-		$betriebsmittelperson_res = $this->getBetriebsmittelInfo($this->pid);
-		$profilUpdates = $this->getProfilUpdates($this->uid);
-		$telefon_res = $this->getTelefonInfo($this->uid);
-		$mitarbeiter_res = $this->getMitarbeiterInfo($this->uid);
-
-		$res = new stdClass();
-		$res->username = $this->uid;
-
-		//? Person Information
-		foreach ($person_res as $key => $value) {
-			$res->$key = $value;
-		}
-
-		//? Mitarbeiter Information
-		foreach ($mitarbeiter_res as $key => $value) {
-			$res->$key = $value;
-		}
-
-		$res->adressen = $adresse_res;
-		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
-		$res->kontakte = $kontakte_res;
-		$res->mittel = $betriebsmittelperson_res;
-		$res->mailverteiler = $mailverteiler_res;
-
-		$intern_email = array();
-		$intern_email["type"] = "intern";
-		$intern_email["email"] = $this->uid . "@" . DOMAIN;
-		$extern_email = array();
-		$extern_email["type"] = "alias";
-		
-		$extern_email["email"] = $mitarbeiter_res->alias? ($mitarbeiter_res->alias . "@" . DOMAIN) : null;
-		$res->emails = $extern_email["email"]?[$intern_email, $extern_email]:[$intern_email];
-
-		$res->funktionen = $benutzer_funktion_res;
-		$res->standort_telefon = $telefon_res;
-		$res->profilUpdates = $profilUpdates;
-
-		return $res;
-	}
-
-	/**
-	 * function that returns the data used for the student profile
-	 * @access private 
-	 * @return stdClass student data
-	 */
-	private function studentProfil()
-	{
-		$betriebsmittelperson_res = $this->getBetriebsmittelInfo($this->pid);
-		$kontakte_res = $this->getKontaktInfo($this->pid);
-		$zutrittskarte_ausgegebenam = $this->getZutrittskarteDatum($this->uid);
-		$adresse_res = $this->getAdressenInfo($this->pid);
-		$mailverteiler_res = $this->getMailverteiler($this->uid);
-		$person_res = $this->getPersonInfo($this->uid, true);
-		$zutrittsgruppe_res = $this->getZutrittsgruppen($this->uid);
-		$student_res = $this->getStudentInfo($this->uid);
-		$matr_res = $this->getMatrikelNummer($this->uid);
-		$profilUpdates = $this->getProfilUpdates($this->uid);
-
-		$res = new stdClass();
-		$res->username = $this->uid;
-
-		//? Person Information
-		foreach ($person_res as $key => $value) {
-			$res->$key = $value;
-		}
-
-		//? Student Information
-		foreach ($student_res as $key => $value) {
-			$res->$key = trim($value);
-		}
-
-		$intern_email = array();
-		$intern_email["type"] = "intern";
-		$intern_email["email"] = $this->uid . "@" . DOMAIN;
-
-		$res->emails = [$intern_email];
-		$res->adressen = $adresse_res;
-		$res->zutrittsdatum = $zutrittskarte_ausgegebenam;
-		$res->kontakte = $kontakte_res;
-		$res->mittel = $betriebsmittelperson_res;
-		$res->matrikelnummer = $matr_res->matr_nr;
-		$res->zuttritsgruppen = $zutrittsgruppe_res;
-		$res->mailverteiler = $mailverteiler_res;
-		$res->profilUpdates = $profilUpdates;
-
-		return $res;
-	}
-
-
-    /**
-	 * gets all the mailverteiler using the tables: tbl_benutzer, tbl_benutzergruppe, tbl_gruppe
-	 * @access private
-	 * @param  integer $uid  the userID used to retrieve the mailverteiler 
-	 * @return array returns the mailvertailer corresponding to a userID 
-	 */
-	private function getMailverteiler($uid)
-	{
-		$this->PersonModel->addSelect('gruppe_kurzbz, beschreibung');
-		$this->PersonModel->addJoin('tbl_benutzer', 'person_id');
-		$this->PersonModel->addJoin('tbl_benutzergruppe', 'uid');
-		$this->PersonModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
-
-		$mailverteiler_res = $this->PersonModel->loadWhere(array('mailgrp' => true, 'uid' => $uid));
-		$mailverteiler_res = $this->getDataOrTerminateWithError($mailverteiler_res);
-		$mailverteiler_res = gettype($mailverteiler_res) === 'array' ? $mailverteiler_res : [];
-		$mailverteiler_res = array_map(function ($element) {
-			$element->mailto = "mailto:" . $element->gruppe_kurzbz . "@" . DOMAIN;
-			return $element;
-		}, $mailverteiler_res);
-		return $mailverteiler_res;
-	}
-
-	/**
-	 * gets all the Benutzerfunktionen of a corresponding user
-	 * @access private
-	 * @param  integer $uid  the userID used to retrieve the Benutzerfunktionen 
-	 * @return array returns the Benutzerfunktionen corresponding to a userID 
-	 */
-	private function getBenutzerFunktion($uid)
-	{
-		$this->BenutzerfunktionModel->addSelect(["tbl_benutzerfunktion.bezeichnung as Bezeichnung", "tbl_organisationseinheit.bezeichnung as Organisationseinheit", "datum_von as Gültig_von", "datum_bis as Gültig_bis", "wochenstunden as Wochenstunden"]);
-		$this->BenutzerfunktionModel->addJoin("tbl_organisationseinheit", "oe_kurzbz");
-
-		$benutzer_funktion_res = $this->BenutzerfunktionModel->loadWhere(array('uid' => $uid));
-		$benutzer_funktion_res = $this->getDataOrTerminateWithError($benutzer_funktion_res);
-		return $benutzer_funktion_res;
-	}
-
-	/**
-	 * gets all the Betriebsmittel of a corresponding user
-	 * @access private
-	 * @param  integer $uid  the userID used to retrieve the Betriebsmittel 
-	 * @return array returns the Betriebsmittel corresponding to a userID 
-	 */
-	private function getBetriebsmittelInfo($pid)
-	{
-		$this->BetriebsmittelpersonModel->addSelect(["CONCAT(betriebsmitteltyp, ' ' ,beschreibung) as Betriebsmittel", "nummer as Nummer", "ausgegebenam as Ausgegeben_am"]);
-
-		//? betriebsmittel are not needed in a view
-		$betriebsmittelperson_res = $this->BetriebsmittelpersonModel->getBetriebsmittel($pid);
-		$betriebsmittelperson_res = $this->getDataOrTerminateWithError($betriebsmittelperson_res);
-		return $betriebsmittelperson_res;
-	}
-
-	/**
-	 * gets the alias of a corresponding user
-	 * @access private
-	 * @param  integer $uid the userID used to get the alias
-	 * @return string the alias of the userID
-	 */
-	private function getBenutzerAlias($uid)
-	{
-		$this->BenutzerModel->addSelect(["alias"]);
-		$benutzer_res = $this->BenutzerModel->load([$uid]);
-		$benutzer_res = $this->getDataOrTerminateWithError($benutzer_res);
-		$benutzer_res = $benutzer_res ? current($benutzer_res) : null;
-			
-		return $benutzer_res;
-	}
-
-	/**
-	 * gets the person information corresponding to a user
-	 * @access private
-	 * @param  integer $uid the userID used to get the person information
-	 * @param  integer $geburtsInfo flag wether to add the columns gebort, gebdatum, foto_sperre or not
-	 * @return array all the person informaion corresponding to a userID
-	 */
-	private function getPersonInfo($uid, $geburtsInfo = null)
-	{
-		$selectClause = ["foto", "foto_sperre", "anrede", "titelpost as postnomen", "titelpre as titel", "vorname", "nachname"];
-		/** @param integer $geburtsInfo */
-		if ($geburtsInfo) {
-			array_push($selectClause, "gebort");
-			array_push($selectClause, "TO_CHAR(gebdatum, 'DD.MM.YYYY') as gebdatum");
-		}
-		$this->BenutzerModel->addSelect($selectClause);
-		$this->BenutzerModel->addJoin("tbl_person", "person_id");
-
-		$person_res = $this->BenutzerModel->load([$uid]);
-		$person_res = $this->getDataOrTerminateWithError($person_res);
-		$person_res = $person_res ? current($person_res) : null;
-
-		if( ($person_res->foto === null) || (($this->uid !== $uid) && ($person_res->foto_sperre !== false)) )
-		{
-			$dummy_foto = base64_encode(file_get_contents(DOC_ROOT.'skin/images/profilbild_dummy.jpg'));
-			$person_res->foto = $dummy_foto;
-		}
-
-		return $person_res;
-	}
-
-	/**
-	 * gets the mitarbeiter information corresponding to a user
-	 * @access private
-	 * @param  integer $uid the userID used to get the mitarbeiter information
-	 * @return array all the mitarbeiter informaion corresponding to a userID
-	 */
-	private function getMitarbeiterInfo($uid)
-	{
-		$this->MitarbeiterModel->addSelect(["kurzbz", "telefonklappe", "alias", "ort_kurzbz"]);
-		$this->MitarbeiterModel->addJoin("tbl_benutzer", "tbl_benutzer.uid = tbl_mitarbeiter.mitarbeiter_uid");
-		$mitarbeiter_res = $this->MitarbeiterModel->load($uid);
-		$mitarbeiter_res = $this->getDataOrTerminateWithError($mitarbeiter_res);
-		$mitarbeiter_res = $mitarbeiter_res ? current($mitarbeiter_res) : null;
-
-		return $mitarbeiter_res;
-	}
-
-	/**
-	 * gets the telefon information corresponding to a user
-	 * @access private
-	 * @param  integer $uid the userID used to get the telefon information
-	 * @return array all the telefon informaion corresponding to a userID
-	 */
-	private function getTelefonInfo($uid)
-	{
-		$this->MitarbeiterModel->addSelect(["kontakt"]);
-		$this->MitarbeiterModel->addJoin("tbl_kontakt", "tbl_mitarbeiter.standort_id = tbl_kontakt.standort_id");
-		$this->MitarbeiterModel->addLimit(1);
-		$telefon_res = $this->MitarbeiterModel->loadWhere(["mitarbeiter_uid" => $uid, "kontakttyp" => "telefon"]);
-		$telefon_res = $this->getDataOrTerminateWithError($telefon_res);
-		$telefon_res = $telefon_res ? current($telefon_res) : null;
-		return $telefon_res;
-	}
-
-	/**
-	 * gets the student information corresponding to a user
-	 * @access private
-	 * @param  integer $uid the userID used to get the student information
-	 * @return array all the student informaion corresponding to a userID
-	 */
-	private function getStudentInfo($uid)
-	{
-		$this->StudentModel->addSelect(['tbl_studiengang.bezeichnung as studiengang', 'tbl_studiengang.studiengang_kz as studiengang_kz', 'tbl_student.semester', 'tbl_student.verband', 'tbl_student.gruppe', 'tbl_student.matrikelnr as personenkennzeichen']);
-		$this->StudentModel->addJoin('tbl_studiengang', "tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz");
-
-		$student_res = $this->StudentModel->load([$uid]);
-		
-		$student_res = $this->getDataOrTerminateWithError($student_res);
-		$student_res = $student_res ? current($student_res) : null;
-		return $student_res;
-	}
-
-	/**
-	 * gets the profil updates corresponding to a user
-	 * @access private
-	 * @param  integer $uid the userID used to get the profil updates
-	 * @return array all the profil updates corresponding to a userID
-	 */
-	private function getProfilUpdates($uid)
-	{
-		$profilUpdates = $this->ProfilUpdateModel->getProfilUpdatesWhere(['uid' => $uid]);
-		$profilUpdates = $this->getDataOrTerminateWithError($profilUpdates);
-		return $profilUpdates;
-	}
-
-	/**
-	 * gets the Matrikelnummer corresponding to a user
-	 * @access private
-	 * @param  integer $uid the userID used to get the Matrikelnummer
-	 * @return integer the Matrikelnummer corresponding to a userID
-	 */
-	private function getMatrikelNummer($uid)
-	{
-		$this->BenutzerModel->addSelect(["matr_nr"]);
-		$this->BenutzerModel->addJoin("tbl_person", "person_id");
-
-		$matr_res = $this->BenutzerModel->load([$uid]);
-		
-		$matr_res = $this->getDataOrTerminateWithError($matr_res);
-		$matr_res = $matr_res ? current($matr_res) : [];
-		return $matr_res;
-	}
-
-	/**
-	 * gets the Zutrittsgruppen corresponding to a user
-	 * @access private
-	 * @param  integer $uid the userID used to get the Zutrittsgruppen
-	 * @return array all the Zutrittsgruppen corresponding to a userID
-	 */
-	private function getZutrittsgruppen($uid)
-	{
-		$this->BenutzergruppeModel->addSelect(['bezeichnung']);
-		$this->BenutzergruppeModel->addJoin('tbl_gruppe', 'gruppe_kurzbz');
-
-		$zutrittsgruppe_res = $this->BenutzergruppeModel->loadWhere(array("uid" => $uid, "zutrittssystem" => true));
-		$zutrittsgruppe_res = $this->getDataOrTerminateWithError($zutrittsgruppe_res);
-		return $zutrittsgruppe_res;
-	}
-
-	/**
-	 * gets the address information corresponding to a user
-	 * @access private
-	 * @param  integer $uid the userID used to get the address information
-	 * @return array all the address information corresponding to a userID
-	 */
-	private function getAdressenInfo($pid)
-	{
-		$adresse_res = $this->AdresseModel->addSelect(["adresse_id", "strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort", "zustelladresse", "gemeinde", "nation"]);
-		$adresse_res = $this->AdresseModel->addOrder("zustelladresse", "DESC");
-		$adresse_res = $this->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz");
-
-		$adresse_res = $this->AdresseModel->loadWhere(["person_id" => $pid]);
-		$adresse_res = $this->getDataOrTerminateWithError($adresse_res);
-		return $adresse_res;
-	}
-
-	/**
-	 * gets the kontakt information corresponding to a user
-	 * @access private
-	 * @param  integer $uid the userID used to get the kontakt information
-	 * @return array all the kontakt information corresponding to a userID
-	 */
-	private function getKontaktInfo($pid)
-	{
-		$this->KontaktModel->addSelect(['kontakttyp', 'kontakt_id', 'kontakt', 'tbl_kontakt.anmerkung', 'tbl_kontakt.zustellung']);
-		$this->KontaktModel->addJoin('public.tbl_standort', 'standort_id', 'LEFT');
-		$this->KontaktModel->addJoin('public.tbl_firma', 'firma_id', 'LEFT');
-		$this->KontaktModel->addOrder('kontakttyp, kontakt, tbl_kontakt.updateamum, tbl_kontakt.insertamum');
-
-		$kontakte_res = $this->KontaktModel->loadWhere(['person_id' => $pid]);
-		$kontakte_res = $this->getDataOrTerminateWithError($kontakte_res);
-		return $kontakte_res;
-	}
-
-	/**
-	 * gets the date of issue of the FH access card corresponding to a user
-	 * @access private
-	 * @param  integer $uid the userID used to get the date of issue of the FH access card
-	 * @return string the date of issue of the FH access card corresponding to a userID
-	 */
-	private function getZutrittskarteDatum($uid)
-	{
-		$zutrittskarte_ausgegebenam = $this->BetriebsmittelpersonModel->getBetriebsmittelByUid($uid, "Zutrittskarte");
-		
-		$zutrittskarte_ausgegebenam = $this->getDataOrTerminateWithError($zutrittskarte_ausgegebenam);
-		$zutrittskarte_ausgegebenam = $zutrittskarte_ausgegebenam ? current($zutrittskarte_ausgegebenam)->ausgegebenam : null;
-		
-		//? formats date from 01-01-2000 to 01.01.2000
-		$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
-		return $zutrittskarte_ausgegebenam;
-	}
-
-	/**
-	 * checks whether the foto of a user is accepted or not
-	 * @access private
-	 * @param  integer $pid the personId of the student or mitarbeiter
-	 * @return bool whether the foto is accepted or not
-	 */
-	private function isFotoAkzeptiert($pid)
-	{
-		$this->load->model('person/Fotostatusperson_model','FotostatusModel');
-		$fotostatus = $this->FotostatusModel->execReadOnlyQuery("
-		select distinct on (person_id) person_id, insertamum, fotostatus_kurzbz
-		from public.tbl_person_fotostatus
-		where person_id = ? 
-		order by person_id, insertamum desc",[$pid]);
-		$fotostatus = $this->getDataOrTerminateWithError($fotostatus);
-		if(is_array($fotostatus) && count($fotostatus) > 0){
-			$fotostatus = current($fotostatus)->fotostatus_kurzbz == 'akzeptiert';
-		}
-		else
-			$fotostatus = false;
-		return $fotostatus;
-	}
+	
 }
 
diff --git a/public/js/api/factory/profil.js b/public/js/api/factory/profil.js
index 49d0263c6..1d884c714 100644
--- a/public/js/api/factory/profil.js
+++ b/public/js/api/factory/profil.js
@@ -16,16 +16,15 @@
  */
 
 export default {
-	getView(uid) {
-		return {
-			method: 'get',
-			url: `/api/frontend/v1/Profil/getView/${uid}`
-		};
-	},
+	
 	profilViewData(uid) {
+		let url = "/api/frontend/v1/Profil/profilViewData";
+		if(uid){
+			url += `/${uid}`;
+		}
 		return {
 			method: 'get',
-			url: `/api/frontend/v1/Profil/profilViewData/${uid}`
+			url: url
 		};
 	},
 	fotoSperre(value) {

From 28e42163a1f92e37040446f523861813b312c863 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 11 Jul 2025 11:10:35 +0200
Subject: [PATCH 358/572] fix(Profil fotoStatus): changes how fotoStatus is
 evaluated for different views

---
 application/libraries/ProfilLib.php                            | 3 ++-
 data-                                                          | 0
 fotoStatus                                                     | 0
 public/js/components/Cis/Profil/MitarbeiterProfil.js           | 2 +-
 public/js/components/Cis/Profil/MitarbeiterViewProfil.js       | 2 +-
 .../Cis/Profil/ProfilComponents/ProfilInformation.js           | 2 +-
 public/js/components/Cis/Profil/StudentProfil.js               | 2 +-
 public/js/components/Cis/Profil/StudentViewProfil.js           | 2 +-
 8 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 data-
 create mode 100644 fotoStatus

diff --git a/application/libraries/ProfilLib.php b/application/libraries/ProfilLib.php
index 17d2218ad..70a8717db 100644
--- a/application/libraries/ProfilLib.php
+++ b/application/libraries/ProfilLib.php
@@ -34,6 +34,7 @@ class ProfilLib{
 				$res->data = $this->studentProfil();
 				$res->data->pid = getAuthPersonId();
 			}
+			$res->data->fotoStatus=$this->isFotoAkzeptiert(getAuthPersonId());
 		}
 		// UID is availabe when accessing Profil/View/:uid
 		else {
@@ -53,7 +54,7 @@ class ProfilLib{
 				$res->data = $this->viewStudentProfil($uid);
 			}
 		}
-		$res->data->fotoStatus=$this->isFotoAkzeptiert(getAuthPersonId());
+		
 		return success($res);
 	}
 
diff --git a/data- b/data-
new file mode 100644
index 000000000..e69de29bb
diff --git a/fotoStatus b/fotoStatus
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 873984c1b..8eaae6dd9 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -216,7 +216,7 @@ export default {
 
 	computed: {
 		fotoStatus() {
-			return this.data?.fotoStatus ?? false;
+			return this.data?.fotoStatus ?? null;
 		},
 		getTelefonValue() {
 			if(this.data.standort_telefon?.kontakt) {
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 4d2b080b6..c1ce4ead6 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -111,7 +111,7 @@ export default {
 			}
 		},
 		fotoStatus() {
-			return this.data?.fotoStatus ?? false;
+			return this.data?.fotoStatus ?? null;
 		},
 
 		personEmails() {
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index 438b3cca8..5dd4a6969 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -93,7 +93,7 @@ export default {
                         <div v-if="isEditable" role="button" @click.prevent="sperre_foto_function" class="image-lock">
                             <i :class="{'fa':true, ...(FotoSperre?{'fa-lock':true}:{'fa-lock-open':true})} "></i>
                         </div>
-						<div v-if="!fotoStatus" role="button" @click.prevent="showModal" class="image-upload">
+						<div v-if="fotoStatus != null && !fotostatus" role="button" @click.prevent="showModal" class="image-upload">
                             <i class="fa fa-upload"></i>
                         </div>
                     </div>
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 480130cbb..cc0068411 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -165,7 +165,7 @@ export default {
 	computed: {
 		
 		fotoStatus() {
-			return this.data?.fotoStatus ?? false;
+			return this.data?.fotoStatus ?? null;
 		},
 
 		filteredEditData() {
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index ccc55362e..2ce649dae 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -27,7 +27,7 @@ export default {
 
 	computed: {
 		fotoStatus() {
-			return this.data?.fotoStatus ?? false;
+			return this.data?.fotoStatus ?? null;
 		},
 		profilInformation() {
 			if (!this.data) {

From 31fbaaa0172efb36e9a8cf45eb264ff58a21bce6 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 11 Jul 2025 11:30:13 +0200
Subject: [PATCH 359/572] remove unnessecary 0byte files

---
 data-      | 0
 fotoStatus | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 data-
 delete mode 100644 fotoStatus

diff --git a/data- b/data-
deleted file mode 100644
index e69de29bb..000000000
diff --git a/fotoStatus b/fotoStatus
deleted file mode 100644
index e69de29bb..000000000

From 1bf49ad7ab7363e8fae9e050ece7adf98e32b86c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 11 Jul 2025 11:50:15 +0200
Subject: [PATCH 360/572] fix(Profillib): data handling fix

---
 application/libraries/ProfilLib.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/application/libraries/ProfilLib.php b/application/libraries/ProfilLib.php
index 70a8717db..2a130d263 100644
--- a/application/libraries/ProfilLib.php
+++ b/application/libraries/ProfilLib.php
@@ -15,6 +15,7 @@ class ProfilLib{
 		// loading required models
 		$this->ci->load->model("ressource/Mitarbeiter_model","MitarbeiterModel");
 		$this->ci->load->model("person/Person_model","PersonModel");
+
 		$res = new stdClass();
 
 		// checking the uid
@@ -44,7 +45,6 @@ class ProfilLib{
 				return error(getData($isMitarbeiter));
 			}
 			$isMitarbeiter = getData($isMitarbeiter);
-			$isMitarbeiter = $isMitarbeiter ? current($isMitarbeiter) : false;
 			if ($isMitarbeiter) {
 				$res->view = "ViewMitarbeiterProfil";
 				$res->data = $this->viewMitarbeiterProfil($uid);
@@ -536,9 +536,14 @@ class ProfilLib{
 	 */
 	private function getBenutzerAlias($uid)
 	{
-		$this->BenutzerModel->addSelect(["alias"]);
-		$benutzer_res = $this->BenutzerModel->load([$uid]);
-		$benutzer_res = $this->getDataOrTerminateWithError($benutzer_res);
+		$this->ci->load->model("person/Benutzer_model","BenutzerModel");
+		$this->ci->BenutzerModel->addSelect(["alias"]);
+		$benutzer_res = $this->ci->BenutzerModel->load([$uid]);
+		if(isError($benutzer_res)){
+			return error(getData($benutzer_res));
+		}
+
+		$benutzer_res = getData($benutzer_res);
 		$benutzer_res = $benutzer_res ? current($benutzer_res) : null;
 			
 		return $benutzer_res;

From 22afddc2ae6f7682034ce02f70b010b11242e6d5 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 11 Jul 2025 14:21:56 +0200
Subject: [PATCH 361/572] add changes for detail header of Vertragsverwaltung

---
 .../api/frontend/v1/vertraege/Vertraege.php   | 720 ++++++++++++++++++
 public/js/api/factory/detailHeader.js         |   4 +-
 .../components/DetailHeader/DetailHeader.js   |   7 +-
 3 files changed, 726 insertions(+), 5 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/vertraege/Vertraege.php

diff --git a/application/controllers/api/frontend/v1/vertraege/Vertraege.php b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
new file mode 100644
index 000000000..bb14bc511
--- /dev/null
+++ b/application/controllers/api/frontend/v1/vertraege/Vertraege.php
@@ -0,0 +1,720 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+
+class Vertraege extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'getAllVertraege' => ['vertrag/mitarbeiter:r'],
+			'getAllContractsNotAssigned' => ['vertrag/mitarbeiter:r'],
+			'getAllContractsAssigned' => ['vertrag/mitarbeiter:r'],
+			'getAllContractTypes' =>  ['vertrag/mitarbeiter:r'],
+			'getAllContractStati' =>  ['vertrag/mitarbeiter:r'],
+			'getStatiOfContract' =>  ['vertrag/mitarbeiter:r'],
+			'loadContract' => ['vertrag/mitarbeiter:r'],
+			'loadContractStatus' => ['vertrag/mitarbeiter:r'],
+			'updateContract' =>['vertrag/mitarbeiter:w'],
+			'addNewContract' =>['vertrag/mitarbeiter:w'],
+			'deleteContract' =>['vertrag/mitarbeiter:w'],
+			'insertContractStatus' =>['vertrag/mitarbeiter:w'],
+			'deleteContractStatus' =>['vertrag/mitarbeiter:w'],
+			'updateContractStatus' =>['vertrag/mitarbeiter:w'],
+			'deleteLehrauftrag' =>['vertrag/mitarbeiter:w'],
+			'deleteBetreuung' =>['vertrag/mitarbeiter:w'],
+			'getMitarbeiter' => ['vertrag/mitarbeiter:r'],
+			'getHeader' => ['vertrag/mitarbeiter:r'],
+			'getPersonAbteilung' => ['vertrag/mitarbeiter:r'],
+			'getLeitungOrg' => ['vertrag/mitarbeiter:r'],
+		]);
+
+		//Load Models and Libraries
+		$this->load->model('accounting/Vertrag_model', 'VertragModel');
+		$this->load->model('accounting/Vertragsstatus_model', 'VertragsstatusModel');
+		$this->load->model('accounting/Vertragstyp_model', 'VertragstypModel');
+		$this->load->model('accounting/Vertragvertragsstatus_model', 'VertragvertragsstatusModel');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui',
+			'vertrag'
+		]);
+	}
+
+	public function getAllVertraege($person_id)
+	{
+		$result = $this->VertragModel->loadContractsOfPerson($person_id);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function getAllContractsNotAssigned($person_id)
+	{
+		$result = $this->VertragModel->loadContractsOfPersonNotAssigned($person_id);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function getAllContractsAssigned($person_id, $vertrag_id)
+	{
+		$result = $this->VertragModel->loadContractsOfPersonAssigned($person_id, $vertrag_id);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function getStatiOfContract($person_id, $vertrag_id)
+	{
+		//check if vertrag_id corresponds with person_id and return null if not
+		$result = $this->VertragModel->loadWhere(
+			array(
+				'vertrag_id' => $vertrag_id,
+				'person_id' => $person_id
+			)
+		);
+		if(!hasData($result))
+		{
+			$this->terminateWithSuccess([]);
+		}
+
+		$result = $this->VertragModel->getStatiOfContract($vertrag_id);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	public function getAllContractTypes()
+	{
+		$result = $this->VertragstypModel->load();
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function getAllContractStati()
+	{
+		$result = $this->VertragsstatusModel->load();
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess(getData($result) ?: []);
+	}
+
+	public function addNewContract()
+	{
+		$this->load->library('form_validation');
+
+		$person_id = $this->input->post('person_id');
+
+		if(!$person_id)
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$formData = $this->input->post('formData');
+		$vertragstyp_kurzbz = $formData['vertragstyp_kurzbz'] ?? null;
+		$vertragsdatum = $formData['vertragsdatum'] ?? null;
+		$bezeichnung = $formData['bezeichnung'] ?? null;
+		$betrag = $formData['betrag'] ?? null;
+		$vertragsstunden = $formData['vertragsstunden'] ?? null;
+		$vertragsstunden_studiensemester_kurzbz = $formData['vertragsstunden_studiensemester_kurzbz'] ?? null;
+		$anmerkung = $formData['anmerkung'] ?? null;
+
+		$this->form_validation->set_data($formData);
+		$this->form_validation->set_rules('bezeichnung', 'Bezeichnung', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Bezeichnung'])
+		]);
+
+		$this->form_validation->set_rules('vertragstyp_kurzbz', 'Vertragstyp', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Vertragstyp'])
+		]);
+		$this->form_validation->set_rules('vertragsdatum', 'Vertragsdatum', 'required|is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Vertragsdatum']),
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Vertragsdatum'])
+		]);
+		$this->form_validation->set_rules('betrag', 'Betrag', 'required|numeric', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Betrag']),
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Betrag'])
+		]);
+		$this->form_validation->set_rules('vertragsstunden', 'Stunden(Vertrags-Urfassung)', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Stunden(Vertrags-Urfassung)'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$lehrauftraege = $this->input->post('clickedRows');
+
+		$this->db->trans_start();
+
+		$result = $this->VertragModel->insert([
+			'person_id' => $person_id,
+			'vertragsdatum' => $vertragsdatum,
+			'bezeichnung' => $bezeichnung,
+			'vertragstyp_kurzbz' => $vertragstyp_kurzbz,
+			'betrag' => $betrag,
+			'vertragsstunden' => $vertragsstunden,
+			'vertragsstunden_studiensemester_kurzbz' => $vertragsstunden_studiensemester_kurzbz,
+			'anmerkung' => $anmerkung,
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID()
+		]);
+
+		$this->getDataOrTerminateWithError($result);
+		$vertrag_id = $result->retval;
+
+		$status_result = $this->VertragvertragsstatusModel->insert([
+			'vertrag_id' => $vertrag_id,
+			'uid' => getAuthUID(),
+			'vertragsstatus_kurzbz' => 'neu',
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID(),
+			'datum' => date('c')
+		]);
+
+		if (!$status_result) {
+			$this->db->trans_rollback();
+			$this->terminateWithError($this->p->t('vertrag', 'error_insertOrUpdateStatusVertrag'), self::ERROR_TYPE_GENERAL);
+		}
+
+		//Hinzufügen der Lehraufträge
+		foreach ($lehrauftraege as $row)
+		{
+			if ($row['type'] == 'Lehrauftrag')
+			{
+				$this->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
+
+				$result_lehrauftrag = $this->LehreinheitmitarbeiterModel->update(
+					[
+						'lehreinheit_id' => $row['lehreinheit_id'],
+						'mitarbeiter_uid' => $row['mitarbeiter_uid']
+					],
+					[
+						'vertrag_id' => $vertrag_id
+					]
+				);
+
+				if (!$result_lehrauftrag) {
+					$this->db->trans_rollback();
+					$this->terminateWithError($this->p->t('vertrag', 'error_addOrUpdateLehrauftraege'), self::ERROR_TYPE_GENERAL);
+				}
+			}
+
+			if ($row['type'] == 'Betreuung')
+			{
+				$this->load->model('education/Projektbetreuer_model', 'Projektbetreuermodel');
+
+				$result_projektbetreuer = $this->Projektbetreuermodel->update(
+					[
+						'person_id' => $person_id,
+						'projektarbeit_id' => $row['projektarbeit_id'],
+						'betreuerart_kurzbz' => $row['betreuerart_kurzbz']
+					],
+					[
+						'vertrag_id' => $vertrag_id
+					]
+				);
+
+				if (!$result_projektbetreuer)
+				{
+					$this->db->trans_rollback();
+					$this->terminateWithError($this->p->t('vertrag', 'error_addOrUpdateLehrauftraege'), self::ERROR_TYPE_GENERAL);
+				}
+			}
+		}
+		$this->db->trans_complete();
+		$this->terminateWithSuccess(true);
+	}
+
+	public function updateContract()
+	{
+		$this->load->library('form_validation');
+
+		$vertrag_id = $this->input->post('vertrag_id');
+		$person_id = $this->input->post('person_id');
+		$formData = $this->input->post('formData');
+		$lehrauftraege = $this->input->post('clickedRows');
+
+		$vertragstyp_kurzbz = $formData['vertragstyp_kurzbz'] ?? null;
+		$vertragsdatum = $formData['vertragsdatum'] ?? null;
+		$bezeichnung = $formData['bezeichnung'] ?? null;
+		$betrag = $formData['betrag'] ?? null;
+		$vertragsstunden = $formData['vertragsstunden'] ?? null;
+		$vertragsstunden_studiensemester_kurzbz = $formData['vertragsstunden_studiensemester_kurzbz'] ?? null;
+		$anmerkung = $formData['anmerkung'] ?? null;
+
+
+		$this->form_validation->set_data($formData);
+		$this->form_validation->set_rules('bezeichnung', 'Bezeichnung', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Bezeichnung'])
+		]);
+
+		$this->form_validation->set_rules('vertragstyp_kurzbz', 'Vertragstyp', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Vertragstyp'])
+		]);
+		$this->form_validation->set_rules('vertragsdatum', 'Vertragsdatum', 'required|is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Vertragsdatum']),
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Vertragsdatum'])
+		]);
+		$this->form_validation->set_rules('betrag', 'Betrag', 'required|numeric', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Betrag']),
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Betrag'])
+		]);
+		$this->form_validation->set_rules('vertragsstunden', 'Stunden(Vertrags-Urfassung)', 'numeric', [
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Stunden(Vertrags-Urfassung)'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$this->db->trans_start();
+
+		$result = $this->VertragModel->update(
+			$vertrag_id,
+			[
+				'person_id' => $person_id,
+				'vertragsdatum' => $vertragsdatum,
+				'bezeichnung' => $bezeichnung,
+				'vertragstyp_kurzbz' => $vertragstyp_kurzbz,
+				'betrag' => $betrag,
+				'vertragsstunden' => $vertragsstunden,
+				'vertragsstunden_studiensemester_kurzbz' => $vertragsstunden_studiensemester_kurzbz,
+				'anmerkung' => $anmerkung,
+				'updateamum' => date('c'),
+				'updatevon' => getAuthUID()
+			]
+		);
+
+		$this->getDataOrTerminateWithError($result);
+
+		//Adding of Lehraufträge
+		foreach ($lehrauftraege as $row)
+		{
+			if ($row['type'] == 'Lehrauftrag')
+			{
+				$this->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
+
+				$result_lehrauftrag = $this->LehreinheitmitarbeiterModel->update(
+					[
+						'lehreinheit_id' => $row['lehreinheit_id'],
+						'mitarbeiter_uid' => $row['mitarbeiter_uid']
+					],
+					[
+						'vertrag_id' => $vertrag_id,
+						'updateamum' => date('c'),
+						'updatevon' => getAuthUID()
+					]
+				);
+
+				if (!$result_lehrauftrag) {
+					$this->db->trans_rollback();
+					$this->terminateWithError($this->p->t('vertrag', 'error_addOrUpdateLehrauftraege'), self::ERROR_TYPE_GENERAL);
+				}
+			}
+
+			if ($row['type'] == 'Betreuung')
+			{
+				$this->load->model('education/Projektbetreuer_model', 'Projektbetreuermodel');
+
+				$result_projektbetreuer = $this->Projektbetreuermodel->update(
+					[
+						'person_id' => $person_id,
+						'projektarbeit_id' => $row['projektarbeit_id'],
+						'betreuerart_kurzbz' => $row['betreuerart_kurzbz']
+					],
+					[
+						'vertrag_id' => $vertrag_id,
+						'updateamum' => date('c'),
+						'updatevon' => getAuthUID()
+					]
+				);
+
+				if (!$result_projektbetreuer)
+				{
+					$this->db->trans_rollback();
+					$this->terminateWithError($this->p->t('vertrag', 'error_addOrUpdateLehrauftraege'), self::ERROR_TYPE_GENERAL);
+				}
+			}
+		}
+		$this->db->trans_complete();
+
+		$this->terminateWithSuccess(true);
+	}
+
+	public function loadContract($vertrag_id)
+	{
+		$result = $this->VertragModel->load($vertrag_id);
+
+		if (isError($result)) {
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+
+		if (!hasData($result)) {
+			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Vertrag_id']), self::ERROR_TYPE_GENERAL);
+		}
+
+		$this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function deleteContract($vertrag_id)
+	{
+		$this->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
+
+		//check if attached Lehrauftrag
+		$resultLehrauftrag = $this->LehreinheitmitarbeiterModel->load([
+			'vertrag_id' => $vertrag_id
+		]);
+
+		if(hasData($resultLehrauftrag))
+		{
+			$resultLehrauftrag = getData($resultLehrauftrag);
+			foreach($resultLehrauftrag as $lehrauftrag)
+			{
+				$result = $this->LehreinheitmitarbeiterModel->update(
+					[
+						'lehreinheit_id' => $lehrauftrag->lehreinheit_id,
+						'mitarbeiter_uid' => $lehrauftrag->mitarbeiter_uid,
+						'vertrag_id' => $vertrag_id
+					],
+					[
+						'vertrag_id' => null,
+						'updateamum' => date('c'),
+						'updatevon' => getAuthUID()
+					]
+				);
+
+				$this->getDataOrTerminateWithError($result);
+			}
+		}
+
+		//if attached Betreuung
+		$this->load->model('education/Projektbetreuer_model', 'Projektbetreuermodel');
+
+		//if attached Betreuung
+		$resultBetreuung = $this->Projektbetreuermodel->load([
+			'vertrag_id' => $vertrag_id
+		]);
+
+		if(hasData($resultBetreuung))
+		{
+			$resultBetreuung = getData($resultBetreuung);
+			foreach($resultBetreuung as $betreuung)
+			{
+				$result = $this->Projektbetreuermodel->update(
+					[
+						'person_id' => $betreuung->person_id,
+						'projektarbeit_id' => $betreuung->projektarbeit_id,
+						'betreuerart_kurzbz' => $betreuung->betreuerart_kurzbz,
+						'vertrag_id' => $vertrag_id
+					],
+					[
+						'vertrag_id' => null,
+						'updateamum' => date('c'),
+						'updatevon' => getAuthUID()
+
+					]
+				);
+
+				$this->getDataOrTerminateWithError($result);
+			}
+		}
+
+		$result = $this->VertragvertragsstatusModel->load([
+			'vertrag_id' => $vertrag_id
+		]);
+
+		if(hasData($result))
+		{
+			$data = getData($result);
+			foreach ($data as $item)
+			{
+				//delete all entries in lehre.tbl_vertrag_vertragsstatus
+				$result = $this->VertragvertragsstatusModel->delete([
+					'vertrag_id' => $vertrag_id,
+					'vertragsstatus_kurzbz' => $item->vertragsstatus_kurzbz,
+					'uid' => $item->uid
+				]);
+				if(isError($result))
+					$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+		}
+
+		//delete Contract
+		$result = $this->VertragModel->delete(
+			array('vertrag_id' => $vertrag_id,
+			)
+		);
+
+		if (isError($result)) {
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result)) {
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Vertrag_id']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function insertContractStatus()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('vertragsstatus_kurzbz', 'vertragsstatus_kurzbz', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'vertragsstatus_kurzbz'])
+		]);
+		$this->form_validation->set_rules('datum', 'Datum', 'required|is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Datum']),
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Datum'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$result = $this->VertragvertragsstatusModel->loadWhere(
+            array(
+                'vertrag_id' => $this->input->post('vertrag_id'),
+                'vertragsstatus_kurzbz' => $this->input->post('vertragsstatus_kurzbz')
+            )
+        );
+
+        if (hasData($result))
+		{
+			$this->terminateWithError($this->p->t('vertrag', 'error_statusVorhanden'), self::ERROR_TYPE_GENERAL);
+        }
+
+		$status_result = $this->VertragvertragsstatusModel->insert([
+			'vertrag_id' => $this->input->post('vertrag_id'),
+			'uid' => getAuthUID(),
+			'vertragsstatus_kurzbz' => $this->input->post('vertragsstatus_kurzbz'),
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID(),
+			'datum' => $this->input->post('datum')
+		]);
+
+		if (!$status_result) {
+			$this->terminateWithError('Fehler beim Hinzufügen des Vertragsstatus.');
+		}
+
+		return $this->terminateWithSuccess(current(getData($status_result)));
+	}
+
+	public function deleteContractStatus()
+	{
+		$status = $this->input->post('vertragsstatus_kurzbz');
+		$vertrag_id = $this->input->post('vertrag_id');
+
+		$result = $this->VertragvertragsstatusModel->delete(
+			array(
+				'vertrag_id' => $vertrag_id,
+				'vertragsstatus_kurzbz' => $status
+			)
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'vertragsstatus_kurzb']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function loadContractStatus()
+	{
+		$status = $this->input->get('vertragsstatus_kurzbz');
+		$vertrag_id = $this->input->get('vertrag_id');
+
+		$result = $this->VertragvertragsstatusModel->loadWhere(
+			array(
+				'vertrag_id' => $vertrag_id,
+				'vertragsstatus_kurzbz' => $status
+			)
+		);
+		if (!$result) {
+			$this->terminateWithError('Status not existing');
+		}
+		return $this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function updateContractStatus()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('vertragsstatus_kurzbz', 'vertragsstatus_kurzbz', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'vertragsstatus_kurzbz'])
+		]);
+		$this->form_validation->set_rules('datum', 'Datum', 'required|is_valid_date', [
+			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Datum']),
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Datum'])
+		]);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$status_result = $this->VertragvertragsstatusModel->update(
+			[
+				'vertrag_id' => $this->input->post('vertrag_id'),
+				'vertragsstatus_kurzbz' => $this->input->post('vertragsstatus_kurzbz')
+			],
+			[
+				'uid' => getAuthUID(),
+				'updateamum' => date('c'),
+				'updatevon' => getAuthUID(),
+				'datum' => $this->input->post('datum')
+			]
+		);
+
+		if (!$status_result) {
+			$this->terminateWithError('Fehler beim Updaten des Vertragsstatus.');
+		}
+
+		return $this->terminateWithSuccess(current(getData($status_result)));
+	}
+
+	public function deleteLehrauftrag()
+	{
+		$lehreinheit_id = $this->input->post('lehreinheit_id');
+		$mitarbeiter_uid = $this->input->post('mitarbeiter_uid');
+		$vertrag_id = $this->input->post('vertrag_id');
+
+		$this->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
+
+		//kein delete: ein update, bei dem die vertrag_id auf null gesetzt wird
+		$result = $this->LehreinheitmitarbeiterModel->update(
+			[
+				'lehreinheit_id' => $lehreinheit_id,
+				'mitarbeiter_uid' => $mitarbeiter_uid,
+				'vertrag_id' => $vertrag_id
+			],
+			[
+				'vertrag_id' => null,
+				'updateamum' => date('c'),
+				'updatevon' => getAuthUID()
+			]
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Id_Lehrauftrag']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function deleteBetreuung()
+	{
+		$person_id= $this->input->post('person_id');
+		$projektarbeit_id = $this->input->post('projektarbeit_id');
+		$betreuerart_kurzbz = $this->input->post('betreuerart_kurzbz');
+		$vertrag_id = $this->input->post('vertrag_id');
+
+		$this->load->model('education/Projektbetreuer_model', 'Projektbetreuermodel');
+
+		$result = $this->Projektbetreuermodel->update(
+			[
+				'person_id' => $person_id,
+				'projektarbeit_id' => $projektarbeit_id,
+				'betreuerart_kurzbz' => $betreuerart_kurzbz,
+				'vertrag_id' => $vertrag_id
+			],
+			[
+				'vertrag_id' => null,
+				'updateamum' => date('c'),
+				'updatevon' => getAuthUID()
+			]
+		);
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result))
+		{
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id' => 'Id_Projektbetreuung']), self::ERROR_TYPE_GENERAL);
+		}
+		return $this->terminateWithSuccess(current(getData($result)));
+	}
+
+	public function getMitarbeiter()
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getPersonenWithContractDetails();
+
+		if (isError($result))
+		{
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		if (!hasData($result))
+		{
+			//return data before PV21 (with filter fix angestellt, active and with bisverwendung)
+			$result = $this->Mitarbeitermodel->getPersonal(true, true, true);
+			if (isError($result))
+			{
+				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			}
+		}
+		return $this->terminateWithSuccess(getData($result));
+	}
+
+	public function getPersonAbteilung($mitarbeiter_uid)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getPersonAbteilung($mitarbeiter_uid);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function getLeitungOrg($oekurzbz)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getLeitungOrg($oekurzbz);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function getHeader($person_id)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getHeader($person_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+}
diff --git a/public/js/api/factory/detailHeader.js b/public/js/api/factory/detailHeader.js
index f9f368bc7..74563bd4b 100644
--- a/public/js/api/factory/detailHeader.js
+++ b/public/js/api/factory/detailHeader.js
@@ -22,10 +22,10 @@ export default {
 			url: 'api/frontend/v1/vertraege/vertraege/getHeader/' + person_id,
 		};
 	},
-	getPersonAbteilung(person_id){
+	getPersonAbteilung(mitarbeiter_uid){
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/vertraege/vertraege/getPersonAbteilung/' + person_id,
+			url: 'api/frontend/v1/vertraege/vertraege/getPersonAbteilung/' + mitarbeiter_uid,
 		};
 	},
 	getLeitungOrg(oekurzbz){
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 4cf2571a8..6014faadd 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -42,7 +42,7 @@ export default {
 		if(this.person_id) {
 			this.getHeader(this.person_id);
 
-			this.loadDepartmentData(this.person_id)
+			this.loadDepartmentData(this.mitarbeiter_uid)
 				.then(() => {
 					// Call getLeitungOrg only after departmentData is loaded
 					this.getLeitungOrg(this.departmentData.oe_kurzbz);
@@ -83,9 +83,9 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		loadDepartmentData(person_id) {
+		loadDepartmentData(mitarbeiter_uid) {
 			return this.$api
-				.call(ApiDetailHeader.getPersonAbteilung(person_id))
+				.call(ApiDetailHeader.getPersonAbteilung(mitarbeiter_uid))
 				.then(result => {
 					this.departmentData = result.data;
 				})
@@ -106,6 +106,7 @@ export default {
 	},
 	template: `
 		<div class="core-header d-flex justify-content-start align-items-center w-100 overflow-auto pb-3 gap-3" style="max-height:9rem; min-width: 37.5rem;">
+
 			<template v-if="typeHeader==='student'">
 					<div
 						v-for="person in headerData"

From c89b88ec1b8c9f0f625ee7fdb38221d9e7eb440e Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 11 Jul 2025 17:46:54 +0200
Subject: [PATCH 362/572] prevent loading huge list of lvs when deleting an lv

---
 vilesci/lehre/lehrveranstaltung.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vilesci/lehre/lehrveranstaltung.php b/vilesci/lehre/lehrveranstaltung.php
index 25fe143b6..dfe399e77 100644
--- a/vilesci/lehre/lehrveranstaltung.php
+++ b/vilesci/lehre/lehrveranstaltung.php
@@ -550,6 +550,8 @@ if($orgform_kurzbz != -1)
 
 if($lehrveranstaltung_id != '')
 	$sql_query.= " AND tbl_lehrveranstaltung.lehrveranstaltung_id=".$db->db_add_param($lehrveranstaltung_id, FHC_INTEGER);
+elseif(isset($_GET['delete_lvid']))
+	$sql_query.= " AND tbl_lehrveranstaltung.lehrveranstaltung_id=".$db->db_add_param(intval($_GET['delete_lvid']), FHC_INTEGER);
 
 if($lehrveranstaltung_name != '')
 {

From 9d341cc04570cf2308d5f63e59cb1bc29d7318c1 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 14 Jul 2025 10:23:05 +0200
Subject: [PATCH 363/572] getFunction for Student: restrict select attributes
 for person, update mitarbeiter model

---
 .../api/frontend/v1/stv/Student.php           |  14 +-
 .../models/ressource/Mitarbeiter_model.php    | 191 ++++++++++++++----
 2 files changed, 170 insertions(+), 35 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index ce2e2df8d..10b972a45 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -74,7 +74,19 @@ class Student extends FHCAPI_Controller
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
-		$this->PrestudentModel->addSelect('p.*');
+		$this->PrestudentModel->addSelect('p.person_id');
+		$this->PrestudentModel->addSelect('p.titelpre');
+		$this->PrestudentModel->addSelect('p.nachname');
+		$this->PrestudentModel->addSelect('p.vorname');
+		$this->PrestudentModel->addSelect('p.wahlname');
+		$this->PrestudentModel->addSelect('p.vornamen');
+		$this->PrestudentModel->addSelect('p.titelpost');
+		$this->PrestudentModel->addSelect('p.svnr');
+		$this->PrestudentModel->addSelect('p.ersatzkennzeichen');
+		$this->PrestudentModel->addSelect('p.gebdatum');
+		$this->PrestudentModel->addSelect('p.geschlecht');
+		$this->PrestudentModel->addSelect('p.foto');
+		$this->PrestudentModel->addSelect('p.foto_sperre');
 		$this->PrestudentModel->addSelect('s.student_uid');
 		$this->PrestudentModel->addSelect('matrikelnr');
 		$this->PrestudentModel->addSelect('b.aktiv');
diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php
index 2b652c65b..bf4672070 100644
--- a/application/models/ressource/Mitarbeiter_model.php
+++ b/application/models/ressource/Mitarbeiter_model.php
@@ -12,34 +12,34 @@ class Mitarbeiter_model extends DB_Model
 		$this->pk = 'mitarbeiter_uid';
 	}
 
-    /**
-     * Checks if the user is a Mitarbeiter.
-     * @param string $uid
-     * @param boolean null $fixangestellt
-     * @return array
-     */
-    public function isMitarbeiter($uid, $fixangestellt = null)
-    {
-        $this->addSelect('1');
+	/**
+	 * Checks if the user is a Mitarbeiter.
+	 * @param string $uid
+	 * @param boolean null $fixangestellt
+	 * @return array
+	 */
+	public function isMitarbeiter($uid, $fixangestellt = null)
+	{
+		$this->addSelect('1');
 
-        if (is_bool($fixangestellt))
-        {
-            $result = $this->loadWhere(array('mitarbeiter_uid' => $uid, 'fixangestellt' => $fixangestellt));
-        }
-        else    // default
-        {
-            $result = $this->loadWhere(array('mitarbeiter_uid' => $uid));
-        }
+		if (is_bool($fixangestellt))
+		{
+			$result = $this->loadWhere(array('mitarbeiter_uid' => $uid, 'fixangestellt' => $fixangestellt));
+		}
+		else    // default
+		{
+			$result = $this->loadWhere(array('mitarbeiter_uid' => $uid));
+		}
 
-        if(hasData($result))
-        {
-            return success(true);
-        }
-        else
-        {
-            return success(false);
-        }
-    }
+		if(hasData($result))
+		{
+			return success(true);
+		}
+		else
+		{
+			return success(false);
+		}
+	}
 
 	/**
 	 * Laedt das Personal
@@ -98,6 +98,129 @@ class Mitarbeiter_model extends DB_Model
 		return $this->execQuery($qry, $params);
 	}
 
+	/**
+	 * gibt Personen mit Übersicht von Vertragsdaten aus
+	 *
+	 * @return array
+	 */
+	public function getPersonenWithContractDetails($person_id = null)
+	{
+		$qry = "
+			SELECT
+				b.uid , p.person_id,
+				p.vorname, p.nachname,
+				gebdatum,
+				COALESCE(b.alias, b.uid) AS email,
+				STRING_AGG(DISTINCT va.bezeichnung, ', ') AS Vertragsarten,
+				STRING_AGG(DISTINCT u.bezeichnung, ', ') AS Unternehmen,
+				STRING_AGG(d.dienstverhaeltnis_id::TEXT, ', ') AS ids,
+				b.aktiv
+				FROM
+					hr.tbl_dienstverhaeltnis d
+				JOIN
+					public.tbl_benutzer b ON d.mitarbeiter_uid = b.uid
+				JOIN
+					public.tbl_person p ON p.person_id = b.person_id
+				JOIN
+					public.tbl_organisationseinheit u ON d.oe_kurzbz = u.oe_kurzbz
+				JOIN
+					hr.tbl_vertragsart va ON d.vertragsart_kurzbz = va.vertragsart_kurzbz
+			";
+
+		if($person_id)
+		{
+			$qry .= " WHERE p.person_id = ?";
+		}
+
+		$qry.= "
+			GROUP BY
+				b.uid, p.person_id, p.vorname, p.nachname, b.alias
+			ORDER BY
+					p.nachname, p.vorname;
+			";
+
+		$params = array($person_id);
+
+		return $this->execQuery($qry, $params);
+	}
+
+	/**
+	 * get current disciplinary Abteilung of person
+	 *
+	 * @param $person_id
+	 *
+	 * @return Array benutzerfunktionsdata
+	 */
+	public function getPersonAbteilung($uid)
+	{
+		$qry = "
+			SELECT
+				bf.benutzerfunktion_id, bf.fachbereich_kurzbz, bf.uid, bf.funktion_kurzbz, bf.updateamum,
+				bf.updatevon, bf.insertamum, bf.insertvon, bf.ext_id, bf.semester, bf.oe_kurzbz,
+				bf.datum_von, bf.datum_bis, bf.bezeichnung, bf.wochenstunden,
+				oe.oe_kurzbz, oe.oe_parent_kurzbz, oe.bezeichnung,
+				oe.organisationseinheittyp_kurzbz, oe.aktiv, oe.mailverteiler,
+				oe.freigabegrenze, oe.kurzzeichen, oe.lehre, oe.standort,
+				oe.warn_semesterstunden_frei, oe.warn_semesterstunden_fix, oe.standort_id
+			FROM tbl_benutzerfunktion bf
+			JOIN public.tbl_organisationseinheit oe USING(oe_kurzbz)
+			WHERE uid = ?
+				AND funktion_kurzbz = 'oezuordnung'
+				AND datum_von <= NOW()
+				AND (datum_bis IS NULL OR datum_bis >= NOW())
+		";
+		$result = $this->execQuery($qry, [$uid]);
+
+		return $result;
+	}
+
+	/**
+	 * get Leitung / Vorgesetzten of current OE
+	 *
+	 * @param $oe_kurzbz
+	 *
+	 * @return Array persondata / benutzerfunktionsdata
+	 */
+	public function getLeitungOrg($oe_kurzbz)
+	{
+		$qry = "
+            SELECT bf.benutzerfunktion_id,bf.fachbereich_kurzbz,bf.uid,bf.funktion_kurzbz,
+				bf.updateamum,bf.updatevon,bf.insertamum,bf.insertvon,bf.ext_id,bf.semester,
+				bf.oe_kurzbz,bf.datum_von,bf.datum_bis,bf.bezeichnung,bf.wochenstunden,
+				p.person_id, p.vorname,p.nachname,p.titelpre,p.titelpost
+            FROM public.tbl_benutzerfunktion bf JOIN public.tbl_organisationseinheit oe USING(oe_kurzbz)
+            JOIN public.tbl_benutzer b USING (uid) JOIN public.tbl_mitarbeiter ma ON(b.uid=ma.mitarbeiter_uid)
+            JOIN public.tbl_person p  USING(person_id)
+            WHERE funktion_kurzbz='Leitung' AND oe.oe_kurzbz = ?
+                AND datum_von<=now() AND (datum_bis is null OR datum_bis>=now());
+        ";
+
+		return $this->execQuery($qry, array($oe_kurzbz));
+	}
+
+	/**
+	 * get persondata for person_id
+	 *
+	 * @param $oe_kurzbz
+	 *
+	 * @return Array persondata
+	 */
+	public function getHeader($person_id)
+	{
+		$qry = "
+			SELECT
+			  titelpre, vorname, nachname, titelpost, foto, foto_sperre, person_id, alias, telefonklappe
+			FROM
+				public.tbl_person
+				JOIN public.tbl_benutzer b USING(person_id)
+				JOIN public.tbl_mitarbeiter ma ON (ma.mitarbeiter_uid = b.uid)
+			WHERE
+				person_id = ?
+        ";
+
+		return $this->execQuery($qry, array($person_id));
+	}
+
 	/**
 	 * Gibt ein Array mit den UIDs der Vorgesetzten zurück
 	 * @return object
@@ -213,7 +336,7 @@ class Mitarbeiter_model extends DB_Model
 
 		if (hasData($kurzbzexists) && getData($kurzbzexists)[0])
 			return error('No Kurzbezeichnung could be generated');
-	
+
 		return success($kurzbz);
 	}
 
@@ -240,13 +363,13 @@ class Mitarbeiter_model extends DB_Model
 		$qry = "
 			SELECT " . $returnwert . "  
 			FROM 
-			    public.tbl_mitarbeiter ma 
+				public.tbl_mitarbeiter ma
 			JOIN 
-			    public.tbl_benutzer b on (ma.mitarbeiter_uid = b.uid)
+				public.tbl_benutzer b on (ma.mitarbeiter_uid = b.uid)
 			JOIN 
-			    public.tbl_person p on (p.person_id = b.person_id)
+				public.tbl_person p on (p.person_id = b.person_id)
 			WHERE 
-			    lower (p.nachname) LIKE '%". $this->db->escape_like_str($filter)."%'
+				lower (p.nachname) LIKE '%". $this->db->escape_like_str($filter)."%'
 			OR
 				lower (p.vorname) LIKE '%". $this->db->escape_like_str($filter)."%'
 			OR
@@ -264,11 +387,11 @@ class Mitarbeiter_model extends DB_Model
 	public function getMitarbeiterFromLV($lehrveranstaltung_id)
 	{
 		$qry = "SELECT DISTINCT
-    			lehrveranstaltung_id, uid, vorname, wahlname, vornamen, nachname, titelpre, titelpost, kurzbz, mitarbeiter_uid 
+				lehrveranstaltung_id, uid, vorname, wahlname, vornamen, nachname, titelpre, titelpost, kurzbz, mitarbeiter_uid 
 			FROM 
-			    lehre.tbl_lehreinheitmitarbeiter, campus.vw_mitarbeiter, lehre.tbl_lehreinheit
+				lehre.tbl_lehreinheitmitarbeiter, campus.vw_mitarbeiter, lehre.tbl_lehreinheit
 			WHERE 
-			    lehrveranstaltung_id= ?
+				lehrveranstaltung_id= ?
 			AND 
 				mitarbeiter_uid=uid 
 			AND 

From c9cced3f61f2a234aac43af6a10f3c1dc131fb8e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 14 Jul 2025 13:09:52 +0200
Subject: [PATCH 364/572] bugfix firma_id: define default as null instead of
 empty string

---
 .../Stv/Studentenverwaltung/Details/Kontakt/Address.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index ed32e2eab..d0c7fbd04 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -231,7 +231,7 @@ export default{
 			this.reload();
 		},
 		selectedFirma(newVal) {
-			this.addressData.firma_id = newVal?.firma_id || '';
+			this.addressData.firma_id = newVal?.firma_id || null;
 		}
 	},
 	methods:{

From a1fe2e1b4b407070f0de0755821514c364e552e5 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 14 Jul 2025 13:57:37 +0200
Subject: [PATCH 365/572] fix SearchLib bug, add searchtypes config studentcis
 and active_organisationunit, use new searchtype in cis4 searchoptions and
 searchbar result rendering

---
 application/config/search.php               | 19 +++++++++++++++++++
 application/libraries/SearchLib.php         |  5 +++--
 public/js/apps/Cis.js                       |  4 ++--
 public/js/components/searchbar/searchbar.js |  4 ++--
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/application/config/search.php b/application/config/search.php
index e4876ec8f..bf98d3e93 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -209,6 +209,20 @@ $config['student'] = [
 		JOIN public.tbl_person p USING(person_id)"
 ];
 
+$config['studentcis'] = $config['student'];
+unset($config['studentcis']['fields']['email']);
+$config['studentcis']['resultfields'] = [
+	"s.student_uid AS uid",
+	"s.matrikelnr",
+	"p.person_id",
+	"(p.vorname || ' ' || p.nachname) AS name",
+	"ARRAY[s.student_uid || '@' || '" . DOMAIN . "'] AS email",
+	"CASE
+		WHEN p.foto IS NOT NULL THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
+		ELSE NULL END
+		AS photo_url"
+];
+
 $config['prestudent'] = [
 	'primarykey' => 'prestudent_id',
 	'table' => 'public.tbl_prestudent',
@@ -652,6 +666,11 @@ $config['organisationunit'] = [
 			ON (oe_parent.organisationseinheittyp_kurzbz = type_parent.organisationseinheittyp_kurzbz)"
 ];
 
+$config['active_organisationunit'] = $config['organisationunit'];
+$config['active_organisationunit']['alias'] = ['aou', 'aktive organisationseinheit', 'aoe'];
+$config['active_organisationunit']['prepare'] = 'active_organisationseinheit AS (SELECT * FROM public.tbl_organisationseinheit WHERE aktiv = true)';
+$config['active_organisationunit']['table'] = 'active_organisationseinheit';
+
 $config['room'] = [
 	'alias' => ['raum'],
 	'primarykey' => 'ort_kurzbz',
diff --git a/application/libraries/SearchLib.php b/application/libraries/SearchLib.php
index f48bf7e2e..0c942c436 100644
--- a/application/libraries/SearchLib.php
+++ b/application/libraries/SearchLib.php
@@ -668,8 +668,9 @@ class SearchLib
 					SELECT " . $this->_formatPrimarykeys($table_config['primarykey']) . ", rank / " . $count . " AS rank FROM " . $current_select;
 			}
 
-			if ($or_with[0] === "RECURSIVE") {
-				if ($sqlWith[0] !== "RECURSIVE")
+			if ($or_with[0] === "RECURSIVE")
+			{
+				if (empty($sqlWith) || $sqlWith[0] !== "RECURSIVE")
 					array_unshift($sqlWith, "RECURSIVE");
 				array_shift($or_with);
 			}
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 29784b225..994efbec8 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -17,9 +17,9 @@ const app = Vue.createApp({
 				calcheightonly: true,
                 types: [
                     "employee",
-					"student",
+					"studentcis",
                     "room",
-                    "organisationunit"
+                    "active_organisationunit"
                 ],
                 actions: {
                     employee: {
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 4acdf0288..ec08dd178 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -98,12 +98,12 @@ export default {
                   <div v-else-if="searchresult.length < 1">{{  $p.t('search/error_no_results') }}</div>
                   <template v-else="" v-for="res in searchresult">
                     <person v-if="res.type === 'person'" :res="res" :actions="searchoptions.actions.person" @actionexecuted="hideresult"></person>
-                    <student v-else-if="res.type === 'student' || res.type === 'studentStv'" :mode="searchmode" :res="res" :actions="searchoptions.actions.student" @actionexecuted="hideresult"></student>
+                    <student v-else-if="res.type === 'student' || res.type === 'studentStv' || res.type === 'studentcis'" :mode="searchmode" :res="res" :actions="searchoptions.actions.student" @actionexecuted="hideresult"></student>
                     <prestudent v-else-if="res.type === 'prestudent'" :mode="searchmode" :res="res" :actions="searchoptions.actions.prestudent" @actionexecuted="hideresult"></prestudent>
                     <merged-student v-else-if="res.type === 'mergedstudent'" :mode="searchmode" :res="res" :actions="searchoptions.actions.mergedstudent" @actionexecuted="hideresult"></merged-student>
                     <merged-person v-else-if="res.type === 'mergedperson'" :mode="searchmode" :res="res" :actions="searchoptions.actions.mergedperson" @actionexecuted="hideresult"></merged-person>
                     <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung' || res.type === 'employee'  || res.type === 'unassigned_employee'" :res="res" :actions="searchoptions.actions.employee" @actionexecuted="hideresult"></employee>
-                    <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="searchoptions.actions.organisationunit" @actionexecuted="hideresult"></organisationunit>
+                    <organisationunit v-else-if="res.type === 'organisationunit' || res.type === 'active_organisationunit'" :res="res" :actions="searchoptions.actions.organisationunit" @actionexecuted="hideresult"></organisationunit>
                     <raum v-else-if="res.type === 'raum' || res.type === 'room'" :mode="searchmode" :res="res" :actions="searchoptions.actions.raum || searchoptions.actions.room" @actionexecuted="hideresult"></raum>
                     <dms v-else-if="res.type === 'dms'" :res="res" :actions="searchoptions.actions.dms" @actionexecuted="hideresult"></dms>
                     <cms v-else-if="res.type === 'cms'" :res="res" :actions="searchoptions.actions.cms" @actionexecuted="hideresult"></cms>

From 3ed2bb4d787f5f9c5bfe42e958756f5053b5d2c3 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 14 Jul 2025 15:16:21 +0200
Subject: [PATCH 366/572] add uid@DOMAIN to emails result for prestudent and
 student, mergedperson render student only results, add searchresult_inaktiv
 css class to inactive users

---
 application/config/search.php                 | 13 ++++---
 .../js/components/Stv/Studentenverwaltung.js  | 10 +++++-
 .../searchbar/result/mergedperson.js          | 34 ++++++++++++++++---
 3 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/application/config/search.php b/application/config/search.php
index bf98d3e93..b4fd4a42b 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -197,11 +197,12 @@ $config['student'] = [
 		"s.matrikelnr",
 		"p.person_id",
 		"(p.vorname || ' ' || p.nachname) AS name",
-		"ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
+		"(s.student_uid || '@" . DOMAIN . "') || ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
 		"CASE
 			WHEN p.foto IS NOT NULL THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
 			ELSE NULL END
-			AS photo_url"
+			AS photo_url",
+		"b.aktiv"
 	],
 	'resultjoin' => "
 		JOIN public.tbl_student s USING (student_uid)
@@ -220,7 +221,8 @@ $config['studentcis']['resultfields'] = [
 	"CASE
 		WHEN p.foto IS NOT NULL THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
 		ELSE NULL END
-		AS photo_url"
+		AS photo_url",
+	"b.aktiv"
 ];
 
 $config['prestudent'] = [
@@ -311,7 +313,7 @@ $config['prestudent'] = [
 		"p.person_id",
 		"b.uid",
 		"(p.vorname || ' ' || p.nachname) AS name",
-		"ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
+		"(b.uid || '@" . DOMAIN . "') || ARRAY( SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp = 'email' AND person_id=p.person_id ) AS email",
 		"CASE
 			WHEN p.foto IS NOT NULL THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
 			ELSE NULL END
@@ -334,7 +336,8 @@ $config['prestudent'] = [
 				LIMIT 1
 			),
 			sg.orgform_kurzbz
-		) AS orgform"
+		) AS orgform",
+		"b.aktiv"
 	],
 	'resultjoin' => "
 		LEFT JOIN public.tbl_prestudent ps USING (prestudent_id)
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 6cd472ea8..13a0369ba 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -107,7 +107,15 @@ export default {
 						},
 						defaultactionstudent: {
 							type: "link",
-							action: data => this.$fhcApi.getUri('/studentenverwaltung/prestudent/' + data.prestudent_id)
+							action: data => {
+								if (data.prestudent_id) {
+									return this.$fhcApi.getUri('/studentenverwaltung/prestudent/' + data.prestudent_id);
+								} else if (data.uid) {
+									return this.$fhcApi.getUri('/studentenverwaltung/student/' + data.uid);
+								} else {
+									return this.$fhcApi.getUri('/studentenverwaltung/person/' + data.person_id);
+								}
+							}
 						},
 						childactions: []
 					}
diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
index f02febf6f..0f6f3f0ee 100644
--- a/public/js/components/searchbar/result/mergedperson.js
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -45,7 +45,26 @@ export default {
 			].includes(item.type)) || null;
 		},
 		students() {
-			const students = this.res.list.filter(item => item.type == 'prestudent');
+			const students = this.res.list.filter(item => [
+					'student',
+					'prestudent',
+					'studentcis',
+					'studentStv'
+				].includes(item.type))
+				.filter((item, idx, arr) => {
+					if (item.type === 'prestudent') {
+						return true;
+					}
+
+					let prestudentwithsameuidexists = arr.some(tmpitem => {
+						return tmpitem.uid === item.uid && tmpitem.type === 'prestudent';
+					});
+
+					if (prestudentwithsameuidexists) {
+						return false;
+					}
+					return true;
+				});
 			return students.length ? students : null;
 		},
 		emails() {
@@ -54,11 +73,15 @@ export default {
 		},
 		telurl() {
 			return 'tel:' + this.employee?.phone;
+		},
+		inaktiv() {
+			return this.res.list.some(item => item?.aktiv === false);
 		}
 	},
 	template: `
 	<template-frame
 		class="searchbar-result-mergedperson"
+		:class="(inaktiv) ? 'searchbar_inaktiv' : ''"
 		:res="person"
 		:actions="actions"
 		:title="person.name"
@@ -145,19 +168,22 @@ export default {
 								<template v-if="mode == 'simple'">
 									{{ student.studiengang_kz }}
 								</template>
-								<template v-else>
+								<template v-else-if="student.status && student.stg_kuerzel">
 									{{ student.status }} ({{ student.stg_kuerzel }})
 								</template>
+								<template v-else>
+									{{ $p.t('person/student') }}
+								</template>
 							</template-action>
 						</div>
 					</div>
-					<div class="searchbar_tablerow">
+					<div v-if="student.bezeichnung" class="searchbar_tablerow">
 						<div class="searchbar_tablecell searchbar_label ps-3">{{ $p.t('lehre/studiengang') }}</div>
 						<div class="searchbar_tablecell searchbar_value">
 							{{ student.bezeichnung }} {{ student.orgform ? '(' + student.orgform + ')' : '' }}
 						</div>
 					</div>
-					<div class="searchbar_tablerow">
+					<div v-if="student.prestudent_id" class="searchbar_tablerow">
 						<div class="searchbar_tablecell searchbar_label ps-3">{{ $p.t('search/result_prestudent_id') }}</div>
 						<div class="searchbar_tablecell searchbar_value">
 							{{ student.prestudent_id }}

From 9fe7dd069fef40a738b5ce3021c1ca91bd43c0cf Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 14 Jul 2025 15:23:57 +0200
Subject: [PATCH 367/572] refactor(LvPlan Lektoren in LV Ansicht): passt die
 Ansicht der Lektoren in den LVs des LvPlan an wenn mehrere Lektoren vorhanden
 sind

---
 public/css/Cis4/Cis.css                       | 18 ++++++++++++++++
 public/css/Cis4/CoreCalendarEvents.css        | 21 ++++++++++++++++++-
 .../Cis/Renderer/Lehreinheit/calendarEvent.js | 19 +++++++++++------
 .../Cis/Renderer/Lehreinheit/modalContent.js  |  8 ++++---
 system/phrasesupdate.php                      | 20 ++++++++++++++++++
 5 files changed, 76 insertions(+), 10 deletions(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 99ab609b9..8311ceadb 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -807,4 +807,22 @@ html {
 
 .mylv-semester-studiengang-lv .card-header {
 	min-height: 55px;
+}
+
+#lektorenContainer{
+	display: grid;
+	grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
+
+}
+
+@media(max-width: 990px) {
+	#lektorenContainer{
+		grid-template-columns: 1fr 1fr 1fr;
+	}
+}
+
+@media(max-width: 575px) {
+	#lektorenContainer {
+		grid-template-columns: 1fr 1fr;
+	}
 }
\ No newline at end of file
diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index f248f4a61..d886e024e 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -16,7 +16,8 @@
 	white-space: nowrap;
 	text-overflow: ellipsis;
 	display:flex;
-	place-content: center space-evenly;
+	justify-content: space-evenly;
+	align-items:center;
 	
 }
 
@@ -24,6 +25,10 @@
 	display:none;
 }
 
+.monthPageContainer .lehreinheitEventContent #lektorEllipsis {
+	display: none;
+}
+
 /* Lehreinheits Events in Week Page */
 .weekPageContainer .lehreinheitEventContent {
 	display: grid;
@@ -32,6 +37,13 @@
 
 }
 
+@media(max-width: 1199px){
+	.weekPageContainer .lehreinheitEventContent {
+			grid-template-columns: 1fr;
+		}
+}
+
+
 .weekPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
 	display: grid;
 	padding: .25rem .5rem .25rem .25rem;
@@ -100,6 +112,13 @@
 	align-items:center;
 	color: var(--fhc-light);
 }
+.weekPageContainer .feiertagEventContent {
+	display: grid;
+	grid-template-columns: auto 1fr;
+	justify-items: center;
+	align-items: center;
+	color: var(--fhc-light);
+}
 
 .weekPageContainer .feiertagEventContent #ferienEventIcon {
 	margin: 0.25rem;
diff --git a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
index dc3cdb443..a334ea4d4 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
@@ -15,18 +15,21 @@ export default {
 			let tooltipString = `${this.$p.t('global','uhrzeit')}: ${this.convertTime(this.event.beginn.split(":"))} / ${this.convertTime(this.event.ende.split(":")) }`;
 			
 			tooltipString += `\n${this.$p.t('profilUpdate', 'topic')}: ${this.event.topic}`;
-			
+			tooltipString += `${this.$p.t('person', 'ort')}: ${this.event.ort_kurzbz}`;
 			if(Array.isArray(this.event.lektor) && this.event.lektor.length > 0){
 				lektorenEmpty = false;
 				tooltipString += `\n${this.$p.t('lehre','lektor')}: `;
-				this.event.lektor.forEach(lektor => {
+				this.event.lektor.slice(0,3).forEach(lektor => {
 					tooltipString += `${lektor.kurzbz}\n`;
 				})
+				if(this.event.lektor.length > 3){
+					tooltipString += `${this.$p.t('lehre', 'weitereLektoren', [(this.event.lektor.length - 3)])}\n`;
+				}
 			}
 			if(lektorenEmpty){
 				tooltipString += "\n";	
 			}
-			tooltipString += `${this.$p.t('person','ort')}: ${this.event.ort_kurzbz}`;
+			
 			
 			return tooltipString;
 		},
@@ -38,15 +41,19 @@ export default {
 		},
 	},
 	template: /*html*/`
-	<div class="lehreinheitEventContent h-100 w-100 p-1" >
-		<div id="lehreinheitEventHeader" class="h-100 " v-if="!event.allDayEvent && event?.beginn && event?.ende" >
+	<div class="lehreinheitEventContent h-100 w-100 p-1" @wheel.stop >
+		<div id="lehreinheitEventHeader" class="d-none d-xl-grid h-100 " v-if="!event.allDayEvent && event?.beginn && event?.ende" >
 			<span >{{convertTime(event.beginn.split(":"))}}</span>
 			<span >{{convertTime(event.ende.split(":"))}}</span>
 		</div>
 		<div id="lehreinheitEventText" v-tooltip="calendarEventTooltip">
 			<span id="lehreinheitTopic">{{event.topic}}</span>
-			<span id="lehreinheitLektoren" v-for="lektor in event.lektor">{{lektor.kurzbz}}</span>
 			<span id="lehreinheitOrt">{{event.ort_kurzbz}}</span>
+			<span id="lehreinheitLektoren" v-for="(lektor,index) in event.lektor.slice(0,3)">
+				{{lektor.kurzbz}}
+			</span>
+			<span id="lektorEllipsis" class="fw-bold" v-if="event.lektor.length > 3">...+ 
+		 	{{event.lektor.length-3}}</span>
 		</div>
 	</div>
 	`,
diff --git a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
index 2d5f34eee..0be28962a 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
@@ -95,9 +95,11 @@ export default {
 							:''
 						}}</th>
 						<td>
-							<div v-for="lektor in event.lektor" class="d-block">
-								<a v-if="lektorenLinks[lektor.kurzbz]" :aria-label="$p.t('lehre','lektor')" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
-								{{lektor.kurzbz}}
+							<div id="lektorenContainer">
+								<div v-for="lektor in event.lektor" class="d-block">
+									<a v-if="lektorenLinks[lektor.kurzbz]" :aria-label="$p.t('lehre','lektor')" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+									{{lektor.kurzbz}}
+								</div>
 							</div>
 						</td>
 					</tr>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b0e9f8888..7e58d0e98 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -3064,6 +3064,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'weitereLektoren',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '...und {0} weitere Lektoren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'group',
+				'description' => '...and {0} more lecturers',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'lehre',

From cb48c1e5e381b26570273b07cbb0edf30211c352 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 14 Jul 2025 15:48:37 +0200
Subject: [PATCH 368/572] Tab Details: add tbl_benutzer to update logic

---
 .../api/frontend/v1/stv/Student.php           | 34 +++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 10b972a45..d56736541 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -151,6 +151,7 @@ class Student extends FHCAPI_Controller
 	public function save($prestudent_id)
 	{
 		$this->load->model('person/Person_model', 'PersonModel');
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
@@ -170,7 +171,6 @@ class Student extends FHCAPI_Controller
 		
 		$result = $this->udflib->getCiValidations($this->PersonModel, $this->input->post());
 
-		//TODO(Manu) check with Chris: input number not allowed
 		$udf_field_validations = $this->getDataOrTerminateWithError($result);
 
 		$this->form_validation->set_rules($udf_field_validations);
@@ -225,7 +225,7 @@ class Student extends FHCAPI_Controller
 			'anmerkung',
 			'homepage'
 		];
-		
+
 		// add UDFs
 		$result = $this->udflib->getDefinitionForModel($this->PersonModel);
 
@@ -257,6 +257,15 @@ class Student extends FHCAPI_Controller
 			}
 		}
 
+		$array_allowed_props_benutzer = ['aktiv', 'alias'];
+		$update_benutzer = array();
+		foreach ($array_allowed_props_benutzer as $prop) {
+			$val = $this->input->post($prop);
+			if ($val !== null) {
+				$update_benutzer[$prop] = $val;
+			}
+		}
+
 		// Check PKs
 		if (count($update_lehrverband) + count($update_student) && $uid === null) {
 			$this->terminateWithValidationErrors(['' => $this->p->t('lehre', 'error_no_student')]);
@@ -264,6 +273,9 @@ class Student extends FHCAPI_Controller
 		if (count($update_person) && $person_id === null) {
 			$this->terminateWithValidationErrors(['' => $this->p->t('lehre', 'error_no_person')]);
 		}
+		if (count($update_benutzer) && $uid === null) {
+			$this->terminateWithValidationErrors(['' => $this->p->t('lehre', 'error_no_student')]);
+		}
 
 		// Do Updates
 		if (count($update_lehrverband)) {
@@ -316,10 +328,26 @@ class Student extends FHCAPI_Controller
 			$this->getDataOrTerminateWithError($result);
 		}
 
+		if (count($update_benutzer)) {
+			$update_benutzer['updatevon'] = $authuid;
+			$update_benutzer['updateamum'] = $now;
+			if (array_key_exists("aktiv", $update_benutzer))
+			{
+				$update_benutzer['updateaktivvon'] = $authuid;
+				$update_benutzer['updateaktivam'] = $now;
+			}
+			$result = $this->BenutzerModel->update(
+				[$uid],
+				$update_benutzer
+			);
+			$this->getDataOrTerminateWithError($result);
+		}
+
 		$this->terminateWithSuccess(array_fill_keys(array_merge(
 			array_keys($update_lehrverband),
 			array_keys($update_person),
-			array_keys($update_student)
+			array_keys($update_student),
+			array_keys($update_benutzer)
 		), ''));
 	}
 

From 7aa074cdf682c70ceccda70003b9130676be1c2c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 14 Jul 2025 15:51:42 +0200
Subject: [PATCH 369/572] use uselanguge when searching cms content, remove
 flags from cms content results, use cms and dms searchtypes in cis4

---
 application/config/search.php                |  5 ++--
 public/js/apps/Cis.js                        | 29 ++++++++++++++++++--
 public/js/components/searchbar/result/cms.js |  7 -----
 public/js/components/searchbar/searchbar.js  | 17 +-----------
 4 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/application/config/search.php b/application/config/search.php
index b4fd4a42b..ea07f6e1c 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -705,7 +705,7 @@ $config['room'] = [
 		LEFT JOIN public.tbl_adresse address
 			USING (adresse_id)"
 ];
-
+$sprache = getUserLanguage();
 $config['cms'] = [
 	'primarykey' => 'contentsprache_id',
 	'table' => 'campus.tbl_contentsprache',
@@ -785,7 +785,8 @@ $config['cms'] = [
 			SELECT content_id 
 			FROM cms_active_others
 		)
-		AND version = campus.get_highest_content_version(content_id)"
+		AND version = campus.get_highest_content_version(content_id)
+		AND contentsprache.sprache = '{$sprache}'"
 ];
 
 $config['dms'] = [
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 994efbec8..dc32511c1 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -19,7 +19,9 @@ const app = Vue.createApp({
                     "employee",
 					"studentcis",
                     "room",
-                    "active_organisationunit"
+                    "active_organisationunit",
+					"cms",
+					"dms"
                 ],
                 actions: {
                     employee: {
@@ -105,7 +107,30 @@ const app = Vue.createApp({
                             }
                         },
                         childactions: []
-                    }
+                    },
+					cms: {
+						defaultaction: {
+							type: "link",
+							action: function (data) {
+								const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+									FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+									'/CisVue/Cms/content/' + data.content_id;
+								return link;
+							}
+						},
+						childactions: []
+					},
+					dms: {
+						defaultaction: {
+							type: "link",
+							action: function (data) {
+								const link = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+									'cms/dms.php?id=' + data.dms_id;
+								return link;
+							}
+						},
+						childactions: []
+					}
                 }
             }
         };
diff --git a/public/js/components/searchbar/result/cms.js b/public/js/components/searchbar/result/cms.js
index 591c7e79c..5eebc3826 100644
--- a/public/js/components/searchbar/result/cms.js
+++ b/public/js/components/searchbar/result/cms.js
@@ -10,7 +10,6 @@ export default {
 		actions: Object
 	},
 	inject: [
-		'languages',
 		'query'
 	],
 	computed: {
@@ -56,11 +55,6 @@ export default {
 			else if (url.substr(0, 3) == '../')
 				url = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/\/+$/, '') + url.substr(2);
 			return '<a href="' + url + '">' + url + '</a>';
-		},
-		flag() {
-			if (!this.languages || !this.languages[this.res.language])
-				return "";
-			return "data:image/jpeg;base64," + this.languages[this.res.language].flagge;
 		}
 	},
 	template: `
@@ -72,7 +66,6 @@ export default {
 		image-fallback="fas fa-newspaper fa-4x"
 		@actionexecuted="$emit('actionexecuted')"
 		>
-		<img v-if="flag" :src="flag" class="ms-2">
 		<div v-if="preview" class="searchbar_table" v-html="preview"></div>
 		<div v-else class="searchbar_table text-muted">
 			{{ $p.t('search/result_content_none') }}
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index ec08dd178..09dab9ece 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -9,13 +9,10 @@ import cms from "./result/cms.js";
 import mergedStudent from "./result/mergedstudent.js";
 import mergedPerson from "./result/mergedperson.js";
 
-import ApiLanguage from "../../api/factory/language.js"
-
 export default {
     props: [ "searchoptions", "searchfunction" ],
     provide() {
         return {
-            languages: Vue.computed(() => this.languages),
             query: Vue.computed(() => this.lastQuery)
         };
     },
@@ -33,8 +30,7 @@ export default {
         searching: false,
         error: null,
             abortController: null,
-        settingsDropdown:null,
-            languages: null,
+			settingsDropdown: null,
             lastQuery: ''
       };
     },
@@ -147,17 +143,6 @@ export default {
 		},
 		
 	},
-    created() {
-        this.$api
-            .call(ApiLanguage.getAll())
-            .then(result => {
-                this.languages = result.data.reduce((a, c) => {
-                    a[c.sprache] = c;
-                    return a;
-                }, {});
-            })
-            .catch(this.$fhcAlert.handleSystemError);
-    },
     beforeMount: function() {
 		this.$watch('searchsettings.types', newValue => {
 			if (Array.isArray(newValue) && newValue.length === 0){

From 487279289080efc9f2bd21aff0f8dbfd0c958450 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 14 Jul 2025 16:19:13 +0200
Subject: [PATCH 370/572] prevent cis search from searching in private email
 addresses and phone numbers

---
 application/config/search.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/config/search.php b/application/config/search.php
index ea07f6e1c..451ae656d 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -211,7 +211,8 @@ $config['student'] = [
 ];
 
 $config['studentcis'] = $config['student'];
-unset($config['studentcis']['fields']['email']);
+unset($config['studentcis']['searchfields']['email']);
+unset($config['studentcis']['searchfields']['tel']);
 $config['studentcis']['resultfields'] = [
 	"s.student_uid AS uid",
 	"s.matrikelnr",

From da9f00fff03c4690d0f05ad7c1987bf742efdd3f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 15 Jul 2025 11:17:49 +0200
Subject: [PATCH 371/572] add Calendar

---
 application/config/calendar.php               |   6 +
 public/css/components/calendar.css            | 549 ++++--------------
 public/js/components/Calendar/Base.js         | 272 +++++++++
 .../components/Calendar/Base/DragAndDrop.js   | 162 ++++++
 public/js/components/Calendar/Base/Grid.js    | 344 +++++++++++
 .../js/components/Calendar/Base/Grid/Line.js  | 111 ++++
 .../Calendar/Base/Grid/Line/Background.js     |  72 +++
 .../Calendar/Base/Grid/Line/Event.js          |  57 ++
 public/js/components/Calendar/Base/Header.js  | 118 ++++
 .../Calendar/Base/Header/Datepicker.js        | 119 ++++
 .../js/components/Calendar/Base/Label/Day.js  |  39 ++
 .../js/components/Calendar/Base/Label/Dow.js  |  35 ++
 .../js/components/Calendar/Base/Label/Time.js |  58 ++
 .../js/components/Calendar/Base/Label/Week.js |  38 ++
 public/js/components/Calendar/Base/Slider.js  | 129 ++++
 public/js/components/Calendar/Mode/Day.js     |  89 +++
 .../js/components/Calendar/Mode/Day/View.js   | 103 ++++
 public/js/components/Calendar/Mode/List.js    |  93 +++
 .../js/components/Calendar/Mode/List/View.js  |  61 ++
 public/js/components/Calendar/Mode/Month.js   | 125 ++++
 .../js/components/Calendar/Mode/Month/View.js |  87 +++
 public/js/components/Calendar/Mode/Week.js    | 108 ++++
 .../js/components/Calendar/Mode/Week/View.js  |  75 +++
 public/js/composables/EventLoader.js          | 125 ++++
 public/js/directives/Calendar/Click.js        |  49 ++
 public/js/directives/Calendar/DragAndDrop.js  | 100 ++++
 public/js/helpers/DragAndDrop.js              |  67 +++
 system/phrasesupdate.php                      |  62 ++
 28 files changed, 2826 insertions(+), 427 deletions(-)
 create mode 100644 application/config/calendar.php
 create mode 100644 public/js/components/Calendar/Base.js
 create mode 100644 public/js/components/Calendar/Base/DragAndDrop.js
 create mode 100644 public/js/components/Calendar/Base/Grid.js
 create mode 100644 public/js/components/Calendar/Base/Grid/Line.js
 create mode 100644 public/js/components/Calendar/Base/Grid/Line/Background.js
 create mode 100644 public/js/components/Calendar/Base/Grid/Line/Event.js
 create mode 100644 public/js/components/Calendar/Base/Header.js
 create mode 100644 public/js/components/Calendar/Base/Header/Datepicker.js
 create mode 100644 public/js/components/Calendar/Base/Label/Day.js
 create mode 100644 public/js/components/Calendar/Base/Label/Dow.js
 create mode 100644 public/js/components/Calendar/Base/Label/Time.js
 create mode 100644 public/js/components/Calendar/Base/Label/Week.js
 create mode 100644 public/js/components/Calendar/Base/Slider.js
 create mode 100644 public/js/components/Calendar/Mode/Day.js
 create mode 100644 public/js/components/Calendar/Mode/Day/View.js
 create mode 100644 public/js/components/Calendar/Mode/List.js
 create mode 100644 public/js/components/Calendar/Mode/List/View.js
 create mode 100644 public/js/components/Calendar/Mode/Month.js
 create mode 100644 public/js/components/Calendar/Mode/Month/View.js
 create mode 100644 public/js/components/Calendar/Mode/Week.js
 create mode 100644 public/js/components/Calendar/Mode/Week/View.js
 create mode 100644 public/js/composables/EventLoader.js
 create mode 100644 public/js/directives/Calendar/Click.js
 create mode 100644 public/js/directives/Calendar/DragAndDrop.js
 create mode 100644 public/js/helpers/DragAndDrop.js

diff --git a/application/config/calendar.php b/application/config/calendar.php
new file mode 100644
index 000000000..99bb9b2c6
--- /dev/null
+++ b/application/config/calendar.php
@@ -0,0 +1,6 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+// Define configuration parameters
+$config['timezone'] = 'Europe/Vienna';
diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 85962d4e0..68181166b 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -1,441 +1,136 @@
-:root{
-	--fhc-calendar-pane-height: calc(100vh - 220px);
-	
-	--fhc-calendar-primary: var(--fhc-primary, #006095);
-	--fhc-calendar-border: var(--fhc-border, #dee2e6);
-	--fhc-calendar-border-highlight: var(--fhc-border-highlight, #495057);
-	--fhc-calendar-text: var(--fhc-text, #212529);
-	--fhc-calendar-text-light: var(--fhc-text, #212529);
-	--fhc-calendar-background: var(--fhc-background, #fff);
-	--fhc-calendar-dark: var(--fhc-dark, #212529);
-	--fhc-calendar-hour-indicator-bg: var(--fhc-background, #fff);
-	--fhc-calendar-week-page-header-background: var(--fhc-background, #fff);
-	--fhc-calendar-week-page-header-color: var(--fhc-text, #212529);
-	--fhc-calendar-week-page-header-border: var(--fhc-border, #dee2e6);
-	--fhc-calendar-week-page-header-hover-background: var(--fhc-background-highlight, #d5dae0);
-	--fhc-calendar-all-day-event-background: var(--fhc-background, #fff);
-	--fhc-calendar-past: var(--fhc-beige-10, rgba(245, 233, 215, 0.5));
-	--fhc-calendar-box-shadow: var(--fhc-box-shadow, #dee2e6);
-}
-
-:root.dark{
-	--fhc-calendar-past: var(--fhc-beige-20, rgba(172, 153, 125, 0.5));
-}
-
-.fhc-calendar-pane {
-	height: var(--fhc-calendar-pane-height);
-}
-
-.fhc-calendar-hour-indicator{
-	border-top: 1px solid var(--fhc-calendar-border);
-}
-
-.fhc-calendar-hour-indicator span{
-	background-color: var(--fhc-calendar-hour-indicator-bg) !important;
-}
-
-.fhc-calendar-week-page-header{
-	color: var(--fhc-calendar-text);
-	background-color: var(--fhc-calendar-week-page-header-background);
-}
-
-.fhc-calendar-week-page-header > div {
-	border-right: 1px solid var(--fhc-calendar-border);
-}
-
-.fhc-calendar-week-page-header > div:hover{
-	background-color: var(--fhc-calendar-week-page-header-hover-background);
-}
-
-.fhc-calendar-months .col-4,
-.fhc-calendar-years .col-4 {
-  padding: 0.1875em 0;
-}
-.show-weeks .fhc-calendar-months .col-4,
-.show-weeks .fhc-calendar-years .col-4 {
-  padding: 0.1875em 0.25em;
-}
-.fhc-calendar-months .col-4 button,
-.fhc-calendar-years .col-4 button {
-  aspect-ratio: 28/18;
-}
-
-.fhc-calendar-month-page {
-  display: grid;
-  grid-template-columns: repeat(7, 1fr);
-  grid-template-rows: 1.5em repeat(6, 1fr);
-}
-.fhc-calendar-month-page.show-weeks {
-  grid-template-columns: 1.5em repeat(7, 1fr);
-  grid-template-rows: 1.5em repeat(6, 1fr);
-}
-
-.fhc-calendar-month-page-weekday,
-.fhc-calendar-month-page-day {
-  color: inherit;
-}
-
-.fhc-calendar-week .carousel-item {
-  /*padding: 0.75em;*/
-}
-
-.fhc-calendar-week-page {
-  /*aspect-ratio: 7/6;*/
-  min-height: 0;
-}
-.fhc-calendar-week-page > div {
-  /*transform: translate(-0.75em, -0.75em);*/
-  /*width: calc(100% + 1.5em);*/
-  /*height: calc(100% + 1.5em);*/
-	max-height: 100%;
-}
-.fhc-calendar-week-page > div > div {
-  padding-left: 3em;
-}
-.fhc-calendar-week-page .events {
-  display: grid;
-  grid-template-columns: 3em repeat(7, 1fr);
-  margin-left: -3em;
-  /*min-height: 266.6666666667%;*/
-}
-.fhc-calendar-week-page .events .day {
-  gap: 1px;
-}
-.fhc-calendar-week-page .events .hours, .fhc-calendar-week-page .events .day {
-  display: grid;
-}
-
-.fhc-calendar-week-page .all-day-event-border{
-	box-shadow: 1px 1px 0 var(--fhc-calendar-box-shadow);
-}
-
-.fhc-calendar-week-page .all-day-event {
-	max-height: 75px;
-	overflow: auto;
-	overscroll-behavior: none;
-}
-
-.fhc-calendar-week-page .all-day-event-container{
-	position: sticky;
-	top: 44px;
-	display:grid;
-	grid-template-columns:repeat(7,1fr);
-	width:100%;
-	z-index:3;
-	background-color:var(--fhc-calendar-all-day-event-background);
-}
-
-.fhc-calendar-week-page .all-day-event-container::before {
-	position: absolute;
-	content:'';
-	top: 0;
-	bottom: 0;
-	left: -3em;
-	right: 100%;
-	background-color: var(--fhc-calendar-all-day-event-background);
-	box-shadow: 1px 1px 0 var(--fhc-calendar-box-shadow);
-}
-
-.fhc-calendar-day-page .all-day-event-border {
-	box-shadow: 0 0 0 1px var(--fhc-calendar-box-shadow);
-}
-
-.fhc-calendar-day-page .all-day-event {
-	grid-column:2;
-	max-height: 75px;
-	overflow: auto;
-}
-
-.fhc-calendar-day-page .all-day-event-container {
-	position: sticky;
-	top:0;
-	display: grid;
-	grid-template-columns: 3em 1fr;
-	width: 100%;
-	z-index: 3;
-	background-color:var(--fhc-calendar-all-day-event-background);
-	box-shadow: 1px 1px 0 var(--fhc-calendar-box-shadow);
-}
-
-/* grid hour lines of the Stundenplan use box-shadow instead of border because box-shadow renders consistently on different viewports*/
-.box-shadow-border{
-	box-shadow: 0 0 0 1px var(--fhc-calendar-border) !important;
-}
-
-.fhc-calendar-no-events-overlay{
-	position: relative;
-}
-
-.fhc-calendar-no-events-overlay::before {
-	content: "";
-	position: absolute;
-	top: 0;
-	left: 3rem;
-	margin:auto;
-	width: 100%;
-	height: 100%;
-	background-image: linear-gradient(120deg, var(--fhc-calendar-background), var(--fhc-calendar-dark) );
-	opacity: .7;
-}
-.fhc-calendar-day-page {
-  /*aspect-ratio: 7/6;*/
-  min-height: 0;
-}
-.fhc-calendar-day-page > div {
-  height: calc(100% + 1.5em);
-}
-.fhc-calendar-day-page .flex-column > .flex-grow-1 {
-  padding-left: 3em;
-}
-
-.fhc-calendar-day-page .events {
-  display: grid;
-  grid-template-columns: 3em 1fr;
-}
-.fhc-calendar-day-page .events .day {
-  gap: 1px;
-}
-.fhc-calendar-day-page .events .hours, .fhc-calendar-day-page .events .day {
-  display: grid;
-}
-
-.fhc-calendar-month-page-day{
-	color: var(--fhc-calendar-text) !important;
-}
-
-.fhc-calendar-month-page-day.fhc-calendar-past:not(.fhc-calendar-month-page-day-focusday) {
-	color: var(--fhc-calendar-text) !important;
-}
-
-.fhc-calendar-lg .fhc-calendar-month-page-day,
-.fhc-calendar-md .fhc-calendar-month-page-day {
-  border: solid 1px var(--fhc-calendar-border);
-}
-
-.fhc-calendar-lg .fhc-calendar-month-page-weekday,
-.fhc-calendar-md .fhc-calendar-month-page-weekday{
-	border: solid 1px var(--fhc-secondary);
+/* Themable Variables */
+:root {
+  --fhc-calendar-pane-height: calc(100vh - 220px);
+  
+  --fhc-calendar-primary: var(--fhc-primary, #006095);
+  --fhc-calendar-border: var(--fhc-border, #dee2e6);
+  --fhc-calendar-border-highlight: var(--fhc-border-highlight, #495057);
+  --fhc-calendar-text: var(--fhc-text, #212529);
+  --fhc-calendar-text-light: var(--fhc-text, #212529);
+  --fhc-calendar-background: var(--fhc-background, #fff);
+  --fhc-calendar-dark: var(--fhc-dark, #212529);
+  --fhc-calendar-hour-indicator-bg: var(--fhc-background, #fff);
+  --fhc-calendar-week-page-header-background: var(--fhc-background, #fff);
+  --fhc-calendar-week-page-header-color: var(--fhc-text, #212529);
+  --fhc-calendar-week-page-header-border: var(--fhc-border, #dee2e6);
+  --fhc-calendar-week-page-header-hover-background: var(--fhc-background-highlight, #d5dae0);
+  --fhc-calendar-all-day-event-background: var(--fhc-background, #fff);
+  --fhc-calendar-past: var(--fhc-beige-10, rgba(245, 233, 215, 0.5));
+  --fhc-calendar-box-shadow: var(--fhc-box-shadow, #dee2e6);
 }
 
 
-.fhc-calendar-lg .fhc-calendar-month-page-day,
-.fhc-calendar-md .fhc-calendar-month-page-day {
-  aspect-ratio: 1;
+/* Labels */
+/* ====== */
+.fhc-calendar-base-label-dow .short,
+.fhc-calendar-base-label-dow .narrow,
+.fhc-calendar-base-label-day .full,
+.fhc-calendar-base-label-day .short,
+.fhc-calendar-base-label-day .narrow,
+.fhc-calendar-mode-month .fhc-calendar-base-label-day .long,
+.collapsed-header .fhc-calendar-base-label-day .long,
+.collapsed-header .fhc-calendar-base-label-dow .long {
+  display: none;
+}
+.fhc-calendar-mode-month .fhc-calendar-base-label-day .narrow,
+.collapsed-header .fhc-calendar-base-label-day .short,
+.collapsed-header .fhc-calendar-base-label-dow .short {
+  display: block;
+}
+.fhc-calendar-mode-day .fhc-calendar-base-label-day,
+.fhc-calendar-mode-week .fhc-calendar-base-label-day {
+  font-size: .875em;
+}
+.fhc-calendar-mode-month .fhc-calendar-base-label-week {
+  text-align: right;
+}
+.fhc-calendar-mode-month .fhc-calendar-base-label-week span {
+  color: var(--bs-secondary-color);
+  cursor: pointer;
+}
+.fhc-calendar-mode-month .fhc-calendar-base-label-week span + span:before {
+  content: "/";
+}
+
+
+/* Base Grid */
+/* ========= */
+/* Grid */
+.fhc-calendar-base-grid {
+  --fhc-calendar-axis-collapsible: .2fr;
+  background-color: var(--bs-border-color);
+  grid-gap: 2px;
+}
+.fhc-calendar-base-grid .grid-header {
+  background-color: var(--bs-gray-200);
+}
+.fhc-calendar-base-grid .grid-main {
+  grid-gap: 1px;
+}
+.fhc-calendar-base-grid-line {
+  grid-gap: 1px;
+}
+.fhc-calendar-mode-month .main-header,
+.fhc-calendar-base-grid .part-header,
+.fhc-calendar-base-grid .part-body {
+  background-color: rgba(255,255,255, 1);
+}
+.fhc-calendar-base-label-time {
   display: flex;
   flex-direction: column;
+  justify-content: space-between;
+  align-items: end;
 }
-.fhc-calendar-lg .fhc-calendar-month-page-day.active,
-.fhc-calendar-md .fhc-calendar-month-page-day.active {
-  border-color: var(--fhc-calendar-border-highlight);
-}
-/*.fhc-calendar-lg .fhc-calendar-month-page-day .events,*/
-/*.fhc-calendar-md .fhc-calendar-month-page-day .events {*/
-/*  display: block;*/
-/*  overflow: auto;*/
-/*  font-size: 0.7em;*/
-/*}*/
-/*.fhc-calendar-lg .fhc-calendar-month-page-day .events span,*/
-/*.fhc-calendar-md .fhc-calendar-month-page-day .events span {*/
-/*  display: block;*/
-/*  margin: 0.2em;*/
-/*  padding: 0.1em 0.4em;*/
-/*  border-radius: 0.1em;*/
-/*}*/
-.fhc-calendar-lg .fhc-calendar-years .col-4,
-.fhc-calendar-md .fhc-calendar-years .col-4 {
-  padding: 0.09375em 0;
-}
-.show-weeks .fhc-calendar-lg .fhc-calendar-years .col-4,
-.show-weeks .fhc-calendar-md .fhc-calendar-years .col-4 {
-  padding: 0.09375em 0.25em;
-}
-.fhc-calendar-lg .fhc-calendar-years .col-4 button,
-.fhc-calendar-md .fhc-calendar-years .col-4 button {
-  aspect-ratio: 28/9;
-}
-
-.fhc-calendar-xs {
-  font-size: 0.6em;
-}
-
-.fhc-calendar-sm .fhc-calendar-month-page {
-  font-size: 0.8em;
-}
-
-.fhc-calendar-sm .fhc-calendar-month-page-weekday,
-.fhc-calendar-xs .fhc-calendar-month-page-weekday {
-  font-style: italic;
-  display: flex;
-  align-items: center;
-  justify-content: end;
-}
-
-.fhc-calendar-month-page-weekday:hover {
-	background-color:var(--fhc-calendar-primary);
-	color:var(--fhc-calendar-text-light);
-	
-}
-
-.fhc-calendar-sm .fhc-calendar-month-page-day,
-.fhc-calendar-xs .fhc-calendar-month-page-day {
-  position: relative;
-  aspect-ratio: 1;
-}
-
-
-
-.fhc-calendar-past {
-	background-color: var(--fhc-calendar-past);
-	border-color: var(--fhc-calendar-border);
-	opacity: 0.5;
-}
-
-.fhc-calendar-month-page-day-focusday {
-	border-color: var(--fhc-calendar-border-highlight) !important;
-	background-color: var(--fhc-calendar-background);
-	position: relative;
-	animation: dash-animation 2.5s linear infinite;
-}
-
-@keyframes dash-animation {
-	0% {
-		border-style: dashed;
-	}
-	50% {
-		border-style: solid;
-	}
-	100% {
-		border-style: dashed;
-	}
-}
-
-.fhc-highlight-week {
-	/*border-color: black !important;*/
-}
-
-.fhc-highlight-day {
-	position:relative;
-}
-
-.fhc-highlight-day::before {
-	content:'';
-	position:absolute;
-	top:0;
-	bottom:0;
-	left:0;
-	right:0;
-	box-shadow: inset 0 0 0 2px var(--fhc-calendar-border) !important;
-	pointer-events: none;
-	z-index: 2;
-}
-
-.fhc-calendar-sm .fhc-calendar-month-page-day.active .no,
-.fhc-calendar-xs .fhc-calendar-month-page-day.active .no {
-  background-color: var(--fhc-calendar-primary);
-  border-radius: 50%;
+/* Events */
+.fhc-calendar-base-grid-line-event.event-header {
   font-weight: bold;
 }
-.fhc-calendar-sm .fhc-calendar-month-page-day:not(.active):hover .no,
-.fhc-calendar-xs .fhc-calendar-month-page-day:not(.active):hover .no {
-  background-color: var(--fhc-calendar-primary);
-  border-radius: 50%;
+.fhc-calendar-base-grid-line-event.event-header .disabled {
+  opacity: .3;
 }
-/*.fhc-calendar-sm .fhc-calendar-month-page-day .no,*/
-/*.fhc-calendar-xs .fhc-calendar-month-page-day .no {*/
-/*  display: flex;*/
-/*  align-items: center;*/
-/*  justify-content: center;*/
-/*  width: 80%;*/
-/*  height: 80%;*/
-/*  margin: 10%;*/
-/*}*/
-/*.fhc-calendar-sm .fhc-calendar-month-page-day .events,*/
-/*.fhc-calendar-xs .fhc-calendar-month-page-day .events {*/
-/*  position: absolute;*/
-/*  bottom: 0;*/
-/*  left: 10%;*/
-/*  width: 80%;*/
-/*  height: 10%;*/
-/*  overflow: hidden;*/
-/*  display: flex;*/
-/*}*/
-.fhc-calendar-sm .fhc-calendar-month-page-day .events span,
-.fhc-calendar-xs .fhc-calendar-month-page-day .events span {
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line {
+  overflow: hidden;
+  line-height: 1.5;
+  font-size: .8rem;
+  grid-auto-rows: 1.5em;
+}
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event {
+  text-indent: .5em;
+  height: 1.5em;
   overflow: hidden;
 }
 
-.selectedEvent {
-	background-color: var(--fhc-calendar-primary) !important;
-	color: var(--fhc-calendar-text-light);
+
+/* Customize */
+/* ========= */
+/* Header */
+.fhc-calendar-base-header > .row {
+  align-items: center;
+}
+/* Events */
+.event-colored {
+  background: rgba(var(--event-color-rgb), .5);
+  min-height: 100%;
+}
+.event-colored:hover {
+  background: rgba(var(--event-color-rgb), .3);
+}
+/* Backgrounds */
+.background-past {
+  background: var(--fhc-calendar-past);
+  border-bottom: solid 1px var(--fhc-calendar-border);
+}
+.background-past > span {
+  display: none;
+}
+.background-past.bg-end > span {
+  display: block;
+  position: absolute;
+  top: 100%;
+  left: 1rem;
+  padding: 0 .5rem;
+  background-color: var(--fhc-background);
+  border: solid 1px var(--fhc-calendar-border);
+  font-size: .875em;
 }
 
-.fhc-calendar-day-page .curTimeIndicator{
-	position: absolute;
-	left: 0;
-	right: 0;
-	pointer-events: none;
-	padding-left: 7rem;
-	margin-top: -1px;
-	z-index: 2;
-	border-color: var(--fhc-calendar-border)!important;
-}
-
-.fhc-calendar-week-page .curTimeIndicator {
-	position: absolute;
-	left: 0;
-	right: 0;
-	pointer-events: none;
-	padding-left: 1rem;
-	margin-top: -1px;
-	z-index: 2;
-	border-color: var(--fhc-calendar-border) !important;
-}
-
-.fhc-calendar-week-page .past::before{
-	content:"";
-	background-color: var(--fhc-calendar-past);
-	position: absolute;
-	pointer-events: none;
-	z-index: 2;
-	opacity: 0.5;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: 0;
-}
-
-.fhc-calendar-week-page .overlay {
-	background-color: var(--fhc-calendar-past);
-	position: absolute;
-	pointer-events: none;
-	z-index: 2;
-	opacity: 0.5;
-}
-
-.fhc-calendar-day-page .overlay {
-	background-color: var(--fhc-calendar-past);
-	position: absolute;
-	pointer-events: none;
-	z-index: 2;
-	opacity: 0.5;
-}
-
-.dayPageContainer,
-.weekPageContainer {
-	container-type: inline-size;
-}
-
-#calendarHeaderTitle{
-	color: var(--fhc-text);
-}
-
-.fhc-calendar-day-page .hours,
-.fhc-calendar-day-page .curTimeIndicator,
-.fhc-calendar-day-page .fhc-calendar-hour-indicator,
-.fhc-calendar-week-page .hours,
-.fhc-calendar-week-page .curTimeIndicator,
-.fhc-calendar-week-page .fhc-calendar-hour-indicator,
-.fhc-calendar-day-page .date,
-.fhc-calendar-week-page .date {
-	color: var(--fhc-text-secondary) !important;
-}
\ No newline at end of file
diff --git a/public/js/components/Calendar/Base.js b/public/js/components/Calendar/Base.js
new file mode 100644
index 000000000..816027ade
--- /dev/null
+++ b/public/js/components/Calendar/Base.js
@@ -0,0 +1,272 @@
+import BaseDraganddrop from './Base/DragAndDrop.js';
+import BaseHeader from './Base/Header.js';
+import BaseSlider from './Base/Slider.js';
+
+import CalClick from '../../directives/Calendar/Click.js';
+
+/**
+ * TODO(chris):
+ * - check emits
+ * - event single mode (default for click:event)
+ * - get focusDate/currentDate correct
+ */
+
+export default {
+	name: "CalendarBase",
+	components: {
+		BaseDraganddrop,
+		BaseHeader,
+		BaseSlider
+	},
+	directives: {
+		CalClick
+	},
+	provide() {
+		return {
+			locale: Vue.computed(() => this.locale),
+			timezone: Vue.computed(() => this.timezone),
+			timeGrid: Vue.computed(() => this.timeGrid),
+			draggableEvents: Vue.computed(() => {
+				if (!this.draggableEvents)
+					return () => false;
+
+				if (Array.isArray(this.draggableEvents))
+					return event => this.draggableEvents.includes(event.type);
+				if (this.draggableEvents instanceof Function)
+					return this.draggableEvents;
+				
+				return () => true;
+			}),
+			dropableEvents: Vue.computed(() => {
+				if (!this.onDrop)
+					return () => false;
+
+				if (Array.isArray(this.dropableEvents))
+					return item => this.dropableEvents.includes(item.type);
+				if (this.dropableEvents instanceof Function)
+					return this.dropableEvents;
+
+				return () => true;
+			}),
+			hasDragoverFunc: Vue.computed(() => this.onDragover),
+			mode: Vue.computed(() => this.mode)
+		};
+	},
+	props: {
+		locale: {
+			type: String,
+			default: 'de'
+		},
+		timezone: {
+			type: String,
+			required: true
+		},
+		date: {
+			type: [Date, String, Number, luxon.DateTime],
+			default: luxon.DateTime.local()
+		},
+		modes: {
+			type: Object,
+			required: true,
+			default: {}
+			// TODO(chris): verfication functions
+		},
+		mode: String,
+		modeOptions: Object,
+		events: {
+			type: Array,
+			default: []
+		},
+		backgrounds: {
+			type: Array,
+			default: []
+		},
+		showBtns: Boolean,
+		btnMonth: {
+			type: Boolean,
+			default: undefined
+		},
+		btnWeek: {
+			type: Boolean,
+			default: undefined
+		},
+		btnDay: {
+			type: Boolean,
+			default: undefined
+		},
+		btnList: {
+			type: Boolean,
+			default: undefined
+		},
+		timeGrid: Array,
+		draggableEvents: [Boolean, Array, Function],
+		dropableEvents: [Boolean, Array, Function],
+		onDragover: Function,
+		onDrop: Function
+	},
+	emits: [
+		"click:next",
+		"click:prev",
+		"click:mode",
+		"click:event",
+		"click:day",
+		"click:week",
+		"update:date",
+		"update:mode",
+		"update:range",
+		"drop"
+	],
+	data() {
+		return {
+			internalView: null,
+			internalDate: null
+		};
+	},
+	computed: {
+		convertedEvents() {
+			return this.events.map(orig => ({
+				id: orig.type + orig[orig.type + '_id'],
+				type: orig.type,
+				start: luxon.DateTime.fromISO(orig.isostart).setZone(this.timezone),
+				end: luxon.DateTime.fromISO(orig.isoend).setZone(this.timezone),
+				orig
+			}));
+		},
+		convertedBackgrounds() {
+			return this.backgrounds.map(bg => {
+				const res = { ...bg };
+				if (res.start) {
+					if (Number.isInteger(res.start))
+						res.start = luxon.DateTime.fromMillis(res.start, { zone: this.timezone, locale: this.locale });
+					else if (res.start instanceof Date)
+						res.start = luxon.DateTime.fromJSDate(res.start, { zone: this.timezone, locale: this.locale });
+					else if (typeof res.start === 
+						'string' || res.start instanceof String)
+						res.start = luxon.DateTime.fromISO(res.start, { zone: this.timezone, locale: this.locale });
+				}
+				if (res.end) {
+					if (Number.isInteger(res.end))
+						res.end = luxon.DateTime.fromMillis(res.end, { zone: this.timezone, locale: this.locale });
+					else if (res.end instanceof Date)
+						res.end = luxon.DateTime.fromJSDate(res.end, { zone: this.timezone, locale: this.locale });
+					else if (typeof res.end === 
+						'string' || res.end instanceof String)
+						res.end = luxon.DateTime.fromISO(res.end, { zone: this.timezone, locale: this.locale });
+				}
+				return res;
+			});
+		},
+		cDate: {
+			get() {
+				if (this.internalDate) {
+					return this.internalDate.setLocale(this.locale);
+				}
+				return luxon.DateTime.fromJSDate(new Date(this.date)).setZone(this.timezone).setLocale(this.locale);
+			},
+			set(value) {
+				this.internalDate = value;
+				this.$emit('update:date', value);
+			}
+		},
+		cMode: {
+			get() {
+				if (!this.internalView) {
+					// choose default mode
+					let mode = this.mode;
+					if (!mode || !this.modes[mode])
+						mode = Object.keys(this.modes).find(Boolean); // start with first entry as active mode
+					return mode || '';
+				}
+				return this.internalView;
+			},
+			set(value) {
+				this.internalView = value;
+				this.$emit('update:mode', value);
+			}
+		}
+	},
+	methods: {
+		clickPrev() {
+			const evt = new Event('click:prev', {cancelable: true});
+			this.$emit('click:prev', evt);
+			if (evt.defaultPrevented)
+				return;
+
+			// default: switch page
+			this.$refs.mode.prevPage();
+		},
+		clickNext() {
+			const evt = new Event('click:next', {cancelable: true});
+			this.$emit('click:next', evt);
+			if (evt.defaultPrevented)
+				return;
+
+			// default: switch page
+			this.$refs.mode.nextPage();
+		},
+		handleClickDefaults(evt) {
+			// TODO(chris): implement
+			switch (evt.detail.source) {
+			case 'day':
+				if (this.cMode != 'day' && this.modes['day']) {
+					evt.stopPropagation();
+					this.cDate = evt.detail.value;
+					this.cMode = 'day';
+				}
+				break;
+			case 'week':
+				if (this.cMode != 'week' && this.modes['week']) {
+					evt.stopPropagation();
+					this.cDate = luxon.DateTime.fromObject({
+						localWeekNumber: evt.detail.value.number,
+						localWeekYear: evt.detail.value.year
+					}, {
+						zone: this.cDate.zoneName,
+						locale: this.cDate.locale
+					});
+					this.cMode = 'week';
+				}
+				break;
+			}
+		},
+		onDropItem(evt, start, end) {
+			this.$emit('drop', evt, start, end);
+		}
+	},
+	template: /* html */`
+	<div class="fhc-calendar-base h-100">
+		<base-draganddrop
+			class="card h-100"
+			:events="convertedEvents"
+			:backgrounds="convertedBackgrounds"
+			@drop="onDropItem"
+			v-cal-click:container
+			@cal-click-default.capture="handleClickDefaults"
+		>
+			<base-header
+				class="card-header"
+				v-model:date="cDate"
+				v-model:mode="cMode"
+				@prev="clickPrev"
+				@next="clickNext"
+				@click:mode="$emit('click:mode', $event)"
+				:btn-day="!!modes['day'] && (btnDay || (showBtns && btnDay !== false))"
+				:btn-week="!!modes['week'] && (btnWeek || (showBtns && btnWeek !== false))"
+				:btn-month="!!modes['month'] && (btnMonth || (showBtns && btnMonth !== false))"
+				:btn-list="!!modes['list'] && (btnList || (showBtns && btnList !== false))"
+			>
+				<slot name="actions" />
+			</base-header>
+			<component
+				:is="modes ? modes[cMode] : null || 'div'"
+				ref="mode"
+				v-model:current-date="cDate"
+				@update:range="$emit('update:range', $event)"
+				v-bind="modeOptions ? modeOptions[cMode] : null || {}"
+			>
+				<template v-slot="slot"><slot v-bind="slot" /></template>
+			</component>
+		</base-draganddrop>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Base/DragAndDrop.js b/public/js/components/Calendar/Base/DragAndDrop.js
new file mode 100644
index 000000000..0be17ddb4
--- /dev/null
+++ b/public/js/components/Calendar/Base/DragAndDrop.js
@@ -0,0 +1,162 @@
+import DragAndDrop from '../../../helpers/DragAndDrop.js';
+
+import CalDnd from '../../../directives/Calendar/DragAndDrop.js';
+
+/**
+ * TODO(chris): this needs serious rework!
+ */
+
+export default {
+	name: "CalendarDragAndDrop",
+	directives: {
+		CalDnd
+	},
+	provide() {
+		return {
+			events: Vue.computed(() => this.correctedEvents),
+			backgrounds: Vue.computed(() => this.backgrounds),
+			dropAllowed: Vue.computed(() => this.dragging && this.dropAllowed)
+		};
+	},
+	inject: {
+		mode: "mode",
+		dropableEvents: "dropableEvents"
+	},
+	props: {
+		events: Array,
+		backgrounds: Array
+	},
+	emits: [
+		"drop"
+	],
+	data() {
+		return {
+			dragging: false,
+			allowed: false,
+			draggedInternalEvent: null,
+			draggedExternalEvent: null,
+			targetTimestamp: 0,
+			targetGridEnds: null,
+			dropAllowed: false,
+
+			shadowPreview: false // TODO(chris): IMPLEMENT! (use background instead of event as preview)
+		};
+	},
+	computed: {
+		correctedEvents() {
+			if (this.dragging) {
+				if (this.draggedInternalEvent) {
+					const index = this.events.findIndex(e => e.id == this.draggedInternalEvent.id);
+					if (this.previewEvent && !this.shadowPreview)
+						return this.events.toSpliced(index, 1, this.previewEvent);
+					else
+						return this.events.toSpliced(index, 1);
+				}
+				if (this.previewEvent && !this.shadowPreview)
+					return [...this.events, this.previewEvent];
+			}
+
+			return this.events;
+		},
+		correctedBackgrounds() {
+			if (this.dragging) {
+				if (this.shadowPreview) {
+					// TODO(chris): how to get the length
+					return [...this.backgrounds, {
+						start: new Date(this.targetTimestamp),
+						class: 'shadow-preview'
+					}];
+				}
+			}
+
+			return this.backgrounds;
+		},
+		previewEvent() {
+			if (!this.dragging || !this.dropAllowed)
+				return null;
+			if (!this.targetTimestamp)
+				return null;
+
+			const event = this.draggedInternalEvent || this.draggedExternalEvent;
+
+			if (!event)
+				return null;
+			
+			// TODO(chris): calculate length correctly from orig
+			let length = event.end - event.start;
+			if (this.targetGridEnds)
+				length = this.targetGridEnds.find(end => end >= this.targetTimestamp + length) - this.targetTimestamp;
+			
+			return {
+				orig: event.orig,
+				start: this.targetTimestamp,
+				end: this.targetTimestamp + length
+			};
+		}
+	},
+	methods: {
+		onDragstart(evt) {
+			DragAndDrop.setTransferData(evt.detail.originalEvent, evt.detail.item.orig);
+			this.draggedInternalEvent = evt.detail.item;
+		},
+		onDragend() {
+			this.draggedInternalEvent = null;
+			this.dragging = false;
+		},
+		onDragenter(evt) {
+			this.dragging = true;
+
+			if (!this.draggedInternalEvent) {
+				const event = DragAndDrop.getValidTransferData(evt.detail.originalEvent);
+				if (event) {
+					this.draggedExternalEvent = {
+						id: event.id,
+						type: event.type,
+						start: event.isostart
+							? luxon.DateTime.fromISO(event.isostart).setZone(this.timezone)
+							: luxon.DateTime.local().setZone(this.timezone),
+						end: event.isoend
+							? luxon.DateTime.fromISO(event.isoend).setZone(this.timezone)
+							: luxon.DateTime.local().setZone(this.timezone),
+						orig: event
+					};
+				} else {
+					this.draggedExternalEvent = null;
+				}
+				this.dropAllowed = this.dropableEvents(event, this.mode);
+			} else {
+				this.dropAllowed = this.dropableEvents(this.draggedInternalEvent, this.mode);
+			}
+		},
+		onDragleave() {
+			this.dragging = false;
+		},
+		onDragchange(evt) {
+			this.targetTimestamp = evt.detail.timestamp;
+			
+			this.targetGridEnds = evt.detail.ends || null;
+		},
+		onDrop(evt) {
+			if (!this.dragging || !this.dropAllowed)
+				return;
+
+			this.$emit('drop', evt, this.previewEvent.start, this.previewEvent.end);
+			this.dropAllowed = false;
+			this.dragging = false;
+		}
+	},
+	template: `
+	<div
+		class="fhc-calendar-base-draganddrop"
+		@calendar-dragstart="onDragstart"
+		@calendar-dragend="onDragend"
+		v-cal-dnd:dropcage
+		@calendar-dragenter="onDragenter"
+		@calendar-dragleave="onDragleave"
+		@calendar-dragchange="onDragchange"
+		@drop="onDrop"
+	>
+		<slot />
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Base/Grid.js b/public/js/components/Calendar/Base/Grid.js
new file mode 100644
index 000000000..56465c0f3
--- /dev/null
+++ b/public/js/components/Calendar/Base/Grid.js
@@ -0,0 +1,344 @@
+import GridLine from './Grid/Line.js';
+
+import CalDnd from '../../../directives/Calendar/DragAndDrop.js';
+
+export default {
+	name: "CalendarGrid",
+	components: {
+		GridLine
+	},
+	directives: {
+		CalDnd
+	},
+	inject: {
+		originalEvents: "events",
+		originalBackgrounds: "backgrounds",
+		dropAllowed: "dropAllowed"
+	},
+	provide() {
+		return {
+			flipAxis: Vue.computed(() => this.flipAxis),
+			axisRow: Vue.computed(() => this.axisRow)
+		};
+	},
+	props: {
+		axisMain: {
+			type: Array,
+			required: true,
+			validator(value) {
+				return value.every(item => item instanceof luxon.DateTime);
+			}
+		},
+		axisParts: {
+			type: Array,
+			required: true,
+			validator(value) {
+				return value.every(item => 
+					item instanceof luxon.Duration
+					|| Number.isInteger(item)
+					|| (
+						(
+							item.start instanceof luxon.Duration
+							|| Number.isInteger(item.start)
+						) && (
+							item.end instanceof luxon.Duration
+							|| Number.isInteger(item.end)
+						)
+					)
+				);
+			}
+		},
+		flipAxis: Boolean,
+		allDayEvents: Boolean,
+		axisMainCollapsible: Boolean,
+		snapToGrid: Boolean
+	},
+	data() {
+		return {
+			dragging: false
+		};
+	},
+	computed: {
+		axisRow() {
+			return this.flipAxis ? 'column' : 'row';
+		},
+		axisCol() {
+			return this.flipAxis ? 'row' : 'column';
+		},
+		axisPartsWithBreaks() {
+			return this.axisParts.reduce((res, tu, index) => {
+				const start = tu.start || tu;
+				const end = tu.end;
+
+				if (res.length) {
+					const lastTuEnd = res.pop();
+					if (Array.isArray(lastTuEnd)) {
+						res.push({
+							start: lastTuEnd[0],
+							end: start,
+							index: lastTuEnd[1]
+						});
+					} else if (lastTuEnd != start) {
+						// add pause
+						res.push({
+							start: lastTuEnd,
+							end: start
+						});
+					}
+				}
+
+				if (!end) {
+					res.push([start, index]);
+				} else {
+					res.push({
+						start,
+						end,
+						index
+					});
+					res.push(end);
+				}
+				return res;
+			}, []).slice(0, -1);
+		},
+		axisPartsSave() {
+			if (!this.axisParts[this.axisParts.length - 1].end)
+				return this.axisParts.slice(0, -1);
+			return this.axisParts;
+		},
+		start() {
+			return this.axisPartsWithBreaks[0].start;
+		},
+		end() {
+			return this.axisPartsWithBreaks[this.axisPartsWithBreaks.length - 1].end;
+		},
+		ends() {
+			const ends = [];
+			const partsEnds = this.axisPartsWithBreaks
+				.filter(p => p.index !== undefined)
+				.map(p => p.end);
+			for (var date of this.axisMain)
+				for (var part of partsEnds)
+					ends.push(date.plus(part));
+			
+			return ends;
+		},
+		axisMainBorders() {
+			const lastInMainAxis = this.axisMain[this.axisMain.length - 1];
+			const extraLength = this.end;
+
+			return [...this.axisMain, lastInMainAxis.plus(extraLength)];
+		},
+		events() {
+			return this.mapIntoMainAxis(this.originalEvents);
+		},
+		backgrounds() {
+			return this.mapIntoMainAxis(this.originalBackgrounds);
+		},
+		hasValidEvents() {
+			return this.events.find(e => e.length);
+		},
+		styleGridCols() {
+			let cols = 'repeat(' + this.axisMain.length + ', 1fr)';
+			if (this.axisMainCollapsible) {
+				if (this.hasValidEvents)
+					cols = this.events
+						.map(e => e.length
+							? '1fr'
+							: 'var(--fhc-calendar-axis-collapsible, .5fr)')
+						.join(' ');
+			}
+			return cols;
+		},
+		styleGridRows() {
+			const gridlines = {};
+
+			this.axisPartsWithBreaks.forEach(part => {
+				let ts = part.start.toMillis();
+				if (!gridlines[ts])
+					gridlines[ts] = ['t_' + ts];
+				if (part.index !== undefined)
+					gridlines[ts].push('ps_' + part.index);
+				ts = part.end.toMillis();
+				if (!gridlines[ts])
+					gridlines[ts] = ['t_' + ts];
+				if (part.index !== undefined)
+					gridlines[ts].push('pe_' + part.index);
+			});
+
+			this.events.forEach((events, mainIndex) => {
+				let day = this.axisMain[mainIndex];
+				events.forEach(event => {
+					if (!event.startsHere && !event.endsHere)
+						return;
+					if (this.allDayEvents && event.orig.allDayEvent)
+						return;
+					if (event.startsHere) {
+						let ts = event.start.diff(day).toMillis();
+						if (!gridlines[ts])
+							gridlines[ts] = ['t_' + ts, 'e_' + ts];
+					}
+					if (event.endsHere) {
+						let ts = event.end.diff(day).toMillis();
+						if (!gridlines[ts])
+							gridlines[ts] = ['t_' + ts, 'e_' + ts];
+					}
+				});
+			});
+
+			return '[allday] auto ' + Object.keys(gridlines).sort((a,b) => parseInt(a)-parseInt(b)).map((start, i, keys) => {
+				let end = keys[i + 1];
+				if (!end) {
+					gridlines[start].push('end');
+					return '[' + gridlines[start].join(' ') + ']';
+				}
+				return '[' + gridlines[start].join(' ') + '] ' + (end - start) + 'fr';
+			}).join(' ');
+		}
+	},
+	methods: {
+		mapIntoMainAxis(target) {
+			const result = Array.from({length: this.axisMain.length}, () => Array());
+			
+			target.forEach(event => {
+				// NOTE(chris): make new Date object to reset the time
+				const start = event.start || this.axisMainBorders[0].plus(-1);
+				const end = event.end || this.axisMainBorders[this.axisMainBorders.length - 1].plus(1);
+
+				for (var i = 0; i < this.axisMain.length; i++) {
+					if (start < this.axisMainBorders[i + 1] && end > this.axisMainBorders[i]) {
+						const startsHere = start >= this.axisMainBorders[i];
+						const endsHere = end <= this.axisMainBorders[i+1];
+						result[i].push({
+							...event,
+							startsHere,
+							endsHere
+						});
+					}
+				}
+			});
+
+			return result;
+		},
+
+		/* DRAG AND DROP */
+		getPageTop(el) {
+			let pageTop = el.offsetTop;
+			if (el.offsetParent)
+				pageTop += this.getPageTop(el.offsetParent);
+			return pageTop;
+		},
+		getPageLeft(el) {
+			let pageLeft = el.offsetLeft;
+			if (el.offsetParent)
+				pageLeft += this.getPageLeft(el.offsetParent);
+			return pageLeft;
+		},
+		getTimestampFromMouse(evt, dayTimestamp) {
+			let mouse, mouseFrac;
+			if (this.flipAxis) {
+				mouse = evt.pageX - this.getPageLeft(this.$refs.body) + this.$refs.main.scrollLeft;
+				mouseFrac = mouse / this.$refs.body.offsetWidth;
+			} else {
+				mouse = evt.pageY - this.getPageTop(this.$refs.body) + this.$refs.main.scrollTop;
+				mouseFrac = mouse / this.$refs.body.offsetHeight;
+			}
+
+			return dayTimestamp + this.start + Math.floor((this.end - this.start) * mouseFrac);
+		}
+	},
+	template: /* html */`
+	<div
+		class="fhc-calendar-base-grid"
+		style="display:grid;width:100%;height:100%"
+		:style="'grid-template-' + axisRow + 's:auto 1fr;grid-template-' + axisCol + 's:auto ' + styleGridCols"
+	>
+		<div
+			class="grid-header"
+			style="display:grid"
+			:style="'grid-template-' + axisCol + 's:subgrid;grid-' + axisCol + ':1/-1'"
+		>
+			<div
+				v-for="(date, index) in axisMain"
+				:key="index"
+				class="main-header"
+				:class="{'collapsed-header': axisMainCollapsible && hasValidEvents && !events[index].length}"
+				:style="'grid-' + axisCol + ':' + (2+index)"
+			>
+				<slot name="main-header" v-bind="{ index, date }" />
+			</div>
+		</div>
+		<div
+			style="display:grid;overflow:auto"
+			:style="'grid-' + axisCol + ':1/-1;grid-template-' + axisCol + 's:subgrid'"
+		>
+			<div
+				ref="main"
+				class="grid-main"
+				style="grid-column:1/-1;grid-row:1/-1;display:grid"
+				:style="'grid-template-' + axisCol + 's:subgrid;grid-template-' + axisRow + 's:' + styleGridRows"
+			>
+				<div
+					v-for="(part, index) in axisPartsSave"
+					:key="index"
+					class="part-header"
+					:style="'grid-' + axisCol + ':1;grid-' + axisRow + ': ps_' + index + '/pe_' + index"
+				>
+					<slot name="part-header" v-bind="{ index, part }" />
+				</div>
+
+				<div
+					ref="body"
+					class="grid-body"
+					style="display:grid;grid-template-rows:subgrid;grid-template-columns:subgrid"
+					:style="'grid-' + axisCol + ':2/-1;grid-' + axisRow + ':1/-1'"
+					v-cal-dnd:dropcage
+					@calendar-dragenter="dragging = true"
+					@calendar-dragleave="dragging = false"
+					@dragover="dropAllowed ? $event.preventDefault() : null"
+				>
+					<template
+						v-for="(date, index) in axisMain"
+						:key="index"
+					>
+						<div
+							v-for="(part, i) in axisPartsSave"
+							:key="i"
+							class="part-body"
+							style="position:relative"
+							:style="'grid-' + axisCol + ':' + (1+index) + ';grid-' + axisRow + ':ps_' + i + '/pe_' + i"
+						>
+							<slot name="part-body" v-bind="{ index, part }" />
+							<div
+								v-if="snapToGrid && dragging"
+								style="position:absolute;inset:0;z-index:1"
+								v-cal-dnd:dropzone.once="{date: date.plus(part.start || part), ends: ends.slice(ends.findIndex(end => end > date))}"
+							></div>
+						</div>
+						<grid-line
+							:start="date.plus(start)"
+							:end="date.plus(end)"
+							:date="date"
+							:events="events[index]"
+							:backgrounds="backgrounds[index]"
+							style="position:relative"
+							:style="'grid-' + axisRow + ':1/-1;grid-' + axisCol + ':' + (1+index)"
+							:all-day-events="allDayEvents"
+						>
+							<template #event="slot">
+								<slot name="event" v-bind="slot" />
+							</template>
+							<template #dropzone>
+								<div
+									v-if="!snapToGrid && dragging"
+									style="position:absolute;inset:0;z-index:1"
+									v-cal-dnd:dropzone="evt => getTimestampFromMouse(evt, date)"
+								></div>
+							</template>
+						</grid-line>
+					</template>
+				</div>
+			</div>
+		</div>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Base/Grid/Line.js b/public/js/components/Calendar/Base/Grid/Line.js
new file mode 100644
index 000000000..41f9bd58d
--- /dev/null
+++ b/public/js/components/Calendar/Base/Grid/Line.js
@@ -0,0 +1,111 @@
+import LineEvent from './Line/Event.js';
+import LineBackground from './Line/Background.js';
+
+/**
+ * TODO(chris):
+ * Event overflow for Month mode (more-button)
+ */
+
+export default {
+	name: "GridLine",
+	components: {
+		LineEvent,
+		LineBackground
+	},
+	inject: {
+		axisRow: "axisRow"
+	},
+	props: {
+		date: {
+			type: luxon.DateTime,
+			required: true
+		},
+		start: {
+			type: luxon.DateTime,
+			required: true
+		},
+		end: {
+			type: luxon.DateTime,
+			required: true
+		},
+		events: {
+			type: Array,
+			default: []
+		},
+		backgrounds: {
+			type: Array,
+			default: []
+		},
+		allDayEvents: Boolean
+	},
+	computed: {
+		eventsAllDay() {
+			if (!this.allDayEvents)
+				return [];
+			return this.events.filter(event => event.orig.allDayEvent);
+		},
+		eventsNormal() {
+			if (!this.allDayEvents)
+				return this.events;
+			return this.events.filter(event => !event.orig.allDayEvent);
+		},
+		eventsWithRowInfo() {
+			const events = [];
+			this.eventsNormal.forEach(event => {
+				const rows = [2, -1];
+				if (event.startsHere) {
+					rows[0] = 't_' + event.start.diff(this.date).toMillis();
+				}
+				if (event.endsHere) {
+					rows[1] = 't_' + event.end.diff(this.date).toMillis();
+				}
+
+				events.push({
+					...event,
+					rows
+				});
+			});
+			return events;
+		}
+	},
+	template: /* html */`
+	<div
+		class="fhc-calendar-base-grid-line"
+		style="position:relative;display:grid;grid-auto-flow:dense"
+		:style="'grid-template-' + axisRow + 's:subgrid'"
+	>
+		<line-background
+			v-for="bg in backgrounds"
+			:start="start"
+			:end="end"
+			:background="bg"
+		></line-background>
+		<div
+			v-if="eventsAllDay.length"
+			:style="'grid-' + axisRow + ': allday'"
+			class="all-day-events"
+		>
+			<line-event
+				v-for="(event, i) in eventsAllDay"
+				:key="i"
+				:event="event"
+			>
+				<template v-slot="slot">
+					<slot name="event" v-bind="slot" />
+				</template>
+			</line-event>
+		</div>
+		<line-event
+			v-for="(event, i) in eventsWithRowInfo"
+			:key="i"
+			:style="'grid-' + axisRow + ': ' + event.rows.join('/')"
+			:event="event"
+		>
+			<template v-slot="slot">
+				<slot name="event" v-bind="slot" />
+			</template>
+		</line-event>
+		<slot name="dropzone" />
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Base/Grid/Line/Background.js b/public/js/components/Calendar/Base/Grid/Line/Background.js
new file mode 100644
index 000000000..e87737ffc
--- /dev/null
+++ b/public/js/components/Calendar/Base/Grid/Line/Background.js
@@ -0,0 +1,72 @@
+export default {
+	name: "GridLineBackground",
+	inject: {
+		flipAxis: "flipAxis"
+	},
+	props: {
+		start: {
+			type: luxon.DateTime,
+			required: true
+		},
+		end: {
+			type: luxon.DateTime,
+			required: true
+		},
+		background: {
+			type: Object,
+			required: true,
+			validator(value) {
+				if (!value.start && !value.end)
+					return false;
+				if (value.start && !(value.start instanceof luxon.DateTime))
+					return false;
+				if (value.end && !(value.end instanceof luxon.DateTime))
+					return false;
+				return true;
+			}
+		}
+	},
+	computed: {
+		styles() {
+			if (!this.background.endsHere && !this.background.startsHere)
+				return this.background.style;
+
+			const perc = (this.end.ts - this.start.ts) / 100;
+			
+			let border = {};
+			if (this.background.startsHere)
+				border[this.flipAxis ? 'left' : 'top'] = (this.background.start.diff(this.start)) / perc + '%';
+			if (this.background.endsHere)
+				border[this.flipAxis ? 'right' : 'bottom'] = (this.end.diff(this.background.end)) / perc + '%';
+
+			if (!this.background.style)
+				return border;
+			
+			return [this.background.style, border];
+		},
+		classes() {
+			if (!this.background.endsHere && !this.background.startsHere)
+				return this.background.class;
+			
+			const result = [];
+			if (this.background.class)
+				result.push(this.background.class);
+			if (this.background.startsHere)
+				result.push('bg-begin');
+			if (this.background.endsHere)
+				result.push('bg-end');
+			return result;
+		}
+	},
+	template: /* html */`
+	<div
+		class="fhc-calendar-base-grid-line-background"
+		:class="classes"
+		style="position:absolute;inset:0;z-index:0"
+		:style="styles"
+		:title="background.title"
+	>
+		<span v-if="background.label">{{ background.label }}</span>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Base/Grid/Line/Event.js b/public/js/components/Calendar/Base/Grid/Line/Event.js
new file mode 100644
index 000000000..5cf098eb5
--- /dev/null
+++ b/public/js/components/Calendar/Base/Grid/Line/Event.js
@@ -0,0 +1,57 @@
+import CalDnd from '../../../../../directives/Calendar/DragAndDrop.js';
+import CalClick from '../../../../../directives/Calendar/Click.js';
+
+export default {
+	name: "GridLineEvent",
+	directives: {
+		CalDnd,
+		CalClick
+	},
+	inject: {
+		draggableEvents: "draggableEvents",
+		mode: "mode"
+	},
+	props: {
+		event: {
+			type: Object,
+			required: true,
+			validator(value) {
+				return (value.start && value.end && value.orig);
+			}
+		}
+	},
+	computed: {
+		isHeaderOrFooter() {
+			return ['header', 'footer'].includes(this.event.orig);
+		},
+		draggable() {
+			return !this.isHeaderOrFooter && this.draggableEvents(this.event.orig, this.mode);
+		},
+		classes() {
+			const classes = [];
+			if (this.isHeaderOrFooter) {
+				classes.push('event-' + this.event.orig);
+			} else {
+				if (this.event.startsHere)
+					classes.push('event-begin');
+				if (this.event.endsHere)
+					classes.push('event-end');
+			}
+			return classes
+		}
+	},
+	template: /* html */`
+	<div
+		class="fhc-calendar-base-grid-line-event"
+		:class="classes"
+		style="z-index: 1"
+		:draggable="draggable"
+		v-cal-dnd:draggable="event"
+		v-cal-click:event="isHeaderOrFooter ? event : event.orig"
+	>
+		<slot :event="isHeaderOrFooter ? event : event.orig">
+			{{ event.orig }}
+		</slot>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Base/Header.js b/public/js/components/Calendar/Base/Header.js
new file mode 100644
index 000000000..6dc0d3c26
--- /dev/null
+++ b/public/js/components/Calendar/Base/Header.js
@@ -0,0 +1,118 @@
+/**
+ * TODO(chris): use click-directive
+ */
+import DatePicker from './Header/Datepicker.js';
+
+export default {
+	name: "CalendarHeader",
+	components: {
+		DatePicker
+	},
+	props: {
+		date: {
+			type: luxon.DateTime,
+			required: true
+		},
+		mode: {
+			type: String,
+			required: true
+		},
+		btnMonth: Boolean,
+		btnWeek: Boolean,
+		btnDay: Boolean,
+		btnList: Boolean
+	},
+	emits: [
+		"next",
+		"prev",
+		"click:mode",
+		"update:date",
+		"update:mode"
+	],
+	data() {
+		return {
+			open: false
+		};
+	},
+	methods: {
+		clickMode(evt, mode) {
+			this.$emit('click:mode', evt);
+			if (!evt.defaultPrevented)
+				this.$emit('update:mode', mode);
+		}
+	},
+	template: /* html */`
+	<div class="fhc-calendar-base-header">
+		<div class="row">
+			<div class="col">
+				<slot />
+			</div>
+			<div class="col-auto d-flex justify-content-center">
+				<div class="btn-group" role="group">
+					<button
+						class="btn btn-outline-secondary border-0"
+						@click="$emit('prev')"
+						:disabled="open"
+					>
+						<i class="fa fa-chevron-left"></i>
+					</button>
+					<date-picker
+						:mode="mode"
+						:date="date"
+						@update:date="$emit('update:date', $event)"
+						@open="open = true"
+						@closed="open = false"
+					/>
+					<button
+						class="btn btn-outline-secondary border-0"
+						@click="$emit('next')"
+						:disabled="open"
+					>
+						<i class="fa fa-chevron-right"></i>
+					</button>
+				</div>
+			</div>
+			<div class="col">
+				<div class="d-flex gap-1 justify-content-end" role="group">
+					<button
+						v-if="btnMonth"
+						type="button"
+						class="btn btn-outline-secondary"
+						:class="{active: mode === 'month'}"
+						@click="clickMode($event, 'month')"
+					>
+						<i class="fa fa-calendar-days"></i>
+					</button>
+					<button
+						v-if="btnWeek"
+						type="button"
+						class="btn btn-outline-secondary"
+						:class="{active: mode === 'week'}"
+						@click="clickMode($event, 'week')"
+					>
+						<i class="fa fa-calendar-week"></i>
+					</button>
+					<button
+						v-if="btnDay"
+						type="button"
+						class="btn btn-outline-secondary"
+						:class="{active: mode === 'day'}"
+						@click="clickMode($event, 'day')"
+					>
+						<i class="fa fa-calendar-day"></i>
+					</button>
+					<button
+						v-if="btnList"
+						type="button"
+						class="btn btn-outline-secondary"
+						:class="{active: mode === 'list'}"
+						@click="clickMode($event, 'list')"
+					>
+						<i class="fa fa-table-list"></i>
+					</button>
+				</div>
+			</div>
+		</div>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Base/Header/Datepicker.js b/public/js/components/Calendar/Base/Header/Datepicker.js
new file mode 100644
index 000000000..f6e521805
--- /dev/null
+++ b/public/js/components/Calendar/Base/Header/Datepicker.js
@@ -0,0 +1,119 @@
+// TODO(chris): translate aria-labels
+
+export default {
+	name: "CalendarHeaderDatepicker",
+	components: {
+		VueDatePicker
+	},
+	inject: [
+		"locale",
+		"timezone"
+	],
+	props: {
+		date: {
+			type: luxon.DateTime,
+			required: true
+		},
+		mode: {
+			type: String,
+			required: true
+		},
+		listLength: {
+			type: Number,
+			default: 7
+		}
+	},
+	emits: [
+		"update:date"
+	],
+	computed: {
+		convertedDate() {
+			// convert to target TZ then strip TZ Information
+			// so the datepicker can work with local times
+			return this.date.setZone(this.timezone).setZone('local', { keepLocalTime: true });
+		},
+		current() {
+			switch (this.mode) {
+			case "month":
+				return {month: this.convertedDate.month-1, year: this.convertedDate.year};
+			case "list":
+				return [this.convertedDate.startOf('day').ts, this.convertedDate.startOf('day').plus({ days: this.listLength }).ts - 1];
+			case "week":
+				return [this.convertedDate.startOf('week', { useLocaleWeeks: true }).ts, this.convertedDate.endOf('week', { useLocaleWeeks: true }).ts];
+			case "day":
+				return this.convertedDate;
+			default:
+				return null;
+			}
+		},
+		title() {
+			switch (this.mode) {
+			case "month":
+				return this.date.toLocaleString({ month: 'long', year: 'numeric' });
+			case "week":
+				const year = this.date.localWeekYear;
+				const week = this.date.toFormat('nn');
+				return this.$p.t('calendar/year_kw', { year, week });
+			case "list":
+			case "day":
+				return this.date.toLocaleString(luxon.DateTime.DATE_FULL);
+			default:
+				return 'View not Supported';
+			}
+		},
+		format() {
+			const title = this.title;
+			return `'${title}'`;
+		},
+		weekStart() {
+			return luxon.Info.getStartOfWeek(this.date)%7;
+		}
+	},
+	methods: {
+		update(value) {
+			let date;
+			switch (this.mode) {
+			case "month":
+				value.month++;
+				date = luxon.DateTime.fromObject(value).setZone(this.timezone, { keepLocalTime: true }).setLocale(this.locale);
+				break;
+			case "list":
+			case "week":
+				date = luxon.DateTime.fromJSDate(value[0]).setZone(this.timezone, { keepLocalTime: true }).setLocale(this.locale);
+				break;
+			case "day":
+				date = luxon.DateTime.fromJSDate(value).setZone(this.timezone, { keepLocalTime: true }).setLocale(this.locale);
+				break;
+			default:
+				return; // Don't update if the value is invalid!
+			}
+			this.$emit("update:date", date);
+		},
+		weekNumbers(date) {
+			return luxon.DateTime.fromJSDate(date, { locale: this.locale }).localWeekNumber;
+		}
+	},
+	template: /* html */`
+	<vue-date-picker
+		:model-value="current"
+		@update:model-value="update"
+		:format="format"
+		:month-picker="mode == 'month'"
+		:week-picker="mode == 'week'"
+		:range="mode == 'list' ? { autoRange: listLength } : false"
+		:text-input="mode == 'day'"
+		:week-start="weekStart"
+		:week-numbers="{ type: weekNumbers }"
+		:clearable="false"
+		:enable-time-picker="false"
+		:config="{ keepActionRow: mode != 'month' }"
+		:action-row="{ showSelect: false, showCancel: false, showNow: mode != 'month', showPreview: false }"
+		auto-apply
+		six-weeks
+		teleport
+		:locale="locale"
+		:now-button-label="$p.t('calendar/today')"
+		:week-num-name="$p.t('calendar/kw')"
+	/>
+	`
+}
diff --git a/public/js/components/Calendar/Base/Label/Day.js b/public/js/components/Calendar/Base/Label/Day.js
new file mode 100644
index 000000000..731beebd2
--- /dev/null
+++ b/public/js/components/Calendar/Base/Label/Day.js
@@ -0,0 +1,39 @@
+import CalClick from '../../../../directives/Calendar/Click.js';
+
+export default {
+	name: "LabelDay",
+	directives: {
+		CalClick
+	},
+	props: {
+		date: {
+			type: luxon.DateTime,
+			required: true
+		}
+	},
+	computed: {
+		titleFull() {
+			return this.date.toLocaleString({day: 'numeric', month: 'long', year: 'numeric'});
+		},
+		titleLong() {
+			return this.date.toLocaleString({day: '2-digit', month: '2-digit', year: 'numeric'});
+		},
+		titleShort() {
+			return this.date.toLocaleString({day: 'numeric', month: 'numeric'});
+		},
+		titleNarrow() {
+			return this.date.toLocaleString({day: 'numeric'});
+		}
+	},
+	template: /* html */`
+	<div
+		class="fhc-calendar-base-label-day"
+		v-cal-click:day="date"
+	>
+		<span class="full">{{ titleFull }}</span>
+		<span class="long">{{ titleLong }}</span>
+		<span class="short">{{ titleShort }}</span>
+		<span class="narrow">{{ titleNarrow }}</span>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Base/Label/Dow.js b/public/js/components/Calendar/Base/Label/Dow.js
new file mode 100644
index 000000000..4da02de64
--- /dev/null
+++ b/public/js/components/Calendar/Base/Label/Dow.js
@@ -0,0 +1,35 @@
+import CalClick from '../../../../directives/Calendar/Click.js';
+
+export default {
+	name: "LabelDow",
+	directives: {
+		CalClick
+	},
+	props: {
+		date: {
+			type: luxon.DateTime,
+			required: true
+		}
+	},
+	computed: {
+		titleLong() {
+			return this.date.toLocaleString({weekday: 'long'});
+		},
+		titleShort() {
+			return this.date.toLocaleString({weekday: 'short'});
+		},
+		titleNarrow() {
+			return this.date.toLocaleString({weekday: 'narrow'});
+		}
+	},
+	template: /* html */`
+	<div
+		class="fhc-calendar-base-label-dow"
+		v-cal-click:dow="date"
+	>
+		<b class="long">{{ titleLong }}</b>
+		<b class="short">{{ titleShort }}</b>
+		<b class="narrow">{{ titleNarrow }}</b>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Base/Label/Time.js b/public/js/components/Calendar/Base/Label/Time.js
new file mode 100644
index 000000000..a7fc21ae7
--- /dev/null
+++ b/public/js/components/Calendar/Base/Label/Time.js
@@ -0,0 +1,58 @@
+export default {
+	name: "LabelTime",
+	props: {
+		part: {
+			type: [luxon.Duration, Number, Object],
+			required: true,
+			validator(value) {
+				if (value instanceof Object) {
+					if (value instanceof luxon.Duration)
+						return true;
+					let start_ok = true;
+					let end_ok = true;
+					if (value.start) {
+						start_ok = (
+							value.start instanceof luxon.Duration
+							|| Number.isInteger(value.start)
+						);
+					}
+					if (value.end) {
+						end_ok = (
+							value.end instanceof luxon.Duration
+							|| Number.isInteger(value.end)
+						);
+					}
+					return start_ok && end_ok;
+				}
+				return true;
+			}
+		}
+	},
+	computed: {
+		sanitizedTimestamps() {
+			return this.part.start || this.part.end ? this.part : { start: this.part };
+		},
+		start() {
+			if (!this.sanitizedTimestamps.start)
+				return null;
+			return this.formatTime(this.sanitizedTimestamps.start);
+		},
+		end() {
+			if (!this.sanitizedTimestamps.end)
+				return null;
+			return this.formatTime(this.sanitizedTimestamps.end);
+		}
+	},
+	methods: {
+		formatTime(date) {
+			return date.toISOTime({ suppressSeconds: true });
+		}
+	},
+	template: `
+	<div class="fhc-calendar-base-label-time">
+		<span v-if="start">{{ start }}</span>
+		<span v-if="end">-</span>
+		<span v-if="end">{{ end }}</span>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Base/Label/Week.js b/public/js/components/Calendar/Base/Label/Week.js
new file mode 100644
index 000000000..76849f2c6
--- /dev/null
+++ b/public/js/components/Calendar/Base/Label/Week.js
@@ -0,0 +1,38 @@
+import CalClick from '../../../../directives/Calendar/Click.js';
+
+export default {
+	name: "LabelWeek",
+	directives: {
+		CalClick
+	},
+	props: {
+		date: {
+			type: luxon.DateTime,
+			required: true
+		}
+	},
+	computed: {
+		weeks() {
+			const firstDay = this.date.startOf('week', { useLocaleWeeks: true });
+			const lastDay = this.date.endOf('week', { useLocaleWeeks: true });
+
+			const weeks = [
+				{ number: firstDay.localWeekNumber, year: firstDay.localWeekYear },
+				{ number: lastDay.localWeekNumber, year: lastDay.localWeekYear }
+			];
+			if (weeks[0].number == weeks[1].number)
+				weeks.pop();
+			return weeks;
+		}
+	},
+	template: `
+	<div class="fhc-calendar-base-label-week">
+		<span
+			v-for="week in weeks"
+			v-cal-click:week="week"
+		>
+			{{ week.number }}
+		</span>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Base/Slider.js b/public/js/components/Calendar/Base/Slider.js
new file mode 100644
index 000000000..192eccd5f
--- /dev/null
+++ b/public/js/components/Calendar/Base/Slider.js
@@ -0,0 +1,129 @@
+export default {
+	name: 'CalendarSlider',
+	inject: {
+		time: {
+			from: "sliderTime",
+			default: ".3s"
+		}
+	},
+	emits: [
+		'slid'
+	],
+	data() {
+		return {
+			target: 0,
+			extrasAfter: 0,
+			extrasBefore: 0,
+			running: false,
+			promiseResolve: null
+		}
+	},
+	computed: {
+		itemsAfter() {
+			return [...Array(this.extrasAfter)].map((i, k) => 1+k);
+		},
+		itemsBefore() {
+			return [...Array(this.extrasBefore)].map((i, k) => k-this.extrasBefore);
+		},
+		styleSlider() {
+			const style = {
+				position: 'absolute',
+				top: 0,
+				left: 0,
+				width: '100%',
+				height: '100%'
+			};
+			if (this.running) {
+				style.left = (-this.target * 100) + '%';
+				style.transition = 'left ' + this.time + ' ease-in-out';
+			}
+			return style;
+		},
+		styleBefore() {
+			return {
+				position: 'absolute',
+				top: 0,
+				height: '100%',
+				display: 'flex',
+				right: '100%',
+				width: (this.extrasBefore * 100) + '%'
+			};
+		},
+		styleAfter() {
+			return {
+				position: 'absolute',
+				top: 0,
+				height: '100%',
+				display: 'flex',
+				left: '100%',
+				width: (this.extrasAfter * 100) + '%'
+			};
+		}
+	},
+	methods: {
+		prevPage() {
+			return this.slidePages(-1);
+		},
+		nextPage() {
+			return this.slidePages(1);
+		},
+		slidePages(dir) {
+			return new Promise(resolve => {
+				this.promiseResolve = resolve;
+				this.running = true;
+				const newTarget = this.target + dir;
+				if (newTarget > 0) {
+					if (this.extrasAfter < newTarget)
+						this.extrasAfter = newTarget;
+				} else if (newTarget < 0) {
+					if (-this.extrasBefore > newTarget)
+						this.extrasBefore = -newTarget;
+				}
+				this.target = newTarget;
+			});
+		},
+		endSlide() {
+			if (this.promiseResolve) {
+				this.promiseResolve(this.target);
+				this.promiseResolve = null;
+			}
+			this.$emit('slid', this.target);
+			this.running = false;
+			this.target = 0;
+			this.extrasAfter = this.extrasBefore = 0;
+		}
+	},
+	template: /* html */`
+	<div
+		class="fhc-calendar-base-slider h-100"
+		style="position:relative;overflow:hidden"
+	>
+		<div
+			:style="styleSlider"
+			@transitionend="endSlide"
+		>
+			<div :style="styleBefore">
+				<div
+					v-for="i in itemsBefore"
+					:key="i"
+					style="height:100%;width:100%"
+				>
+					<slot :offset="i" />
+				</div>
+			</div>
+			<div :style="styleAfter">
+				<div
+					v-for="i in itemsAfter"
+					:key="i"
+					style="height:100%;width:100%"
+				>
+					<slot :offset="i" />
+				</div>
+			</div>
+			<div style="height:100%;width:100%">
+				<slot :offset="0" />
+			</div>
+		</div>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Mode/Day.js b/public/js/components/Calendar/Mode/Day.js
new file mode 100644
index 000000000..dc697cfc0
--- /dev/null
+++ b/public/js/components/Calendar/Mode/Day.js
@@ -0,0 +1,89 @@
+import BaseSlider from '../Base/Slider.js';
+import DayView from './Day/View.js';
+
+export default {
+	name: "ModeDay",
+	components: {
+		BaseSlider,
+		DayView
+	},
+	props: {
+		currentDate: {
+			type: luxon.DateTime,
+			required: true
+		}
+	},
+	emits: [
+		"update:currentDate",
+		"update:range",
+		"click"
+	],
+	data() {
+		return {
+			focusDate: this.currentDate,
+			rangeOffset: 0
+		};
+	},
+	computed: {
+		range() {
+			let first = this.focusDate.startOf('day');
+			let last = this.focusDate.endOf('day');
+			
+			if (this.rangeOffset != 0) {
+				if (this.rangeOffset < 0) {
+					first = first.plus({ days: this.rangeOffset });
+				} else {
+					last = last.plus({ days: this.rangeOffset });
+				}
+			}
+
+			return luxon.Interval.fromDateTimes(first, last);
+		}
+	},
+	watch: {
+		currentDate() {
+			this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days;
+			if (this.rangeOffset) {
+				this.$emit('update:range', this.range);
+				this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
+			}
+		}
+	},
+	methods: {
+		prevPage() {
+			this.rangeOffset = this.$refs.slider.target - 1;
+			this.$emit('update:range', this.range);
+			this.$refs.slider.prevPage().then(this.updatePage);
+		},
+		nextPage() {
+			this.rangeOffset = this.$refs.slider.target + 1;
+			this.$emit('update:range', this.range);
+			this.$refs.slider.nextPage().then(this.updatePage);
+		},
+		updatePage(days) {
+			const newFocusDate = this.focusDate.plus({ days });
+			this.focusDate = newFocusDate;
+			this.rangeOffset = 0;
+			this.$emit('update:currentDate', this.focusDate);
+			this.$emit('update:range', this.range);
+		},
+		viewAttrs(days) {
+			const day = this.focusDate.plus({ days });
+			return { day };
+		}
+	},
+	mounted() {
+		this.$emit('update:range', this.range);
+	},
+	template: `
+	<div
+		class="fhc-calendar-mode-day flex-grow-1 position-relative"
+	>
+		<base-slider ref="slider" v-slot="slot">
+			<day-view v-bind="viewAttrs(slot.offset)">
+				<template v-slot="slot"><slot v-bind="slot" /></template>
+			</day-view>
+		</base-slider>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Mode/Day/View.js b/public/js/components/Calendar/Mode/Day/View.js
new file mode 100644
index 000000000..cdd212b6d
--- /dev/null
+++ b/public/js/components/Calendar/Mode/Day/View.js
@@ -0,0 +1,103 @@
+import CalendarGrid from '../../Base/Grid.js';
+import LabelDay from '../../Base/Label/Day.js';
+import LabelDow from '../../Base/Label/Dow.js';
+import LabelTime from '../../Base/Label/Time.js';
+
+export default {
+	name: "DayView",
+	components: {
+		CalendarGrid,
+		LabelDay,
+		LabelDow,
+		LabelTime
+	},
+	inject: {
+		timeGrid: "timeGrid",
+		originalEvents: "events"
+	},
+	props: {
+		day: {
+			type: luxon.DateTime,
+			required: true
+		}
+	},
+	data() {
+		return {
+			chosenEvent: null
+		};
+	},
+	computed: {
+		axisMain() {
+			return [this.day.startOf('day')];
+		},
+		axisParts() {
+			if (this.timeGrid) {
+				// create {start, end} array
+				return this.timeGrid.map(tu => {
+					return {
+						start: luxon.Duration.fromISOTime(tu.start),
+						end: luxon.Duration.fromISOTime(tu.end)
+					};
+				});
+			} else {
+				// create 07:00-23:00
+				return Array.from({ length: 17 }, (e, i) => luxon.Duration.fromObject({ hours: i + 7 }));
+			}
+		},
+		events() {
+			return this.originalEvents
+				.filter(event => event.start < this.day.plus({ days: 1 }) && event.end > this.day)
+				.sort((a, b) => a.start.ts - b.start.ts)
+				.map(evt => evt.orig);
+		},
+		currentEvent() {
+			if (this.chosenEvent) {
+				if (this.events.find(e => e == this.chosenEvent))
+					return this.chosenEvent;
+			}
+			if (this.events)
+				return this.events.find(Boolean); // undefined => none found
+			return null; // null => loading
+		}
+	},
+	methods: {
+		handleClickDefaults(evt) {
+			if (evt.detail.source == 'event') {
+				this.chosenEvent = evt.detail.value;
+			}
+		}
+	},
+	template: /* html */`
+	<div
+		class="fhc-calendar-mode-day-view d-flex h-100"
+		@cal-click-default.capture="handleClickDefaults"
+	>
+		<calendar-grid
+			:axis-main="axisMain"
+			:axis-parts="axisParts"
+			:snap-to-grid="!!timeGrid"
+			all-day-events
+		>
+			<template #main-header="{ date }">
+				<label-dow
+					@cal-click="evt => evt.detail.source = 'day'"
+					v-bind="{ date }"
+				/>
+				<label-day
+					v-bind="{ date }"
+				/>
+			</template>
+			<template #part-header="{ part }">
+				<label-time v-bind="{ part }" />
+			</template>
+			<template #event="slot">
+				<slot v-bind="slot" mode="day" />
+			</template>
+		</calendar-grid>
+		<div class="w-100">
+			<div v-if="currentEvent === null">loading...</div>
+			<slot v-else :event="currentEvent" mode="event" />
+		</div>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Mode/List.js b/public/js/components/Calendar/Mode/List.js
new file mode 100644
index 000000000..56ba7b1f9
--- /dev/null
+++ b/public/js/components/Calendar/Mode/List.js
@@ -0,0 +1,93 @@
+import BaseSlider from '../Base/Slider.js';
+import ListView from './List/View.js';
+
+export default {
+	name: "ModeList",
+	components: {
+		BaseSlider,
+		ListView
+	},
+	props: {
+		currentDate: {
+			type: luxon.DateTime,
+			required: true
+		},
+		length: {
+			type: Number,
+			default: 7
+		}
+	},
+	emits: [
+		"update:currentDate",
+		"update:range",
+		"click"
+	],
+	data() {
+		return {
+			focusDate: this.currentDate,
+			rangeOffset: 0
+		};
+	},
+	computed: {
+		range() {
+			let first = this.focusDate;
+			let last = first.plus({ days: this.length });
+
+			if (this.rangeOffset != 0) {
+				if (this.rangeOffset < 0) {
+					first = first.plus({ days: this.rangeOffset * this.length });
+				} else {
+					last = last.plus({ days: this.rangeOffset * this.length });
+				}
+			}
+
+			return luxon.Interval.fromDateTimes(first, last);
+		}
+	},
+	watch: {
+		currentDate() {
+			this.rangeOffset = Math.floor(this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days / this.length);
+			if (this.rangeOffset) {
+				this.$emit('update:range', this.range);
+				this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
+			}
+		}
+	},
+	methods: {
+		prevPage() {
+			this.rangeOffset = this.$refs.slider.target - 1;
+			this.$emit('update:range', this.range);
+			this.$refs.slider.prevPage().then(this.updatePage);
+		},
+		nextPage() {
+			this.rangeOffset = this.$refs.slider.target + 1;
+			this.$emit('update:range', this.range);
+			this.$refs.slider.nextPage().then(this.updatePage);
+		},
+		updatePage(offset) {
+			const newFocusDate = this.focusDate.plus({ days: offset * this.length });
+			this.focusDate = newFocusDate;
+			this.rangeOffset = 0;
+			this.$emit('update:currentDate', this.focusDate);
+			this.$emit('update:range', this.range);
+		},
+		viewAttrs(offset) {
+			const day = this.focusDate.plus({ days: offset * this.length });
+			return { day, length: this.length };
+		}
+	},
+	mounted() {
+		this.$emit('update:range', this.range);
+	},
+	template: `
+	<div
+		class="fhc-calendar-mode-list flex-grow-1 position-relative"
+	>
+		<base-slider ref="slider" v-slot="slot">
+			<list-view v-bind="viewAttrs(slot.offset)">
+				<template v-slot="slot"><slot v-bind="slot" /></template>
+			</list-view>
+		</base-slider>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Mode/List/View.js b/public/js/components/Calendar/Mode/List/View.js
new file mode 100644
index 000000000..50560c0e7
--- /dev/null
+++ b/public/js/components/Calendar/Mode/List/View.js
@@ -0,0 +1,61 @@
+import LabelDay from '../../Base/Label/Day.js';
+import LabelDow from '../../Base/Label/Dow.js';
+
+// TODO(chris): drag and drop
+
+export default {
+	name: "ListView",
+	components: {
+		LabelDay,
+		LabelDow
+	},
+	inject: {
+		events: "events"
+	},
+	props: {
+		day: {
+			type: luxon.DateTime,
+			required: true
+		},
+		length: {
+			type: Number,
+			required: true
+		}
+	},
+	data() {
+		return {
+			chosenEvent: null
+		};
+	},
+	computed: {
+		days() {
+			return Array.from({ length: this.length }, (e, days) => this.day.plus({ days }));
+		},
+		eventsPerDay() {
+			const eventsPerDay = this.days.map(day => {
+				return {
+					day,
+					events: this.events
+						.filter(event => event.start < day.plus({ days: 1 }) && event.end > day)
+						.sort((a, b) => a.start.ts - b.start.ts)
+				};
+			});
+			return eventsPerDay.filter(day => day.events.length);
+		}
+	},
+	template: /* html */`
+	<div
+		class="fhc-calendar-mode-list-view h-100"
+	>
+		<div v-if="!eventsPerDay.length">
+			<slot :event="undefined" mode="list" />
+		</div>
+		<div v-for="{ day, events } in eventsPerDay" class="text-center">
+			<label-dow :date="day" class="d-inline" />, <label-day :date="day" class="d-inline" />
+			<div v-for="event in events">
+				<slot :event="event.orig" mode="list" />
+			</div>
+		</div>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Mode/Month.js b/public/js/components/Calendar/Mode/Month.js
new file mode 100644
index 000000000..038c39123
--- /dev/null
+++ b/public/js/components/Calendar/Mode/Month.js
@@ -0,0 +1,125 @@
+import BaseSlider from '../Base/Slider.js';
+import MonthView from './Month/View.js';
+
+export default {
+	name: "ModeMonth",
+	components: {
+		BaseSlider,
+		MonthView
+	},
+	props: {
+		currentDate: {
+			type: luxon.DateTime,
+			required: true
+		}
+	},
+	emits: [
+		"update:currentDate",
+		"update:range",
+		"click"
+	],
+	data() {
+		return {
+			focusDate: this.currentDate,
+			rangeOffset: 0
+		};
+	},
+	computed: {
+		range() {
+			let first = this.focusDate.startOf('month').startOf('week', { useLocaleWeeks: true });
+			let last = first.plus({ days: 41 }).endOf('day'); // NOTE(chris): 6 weeks minus 1 day
+
+			if (this.rangeOffset != 0) {
+				const nextFocusDate = this.focusDate.plus({ months: this.rangeOffset});
+				const nextRangeStart = nextFocusDate.startOf('month').startOf('week', { useLocaleWeeks: true });
+				if (this.rangeOffset < 0) {
+					first = nextRangeStart;
+				} else {
+					last = nextRangeStart.plus({ days: 41 }).endOf('day');
+				}
+			}
+
+			return luxon.Interval.fromDateTimes(first, last);
+		}
+	},
+	watch: {
+		currentDate() {
+			if (this.currentDate.locale != this.focusDate.locale) {
+				this.focusDate = this.currentDate;
+				this.$emit('update:range', this.range);
+			} else {
+				this.rangeOffset = this.currentDate.startOf('month').diff(this.focusDate.startOf('month'), 'months').months;
+				if (this.rangeOffset) {
+					this.$emit('update:range', this.range);
+					this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
+				}
+			}
+		}
+	},
+	methods: {
+		prevPage() {
+			this.rangeOffset = this.$refs.slider.target - 1;
+			this.$emit('update:range', this.range);
+			this.$refs.slider.prevPage().then(this.updatePage);
+		},
+		nextPage() {
+			this.rangeOffset = this.$refs.slider.target + 1;
+			this.$emit('update:range', this.range);
+			this.$refs.slider.nextPage().then(this.updatePage);
+		},
+		updatePage(months) {
+			const newFocusDate = this.focusDate.plus({ months });
+			this.focusDate = newFocusDate;
+			this.rangeOffset = 0;
+			this.$emit('update:currentDate', this.focusDate);
+			this.$emit('update:range', this.range);
+		},
+		viewAttrs(months) {
+			const day = this.focusDate.plus({ months });
+			return { day };
+		},
+		handleClickDefaults(evt) {
+			switch (evt.detail.source) {
+			case 'week':
+				// default: Move to week if not in month
+				let dayInWeek = luxon.DateTime.fromObject({
+					localWeekNumber: evt.detail.value.number,
+					localWeekYear: evt.detail.value.year
+				}, {
+					zone: this.currentDate.zoneName,
+					locale: this.currentDate.locale
+				});
+
+				if (!this.focusDate.hasSame(dayInWeek.startOf('week', { useLocaleWeeks: true }), 'month')) {
+					this.$emit('update:currentDate', dayInWeek.startOf('week', { useLocaleWeeks: true }));
+				} else if (!this.focusDate.hasSame(dayInWeek.endOf('week', { useLocaleWeeks: true }), 'month')) {
+					this.$emit('update:currentDate', dayInWeek.endOf('week', { useLocaleWeeks: true }));
+				}
+				break;
+			case 'day':
+				// default: Set current-date
+				this.$emit('update:currentDate', evt.detail.value);
+				break;
+			case 'event':
+				// TODO(chris): IMPLEMENT!
+				// default: ???
+				break;
+			}
+		}
+	},
+	mounted() {
+		this.$emit('update:range', this.range);
+	},
+	template: `
+	<div
+		class="fhc-calendar-mode-month flex-grow-1 position-relative"
+		@cal-click-default.capture="handleClickDefaults"
+	>
+		<base-slider ref="slider" v-slot="slot">
+			<month-view v-bind="viewAttrs(slot.offset)">
+				<template v-slot="slot"><slot v-bind="slot" mode="month" /></template>
+			</month-view>
+		</base-slider>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Mode/Month/View.js b/public/js/components/Calendar/Mode/Month/View.js
new file mode 100644
index 000000000..a9f5a5008
--- /dev/null
+++ b/public/js/components/Calendar/Mode/Month/View.js
@@ -0,0 +1,87 @@
+import CalendarGrid from '../../Base/Grid.js';
+import LabelWeek from '../../Base/Label/Week.js';
+import LabelDow from '../../Base/Label/Dow.js';
+import LabelDay from '../../Base/Label/Day.js';
+
+export default {
+	name: "MonthView",
+	components: {
+		CalendarGrid,
+		LabelWeek,
+		LabelDow,
+		LabelDay
+	},
+	provide() {
+		return {
+			// NOTE(chris): snap events to day
+			events: Vue.computed(() => {
+				//const events = [];
+				const events = this.events.map(event => {
+					const start = event.start.startOf('day');
+					const end = event.end.plus({ days: 1 }).startOf('day');
+					return {
+						...event,
+						start,
+						end
+					};
+				});
+				for (var w = 5; w > -1; w--) {
+					for (var d = 6; d > -1; d--) {
+						const startdate = this.axisMain[w].plus(this.axisParts[d]);
+						events.unshift({
+							start: startdate,
+							end: startdate.plus({ days: 1 }),
+							orig: 'header'
+						});
+					}
+				}
+				return events;
+			})
+		};
+	},
+	inject: {
+		events: "events"
+	},
+	props: {
+		day: {
+			type: luxon.DateTime,
+			required: true
+		}
+	},
+	computed: {
+		axisMain() {
+			const start = this.day.startOf('month').startOf('week', { useLocaleWeeks: true });
+			return Array.from({ length: 6 }, (e, i) => start.plus({ weeks: i }));
+		},
+		axisParts() {
+			return Array.from({ length: 8 }, (e, i) => luxon.Duration.fromObject({ days: i }));
+		}
+	},
+	template: /* html */`
+	<div class="fhc-calendar-mode-month-view h-100">
+		<calendar-grid
+			flip-axis
+			:axis-main="axisMain"
+			:axis-parts="axisParts"
+
+			snap-to-grid
+		>
+			<template #main-header="{ date }">
+				<label-week v-bind="{ date }" />
+			</template>
+			<template #part-header="{ part }">
+				<label-dow :date="axisMain[0].plus(part)" class="text-center" />
+			</template>
+			<template #event="slot">
+				<label-day
+					v-if="slot.event.orig == 'header'"
+					:date="slot.event.start"
+					class="text-center"
+					:class="{ disabled: day.month != slot.event.start.month }"
+				/>
+				<slot v-else v-bind="slot" />
+			</template>
+		</calendar-grid>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Mode/Week.js b/public/js/components/Calendar/Mode/Week.js
new file mode 100644
index 000000000..a49f91194
--- /dev/null
+++ b/public/js/components/Calendar/Mode/Week.js
@@ -0,0 +1,108 @@
+import BaseSlider from '../Base/Slider.js';
+import WeekView from './Week/View.js';
+
+export default {
+	name: "ModeWeek",
+	components: {
+		BaseSlider,
+		WeekView
+	},
+	props: {
+		currentDate: {
+			type: luxon.DateTime,
+			required: true
+		}
+	},
+	emits: [
+		"update:currentDate",
+		"update:range",
+		"click"
+	],
+	data() {
+		return {
+			focusDate: this.currentDate,
+			rangeOffset: 0
+		};
+	},
+	computed: {
+		range() {
+			let first = this.focusDate.startOf('week', { useLocaleWeeks: true });
+			let last = this.focusDate.endOf('week', { useLocaleWeeks: true });
+
+			if (this.rangeOffset != 0) {
+				if (this.rangeOffset < 0) {
+					first = first.plus({ weeks: this.rangeOffset });
+				} else {
+					last = last.plus({ weeks: this.rangeOffset });
+				}
+			}
+
+			return luxon.Interval.fromDateTimes(first, last);
+		}
+	},
+	watch: {
+		currentDate() {
+			if (this.currentDate.locale != this.focusDate.locale) {
+				console.log(this.focusDate.toISODate(), this.currentDate.toISODate());
+				this.focusDate = this.currentDate;
+				this.$emit('update:range', this.range);
+			} else {
+				this.rangeOffset = this.currentDate.startOf('week', { useLocaleWeeks: true }).diff(this.focusDate.startOf('week', { useLocaleWeeks: true }), 'weeks').weeks;
+				if (this.rangeOffset) {
+					this.$emit('update:range', this.range);
+					this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
+				}
+			}
+		}
+	},
+	methods: {
+		prevPage() {
+			this.rangeOffset = this.$refs.slider.target - 1;
+			this.$emit('update:range', this.range);
+			this.$refs.slider.prevPage().then(this.updatePage);
+		},
+		nextPage() {
+			this.rangeOffset = this.$refs.slider.target + 1;
+			this.$emit('update:range', this.range);
+			this.$refs.slider.nextPage().then(this.updatePage);
+		},
+		updatePage(weeks) {
+			const newFocusDate = this.focusDate.plus({ weeks });
+			this.focusDate = newFocusDate;
+			this.rangeOffset = 0;
+			this.$emit('update:currentDate', this.focusDate);
+			this.$emit('update:range', this.range);
+		},
+		viewAttrs(weeks) {
+			const day = this.focusDate.plus({ weeks });
+			return { ...this.$attrs, day };
+		},
+		handleClickDefaults(evt) {
+			switch (evt.detail.source) {
+			case 'day':
+				// default: Set current-date
+				this.$emit('update:currentDate', evt.detail.value);
+				break;
+			case 'event':
+				// TODO(chris): IMPLEMENT!
+				// default: ???
+				break;
+			}
+		}
+	},
+	mounted() {
+		this.$emit('update:range', this.range);
+	},
+	template: `
+	<div
+		class="fhc-calendar-mode-week flex-grow-1 position-relative"
+		@cal-click-default.capture="handleClickDefaults"
+	>
+		<base-slider ref="slider" v-slot="slot">
+			<week-view v-bind="viewAttrs(slot.offset)">
+				<template v-slot="slot"><slot v-bind="slot" mode="week" /></template>
+			</week-view>
+		</base-slider>
+	</div>
+	`
+}
diff --git a/public/js/components/Calendar/Mode/Week/View.js b/public/js/components/Calendar/Mode/Week/View.js
new file mode 100644
index 000000000..4cc2a3ae3
--- /dev/null
+++ b/public/js/components/Calendar/Mode/Week/View.js
@@ -0,0 +1,75 @@
+import CalendarGrid from '../../Base/Grid.js';
+import LabelDay from '../../Base/Label/Day.js';
+import LabelDow from '../../Base/Label/Dow.js';
+import LabelTime from '../../Base/Label/Time.js';
+
+export default {
+	name: "WeekView",
+	components: {
+		CalendarGrid,
+		LabelDay,
+		LabelDow,
+		LabelTime
+	},
+	inject: {
+		timeGrid: "timeGrid"
+	},
+	props: {
+		day: {
+			type: luxon.DateTime,
+			required: true
+		},
+		collapseEmptyDays: Boolean
+	},
+	computed: {
+		start() {
+			return this.day.startOf('week', { useLocaleWeeks: true });
+		},
+		axisMain() {
+			return Array.from({ length: 7 }, (e, i) => this.start.plus({ days: i }));
+		},
+		axisParts() {
+			if (this.timeGrid) {
+				// create {start, end} array
+				return this.timeGrid.map(tu => {
+					return {
+						start: luxon.Duration.fromISOTime(tu.start),
+						end: luxon.Duration.fromISOTime(tu.end)
+					};
+				});
+			} else {
+				// create 07:00-23:00
+				return Array.from({ length: 17 }, (e, i) => luxon.Duration.fromObject({ hours: i + 7 }));
+			}
+		}
+	},
+	template: /* html */`
+	<div class="fhc-calendar-mode-week-view h-100">
+		<calendar-grid
+			:axis-main="axisMain"
+			:axis-parts="axisParts"
+			:axis-main-collapsible="collapseEmptyDays"
+			:snap-to-grid="!!timeGrid"
+			all-day-events
+		>
+			<template #main-header="{ date }">
+				<label-dow
+					v-bind="{ date }"
+					@cal-click="evt => evt.detail.source = 'day'"
+					class="text-center"
+				/>
+				<label-day
+					v-bind="{ date }"
+					class="text-center"
+				/>
+			</template>
+			<template #part-header="{ part }">
+				<label-time v-bind="{ part }" />
+			</template>
+			<template #event="slot">
+				<slot v-bind="slot" />
+			</template>
+		</calendar-grid>
+	</div>
+	`
+}
diff --git a/public/js/composables/EventLoader.js b/public/js/composables/EventLoader.js
new file mode 100644
index 000000000..541903012
--- /dev/null
+++ b/public/js/composables/EventLoader.js
@@ -0,0 +1,125 @@
+export function useEventLoader(rangeInterval, getPromiseFunc) {
+	const events = Vue.ref([]);
+	const lv = Vue.ref(null);
+	const eventsLoaded = [];
+
+	const mergePromiseArr = (n, o) => {
+		if (Array.isArray(n))
+			return o.concat(n);
+		return o.push(n), o;
+	};
+
+	const markEventsLoaded = (start, end) => {
+		let result = [];
+		if (!eventsLoaded.length) {
+			// empty: add new chunk
+			eventsLoaded.push(start.ts, end.ts);
+		} else {
+			if (eventsLoaded[eventsLoaded.length-1] + 1 == start.ts) {
+				// add to the end of last chunk
+				eventsLoaded[eventsLoaded.length-1] = end.ts;
+			} else if (eventsLoaded[eventsLoaded.length-1] < start.ts) {
+				// add new chunk after the last chunk
+				eventsLoaded.push(start.ts, end.ts);
+			} else if (eventsLoaded[0] == end.ts + 1) {
+				// add to the start of first chunk
+				eventsLoaded[0] = start.ts;
+			} else if (eventsLoaded[0] > end.ts) {
+				eventsLoaded.unshift(start.ts, end.ts);
+			} else {
+				let index = eventsLoaded.findIndex(e => e >= start.ts);
+
+				if (index % 2) {
+					// starts inside an existing chunk
+					if (eventsLoaded[index] >= end.ts)
+						return []; // Already loaded
+
+					let indexIsLast = (index == eventsLoaded.length - 1);
+
+					if (indexIsLast || eventsLoaded[index + 1] > end.ts) {
+						// extend an existing chunk
+						// and merge with the next if necessary
+						let nStart = eventsLoaded[index] + 1;
+						start = start.plus(nStart - start.ts);
+						if (!indexIsLast && eventsLoaded[index + 1] == end.ts + 1)
+							eventsLoaded.splice(index, 2);
+						else
+							eventsLoaded[index] = end.ts;
+					} else {
+						// merge exising chunks
+						// and load the rest if necessary
+						if (eventsLoaded[index + 2] < end.ts) {
+							let rStart = eventsLoaded[index + 2] + 1;
+							result = mergePromiseArr(markEventsLoaded(start.plus(rStart - start.ts), end), result);
+						}
+
+						let nStart = eventsLoaded[index] + 1;
+						start = start.plus(nStart - start.ts);
+						let nEnd = eventsLoaded[index + 1] - 1;
+						end = end.plus(nEnd - end.ts);
+						eventsLoaded.splice(index, 2);
+					}
+				} else {
+					// starts between two chunks or before the first
+					if (!index) {
+						// extend the first chunk
+						// and load the rest if necessary
+						if (eventsLoaded[1] < end.ts) {
+							let rStart = eventsLoaded[1] + 1;
+							result = mergePromiseArr(markEventsLoaded(start.plus(rStart - start.ts), end), result);
+						}
+						let nEnd = eventsLoaded[0] - 1;
+						end = end.plus(nEnd - end.ts);
+						eventsLoaded[0] = start.ts;
+					} else if (eventsLoaded[index] == start.ts) {
+						// starts at the same position as an existing chunk
+						if (eventsLoaded[index + 1] >= end.ts)
+							return []; // Already loaded
+						// load this rest
+						let rStart = eventsLoaded[index + 1] + 1;
+						result = mergePromiseArr(markEventsLoaded(start.plus(rStart - start.ts), end), result);
+					} else {
+						// extend an existing chunk
+						// and load the rest if necessary
+						if (eventsLoaded[index + 1] < end.ts) {
+							let rStart = eventsLoaded[index + 1] + 1;
+							result = mergePromiseArr(markEventsLoaded(start.plus(rStart - start.ts), end), result);
+						}
+						let nEnd = eventsLoaded[index] - 1;
+						end = end.plus(nEnd - end.ts);
+						eventsLoaded[index] = start.ts;
+					}
+				}
+			}
+		}
+
+		if (start.ts > end.ts)
+			return [];
+
+		return mergePromiseArr(getPromiseFunc(start, end), result);
+	};
+
+	Vue.watchEffect(() => {
+		const range = Vue.toValue(rangeInterval);
+		if (!(range instanceof luxon.Interval))
+			return;
+		const promises = markEventsLoaded(range.start, range.end);
+		Promise
+			.allSettled(promises)
+			.then(results => {
+				results.forEach(res => {
+					if (
+						res.status === 'fulfilled'
+						&& res.value.meta.status === "success"
+					) {
+						if (res.value.meta.lv)
+							lv.value = res.value.meta.lv;
+
+						events.value = events.value.concat(res.value.data);
+					}
+				})
+			});
+	})
+
+	return { events, lv }
+}
\ No newline at end of file
diff --git a/public/js/directives/Calendar/Click.js b/public/js/directives/Calendar/Click.js
new file mode 100644
index 000000000..e5de31f1a
--- /dev/null
+++ b/public/js/directives/Calendar/Click.js
@@ -0,0 +1,49 @@
+const clickListeners = [];
+
+function saveAddClickListener(el, source, value) {
+	const index = clickListeners.findIndex(data => data.el == el);
+	if (index >= 0) {
+		el.removeEventListener('click', clickListeners[index].listener);
+		clickListeners.splice(index, 1);
+	}
+	const listener = evt => {
+		evt.preventDefault();
+		evt.stopPropagation();
+		const customEvent = new CustomEvent('cal-click', {
+			cancelable: true,
+			bubbles: true,
+			detail: { source, value }
+		});
+		evt.target.dispatchEvent(customEvent);
+	}
+	clickListeners.push({el, listener});
+	el.addEventListener('click', listener);
+}
+
+export default {
+	mounted(el, binding, vnode) {
+		if (binding.arg == 'container') {
+			el.addEventListener('cal-click', evt => {
+				const customEvent = new Event('click:' + evt.detail.source, {
+					cancelable: true
+				});
+				binding.instance.$emit('click:' + evt.detail.source, customEvent, evt.detail.value);
+				if (!customEvent.defaultPrevented) {
+					const finalEvent = new CustomEvent('cal-click-default', {
+						cancelable: true,
+						bubbles: true,
+						detail: evt.detail
+					});
+					evt.target.dispatchEvent(finalEvent);
+				}
+			});
+		} else {
+			saveAddClickListener(el, binding.arg, binding.value);
+		}
+	},
+	updated(el, binding, vnode, prevVnode) {
+		if (binding.arg != 'container') {
+			saveAddClickListener(el, binding.arg, binding.value);
+		}
+	}
+}
\ No newline at end of file
diff --git a/public/js/directives/Calendar/DragAndDrop.js b/public/js/directives/Calendar/DragAndDrop.js
new file mode 100644
index 000000000..b1cd015ec
--- /dev/null
+++ b/public/js/directives/Calendar/DragAndDrop.js
@@ -0,0 +1,100 @@
+/**
+ * TODO(chris): This needs serious rework!!!
+ */
+export default {
+	mounted(el, binding, vnode) {
+		if (binding.arg == 'draggable') {
+			el.addEventListener('update-my-value', evt => {
+				evt.preventDefault();
+				binding.value = evt.detail.item;
+			});
+			el.addEventListener('dragstart', evt => {
+				el.dispatchEvent(new CustomEvent('calendar-dragstart', {
+					cancelable: true,
+					bubbles: true,
+					detail: {
+						item: binding.value,
+						x: evt.offsetX / el.offsetWidth,
+						y: evt.offsetY / el.offsetHeight,
+						originalEvent: evt
+					}
+				}));
+			});
+			el.addEventListener('dragend', evt => {
+				el.dispatchEvent(new CustomEvent('calendar-dragend', {
+					cancelable: true,
+					bubbles: true,
+					detail: {
+						item: binding.value,
+						originalEvent: evt
+					}
+				}));
+			});
+		} else if (binding.arg == 'dropcage') {
+			let hitbox = null;
+			el.addEventListener('dragover', evt => {
+				if (hitbox)
+					return;
+				hitbox = el.getBoundingClientRect();
+				return el.dispatchEvent(new CustomEvent('calendar-dragenter', {
+					detail: { originalEvent: evt }
+				}));
+			});
+			window.addEventListener('dragleave', evt => {
+				if (!hitbox)
+					return;
+				let pos;
+				if (typeof evt.clientX === 'undefined')
+					pos = {
+						x: evt.pageX + document.documentElement.scrollLeft,
+						y: evt.pageY + document.documentElement.scrollTop
+					};
+				else
+					pos = {
+						x: evt.clientX + document.body.scrollLeft + document.documentElement.scrollLeft,
+						y: evt.clientY + document.body.scrollTop + document.documentElement.scrollTop
+					};
+				if (pos.x > hitbox.left + hitbox.width - 1 || pos.x < hitbox.left || pos.y > hitbox.top + hitbox.height - 1 || pos.y < hitbox.top) {
+					hitbox = null;
+					return el.dispatchEvent(new CustomEvent('calendar-dragleave', {
+						detail: { originalEvent: evt }
+					}));
+				}
+			});
+			window.addEventListener('drop', evt => {
+				if (!hitbox)
+					return;
+				
+				hitbox = null;
+				return el.dispatchEvent(new CustomEvent('calendar-dragleave', {
+					detail: { originalEvent: evt }
+				}));
+			});
+		} else if (binding.arg == 'dropzone') {
+			el.addEventListener(
+				binding.modifiers.once ? 'dragenter' : 'dragover',
+				evt => {
+					const timestamp = binding.value instanceof Function
+						? binding.value(evt)
+						: binding.value;
+					const detail = timestamp.timestamp ? timestamp : { timestamp };
+					el.dispatchEvent(new CustomEvent('calendar-dragchange', {
+						cancelable: true,
+						bubbles: true,
+						detail
+					}));
+				}
+			);
+		}
+	},
+	updated(el, binding, vnode, prevVnode) {
+		if (binding.arg == 'draggable') {
+			el.dispatchEvent(new CustomEvent('update-my-value', {
+				cancelable: true,
+				detail: {
+					item: binding.value
+				}
+			}));
+		}
+	}
+}
\ No newline at end of file
diff --git a/public/js/helpers/DragAndDrop.js b/public/js/helpers/DragAndDrop.js
new file mode 100644
index 000000000..1160400f7
--- /dev/null
+++ b/public/js/helpers/DragAndDrop.js
@@ -0,0 +1,67 @@
+/**
+ * TODO(chris): This is only a prototype!!!
+ */
+const DragAndDrop = {
+	TYPE_LE: "lehreinheit",
+	TYPE_VEVENT: "vevent",
+
+	getValidTransferData(event, allowedTypes) {
+		const json = event.dataTransfer.getData('text');
+		let obj;
+		try {
+			obj = JSON.parse(json);
+			if (!obj.type)
+				return null;
+			if (allowedTypes && !allowedTypes.includes(obj.type))
+				return null;
+		} catch (error) {
+			return null;
+		}
+		return obj;
+	},
+	isValidTransferData(event, allowedTypes) {
+		return this.getValidTransferData(event, allowedTypes) ? true : false;
+	},
+	getTransferData(event) {
+		const json = event.dataTransfer.getData('text');
+		return JSON.parse(json);
+	},
+	setTransferData(event, data) {
+		switch (data.type) {
+			case DragAndDrop.TYPE_LE:
+				data = DragAndDrop.fromLe(data);
+				break;
+			default:
+				if (data.dtstart && data.dtend && data.uid && data.summary) {
+					data = DragAndDrop.fromVEvent(data);
+					break;
+				}
+				return false; // No type found => abort
+		}
+		
+		event.dataTransfer.setData('text', JSON.stringify(data));
+		return true;
+	},
+	fromLe(data) {
+		const {
+			type = DragAndDrop.TYPE_LE,
+			lehreinheit_id: id,
+			stundenblockung
+		} = data;
+		
+		return { type, id, stundenblockung };
+	},
+	fromVEvent(data) {
+		const {
+			type = DragAndDrop.TYPE_VEVENT,
+			uid: id,
+			dtstart,
+			dtend,
+			summary
+		} = data;
+		
+		return { type, id, dtstart, dtend, summary };
+	}
+};
+
+export default DragAndDrop;
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b0e9f8888..979323ab5 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -38499,6 +38499,68 @@ array(
 		)
 	),
 
+	//****************************	 CORE/calendar
+	array(
+		'app' => 'core',
+		'category' => 'calendar',
+		'phrase' => 'kw',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'W',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'W',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'calendar',
+		'phrase' => 'year_kw',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{year} KW {week}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{year} W {week}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'calendar',
+		'phrase' => 'today',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Heute',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'today',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+
 	//****************************	 FHC-Core-SAP
 	array(
 		'app' => 'core',

From 77e5dfeb9aa7c9c9f067dd45e28527691103d641 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 15 Jul 2025 11:18:01 +0200
Subject: [PATCH 372/572] add Luxon

---
 application/views/CisRouterView/CisRouterView.php |  3 ++-
 composer.json                                     | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index f70274f6e..2b2b44ee3 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -29,7 +29,8 @@ $includesArray = array(
 		'vendor/npm-asset/primevue/accordiontab/accordiontab.min.js',
 		'vendor/npm-asset/primevue/inputnumber/inputnumber.min.js',
 		'vendor/npm-asset/primevue/textarea/textarea.min.js',
-		'vendor/npm-asset/primevue/checkbox/checkbox.min.js'
+		'vendor/npm-asset/primevue/checkbox/checkbox.min.js',
+		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
 		'public/js/apps/Dashboard/Fhc.js'
diff --git a/composer.json b/composer.json
index c0dd03abf..370c2eda1 100644
--- a/composer.json
+++ b/composer.json
@@ -414,6 +414,17 @@
 				}
 			}
 		},
+		{
+			"type": "package",
+			"package": {
+				"name": "moment/luxonjs",
+				"version": "3.6.1",
+				"dist": {
+					"url": "https://unpkg.com/luxon@3.6.1/build/global/luxon.min.js",
+					"type": "file"
+				}
+			}
+		},
 		{
 			"type": "composer",
 			"url": "https://asset-packagist.org"
@@ -462,6 +473,7 @@
 
 		"michelf/php-markdown": "1.5.0",
 		"ml/json-ld": "1.*",
+		"moment/luxonjs": "3.6.1",
 		"moment/momentjs": "2.24.0",
 		"mottie/tablesorter": "2.*",
 

From 9e06f1468ad871868b0189057bcba2791ec49040 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 15 Jul 2025 12:01:46 +0200
Subject: [PATCH 373/572] refactor(Location change FHC Core Event): changes the
 location of the Events for the FHCore App to the original folder

---
 application/config/Events.php   | 41 +++++++++++++++++++++++++--------
 application/core/CI3_Events.php |  3 ---
 application/core/Events.php     | 36 -----------------------------
 3 files changed, 32 insertions(+), 48 deletions(-)
 delete mode 100644 application/core/Events.php

diff --git a/application/config/Events.php b/application/config/Events.php
index 191a1eb98..3e0a5248f 100644
--- a/application/config/Events.php
+++ b/application/config/Events.php
@@ -3,12 +3,35 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 use CI3_Events as Events;
 
-/**
- * NOTE(chris): example:
-	Events::on('stv_conf_student', function (&$res) {
-		$res['test'] = [
-			'title' => 'TEST',
-			'component' => './Stv/Studentenverwaltung/Details/Notizen.js'
-		];
-	});
- */
+Events::on('loadRenderers', function ($renderers) {
+	$fhc_core_renderers =& $renderers();
+	$fhc_core_renderers["lehreinheit"] = array(
+		'calendarEvent' => APP_ROOT.'public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js',
+		'modalTitle' => APP_ROOT.'public/js/components/Cis/Renderer/Lehreinheit/modalTitle.js',
+		'modalContent' => APP_ROOT.'public/js/components/Cis/Renderer/Lehreinheit/modalContent.js',
+		'calendarEventStyles' => APP_ROOT.'public/css/Cis4/CoreCalendarEvents.css'
+	);
+});
+
+Events::on('loadRenderers', function ($renderers) {
+	$fhc_core_renderers =& $renderers();
+	$fhc_core_renderers["reservierung"] = array(
+		'calendarEvent' => APP_ROOT.'public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js',
+		'modalTitle' => APP_ROOT.'public/js/components/Cis/Renderer/Reservierungen/modalTitle.js',
+		'modalContent' => APP_ROOT.'public/js/components/Cis/Renderer/Reservierungen/modalContent.js',
+		'calendarEventStyles' => APP_ROOT.'public/css/Cis4/CoreCalendarEvents.css'
+	);
+});
+
+Events::on('loadRenderers', function ($renderers) {
+	$fhc_core_renderers =& $renderers();
+	$fhc_core_renderers["ferien"] = array(
+		'calendarEvent' => APP_ROOT.'public/js/components/Cis/Renderer/Feiertage/calendarEvent.js',
+		'modalTitle' => APP_ROOT.'public/js/components/Cis/Renderer/Feiertage/modalTitle.js',
+		'modalContent' => APP_ROOT.'public/js/components/Cis/Renderer/Feiertage/modalContent.js',
+		'calendarEventStyles' => APP_ROOT.'public/css/Cis4/CoreCalendarEvents.css'
+	);
+});
+
+
+
diff --git a/application/core/CI3_Events.php b/application/core/CI3_Events.php
index e283230c9..37f6c3f21 100644
--- a/application/core/CI3_Events.php
+++ b/application/core/CI3_Events.php
@@ -49,9 +49,6 @@ require_once(APPPATH.'config/Events.php');
 
 $active_addons_array = explode(";", ACTIVE_ADDONS);
 
-// Load Events from FHC core
-require_once APPPATH.'core/Events.php';
-
 foreach (scandir(APPPATH.'config/extensions') as $dir)
 	if ($dir[0] != '.' && file_exists(APPPATH.'config/extensions/'.$dir.'/Events.php'))
 		require_once APPPATH.'config/extensions/'.$dir.'/Events.php';
diff --git a/application/core/Events.php b/application/core/Events.php
deleted file mode 100644
index b689a99d3..000000000
--- a/application/core/Events.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use CI3_Events as Events;
-
-Events::on('loadRenderers', function ($renderers) {
-	$fhc_core_renderers =& $renderers();
-	$fhc_core_renderers["lehreinheit"] = array(
-		'calendarEvent' => APP_ROOT.'public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js',
-		'modalTitle' => APP_ROOT.'public/js/components/Cis/Renderer/Lehreinheit/modalTitle.js',
-		'modalContent' => APP_ROOT.'public/js/components/Cis/Renderer/Lehreinheit/modalContent.js',
-		'calendarEventStyles' => APP_ROOT.'public/css/Cis4/CoreCalendarEvents.css'
-	);
-});
-
-Events::on('loadRenderers', function ($renderers) {
-	$fhc_core_renderers =& $renderers();
-	$fhc_core_renderers["reservierung"] = array(
-		'calendarEvent' => APP_ROOT.'public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js',
-		'modalTitle' => APP_ROOT.'public/js/components/Cis/Renderer/Reservierungen/modalTitle.js',
-		'modalContent' => APP_ROOT.'public/js/components/Cis/Renderer/Reservierungen/modalContent.js',
-		'calendarEventStyles' => APP_ROOT.'public/css/Cis4/CoreCalendarEvents.css'
-	);
-});
-
-Events::on('loadRenderers', function ($renderers) {
-	$fhc_core_renderers =& $renderers();
-	$fhc_core_renderers["ferien"] = array(
-		'calendarEvent' => APP_ROOT.'public/js/components/Cis/Renderer/Feiertage/calendarEvent.js',
-		'modalTitle' => APP_ROOT.'public/js/components/Cis/Renderer/Feiertage/modalTitle.js',
-		'modalContent' => APP_ROOT.'public/js/components/Cis/Renderer/Feiertage/modalContent.js',
-		'calendarEventStyles' => APP_ROOT.'public/css/Cis4/CoreCalendarEvents.css'
-	);
-});
-
-

From c3d0f0370484520aceba7890a29751968e34db45 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 15 Jul 2025 13:06:08 +0200
Subject: [PATCH 374/572] remove unnecessary addMetas, add table alias to fix
 Prestudent Filters in StvTree

---
 .../controllers/api/frontend/v1/stv/Student.php      |  2 --
 .../controllers/api/frontend/v1/stv/Students.php     | 12 ++++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index d56736541..6287ecbda 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -243,11 +243,9 @@ class Student extends FHCAPI_Controller
 		}
 
 		$array_allowed_props_student = ['matrikelnr'];
-		$this->addMeta('bhtest1', $this->isLaufendesSemester($studiensemester_kurzbz));
 		if($this->isLaufendesSemester($studiensemester_kurzbz)) 
 		{
 			$array_allowed_props_student = ['matrikelnr', 'verband', 'semester', 'gruppe'];
-			$this->addMeta('bhtest2', $array_allowed_props_student);
 		}
 		$update_student = array();
 		foreach ($array_allowed_props_student as $prop) {
diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 41c5fc613..f9ceabc3d 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -223,25 +223,25 @@ class Students extends FHCAPI_Controller
 				break;
 			case "bewerbungnichtabgeschickt":
 				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['bewerbung_abgeschicktamum'] = null;
+				$where['ps.bewerbung_abgeschicktamum'] = null;
 				break;
 			case "bewerbungabgeschickt":
 				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['bewerbung_abgeschicktamum IS NOT NULL'] = null;
-				$where['bestaetigtam'] = null;
+				$where['ps.bewerbung_abgeschicktamum IS NOT NULL'] = null;
+				$where['ps.bestaetigtam'] = null;
 				break;
 			case "statusbestaetigt":
 				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['bestaetigtam IS NOT NULL'] = null;
+				$where['ps.bestaetigtam IS NOT NULL'] = null;
 				break;
 			case "statusbestaetigtrtnichtangemeldet":
 				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['bestaetigtam IS NOT NULL'] = null;
+				$where['ps.bestaetigtam IS NOT NULL'] = null;
 				$this->PrestudentModel->db->where('NOT EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "statusbestaetigtrtangemeldet":
 				$where['ps.status_kurzbz'] = 'Interessent';
-				$where['bestaetigtam IS NOT NULL'] = null;
+				$where['ps.bestaetigtam IS NOT NULL'] = null;
 				$this->PrestudentModel->db->where('EXISTS(' . $selectRT . ')', null, false);
 				break;
 			case "zgv":

From c91b2481eb860fc30562ac255f649b05130ede56 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 15 Jul 2025 13:16:39 +0200
Subject: [PATCH 375/572] refactor(Modal component): don't pass the properies
 to the v-bind of the bootstrap modal (title prop was added as an attribute to
 modal div, creating a tooltip)

---
 public/js/components/Cis/Mylv/LvModal.js                  | 2 +-
 public/js/components/Cis/Profil/ProfilModal/EditProfil.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
index 7725fa93f..3f52cec8f 100644
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ b/public/js/components/Cis/Mylv/LvModal.js
@@ -75,7 +75,7 @@ export default {
 		return BsModal.popup.bind(this)(null, options);
 	},
 	template: /*html*/ `
-	<bs-modal ref="modalContainer" @showBsModal="onModalShow" @hideBsModal="onHideModal" v-bind="$props" :bodyClass="''" dialogClass='modal-lg' class="bootstrap-alert" :backdrop="false" >
+	<bs-modal ref="modalContainer" @showBsModal="onModalShow" @hideBsModal="onHideModal" :bodyClass="''" dialogClass='modal-lg' class="bootstrap-alert" :backdrop="false" >
 		<template v-slot:title>
 			<slot name="modalTitle"></slot>
 		</template>
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index 26ab7ff1d..b490b56a5 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -189,7 +189,7 @@ export default {
 		return BsModal.popup(null, options);
 	},
 	template: /*html*/ `
-<bs-modal v-show="!loading" ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" :backdrop="false">
+<bs-modal v-show="!loading" ref="modalContainer" body-class="" dialog-class="modal-lg" class="bootstrap-alert" :backdrop="false">
 	<template v-if="title" v-slot:title>{{title}}</template>
 	<template v-slot:default>
 		<div>

From c69be4762ecb8b6ce3b2ca0f6b9cf8cdd34a950e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 15 Jul 2025 13:19:47 +0200
Subject: [PATCH 376/572] refactor(renderer components accessibility) adds the
 aria accessibility attributes and tooltips to the renderer components of the
 LvPlan

---
 public/js/components/Cis/Renderer/Lehreinheit/modalContent.js | 4 ++--
 .../js/components/Cis/Renderer/Reservierungen/modalContent.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
index 0be28962a..523a67049 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
@@ -76,7 +76,7 @@ export default {
 							:''
 						}}</th>
 						<td>
-							<a v-if="event.ort_content_id" :aria-label="$p.t('global','raum')" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+							<a v-if="event.ort_content_id" :aria-label="$p.t('global','raum')" :title="$p.t('global','raum')" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" aria-hidden="true" style="color:#00649C"></i></a>
 							{{event.ort_kurzbz}}
 						</td>
 					</tr>
@@ -97,7 +97,7 @@ export default {
 						<td>
 							<div id="lektorenContainer">
 								<div v-for="lektor in event.lektor" class="d-block">
-									<a v-if="lektorenLinks[lektor.kurzbz]" :aria-label="$p.t('lehre','lektor')" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+									<a v-if="lektorenLinks[lektor.kurzbz]" :aria-label="$p.t('lehre','lektor')" :title="$p.t('lehre','lektor')" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C" aria-hidden="true"></i></a>
 									{{lektor.kurzbz}}
 								</div>
 							</div>
diff --git a/public/js/components/Cis/Renderer/Reservierungen/modalContent.js b/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
index 6dcef418c..571bbde29 100644
--- a/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
+++ b/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
@@ -76,7 +76,7 @@ export default {
 							:''
 						}}</th>
 						<td>
-							<a v-if="event.ort_content_id" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+							<a v-if="event.ort_content_id" :aria-label="$p.t('global','raum')" :title="$p.t('global','raum')" :href="getOrtContentLink"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C" aria-hidden="true"></i></a>
 							{{event.ort_kurzbz}}
 						</td>
 					</tr>
@@ -88,7 +88,7 @@ export default {
 						}}</th>
 						<td>
 							<div v-for="lektor in event.lektor" class="d-block">
-								<a v-if="lektorenLinks[lektor.kurzbz]" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" style="color:#00649C"></i></a>
+								<a v-if="lektorenLinks[lektor.kurzbz]" :aria-label="$p.t('lehre','lektor')" :tooltip="$p.t('lehre','lektor')" :href="lektorenLinks[lektor.kurzbz]"><i class="fa fa-arrow-up-right-from-square me-1" aria-hidden="true" style="color:#00649C"></i></a>
 								{{lektor.kurzbz}}
 							</div>
 						</td>

From 08404a9440cdeb16a401c4d95790f9dc31b98ba6 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 15 Jul 2025 13:35:13 +0200
Subject: [PATCH 377/572] all-day-events not in scrollable part

---
 public/js/components/Calendar/Base/Grid.js    | 49 ++++++++++++++++---
 .../js/components/Calendar/Base/Grid/Line.js  | 30 +-----------
 2 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/public/js/components/Calendar/Base/Grid.js b/public/js/components/Calendar/Base/Grid.js
index 56465c0f3..572068f8e 100644
--- a/public/js/components/Calendar/Base/Grid.js
+++ b/public/js/components/Calendar/Base/Grid.js
@@ -1,11 +1,13 @@
 import GridLine from './Grid/Line.js';
+import GridLineEvent from './Grid/Line/Event.js';
 
 import CalDnd from '../../../directives/Calendar/DragAndDrop.js';
 
 export default {
 	name: "CalendarGrid",
 	components: {
-		GridLine
+		GridLine,
+		GridLineEvent
 	},
 	directives: {
 		CalDnd
@@ -128,6 +130,16 @@ export default {
 
 			return [...this.axisMain, lastInMainAxis.plus(extraLength)];
 		},
+		eventsAllDay() {
+			if (!this.allDayEvents)
+				return [];
+			return this.mapIntoMainAxis(this.originalEvents.filter(event => event.orig.allDayEvent));
+		},
+		eventsNormal() {
+			if (!this.allDayEvents)
+				return this.events;
+			return this.mapIntoMainAxis(this.originalEvents.filter(event => !event.orig.allDayEvent));
+		},
 		events() {
 			return this.mapIntoMainAxis(this.originalEvents);
 		},
@@ -165,13 +177,12 @@ export default {
 					gridlines[ts].push('pe_' + part.index);
 			});
 
-			this.events.forEach((events, mainIndex) => {
+			this.eventsNormal.forEach((events, mainIndex) => {
 				let day = this.axisMain[mainIndex];
 				events.forEach(event => {
 					if (!event.startsHere && !event.endsHere)
 						return;
-					if (this.allDayEvents && event.orig.allDayEvent)
-						return;
+
 					if (event.startsHere) {
 						let ts = event.start.diff(day).toMillis();
 						if (!gridlines[ts])
@@ -185,7 +196,7 @@ export default {
 				});
 			});
 
-			return '[allday] auto ' + Object.keys(gridlines).sort((a,b) => parseInt(a)-parseInt(b)).map((start, i, keys) => {
+			return Object.keys(gridlines).sort((a,b) => parseInt(a)-parseInt(b)).map((start, i, keys) => {
 				let end = keys[i + 1];
 				if (!end) {
 					gridlines[start].push('end');
@@ -250,7 +261,7 @@ export default {
 	<div
 		class="fhc-calendar-base-grid"
 		style="display:grid;width:100%;height:100%"
-		:style="'grid-template-' + axisRow + 's:auto 1fr;grid-template-' + axisCol + 's:auto ' + styleGridCols"
+		:style="'grid-template-' + axisRow + 's:auto' + (allDayEvents ? ' auto ' : ' ') + '1fr;grid-template-' + axisCol + 's:auto ' + styleGridCols"
 	>
 		<div
 			class="grid-header"
@@ -267,6 +278,29 @@ export default {
 				<slot name="main-header" v-bind="{ index, date }" />
 			</div>
 		</div>
+		<div
+			v-if="allDayEvents"
+			class="grid-allday"
+			style="display:grid"
+			:style="'grid-template-' + axisCol + 's:subgrid;grid-' + axisCol + ':1/-1'"
+		>
+			<div
+				v-for="(events, index) in eventsAllDay"
+				:key="index"
+				class="all-day-events"
+				:style="'grid-' + axisCol + ':' + (2+index)"
+			>
+				<grid-line-event
+					v-for="(event, i) in events"
+					:key="i"
+					:event="event"
+				>
+					<template v-slot="slot">
+						<slot name="event" v-bind="slot" />
+					</template>
+				</grid-line-event>
+			</div>
+		</div>
 		<div
 			style="display:grid;overflow:auto"
 			:style="'grid-' + axisCol + ':1/-1;grid-template-' + axisCol + 's:subgrid'"
@@ -318,11 +352,10 @@ export default {
 							:start="date.plus(start)"
 							:end="date.plus(end)"
 							:date="date"
-							:events="events[index]"
+							:events="eventsNormal[index]"
 							:backgrounds="backgrounds[index]"
 							style="position:relative"
 							:style="'grid-' + axisRow + ':1/-1;grid-' + axisCol + ':' + (1+index)"
-							:all-day-events="allDayEvents"
 						>
 							<template #event="slot">
 								<slot name="event" v-bind="slot" />
diff --git a/public/js/components/Calendar/Base/Grid/Line.js b/public/js/components/Calendar/Base/Grid/Line.js
index 41f9bd58d..cd71dcc02 100644
--- a/public/js/components/Calendar/Base/Grid/Line.js
+++ b/public/js/components/Calendar/Base/Grid/Line.js
@@ -35,23 +35,12 @@ export default {
 		backgrounds: {
 			type: Array,
 			default: []
-		},
-		allDayEvents: Boolean
+		}
 	},
 	computed: {
-		eventsAllDay() {
-			if (!this.allDayEvents)
-				return [];
-			return this.events.filter(event => event.orig.allDayEvent);
-		},
-		eventsNormal() {
-			if (!this.allDayEvents)
-				return this.events;
-			return this.events.filter(event => !event.orig.allDayEvent);
-		},
 		eventsWithRowInfo() {
 			const events = [];
-			this.eventsNormal.forEach(event => {
+			this.events.forEach(event => {
 				const rows = [2, -1];
 				if (event.startsHere) {
 					rows[0] = 't_' + event.start.diff(this.date).toMillis();
@@ -80,21 +69,6 @@ export default {
 			:end="end"
 			:background="bg"
 		></line-background>
-		<div
-			v-if="eventsAllDay.length"
-			:style="'grid-' + axisRow + ': allday'"
-			class="all-day-events"
-		>
-			<line-event
-				v-for="(event, i) in eventsAllDay"
-				:key="i"
-				:event="event"
-			>
-				<template v-slot="slot">
-					<slot name="event" v-bind="slot" />
-				</template>
-			</line-event>
-		</div>
 		<line-event
 			v-for="(event, i) in eventsWithRowInfo"
 			:key="i"

From 133a611d0e0242aba0d141e939ecd29f9accc769 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 15 Jul 2025 13:35:38 +0200
Subject: [PATCH 378/572] update(Profil Modal attribute rename): refactor of
 attributes and styles

---
 public/css/components/calendar.css                          | 2 +-
 public/js/components/Cis/Profil/MitarbeiterProfil.js        | 2 +-
 .../Cis/Profil/ProfilComponents/FetchProfilUpdates.js       | 2 +-
 public/js/components/Cis/Profil/ProfilModal/EditProfil.js   | 6 +++---
 public/js/components/Cis/Profil/StudentProfil.js            | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 85962d4e0..cb570cc46 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -287,7 +287,7 @@
 .fhc-calendar-past {
 	background-color: var(--fhc-calendar-past);
 	border-color: var(--fhc-calendar-border);
-	opacity: 0.5;
+	opacity: 0.75;
 }
 
 .fhc-calendar-month-page-day-focusday {
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 8eaae6dd9..78fbdb04b 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -309,7 +309,7 @@ export default {
 	},
 	template: /*html*/ `
 <div class="container-fluid text-break fhc-form"  >
-    <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(filteredEditData))" :title="$p.t('profil','profilBearbeiten')"></edit-profil>
+    <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal" :value="JSON.parse(JSON.stringify(filteredEditData))" :titel="$p.t('profil','profilBearbeiten')"></edit-profil>
     <div class="row">
         <div  class="d-md-none col-12 ">
             <!--TODO: uncomment when implemented
diff --git a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
index d7109579e..40627d98b 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/FetchProfilUpdates.js
@@ -155,7 +155,7 @@ export default {
 
 	template: /*html*/ `
 <div class="card">
-    <edit-profil v-if="showUpdateModal" ref="updateEditModal" @hideBsModal="hideEditProfilModal" :value="content" :title="editProfilTitle"></edit-profil>
+    <edit-profil v-if="showUpdateModal" ref="updateEditModal" @hideBsModal="hideEditProfilModal" :value="content" :titel="editProfilTitle"></edit-profil>
     <div class="card-header">{{$p.t('profilUpdate','profilUpdates')}}</div>
     <div class="card-body">
         <div class="table-responsive text-nowrap">
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
index b490b56a5..39b18c83b 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfil.js
@@ -15,7 +15,7 @@ export default {
 	mixins: [BsModal],
 	props: {
 		value: Object,
-		title: String,
+		titel: String,
 		zustelladressenCount: Function,
 		zustellkontakteCount: Function,
 		/*
@@ -189,8 +189,8 @@ export default {
 		return BsModal.popup(null, options);
 	},
 	template: /*html*/ `
-<bs-modal v-show="!loading" ref="modalContainer" body-class="" dialog-class="modal-lg" class="bootstrap-alert" :backdrop="false">
-	<template v-if="title" v-slot:title>{{title}}</template>
+<bs-modal v-show="!loading" ref="modalContainer" body-class="" v-bind="$props" dialog-class="modal-lg" class="bootstrap-alert" :backdrop="false">
+	<template v-if="titel" v-slot:title>{{titel}}</template>
 	<template v-slot:default>
 		<div>
 			<nav aria-label="breadcrumb" class="ps-2">
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index cc0068411..88437a0f1 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -249,7 +249,7 @@ export default {
 	template: /*html*/ `
 <div class="container-fluid text-break fhc-form">
     <edit-profil v-if="showModal" ref="editModal" @hideBsModal="hideEditProfilModal"
-    :value="JSON.parse(JSON.stringify(filteredEditData))" :title="$p.t('profil','profilBearbeiten')"></edit-profil>
+    :value="JSON.parse(JSON.stringify(filteredEditData))" :titel="$p.t('profil','profilBearbeiten')"></edit-profil>
     <!-- ROW -->
     <div class="row">
         <!-- HIDDEN QUICK LINKS -->

From 2222199b95cbc958b280a0c82b794abb728224d8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 15 Jul 2025 14:17:44 +0200
Subject: [PATCH 379/572] refactor(ProfilUpdate components accessability): adds
 accessability attribute to profil update components

---
 .../EditProfilComponents/EditAdresse.js       | 12 +--
 .../EditProfilComponents/EditKontakt.js       | 28 +++----
 .../EditProfilComponents/TextInputDokument.js | 10 +--
 .../Profil/ProfilModal/EditProfilSelect.js    |  4 +-
 public/js/components/Form/Upload/Dms.js       |  2 +-
 system/phrasesupdate.php                      | 80 +++++++++++++++++++
 6 files changed, 108 insertions(+), 28 deletions(-)

diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
index 8f174dabc..1dcde49c9 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditAdresse.js
@@ -152,7 +152,7 @@ export default {
       <label class="form-check-label" for="flexCheckDefault">
       {{$p.t('person','zustelladresse')}}
       </label>
-    </div>  
+    </div>
   </div>
 
   <!-- NATION -->
@@ -162,7 +162,7 @@ export default {
       <select  :value="data.nation" @change="updateValue($event,'nation')" @change="getGemeinde" class="form-select" aria-label="Select Kontakttyp">
         <option selected></option>
         <option :value="nation.code" v-for="nation in nationenList">{{nation.langtext}}</option>
-      </select> 
+      </select>
     </div>
   </div>
 
@@ -170,7 +170,7 @@ export default {
   <div class=" col-4">
     <div class="form-underline">
       <div class="form-underline-titel">{{$p.t('person','plz')}}*</div>
-      <input class="form-control" :value="data.plz" @input="updateValue($event,'plz')" @input="getGemeinde" :placeholder="data.plz">
+      <input class="form-control" :value="data.plz" :aria-label="$p.t('person','plz')" :title="$p.t('person','plz')" @input="updateValue($event,'plz')" @input="getGemeinde" :placeholder="data.plz">
     </div>
   </div>
 
@@ -178,7 +178,7 @@ export default {
   <div class="col-lg-6">
     <div class="form-underline ">
       <div class="form-underline-titel">{{$p.t('person','gemeinde')}}*</div>
-      <auto-complete class="w-100" v-model="data.gemeinde" dropdown :forceSelection="data.nation ==='A'?true:false" :suggestions="gemeinden" @complete="autocompleteSearchGemeinden" ></auto-complete>
+      <auto-complete :aria-label="$p.t('person','gemeinde')" class="w-100" v-model="data.gemeinde" dropdown :forceSelection="data.nation ==='A'?true:false" :suggestions="gemeinden" @complete="autocompleteSearchGemeinden" ></auto-complete>
     </div>
   </div>
 
@@ -186,7 +186,7 @@ export default {
   <div  class="col-lg-6" >
     <div class="form-underline ">
       <div class="form-underline-titel">{{$p.t('person','ort')}}*</div>
-      <auto-complete class="w-100" v-model="data.ort" dropdown :forceSelection="data.nation ==='A'?true:false" :suggestions="ortschaftnamen" @complete="autocompleteSearchOrtschaftsnamen" ></auto-complete>
+      <auto-complete :aria-label="$p.t('person','ort')" class="w-100" v-model="data.ort" dropdown :forceSelection="data.nation ==='A'?true:false" :suggestions="ortschaftnamen" @complete="autocompleteSearchOrtschaftsnamen" ></auto-complete>
     </div>
   </div>
 
@@ -194,7 +194,7 @@ export default {
   <div  class="col-lg-8">
     <div class="form-underline ">
       <div class="form-underline-titel">{{$p.t('person','strasse')}}*</div>
-      <input  class="form-control" :value="data.strasse" @input="updateValue($event,'strasse')" :placeholder="data.strasse">
+      <input :aria-label="$p.t('person','strasse')" class="form-control" :value="data.strasse" @input="updateValue($event,'strasse')" :placeholder="data.strasse">
     </div>
   </div>
   
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
index ee1cc938c..4f978f636 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/EditKontakt.js
@@ -68,11 +68,11 @@ export default {
     <!-- End of warning -->
 
     <div v-if="!data.kontakt_id" class="col-12">
-        
-    
+
+
         <div  class="form-underline">
             <div class="form-underline-titel">{{$p.t('profilUpdate','kontaktTyp')}}</div>
-    
+
             <select :value="data.kontakttyp" @change="updateValue($event,'kontakttyp')" class="form-select" aria-label="Select Kontakttyp">
                 <option selected></option>
                 <option value="email">{{$p.t('person','email')}}</option>
@@ -81,37 +81,37 @@ export default {
                 <option value="mobil">{{$p.t('profilUpdate','mobiltelefonnummer')}}</option>
                 <option value="homepage">{{$p.t('profilUpdate','homepage')}}</option>
                 <option value="fax">{{$p.t('profilUpdate','faxnummer')}}</option>
-                
-            </select>    
+
+            </select>
         </div>
-        
+
     </div>
     <div class="col-12">
-        
+
         <!-- rendering KONTAKT emails -->
-   
+
 
         <div class="form-underline">
         <div class="form-underline-titel">{{data.kontakttyp?data.kontakttyp:$p.t('global','kontakt')}}</div>
-    
-        <input :disabled="data.kontakttyp?false:true"  class="form-control"   :value="data.kontakt" @input="updateValue($event,'kontakt')" :placeholder="data.kontakt">
+
+        <input :aria-label="data.kontakttyp" :title="data.kontakttyp" :disabled="data.kontakttyp?false:true"  class="form-control"   :value="data.kontakt" @input="updateValue($event,'kontakt')" :placeholder="data.kontakt">
         </div>
 
     </div>
     <div class="col-12">
-        
+
     <div  class="form-underline">
     <div class="form-underline-titel">{{$p.t('global','anmerkung')}}</div>
 
-    <input  class="form-control" :value="data.anmerkung" @input="updateValue($event,'anmerkung')" :placeholder="data.anmerkung">
+    <input :aria-label="$p.t('global','anmerkung')" :title="$p.t('global','anmerkung')" class="form-control" :value="data.anmerkung" @input="updateValue($event,'anmerkung')" :placeholder="data.anmerkung">
     </div>
 
     </div>
-  
+
     <div  class="d-flex flex-row justify-content-start col-12  allign-middle">
         <span style="opacity: 0.65; font-size: .85rem; " class="px-2">{{$p.t('profilUpdate','zustellungsKontakt')}}</span>
 
-        <input class="form-check-input " type="checkbox" :checked="data.zustellung" @change="updateValue($event,'zustellung')" id="flexCheckDefault">   
+        <input :aria-label="$p.t('profilUpdate','zustellungsKontakt')" :title="$p.t('profilUpdate','zustellungsKontakt')" class="form-check-input " type="checkbox" :checked="data.zustellung" @change="updateValue($event,'zustellung')" id="flexCheckDefault">
     </div>
   </div>
     `,
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/TextInputDokument.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/TextInputDokument.js
index f00e9634e..c73fee86a 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/TextInputDokument.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilComponents/TextInputDokument.js
@@ -93,20 +93,20 @@ export default {
     }
   },
   template: /*html*/`
-  
+
     <p style="opacity:0.8" class="ms-2" v-if="withFiles && !updateID">{{$p.t('profilUpdate','profilUpdateInformationMessage',[data.titel])}}</p>
 
     <div class="form-underline">
     <div class="form-underline-titel">{{data.titel?data.titel:$p.t('global','titel')}}</div>
-    
-    <input  class="mb-2 form-control" @input="emitChanges"  v-model="data.value" :placeholder="data.value">
-  
+
+    <input  class="mb-2 form-control" @input="emitChanges" :aria-label="data.titel" :tooltip="data.titel"  v-model="data.value" :placeholder="data.value">
+
     <div class="row gx-2">
     <div class="col">
     <dms ref="update" v-if="withFiles" id="files" name="files" :multiple="false" v-model="dmsData" @update:model-value="didFilesChange"  ></dms>
     </div>
     <div class="col-auto">
-    <button @click="dmsData=[]" class="btn btn-danger"><i style="color:white" class="fa fa-trash"></i></button>
+    <button @click="dmsData=[]" class="btn btn-danger" :aria-label="$p.t('profilUpdate','deleteAttachment')" :title="$p.t('profilUpdate','deleteAttachment')" ><i style="color:white" class="fa fa-trash" aria-hidden="true"></i></button>
     </div>
     </div>
     </div>
diff --git a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
index 53a7b2a4d..53c5baf8d 100644
--- a/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
+++ b/public/js/components/Cis/Profil/ProfilModal/EditProfilSelect.js
@@ -156,12 +156,12 @@ export default {
                             <component :is="item.listview" v-bind="item"></component>
                         </div>
                     </button>
-                    <button v-if="item.listview" @click="deleteItem(item)" type="button" class="mx-3 btn btn-danger btn-circle"><i class="fa fa-trash"></i></button>
+                    <button v-if="item.listview" @click="deleteItem(item)" type="button" class="mx-3 btn btn-danger btn-circle" :aria-label="$p.t('profilUpdate','deleteItem')" :title="$p.t('profilUpdate','deleteItem')" ><i class="fa fa-trash" aria-hide="true"></i></button>
                 </div>
             </template>
         </div>
         <div v-if="Array.isArray(data)" class="mt-4 d-flex justify-content-center">
-          <button @click="addItem" type="button" class="btn btn-primary btn-circle"><i class="fa fa-plus"></i></button>
+          <button @click="addItem" type="button" class="btn btn-primary btn-circle" :aria-label="$p.t('profilUpdate','addItem')" :title="$p.t('profilUpdate','addItem')"><i class="fa fa-plus" aria-hide="true"></i></button>
         </div>
     </template>
     <template v-else>
diff --git a/public/js/components/Form/Upload/Dms.js b/public/js/components/Form/Upload/Dms.js
index 4c7a8eb3f..82333dc7f 100644
--- a/public/js/components/Form/Upload/Dms.js
+++ b/public/js/components/Form/Upload/Dms.js
@@ -92,7 +92,7 @@ export default {
 	},
 	template: `
 	<div class="form-upload-dms">
-		<input ref="upload" class="form-control" :disabled="disabled" :accept="accept" :class="inputClass" :id="id" :name="name" :multiple="multiple" type="file" @change="addFiles">
+		<input ref="upload" class="form-control" :disabled="disabled" :accept="accept" :aria-label="$p.t('profilUpdate','documentUpload')" :title="$p.t('profilUpdate','documentUpload')" :class="inputClass" :id="id" :name="name" :multiple="multiple" type="file" @change="addFiles">
 		<ul v-if="modelValue.length && multiple && !noList" :accept="accept" class="list-unstyled m-0">
 			<dms-item
 				v-for="(file, index) in modelValue"
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 7e58d0e98..b7f6c8661 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -28620,6 +28620,46 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'deleteAttachment',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Anhang löschen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Delete attachment',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'documentUpload',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Dokument hochladen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Upload document',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 		array(
 			'app' => 'core',
 			'category' => 'profilUpdate',
@@ -29261,6 +29301,46 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'deleteItem',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Item löschen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Delete item',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profilUpdate',
+			'phrase' => 'addItem',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Item hinzufügen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Add item',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 		array(
 			'app' => 'core',
 			'category' => 'profilUpdate',

From 81280a5e913b99d00e2d907e680f6f70ac81b1f2 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 15 Jul 2025 14:29:26 +0200
Subject: [PATCH 380/572] refactor(Studium accessibility): adds accessability
 attributes to the studium component

---
 public/js/components/Cis/Studium/Studium.js | 16 ++++----
 system/phrasesupdate.php                    | 41 +++++++++++++++++++++
 2 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/public/js/components/Cis/Studium/Studium.js b/public/js/components/Cis/Studium/Studium.js
index 246bbb296..1b7aff81b 100644
--- a/public/js/components/Cis/Studium/Studium.js
+++ b/public/js/components/Cis/Studium/Studium.js
@@ -281,13 +281,13 @@ export default {
 		<div>
 		<h6>Studiensemester:</h6>
 		<div class="input-group">
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(1)" :aria-label="$p.t('global','previous')" :title="$p.t('global','previous')">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="studiensemester" v-model="selectedStudiensemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 				<option v-for="semester in studienSemester" @click="changeSelectedStudienSemester(semester.studiensemester_kurzbz)" :key="semester" :value="semester.studiensemester_kurzbz">{{studiensemesterTitel(semester.studiensemester_kurzbz)	}}</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(-1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiensemester(-1)" :aria-label="$p.t('global','next')" :title="$p.t('global','next')">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
 			</button>
 		</div>
@@ -296,13 +296,13 @@ export default {
 		<div>
 		<h6>Studiengang:</h6>
 		<div class="input-group">
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(-1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(-1)" :aria-label="$p.t('global','previous')" :title="$p.t('global','previous')">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="studiengaenge" v-model="selectedStudiengang" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 				<option v-for="studiengang in studiengaenge" @click="changeSelectedStudienGang(studiengang.studiengang_kz)" :key="studiengang.studiengang_kz" :value="studiengang.studiengang_kz" >{{studiengangTitel(studiengang)}}</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudiengang(1)" :aria-label="$p.t('global','next')" :title="$p.t('global','next')">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
 			</button>
 		</div>
@@ -311,13 +311,13 @@ export default {
 		<div>
 		<h6>Semester:</h6>
 		<div class="input-group">
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(-1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(-1)" :aria-label="$p.t('global','previous')" :title="$p.t('global','previous')">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="semester" v-model="selectedSemester" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 				<option v-for="sem in semester" @click="changeSelectedSemester(sem)" :key="semester" :value="sem">{{sem}}. Semester</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeSemester(1)" :aria-label="$p.t('global','next')" :title="$p.t('global','next')">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
 			</button>
 		</div>
@@ -326,13 +326,13 @@ export default {
 		<div>
 		<h6>Studienordnung:</h6>
 		<div class="input-group">
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(-1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(-1)" :aria-label="$p.t('global','previous')" :title="$p.t('global','previous')">
 				<i class="fa fa-caret-left" aria-hidden="true"></i>
 			</button>
 			<select ref="studienordnung" v-model="selectedStudienordnung" class="form-select" :aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setHash($event.target.value)">
 				<option v-for="ordnung in computedStudienOrdnungSelectValues" :disabled="ordnung.disabled" @click="changeSelectedStudienPlan(ordnung?.studienplan?.studienplan_id)" :key="ordnung?.studienplan?.bezeichnung	" :value="ordnung?.studienplan?.studienplan_id">{{ordnung.bezeichnung}}</option>
 			</select>
-			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(1)">
+			<button class="btn btn-outline-secondary" type="button" :disabled="false" @click="changeStudienordnung(1)" :aria-label="$p.t('global','next')" :title="$p.t('global','next')">
 				<i class="fa fa-caret-right" aria-hidden="true"></i>
 			</button>
 		</div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b7f6c8661..f4ed08415 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -30161,6 +30161,7 @@ array(
 				)
 			)
 		),
+		
 
 		//ProfilUpdate Phrasen ende
 	array(
@@ -30183,6 +30184,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'previous',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'vorherige',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'previous',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'next',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'nächste',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'next',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',

From a737dc20dc3cc1eb39d2ab872ece701e174c7a94 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 15 Jul 2025 14:59:45 +0200
Subject: [PATCH 381/572] refactor(Layout Lvplan widget): margin adjustment

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

diff --git a/public/js/components/DashboardWidget/LvPlan.js b/public/js/components/DashboardWidget/LvPlan.js
index 1e2588161..f93b57881 100644
--- a/public/js/components/DashboardWidget/LvPlan.js
+++ b/public/js/components/DashboardWidget/LvPlan.js
@@ -251,7 +251,7 @@ export default {
 						<div class=" card-header d-grid p-0">
 							<button class="btn fhc-tertiary text-decoration-none" @click="setCalendarMaximized">{{ key.format({dateStyle: "full"}, $p.user_locale.value)}}</button>
 						</div>
-						<div role="button" @click="showLvUebersicht(evt)" v-for="evt in value" :key="evt.id" class="list-group-item small" :style="getEventStyle(evt)">
+						<div role="button" @click="showLvUebersicht(evt)" v-for="evt in value" :key="evt.id" class="mx-1 list-group-item small" :style="getEventStyle(evt)">
 							<component :is="calendarEventComponent(evt.type)" :event="evt" ></component>
 						</div>
 						<div v-if="!value.length" class="list-group-item small text-center">

From 0aef00bd9efc81f97b75b355f03d1791633dde67 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 16 Jul 2025 08:58:02 +0200
Subject: [PATCH 382/572] use Timezone

---
 application/controllers/Cis/LvPlan.php   |  4 ++
 application/libraries/StundenplanLib.php | 52 +++++++++++++++++++-----
 2 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/application/controllers/Cis/LvPlan.php b/application/controllers/Cis/LvPlan.php
index ea48f09f0..884c8a9a0 100644
--- a/application/controllers/Cis/LvPlan.php
+++ b/application/controllers/Cis/LvPlan.php
@@ -15,6 +15,9 @@ class LvPlan extends Auth_Controller
 		parent::__construct([
 			'index' => ['basis/cis:r']
 		]);
+
+		// Load Config
+		$this->load->config('calendar');
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -28,6 +31,7 @@ class LvPlan extends Auth_Controller
 		
 		$viewData = array(
 			'uid'=>getAuthUID(),
+			'timezone' => $this->config->item('timezone')
 		);
 		
 		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'LvPlan']);
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index 8bc5a7c70..868d73a24 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -3,6 +3,11 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+use \DateTime as DateTime;
+use \DateTimeZone as DateTimeZone;
+use \DateInterval as DateInterval;
+use \DatePeriod as DatePeriod;
+
 class StundenplanLib{
 
 	private $_ci; // Code igniter instance
@@ -14,9 +19,11 @@ class StundenplanLib{
 	 *
 	 */
 	public function getStundenplan($start_date, $end_date, $lv_id = null){
-		
 		$this->_ci =& get_instance();
 
+		// Load Config
+		$this->_ci->load->config('calendar');
+
 		$this->_ci->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
 		$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
 		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
@@ -125,6 +132,10 @@ class StundenplanLib{
 
 	public function getReservierungen($start_date, $end_date, $ort_kurzbz){
 		$this->_ci =& get_instance();
+
+		// Load Config
+		$this->_ci->load->config('calendar');
+
 		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter(getAuthUID()));
 		if($is_mitarbeiter)
 		{
@@ -181,8 +192,15 @@ class StundenplanLib{
 
 	public function expand_object_information($data){
 		$this->_ci =& get_instance();
+		
 		foreach ($data as $item)
 		{
+			$tz = new DateTimeZone($this->_ci->config->item('timezone'));
+			$isostart = new DateTime($item->datum . ' ' . $item->beginn, $tz);
+			$item->isostart = $isostart->format(DateTime::ATOM);
+
+			$isoend = new DateTime($item->datum . ' ' . $item->ende, $tz);
+			$item->isoend = $isoend->format(DateTime::ATOM);
 
 			$lektor_obj_array = array();
 			$gruppe_obj_array = array();
@@ -254,9 +272,17 @@ class StundenplanLib{
 		}
 	}
 
-	public function fetchFerienTageEvents($start_date, $end_date, $studiengang_kz){
+	public function fetchFerienTageEvents($start_date, $end_date, $studiengang_kz)
+	{
 		$this->_ci =& get_instance();
-		$this->_ci->load->model('organisation/Ferien_model','FerienModel');
+
+		// Load Config
+		$this->_ci->load->config('calendar');
+
+		$this->_ci->load->model('organisation/Ferien_model', 'FerienModel');
+
+		$tz = new DateTimeZone($this->_ci->config->item('timezone'));
+
 		$ferienEvents = $this->_ci->FerienModel->execReadOnlyQuery("
 		SELECT * 
 		FROM lehre.tbl_ferien
@@ -277,35 +303,41 @@ class StundenplanLib{
 	
 				$interval = new DateInterval('P1D');
 				$period = new DatePeriod($event_start, $interval, $event_end);
-				$event->dates = array_map(function($date){
-					return $date->format('Y-m-d');
-				}, iterator_to_array($period));
+				$event->dates = iterator_to_array($period);
 				return $event;
 			}, $ferienEvents);
 	
+			$start_date = new DateTime($start_date);
+			$start_date->setTime(0, 0, 0);
+			$end_date = new DateTime($end_date);
+			$end_date->setTime(23, 59, 59);
+
 			$ferienEventsFlattened=[];
 			foreach($ferienEvents as $ferien_event){
 				foreach($ferien_event->dates as $date){
+					if ($date < $start_date || $date > $end_date)
+						continue;
 					$event = new stdClass();
 					$event->bezeichnung = $ferien_event->bezeichnung;
-					$event->datum = $date;
+					$event->datum = $date->format('Y-m-d');
 					$event->type = 'ferien';
 					$ferienEventsFlattened[] = $event;
 				}
 			};
 	
 			$today=new DateTime();
-			$ferienEventsFlattened = array_map(function($event) use($today){
+			$ferienEventsFlattened = array_map(function($event) use($today, $tz){
 				$ferien_event = (object) array(
 					'type' => 'ferien',
 					'beginn' => $today->format('H:i:s'),
 					'ende' => $today->format('H:i:s'),
+					'isostart' => (new DateTime($event->datum . ' 00:00:00', $tz))->format('c'),
+					'isoend' => (new DateTime($event->datum . ' 23:59:59', $tz))->format('c'),
 					'allDayEvent' => true,
 					'datum' => $event->datum,
 					'topic' => $event->bezeichnung,
 					'titel' => $event->bezeichnung,
 					'farbe' => '00689E'
-					
 				);
 				return $ferien_event;
 			}, $ferienEventsFlattened);
@@ -635,7 +667,7 @@ class StundenplanLib{
 			{
 				return $sem->studiensemester_kurzbz;
 			},
-			getData($semester_range)
+			getData($semester_range) ?: []
 		);
 
 		// if no studiensemester is found for the given timespan, get the nearest studiensemester

From 90b944a047896a3abafaad200f59d42df891e9e9 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 16 Jul 2025 09:57:03 +0200
Subject: [PATCH 383/572] configureable "no-events" message

---
 public/js/components/Calendar/Base/Grid.js    |  2 +-
 public/js/components/Calendar/Mode/Day.js     |  2 +-
 .../js/components/Calendar/Mode/Day/View.js   | 30 ++++++++++++++++---
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Calendar/Base/Grid.js b/public/js/components/Calendar/Base/Grid.js
index 572068f8e..c6b7dd2a3 100644
--- a/public/js/components/Calendar/Base/Grid.js
+++ b/public/js/components/Calendar/Base/Grid.js
@@ -308,7 +308,7 @@ export default {
 			<div
 				ref="main"
 				class="grid-main"
-				style="grid-column:1/-1;grid-row:1/-1;display:grid"
+				style="position:relative;grid-column:1/-1;grid-row:1/-1;display:grid"
 				:style="'grid-template-' + axisCol + 's:subgrid;grid-template-' + axisRow + 's:' + styleGridRows"
 			>
 				<div
diff --git a/public/js/components/Calendar/Mode/Day.js b/public/js/components/Calendar/Mode/Day.js
index dc697cfc0..d954f7b51 100644
--- a/public/js/components/Calendar/Mode/Day.js
+++ b/public/js/components/Calendar/Mode/Day.js
@@ -69,7 +69,7 @@ export default {
 		},
 		viewAttrs(days) {
 			const day = this.focusDate.plus({ days });
-			return { day };
+			return { ...this.$attrs, day };
 		}
 	},
 	mounted() {
diff --git a/public/js/components/Calendar/Mode/Day/View.js b/public/js/components/Calendar/Mode/Day/View.js
index cdd212b6d..72b0baa99 100644
--- a/public/js/components/Calendar/Mode/Day/View.js
+++ b/public/js/components/Calendar/Mode/Day/View.js
@@ -19,11 +19,14 @@ export default {
 		day: {
 			type: luxon.DateTime,
 			required: true
-		}
+		},
+		emptyMessage: String,
+		emptyMessageDetails: String
 	},
 	data() {
 		return {
-			chosenEvent: null
+			chosenEvent: null,
+			gridMainRef: null
 		};
 	},
 	computed: {
@@ -67,12 +70,16 @@ export default {
 			}
 		}
 	},
+	mounted() {
+		this.gridMainRef = this.$refs.grid.$refs.main;
+	},
 	template: /* html */`
 	<div
 		class="fhc-calendar-mode-day-view d-flex h-100"
 		@cal-click-default.capture="handleClickDefaults"
 	>
 		<calendar-grid
+			ref="grid"
 			:axis-main="axisMain"
 			:axis-parts="axisParts"
 			:snap-to-grid="!!timeGrid"
@@ -94,8 +101,23 @@ export default {
 				<slot v-bind="slot" mode="day" />
 			</template>
 		</calendar-grid>
-		<div class="w-100">
-			<div v-if="currentEvent === null">loading...</div>
+		<Teleport :disabled="!gridMainRef" :to="gridMainRef">
+			<div
+				v-if="emptyMessage && currentEvent !== null && !currentEvent"
+				class="fhc-calendar-no-events-overlay"
+				style="position:absolute;inset:0"
+			>
+				{{ emptyMessage }}
+			</div>
+		</Teleport>
+		<div class="event-details">
+			<div
+				v-if="currentEvent === null"
+				class="p-4 d-flex w-100 justify-content-center align-items-center"
+			>
+				<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
+			</div>
+			<h3 v-else-if="!currentEvent">{{ emptyMessageDetails }}</h3>
 			<slot v-else :event="currentEvent" mode="event" />
 		</div>
 	</div>

From f210bb8bbd481771ecd82a35bbe9d8194a5e3ceb Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 16 Jul 2025 11:06:47 +0200
Subject: [PATCH 384/572] refactor(NewsWidget responsive):updates the resonsive
 classes of the newsWidget

---
 public/css/components/dashboard/news.css | 65 ++++++++++++++++++++----
 1 file changed, 56 insertions(+), 9 deletions(-)

diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index ca584c235..c8414521e 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -4,7 +4,7 @@
 	--fhc-news-widget-highlight-color: var(--fhc-primary-highlight);
 	--fhc-news-widget-border: var(--fhc-border);
 	--fhc-news-widget-border-highlight: var(--fhc-border-highlight);
-	--fhc-news-widget-text-light: var(--fhc-text);
+	--fhc-news-widget-text-light: var(--fhc-light);
 }
 
 
@@ -13,28 +13,68 @@
 @media (min-width :576px) {
 	.fhc-news-menu-item {
 		/* padding: top right bottom left */
-		padding:0em 0em 0em 0em !important;
+		padding:0.125em 0.125em 0.125em 0.125em !important;
+		max-height:30px !important;
+	}
+
+	.fhc-news-menu-item-betreff p {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 1;
+		line-clamp: 1;
+		/* Number of lines to show */
+		overflow: hidden;
 	}
 }
 /* media query for md sizes */
 @media (min-width :768px) {
 	.fhc-news-menu-item {
 		/* padding: top right bottom left */
-		padding: 0.3em 0.3em 0.3em 0.3em !important;
+		padding: 0.25em 0.25em 0.25em 0.25em !important;
+		max-height: 50px !important;
+	}
+
+	.fhc-news-menu-item-betreff p {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 1;
+		line-clamp: 1;
+		/* Number of lines to show */
+		overflow: hidden;
 	}
 }
 /* media query for lg sizes */
 @media (min-width :992px) {
 	.fhc-news-menu-item {
 		/* padding: top right bottom left */
-		padding: 0.3em 0.3em 0.3em 0.3em !important;
+		padding: 0.25em 0.25em 0.25em 0.25em !important;
+		max-height: 75px !important;
+	}
+
+	.fhc-news-menu-item-betreff p {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		line-clamp: 2;
+		/* Number of lines to show */
+		overflow: hidden;
 	}
 }
 /* media query for xl sizes */
 @media (min-width :1200px) {
 	.fhc-news-menu-item {
 		/* padding: top right bottom left */
-		padding: 1em 1em 0.3em 1em !important;
+		padding: 1em 0.25em 0.25em 0.25em !important;
+		height: 100px !important;
+	}
+
+	.fhc-news-menu-item-betreff p {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		line-clamp: 2;
+		/* Number of lines to show */
+		overflow: hidden;
 	}
 }
 
@@ -42,7 +82,17 @@
 @media (min-width :1400px) {
 	.fhc-news-menu-item {
 		/* padding: top right bottom left */
-		padding: 1.2em 1.2em 0.3em 1.2em !important;
+		padding: 1.2em 0.5em 0.5em 0.5em !important;
+		height: 125px !important;
+	}
+
+	.fhc-news-menu-item-betreff p {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		line-clamp: 2;
+		/* Number of lines to show */
+		overflow: hidden;
 	}
 }
 
@@ -54,8 +104,6 @@
 .fhc-news-menu-item {
     padding: 0.375rem;
     color: var(--fhc-news-widget-text-light);
-    min-height: 5%;
-    max-height: 30%;
     width: 100%;
     justify-content: space-between;
     align-items: center;
@@ -83,7 +131,6 @@
 .fhc-news-menu-item-betreff
 {
     width: 100%;
-    text-align: center;
     max-height: 100%;
     height: 100%;
 }

From ba3914c1c3b184b6bc0717e643aa7510ce55e6d1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 16 Jul 2025 11:08:00 +0200
Subject: [PATCH 385/572] refactor(Cis4 Wave Accessability): adds more
 accessability attributes to the cis4 views

---
 .../StudiengangPerson.js                      |  2 +-
 .../StudiengangVertretung.js                  |  4 ++--
 public/js/components/DashboardWidget/Url.js   | 12 ++++-------
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js
index 4e15e0a42..13de1e8a0 100644
--- a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js
+++ b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangPerson.js
@@ -20,7 +20,7 @@ export default {
 			<img  :src="base64Image" alt="mitarbeiter_foto" style="width: 110px; height: auto; object-fir:scale-down;" class="card-img-top" >
 		</div>
 		<div class="card-body p-2 flex-grow-0" style="min-height: 50px;">
-			<h6 class="text-center card-title mb-0">{{fullname}} <a v-if="profilViewLink" :href="profilViewLink"><i class="ms-2 fa fa-arrow-up-right-from-square fhc-primary-color" ></i></a></h6>
+			<h6 class="text-center card-title mb-0">{{fullname}} <a v-if="profilViewLink" :href="profilViewLink" :aria-label="$p.t('profil','profil')" :title="$p.t('profil','profil')"><i class="ms-2 fa fa-arrow-up-right-from-square fhc-primary-color" aria-hidden="true"></i></a></h6>
 		</div>
 		<hr class="my-0">
 		<div class="card-body p-2">
diff --git a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js
index 5fb86bba7..2914919a1 100644
--- a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js
+++ b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangVertretung.js
@@ -11,8 +11,8 @@ export default {
 		</div>
 		<div class="card-body">
 			<p v-for="vertretung in vertretungsList">
-				<a v-if="profilViewLink(vertretung.uid)" :href="profilViewLink(vertretung.uid)">
-					<i class="me-2 fa fa-arrow-up-right-from-square fhc-primary-color" ></i>
+				<a v-if="profilViewLink(vertretung.uid)" :href="profilViewLink(vertretung.uid)" :aria-label="$p.t('profil','profil')" :title="$p.t('profil','profil')">
+					<i class="me-2 fa fa-arrow-up-right-from-square fhc-primary-color" aria-hidden="true"></i>
 				</a>
 				{{vertretungFormatedName(vertretung,false)}}
 			</p>
diff --git a/public/js/components/DashboardWidget/Url.js b/public/js/components/DashboardWidget/Url.js
index 93718a10c..2763862a9 100644
--- a/public/js/components/DashboardWidget/Url.js
+++ b/public/js/components/DashboardWidget/Url.js
@@ -204,10 +204,8 @@ export default {
 				<h2>{{$p.t('bookmark','editLink')}}</h2>
 			</template>
 			<template #default>
-				<label class="form-label" for="editTitle">Title</label>
-				<form-input id="editTitle" v-model="title_input" name="title" class="mb-2"></form-input>
-				<label class="form-label" for="editUrl">Url</label>
-				<form-input id="editUrl" v-model="url_input" name="url"></form-input>
+				<form-input  :label="$p.t('profil','Titel')" :title="$p.t('profil','Titel')" id="editTitle" v-model="title_input" name="title" class="mb-2"></form-input>
+				<form-input label="Url" title="Url" id="editUrl" v-model="url_input" name="url"></form-input>
 			</template>
 			<template #footer>
 				<button @click="editBookmark" class="btn btn-primary">{{$p.t('bookmark','saveLink')}}</button>
@@ -221,10 +219,8 @@ export default {
 				<h2>{{$p.t('bookmark','newLink')}}</h2>
 			</template>
 			<template #default>
-				<label class="form-label" for="insertTitle">Title</label>
-				<form-input id="insertTitle" v-model="title_input" name="title" class="mb-2"></form-input>
-				<label class="form-label" for="insertUrl">Url</label>
-				<form-input id="insertUrl" v-model="url_input" name="url"></form-input>
+				<form-input :label="$p.t('profil','Titel')" :title="$p.t('profil','Titel')" id="insertTitle" v-model="title_input" name="title" class="mb-2"></form-input>
+				<form-input label="Url" title="Url" id="insertUrl" v-model="url_input" name="url"></form-input>
 			</template>
 			<template #footer>
 				<button @click="insertBookmark" class="btn btn-primary">{{$p.t('bookmark','saveLink')}}</button>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index f4ed08415..72013baac 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27416,6 +27416,26 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'profil',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Profil',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'Profile',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 		array(
 			'app' => 'core',
 			'category' => 'profil',

From 1ff3f7b66dc3832b18b8e168748fa1955aada225 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 16 Jul 2025 11:41:23 +0200
Subject: [PATCH 386/572] Display current semester status in Detail Header -
 adapt function get - adapt functions getPrestudents, get Students, get
 Prestudent, getStudent, get Person - add Phrase Student auswaehlen

---
 .../api/frontend/v1/stv/Student.php           | 17 ++++-
 .../api/frontend/v1/stv/Students.php          | 68 ++++++++++++++++++-
 .../components/DetailHeader/DetailHeader.js   |  4 +-
 .../Stv/Studentenverwaltung/Details.js        |  2 +-
 system/phrasesupdate.php                      | 20 ++++++
 5 files changed, 105 insertions(+), 6 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index d56736541..cb7dd9446 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -72,6 +72,7 @@ class Student extends FHCAPI_Controller
 	{
 		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
 
+
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
 		$this->PrestudentModel->addSelect('p.person_id');
@@ -109,6 +110,16 @@ class Student extends FHCAPI_Controller
 				false
 			);
 		}
+		$this->PrestudentModel->addSelect(
+			"(
+				SELECT status_kurzbz
+				FROM public.tbl_prestudentstatus pss
+				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
+				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
+				LIMIT 1
+				) AS statusofsemester"
+		);
 
 		$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
 		$this->PrestudentModel->addJoin('public.tbl_benutzer b', 'student_uid = uid', 'LEFT');
@@ -118,14 +129,18 @@ class Student extends FHCAPI_Controller
 			'LEFT'
 		);
 		$this->PrestudentModel->addJoin('public.tbl_person p', 'p.person_id = tbl_prestudent.person_id');
+/*		$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pss', 'pss.prestudent_id = tbl_prestudent.prestudent_id
+										AND pss.studiensemester_kurzbz = ' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+										'LEFT');*/
 
-		$result = $this->PrestudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+		$result = $this->PrestudentModel->loadWhere(['tbl_prestudent.prestudent_id' => $prestudent_id]);
 		
 		$student = $this->getDataOrTerminateWithError($result);
 		
 		if (!$student)
 			return show_404();
 
+
 		$this->terminateWithSuccess(current($student));
 	}
 
diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 41c5fc613..13f69647e 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -70,7 +70,7 @@ class Students extends FHCAPI_Controller
 	 * /(studiengang_kz)/(org_form)/(semester)/(verband)	=> getStudents
 	 * /(studiengang_kz)/(org_form)/(semester)/(verband)/(gruppe)
 	 * 														=> getStudents
-	 * /uid/(student_uid)									=> getStudent
+	 * /student/(student_uid)								=> getStudent
 	 * /prestudent/(prestudent_id)							=> getPrestudent
 	 * /person/(person_id)									=> getPerson
 	 *
@@ -358,6 +358,18 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect("'' AS gruppe");
 		$this->addSelectPrioRel();
 
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"(
+				SELECT status_kurzbz
+				FROM public.tbl_prestudentstatus pss
+				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
+				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
+				LIMIT 1
+				) AS statusofsemester"
+		);
+
 		$this->addFilter($studiensemester_kurzbz);
 
 		$result = $this->PrestudentModel->loadWhere($where);
@@ -380,7 +392,6 @@ class Students extends FHCAPI_Controller
 	protected function getStudents($studiengang_kz, $semester = null, $verband = null, $gruppe = null, $gruppe_kurzbz = null, $orgform_kurzbz = null)
 	{
 		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-		
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
@@ -406,6 +417,18 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('v.gruppe');
 		$this->PrestudentModel->addSelect("'' AS priorisierung_relativ");
 
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"(
+				SELECT status_kurzbz
+				FROM public.tbl_prestudentstatus pss
+				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
+				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
+				LIMIT 1
+				) AS statusofsemester"
+		);
+
 
 		$where = [];
 
@@ -482,6 +505,19 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect("COALESCE(v.semester::text, CASE WHEN public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') THEN public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)::text ELSE ''::text END) AS semester", false);
 		$this->PrestudentModel->addSelect('v.verband');
 		$this->PrestudentModel->addSelect('v.gruppe');
+
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"(
+				SELECT status_kurzbz
+				FROM public.tbl_prestudentstatus pss
+				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
+				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
+				LIMIT 1
+				) AS statusofsemester"
+		);
+
 		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
@@ -527,8 +563,23 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('v.semester');
 		$this->PrestudentModel->addSelect('v.verband');
 		$this->PrestudentModel->addSelect('v.gruppe');
+
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"(
+				SELECT status_kurzbz
+				FROM public.tbl_prestudentstatus pss
+				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
+				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
+				LIMIT 1
+				) AS statusofsemester"
+		);
+
 		$this->addSelectPrioRel();
 
+
+
 		$this->addFilter($studiensemester_kurzbz);
 
 		$result = $this->PrestudentModel->loadWhere([
@@ -565,6 +616,19 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('v.semester');
 		$this->PrestudentModel->addSelect('v.verband');
 		$this->PrestudentModel->addSelect('v.gruppe');
+
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"(
+				SELECT status_kurzbz
+				FROM public.tbl_prestudentstatus pss
+				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
+				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
+				LIMIT 1
+				) AS statusofsemester"
+		);
+
 		$this->addSelectPrioRel();
 
 		$this->addFilter($studiensemester_kurzbz);
diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index 6014faadd..aa0bb549d 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -155,8 +155,8 @@ export default {
 						<span>
 							<a :href="'mailto:'+headerData[0]?.mail_intern">{{headerData[0].mail_intern}}</a>
 						</span>
-						<strong class="text-muted"> | Status </strong>
-						 {{headerData[0].status}}
+						<strong v-if="headerData[0].statusofsemester" class="text-muted"> | Status </strong>
+						 {{headerData[0].statusofsemester}}
 						<strong class="text-muted"> | {{$p.t('person', 'matrikelnummer')}} </strong>
 						  {{headerData[0].matr_nr}}
 					  </h5>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js
index 8d6a9a7a1..8222d637e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details.js
@@ -60,7 +60,7 @@ export default {
 	template: `
 	<div class="stv-details h-100 pb-3 d-flex flex-column">
 		<div v-if="!students?.length" class="justify-content-center d-flex h-100 align-items-center">
-			Bitte StudentIn auswählen!
+			{{$p.t('ui', 'chooseStudent')}}
 		</div>
 		<div v-else-if="configStudent && configStudents" class="d-flex flex-column h-100 pb-3">
 			<fhc-header
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 34180326d..491271a00 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44475,6 +44475,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'chooseStudent',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte StudentIn auswählen!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please select a student!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-4 Studierendenverwaltung FHC-ALERTS END
 );
 

From 99f950913448d238d8702b73e1c47ee0fd0f73e6 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 16 Jul 2025 12:56:49 +0200
Subject: [PATCH 387/572] refactor(Cis4 Wave Accessability): adds accessability
 attributes to the searchbar components

---
 public/js/components/searchbar/action.js           | 1 +
 public/js/components/searchbar/employee.js         | 2 +-
 public/js/components/searchbar/organisationunit.js | 2 +-
 public/js/components/searchbar/person.js           | 3 ++-
 public/js/components/searchbar/prestudent.js       | 1 +
 public/js/components/searchbar/raum.js             | 2 +-
 public/js/components/searchbar/student.js          | 1 +
 7 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/public/js/components/searchbar/action.js b/public/js/components/searchbar/action.js
index e8db391c9..a19ecfa97 100644
--- a/public/js/components/searchbar/action.js
+++ b/public/js/components/searchbar/action.js
@@ -15,6 +15,7 @@ export default {
     template: `
 		<template v-if="this.renderif()">
 			<a :class="this.cssclass" :href="this.getactionhref()"
+				:alt="$p.t('ui','aktion')"
 				@click="this.execaction()">
 				<slot>Action</slot>
 			</a>
diff --git a/public/js/components/searchbar/employee.js b/public/js/components/searchbar/employee.js
index f1e6a67f6..65eb93d1f 100644
--- a/public/js/components/searchbar/employee.js
+++ b/public/js/components/searchbar/employee.js
@@ -14,7 +14,7 @@ export default {
           <div class="searchbar_grid">
               <div class="searchbar_icon">
                 <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <img v-if="(typeof res.photo_url !== 'undefined') && (res.photo_url !== null)" :src="res.photo_url" 
+                  <img v-if="(typeof res.photo_url !== 'undefined') && (res.photo_url !== null)" :alt="$p.t('profilUpdate','profilBild')" :src="res.photo_url" 
                     class="rounded" style="max-height: 120px; max-width: 90px;" />
                   <i v-else class="fas fa-user-circle fa-5x"></i>
                 </action>
diff --git a/public/js/components/searchbar/organisationunit.js b/public/js/components/searchbar/organisationunit.js
index 09e2822a3..18e11c861 100644
--- a/public/js/components/searchbar/organisationunit.js
+++ b/public/js/components/searchbar/organisationunit.js
@@ -14,7 +14,7 @@ export default {
           <div class="searchbar_grid">
               <div class="searchbar_icon">
                 <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <i class="fas fa-sitemap fa-4x"></i>
+                  <i class="fas fa-sitemap fa-4x" aria-hidden="true"></i>
                 </action>
               </div>
               
diff --git a/public/js/components/searchbar/person.js b/public/js/components/searchbar/person.js
index eeb476149..8e74a714f 100644
--- a/public/js/components/searchbar/person.js
+++ b/public/js/components/searchbar/person.js
@@ -14,7 +14,8 @@ export default {
           <div class="searchbar_grid">
               <div class="searchbar_icon">
                 <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <img v-if="(typeof res.foto !== 'undefined') && (res.foto !== null)" :src="res.foto" 
+                  <img v-if="(typeof res.foto !== 'undefined') && (res.foto !== null)"
+				    :alt="$p.t('profilUpdate','profilBild')" :src="res.foto" 
                     class="rounded" style="max-height: 120px; max-width: 90px;" />
                   <i v-else class="fas fa-user-circle fa-5x"></i>
                 </action>
diff --git a/public/js/components/searchbar/prestudent.js b/public/js/components/searchbar/prestudent.js
index 99837fe4b..2887924e5 100644
--- a/public/js/components/searchbar/prestudent.js
+++ b/public/js/components/searchbar/prestudent.js
@@ -15,6 +15,7 @@ export default {
 				<div class="searchbar_icon">
 					<action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
 						<img v-if="(typeof res.foto !== 'undefined') && (res.foto !== null)"
+							 :alt="$p.t('profilUpdate','profilBild')"
 							 :src="'data:image/jpeg;base64,' + res.foto"
 							 class="rounded-circle" height="100"/>
 						<i v-else class="fas fa-user-circle fa-5x"></i>
diff --git a/public/js/components/searchbar/raum.js b/public/js/components/searchbar/raum.js
index 4a55b417a..a64251356 100644
--- a/public/js/components/searchbar/raum.js
+++ b/public/js/components/searchbar/raum.js
@@ -13,7 +13,7 @@ export default {
           <div class="searchbar_grid">
             <div class="searchbar_icon">
               <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                <i class="fas fa-door-open fa-4x"></i>
+                <i class="fas fa-door-open fa-4x" aria-hidden="true"></i>
               </action>
             </div>
             <div class="searchbar_data">
diff --git a/public/js/components/searchbar/student.js b/public/js/components/searchbar/student.js
index ac7362d23..66f105c1b 100644
--- a/public/js/components/searchbar/student.js
+++ b/public/js/components/searchbar/student.js
@@ -16,6 +16,7 @@ export default {
                     <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
                         <img v-if="(typeof res.foto !== 'undefined') && (res.foto !== null)"
                              :src="studentImage"
+							 :alt="$p.t('personUpdate','profilBild')"
                              class="rounded" style="max-height: 120px; max-width: 90px;" />
                         <i v-else class="fas fa-user-circle fa-5x"></i>
                     </action>

From 26b40866fc7364316f936393647b277f9c20024a Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 16 Jul 2025 13:51:37 +0200
Subject: [PATCH 388/572] CSS updates

---
 .../views/CisRouterView/CisRouterView.php     |   4 +-
 public/css/components/calendar.css            | 174 +++++-------------
 .../css/components/calendar/backgrounds.css   |  18 ++
 public/css/components/calendar/events.css     |  67 +++++++
 public/css/components/calendar/frame.css      | 149 +++++++++++++++
 .../js/components/Calendar/Mode/Month/View.js |   1 -
 .../js/components/Calendar/Mode/Week/View.js  |   2 -
 7 files changed, 281 insertions(+), 134 deletions(-)
 create mode 100644 public/css/components/calendar/backgrounds.css
 create mode 100644 public/css/components/calendar/events.css
 create mode 100644 public/css/components/calendar/frame.css

diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php
index 2b2b44ee3..ab22fbb81 100644
--- a/application/views/CisRouterView/CisRouterView.php
+++ b/application/views/CisRouterView/CisRouterView.php
@@ -15,7 +15,7 @@ $includesArray = array(
 		'public/css/components/searchbar/searchbar.css',
 		'public/css/Fhc.css',
 		'public/css/components/dashboard.css',
-		'public/css/components/calendar.css',
+		//'public/css/components/calendar.css', <= imported in dashboard.css
 		'public/css/components/Sprachen.css',
 		'public/css/components/MyLv.css',
 		'public/css/components/FilterComponent.css',
@@ -40,7 +40,7 @@ $includesArray = array(
 
 $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
-<div id="fhccontent" route=<?php echo $route ?>>
+<div id="fhccontent" class="h-100" route=<?php echo $route ?>>
 	<router-view 
 			:view-data='<?php echo json_encode($viewData) ?>'
 	></router-view>
diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 68181166b..8d349e8c2 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -1,136 +1,52 @@
+@import './calendar/frame.css';
+@import './calendar/events.css';
+@import './calendar/backgrounds.css';
+
 /* Themable Variables */
 :root {
-  --fhc-calendar-pane-height: calc(100vh - 220px);
-  
-  --fhc-calendar-primary: var(--fhc-primary, #006095);
-  --fhc-calendar-border: var(--fhc-border, #dee2e6);
-  --fhc-calendar-border-highlight: var(--fhc-border-highlight, #495057);
-  --fhc-calendar-text: var(--fhc-text, #212529);
-  --fhc-calendar-text-light: var(--fhc-text, #212529);
-  --fhc-calendar-background: var(--fhc-background, #fff);
-  --fhc-calendar-dark: var(--fhc-dark, #212529);
-  --fhc-calendar-hour-indicator-bg: var(--fhc-background, #fff);
-  --fhc-calendar-week-page-header-background: var(--fhc-background, #fff);
-  --fhc-calendar-week-page-header-color: var(--fhc-text, #212529);
-  --fhc-calendar-week-page-header-border: var(--fhc-border, #dee2e6);
-  --fhc-calendar-week-page-header-hover-background: var(--fhc-background-highlight, #d5dae0);
-  --fhc-calendar-all-day-event-background: var(--fhc-background, #fff);
-  --fhc-calendar-past: var(--fhc-beige-10, rgba(245, 233, 215, 0.5));
-  --fhc-calendar-box-shadow: var(--fhc-box-shadow, #dee2e6);
-}
+/*	--fhc-calendar-pane-height: calc(100vh - 220px);
+	
+	--fhc-calendar-primary: var(--fhc-primary, #006095);
+	--fhc-calendar-border-highlight: var(--fhc-border-highlight, #495057);
+	--fhc-calendar-text: var(--fhc-text, #212529);
+	--fhc-calendar-text-light: var(--fhc-text, #212529);
+	--fhc-calendar-background: var(--fhc-background, #fff);
+	--fhc-calendar-dark: var(--fhc-dark, #212529);
+	--fhc-calendar-hour-indicator-bg: var(--fhc-background, #fff);
+	--fhc-calendar-week-page-header-background: var(--fhc-background, #fff);
+	--fhc-calendar-week-page-header-color: var(--fhc-text, #212529);
+	--fhc-calendar-week-page-header-border: var(--fhc-border, #dee2e6);
+	--fhc-calendar-week-page-header-hover-background: var(--fhc-background-highlight, #d5dae0);
+	--fhc-calendar-all-day-event-background: var(--fhc-background, #fff);
+	--fhc-calendar-past: var(--fhc-beige-10, rgba(245, 233, 215, 0.5));
+	--fhc-calendar-box-shadow: var(--fhc-box-shadow, #dee2e6);*/
+	
+	--fhc-calendar-gap: var(--fhc-border, #dee2e6);
+	--fhc-calendar-bg: var(--fhc-background, #fff);
+	--fhc-calendar-border: var(--fhc-border, #dee2e6);
 
+	--fhc-calendar-bg-event: var(--fhc-white-80, #ccc);
+	--fhc-calendar-border-event: var(--bs-secondary, #6c757d);
+	--fhc-calendar-radius-event: var(--bs-border-radius, .375rem);
+	--fhc-calendar-fontsize-event: .875em;
 
-/* Labels */
-/* ====== */
-.fhc-calendar-base-label-dow .short,
-.fhc-calendar-base-label-dow .narrow,
-.fhc-calendar-base-label-day .full,
-.fhc-calendar-base-label-day .short,
-.fhc-calendar-base-label-day .narrow,
-.fhc-calendar-mode-month .fhc-calendar-base-label-day .long,
-.collapsed-header .fhc-calendar-base-label-day .long,
-.collapsed-header .fhc-calendar-base-label-dow .long {
-  display: none;
-}
-.fhc-calendar-mode-month .fhc-calendar-base-label-day .narrow,
-.collapsed-header .fhc-calendar-base-label-day .short,
-.collapsed-header .fhc-calendar-base-label-dow .short {
-  display: block;
-}
-.fhc-calendar-mode-day .fhc-calendar-base-label-day,
-.fhc-calendar-mode-week .fhc-calendar-base-label-day {
-  font-size: .875em;
-}
-.fhc-calendar-mode-month .fhc-calendar-base-label-week {
-  text-align: right;
-}
-.fhc-calendar-mode-month .fhc-calendar-base-label-week span {
-  color: var(--bs-secondary-color);
-  cursor: pointer;
-}
-.fhc-calendar-mode-month .fhc-calendar-base-label-week span + span:before {
-  content: "/";
-}
+	--fhc-calendar-bg-markings-past: var(--fhc-beige-10, rgba(245, 233, 215, 0.5));
+	--fhc-calendar-border-markings-past: var(--fhc-calendar-border);
+	--fhc-calendar-bg-markings-past-label: var(--fhc-calendar-bg);
+	--fhc-calendar-border-markings-past-label: var(--fhc-calendar-border);
 
+	--fhc-calendar-gap-header: transparent;
+	--fhc-calendar-gap-allday: transparent;
+	--fhc-calendar-gap-body: transparent;
+	--fhc-calendar-bg-header: var(--fhc-calendar-bg);
+	--fhc-calendar-bg-allday: var(--fhc-calendar-bg);
+	--fhc-calendar-bg-body: var(--fhc-calendar-bg);
 
-/* Base Grid */
-/* ========= */
-/* Grid */
-.fhc-calendar-base-grid {
-  --fhc-calendar-axis-collapsible: .2fr;
-  background-color: var(--bs-border-color);
-  grid-gap: 2px;
+	--fhc-calendar-bg-overlay1: var(--fhc-calendar-bg);
+	--fhc-calendar-bg-overlay2: var(--fhc-dark, #212529);
+	
+	--fhc-calendar-radius-day-event: var(--fhc-calendar-radius-event);
+	--fhc-calendar-radius-week-event: var(--fhc-calendar-radius-event);
+	--fhc-calendar-radius-month-event: 0;
+	--fhc-calendar-radius-list-event: 0;
 }
-.fhc-calendar-base-grid .grid-header {
-  background-color: var(--bs-gray-200);
-}
-.fhc-calendar-base-grid .grid-main {
-  grid-gap: 1px;
-}
-.fhc-calendar-base-grid-line {
-  grid-gap: 1px;
-}
-.fhc-calendar-mode-month .main-header,
-.fhc-calendar-base-grid .part-header,
-.fhc-calendar-base-grid .part-body {
-  background-color: rgba(255,255,255, 1);
-}
-.fhc-calendar-base-label-time {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  align-items: end;
-}
-/* Events */
-.fhc-calendar-base-grid-line-event.event-header {
-  font-weight: bold;
-}
-.fhc-calendar-base-grid-line-event.event-header .disabled {
-  opacity: .3;
-}
-.fhc-calendar-mode-month .fhc-calendar-base-grid-line {
-  overflow: hidden;
-  line-height: 1.5;
-  font-size: .8rem;
-  grid-auto-rows: 1.5em;
-}
-.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event {
-  text-indent: .5em;
-  height: 1.5em;
-  overflow: hidden;
-}
-
-
-/* Customize */
-/* ========= */
-/* Header */
-.fhc-calendar-base-header > .row {
-  align-items: center;
-}
-/* Events */
-.event-colored {
-  background: rgba(var(--event-color-rgb), .5);
-  min-height: 100%;
-}
-.event-colored:hover {
-  background: rgba(var(--event-color-rgb), .3);
-}
-/* Backgrounds */
-.background-past {
-  background: var(--fhc-calendar-past);
-  border-bottom: solid 1px var(--fhc-calendar-border);
-}
-.background-past > span {
-  display: none;
-}
-.background-past.bg-end > span {
-  display: block;
-  position: absolute;
-  top: 100%;
-  left: 1rem;
-  padding: 0 .5rem;
-  background-color: var(--fhc-background);
-  border: solid 1px var(--fhc-calendar-border);
-  font-size: .875em;
-}
-
diff --git a/public/css/components/calendar/backgrounds.css b/public/css/components/calendar/backgrounds.css
new file mode 100644
index 000000000..2524be91f
--- /dev/null
+++ b/public/css/components/calendar/backgrounds.css
@@ -0,0 +1,18 @@
+.background-past {
+	background-color: var(--fhc-calendar-bg-markings-past);
+	border-bottom: solid 1px var(--fhc-calendar-border-markings-past);
+}
+.background-past > span {
+	display: none;
+}
+.background-past.bg-end > span {
+	display: block;
+	position: absolute;
+	top: 100%;
+	left: 1rem;
+	padding: 0 .5rem;
+	background-color: var(--fhc-calendar-bg-markings-past-label);
+	border: solid 1px var(--fhc-calendar-border-markings-past-label);
+	font-size: .875em;
+}
+
diff --git a/public/css/components/calendar/events.css b/public/css/components/calendar/events.css
new file mode 100644
index 000000000..5feb7b707
--- /dev/null
+++ b/public/css/components/calendar/events.css
@@ -0,0 +1,67 @@
+.fhc-calendar-base-grid-line-event {
+	cursor: pointer;
+}
+.fhc-calendar-mode-week .all-day-events .fhc-calendar-base-grid-line-event .weekPageContainer {
+	padding: .25rem;
+}
+.fhc-calendar-mode-day .fhc-calendar-base-grid-line-event,
+.fhc-calendar-mode-week .fhc-calendar-base-grid-line-event {
+	margin: 0 .5rem;
+	font-size: var(--fhc-calendar-fontsize-event, .875rem);
+}
+.fhc-calendar-mode-day .all-day-events .fhc-calendar-base-grid-line-event,
+.fhc-calendar-mode-week .all-day-events .fhc-calendar-base-grid-line-event {
+	margin: .25rem;
+}
+/* Border */
+.fhc-calendar-mode-day .grid-main .fhc-calendar-base-grid-line-event > *,
+.fhc-calendar-mode-week .grid-main .fhc-calendar-base-grid-line-event > * {
+	border: solid 1px var(--fhc-calendar-border-event);
+}
+.fhc-calendar-mode-day .fhc-calendar-base-grid-line-event {
+	--event-radius: var(--fhc-calendar-radius-day-event, 0);
+}
+.fhc-calendar-mode-week .fhc-calendar-base-grid-line-event {
+	--event-radius: var(--fhc-calendar-radius-week-event, 0);
+}
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event {
+	--event-radius: var(--fhc-calendar-radius-month-event, 0);
+}
+.fhc-calendar-mode-list .fhc-calendar-base-grid-line-event {
+	--event-radius: var(--fhc-calendar-radius-list-event, 0);
+}
+.fhc-calendar-mode-day .all-day-events .fhc-calendar-base-grid-line-event > *,
+.fhc-calendar-mode-week .all-day-events .fhc-calendar-base-grid-line-event > *,
+.fhc-calendar-mode-day .fhc-calendar-base-grid-line-event.event-begin > *,
+.fhc-calendar-mode-week .fhc-calendar-base-grid-line-event.event-begin > * {
+	border-top-left-radius: var(--event-radius);
+	border-top-right-radius: var(--event-radius);
+}
+.fhc-calendar-mode-day .all-day-events .fhc-calendar-base-grid-line-event > *,
+.fhc-calendar-mode-week .all-day-events .fhc-calendar-base-grid-line-event > *,
+.fhc-calendar-mode-day .fhc-calendar-base-grid-line-event.event-end > *,
+.fhc-calendar-mode-week .fhc-calendar-base-grid-line-event.event-end > * {
+	border-bottom-left-radius: var(--event-radius);
+	border-bottom-right-radius: var(--event-radius);
+}
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-begin > * {
+	border-top-left-radius: var(--event-radius);
+	border-bottom-left-radius: var(--event-radius);
+}
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-end > * {
+	border-top-right-radius: var(--event-radius);
+	border-bottom-right-radius: var(--event-radius);
+}
+/* Colors */
+.fhc-calendar-base-grid-line-event {
+	--event-default-bg: var(--fhc-calendar-bg-event, #ccc);
+}
+.fhc-calendar-base-grid-line-event .event-type-reservierung {
+	--event-default-bg: var(--fhc-calendar-bg-reservierung, #fff);
+}
+.fhc-calendar-base-grid-line-event > * {
+	background-color: var(--event-bg, var(--event-default-bg));
+}
+.fhc-calendar-base-grid-line-event > *:hover {
+	filter: brightness(120%);
+}
diff --git a/public/css/components/calendar/frame.css b/public/css/components/calendar/frame.css
new file mode 100644
index 000000000..3185fbdd6
--- /dev/null
+++ b/public/css/components/calendar/frame.css
@@ -0,0 +1,149 @@
+/* Labels */
+/* ====== */
+.fhc-calendar-base-label-dow .short,
+.fhc-calendar-base-label-dow .narrow,
+.fhc-calendar-base-label-day .full,
+.fhc-calendar-base-label-day .short,
+.fhc-calendar-base-label-day .narrow,
+.fhc-calendar-mode-month .fhc-calendar-base-label-day .long,
+.collapsed-header .fhc-calendar-base-label-day .long,
+.collapsed-header .fhc-calendar-base-label-dow .long {
+	display: none;
+}
+.fhc-calendar-mode-month .fhc-calendar-base-label-day .narrow,
+.collapsed-header .fhc-calendar-base-label-day .short,
+.collapsed-header .fhc-calendar-base-label-dow .short {
+	display: block;
+}
+.fhc-calendar-mode-day .fhc-calendar-base-label-day,
+.fhc-calendar-mode-week .fhc-calendar-base-label-day {
+	font-size: .875em;
+}
+.fhc-calendar-mode-day .main-header,
+.fhc-calendar-mode-week .main-header {
+	text-align: center;
+}
+.fhc-calendar-mode-month .fhc-calendar-base-label-week {
+	text-align: right;
+}
+.fhc-calendar-base-label-week {
+	margin-left: .5rem;
+}
+.fhc-calendar-base-label-time,
+.fhc-calendar-base-label-day,
+.fhc-calendar-base-label-week {
+	color: var(--bs-secondary-color);
+}
+.fhc-calendar-mode-day .fhc-calendar-base-label-dow,
+.fhc-calendar-mode-week .fhc-calendar-base-label-dow,
+.fhc-calendar-base-label-day,
+.fhc-calendar-base-label-week {
+	cursor: pointer;
+}
+.fhc-calendar-base-label-week span + span:before {
+	content: "/";
+}
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-header {
+	--event-bg: transparent;
+	font-weight: bold;
+	text-indent: 0;
+	font-size: var(--fhc-calendar-fontsize-month-day, 1rem);
+	height: 100%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-header .disabled {
+	opacity: .3;
+}
+
+
+/* Base Grid */
+/* ========= */
+/* Grid */
+.fhc-calendar-base-grid {
+	--fhc-calendar-axis-collapsible: .2fr;
+	background-color: var(--fhc-calendar-gap);
+	grid-gap: 2px;
+}
+.fhc-calendar-base-grid .grid-header {
+	background-color: var(--fhc-calendar-gap-header);
+}
+.fhc-calendar-base-grid .grid-header:before,
+.fhc-calendar-base-grid .grid-allday:before {
+	content: "";
+}
+.fhc-calendar-base-grid .grid-header:before,
+.fhc-calendar-base-grid .grid-header .main-header {
+	background-color: var(--fhc-calendar-bg-header);
+}
+.fhc-calendar-base-grid .grid-allday {
+	background-color: var(--fhc-calendar-gap-allday);
+}
+.fhc-calendar-base-grid .grid-allday:before,
+.fhc-calendar-base-grid .grid-allday .all-day-events {
+	background-color: var(--fhc-calendar-bg-allday);
+}
+.fhc-calendar-base-grid .grid-main {
+	grid-gap: 1px;
+	background-color: var(--fhc-calendar-gap-body);
+}
+.fhc-calendar-base-grid .grid-main .part-header,
+.fhc-calendar-base-grid .grid-main .part-body {
+	background-color: var(--fhc-calendar-bg-body);
+}
+.fhc-calendar-base-grid-line {
+	grid-gap: 1px;
+}
+.fhc-calendar-base-label-time {
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	align-items: end;
+}
+/* Header */
+.fhc-calendar-base-header > .row {
+	align-items: center;
+}
+
+/* Modes */
+/* ===== */
+/* Day */
+.fhc-calendar-mode-day .event-details {
+	padding: 1.5rem;
+	width: 100%;
+	border-left: solid 1px var(--fhc-calendar-gap);
+}
+/* Month */
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line {
+	overflow: hidden;
+	line-height: 1.5;
+	grid-template-rows: 2em;
+	grid-auto-rows: calc(var(--fhc-calendar-fontsize-event, .875rem) + 2 * var(--fhc-calendar-margin-event-icon, .5rem));
+	font-size: var(--fhc-calendar-fontsize-event, .875rem);
+}
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event {
+	text-indent: .5em;
+	height: calc(var(--fhc-calendar-fontsize-event, .875rem) + 2 * var(--fhc-calendar-margin-event-icon, .5rem));
+	overflow: hidden;
+}
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event * {
+	max-height: 100%;
+	max-width: 100%;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+/* Overlays */
+/* ======== */
+/* No Events */
+.fhc-calendar-no-events-overlay {
+	background: linear-gradient(120deg, var(--fhc-calendar-bg-overlay1), var(--fhc-calendar-bg-overlay2));
+	opacity: .7;
+	text-align: center;
+	padding-top: 100px;
+	font-size: 2.5rem;
+	font-weight: 500;
+	line-height: 1.2;
+}
diff --git a/public/js/components/Calendar/Mode/Month/View.js b/public/js/components/Calendar/Mode/Month/View.js
index a9f5a5008..b2268e43d 100644
--- a/public/js/components/Calendar/Mode/Month/View.js
+++ b/public/js/components/Calendar/Mode/Month/View.js
@@ -76,7 +76,6 @@ export default {
 				<label-day
 					v-if="slot.event.orig == 'header'"
 					:date="slot.event.start"
-					class="text-center"
 					:class="{ disabled: day.month != slot.event.start.month }"
 				/>
 				<slot v-else v-bind="slot" />
diff --git a/public/js/components/Calendar/Mode/Week/View.js b/public/js/components/Calendar/Mode/Week/View.js
index 4cc2a3ae3..d110c45bc 100644
--- a/public/js/components/Calendar/Mode/Week/View.js
+++ b/public/js/components/Calendar/Mode/Week/View.js
@@ -56,11 +56,9 @@ export default {
 				<label-dow
 					v-bind="{ date }"
 					@cal-click="evt => evt.detail.source = 'day'"
-					class="text-center"
 				/>
 				<label-day
 					v-bind="{ date }"
-					class="text-center"
 				/>
 			</template>
 			<template #part-header="{ part }">

From 78a735f27794133be7d30c923b12d55e6c600097 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 16 Jul 2025 13:52:45 +0200
Subject: [PATCH 389/572] Event popup inside calendar component

---
 public/js/components/Calendar/Base.js         | 31 +++++++++++++++++--
 public/js/components/Calendar/Mode/Day.js     | 10 ++++--
 .../js/components/Calendar/Mode/Day/View.js   | 29 +++++++++++++++--
 public/js/components/Calendar/Mode/Month.js   |  7 +++--
 public/js/components/Calendar/Mode/Week.js    |  7 +++--
 5 files changed, 72 insertions(+), 12 deletions(-)

diff --git a/public/js/components/Calendar/Base.js b/public/js/components/Calendar/Base.js
index 816027ade..298b9857e 100644
--- a/public/js/components/Calendar/Base.js
+++ b/public/js/components/Calendar/Base.js
@@ -1,6 +1,7 @@
 import BaseDraganddrop from './Base/DragAndDrop.js';
 import BaseHeader from './Base/Header.js';
 import BaseSlider from './Base/Slider.js';
+import BsModal from '../Bootstrap/Modal.js';
 
 import CalClick from '../../directives/Calendar/Click.js';
 
@@ -16,7 +17,8 @@ export default {
 	components: {
 		BaseDraganddrop,
 		BaseHeader,
-		BaseSlider
+		BaseSlider,
+		BsModal
 	},
 	directives: {
 		CalClick
@@ -119,7 +121,8 @@ export default {
 	data() {
 		return {
 			internalView: null,
-			internalDate: null
+			internalDate: null,
+			modalEvent: null
 		};
 	},
 	computed: {
@@ -231,6 +234,20 @@ export default {
 		},
 		onDropItem(evt, start, end) {
 			this.$emit('drop', evt, start, end);
+		},
+		showEventModal(eventObj) {
+			this.modalEvent = eventObj;
+			this.$refs.modal.show();
+		},
+		hideEventModal() {
+			if (this.modalEvent)
+				this.modalEvent.closeFn = undefined;
+			this.$refs.modal.hide();
+			this.modalEvent = null;
+		},
+		onModalHidden() {
+			if (this.modalEvent.closeFn)
+				this.modalEvent.closeFn();
 		}
 	},
 	template: /* html */`
@@ -262,11 +279,21 @@ export default {
 				ref="mode"
 				v-model:current-date="cDate"
 				@update:range="$emit('update:range', $event)"
+				@request-modal-open="showEventModal"
+				@request-modal-close="hideEventModal"
 				v-bind="modeOptions ? modeOptions[cMode] : null || {}"
 			>
 				<template v-slot="slot"><slot v-bind="slot" /></template>
 			</component>
 		</base-draganddrop>
+		<bs-modal ref="modal" dialog-class="modal-lg" body-class="" @hidden-bs-modal="onModalHidden">
+			<template #title>
+				<slot v-if="modalEvent" v-bind="{mode: 'eventheader', event: modalEvent.event}" />
+			</template>
+			<template #default>
+				<slot v-if="modalEvent" v-bind="{mode: 'event', event: modalEvent.event}" />
+			</template>
+		</bs-modal>
 	</div>
 	`
 }
diff --git a/public/js/components/Calendar/Mode/Day.js b/public/js/components/Calendar/Mode/Day.js
index d954f7b51..bc0896888 100644
--- a/public/js/components/Calendar/Mode/Day.js
+++ b/public/js/components/Calendar/Mode/Day.js
@@ -16,7 +16,9 @@ export default {
 	emits: [
 		"update:currentDate",
 		"update:range",
-		"click"
+		"click",
+		"requestModalOpen",
+		"requestModalClose"
 	],
 	data() {
 		return {
@@ -80,7 +82,11 @@ export default {
 		class="fhc-calendar-mode-day flex-grow-1 position-relative"
 	>
 		<base-slider ref="slider" v-slot="slot">
-			<day-view v-bind="viewAttrs(slot.offset)">
+			<day-view
+				v-bind="viewAttrs(slot.offset)"
+				@request-modal-open="$emit('requestModalOpen', $event)"
+				@request-modal-close="$emit('requestModalClose', $event)"
+			>
 				<template v-slot="slot"><slot v-bind="slot" /></template>
 			</day-view>
 		</base-slider>
diff --git a/public/js/components/Calendar/Mode/Day/View.js b/public/js/components/Calendar/Mode/Day/View.js
index 72b0baa99..8371405d3 100644
--- a/public/js/components/Calendar/Mode/Day/View.js
+++ b/public/js/components/Calendar/Mode/Day/View.js
@@ -21,8 +21,13 @@ export default {
 			required: true
 		},
 		emptyMessage: String,
-		emptyMessageDetails: String
+		emptyMessageDetails: String,
+		compact: Boolean
 	},
+	emits: [
+		"requestModalOpen",
+		"requestModalClose"
+	],
 	data() {
 		return {
 			chosenEvent: null,
@@ -63,10 +68,30 @@ export default {
 			return null; // null => loading
 		}
 	},
+	watch: {
+		compact() {
+			if (this.compact) {
+				if (this.chosenEvent) {
+					this.$emit('requestModalOpen', {
+						event: this.chosenEvent,
+						closeFn: () => { this.chosenEvent = null; }
+					});
+				}
+			} else {
+				this.$emit('requestModalClose');
+			}
+		}
+	},
 	methods: {
 		handleClickDefaults(evt) {
 			if (evt.detail.source == 'event') {
 				this.chosenEvent = evt.detail.value;
+				if (this.compact) {
+					this.$emit('requestModalOpen', {
+						event: this.chosenEvent,
+						closeFn: () => { this.chosenEvent = null; }
+					});
+				}
 			}
 		}
 	},
@@ -110,7 +135,7 @@ export default {
 				{{ emptyMessage }}
 			</div>
 		</Teleport>
-		<div class="event-details">
+		<div class="event-details" v-if="!compact">
 			<div
 				v-if="currentEvent === null"
 				class="p-4 d-flex w-100 justify-content-center align-items-center"
diff --git a/public/js/components/Calendar/Mode/Month.js b/public/js/components/Calendar/Mode/Month.js
index 038c39123..a352ccc98 100644
--- a/public/js/components/Calendar/Mode/Month.js
+++ b/public/js/components/Calendar/Mode/Month.js
@@ -16,7 +16,8 @@ export default {
 	emits: [
 		"update:currentDate",
 		"update:range",
-		"click"
+		"click",
+		"requestModalOpen"
 	],
 	data() {
 		return {
@@ -101,8 +102,8 @@ export default {
 				this.$emit('update:currentDate', evt.detail.value);
 				break;
 			case 'event':
-				// TODO(chris): IMPLEMENT!
-				// default: ???
+				// default: Request Modal
+				this.$emit('requestModalOpen', { event: evt.detail.value });
 				break;
 			}
 		}
diff --git a/public/js/components/Calendar/Mode/Week.js b/public/js/components/Calendar/Mode/Week.js
index a49f91194..8194a22cd 100644
--- a/public/js/components/Calendar/Mode/Week.js
+++ b/public/js/components/Calendar/Mode/Week.js
@@ -16,7 +16,8 @@ export default {
 	emits: [
 		"update:currentDate",
 		"update:range",
-		"click"
+		"click",
+		"requestModalOpen"
 	],
 	data() {
 		return {
@@ -84,8 +85,8 @@ export default {
 				this.$emit('update:currentDate', evt.detail.value);
 				break;
 			case 'event':
-				// TODO(chris): IMPLEMENT!
-				// default: ???
+				// default: Request Modal
+				this.$emit('requestModalOpen', { event: evt.detail.value });
 				break;
 			}
 		}

From 2f5a7addbd43c9339196357cce78914b075e6b3d Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 16 Jul 2025 15:11:20 +0200
Subject: [PATCH 390/572] Tab Details: Bugfix use cleanedFeedback to avoid
 empty alerts because of updateam, updatevon in result.data

---
 .../Studentenverwaltung/Details/Details.js    | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index a344fc951..18efcc9de 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -116,7 +116,26 @@ export default {
 				.then(result => {
 					this.original = {...this.data};
 					this.changed = {};
-					this.$refs.form.setFeedback(true, result.data);
+
+					const feedback = result.data;
+
+					//to avoid empty alert for updateam, updatevon
+					const cleanedFeedback = {};
+
+					const formElement = this.$refs.form.$el || this.$refs.form;
+					const inputElements = formElement.querySelectorAll('[name]');
+					const validFieldNames = Array.from(inputElements).map(el => el.getAttribute('name'));
+
+					for (const key in feedback) {
+						if (validFieldNames.includes(key)) {
+							cleanedFeedback[key] = feedback[key];
+						}
+					}
+
+					if (Object.keys(cleanedFeedback).length > 0) {
+						this.$refs.form.setFeedback(true, cleanedFeedback);
+						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
+					}
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},

From 8191c5e19f87d2640e46bf350353fb7fa991a479 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 16 Jul 2025 16:47:12 +0200
Subject: [PATCH 391/572] CSS update

---
 public/css/components/calendar/frame.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/css/components/calendar/frame.css b/public/css/components/calendar/frame.css
index 3185fbdd6..22f8cae37 100644
--- a/public/css/components/calendar/frame.css
+++ b/public/css/components/calendar/frame.css
@@ -142,8 +142,12 @@
 	background: linear-gradient(120deg, var(--fhc-calendar-bg-overlay1), var(--fhc-calendar-bg-overlay2));
 	opacity: .7;
 	text-align: center;
-	padding-top: 100px;
 	font-size: 2.5rem;
 	font-weight: 500;
 	line-height: 1.2;
 }
+.fhc-calendar-no-events-overlay:before {
+	content: "";
+	display: block;
+	height: 100px;
+}

From d122a5e72dada37f2ce6dcc798842ef66bd2a919 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 21 Jul 2025 07:57:18 +0200
Subject: [PATCH 392/572] use correct phrase for column name

---
 .../Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
index 451e4f5f4..758fcde2b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -172,7 +172,7 @@ export default {
 							title: this.$p.t('mobility', 'kurzbz')
 						});
 						cm.getColumnByField('insertvonma').component.updateDefinition({
-							title: this.$p.t('global', 'uploaddatum')
+							title: this.$p.t('dokumente', 'akzeptiertVon')
 						});
 						cm.getColumnByField('hochgeladenamum').component.updateDefinition({
 							title: this.$p.t('global', 'uploaddatum')

From a22041007cc47c640809032d8635519c7466fafc Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 21 Jul 2025 08:14:54 +0200
Subject: [PATCH 393/572] update(Cis css): updates utility classes for primary
 colors

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

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 8311ceadb..64bf769fc 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -19,6 +19,11 @@ html {
 	filter: brightness(120%);
 }
 
+.fhc-primary{
+	background-color: var(--fhc-primary) !important;
+	color: var(--fhc-light) !important;
+}
+
 .fhc-primary-color{
 	color: var(--fhc-primary) !important;
 }
@@ -31,6 +36,10 @@ html {
 	background-color: var(--fhc-primary-highlight) !important;
 }
 
+.fhc-primary-highlight-color {
+	color: var(--fhc-primary-highlight) !important;
+}
+
 .fhc-body-bg{
 	background-color:var(--fhc-background) !important;
 }
@@ -97,6 +106,10 @@ html {
 	color: var(--fhc-text) !important;
 }
 
+.fhc-text-light{
+	color: var(--fhc-light) !important;
+}
+
 :root{	
 	/* sidebar colors */
 	--fhc-cis-sidebar-bg: var(--fhc-secondary);

From 07d610d60f0057b1e5c93558f0583f0f01ac9abb Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 21 Jul 2025 08:15:19 +0200
Subject: [PATCH 394/572] update(PrimeVue Paginator darkmode): overwrites the
 background of the paginator component in primevue

---
 public/css/theme/default.css         |  4 ++++
 public/js/components/Cis/Cms/News.js | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/public/css/theme/default.css b/public/css/theme/default.css
index fe05d8d8a..35a0c98f9 100644
--- a/public/css/theme/default.css
+++ b/public/css/theme/default.css
@@ -262,4 +262,8 @@ html.dark .tabulator .tabulator-cell {
 
 html.dark .tabulator .tabulator-header .tabulator-col:hover {
 	background-color: var(--fhc-tertiary) !important;
+}
+
+.p-paginator{
+	background-color: var(--fhc-background) !important;
 }
\ No newline at end of file
diff --git a/public/js/components/Cis/Cms/News.js b/public/js/components/Cis/Cms/News.js
index 50310e771..bf17666a2 100644
--- a/public/js/components/Cis/Cms/News.js
+++ b/public/js/components/Cis/Cms/News.js
@@ -58,6 +58,20 @@ export default {
 							FHC_JS_DATA_STORAGE_OBJECT.app_root
 						);
 					});
+					Vue.nextTick(()=>{
+						document.querySelectorAll(".card-header").forEach((el) => {
+							el.classList.add("fhc-primary");
+						});
+						document.querySelectorAll(".row").forEach((el) => {
+							el.classList.add("w-100");
+							el.classList.add("align-items-center");
+							
+						});
+						document.querySelectorAll(".row h2").forEach((el) => {
+							el.classList.add("mb-0");
+						});
+
+					})
 				});
 		},
 		loadNewPageContent(data) {
@@ -66,6 +80,7 @@ export default {
 				.then(res => res.data)
 				.then(result => {
 					this.content = result;
+					
 				});
 		}
   },
@@ -80,7 +95,7 @@ export default {
 			});
   },
   template: /*html*/ `
-  	<h2 >News</h2>
+  	<h2 class="fhc-primary-color">News</h2>
 	<hr/>
 	<pagination v-show="content?true:false" :page_size="page_size"  @page="page=$event.page; loadNewPageContent($event)" :maxPageCount="maxPageCount">
 	</pagination>

From 4ae1ab88dcdd6180b22a7d594c9de20f485cf76f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 21 Jul 2025 08:51:16 +0200
Subject: [PATCH 395/572] documents accepted tabulator bump persitence_id

---
 .../Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
index 758fcde2b..673c41210 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -151,7 +151,7 @@ export default {
 				height: 300,
 				selectable: true,
 				selectableRangeMode: 'click',
-				persistenceID: 'core-details-documents-accepted',
+				persistenceID: 'core-details-documents-accepted-2025072101',
 				listDocuments: [],
 			},
 			tabulatorEvents: [

From 90c30f21c1eb50a610eae9ea2ed2731969660237 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 21 Jul 2025 11:34:58 +0200
Subject: [PATCH 396/572] Autoscroll

---
 public/js/components/Calendar/Base/Grid.js | 55 +++++++++++++++++++++-
 public/js/components/Calendar/Mode/Day.js  |  6 +++
 public/js/components/Calendar/Mode/Week.js |  8 +++-
 3 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Calendar/Base/Grid.js b/public/js/components/Calendar/Base/Grid.js
index c6b7dd2a3..f9f55bd63 100644
--- a/public/js/components/Calendar/Base/Grid.js
+++ b/public/js/components/Calendar/Base/Grid.js
@@ -57,7 +57,10 @@ export default {
 	},
 	data() {
 		return {
-			dragging: false
+			dragging: false,
+			resizeObserver: null,
+			mutationObserver: null,
+			userScroll: true
 		};
 	},
 	computed: {
@@ -255,8 +258,56 @@ export default {
 			}
 
 			return dayTimestamp + this.start + Math.floor((this.end - this.start) * mouseFrac);
+		},
+		
+		/* SCROLLING */
+		enableAutoScroll() {
+			if (!this.resizeObserver)
+				this.resizeObserver = new ResizeObserver(this.scrollToEarliestEvent);
+			this.resizeObserver.observe(this.$refs.body);
+			
+			if (!this.mutationObserver)
+				this.mutationObserver = new MutationObserver(mutations => {
+					if (mutations.some(m => [].some.call(m.addedNodes, el => el.matches('.fhc-calendar-base-grid-line-event'))))
+						this.scrollToEarliestEvent();
+				});
+			this.mutationObserver.observe(this.$refs.body, {
+				subtree: true,
+				childList: true
+			});
+
+			this.scrollToEarliestEvent();
+		},
+		disableAutoScroll() {
+			if (this.resizeObserver)
+				this.resizeObserver.disconnect();
+			this.resizeObserver = null;
+
+			if (this.mutationObserver)
+				this.mutationObserver.disconnect();
+			this.mutationObserver = null;
+		},
+		scrollToEarliestEvent() {
+			const eventElements = this.$refs.scroller.querySelectorAll('.fhc-calendar-base-grid-line-event');
+			const earliestEventOffset = eventElements.values()
+				.reduce((res, el) => {
+					const top = el.offsetTop;
+					if (!res[1] || top < res[0])
+						return [top, el];
+					return res;
+				}, [0, null]);
+			
+			this.userScroll = false;
+			if (earliestEventOffset[1]) {
+				earliestEventOffset[1].scrollIntoView({ behavior: "smooth" });
+			} else {
+				this.$refs.scroller.scrollTo(0, 0);
+			}
 		}
 	},
+	beforeUnmount() {
+		this.disableAutoScroll();
+	},
 	template: /* html */`
 	<div
 		class="fhc-calendar-base-grid"
@@ -302,6 +353,8 @@ export default {
 			</div>
 		</div>
 		<div
+			ref="scroller"
+			@scrollend="userScroll ? disableAutoScroll() : userScroll = true"
 			style="display:grid;overflow:auto"
 			:style="'grid-' + axisCol + ':1/-1;grid-template-' + axisCol + 's:subgrid'"
 		>
diff --git a/public/js/components/Calendar/Mode/Day.js b/public/js/components/Calendar/Mode/Day.js
index bc0896888..68ca1fa89 100644
--- a/public/js/components/Calendar/Mode/Day.js
+++ b/public/js/components/Calendar/Mode/Day.js
@@ -46,6 +46,7 @@ export default {
 		currentDate() {
 			this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days;
 			if (this.rangeOffset) {
+				this.$refs.view.$refs.grid.disableAutoScroll();
 				this.$emit('update:range', this.range);
 				this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
 			}
@@ -54,11 +55,13 @@ export default {
 	methods: {
 		prevPage() {
 			this.rangeOffset = this.$refs.slider.target - 1;
+			this.$refs.view.$refs.grid.disableAutoScroll();
 			this.$emit('update:range', this.range);
 			this.$refs.slider.prevPage().then(this.updatePage);
 		},
 		nextPage() {
 			this.rangeOffset = this.$refs.slider.target + 1;
+			this.$refs.view.$refs.grid.disableAutoScroll();
 			this.$emit('update:range', this.range);
 			this.$refs.slider.nextPage().then(this.updatePage);
 		},
@@ -68,6 +71,7 @@ export default {
 			this.rangeOffset = 0;
 			this.$emit('update:currentDate', this.focusDate);
 			this.$emit('update:range', this.range);
+			this.$refs.view.$refs.grid.enableAutoScroll();
 		},
 		viewAttrs(days) {
 			const day = this.focusDate.plus({ days });
@@ -76,6 +80,7 @@ export default {
 	},
 	mounted() {
 		this.$emit('update:range', this.range);
+		this.$refs.view.$refs.grid.enableAutoScroll();
 	},
 	template: `
 	<div
@@ -83,6 +88,7 @@ export default {
 	>
 		<base-slider ref="slider" v-slot="slot">
 			<day-view
+				ref="view"
 				v-bind="viewAttrs(slot.offset)"
 				@request-modal-open="$emit('requestModalOpen', $event)"
 				@request-modal-close="$emit('requestModalClose', $event)"
diff --git a/public/js/components/Calendar/Mode/Week.js b/public/js/components/Calendar/Mode/Week.js
index 8194a22cd..f8653b9e9 100644
--- a/public/js/components/Calendar/Mode/Week.js
+++ b/public/js/components/Calendar/Mode/Week.js
@@ -44,12 +44,12 @@ export default {
 	watch: {
 		currentDate() {
 			if (this.currentDate.locale != this.focusDate.locale) {
-				console.log(this.focusDate.toISODate(), this.currentDate.toISODate());
 				this.focusDate = this.currentDate;
 				this.$emit('update:range', this.range);
 			} else {
 				this.rangeOffset = this.currentDate.startOf('week', { useLocaleWeeks: true }).diff(this.focusDate.startOf('week', { useLocaleWeeks: true }), 'weeks').weeks;
 				if (this.rangeOffset) {
+					this.$refs.view.$refs.grid.disableAutoScroll();
 					this.$emit('update:range', this.range);
 					this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
 				}
@@ -59,11 +59,13 @@ export default {
 	methods: {
 		prevPage() {
 			this.rangeOffset = this.$refs.slider.target - 1;
+			this.$refs.view.$refs.grid.disableAutoScroll();
 			this.$emit('update:range', this.range);
 			this.$refs.slider.prevPage().then(this.updatePage);
 		},
 		nextPage() {
 			this.rangeOffset = this.$refs.slider.target + 1;
+			this.$refs.view.$refs.grid.disableAutoScroll();
 			this.$emit('update:range', this.range);
 			this.$refs.slider.nextPage().then(this.updatePage);
 		},
@@ -73,6 +75,7 @@ export default {
 			this.rangeOffset = 0;
 			this.$emit('update:currentDate', this.focusDate);
 			this.$emit('update:range', this.range);
+			this.$refs.view.$refs.grid.enableAutoScroll();
 		},
 		viewAttrs(weeks) {
 			const day = this.focusDate.plus({ weeks });
@@ -93,6 +96,7 @@ export default {
 	},
 	mounted() {
 		this.$emit('update:range', this.range);
+		this.$refs.view.$refs.grid.enableAutoScroll();
 	},
 	template: `
 	<div
@@ -100,7 +104,7 @@ export default {
 		@cal-click-default.capture="handleClickDefaults"
 	>
 		<base-slider ref="slider" v-slot="slot">
-			<week-view v-bind="viewAttrs(slot.offset)">
+			<week-view ref="view" v-bind="viewAttrs(slot.offset)">
 				<template v-slot="slot"><slot v-bind="slot" mode="week" /></template>
 			</week-view>
 		</base-slider>

From 5ed259522259a4928d850a72681e5a5fa2c85dd5 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 21 Jul 2025 13:10:43 +0200
Subject: [PATCH 397/572] Tab Konto: change Dateformat to localeString

- Tabulator: column Buchungsdatum
- Modal: newCounter
- Modal: editCounter
- Tabulator: actionSlot: selected
---
 .../Stv/Studentenverwaltung/Details/Konto.js  | 23 ++++++++++++++++++-
 .../Studentenverwaltung/Details/Konto/Edit.js |  1 +
 .../Studentenverwaltung/Details/Konto/New.js  |  1 +
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
index afb668e4b..eb32e7102 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
@@ -62,6 +62,25 @@ export default {
 					title: '',
 					frozen: true
 				};
+
+			columns.buchungsdatum = {
+				title: 'buchungsdatum',
+				field: 'buchungsdatum',
+				hozAlign: 'center',
+				width: 180,
+				formatter: (cell) => {
+					const value = cell.getValue();
+					if (!value) return '';
+					const date = new Date(value);
+					return date.toLocaleString("de-DE", {
+						day: "2-digit",
+						month: "2-digit",
+						year: "numeric",
+						hour12: false
+					});
+				},
+			};
+
 			columns.actions.formatter = cell => {
 				let container = document.createElement('div');
 				container.className = "d-flex gap-2";
@@ -113,7 +132,7 @@ export default {
 				index: 'buchungsnr',
 				persistenceID: 'stv-details-konto'
 			};
-		}
+		},
 	},
 	watch: {
 		modelValue() {
@@ -222,6 +241,7 @@ export default {
 				</form-input>
 			</div>
 		</div>
+
 		<core-filter-cmpt
 			ref="table"
 			table-only
@@ -240,6 +260,7 @@ export default {
 						v-model="counterdate"
 						input-group
 						:enable-time-picker="false"
+						format="dd.MM.yyyy"
 						auto-apply
 						@cleared="counterdate = new Date()"
 						>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
index fb02e30a2..ce926c007 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
@@ -82,6 +82,7 @@ export default {
 					name="buchungsdatum"
 					:label="$p.t('konto/buchungsdatum')"
 					:enable-time-picker="false"
+					format="dd.MM.yyyy"
 					auto-apply
 					>
 				</form-input>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
index dc6dbb253..2afb8158d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
@@ -144,6 +144,7 @@ export default {
 					name="buchungsdatum"
 					:label="$p.t('konto/buchungsdatum')"
 					:enable-time-picker="false"
+					format="dd.MM.yyyy"
 					auto-apply
 					>
 				</form-input>

From f4f59b2fffb885f79c6001c60e062163309ca7b1 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 21 Jul 2025 13:49:52 +0200
Subject: [PATCH 398/572] Bugfix check textnodes

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

diff --git a/public/js/components/Calendar/Base/Grid.js b/public/js/components/Calendar/Base/Grid.js
index f9f55bd63..7800955d8 100644
--- a/public/js/components/Calendar/Base/Grid.js
+++ b/public/js/components/Calendar/Base/Grid.js
@@ -268,7 +268,7 @@ export default {
 			
 			if (!this.mutationObserver)
 				this.mutationObserver = new MutationObserver(mutations => {
-					if (mutations.some(m => [].some.call(m.addedNodes, el => el.matches('.fhc-calendar-base-grid-line-event'))))
+					if (mutations.some(m => m.addedNodes.length && [].some.call(m.addedNodes, el => el.matches && el.matches('.fhc-calendar-base-grid-line-event'))))
 						this.scrollToEarliestEvent();
 				});
 			this.mutationObserver.observe(this.$refs.body, {

From f1e28cec4e0be7638db018cc63aec11c4e3f46fe Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 21 Jul 2025 14:10:23 +0200
Subject: [PATCH 399/572] Bugfix eventloader

---
 public/js/composables/EventLoader.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/composables/EventLoader.js b/public/js/composables/EventLoader.js
index 541903012..7fc1c5abc 100644
--- a/public/js/composables/EventLoader.js
+++ b/public/js/composables/EventLoader.js
@@ -75,7 +75,7 @@ export function useEventLoader(rangeInterval, getPromiseFunc) {
 						// starts at the same position as an existing chunk
 						if (eventsLoaded[index + 1] >= end.ts)
 							return []; // Already loaded
-						// load this rest
+						// load the rest
 						let rStart = eventsLoaded[index + 1] + 1;
 						result = mergePromiseArr(markEventsLoaded(start.plus(rStart - start.ts), end), result);
 					} else {
@@ -94,7 +94,7 @@ export function useEventLoader(rangeInterval, getPromiseFunc) {
 		}
 
 		if (start.ts > end.ts)
-			return [];
+			return result;
 
 		return mergePromiseArr(getPromiseFunc(start, end), result);
 	};

From e25687be5259db316925f6df787b81f80c111138 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 21 Jul 2025 15:08:25 +0200
Subject: [PATCH 400/572] Bugfix start index of grid-line

---
 public/js/components/Calendar/Base/Grid.js      | 1 -
 public/js/components/Calendar/Base/Grid/Line.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/js/components/Calendar/Base/Grid.js b/public/js/components/Calendar/Base/Grid.js
index 7800955d8..7b2d1f87b 100644
--- a/public/js/components/Calendar/Base/Grid.js
+++ b/public/js/components/Calendar/Base/Grid.js
@@ -214,7 +214,6 @@ export default {
 			const result = Array.from({length: this.axisMain.length}, () => Array());
 			
 			target.forEach(event => {
-				// NOTE(chris): make new Date object to reset the time
 				const start = event.start || this.axisMainBorders[0].plus(-1);
 				const end = event.end || this.axisMainBorders[this.axisMainBorders.length - 1].plus(1);
 
diff --git a/public/js/components/Calendar/Base/Grid/Line.js b/public/js/components/Calendar/Base/Grid/Line.js
index cd71dcc02..9a6c2f579 100644
--- a/public/js/components/Calendar/Base/Grid/Line.js
+++ b/public/js/components/Calendar/Base/Grid/Line.js
@@ -41,7 +41,7 @@ export default {
 		eventsWithRowInfo() {
 			const events = [];
 			this.events.forEach(event => {
-				const rows = [2, -1];
+				const rows = [1, -1];
 				if (event.startsHere) {
 					rows[0] = 't_' + event.start.diff(this.date).toMillis();
 				}

From ff104461af84be26368e6774f260853f74acd64e Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 21 Jul 2025 15:08:42 +0200
Subject: [PATCH 401/572] Bugfix missing template ref

---
 public/js/components/Calendar/Mode/Week/View.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/js/components/Calendar/Mode/Week/View.js b/public/js/components/Calendar/Mode/Week/View.js
index d110c45bc..8941a755a 100644
--- a/public/js/components/Calendar/Mode/Week/View.js
+++ b/public/js/components/Calendar/Mode/Week/View.js
@@ -46,6 +46,7 @@ export default {
 	template: /* html */`
 	<div class="fhc-calendar-mode-week-view h-100">
 		<calendar-grid
+			ref="grid"
 			:axis-main="axisMain"
 			:axis-parts="axisParts"
 			:axis-main-collapsible="collapseEmptyDays"

From 4e4a7a3880e657ff59a8319ce326d5ae7e537345 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 21 Jul 2025 15:30:34 +0200
Subject: [PATCH 402/572] Bugfix handle events outside of grid bounds

---
 public/js/components/Calendar/Base/Grid.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Calendar/Base/Grid.js b/public/js/components/Calendar/Base/Grid.js
index 7b2d1f87b..37b31e784 100644
--- a/public/js/components/Calendar/Base/Grid.js
+++ b/public/js/components/Calendar/Base/Grid.js
@@ -128,10 +128,10 @@ export default {
 			return ends;
 		},
 		axisMainBorders() {
-			const lastInMainAxis = this.axisMain[this.axisMain.length - 1];
-			const extraLength = this.end;
-
-			return [...this.axisMain, lastInMainAxis.plus(extraLength)];
+			return this.axisMain.reduce(
+				(res, curr) => res.concat([curr.plus(this.start), curr.plus(this.end)]),
+				[]
+			);
 		},
 		eventsAllDay() {
 			if (!this.allDayEvents)
@@ -218,9 +218,9 @@ export default {
 				const end = event.end || this.axisMainBorders[this.axisMainBorders.length - 1].plus(1);
 
 				for (var i = 0; i < this.axisMain.length; i++) {
-					if (start < this.axisMainBorders[i + 1] && end > this.axisMainBorders[i]) {
-						const startsHere = start >= this.axisMainBorders[i];
-						const endsHere = end <= this.axisMainBorders[i+1];
+					if (start < this.axisMainBorders[i * 2 + 1] && end > this.axisMainBorders[i * 2]) {
+						const startsHere = start >= this.axisMainBorders[i * 2];
+						const endsHere = end <= this.axisMainBorders[i * 2 + 1];
 						result[i].push({
 							...event,
 							startsHere,

From f1971659b47ea75eb33a84ed147dc85689a98d73 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 21 Jul 2025 15:33:35 +0200
Subject: [PATCH 403/572] Loading Events

---
 public/css/components/calendar/frame.css         |  3 +++
 public/js/components/Calendar/Mode/Day/View.js   | 14 +++++++++++---
 public/js/components/Calendar/Mode/List/View.js  |  5 ++++-
 public/js/components/Calendar/Mode/Month/View.js |  3 +++
 public/js/components/Calendar/Mode/Week/View.js  |  5 ++++-
 public/js/composables/EventLoader.js             | 15 +++++++++++++--
 6 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/public/css/components/calendar/frame.css b/public/css/components/calendar/frame.css
index 22f8cae37..dcad26abf 100644
--- a/public/css/components/calendar/frame.css
+++ b/public/css/components/calendar/frame.css
@@ -127,6 +127,9 @@
 	height: calc(var(--fhc-calendar-fontsize-event, .875rem) + 2 * var(--fhc-calendar-margin-event-icon, .5rem));
 	overflow: hidden;
 }
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event .placeholder-glow {
+	text-indent: 0;
+}
 .fhc-calendar-mode-month .fhc-calendar-base-grid-line-event * {
 	max-height: 100%;
 	max-width: 100%;
diff --git a/public/js/components/Calendar/Mode/Day/View.js b/public/js/components/Calendar/Mode/Day/View.js
index 8371405d3..56065bbfd 100644
--- a/public/js/components/Calendar/Mode/Day/View.js
+++ b/public/js/components/Calendar/Mode/Day/View.js
@@ -63,9 +63,14 @@ export default {
 				if (this.events.find(e => e == this.chosenEvent))
 					return this.chosenEvent;
 			}
+			let first = null;
 			if (this.events)
-				return this.events.find(Boolean); // undefined => none found
-			return null; // null => loading
+				first = this.events.find(Boolean); // undefined => none found
+
+			if (first && first.type == 'loading')
+				return null; // null => loading
+
+			return first;
 		}
 	},
 	watch: {
@@ -123,7 +128,10 @@ export default {
 				<label-time v-bind="{ part }" />
 			</template>
 			<template #event="slot">
-				<slot v-bind="slot" mode="day" />
+				<div v-if="slot.event.type == 'loading'" class="placeholder-glow h-100 opacity-50">
+					<span class="placeholder w-100 h-100" />
+				</div>
+				<slot v-else v-bind="slot" mode="day" />
 			</template>
 		</calendar-grid>
 		<Teleport :disabled="!gridMainRef" :to="gridMainRef">
diff --git a/public/js/components/Calendar/Mode/List/View.js b/public/js/components/Calendar/Mode/List/View.js
index 50560c0e7..38b1f9855 100644
--- a/public/js/components/Calendar/Mode/List/View.js
+++ b/public/js/components/Calendar/Mode/List/View.js
@@ -53,7 +53,10 @@ export default {
 		<div v-for="{ day, events } in eventsPerDay" class="text-center">
 			<label-dow :date="day" class="d-inline" />, <label-day :date="day" class="d-inline" />
 			<div v-for="event in events">
-				<slot :event="event.orig" mode="list" />
+ 				<div v-if="slot.event.type == 'loading'" class="placeholder-glow opacity-50">
+					<span class="placeholder w-100" />
+				</div>
+				<slot v-else :event="event.orig" mode="list" />
 			</div>
 		</div>
 	</div>
diff --git a/public/js/components/Calendar/Mode/Month/View.js b/public/js/components/Calendar/Mode/Month/View.js
index b2268e43d..fc21e452b 100644
--- a/public/js/components/Calendar/Mode/Month/View.js
+++ b/public/js/components/Calendar/Mode/Month/View.js
@@ -78,6 +78,9 @@ export default {
 					:date="slot.event.start"
 					:class="{ disabled: day.month != slot.event.start.month }"
 				/>
+				<div v-else-if="slot.event.type == 'loading'" class="placeholder-glow opacity-50">
+					<span class="placeholder w-100 fs-1" />
+				</div>
 				<slot v-else v-bind="slot" />
 			</template>
 		</calendar-grid>
diff --git a/public/js/components/Calendar/Mode/Week/View.js b/public/js/components/Calendar/Mode/Week/View.js
index 8941a755a..64cd4b1a6 100644
--- a/public/js/components/Calendar/Mode/Week/View.js
+++ b/public/js/components/Calendar/Mode/Week/View.js
@@ -66,7 +66,10 @@ export default {
 				<label-time v-bind="{ part }" />
 			</template>
 			<template #event="slot">
-				<slot v-bind="slot" />
+				<div v-if="slot.event.type == 'loading'" class="placeholder-glow h-100 opacity-50">
+					<span class="placeholder w-100 h-100" />
+				</div>
+				<slot v-else v-bind="slot" />
 			</template>
 		</calendar-grid>
 	</div>
diff --git a/public/js/composables/EventLoader.js b/public/js/composables/EventLoader.js
index 7fc1c5abc..5af20f6be 100644
--- a/public/js/composables/EventLoader.js
+++ b/public/js/composables/EventLoader.js
@@ -1,5 +1,8 @@
 export function useEventLoader(rangeInterval, getPromiseFunc) {
+	let loading_id = 0;
 	const events = Vue.ref([]);
+	const loadingEvents = Vue.ref([]);
+	const allEvents = Vue.computed(() => events.value.concat(loadingEvents.value));
 	const lv = Vue.ref(null);
 	const eventsLoaded = [];
 
@@ -93,9 +96,16 @@ export function useEventLoader(rangeInterval, getPromiseFunc) {
 			}
 		}
 
-		if (start.ts > end.ts)
+		if (start.ts >= end.ts)
 			return result;
 
+		loadingEvents.value.push({
+			loading_id: loading_id++,
+			type: "loading",
+			isostart: start.toISODate() + 'T' + start.toISOTime(),
+			isoend: end.toISODate() + 'T' + end.toISOTime()
+		});
+
 		return mergePromiseArr(getPromiseFunc(start, end), result);
 	};
 
@@ -116,10 +126,11 @@ export function useEventLoader(rangeInterval, getPromiseFunc) {
 							lv.value = res.value.meta.lv;
 
 						events.value = events.value.concat(res.value.data);
+						loadingEvents.value = [];
 					}
 				})
 			});
 	})
 
-	return { events, lv }
+	return { events: allEvents, lv }
 }
\ No newline at end of file

From 20e896427439e909aa154607cd5c6eda327ba6d8 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 21 Jul 2025 15:38:35 +0200
Subject: [PATCH 404/572] Comment

---
 public/js/components/Calendar/Base.js | 7 -------
 public/js/composables/EventLoader.js  | 2 ++
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Calendar/Base.js b/public/js/components/Calendar/Base.js
index 298b9857e..a8d668cab 100644
--- a/public/js/components/Calendar/Base.js
+++ b/public/js/components/Calendar/Base.js
@@ -5,13 +5,6 @@ import BsModal from '../Bootstrap/Modal.js';
 
 import CalClick from '../../directives/Calendar/Click.js';
 
-/**
- * TODO(chris):
- * - check emits
- * - event single mode (default for click:event)
- * - get focusDate/currentDate correct
- */
-
 export default {
 	name: "CalendarBase",
 	components: {
diff --git a/public/js/composables/EventLoader.js b/public/js/composables/EventLoader.js
index 5af20f6be..7360d0286 100644
--- a/public/js/composables/EventLoader.js
+++ b/public/js/composables/EventLoader.js
@@ -1,3 +1,5 @@
+// TODO(chris): load events that are longer than the interval without doubling it
+
 export function useEventLoader(rangeInterval, getPromiseFunc) {
 	let loading_id = 0;
 	const events = Vue.ref([]);

From 91bb167c425129ba48f8871c523f503494695483 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 21 Jul 2025 15:40:51 +0200
Subject: [PATCH 405/572] Implementation CIS => LV Plan

---
 public/js/components/Cis/LvPlan/LvPlan.js | 488 ++++++++--------------
 1 file changed, 185 insertions(+), 303 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 14c9b77a2..5267fc269 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -1,353 +1,235 @@
-import FhcCalendar from "../../Calendar/Calendar.js";
-import CalendarDate from "../../../composables/CalendarDate.js";
+import FhcCalendar from "../../Calendar/Base.js";
 import LvModal from "../Mylv/LvModal.js";
 import LvMenu from "../Mylv/LvMenu.js"
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
+import { useEventLoader } from '../../../composables/EventLoader.js';
+
+import ModeDay from '../../Calendar/Mode/Day.js';
+import ModeWeek from '../../Calendar/Mode/Week.js';
+import ModeMonth from '../../Calendar/Mode/Month.js';
+
 export const DEFAULT_MODE_LVPLAN = 'Week'
 
-const LvPlan = {
+export default {
 	name: 'LvPlan',
+	components: {
+		FhcCalendar,
+		LvModal,
+		LvMenu
+	},
+	inject: [
+		"renderers"
+	],
+	props: {
+		viewData: Object, // NOTE(chris): this is inherited from router-view
+		propsViewData: Object
+	},
 	data() {
 		return {
-			events: null,
+			modes: {
+				day: Vue.markRaw(ModeDay),
+				week: Vue.markRaw(ModeWeek),
+				month: Vue.markRaw(ModeMonth)
+			},
+			modeOptions: {
+				day: {
+					emptyMessage: Vue.computed(() => this.$p.t('lehre/noLvFound')),
+					emptyMessageDetails: Vue.computed(() => this.$p.t('lehre/noLvFound')),
+					compact: false
+				},
+				week: {
+					collapseEmptyDays: false
+				}
+			},
+			currentDay: this.propsViewData?.focus_date,
 			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_LVPLAN,
-			calendarDate: new CalendarDate(new Date()),
-			eventCalendarDate: new CalendarDate(new Date()),
-			currentlySelectedEvent: null,
-			currentDay: this.propsViewData?.focus_date ? new Date(this.propsViewData.focus_date) : new Date(),
-			lv: null,
-			minimized: false,
+
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
 			studiensemester_ende: null,
 			uid: null,
-			isModalContentResolved: false,
-			isModalTitleResolved: false,
-			isShowModal: false,
-		}
-	},
-	props: {
-		viewData: Object, // NOTE(chris): this is inherited from router-view
-		propsViewData: Object,
-		rowMinHeight: {
-			type: String,
-			default: '100px'
-		},
-		eventMaxHeight: {
-			type: String,
-			default: '125px'
-		}
-	},
-	provide() {
-		return {
-			rowMinHeight: this.rowMinHeight,
-			eventMaxHeight: this.eventMaxHeight
-		}	
-	},
-	inject:["renderers"],
-	watch: {
-		/* events:{
-			handler: function(newValue){
-				if(newValue == null)
-					setTimeout(()=>{
-						if(this.events == null){
-							this.loadEvents();
-						}
-					},500);
-			},
-			immediate: true,
-		}, */
-		modalLoaded:{
-			handler: function (newValue) {
-				if (this.isShowModal && newValue.isModalContentResolved && newValue.isModalTitleResolved) {
-					this.$nextTick(() => {
-						if(this.$refs.lvmodal) this.$refs.lvmodal.show();
-						this.isShowModal = false;
-					});
-				}
-			}, 
-			immediate: true
-		},
-		weekFirstDay: {
-			handler: async function (newValue) {
-				let data = await this.fetchStudiensemesterDetails(newValue);
-				let { studiensemester_kurzbz, start, ende } = data.data;
-				this.studiensemester_kurzbz = studiensemester_kurzbz;
-				this.studiensemester_start = start;
-				this.studiensemester_ende = ende;
-			},
-			immediate: true,
-		},
-		// forward/backward on history entries happening in lvplan
-		'propsViewData.lv_id'(newVal) {
-			// relevant if lv_id can be changed from within this component
-		},
-		'propsViewData.mode'(newVal) {
-			if(this.$refs.calendar) this.$refs.calendar.setMode(newVal)
-		},
-		'propsViewData.focus_date'(newVal) {
-			this.currentDate = new Date(newVal)
-		}
-	},
-	components: {
-		FhcCalendar, LvModal, LvMenu
+		};
 	},
 	computed:{
-		modalLoaded: function(){
-			return { isModalContentResolved: this.isModalContentResolved, isModalTitleResolved:this.isModalTitleResolved};
-		},
-		
-		downloadLinks: function(){
-			if(!this.studiensemester_start || !this.studiensemester_ende || !this.uid )return;
-			let start = new Date(this.studiensemester_start);
-			start = Math.floor(start.getTime()/1000);
-			let ende = new Date(this.studiensemester_ende);
-			ende = Math.floor(ende.getTime() / 1000);
+		downloadLinks() {
+			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
+				return false;
+			
+			const opts = { zone: this.viewData.timezone };
+			const start = luxon.DateTime
+				.fromISO(this.studiensemester_start, opts)
+				.toUnixInteger();
+			const ende = luxon.DateTime
+				.fromISO(this.studiensemester_ende, opts)
+				.toUnixInteger();
+
+			const download_link = FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ 'cis/private/lvplan/stpl_kalender.php'
+				+ '?type=student'
+				+ '&pers_uid=' + this.uid
+				+ '&begin=' + start
+				+ '&ende=' + ende;
 
-			let download_link = 
-				(format, version = "", target = "") => 
-					`${FHC_JS_DATA_STORAGE_OBJECT.app_root}cis/private/lvplan/stpl_kalender.php?type=student&pers_uid=
-					${this.uid}&begin=${start}&ende=${ende}&format=${format}
-					${version ? '&version=' + version : ''}${target ? '&target=' + target : ''}`;
 			return [
-				{ title: "excel", icon: 'fa-solid fa-file-excel', link: download_link('excel') },
-				{ title: "csv", icon: 'fa-solid fa-file-csv', link: download_link('csv') },
-				{ title: "ical1", icon: 'fa-regular fa-calendar', link: download_link('ical', '1', 'ical') },
-				{ title: "ical2", icon: 'fa-regular fa-calendar', link: download_link('ical', '2', 'ical') }
+				{ title: "excel", icon: 'fa-solid fa-file-excel', link: download_link + '&format=excel' },
+				{ title: "csv", icon: 'fa-solid fa-file-csv', link: download_link + '&format=csv' },
+				{ title: "ical1", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=1&target=ical' },
+				{ title: "ical2", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=2&target=ical' }
 			];
 		},
-		weekFirstDay: function () {
-			return this.calendarDateToString(this.calendarDate.cdFirstDayOfWeek);
-		},
-		weekLastDay: function () {
-			return this.calendarDateToString(this.calendarDate.cdLastDayOfWeek);
-		},
-		monthFirstDay: function () {
-			return this.calendarDateToString(this.eventCalendarDate.cdFirstDayOfCalendarMonth);
-		},
-		monthLastDay: function () {
-			return this.calendarDateToString(this.eventCalendarDate.cdLastDayOfCalendarMonth);
-		},
 	},
-	methods:{
-		modalTitleResolved: function () {
-			this.isModalTitleResolved = true;
-			
+	methods: {
+		eventStyle(event) {
+			if (!event.farbe)
+				return undefined;
+			return '--event-bg:#' + event.farbe;
 		},
-		modalContentResolved: function () {
-			this.isModalContentResolved = true;
-			
-		},
-		// component renderers fetches from different addons
-		modalTitleComponent(type){
-			return this.renderers[type]?.modalTitle;
-		},
-		modalContentComponent(type) {
-			return this.renderers[type]?.modalContent;
-		},
-		calendarEventComponent(type){
-			return this.renderers[type]?.calendarEvent;
-		},
-		
-
-		fetchStudiensemesterDetails: async function (date) {
-			return this.$api.call(ApiLvPlan.studiensemesterDateInterval(date));
-		},
-		
-		setSelectedEvent: function (event) {
-			this.currentlySelectedEvent = event;
-		},
-		selectDay: function(day){
-			const date = day.getFullYear() + "-" +
-				String(day.getMonth() + 1).padStart(2, "0") + "-" +
-				String(day.getDate()).padStart(2, "0");
-			const capitalizedMode = this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1);
+		handleChangeDate(day) {
+			const focus_date = day.toISODate();
+			const mode = this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1);
 
 			this.$router.push({
 				name: "LvPlan",
 				params: {
-					mode: capitalizedMode,
-					focus_date: date,
+					mode,
+					focus_date,
 					lv_id: this.propsViewData?.lv_id || null
 				}
 			})
 			
 			this.currentDay = day;
 		},
-		handleChangeMode(mode) {
-			let m = mode[0].toUpperCase() + mode.slice(1)
-			if(m === this.calendarMode) return; // TODO(chris): check for date and lv_id too!
-			const date = this.currentDay.getFullYear() + "-" +
-				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
-				String(this.currentDay.getDate()).padStart(2, "0");
-			
-			if (m == 'Weeks' || m == 'Years' || m == 'Months') return;
+		handleChangeMode(newMode) {
+			const mode = newMode[0].toUpperCase() + newMode.slice(1)
+			const focus_date = (this.currentDay instanceof luxon.DateTime)
+				? this.currentDay.toISODate()
+				: this.currentDay;
 			
 			this.$router.push({
 				name: "LvPlan",
 				params: {
-					mode: m,
-					focus_date: date,
+					mode,
+					focus_date,
 					lv_id: this.propsViewData?.lv_id ?? null
 				}
-			})
-			this.calendarMode = m
-		},
-		showModal: function(event){
-			this.currentlySelectedEvent = event;
-			Vue.nextTick(()=>{
-				if(this.isModalContentResolved && this.isModalTitleResolved){
-					if(this.$refs.lvmodal) this.$refs.lvmodal.show();
-				} 
-				else{
-					this.isShowModal = true;
-				}
-			})
-		},
-		updateRange: function ({start,end, mounted}) {
-			let checkDate = (date) => {
-				return date.m != this.eventCalendarDate.m || date.y != this.eventCalendarDate.y;
-			}
-			this.calendarDate = new CalendarDate(end);
-
-			// only load month data if the month or year has changed
-			// or we receive a reload flag from the mounted routine of the components
-			// or this handler is being called from the mounted lifecycle of a component
-			if (mounted || (checkDate(new CalendarDate(start)) && checkDate(new CalendarDate(end)))){
-				// reset the events before querying the new events to activate the loading spinner
-				this.events = null;
-				this.eventCalendarDate = new CalendarDate(end);
-				this.loadEvents();
-			}
-		},
-		calendarDateToString: function (calendarDate) {
-			return calendarDate instanceof CalendarDate ?
-				[calendarDate.y, calendarDate.m + 1, calendarDate.d].join('-') :
-				null;
-
-		},
-		loadEvents: function(){
-			Promise.allSettled([
-				this.$api.call(ApiLvPlan.LvPlanEvents(this.monthFirstDay, this.monthLastDay, this.propsViewData.lv_id)),
-				this.$api.call(ApiLvPlan.getLvPlanReservierungen(this.monthFirstDay, this.monthLastDay))
-			]).then((result) => {
-				let promise_events = [];
-				result.forEach((promise_result) => {
-					if (promise_result.status === 'fulfilled' && promise_result.value.meta.status === "success") {
-						
-						if(promise_result.value.meta?.lv) this.lv = promise_result.value.meta.lv
-						
-						let data = promise_result.value.data;
-						// adding additional information to the events 
-						if (data && data.forEach) {
-
-							data.forEach((el, i) => {
-								el.id = i;
-								if (el.type === 'reservierung') {
-									el.color = '#' + (el.farbe || 'FFFFFF');
-								} else {
-									el.color = '#' + (el.farbe || 'CCCCCC');
-								}
-
-								el.start = new Date(el.datum + ' ' + el.beginn);
-								el.end = new Date(el.datum + ' ' + el.ende);
-
-							});
-						}
-						promise_events = promise_events.concat(data);
-					}
-				})
-				this.events = promise_events;
 			});
+
+			this.calendarMode = mode;
 		},
+		updateRange(rangeInterval) {
+			this.rangeInterval = rangeInterval;
+			this.$api
+				.call(ApiLvPlan.studiensemesterDateInterval(
+					this.rangeInterval.end.startOf('week').toISODate()
+				))
+				.then(res => {
+					this.studiensemester_kurzbz = res.data.studiensemester_kurzbz;
+					this.studiensemester_start = res.data.start;
+					this.studiensemester_ende = res.data.ende;
+				});
+		}
+	},
+	setup(props) {
+		const $api = Vue.inject('$api');
+
+		const rangeInterval = Vue.ref(null);
+		
+		const { events, lv } = useEventLoader(rangeInterval, (start, end) => {
+			return [
+				$api.call(ApiLvPlan.LvPlanEvents(start.toISODate(), end.toISODate(), props.propsViewData.lv_id)),
+				$api.call(ApiLvPlan.getLvPlanReservierungen(start.toISODate(), end.toISODate()))
+			];
+		});
+
+		return {
+			rangeInterval,
+			events,
+			lv
+		};
 	},
 	created() {
-		
-
 		this.$api
 			.call(ApiAuthinfo.getAuthUID())
-			.then(res => res.data)
-			.then(data => {
-				this.uid = data.uid;
+			.then(res => {
+				this.uid = res.data.uid;
 			});
-		
-		// this.loadEvents();
-	},
-	beforeUnmount() {
-		if(this.$refs.lvmodal) this.$refs.lvmodal.hide()	
+		/*window.addEventListener("resize", () => {
+			this.modeOptions.day.compact = document.body.offsetWidth < 1200;
+		});*/
 	},
 	template:/*html*/`
-	<template v-if="renderers">
-	<h2>
-		{{$p.t('lehre/stundenplan')}}
-		<span style="padding-left: 0.4em;" v-show="studiensemester_kurzbz">{{studiensemester_kurzbz}}</span>
-		<span style="padding-left: 0.5em;" v-show="propsViewData?.lv_id && lv"> {{ $p.user_language.value === 'German' ? lv?.bezeichnung : lv?.bezeichnung_english}}</span>
-	</h2>
-	<hr>
-	<lv-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="lvmodal" >
-		<template #modalTitle>
-		<Suspense @pending="isModalTitleResolved=false" @resolve="modalTitleResolved">
-			<component :is="modalTitleComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
-		</Suspense>
-		</template>
-		<template #modalContent>
-		<Suspense @pending="isModalContentResolved=false" @resolve="modalContentResolved">
-			<component :is="modalContentComponent(currentlySelectedEvent.type)" v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ></component>
-		</Suspense>
-		</template>
-	</lv-modal>
+	<div class="d-flex flex-column h-100" v-if="renderers">
+		<h2 @click="modeOptions.week.collapseEmptyDays = !modeOptions.week.collapseEmptyDays">
+			{{ $p.t('lehre/stundenplan') }}
+			<span style="padding-left: 0.4em;" v-show="studiensemester_kurzbz">
+				{{ studiensemester_kurzbz }}
+			</span>
+			<span style="padding-left: 0.5em;" v-show="propsViewData?.lv_id && lv">
+				{{ $p.user_language.value === 'German' ? lv?.bezeichnung : lv?.bezeichnung_english }}
+			</span>
+		</h2>
+		<hr>
+		<fhc-calendar
+			ref="calendar"
+			:date="currentDay"
+			:modes="modes"
+			:modeOptions="modeOptions"
+			:mode="propsViewData.mode.toLowerCase()"
+			@update:date="handleChangeDate"
+			@update:mode="handleChangeMode"
+			@update:range="updateRange"
+			:timezone="viewData.timezone"
+			:locale="$p.user_locale.value"
+			show-btns
+			:events="events || []"
+			:backgrounds="[]"
 
-	<fhc-calendar
-		ref="calendar"
-		@selectedEvent="setSelectedEvent"
-		:initial-date="currentDay"
-		@change:range="updateRange"
-		@change:offset="handleOffset"
-		:events="events"
-		:initial-mode="propsViewData.mode"
-		show-weeks
-		@select:day="selectDay"
-		@change:mode="handleChangeMode"
-		v-model:minimized="minimized"
-	>
-		<template #calendarDownloads>
-			<div v-for="{title,icon,link} in downloadLinks">
-				<a :href="link" :aria-label="title" class="py-1 px-2 m-1 btn btn-outline-secondary card">
-					<div class="d-flex flex-column">
-						<i aria-hidden="true" :class="icon"></i>
-						<span class="small">{{title}}</span>
+			show-weeks
+		>
+			<template v-slot="{ event, mode }">
+				<div
+					:class="'event-type-' + event.type + ' ' + mode + 'PageContainer'"
+					:type="mode == 'day' ? 'button' : undefined"
+	 				:style="eventStyle(event)"
+				>
+					<component
+						v-if="mode == 'event'"
+						:is="renderers[event.type]?.modalContent"
+						:event="event"
+					></component>
+					<component
+						v-else-if="mode == 'eventheader'"
+						:is="renderers[event.type]?.modalTitle"
+						:event="event"
+					></component>
+					<component
+						v-else
+						:is="renderers[event.type]?.calendarEvent"
+						:event="event"
+					></component>
+				</div>
+			</template>
+			<template #actions>
+				<div
+					v-if="downloadLinks"
+					class="d-flex gap-1 justify-items-start"
+				>
+					<div v-for="{ title, icon, link } in downloadLinks">
+						<a
+							:href="link"
+							:aria-label="title"
+							class="py-1 px-2 m-1 btn btn-outline-secondary card"
+						>
+							<div class="d-flex flex-column">
+								<i aria-hidden="true" :class="icon"></i>
+								<span class="small">{{ title }}</span>
+							</div>
+						</a>
 					</div>
-				</a>
-			</div>
-		</template>
-		<template #monthPage="{event,day}">
-			<div @click="showModal(event)" class="monthPageContainer " >
-				<component :is="calendarEventComponent(event.type)" :event="event" ></component>
-			</div>
-		</template>
-		<template #weekPage="{event,day}">
-			<div @click="showModal(event)" type = "button"
-				class="weekPageContainer position-relative h-100"
-				:class="{'p-1':event.allDayEvent}"
-				style = "overflow: auto;" >
-				<component :is="calendarEventComponent(event.type)" :event="event" ></component>
-			</div>
-		</template>
-		<template #dayPage="{event,day,mobile}">
-			<div @click="mobile? showModal(event):null" type="button" class="dayPageContainer fhc-entry m-0 h-100  text-center">
-				<component :is="calendarEventComponent(event.type)" :event="event"></component>
-			</div>
-		</template>
-		<template #pageMobilContent="{lvMenu, event}">
-			<component :is="modalContentComponent(currentlySelectedEvent.type)" v-if="event" :event="event" :lvMenu="lvMenu" ></component>
-		</template>
-		<template #pageMobilContentEmpty >
-			<h3>{{ $p.t('lehre/noLvFound') }}</h3>
-		</template>
-	</fhc-calendar>
-	</template>`
-}
-
-export default LvPlan;
+				</div>
+			</template>
+		</fhc-calendar>
+	</div>`
+};

From 772685019381eefff7e410ac1b47066a6a9a42aa Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 21 Jul 2025 16:14:16 +0200
Subject: [PATCH 406/572] quick fix equal-int comparison resulting in an error
 if search string is numeric but out of range of integer column

---
 application/config/searchfunctions.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/application/config/searchfunctions.php b/application/config/searchfunctions.php
index 898069aed..276652997 100644
--- a/application/config/searchfunctions.php
+++ b/application/config/searchfunctions.php
@@ -1,12 +1,16 @@
 <?php
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-
+/*
+ * TODO: 2025-07-21 ma0080 bare integer comparision results in db error
+ *       if searchstring is numeric but out of range of int, think about 
+ *       more sophisticated solution using column data type - quick fix 
+ *       convert field and search string to text
+ */
 $config['equal-int'] = [
 	'priority' => 4,
 	'rank' => "0",
-	'compare' => "{field} = {word}",
+	'compare' => "{field}::text = {word}::text",
 	'force_integer' => true
 ];
 

From 9d809cf8439be3c1f848fc5a4230807550bb607c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 21 Jul 2025 16:33:26 +0200
Subject: [PATCH 407/572] Tab Dokumente

- Refactor Mapping for List Accepted for correct view Akzeptiertdatum and AkzeptiertVon
- Delete Testoutputs dokument_kurzbz List NotAccpeted
- Correct ColumnName for NachreichungAm
- Change Order Columns Uploaddatum, akzeptiertVon
---
 .../api/frontend/v1/stv/Dokumente.php         | 29 ++++++++++++-------
 .../models/crm/Dokumentprestudent_model.php   |  2 ++
 .../Details/Dokumente/List/Accepted.js        |  6 ++--
 .../Details/Dokumente/List/Unaccepted.js      |  2 --
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Dokumente.php b/application/controllers/api/frontend/v1/stv/Dokumente.php
index 686094620..18c976eb6 100644
--- a/application/controllers/api/frontend/v1/stv/Dokumente.php
+++ b/application/controllers/api/frontend/v1/stv/Dokumente.php
@@ -101,22 +101,29 @@ class Dokumente extends FHCAPI_Controller
 			}
 		}
 
-		//Array for total list of accepted documents
-		$newDataMap = [];
-		foreach ($arrayAccepted as $item) {
-			$newDataMap[] = (array)$item;
+		//Mapping with document_kurzbz
+		$preDocMap = [];
+		foreach ($resultPreDoc as $pre) {
+			$preDocMap[$pre->dokument_kurzbz] = $pre;
 		}
 
-		$listExistingKurzbz = array_column($newDataMap, 'dokument_kurzbz');
+		$mergedArray = [];
+		foreach ($arrayAccepted as $doc) {
+			$merged = clone $doc;
 
-		foreach ($resultPreDoc as $item)
-		{
-			if (!in_array($item->dokument_kurzbz, $listExistingKurzbz))
-			{
-				$newDataMap[] = (array)$item;
+			if (isset($preDocMap[$doc->dokument_kurzbz])) {
+				$merged->docdatum = $preDocMap[$doc->dokument_kurzbz]->docdatum;
+				$merged->insertvonma = $preDocMap[$doc->dokument_kurzbz]->insertvonma;
+				$merged->bezeichnung = $preDocMap[$doc->dokument_kurzbz]->bezeichnung;
+			} else {
+				$merged->akzeptiertdatum = null;
+				$merged->akzeptiertvon = null;
 			}
+
+			$mergedArray[] = $merged;
 		}
-		$this->terminateWithSuccess($newDataMap);
+
+		$this->terminateWithSuccess($mergedArray);
 	}
 
 	public function deleteZuordnung($prestudent_id, $dokument_kurzbz)
diff --git a/application/models/crm/Dokumentprestudent_model.php b/application/models/crm/Dokumentprestudent_model.php
index 2415ee483..6b1c222a8 100644
--- a/application/models/crm/Dokumentprestudent_model.php
+++ b/application/models/crm/Dokumentprestudent_model.php
@@ -102,6 +102,8 @@ class Dokumentprestudent_model extends DB_Model
 			$qry.="	AND (v.archivierbar = FALSE OR v.archivierbar IS NULL)";
 		}
 
+		$qry.=" ORDER BY d.bezeichnung ASC";
+
 		return $this->execQuery($qry, $parametersArray);
 	}
 }
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
index 673c41210..bca7e00fa 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -42,7 +42,6 @@ export default {
 								hour12: false
 							});
 						}},
-					{title: "Akzeptiertvon", field: "insertvonma"},
 					{
 						title: "UploadDatum", field: "hochgeladenamum",
 						formatter: function (cell) {
@@ -57,6 +56,7 @@ export default {
 								hour12: false
 							});
 						}},
+					{title: "Akzeptiertvon", field: "insertvonma"},
 					{title: "Kurzbz", field: "dokument_kurzbz", visible: false},
 					{title: "Prestudent ID", field: "prestudent_id", visible: false},
 					{title: "nachgereicht", field: "nachgereicht", visible: false,
@@ -69,7 +69,7 @@ export default {
 					{title: "infotext", field: "infotext"},
 					{title: "akte_id", field: "akte_id"},
 					{title: "dms_id", field: "dms_id", visible: false},
-					{title: "titel", field: "titel_intern"},
+					{title: "titel", field: "titel_intern", visible: false},
 					{title: "vorhanden", field: "vorhanden",
 						formatter:"tickCross",
 						hozAlign:"center",
@@ -196,7 +196,7 @@ export default {
 							title: this.$p.t('global', 'akte_id')
 						});
 						cm.getColumnByField('nachgereicht_am').component.updateDefinition({
-							title: this.$p.t('global', 'dokument')
+							title: this.$p.t('dokumente', 'nachreichungAm')
 						});
 					}
 				},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
index 21dec91e8..e1110ddf3 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -349,8 +349,6 @@ export default {
 			@click:new="actionUploadFile"
 		>
 			<template #actions="{selected}">
-			<p v-for="name in selected">
-			{{name.dokument_kurzbz}}</p>
 				<button
 					class="btn btn-primary"
 					@click="acceptDocuments(selected)"

From 4524b9bcdca604d395a16d6c4d52ff44063e9568 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 22 Jul 2025 09:18:31 +0200
Subject: [PATCH 408/572] Bugfix invalid end-tag

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

diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index 06a63915d..88340f01b 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -55,7 +55,7 @@ export default {
 					class="menu-entry p-2 w-100 text-wrap border border-1 rounded-3 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link h-100">
 						<img :src="menuItem.c4_icon" :alt="menuItem.name" />
 						<p class="w-100 mt-2 mb-0">{{menuItem.name}}</p>
-						<a v-for="([text,link],index) in menuItem.c4_linkList" target="_blank" :href="link" class="my-1 w-100 submenu text-decoration-none" :index="index">{{text}}</p>
+						<a v-for="([text,link],index) in menuItem.c4_linkList" target="_blank" :href="link" class="my-1 w-100 submenu text-decoration-none" :index="index">{{text}}</a>
 					</a>
 					<ul v-if="menuItem.c4_moodle_links?.length" class="dropdown-menu p-0" :aria-labelledby="menuItem.name">
 						<li v-for="item in menuItem.c4_moodle_links"><a class="dropdown-item border-bottom" :href="item.url">{{item.lehrform}}</a></li>

From a0721fcd9aeadc9f8905dbe1b6899780c20829bf Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 22 Jul 2025 09:19:00 +0200
Subject: [PATCH 409/572] LvPlan.js remove unused imports

---
 public/js/components/Cis/LvPlan/LvPlan.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 5267fc269..5797fa5df 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -1,6 +1,4 @@
 import FhcCalendar from "../../Calendar/Base.js";
-import LvModal from "../Mylv/LvModal.js";
-import LvMenu from "../Mylv/LvMenu.js"
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
@@ -15,9 +13,7 @@ export const DEFAULT_MODE_LVPLAN = 'Week'
 export default {
 	name: 'LvPlan',
 	components: {
-		FhcCalendar,
-		LvModal,
-		LvMenu
+		FhcCalendar
 	},
 	inject: [
 		"renderers"

From b4f1a8a56c370618e1ee371ee630fcf6c3d759ee Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 22 Jul 2025 09:19:51 +0200
Subject: [PATCH 410/572] Renderer Lehreinheit: get LvMenu inside the component

---
 .../Cis/Renderer/Lehreinheit/modalContent.js  | 37 ++++++++++++++-----
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
index 2d5f34eee..e0436bad1 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
@@ -1,20 +1,23 @@
 import { numberPadding, formatDate } from "../../../../helpers/DateHelpers.js"
 import LvMenu from "../../Mylv/LvMenu.js";
 
+import ApiLvPlan from '../../../../api/factory/lvPlan.js';
+import ApiAddons from '../../../../api/factory/addons.js';
+
 export default {
+	components:{
+		LvMenu,
+	},
 	props:{
 		event: {
 			type: Object,
 			required: true,
-		},
-		lvMenu:{
-			type: Object,
-			required: false,
-			default: null,
-		},
+		}
 	},
-	components:{
-		LvMenu,
+	data() {
+		return {
+			lvMenu: []
+		};
 	},
 	computed: {
 		lektorenLinks: function () {
@@ -54,6 +57,22 @@ export default {
 			return formatDate(d);
 		},
 	},
+	created() {
+		if (this.event.type == 'lehreinheit') {
+			this.$api
+				.call(ApiLvPlan.getLehreinheitStudiensemester(Array.isArray(this.event.lehreinheit_id) ? this.event.lehreinheit_id[0] : this.event.lehreinheit_id))
+				.then(res => res.data)
+				.then(studiensemester_kurzbz => this.$api.call(
+					ApiAddons.getLvMenu(
+						this.event.lehrveranstaltung_id,
+						studiensemester_kurzbz
+					)
+				))
+				.then(res => {
+					this.lvMenu = res.data;
+				});
+		}
+	},
 	template: `
 	<div>
 		<h5>
@@ -120,6 +139,6 @@ export default {
 				</tbody>
 		</table>
 		
-		<lv-menu :containerStyles="['p-0']" :rowStyles="['m-0']" v-if="lvMenu" :menu="lvMenu" />
+		<lv-menu :containerStyles="['p-0']" :rowStyles="['m-0']" v-if="lvMenu.length" :menu="lvMenu" />
 	</div>`,
 }
\ No newline at end of file

From fa090153f211dcfb08694ab3e46ff41522dd8141 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 22 Jul 2025 09:22:03 +0200
Subject: [PATCH 411/572] LvPlan.js Remove unused prop

---
 public/js/components/Cis/LvPlan/LvPlan.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 5797fa5df..01b026fdd 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -181,8 +181,6 @@ export default {
 			show-btns
 			:events="events || []"
 			:backgrounds="[]"
-
-			show-weeks
 		>
 			<template v-slot="{ event, mode }">
 				<div

From 117a284dc4a35e08d1751942eb4d060de72a53c7 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 22 Jul 2025 09:47:45 +0200
Subject: [PATCH 412/572] update(News Widget/Content stylings): updates the
 style of the news widget and single news view

---
 public/css/components/dashboard/news.css      |  31 +---
 public/js/components/Cis/Cms/Content.js       |   5 +-
 .../Cis/Cms/Content_types/News_content.js     | 142 ++++++++++++++++++
 public/js/components/Dashboard/Item.js        |   4 +-
 public/js/components/DashboardWidget/News.js  |  89 +++++++----
 5 files changed, 219 insertions(+), 52 deletions(-)
 create mode 100644 public/js/components/Cis/Cms/Content_types/News_content.js

diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index c8414521e..975ef7a81 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -158,32 +158,17 @@
 
 .carousel-control-prev,
 .carousel-control-next {
-    opacity: 0;
-    transition: opacity 0.3s ease;
+	top: 0.5rem !important;
+	bottom: auto !important;
+	opacity: 1 !important;
 }
 
-/* Show the buttons when the carousel is hovered */
-.carousel:hover .carousel-control-prev,
-.carousel:hover .carousel-control-next {
-    opacity: 1;
+.fhc-news-items-lg .row:hover{
+	background-color: var(--fhc-primary);
+	color: var(--fhc-light);
+	cursor: pointer;
 }
 
-.fhc-news-text{
-	font-size: 0.75em;
-}
+.fhc-news-items-sm{
 
-.fhc-news-xs {
-	font-size: 0.6em;
-}
-
-.fhc-news-sm {
-	font-size: 0.7em;
-}
-
-.fhc-news-md {
-	font-size: 1.1em;
-}
-
-.fhc-news-lg {
-	font-size: 1.4em;
 }
diff --git a/public/js/components/Cis/Cms/Content.js b/public/js/components/Cis/Cms/Content.js
index 0fd08078a..470a0fa62 100644
--- a/public/js/components/Cis/Cms/Content.js
+++ b/public/js/components/Cis/Cms/Content.js
@@ -1,7 +1,7 @@
 import raum_contentmittitel from './Content_types/Raum_contentmittitel.js'
 import general from './Content_types/General.js'
 import BsConfirm from "../../Bootstrap/Confirm.js";
-
+import news_content from './Content_types/News_content.js';
 import ApiCms from '../../../api/factory/cms.js';
 
 export default {
@@ -22,6 +22,7 @@ export default {
 	},
 	components: {
 		raum_contentmittitel,
+		news_content,
 		general,
 	},
 	data() {
@@ -80,6 +81,8 @@ export default {
 			switch (this.content_type) {
 				case "raum_contentmittitel":
 					return "raum_contentmittitel";
+				case "news":
+					return "news_content";
 				default:
 					return "general";
 			};
diff --git a/public/js/components/Cis/Cms/Content_types/News_content.js b/public/js/components/Cis/Cms/Content_types/News_content.js
new file mode 100644
index 000000000..a4eacd332
--- /dev/null
+++ b/public/js/components/Cis/Cms/Content_types/News_content.js
@@ -0,0 +1,142 @@
+import { replaceRelativeLegacyLink } from "../../../../helpers/LegacyLinkReplaceHelper.js"
+export default {
+	name: "GeneralComponent",
+	props:{
+	  content:{
+		  type:String,
+		  required:true,
+	  },
+	},
+	methods: {
+		sanitizeLegacyTables(table) {
+			
+			// find nested tables and replace with p element
+			const tt = table.querySelectorAll('table')
+			tt.forEach(t => {
+				const textContent = t.textContent.trim();
+				const pElement = document.createElement('p');
+				pElement.textContent = textContent;
+				t.parentNode.replaceChild(pElement, t);
+			})
+
+			// find unordered lists, traverse li childs and replace with p element -> more readable than 1 p tag for ul
+			const ul = table.querySelectorAll('ul')
+			ul.forEach(u => {
+				Array.from(u.children).forEach(li => {
+					const p = document.createElement('p');
+					p.textContent = li.textContent
+					u.parentNode.appendChild(p)
+				})
+				u.parentNode.removeChild(u)
+				
+			})
+
+			// find bare text nodes and put into p element
+			const td = Array.from(table.querySelectorAll('td')).filter(el => el.scrollWidth > 100)
+			td.forEach(element => {
+				if (element.firstChild?.nodeType === Node.TEXT_NODE && element.firstChild.length > 10) {
+					const p = document.createElement('p');
+					p.appendChild(element.firstChild)
+					element.appendChild(p);
+				}
+			});
+
+			// flatten nested th elements
+			const ths = Array.from(table.querySelectorAll('th'))
+			ths.forEach(th => {
+
+				if(th.children.length > 1) {
+					th.innerHTML = Array.from(th.childNodes).find(cn => cn.textContent).textContent
+				}
+			})
+
+			// let p elements wrap on overflow
+			const p = table.querySelectorAll('p')
+			p.forEach(p => {
+				p.style.setProperty('word-wrap', 'break-word');
+				p.style.setProperty('white-space', 'normal');
+				p.style.setProperty('max-width', '400px');
+			})
+		}
+	},
+	mounted(){
+		// replaces the tablesorter with the tabulator
+		let tables = Array.from(document.getElementsByClassName("tablesorter"));
+
+		tables.forEach((table, index) =>  {
+			this.sanitizeLegacyTables(table)
+			
+			new Tabulator(table, {
+				index: index,
+				layout: "fitDataFill",
+
+				columnDefaults: {
+					formatter: "html",
+					resizable: true,
+					minWidth: "100px"
+				}
+			})
+		})
+
+		document.querySelectorAll("#cms [data-confirm]").forEach((el) => {
+			el.addEventListener("click", (evt) => {
+			  evt.preventDefault();
+			  BsConfirm.popup(el.dataset.confirm)
+				.then(() => {
+				  Axios.get(el.href)
+					.then((res) => {
+						// TODO(chris): check for success then show message and/or reload
+						location = location;
+					})
+					.catch((err) => console.error("ERROR:", err));
+				})
+				.catch(() => {});
+			});
+		  });
+		document.querySelectorAll("#cms [data-href]").forEach((el) => {
+			el.href = el.dataset.href.replace(
+				/^ROOT\//,
+				FHC_JS_DATA_STORAGE_OBJECT.app_root
+			);
+		});
+			
+		document.querySelectorAll("[href]").forEach((element) => {
+			let orignal_href = element.getAttribute("href");
+			let new_href = replaceRelativeLegacyLink(orignal_href);
+			element.href = new_href;
+		});
+
+		document.querySelectorAll("[style*=background-color]").forEach((element) => {
+			if (element.style.backgroundColor == "rgb(255, 255, 255)"){
+				element.style.backgroundColor = "var(--fhc-background)";
+			}
+			if(element.querySelector("*[style*=background-color]")){
+				element.style.backgroundColor = "var(--fhc-tertiary)";
+			}
+		});
+
+		Vue.nextTick(() => {
+			document.querySelectorAll(".card-header").forEach((el) => {
+				el.classList.add("fhc-primary");
+			});
+			document.querySelectorAll(".row").forEach((el) => {
+				el.classList.add("w-100");
+				el.classList.add("align-items-center");
+
+			});
+			document.querySelectorAll(".row h2").forEach((el) => {
+				el.classList.add("mb-0");
+			});
+
+		})
+
+	},
+	template: /*html*/ `
+	  <!-- div that contains the content -->
+	  <div v-if="content" class="container" style="max-width: 100%;"><div class="row"><div class="col">
+		<div v-html="content"  ></div>
+	  </div></div></div>
+	  <p v-else>Content was not found</p>
+	  `,
+  };
+  
\ No newline at end of file
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index e1a03e2f3..c9598ce16 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -164,7 +164,7 @@ export default {
 			</Transition>
 			<span class="col mx-2 px-2">{{ widget.setup.name }}</span>
 			<template v-if="isPinned">
-				<div type="button" v-if="editMode" pinned="true" @click="unpin" v-tooltip="{showDelay:1000, value: 'unpin item'}" aria-label="unpin item" class="pin cursor-pointer col-auto me-2">
+				<div type="button" role="button" v-if="editMode" pinned="true" @click="unpin" title="unpin item" aria-label="unpin item" class="pin cursor-pointer col-auto me-2">
 					<i class="fa-solid fa-thumbtack " aria-hidden="true"></i>
 				</div>
 				<div v-else class="col-auto me-2">
@@ -172,7 +172,7 @@ export default {
 				</div>
 			</template>
 			<template v-else>
-				<div type="button" v-if="editMode"  class="col-auto me-2 pin" @click="pinItem" aria-label="pin item" v-tooltip="{showDelay:1000, value: 'pin item'}">
+				<div type="button" role="button" v-if="editMode"  class="col-auto me-2 pin" @click="pinItem" aria-label="pin item" title="pin item">
 					<i class="fa-solid fa-thumbtack" aria-hidden="true" style="color:lightgray;"></i>
 				</div>
 			</template>
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index c423fc11f..a683e0f72 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -36,7 +36,12 @@ export default {
 				quantity = this.height === 1 ? 4 : MAX_LOADED_NEWS;
 			}
 
-			return this.allNewsList.slice(0, quantity);
+			let slicedNews= this.allNewsList.slice(0, quantity);
+			slicedNews.sort((a,b)=>{
+				return new Date(b.insertamum) - new Date(a.insertamum);
+			});
+			
+			return slicedNews;
 		},
 		carouselItems() {
 			return this.allNewsList.reduce((acc, cur) => {
@@ -47,6 +52,14 @@ export default {
 		}
 	},
 	methods: {
+		formatDate: function (dateTime) {
+			const dt = new Date(dateTime);
+			return dt.getDate() + '.' + (dt.getMonth() + 1) + '.' + dt.getFullYear();				
+		},
+		formatTime: function (dateTime) {
+			const dt = new Date(dateTime);
+			return dt.getHours() + ':' + dt.getMinutes();
+		},
 		isString(value){
 			return Object.prototype.toString.call(value) === '[object String]';
 		},
@@ -141,6 +154,25 @@ export default {
 				this.allNewsList = Array.from(Object.values(news));
 				this.selected = this.allNewsList.length ? this.allNewsList[0] : null
 				this.initActiveItem()
+
+				Vue.nextTick(() => {
+					document.querySelectorAll(".fhc-news-card-item .card-body, .fhc-news-card-item .card, .fhc-news-card-item .card-header").forEach((el) => {
+						el.classList.add("border-0");
+					});
+
+					document.querySelectorAll(".fhc-news-card-item .card-header").forEach((el) => {
+						el.classList.add("px-5");
+						el.classList.add("fhc-primary");
+					});
+					document.querySelectorAll(".fhc-news-card-item .card-header .row").forEach((el) => {
+						el.classList.add("w-100");
+						el.classList.add("align-items-center");
+
+					});
+					document.querySelectorAll(".fhc-news-card-item .card-header .row h2").forEach((el) => {
+						el.classList.add("mb-0");
+					});
+				})
 				
 			})
 			.catch((err) => {
@@ -167,32 +199,37 @@ export default {
 		}
 		
 		this.initCarouselInstance()
+
+	
 	},
 	template: /*html*/ `
 <div ref="container" class="widgets-news h-100" :class="sizeClass" :style="getNewsWidgetStyle">
     <div class="d-flex flex-column h-100">
-        <div class="h-100" style="overflow-y: auto" v-show="width == 1">
-            <div  v-for="(news, index) in newsList" :key="news.news_id" class="mt-2">
-                <div v-if="index > 0 " class="fhc-seperator"></div>
-                <a :href="contentURI(news.content_id)" >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</a><br>
-                <span class="small text-muted">{{ formatDateTime(news.insertamum) }}</span>
+        <div class="h-100 fhc-news-items-sm" style="overflow-y: auto" v-show="width == 1" >
+            <div  v-for="(news, index) in newsList" :key="news.news_id" class="py-2">
+				<div class="row m-0">
+					<div class="col-3 d-flex">
+						<span class="small">{{ formatDate(news.insertamum) }} </span>
+						<span class="ms-auto small">{{ formatTime(news.insertamum) }} </span>
+					</div>
+					<div class="col">
+						<a :href="contentURI(news.content_id)" >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</a>
+					</div>
+				</div>
 			</div>
 		</div>
         <div v-show="width >1" class="row h-100 g-0">
-        	<div :class="'col-'+(width == 2? 6 : 4) + ' h-100 g-0'" style="overflow: auto;">
-        		<template v-for="news in newsList" :key="'menu-'+news.news_id">
-					<div class="position-relative">
-						<div class="row fhc-news-menu-item " @click="setSelected(news)" :class="getMenuItemClass(news)" style="margin-right: 0px; margin-left: 0px; overflow-y: hidden;">
-							<div class="col-8 fhc-news-menu-item-betreff">
-								<p class="fhc-news-text mb-0">
-									{{news.content_obj.betreff ?? ''}}
-								</p>
-							</div>
-							<span style="top:2px; right:0" class=" position-absolute d-none d-xl-block fhc-news-text fhc-news-menu-item-date fw-bold">
-								{{ news.datumformatted ?? ''}}
-							</span>
-						</div>
+        	<div :class="'col-'+(width == 2? 6 : 4) + ' h-100 g-0'" style="overflow: auto;" class="fhc-news-items-lg border-end" >
+        		<template v-for="news in newsList" :key="'menu-'+news.news_id" >
+				<div class="row m-0 py-2" @click="setSelected(news)">
+					<div class="col-3 d-flex">
+						<span class="small">{{ formatDate(news.insertamum) }} </span>
+						<span class="ms-auto small">{{ formatTime(news.insertamum) }} </span>
 					</div>
+					<div class="col">
+						<span >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</span>
+					</div>
+				</div>
 				</template>
 			</div>
 			<div :class="'col-'+(width == 2? 6 : 8) + ' h-100'" style="padding-left: 0px; padding-right: 0px;" ref="htmlContent">
@@ -200,16 +237,16 @@ export default {
 					<div id="FhcCarouselContainer" style="height: 100%;" ref="carousel" class="carousel slide fhc-carousel" data-bs-interval="false">
 
 						<div class="carousel-inner" ref="carouselInner"  style="height: 100%; max-width: 100%;">
-							<div ref="carouselItems" v-for="(news, index) in newsList" class="carousel-item " style="overflow-y: auto; overflow-x: hidden; height: 100%;" :id="'card-'+news.news_id" v-html="news.content_obj.content"/>
+							<div ref="carouselItems" v-for="(news, index) in newsList" class="carousel-item fhc-news-card-item" style="overflow-y: auto; overflow-x: hidden; height: 100%;" :id="'card-'+news.news_id" v-html="news.content_obj.content"/>
 						</div>
-						<button @click="setPrev" @focus="$event.target.blur()" style="z-index: 100; color: black; overflow: hidden; margin-left: 10px; width:35px;" data-bs-target="#FhcCarouselContainer" class="carousel-control-prev" type="button">
-							<div class="border rounded-circle" style="padding-left: 0.4rem; padding-right: 0.4rem; background-color:rgba(138,138,138,0.4)">
-								<i class="fa fa-chevron-left"></i>
+						<button @click="setPrev" style="z-index: 100; overflow: hidden; margin-left: 4px; width:35px;" data-bs-target="#FhcCarouselContainer" class="carousel-control-prev" type="button">
+							<div style="padding-left: 0.4rem; padding-right: 0.4rem;">
+								<i class="fa fa-chevron-left fhc-text-light"></i>
 							</div>
 						</button>
-						<button @click="setNext" @focus="$event.target.blur()" style="z-index: 100; color: black; overflow: hidden; margin-right: 10px; width:35px;" data-bs-target="#FhcCarouselContainer" class="carousel-control-next"  type="button">
-							<div class="border rounded-circle" style="padding-left: 0.4rem; padding-right: 0.4rem; background-color:rgba(138,138,138,0.4)">
-								<i class="fa fa-chevron-right"></i>
+						<button @click="setNext" style="z-index: 100;  overflow: hidden; margin-right: 4px; width:35px;" data-bs-target="#FhcCarouselContainer" class="carousel-control-next"  type="button">
+							<div style="padding-left: 0.4rem; padding-right: 0.4rem;">
+								<i class="fa fa-chevron-right fhc-text-light"></i>
 							</div>
 						</button>
 					</div>

From 9855a0b45d4434a105994a68667282a9341ff89c Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 22 Jul 2025 10:37:45 +0200
Subject: [PATCH 413/572] fix(News widget style): updates the content style of
 the news when rendering new news content

---
 public/js/components/DashboardWidget/News.js | 62 ++++++++++++--------
 1 file changed, 39 insertions(+), 23 deletions(-)

diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index a683e0f72..7f4419aa6 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -52,6 +52,36 @@ export default {
 		}
 	},
 	methods: {
+		updateNewsContentClasses:function(){
+			Vue.nextTick(() => {
+				document.querySelectorAll(".fhc-news-card-item .card-body, .fhc-news-card-item .card, .fhc-news-card-item .card-header").forEach((el) => {
+					if (!el.classList.contains("border-0")) {
+						el.classList.add("border-0");
+					}
+				});
+				document.querySelectorAll(".fhc-news-card-item .card-header").forEach((el) => {
+					if (!el.classList.contains("px-5")) {
+						el.classList.add("px-5");
+					}
+					if (!el.classList.contains("fhc-primary")) {
+						el.classList.add("fhc-primary");
+					}
+				});
+				document.querySelectorAll(".fhc-news-card-item .card-header .row").forEach((el) => {
+					if (!el.classList.contains("w-100")) {
+						el.classList.add("w-100");
+					}
+					if (!el.classList.contains("align-items-center")) {
+						el.classList.add("align-items-center");
+					}
+				});
+				document.querySelectorAll(".fhc-news-card-item .card-header .row h2").forEach((el) => {
+					if (!el.classList.contains("mb-0")) {
+						el.classList.add("mb-0");
+					}
+				});
+			})
+		},
 		formatDate: function (dateTime) {
 			const dt = new Date(dateTime);
 			return dt.getDate() + '.' + (dt.getMonth() + 1) + '.' + dt.getFullYear();				
@@ -68,12 +98,15 @@ export default {
 			const nextIndex = thisIndex == (this.allNewsList.length - 1) ? 0 : thisIndex + 1
 
 			this.setSelected(this.allNewsList[nextIndex])
+			this.updateNewsContentClasses();
+			
 		},
 		setPrev() {
 			const thisIndex = this.allNewsList.findIndex(n=>n.news_id == this.selected.news_id)
 			const prevIndex = thisIndex ? thisIndex - 1 : this.allNewsList.length - 1
 			
 			this.setSelected(this.allNewsList[prevIndex])
+			this.updateNewsContentClasses();
 		},
 		getMenuItemClass(news) {
 			let classString = ''
@@ -155,24 +188,7 @@ export default {
 				this.selected = this.allNewsList.length ? this.allNewsList[0] : null
 				this.initActiveItem()
 
-				Vue.nextTick(() => {
-					document.querySelectorAll(".fhc-news-card-item .card-body, .fhc-news-card-item .card, .fhc-news-card-item .card-header").forEach((el) => {
-						el.classList.add("border-0");
-					});
-
-					document.querySelectorAll(".fhc-news-card-item .card-header").forEach((el) => {
-						el.classList.add("px-5");
-						el.classList.add("fhc-primary");
-					});
-					document.querySelectorAll(".fhc-news-card-item .card-header .row").forEach((el) => {
-						el.classList.add("w-100");
-						el.classList.add("align-items-center");
-
-					});
-					document.querySelectorAll(".fhc-news-card-item .card-header .row h2").forEach((el) => {
-						el.classList.add("mb-0");
-					});
-				})
+				this.updateNewsContentClasses();
 				
 			})
 			.catch((err) => {
@@ -208,7 +224,7 @@ export default {
         <div class="h-100 fhc-news-items-sm" style="overflow-y: auto" v-show="width == 1" >
             <div  v-for="(news, index) in newsList" :key="news.news_id" class="py-2">
 				<div class="row m-0">
-					<div class="col-3 d-flex">
+					<div class="col-12 col-md-3 d-flex">
 						<span class="small">{{ formatDate(news.insertamum) }} </span>
 						<span class="ms-auto small">{{ formatTime(news.insertamum) }} </span>
 					</div>
@@ -219,20 +235,20 @@ export default {
 			</div>
 		</div>
         <div v-show="width >1" class="row h-100 g-0">
-        	<div :class="'col-'+(width == 2? 6 : 4) + ' h-100 g-0'" style="overflow: auto;" class="fhc-news-items-lg border-end" >
+        	<div style="overflow: auto;" class="fhc-news-items-lg border-end h-100 g-0 col-12 col-sm-3 col-md-4 col-lg-5" >
         		<template v-for="news in newsList" :key="'menu-'+news.news_id" >
 				<div class="row m-0 py-2" @click="setSelected(news)">
-					<div class="col-3 d-flex">
+					<div class="col-md-12 d-flex">
 						<span class="small">{{ formatDate(news.insertamum) }} </span>
 						<span class="ms-auto small">{{ formatTime(news.insertamum) }} </span>
 					</div>
-					<div class="col">
+					<div class="col-md-12">
 						<span >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</span>
 					</div>
 				</div>
 				</template>
 			</div>
-			<div :class="'col-'+(width == 2? 6 : 8) + ' h-100'" style="padding-left: 0px; padding-right: 0px;" ref="htmlContent">
+			<div style="padding-left: 0px; padding-right: 0px;" ref="htmlContent" class="h-100 col-12 col-sm-9 col-md-8 col-lg-7">
 				<div class="container h-100" style="padding: 0px;"  ref="carocontainer">
 					<div id="FhcCarouselContainer" style="height: 100%;" ref="carousel" class="carousel slide fhc-carousel" data-bs-interval="false">
 

From f9a45a4917c0e8217528386d4354e0f513481948 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 22 Jul 2025 10:45:51 +0200
Subject: [PATCH 414/572] LvPlan Now-background

---
 public/js/components/Cis/LvPlan/LvPlan.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 01b026fdd..25538bc33 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -1,4 +1,5 @@
 import FhcCalendar from "../../Calendar/Base.js";
+
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
@@ -23,6 +24,7 @@ export default {
 		propsViewData: Object
 	},
 	data() {
+		const now = luxon.DateTime.now().setZone(this.viewData.timezone);
 		return {
 			modes: {
 				day: Vue.markRaw(ModeDay),
@@ -41,11 +43,17 @@ export default {
 			},
 			currentDay: this.propsViewData?.focus_date,
 			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_LVPLAN,
-
+			backgrounds: [
+				{
+					class: 'background-past',
+					end: now,
+					label: now.startOf('minute').toISOTime({ suppressSeconds: true, includeOffset: false })
+				}
+			],
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
 			studiensemester_ende: null,
-			uid: null,
+			uid: null
 		};
 	},
 	computed:{
@@ -151,9 +159,6 @@ export default {
 			.then(res => {
 				this.uid = res.data.uid;
 			});
-		/*window.addEventListener("resize", () => {
-			this.modeOptions.day.compact = document.body.offsetWidth < 1200;
-		});*/
 	},
 	template:/*html*/`
 	<div class="d-flex flex-column h-100" v-if="renderers">
@@ -171,7 +176,7 @@ export default {
 			ref="calendar"
 			:date="currentDay"
 			:modes="modes"
-			:modeOptions="modeOptions"
+			:mode-options="modeOptions"
 			:mode="propsViewData.mode.toLowerCase()"
 			@update:date="handleChangeDate"
 			@update:mode="handleChangeMode"
@@ -180,7 +185,7 @@ export default {
 			:locale="$p.user_locale.value"
 			show-btns
 			:events="events || []"
-			:backgrounds="[]"
+			:backgrounds="backgrounds"
 		>
 			<template v-slot="{ event, mode }">
 				<div

From 0a9f4023b3af535ac8611dd68b80fc88444e62e8 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 22 Jul 2025 10:50:34 +0200
Subject: [PATCH 415/572] add component class

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

diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 25538bc33..001b46f7c 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -161,7 +161,7 @@ export default {
 			});
 	},
 	template:/*html*/`
-	<div class="d-flex flex-column h-100" v-if="renderers">
+	<div class="fhc-lvplan d-flex flex-column h-100" v-if="renderers">
 		<h2 @click="modeOptions.week.collapseEmptyDays = !modeOptions.week.collapseEmptyDays">
 			{{ $p.t('lehre/stundenplan') }}
 			<span style="padding-left: 0.4em;" v-show="studiensemester_kurzbz">

From ad080e61b290aad48f5a906ff2e011a1aeadf201 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 22 Jul 2025 13:14:56 +0200
Subject: [PATCH 416/572] Implementation CIS => RoomInformation

---
 application/controllers/CisVue/Cms.php        |   9 +-
 .../controllers/api/frontend/v1/LvPlan.php    |  82 +++--
 application/libraries/StundenplanLib.php      |  63 +++-
 public/js/api/factory/lvPlan.js               |  10 +-
 public/js/api/lvPlan.js                       |  10 +-
 .../js/components/Cis/Mylv/RoomInformation.js | 345 +++++++-----------
 6 files changed, 256 insertions(+), 263 deletions(-)

diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
index a9ff13c53..aa07b919f 100644
--- a/application/controllers/CisVue/Cms.php
+++ b/application/controllers/CisVue/Cms.php
@@ -87,9 +87,14 @@ class Cms extends Auth_Controller
 		$this->load->view('CisRouterView/CisRouterView.php', ['viewData'=>$viewData, 'route' => 'News']);
 	}
 	
-	public function getRoomInformation($ort_kurzbz){
+	public function getRoomInformation($ort_kurzbz)
+	{
+		// Load Config
+		$this->load->config('calendar');
+
 		$viewData = array(
-			'ort_kurzbz' => $ort_kurzbz
+			'ort_kurzbz' => $ort_kurzbz,
+			'timezone' => $this->config->item('timezone')
 		);
 		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'CmsRoom']);
 	}
diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 69d08110a..0ccf65a0e 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -32,7 +32,7 @@ class LvPlan extends FHCAPI_Controller
 		parent::__construct([
 			'getRoomplan' => self::PERM_LOGGED,
             'Stunden' => self::PERM_LOGGED,
-            'Reservierungen' => self::PERM_LOGGED,
+            'getReservierungen' => self::PERM_LOGGED,
 			'LvPlanEvents' => self::PERM_LOGGED,
 			'getLehreinheitStudiensemester' => self::PERM_LOGGED,
 			'studiensemesterDateInterval' => self::PERM_LOGGED,
@@ -177,55 +177,69 @@ class LvPlan extends FHCAPI_Controller
 		$this->terminateWithSuccess($stunden);
 	}
 
-    /**
-     * fetches room events from a certain date
-     * @access public
-     *
-     */
+	/**
+	 * fetches room events from a certain date
+	 * @access public
+	 *
+	 * @return void
+	 */
 	public function getRoomplan()
 	{
+		// form validation
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('ort_kurzbz', "Ort", "required");
+		$this->form_validation->set_rules('start_date', "start_date", "required");
+		$this->form_validation->set_rules('end_date', "end_date", "required");
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		// storing the post parameter in local variables
+		$ort_kurzbz = $this->input->post('ort_kurzbz', true);
+		$start_date = $this->input->post('start_date', true);
+		$end_date = $this->input->post('end_date', true);
+
+		// get data
 		$this->load->library('StundenplanLib');
-        // form validation
-        $this->load->library('form_validation');
-        $this->form_validation->set_data($_GET);
-        $this->form_validation->set_rules('ort_kurzbz',"Ort","required");
-        $this->form_validation->set_rules('start_date',"start_date","required");
-        $this->form_validation->set_rules('end_date',"end_date","required");
-        if($this->form_validation->run() === FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
 
-        // storing the get parameter in local variables
-        $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
-        $start_date = $this->input->get('start_date', TRUE);
-        $end_date = $this->input->get('end_date', TRUE);
-
-		$roomplan_data = $this->LvPlan->lvPlanGruppierung($this->LvPlan->getRoomQuery($ort_kurzbz, $start_date, $end_date));
-
-        $roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
-		$this->stundenplanlib->expand_object_information($roomplan_data);
+		$roomplan_data = $this->stundenplanlib->getRoomplan($ort_kurzbz, $start_date, $end_date);
 
+		$roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
+		
 		$this->terminateWithSuccess($roomplan_data);
-
 	}
 	
-	// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the lvplan of a student
-    public function Reservierungen($ort_kurzbz = null)
+	/**
+	 * gets the reservierungen of a room if the ort_kurzbz parameter is
+	 * supplied otherwise gets the reservierungen of the lvplan of a student
+	 * @access public
+	 *
+	 * @param string	$ort_kurzbz
+	 * @return void
+	 */
+	public function getReservierungen($ort_kurzbz = null)
 	{
-		$this->load->library('StundenplanLib');
 		//form validation
 		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
+		
 		$this->form_validation->set_rules('start_date', "StartDate", "required");
 		$this->form_validation->set_rules('end_date', "EndDate", "required");
-		if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+		
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
-		$this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
+		// storing the post parameter in local variables
+		$start_date = $this->input->post('start_date', true);
+		$end_date = $this->input->post('end_date', true);
 
-		// storing the get parameter in local variables
-        $start_date = $this->input->get('start_date', TRUE);
-        $end_date = $this->input->get('end_date', TRUE);
+		// get data
+		$this->load->library('StundenplanLib');
+
+		$result = $this->stundenplanlib->getReservierungen($start_date, $end_date, $ort_kurzbz);
+
+		$result = $this->getDataOrTerminateWithError($result);
 
-		$result = $this->stundenplanlib->getReservierungen($start_date,$end_date,$ort_kurzbz);
-		$result = $this->getDataOrTerminateWithError($result);	
 		$this->terminateWithSuccess($result);
 	}
 
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index 868d73a24..0107ceef1 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -130,30 +130,69 @@ class StundenplanLib{
 		
 	}
 
-	public function getReservierungen($start_date, $end_date, $ort_kurzbz){
+	/**
+	 * Get stundenplan for a room
+	 *
+	 * @param string	$ort_kurzbz
+	 * @param string	$start_date
+	 * @param string	$end_date
+	 * @return stdClass
+	 */
+	public function getRoomplan($ort_kurzbz, $start_date, $end_date)
+	{
 		$this->_ci =& get_instance();
 
 		// Load Config
 		$this->_ci->load->config('calendar');
+		// Load Models
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		$query = $this->_ci->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date);
+		$roomplan_data = $this->_ci->StundenplanModel->stundenplanGruppierung($query);
+
+		if (isError($roomplan_data))
+			return $roomplan_data;
+
+		$this->expand_object_information($roomplan_data->retval);
+
+		return $roomplan_data;
+	}
+
+	/**
+	 * Get reservations (for a room or all)
+	 *
+	 * @param string	$start_date
+	 * @param string	$end_date
+	 * @param string	$ort_kurzbz
+	 * @return stdClass
+	 */
+	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '')
+	{
+		$this->_ci =& get_instance();
+
+		// Load Config
+		$this->_ci->load->config('calendar');
+		// Load Models
+		$this->_ci->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
 		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter(getAuthUID()));
-		if($is_mitarbeiter)
-		{
+		
+		if ($is_mitarbeiter) {
 			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date, $ort_kurzbz);
 		} else {
 			// querying the reservierungen
 			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
 		}
-		if(isError($reservierungen))
-		{
-			return error(getData($reservierungen));
-		}
-		$reservierungen = getData($reservierungen) ?? [];
-		$function_error = $this->expand_object_information($reservierungen);
-		if(!is_null($function_error)){
+		
+		if (isError($reservierungen))
+			return $reservierungen;
+		
+		$function_error = $this->expand_object_information($reservierungen->retval);
+		
+		if (!is_null($function_error))
 			return $function_error;
-		}
-		return success($reservierungen);
+		
+		return $reservierungen;
 	}
 
 	public function getLektorenFromLehrveranstaltung($lehrveranstaltung_id, $semester, $studiengang_kz, $studiensemester_kurzbz){
diff --git a/public/js/api/factory/lvPlan.js b/public/js/api/factory/lvPlan.js
index d8cad1c01..99f7961f6 100644
--- a/public/js/api/factory/lvPlan.js
+++ b/public/js/api/factory/lvPlan.js
@@ -18,7 +18,7 @@
 export default {
 	getRoomInfo(ort_kurzbz, start_date, end_date) {
 		return {
-			method: 'get',
+			method: 'post',
 			url: '/api/frontend/v1/LvPlan/getRoomplan',
 			params: { ort_kurzbz, start_date, end_date }
 		};
@@ -39,15 +39,15 @@ export default {
 	},
 	getOrtReservierungen(ort_kurzbz, start_date, end_date) {
 		return {
-			method: 'get',
-			url: `/api/frontend/v1/LvPlan/Reservierungen/${ort_kurzbz}`,
+			method: 'post',
+			url: `/api/frontend/v1/LvPlan/getReservierungen/${ort_kurzbz}`,
 			params: { start_date, end_date }
 		};
 	},
 	getLvPlanReservierungen(start_date, end_date) {
 		return {
-			method: 'get',
-			url: '/api/frontend/v1/LvPlan/Reservierungen',
+			method: 'post',
+			url: '/api/frontend/v1/LvPlan/getReservierungen',
 			params: { start_date, end_date }
 		};
 	},
diff --git a/public/js/api/lvPlan.js b/public/js/api/lvPlan.js
index a1d34b37c..2939b688c 100644
--- a/public/js/api/lvPlan.js
+++ b/public/js/api/lvPlan.js
@@ -1,7 +1,7 @@
 
 export default {
 	getRoomInfo(ort_kurzbz, start_date, end_date) {
-		return this.$fhcApi.get(
+		return this.$fhcApi.post(
 			'/api/frontend/v1/LvPlan/getRoomplan',
 			{  ort_kurzbz, start_date, end_date}
 		);
@@ -13,14 +13,14 @@ export default {
 		);
 	},
 	getOrtReservierungen(ort_kurzbz, start_date, end_date) {
-		return this.$fhcApi.get(
-			`/api/frontend/v1/LvPlan/Reservierungen/${ort_kurzbz}`,
+		return this.$fhcApi.post(
+			`/api/frontend/v1/LvPlan/getReservierungen/${ort_kurzbz}`,
 			{ start_date, end_date}
 		);
 	},
 	getLvPlanReservierungen(start_date, end_date) {
-		return this.$fhcApi.get(
-			'/api/frontend/v1/LvPlan/Reservierungen',
+		return this.$fhcApi.post(
+			'/api/frontend/v1/LvPlan/getReservierungen',
 			{ start_date, end_date }
 		);
 	},
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 6a9a7dbcd..b604ef2bb 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -1,259 +1,194 @@
-import FhcCalendar from "../../Calendar/Calendar.js";
+import FhcCalendar from "../../Calendar/Base.js";
 import CalendarDate from "../../../composables/CalendarDate.js";
-import LvModal from "../../../components/Cis/Mylv/LvModal.js";
 import LvInfo from "../../../components/Cis/Mylv/LvInfo.js"
 
 import ApiStudenplan from '../../../api/factory/lvPlan.js';
 
+import { useEventLoader } from '../../../composables/EventLoader.js';
+
+import ModeDay from '../../Calendar/Mode/Day.js';
+import ModeWeek from '../../Calendar/Mode/Week.js';
+import ModeMonth from '../../Calendar/Mode/Month.js';
+
 export const DEFAULT_MODE_RAUMINFO = 'Week'
 
-const RoomInformation = {
+export default {
 	name: "RoomInformation",
-    props:{
-		propsViewData: {
-			type: Object
-		},
-		rowMinHeight: {
-			type: String,
-			default: '100px'
-		},
-		eventMaxHeight: {
-			type: String,
-			default: '125px'
-		}
-    },
 	components: {
 		FhcCalendar,
-		LvModal,
-		LvInfo,
+		LvInfo
 	},
-	provide() {
-		return {
-			rowMinHeight: this.rowMinHeight,
-			eventMaxHeight: this.eventMaxHeight
-		}
+	inject: [
+		"renderers"
+	],
+	props:{
+		viewData: Object, // NOTE(chris): this is inherited from router-view
+		propsViewData: Object
 	},
 	data() {
+		const now = luxon.DateTime.now().setZone(this.viewData.timezone);
 		return {
-			events: null,
-			calendarMode: DEFAULT_MODE_RAUMINFO,
-			calendarDate: new CalendarDate(new Date()),
-			currentlySelectedEvent: null,
-			currentDay: this.propsViewData?.focus_date ? new Date(this.propsViewData.focus_date) : new Date(),
-			minimized: false,
-            
-        }
+			modes: {
+				day: Vue.markRaw(ModeDay),
+				week: Vue.markRaw(ModeWeek),
+				month: Vue.markRaw(ModeMonth)
+			},
+			modeOptions: {
+				day: {
+					emptyMessage: Vue.computed(() => this.$p.t('rauminfo/keineRaumReservierung')),
+					emptyMessageDetails: Vue.computed(() => this.$p.t('rauminfo/keineRaumReservierung')),
+					compact: false
+				},
+				week: {
+					collapseEmptyDays: false
+				}
+			},
+			currentDay: this.propsViewData?.focus_date,
+			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_RAUMINFO,
+			backgrounds: [
+				{
+					class: 'background-past',
+					end: now,
+					label: now.startOf('minute').toISOTime({ suppressSeconds: true, includeOffset: false })
+				}
+			]
+		}
 	},
-    computed:{
-        currentDate: function(){
-            return new Date(this.calendarWeek.y, this.calendarWeek.m, this.calendarWeek.d);
-        },
-		weekFirstDay: function () {
-			return this.calendarDateToString(this.calendarDate.cdFirstDayOfWeek);
+	methods:{
+		eventStyle(event) {
+			if (!event.farbe)
+				return undefined;
+			return '--event-bg:#' + event.farbe;
 		},
-		weekLastDay: function () {
-			return this.calendarDateToString(this.calendarDate.cdLastDayOfWeek);
-		},
-		monthFirstDay: function () {
-			return this.calendarDateToString(this.calendarDate.cdFirstDayOfCalendarMonth);
-		},
-		monthLastDay: function () {
-			return this.calendarDateToString(this.calendarDate.cdLastDayOfCalendarMonth);
-		},
-    },
-	watch: {
-		'propsViewData.ort_kurzbz'(newVal) {
-			// relevant if ort_kurzbz can be changed from within this component
-		},
-		'propsViewData.mode'(newVal) {
-			if(this.$refs.calendar) this.$refs.calendar.setMode(newVal)
-		},
-		'propsViewData.focus_date'(newVal) {
-			this.currentDate = new Date(newVal)
-		}	
-	},
-    methods:{
-		setSelectedEvent: function(event){
-			this.currentlySelectedEvent = event;
-		},
-		getLvID: function () {
-			this.lv_id = window.location.pathname
-		},
-		selectDay: function(day){
-			const date = day.getFullYear() + "-" +
-				String(day.getMonth() + 1).padStart(2, "0") + "-" +
-				String(day.getDate()).padStart(2, "0");
+		handleChangeDate(day) {
+			const focus_date = day.toISODate();
+			const mode = this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1);
 
 			this.$router.push({
 				name: "RoomInformation",
 				params: {
-					mode: this.calendarMode,
-					focus_date: date,
+					mode,
+					focus_date,
 					ort_kurzbz: this.propsViewData.ort_kurzbz
 				}
 			})
-
+			
 			this.currentDay = day;
 		},
-		handleOffset: function(offset)  {
-			this.currentDay = new Date(
-				this.currentDay.getFullYear() + offset.y,
-				this.currentDay.getMonth() + offset.m,
-				this.currentDay.getDate() + offset.d
-			)
+		handleChangeMode(newMode) {
+			const mode = newMode[0].toUpperCase() + newMode.slice(1)
+			const focus_date = (this.currentDay instanceof luxon.DateTime)
+				? this.currentDay.toISODate()
+				: this.currentDay;
 
-			const date = this.currentDay.getFullYear() + "-" +
-				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
-				String(this.currentDay.getDate()).padStart(2, "0");
-
-			this.$router.push({
-				name: "LvPlan",
-				params: {
-					mode: this.calendarMode,
-					focus_date: date,
-					lv_id: this.propsViewData?.lv_id || null
-				}
-			})
-		},
-		handleChangeMode(mode) {
-			const modeCapitalized = mode.charAt(0).toUpperCase() + mode.slice(1)
-			const date = this.currentDay.getFullYear() + "-" +
-				String(this.currentDay.getMonth() + 1).padStart(2, "0") + "-" +
-				String(this.currentDay.getDate()).padStart(2, "0");
-			
 			this.$router.push({
 				name: "RoomInformation",
 				params: {
-					mode: modeCapitalized,
-					focus_date: date,
+					mode,
+					focus_date,
 					ort_kurzbz: this.propsViewData.ort_kurzbz
 				}
 			})
 
 			this.calendarMode = mode
 		},
-		showModal: function (event) {
-			this.currentlySelectedEvent = event;
-			Vue.nextTick(() => {
-				this.$refs.lvmodal.show();
-			});
-			
-		},
-		updateRange: function ({ start, end }) {
-
-			let checkDate = (date) => {
-				return date.m != this.calendarDate.m || date.y != this.calendarDate.y;
-			}
-
-			// only load month data if the month or year has changed
-			if (checkDate(new CalendarDate(start)) && checkDate(new CalendarDate(end))) {
-				// reset the events before querying the new events to activate the loading spinner
-				this.events = null;
-				this.calendarDate = new CalendarDate(end);
-				Vue.nextTick(() => {
-					this.loadEvents();
-				});
-			}
-		},
-		calendarDateToString: function (calendarDate) {
-			return calendarDate instanceof CalendarDate ?
-				[calendarDate.y, calendarDate.m + 1, calendarDate.d].join('-') :
-				null;
-
-		},
-		loadEvents: function(){
-
-			// bundles the room_events and the reservierungen together into the this.events array
-			Promise.allSettled([
-				this.$api.call(ApiStudenplan.getRoomInfo(this.propsViewData.ort_kurzbz, this.monthFirstDay, this.monthLastDay)),
-				this.$api.call(ApiStudenplan.getOrtReservierungen(this.propsViewData.ort_kurzbz, this.monthFirstDay, this.monthLastDay))
-			]).then((result) => {
-				let promise_events = [];
-				result.forEach((promise_result) => {
-					if(promise_result.status === 'fulfilled' && promise_result.value.meta.status === "success"){
-						
-						let data = promise_result.value.data;
-						// adding additional information to the events 
-						if (data && data.forEach) {
-							data.forEach((el, i) => {
-								el.id = i;
-								if (el.type === 'reservierung') {
-									el.color = '#' + (el.farbe || 'FFFFFF');
-								} else {
-									el.color = '#' + (el.farbe || 'CCCCCC');
-								}
-
-								el.start = new Date(el.datum + ' ' + el.beginn);
-								el.end = new Date(el.datum + ' ' + el.ende);
-								
-							});
-						}
-						promise_events = promise_events.concat(data);
-					}
-				})
-				this.events = promise_events;
-			})
-		},
-    },
-	created() {
-		this.loadEvents();
+		updateRange(rangeInterval) {
+			this.rangeInterval = rangeInterval;
+		}
 	},
-    template: /*html*/`
+	setup(props) {
+		const $api = Vue.inject('$api');
+
+		const rangeInterval = Vue.ref(null);
+		
+		const { events } = useEventLoader(rangeInterval, (start, end) => {
+			return [
+				$api.call(ApiStudenplan.getRoomInfo(props.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate())),
+				$api.call(ApiStudenplan.getOrtReservierungen(props.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate()))
+			];
+		});
+
+		return {
+			rangeInterval,
+			events
+		};
+	},
+	template: /*html*/`
+	<div class="fhc-roominformation d-flex flex-column h-100">
 		<h2>{{ $p.t('rauminfo/rauminfo') }} {{ propsViewData.ort_kurzbz }}</h2>
 		<hr>
-		<lv-modal v-if="currentlySelectedEvent" :showMenu="false" :event="currentlySelectedEvent" ref="lvmodal" />
 		<fhc-calendar 
 			ref="calendar"
-			@selectedEvent="setSelectedEvent" 
-			:initial-date="currentDay"
-			@change:range="updateRange"
-			@change:offset="handleOffset"
-			:events="events" 
-			:initial-mode="propsViewData.mode"
-			show-weeks 
-			@select:day="selectDay"
-			@change:mode="handleChangeMode"
-			v-model:minimized="minimized"
+			:date="currentDay"
+			:modes="modes"
+			:mode-options="modeOptions"
+			:mode="propsViewData.mode.toLowerCase()"
+			@update:date="handleChangeDate"
+			@update:mode="handleChangeMode"
+			@update:range="updateRange"
+			:timezone="viewData.timezone"
+			:locale="$p.user_locale.value"
+			show-btns
+			:events="events || []"
+			:backgrounds="backgrounds"
 		>
-            <template #monthPage="{event,day}">
-				<span >
-					{{event.topic}}
-				</span>
-			</template>
-			<template #weekPage="{event,day}">
-				<div @click="showModal(event)" type="button" class=" border border-secondary border d-flex flex-column align-items-center justify-content-evenly h-100">
-					<span>{{event?.topic}}</span>
-					<span v-for="lektor in event?.lektor">{{lektor.kurzbz}}</span>
-					<span>{{event?.ort_kurzbz}}</span>
+			<template v-slot="{ event, mode }">
+				<component
+					v-if="mode == 'event'"
+					:is="renderers[event.type]?.modalContent"
+					:event="event"
+				></component>
+				<component
+					v-else-if="mode == 'eventheader'"
+					:is="renderers[event.type]?.modalTitle"
+					:event="event"
+				></component>
+				<div
+					v-else-if="mode == 'month'"
+					:class="'event-type-' + event.type"
+	 				:style="eventStyle(event)"
+					class="d-flex flex-column align-items-center justify-content-evenly h-100"
+				>
+					<span>{{ event?.topic }}</span>
 				</div>
-			</template>
-			<template #dayPage="{event,day,mobile}">
-				<div @click="mobile? showModal(event):null" type="button" class="fhc-entry border border-secondary border row h-100 justify-content-center align-items-center text-center">
+				<div
+					v-else-if="mode == 'week'"
+					:class="'event-type-' + event.type"
+	 				:style="eventStyle(event)"
+					class="border border-secondary d-flex flex-column align-items-center justify-content-evenly h-100"
+					type="button"
+				>
+					<span>{{ event?.topic }}</span>
+					<span v-for="lektor in event?.lektor">{{ lektor.kurzbz }}</span>
+					<span>{{ event?.ort_kurzbz }}</span>
+				</div>
+				<div
+					v-else-if="mode == 'day'"
+					:class="'event-type-' + event.type"
+	 				:style="eventStyle(event)"
+					type="button"
+					class="border border-secondary d-flex align-items-center justify-content-center text-center h-100"
+				>
 					<div class="col ">
 						<p>{{ $p.t('lehre/lehrveranstaltung') }}:</p>
-						<p class="m-0">{{event?.topic}}</p>
+						<p class="m-0">
+							{{ event?.topic }}
+						</p>
 					</div>
 					<div class="col ">
 						<p>{{ $p.t('lehre/lektor') }}:</p>
-						<p class="m-0" v-for="lektor in event?.lektor">{{lektor.kurzbz}}</p>
+						<p class="m-0" v-for="lektor in event?.lektor">
+							{{ lektor.kurzbz }}
+						</p>
 					</div>
 					<div class="col ">
 						<p>{{ $p.t('profil/Ort') }}: </p>
-						<p class="m-0">{{event?.ort_kurzbz}}</p>
+						<p class="m-0">
+							{{ event?.ort_kurzbz }}
+						</p>
 					</div>
 				</div>
 			</template>
-			<template #pageMobilContent>
-				<h3 >{{$p.t('lvinfo','lehrveranstaltungsinformationen')}}</h3>
-				<div class="w-100">
-					<lv-info :event="currentlySelectedEvent" />
-				</div>
-			</template>
-			<template #pageMobilContentEmpty >
-				<h3>{{$p.t('rauminfo','keineRaumReservierung')}}</h3>
-			</template>
-        </fhc-calendar>
-    `,
+		</fhc-calendar>
+	</div>`
 };
-
-export default RoomInformation
\ No newline at end of file

From 9ddb9f46fdec8a5a84d041666a230845bd6ccff8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 22 Jul 2025 13:30:25 +0200
Subject: [PATCH 417/572] refactor(Cis4 News Widget Responsive): changes the
 responsive column layouts for the news widget

---
 public/css/components/dashboard/news.css     | 11 +++++++++--
 public/js/components/DashboardWidget/News.js | 10 +++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index 975ef7a81..a5bca7afe 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -169,6 +169,13 @@
 	cursor: pointer;
 }
 
-.fhc-news-items-sm{
-
+.news-truncate {
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	/* number of lines to show */
+	-webkit-box-orient: vertical;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	word-break: break-word;
 }
+
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 7f4419aa6..a6c94b90e 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -224,7 +224,7 @@ export default {
         <div class="h-100 fhc-news-items-sm" style="overflow-y: auto" v-show="width == 1" >
             <div  v-for="(news, index) in newsList" :key="news.news_id" class="py-2">
 				<div class="row m-0">
-					<div class="col-12 col-md-3 d-flex">
+					<div class="col-12 d-flex">
 						<span class="small">{{ formatDate(news.insertamum) }} </span>
 						<span class="ms-auto small">{{ formatTime(news.insertamum) }} </span>
 					</div>
@@ -235,20 +235,20 @@ export default {
 			</div>
 		</div>
         <div v-show="width >1" class="row h-100 g-0">
-        	<div style="overflow: auto;" class="fhc-news-items-lg border-end h-100 g-0 col-12 col-sm-3 col-md-4 col-lg-5" >
+        	<div :class="'col-'+(width == 4? 3: width == 3? 4 :6)" style="overflow: auto;" class="fhc-news-items-lg border-end h-100 g-0 " >
         		<template v-for="news in newsList" :key="'menu-'+news.news_id" >
 				<div class="row m-0 py-2" @click="setSelected(news)">
-					<div class="col-md-12 d-flex">
+					<div class="col-md-12 d-flex mb-2">
 						<span class="small">{{ formatDate(news.insertamum) }} </span>
 						<span class="ms-auto small">{{ formatTime(news.insertamum) }} </span>
 					</div>
-					<div class="col-md-12">
+					<div class="col-md-12 news-truncate">
 						<span >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</span>
 					</div>
 				</div>
 				</template>
 			</div>
-			<div style="padding-left: 0px; padding-right: 0px;" ref="htmlContent" class="h-100 col-12 col-sm-9 col-md-8 col-lg-7">
+			<div style="padding-left: 0px; padding-right: 0px;" ref="htmlContent" class="h-100 col">
 				<div class="container h-100" style="padding: 0px;"  ref="carocontainer">
 					<div id="FhcCarouselContainer" style="height: 100%;" ref="carousel" class="carousel slide fhc-carousel" data-bs-interval="false">
 

From 6c57c17eb5d924b4be8191e5fb7005f0e918e2ea Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 22 Jul 2025 13:50:34 +0200
Subject: [PATCH 418/572] update(News Widget 1 spaltig): adds padding and
 updates colors of the time and content when hovered

---
 public/css/components/dashboard/news.css     | 17 +++++++++++++++++
 public/js/components/Dashboard/Item.js       |  2 +-
 public/js/components/DashboardWidget/News.js |  9 +++------
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index a5bca7afe..0253a1789 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -96,6 +96,11 @@
 	}
 }
 
+.widgets-news{
+	padding: 0 .5rem;
+	overflow-y: auto;
+}
+
 .widgets-news img
 {
     max-width: 100%;
@@ -165,10 +170,22 @@
 
 .fhc-news-items-lg .row:hover{
 	background-color: var(--fhc-primary);
+	color: var(--fhc-light) !important;
+	cursor: pointer;
+}
+
+.fhc-news-items-lg .row .news-truncate span{
+	color: var(--fhc-primary);
+	cursor: pointer;
+}
+
+.fhc-news-items-lg .row:hover .news-truncate span {
 	color: var(--fhc-light);
 	cursor: pointer;
 }
 
+
+
 .news-truncate {
 	display: -webkit-box;
 	-webkit-line-clamp: 2;
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index c9598ce16..8e1fb2c62 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -189,7 +189,7 @@ export default {
 				</div>
 			</Transition>
 		</div>
-		<div v-if="ready" class="card-body overflow-hidden" style="padding: 0px;">
+		<div v-if="ready" class="card-body overflow-hidden" style="padding: .5em 0;">
 			<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
 		</div>
 		<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index a6c94b90e..26757d49c 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -23,9 +23,6 @@ export default {
 		sizeClass() {
 			return 'fhc-news-' + ['xs', 'sm', 'md', 'lg'][this.size];
 		},
-		getNewsWidgetStyle() {
-			return this.width == 1 ? "padding: 1rem 1rem;" : "padding: 0px;"
-		},
 		newsList() {
 			//Return news amount depending on widget width and size
 			// let quantity = this.width;
@@ -219,7 +216,7 @@ export default {
 	
 	},
 	template: /*html*/ `
-<div ref="container" class="widgets-news h-100" :class="sizeClass" :style="getNewsWidgetStyle">
+<div ref="container" class="widgets-news h-100" :class="sizeClass" >
     <div class="d-flex flex-column h-100">
         <div class="h-100 fhc-news-items-sm" style="overflow-y: auto" v-show="width == 1" >
             <div  v-for="(news, index) in newsList" :key="news.news_id" class="py-2">
@@ -239,8 +236,8 @@ export default {
         		<template v-for="news in newsList" :key="'menu-'+news.news_id" >
 				<div class="row m-0 py-2" @click="setSelected(news)">
 					<div class="col-md-12 d-flex mb-2">
-						<span class="small">{{ formatDate(news.insertamum) }} </span>
-						<span class="ms-auto small">{{ formatTime(news.insertamum) }} </span>
+						<span class="small ">{{ formatDate(news.insertamum) }} </span>
+						<span class="ms-auto small ">{{ formatTime(news.insertamum) }} </span>
 					</div>
 					<div class="col-md-12 news-truncate">
 						<span >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</span>

From a13deed13f86a1079b9db0929e536be0186c0358 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 22 Jul 2025 14:07:44 +0200
Subject: [PATCH 419/572] Tab Aufnahmetermine: bugfix updateAufnahmetermin

---
 application/controllers/api/frontend/v1/stv/Aufnahmetermine.php | 1 -
 .../Details/Aufnahmetermine/Aufnahmetermine.js                  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
index 153079789..86b739c90 100644
--- a/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
+++ b/application/controllers/api/frontend/v1/stv/Aufnahmetermine.php
@@ -175,7 +175,6 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$result = $this->RtPersonModel->update(
 			[
 				'rt_person_id' => $rt_person_id,
-				'person_id' => $person_id,
 			],
 			[
 				'rt_id' => $rt_id,
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index 474854315..9ffddcf5a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -495,7 +495,7 @@ export default {
 		<template #footer>
 			<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{$p.t('ui', 'abbrechen')}}</button>
 			<button v-if="statusNew" class="btn btn-primary" @click="addNewPlacementTest()"> {{$p.t('ui', 'speichern')}}</button>
-			<button v-else class="btn btn-primary" @click="updatePlacementTest(formData.rt_id)"> {{$p.t('ui', 'speichern')}}</button>
+			<button v-else class="btn btn-primary" @click="updatePlacementTest(formData.rt_person_id)"> {{$p.t('ui', 'speichern')}}</button>
 		</template>
 	    </bs-modal>
 

From 1b2d5ff6c65263702d7c37701a5345c30e21d59d Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 22 Jul 2025 15:43:03 +0200
Subject: [PATCH 420/572] update(News widget styling): makes card-header of the
 news content sticky so that the white left and right buttons don't appear in
 front of a white background

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

diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 26757d49c..0f15a165e 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -63,6 +63,14 @@ export default {
 					if (!el.classList.contains("fhc-primary")) {
 						el.classList.add("fhc-primary");
 					}
+					if (!el.classList.contains("position-sticky")) {
+						el.classList.add("position-sticky");
+					}
+					if (!el.classList.contains("top-0")) {
+						el.classList.add("top-0");
+					}
+					
+					
 				});
 				document.querySelectorAll(".fhc-news-card-item .card-header .row").forEach((el) => {
 					if (!el.classList.contains("w-100")) {

From 07ba21ff3ec4bc9c49ecec85f35c9fa33f7e73a9 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 22 Jul 2025 16:03:00 +0200
Subject: [PATCH 421/572] Tab Details: reload DetailHeader after update Detaisl

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

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index 18efcc9de..624b3d035 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -37,6 +37,10 @@ export default {
 		},
 		lists: {
 			from: 'lists'
+		},
+		$reloadList: {
+			from: '$reloadList',
+			required: true
 		}
 	},
 	props: {
@@ -136,6 +140,8 @@ export default {
 						this.$refs.form.setFeedback(true, cleanedFeedback);
 						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
 					}
+
+					this.$reloadList();
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},

From db07f33e3c6b28ba658eb782cf8004957ee56dd1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 22 Jul 2025 16:20:18 +0200
Subject: [PATCH 422/572] update(Cis Modals): makes modals scrollable by
 default and uses fhc-primary for the card-header and fhc-secondary for the
 card-footer

---
 public/css/Cis4/Cis.css            | 14 ++++++++++++++
 public/js/components/Base/Modal.js |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 64bf769fc..80784fe5d 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -838,4 +838,18 @@ html {
 	#lektorenContainer {
 		grid-template-columns: 1fr 1fr;
 	}
+}
+
+#cis-main .modal-header{
+	background-color: var(--fhc-primary);
+	color: var(--fhc-light);
+}
+
+#cis-main .modal-header .btn-close{
+	filter: invert(1);
+}
+
+#cis-main .modal-footer {
+	background-color: var(--fhc-secondary);
+	
 }
\ No newline at end of file
diff --git a/public/js/components/Base/Modal.js b/public/js/components/Base/Modal.js
index ad3785e62..9a07f9c16 100644
--- a/public/js/components/Base/Modal.js
+++ b/public/js/components/Base/Modal.js
@@ -16,7 +16,7 @@ export default {
         :class="this.cModalClass"
         :id="this.id"
         :aria-labelledby="this.id + '_label'" aria-hidden="true" tabindex="-1">       
-            <div class="modal-dialog" :class="this.cModalDialogClass">
+            <div class="modal-dialog modal-dialog-scrollable" :class="this.cModalDialogClass">
                 <div class="modal-content">
                     <div class="modal-header">
                         <h5 class="modal-title" :id="this.id + '_label'">

From 72df2cb79cfb737142ace0e73da0ef78f8f2f159 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 23 Jul 2025 08:56:23 +0200
Subject: [PATCH 423/572] Implementation CIS => LvPlanWidget

---
 application/controllers/Cis4.php              |  12 +-
 public/css/Cis4/CoreCalendarEvents.css        |  50 ++-
 public/css/components/calendar/events.css     |   6 +-
 public/js/components/Calendar/Base.js         |   1 +
 .../Calendar/Base/Grid/Line/Event.js          |   2 +-
 public/js/components/Calendar/Base/Header.js  |   5 +
 .../Calendar/Base/Header/Datepicker.js        |  13 +-
 public/js/components/Calendar/Mode/List.js    |  22 +-
 .../js/components/Calendar/Mode/List/View.js  |  31 +-
 public/js/components/Dashboard/Dashboard.js   |   4 +-
 .../js/components/DashboardWidget/LvPlan.js   | 321 +++++-------------
 11 files changed, 190 insertions(+), 277 deletions(-)

diff --git a/application/controllers/Cis4.php b/application/controllers/Cis4.php
index c0ca8d503..b7ba2029d 100644
--- a/application/controllers/Cis4.php
+++ b/application/controllers/Cis4.php
@@ -17,6 +17,9 @@ class Cis4 extends Auth_Controller
 			'index' => 'basis/cis:r'
 		    )
 		);
+
+		// Load Config
+		$this->load->config('calendar');
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -27,15 +30,16 @@ class Cis4 extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->model('person/Person_model','PersonModel');
+		$this->load->model('person/Person_model', 'PersonModel');
 		$personData = getData($this->PersonModel->getByUid(getAuthUID()))[0];
 		
 		$viewData = array(
 			'uid' => getAuthUID(),
 			'name' => $personData->vorname,
-			'person_id' => $personData->person_id
+			'person_id' => $personData->person_id,
+			'timezone' => $this->config->item('timezone')
 		);
 
-		$this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'FhcDashboard']);
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'FhcDashboard']);
 	}
-}
\ No newline at end of file
+}
diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index f248f4a61..9075d89e9 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -124,27 +124,27 @@
 
 .dayPageContainer .feiertagEventContent #ferienEventTitle {}
 
-/* Minimized Container Styles */
+/* List Page Container Styles */
 
-/* Ferientage Events for Minimized */
+/* Ferientage Events for List Page */
 
-.minimizedContainer .feiertagEventContent{
+.listPageContainer .feiertagEventContent{
 	display: flex;
 	justify-content: center;
 	align-items: center;
 	color: var(--fhc-light);
 }
 
-.minimizedContainer .feiertagEventContent #ferienEventIcon{
+.listPageContainer .feiertagEventContent #ferienEventIcon{
 	margin: 0.5rem;
 }
 
-.minimizedContainer .feiertagEventContent #ferienEventTitle{
+.listPageContainer .feiertagEventContent #ferienEventTitle{
 	flex-grow: 1;
 }
 
-/* Lehreinheits Events in Minimized */
-.dayPageContainer .lehreinheitEventContent {
+/* Lehreinheits Events in List Page */
+.listPageContainer .lehreinheitEventContent {
 	display: flex;
 	padding-left: 4rem;
 	justify-content: space-evenly;
@@ -152,15 +152,43 @@
 
 }
 
-.dayPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
+.listPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
 	display: grid;
 	align-content: center;
 }
 
-.dayPageContainer .lehreinheitEventContent #lehreinheitEventText {
+.listPageContainer .lehreinheitEventContent #lehreinheitEventText {
 	display: contents;
 }
 
-.dayPageContainer .lehreinheitEventContent #lehreinheitEventText * {
+.listPageContainer .lehreinheitEventContent #lehreinheitEventText * {
 	font-weight: 500;
-}
\ No newline at end of file
+}
+
+
+/* Widget Styles */
+.dashboard-widget-lvplan .fhc-calendar-base .card {
+	--bs-card-cap-padding-x: 0;
+	--bs-card-cap-padding-y: 0;
+	--bs-card-border-radius: 0;
+	--bs-card-border-width: 0;
+	--dp-input-padding: .375rem .75rem;
+	--dp-input-icon-padding: calc(1rem + 24px);
+}
+.dashboard-widget-lvplan .fhc-calendar-base .card-header {
+	border-bottom-width: var(--bs-border-width);
+}
+.dashboard-widget-lvplan .fhc-calendar-base .card-header > .row > .col-auto,
+.dashboard-widget-lvplan .fhc-calendar-base .card-header .btn-group {
+	width: 100%;
+}
+.dashboard-widget-lvplan .fhc-calendar-base .card-header input {
+	--dp-font-size: .7em;
+}
+.dashboard-widget-lvplan .fhc-calendar-base .card-header .btn {
+	--bs-btn-font-size: .7em;
+}
+.dashboard-widget-lvplan .fhc-calendar-base-label-day {
+	cursor: initial;
+}
+
diff --git a/public/css/components/calendar/events.css b/public/css/components/calendar/events.css
index 5feb7b707..b29883d54 100644
--- a/public/css/components/calendar/events.css
+++ b/public/css/components/calendar/events.css
@@ -1,4 +1,4 @@
-.fhc-calendar-base-grid-line-event {
+.event {
 	cursor: pointer;
 }
 .fhc-calendar-mode-week .all-day-events .fhc-calendar-base-grid-line-event .weekPageContainer {
@@ -59,9 +59,9 @@
 .fhc-calendar-base-grid-line-event .event-type-reservierung {
 	--event-default-bg: var(--fhc-calendar-bg-reservierung, #fff);
 }
-.fhc-calendar-base-grid-line-event > * {
+.fhc-calendar-base .event > * {
 	background-color: var(--event-bg, var(--event-default-bg));
 }
-.fhc-calendar-base-grid-line-event > *:hover {
+.fhc-calendar-base .event > *:hover {
 	filter: brightness(120%);
 }
diff --git a/public/js/components/Calendar/Base.js b/public/js/components/Calendar/Base.js
index a8d668cab..520948ecb 100644
--- a/public/js/components/Calendar/Base.js
+++ b/public/js/components/Calendar/Base.js
@@ -264,6 +264,7 @@ export default {
 				:btn-week="!!modes['week'] && (btnWeek || (showBtns && btnWeek !== false))"
 				:btn-month="!!modes['month'] && (btnMonth || (showBtns && btnMonth !== false))"
 				:btn-list="!!modes['list'] && (btnList || (showBtns && btnList !== false))"
+				:mode-options="modeOptions ? modeOptions[cMode] : undefined"
 			>
 				<slot name="actions" />
 			</base-header>
diff --git a/public/js/components/Calendar/Base/Grid/Line/Event.js b/public/js/components/Calendar/Base/Grid/Line/Event.js
index 5cf098eb5..6512d1fa1 100644
--- a/public/js/components/Calendar/Base/Grid/Line/Event.js
+++ b/public/js/components/Calendar/Base/Grid/Line/Event.js
@@ -42,7 +42,7 @@ export default {
 	},
 	template: /* html */`
 	<div
-		class="fhc-calendar-base-grid-line-event"
+		class="fhc-calendar-base-grid-line-event event"
 		:class="classes"
 		style="z-index: 1"
 		:draggable="draggable"
diff --git a/public/js/components/Calendar/Base/Header.js b/public/js/components/Calendar/Base/Header.js
index 6dc0d3c26..c1dae4bc0 100644
--- a/public/js/components/Calendar/Base/Header.js
+++ b/public/js/components/Calendar/Base/Header.js
@@ -17,6 +17,10 @@ export default {
 			type: String,
 			required: true
 		},
+		modeOptions: {
+			type: Object,
+			default: {}
+		},
 		btnMonth: Boolean,
 		btnWeek: Boolean,
 		btnDay: Boolean,
@@ -62,6 +66,7 @@ export default {
 						@update:date="$emit('update:date', $event)"
 						@open="open = true"
 						@closed="open = false"
+						:list-length="modeOptions.length"
 					/>
 					<button
 						class="btn btn-outline-secondary border-0"
diff --git a/public/js/components/Calendar/Base/Header/Datepicker.js b/public/js/components/Calendar/Base/Header/Datepicker.js
index f6e521805..2d3237643 100644
--- a/public/js/components/Calendar/Base/Header/Datepicker.js
+++ b/public/js/components/Calendar/Base/Header/Datepicker.js
@@ -51,20 +51,17 @@ export default {
 			case "month":
 				return this.date.toLocaleString({ month: 'long', year: 'numeric' });
 			case "week":
-				const year = this.date.localWeekYear;
-				const week = this.date.toFormat('nn');
+				var year = this.date.localWeekYear;
+				var week = this.date.toFormat('nn');
 				return this.$p.t('calendar/year_kw', { year, week });
 			case "list":
+				return this.date.toLocaleString(luxon.DateTime.DATE_FULL) + '-' + this.date.plus({ days: this.listLength - 1 }).toLocaleString(luxon.DateTime.DATE_FULL);
 			case "day":
 				return this.date.toLocaleString(luxon.DateTime.DATE_FULL);
 			default:
 				return 'View not Supported';
 			}
 		},
-		format() {
-			const title = this.title;
-			return `'${title}'`;
-		},
 		weekStart() {
 			return luxon.Info.getStartOfWeek(this.date)%7;
 		}
@@ -97,10 +94,10 @@ export default {
 	<vue-date-picker
 		:model-value="current"
 		@update:model-value="update"
-		:format="format"
+		:format="() => title"
 		:month-picker="mode == 'month'"
 		:week-picker="mode == 'week'"
-		:range="mode == 'list' ? { autoRange: listLength } : false"
+		:range="mode == 'list' ? { autoRange: listLength - 1 } : false"
 		:text-input="mode == 'day'"
 		:week-start="weekStart"
 		:week-numbers="{ type: weekNumbers }"
diff --git a/public/js/components/Calendar/Mode/List.js b/public/js/components/Calendar/Mode/List.js
index 56ba7b1f9..97990a5a3 100644
--- a/public/js/components/Calendar/Mode/List.js
+++ b/public/js/components/Calendar/Mode/List.js
@@ -20,7 +20,8 @@ export default {
 	emits: [
 		"update:currentDate",
 		"update:range",
-		"click"
+		"click",
+		"requestModalOpen"
 	],
 	data() {
 		return {
@@ -35,9 +36,9 @@ export default {
 
 			if (this.rangeOffset != 0) {
 				if (this.rangeOffset < 0) {
-					first = first.plus({ days: this.rangeOffset * this.length });
+					first = first.plus({ days: this.rangeOffset });
 				} else {
-					last = last.plus({ days: this.rangeOffset * this.length });
+					last = first.plus({ days: this.rangeOffset + this.length });
 				}
 			}
 
@@ -46,7 +47,7 @@ export default {
 	},
 	watch: {
 		currentDate() {
-			this.rangeOffset = Math.floor(this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days / this.length);
+			this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days;
 			if (this.rangeOffset) {
 				this.$emit('update:range', this.range);
 				this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
@@ -65,15 +66,23 @@ export default {
 			this.$refs.slider.nextPage().then(this.updatePage);
 		},
 		updatePage(offset) {
-			const newFocusDate = this.focusDate.plus({ days: offset * this.length });
+			const newFocusDate = this.focusDate.plus({ days: offset });
 			this.focusDate = newFocusDate;
 			this.rangeOffset = 0;
 			this.$emit('update:currentDate', this.focusDate);
 			this.$emit('update:range', this.range);
 		},
 		viewAttrs(offset) {
-			const day = this.focusDate.plus({ days: offset * this.length });
+			const day = this.focusDate.plus({ days: offset });
 			return { day, length: this.length };
+		},
+		handleClickDefaults(evt) {
+			switch (evt.detail.source) {
+			case 'event':
+				// default: Request Modal
+				this.$emit('requestModalOpen', { event: evt.detail.value });
+				break;
+			}
 		}
 	},
 	mounted() {
@@ -82,6 +91,7 @@ export default {
 	template: `
 	<div
 		class="fhc-calendar-mode-list flex-grow-1 position-relative"
+		@cal-click-default.capture="handleClickDefaults"
 	>
 		<base-slider ref="slider" v-slot="slot">
 			<list-view v-bind="viewAttrs(slot.offset)">
diff --git a/public/js/components/Calendar/Mode/List/View.js b/public/js/components/Calendar/Mode/List/View.js
index 38b1f9855..510d821c1 100644
--- a/public/js/components/Calendar/Mode/List/View.js
+++ b/public/js/components/Calendar/Mode/List/View.js
@@ -1,6 +1,9 @@
 import LabelDay from '../../Base/Label/Day.js';
 import LabelDow from '../../Base/Label/Dow.js';
 
+import CalDnd from '../../../../directives/Calendar/DragAndDrop.js';
+import CalClick from '../../../../directives/Calendar/Click.js';
+
 // TODO(chris): drag and drop
 
 export default {
@@ -9,7 +12,12 @@ export default {
 		LabelDay,
 		LabelDow
 	},
+	directives: {
+		CalDnd,
+		CalClick
+	},
 	inject: {
+		draggableEvents: "draggableEvents",
 		events: "events"
 	},
 	props: {
@@ -43,20 +51,31 @@ export default {
 			return eventsPerDay.filter(day => day.events.length);
 		}
 	},
+	methods: {
+		draggable(event) {
+			return this.draggableEvents(event.orig, 'list');
+		},
+	},
 	template: /* html */`
-	<div
-		class="fhc-calendar-mode-list-view h-100"
-	>
-		<div v-if="!eventsPerDay.length">
+	<div class="fhc-calendar-mode-list-view h-100 overflow-auto">
+		<div v-if="!eventsPerDay.length" class="h-100">
 			<slot :event="undefined" mode="list" />
 		</div>
 		<div v-for="{ day, events } in eventsPerDay" class="text-center">
 			<label-dow :date="day" class="d-inline" />, <label-day :date="day" class="d-inline" />
 			<div v-for="event in events">
- 				<div v-if="slot.event.type == 'loading'" class="placeholder-glow opacity-50">
+ 				<div v-if="event.type == 'loading'" class="placeholder-glow opacity-50">
 					<span class="placeholder w-100" />
 				</div>
-				<slot v-else :event="event.orig" mode="list" />
+				<div
+					v-else
+					class="event"
+					:draggable="draggable(event)"
+					v-cal-dnd:draggable="event"
+					v-cal-click:event="event.orig"
+				>
+					<slot :event="event.orig" mode="list" />
+				</div>
 			</div>
 		</div>
 	</div>
diff --git a/public/js/components/Dashboard/Dashboard.js b/public/js/components/Dashboard/Dashboard.js
index 81eabd31c..3d781ac72 100644
--- a/public/js/components/Dashboard/Dashboard.js
+++ b/public/js/components/Dashboard/Dashboard.js
@@ -19,9 +19,8 @@ export default {
 		viewData: {
 			type: Object,
 			required: true,
-			default: () => ({name: '', uid: ''}),
 			validator(value) {
-				return value && value.name && value.uid
+				return value && value.name && value.uid && value.timezone
 			}
 		}
 	},
@@ -37,6 +36,7 @@ export default {
 		return {
 			editMode: Vue.computed(()=>this.editMode),
 			widgetsSetup: Vue.computed(() => this.widgets),
+			timezone: Vue.computed(() => this.viewData.timezone)
 		}
 	},
 	computed: {
diff --git a/public/js/components/DashboardWidget/LvPlan.js b/public/js/components/DashboardWidget/LvPlan.js
index 1e2588161..3961bae78 100644
--- a/public/js/components/DashboardWidget/LvPlan.js
+++ b/public/js/components/DashboardWidget/LvPlan.js
@@ -1,266 +1,115 @@
-import Phrasen from '../../mixins/Phrasen.js';
 import AbstractWidget from './Abstract.js';
-import FhcCalendar from '../Calendar/Calendar.js';
-import LvModal from '../Cis/Mylv/LvModal.js';
-import ContentModal from '../Cis/Cms/ContentModal.js'
-import CalendarDate from '../../composables/CalendarDate.js';
+import FhcCalendar from '../Calendar/Base.js';
 
 import ApiLvPlan from '../../api/factory/lvPlan.js';
-import ApiOrt from '../../api/factory/ort.js';
+
+import { useEventLoader } from '../../composables/EventLoader.js';
+
+import ModeList from '../Calendar/Mode/List.js';
 
 export default {
 	name: "LvPlanWidget",
+	components: {
+		FhcCalendar
+	},
 	mixins: [
-		Phrasen,
 		AbstractWidget
 	],
-	components: {
-		FhcCalendar,
-		LvModal,
-		ContentModal
-	},
-	
+	inject: [
+		"renderers",
+		"timezone"
+	],
 	data() {
 		return {
-			stunden: [],
-			minimized: true,
-			events: null,
-			currentDay: this.getCurrentDate(),
-			calendarDate: new CalendarDate(new Date()),
-			roomInfoContentID: null,
-			ort_kurzbz: null,
-			selectedEvent: null,
-			isModalContentResolved: false,
-			isModalTitleResolved: false,
-			isShowModal: false,
-		}
-	},
-	inject: ["renderers"],
-	watch:{
-		modalLoaded: {
-			handler: function (newValue) {
-				if (this.isShowModal && newValue.isModalContentResolved && newValue.isModalTitleResolved) {
-					this.$nextTick(() => {
-						if (this.$refs.lvmodal) this.$refs.lvmodal.show();
-						this.isShowModal = false;
-					});
+			now: luxon.DateTime.now().setZone(this.timezone),
+			modes: {
+				list: Vue.markRaw(ModeList)
+			},
+			modeOptions: {
+				list: {
+					length: 7
 				}
 			},
-			immediate: true
-		},
-	},
-	computed: {
-		modalLoaded: function () {
-			return { isModalContentResolved: this.isModalContentResolved, isModalTitleResolved: this.isModalTitleResolved };
-		},
-		allEventsGrouped() {
-			// groups all events of the next 7 days together
-			const currentCalendarDate = new CalendarDate(this.currentDay)
-			const mapArr = currentCalendarDate.nextSevenDays.map((d) => [new CalendarDate(d), []])
-
-			// return map of key => calendar date of next 7 days & values the respective events on that date
-			return new Map((this.events || []).filter(evt => evt.start >= this.currentDay).reduce((acc, cur) => {
-				const date = new CalendarDate(new Date(cur.datum))
-				const arr = acc.find(el => el[0].compare(date))
-				if(!arr) return acc
-				arr[1].push(cur)
-				
-				return acc
-			}, mapArr));
-		},
-		currentEvents() {
-			return (this.events || []).filter(evt => evt.end < this.dayAfterCurrentDay && evt.start >= this.currentDay);
-		},
-		dayAfterCurrentDay() {
-			let currentDay = new Date(this.currentDay);
-			currentDay.setDate(currentDay.getDate() + 1);
-			return currentDay;
-		},
-		monthFirstDay: function () {
-			return this.calendarDateToString(this.calendarDate.cdFirstDayOfCalendarMonth);
-		},
-		monthLastDay: function () {
-			return this.calendarDateToString(this.calendarDate.cdLastDayOfNextCalendarMonth);
-		},
+			currentDay: luxon.DateTime.now().setZone(this.timezone).startOf('day')
+		}
 	},
 	methods: {
-		showModal: function (event) {
-			this.currentlySelectedEvent = event;
-			Vue.nextTick(() => {
-				if (this.isModalContentResolved && this.isModalTitleResolved) {
-					if (this.$refs.lvmodal) this.$refs.lvmodal.show();
-				}
-				else {
-					this.isShowModal = true;
-				}
-			})
-		},
-		modalTitleResolved: function () {
-			this.isModalTitleResolved = true;
-
-		},
-		modalContentResolved: function () {
-			this.isModalContentResolved = true;
-
-		},
-		modalTitleComponent(type) {
-			return this.renderers[type]?.modalTitle;
-		},
-		modalContentComponent(type) {
-			return this.renderers[type]?.modalContent;
-		},
-		calendarEventComponent(type) {
-			return this.renderers[type]?.calendarEvent;
-		},
-		getEventStyle: function(evt) {
-			const styles = {'background-color': evt.color};
-			if(evt.start.getTime() < Date.now()) styles.opacity = 0.5;
+		eventStyle(event) {
+			const styles = {};
+			if (event.farbe)
+				styles['--event-bg'] = '#' + event.farbe;
+			else if (event.type == 'reservierung')
+				styles['--event-bg'] = '#ffffff';
+			else
+				styles['--event-bg'] = '#cccccc';
 
+			const eventEnd = luxon.DateTime.fromISO(event.isoend, { zone: this.timezone });
+			if (eventEnd < this.now)
+				styles['opacity'] = .5;
+			
 			return styles;
 		},
-		getCurrentDate: function() {
-			const today = new Date()
-			today.setHours(0,0,0)
-			return today
-		},
-		calendarDateToString: function (calendarDate) {
-
-			return calendarDate instanceof CalendarDate ?
-				[calendarDate.y, calendarDate.m + 1, calendarDate.d].join('-') :
-				null;
-
-		},
-		showRoomInfoModal: function(ort_kurzbz){
-			// getting the content_id of the ort_kurzbz
-			this.$api
-				.call(ApiOrt.getContentID(ort_kurzbz))
-				.then(res => {
-					this.roomInfoContentID = res.data;
-					this.ort_kurzbz = ort_kurzbz;
-
-					// only showing the modal after vue was able to set the reactive data
-					Vue.nextTick(() => { this.$refs.contentModal.show(); });
-				})
-				.catch(err => {
-					console.err(err);
-					this.ort_kurzbz = null;
-					this.roomInfoContentID = null;
-				});
-		},
-		showLvUebersicht: function (event){
-			this.selectedEvent= event;
-			Vue.nextTick(()=>{
-				this.$refs.lvmodal.show();
-			});
-		},
-		
-		selectDay(day) {
-			this.currentDay = day;
-			this.minimized = true;
-		},
-
-		updateRange: function (data) {
-			
-			let tmp_date = new CalendarDate(data.start);
-			// only load month data if the month or year has changed
-			if (tmp_date.m != this.calendarDate.m || tmp_date.y != this.calendarDate.y) {
-				this.calendarDate = tmp_date;
-				Vue.nextTick(() => {
-					this.loadEvents();
-				});
-			}
-		},
-		
-
-		loadEvents: function () {
-			Promise.allSettled([
-				this.$api.call(ApiLvPlan.LvPlanEvents(this.monthFirstDay, this.monthLastDay)),
-				this.$api.call(ApiLvPlan.getLvPlanReservierungen(this.monthFirstDay, this.monthLastDay))
-			]).then((result) => {
-				let promise_events = [];
-				result.forEach((promise_result) => {
-					if (promise_result.status === 'fulfilled' && promise_result.value.meta.status === "success") {
-
-						let data = promise_result.value.data;
-						// adding additional information to the events 
-						if (data && data.forEach) {
-
-							data.forEach((el, i) => {
-								el.id = i;
-								if (el.type === 'reservierung') {
-									el.color = '#' + (el.farbe || 'FFFFFF');
-								} else {
-									el.color = '#' + (el.farbe || 'CCCCCC');
-								}
-
-								el.start = new Date(el.datum + ' ' + el.beginn);
-								el.end = new Date(el.datum + ' ' + el.ende);
-
-							});
-						}
-						promise_events = promise_events.concat(data);
-					}
-				})
-				this.events = promise_events;
-			});
-		},
-
-		setCalendarMaximized() {
-			this.minimized = false
+		updateRange(rangeInterval) {
+			this.rangeInterval = rangeInterval;
 		}
-	
+	},
+	setup() {
+		const $api = Vue.inject('$api');
 
+		const rangeInterval = Vue.ref(null);
+		
+		const { events } = useEventLoader(rangeInterval, (start, end) => {
+			return [
+				$api.call(ApiLvPlan.LvPlanEvents(start.toISODate(), end.toISODate())),
+				$api.call(ApiLvPlan.getLvPlanReservierungen(start.toISODate(), end.toISODate()))
+			];
+		});
+
+		return {
+			rangeInterval,
+			events
+		};
 	},
 	created() {
 		this.$emit('setConfig', false);
-		this.loadEvents();
 	},
 	template: /*html*/`
 	<div class="dashboard-widget-lvplan d-flex flex-column h-100">
-		<lv-modal v-if="selectedEvent" ref="lvmodal" :event="selectedEvent"  >
-			<template #modalTitle>
-				<Suspense @pending="isModalTitleResolved=false" @resolve="modalTitleResolved">
-					<component :is="modalTitleComponent(selectedEvent.type)" v-if="selectedEvent" :event="selectedEvent" ></component>
-				</Suspense>
-			</template>
-			<template #modalContent>
-				<Suspense @pending="isModalContentResolved=false" @resolve="modalContentResolved">
-					<component :is="modalContentComponent(selectedEvent.type)" v-if="selectedEvent" :event="selectedEvent" ></component>
-				</Suspense>
-			</template>
-		</lv-modal>
-		<content-modal :content_id="roomInfoContentID" dialogClass="modal-lg" ref="contentModal"/>
-		<fhc-calendar @change:range="updateRange" :initial-date="currentDay" class="border-0" class-header="p-0" @select:day="selectDay" :widget="true" v-model:minimized="minimized" :events="events" no-week-view :show-weeks="false" >
-			<template #monthPage="{event,day}">
-				<div  v-if="event.type=='moodle'">
-					<div class="d-flex small w-100" >
-						<moodle-svg></moodle-svg>
-						<span v-contrast class="flex-grow-1 text-center "><strong v-html="event.titel"></strong> - {{event.topic}}</span>
-					</div>
+		<fhc-calendar
+			v-model:date="currentDay"
+			:modes="modes"
+			:mode-options="modeOptions"
+			@update:range="updateRange"
+			:timezone="timezone"
+			:locale="$p.user_locale.value"
+			:events="events"
+		>
+			<template v-slot="{ event, mode }">
+				<div
+					v-if="!event"
+					class="h-100 d-flex justify-content-center align-items-center"
+				>
+					{{ $p.t('lehre/noLvFound') }}
 				</div>
-				<span v-else class="small" >
-					{{event.topic}}
-				</span>
-			</template>
-			<template #minimizedPage >
-				<div class="minimizedContainer flex-grow-1" style="overflow-y: auto; overflow-x: hidden">
-					<div v-if="events === null" class="d-flex h-100 justify-content-center align-items-center">
-						<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
-					</div>
-					<template v-else-if="allEventsGrouped.size" v-for="([key, value], index) in allEventsGrouped" :key="index" style="margin-top: 8px;">
-						<div class=" card-header d-grid p-0">
-							<button class="btn fhc-tertiary text-decoration-none" @click="setCalendarMaximized">{{ key.format({dateStyle: "full"}, $p.user_locale.value)}}</button>
-						</div>
-						<div role="button" @click="showLvUebersicht(evt)" v-for="evt in value" :key="evt.id" class="list-group-item small" :style="getEventStyle(evt)">
-							<component :is="calendarEventComponent(evt.type)" :event="evt" ></component>
-						</div>
-						<div v-if="!value.length" class="list-group-item small text-center">
-							{{ $p.t('lehre/noLvFound') }}
-						</div>
-					</template>
-					<div v-else class="d-flex h-100 justify-content-center align-items-center fst-italic text-center">
-						{{ $p.t('lehre/noLvFound') }}
-					</div>
+				<component
+					v-else-if="mode == 'eventheader'"
+					:is="renderers[event.type]?.modalTitle"
+					:event="event"
+				></component>
+				<component
+					v-else-if="mode == 'event'"
+					:is="renderers[event.type]?.modalContent"
+					:event="event"
+				></component>
+				<div
+					v-else
+					:class="'event-type-' + event.type + ' ' + mode + 'PageContainer'"
+	 				:style="eventStyle(event)"
+				>
+					<component
+						:is="renderers[event.type]?.calendarEvent"
+						:event="event"
+					></component>
 				</div>
 			</template>
 		</fhc-calendar>

From 36fd2dcd9032a23953bca421a3306fafd81c82ae Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 23 Jul 2025 09:23:29 +0200
Subject: [PATCH 424/572] cleanup

---
 public/js/components/Cis/Mylv/RoomInformation.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index b604ef2bb..114295464 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -1,6 +1,4 @@
 import FhcCalendar from "../../Calendar/Base.js";
-import CalendarDate from "../../../composables/CalendarDate.js";
-import LvInfo from "../../../components/Cis/Mylv/LvInfo.js"
 
 import ApiStudenplan from '../../../api/factory/lvPlan.js';
 
@@ -15,8 +13,7 @@ export const DEFAULT_MODE_RAUMINFO = 'Week'
 export default {
 	name: "RoomInformation",
 	components: {
-		FhcCalendar,
-		LvInfo
+		FhcCalendar
 	},
 	inject: [
 		"renderers"

From 132ab686c9b53f866fb185b52a542cb4fe6d9e0f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 23 Jul 2025 09:24:16 +0200
Subject: [PATCH 425/572] get rid of Dashboard warnings

---
 public/js/components/Dashboard/Section.js | 8 ++++----
 public/js/components/Drop/Grid.js         | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Dashboard/Section.js b/public/js/components/Dashboard/Section.js
index 43031b8c1..a238de289 100644
--- a/public/js/components/Dashboard/Section.js
+++ b/public/js/components/Dashboard/Section.js
@@ -209,11 +209,11 @@ export default {
 		});
 	},
 	template: `
-	<h4 v-if="editModeIsActive" class=" mb-2">
-		<i v-tooltip="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>
-		{{sectionNameTranslation()}}:
-	</h4>
 	<div class="dashboard-section position-relative pb-3 border-bottom" ref="container" :style="getSectionStyle">
+		<h4 v-if="editModeIsActive" class=" mb-2">
+			<i v-tooltip="showSectionInformation(name)" class="fa-solid fa-circle-info section-info" ></i>
+			{{sectionNameTranslation()}}:
+		</h4>
 		<button v-tooltip="$p.t('dashboard','addLine')" v-if="!additionalRow && editModeIsActive" @click="additionalRow=true" class="btn btn-outline-secondary rounded-circle newGridRow d-flex justify-content-center align-items-center">+</button>
 		<drop-grid v-model:cols="gridWidth" v-model:additionalRow="additionalRow" :items="items" :itemsSetup="computedWidgetsSetup" :active="editModeIsActive" :resize-limit="checkResizeLimit" :margin-for-extra-row=".01" @draggedItem="draggedItem=$event" @rearrange-items="updatePositions" @gridHeight="gridHeight=$event" >
 			<template #default="item">
diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 6955107e3..31bdeb74e 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -36,6 +36,7 @@ export default {
 		"newItem",
 		"gridHeight",
 		"draggedItem",
+		"update:additionalRow"
 	],
 	data() {
 		return {

From 4ead5907321c8d9b01ef02e0d5fdd7adffdf5316 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 23 Jul 2025 09:25:16 +0200
Subject: [PATCH 426/572] Fix: negation of instanceof in Lehreinheit
 modalContent Renderer

---
 public/js/components/Cis/Renderer/Lehreinheit/modalContent.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
index e0436bad1..2a5670a02 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
@@ -36,14 +36,14 @@ export default {
 		},
 		start_time: function () {
 			if (!this.event.start) return 'N/A';
-			if (!this.event.start instanceof Date) {
+			if (!(this.event.start instanceof Date)) {
 				return this.event.start;
 			}
 			return numberPadding(this.event.start.getHours()) + ":" + numberPadding(this.event.start.getMinutes());
 		},
 		end_time: function () {
 			if (!this.event.end) return 'N/A';
-			if (!this.event.end instanceof Date) {
+			if (!(this.event.end instanceof Date)) {
 				return this.event.end;
 			}
 			return numberPadding(this.event.end.getHours()) + ":" + numberPadding(this.event.end.getMinutes());

From d648f79ca59a861c667ecfccc235d07356df665a Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 23 Jul 2025 09:38:31 +0200
Subject: [PATCH 427/572] Correct click source for list mode

---
 public/js/components/Calendar/Mode/List/View.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Calendar/Mode/List/View.js b/public/js/components/Calendar/Mode/List/View.js
index 510d821c1..ec4ba5897 100644
--- a/public/js/components/Calendar/Mode/List/View.js
+++ b/public/js/components/Calendar/Mode/List/View.js
@@ -62,7 +62,13 @@ export default {
 			<slot :event="undefined" mode="list" />
 		</div>
 		<div v-for="{ day, events } in eventsPerDay" class="text-center">
-			<label-dow :date="day" class="d-inline" />, <label-day :date="day" class="d-inline" />
+			<label-dow
+				:date="day"
+				class="d-inline"
+				@cal-click="evt => evt.detail.source = 'day'"
+			/>
+			, 
+			<label-day :date="day" class="d-inline" />
 			<div v-for="event in events">
  				<div v-if="event.type == 'loading'" class="placeholder-glow opacity-50">
 					<span class="placeholder w-100" />

From 66fd2e65a427d58ed0cf458d1faa099c9b9e4f19 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 23 Jul 2025 10:42:12 +0200
Subject: [PATCH 428/572] add css class today

---
 public/css/components/calendar.css            |  3 ++
 public/css/components/calendar/frame.css      | 32 ++++++++++++++++---
 .../js/components/Calendar/Mode/Day/View.js   | 22 ++++++++-----
 .../js/components/Calendar/Mode/List/View.js  | 27 ++++++++++------
 .../js/components/Calendar/Mode/Month/View.js | 10 ++++--
 .../js/components/Calendar/Mode/Week/View.js  | 24 +++++++++-----
 6 files changed, 87 insertions(+), 31 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 8d349e8c2..d2df19c0e 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -42,6 +42,9 @@
 	--fhc-calendar-bg-allday: var(--fhc-calendar-bg);
 	--fhc-calendar-bg-body: var(--fhc-calendar-bg);
 
+	--fhc-calendar-bg-month-today: var(--fhc-primary);
+	--fhc-calendar-color-month-today: var(--fhc-white-10);
+	
 	--fhc-calendar-bg-overlay1: var(--fhc-calendar-bg);
 	--fhc-calendar-bg-overlay2: var(--fhc-dark, #212529);
 	
diff --git a/public/css/components/calendar/frame.css b/public/css/components/calendar/frame.css
index dcad26abf..ab400c95d 100644
--- a/public/css/components/calendar/frame.css
+++ b/public/css/components/calendar/frame.css
@@ -44,15 +44,21 @@
 	content: "/";
 }
 .fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-header {
-	--event-bg: transparent;
-	font-weight: bold;
-	text-indent: 0;
-	font-size: var(--fhc-calendar-fontsize-month-day, 1rem);
+	height: 100%;
+}
+.fhc-calendar-mode-month .fhc-calendar-base-label-day {
+	width: 100%;
 	height: 100%;
 	display: flex;
 	justify-content: center;
 	align-items: center;
 }
+.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-header {
+	--event-bg: transparent;
+	font-weight: bold;
+	text-indent: 0;
+	font-size: var(--fhc-calendar-fontsize-month-day, 1rem);
+}
 .fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-header .disabled {
 	opacity: .3;
 }
@@ -114,6 +120,15 @@
 	width: 100%;
 	border-left: solid 1px var(--fhc-calendar-gap);
 }
+.fhc-calendar-mode-day .today {
+	background-color: var(--fhc-calendar-bg-day-today);
+	color: var(--fhc-calendar-color-day-today);
+}
+/* Week */
+.fhc-calendar-mode-week .today {
+	background-color: var(--fhc-calendar-bg-week-today);
+	color: var(--fhc-calendar-color-week-today);
+}
 /* Month */
 .fhc-calendar-mode-month .fhc-calendar-base-grid-line {
 	overflow: hidden;
@@ -137,6 +152,15 @@
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
+.fhc-calendar-mode-month .event > .today {
+	background-color: var(--fhc-calendar-bg-month-today);
+	color: var(--fhc-calendar-color-month-today);
+}
+/* List */
+.fhc-calendar-mode-list .today {
+	background-color: var(--fhc-calendar-bg-list-today);
+	color: var(--fhc-calendar-color-list-today);
+}
 
 /* Overlays */
 /* ======== */
diff --git a/public/js/components/Calendar/Mode/Day/View.js b/public/js/components/Calendar/Mode/Day/View.js
index 56065bbfd..09738f1d0 100644
--- a/public/js/components/Calendar/Mode/Day/View.js
+++ b/public/js/components/Calendar/Mode/Day/View.js
@@ -13,7 +13,8 @@ export default {
 	},
 	inject: {
 		timeGrid: "timeGrid",
-		originalEvents: "events"
+		originalEvents: "events",
+		timezone: "timezone"
 	},
 	props: {
 		day: {
@@ -71,6 +72,9 @@ export default {
 				return null; // null => loading
 
 			return first;
+		},
+		isToday() {
+			return this.day.hasSame(luxon.DateTime.now().setZone(this.timezone), 'day');
 		}
 	},
 	watch: {
@@ -116,13 +120,15 @@ export default {
 			all-day-events
 		>
 			<template #main-header="{ date }">
-				<label-dow
-					@cal-click="evt => evt.detail.source = 'day'"
-					v-bind="{ date }"
-				/>
-				<label-day
-					v-bind="{ date }"
-				/>
+				<div :class="{ today: isToday }">
+					<label-dow
+						@cal-click="evt => evt.detail.source = 'day'"
+						v-bind="{ date }"
+					/>
+					<label-day
+						v-bind="{ date }"
+					/>
+				</div>
 			</template>
 			<template #part-header="{ part }">
 				<label-time v-bind="{ part }" />
diff --git a/public/js/components/Calendar/Mode/List/View.js b/public/js/components/Calendar/Mode/List/View.js
index ec4ba5897..76b4c887d 100644
--- a/public/js/components/Calendar/Mode/List/View.js
+++ b/public/js/components/Calendar/Mode/List/View.js
@@ -18,7 +18,8 @@ export default {
 	},
 	inject: {
 		draggableEvents: "draggableEvents",
-		events: "events"
+		events: "events",
+		timezone: "timezone"
 	},
 	props: {
 		day: {
@@ -55,20 +56,28 @@ export default {
 		draggable(event) {
 			return this.draggableEvents(event.orig, 'list');
 		},
+		isToday(date) {
+			return date.hasSame(luxon.DateTime.now().setZone(this.timezone), 'day');
+		}
 	},
 	template: /* html */`
 	<div class="fhc-calendar-mode-list-view h-100 overflow-auto">
 		<div v-if="!eventsPerDay.length" class="h-100">
 			<slot :event="undefined" mode="list" />
 		</div>
-		<div v-for="{ day, events } in eventsPerDay" class="text-center">
-			<label-dow
-				:date="day"
-				class="d-inline"
-				@cal-click="evt => evt.detail.source = 'day'"
-			/>
-			, 
-			<label-day :date="day" class="d-inline" />
+		<div v-for="{ day, events } in eventsPerDay">
+			<div
+				class="text-center"
+				:class="{ today: isToday(day) }"
+			>
+				<label-dow
+					:date="day"
+					class="d-inline"
+					@cal-click="evt => evt.detail.source = 'day'"
+				/>
+				, 
+				<label-day :date="day" class="d-inline" />
+			</div>
 			<div v-for="event in events">
  				<div v-if="event.type == 'loading'" class="placeholder-glow opacity-50">
 					<span class="placeholder w-100" />
diff --git a/public/js/components/Calendar/Mode/Month/View.js b/public/js/components/Calendar/Mode/Month/View.js
index fc21e452b..ea83b6c96 100644
--- a/public/js/components/Calendar/Mode/Month/View.js
+++ b/public/js/components/Calendar/Mode/Month/View.js
@@ -40,7 +40,8 @@ export default {
 		};
 	},
 	inject: {
-		events: "events"
+		events: "events",
+		timezone: "timezone"
 	},
 	props: {
 		day: {
@@ -57,6 +58,11 @@ export default {
 			return Array.from({ length: 8 }, (e, i) => luxon.Duration.fromObject({ days: i }));
 		}
 	},
+	methods: {
+		isToday(date) {
+			return date.hasSame(luxon.DateTime.now().setZone(this.timezone), 'day');
+		}
+	},
 	template: /* html */`
 	<div class="fhc-calendar-mode-month-view h-100">
 		<calendar-grid
@@ -76,7 +82,7 @@ export default {
 				<label-day
 					v-if="slot.event.orig == 'header'"
 					:date="slot.event.start"
-					:class="{ disabled: day.month != slot.event.start.month }"
+					:class="{ disabled: !day.hasSame(slot.event.start, 'month'), today: isToday(slot.event.start) }"
 				/>
 				<div v-else-if="slot.event.type == 'loading'" class="placeholder-glow opacity-50">
 					<span class="placeholder w-100 fs-1" />
diff --git a/public/js/components/Calendar/Mode/Week/View.js b/public/js/components/Calendar/Mode/Week/View.js
index 64cd4b1a6..612c4ad55 100644
--- a/public/js/components/Calendar/Mode/Week/View.js
+++ b/public/js/components/Calendar/Mode/Week/View.js
@@ -12,7 +12,8 @@ export default {
 		LabelTime
 	},
 	inject: {
-		timeGrid: "timeGrid"
+		timeGrid: "timeGrid",
+		timezone: "timezone"
 	},
 	props: {
 		day: {
@@ -43,6 +44,11 @@ export default {
 			}
 		}
 	},
+	methods: {
+		isToday(date) {
+			return date.hasSame(luxon.DateTime.now().setZone(this.timezone), 'day');
+		}
+	},
 	template: /* html */`
 	<div class="fhc-calendar-mode-week-view h-100">
 		<calendar-grid
@@ -54,13 +60,15 @@ export default {
 			all-day-events
 		>
 			<template #main-header="{ date }">
-				<label-dow
-					v-bind="{ date }"
-					@cal-click="evt => evt.detail.source = 'day'"
-				/>
-				<label-day
-					v-bind="{ date }"
-				/>
+				<div :class="{ today: isToday(date) }">
+					<label-dow
+						v-bind="{ date }"
+						@cal-click="evt => evt.detail.source = 'day'"
+					/>
+					<label-day
+						v-bind="{ date }"
+					/>
+				</div>
 			</template>
 			<template #part-header="{ part }">
 				<label-time v-bind="{ part }" />

From 8f73404307a394b23a5b1588395265ee70683dc9 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 23 Jul 2025 10:50:57 +0200
Subject: [PATCH 429/572] truncate past-markings in month mode

---
 public/js/components/Cis/LvPlan/LvPlan.js     | 28 +++++++++++++------
 .../js/components/Cis/Mylv/RoomInformation.js | 21 +++++++++++---
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 001b46f7c..cdb2c38c1 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -43,13 +43,6 @@ export default {
 			},
 			currentDay: this.propsViewData?.focus_date,
 			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_LVPLAN,
-			backgrounds: [
-				{
-					class: 'background-past',
-					end: now,
-					label: now.startOf('minute').toISOTime({ suppressSeconds: true, includeOffset: false })
-				}
-			],
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
 			studiensemester_ende: null,
@@ -57,6 +50,25 @@ export default {
 		};
 	},
 	computed:{
+		backgrounds() {
+			let now = luxon.DateTime.now().setZone(this.viewData.timezone);
+
+			if (this.calendarMode == 'Month')
+				return [
+					{
+						class: 'background-past',
+						end: now.startOf('day')
+					}
+				];
+
+			return [
+				{
+					class: 'background-past',
+					end: now,
+					label: now.startOf('minute').toISOTime({ suppressSeconds: true, includeOffset: false })
+				}
+			];
+		},
 		downloadLinks() {
 			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
 				return false;
@@ -82,7 +94,7 @@ export default {
 				{ title: "ical1", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=1&target=ical' },
 				{ title: "ical2", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=2&target=ical' }
 			];
-		},
+		}
 	},
 	methods: {
 		eventStyle(event) {
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 114295464..ac02a9d51 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -23,7 +23,6 @@ export default {
 		propsViewData: Object
 	},
 	data() {
-		const now = luxon.DateTime.now().setZone(this.viewData.timezone);
 		return {
 			modes: {
 				day: Vue.markRaw(ModeDay),
@@ -41,14 +40,28 @@ export default {
 				}
 			},
 			currentDay: this.propsViewData?.focus_date,
-			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_RAUMINFO,
-			backgrounds: [
+			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_RAUMINFO
+		}
+	},
+	computed: {
+		backgrounds() {
+			let now = luxon.DateTime.now().setZone(this.viewData.timezone);
+
+			if (this.calendarMode == 'Month')
+				return [
+					{
+						class: 'background-past',
+						end: now.startOf('day')
+					}
+				];
+
+			return [
 				{
 					class: 'background-past',
 					end: now,
 					label: now.startOf('minute').toISOTime({ suppressSeconds: true, includeOffset: false })
 				}
-			]
+			];
 		}
 	},
 	methods:{

From 0be83eedef1644c6bff024cb8e22d398ae99196b Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 23 Jul 2025 11:17:47 +0200
Subject: [PATCH 430/572] Start Translation ErrorMessage

---
 public/js/plugins/FhcAlert.js |  6 +++++-
 system/phrasesupdate.php      | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/public/js/plugins/FhcAlert.js b/public/js/plugins/FhcAlert.js
index ad3975a73..f90b61ac2 100644
--- a/public/js/plugins/FhcAlert.js
+++ b/public/js/plugins/FhcAlert.js
@@ -217,9 +217,13 @@ export default {
 			alertSystemError(message) {
 				//TODO(Manu) for translation of content of template: restructure in data
 				//and update definitions with  translations
+
 				if (Array.isArray(message))
 					return message.forEach(this.alertSystemError);
-				helperAppInstance.$refs.alert.add({ severity: 'error', summary: 'Systemfehler', detail: message});
+				helperAppInstance.$refs.alert.add({
+					severity: 'error',
+					summary: Vue.computed(() => app.config.globalProperties.$p.t('alert/systemerror')),
+					detail: message});
 			},
 			confirmDelete() {
 				return new Promise((resolve, reject) => {
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 491271a00..ac00fb40d 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44475,6 +44475,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'alert',
+		'phrase' => 'systemerror',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Systemfehler',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'System Error',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'ui',

From ae725c08a95ad8757858070b9d324b3dc69a25b5 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 23 Jul 2025 11:18:38 +0200
Subject: [PATCH 431/572] update(News und Paginator styling): updates how the
 news widget is highlighted and adds paginator css overwrites

---
 public/css/components/dashboard/news.css      |  9 +--
 public/css/theme/default.css                  | 19 ++++++
 .../ProfilComponents/ProfilInformation.js     |  6 +-
 public/js/components/DashboardWidget/News.js  |  2 +-
 system/phrasesupdate.php                      | 60 +++++++++++++++++++
 5 files changed, 85 insertions(+), 11 deletions(-)

diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index 0253a1789..8c3a090d7 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -168,19 +168,14 @@
 	opacity: 1 !important;
 }
 
-.fhc-news-items-lg .row:hover{
-	background-color: var(--fhc-primary);
-	color: var(--fhc-light) !important;
-	cursor: pointer;
-}
 
 .fhc-news-items-lg .row .news-truncate span{
 	color: var(--fhc-primary);
 	cursor: pointer;
 }
 
-.fhc-news-items-lg .row:hover .news-truncate span {
-	color: var(--fhc-light);
+.fhc-news-items-lg .row:hover .news-truncate span{
+	text-decoration: underline;
 	cursor: pointer;
 }
 
diff --git a/public/css/theme/default.css b/public/css/theme/default.css
index 35a0c98f9..ba6493542 100644
--- a/public/css/theme/default.css
+++ b/public/css/theme/default.css
@@ -266,4 +266,23 @@ html.dark .tabulator .tabulator-header .tabulator-col:hover {
 
 .p-paginator{
 	background-color: var(--fhc-background) !important;
+}
+
+.p-paginator .p-paginator-pages .p-paginator-page.p-highlight,
+.p-dropdown-panel .p-dropdown-items .p-dropdown-item.p-highlight {
+	background-color: var(--fhc-primary) !important;
+	border-color: var(--fhc-primary) !important;
+	color: var(--fhc-light) !important;
+}
+
+.p-paginator .p-paginator-pages .p-paginator-page,
+.p-paginator .p-paginator-next,
+.p-paginator .p-paginator-prev,
+.p-paginator .p-paginator-first,
+.p-paginator .p-paginator-last {
+	color: var(--fhc-primary) !important;
+}
+
+.p-link:focus {
+	box-shadow: 0 0 0 0.2rem rgba(var(--fhc-primary), 0.5) !important;
 }
\ No newline at end of file
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index 5dd4a6969..d714c9faa 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -73,7 +73,7 @@ export default {
 	<image-upload ref="imageUpload" :titel="$p.t('profilUpdate','profilBild')"></image-upload>
     <div class="card-header">
         <div class="row">
-            <div v-if="isEditable" @click="$emit('showEditProfilModal','Personen_Informationen')" class="col-auto" type="button">
+            <div v-if="isEditable" @click="$emit('showEditProfilModal','Personen_Informationen')" class="col-auto" type="button" :title="$p.t('profilUpdate','profilBearbeiten')">
                 <i class="fa fa-edit"></i>
             </div>
             <div class="col">
@@ -90,10 +90,10 @@ export default {
                     <div class="col-auto profil-image" style="position:relative">
                         <img alt="profile picture" class=" img-thumbnail " style=" max-height:150px; "  :src="get_image_base64_src"/>
                         <!-- LOCKING IMAGE FUNCTIONALITY -->
-                        <div v-if="isEditable" role="button" @click.prevent="sperre_foto_function" class="image-lock">
+                        <div v-if="isEditable" role="button" type="button"  :title="FotoSperre?$p.t('profil','fotoSperren'):$p.t('profil','fotoEntsperren')" @click.prevent="sperre_foto_function" class="image-lock">
                             <i :class="{'fa':true, ...(FotoSperre?{'fa-lock':true}:{'fa-lock-open':true})} "></i>
                         </div>
-						<div v-if="fotoStatus != null && !fotostatus" role="button" @click.prevent="showModal" class="image-upload">
+						<div v-if="fotoStatus != null && !fotoStatus" role="button" type="button" :title="$p.t('profil','fotoHochladen')" @click.prevent="showModal" class="image-upload">
                             <i class="fa fa-upload"></i>
                         </div>
                     </div>
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 0f15a165e..247f04b40 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -243,7 +243,7 @@ export default {
         	<div :class="'col-'+(width == 4? 3: width == 3? 4 :6)" style="overflow: auto;" class="fhc-news-items-lg border-end h-100 g-0 " >
         		<template v-for="news in newsList" :key="'menu-'+news.news_id" >
 				<div class="row m-0 py-2" @click="setSelected(news)">
-					<div class="col-md-12 d-flex mb-2">
+					<div class="col-md-12 d-flex mb-2 pe-3">
 						<span class="small ">{{ formatDate(news.insertamum) }} </span>
 						<span class="ms-auto small ">{{ formatTime(news.insertamum) }} </span>
 					</div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 72013baac..7e8dd1316 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27416,6 +27416,66 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'fotoSperren',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Profilbild sperren',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'lock profile picture',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'fotoEntsperren',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Profilbild entsperren',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'unlock profile picture',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'fotoHochladen',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Profilbild hochladen',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'upload profile picture',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 		array(
 			'app' => 'core',
 			'category' => 'profil',

From 92bd09355b830c5bae4f8ba3a901aa86ed65455a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 23 Jul 2025 11:25:13 +0200
Subject: [PATCH 432/572] update(News widget): adds number padding for the date
 and the time stamp in the news widget

---
 public/js/components/DashboardWidget/News.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index 247f04b40..d86ccff0b 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -1,6 +1,6 @@
 import AbstractWidget from './Abstract.js';
 import BsModal from '../Bootstrap/Modal.js';
-
+import { numberPadding } from '../../helpers/DateHelpers.js';
 import ApiCms from '../../api/factory/cms.js';
 
 const MAX_LOADED_NEWS = 30;
@@ -89,11 +89,11 @@ export default {
 		},
 		formatDate: function (dateTime) {
 			const dt = new Date(dateTime);
-			return dt.getDate() + '.' + (dt.getMonth() + 1) + '.' + dt.getFullYear();				
+			return numberPadding(dt.getDate()) + '.' + numberPadding((dt.getMonth() + 1)) + '.' + dt.getFullYear();				
 		},
 		formatTime: function (dateTime) {
 			const dt = new Date(dateTime);
-			return dt.getHours() + ':' + dt.getMinutes();
+			return numberPadding(dt.getHours()) + ':' + numberPadding(dt.getMinutes());
 		},
 		isString(value){
 			return Object.prototype.toString.call(value) === '[object String]';

From b1fe60aab0a740311f4f1320828e07d470d56511 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 23 Jul 2025 11:57:56 +0200
Subject: [PATCH 433/572] =?UTF-8?q?Tab=20Anrechnungen:=20Add=20Phrasen=20S?=
 =?UTF-8?q?tatus,=20Notiz=20hinzuf=C3=BCgen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Details/Anrechnungen/Anrechnungen.js      |  8 ++++++--
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index c11c0b39a..8f32479a9 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -93,9 +93,10 @@ export default {
 							if (countNotizen > 0){
 								buttonNotes.innerHTML = countNotizen + this.$p.t('anrechnung', 'existingNotes');
 							}
-							else
+							else {
 								buttonNotes.innerHTML = '+' + this.$p.t('global', 'notiz');
-
+							}
+							buttonNotes.title = this.$p.t('ui', 'notizHinzufuegen');
 							buttonNotes.addEventListener('click', (event) =>
 								this.addNote(cell.getData().anrechnung_id)
 							);
@@ -138,6 +139,9 @@ export default {
 						cm.getColumnByField('lehrveranstaltung_bez_kompatibel').component.updateDefinition({
 							title: this.$p.t('anrechnung', 'lehrveranstaltung_bez_kompatibel'),
 						});
+						cm.getColumnByField('status').component.updateDefinition({
+							title: this.$p.t('global', 'status'),
+						});
 						cm.getColumnByField('genehmigt_von').component.updateDefinition({
 							title: this.$p.t('anrechnung', 'genehmigtVon'),
 						});
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ac00fb40d..e30c2e373 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44516,6 +44516,26 @@ and represent the current state of research on the topic. The prescribed citatio
 		)
 	),
 	// FHC-4 Studierendenverwaltung FHC-ALERTS END
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'notizHinzufuegen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Notiz hinzufügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Add note',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 6994591a10d45d8bdf95acc36007254696f7c2f5 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 23 Jul 2025 13:39:34 +0200
Subject: [PATCH 434/572] better CSS file arrangement

---
 public/css/Cis4/CoreCalendarEvents.css     | 28 ----------------------
 public/css/components/calendar.css         | 17 -------------
 public/css/components/dashboard.css        |  1 +
 public/css/components/dashboard/LvPlan.css | 24 +++++++++++++++++++
 4 files changed, 25 insertions(+), 45 deletions(-)
 create mode 100644 public/css/components/dashboard/LvPlan.css

diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index 9075d89e9..95e1dfd39 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -164,31 +164,3 @@
 .listPageContainer .lehreinheitEventContent #lehreinheitEventText * {
 	font-weight: 500;
 }
-
-
-/* Widget Styles */
-.dashboard-widget-lvplan .fhc-calendar-base .card {
-	--bs-card-cap-padding-x: 0;
-	--bs-card-cap-padding-y: 0;
-	--bs-card-border-radius: 0;
-	--bs-card-border-width: 0;
-	--dp-input-padding: .375rem .75rem;
-	--dp-input-icon-padding: calc(1rem + 24px);
-}
-.dashboard-widget-lvplan .fhc-calendar-base .card-header {
-	border-bottom-width: var(--bs-border-width);
-}
-.dashboard-widget-lvplan .fhc-calendar-base .card-header > .row > .col-auto,
-.dashboard-widget-lvplan .fhc-calendar-base .card-header .btn-group {
-	width: 100%;
-}
-.dashboard-widget-lvplan .fhc-calendar-base .card-header input {
-	--dp-font-size: .7em;
-}
-.dashboard-widget-lvplan .fhc-calendar-base .card-header .btn {
-	--bs-btn-font-size: .7em;
-}
-.dashboard-widget-lvplan .fhc-calendar-base-label-day {
-	cursor: initial;
-}
-
diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index d2df19c0e..3b531cfb7 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -4,23 +4,6 @@
 
 /* Themable Variables */
 :root {
-/*	--fhc-calendar-pane-height: calc(100vh - 220px);
-	
-	--fhc-calendar-primary: var(--fhc-primary, #006095);
-	--fhc-calendar-border-highlight: var(--fhc-border-highlight, #495057);
-	--fhc-calendar-text: var(--fhc-text, #212529);
-	--fhc-calendar-text-light: var(--fhc-text, #212529);
-	--fhc-calendar-background: var(--fhc-background, #fff);
-	--fhc-calendar-dark: var(--fhc-dark, #212529);
-	--fhc-calendar-hour-indicator-bg: var(--fhc-background, #fff);
-	--fhc-calendar-week-page-header-background: var(--fhc-background, #fff);
-	--fhc-calendar-week-page-header-color: var(--fhc-text, #212529);
-	--fhc-calendar-week-page-header-border: var(--fhc-border, #dee2e6);
-	--fhc-calendar-week-page-header-hover-background: var(--fhc-background-highlight, #d5dae0);
-	--fhc-calendar-all-day-event-background: var(--fhc-background, #fff);
-	--fhc-calendar-past: var(--fhc-beige-10, rgba(245, 233, 215, 0.5));
-	--fhc-calendar-box-shadow: var(--fhc-box-shadow, #dee2e6);*/
-	
 	--fhc-calendar-gap: var(--fhc-border, #dee2e6);
 	--fhc-calendar-bg: var(--fhc-background, #fff);
 	--fhc-calendar-border: var(--fhc-border, #dee2e6);
diff --git a/public/css/components/dashboard.css b/public/css/components/dashboard.css
index ae2bb252f..8dc19128d 100644
--- a/public/css/components/dashboard.css
+++ b/public/css/components/dashboard.css
@@ -1,5 +1,6 @@
 @import './calendar.css';
 @import './dashboard/news.css';
+@import './dashboard/LvPlan.css';
 
 :root{
 	--fhc-dashboard-danger: var(--fhc-danger, #842029);
diff --git a/public/css/components/dashboard/LvPlan.css b/public/css/components/dashboard/LvPlan.css
new file mode 100644
index 000000000..014abebae
--- /dev/null
+++ b/public/css/components/dashboard/LvPlan.css
@@ -0,0 +1,24 @@
+.dashboard-widget-lvplan .fhc-calendar-base .card {
+	--bs-card-cap-padding-x: 0;
+	--bs-card-cap-padding-y: 0;
+	--bs-card-border-radius: 0;
+	--bs-card-border-width: 0;
+	--dp-input-padding: .375rem .75rem;
+	--dp-input-icon-padding: calc(1rem + 24px);
+}
+.dashboard-widget-lvplan .fhc-calendar-base .card-header {
+	border-bottom-width: var(--bs-border-width);
+}
+.dashboard-widget-lvplan .fhc-calendar-base .card-header > .row > .col-auto,
+.dashboard-widget-lvplan .fhc-calendar-base .card-header .btn-group {
+	width: 100%;
+}
+.dashboard-widget-lvplan .fhc-calendar-base .card-header input {
+	--dp-font-size: .7em;
+}
+.dashboard-widget-lvplan .fhc-calendar-base .card-header .btn {
+	--bs-btn-font-size: .7em;
+}
+.dashboard-widget-lvplan .fhc-calendar-base-label-day {
+	cursor: initial;
+}

From 715b48c39f7240e1fd67d1876391186cd321e0f4 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 23 Jul 2025 13:41:24 +0200
Subject: [PATCH 435/572] =?UTF-8?q?Tab=20Nachrichten:=20Relationmessage=20?=
 =?UTF-8?q?Id,=20Letzte=20=C3=84nderung,=20Status=20in=20capital=20letters?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/js/components/Messages/Details/TableMessages.js | 4 ++--
 system/phrasesupdate.php                               | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 65c090327..d2dbdb7ce 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -63,9 +63,9 @@ export default {
 					{title: "recipient", field: "recipient"},
 					{title: "senderId", field: "sender_id"},
 					{title: "recipientId", field: "recipient_id"},
-					{title: "relationmessage_id", field: "relationmessage_id"},
+					{title: "Relationmessage ID", field: "relationmessage_id"},
 					{
-						title: "status",
+						title: "Status",
 						field: "status",
 						formatterParams: [
 							"unread",
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index e30c2e373..36f5f7dcc 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -24979,7 +24979,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'letzte Änderung',
+				'text' => 'Letzte Änderung',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -44516,6 +44516,7 @@ and represent the current state of research on the topic. The prescribed citatio
 		)
 	),
 	// FHC-4 Studierendenverwaltung FHC-ALERTS END
+	// FHC-4 Finetuning START
 	array(
 		'app' => 'core',
 		'category' => 'ui',
@@ -44536,6 +44537,7 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	// FHC-4 Finetuning END
 );
 
 

From ccb4a72ae48209cce5723f9adcbb064a7d86738f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 24 Jul 2025 09:32:18 +0200
Subject: [PATCH 436/572] CSS changes

---
 public/css/components/calendar.css         | 2 +-
 public/css/components/dashboard/LvPlan.css | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 3b531cfb7..f46554007 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -34,5 +34,5 @@
 	--fhc-calendar-radius-day-event: var(--fhc-calendar-radius-event);
 	--fhc-calendar-radius-week-event: var(--fhc-calendar-radius-event);
 	--fhc-calendar-radius-month-event: 0;
-	--fhc-calendar-radius-list-event: 0;
+	--fhc-calendar-radius-list-event: var(--fhc-calendar-radius-event);
 }
diff --git a/public/css/components/dashboard/LvPlan.css b/public/css/components/dashboard/LvPlan.css
index 014abebae..6e0e4a654 100644
--- a/public/css/components/dashboard/LvPlan.css
+++ b/public/css/components/dashboard/LvPlan.css
@@ -22,3 +22,6 @@
 .dashboard-widget-lvplan .fhc-calendar-base-label-day {
 	cursor: initial;
 }
+.dashboard-widget-lvplan .fhc-calendar-mode-list-view {
+	padding: 0 1rem;
+}
\ No newline at end of file

From 3a8984a8c3788fc241743455b8f83dd5ba998dc9 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 24 Jul 2025 09:39:47 +0200
Subject: [PATCH 437/572] CSS improvements for events

---
 public/css/components/calendar/events.css | 49 ++++++++++++-----------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/public/css/components/calendar/events.css b/public/css/components/calendar/events.css
index b29883d54..f996b7339 100644
--- a/public/css/components/calendar/events.css
+++ b/public/css/components/calendar/events.css
@@ -1,62 +1,65 @@
 .event {
 	cursor: pointer;
 }
-.fhc-calendar-mode-week .all-day-events .fhc-calendar-base-grid-line-event .weekPageContainer {
+.fhc-calendar-mode-week .all-day-events .event .weekPageContainer {
 	padding: .25rem;
 }
-.fhc-calendar-mode-day .fhc-calendar-base-grid-line-event,
-.fhc-calendar-mode-week .fhc-calendar-base-grid-line-event {
+.fhc-calendar-mode-day .event,
+.fhc-calendar-mode-week .event {
 	margin: 0 .5rem;
 	font-size: var(--fhc-calendar-fontsize-event, .875rem);
 }
-.fhc-calendar-mode-day .all-day-events .fhc-calendar-base-grid-line-event,
-.fhc-calendar-mode-week .all-day-events .fhc-calendar-base-grid-line-event {
+.fhc-calendar-mode-day .all-day-events .event,
+.fhc-calendar-mode-week .all-day-events .event {
 	margin: .25rem;
 }
 /* Border */
-.fhc-calendar-mode-day .grid-main .fhc-calendar-base-grid-line-event > *,
-.fhc-calendar-mode-week .grid-main .fhc-calendar-base-grid-line-event > * {
+.fhc-calendar-mode-day .grid-main .event > *,
+.fhc-calendar-mode-week .grid-main .event > * {
 	border: solid 1px var(--fhc-calendar-border-event);
 }
-.fhc-calendar-mode-day .fhc-calendar-base-grid-line-event {
+.fhc-calendar-mode-day .event {
 	--event-radius: var(--fhc-calendar-radius-day-event, 0);
 }
-.fhc-calendar-mode-week .fhc-calendar-base-grid-line-event {
+.fhc-calendar-mode-week .event {
 	--event-radius: var(--fhc-calendar-radius-week-event, 0);
 }
-.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event {
+.fhc-calendar-mode-month .event {
 	--event-radius: var(--fhc-calendar-radius-month-event, 0);
 }
-.fhc-calendar-mode-list .fhc-calendar-base-grid-line-event {
+.fhc-calendar-mode-list .event {
 	--event-radius: var(--fhc-calendar-radius-list-event, 0);
 }
-.fhc-calendar-mode-day .all-day-events .fhc-calendar-base-grid-line-event > *,
-.fhc-calendar-mode-week .all-day-events .fhc-calendar-base-grid-line-event > *,
-.fhc-calendar-mode-day .fhc-calendar-base-grid-line-event.event-begin > *,
-.fhc-calendar-mode-week .fhc-calendar-base-grid-line-event.event-begin > * {
+.fhc-calendar-mode-day .all-day-events .event > *,
+.fhc-calendar-mode-week .all-day-events .event > *,
+.fhc-calendar-mode-day .event.event-begin > *,
+.fhc-calendar-mode-week .event.event-begin > * {
 	border-top-left-radius: var(--event-radius);
 	border-top-right-radius: var(--event-radius);
 }
-.fhc-calendar-mode-day .all-day-events .fhc-calendar-base-grid-line-event > *,
-.fhc-calendar-mode-week .all-day-events .fhc-calendar-base-grid-line-event > *,
-.fhc-calendar-mode-day .fhc-calendar-base-grid-line-event.event-end > *,
-.fhc-calendar-mode-week .fhc-calendar-base-grid-line-event.event-end > * {
+.fhc-calendar-mode-day .all-day-events .event > *,
+.fhc-calendar-mode-week .all-day-events .event > *,
+.fhc-calendar-mode-day .event.event-end > *,
+.fhc-calendar-mode-week .event.event-end > * {
 	border-bottom-left-radius: var(--event-radius);
 	border-bottom-right-radius: var(--event-radius);
 }
-.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-begin > * {
+.fhc-calendar-mode-month .event.event-begin > * {
 	border-top-left-radius: var(--event-radius);
 	border-bottom-left-radius: var(--event-radius);
 }
-.fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-end > * {
+.fhc-calendar-mode-month .event.event-end > * {
 	border-top-right-radius: var(--event-radius);
 	border-bottom-right-radius: var(--event-radius);
 }
+.fhc-calendar-mode-list .event > * {
+	border-radius: var(--event-radius);
+}
 /* Colors */
-.fhc-calendar-base-grid-line-event {
+.fhc-calendar-base .event {
 	--event-default-bg: var(--fhc-calendar-bg-event, #ccc);
 }
-.fhc-calendar-base-grid-line-event .event-type-reservierung {
+.fhc-calendar-base .event .event-type-reservierung {
 	--event-default-bg: var(--fhc-calendar-bg-reservierung, #fff);
 }
 .fhc-calendar-base .event > * {

From d024d57ef552d356a02b2cab3579a9b36c374a5a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 24 Jul 2025 10:21:50 +0200
Subject: [PATCH 438/572] fix carousel switching to wrong index, news widget
 styling

---
 public/css/components/dashboard/news.css     |  1 +
 public/js/components/DashboardWidget/News.js | 26 +++++++++-----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index 8c3a090d7..f1adb2b65 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -177,6 +177,7 @@
 .fhc-news-items-lg .row:hover .news-truncate span{
 	text-decoration: underline;
 	cursor: pointer;
+	font-weight: bold;
 }
 
 
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index d86ccff0b..f0b6ec75a 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -33,11 +33,8 @@ export default {
 				quantity = this.height === 1 ? 4 : MAX_LOADED_NEWS;
 			}
 
-			let slicedNews= this.allNewsList.slice(0, quantity);
-			slicedNews.sort((a,b)=>{
-				return new Date(b.insertamum) - new Date(a.insertamum);
-			});
-			
+			let slicedNews = this.allNewsList.slice(0, quantity);
+
 			return slicedNews;
 		},
 		carouselItems() {
@@ -190,6 +187,9 @@ export default {
 			.then(res => res.data)
 			.then((news) => {
 				this.allNewsList = Array.from(Object.values(news));
+				this.allNewsList.sort((a, b) => {
+					return new Date(b.datum) - new Date(a.datum);
+				});
 				this.selected = this.allNewsList.length ? this.allNewsList[0] : null
 				this.initActiveItem()
 
@@ -230,32 +230,30 @@ export default {
             <div  v-for="(news, index) in newsList" :key="news.news_id" class="py-2">
 				<div class="row m-0">
 					<div class="col-12 d-flex">
-						<span class="small">{{ formatDate(news.insertamum) }} </span>
-						<span class="ms-auto small">{{ formatTime(news.insertamum) }} </span>
+						<span class="small">{{ formatDate(news.datum) }} </span>
 					</div>
 					<div class="col">
-						<a :href="contentURI(news.content_id)" >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</a>
+						<a :href="contentURI(news.content_id)" >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.datum) }}</a>
 					</div>
 				</div>
 			</div>
 		</div>
         <div v-show="width >1" class="row h-100 g-0">
-        	<div :class="'col-'+(width == 4? 3: width == 3? 4 :6)" style="overflow: auto;" class="fhc-news-items-lg border-end h-100 g-0 " >
+		<div :class="'col-'+(width == 4? 3: width == 3? 4 :6)" style="overflow: auto; overscroll-behavior: none;" class="fhc-news-items-lg border-end h-100 g-0 " >
         		<template v-for="news in newsList" :key="'menu-'+news.news_id" >
 				<div class="row m-0 py-2" @click="setSelected(news)">
-					<div class="col-md-12 d-flex mb-2 pe-3">
-						<span class="small ">{{ formatDate(news.insertamum) }} </span>
-						<span class="ms-auto small ">{{ formatTime(news.insertamum) }} </span>
+					<div class="col-md-12 d-flex pe-3">
+						<span class="small ">{{ formatDate(news.datum) }} </span>
 					</div>
 					<div class="col-md-12 news-truncate">
-						<span >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.insertamum) }}</span>
+						<span >{{ news.content_obj.betreff?news.content_obj.betreff:getDate(news.datum) }}</span>
 					</div>
 				</div>
 				</template>
 			</div>
 			<div style="padding-left: 0px; padding-right: 0px;" ref="htmlContent" class="h-100 col">
 				<div class="container h-100" style="padding: 0px;"  ref="carocontainer">
-					<div id="FhcCarouselContainer" style="height: 100%;" ref="carousel" class="carousel slide fhc-carousel" data-bs-interval="false">
+					<div id="FhcCarouselContainer" style="height: 100%;" ref="carousel" class="carousel slide fhc-carousel ms-2" data-bs-interval="false">
 
 						<div class="carousel-inner" ref="carouselInner"  style="height: 100%; max-width: 100%;">
 							<div ref="carouselItems" v-for="(news, index) in newsList" class="carousel-item fhc-news-card-item" style="overflow-y: auto; overflow-x: hidden; height: 100%;" :id="'card-'+news.news_id" v-html="news.content_obj.content"/>

From d5f2f3d787e4b18b25e7d385701524ca047f520a Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 24 Jul 2025 10:45:53 +0200
Subject: [PATCH 439/572] add luxon to composer.lock

---
 composer.lock | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index 70044eb58..f2ce3923c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1b8a408a43c62cb966fa89af338564a7",
+    "content-hash": "1de37a74ba51a66057eb2712b21340c8",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -1296,6 +1296,15 @@
             },
             "time": "2022-09-29T08:45:17+00:00"
         },
+        {
+            "name": "moment/luxonjs",
+            "version": "3.6.1",
+            "dist": {
+                "type": "file",
+                "url": "https://unpkg.com/luxon@3.6.1/build/global/luxon.min.js"
+            },
+            "type": "library"
+        },
         {
             "name": "moment/momentjs",
             "version": "2.24.0",

From 1d63b8de4417f86d3d742c6e614300861a52b7a6 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 24 Jul 2025 11:18:58 +0200
Subject: [PATCH 440/572] schluesselverwaltung & kontaktdatenverwaltung gui
 hinzugefuegt betriebsmittel einschraenkung ueber prop moeglich (nur anzeige)

---
 .../v1/betriebsmittel/BetriebsmittelP.php     |  12 +-
 .../ressource/Betriebsmittelperson_model.php  |  15 ++-
 .../js/api/factory/betriebsmittel/person.js   |  14 ++-
 .../Betriebsmittel/Betriebsmittel.js          |  16 ++-
 system/filtersupdate.php                      | 103 ++++++++++++++++++
 5 files changed, 149 insertions(+), 11 deletions(-)

diff --git a/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
index 8e9d931f2..b8979d99a 100644
--- a/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
+++ b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
@@ -60,7 +60,11 @@ class BetriebsmittelP extends FHCAPI_Controller
 
 	public function getAllBetriebsmittel($type_id, $id)
 	{
-		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($id, $type_id);
+		$betriebsmitteltypes = null;
+		if ($this->input->get('betriebsmitteltypes') !== null && !isEmptyArray($this->input->get('betriebsmitteltypes')))
+			$betriebsmitteltypes = $this->input->get('betriebsmitteltypes');
+
+		$result = $this->BetriebsmittelpersonModel->getBetriebsmittelData($id, $type_id, $betriebsmitteltypes);
 
 		if (isError($result)) {
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
@@ -366,6 +370,12 @@ class BetriebsmittelP extends FHCAPI_Controller
 		$this->load->model('ressource/Betriebsmitteltyp_model', 'BetriebsmitteltypModel');
 
 		$this->BetriebsmitteltypModel->addOrder('beschreibung', 'ASC');
+
+		if ($this->input->get('betriebsmitteltypes') !== null && !isEmptyArray($this->input->get('betriebsmitteltypes')))
+		{
+			$this->BetriebsmitteltypModel->db->where_in('betriebsmitteltyp', $this->input->get('betriebsmitteltypes'));
+		}
+
 		$result = $this->BetriebsmitteltypModel->load(); // load All
 
 		if (isError($result)) {
diff --git a/application/models/ressource/Betriebsmittelperson_model.php b/application/models/ressource/Betriebsmittelperson_model.php
index 6da9a384d..219af51b8 100644
--- a/application/models/ressource/Betriebsmittelperson_model.php
+++ b/application/models/ressource/Betriebsmittelperson_model.php
@@ -97,7 +97,7 @@ class Betriebsmittelperson_model extends DB_Model
 		return $this->loadWhere($condition);
 	}
 
-	public function getBetriebsmittelData($id, $type_id)
+	public function getBetriebsmittelData($id, $type_id, $betriesmitteltypes = null)
 	{
 		switch ($type_id) {
 			case 'person_id':
@@ -113,6 +113,15 @@ class Betriebsmittelperson_model extends DB_Model
 				return error("ID nicht gültig");
 		}
 
+		$cond .= " = ? ";
+		$params[] = $id;
+
+		if ($betriesmitteltypes && !isEmptyArray($betriesmitteltypes))
+		{
+			$cond .= " AND bm.betriebsmitteltyp IN ?";
+			$params[] = $betriesmitteltypes;
+		}
+
 		$query = "
 			SELECT 
 			bm.nummer, bmp.person_id, bm.betriebsmitteltyp, bmp.anmerkung as anmerkung,
@@ -126,9 +135,9 @@ class Betriebsmittelperson_model extends DB_Model
 			JOIN 
 				wawi.tbl_betriebsmittel bm ON (bmp.betriebsmittel_id = bm.betriebsmittel_id)
 			WHERE 
-				" . $cond . " = ? ";
+				" . $cond;
 
-		return $this->execQuery($query, array($id));
+		return $this->execQuery($query, $params);
 	}
 
 	/**
diff --git a/public/js/api/factory/betriebsmittel/person.js b/public/js/api/factory/betriebsmittel/person.js
index 912a5df31..504e755b6 100644
--- a/public/js/api/factory/betriebsmittel/person.js
+++ b/public/js/api/factory/betriebsmittel/person.js
@@ -16,10 +16,13 @@
  */
 
 export default {
-	getAllBetriebsmittel(type, id) {
+	getAllBetriebsmittel(type, id, betriebsmitteltypes) {
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/betriebsmittel/betriebsmittelP/getAllBetriebsmittel/' + type + '/' + id
+			url: 'api/frontend/v1/betriebsmittel/betriebsmittelP/getAllBetriebsmittel/' + type + '/' + id,
+			params: {
+				betriebsmitteltypes
+			}
 		};
 	},
 	addNewBetriebsmittel(person_id, params) {
@@ -48,10 +51,13 @@ export default {
 			url: 'api/frontend/v1/betriebsmittel/betriebsmittelP/deleteBetriebsmittel/' +	betriebsmittelperson_id
 		};
 	},
-	getTypenBetriebsmittel() {
+	getTypenBetriebsmittel(betriebsmitteltypes) {
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/betriebsmittel/betriebsmittelP/getTypenBetriebsmittel/'
+			url: 'api/frontend/v1/betriebsmittel/betriebsmittelP/getTypenBetriebsmittel/',
+			params: {
+				betriebsmitteltypes
+			}
 		};
 	},
 	loadInventarliste(query) {
diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 39681ffb4..d1188b371 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -29,14 +29,24 @@ export default {
 		uid: {
 			type: [Number, String],
 			required: true
-		}
+		},
+		/** List of types to allow for creation */
+		betriebsmittelTypes: {
+			type: Array,
+			default: null
+		},
+		/**
+		 * If true: only show the types specified in 'betriebsmittelTypes'.
+		 * If false: show all available types.
+		 */
+		filterByProvidedTypes: Boolean
 	},
 	data() {
 		return {
 			tabulatorOptions: {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
-					this.endpoint.getAllBetriebsmittel(this.typeId, this.id)
+					this.endpoint.getAllBetriebsmittel(this.typeId, this.id, (this.filterByProvidedTypes ? this.betriebsmittelTypes : null))
 				),
 				ajaxResponse: (url, params, response) => response.data,
 				columns: [
@@ -296,7 +306,7 @@ export default {
 	},
 	created() {
 		return this.$api
-			.call(this.endpoint.getTypenBetriebsmittel())
+			.call(this.endpoint.getTypenBetriebsmittel(this.betriebsmittelTypes))
 			.then(result => {
 				this.listBetriebsmitteltyp = result.data;
 			})
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 51dd86314..9e3c62a33 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -1456,6 +1456,109 @@ $filters = array(
 			',
 			'oe_kurzbz' => null,
 		),
+	array(
+		'app' => 'personalverwaltung',
+		'dataset_name' => 'schluesselverwaltung',
+		'filter_kurzbz' => 'ma4schluesselverwaltung',
+		'description' => '{MA Schluesselverwaltung}',
+		'sort' => 1,
+		'default_filter' => true,
+		'filter' => '
+			{
+				"name": "MA Schlüsselverwaltung",
+				"columns": [
+					{"name": "UID"},
+					{"name": "PersonId"},
+					{"name": "Vorname"},
+					{"name": "Nachname"},
+					{"name": "EMail"}, 
+					{"name": "Unternehmen"}, 
+					{"name": "Vertragsart"}, 
+					{"name": "DV_von"}, 
+					{"name": "DV_bis"}, 
+					{"name": "Wochenstunden"}, 
+					{"name": "WS_von"}, 
+					{"name": "WS_bis"}, 
+					{"name": "Standardkostenstelle"},
+					{"name": "DV_status"}
+				],
+				"filters": [
+					{
+						"name": "DV_status",
+						"option": "",
+						"operation": "nequal",
+						"condition": "beendet"
+					}
+				]
+			}
+		',
+		'oe_kurzbz' => null,
+	),
+	array(
+		'app' => 'personalverwaltung',
+		'dataset_name' => 'schluesselverwaltung',
+		'filter_kurzbz' => 'ma4schluesselverwaltung_beendet',
+		'description' => '{MA Schluesselverwaltung (DV beendet)}',
+		'sort' => 2,
+		'default_filter' => false,
+		'filter' => '
+			{
+				"name": "MA Schlüsselverwaltung (DV beendet)",
+				"columns": [
+					{"name": "UID"},
+					{"name": "PersonId"},
+					{"name": "Vorname"},
+					{"name": "Nachname"},
+					{"name": "EMail"}, 
+					{"name": "Unternehmen"}, 
+					{"name": "Vertragsart"}, 
+					{"name": "DV_von"}, 
+					{"name": "DV_bis"}, 
+					{"name": "Wochenstunden"}, 
+					{"name": "WS_von"}, 
+					{"name": "WS_bis"}, 
+					{"name": "Standardkostenstelle"},
+					{"name": "DV_status"}
+				],
+				"filters": [
+					{
+						"name": "DV_status",
+						"option": "",
+						"operation": "equal",
+						"condition": "beendet"
+					}
+				]
+			}
+		',
+		'oe_kurzbz' => null,
+	),
+	array(
+		'app' => 'personalverwaltung',
+		'dataset_name' => 'kontaktdatenverwaltung',
+		'filter_kurzbz' => 'ma4kontaktdaten',
+		'description' => '{MA Kontaktdatenverwaltung}',
+		'sort' => 1,
+		'default_filter' => true,
+		'filter' => '
+			{
+				"name": "MA Kontaktdatenverwaltung",
+				"columns": [
+					{"name": "UID"},
+					{"name": "PersonId"},
+					{"name": "Vorname"},
+					{"name": "Nachname"},
+					{"name": "Unternehmen"}, 
+					{"name": "Vertragsart"}, 
+					{"name": "DV_von"}, 
+					{"name": "DV_bis"}, 
+					{"name": "Disziplinaere_Zuordnung"},
+					{"name": "DV_status"}
+				],
+				"filters": []
+			}',
+		'oe_kurzbz' => null,
+	),
+
 );
 
 // Loop through the filters array

From 611a6204cd29580470feab5627dd20f2220cad65 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 24 Jul 2025 14:15:20 +0200
Subject: [PATCH 441/572] compare AllDayEvents to whole day

---
 public/js/components/Calendar/Base/Grid.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Calendar/Base/Grid.js b/public/js/components/Calendar/Base/Grid.js
index 37b31e784..ad0d9ec51 100644
--- a/public/js/components/Calendar/Base/Grid.js
+++ b/public/js/components/Calendar/Base/Grid.js
@@ -218,9 +218,15 @@ export default {
 				const end = event.end || this.axisMainBorders[this.axisMainBorders.length - 1].plus(1);
 
 				for (var i = 0; i < this.axisMain.length; i++) {
-					if (start < this.axisMainBorders[i * 2 + 1] && end > this.axisMainBorders[i * 2]) {
-						const startsHere = start >= this.axisMainBorders[i * 2];
-						const endsHere = end <= this.axisMainBorders[i * 2 + 1];
+					let laneStart = this.axisMainBorders[i * 2];
+					let laneEnd = this.axisMainBorders[i * 2 + 1];
+					if (event.orig?.allDayEvent) {
+						laneStart = laneStart.startOf('day');
+						laneEnd = laneEnd.endOf('day');
+					}
+					if (start < laneEnd && end > laneStart) {
+						const startsHere = start >= laneStart;
+						const endsHere = end <= laneEnd;
 						result[i].push({
 							...event,
 							startsHere,

From 53e395aca4fa74e0b49d41d7bf9471f0b077765e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 24 Jul 2025 14:40:48 +0200
Subject: [PATCH 442/572] =?UTF-8?q?Tab=20Notizen,=20Messages:=20use=20HTML?=
 =?UTF-8?q?-Entities=20Tab=20Abschlusspr=C3=BCfung,=20Prestudent,=20Pruefu?=
 =?UTF-8?q?ng,=20Dokument:=20Phrasen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Messages/Details/TableMessages.js         |  2 +-
 public/js/components/Notiz/Notiz.js           |  1 +
 .../Abschlusspruefung/Abschlusspruefung.js    |  2 +-
 .../Details/Dokumente/List/Accepted.js        |  2 +-
 .../Details/Dokumente/List/Unaccepted.js      |  5 +-
 .../Studentenverwaltung/Details/Prestudent.js |  4 +-
 .../Details/Prestudent/History.js             |  6 ++-
 .../Details/Pruefung/Pruefunglist.js          |  5 +-
 system/phrasesupdate.php                      | 50 +++++++++++++++++--
 9 files changed, 63 insertions(+), 14 deletions(-)

diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index d2dbdb7ce..a21073855 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -41,7 +41,7 @@ export default {
 				ajaxResponse: (url, params, response) => this.buildTreemap(response),
 				columns: [
 					{title: "subject", field: "subject"},
-					{title: "body", field: "body", visible: false},
+					{title: "body", field: "body", formatter: "html", visible: false},
 					{title: "message_id", field: "message_id", visible: false},
 					{
 						title: "Datum",
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 783987363..8b37cd6e3 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -81,6 +81,7 @@ export default {
 						title: "Text",
 						field: "text_stripped",
 						width: 250,
+						formatter: "html",
 						clipContents: true,
 						tooltip:function(e, cell, onRendered){
 							var el = document.createElement("div");
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index 5184de62d..26bea210d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -225,7 +225,7 @@ export default {
 							title: this.$p.t('global', 'typ')
 						});
 						cm.getColumnByField('abschlusspruefung_id').component.updateDefinition({
-							title: this.$p.t('ui', 'abschlusspruefung_id')
+							title: this.$p.t('abschlusspruefung', 'abschlusspruefung_id')
 						});
 						/*
 						cm.getColumnByField('actions').component.updateDefinition({
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
index bca7e00fa..e07d1a45d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -66,7 +66,7 @@ export default {
 							tickElement: '<i class="fa fa-check text-secondary"></i>',
 							crossElement: '<i class="fa fa-xmark text-secondary"></i>'
 						}},
-					{title: "infotext", field: "infotext"},
+					{title: "Infotext", field: "infotext"},
 					{title: "akte_id", field: "akte_id"},
 					{title: "dms_id", field: "dms_id", visible: false},
 					{title: "titel", field: "titel_intern", visible: false},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
index e1110ddf3..93b3a1b70 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -77,7 +77,7 @@ export default {
 						},
 						hozAlign: "center"
 						},
-					{title: "infotext", field: "infotext"},
+					{title: "Infotext", field: "infotext"},
 					{title: "akte_id", field: "akte_id"},
 					{title: "titel_intern", field: "titel_intern"},
 					{title: "Anmerkung_intern", field: "anmerkung_intern", visible: false},
@@ -194,6 +194,9 @@ export default {
 						cm.getColumnByField('vorhanden').component.updateDefinition({
 							title: this.$p.t('dokumente', 'vorhanden')
 						});
+						cm.getColumnByField('titel_intern').component.updateDefinition({
+							title: this.$p.t('global', 'titel')
+						});
 						cm.getColumnByField('anmerkung_intern').component.updateDefinition({
 							title: this.$p.t('global', 'anmerkung')
 						});
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index a8c0f985b..ef7eb141a 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -197,7 +197,7 @@ export default {
 					<form-input
 					v-if="!config.hiddenFields.includes('prestudent_id')"
 						container-class="col-3 stv-details-prestudent-prestudent_id"
-						label="Prestudent_id"
+						:label="$p.t('ui', 'prestudent_id')"
 						type="text"
 						v-model="data.prestudent_id"
 						name="prestudent_id"
@@ -207,7 +207,7 @@ export default {
 					<form-input
 						v-if="!config.hiddenFields.includes('person_id')"
 						container-class="col-3 stv-details-prestudent-person_id"
-						label="Person_id"
+						:label="$p.t('person', 'person_id')"
 						type="text"
 						v-model="data.person_id"
 						name="person_id"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
index 0bcb8be72..44b318f5b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/History.js
@@ -25,7 +25,7 @@ export default{
 					{title:"Studienplan", field:"bezeichnung"},
 					{title:"UID", field:"student_uid"},
 					{title:"Status", field:"status"},
-					{title:"PrestudentId", field:"prestudent_id", visible:false}
+					{title:"Prestudent ID", field:"prestudent_id", visible:false}
 				],
 				rowFormatter: row => {
 					const rowData = row.getData();
@@ -58,6 +58,10 @@ export default{
 						cm.getColumnByField('bezeichnung').component.updateDefinition({
 							title: this.$p.t('lehre', 'studienplan')
 						});
+
+						cm.getColumnByField('prestudent_id').component.updateDefinition({
+							title: this.$p.t('ui', 'prestudent_id')
+						});
 					}
 				}
 			]
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
index 6f0cb2e43..799578a70 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
@@ -92,7 +92,8 @@ export default{
 				layout: 'fitDataFill',
 				layoutColumnsOnNewData: false,
 				height: 'auto',
-				persistenceID:'stv-details-pruefung-pruefung-list'
+				index: 'pruefung_id',
+				persistenceID: 'stv-details-pruefung-list'
 			},
 			tabulatorEvents: [
 				{
@@ -123,7 +124,7 @@ export default{
 							title: this.$p.t('ui', 'pruefung_id')
 						});
 						cm.getColumnByField('lehreinheit_id').component.updateDefinition({
-							title: this.$p.t('ui', 'lehreinheit_id')
+							title: this.$p.t('global', 'lehreinheit_id')
 						});
 						cm.getColumnByField('mitarbeiter_uid').component.updateDefinition({
 							title: this.$p.t('ui', 'mitarbeiter_uid')
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 36f5f7dcc..355ed7186 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -40096,7 +40096,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Abschlusspruefung ID',
+				'text' => 'Abschlussprüfung ID',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -40660,13 +40660,13 @@ array(
 	'phrases' => array(
 		array(
 			'sprache' => 'German',
-			'text' => 'Firma Id',
+			'text' => 'Firma ID',
 			'description' => '',
 			'insertvon' => 'system'
 		),
 		array(
 			'sprache' => 'English',
-			'text' => 'Company Id',
+			'text' => 'Company ID',
 			'description' => '',
 			'insertvon' => 'system'
 		)
@@ -43209,13 +43209,13 @@ and represent the current state of research on the topic. The prescribed citatio
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Dms ID',
+				'text' => 'DMS ID',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Dms ID',
+				'text' => 'DMS ID',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -44537,6 +44537,46 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'mitarbeiter_uid',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mitarbeiter UID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Employee UID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'pruefung_id',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Prüfung ID',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Examination ID',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-4 Finetuning END
 );
 

From d101b53d3de2c80cfa54f89bcb3fff67d808f294 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 25 Jul 2025 09:27:56 +0200
Subject: [PATCH 443/572] Calendar: ResizeObserver for compact day mode

---
 .../js/components/Calendar/Mode/Day/View.js   | 15 +++-
 public/js/components/Cis/LvPlan/LvPlan.js     |  3 +-
 .../js/components/Cis/Mylv/RoomInformation.js |  3 +-
 public/js/composables/Responsive.js           | 85 +++++++++++++++++++
 4 files changed, 100 insertions(+), 6 deletions(-)
 create mode 100644 public/js/composables/Responsive.js

diff --git a/public/js/components/Calendar/Mode/Day/View.js b/public/js/components/Calendar/Mode/Day/View.js
index 09738f1d0..cd953f33a 100644
--- a/public/js/components/Calendar/Mode/Day/View.js
+++ b/public/js/components/Calendar/Mode/Day/View.js
@@ -3,6 +3,8 @@ import LabelDay from '../../Base/Label/Day.js';
 import LabelDow from '../../Base/Label/Dow.js';
 import LabelTime from '../../Base/Label/Time.js';
 
+import { useResizeObserver } from '../../../../composables/Responsive.js';
+
 export default {
 	name: "DayView",
 	components: {
@@ -22,8 +24,7 @@ export default {
 			required: true
 		},
 		emptyMessage: String,
-		emptyMessageDetails: String,
-		compact: Boolean
+		emptyMessageDetails: String
 	},
 	emits: [
 		"requestModalOpen",
@@ -104,11 +105,21 @@ export default {
 			}
 		}
 	},
+	setup() {
+		const container = Vue.ref(null); // use useTemplateRef when updating to Vue 3.5
+		const { compact } = useResizeObserver(container, 750);
+
+		return {
+			container, // must be exposed or it won't be set in Vue < 3.5
+			compact
+		};
+	},
 	mounted() {
 		this.gridMainRef = this.$refs.grid.$refs.main;
 	},
 	template: /* html */`
 	<div
+		ref="container"
 		class="fhc-calendar-mode-day-view d-flex h-100"
 		@cal-click-default.capture="handleClickDefaults"
 	>
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index cdb2c38c1..4fbb7c871 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -34,8 +34,7 @@ export default {
 			modeOptions: {
 				day: {
 					emptyMessage: Vue.computed(() => this.$p.t('lehre/noLvFound')),
-					emptyMessageDetails: Vue.computed(() => this.$p.t('lehre/noLvFound')),
-					compact: false
+					emptyMessageDetails: Vue.computed(() => this.$p.t('lehre/noLvFound'))
 				},
 				week: {
 					collapseEmptyDays: false
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index ac02a9d51..0f4fa0603 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -32,8 +32,7 @@ export default {
 			modeOptions: {
 				day: {
 					emptyMessage: Vue.computed(() => this.$p.t('rauminfo/keineRaumReservierung')),
-					emptyMessageDetails: Vue.computed(() => this.$p.t('rauminfo/keineRaumReservierung')),
-					compact: false
+					emptyMessageDetails: Vue.computed(() => this.$p.t('rauminfo/keineRaumReservierung'))
 				},
 				week: {
 					collapseEmptyDays: false
diff --git a/public/js/composables/Responsive.js b/public/js/composables/Responsive.js
new file mode 100644
index 000000000..f1761d870
--- /dev/null
+++ b/public/js/composables/Responsive.js
@@ -0,0 +1,85 @@
+/**
+ * size returns the key of smallest threshold array (integer converts to
+ * { compact: threshold }) entry that is bigger than the current width of
+ * the element or 'full' if none is found.
+ * compact is true if the smallest threshold array entry is bigger than the
+ * current width or false otherwise.
+ *
+ * @param DOMElement|VueTemplateRef		element
+ * @param object|array|integer			threshold
+ * @return object						{ compact:Boolean, size:String }
+ */
+export function useResizeObserver(element, threshold) {
+	/* Result Vars */
+	const compact = Vue.ref(false);
+	const size = Vue.ref(false);
+
+	/* Helper Vars */
+	const mounted = Vue.ref(false);
+	const elementRef = Vue.computed(() => {
+		if (!Vue.isRef(element))
+			return element;
+		
+		if (!element.value)
+			return element.value;
+		
+		if (element.value.$el) // Maybe there is a better test
+			return element.value.$el;
+
+		return element.value;
+	});
+	const compareArray = Vue.computed(() => {
+		const input = Vue.isRef(threshold) ? threshold.value : threshold;
+		if (Number.isInteger(input))
+			return [['compact', input]];
+		if (Array.isArray(input))
+			return input.map((value, key) => [key, value]).sort((a, b) => a[1]-b[1]);
+		return Object.entries(input).sort((a, b) => a[1]-b[1]);
+	});
+
+	/* Helper Functions */
+	function updateResultVars() {
+		const compare = threshold.value || threshold;
+		if (elementRef.value.offsetWidth === undefined)
+			return;
+
+		const found = compareArray.value.find(compare => compare[1] > elementRef.value.offsetWidth);
+
+		size.value = found ? found[0] : 'full';
+		compact.value = (size.value == compareArray.value[0][0]);
+	}
+
+	/* Observer */
+	const observer = new ResizeObserver(() => {
+		if (elementRef.value) {
+			updateResultVars();
+		}
+	});
+	/* Observer Helper Functions */
+	function addObserver() {
+		if (!elementRef.value)
+			return;
+
+		updateResultVars();
+		observer.observe(elementRef.value);
+		mounted.value = true;
+	}
+	function removeObserver() {
+		if (mounted.value) {
+			observer.disconnect()
+		}
+	}
+
+	/* Main Logic */
+	Vue.onMounted(addObserver);
+	Vue.onUnmounted(removeObserver);
+	
+	Vue.watchEffect(() => {
+		if (elementRef.value) {
+			removeObserver();
+			addObserver();
+		}
+	});
+
+	return { compact, size };
+}
\ No newline at end of file

From 76248175f7709165835bf23830a5f0be0f3a1335 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 25 Jul 2025 09:33:27 +0200
Subject: [PATCH 444/572] News padding not hardcoded in Dashboard Item
 Container but in the News CSS

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

diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index f1adb2b65..6b42f6160 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -97,7 +97,7 @@
 }
 
 .widgets-news{
-	padding: 0 .5rem;
+	padding: .5rem;
 	overflow-y: auto;
 }
 
diff --git a/public/js/components/Dashboard/Item.js b/public/js/components/Dashboard/Item.js
index 8e1fb2c62..eccc8242e 100644
--- a/public/js/components/Dashboard/Item.js
+++ b/public/js/components/Dashboard/Item.js
@@ -189,7 +189,7 @@ export default {
 				</div>
 			</Transition>
 		</div>
-		<div v-if="ready" class="card-body overflow-hidden" style="padding: .5em 0;">
+		<div v-if="ready" class="card-body overflow-hidden p-0">
 			<component :is="component" v-model:shared-data="sharedData" :config="arguments" :width="width" :height="height" @setConfig="setConfig" @change="changeConfigManually"></component>
 		</div>
 		<div v-else class="card-body overflow-hidden text-center d-flex flex-column justify-content-center"><i class="fa-solid fa-spinner fa-pulse fa-3x"></i></div>

From 58a85432caf78ef5125a473422d38e72b1090ded Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 25 Jul 2025 10:50:48 +0200
Subject: [PATCH 445/572] enable text-input in datepicker

---
 public/js/components/Betriebsmittel/Betriebsmittel.js       | 2 ++
 public/js/components/Funktionen/Funktionen.js               | 2 ++
 .../Details/Abschlusspruefung/Abschlusspruefung.js          | 2 ++
 .../Details/Aufnahmetermine/Aufnahmetermine.js              | 1 +
 .../components/Stv/Studentenverwaltung/Details/Details.js   | 1 +
 .../Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js | 1 +
 .../js/components/Stv/Studentenverwaltung/Details/Konto.js  | 1 +
 .../Stv/Studentenverwaltung/Details/Konto/Edit.js           | 1 +
 .../components/Stv/Studentenverwaltung/Details/Konto/New.js | 6 ++++--
 .../Stv/Studentenverwaltung/Details/Mobility/Mobility.js    | 2 ++
 .../Stv/Studentenverwaltung/Details/Prestudent.js           | 2 ++
 .../Studentenverwaltung/Details/Pruefung/Pruefunglist.js    | 5 +++--
 .../Stv/Studentenverwaltung/Details/Status/Modal.js         | 3 +++
 13 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 95678d8dd..d197c341e 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -434,6 +434,7 @@ export default {
 						v-model="formData.ausgegebenam"
 						auto-apply
 						:enable-time-picker="false"
+						text-input
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"
 						:teleport="true"
@@ -449,6 +450,7 @@ export default {
 						v-model="formData.retouram"
 						auto-apply
 						:enable-time-picker="false"
+						text-input
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"
 						:teleport="true"
diff --git a/public/js/components/Funktionen/Funktionen.js b/public/js/components/Funktionen/Funktionen.js
index 4fc7706de..0b5a71155 100644
--- a/public/js/components/Funktionen/Funktionen.js
+++ b/public/js/components/Funktionen/Funktionen.js
@@ -555,6 +555,7 @@ export default {
 							:label="$p.t('ui/from') + ' *'"
 							auto-apply
 							:enable-time-picker="false"
+							text-input
 							format="dd.MM.yyyy"
 							preview-format="dd.MM.yyyy"
 							:teleport="true"
@@ -569,6 +570,7 @@ export default {
 							:label="$p.t('global/bis')"
 							auto-apply
 							:enable-time-picker="false"
+							text-input
 							format="dd.MM.yyyy"
 							preview-format="dd.MM.yyyy"
 							:teleport="true"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index 26bea210d..a9cae9bc5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -717,6 +717,7 @@ export default {
 						v-model="formData.datum"
 						auto-apply
 						:enable-time-picker="false"
+						text-input
 						format="dd.MM.yyyy"
 						name="datum"
 						:teleport="true"
@@ -740,6 +741,7 @@ export default {
 						v-model="formData.sponsion"
 						auto-apply
 						:enable-time-picker="false"
+						text-input
 						format="dd.MM.yyyy"
 						name="sponsion"
 						:teleport="true"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index 9ffddcf5a..fe667aa74 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -429,6 +429,7 @@ export default {
 							v-model="formData.anmeldedatum"
 							auto-apply
 							:enable-time-picker="false"
+							text-input
 							format="dd.MM.yyyy"
 							name="anmeldedatum"
 							:teleport="true"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index 624b3d035..eacabccc0 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -281,6 +281,7 @@ export default {
 						no-today
 						auto-apply
 						:enable-time-picker="false"
+						text-input
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"
 						teleport
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
index 29c98020e..c96dcfd78 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js
@@ -107,6 +107,7 @@ export default {
 							:label="$p.t('dokumente/nachreichungAm')"
 							auto-apply
 							:enable-time-picker="false"
+							text-input
 							format="dd.MM.yyyy"
 							preview-format="dd.MM.yyyy"
 							:teleport="true"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
index eb32e7102..a5532addc 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
@@ -260,6 +260,7 @@ export default {
 						v-model="counterdate"
 						input-group
 						:enable-time-picker="false"
+						text-input
 						format="dd.MM.yyyy"
 						auto-apply
 						@cleared="counterdate = new Date()"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
index ce926c007..200a15a0d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js
@@ -82,6 +82,7 @@ export default {
 					name="buchungsdatum"
 					:label="$p.t('konto/buchungsdatum')"
 					:enable-time-picker="false"
+					text-input
 					format="dd.MM.yyyy"
 					auto-apply
 					>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
index 2afb8158d..313d34c67 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
@@ -38,7 +38,7 @@ export default {
 	data() {
 		return {
 			loading: false,
-			data: {}
+			data: {},
 		};
 	},
 	computed: {
@@ -47,7 +47,7 @@ export default {
 		},
 		activeBuchungstypen() {
 			return this.lists.buchungstypen.filter(e => e.aktiv);
-		}
+		},
 	},
 	methods: {
 		save() {
@@ -144,10 +144,12 @@ export default {
 					name="buchungsdatum"
 					:label="$p.t('konto/buchungsdatum')"
 					:enable-time-picker="false"
+					text-input
 					format="dd.MM.yyyy"
 					auto-apply
 					>
 				</form-input>
+
 				<form-input
 					v-model="data.buchungstext"
 					name="buchungstext"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
index 44f6b72fb..7ea34497b 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
@@ -464,6 +464,7 @@ export default {
 						v-model="formData.von"
 						auto-apply
 						:enable-time-picker="false"
+						text-input
 						format="dd.MM.yyyy"
 						name="von"
 						:teleport="true"
@@ -497,6 +498,7 @@ export default {
 						v-model="formData.bis"
 						auto-apply
 						:enable-time-picker="false"
+						text-input
 						format="dd.MM.yyyy"
 						name="bis"
 						:teleport="true"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index ef7eb141a..da5aea29e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -245,6 +245,7 @@ export default {
 						no-today
 						auto-apply
 						:enable-time-picker="false"
+						text-input
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"
 						:teleport="true"
@@ -292,6 +293,7 @@ export default {
 						no-today
 						auto-apply
 						:enable-time-picker="false"
+						text-input
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"
 						:teleport="true"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
index 799578a70..5a427fcd4 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
@@ -350,7 +350,7 @@ export default{
 			else {
 				this.$refs.table.tabulator.clearFilter("studiensemester_kurzbz");
 			}
-		},
+		}
 	},
 	watch: {
 		//adaption to go directly through different semesters
@@ -433,7 +433,7 @@ export default{
 				<p v-else class="fw-bold mt-3">{{ $p.t('exam', 'edit_pruefung') }}</p>
 			</template>
 	
-			<form-form class="row pt-3" ref="examData">
+			<form-form class="row pt-3" ref="examData" @submit.prevent>
 				<legend>Details</legend>
 				
 				<!--DropDown Lehrveranstaltung-->
@@ -537,6 +537,7 @@ export default{
 					:label="$p.t('global/datum')"
 					auto-apply
 					:enable-time-picker="false"
+					text-input
 					format="dd.MM.yyyy"
 					preview-format="dd.MM.yyyy"
 					:teleport="true"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
index 1a3fb40d2..c0ec2cfad 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
@@ -294,6 +294,7 @@ export default{
 				:label="$p.t('global/datum')"
 				auto-apply
 				:enable-time-picker="false"
+				text-input
 				format="dd.MM.yyyy"
 				preview-format="dd.MM.yyyy"
 				:teleport="true"
@@ -308,6 +309,7 @@ export default{
 				:label="$p.t('lehre/bestaetigt_am')"
 				auto-apply
 				:enable-time-picker="false"
+				text-input
 				format="dd.MM.yyyy"
 				preview-format="dd.MM.yyyy"
 				:teleport="true"
@@ -323,6 +325,7 @@ export default{
 				auto-apply
 				:enable-time-picker="false"
 				format="dd.MM.yyyy"
+				text-input
 				preview-format="dd.MM.yyyy"
 				:teleport="true"
 				:disabled="bisLocked || !hasPrestudentstatusPermission"

From d59b623cb4163bb65e0d5b9b8944807ef042192c Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 25 Jul 2025 13:17:41 +0200
Subject: [PATCH 446/572] Bugfix: Return no events instead of error if the
 student is/was not enrolled in a timeframe

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

diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index 0107ceef1..50835873e 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -109,7 +109,7 @@ class StundenplanLib{
 			$stundenplan_query = $this->_ci->StundenplanModel->getStundenplanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
 			if(!$stundenplan_query)
 			{
-				return error([]);
+				return success([]);
 			}
 			
 			

From 1b8ab88820d3b71d6cc7f1952ccd7c4a878cf8bd Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 25 Jul 2025 13:31:56 +0200
Subject: [PATCH 447/572] Fix: Browser back

---
 public/js/components/Calendar/Base.js         | 39 +++++++++++++------
 public/js/components/Cis/LvPlan/LvPlan.js     | 18 ++++-----
 .../js/components/Cis/Mylv/RoomInformation.js | 20 +++++-----
 3 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/public/js/components/Calendar/Base.js b/public/js/components/Calendar/Base.js
index 520948ecb..94ad3ef05 100644
--- a/public/js/components/Calendar/Base.js
+++ b/public/js/components/Calendar/Base.js
@@ -152,28 +152,33 @@ export default {
 				return res;
 			});
 		},
+		sDate() {
+			if (this.date instanceof luxon.DateTime)
+				return this.date;
+			return luxon.DateTime.fromJSDate(new Date(this.date)).setZone(this.timezone);
+		},
 		cDate: {
 			get() {
-				if (this.internalDate) {
-					return this.internalDate.setLocale(this.locale);
-				}
-				return luxon.DateTime.fromJSDate(new Date(this.date)).setZone(this.timezone).setLocale(this.locale);
+				const date = this.internalDate ? this.internalDate : this.sDate;
+				return date.setLocale(this.locale);
 			},
 			set(value) {
 				this.internalDate = value;
 				this.$emit('update:date', value);
 			}
 		},
+		sMode() {
+			// choose default mode
+			let mode = this.mode;
+			if (mode)
+				mode = mode.toLowerCase();
+			if (!mode || !this.modes[mode])
+				mode = Object.keys(this.modes).find(Boolean); // start with first entry as active mode
+			return mode || '';
+		},
 		cMode: {
 			get() {
-				if (!this.internalView) {
-					// choose default mode
-					let mode = this.mode;
-					if (!mode || !this.modes[mode])
-						mode = Object.keys(this.modes).find(Boolean); // start with first entry as active mode
-					return mode || '';
-				}
-				return this.internalView;
+				return this.internalView ? this.internalView : this.sMode;
 			},
 			set(value) {
 				this.internalView = value;
@@ -181,6 +186,16 @@ export default {
 			}
 		}
 	},
+	watch: {
+		sDate(n, o) {
+			if (this.sDate.isValid && !this.sDate.hasSame(this.internalDate, 'day'))
+				this.internalDate = this.sDate;
+		},
+		sMode() {
+			if (this.sMode)
+				this.internalView = this.sMode;
+		}
+	},
 	methods: {
 		clickPrev() {
 			const evt = new Event('click:prev', {cancelable: true});
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 4fbb7c871..cf190d1c5 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -40,8 +40,6 @@ export default {
 					collapseEmptyDays: false
 				}
 			},
-			currentDay: this.propsViewData?.focus_date,
-			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_LVPLAN,
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
 			studiensemester_ende: null,
@@ -49,10 +47,16 @@ export default {
 		};
 	},
 	computed:{
+		currentDay() {
+			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+		},
+		currentMode() {
+			return this.propsViewData?.mode || DEFAULT_MODE_LVPLAN;
+		},
 		backgrounds() {
 			let now = luxon.DateTime.now().setZone(this.viewData.timezone);
 
-			if (this.calendarMode == 'Month')
+			if (this.currentMode == 'Month')
 				return [
 					{
 						class: 'background-past',
@@ -103,7 +107,7 @@ export default {
 		},
 		handleChangeDate(day) {
 			const focus_date = day.toISODate();
-			const mode = this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1);
+			const mode = this.currentMode;
 
 			this.$router.push({
 				name: "LvPlan",
@@ -113,8 +117,6 @@ export default {
 					lv_id: this.propsViewData?.lv_id || null
 				}
 			})
-			
-			this.currentDay = day;
 		},
 		handleChangeMode(newMode) {
 			const mode = newMode[0].toUpperCase() + newMode.slice(1)
@@ -130,8 +132,6 @@ export default {
 					lv_id: this.propsViewData?.lv_id ?? null
 				}
 			});
-
-			this.calendarMode = mode;
 		},
 		updateRange(rangeInterval) {
 			this.rangeInterval = rangeInterval;
@@ -188,7 +188,7 @@ export default {
 			:date="currentDay"
 			:modes="modes"
 			:mode-options="modeOptions"
-			:mode="propsViewData.mode.toLowerCase()"
+			:mode="currentMode"
 			@update:date="handleChangeDate"
 			@update:mode="handleChangeMode"
 			@update:range="updateRange"
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 0f4fa0603..d8d2ff074 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -37,16 +37,20 @@ export default {
 				week: {
 					collapseEmptyDays: false
 				}
-			},
-			currentDay: this.propsViewData?.focus_date,
-			calendarMode: this.propsViewData?.mode ?? DEFAULT_MODE_RAUMINFO
+			}
 		}
 	},
 	computed: {
+		currentDay() {
+			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+		},
+		currentMode() {
+			return this.propsViewData?.mode || DEFAULT_MODE_RAUMINFO;
+		},
 		backgrounds() {
 			let now = luxon.DateTime.now().setZone(this.viewData.timezone);
 
-			if (this.calendarMode == 'Month')
+			if (this.currentMode == 'Month')
 				return [
 					{
 						class: 'background-past',
@@ -71,7 +75,7 @@ export default {
 		},
 		handleChangeDate(day) {
 			const focus_date = day.toISODate();
-			const mode = this.calendarMode[0].toUpperCase() + this.calendarMode.slice(1);
+			const mode = this.currentMode;
 
 			this.$router.push({
 				name: "RoomInformation",
@@ -81,8 +85,6 @@ export default {
 					ort_kurzbz: this.propsViewData.ort_kurzbz
 				}
 			})
-			
-			this.currentDay = day;
 		},
 		handleChangeMode(newMode) {
 			const mode = newMode[0].toUpperCase() + newMode.slice(1)
@@ -98,8 +100,6 @@ export default {
 					ort_kurzbz: this.propsViewData.ort_kurzbz
 				}
 			})
-
-			this.calendarMode = mode
 		},
 		updateRange(rangeInterval) {
 			this.rangeInterval = rangeInterval;
@@ -131,7 +131,7 @@ export default {
 			:date="currentDay"
 			:modes="modes"
 			:mode-options="modeOptions"
-			:mode="propsViewData.mode.toLowerCase()"
+			:mode="currentMode"
 			@update:date="handleChangeDate"
 			@update:mode="handleChangeMode"
 			@update:range="updateRange"

From e2df03debfe9eb2db75815ce47d29f6c58070a44 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 25 Jul 2025 14:05:37 +0200
Subject: [PATCH 448/572] Tab Prestudent: ZGVFields: Add Autocomplete function
 with strike through for not active entries

---
 .../api/frontend/v1/stv/Prestudent.php        |  18 ++-
 .../Studentenverwaltung/Details/Prestudent.js | 113 +++++++++++++++---
 2 files changed, 114 insertions(+), 17 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index 0b06b9667..b433702b6 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -174,7 +174,11 @@ class Prestudent extends FHCAPI_Controller
 	{
 		$this->load->model('codex/Zgv_model', 'ZgvModel');
 
-		$this->ZgvModel->addOrder('zgv_code');
+		$this->ZgvModel->addSelect('zgv_code');
+		$this->ZgvModel->addSelect('zgv_bez');
+		$this->ZgvModel->addSelect('aktiv');
+		$this->ZgvModel->addSelect('zgv_bez as label');
+		$this->ZgvModel->addOrder('zgv_bez');
 
 		$result = $this->ZgvModel->load();
 		if (isError($result))
@@ -188,7 +192,11 @@ class Prestudent extends FHCAPI_Controller
 	{
 		$this->load->model('codex/Zgvdoktor_model', 'ZgvdoktorModel');
 
-		$this->ZgvdoktorModel->addOrder('zgvdoktor_code');
+		$this->ZgvdoktorModel->addSelect('zgvdoktor_code');
+		$this->ZgvdoktorModel->addSelect('zgvdoktor_bez');
+		$this->ZgvdoktorModel->addSelect('aktiv');
+		$this->ZgvdoktorModel->addSelect('zgvdoktor_bez as label');
+		$this->ZgvdoktorModel->addOrder('zgvdoktor_bez');
 
 		$result = $this->ZgvdoktorModel->load();
 		if (isError($result))
@@ -202,7 +210,11 @@ class Prestudent extends FHCAPI_Controller
 	{
 		$this->load->model('codex/Zgvmaster_model', 'ZgvmasterModel');
 
-		$this->ZgvmasterModel->addOrder('zgvmas_code');
+		$this->ZgvmasterModel->addSelect('zgvmas_code');
+		$this->ZgvmasterModel->addSelect('zgvmas_bez');
+		$this->ZgvmasterModel->addSelect('aktiv');
+		$this->ZgvmasterModel->addSelect('zgvmas_bez as label');
+		$this->ZgvmasterModel->addOrder('zgvmas_bez');
 
 		$result = $this->ZgvmasterModel->load();
 		if (isError($result))
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index da5aea29e..e782a6936 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -60,7 +60,13 @@ export default {
 			listBisStandort: [],
 			initialFormData: {},
 			deltaArray: {},
-			actionUpdate: false
+			actionUpdate: false,
+			filteredZgvs: [],
+			selectedZgv: null,
+			filteredMasterZgvs: [],
+			selectedMasterZgv: null,
+			filteredDoktorZgvs: [],
+			selectedDoktorZgv: null
 		};
 	},
 	computed: {
@@ -86,7 +92,16 @@ export default {
 		},
 		modelValue(n){
 			this.loadPrestudent(n);
-		}
+		},
+		selectedZgv(newVal) {
+			this.data.zgv_code = newVal?.zgv_code || null;
+		},
+		selectedMasterZgv(newVal) {
+			this.data.zgvmas_code = newVal?.zgvmas_code || null;
+		},
+		selectedDoktorZgv(newVal) {
+			this.data.zgvdoktor_code = newVal?.zgvdoktor_code || null;
+		},
 	},
 
 	methods: {
@@ -96,6 +111,7 @@ export default {
 				.then(result => result.data)
 				.then(result => {
 					this.data = result;
+
 					//neue DataVariable um ein Delta der vorgenommenen Änderungen berechnen zu können
 					this.initialFormData = {...this.data};
 				})
@@ -118,6 +134,24 @@ export default {
 					window.scrollTo(0, 0);
 				});
 		},
+		filterZgvs(event){
+			const query = event.query.toLowerCase();
+			this.filteredZgvs = this.listZgvs.filter(item =>
+				item.label.toLowerCase().includes(query)
+			)
+		},
+		filterMasterZgvs(event){
+			const query = event.query.toLowerCase();
+			this.filteredMasterZgvs = this.listZgvsmaster.filter(item =>
+				item.label.toLowerCase().includes(query)
+			)
+		},
+		filterDoktorZgvs(event){
+			const query = event.query.toLowerCase();
+			this.filteredDoktorZgvs = this.listZgvsdoktor.filter(item =>
+				item.label.toLowerCase().includes(query)
+			)
+		},
 	},
 	created() {
 		this.loadPrestudent();
@@ -126,6 +160,9 @@ export default {
 			.then(result => result.data)
 			.then(result => {
 				this.listZgvs = result;
+				this.selectedZgv = this.listZgvs.find(
+					item => item.zgv_code === this.data.zgv_code
+				);
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 		this.$api
@@ -133,6 +170,9 @@ export default {
 			.then(result => result.data)
 			.then(result => {
 				this.listZgvsmaster = result;
+				this.selectedMasterZgv = this.listZgvsmaster.find(
+					item => item.zgvmas_code === this.data.zgvmas_code
+				);
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 		this.$api
@@ -140,6 +180,9 @@ export default {
 			.then(result => result.data)
 			.then(result => {
 				this.listZgvsdoktor = result;
+				this.selectedDoktorZgv = this.listZgvsdoktor.find(
+					item => item.zgvdoktor_code === this.data.zgvdoktor_code
+				);
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 		this.$api
@@ -220,11 +263,25 @@ export default {
 						v-if="!config.hiddenFields.includes('zgv_code')"
 						container-class="col-3 stv-details-prestudent-zgv_code"
 						label="ZGV"
-						type="select"
-						v-model="data.zgv_code"
-						name="zgvcode"
+						type="autocomplete"
+						v-model="selectedZgv"
+						forceSelection
+						optionLabel="label"
+						optionValue="zgv_code"
+						:suggestions="filteredZgvs"
+						dropdown
+						name="zgv_code"
+						@complete="filterZgvs"
 						>
-					<option v-for="zgv in listZgvs" :key="zgv.zgv_code" :value="zgv.zgv_code">{{zgv.zgv_bez}}</option>
+							<template #option="slotProps">
+								<div
+									:class="!slotProps.option.aktiv
+									? 'item-inactive'
+									: ''"
+									>
+										{{slotProps.option.label}}
+								</div>
+							</template>
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('zgvOrt')"
@@ -234,7 +291,7 @@ export default {
 						v-model="data.zgvort"
 						name="zgvort"
 						>
-					</form-input>
+					</form-input>	
 					<form-input
 						v-if="!config.hiddenFields.includes('zgvDatum')"
 						container-class="col-3 stv-details-prestudent-zgvDatum"
@@ -268,11 +325,25 @@ export default {
 						v-if="!config.hiddenFields.includes('zgvmas_code')"
 						container-class="col-3 stv-details-prestudent-zgvmas_code"
 						:label="$p.t('lehre', 'zgvMaster')"
-						type="select"
-						v-model="data.zgvmas_code"
-						name="zgvmascode"
+						type="autocomplete"
+						v-model="selectedMasterZgv"
+						forceSelection
+						optionLabel="label"
+						optionValue="zgvmas_code"
+						:suggestions="filteredMasterZgvs"
+						dropdown
+						name="zgvmas_code"
+						@complete="filterMasterZgvs"
 						>
-						<option v-for="mzgv in listZgvsmaster" :key="mzgv.zgvmas_code" :value="mzgv.zgvmas_code">{{mzgv.zgvmas_bez}}</option>
+							<template #option="slotProps">
+								<div
+									:class="!slotProps.option.aktiv
+									? 'item-inactive'
+									: ''"
+									>
+										{{slotProps.option.label}}
+								</div>
+							</template>
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('zgvmaort')"
@@ -317,11 +388,25 @@ export default {
 						v-if="!config.hiddenFields.includes('zgvdoktor_code')"
 						container-class="col-3 stv-details-prestudent-zgvdoktor_code"
 						:label="$p.t('lehre', 'zgvDoktor')"
-						type="select"
-						v-model="data.zgvdoktor_code"
+						type="autocomplete"
+						v-model="selectedDoktorZgv"
+						forceSelection
+						optionLabel="label"
+						optionValue="zgvdoktor_code"
+						:suggestions="filteredDoktorZgvs"
+						dropdown
 						name="zgvdoktor_code"
+						@complete="filterDoktorZgvs"
 						>
-						<option v-for="zgv in listZgvsdoktor" :key="zgv.zgvdoktor_code" :value="zgv.zgvdoktor_code">{{zgv.zgvdoktor_bez}}</option>
+							<template #option="slotProps">
+								<div
+									:class="!slotProps.option.aktiv
+									? 'item-inactive'
+									: ''"
+									>
+										{{slotProps.option.label}}
+								</div>
+							</template>
 					</form-input>
 					<form-input
 						v-if="!config.hiddenFields.includes('zgvdoktorort')"

From 24df22ba240318fe0e272dcab7d506149bc01574 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 28 Jul 2025 08:40:45 +0200
Subject: [PATCH 449/572] enable text-input zgv-master and enable remove dates
 ZGV

---
 application/controllers/api/frontend/v1/stv/Prestudent.php  | 6 ++++++
 .../Stv/Studentenverwaltung/Details/Prestudent.js           | 1 +
 2 files changed, 7 insertions(+)

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index b433702b6..ed48e6d9a 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -140,6 +140,12 @@ class Prestudent extends FHCAPI_Controller
 			if ($val !== null || $prop == 'foerderrelevant') {
 				$update_prestudent[$prop] = $val;
 			}
+			if (($prop == 'zgvdatum' && $val == '')
+				|| ($prop == 'zgvmadatum' && $val == '')
+				|| ($prop == 'zgvdoktordatum' && $val == '')
+				) {
+				$update_prestudent[$prop] = null;
+			}
 		}
 
 		$update_prestudent['updateamum'] = date('c');
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index e782a6936..a36b355b1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -426,6 +426,7 @@ export default {
 						name="zgvdoktordatum"
 						no-today
 						auto-apply
+						text-input
 						:enable-time-picker="false"
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"

From 5e0ef4ebabace0c6edc4816a89afca37a271beb5 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 28 Jul 2025 09:39:32 +0200
Subject: [PATCH 450/572] Fix send mode on date update and vice versa to fix
 multiple router pushes

---
 public/js/components/Calendar/Base.js         |  4 ++--
 public/js/components/Cis/LvPlan/LvPlan.js     | 20 ++++-------------
 .../js/components/Cis/Mylv/RoomInformation.js | 22 +++++--------------
 3 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/public/js/components/Calendar/Base.js b/public/js/components/Calendar/Base.js
index 94ad3ef05..9d344ca09 100644
--- a/public/js/components/Calendar/Base.js
+++ b/public/js/components/Calendar/Base.js
@@ -164,7 +164,7 @@ export default {
 			},
 			set(value) {
 				this.internalDate = value;
-				this.$emit('update:date', value);
+				this.$emit('update:date', value, this.cMode);
 			}
 		},
 		sMode() {
@@ -182,7 +182,7 @@ export default {
 			},
 			set(value) {
 				this.internalView = value;
-				this.$emit('update:mode', value);
+				this.$emit('update:mode', value, this.cDate);
 			}
 		}
 	},
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index cf190d1c5..4555f18aa 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -105,24 +105,12 @@ export default {
 				return undefined;
 			return '--event-bg:#' + event.farbe;
 		},
-		handleChangeDate(day) {
-			const focus_date = day.toISODate();
-			const mode = this.currentMode;
-
-			this.$router.push({
-				name: "LvPlan",
-				params: {
-					mode,
-					focus_date,
-					lv_id: this.propsViewData?.lv_id || null
-				}
-			})
+		handleChangeDate(day, newMode) {
+			return this.handleChangeMode(newMode, day);
 		},
-		handleChangeMode(newMode) {
+		handleChangeMode(newMode, day) {
 			const mode = newMode[0].toUpperCase() + newMode.slice(1)
-			const focus_date = (this.currentDay instanceof luxon.DateTime)
-				? this.currentDay.toISODate()
-				: this.currentDay;
+			const focus_date = day.toISODate();
 			
 			this.$router.push({
 				name: "LvPlan",
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index d8d2ff074..72d489023 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -73,24 +73,12 @@ export default {
 				return undefined;
 			return '--event-bg:#' + event.farbe;
 		},
-		handleChangeDate(day) {
-			const focus_date = day.toISODate();
-			const mode = this.currentMode;
-
-			this.$router.push({
-				name: "RoomInformation",
-				params: {
-					mode,
-					focus_date,
-					ort_kurzbz: this.propsViewData.ort_kurzbz
-				}
-			})
+		handleChangeDate(day, newMode) {
+			return this.handleChangeMode(newMode, day);
 		},
-		handleChangeMode(newMode) {
+		handleChangeMode(newMode, day) {
 			const mode = newMode[0].toUpperCase() + newMode.slice(1)
-			const focus_date = (this.currentDay instanceof luxon.DateTime)
-				? this.currentDay.toISODate()
-				: this.currentDay;
+			const focus_date = day.toISODate();
 
 			this.$router.push({
 				name: "RoomInformation",
@@ -99,7 +87,7 @@ export default {
 					focus_date,
 					ort_kurzbz: this.propsViewData.ort_kurzbz
 				}
-			})
+			});
 		},
 		updateRange(rangeInterval) {
 			this.rangeInterval = rangeInterval;

From cc0572b386e54f03c822d0b5dc3c46153cd27b0e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 28 Jul 2025 11:44:06 +0200
Subject: [PATCH 451/572] use endpoint for Messages, refactor component
 Vorlagendropdown to fhcapi

---
 public/js/api/factory/vorlagen.js             | 32 +++++++++++++++++++
 .../Messages/Details/NewMessage/Modal.js      | 24 +++++++-------
 .../Messages/Details/NewMessage/NewDiv.js     | 21 ++++++------
 .../Messages/Details/TableMessages.js         | 10 +++---
 public/js/components/Messages/Messages.js     |  2 +-
 .../Studentenverwaltung/Details/Messages.js   |  8 ++++-
 .../VorlagenDropdown/VorlagenDropdown.js      |  8 +++--
 7 files changed, 71 insertions(+), 34 deletions(-)
 create mode 100644 public/js/api/factory/vorlagen.js

diff --git a/public/js/api/factory/vorlagen.js b/public/js/api/factory/vorlagen.js
new file mode 100644
index 000000000..f62f65e47
--- /dev/null
+++ b/public/js/api/factory/vorlagen.js
@@ -0,0 +1,32 @@
+/**
+ * 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 {
+	getVorlagen() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vorlagen/vorlagen/getVorlagen/'
+		};
+	},
+	getVorlagenByLoggedInUser() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/vorlagen/vorlagen/getVorlagenByLoggedInUser/'
+		};
+	},
+
+};
diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index 57573a9ba..24c282cb4 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -4,8 +4,6 @@ import FormInput from '../../../Form/Input.js';
 import ListBox from "../../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
 import DropdownComponent from "../../../VorlagenDropdown/VorlagenDropdown.js";
 
-import ApiMessages from '../../../../api/factory/messages/messages.js';
-
 export default {
 	name: "ModalNewMessages",
 	components: {
@@ -17,7 +15,7 @@ export default {
 	},
 	props: {
 		endpoint: {
-			type: String,
+			type: Object,
 			required: true
 		},
 		typeId: String,
@@ -124,7 +122,7 @@ export default {
 			data.append('data', JSON.stringify(merged));
 
 			return this.$refs.formMessage
-				.call(ApiMessages.sendMessageFromModalContext(this.uid, data))
+				.call(this.endpoint.sendMessageFromModalContext(this.uid, data))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
 					this.hideModal('modalNewMessage');
@@ -140,7 +138,7 @@ export default {
 		},
 		getVorlagentext(vorlage_kurzbz){
 			return this.$api
-				.call(ApiMessages.getVorlagentext(vorlage_kurzbz))
+				.call(this.endpoint.getVorlagentext(vorlage_kurzbz))
 				.then(response => {
 					this.formData.body = response.data;
 				}).catch(this.$fhcAlert.handleSystemError)
@@ -155,7 +153,7 @@ export default {
 
 			data.append('data', JSON.stringify(this.formData.body));
 			return this.$api
-				.call(ApiMessages.getPreviewText({
+				.call(this.endpoint.getPreviewText({
 					id: this.id,
 					type_id: this.typeId}, data))
 				.then(response => {
@@ -214,7 +212,7 @@ export default {
 				type_id: typeId
 			};
 			this.$api
-				.call(ApiMessages.getUid(params))
+				.call(this.endpoint.getUid(params))
 				.then(result => {
 					this.uid = result.data;
 				})
@@ -252,7 +250,7 @@ export default {
 				if (!newMessageId) return;
 
 				try {
-					const result = await this.$api.call(ApiMessages.getReplyData(newMessageId));
+					const result = await this.$api.call(this.endpoint.getReplyData(newMessageId));
 					this.replyData = result.data;
 
 					if (this.replyData.length > 0) {
@@ -275,7 +273,7 @@ export default {
 				type_id: this.typeId
 			};
 			this.$api
-				.call(ApiMessages.getMessageVarsPerson(params))
+				.call(this.endpoint.getMessageVarsPerson(params))
 				.then(result => {
 					this.fieldsPerson = result.data;
 					const person = this.fieldsPerson[0];
@@ -293,7 +291,7 @@ export default {
 				type_id: this.typeId
 			};
 			this.$api
-				.call(ApiMessages.getMsgVarsPrestudent(params))
+				.call(this.endpoint.getMsgVarsPrestudent(params))
 				.then(result => {
 					this.fieldsPrestudent = result.data;
 					const prestudent = this.fieldsPrestudent[0];
@@ -306,7 +304,7 @@ export default {
 		}
 
 		this.$api
-			.call(ApiMessages.getMsgVarsLoggedInUser())
+			.call(this.endpoint.getMsgVarsLoggedInUser())
 			.then(result => {
 				this.fieldsUser = result.data;
 				const user = this.fieldsUser;
@@ -318,7 +316,7 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 
 		this.$api
-			.call(ApiMessages.getNameOfDefaultRecipient({
+			.call(this.endpoint.getNameOfDefaultRecipient({
 				id: this.id,
 				type_id: this.typeId}))
 			.then(result => {
@@ -332,7 +330,7 @@ export default {
 		//case of reply
 		if(this.messageId) {
 			this.$api
-				.call(ApiMessages.getReplyData(this.messageId))
+				.call(this.endpoint.getReplyData(this.messageId))
 				.then(result => {
 					this.replyData = result.data;
 					this.formData.subject = this.replyData[0].replySubject;
diff --git a/public/js/components/Messages/Details/NewMessage/NewDiv.js b/public/js/components/Messages/Details/NewMessage/NewDiv.js
index d070ff379..7622f0928 100644
--- a/public/js/components/Messages/Details/NewMessage/NewDiv.js
+++ b/public/js/components/Messages/Details/NewMessage/NewDiv.js
@@ -2,7 +2,6 @@ import FormForm from '../../../Form/Form.js';
 import FormInput from '../../../Form/Input.js';
 import ListBox from "../../../../../../index.ci.php/public/js/components/primevue/listbox/listbox.esm.min.js";
 import DropdownComponent from '../../../VorlagenDropdown/VorlagenDropdown.js';
-import ApiMessages from "../../../../api/factory/messages/messages.js";
 
 export default {
 	name: "ComponentNewMessages",
@@ -14,7 +13,7 @@ export default {
 	},
 	props: {
 		endpoint: {
-			type: String,
+			type: Object,
 			required: true
 		},
 		openMode: String,
@@ -119,7 +118,7 @@ export default {
 			};
 			data.append('data', JSON.stringify(merged));
 			return this.$api
-				.call(ApiMessages.sendMessage(this.uid, data))
+				.call(this.endpoint.sendMessage(this.uid, data))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSent'));
 					this.hideTemplate();
@@ -139,7 +138,7 @@ export default {
 		},
 		getVorlagentext(vorlage_kurzbz){
 			return this.$api
-				.call(ApiMessages.getVorlagentext(vorlage_kurzbz))
+				.call(this.endpoint.getVorlagentext(vorlage_kurzbz))
 				.then(response => {
 					this.formData.body = response.data;
 				}).catch(this.$fhcAlert.handleSystemError)
@@ -152,7 +151,7 @@ export default {
 
 			data.append('data', JSON.stringify(this.formData.body));
 			return this.$api
-				.call(ApiMessages.getPreviewText({
+				.call(this.endpoint.getPreviewText({
 					id: this.id,
 					type_id: this.typeId}, data))
 				.then(response => {
@@ -226,7 +225,7 @@ export default {
 				type_id: typeId
 			};
 			this.$api
-				.call(ApiMessages.getUid(params))
+				.call(this.endpoint.getUid(params))
 				.then(result => {
 					this.uid = result.data;
 				})
@@ -264,7 +263,7 @@ export default {
 				};
 
 				this.$api
-				.call(ApiMessages.getMessageVarsPerson(params))
+				.call(this.endpoint.getMessageVarsPerson(params))
 					.then(result => {
 						this.fieldsPerson = result.data;
 						const person = this.fieldsPerson[0];
@@ -282,7 +281,7 @@ export default {
 				type_id: this.typeId
 			};
 			this.$api
-				.call(ApiMessages.getMsgVarsPrestudent(params))
+				.call(this.endpoint.getMsgVarsPrestudent(params))
 				.then(result => {
 					this.fieldsPrestudent = result.data;
 					const prestudent = this.fieldsPrestudent[0];
@@ -296,7 +295,7 @@ export default {
 		}
 
 		this.$api
-			.call(ApiMessages.getMsgVarsLoggedInUser())
+			.call(this.endpoint.getMsgVarsLoggedInUser())
 			.then(result => {
 				this.fieldsUser = result.data;
 				const user = this.fieldsUser;
@@ -308,7 +307,7 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 
 		this.$api
-			.call(ApiMessages.getNameOfDefaultRecipient({
+			.call(this.endpoint.getNameOfDefaultRecipient({
 				id: this.id,
 				type_id: this.typeId}))
 			.then(result => {
@@ -322,7 +321,7 @@ export default {
 		//case of reply
 		if(this.messageId != null) {
 			this.$api
-				.call(ApiMessages.getReplyData(this.messageId))
+				.call(this.endpoint.getReplyData(this.messageId))
 				.then(result => {
 					this.replyData = result.data;
 					this.formData.subject = this.replyData[0].replySubject;
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index a21073855..8d539983f 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -1,8 +1,6 @@
 import {CoreFilterCmpt} from "../../filter/Filter.js";
 import FormForm from '../../Form/Form.js';
 
-import ApiMessages from '../../../api/factory/messages/messages.js';
-
 export default {
 	name: "TableMessages",
 	components: {
@@ -16,7 +14,7 @@ export default {
 	},
 	props: {
 		endpoint: {
-			type: String,
+			type: Object,
 			required: true
 		},
 		typeId: String,
@@ -257,7 +255,7 @@ export default {
 		},
 		deleteMessage(message_id){
 			return this.$api
-				.call(ApiMessages.deleteMessage(message_id))
+				.call(this.endpoint.deleteMessage(message_id))
 				.then(response => {
 					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
 				}).catch(this.$fhcAlert.handleSystemError)
@@ -318,7 +316,7 @@ export default {
 		},
 		loadAjaxCall(url, config, params){
 			return this.$api.call(
-				ApiMessages.getMessages(params)
+				this.endpoint.getMessages(params)
 			);
 		}
 	},
@@ -349,7 +347,7 @@ export default {
 				type_id: this.typeId
 			};
 			this.$api
-				.call(ApiMessages.getPersonId(params))
+				.call(this.endpoint.getPersonId(params))
 				.then(result => {
 					this.personId = result.data;
 				})
diff --git a/public/js/components/Messages/Messages.js b/public/js/components/Messages/Messages.js
index 337883be3..176c05b6b 100644
--- a/public/js/components/Messages/Messages.js
+++ b/public/js/components/Messages/Messages.js
@@ -15,7 +15,7 @@ export default {
 	},
 	props: {
 		endpoint: {
-			type: String,
+			type: Object,
 			required: true
 		},
 		typeId: {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
index 49600fe20..59650eaab 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Messages.js
@@ -1,4 +1,5 @@
 import CoreMessages from "../../../Messages/Messages.js";
+import ApiMessages from "../../../../api/factory/messages/messages.js";
 
 export default {
 	name: "TabMessages",
@@ -8,13 +9,18 @@ export default {
 	props: {
 		modelValue: Object
 	},
+	data(){
+		return {
+			endpoint: ApiMessages
+		};
+	},
 	template: `
 	<div class="stv-details-messages h-100 pb-3 overflow-hidden">
 	
 	<template v-if="modelValue.prestudent_id">
 		<core-messages
 			ref="formc"
-			endpoint="$fhcApi.factory.messages.person"
+			:endpoint="endpoint"
 			type-id="prestudent_id"
 			:id="modelValue.prestudent_id"
 			messageLayout="twoColumnsTableLeft"
diff --git a/public/js/components/VorlagenDropdown/VorlagenDropdown.js b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
index 0071d4a1d..d7c73a9e5 100644
--- a/public/js/components/VorlagenDropdown/VorlagenDropdown.js
+++ b/public/js/components/VorlagenDropdown/VorlagenDropdown.js
@@ -2,6 +2,8 @@ import {CoreFilterCmpt} from "../filter/Filter.js";
 import FormForm from '../Form/Form.js';
 import FormInput from '../Form/Input.js';
 
+import ApiVorlage from '../../api/factory/vorlagen.js';
+
 export default {
 	components: {
 		FormForm,
@@ -39,7 +41,8 @@ export default {
 	},
 	created() {
 		if(this.isAdmin) {
-			this.$fhcApi.factory.vorlagen.getVorlagen()
+			this.$api
+				.call(ApiVorlage.getVorlagen())
 				.then(result => {
 					this.vorlagen = result.data;
 				})
@@ -47,7 +50,8 @@ export default {
 		}
 
 		if(this.useLoggedInUserOe){
-			this.$fhcApi.factory.vorlagen.getVorlagenByLoggedInUser()
+			this.$api
+				.call(ApiVorlage.getVorlagenByLoggedInUser())
 				.then(result => {
 					//console.log(this.vorlagenOe);
 					this.vorlagenOe = result.data;

From dcb9fad0d2b79103f0f39a62fdc62fff74fd9442 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 28 Jul 2025 12:11:45 +0200
Subject: [PATCH 452/572] remove not existing tinymce-plugin linktitle

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

diff --git a/public/js/components/Messages/Details/NewMessage/Modal.js b/public/js/components/Messages/Details/NewMessage/Modal.js
index 24c282cb4..b0d8cca7d 100644
--- a/public/js/components/Messages/Details/NewMessage/Modal.js
+++ b/public/js/components/Messages/Details/NewMessage/Modal.js
@@ -67,7 +67,7 @@ export default {
 				//height: 800,
 				//plugins: ['lists'],
 				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify | link',
-				plugins: 'link linktitle',
+				plugins: 'link',
 				link_context_toolbar: true,
 				automatic_uploads: true,
 				default_link_target: "_blank",

From 4d1c4bf7abc8ad78176b2dd7f18a0a19c2139c7c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 28 Jul 2025 15:04:15 +0200
Subject: [PATCH 453/572] add css rules to show vue-datepicker svg icons inside
 of elements with bootstrap input-group or primevue p-component css class

---
 public/css/components/vue-datepicker.css | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/public/css/components/vue-datepicker.css b/public/css/components/vue-datepicker.css
index c2551b9d8..efca42f4f 100644
--- a/public/css/components/vue-datepicker.css
+++ b/public/css/components/vue-datepicker.css
@@ -43,4 +43,12 @@
     --dp-border-color-hover: var(--bs-success);
 }
 .form-control.is-invalid ~ .dp__clear_icon,
-.was-validated .form-control:invalid ~ .dp__clear_icon { margin-right: calc(1.5em + .75rem - 12px) }
+.was-validated .form-control:invalid ~ .dp__clear_icon {
+	margin-right: calc(1.5em + .75rem - 12px);
+}
+.p-component .dp__input_icons {
+	box-sizing: content-box !important;
+}
+.input-group .dp__input_icons {
+	z-index: 3;
+}
\ No newline at end of file

From d76a5965db16127d98b970734cf9b7079796319f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 29 Jul 2025 08:54:16 +0200
Subject: [PATCH 454/572] CSS improvements Calendar

---
 public/css/Cis4/Cis.css                       |   2 +
 public/css/Cis4/Cis/Calendar.css              |  13 ++
 public/css/Cis4/CoreCalendarEvents.css        | 216 +++++-------------
 public/css/components/calendar.css            |  11 +-
 public/css/components/calendar/events.css     |  17 +-
 public/css/components/calendar/frame.css      |  25 +-
 public/js/components/Cis/LvPlan/LvPlan.js     |   1 +
 .../js/components/Cis/Mylv/RoomInformation.js |   1 +
 8 files changed, 106 insertions(+), 180 deletions(-)
 create mode 100644 public/css/Cis4/Cis/Calendar.css

diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 80784fe5d..ff1b181dd 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -1,6 +1,7 @@
 /* basic */
 @import '../components/searchbar/searchbar.css';
 @import '../components/Sprachen.css';
+@import './Cis/Calendar.css';
 
 html {
   font-size: 0.875em;
@@ -567,6 +568,7 @@ html {
 @media (max-width: 991.98px) {
   #cis-main{
     padding: 0.75rem 0.75rem;
+    height: calc(100vh - var(--fhc-cis-header-height));
   }
   #cis-main > :first-child {
     margin-top: var(--fhc-cis-header-height);
diff --git a/public/css/Cis4/Cis/Calendar.css b/public/css/Cis4/Cis/Calendar.css
new file mode 100644
index 000000000..c8483dd0f
--- /dev/null
+++ b/public/css/Cis4/Cis/Calendar.css
@@ -0,0 +1,13 @@
+/* mobile */
+@media (max-width: 991.98px) {
+	.responsive-calendar .fhc-calendar-mode-week .fhc-calendar-base-label-day .short,
+	.responsive-calendar .fhc-calendar-mode-week .fhc-calendar-base-label-dow .short,
+	.responsive-calendar .fhc-calendar-mode-month .fhc-calendar-base-label-dow .short {
+		display: block;
+	}
+	.responsive-calendar .fhc-calendar-mode-week .fhc-calendar-base-label-day .long,
+	.responsive-calendar .fhc-calendar-mode-week .fhc-calendar-base-label-dow .long,
+	.responsive-calendar .fhc-calendar-mode-month .fhc-calendar-base-label-dow .long {
+		display: none;
+	}
+}
diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index c990c93d2..7b43603da 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -1,185 +1,93 @@
-/* Lehreinheits Events in Month Page */
-.monthPageContainer .lehreinheitEventContent{
-	display: flex;
-	border-bottom: 1px solid var(--bs-border-color);	
-}
-
-.monthPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
-	display:none;
-}
-
-
-.monthPageContainer .lehreinheitEventContent #lehreinheitEventText {
-	width: 100%;
-	font-size: .875em;
-	overflow:hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	display:flex;
-	justify-content: space-evenly;
-	align-items:center;
-	
-}
-
-.monthPageContainer .lehreinheitEventContent #lehreinheitEventText #lehreinheitLektoren{
-	display:none;
-}
-
-.monthPageContainer .lehreinheitEventContent #lektorEllipsis {
-	display: none;
-}
-
-/* Lehreinheits Events in Week Page */
-.weekPageContainer .lehreinheitEventContent {
-	display: grid;
-	grid-template-columns: auto 1fr;
-	grid-template-rows: 1fr;
-
-}
-
-@media(max-width: 1199px){
-	.weekPageContainer .lehreinheitEventContent {
-			grid-template-columns: 1fr;
-		}
-}
-
-
-.weekPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
-	display: grid;
-	padding: .25rem .5rem .25rem .25rem;
-	margin-right: .25rem;
-	align-content: center;
-	border-right: 1px solid var(--bs-secondary);
-}
-
-
-.weekPageContainer .lehreinheitEventContent #lehreinheitEventText {
-	display: flex;
-	flex-direction: column;
-	column-gap: 5px;
-	overflow-y: scroll;
+/* All */
+.weekPageContainer,
+.dayPageContainer {
 	height: 100%;
-	min-height:auto;
-	justify-content: space-between;
-	align-items:center;
-
 }
 
-/* Lehreinheits Events in Day Page */
-.dayPageContainer .lehreinheitEventContent {
-	display: flex;
-	padding-left:4rem;
-	justify-content: space-evenly;
-	align-items: center;
-
-}
-
-.dayPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
-	display:grid;
-	align-content: center;
-}
-
-.dayPageContainer .lehreinheitEventContent #lehreinheitEventText {
-	display: contents;
-}
-
-.dayPageContainer .lehreinheitEventContent #lehreinheitEventText *{
-	font-weight: 500;
-}
-
-/* Ferientage Events in Month Page */
-.monthPageContainer .feiertagEventContent {
-	display: grid;
-	grid-template-columns: auto 1fr;
-	justify-items: center;
-	align-items:center;
-	color: var(--fhc-light);
-}
-
-.monthPageContainer .feiertagEventContent #ferienEventIcon{
-	margin: 0.5rem;
-}
-
-.monthPageContainer .feiertagEventContent #ferienEventTitle {
-
-}
-
-/* Ferientage Events in Week Page */
-.weekPageContainer .feiertagEventContent {
-	display: grid;
-	grid-template-columns: auto 1fr;
-	justify-items: center;
-	align-items:center;
-	color: var(--fhc-light);
-}
-.weekPageContainer .feiertagEventContent {
-	display: grid;
-	grid-template-columns: auto 1fr;
-	justify-items: center;
+/* Feiertag */
+.feiertagEventContent {
 	align-items: center;
 	color: var(--fhc-light);
 }
-
-.weekPageContainer .feiertagEventContent #ferienEventIcon {
-	margin: 0.25rem;
-}
-
-.weekPageContainer .feiertagEventContent #ferienEventTitle {
-	
-}
-
-/* Ferientage Events in Day Page */
+.monthPageContainer .feiertagEventContent,
+.weekPageContainer .feiertagEventContent,
 .dayPageContainer .feiertagEventContent {
 	display: grid;
 	grid-template-columns: auto 1fr;
 	justify-items: center;
-	align-items: center;
-	color: var(--fhc-light);
 }
-
-.dayPageContainer .feiertagEventContent #ferienEventIcon {
-	margin: 0.5rem;
-}
-
-.dayPageContainer .feiertagEventContent #ferienEventTitle {}
-
-/* List Page Container Styles */
-
-/* Ferientage Events for List Page */
-
 .listPageContainer .feiertagEventContent{
 	display: flex;
 	justify-content: center;
-	align-items: center;
-	color: var(--fhc-light);
 }
 
-.listPageContainer .feiertagEventContent #ferienEventIcon{
-	margin: 0.5rem;
+.monthPageContainer .feiertagEventContent #ferienEventIcon {
+	margin: 0 .5rem;
+}
+.weekPageContainer .feiertagEventContent #ferienEventIcon,
+.dayPageContainer .feiertagEventContent #ferienEventIcon,
+.listPageContainer .feiertagEventContent #ferienEventIcon {
+	margin: .5rem;
 }
 
-.listPageContainer .feiertagEventContent #ferienEventTitle{
+.listPageContainer .feiertagEventContent #ferienEventTitle {
 	flex-grow: 1;
 }
 
-/* Lehreinheits Events in List Page */
-.listPageContainer .lehreinheitEventContent {
+/* Lehreinheit */
+.monthPageContainer .lehreinheitEventContent {
+	padding: 0!important;
+}
+.monthPageContainer .lehreinheitEventContent #lehreinheitEventHeader,
+.monthPageContainer .lehreinheitEventContent #lehreinheitLektoren,
+.monthPageContainer .lehreinheitEventContent #lektorEllipsis {
+	display: none!important;
+}
+.monthPageContainer .lehreinheitEventContent #lehreinheitEventText {
 	display: flex;
-	padding-left: 4rem;
 	justify-content: space-evenly;
 	align-items: center;
-
 }
-
+.weekPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
+	justify-content: center;
+	grid-template-columns: repeat(2, auto);
+	border-bottom: solid 1px;
+	height: auto!important;
+}
+.weekPageContainer .lehreinheitEventContent #lehreinheitEventHeader :last-child:not(:first-child):before {
+	content: "-";
+	margin-inline-start: .15em;
+}
+.weekPageContainer .lehreinheitEventContent #lehreinheitEventText {
+	display: flex;
+	flex-direction: column;
+	justify-content: space-evenly;
+	align-items: center;
+}
+.dayPageContainer .lehreinheitEventContent,
+.listPageContainer .lehreinheitEventContent {
+	display: flex;
+	align-items: center;
+}
+.dayPageContainer .lehreinheitEventContent #lehreinheitEventHeader,
 .listPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
-	display: grid;
 	align-content: center;
+	padding-inline-end: .5em;
+	border-inline-end: solid 1px;
+	margin-inline-end: .5em;
 }
-
+.dayPageContainer .lehreinheitEventContent #lehreinheitEventText,
 .listPageContainer .lehreinheitEventContent #lehreinheitEventText {
-	display: contents;
+	flex: 1 1 auto;
+	display: flex;
+	flex-wrap: wrap;
+	gap: .25em;
+	justify-content: center;
 }
-
-.listPageContainer .lehreinheitEventContent #lehreinheitEventText * {
-	font-weight: 500;
+.dayPageContainer .lehreinheitEventContent #lehreinheitTopic,
+.dayPageContainer .lehreinheitEventContent #lehreinheitOrt,
+.listPageContainer .lehreinheitEventContent #lehreinheitTopic,
+.listPageContainer .lehreinheitEventContent #lehreinheitOrt {
+	flex: 0 0 100%;
+	text-align: center;
 }
diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index f46554007..1c78ccc6c 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -4,26 +4,27 @@
 
 /* Themable Variables */
 :root {
-	--fhc-calendar-gap: var(--fhc-border, #dee2e6);
+	--fhc-calendar-gap: var(--bs-border-width, 1px);
+
 	--fhc-calendar-bg: var(--fhc-background, #fff);
 	--fhc-calendar-border: var(--fhc-border, #dee2e6);
+	--fhc-calendar-bg-gap: var(--fhc-border, #dee2e6);
 
 	--fhc-calendar-bg-event: var(--fhc-white-80, #ccc);
 	--fhc-calendar-border-event: var(--bs-secondary, #6c757d);
 	--fhc-calendar-radius-event: var(--bs-border-radius, .375rem);
-	--fhc-calendar-fontsize-event: .875em;
 
 	--fhc-calendar-bg-markings-past: var(--fhc-beige-10, rgba(245, 233, 215, 0.5));
 	--fhc-calendar-border-markings-past: var(--fhc-calendar-border);
 	--fhc-calendar-bg-markings-past-label: var(--fhc-calendar-bg);
 	--fhc-calendar-border-markings-past-label: var(--fhc-calendar-border);
 
-	--fhc-calendar-gap-header: transparent;
-	--fhc-calendar-gap-allday: transparent;
-	--fhc-calendar-gap-body: transparent;
 	--fhc-calendar-bg-header: var(--fhc-calendar-bg);
+	--fhc-calendar-bg-header-gap: transparent;
 	--fhc-calendar-bg-allday: var(--fhc-calendar-bg);
+	--fhc-calendar-bg-allday-gap: transparent;
 	--fhc-calendar-bg-body: var(--fhc-calendar-bg);
+	--fhc-calendar-bg-body-gap: transparent;
 
 	--fhc-calendar-bg-month-today: var(--fhc-primary);
 	--fhc-calendar-color-month-today: var(--fhc-white-10);
diff --git a/public/css/components/calendar/events.css b/public/css/components/calendar/events.css
index f996b7339..5bdbb1b46 100644
--- a/public/css/components/calendar/events.css
+++ b/public/css/components/calendar/events.css
@@ -1,17 +1,17 @@
 .event {
 	cursor: pointer;
-}
-.fhc-calendar-mode-week .all-day-events .event .weekPageContainer {
-	padding: .25rem;
-}
-.fhc-calendar-mode-day .event,
-.fhc-calendar-mode-week .event {
-	margin: 0 .5rem;
 	font-size: var(--fhc-calendar-fontsize-event, .875rem);
 }
+.fhc-calendar-mode-day .fhc-calendar-base-grid-line,
+.fhc-calendar-mode-week .fhc-calendar-base-grid-line {
+	padding: 0 var(--fhc-calendar-gap-events, var(--fhc-calendar-gap, 1px));
+}
 .fhc-calendar-mode-day .all-day-events .event,
 .fhc-calendar-mode-week .all-day-events .event {
-	margin: .25rem;
+	margin: var(--fhc-calendar-gap-events, var(--fhc-calendar-gap, 1px)) 0;
+}
+.fhc-calendar-mode-list .event {
+	margin-bottom: var(--fhc-calendar-gap-events, var(--fhc-calendar-gap, 1px));
 }
 /* Border */
 .fhc-calendar-mode-day .grid-main .event > *,
@@ -64,6 +64,7 @@
 }
 .fhc-calendar-base .event > * {
 	background-color: var(--event-bg, var(--event-default-bg));
+	color: var(--event-color, var(--fhc-calendar-color-event, #000));
 }
 .fhc-calendar-base .event > *:hover {
 	filter: brightness(120%);
diff --git a/public/css/components/calendar/frame.css b/public/css/components/calendar/frame.css
index ab400c95d..843e95cf6 100644
--- a/public/css/components/calendar/frame.css
+++ b/public/css/components/calendar/frame.css
@@ -56,7 +56,6 @@
 .fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-header {
 	--event-bg: transparent;
 	font-weight: bold;
-	text-indent: 0;
 	font-size: var(--fhc-calendar-fontsize-month-day, 1rem);
 }
 .fhc-calendar-mode-month .fhc-calendar-base-grid-line-event.event-header .disabled {
@@ -69,11 +68,11 @@
 /* Grid */
 .fhc-calendar-base-grid {
 	--fhc-calendar-axis-collapsible: .2fr;
-	background-color: var(--fhc-calendar-gap);
-	grid-gap: 2px;
+	background-color: var(--fhc-calendar-bg-gap);
+	grid-gap: var(--fhc-calendar-gap-header, calc(var(--fhc-calendar-gap, 1px) * 2));
 }
 .fhc-calendar-base-grid .grid-header {
-	background-color: var(--fhc-calendar-gap-header);
+	background-color: var(--fhc-calendar-bg-header-gap, var(--fhc-calendar-bg-gap));
 }
 .fhc-calendar-base-grid .grid-header:before,
 .fhc-calendar-base-grid .grid-allday:before {
@@ -84,22 +83,22 @@
 	background-color: var(--fhc-calendar-bg-header);
 }
 .fhc-calendar-base-grid .grid-allday {
-	background-color: var(--fhc-calendar-gap-allday);
+	background-color: var(--fhc-calendar-bg-allday-gap, var(--fhc-calendar-bg-gap));
 }
 .fhc-calendar-base-grid .grid-allday:before,
 .fhc-calendar-base-grid .grid-allday .all-day-events {
 	background-color: var(--fhc-calendar-bg-allday);
 }
 .fhc-calendar-base-grid .grid-main {
-	grid-gap: 1px;
-	background-color: var(--fhc-calendar-gap-body);
+	grid-gap: var(--fhc-calendar-gap, 1px);
+	background-color: var(--fhc-calendar-bg-body-gap, var(--fhc-calendar-bg-gap));
 }
 .fhc-calendar-base-grid .grid-main .part-header,
 .fhc-calendar-base-grid .grid-main .part-body {
 	background-color: var(--fhc-calendar-bg-body);
 }
 .fhc-calendar-base-grid-line {
-	grid-gap: 1px;
+	grid-gap: var(--fhc-calendar-gap-events, var(--fhc-calendar-gap, 1px));
 }
 .fhc-calendar-base-label-time {
 	display: flex;
@@ -118,7 +117,7 @@
 .fhc-calendar-mode-day .event-details {
 	padding: 1.5rem;
 	width: 100%;
-	border-left: solid 1px var(--fhc-calendar-gap);
+	border-left: solid 1px var(--fhc-calendar-bg-gap);
 }
 .fhc-calendar-mode-day .today {
 	background-color: var(--fhc-calendar-bg-day-today);
@@ -132,14 +131,14 @@
 /* Month */
 .fhc-calendar-mode-month .fhc-calendar-base-grid-line {
 	overflow: hidden;
-	line-height: 1.5;
+	line-height: 1.8;
 	grid-template-rows: 2em;
-	grid-auto-rows: calc(var(--fhc-calendar-fontsize-event, .875rem) + 2 * var(--fhc-calendar-margin-event-icon, .5rem));
+	grid-auto-rows: 1.8em;
 	font-size: var(--fhc-calendar-fontsize-event, .875rem);
 }
 .fhc-calendar-mode-month .fhc-calendar-base-grid-line-event {
-	text-indent: .5em;
-	height: calc(var(--fhc-calendar-fontsize-event, .875rem) + 2 * var(--fhc-calendar-margin-event-icon, .5rem));
+	font-size: 1em;
+	height: 1.8em;
 	overflow: hidden;
 }
 .fhc-calendar-mode-month .fhc-calendar-base-grid-line-event .placeholder-glow {
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 4555f18aa..5a276b889 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -173,6 +173,7 @@ export default {
 		<hr>
 		<fhc-calendar
 			ref="calendar"
+			class="responsive-calendar"
 			:date="currentDay"
 			:modes="modes"
 			:mode-options="modeOptions"
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 72d489023..307b535f5 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -116,6 +116,7 @@ export default {
 		<hr>
 		<fhc-calendar 
 			ref="calendar"
+			class="responsive-calendar"
 			:date="currentDay"
 			:modes="modes"
 			:mode-options="modeOptions"

From 31fb649cac1a59786b6963a0852c42920ab39daa Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 29 Jul 2025 11:40:24 +0200
Subject: [PATCH 455/572] Bugfix: moodle start/end dates lost timezones and end
 time

---
 .../controllers/api/frontend/v1/LvPlan.php       | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 0ccf65a0e..a1d40cb81 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -19,6 +19,8 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 use CI3_Events as Events;
+use \DateTime as DateTime;
+use \DateTimeZone as DateTimeZone;
 
 class LvPlan extends FHCAPI_Controller
 {
@@ -89,16 +91,22 @@ class LvPlan extends FHCAPI_Controller
 		}
 
 		// fetching moodle events
+		$this->load->config('calendar');
+		$tz = new DateTimeZone($this->config->item('timezone'));
+		$start = new DateTime($start_date);
+		$start->setTimezone($tz);
+		$end = new DateTime($end_date);
+		$end->setTimezone($tz);
+		$end->modify('+1 day -1 second');
 		$moodle_events = [];
 		Events::trigger(
 			'moodleCalendarEvents',
-			function & () use (&$moodle_events)
-			{
+			function & () use (&$moodle_events) {
 				return $moodle_events;
 			},
 			[
-				'start_date' => $start_date,
-				'end_date' => $end_date, 
+				'start_date' => $start->format('c'),
+				'end_date' => $end->format('c'),
 				'username' => getAuthUID()
 			]
 		);

From fd04b26af441e5e2e9219c89fac82941d387a0eb Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 29 Jul 2025 11:40:40 +0200
Subject: [PATCH 456/572] code quality

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

diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index 7b43603da..82e7a3a31 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -16,7 +16,7 @@
 	grid-template-columns: auto 1fr;
 	justify-items: center;
 }
-.listPageContainer .feiertagEventContent{
+.listPageContainer .feiertagEventContent {
 	display: flex;
 	justify-content: center;
 }

From d262c5106c3ce85d297a030ff36a201ff401f5d9 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 29 Jul 2025 11:52:36 +0200
Subject: [PATCH 457/572] add zgv-fields to allow null values for update

---
 .../api/frontend/v1/stv/Prestudent.php          | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index ed48e6d9a..369c8eabd 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -136,14 +136,19 @@ class Prestudent extends FHCAPI_Controller
 		$update_prestudent = array();
 		foreach ($array_allowed_props_prestudent as $prop)
 		{
-			$val = $this->input->post($prop);
-			if ($val !== null || $prop == 'foerderrelevant') {
+			$val = $this->input->post($prop, true);
+
+			if ($val !== null || $prop === 'foerderrelevant') {
 				$update_prestudent[$prop] = $val;
 			}
-			if (($prop == 'zgvdatum' && $val == '')
-				|| ($prop == 'zgvmadatum' && $val == '')
-				|| ($prop == 'zgvdoktordatum' && $val == '')
-				) {
+
+			// allowed to be null, but has to be in postparameter
+			if (
+				in_array($prop, ['zgvdatum', 'zgvmadatum', 'zgvdoktordatum', 'zgv_code', 'zgvmas_code', 'zgvdoktor_code'])
+				&& !isset($update_prestudent[$prop])
+				&& array_key_exists($prop, $_POST)
+			) 
+			{
 				$update_prestudent[$prop] = null;
 			}
 		}

From c1ca8c78aff82215acbb1b2ac30136397daa4aa4 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 29 Jul 2025 13:13:15 +0200
Subject: [PATCH 458/572] bugfix field gsstudientyp_kurzbz

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

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index a36b355b1..01f31b696 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -573,7 +573,7 @@ export default {
 						v-model="data.gsstudientyp_kurzbz"
 						name="gsstudientyp_kurzbz"
 						>
-						<option v-for="typ in listStgTyp" :key="typ.typ" :value="typ.typ">{{typ.bezeichnung}}</option>
+						<option v-for="typ in listStgTyp" :key="typ.gsstudientyp_kurzbz" :value="typ.gsstudientyp_kurzbz">{{typ.bezeichnung}}</option>
 					</form-input>
 				</div>
 				

From 2442c16eebaed0838456f4678709ed66d1cbae8b Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 29 Jul 2025 13:24:49 +0200
Subject: [PATCH 459/572] Calendar header CSS

---
 public/css/components/calendar/frame.css     | 38 ++++++++++++-
 public/js/components/Calendar/Base/Header.js | 58 ++++++++++----------
 public/js/components/Cis/LvPlan/LvPlan.js    |  4 +-
 3 files changed, 68 insertions(+), 32 deletions(-)

diff --git a/public/css/components/calendar/frame.css b/public/css/components/calendar/frame.css
index 843e95cf6..e5ed19385 100644
--- a/public/css/components/calendar/frame.css
+++ b/public/css/components/calendar/frame.css
@@ -107,8 +107,44 @@
 	align-items: end;
 }
 /* Header */
-.fhc-calendar-base-header > .row {
+.fhc-calendar-base-header .header-picker {
+	display: flex;
+	justify-content: center;
+}
+.fhc-calendar-base-header .header-actions {
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: space-around;
 	align-items: center;
+	margin-bottom: .5rem;
+	row-gap: .5rem;
+}
+.fhc-calendar-base-header .header-userdefined:empty {
+	display: none;
+}
+@media (min-width: 768px) {
+	.fhc-calendar-base-header {
+		display: grid;
+		grid-template-columns: [userdefined] 1fr [picker] max-content [modes] 1fr;
+		align-items: center;
+	}
+	.fhc-calendar-base-header .header-actions {
+		grid-column: 1 / -1;
+		grid-row: 1;
+		display: grid;
+		grid-template-columns: subgrid;
+		margin-bottom: 0;
+	}
+	.fhc-calendar-base-header .header-userdefined {
+		grid-column: userdefined;
+	}
+	.fhc-calendar-base-header .header-modes {
+		grid-column: modes;
+	}
+	.fhc-calendar-base-header .header-picker {
+		grid-column: picker;
+		grid-row: 1;
+	}
 }
 
 /* Modes */
diff --git a/public/js/components/Calendar/Base/Header.js b/public/js/components/Calendar/Base/Header.js
index c1dae4bc0..46b5843f9 100644
--- a/public/js/components/Calendar/Base/Header.js
+++ b/public/js/components/Calendar/Base/Header.js
@@ -47,37 +47,11 @@ export default {
 	},
 	template: /* html */`
 	<div class="fhc-calendar-base-header">
-		<div class="row">
-			<div class="col">
+		<div class="header-actions">
+			<div class="header-userdefined">
 				<slot />
 			</div>
-			<div class="col-auto d-flex justify-content-center">
-				<div class="btn-group" role="group">
-					<button
-						class="btn btn-outline-secondary border-0"
-						@click="$emit('prev')"
-						:disabled="open"
-					>
-						<i class="fa fa-chevron-left"></i>
-					</button>
-					<date-picker
-						:mode="mode"
-						:date="date"
-						@update:date="$emit('update:date', $event)"
-						@open="open = true"
-						@closed="open = false"
-						:list-length="modeOptions.length"
-					/>
-					<button
-						class="btn btn-outline-secondary border-0"
-						@click="$emit('next')"
-						:disabled="open"
-					>
-						<i class="fa fa-chevron-right"></i>
-					</button>
-				</div>
-			</div>
-			<div class="col">
+			<div class="header-modes">
 				<div class="d-flex gap-1 justify-content-end" role="group">
 					<button
 						v-if="btnMonth"
@@ -118,6 +92,32 @@ export default {
 				</div>
 			</div>
 		</div>
+		<div class="header-picker">
+			<div class="btn-group" role="group">
+				<button
+					class="btn btn-outline-secondary border-0"
+					@click="$emit('prev')"
+					:disabled="open"
+				>
+					<i class="fa fa-chevron-left"></i>
+				</button>
+				<date-picker
+					:mode="mode"
+					:date="date"
+					@update:date="$emit('update:date', $event)"
+					@open="open = true"
+					@closed="open = false"
+					:list-length="modeOptions.length"
+				/>
+				<button
+					class="btn btn-outline-secondary border-0"
+					@click="$emit('next')"
+					:disabled="open"
+				>
+					<i class="fa fa-chevron-right"></i>
+				</button>
+			</div>
+		</div>
 	</div>
 	`
 }
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 5a276b889..e35cd5739 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -219,11 +219,11 @@ export default {
 						<a
 							:href="link"
 							:aria-label="title"
-							class="py-1 px-2 m-1 btn btn-outline-secondary card"
+							class="py-1 btn btn-outline-secondary"
 						>
 							<div class="d-flex flex-column">
 								<i aria-hidden="true" :class="icon"></i>
-								<span class="small">{{ title }}</span>
+								<span style="font-size:.5rem">{{ title }}</span>
 							</div>
 						</a>
 					</div>

From 602a5725181e84f068572cf2f284ff99a6de082a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 29 Jul 2025 13:48:54 +0200
Subject: [PATCH 460/572] max height for all-day container, rearange zeitraum /
 frist in lehreinheit modal

---
 public/css/components/calendar.css            |  2 ++
 public/css/components/calendar/frame.css      |  4 +++
 .../Cis/Renderer/Lehreinheit/modalContent.js  | 34 +++++++++---------
 .../Renderer/Reservierungen/modalContent.js   | 35 ++++++++++---------
 4 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/public/css/components/calendar.css b/public/css/components/calendar.css
index 1c78ccc6c..1550b2a9c 100644
--- a/public/css/components/calendar.css
+++ b/public/css/components/calendar.css
@@ -36,4 +36,6 @@
 	--fhc-calendar-radius-week-event: var(--fhc-calendar-radius-event);
 	--fhc-calendar-radius-month-event: 0;
 	--fhc-calendar-radius-list-event: var(--fhc-calendar-radius-event);
+
+	--fhc-calendar-maxheight-allday: 7.125rem;
 }
diff --git a/public/css/components/calendar/frame.css b/public/css/components/calendar/frame.css
index e5ed19385..d17cc06b4 100644
--- a/public/css/components/calendar/frame.css
+++ b/public/css/components/calendar/frame.css
@@ -89,6 +89,10 @@
 .fhc-calendar-base-grid .grid-allday .all-day-events {
 	background-color: var(--fhc-calendar-bg-allday);
 }
+.fhc-calendar-base-grid .grid-allday .all-day-events {
+	max-height: var(--fhc-calendar-maxheight-allday);
+	overflow-y: auto;
+}
 .fhc-calendar-base-grid .grid-main {
 	grid-gap: var(--fhc-calendar-gap, 1px);
 	background-color: var(--fhc-calendar-bg-body-gap, var(--fhc-calendar-bg-gap));
diff --git a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
index 0a2066d0c..d773a52ed 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js
@@ -35,18 +35,20 @@ export default {
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/CisVue/Cms/content/${this.event.ort_content_id}`
 		},
 		start_time: function () {
-			if (!this.event.start) return 'N/A';
-			if (!(this.event.start instanceof Date)) {
-				return this.event.start;
+			if (!this.event.beginn)
+				return 'N/A';
+			if (!(this.event.beginn instanceof Date)) {
+				return this.event.beginn;
 			}
-			return numberPadding(this.event.start.getHours()) + ":" + numberPadding(this.event.start.getMinutes());
+			return numberPadding(this.event.beginn.getHours()) + ":" + numberPadding(this.event.beginn.getMinutes());
 		},
 		end_time: function () {
-			if (!this.event.end) return 'N/A';
-			if (!(this.event.end instanceof Date)) {
-				return this.event.end;
+			if (!this.event.ende)
+				return 'N/A';
+			if (!(this.event.ende instanceof Date)) {
+				return this.event.ende;
 			}
-			return numberPadding(this.event.end.getHours()) + ":" + numberPadding(this.event.end.getMinutes());
+			return numberPadding(this.event.ende.getHours()) + ":" + numberPadding(this.event.ende.getMinutes());
 		}
 	},
 	methods: {
@@ -88,6 +90,14 @@ export default {
 						}}</th>
 						<td>{{methodFormatDate(event.datum)}}</td>
 					</tr>
+					<tr>
+						<th>{{
+								$p.t('ui','zeitraum')?
+								$p.t('ui','zeitraum')+':'
+								:''
+							}}</th>
+						<td>{{start_time + ' - ' + end_time}}</td>
+					</tr>
 					<tr>
 						<th>{{
 							$p.t('global','raum')?
@@ -122,14 +132,6 @@ export default {
 							</div>
 						</td>
 					</tr>
-					<tr>
-						<th>{{
-								$p.t('ui','zeitraum')?
-								$p.t('ui','zeitraum')+':'
-								:''
-							}}</th>
-						<td>{{start_time + ' - ' + end_time}}</td>
-					</tr>
 					<tr>
 						<th>{{
 							$p.t('lehre','organisationseinheit')?
diff --git a/public/js/components/Cis/Renderer/Reservierungen/modalContent.js b/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
index 571bbde29..66428e37f 100644
--- a/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
+++ b/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
@@ -32,18 +32,20 @@ export default {
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + `/CisVue/Cms/content/${this.event.ort_content_id}`
 		},
 		start_time: function () {
-			if (!this.event.start) return 'N/A';
-			if (!this.event.start instanceof Date) {
-				return this.event.start;
+			if (!this.event.beginn)
+				return 'N/A';
+			if (!this.event.beginn instanceof Date) {
+				return this.event.beginn;
 			}
-			return numberPadding(this.event.start.getHours()) + ":" + numberPadding(this.event.start.getMinutes());
+			return numberPadding(this.event.beginn.getHours()) + ":" + numberPadding(this.event.beginn.getMinutes());
 		},
 		end_time: function () {
-			if (!this.event.end) return 'N/A';
-			if (!this.event.end instanceof Date) {
-				return this.event.end;
+			if (!this.event.ende)
+				return 'N/A';
+			if (!this.event.ende instanceof Date) {
+				return this.event.ende;
 			}
-			return numberPadding(this.event.end.getHours()) + ":" + numberPadding(this.event.end.getMinutes());
+			return numberPadding(this.event.ende.getHours()) + ":" + numberPadding(this.event.ende.getMinutes());
 		}
 	},
 	methods: {
@@ -69,6 +71,14 @@ export default {
 						}}</th>
 						<td>{{methodFormatDate(event.datum)}}</td>
 					</tr>
+					<tr>
+						<th>{{
+								$p.t('ui','zeitraum')?
+								$p.t('ui','zeitraum')+':'
+								:''
+							}}</th>
+						<td>{{start_time + ' - ' + end_time}}</td>
+					</tr>
 					<tr>
 						<th>{{
 							$p.t('global','raum')?
@@ -93,15 +103,6 @@ export default {
 							</div>
 						</td>
 					</tr>
-					<tr>
-						<th>{{
-								$p.t('ui','zeitraum')?
-								$p.t('ui','zeitraum')+':'
-								:''
-							}}</th>
-						<td>{{start_time + ' - ' + end_time}}</td>
-					</tr>
-					
 				</tbody>
 		</table>
 		

From ee5391f11abe40491c21497e416ca26c4ccc0a5c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 29 Jul 2025 14:27:46 +0200
Subject: [PATCH 461/572] place timeinterval left of eventtext, add missing
 success wrapper in stundenplanlib

---
 application/libraries/StundenplanLib.php |  3 +--
 public/css/Cis4/CoreCalendarEvents.css   | 17 +++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index 50835873e..488fff45a 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -70,8 +70,7 @@ class StundenplanLib{
 				return error(getData($lv_result));
 			}
 			$lv = getData($lv_result)[0];
-			return $stundenplan_data;
-			
+			return success($stundenplan_data);
 		}
 		
 		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter($student_uid));
diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index 82e7a3a31..908e23305 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -48,15 +48,16 @@
 	justify-content: space-evenly;
 	align-items: center;
 }
-.weekPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
-	justify-content: center;
-	grid-template-columns: repeat(2, auto);
-	border-bottom: solid 1px;
-	height: auto!important;
+.weekPageContainer .lehreinheitEventContent {
+	display: grid;
+	grid-template-columns: auto 1fr;
 }
-.weekPageContainer .lehreinheitEventContent #lehreinheitEventHeader :last-child:not(:first-child):before {
-	content: "-";
-	margin-inline-start: .15em;
+.weekPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
+	border-inline-end: solid 1px var(--bs-secondary);
+	align-self: stretch;
+	align-content: center;
+	padding: .25em .5em .25em .25em;
+	margin-inline-end: .25rem;
 }
 .weekPageContainer .lehreinheitEventContent #lehreinheitEventText {
 	display: flex;

From 3cd00a5e5f9a54e3a87c0066e9c09a3e47b33cc0 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 29 Jul 2025 15:27:09 +0200
Subject: [PATCH 462/572] Cleanup

---
 public/js/components/Calendar/Abstract.js   |  17 -
 public/js/components/Calendar/Calendar.js   | 301 ------------
 public/js/components/Calendar/Day.js        |  61 ---
 public/js/components/Calendar/Day/Page.js   | 490 --------------------
 public/js/components/Calendar/Header.js     |  99 ----
 public/js/components/Calendar/Minimized.js  |  26 --
 public/js/components/Calendar/Month.js      | 103 ----
 public/js/components/Calendar/Month/Page.js | 170 -------
 public/js/components/Calendar/Months.js     |  37 --
 public/js/components/Calendar/Pane.js       |  94 ----
 public/js/components/Calendar/Week.js       |  83 ----
 public/js/components/Calendar/Week/Page.js  | 387 ----------------
 public/js/components/Calendar/Weeks.js      |  69 ---
 public/js/components/Calendar/Years.js      |  61 ---
 public/js/components/Calendar/Years/Page.js |  36 --
 public/js/components/Cis/Mylv/LvModal.js    |  96 ----
 public/js/composables/CalendarDate.js       | 274 -----------
 public/js/composables/CalendarDates.js      |  16 -
 18 files changed, 2420 deletions(-)
 delete mode 100644 public/js/components/Calendar/Abstract.js
 delete mode 100644 public/js/components/Calendar/Calendar.js
 delete mode 100644 public/js/components/Calendar/Day.js
 delete mode 100644 public/js/components/Calendar/Day/Page.js
 delete mode 100644 public/js/components/Calendar/Header.js
 delete mode 100644 public/js/components/Calendar/Minimized.js
 delete mode 100644 public/js/components/Calendar/Month.js
 delete mode 100644 public/js/components/Calendar/Month/Page.js
 delete mode 100644 public/js/components/Calendar/Months.js
 delete mode 100644 public/js/components/Calendar/Pane.js
 delete mode 100644 public/js/components/Calendar/Week.js
 delete mode 100644 public/js/components/Calendar/Week/Page.js
 delete mode 100644 public/js/components/Calendar/Weeks.js
 delete mode 100644 public/js/components/Calendar/Years.js
 delete mode 100644 public/js/components/Calendar/Years/Page.js
 delete mode 100644 public/js/components/Cis/Mylv/LvModal.js
 delete mode 100644 public/js/composables/CalendarDate.js
 delete mode 100644 public/js/composables/CalendarDates.js

diff --git a/public/js/components/Calendar/Abstract.js b/public/js/components/Calendar/Abstract.js
deleted file mode 100644
index 54b0304c7..000000000
--- a/public/js/components/Calendar/Abstract.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import CalendarHeader from './Header.js';
-
-export default {
-	components: {
-		CalendarHeader
-	},
-	inject: [
-		'date',
-		'focusDate',
-		'size'
-	],
-	emits: [
-		'updateMode',
-		'change:range',
-		'input'
-	]
-}
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
deleted file mode 100644
index ab7dac2b3..000000000
--- a/public/js/components/Calendar/Calendar.js
+++ /dev/null
@@ -1,301 +0,0 @@
-import CalendarMonth from './Month.js';
-import CalendarMonths from './Months.js';
-import CalendarYears from './Years.js';
-import CalendarWeek from './Week.js';
-import CalendarWeeks from './Weeks.js';
-import CalendarDay from './Day.js';
-import CalendarMinimized from './Minimized.js';
-import CalendarDate from '../../composables/CalendarDate.js';
-import CalendarDates from '../../composables/CalendarDates.js';
-
-const todayDate = new Date(new Date().setHours(0, 0, 0, 0));
-const today = todayDate.getTime()
-
-export default {
-	components: {
-		CalendarMonth,
-		CalendarMonths,
-		CalendarYears,
-		CalendarWeek,
-		CalendarWeeks,
-		CalendarDay,
-		CalendarMinimized,
-	},
-	provide() {
-		return {
-			today,
-			todayDate,
-			date: this.date,
-			focusDate: this.focusDate,
-			size: Vue.computed({ get: () => this.size }),
-			containerHeight: Vue.computed({ get: () => this.containerHeight }),
-			containerWidth: Vue.computed({ get: () => this.containerWidth }),
-			
-			events: Vue.computed(() => this.eventsPerDay),
-			filteredEvents: Vue.computed(() => this.filteredEvents),
-			minimized: Vue.computed({ get: () => this.minimized, set: v => this.$emit('update:minimized', v) }),
-			showWeeks: this.showWeeks,
-			noMonthView: this.noMonthView,
-			noWeekView: this.noWeekView,
-			eventsAreNull: Vue.computed(() => this.events === null),
-			mode: Vue.computed(()=>this.mode),
-			selectedEvent: Vue.computed(() => this.selectedEvent),
-			setSelectedEvent: (event)=>{this.selectedEvent = event;},
-		};
-	},
-	props: {
-		events: Array,
-		initialDate: {
-			type: [Date, String],
-			default: new Date()
-		},
-		showWeeks: {
-			type: Boolean,
-			default: true
-		},
-		initialMode: {
-			type: String,
-			default: 'month'
-		},
-		minimized: Boolean,
-		noWeekView: Boolean,
-		noMonthView: Boolean
-	},
-	watch:{
-		mode(newVal) {
-			this.$emit('change:mode', newVal)
-		},
-		selectedEvent:{
-			handler(newSelectedEvent) {
-				this.$emit('selectedEvent', newSelectedEvent);
-			},
-			immediate: true,
-		},
-		// scroll to the first event if the html element was found
-		scrollTime(newValue,oldValue){
-			// return early if the scrollTime is not set
-			if (!newValue.scrollTime || !newValue?.doScroll) return;
-			if (newValue?.scrollTime == oldValue?.scrollTime && newValue?.focusDate.d==oldValue?.focusDate.d) {
-				return;
-			}
-			// scroll the LvPlan to the closest event
-			let previousScrollAnchor = document.getElementById('scroll' + (newValue.scrollTime - 1) + this.focusDate.d + this.focusDate.w)
-			let scrollAnchor = document.getElementById('scroll' + newValue.scrollTime + this.focusDate.d + this.focusDate.w);
-			if (previousScrollAnchor) {
-				previousScrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
-			}
-			else {
-				if (scrollAnchor) {
-					scrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
-				}
-			}
-			
-		},
-	},
-	emits: [
-		'select:day',
-		'select:event',
-		'change:range',
-		'change:mode',
-		'update:minimized',
-		'selectedEvent',
-		'change:offset'
-	],
-	data() {
-		return {
-			header: '',
-			prevMode: null,
-			currMode: null,
-			date: new CalendarDate(),
-			focusDate: new CalendarDate(),
-			size: 0,
-			containerWidth: 0,
-			containerHeight: 0,
-			selectedEvent:null,
-		}
-	},
-	computed: {
-		sizeClass() { 
-			// mainly determines calendar font-size
-			return 'fhc-calendar-' + ['xs', 'sm', 'md', 'lg'][this.size];
-		},
-		mode: {
-			get() { return this.minimized ? 'minimized' : this.currMode; },
-			set(v) {
-				if (!v && this.prevMode) {
-					this.currMode = this.prevMode;
-					this.prevMode = null;
-				} else {
-					this.prevMode = this.currMode;
-					this.currMode = v;
-				}
-			}
-		},
-		eventsPerDay() {
-			if (!this.events)
-				return {};
-			return this.events.reduce((result, event) => {
-				let days = Math.ceil((event.end - event.start) / 86400000) || 1;
-				while (days-- > 0) {
-					let day = (new Date(event.start.getFullYear(), event.start.getMonth(), event.start.getDate() + days)).toDateString();
-					if (!result[day])
-						result[day] = [];
-					result[day].push(event);
-				}
-				return result;
-			}, {});
-		},
-		// returns the hour of the earliest event, used to scroll to the events in the calendar (week / day view)
-		scrollTime() {
-				let doScroll = true;	
-				// return the first beginning time of the filtered events
-				if(this.filteredEvents && Array.isArray(this.filteredEvents) && this.filteredEvents.length > 0)
-				{
-					let scrollTimeEvents = this.filteredEvents.filter(event=>{
-						return event.type !== 'moodle';
-					});
-					// do not compute a new scroll time if there are no other events than moodle events
-					if(!(scrollTimeEvents.length >0)){
-						doScroll = false;
-					}
-					let scrollTime = parseInt(scrollTimeEvents.sort((a, b) => parseInt(a.beginn) - parseInt(b.beginn))[0]?.beginn);
-					// to ensure that the scrollTime watcher triggers even if the scrollTime doesn't change, it returns both the scrollTime and the focusDate
-					return { focusDate: { d: this.focusDate.d, w: this.focusDate.w}, doScroll, scrollTime };	
-				}
-				// there is no event that matches the current view mode constraints
-				else 
-				{
-					return { focusDate: { d: this.focusDate.d, w: this.focusDate.w }, doScroll,scrollTime: null };
-				}
-			},
-		// filters the events based on the current calendar view mode
-		// week view - filter events based on their week
-		// day view - filter events based on their day and week
-		// month view - does not filter the events
-		filteredEvents: function(){
-			if (this.events && Array.isArray(this.events) && this.events.length > 0) {
-				let filteredEvents = this.events.filter(event => {
-					let eventDate = new CalendarDate(new Date(event.datum));
-					if (this.mode == 'week' || this.mode == 'Week')
-					{
-						// week view filters the elements only for the same week
-						return this.focusDate.w == eventDate.w;
-					}
-					else if (this.mode == 'day' || this.mode == 'Day')
-					{
-						// day view filters the elements for the same day and the same week
-						return this.focusDate.d == eventDate.d && this.focusDate.w == eventDate.w;
-					}
-					else
-					{
-						// returns all the events, does not filter the events
-						return true;
-					}
-				})
-				
-				return filteredEvents;
-			}
-			else
-			{
-				return null;
-			}
-		},
-	},
-	methods: {
-		handleRangeOffset(event){
-			
-			let date = new Date(
-				this.focusDate.y,
-				this.focusDate.m,
-				this.focusDate.d
-			);
-			
-			date = date.getFullYear() + "-" +
-				String(date.getMonth() + 1).padStart(2, "0") + "-" +
-				String(date.getDate()).padStart(2, "0");
-
-			
-			this.$router.push({
-				name: "LvPlan",
-				params: {
-					mode: this.mode[0].toUpperCase() + this.mode.slice(1),
-					focus_date: date,
-					lv_id: this.$route.params.lv_id || null
-				}
-			});
-
-			this.$emit('change:range',event);
-		},
-		setMode(mode) {
-			this.mode = mode
-		},
-		handleInput(day) {
-			this.$emit(day[0], day[1]);
-		},
-	},
-	created() {
-		const initMode = this.initialMode.toLowerCase()
-		const allowedInitialModes = ['day'];
-		if (!this.noWeekView)
-			allowedInitialModes.push('week');
-		if (!this.noMonthView)
-			allowedInitialModes.push('month');
-		this.mode = allowedInitialModes[allowedInitialModes.indexOf(initMode)] || allowedInitialModes.pop();
-		this.date.set(new Date(this.initialDate));
-		this.focusDate.set(this.date);
-	},
-	mounted() {
-		if (this.$refs.container) {
-			new ResizeObserver(entries => {
-				for (const entry of entries) {
-					const w = entry.contentBoxSize ? entry.contentBoxSize[0].inlineSize : entry.contentRect.width;
-					const h = entry.contentBoxSize ? entry.contentBoxSize[0].blockSize : entry.contentRect.height;
-
-					// https://getbootstrap.com/docs/5.0/layout/breakpoints/
-					// bootstrap breakpoints watch window size and this function monitors container size of calendar itself.
-					// calendar is using bootstrap breakpoints which influence layout, which retriggers this function 
-					// -> some width constellations will loop so we dont use values around bs5 breakpoints
-					// ['xs', 'sm', 'md', 'lg'][this.size]
-					if (w >= 600)
-						this.size = 3;
-					else if (w >= 350)
-						this.size = 2;
-					else if (w >= 250)
-						this.size = 1;
-					else
-						this.size = 0;
-					
-					this.containerWidth = w
-					this.containerHeight = h
-				}
-			}).observe(this.$refs.container);
-		}
-	},
-	unmounted(){
-		CalendarDates.cleanup();
-	},
-	template: /*html*/`
-	<div ref="container" class="fhc-calendar card h-100" :class="sizeClass">
-		<component :is="'calendar-' + mode" @updateMode="mode = $event" @change:range="handleRangeOffset"
-		 @input="handleInput" >
-			<template #calendarDownloads>
-				<slot name="calendarDownloads" ></slot>
-			</template>
-			<template #monthPage="{event,day}">
-				<slot name="monthPage" :event="event" :day="day" ></slot>
-			</template>
-			<template #weekPage="{event,day}">
-				<slot name="weekPage" :event="event" :day="day" ></slot>
-			</template>
-			<template #dayPage="{event,day,mobile}">
-				<slot name="dayPage" :event="event" :day="day" :mobile="mobile"></slot>
-			</template>
-			<template #pageMobilContent="{lvMenu, event}">
-				<slot name="pageMobilContent" :lvMenu="lvMenu" :event="event"></slot>
-			</template>
-			<template #minimizedPage="{event,day}">
-				<slot name="minimizedPage" :event="event" :day="day"></slot>
-			</template>
-		</component>
-	</div>`
-}
diff --git a/public/js/components/Calendar/Day.js b/public/js/components/Calendar/Day.js
deleted file mode 100644
index 13128a520..000000000
--- a/public/js/components/Calendar/Day.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import CalendarAbstract from './Abstract.js';
-import CalendarPane from './Pane.js';
-import CalendarDayPage from './Day/Page.js';
-import CalendarDate from '../../composables/CalendarDate.js';
-
-export default {
-	mixins: [
-		CalendarAbstract
-	],
-	components: {
-		CalendarDayPage,
-		CalendarPane
-	},
-	computed: {
-		title() {
-			return this.focusDate.wYear + ' KW ' + this.focusDate.w;
-		}
-	},
-	methods: {
-		paneChanged(dir) {
-			let previousDate = new CalendarDate(this.focusDate);
-			this.focusDate.d += dir;
-			this.emitRangeChanged(previousDate);
-		},
-		emitRangeChanged(previousDate, mounted) {
-			this.$emit('change:range', { start: previousDate, end:this.focusDate });
-		},
-		prev() {
-			this.$refs.pane.prev();
-			this.$emit('change:offset', { y: 0, m: 0, d: -1 });
-		},
-		next() {
-			this.$refs.pane.next();
-			this.$emit('change:offset', { y: 0, m: 0, d: 1 });
-		},
-		selectEvent(event) {
-			this.$emit('input', ['select:event', event]);
-		}
-	},
-	mounted() {
-		this.emitRangeChanged(new CalendarDate(this.focusDate.y, this.focusDate.m, this.focusDate.d -1), true);
-	},
-	template: /*html*/`
-	<div class="fhc-calendar-day">
-		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" @click="$emit('updateMode', 'week')">
-			<template #calendarDownloads>
-				<slot name="calendarDownloads"></slot>
-			</template>
-		</calendar-header>
-		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
-			<calendar-day-page :active="slot.active" :year="focusDate.y" :week="focusDate.w+slot.offset" @updateMode="$emit('updateMode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" >
-				<template #dayPage="{event,day,mobile}">
-					<slot name="dayPage" :event="event" :day="day" :mobile="mobile" ></slot>
-				</template>
-				<template #pageMobilContent="{lvMenu, event}">
-					<slot name="pageMobilContent" :lvMenu="lvMenu" :event="event" ></slot>
-				</template>
-			</calendar-day-page>
-		</calendar-pane>
-	</div>`
-}
diff --git a/public/js/components/Calendar/Day/Page.js b/public/js/components/Calendar/Day/Page.js
deleted file mode 100644
index 43154aa0a..000000000
--- a/public/js/components/Calendar/Day/Page.js
+++ /dev/null
@@ -1,490 +0,0 @@
-import CalendarDate from '../../../composables/CalendarDate.js';
-import LvModal from "../../../components/Cis/Mylv/LvModal.js";
-
-import ApiLvPlan from '../../../api/factory/lvPlan.js';
-import ApiAddons from '../../../api/factory/addons.js';
-
-function ggt(m, n) {
-	return n == 0 ? m : ggt(n, m % n);
-}
-
-function kgv(m, n) {
-	return (m * n) / ggt(m, n);
-}
-
-export default {
-	name: 'DayPage',
-	components: {
-		LvModal,
-	},
-	data() {
-		return {
-			hourPosition: null,
-			curHourPosition: null,
-			hourPositionTime: null,
-			lvMenu: null,
-		}
-	},
-	inject: [
-		'today',
-		'todayDate',
-		'date',
-		'focusDate',
-		'size',
-		'events',
-		'noMonthView',
-		'filteredEvents',
-		'isSliding',
-		'calendarScrollTop',
-		'calendarClientHeight',
-		'setSelectedEvent',
-		'selectedEvent',
-		'rowMinHeight'
-	],
-	props: {
-		year: Number,
-		week: Number,
-		active: Boolean,
-	},
-	emits: [
-		'updateMode',
-		'page:back',
-		'page:forward',
-		'input'
-	],
-	watch: {
-		//TODO: on first render non of the day-page components are active and the watcher on selectedEvent does not fetch the lvMenu
-		//TODO: workaround is to watch the active state and refetch in case the lvMenu is empty
-		activeAndEventsReady: {
-			handler({active,events}) {
-				// handles fetching the lvMenu
-				if (active) {
-					if (!this.lvMenu) {
-						this.fetchLvMenu(this.selectedEvent);
-					}
-				
-					if(events){
-						// if no event is selected, select the first event of the day
-						if (this.selectedEvent == null && this.events[this.day.toDateString()]?.length > 0) {
-							let events = this.events[this.day.toDateString()].sort((a,b)=>{
-								let [a_stunde,a_minute,a_sekunden]= a.beginn.split(":");
-								let [b_stunde, b_minute, b_sekunden] = b.beginn.split(":");
-								a_stunde = Number(a_stunde);
-								a_minute = Number(a_minute);
-								a_sekunden= Number(a_sekunden);
-								b_stunde = Number(b_stunde);
-								b_minute = Number(b_minute);
-								b_sekunden = Number(b_sekunden);
-								if(a_stunde > b_stunde){
-									return 1;
-								}
-								else if(b_stunde > a_stunde){
-									return -1;
-								}
-								else if(a_minute > b_minute){
-									return 1;
-								}
-								else if (b_minute > a_minute){
-									return -1;
-								}
-								else{
-									return a_sekunden > b_sekunden? 1:-1;
-								}
-								
-							});
-							if (Array.isArray(events) && events.length > 0) {
-								this.setSelectedEvent(events[0]);
-							}
-						}
-					}
-				}
-			},
-			immediate: true,
-		},
-		selectedEvent: {
-			handler(event) {
-				// return early if the day-page component is not the active carousel item
-				if (!this.active) {
-					return;
-				}
-				this.lvMenu = null;
-				this.fetchLvMenu(event);
-			},
-			immediate: true,
-		},
-		isSliding: {
-			handler(value) {
-				if (value) {
-					this.setSelectedEvent(null);
-				}
-			}
-		}
-	},
-	computed: {
-		activeAndEventsReady(){
-			return {
-				active: this.active,
-				events: this.events,
-			}
-		},
-		allDayEvents() {
-			let allDayEvents = {};
-			for (let day in this.events) {
-				const filteredAllDayEvents = this.events[day].filter(event => event.allDayEvent);
-				if (filteredAllDayEvents.length > 0) {
-					allDayEvents[day] = filteredAllDayEvents;
-				}
-			};
-			return allDayEvents;
-		},
-		overlayStyle() {
-			return {
-				height:  this.getDayTimePercent + '%',
-			}
-		},
-		pageHeaderStyle() {
-			return {
-				'z-index': 4,
-				'grid-template-columns': 'repeat(' + this.day.length + ', 1fr)',
-				'grid-template-rows': 1,
-				position: 'sticky',
-				top: 0,
-			}
-		},
-		dayText(){
-			if(!this.day)return {};
-			return {
-				heading: this.day.toLocaleString(this.$p.user_locale.value, { dateStyle: 'short' }),
-				tag: this.day.toLocaleString(this.$p.user_locale.value, { weekday: this.size < 2 ? 'narrow' : (this.size < 3 ? 'short' : 'long') }),
-				datum: this.day.toLocaleString(this.$p.user_locale.value, [{ day: 'numeric', month: 'numeric' }, { day: 'numeric', month: 'numeric' }, { day: 'numeric', month: 'numeric' }, { dateStyle: 'short' }][this.size]),
-			}
-		},
-		noLvStyle() {
-			return {
-				top: (this.calendarScrollTop + 100) + 'px',
-				position: 'absolute',
-				left: 0,
-				'text-align': 'center',
-				width: '100%',
-				'z-index': 1,
-			}
-		},
-		indicatorStyle() {
-			return {
-				'pointer-events': 'none',
-				'padding-left': '3.5rem',
-				'margin-top': '-1px',
-				'z-index': 2,
-				'border-color': 'var(--fhc-border)',
-				top: this.hourPosition + 'px',
-				left: 0,
-				right: 0,
-			}
-		},
-		curTime() {
-			const now = new Date();
-			return String(now.getHours()).padStart(2, '0') + ':' + String(now.getMinutes()).padStart(2, '0');
-		},
-		curIndicatorStyle() {
-			return {
-				top:  this.getDayTimePercent + '%',
-			}
-		},
-		noEventsCondition() {
-			return !this.isSliding && (this.filteredEvents?.length === 0 || !this.filteredEvents);
-		},
-		hours() {
-			// returns an array with elements starting at 7 and ending at 24
-			return [...Array(24).keys()].filter(hour => hour >= 7 && hour <= 24);
-		},
-		day() {
-			return new Date(this.focusDate.y, this.focusDate.m, this.focusDate.d);
-		},
-		eventsPerDayAndHour() {
-			// return early if the calendar pane is sliding
-			if (this.isSliding) return {};
-
-			const res = {};
-
-			let key = this.day.toDateString();
-
-			let nextDay = new Date(this.day);
-			nextDay.setDate(nextDay.getDate() + 1);
-			nextDay.setMilliseconds(nextDay.getMilliseconds() - 1);
-			let d = {events: [], lanes: 1};
-			if (this.events[key]) {
-				this.events[key].forEach(evt => {
-					if (evt.allDayEvent) return;
-					let event = {
-						orig: evt,
-						lane: 1,
-						maxLane: 1,
-						start: evt.start < this.day ? this.day : evt.start,
-						end: evt.end > nextDay ? nextDay : evt.end,
-						shared: [],
-						setSharedMaxRecursive(doneItems) {
-							this.maxLane = Math.max(doneItems[0].maxLane, this.maxLane);
-							doneItems.push(this);
-							this.shared.filter(other => !doneItems.includes(other)).forEach(i => i.setSharedMaxRecursive(doneItems));
-						}
-					};
-					event.shared = d.events.filter(other => other.start < event.end && other.end > event.start);
-					event.shared.forEach(other => other.shared.push(event));
-					let occupiedLanes = event.shared.map(other => other.lane);
-					while (occupiedLanes.includes(event.lane))
-						event.lane++;
-					event.maxLane = Math.max(...[event.lane], ...occupiedLanes);
-					if (event.maxLane > 1) {
-						event.setSharedMaxRecursive([event]);
-					}
-					d.events.push(event);
-				});
-				d.lanes = d.events.map(e => e.maxLane).reduce((res, i) => kgv(res, i), 1);
-			}
-			res[key] = d;
-
-			return res;
-		},
-		smallestTimeFrame() {
-			return [30, 15, 10, 5][this.size];
-		},
-		lookingAtToday() {
-			return this.date.compare(this.todayDate)
-		},
-		getDayTimePercent() {
-			const now = new Date(Date.now())
-			const currentMinutes = now.getMinutes() + now.getHours() * 60
-			let timePercentage = ((currentMinutes - (this.hours[0] * 60)) / (this.hours.length * 60)) * 100;
-
-			return timePercentage
-		}
-	},
-	methods: {
-		dayScrollBehavior(event){
-			this.$refs.dayScrollContainer?.scrollBy({ top: Math.sign(event.deltaY) * 100, behavior: 'instant' });
-		},
-		dayGridStyle(day) {
-			const styleObj = {
-				'grid-template-columns': '1 1fr',
-				'grid-template-rows': 'repeat(' + (this.hours.length * 60 / this.smallestTimeFrame) + ', 1fr)',
-			}
-
-			if(this.date.compare(this.todayDate)) {
-				styleObj['backgroundImage'] = 'linear-gradient(to bottom, var(--calendar-past) '+this.getDayTimePercent+'%, transparent '+this.getDayTimePercent+'%)'
-				// styleObj.opacity = 0.5; // would opaque the whole column
-			}
-
-			return styleObj
-		},
-		fetchLvMenu(event) {
-			if (event && event.type == 'lehreinheit') {
-				this.$api
-					.call(ApiLvPlan.getLehreinheitStudiensemester(event.lehreinheit_id[0]))
-					.then(res => res.data)
-					.then(studiensemester_kurzbz => this.$api.call(
-						ApiAddons.getLvMenu(
-							event.lehrveranstaltung_id,
-							studiensemester_kurzbz
-						)
-					))
-					.then(res => {
-						if (res.data) {
-							this.lvMenu = res.data;
-						}
-					});
-			}
-		},
-		hourGridIdentifier(hour) {
-			// this is the id attribute that is responsible to scroll the calender to the first event
-			return 'scroll' + hour + this.focusDate.d + this.week;
-		},
-		hourGridStyle(hour) {
-			return {
-				'pointer-events': 'none',
-				top: this.getAbsolutePositionForHour(hour),
-				left: 0,
-				right: 0,
-				'z-index': 0,
-			}
-		},
-		eventGridStyle(day, event) {
-			return {
-				'z-index': 1,
-				'grid-column-start': 1 + (event.lane - 1) * day.lanes / event.maxLane,
-				'grid-column-end': 1 + event.lane * day.lanes / event.maxLane,
-				'grid-row-start': this.dateToMinutesOfDay(event.start),
-				'grid-row-end': this.dateToMinutesOfDay(event.end),
-				'background-color': event.orig.color,
-				'--test': this.dateToMinutesOfDay(event.end),
-			}
-		},
-		eventClick(evt) {
-			let event = evt.orig || evt;
-			this.setSelectedEvent(event);
-			this.$emit('input', event);
-		},
-		calcHourPosition(event) {
-			let height = this.$refs.events.getBoundingClientRect().height;
-			let top = this.$refs.events.getBoundingClientRect().top;
-			let position = event.clientY - top;
-			// position percentage of total height
-			let timePercentage = (position / height) * 100;
-			// minute percentage of total minutes
-			let result = (this.hours.length * 60) * (timePercentage / 100);
-			// calculate time in float
-			let currentMinutes = ((result + (this.hours[0] * 60)) / 60);
-			// get hour part of time
-			let currentHour = Math.floor(currentMinutes);
-			// get float part of time
-			let minutePercentage = currentMinutes % currentHour;
-			// calculate minutes from float part of time
-			let minute = Math.round(60 * minutePercentage);
-			// convert minutes to 5 minute interval
-			if (minute % 5 != 0) {
-				minute = Math.round(minute / 5) * 5;
-			}
-			// in case the rounding made the minutes 60, increase the hour and reset the minutes
-			if (minute == 60) {
-				currentHour++;
-				minute = 0;
-			}
-
-			// ## after rounding the time to the nearest 5 Minute interval, we have to convert the time back to the relative position
-			// convert current time in minutes
-			currentMinutes = currentHour * 60 + minute;
-			// calculate the minutes percentage of the total minutes 
-			timePercentage = ((currentMinutes - (this.hours[0] * 60)) / (this.hours.length * 60)) * 100;
-			// calculate the relative position of the time percentage
-			position = height * (timePercentage / 100);
-			this.hourPosition = position;
-
-			// add padding to minutes that consist of only one digit
-			minute.toString().length == 1 ? minute = "0" + minute : minute;
-			this.hourPositionTime = currentHour + ":" + minute;
-		},
-		getAbsolutePositionForHour(hour) {
-			// used for the absolute positioning of the gutters of hours
-			return (100 / this.hours.length) * (hour - (24 - this.hours.length)) + '%';
-		},
-		changeToMonth(day) {
-			if (!this.noMonthView) {
-				this.date.set(day);
-				this.focusDate.set(day);
-				this.$emit('updateMode', 'month');
-			}
-		},
-		dateToMinutesOfDay(day) {
-			return Math.floor(((day.getHours() - 7) * 60 + day.getMinutes()) / this.smallestTimeFrame) + 1;
-		}
-
-	},
-	template: /*html*/`
-	<div class="fhc-calendar-day-page h-100">
-		<div class="row m-0 h-100">
-			<div style="overflow:auto" class="col-12 col-xl-6 p-0 h-100">
-				<div class="d-flex flex-column h-100 border">
-					<div ref="header" class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="pageHeaderStyle">
-						<div type="button" class="flex-grow-1" :title="dayText.heading" @click.prevent="changeToMonth(day)">
-							<div class="day fw-bold">{{dayText.tag}}</div>
-							<a href="#" class="small date text-decoration-none" >{{dayText.datum}}</a>
-						</div>
-					</div>
-					<div @wheel.prevent="dayScrollBehavior" id="scrollContainer" ref="dayScrollContainer" style="height: 100%; overflow-y: scroll;">
-
-						<div ref="eventcontainer" class="position-relative flex-grow-1"  >
-							<div class="all-day-event-container" >
-								<div @wheel.stop class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
-									<template v-for="(events,_day) in allDayEvents" :key="_day">
-										<div
-											v-if="dayindex == _day"
-											v-for="event in events"
-											:key="event"
-											style="top:0;"
-											@click.prevent="eventClick(event)"
-											:selected="event == selectedEvent"
-											:style="{'background-color': event?.color, 'margin-bottom':'1px'}"
-											class="d-grid m-1 small rounded overflow-hidden fhc-entry"
-											v-contrast
-											>
-											<div class="d-none d-xl-block">
-													<slot name="dayPage" :event="event" :day="day" :mobile="false">
-														<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
-													</slot>
-												</div>
-												<div class="d-block d-xl-none">
-													<slot name="dayPage" :event="event" :day="day" :mobile="true">
-														<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
-													</slot>
-												</div>
-										</div>
-									</template>
-								</div>
-							</div>
-
-
-
-							<div >
-								<h1 v-if="noEventsCondition" class="m-0 bs-body" ref="noEventsText" :style="noLvStyle">{{ $p.t('lehre/noLvFound') }}</h1>
-								<div class="events position-relative" :class="{'fhc-calendar-no-events-overlay':noEventsCondition}" ref="events" @mousemove="calcHourPosition" @mouseleave="hourPosition = null">
-									<Transition>
-										<div v-if="hourPosition && !noEventsCondition" class="position-absolute border-top small"  :style="indicatorStyle">
-											<span class="border border-top-0 px-2">{{hourPositionTime}}</span>
-										</div>
-									</Transition>
-									<Transition>
-										<div v-if="lookingAtToday && !noEventsCondition" class="curTimeIndicator border-top small"  :style="curIndicatorStyle">
-											<span class="border border-top-0 px-2">{{curTime}}</span>
-										</div>
-									</Transition>
-									<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour"  class="position-absolute box-shadow-border" :style="hourGridStyle(hour)"></div>
-									<div class="hours">
-										<div v-for="hour in hours" :style="'min-height:' + rowMinHeight " :key="hour" class="text-end small" :ref="'hour' + hour">{{hour}}:00</div>
-									</div>
-									<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" class=" day border-start" :style="dayGridStyle(day)">
-
-										<div v-if="lookingAtToday && !noEventsCondition" class="overlay" :style="overlayStyle"></div>
-										<div v-for="event in day.events" :key="event" :style="eventGridStyle(day,event)" v-contrast
-											:selected="event.orig == selectedEvent" class="fhc-entry mx-2 small border border-secondary rounded overflow-hidden" >
-											<!-- desktop version of the page template, parent receives slotProp mobile = false -->
-											<div class="d-none d-xl-block h-100 "  @click.prevent="eventClick(event)">
-												<slot  name="dayPage" :event="event.orig" :day="day" :mobile="false">
-													<p>this is a slot placeholder</p>
-												</slot>
-											</div>
-											<!-- mobile version of the page template, parent receives slotProp mobile = true -->
-											<div class="d-block d-xl-none h-100 " @click.prevent="eventClick(event)">
-												<slot  name="dayPage" :event="event.orig" :day="day" :mobile="true">
-													<p>this is a slot placeholder</p>
-												</slot>
-											</div>
-
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="d-xl-block col-xl-6 p-4 d-none" style="max-height: 100%">
-					<div @wheel.stop style="max-height: 100%; overflow-y:auto;" class="w-100">
-						<template v-if="selectedEvent ">
-							<slot name="pageMobilContent" :event="selectedEvent" :lvMenu="lvMenu" >
-								<p>this is a slot placeholder</p>
-							</slot>
-						</template>
-						<template v-else-if="noEventsCondition">
-							<h3>Keine Lehrveranstaltungen</h3>
-						</template>
-						<template v-else>
-							<div class="p-4 d-flex w-100 justify-content-center align-items-center">
-								<i class="fa-solid fa-spinner fa-pulse fa-3x"></i>
-							</div>
-						</template>
-					</div>
-			</div>
-		</div>	
-	</div>
-
-`
-}
diff --git a/public/js/components/Calendar/Header.js b/public/js/components/Calendar/Header.js
deleted file mode 100644
index 7ddb384f2..000000000
--- a/public/js/components/Calendar/Header.js
+++ /dev/null
@@ -1,99 +0,0 @@
-export default {
-	data(){
-		return{
-			selected: this.mode,
-			modes:{
-				day: { mode_bezeichnung: "day", icon: "fa-calendar-day" , condition:true}, 
-				week: { mode_bezeichnung: "week", icon: "fa-calendar-week", condition: !this.noWeekView }, 
-				month: { mode_bezeichnung: "month", icon: "fa-calendar-days", condition: !this.noMonthView }, 
-			},
-			headerPadding:null,
-		}
-	},
-	inject: [
-		'eventsAreNull',
-		'size',
-		'mode',
-		'noWeekView',
-		'noMonthView',
-		'containerWidth'
-	],
-	props: {
-		title: String
-	},
-	emits: [
-		'updateMode',
-		'prev',
-		'next',
-		'click'
-	],
-	methods:{
-		modeAriaLabelText(mode) {
-			switch (mode.toLowerCase()) {
-				case "day": return this.$p.t('LvPlan', 'modeDay');
-				case "week": return this.$p.t('LvPlan', 'modeWeek');
-				case "month": return this.$p.t('LvPlan', 'modeMonth');
-			}
-		},
-	},
-	computed: {
-		getHeaderClassSide() {
-			return this.containerWidth > 780 ? 'col-3' : 'col-12'
-		},
-		getHeaderClassMiddle() {
-			return this.containerWidth > 780 ? 'col-6' : 'col-12'
-		},
-		previousButtonAriaLabelText(){
-			switch(this.mode.toLowerCase()){
-				case "day": return this.$p.t('LvPlan', 'previousDay');
-				case "week": return this.$p.t('LvPlan', 'previousWeek');
-				case "weeks": return this.$p.t('LvPlan', 'previousYear');
-				case "month": return this.$p.t('LvPlan', 'previousMonth');
-			}
-		},
-		nextButtonAriaLabelText() {
-			switch (this.mode.toLowerCase()) {
-				case "day": return this.$p.t('LvPlan', 'nextDay');
-				case "week": return this.$p.t('LvPlan', 'nextWeek');
-				case "weeks": return this.$p.t('LvPlan', 'nextYear');
-				case "month": return this.$p.t('LvPlan', 'nextMonth');
-			}
-		},
-		
-	},
-	template: /*html*/`
-	<div class="calendar-header card-header w-100">
-		<div class="row align-items-center ">
-			<div :class="getHeaderClassSide" class="d-flex justify-content-center justify-content-md-start align-items-center">
-				<slot name="calendarDownloads"></slot>
-			</div>
-			<div :class="getHeaderClassMiddle" :style="{'padding-left':headerPadding}">
-				<div class="row align-items-center justify-content-center">
-					<div class="col-auto p-2">
-						<button class="btn btn-outline-secondary border-0" :class="{'btn-sm':!this.size}" @click="$emit('prev')" v-tooltip.top="{ value: previousButtonAriaLabelText, showDelay: 1000}" :aria-label="previousButtonAriaLabelText"><i class="fa fa-chevron-left" aria-hidden="true"></i></button>
-					</div>
-					<div class="justify-content-center text-center col-auto">
-						<div class="d-flex justify-content-center align-items-center">
-							<button id="calendarHeaderTitle" class="btn btn-link text-decoration-none" :class="{'btn-sm': !this.size}" @click="$emit('click')">
-								{{ title }}
-								<i v-if="eventsAreNull" class="fa fa-spinner fa-pulse"></i>
-							</button>
-						</div>
-					</div>
-					<div class="col-auto p-2">
-						<button class="btn btn-outline-secondary border-0" :class="{'btn-sm': !this.size}" @click="$emit('next')" v-tooltip.top="{value:nextButtonAriaLabelText, showDelay:1000}" :aria-label="previousButtonAriaLabelText"><i class="fa fa-chevron-right" aria-hide="true"></i></button>
-					</div>
-				</div>
-			</div>
-			<div ref="viewButtons" v-if="!noWeekView && !noMonthView" :class="getHeaderClassSide" class="d-flex justify-content-center justify-content-md-end align-items-center" style="pointer-events: none;">
-				<div  style="pointer-events: all;">
-					<div  role="group" aria-label="Kalender Modus">
-						<button :aria-label="modeAriaLabelText(mode_bezeichnung)" v-tooltip.top="{value:modeAriaLabelText(mode_bezeichnung), showDelay:1000}" type="button" :class="{'active':mode_kurzbz.toLowerCase() === mode.toLowerCase()}" style="margin-right: 4px;" @click.prevent="$emit('updateMode',mode_kurzbz)" class="btn btn-outline-secondary card d-inline-block" v-for="({mode_bezeichnung,icon,condition},mode_kurzbz) in modes">
-							<i aria-hidden="true" v-if="condition" class="fa" :class="icon" ></i>
-						</button>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>`
-}
\ No newline at end of file
diff --git a/public/js/components/Calendar/Minimized.js b/public/js/components/Calendar/Minimized.js
deleted file mode 100644
index 96db36ada..000000000
--- a/public/js/components/Calendar/Minimized.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import CalendarAbstract from './Abstract.js';
-
-export default {
-	mixins: [
-		CalendarAbstract
-	],
-	inject: [
-		'size',
-		'minimized',
-		'date',
-	],
-	data() {
-		return {
-			start: 0
-		}
-	},
-	methods: {
-		maximize() {
-			this.minimized = false;
-		}
-	},
-	template: `
-	<div class="fhc-calendar-minimized h-100 d-flex flex-column">
-		<slot name="minimizedPage"></slot>
-	</div>`
-}
diff --git a/public/js/components/Calendar/Month.js b/public/js/components/Calendar/Month.js
deleted file mode 100644
index 27ec50fbf..000000000
--- a/public/js/components/Calendar/Month.js
+++ /dev/null
@@ -1,103 +0,0 @@
-import CalendarAbstract from './Abstract.js';
-import CalendarPane from './Pane.js';
-import CalendarMonthPage from './Month/Page.js';
-import BsModal from "../Bootstrap/Modal.js";
-import Months from "./Months.js";
-export default {
-	mixins: [
-		CalendarAbstract
-	],
-	components: {
-		CalendarMonthPage,
-		CalendarPane,
-		BsModal,
-		Months
-	},
-	emits: [
-		"change:offset"
-	],
-	data() {
-		return {
-			syncOnNextChange: false
-		}
-	},
-	computed: {
-		title() {
-			return this.focusDate.format({month: ['short','long','long','long'][this.size], year: 'numeric'}, this.$p.user_locale.value);
-		}
-	},
-	methods: {
-		handleMonthChanged(month) {
-			this.$emit('change:offset', { y: 0, m: month - this.focusDate.m, d: 0 });
-			this.$refs.modalDatepickerContainer.hide()
-		},
-		hideMonthsModal() {
-			this.$refs.modalDatepickerContainer.hide()
-		},
-		handleHeaderClickMonth() {
-			this.$refs.modalDatepickerContainer.show()
-		},
-		paneChanged(dir) {
-			if (this.syncOnNextChange) {
-				this.syncOnNextChange = false;
-				this.focusDate.set(this.date);
-			} else {
-				this.focusDate.moveMonthInDirection(dir)
-			}
-			this.emitRangeChanged()
-		},
-		emitRangeChanged(mounted = false) {
-			this.$emit('change:range', {
-				start: new Date(this.focusDate.y, this.focusDate.m, 1),
-				end: new Date(this.focusDate.y, this.focusDate.m+1, 0),
-				mounted
-			});
-		},
-		prev() {
-			this.$refs.pane.prev();
-			this.$emit('change:offset', { y: 0, m: -1, d: 0 });
-		},
-		next() {
-			this.$refs.pane.next();
-			this.$emit('change:offset', { y: 0, m: 1, d: 0 });
-		},
-		selectDay(day) {
-			let m = day.getMonth();
-			if (this.focusDate.m != m) {
-				this.syncOnNextChange = true;
-				if (this.focusDate.m-1 == m || (m == 11 && !this.focusDate.m))
-					this.$refs.pane.prev();
-				else
-					this.$refs.pane.next();
-			} else {
-				this.focusDate.set(this.date);
-			}
-			this.$emit('input', ['select:day',day])
-		}
-	},
-	mounted() {
-		this.emitRangeChanged(true)
-	},
-	template: `
-	<div class="fhc-calendar-month">
-		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" @click="handleHeaderClickMonth">
-			<template #calendarDownloads>
-				<slot name="calendarDownloads"></slot>
-			</template>
-		</calendar-header>
-		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
-			<calendar-month-page :year="focusDate.y" :month="focusDate.m+slot.offset" @updateMode="$emit('updateMode', $event)" @page:back="prev" @page:forward="next" @input="selectDay" >
-				<template #monthPage="{event,day}">
-					<slot name="monthPage" :event="event" :day="day" ></slot>
-				</template>
-			</calendar-month-page>
-		</calendar-pane>
-	</div>
-
-	<bs-modal ref="modalDatepickerContainer" dialogClass='modal-lg' class="bootstrap-prompt">
-		<template v-slot:default>
-			<months @change="handleMonthChanged"></months>
-		</template>
-	</bs-modal>
-`
-}
diff --git a/public/js/components/Calendar/Month/Page.js b/public/js/components/Calendar/Month/Page.js
deleted file mode 100644
index bd974afde..000000000
--- a/public/js/components/Calendar/Month/Page.js
+++ /dev/null
@@ -1,170 +0,0 @@
-import CalendarDate from '../../../composables/CalendarDate.js';
-
-export default {
-	name: 'MonthPage',
-	data(){
-		return{
-			highlightedWeek: null,
-			highlightedDay: null,
-		}
-	},
-	inject: [
-		'today',
-		'todayDate',
-		'date',
-		'focusDate',
-		'size',
-		'events',
-		'showWeeks',
-		'noWeekView',
-		'selectedEvent',
-		'setSelectedEvent'
-	],
-	props: {
-		year: Number,
-		month: Number
-	},
-	emits: [
-		'updateMode',
-		'page:back',
-		'page:forward',
-		'input'
-	],
-	computed: {
-		dayText(){
-			if (!this.size || !this.weeks[0]?.days) return {};
-			let dayTextMap ={};
-			this.weeks[0].days.forEach((day)=>{
-				dayTextMap[day] = day.toLocaleString(this.$p.user_locale.value, { weekday: this.size < 1 ? 'narrow' : (this.size < 3 ? 'short' : 'long') });
-			});
-			return dayTextMap;
-		},
-		weeks() {
-			let firstDayOfMonth = new CalendarDate(this.year, this.month, 1);
-			let startDay = firstDayOfMonth.firstDayOfCalendarMonth;
-			let endDay = firstDayOfMonth.lastDayOfCalendarMonth;
-			
-			let res = [];
-			let week = {no:0,y:0,days:[]};
-			while (startDay <= endDay) {
-				week.days.push(new Date(startDay));
-				
-				if (week.days.length == 7) {
-					let d = new CalendarDate(week.days[5]);
-					week.no = d.w;
-					week.y = d.y;
-					res.push(week);
-					week = {no:0,y:0,days:[]};
-				}
-				startDay.setDate(startDay.getDate() + 1);
-			}
-			return res;
-		},
-		
-	},
-	methods: {
-		getDayClass(week, day) {
-			let classstring = 'fhc-calendar-month-page-day text-decoration-none overflow-hidden'
-			const isHighlightedWeek = this.isHighlightedWeek(week)
-			const isHighlightedDay = this.isHighlightedDay(day)
-			const isThisDate = this.focusDate.compare(day)
-
-			const isNotThisMonth = day.getMonth() != this.month
-			const isInThePast = day.getTime() < this.today // this.date is just the focusDate but not the initial Date
-			
-			if(isThisDate) classstring += ' fhc-calendar-month-page-day-focusday'
-			if(isHighlightedWeek) classstring += ' fhc-highlight-week'
-			if(isHighlightedDay) classstring += ' fhc-highlight-day'
-			
-			if(isNotThisMonth) classstring += ' opacity-25'
-			if(isInThePast) classstring += ' fhc-calendar-past'
-			return classstring
-		},
-		selectDay(day, event) {
-			this.setSelectedEvent(event);
-			this.date.set(day);
-			this.$emit('input', day);
-		},
-		changeToWeek(week) {
-			if (!this.noWeekView) {
-				if (!this.focusDate.isInWeek(week.no, week.y))
-					this.focusDate.set(week.days[0]);
-				this.$emit('updateMode', 'week');
-			}
-		},
-		highlight(week, day){
-			this.highlightedWeek = week.no; 
-			this.highlightedDay = day;
-		},
-		isHighlightedDay(day) {
-			return day == this.highlightedDay
-		},
-		isHighlightedWeek(week) {
-			return  week.no == this.highlightedWeek
-		},
-		clickEvent(day,week) {
-			if(!this.noWeekView)
-			{
-				this.focusDate.set(day);
-				this.$emit('updateMode', 'day');
-			}
-			this.selectDay(day);
-		},
-		getNumberStyle(day) {
-			
-			const styleObj = {}
-			styleObj.display = 'inline-block';
-			styleObj.height = '32px';
-			styleObj['line-height'] = '32px';
-			styleObj['text-align'] = 'center';
-			styleObj['font-weight'] = 'bold';
-			styleObj['font-size'] = '14px';
-
-			if(day.getDate() === this.todayDate.getDate() 
-				&& day.getMonth() === this.todayDate.getMonth() 
-				&& day.getFullYear() === this.todayDate.getFullYear()) {
-				styleObj['background-color'] = 'var(--fhc-primary)'; 
-				styleObj.color = 'white';
-			}
-			
-			return styleObj
-		} 
-	},
-	mounted() {
-		const container = document.getElementById("calendarContainer")
-		if(container) container.style['overflow-y'] = 'auto'
-		
-	},
-	template: /*html*/`
-	<div class="fhc-calendar-month-page" :class="{'show-weeks': showWeeks}">
-		<div v-if="showWeeks" class=" fw-bold border-top border-bottom text-center"></div>
-		<div v-for="day in weeks[0].days" :key="day" class=" fw-bold border-top border-bottom text-center">
-			{{dayText[day]}}
-		</div>
-		<template v-for="week in weeks"
-		:key="week.no">
-			<a href="#" v-if="showWeeks" class="fhc-calendar-month-page-weekday text-decoration-none text-end "
-			@click.prevent="changeToWeek(week)">{{week.no}}</a>
-			<a href="#"
-			@click.prevent="clickEvent(day,week)"
-			@mouseover="highlight(week,day)"
-			@mouseleave="highlightedWeek = null; highlightedDay = null"
-			v-for="day in week.days"
-			:key="day"
-			:class="getDayClass(week, day)" 
-			>
-				<span @click="clickEvent(day,week)" class="no" :style="getNumberStyle(day)">{{day.getDate()}}</span>
-				<span v-if="events[day.toDateString()] && events[day.toDateString()].length" class="events">
-					<div v-for="event in events[day.toDateString()]" :key="event.id" 
-					:style="{'background-color': event.color}" class="fhc-entry" :selected="event == selectedEvent"
-					v-contrast @click.stop="selectDay(day,event)">
-						<slot  name="monthPage" :event="event" :day="day" >
-							<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
-						</slot>
-					</div>
-				</span>
-			</a>
-		</template>
-	</div>
-`
-}
diff --git a/public/js/components/Calendar/Months.js b/public/js/components/Calendar/Months.js
deleted file mode 100644
index 6263e1b01..000000000
--- a/public/js/components/Calendar/Months.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import CalendarAbstract from './Abstract.js';
-
-export default {
-	mixins: [
-		CalendarAbstract
-	],
-	emits: [
-		'change'
-	],
-	inject: [
-		'size'
-	],
-	data() {
-		return {
-			// TODO: 36, 24, 16 (2+ 12 + 2) months to enable year switch?
-			monthIndices: [...Array(12).keys()]
-		}
-	},
-	computed: {
-		title() {
-			return this.focusDate.format({year: 'numeric'});
-		},
-		months() {
-			return this.monthIndices.map(i => (new Date(0, i, 1)).toLocaleString(this.$p.user_locale.value, {month: this.size < 2 ? 'short' : 'long'}));
-		}
-	},
-	template: `
-	<div class="fhc-calendar-months">
-		<div class="d-flex flex-wrap">
-			<div v-for="(month, key) in months" :key="key" class="d-grid col-4">
-				<button @click=" $emit('change', key); focusDate.m = key;" class="btn btn-outline-secondary" :class="{'border-0': key != focusDate.m}">
-					{{month}}
-				</button>
-			</div>
-		</div>
-	</div>`
-}
diff --git a/public/js/components/Calendar/Pane.js b/public/js/components/Calendar/Pane.js
deleted file mode 100644
index 6bc00752b..000000000
--- a/public/js/components/Calendar/Pane.js
+++ /dev/null
@@ -1,94 +0,0 @@
-export default {
-	name: 'Pane',
-	emits: [
-		'slid'
-	],
-	data() {
-		return {
-			carousel: null,
-			queue: 0,
-			offset: 0,
-			slideAnimation:false,
-			scrollTop:null,
-			clientHeight:null,
-			carouselItems:null,
-		}
-	},
-	provide() {
-		return {
-			isSliding: Vue.computed(() => this.slideAnimation),
-			calendarScrollTop: Vue.computed(() =>this.scrollTop),
-			calendarClientHeight: Vue.computed(() => this.clientHeight),
-		}
-	},
-	computed: {
-		offsets() {
-			return [...Array(3).keys()].map(i => (3+i-this.offset)%3-1);
-		},
-		activeCarouselItemIndex() {
-			if (Array.isArray(this.carouselItems) && this.carouselItems.length > 0) {
-				for(let index=0; index < this.carouselItems.length; index++){
-					if (this.carouselItems[index] == true){
-						return index;
-					}
-				}
-
-			}
-			return -1;
-		}
-		
-	},
-	methods: {
-		scrollBehavior(event){
-			this.$refs.calendarContainer?.scrollBy({ top: Math.sign(event.deltaY) * 100, behavior: 'instant' });
-		},
-		scrollCalendar(event){
-			this.scrollTop = this.$refs.calendarContainer.scrollTop;
-			this.clientHeight = this.$refs.calendarContainer.clientHeight;
-		},
-		prev() {
-			if (!this.queue--)
-				this.carousel.prev();
-		},
-		next() {
-			if (!this.queue++)
-				this.carousel.next();
-		},
-		slid(evt) {
-			let dir = evt.direction == 'left' ? 1 : -1;
-			this.queue -= dir;
-			this.$emit('slid', dir);
-			this.offset = (3+this.offset+dir)%3;
-			if (this.queue) {
-				if (this.queue > 0)
-					this.carousel.next();
-				else
-					this.carousel.prev();
-			}
-			this.carouselItems = this.$refs.carouselItems.map((item) => { return item.classList.contains('active') });
-			this.slideAnimation = false;
-		},
-		slide(evt) {
-			this.slideAnimation = true;
-		}
-	},
-	mounted() {
-		if (this.$refs.carousel) {
-			this.$refs.carousel.children[0].children[1].classList.add('active');
-			this.carousel = new window.bootstrap.Carousel(this.$refs.carousel, {
-				interval: false
-			});
-		}
-		this.carouselItems = this.$refs.carouselItems.map((item)=>{return item.classList.contains('active')});
-		this.scrollTop = this.$refs.calendarContainer.scrollTop;
-		this.clientHeight = this.$refs.calendarContainer.clientHeight;
-	},
-	template: `
-	<div ref="carousel" class="calendar-pane carousel slide" @[\`slide.bs.carousel\`]="slide" @[\`slid.bs.carousel\`]="slid" :data-queue="queue">
-		<div id="calendarContainer" @wheel.prevent="scrollBehavior" @scroll="scrollCalendar" ref="calendarContainer" class="carousel-inner fhc-calendar-pane">
-			<div ref="carouselItems" v-for="i in [...Array(3).keys()]" :key="i" class="carousel-item fhc-calendar-pane">
-				<slot :active="i == activeCarouselItemIndex" :index="i" :offset="offsets[i]" />
-			</div>
-		</div>
-	</div>`
-}
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
deleted file mode 100644
index 2cca97a27..000000000
--- a/public/js/components/Calendar/Week.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import CalendarAbstract from './Abstract.js';
-import CalendarPane from './Pane.js';
-import CalendarWeekPage from './Week/Page.js';
-import BsModal from "../Bootstrap/Modal.js";
-import Weeks from "./Weeks.js";
-
-export default {
-	mixins: [
-		CalendarAbstract
-	],
-	components: {
-		CalendarWeekPage,
-		CalendarPane,
-		BsModal,
-		Weeks
-	},
-	emits: [
-		"change:offset"
-	],
-	computed: {
-		title() {
-			return this.focusDate.wYear + ' KW ' + this.focusDate.w;
-		}
-	},
-	methods: {
-		handleWeekChanged(week) {
-			// this.$emit('change:offset', { y: 0, m: month - this.focusDate.m, d: 0 });
-			this.$refs.modalDatepickerContainer.hide()
-		},
-		hideMonthsModal() {
-			this.$refs.modalDatepickerContainer.hide()
-		},
-		handleHeaderClickWeek() {
-			this.$emit('updateMode', 'weeks');//
-			//this.$refs.modalDatepickerContainer.show()
-		},
-		paneChanged(dir) {
-			this.focusDate.d += dir * 7;
-			this.emitRangeChanged();
-		},
-		emitRangeChanged(mounted = false) {
-			let start = this.focusDate.firstDayOfWeek;
-			let end = this.focusDate.lastDayOfWeek;
-			this.$emit('change:range', { start, end, mounted });
-		},
-		prev() {
-			this.$refs.pane.prev();
-			this.$emit('change:offset', { y: 0, m: 0, d: -7 });
-		},
-		next() {
-			this.$refs.pane.next();
-			this.$emit('change:offset', { y: 0, m: 0, d: 7 });
-		},
-		selectEvent(event) {
-			this.$emit('input', ['select:event',event]);
-		}
-	},
-	mounted() {
-		this.emitRangeChanged(true);
-	},
-	template: /*html*/`
-	<div class="fhc-calendar-week">
-		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" @click="handleHeaderClickWeek">
-			<template #calendarDownloads>
-				<slot name="calendarDownloads"></slot>
-			</template>
-		</calendar-header>
-		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
-			<calendar-week-page :active="slot.active" :year="focusDate.wYear" :week="focusDate.w+slot.offset" @updateMode="$emit('updateMode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" >
-				<template #weekPage="{event,day}">
-					<slot name="weekPage" :event="event" :day="day" ></slot>
-				</template>
-			</calendar-week-page>
-		</calendar-pane>
-	</div>
-
-	<bs-modal ref="modalDatepickerContainer" dialogClass='modal-lg' class="bootstrap-prompt">
-		<template v-slot:default>
-			<weeks :header="false" @change="handleWeekChanged"></weeks>
-		</template>
-	</bs-modal>
-`
-}
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
deleted file mode 100644
index b5bfcd3c3..000000000
--- a/public/js/components/Calendar/Week/Page.js
+++ /dev/null
@@ -1,387 +0,0 @@
-import CalendarDate from '../../../composables/CalendarDate.js';
-
-function ggt(m,n) { return n==0 ? m : ggt(n, m%n); }
-function kgv(m,n) { return (m*n) / ggt(m,n); }
-
-export default {
-	name: 'WeekPage',
-	data(){
-		return{
-			hourPosition:null,
-			hourPositionTime:null,
-			resizeObserver: null,
-			width: 0,
-		}
-	},
-	inject: [
-		'today',
-		'todayDate',
-		'date',
-		'focusDate',
-		'size',
-		'events',
-		'noMonthView',
-		'isSliding',
-		'selectedEvent',
-		'setSelectedEvent',
-		'rowMinHeight'
-	],
-	props: {
-		year: Number,
-		week: Number,
-		active: Boolean
-	},
-	emits: [
-		'updateMode',
-		'page:back',
-		'page:forward',
-		'input',
-	],
-	computed: {
-		allDayEvents(){
-			let allDayEvents = {};
-			for(let day in this.events){
-				const filteredAllDayEvents = this.events[day].filter(event=>event.allDayEvent);
-				if (filteredAllDayEvents.length > 0){
-					allDayEvents[day]=filteredAllDayEvents;
-				}
-			};
-			return allDayEvents;
-		},
-		getGridStyle() {
-			return {
-				'min-height': this.rowMinHeight,
-				// this.size is the magic number anyway which directs font-size,
-				// which in turn influences a lot of layout
-				width: '42px'
-			}
-		},
-		laneWidth() {
-			return (this.width - 42) / this.days.length
-		},
-		curTime() {
-			const now = new Date();
-			return String(now.getHours()).padStart(2, '0') + ':' + String(now.getMinutes()).padStart(2, '0');
-		},
-		curIndicatorStyle() {
-			return {
-				top: this.getDayTimePercent + '%',
-			}
-		},
-		pageHeaderStyle(){
-			return {
-				'z-index': 4,
-				'grid-template-columns': 'repeat(' + this.days.length + ', 1fr)',
-				'grid-template-rows': 1,
-				position: 'sticky',
-				top: 0,
-			}
-		},
-		overlayStyle() {
-			return {
-				height:  this.getDayTimePercent + '%',
-				width: this.laneWidth + 'px',
-			}
-		},
-		
-		hours(){
-			// returns an array with elements starting at 7 and ending at 24
-			return [...Array(24).keys()].filter(hour => hour >= 7 && hour <= 24);
-		},
-		dayText() {
-			if (!this.size || !this.days) return {};
-			let dayTextMap ={};
-			this.days.forEach((day)=>{
-				dayTextMap[day] = {
-					heading: day.toLocaleString(this.$p.user_locale.value, { dateStyle: 'short' }),
-					tag: day.toLocaleString(this.$p.user_locale.value, { weekday: this.size < 2 ? 'narrow' : (this.size < 3 ? 'short' : 'long') }),
-					datum: day.toLocaleString(this.$p.user_locale.value, [{ day: 'numeric', month: 'numeric' }, { day: 'numeric', month: 'numeric' }, { day: 'numeric', month: 'numeric' }, { dateStyle: 'short' }][this.size]),
-				};
-			});
-			return dayTextMap;
-		},
-		days() {
-			
-			let tmpDate = new CalendarDate(this.year,1,1); // NOTE(chris): somewhere in the middle of the year
-			tmpDate.w = this.week;
-			let startDay = tmpDate.firstDayOfWeek;
-			let result = [];
-			for (let i = 0; i < 7; i++) {
-				result.push(new Date(startDay.getFullYear(), startDay.getMonth(), startDay.getDate() + i));
-			}
-			return result;
-
-		},
-		eventsPerDayAndHour() {
-			// return early if the calendar pane is sliding
-			if (this.isSliding) return {};
-			const res = {};
-			this.days.forEach(day => {
-				let key = day.toDateString();
-				
-				let nextDay = new Date(day);
-				nextDay.setDate(nextDay.getDate()+1);
-				nextDay.setMilliseconds(nextDay.getMilliseconds()-1);
-				let d = {events:[],lanes:1, isPast: false};
-				d.isPast = nextDay.getTime() < this.today
-				d.isToday = nextDay.getFullYear() === this.todayDate.getFullYear() && nextDay.getMonth() === this.todayDate.getMonth() && nextDay.getDate() === this.todayDate.getDate()
-				if (this.events[key]) {
-					this.events[key].forEach(evt => {
-						if (evt.allDayEvent) return;
-						let event = {orig:evt,lane:1,maxLane:1,start: evt.start < day ? day : evt.start, end: evt.end > nextDay ? nextDay : evt.end,shared:[],setSharedMaxRecursive(doneItems) {
-							this.maxLane = Math.max(doneItems[0].maxLane, this.maxLane);
-							doneItems.push(this);
-							this.shared.filter(other => !doneItems.includes(other)).forEach(i => i.setSharedMaxRecursive(doneItems));
-						}};
-						event.shared = d.events.filter(other => other.start < event.end && other.end > event.start);
-						event.shared.forEach(other => other.shared.push(event));
-						let occupiedLanes = event.shared.map(other => other.lane);
-						while (occupiedLanes.includes(event.lane))
-							event.lane++;
-						event.maxLane = Math.max(...[event.lane], ...occupiedLanes);
-						if (event.maxLane > 1) {
-							event.setSharedMaxRecursive([event]);
-						}
-						d.events.push(event);
-					});
-					d.lanes = d.events.map(e => e.maxLane).reduce((res, i) => kgv(res, i), 1);
-				}
-				res[key] = d;
-			});
-			return res;
-		},
-		smallestTimeFrame() {
-			return [30,15,10,5][this.size];
-		},
-		lookingAtToday() {
-			return this.days.some(d => 
-				d.getFullYear() === this.todayDate.getFullYear() &&
-				d.getMonth() === this.todayDate.getMonth() &&
-				d.getDate() === this.todayDate.getDate()
-			)
-		},
-		indicatorStyle() {
-			return {
-				'pointer-events': 'none',
-				'padding-left': '3.5rem',
-				'margin-top': '-1px',
-				'z-index': 2,
-				'border-color': 'var(--fhc-border)',
-				top: this.hourPosition + 'px',
-				left: 0,
-				right: 0,
-			}
-		},
-		getDayTimePercent() {
-			const now = new Date(Date.now())
-			const currentMinutes = now.getMinutes() + now.getHours() * 60
-			let timePercentage = ((currentMinutes - (this.hours[0] * 60)) / (this.hours.length * 60)) * 100;
-
-			return timePercentage
-		}
-	}, 
-	methods: {
-		hourGridIdentifier(hour) {
-			// this is the id attribute that is responsible to scroll the calender to the first event
-			return 'scroll' + hour + this.focusDate.d + this.week;
-		},
-		hourGridStyle(hour) {
-			return {
-				'pointer-events': 'none',
-				top: this.getAbsolutePositionForHour(hour),
-				left: 0,
-				right: 0,
-				'z-index': 0
-			}
-		},
-		dayGridStyle(day) {
-			const styleObj = {
-				'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)',
-				'grid-template-rows': 'repeat(' + (this.hours.length * 60 / this.smallestTimeFrame) + ', 1fr)',
-			}
-			if(day.isPast) {
-				//styleObj['background-color'] = 'var(--calendar-past)'
-				styleObj['border-color'] = 'var(--fhc-border)';
-			} else if (day.isToday) {
-				
-				//styleObj['backgroundImage'] = 'linear-gradient(to bottom, var(--calendar-past) '+this.getDayTimePercent+'%, transparent '+this.getDayTimePercent+'%)'
-				styleObj['border-color'] = 'var(--fhc-border)';
-			}
-			
-			return styleObj
-		},
-		eventGridStyle(day, event) {
-			return {
-					'z-index': 1,
-					'grid-column-start': 1 + (event.lane - 1) * day.lanes / event.maxLane,
-					'grid-column-end': 1 + event.lane * day.lanes / event.maxLane,
-					'grid-row-start': this.dateToMinutesOfDay(event.start),
-					'grid-row-end': this.dateToMinutesOfDay(event.end),
-					'background-color': event.orig.color,
-					'max-height': '75px'
-			};
-		},
-		calcHourPosition(event) {
-			let height = this.$refs['eventsRef' + this.week].getBoundingClientRect().height;
-			let top = this.$refs['eventsRef' + this.week].getBoundingClientRect().top;
-			let position = event.clientY - top;
-			// position percentage of total height
-			let timePercentage = (position / height) * 100;
-			// minute percentage of total minutes
-			let result = (this.hours.length * 60) * (timePercentage / 100);
-			// calculate time in float
-			let currentMinutes = ((result + (this.hours[0] * 60)) / 60);
-			// get hour part of time
-			let currentHour = Math.floor(currentMinutes);
-			// get float part of time
-			let minutePercentage = currentMinutes % currentHour;
-			// calculate minutes from float part of time
-			let minute = Math.round(60 * minutePercentage);
-			// convert minutes to 5 minute interval
-			if (minute % 5 != 0) {
-				minute = Math.round(minute / 5) * 5;
-			}
-			// in case the rounding made the minutes 60, increase the hour and reset the minutes
-			if (minute == 60) {
-				currentHour++;
-				minute = 0;
-			}
-
-			// ## after rounding the time to the nearest 5 Minute interval, we have to convert the time back to the relative position
-			// convert current time in minutes
-			currentMinutes = currentHour * 60 + minute;
-			// calculate the minutes percentage of the total minutes 
-			timePercentage = ((currentMinutes - (this.hours[0] * 60)) / (this.hours.length * 60)) * 100;
-			// calculate the relative position of the time percentage
-			position = height * (timePercentage / 100);
-			this.hourPosition = position;
-
-			// add padding to minutes that consist of only one digit
-			minute.toString().length == 1 ? minute = "0" + minute : minute;
-			this.hourPositionTime = currentHour + ":" + minute;
-		},
-		getAbsolutePositionForHour(hour){
-			// used for the absolute positioning of the gutters of hours
-			return (100 / this.hours.length) * (hour - (24-this.hours.length)) + '%';
-		},
-		changeToMonth(day) {
-			if (!this.noMonthView) {
-				this.date.set(day);
-				this.focusDate.set(day);
-				this.$emit('updateMode', 'month');
-			}
-		},
-		changeToDay(day) {
-			this.date.set(day);
-			this.focusDate.set(day);
-			this.$emit('updateMode', 'day');
-		},
-		dateToMinutesOfDay(day) {
-			// subtract 7 from the total hours because the hours range from 7 to 24
-			return Math.floor(((day.getHours()-7) * 60 + day.getMinutes()) / this.smallestTimeFrame) + 1;
-		},
-		weekPageClick(event, day) {
-			this.setSelectedEvent(event);
-			this.focusDate.set(new CalendarDate(new Date(event.datum)));
-			this.$emit('input', event)
-		},
-		initResizeObserver() {
-			const events = this.$refs['eventsRef'+this.week];
-			if (!events) return;
-
-			this.resizeObserver = new ResizeObserver((entries) => {
-				for (let entry of entries) {
-					const { width, height } = entry.contentRect;
-					if(width > 0) this.width = width
-				}
-			});
-
-			this.resizeObserver.observe(events);
-		},
-		destroyResizeObserver() {
-			if (this.resizeObserver) {
-				this.resizeObserver.disconnect();
-				this.resizeObserver = null;
-			}
-		},
-	},
-	mounted() {
-
-		setTimeout(() => this.$refs.eventcontainer.scrollTop = this.$refs.eventcontainer.scrollHeight / 3 + 1, 0);
-
-		const container = document.getElementById("calendarContainer")
-		if(container) {
-			container.style['overflow-y'] = 'scroll'
-			container.style['overflow-x'] = 'auto'
-		}
-		
-		this.initResizeObserver();
-	},
-	beforeUnmount() {
-		this.destroyResizeObserver();
-	},
-	template: /*html*/`
-	<div ref="page" class="fhc-calendar-week-page" style="min-width: 700px;">
-	<div class="d-flex flex-column">
-			<div class="fhc-calendar-week-page-header d-grid border-2 border-bottom text-center" :style="pageHeaderStyle" >
-				<div type="button" v-for="day in days" :key="day" class="flex-grow-1" :title="dayText[day]?.heading" @click.prevent="changeToDay(day)">
-					<div class="day fw-bold">{{dayText[day]?.tag}}</div>
-					<a href="#" class="date small text-decoration-none" >{{dayText[day]?.datum}}</a>
-				</div>
-			</div>
-			<div ref="eventcontainer" class="position-relative flex-grow-1"  >
-				<div class="all-day-event-container" >
-					<div @wheel.stop class="all-day-event all-day-event-border" v-for="(day,dayindex) in eventsPerDayAndHour">
-						<template v-for="(events,_day) in allDayEvents" :key="_day">
-
-							<div
-								v-if="dayindex == _day"
-								v-for="event in events"
-								:key="event"
-								style="top:0;"
-								@click.prevent="weekPageClick(event, _day)"
-								:selected="event == selectedEvent"
-								:style="{'background-color': event?.color, 'margin-bottom':'1px'}"
-								class="d-grid m-1 small rounded overflow-hidden fhc-entry"
-								v-contrast
-								>
-								<slot class="p-1" name="weekPage" :event="event" :day="day">
-									<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
-								</slot>
-							</div>
-						</template>
-					</div>
-				</div>
-				<div class="events position-relative" :ref="'eventsRef'+week" @mousemove="calcHourPosition" @mouseleave="hourPosition = null">
-					<div :id="hourGridIdentifier(hour)" v-for="hour in hours" :key="hour" class="position-absolute box-shadow-border" :style="hourGridStyle(hour)"></div>
-					<Transition>
-						<div v-if="hourPosition" class="fhc-calendar-hour-indicator position-absolute small" :style="indicatorStyle" >
-							<span class=" border border-top-0 px-2 ">{{hourPositionTime}}</span>
-						</div>
-					</Transition>
-					<div class="hours">
-						<div v-for="hour in hours" :style="getGridStyle" :key="hour" class="text-end small" :ref="'hour' + hour">{{hour}}:00</div>
-					</div>
-					<div v-for="(day,dayindex) in eventsPerDayAndHour" :key="day" :class="{'past':day.isPast}" class=" day border-start position-relative" :style="dayGridStyle(day)">
-						<Transition>
-							<div v-if="day.isToday" class="border-top small curTimeIndicator" :style="curIndicatorStyle">
-								<span class="fhc-body-bg border border-top-0 px-2">{{curTime}}</span>
-							</div>
-						</Transition>
-						<div v-if="day.isToday" class="overlay" :style="overlayStyle"></div>
-						<div v-for="event in day.events" :key="event" @click.prevent="weekPageClick(event.orig, day)"
-						:selected="event.orig == selectedEvent"
-						:style="eventGridStyle(day,event)"
-						class="mx-2 small rounded overflow-hidden fhc-entry border border-secondary"
-						v-contrast >
-							<slot name="weekPage" :event="event.orig" :day="day">
-								<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
-							</slot>		
-						</div>
-						
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>`
-}
diff --git a/public/js/components/Calendar/Weeks.js b/public/js/components/Calendar/Weeks.js
deleted file mode 100644
index 057889e83..000000000
--- a/public/js/components/Calendar/Weeks.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import CalendarAbstract from './Abstract.js';
-
-export default {
-	mixins: [
-		CalendarAbstract
-	],
-	emits: [
-		'change'
-	],
-	inject: [
-		'size',
-		'focusDate',
-		'mode',
-	],
-	props: {
-		header: {
-			type: Boolean,
-			default: true
-		}
-	},
-	computed: {
-		weeks(){
-			return [...Array(this.focusDate.numWeeks).keys()].map(i => i + 1);
-		},
-		title() {
-			return this.focusDate.format({year: 'numeric'});
-		}
-	},
-	methods: {
-		setWeek(week) {
-			// TODO(chris): test is there a week jump on year select? => yes there is if the same month/day are in different weeks ... should we prevent that?
-			this.focusDate.w = week;
-			this.$emit('updateMode', 'week');
-			Vue.nextTick(()=>{
-				let date = new Date(this.focusDate.y, this.focusDate.m, this.focusDate.d);
-				date = date.getFullYear() + "-" +
-					String(date.getMonth() + 1).padStart(2, "0") + "-" +
-					String(date.getDate()).padStart(2, "0");
-				this.$router.push({
-					name: "LvPlan",
-					params: {
-						mode: this.mode[0].toUpperCase() + this.mode.slice(1),
-						focus_date: date,
-						lv_id: this.$route.params.lv_id || null
-					}
-				})
-			})
-		},
-		prev(){
-			this.focusDate.y--;
-			this.focusDate._clean();
-		},
-		next() {
-			this.focusDate.y++;
-			this.focusDate._clean();
-		},
-	},
-	template: `
-	<div class="fhc-calendar-weeks h-100">
-		<calendar-header v-if="header" :title="title" @prev="prev" @next="next" @click="$emit('updateMode', 'years')" @updateMode="$emit('updateMode', $event)" />
-		<div class="d-flex flex-wrap">
-			<div v-for="(week, key) in weeks" :key="key" class="d-grid col-2">
-				<button @click="setWeek(week)" class="btn btn-outline-secondary card" :class="{'border-0': week != focusDate.w}">
-					{{week}}
-				</button>
-			</div>
-		</div>
-	</div>`
-}
diff --git a/public/js/components/Calendar/Years.js b/public/js/components/Calendar/Years.js
deleted file mode 100644
index baff2eb6c..000000000
--- a/public/js/components/Calendar/Years.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import CalendarAbstract from './Abstract.js';
-import CalendarPane from './Pane.js';
-import CalendarYearsPage from './Years/Page.js';
-
-export default {
-	mixins: [
-		CalendarAbstract
-	],
-	components: {
-		CalendarYearsPage,
-		CalendarPane
-	},
-	inject: [
-		'size'
-	],
-	data() {
-		return {
-			start: 0
-		}
-	},
-	computed: {
-		range() {
-			switch (this.size) {
-			case 3:
-			// eslint-disable-next-line
-			case 2:
-				return 24;
-			}
-			return 12;
-		},
-		end() {
-			return this.start + this.range - 1;
-		},
-		title() {
-			return this.start + ' - ' + this.end;
-		}
-	},
-	methods: {
-		paneChanged(dir) {
-			this.start += this.range * dir;
-		},
-		prev() {
-			this.$refs.pane.prev();
-			this.$emit('change:offset', { y: -1, m: 0, d: 0 });
-		},
-		next() {
-			this.$refs.pane.next();
-			this.$emit('change:offset', { y: 1, m: 0, d: 0 });
-		}
-	},
-	created() {
-		this.start = this.focusDate.y - this.focusDate.y%this.range;
-	},
-	template: `
-	<div class="fhc-calendar-years">
-		<calendar-header :title="title" @prev="prev" @next="next" @updateMode="$emit('updateMode', $event)" />
-		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
-			<calendar-years-page :data-test="slot.index" :start="start+range*slot.offset" :end="start+range*slot.offset+range" @updateMode="$emit('updateMode')"/>
-		</calendar-pane>
-	</div>`
-}
diff --git a/public/js/components/Calendar/Years/Page.js b/public/js/components/Calendar/Years/Page.js
deleted file mode 100644
index b7461cd03..000000000
--- a/public/js/components/Calendar/Years/Page.js
+++ /dev/null
@@ -1,36 +0,0 @@
-export default {
-	inject: [
-		'focusDate'
-	],
-	props: {
-		start: Number,
-		end: Number
-	},
-	emits: [
-		'updateMode'
-	],
-	data() {
-		return {
-		}
-	},
-	computed: {
-		years() {
-			return [...Array(this.end - this.start).keys()].map(i => i + this.start);
-		}
-	},
-	mounted() {
-		const container = document.getElementById("calendarContainer")
-		if(container) {
-			container.style['overflow-y'] = 'scroll'
-			container.style['overflow-x'] = 'auto'
-		}
-	},
-	template: `
-	<div class="fhc-calendar-years-page d-flex flex-wrap">
-		<div v-for="year in years" :key="year" class="d-grid col-4">
-			<button class="btn btn-outline-secondary card justify-content-center" :class="{'border-0': year != focusDate.y}" @click="focusDate.y = year; $emit('updateMode')">
-				{{year}}
-			</button>
-		</div>
-	</div>`
-}
diff --git a/public/js/components/Cis/Mylv/LvModal.js b/public/js/components/Cis/Mylv/LvModal.js
deleted file mode 100644
index 3f52cec8f..000000000
--- a/public/js/components/Cis/Mylv/LvModal.js
+++ /dev/null
@@ -1,96 +0,0 @@
-import BsModal from "../../Bootstrap/Modal.js";
-import Alert from "../../Bootstrap/Alert.js";
-import LvMenu from "./LvMenu.js"
-
-import ApiLvPlan from '../../../api/factory/lvPlan.js';
-import ApiAddons from '../../../api/factory/addons.js';
-
-export default {
-	components: {
-		BsModal,
-		Alert,
-		LvMenu,
-	},
-	mixins: [BsModal],
-	props: {
-		event:Object,
-		title:{
-			type:String,
-			default:"title"
-		},
-		showMenu:{
-			type:Boolean,
-			default:true,
-		},
-	/*
-	* NOTE(chris):
-	* Hack to expose in "emits" declared events to $props which we use
-	* in the v-bind directive to forward all events.
-	* @see: https://github.com/vuejs/core/issues/3432
-	*/
-		onHideBsModal: Function,
-		onHiddenBsModal: Function,
-		onHidePreventedBsModal: Function,
-		onShowBsModal: Function,
-		onShownBsModal: Function,
-	},
-	data() {
-		return {
-			menu: null,
-			result: false,
-			info: null,
-		};
-	},
-	methods:{
-		onHideModal: function(){
-			this.menu = null;
-		},
-		onModalShow: function()
-		{
-			// do not load the menu if the menu is not getting rendered
-			if(!this.showMenu) return;
-
-			if (this.event.type == 'lehreinheit') {
-				this.$api
-					.call(ApiLvPlan.getLehreinheitStudiensemester(Array.isArray(this.event.lehreinheit_id) ? this.event.lehreinheit_id[0] : this.event.lehreinheit_id))
-					.then(res => res.data)
-					.then(studiensemester_kurzbz => this.$api.call(
-						ApiAddons.getLvMenu(
-							this.event.lehrveranstaltung_id,
-							studiensemester_kurzbz
-						)
-					))
-					.then(res => {
-						if (res.data) {
-							this.menu = res.data;
-						}
-					});
-			}
-		}
-	},
-	mounted() {
-		this.modal = this.$refs.modalContainer.modal;
-	},
-	popup(options) {
-		return BsModal.popup.bind(this)(null, options);
-	},
-	template: /*html*/ `
-	<bs-modal ref="modalContainer" @showBsModal="onModalShow" @hideBsModal="onHideModal" :bodyClass="''" dialogClass='modal-lg' class="bootstrap-alert" :backdrop="false" >
-		<template v-slot:title>
-			<slot name="modalTitle"></slot>
-		</template>
-		<template v-slot:default>
-			<slot name="modalContent"></slot>
-			
-			<template v-if="showMenu && this.menu">
-				<h5>{{$p.t('lehre','lehrveranstaltungsmenue')}}</h5>
-				<lv-menu :menu="menu"></lv-menu>
-			</template>
-		</template>
-		<!-- optional footer -->
-		<template  v-slot:footer >
-			<button class="btn btn-outline-secondary card" @click="hide">{{$p.t('ui','cancel')}}</button>    
-		</template>
-		<!-- end of optional footer --> 
-	</bs-modal>`,
-};
diff --git a/public/js/composables/CalendarDate.js b/public/js/composables/CalendarDate.js
deleted file mode 100644
index e85cbeeac..000000000
--- a/public/js/composables/CalendarDate.js
+++ /dev/null
@@ -1,274 +0,0 @@
-import {user_locale} from "../plugin/Phrasen.js";
-import CalendarDates from "./CalendarDates.js";
-
-const monthDayRanges = []
-for(let i = 1; i < 13; i++) {
-	monthDayRanges.push(new Date(new Date(Date.now()).getFullYear(), i, 0).getDate())
-}
-
-class CalendarDate {
-	constructor(y, m, d) {
-		this.weekStart = CalendarDate.getWeekStart();
-		this.watchLocale = Vue.watch(
-			user_locale,
-			(newLocale, oldLocale, onCleanup) =>{
-				this.weekStart = CalendarDate.getWeekStart();
-				this._clean();
-				onCleanup((cleanup)=>{
-					// do clean up
-				});
-			},
-			
-		);
-		this.set(y, m, d);
-		this._clean();
-		CalendarDates.subscribe(this);
-	}
-	get y() { return this._y }
-	set y(v) { this._y = v; this._clean() }
-	get m() { return this._m }
-	set m(v) { this._m = v; this._clean() }
-	get d() { return this._d }
-	set d(v) { this._d = v; this._clean() }
-	/**
-	 * @see https://www.smart-rechner.de/kalenderwochen/rechner.php
-	 */
-	get w() {
-		if (this._w === null) {
-			if (this.weekStart == 1 && this._m == 11 && this._d > 28 && this.wd <= this._d-29) {
-				this._w = 1;
-			} else if (this.weekStart == 1 && this._m == 0 && this._d < 4 && 3-this.wd <= -this._d) {
-				let weekStartOfTheYear = new Date(this.y-1, 0, this.weekStart == 1 ? 4 : 1);
-				weekStartOfTheYear.setDate(weekStartOfTheYear.getDate() - (weekStartOfTheYear.getDay() + 7 - this.weekStart)%7);
-				this._w = Math.ceil((Math.floor((new Date(this.y, this.m, this.d) - weekStartOfTheYear) / 86400000) + 1) / 7);
-			} else {
-				let weekStartOfTheYear = new Date(this.y, 0, this.weekStart == 1 ? 4 : 1);
-				weekStartOfTheYear.setDate(weekStartOfTheYear.getDate() - (weekStartOfTheYear.getDay() + 7 - this.weekStart)%7);
-				this._w = Math.ceil((Math.floor((new Date(this.y, this.m, this.d) - weekStartOfTheYear) / 86400000) + 1) / 7);
-			}
-		}
-		return this._w;
-	}
-	set w(v) {
-		if (this.w != v) {
-			let lw = this.numWeeks;
-			
-			this.d += (v - this.w) * 7;
-
-			if (v > 0 && v <= lw && this.w != v) {
-				if (this.weekStart != 1) {
-					if (this.w == 1) {
-						this.set(this.firstDayOfWeek);
-					} else {
-						this.set(this.lastDayOfWeek);
-					}
-				}
-				if (this.w != v) {
-					console.error('couldn\'t set the week', this, v);
-				}
-			}
-		}
-	}
-	get wYear() {
-		if( this.w === 1 ) {
-			return this.cdLastDayOfWeek.y;
-		}
-		return this.cdFirstDayOfWeek.y;
-	}
-	get wd() {
-		if (this._wd === null) {
-			// the .getDay() method from js Date object ALWAYS returns values from 0 to 6, where 0 is Sunday and 6 is Saturday
-			// aligns the getDay() result of the Date to the weekStart of the CalendarDate
-			this._wd = ((new Date(this.y, this.m, this.d)).getDay()+7-this.weekStart)%7;
-		}
-		return this._wd;
-	}
-	get firstDayOfWeek() {
-		let firstDayOfWeek = new Date(this.y, this.m, this.d);
-		// to ensure that firstDayOfWeek.getDay() is always greater than this.weekStart we add 7 and wrap the result around with %7 to avoid negative numbers
-		firstDayOfWeek.setDate(this.d -(firstDayOfWeek.getDay()+7-this.weekStart)%7);
-		return firstDayOfWeek;
-	}
-	get cdFirstDayOfWeek() {
-		let FirstDayOfWeek = new CalendarDate(this.firstDayOfWeek);
-		return FirstDayOfWeek;
-	}
-	get lastDayOfWeek() {
-		let lastDayOfWeek = new Date(this.y, this.m, this.d);
-		// uses the calculation from firstDayOfWeek and adds 6 days to the result to get the last day of the week
-		lastDayOfWeek.setDate(this.d -(lastDayOfWeek.getDay()+7-this.weekStart)%7 +6);
-		return lastDayOfWeek;
-	}
-	get wholeWorkWeek() {
-		const days = []
-		const date = new Date(this.y, this.m, this.d);
-		for(let i = 0; i < 5; i++) {
-			days[i] = new Date(this.y, this.m, this.d)
-			days[i].setDate(this.d -(date.getDay()+7-this.weekStart)%7 + i)
-		}
-		return days
-	}
-	get cdLastDayOfWeek() {
-		let LastDayOfWeek = new CalendarDate(this.lastDayOfWeek);
-		return LastDayOfWeek;
-	}
-	get firstDayOfCalendarMonth() {
-		let firstDayOfMonth = new Date(this.y, this.m, 1);
-		let offset = (firstDayOfMonth.getDay() + 7 - this.weekStart) % 7;
-		// offset will be greater than 1 most of the time, using a negative number for a date returns a date in the past
-		return new Date(this.y, this.m, 1-offset);
-	}
-	get cdFirstDayOfCalendarMonth() {
-		let firstDayOfMonth = new Date(this.y, this.m, 1);
-		let offset = (firstDayOfMonth.getDay() + 7 - this.weekStart) % 7;
-		let FirstDayOfCalendarMonth = new CalendarDate(this.y, this.m, 1 - offset);
-		return FirstDayOfCalendarMonth;
-	}
-	get lastDayOfCalendarMonth() {
-		// In JavaScript, the Date constructor interprets: A day of 0 as the last day of the previous month 
-		let lastDayOfMonth = new Date(this.y, this.m+1, 0);
-		let offset = (lastDayOfMonth.getDay() + 7 - this.weekStart) % 7;
-		return new Date(lastDayOfMonth.getFullYear(), lastDayOfMonth.getMonth(), lastDayOfMonth.getDate()+6-offset);
-	}
-	get cdLastDayOfCalendarMonth() {
-		let lastDayOfMonth = new Date(this.y, this.m+1, 0);
-		let offset = (lastDayOfMonth.getDay() + 7 - this.weekStart) % 7;
-		let LasyDayOfCalendarMonth = new CalendarDate(lastDayOfMonth.getFullYear(), lastDayOfMonth.getMonth(), lastDayOfMonth.getDate() + 6 - offset);
-		return LasyDayOfCalendarMonth;
-	}
-	get cdLastDayOfNextCalendarMonth() {
-		let lastDayOfMonth = new Date(this.y, this.m+1, 0);
-		let offset = (lastDayOfMonth.getDay() + 7 - this.weekStart) % 7;
-		let LastDayOfNextCalendarMonth = new CalendarDate(lastDayOfMonth.getFullYear(), lastDayOfMonth.getMonth() + 1, lastDayOfMonth.getDate() + 6 - offset);
-		return LastDayOfNextCalendarMonth;
-	}
-	get nextSevenDays() {
-		const days = []
-		
-		for(let i = 0; i < 7; i++) {
-			days[i] = new Date(this.y, this.m, this.d + i)
-		}
-		return days
-	}
-	get numWeeks() {
-		// if the week starts with Monday we have to go 3 days in the past from the start of the next year to get the correct numWeek of the current year
-		// this is because for example 30.12.2024 - 05.01.2025 is the first calendarWeek of 2025 
-		let lastCalendarWeek = new CalendarDate(this.y + 1, 0, this.weekStart == 1 ? -3 : 0);
-		return lastCalendarWeek.w;
-	}
-	set(y,m,d,noClean) {
-
-		if (y !== undefined && (m === undefined || m === true) && d === undefined) {
-			if (this.isDate(y))
-			{
-				// set year/month/day from date object
-				return this.set(y.getFullYear(), y.getMonth(), y.getDate(), m);
-			}
-			if (y.y !== undefined && y.m !== undefined && y.d !== undefined)
-			{
-				// set year/month/day from CalendarDate object
-				return this.set(y.y, y.m, y.d, m);
-			}
-		}
-		// initialize year/month/day
-		this._y = y ?? 0;
-		this._m = m ?? 0;
-		this._d = d ?? 0;
-		
-		if (!noClean)
-			this._clean();
-	}
-	_clean() {
-		this.set(new Date(this._y, this._m, this._d), true);
-		this._w = null;
-		this._wd = null;
-	}
-	format(options, lang=undefined) {
-		return (new Date(this._y, this._m, this._d)).toLocaleString(lang, options);
-	}
-	compare(d) {
-		if (this.isDate(d))
-			return (this.y === d.getFullYear() && this.m === d.getMonth() && this.d === d.getDate());
-		return (this.y === d.y && this.m === d.m && this.d === d.d);
-	}
-	isInWeek(w, y) {
-		if (this.y == y && this.w == w)
-			return true;
-		if (this.weekStart == 1)
-			return false;
-		let edgeDay = this.cdFirstDayOfWeek;console.log(edgeDay);
-		if (edgeDay.y == y && edgeDay.w == w)
-			return true;
-		edgeDay = this.cdLastDayOfWeek;
-		if (edgeDay.y == y && edgeDay.w == w)
-			return true;
-		return false;
-	}
-	
-	setLocale(locale) {
-		this.weekStart = CalendarDate.getWeekStart(locale);
-	}
-	// method that checks if the parameter is of type Date
-	isDate(obj){
-		return Object.prototype.toString.call(obj) === '[object Date]';
-	}
-	cleanup(){
-		if(this.watchLocale && this.watchLocale.stop) this.watchLocale.stop(); // TODO: ?
-	}
-	moveMonthInDirection (dir) {
-		// avoid setting date in wrong month if we try to create a date which does not exist like 30th of february
-		const newM = this.m + dir
-		const maxDaysTarget = monthDayRanges[newM]
-
-		if (this.d > maxDaysTarget) this.d = maxDaysTarget
-		
-		this.m = newM // calls _clean which sets a new Date
-	}
-}
-/**
- * Returns the weekday number (Date.getDay()) on which the week starts depending on the locale.
- * This can be Saturday(6), Sunday(0) or Monday(1)
- * 
- * @see https://stackoverflow.com/questions/53382465/how-can-i-determine-if-week-starts-on-monday-or-sunday-based-on-locale-in-pure-j
- * 
- * @param string locale
- * 
- * @return integer
- */
-CalendarDate.getWeekStart = function(locale) {
-
-	locale = user_locale.value || locale || navigator.language;
-	const parts = locale.match(/^([a-z]{2,3})(?:-([a-z]{3})(?=$|-))?(?:-([a-z]{4})(?=$|-))?(?:-([a-z]{2}|\d{3})(?=$|-))?/i);
-
-	const language_code = parts[1];
-	const language_starting_Sat = ['ar','arq','arz','fa'];
-	const language_starting_Sun = 'amasbndzengnguhehiidjajvkmknkolomhmlmrmtmyneomorpapssdsmsnsutatethtnurzhzu'.match(/../g);
-	
-	const region_code = parts[4];
-	const region_starting_Sat = 'AEAFBHDJDZEGIQIRJOKWLYOMQASDSY'.match(/../g);
-	const region_starting_Sun = 'AGARASAUBDBRBSBTBWBZCACNCODMDOETGTGUHKHNIDILINJMJPKEKHKRLAMHMMMOMTMXMZNINPPAPEPHPKPRPTPYSASGSVTHTTTWUMUSVEVIWSYEZAZW'.match(/../g);
-
-	if (region_code){
-		if (region_starting_Sun.includes(region_code))
-			return 0;
-		else if (region_starting_Sat.includes(region_code))
-			return 6;
-		else
-			return 1;
-	}
-	else if(language_code)
-	{
-		if (language_starting_Sun.includes(language_code))
-			return 0;
-		else if (language_starting_Sat.includes(language_code)) 
-			return 6;
-		else
-			return 1;
-	}
-	else
-	{
-		return 1;
-	}
-}
-
-export default CalendarDate
diff --git a/public/js/composables/CalendarDates.js b/public/js/composables/CalendarDates.js
deleted file mode 100644
index a34198441..000000000
--- a/public/js/composables/CalendarDates.js
+++ /dev/null
@@ -1,16 +0,0 @@
-class CalendarDates{
-	
-	static subscribers_array = [];
-	
-	static subscribe(subscriber){
-		this.subscribers_array.push(subscriber);
-	}
-	static unsubscribe(subscriber){
-		this.subscribers_array = this.subscribers_array.filter(sub => !sub.compare(subscriber));
-	}
-	static cleanup(){
-		this.subscribers_array.forEach(sub => { sub.cleanup() });
-	}
-}
-
-export default CalendarDates;
\ No newline at end of file

From b0f8b316af0bfa341a4d11bc0899c917523a3202 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 29 Jul 2025 15:36:29 +0200
Subject: [PATCH 463/572] Use renderers in roominformation component

---
 public/css/Cis4/CoreCalendarEvents.css        |  5 ++
 .../js/components/Cis/Mylv/RoomInformation.js | 68 +++++--------------
 2 files changed, 22 insertions(+), 51 deletions(-)

diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index 908e23305..df451ebf1 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -92,3 +92,8 @@
 	flex: 0 0 100%;
 	text-align: center;
 }
+
+.fhc-roominformation .lehreinheitEventContent #lehreinheitOrt {
+	display: none;
+}
+
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 307b535f5..264e1e840 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -131,60 +131,26 @@ export default {
 			:backgrounds="backgrounds"
 		>
 			<template v-slot="{ event, mode }">
-				<component
-					v-if="mode == 'event'"
-					:is="renderers[event.type]?.modalContent"
-					:event="event"
-				></component>
-				<component
-					v-else-if="mode == 'eventheader'"
-					:is="renderers[event.type]?.modalTitle"
-					:event="event"
-				></component>
 				<div
-					v-else-if="mode == 'month'"
-					:class="'event-type-' + event.type"
+					:class="'event-type-' + event.type + ' ' + mode + 'PageContainer'"
+					:type="mode == 'day' ? 'button' : undefined"
 	 				:style="eventStyle(event)"
-					class="d-flex flex-column align-items-center justify-content-evenly h-100"
 				>
-					<span>{{ event?.topic }}</span>
-				</div>
-				<div
-					v-else-if="mode == 'week'"
-					:class="'event-type-' + event.type"
-	 				:style="eventStyle(event)"
-					class="border border-secondary d-flex flex-column align-items-center justify-content-evenly h-100"
-					type="button"
-				>
-					<span>{{ event?.topic }}</span>
-					<span v-for="lektor in event?.lektor">{{ lektor.kurzbz }}</span>
-					<span>{{ event?.ort_kurzbz }}</span>
-				</div>
-				<div
-					v-else-if="mode == 'day'"
-					:class="'event-type-' + event.type"
-	 				:style="eventStyle(event)"
-					type="button"
-					class="border border-secondary d-flex align-items-center justify-content-center text-center h-100"
-				>
-					<div class="col ">
-						<p>{{ $p.t('lehre/lehrveranstaltung') }}:</p>
-						<p class="m-0">
-							{{ event?.topic }}
-						</p>
-					</div>
-					<div class="col ">
-						<p>{{ $p.t('lehre/lektor') }}:</p>
-						<p class="m-0" v-for="lektor in event?.lektor">
-							{{ lektor.kurzbz }}
-						</p>
-					</div>
-					<div class="col ">
-						<p>{{ $p.t('profil/Ort') }}: </p>
-						<p class="m-0">
-							{{ event?.ort_kurzbz }}
-						</p>
-					</div>
+					<component
+						v-if="mode == 'event'"
+						:is="renderers[event.type]?.modalContent"
+						:event="event"
+					></component>
+					<component
+						v-else-if="mode == 'eventheader'"
+						:is="renderers[event.type]?.modalTitle"
+						:event="event"
+					></component>
+					<component
+						v-else
+						:is="renderers[event.type]?.calendarEvent"
+						:event="event"
+					></component>
 				</div>
 			</template>
 		</fhc-calendar>

From 868c15f47d3fd2a4007d18f2bb886e6225973e8c Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 29 Jul 2025 15:47:17 +0200
Subject: [PATCH 464/572] use teaching units for calendar

---
 public/js/components/Cis/LvPlan/LvPlan.js     | 13 +++++++++++-
 .../js/components/Cis/Mylv/RoomInformation.js | 21 +++++++++++++++----
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index e35cd5739..73c91734c 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -43,7 +43,8 @@ export default {
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
 			studiensemester_ende: null,
-			uid: null
+			uid: null,
+			teachingunits: null
 		};
 	},
 	computed:{
@@ -158,6 +159,15 @@ export default {
 			.then(res => {
 				this.uid = res.data.uid;
 			});
+		this.$api
+			.call(ApiLvPlan.getStunden())
+			.then(res => {
+				return this.teachingunits = res.data.map(el => ({
+					id: el.stunde,
+					start: el.beginn,
+					end: el.ende
+				}));
+			});
 	},
 	template:/*html*/`
 	<div class="fhc-lvplan d-flex flex-column h-100" v-if="renderers">
@@ -186,6 +196,7 @@ export default {
 			show-btns
 			:events="events || []"
 			:backgrounds="backgrounds"
+			:time-grid="teachingunits"
 		>
 			<template v-slot="{ event, mode }">
 				<div
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 264e1e840..1a1d1543d 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -1,6 +1,6 @@
 import FhcCalendar from "../../Calendar/Base.js";
 
-import ApiStudenplan from '../../../api/factory/lvPlan.js';
+import ApiLvPlan from '../../../api/factory/lvPlan.js';
 
 import { useEventLoader } from '../../../composables/EventLoader.js';
 
@@ -37,7 +37,8 @@ export default {
 				week: {
 					collapseEmptyDays: false
 				}
-			}
+			},
+			teachingunits: null
 		}
 	},
 	computed: {
@@ -100,8 +101,8 @@ export default {
 		
 		const { events } = useEventLoader(rangeInterval, (start, end) => {
 			return [
-				$api.call(ApiStudenplan.getRoomInfo(props.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate())),
-				$api.call(ApiStudenplan.getOrtReservierungen(props.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate()))
+				$api.call(ApiLvPlan.getRoomInfo(props.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate())),
+				$api.call(ApiLvPlan.getOrtReservierungen(props.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate()))
 			];
 		});
 
@@ -110,6 +111,17 @@ export default {
 			events
 		};
 	},
+	created() {
+		this.$api
+			.call(ApiLvPlan.getStunden())
+			.then(res => {
+				return this.teachingunits = res.data.map(el => ({
+					id: el.stunde,
+					start: el.beginn,
+					end: el.ende
+				}));
+			});
+	},
 	template: /*html*/`
 	<div class="fhc-roominformation d-flex flex-column h-100">
 		<h2>{{ $p.t('rauminfo/rauminfo') }} {{ propsViewData.ort_kurzbz }}</h2>
@@ -129,6 +141,7 @@ export default {
 			show-btns
 			:events="events || []"
 			:backgrounds="backgrounds"
+			:time-grid="teachingunits"
 		>
 			<template v-slot="{ event, mode }">
 				<div

From 30b895ad04b9cb39ede6dd904a35cc8daf143caa Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 29 Jul 2025 16:07:15 +0200
Subject: [PATCH 465/572] use renderers in search config

---
 application/config/search.php                 |  3 +
 application/libraries/SearchLib.php           |  2 +
 public/js/apps/Cis.js                         |  2 +-
 .../js/components/Stv/Studentenverwaltung.js  |  2 +-
 public/js/components/searchbar/searchbar.js   | 64 ++++++++++---------
 5 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/application/config/search.php b/application/config/search.php
index 451ae656d..220d5e435 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -225,6 +225,7 @@ $config['studentcis']['resultfields'] = [
 		AS photo_url",
 	"b.aktiv"
 ];
+$config['studentcis']['renderer'] = 'student';
 
 $config['prestudent'] = [
 	'primarykey' => 'prestudent_id',
@@ -538,6 +539,7 @@ $config['unassigned_employee']['searchfields']['tel']['join']['on'] = "
 	kontakttyp = 'telefon' 
 	AND tbl_kontakt.standort_id = unassigned_employee.standort_id
 ";
+$config['unassigned_employee']['renderer'] = 'employee';
 
 $config['organisationunit'] = [
 	'alias' => ['ou', 'organisationseinheit', 'oe'],
@@ -674,6 +676,7 @@ $config['active_organisationunit'] = $config['organisationunit'];
 $config['active_organisationunit']['alias'] = ['aou', 'aktive organisationseinheit', 'aoe'];
 $config['active_organisationunit']['prepare'] = 'active_organisationseinheit AS (SELECT * FROM public.tbl_organisationseinheit WHERE aktiv = true)';
 $config['active_organisationunit']['table'] = 'active_organisationseinheit';
+$config['active_organisationunit']['renderer'] = 'organisationunit';
 
 $config['room'] = [
 	'alias' => ['raum'],
diff --git a/application/libraries/SearchLib.php b/application/libraries/SearchLib.php
index 0c942c436..659e5e78c 100644
--- a/application/libraries/SearchLib.php
+++ b/application/libraries/SearchLib.php
@@ -231,8 +231,10 @@ class SearchLib
 				GROUP BY " . $this->_formatPrimarykeys($table_config['primarykey']) . "
 			)";
 
+			$renderer = $table_config['renderer'] ?? $type;
 			$selects[] = "
 				SELECT
+					" . $this->_ci->db->escape($renderer) . " AS renderer,
 					" . $this->_ci->db->escape($type) . " AS type,
 					rank,
 					TO_JSONB((SELECT x FROM (SELECT " . implode(", ", $table_config['resultfields'] ?? ['*']) . ") x)) AS data
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index dc32511c1..65ee6c45a 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -45,7 +45,7 @@ const app = Vue.createApp({
 						},
 						childactions: []
 					},
-                    raum: {
+                    room: {
                         defaultaction: {
                             type: "link",
 							renderif: function(data) {
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 13a0369ba..c7a4ce15a 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -100,7 +100,7 @@ export default {
 						childactions: [
 						]
 					},
-					mergedperson: {
+					mergedPerson: {
 						defaultaction: {
 							type: "link",
 							action: data => this.$fhcApi.getUri('/studentenverwaltung/person/' + data.person_id)
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 09dab9ece..0b30bd12f 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -1,5 +1,5 @@
 import person from "./result/person.js";
-import raum from "./result/room.js";
+import room from "./result/room.js";
 import employee from "./result/employee.js";
 import organisationunit from "./result/organisationunit.js";
 import student from "./result/student.js";
@@ -34,19 +34,19 @@ export default {
             lastQuery: ''
       };
     },
-    components: {
-      person: person,
-      raum: raum,
-      employee: employee,
-      organisationunit: organisationunit,
-      student: student,
-      prestudent: prestudent,
-      dms,
-      cms,
-      mergedStudent,
-      mergedPerson
-    },
-    template: /*html*/`
+	components: {
+		person,
+		room,
+		employee,
+		organisationunit,
+		student,
+		prestudent,
+		dms,
+		cms,
+		mergedStudent,
+		mergedPerson
+	},
+	template: /*html*/`
         <form
             ref="searchform"
             class="d-flex me-3"
@@ -92,17 +92,15 @@ export default {
                   </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">
-                    <person v-if="res.type === 'person'" :res="res" :actions="searchoptions.actions.person" @actionexecuted="hideresult"></person>
-                    <student v-else-if="res.type === 'student' || res.type === 'studentStv' || res.type === 'studentcis'" :mode="searchmode" :res="res" :actions="searchoptions.actions.student" @actionexecuted="hideresult"></student>
-                    <prestudent v-else-if="res.type === 'prestudent'" :mode="searchmode" :res="res" :actions="searchoptions.actions.prestudent" @actionexecuted="hideresult"></prestudent>
-                    <merged-student v-else-if="res.type === 'mergedstudent'" :mode="searchmode" :res="res" :actions="searchoptions.actions.mergedstudent" @actionexecuted="hideresult"></merged-student>
-                    <merged-person v-else-if="res.type === 'mergedperson'" :mode="searchmode" :res="res" :actions="searchoptions.actions.mergedperson" @actionexecuted="hideresult"></merged-person>
-                    <employee v-else-if="res.type === 'mitarbeiter' || res.type === 'mitarbeiter_ohne_zuordnung' || res.type === 'employee'  || res.type === 'unassigned_employee'" :res="res" :actions="searchoptions.actions.employee" @actionexecuted="hideresult"></employee>
-                    <organisationunit v-else-if="res.type === 'organisationunit' || res.type === 'active_organisationunit'" :res="res" :actions="searchoptions.actions.organisationunit" @actionexecuted="hideresult"></organisationunit>
-                    <raum v-else-if="res.type === 'raum' || res.type === 'room'" :mode="searchmode" :res="res" :actions="searchoptions.actions.raum || searchoptions.actions.room" @actionexecuted="hideresult"></raum>
-                    <dms v-else-if="res.type === 'dms'" :res="res" :actions="searchoptions.actions.dms" @actionexecuted="hideresult"></dms>
-                    <cms v-else-if="res.type === 'cms'" :res="res" :actions="searchoptions.actions.cms" @actionexecuted="hideresult"></cms>
+                  <template v-else v-for="res in searchresult">
+                    <component
+                        v-if="isValidRenderer(res.renderer)"
+                        :is="res.renderer"
+                        :mode="searchmode"
+                        :res="res"
+                        :actions="searchoptions.actions[dash2camelCase(res.renderer)]"
+                        @actionexecuted="hideresult"
+                    ></component>
                     <div v-else class="searchbar-result text-danger fw-bold">{{ $p.t('search/error_unknown_type', res) }}</div>
                   </template>
                 </div>
@@ -279,17 +277,17 @@ export default {
                     if (this.searchoptions.mergeResults) {
                         let counter = 0;
                         let mergeTypes = [];
-                        let mergedType = 'merged';
+                        let mergedType = 'merged-';
                         let mergeKey = '';
 
                         switch (this.searchoptions.mergeResults) {
                         case 'student':
-                            mergeTypes = ['student', 'studentStv', 'prestudent'];
+                            mergeTypes = ['student', 'prestudent'];
                             mergedType += this.searchoptions.mergeResults;
                             mergeKey = 'uid';
                             break;
                         case 'person':
-                            mergeTypes = ['person', 'employee', 'unassigned_employee', 'mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'student', 'studentStv', 'prestudent'];
+                            mergeTypes = ['person', 'employee', 'student', 'prestudent'];
                             mergedType += this.searchoptions.mergeResults;
                             mergeKey = 'person_id';
                             break;
@@ -297,13 +295,14 @@ export default {
 
                         if (mergeTypes.length) {
                             res = Object.values(res.reduce((a, c) => {
-                                if (!mergeTypes.includes(c.type)) {
+                                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]
                                     };
@@ -365,6 +364,13 @@ export default {
                 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);
         }
     }
 };

From 386ae594280f87a965d63e2e4a20241bbed4c8b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 29 Jul 2025 16:46:12 +0200
Subject: [PATCH 466/572] Archivierung von MC Zertifikaten/Zeugnissen

---
 content/student/studentoverlay.js.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index d2030f493..d8cb1fc56 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -3553,6 +3553,15 @@ function StudentZeugnisDokumentArchivieren()
 			xml = 'abschlussdokument_lehrgaenge.xml.php';
 			break;
 
+		case 'microcredentialzertifikat_1':
+		case 'microcredentialzertifikat_2':
+		case 'microcredentialzertifikat_3':
+		case 'microcredential_1':
+		case 'microcredential_2':
+		case 'microcredential_3':
+			xml = 'microcredential.xml.php';
+			break;
+			
 		default:
 			alert('Das Archivieren fuer diesen Dokumenttyp wird derzeit nicht unterstuetzt');
 			return
@@ -4783,7 +4792,7 @@ function StudentNotenMoveFromAntrag()
 
 	var uid = document.getElementById('student-detail-textbox-uid').value;
 	req.add('student_uid', uid);
-	
+
 	var txt = "?";
 	for(var q in req.parms) {
 		txt = txt+'&'+req.parms[q].name+'='+encodeURIComponent(req.parms[q].value);

From 1005963179094bf08273ec43c535841f9882ba21 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 29 Jul 2025 16:52:29 +0200
Subject: [PATCH 467/572] Each searchbar it's own config

---
 application/config/search.php                 | 24 +------------
 application/config/searchcis.php              | 35 +++++++++++++++++++
 application/config/searchstv.php              | 11 ++++++
 .../controllers/api/frontend/v1/Searchbar.php | 23 ++++++++++--
 application/libraries/SearchLib.php           | 12 +++++--
 public/js/api/factory/searchbar.js            | 11 ++++--
 public/js/apps/Cis.js                         |  6 ++--
 .../js/components/Stv/Studentenverwaltung.js  |  2 +-
 8 files changed, 90 insertions(+), 34 deletions(-)
 create mode 100644 application/config/searchcis.php
 create mode 100644 application/config/searchstv.php

diff --git a/application/config/search.php b/application/config/search.php
index 220d5e435..1450dff7b 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -210,23 +210,6 @@ $config['student'] = [
 		JOIN public.tbl_person p USING(person_id)"
 ];
 
-$config['studentcis'] = $config['student'];
-unset($config['studentcis']['searchfields']['email']);
-unset($config['studentcis']['searchfields']['tel']);
-$config['studentcis']['resultfields'] = [
-	"s.student_uid AS uid",
-	"s.matrikelnr",
-	"p.person_id",
-	"(p.vorname || ' ' || p.nachname) AS name",
-	"ARRAY[s.student_uid || '@' || '" . DOMAIN . "'] AS email",
-	"CASE
-		WHEN p.foto IS NOT NULL THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
-		ELSE NULL END
-		AS photo_url",
-	"b.aktiv"
-];
-$config['studentcis']['renderer'] = 'student';
-
 $config['prestudent'] = [
 	'primarykey' => 'prestudent_id',
 	'table' => 'public.tbl_prestudent',
@@ -511,6 +494,7 @@ $config['employee'] = [
 		) k ON (k.standort_id = m.standort_id)"
 ];
 
+// TODO(chris): move to searchpv21.php
 $config['unassigned_employee'] = $config['employee'];
 $config['unassigned_employee']['alias'] = ['mitarbeiter_ohne_zuordnung'];
 $config['unassigned_employee']['prepare'] = "unassigned_employee AS (
@@ -672,12 +656,6 @@ $config['organisationunit'] = [
 			ON (oe_parent.organisationseinheittyp_kurzbz = type_parent.organisationseinheittyp_kurzbz)"
 ];
 
-$config['active_organisationunit'] = $config['organisationunit'];
-$config['active_organisationunit']['alias'] = ['aou', 'aktive organisationseinheit', 'aoe'];
-$config['active_organisationunit']['prepare'] = 'active_organisationseinheit AS (SELECT * FROM public.tbl_organisationseinheit WHERE aktiv = true)';
-$config['active_organisationunit']['table'] = 'active_organisationseinheit';
-$config['active_organisationunit']['renderer'] = 'organisationunit';
-
 $config['room'] = [
 	'alias' => ['raum'],
 	'primarykey' => 'ort_kurzbz',
diff --git a/application/config/searchcis.php b/application/config/searchcis.php
new file mode 100644
index 000000000..ce385338f
--- /dev/null
+++ b/application/config/searchcis.php
@@ -0,0 +1,35 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+$CI =& get_instance();
+
+
+$config['employee'] = $CI->config->item('employee', 'search');
+
+$config['student'] = $CI->config->item('student', 'search');
+unset($config['student']['searchfields']['email']);
+unset($config['student']['searchfields']['tel']);
+$config['student']['resultfields'] = [
+	"s.student_uid AS uid",
+	"s.matrikelnr",
+	"p.person_id",
+	"(p.vorname || ' ' || p.nachname) AS name",
+	"ARRAY[s.student_uid || '@' || '" . DOMAIN . "'] AS email",
+	"CASE
+		WHEN p.foto IS NOT NULL THEN 'data:image/jpeg' || CONVERT_FROM(DECODE('3b','hex'), 'UTF8') || 'base64,' || p.foto
+		ELSE NULL END
+		AS photo_url",
+	"b.aktiv"
+];
+
+$config['organisationunit'] = $CI->config->item('organisationunit', 'search');
+$config['organisationunit']['prepare'] = 'active_organisationseinheit AS (SELECT * FROM public.tbl_organisationseinheit WHERE aktiv = true)';
+$config['organisationunit']['table'] = 'active_organisationseinheit';
+
+$config['room'] = $CI->config->item('room', 'search');
+
+$config['cms'] = $CI->config->item('cms', 'search');
+
+$config['dms'] = $CI->config->item('dms', 'search');
diff --git a/application/config/searchstv.php b/application/config/searchstv.php
new file mode 100644
index 000000000..96c118ac8
--- /dev/null
+++ b/application/config/searchstv.php
@@ -0,0 +1,11 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+$CI =& get_instance();
+
+
+$config['student'] = $CI->config->item('student', 'search');
+
+$config['prestudent'] = $CI->config->item('prestudent', 'search');
diff --git a/application/controllers/api/frontend/v1/Searchbar.php b/application/controllers/api/frontend/v1/Searchbar.php
index 1f51334fc..363b6e534 100644
--- a/application/controllers/api/frontend/v1/Searchbar.php
+++ b/application/controllers/api/frontend/v1/Searchbar.php
@@ -36,7 +36,8 @@ class Searchbar extends FHCAPI_Controller
 		// NOTE(chris): additional permission checks will be done in SearchBarLib
 		parent::__construct([
 			'search' => self::PERM_LOGGED,
-			'searchAdvanced' => self::PERM_LOGGED
+			'searchCis' => self::PERM_LOGGED,
+			'searchStv' => self::PERM_LOGGED
 		]);
 	}
 
@@ -71,9 +72,25 @@ class Searchbar extends FHCAPI_Controller
 	/**
 	 * Gets a JSON body via HTTP POST and provides the parameters
 	 */
-	public function searchAdvanced()
+	public function searchCis()
 	{
-		$this->load->library('SearchLib');
+		return $this->searchAdvanced([ 'config' => 'searchcis' ]);
+	}
+
+	/**
+	 * Gets a JSON body via HTTP POST and provides the parameters
+	 */
+	public function searchStv()
+	{
+		return $this->searchAdvanced([ 'config' => 'searchstv' ]);
+	}
+
+	/**
+	 * Gets a JSON body via HTTP POST and provides the parameters
+	 */
+	private function searchAdvanced($config)
+	{
+		$this->load->library('SearchLib', $config);
 		$this->load->library('form_validation');
 
 		// Checks if the searchstr and the types parameters are in the POSTed JSON
diff --git a/application/libraries/SearchLib.php b/application/libraries/SearchLib.php
index 659e5e78c..24894eab5 100644
--- a/application/libraries/SearchLib.php
+++ b/application/libraries/SearchLib.php
@@ -40,17 +40,25 @@ class SearchLib
 	
 	/**
 	 * Gets the CI instance and loads model
+	 *
+	 * @param array		$params
+	 * @return void
 	 */
-	public function __construct()
+	public function __construct($params = null)
 	{
 		$this->_ci =& get_instance(); // get code igniter instance
 
+		$config = $params['config'] ?? null;
 		// It is loaded only to have the DB functions available
 		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
 
 		// Load Config
-		$this->_ci->load->config('search', true);
+		$this->_ci->load->config('search', true, (boolean)$config);
 		$this->_ci->load->config('searchfunctions', true);
+		if ($config) {
+			$this->_ci->load->config($config, true);
+			$this->_ci->config->set_item('search', $this->_ci->config->item($config));
+		}
 
 		$this->_ci->load->library('PhrasesLib', [['search'], null], 'search_phrases');
 
diff --git a/public/js/api/factory/searchbar.js b/public/js/api/factory/searchbar.js
index 6bff98cbc..6bcf577b4 100644
--- a/public/js/api/factory/searchbar.js
+++ b/public/js/api/factory/searchbar.js
@@ -23,10 +23,17 @@ export default {
 			params
 		};
 	},
-	searchAdvanced(params) {
+	searchCis(params) {
 		return {
 			method: 'post',
-			url: '/api/frontend/v1/searchbar/searchAdvanced',
+			url: '/api/frontend/v1/searchbar/searchCis',
+			params
+		};
+	},
+	searchStv(params) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/searchbar/searchStv',
 			params
 		};
 	}
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 65ee6c45a..efc104d69 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -17,9 +17,9 @@ const app = Vue.createApp({
 				calcheightonly: true,
                 types: [
                     "employee",
-					"studentcis",
+					"student",
                     "room",
-                    "active_organisationunit",
+                    "organisationunit",
 					"cms",
 					"dms"
                 ],
@@ -137,7 +137,7 @@ const app = Vue.createApp({
     },
     methods: {
         searchfunction: function(searchsettings) {
-        	return this.$api.call(ApiSearchbar.searchAdvanced(searchsettings));
+        	return this.$api.call(ApiSearchbar.searchCis(searchsettings));
         }
     }
 });
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index c7a4ce15a..e37122427 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -147,7 +147,7 @@ export default {
 			this.$refs.stvList.reload();
 		},
 		searchfunction(params, config) {
-			return this.$api.call(ApiSearchbar.searchAdvanced(params), config);
+			return this.$api.call(ApiSearchbar.searchStv(params), config);
 		}
 	},
 	created() {

From 91624a3e53e120aa4cd6a7481244639809713a36 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 30 Jul 2025 09:42:47 +0200
Subject: [PATCH 468/572] searchbar clear button, searchbar z-indexes

---
 public/css/components/searchbar/searchbar.css | 11 ++++++++
 public/js/components/searchbar/searchbar.js   | 25 +++++++++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css
index c55e13f7e..a27ffe224 100644
--- a/public/css/components/searchbar/searchbar.css
+++ b/public/css/components/searchbar/searchbar.css
@@ -10,6 +10,17 @@
 }
 
 
+.searchbar_input:focus,
+.searchbar_input:focus ~ .searchbar_input_clear {
+	z-index: 5; /* same as bootstrap .input-group > .form-control:focus */
+}
+
+
+.searchbar_searchbox.open {
+	z-index: 10000;
+}
+
+
 .searchbar_settings {
     position: absolute; 
     z-index: 9999; 
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 0b30bd12f..afaf93782 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -55,19 +55,35 @@ export default {
             @focusin="searchfocusin"
             @focusout="searchfocusout"
         >
-			<div ref="searchbox" class="h-100 input-group me-2">
+			<div
+				ref="searchbox"
+				class="h-100 input-group me-2 searchbar_searchbox"
+				:class="showresult ? 'open' : 'closed'"
+			>
 				<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"
+                    class="form-control searchbar_input"
                     type="search"
                     :placeholder="$p.t('search/input_search_label', {types:search_types_string})"
                     :aria-label="$p.t('search/input_search_label', {types:search_types_string})"
                 >
+				<span
+					v-if="searchsettings.searchstr"
+					class="w-0 position-relative searchbar_input_clear"
+				>
+					<button
+						class="position-absolute end-0 btn bg-transparent"
+						@click="clearInput"
+					>
+						<i class="fas fa-close"></i>
+					</button>
+				</span>
                 <span
                     data-bs-toggle="collapse"
                     data-bs-target="#searchSettings"
@@ -170,6 +186,11 @@ export default {
 		}
 	},
     methods: {
+    	clearInput() {
+    		this.searchsettings.searchstr = "";
+    		this.hideresult();
+    		this.$refs.input.focus()
+    	},
 		getSearchTypes: function () {
 			let result = this.allSearchTypes();
 			if (this.searchoptions.origin) {

From cb1ff2ef1ab5ae896f620fc7c09a7faea78eec0b Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 30 Jul 2025 11:03:42 +0200
Subject: [PATCH 469/572] remove unused function

---
 public/js/components/searchbar/searchbar.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index afaf93782..96a38d860 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -228,12 +228,6 @@ export default {
 			// removes the event listener checkSettingsVisibility when the collapsible is hidden
 			document.removeEventListener("click", this.checkSettingsVisibility);
 		},
-        allSearchOptions: function() {
-            this.searchsettings.types = [];
-            for( const idx in this.searchoptions.types ) {
-                this.searchsettings.types.push(this.searchoptions.types[idx]);
-            }
-        },
 		calcSearchResultHeight: function() {
 			const rect = this.$refs.results.getBoundingClientRect();
 			if( rect.height > 0 && rect.height < (window.innerHeight * 0.8) ) {

From 62aa022c690463a26999565a566c62fa8669483e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 30 Jul 2025 11:13:46 +0200
Subject: [PATCH 470/572] Tab Details: add missing person attributes to
 modelValue

---
 application/controllers/api/frontend/v1/stv/Prestudent.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index 369c8eabd..4d0aa5fe1 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -147,7 +147,7 @@ class Prestudent extends FHCAPI_Controller
 				in_array($prop, ['zgvdatum', 'zgvmadatum', 'zgvdoktordatum', 'zgv_code', 'zgvmas_code', 'zgvdoktor_code'])
 				&& !isset($update_prestudent[$prop])
 				&& array_key_exists($prop, $_POST)
-			) 
+			)
 			{
 				$update_prestudent[$prop] = null;
 			}

From 4e7ae928b5bd0a7f379737946641e4d60cb2c009 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 30 Jul 2025 11:19:21 +0200
Subject: [PATCH 471/572] Tab Details: add missing person attributes to
 modelValue.. second try

---
 application/controllers/api/frontend/v1/stv/Student.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index deafb7762..7c1589dd7 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -95,6 +95,14 @@ class Student extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('v.verband');
 		$this->PrestudentModel->addSelect('v.gruppe');
 		$this->PrestudentModel->addSelect('b.alias');
+		$this->PrestudentModel->addSelect('p.geburtsnation');
+		$this->PrestudentModel->addSelect('p.sprache');
+		$this->PrestudentModel->addSelect('p.gebort');
+		$this->PrestudentModel->addSelect('p.homepage');
+		$this->PrestudentModel->addSelect('p.anmerkung');
+		$this->PrestudentModel->addSelect('p.familienstand');
+		$this->PrestudentModel->addSelect('p.staatsbuergerschaft');
+		$this->PrestudentModel->addSelect('p.matr_nr');
 
 		if (defined('ACTIVE_ADDONS') && strpos(ACTIVE_ADDONS, 'bewerbung') !== false) {
 			$this->PrestudentModel->addSelect(

From ba23a6496c0bd53ce3bcb1226a5e33907de04c74 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 30 Jul 2025 11:22:39 +0200
Subject: [PATCH 472/572] Tab Exam: change layout to fitDataStretchFrozen

---
 .../Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
index 5a427fcd4..f90aa298d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
@@ -89,7 +89,7 @@ export default{
 						},
 						frozen: true
 					}],
-				layout: 'fitDataFill',
+				layout: 'fitDataStretchFrozen',
 				layoutColumnsOnNewData: false,
 				height: 'auto',
 				index: 'pruefung_id',

From a7698b9af85e76407c1c3eb8faf475b5859c1105 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 30 Jul 2025 11:23:00 +0200
Subject: [PATCH 473/572] searchbar clear button stretch height

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

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 96a38d860..fd19a22ab 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -78,7 +78,7 @@ export default {
 					class="w-0 position-relative searchbar_input_clear"
 				>
 					<button
-						class="position-absolute end-0 btn bg-transparent"
+						class="position-absolute top-0 bottom-0 end-0 btn bg-transparent"
 						@click="clearInput"
 					>
 						<i class="fas fa-close"></i>

From 79720a77c29e33ba43b6d65c288adf0b7935ed7f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 30 Jul 2025 11:23:48 +0200
Subject: [PATCH 474/572] searchbar: allow labels for types

---
 public/js/components/searchbar/searchbar.js | 144 ++++++++++++--------
 1 file changed, 90 insertions(+), 54 deletions(-)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index fd19a22ab..86602bec2 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -10,6 +10,18 @@ import mergedStudent from "./result/mergedstudent.js";
 import mergedPerson from "./result/mergedperson.js";
 
 export default {
+	components: {
+		person,
+		room,
+		employee,
+		organisationunit,
+		student,
+		prestudent,
+		dms,
+		cms,
+		mergedStudent,
+		mergedPerson
+	},
     props: [ "searchoptions", "searchfunction" ],
     provide() {
         return {
@@ -22,7 +34,7 @@ export default {
         hidetimer: null,
         searchsettings: {
             searchstr: this.getSearchStr(),
-            types: this.getSearchTypes(),
+            types: this.getInitiallySelectedTypes(),
         },
         searchresult: [],
         searchmode: '',
@@ -34,17 +46,31 @@ export default {
             lastQuery: ''
       };
     },
-	components: {
-		person,
-		room,
-		employee,
-		organisationunit,
-		student,
-		prestudent,
-		dms,
-		cms,
-		mergedStudent,
-		mergedPerson
+	computed:{
+		searchTypesPlaceholder() {
+			if (!this.searchsettings.types.length) {
+				return Object.values(this.typeLabels).join(' / ');
+			}
+			return this.searchsettings.types.map(type => this.typeLabels[type]).join(' / ');
+		},
+		types() {
+			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 (Array.isArray(this.searchoptions.types)) {
+				return this.searchoptions.types.reduce((res, type) => {
+					res[type] = type;
+					return res
+				}, {});
+			}
+			return this.searchoptions.types;
+		}
 	},
 	template: /*html*/`
         <form
@@ -70,8 +96,8 @@ export default {
                     v-model="searchsettings.searchstr"
                     class="form-control searchbar_input"
                     type="search"
-                    :placeholder="$p.t('search/input_search_label', {types:search_types_string})"
-                    :aria-label="$p.t('search/input_search_label', {types:search_types_string})"
+                    :placeholder="$p.t('search/input_search_label', { types: searchTypesPlaceholder })"
+                    :aria-label="$p.t('search/input_search_label', { types: searchTypesPlaceholder })"
                 >
 				<span
 					v-if="searchsettings.searchstr"
@@ -123,22 +149,45 @@ export default {
               </div>
             </div>
 
-            <div id="searchSettings"  ref="settings"
+			<div
+				id="searchSettings"
+				ref="settings"
 				@[\`shown.bs.collapse\`]="handleShowSettings"
 				@[\`hide.bs.collapse\`]="handleHideSettings"
-                class="top-100 end-0 searchbar_settings text-white collapse" tabindex="-1">
-              <div class="d-flex flex-column m-3" v-if="searchoptions.types.length > 0">
-              <span class="fw-light mb-2">{{ $p.t('search/applyfilter_label') }}</span>  
-              <template v-for="(type, index) in searchoptions.types" :key="type">
-                    <div class="form-check form-switch">
-                        <input class="fhc-switches form-check-input" type="checkbox" role="switch" :id="$.uid + 'search_type_' + index" :value="type" v-model="searchsettings.types">
-                        <label class="ps-2 form-check-label non-selectable" :for="$.uid + 'search_type_' + index">{{ type }}</label>
-                    </div>
-                </template>
-              </div>
+				class="top-100 end-0 searchbar_settings text-white collapse"
+				tabindex="-1"
+			>
+				<div
+					v-if="types.length > 0"
+					class="d-flex flex-column m-3"
+				>
+					<span class="fw-light mb-2">
+						{{ $p.t('search/applyfilter_label') }}
+					</span>
+					<template
+						v-for="(label, value) in typeLabels"
+						:key="value"
+					>
+						<div class="form-check form-switch">
+							<input
+								class="fhc-switches form-check-input"
+								type="checkbox"
+								role="switch"
+								:id="$.uid + 'search_type_' + value"
+								:value="value"
+								v-model="searchsettings.types"
+							>
+							<label
+								class="ps-2 form-check-label non-selectable"
+								:for="$.uid + 'search_type_' + value"
+							>
+								{{ label }}
+							</label>
+						</div>
+					</template>
+				</div>
             </div>
-        
-          </form>
+		</form>
     `,
     watch:{
 		'searchsettings.searchstr': function (newSearchValue) {
@@ -146,28 +195,16 @@ export default {
 				sessionStorage.setItem(`${this.searchoptions.origin}_searchstr`,newSearchValue);
 			}
 		},
-    },
-	computed:{
-		search_types_string(){
-			if (Array.isArray(this.searchsettings.types) && this.searchsettings.types.length > 0){
-				return this.searchsettings.types.join(' / ');
-			}else{
-				return JSON.stringify(this.searchsettings.types);
-			}
-		},
-		
-	},
-    beforeMount: function() {
-		this.$watch('searchsettings.types', newValue => {
-			if (Array.isArray(newValue) && newValue.length === 0){
-				this.searchsettings.types = this.allSearchTypes();
+		'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){
+			if (Array.isArray(newValue) && this.searchoptions.origin) {
 				localStorage.setItem(`${this.searchoptions.origin}_searchtypes`, JSON.stringify(newValue));
 			}
 			this.search();
-		});
+		}
     },
 	mounted(){
 		this.settingsDropdown = new bootstrap.Collapse(this.$refs.settings, {
@@ -191,22 +228,21 @@ export default {
     		this.hideresult();
     		this.$refs.input.focus()
     	},
-		getSearchTypes: function () {
-			let result = this.allSearchTypes();
+		getInitiallySelectedTypes() {
+			let result = false;
 			if (this.searchoptions.origin) {
 				let localStorageValue = localStorage.getItem(`${this.searchoptions.origin}_searchtypes`);
 				if (localStorageValue) {
 					result = JSON.parse(localStorageValue);
 				}
 			}
-			return result;
-		},
-		allSearchTypes() {
-			let allTypes = [];
-			for (const idx in this.searchoptions.types) {
-				allTypes.push(this.searchoptions.types[idx]);
-			};
-			return allTypes;
+			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)

From ee13cfadba0e384051148c773b1c69310340ccc1 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 30 Jul 2025 12:33:48 +0200
Subject: [PATCH 475/572] Use labels for types in CIS & StV searchbar

---
 public/js/apps/Cis.js                         |  16 +-
 .../js/components/Stv/Studentenverwaltung.js  |   8 +-
 system/phrasesupdate.php                      | 140 ++++++++++++++++++
 3 files changed, 152 insertions(+), 12 deletions(-)

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index efc104d69..14dd7d853 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -15,14 +15,14 @@ const app = Vue.createApp({
 				origin: "cis",
 				cssclass: "",
 				calcheightonly: true,
-                types: [
-                    "employee",
-					"student",
-                    "room",
-                    "organisationunit",
-					"cms",
-					"dms"
-                ],
+				types: {
+					employee: Vue.computed(() => this.$p.t("search/type_employee")),
+					student: Vue.computed(() => this.$p.t("search/type_student")),
+					room: Vue.computed(() => this.$p.t("search/type_room")),
+					organisationunit: Vue.computed(() => this.$p.t("search/type_organisationunit")),
+					cms: Vue.computed(() => this.$p.t("search/type_cms")),
+					dms: Vue.computed(() => this.$p.t("search/type_dms"))
+				},
                 actions: {
                     employee: {
                         defaultaction: {
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index e37122427..280ab8ebf 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -75,10 +75,10 @@ export default {
 				origin: 'stv',
 				cssclass: "position-relative",
 				calcheightonly: true,
-				types: [
-					"student",
-					"prestudent"
-				],
+				types: {
+					student: Vue.computed(() => this.$p.t('search/type_student')),
+					prestudent: Vue.computed(() => this.$p.t('search/type_prestudent'))
+				},
 				actions: {
 					student: {
 						defaultaction: {
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 88ef35fff..4e334cf18 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -41897,6 +41897,146 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'type_employee',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mitarbeiter',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'employees',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'type_student',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studenten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'students',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'type_prestudent',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Prestudenten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'prestudents',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'type_room',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Räume',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'rooms',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'type_organisationunit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Organisationseinheiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'organisation units',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'type_cms',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Inhalte',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'sites',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'type_dms',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dokumente',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'documents',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'search',

From 2755a194eb094a09d2031137d66fb768c10b55a8 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 30 Jul 2025 15:12:20 +0200
Subject: [PATCH 476/572] searchbar remove redundant cssclass option

---
 public/js/apps/Cis.js                           |  1 -
 public/js/components/Stv/Studentenverwaltung.js |  7 +++++--
 public/js/components/searchbar/searchbar.js     | 15 +++++++--------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 14dd7d853..98c8ad65d 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -13,7 +13,6 @@ const app = Vue.createApp({
         return {
             searchbaroptions: {
 				origin: "cis",
-				cssclass: "",
 				calcheightonly: true,
 				types: {
 					employee: Vue.computed(() => this.$p.t("search/type_employee")),
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 280ab8ebf..4770df72f 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -73,7 +73,6 @@ export default {
 			selected: [],
 			searchbaroptions: {
 				origin: 'stv',
-				cssclass: "position-relative",
 				calcheightonly: true,
 				types: {
 					student: Vue.computed(() => this.$p.t('search/type_student')),
@@ -233,7 +232,11 @@ export default {
 		<header class="navbar navbar-expand-lg navbar-dark bg-dark flex-md-nowrap p-0 shadow">
 			<a class="navbar-brand col-md-4 col-lg-3 col-xl-2 me-0 px-3" :href="stvRoot">FHC 4.0</a>
 			<button class="navbar-toggler d-md-none m-1 collapsed" type="button" data-bs-toggle="offcanvas" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" :aria-label="$p.t('ui/toggle_nav')"><span class="navbar-toggler-icon"></span></button>
-			<core-searchbar :searchoptions="searchbaroptions" :searchfunction="searchfunction" class="searchbar w-100"></core-searchbar>
+			<core-searchbar
+				:searchoptions="searchbaroptions"
+				:searchfunction="searchfunction"
+				class="searchbar position-relative w-100"
+			></core-searchbar>
 		</header>
 		<div class="container-fluid overflow-hidden">
 			<div class="row h-100">
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 86602bec2..a63365d29 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -73,14 +73,13 @@ export default {
 		}
 	},
 	template: /*html*/`
-        <form
-            ref="searchform"
-            class="d-flex me-3"
-            :class="searchoptions.cssclass"
-            action="javascript:void(0);"
-            @focusin="searchfocusin"
-            @focusout="searchfocusout"
-        >
+		<form
+			ref="searchform"
+			class="d-flex me-3"
+			action="javascript:void(0);"
+			@focusin="searchfocusin"
+			@focusout="searchfocusout"
+		>
 			<div
 				ref="searchbox"
 				class="h-100 input-group me-2 searchbar_searchbox"

From 16db622bc98635dfad92f49e97768dcd336a1bd5 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 30 Jul 2025 17:55:59 +0200
Subject: [PATCH 477/572] Tab Details

- add anrede to modelValue
- add Validations Alias and Lehrverbandsgruppe
- add Phrase invalidAlias
- add translation to validation Integer for field semester
---
 .../api/frontend/v1/stv/Student.php           | 38 ++++++++++++++++++-
 system/phrasesupdate.php                      | 20 ++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 7c1589dd7..17cec8b26 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -103,6 +103,7 @@ class Student extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('p.familienstand');
 		$this->PrestudentModel->addSelect('p.staatsbuergerschaft');
 		$this->PrestudentModel->addSelect('p.matr_nr');
+		$this->PrestudentModel->addSelect('p.anrede');
 
 		if (defined('ACTIVE_ADDONS') && strpos(ACTIVE_ADDONS, 'bewerbung') !== false) {
 			$this->PrestudentModel->addSelect(
@@ -178,6 +179,7 @@ class Student extends FHCAPI_Controller
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
 
 		$this->load->library('form_validation');
 
@@ -188,7 +190,15 @@ class Student extends FHCAPI_Controller
 
 		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'is_valid_date');
 
-		$this->form_validation->set_rules('semester', 'Semester', 'integer');
+		$this->form_validation->set_rules('semester', 'Semester', 'integer', [
+				'integer' => $this->p->t('ui', 'error_fieldNotInteger')
+			]
+		);
+
+		$this->form_validation->set_rules('alias', 'Alias', 'regex_match[/^[-a-z0-9\_\.]*[a-z0-9]{1,}\.[-a-z0-9\_]{1,}$/]',
+		[
+			'regex_match' => $this->p->t('ui', 'error_fieldInvalidAlias')
+		]);
 
 		$this->load->library('UDFLib');
 		
@@ -300,11 +310,37 @@ class Student extends FHCAPI_Controller
 
 		// Do Updates
 		if (count($update_lehrverband)) {
+
 			$curstudlvb = $this->StudentlehrverbandModel->load([
 				'studiensemester_kurzbz' => $studiensemester_kurzbz,
 				'student_uid' => $uid
 			]);
 
+			$data = $this->getDataOrTerminateWithError($curstudlvb);
+			$data = current($data);
+
+			$verbandCurrent = $data->verband;
+			$studiengang_kz = $data->studiengang_kz;
+			$semesterCurrent = $data->semester;
+			$gruppeCurrent = $data->gruppe;
+
+			$verband = isset($update_lehrverband['verband']) ? $update_lehrverband['verband'] : $verbandCurrent;
+			$gruppe = isset($update_lehrverband['gruppe']) ? $update_lehrverband['gruppe'] : $gruppeCurrent;
+			$semester = isset($update_lehrverband['semester']) ? $update_lehrverband['semester'] : $semesterCurrent;
+
+			//check if existing Lehrverband of new data to avoid Error
+			$result = $this->LehrverbandModel->loadWhere([
+				'verband' => $verband,
+				'gruppe' => $gruppe,
+				'semester' => $semester,
+				'studiengang_kz' => $studiengang_kz,
+			]);
+
+			if(!hasData($result))
+			{
+				$this->terminateWithError($this->p->t('lehre', 'error_noLehrverband'), self::ERROR_TYPE_GENERAL);
+			}
+
 			if(hasData($curstudlvb) && count(getData($curstudlvb)) > 0 )
 			{
 				$update_lehrverband['updatevon'] = $authuid;
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 355ed7186..c190d7b4f 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44577,6 +44577,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_fieldInvalidAlias',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Alias ist ungültig',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Alias is invalid',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-4 Finetuning END
 );
 

From fa97116ec45e0d4042b500310a693f51aec51bdd Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 30 Jul 2025 18:08:04 +0200
Subject: [PATCH 478/572] replace backend var semester_aktuell with api
 parameter in grades, student and status endpoints, adapt old and new js api
 definitions, adapt frontend, add validation method to studiensemester_model

---
 .../api/frontend/v1/stv/Grades.php            | 46 ++++++++++++-------
 .../api/frontend/v1/stv/Status.php            | 11 +++--
 .../api/frontend/v1/stv/Student.php           | 20 +++++---
 application/libraries/PrestudentLib.php       |  9 +---
 .../organisation/Studiensemester_model.php    |  6 +++
 public/js/api/factory/stv/details.js          | 14 ++++--
 public/js/api/factory/stv/grades.js           | 35 +++++++++-----
 public/js/api/factory/stv/prestudent.js       |  7 ++-
 public/js/api/stv/details.js                  | 18 +++++---
 public/js/api/stv/grades.js                   | 38 ++++++++++-----
 public/js/api/stv/prestudent.js               |  9 +++-
 .../Studentenverwaltung/Details/Details.js    | 12 ++++-
 .../Details/Noten/Repeater.js                 |  8 +++-
 .../Details/Noten/Teacher.js                  |  8 +++-
 .../Details/Noten/Zeugnis.js                  | 19 ++++++--
 .../Details/Noten/Zeugnis/Actions.js          | 17 +++++--
 .../Details/Noten/Zeugnis/Documents.js        |  1 +
 .../Studentenverwaltung/Details/Prestudent.js |  7 +--
 .../Details/Status/Dropdown.js                |  5 ++
 19 files changed, 205 insertions(+), 85 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Grades.php b/application/controllers/api/frontend/v1/stv/Grades.php
index 61d797495..dd8f53a27 100644
--- a/application/controllers/api/frontend/v1/stv/Grades.php
+++ b/application/controllers/api/frontend/v1/stv/Grades.php
@@ -74,14 +74,15 @@ class Grades extends FHCAPI_Controller
 	 * (Entries in lehre.tbl_zeugnisnote)
 	 *
 	 * @param string				$prestudent_id
-	 * @param string|null			$all (optional) If null only the current semesters grades will be loaded, otherwise all semesters grades will be loaded.
+	 * @param string|null			$studiensemester_kurzbz If studiensemester_kurzbz only this semesters grades will be loaded, otherwise all semesters grades will be loaded.
 	 *
 	 * @return void
 	 */
-	public function getCertificate($prestudent_id, $all = null)
+	public function getCertificate($prestudent_id, $studiensemester_kurzbz = null)
 	{
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		$result = $this->StudentModel->loadWhere([
 			'prestudent_id' => $prestudent_id
@@ -91,12 +92,13 @@ class Grades extends FHCAPI_Controller
 		if (!$student)
 			$this->terminateWithSuccess([]);
 		
-		
 		$student_uid = current($student)->student_uid;
 
-		$studiensemester_kurzbz = ($all === null) ? $this->variablelib->getVar('semester_aktuell') : null;
+		if ($studiensemester_kurzbz !== null && !$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
 
-		
 		$result = $this->ZeugnisnoteModel->getZeugnisnoten($student_uid, $studiensemester_kurzbz);
 
 		$grades = $this->getDataOrTerminateWithError($result);
@@ -109,14 +111,15 @@ class Grades extends FHCAPI_Controller
 	 * (Entries in campus.tbl_lvgesamtnote)
 	 *
 	 * @param string				$prestudent_id
-	 * @param string|null			$all (optional) If null only the current semesters grades will be loaded, otherwise all semesters grades will be loaded.
+	 * @param string|null			$studiensemester_kurzbz If studiensemester_kurzbz only this semesters grades will be loaded, otherwise all semesters grades will be loaded.
 	 *
 	 * @return void
 	 */
-	public function getTeacherProposal($prestudent_id, $all = null)
+	public function getTeacherProposal($prestudent_id, $studiensemester_kurzbz = null)
 	{
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('education/Lvgesamtnote_model', 'LvgesamtnoteModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		$result = $this->StudentModel->loadWhere([
 			'prestudent_id' => $prestudent_id
@@ -129,9 +132,11 @@ class Grades extends FHCAPI_Controller
 		
 		$student_uid = current($student)->student_uid;
 
-		$studiensemester_kurzbz = ($all === null) ? $this->variablelib->getVar('semester_aktuell') : null;
+		if ($studiensemester_kurzbz !== null && !$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
 
-		
 		$result = $this->LvgesamtnoteModel->getLvGesamtNoten(null, $student_uid, $studiensemester_kurzbz);
 
 		$grades = $this->getDataOrTerminateWithError($result);
@@ -144,17 +149,20 @@ class Grades extends FHCAPI_Controller
 	 * or as not allowed because of the repeating of a semester.
 	 *
 	 * @param string				$prestudent_id
-	 * @param string|null			$all (optional) If null only the current semesters grades will be loaded, otherwise all semesters grades will be loaded.
+	 * @param string|false			$studiensemester_kurzbz If studiensemester_kurzbz only this semesters grades will be loaded, otherwise all semesters grades will be loaded.
 	 *
 	 * @return void
 	 */
-	public function getRepeaterGrades($prestudent_id, $all = null)
+	public function getRepeaterGrades($prestudent_id, $studiensemester_kurzbz = false)
 	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 		$this->load->library('AntragLib');
 
-		$studiensemester_kurzbz = ($all === null) ? $this->variablelib->getVar('semester_aktuell') : false;
+		if ($studiensemester_kurzbz !== false && !$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
 
-		
 		$result = $this->antraglib->getLvsForPrestudent($prestudent_id, $studiensemester_kurzbz);
 
 		$grades = $this->getDataOrTerminateWithError($result);
@@ -456,13 +464,19 @@ class Grades extends FHCAPI_Controller
 	
 		$this->form_validation->set_rules("lehrveranstaltung_id", $this->p->t('lehre', 'lehrveranstaltung'), "required|integer");
 		$this->form_validation->set_rules("points", $this->p->t("stv", "grades_points"), "required|numeric");
+		$this->form_validation->set_rules("studiensemester_kurzbz", $this->p->t("lehre", "studiensemester"), "required|regex_match[/^[WS]S[0-9]{4}$/]");
 
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		
-		$this->load->model('education/Notenschluesselaufteilung_model', 'NotenschluesselaufteilungModel');
 
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
+
+		$this->load->model('education/Notenschluesselaufteilung_model', 'NotenschluesselaufteilungModel');
 		
 		$result = $this->NotenschluesselaufteilungModel->getNote(
 			$this->input->post('points'),
diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index fcc8007cd..629d5512a 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -30,6 +30,7 @@ class Status extends FHCAPI_Controller
 		//Load Models
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 		$this->load->model('person/Person_model', 'PersonModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
@@ -189,9 +190,13 @@ class Status extends FHCAPI_Controller
 		$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz;
 		if ($status_kurzbz == Prestudentstatus_model::STATUS_ABSOLVENT
 			|| $status_kurzbz == Prestudentstatus_model::STATUS_DIPLOMAND
-		) {
-			$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-			$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+		)
+		{
+			$studiensemester_kurzbz = $this->input->post('currentSemester');
+			if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+			{
+				$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+			}
 		}
 
 		$ausbildungssemester = $lastStatusData->ausbildungssemester;
diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index deafb7762..784227ae0 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -68,12 +68,14 @@ class Student extends FHCAPI_Controller
 	 * @param string			$prestudent_id
 	 * @return void
 	 */
-	public function get($prestudent_id)
+	public function get($prestudent_id, $studiensemester_kurzbz)
 	{
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-
-
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
 
 		$this->PrestudentModel->addSelect('p.person_id');
 		$this->PrestudentModel->addSelect('p.titelpre');
@@ -163,21 +165,25 @@ class Student extends FHCAPI_Controller
 	 * @param string			$prestudent_id
 	 * @return void
 	 */
-	public function save($prestudent_id)
+	public function save($prestudent_id, $studiensemester_kurzbz)
 	{
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		$this->load->library('form_validation');
 
+		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
+
 		$authuid = getAuthUID();
 		$now = date('c');
 
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-
 		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'is_valid_date');
 
 		$this->form_validation->set_rules('semester', 'Semester', 'integer');
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index ef5e2e3a9..2d795369f 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -500,11 +500,6 @@ class PrestudentLib
 
 		$student = current(getData($result));
 
-
-		$this->_ci->load->library('VariableLib', ['uid' => $authUID]);
-		$semester_aktuell = $this->_ci->variablelib->getVar('semester_aktuell');
-
-
 		// Update Aktionen
 
 		// Status updaten
@@ -545,8 +540,8 @@ class PrestudentLib
 		// Studentlehrverband updaten
 		$result = $this->_ci->StudentlehrverbandModel->update([
 			'student_uid' => $student->student_uid,
-			'studiensemester_kurzbz' => $semester_aktuell
-		], [
+			'studiensemester_kurzbz' => $studiensemester_kurzbz
+			], [
 			'semester' => $ausbildungssemester,
 			'verband' => '',
 			'gruppe' => '',
diff --git a/application/models/organisation/Studiensemester_model.php b/application/models/organisation/Studiensemester_model.php
index f29ab223c..5fa6ffb14 100644
--- a/application/models/organisation/Studiensemester_model.php
+++ b/application/models/organisation/Studiensemester_model.php
@@ -341,4 +341,10 @@ class Studiensemester_model extends DB_Model
 		WHERE studiensemester_kurzbz = ?",[$studiensemester_kurzbz]);
 
 	}
+
+	public function isValidStudiensemester($studiensemester_kurzbz)
+	{
+		$result = $this->load($studiensemester_kurzbz);
+		return hasData($result);
+	}
 }
diff --git a/public/js/api/factory/stv/details.js b/public/js/api/factory/stv/details.js
index 282b0003e..1077de22d 100644
--- a/public/js/api/factory/stv/details.js
+++ b/public/js/api/factory/stv/details.js
@@ -16,16 +16,22 @@
  */
 
 export default {
-	get(prestudent_id) {
+	get(prestudent_id, studiensemester_kurzbz) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/stv/student/get/' + prestudent_id
+			url: 'api/frontend/v1/stv/student/get/'
+				+ encodeURIComponent(prestudent_id)
+				+ '/'
+				+ encodeURIComponent(studiensemester_kurzbz)
 		};
 	},
-	save(prestudent_id, params) {
+	save(prestudent_id, studiensemester_kurzbz, params) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/stv/student/save/' + prestudent_id,
+			url: 'api/frontend/v1/stv/student/save/'
+				+ encodeURIComponent(prestudent_id)
+				+ '/'
+				+ encodeURIComponent(studiensemester_kurzbz),
 			params
 		};
 	},
diff --git a/public/js/api/factory/stv/grades.js b/public/js/api/factory/stv/grades.js
index ea0d025eb..c42d202e3 100644
--- a/public/js/api/factory/stv/grades.js
+++ b/public/js/api/factory/stv/grades.js
@@ -22,25 +22,34 @@ export default {
 			url: 'api/frontend/v1/stv/grades/list'
 		};
 	},
-	getCertificate(prestudent_id, all) {
-		all = all ? '/all' : '';
+	getCertificate(prestudent_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/grades/getCertificate/' + encodeURIComponent(prestudent_id);
+		if (!!studiensemester_kurzbz) {
+			url = url + '/' + encodeURIComponent(studiensemester_kurzbz);
+		}
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/grades/getCertificate/' + prestudent_id + all
+			url: url
 		};
 	},
-	getTeacherProposal(prestudent_id, all) {
-		all = all ? '/all' : '';
+	getTeacherProposal(prestudent_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/grades/getTeacherProposal/' + encodeURIComponent(prestudent_id);
+		if (!!studiensemester_kurzbz) {
+			url = url + '/' + encodeURIComponent(studiensemester_kurzbz);
+		}
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/grades/getTeacherProposal/' + prestudent_id + all
+			url: url
 		};
 	},
-	getRepeaterGrades(prestudent_id, all) {
-		all = all ? '/all' : '';
+	getRepeaterGrades(prestudent_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/grades/getRepeaterGrades/' + encodeURIComponent(prestudent_id);
+		if (!!studiensemester_kurzbz) {
+			url = url + '/' + encodeURIComponent(studiensemester_kurzbz);
+		}
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/grades/getRepeaterGrades/' + prestudent_id + all
+			url: url
 		};
 	},
 	updateCertificate({lehrveranstaltung_id, student_uid, studiensemester_kurzbz, note, lehrveranstaltung_bezeichnung}) {
@@ -86,11 +95,15 @@ export default {
 			}
 		};
 	},
-	getGradeFromPoints(points, lehrveranstaltung_id) {
+	getGradeFromPoints(points, lehrveranstaltung_id, studiensemester_kurzbz) {
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/stv/grades/getGradeFromPoints',
-			params: { points, lehrveranstaltung_id }
+			params: {
+				"points": points,
+				"lehrveranstaltung_id": lehrveranstaltung_id,
+				"studiensemester_kurzbz": studiensemester_kurzbz
+			}
 		};
 	}
 };
\ No newline at end of file
diff --git a/public/js/api/factory/stv/prestudent.js b/public/js/api/factory/stv/prestudent.js
index a49dd1d7a..0112ff49b 100644
--- a/public/js/api/factory/stv/prestudent.js
+++ b/public/js/api/factory/stv/prestudent.js
@@ -17,10 +17,13 @@
 
 export default {
 	//------------- Prestudent.js------------------------------------------------------
-	get(prestudent_id) {
+	get(prestudent_id, studiensemester_kurzbz) {
 		return {
 			method: 'post',
-			url: 'api/frontend/v1/stv/prestudent/get/' + prestudent_id
+			url: 'api/frontend/v1/stv/prestudent/get/'
+				+ encodeURIComponent(prestudent_id)
+				+ '/'
+				+ encodeURIComponent(studiensemester_kurzbz)
 		};
 	},
 	updatePrestudent(prestudent_id, params) {
diff --git a/public/js/api/stv/details.js b/public/js/api/stv/details.js
index a56de9494..501204c08 100644
--- a/public/js/api/stv/details.js
+++ b/public/js/api/stv/details.js
@@ -1,10 +1,16 @@
 export default {
-	get(prestudent_id) {
-		return this.$fhcApi.post('api/frontend/v1/stv/student/get/' + prestudent_id);
+	get(prestudent_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/student/get/'
+			+ encodeURIComponent(prestudent_id)
+			+ '/'
+			+ encodeURIComponent(studiensemester_kurzbz);
+		return this.$fhcApi.post(url);
 	},
-	save(form, prestudent_id, data) {
-		return this.$fhcApi.post(form, 'api/frontend/v1/stv/student/save/' + prestudent_id,
-			data
-		);
+	save(form, prestudent_id, studiensemester_kurzbz, data) {
+		let url = 'api/frontend/v1/stv/student/save/'
+			+ encodeURIComponent(prestudent_id)
+			+ '/'
+			+ encodeURIComponent(studiensemester_kurzbz);
+		return this.$fhcApi.post(form, url, data);
 	},
 }
diff --git a/public/js/api/stv/grades.js b/public/js/api/stv/grades.js
index 135cd836c..625c3f8e3 100644
--- a/public/js/api/stv/grades.js
+++ b/public/js/api/stv/grades.js
@@ -2,17 +2,26 @@ export default {
 	list() {
 		return this.$fhcApi.get('api/frontend/v1/stv/grades/list');
 	},
-	getCertificate(prestudent_id, all) {
-		all = all ? '/all' : '';
-		return this.$fhcApi.get('api/frontend/v1/stv/grades/getCertificate/' + prestudent_id + all);
+	getCertificate(prestudent_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/grades/getCertificate/' + encodeURIComponent(prestudent_id);
+		if (!!studiensemester_kurzbz) {
+			url = url + '/' + encodeURIComponent(studiensemester_kurzbz);
+		}
+		return this.$fhcApi.get(url);
 	},
-	getTeacherProposal(prestudent_id, all) {
-		all = all ? '/all' : '';
-		return this.$fhcApi.get('api/frontend/v1/stv/grades/getTeacherProposal/' + prestudent_id + all);
+	getTeacherProposal(prestudent_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/grades/getTeacherProposal/' + encodeURIComponent(prestudent_id);
+		if (!!studiensemester_kurzbz) {
+			url = url + '/' + encodeURIComponent(studiensemester_kurzbz);
+		}
+		return this.$fhcApi.get(url);
 	},
-	getRepeaterGrades(prestudent_id, all) {
-		all = all ? '/all' : '';
-		return this.$fhcApi.get('api/frontend/v1/stv/grades/getRepeaterGrades/' + prestudent_id + all);
+	getRepeaterGrades(prestudent_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/grades/getRepeaterGrades/' + encodeURIComponent(prestudent_id);
+		if (!!studiensemester_kurzbz) {
+			url = url + '/' + encodeURIComponent(studiensemester_kurzbz);
+		}
+		return this.$fhcApi.get(url);
 	},
 	updateCertificate({lehrveranstaltung_id, student_uid, studiensemester_kurzbz, note, lehrveranstaltung_bezeichnung}) {
 		return this.$fhcApi.post(
@@ -65,8 +74,15 @@ export default {
 			}
 		);
 	},
-	getGradeFromPoints(points, lehrveranstaltung_id, manualErrorHandling) {
+	getGradeFromPoints(points, lehrveranstaltung_id, studiensemester_kurzbz, manualErrorHandling) {
 		const config = manualErrorHandling ? {errorHandling: false} : {};
-		return this.$fhcApi.post('api/frontend/v1/stv/grades/getGradeFromPoints', {points, lehrveranstaltung_id}, config);
+		return this.$fhcApi.post('api/frontend/v1/stv/grades/getGradeFromPoints',
+			{
+				"points": points,
+				"lehrveranstaltung_id": lehrveranstaltung_id,
+				"studiensemester_kurzbz": studiensemester_kurzbz
+			},
+			config
+			);
 	}
 }
\ No newline at end of file
diff --git a/public/js/api/stv/prestudent.js b/public/js/api/stv/prestudent.js
index 25b4c85ad..8b2a5255b 100644
--- a/public/js/api/stv/prestudent.js
+++ b/public/js/api/stv/prestudent.js
@@ -2,8 +2,13 @@ export default {
 
 //------------- Prestudent.js------------------------------------------------------
 
-	get(prestudent_id){
-		return 	this.$fhcApi.post('api/frontend/v1/stv/prestudent/get/' + prestudent_id);
+	get(prestudent_id, studiensemester_kurzbz) {
+		return 	this.$fhcApi.post(
+			'api/frontend/v1/stv/prestudent/get/'
+			+ encodeURIComponent(prestudent_id)
+			+ '/'
+			+ encodeURIComponent(studiensemester_kurzbz)
+			);
 	},
 	updatePrestudent(form, prestudent_id, data){
 		return this.$fhcApi.post(form, 'api/frontend/v1/stv/prestudent/updatePrestudent/' + prestudent_id,
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index eacabccc0..45ee3bdd5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -41,6 +41,10 @@ export default {
 		$reloadList: {
 			from: '$reloadList',
 			required: true
+		},
+		currentSemester: {
+			from: 'currentSemester',
+			required: true
 		}
 	},
 	props: {
@@ -101,7 +105,7 @@ export default {
 	methods: {
 		updateStudent(n) {
 			return this.$api
-				.call(ApiStvDetails.get(n.prestudent_id))
+				.call(ApiStvDetails.get(n.prestudent_id, this.currentSemester))
 				.then(result => {
 					this.data = result.data;
 					if (!this.data.familienstand)
@@ -116,7 +120,11 @@ export default {
 
 			this.$refs.form.clearValidation();
 			return this.$refs.form
-				.call(ApiStvDetails.save(this.modelValue.prestudent_id, this.changed))
+				.call(ApiStvDetails.save(
+					this.modelValue.prestudent_id,
+					this.currentSemester,
+					this.changed
+					))
 				.then(result => {
 					this.original = {...this.data};
 					this.changed = {};
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Repeater.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Repeater.js
index ee70a721c..a4cfeaafb 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Repeater.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Repeater.js
@@ -9,6 +9,12 @@ export default {
 	emits: [
 		"copied"
 	],
+	inject: {
+		currentSemester: {
+			from: 'currentSemester',
+			required: true
+		}
+	},
 	props: {
 		student: Object,
 		allSemester: Boolean
@@ -24,7 +30,7 @@ export default {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(ApiStvGrades.getRepeaterGrades(
 					this.student.prestudent_id,
-					this.allSemester
+						(!this.allSemester ? this.currentSemester : null)
 				)),
 				ajaxResponse: (url, params, response) => {
 					return response.data || [];
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
index 171202163..4b0df9686 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
@@ -9,6 +9,12 @@ export default {
 	emits: [
 		"copied"
 	],
+	inject: {
+		currentSemester: {
+			from: 'currentSemester',
+			required: true
+		}
+	},
 	props: {
 		student: Object,
 		allSemester: Boolean
@@ -24,7 +30,7 @@ export default {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(ApiStvGrades.getTeacherProposal(
 					this.student.prestudent_id,
-					this.allSemester
+						(!this.allSemester ? this.currentSemester : null)
 				)),
 				ajaxResponse: (url, params, response) => {
 					return response.data || [];
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
index 81745897d..6ee4d0386 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
@@ -5,14 +5,22 @@ import ZeugnisDocuments from './Zeugnis/Documents.js';
 import ApiStvGrades from '../../../../../api/factory/stv/grades.js';
 
 export default {
+	name: 'Zeugnis',
 	components: {
 		CoreFilterCmpt,
 		ZeugnisActions,
 		ZeugnisDocuments
 	},
-	inject: [
-		'config'
-	],
+	inject: {
+		config: {
+			from: 'config',
+			required: true
+		},
+		currentSemester: {
+			from: 'currentSemester',
+			required: true
+		}
+	},
 	props: {
 		student: Object,
 		allSemester: Boolean
@@ -103,7 +111,8 @@ export default {
 									.call(
 										ApiStvGrades.getGradeFromPoints(
 											filterTerm,
-											cell.getData().lehrveranstaltung_id
+											cell.getData().lehrveranstaltung_id,
+											this.currentSemester
 										),
 										{ errorHandling: false }
 									)
@@ -201,7 +210,7 @@ export default {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(ApiStvGrades.getCertificate(
 					this.student.prestudent_id,
-					this.allSemester
+						(!this.allSemester ? this.currentSemester : null)
 				)),
 				ajaxResponse: (url, params, response) => {
 					return response.data || [];
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Actions.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Actions.js
index 303098cf9..1ffa47a30 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Actions.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Actions.js
@@ -5,6 +5,7 @@ import ZeugnisDocuments from './Documents.js';
 import ApiStvGrades from '../../../../../../api/factory/stv/grades.js';
 
 export default {
+	name: 'ZeugnisActions',
 	components: {
 		CoreForm,
 		FormInput,
@@ -14,9 +15,16 @@ export default {
 		'setGrade',
 		'deleteGrade'
 	],
-	inject: [
-		'config'
-	],
+	inject: {
+		config: {
+			from: 'config',
+			required: true
+		},
+		currentSemester: {
+			from: 'currentSemester',
+			required: true
+		}
+	},
 	props: {
 		selected: Array
 	},
@@ -66,7 +74,8 @@ export default {
 			this.$refs.points
 				.call(ApiStvGrades.getGradeFromPoints(
 					query,
-					this.selected.find(Boolean)?.lehrveranstaltung_id
+					this.selected.find(Boolean)?.lehrveranstaltung_id,
+					this.currentSemester
 				))
 				.then(result => {
 					if (result.data === null) {
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Documents.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Documents.js
index ed27dc283..121efddbf 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Documents.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis/Documents.js
@@ -8,6 +8,7 @@ async function callPermissionUrl($api, url) {
 }
 
 export default {
+	name: 'ZeugnisDocuments',
 	components: {
 		PvTieredMenu: primevue.tieredmenu
 	},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index a36b355b1..b73d2effc 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -30,8 +30,9 @@ export default {
 			from: 'hasAdminPermission',
 			default: false
 		},
-		defaultSemester: {
-			from: 'defaultSemester',
+		currentSemester: {
+			from: 'currentSemester',
+			required: true
 		}
 	},
 	props: {
@@ -107,7 +108,7 @@ export default {
 	methods: {
 		loadPrestudent() {
 			return this.$api
-				.call(ApiStvPrestudent.get(this.modelValue.prestudent_id))
+				.call(ApiStvPrestudent.get(this.modelValue.prestudent_id, this.currentSemester))
 				.then(result => result.data)
 				.then(result => {
 					this.data = result;
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
index ab8f83fab..d72c36b7c 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
@@ -14,6 +14,10 @@ export default {
 		$reloadList: {
 			from: '$reloadList',
 			required: true
+		},
+		currentSemester: {
+			from: 'currentSemester',
+			required: true
 		}
 	},
 	emits: [
@@ -242,6 +246,7 @@ export default {
 			return askForSemester();
 		},
 		changeStatus(data) {
+			data.currentSemester = this.currentSemester;
 			Promise
 				.allSettled(
 					this.prestudentIds.map(prestudent_id => this.$api.call(

From c876179762df3f4aa2ea1297148d85dcb9dd2bba Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 30 Jul 2025 18:15:09 +0200
Subject: [PATCH 479/572] adapt Students api endpoints, use ci routing, adapt
 frontend

---
 application/config/routes.php                 |  47 +++
 .../api/frontend/v1/stv/Students.php          | 334 +++++++++++-------
 .../js/components/Stv/Studentenverwaltung.js  |   9 +-
 3 files changed, 257 insertions(+), 133 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index eb4c267ce..943e7164f 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -63,6 +63,53 @@ $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 
 $route['Cis/Stundenplan/.*'] = 'Cis/Stundenplan/index/$1';
 
+// Studierendenverwaltung List Routes
+$route['api/frontend/v1/stv/[sS]tudents/inout'] = 'api/frontend/v1/stv/Students/index';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/index';
+
+// (studiensemester_kurzbz)/inout[/(incoming|outgoing|gemeinsamestudien)]
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout'] = 'api/frontend/v1/stv/Students/index';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/incoming'] = 'api/frontend/v1/stv/Students/getIncoming';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/outgoing'] = 'api/frontend/v1/stv/Students/getOutgoing';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/gemeinsamestudien'] = 'api/frontend/v1/stv/Students/getGemeinsamestudien';
+
+// (studiengang_kz)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]]
+$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudents/$1';
+$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$4';
+
+// (studiengang_kz)/(orgform)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]]
+$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$5';
+
+// (studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe)
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsSpezialgruppe/$1/$2/$3/$4';
+
+// (studiensemester_kurzbz)/(studiengang_kz)[/(semester)[/(verband)[/(gruppe)]]]
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/(:num)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4/$5';
+
+// (studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)/grp/(gruppe)
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgformSpezialgruppe/$1/$2/$3/$4/$5';
+
+// (studiensemester_kurzbz)/(studiengang_kz)/(orgform)[/(semester)[/(verband)[/(gruppe)]]]
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5/$6';
+
+// // (studiensemester_kurzbz)/student/(uid)
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/student/(:any)'] = 'api/frontend/v1/stv/Students/getStudent/$1/$2';
+// // (studiensemester_kurzbz)/prestudent/(prestudent_id)
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/prestudent/(:num)'] = 'api/frontend/v1/stv/Students/getPrestudent/$1/$2';
+// // (studiensemester_kurzbz)/person/(person_id)
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/person/(:num)'] = 'api/frontend/v1/stv/Students/getPerson/$1/$2';
+
 // load routes from extensions
 $subdir = 'application/config/extensions';
 $dirlist = scandir($subdir);
diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index df8793368..68e7407bf 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -48,139 +48,108 @@ class Students extends FHCAPI_Controller
 	}
 
 	/**
-	 * Remap calls:
-	 * /													=> return []
-	 * /inout												=> return []
-	 * /inout/incoming										=> getIncoming
-	 * /inout/outgoing										=> getOutgoing
-	 * /inout/gemeinsamestudien								=> getGemeinsamestudien
-	 * /(studiengang_kz)									=> getStudents
-	 * /(studiengang_kz)/prestudent							=> getPrestudents
-	 * /(studiengang_kz)/prestudent/*						=> getPrestudents
-	 * /(studiengang_kz)/(semester)							=> getStudents
-	 * /(studiengang_kz)/(semester)/grp/(gruppe_kurzbz)		=> getStudents
-	 * /(studiengang_kz)/(semester)/(verband)				=> getStudents
-	 * /(studiengang_kz)/(semester)/(verband)/(gruppe)		=> getStudents
-	 * /(studiengang_kz)/(org_form)							=> getStudents
-	 * /(studiengang_kz)/(org_form)/prestudent				=> getPrestudents
-	 * /(studiengang_kz)/(org_form)/prestudent/*			=> getPrestudents
-	 * /(studiengang_kz)/(org_form)/(semester)				=> getStudents
-	 * /(studiengang_kz)/(org_form)/(semester)/grp/(gruppe_kurzbz)
-	 * 														=> getStudents
-	 * /(studiengang_kz)/(org_form)/(semester)/(verband)	=> getStudents
-	 * /(studiengang_kz)/(org_form)/(semester)/(verband)/(gruppe)
-	 * 														=> getStudents
-	 * /student/(student_uid)								=> getStudent
-	 * /prestudent/(prestudent_id)							=> getPrestudent
-	 * /person/(person_id)									=> getPerson
+	 * Routing
 	 *
-	 * @param string		$method
-	 * @param array			$params				(optional)
+	 * /inout												=> index
+	 * /(studiensemester_kurzbz)							=> index
+	 * /(studiensemester_kurzbz)/inout						=> index
 	 *
+	 * /(studiensemester_kurzbz)/inout/incoming				=> getIncoming
+	 * /(studiensemester_kurzbz)/inout/outgoing				=> getOutgoing
+	 * /(studiensemester_kurzbz)/inout/gemeinsamestudien	=> getGemeinsamestudien
+	 *
+	 * /(studiengang_kz)/prestudent													=> getPrestudents
+	 * /(studiengang_kz)/prestudent/(studiensemester_kurzbz)						=> getPrestudents
+	 * /(studiengang_kz)/prestudent/(studiensemester_kurzbz)/(filter)				=> getPrestudents
+	 * /(studiengang_kz)/prestudent/(studiensemester_kurzbz)/(filter)/(otherfilter)	=> getPrestudents
+	 *
+	 * /(studiengang_kz)/(orgform)/prestudent													=> getPrestudentsOrgform
+	 * /(studiengang_kz)/(orgform)/prestudent/(studiensemester_kurzbz)							=> getPrestudentsOrgform
+	 * /(studiengang_kz)/(orgform)/prestudent/(studiensemester_kurzbz)/(filter)					=> getPrestudentsOrgform
+	 * /(studiengang_kz)/(orgform)/prestudent/(studiensemester_kurzbz)/(filter)/(otherfilter)	=> getPrestudentsOrgform
+	 *
+	 * /(studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe)	=> getStudentsSpezialguppe
+	 *
+	 * /(studiensemester_kurzbz)/(studiengang_kz)								=> getStudents
+	 * /(studiensemester_kurzbz)/(studiengang_kz)/(semester)					=> getStudents
+	 * /(studiensemester_kurzbz)/(studiengang_kz)/(semester)/(verband)			=> getStudents
+	 * /(studiensemester_kurzbz)/(studiengang_kz)/(semester)/(verband)/(gruppe) => getStudents
+	 *
+	 * /(studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)/grp/(gruppe) => getStudentsOrgformSpezialgruppe
+	 *
+	 * /(studiensemester_kurzbz)/(studiengang_kz)/(orgform)									=> getStudentsOrgform
+	 * /(studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)						=> getStudentsOrgform
+	 * /(studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)/(verband)			=> getStudentsOrgform
+	 * /(studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)/(verband)/(gruppe)	=> getStudentsOrgform
+	 *
+	 * /(studiensemester_kurzbz)/student/(student_uid)		=> getStudent
+	 * /(studiensemester_kurzbz)/prestudent/(prestudent_id)	=> getPrestudent
+	 * /(studiensemester_kurzbz)/person/(person_id)			=> getPerson
+	 */
+
+	public function index()
+	{
+		$this->addMeta('ci_method', __FUNCTION__);
+		$this->terminateWithSuccess([]);
+	}
+
+	/**
 	 * @return void
 	 */
-	public function _remap($method, $params = [])
+	public function getIncoming()
 	{
-		if ($method == '' || $method == 'index')
-			return $this->terminateWithSuccess([]);
+		$this->addMeta('ci_method', __FUNCTION__);
+		// TODO(chris): IMPLEMENT!
+		$this->terminateWithSuccess([]);
+	}
 
-		if ($method == 'inout') {
-			if (!count($params))
-				return $this->terminateWithSuccess([]);
-			switch ($params[0]) {
-				case 'incoming':
-					return $this->getIncoming();
-				case 'outgoing':
-					return $this->getOutgoing();
-				case 'gemeinsamestudien':
-					return $this->getGemeinsamestudien();
-				default:
-					return show_404();
-			}
-		}
+	/**
+	 * @return void
+	 */
+	public function getOutgoing()
+	{
+		$this->addMeta('ci_method', __FUNCTION__);
+		// TODO(chris): IMPLEMENT!
+		$this->terminateWithSuccess([]);
+	}
 
-		$count = count($params);
-		if (!$count)
-			return $this->getStudents($method);
+	/**
+	 * @return void
+	 */
+	public function getGemeinsamestudien()
+	{
+		$this->addMeta('ci_method', __FUNCTION__);
+		// TODO(chris): IMPLEMENT!
+		$this->terminateWithSuccess([]);
+	}
 
-		if ($method == 'uid' && $count == 1)
-			return $this->getStudent($params[0]);
-
-		if ($method == 'prestudent' && $count == 1)
-			return $this->getPrestudent($params[0]);
-
-		if ($method == 'person' && $count == 1)
-			return $this->getPerson($params[0]);
-
-		if (is_numeric($params[0])) {
-			$sem = $params[0];
-			if ($count == 3 && $params[1] == 'grp') {
-				$g = $params[2];
-				$ver = null;
-				$grp = null;
-			} else {
-				$g = null;
-				$ver = $count > 1 ? $params[1] : null;
-				$grp = $count > 2 ? $params[2] : null;
-			}
-			return $this->getStudents($method, $sem, $ver, $grp, $g);
-		} elseif ($params[0] == 'prestudent') {
-			if ($count == 1)
-				return $this->getPrestudents($method);
-			if ($count == 2)
-				return $this->getPrestudents($method, $params[1]);
-			return $this->getPrestudents($method, $params[1], $params[$count-1]);
-		} else {
-			$org = $params[0];
-			if ($count > 1 && $params[1] == 'prestudent') {
-				if ($count == 2)
-					return $this->getPrestudents($method, null, null, $org);
-				if ($count == 3)
-					return $this->getPrestudents($method, $params[2], null, $org);
-				return $this->getPrestudents($method, $params[2], $params[$count-1], $org);
-			}
-			$sem = $count > 1 ? $params[1] : null;
-			if ($count == 4 && $params[2] == 'grp') {
-				$g = $params[3];
-				$ver = null;
-				$grp = null;
-			} else {
-				$g = null;
-				$ver = $count > 2 ? $params[2] : null;
-				$grp = $count > 3 ? $params[3] : null;
-			}
-
-			return $this->getStudents($method, $sem, $ver, $grp, $g, $org);
-		}
+	public function getPrestudents($studiengang_kz,
+		$studiensemester_kurzbz = null, $filter = null
+	)
+	{
+		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', array(
+			'studiengang_kz' => $studiengang_kz,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'filter' => $filter
+		));
 		
-		show_404();
+		$this->fetchPrestudents($studiengang_kz, $studiensemester_kurzbz, $filter);
 	}
 
-	/**
-	 * @return void
-	 */
-	protected function getIncoming()
+	public function getPrestudentsOrgform($studiengang_kz, $orgform_kurzbz,
+		$studiensemester_kurzbz = null, $filter = null
+	)
 	{
-		// TODO(chris): IMPLEMENT!
-		$this->terminateWithSuccess([]);
-	}
-
-	/**
-	 * @return void
-	 */
-	protected function getOutgoing()
-	{
-		// TODO(chris): IMPLEMENT!
-		$this->terminateWithSuccess([]);
-	}
-
-	/**
-	 * @return void
-	 */
-	protected function getGemeinsamestudien()
-	{
-		// TODO(chris): IMPLEMENT!
-		$this->terminateWithSuccess([]);
+		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', array(
+			'studiengang_kz' => $studiengang_kz,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'filter' => $filter,
+			'orgform_kurzbz' => $orgform_kurzbz
+		));
+		
+		$this->fetchPrestudents($studiengang_kz, $studiensemester_kurzbz, $filter, $orgform_kurzbz);
 	}
 
 	/**
@@ -191,7 +160,7 @@ class Students extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	protected function getPrestudents($studiengang_kz, $studiensemester_kurzbz = null, $filter = null, $orgform_kurzbz = null)
+	protected function fetchPrestudents($studiengang_kz, $studiensemester_kurzbz = null, $filter = null, $orgform_kurzbz = null)
 	{
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
@@ -379,8 +348,73 @@ class Students extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
+	public function getStudents($studiensemester_kurzbz,
+		$studiengang_kz, $semester = null, $verband = null, $gruppe = null
+	)
+	{
+		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', array(
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'studiengang_kz' => $studiengang_kz,
+			'semester' => $semester,
+			'verband' => $verband,
+			'gruppe' => $gruppe
+		));
+		
+		$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, $verband, $gruppe, null, null);
+	}
+
+	public function getStudentsOrgform($studiensemester_kurzbz,
+		$studiengang_kz, $orgform_kurzbz, $semester = null, $verband = null, $gruppe = null
+	)
+	{
+		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', array(
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'studiengang_kz' => $studiengang_kz,
+			'orgform_kurzbz' => $orgform_kurzbz,
+			'semester' => $semester,
+			'verband' => $verband,
+			'gruppe' => $gruppe
+		));
+		
+		$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, $verband, $gruppe, null, $orgform_kurzbz);
+	}
+
+	public function getStudentsSpezialgruppe($studiensemester_kurzbz,
+		$studiengang_kz, $semester, $gruppe_kurzbz,
+		$orgform_kurzbz = null)
+	{
+		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', array(
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'studiengang_kz' => $studiengang_kz,
+			'semester' => $semester,
+			'gruppe_kurzbz' => $gruppe_kurzbz
+		));
+		
+		$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, null, null, $gruppe_kurzbz, null);
+	}
+
+	public function getStudentsOrgformSpezialgruppe($studiensemester_kurzbz,
+		$orgform_kurzbz, $studiengang_kz, $semester, $gruppe_kurzbz
+	)
+	{
+		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', array(
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'orgform_kurzbz' => $orgform_kurzbz,
+			'studiengang_kz' => $studiengang_kz,
+			'semester' => $semester,
+			'gruppe_kurzbz' => $gruppe_kurzbz
+		));
+		
+		$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, null, null, $gruppe_kurzbz, $orgform_kurzbz);
+	}
+
 	/**
 	 * @param integer		$studiengang_kz
+	 * @param string		$studiensemester_kurzbz
 	 * @param integer		$semester						(optional)
 	 * @param string		$verband						(optional)
 	 * @param integer		$gruppe							(optional)
@@ -389,11 +423,15 @@ class Students extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	protected function getStudents($studiengang_kz, $semester = null, $verband = null, $gruppe = null, $gruppe_kurzbz = null, $orgform_kurzbz = null)
+	protected function fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester = null, $verband = null, $gruppe = null, $gruppe_kurzbz = null, $orgform_kurzbz = null)
 	{
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
-
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
 
 		/*
 			$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
@@ -478,9 +516,20 @@ class Students extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	protected function getPrestudent($prestudent_id)
+	public function getPrestudent($studiensemester_kurzbz, $prestudent_id)
 	{
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', array(
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'prestudent_id' => $prestudent_id,
+		));
+
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
@@ -536,9 +585,20 @@ class Students extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	protected function getStudent($student_uid)
+	public function getStudent($studiensemester_kurzbz, $student_uid)
 	{
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', array(
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'student_uid' => $student_uid,
+		));
+
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
@@ -592,13 +652,25 @@ class Students extends FHCAPI_Controller
 	}
 
 	/**
+	 * @param string		$studiensemester_kurzbz
 	 * @param integer		$person_id
 	 *
 	 * @return void
 	 */
-	protected function getPerson($person_id)
+	public function getPerson($studiensemester_kurzbz, $person_id)
 	{
-		$studiensemester_kurzbz = $this->variablelib->getVar('semester_aktuell');
+		$this->addMeta('ci_method', __FUNCTION__);
+		$this->addMeta('ci_params', array(
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'person_id' => $person_id,
+		));
+
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		if (!$this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+		{
+			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
+		}
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 96846f76d..9c53dc529 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -114,10 +114,15 @@ export default {
 		}
 	},
 	methods: {
-		onSelectVerband({link, studiengang_kz}) {
+		onSelectVerband( {link, studiengang_kz}) {
+			let urlpath = String(link);
+			if (!urlpath.match(/\/prestudent/))
+			{
+				urlpath = this.studiensemesterKurzbz + '/' + urlpath;
+			}
 			this.studiengangKz = studiengang_kz;
 			this.$refs.stvList.updateUrl(
-				ApiStv.students.verband(link)
+				ApiStv.students.verband(urlpath)
 			);
 		},
 		studiensemesterChanged(v) {

From f12db529e0c781d953e7e5bba3ae3e70fefd1440 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 31 Jul 2025 07:40:07 +0200
Subject: [PATCH 480/572] Tab Notizen: remove clipContents

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

diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 8b37cd6e3..a2702c7f0 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -82,7 +82,7 @@ export default {
 						field: "text_stripped",
 						width: 250,
 						formatter: "html",
-						clipContents: true,
+						//clipContents: true,
 						tooltip:function(e, cell, onRendered){
 							var el = document.createElement("div");
 							el.style.backgroundColor = "white";
@@ -254,7 +254,7 @@ export default {
 							title: this.$p.t('global', 'text'),
 							width: 250,
 							tooltip: true,
-							clipContents: true,
+							//clipContents: true,
 						});
 
 						// Force layout recalculation for handling overflow text

From 2f10a3a3e9d13b0db906f1e169b9c0e7290d99db Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 31 Jul 2025 07:50:17 +0200
Subject: [PATCH 481/572] adapt single person routes, old and new js api files
 and frontend usage

---
 application/config/routes.php                 |  4 ++--
 .../api/frontend/v1/stv/Students.php          |  2 +-
 public/js/api/factory/stv/students.js         | 24 ++++++++++++++-----
 public/js/api/stv/students.js                 | 24 ++++++++++++++-----
 .../js/components/Stv/Studentenverwaltung.js  |  6 ++---
 5 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index 943e7164f..c129c7b3b 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -103,8 +103,8 @@ $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:nu
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5';
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5/$6';
 
-// // (studiensemester_kurzbz)/student/(uid)
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/student/(:any)'] = 'api/frontend/v1/stv/Students/getStudent/$1/$2';
+// // (studiensemester_kurzbz)/uid/(uid)
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/uid/(:any)'] = 'api/frontend/v1/stv/Students/getStudent/$1/$2';
 // // (studiensemester_kurzbz)/prestudent/(prestudent_id)
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/prestudent/(:num)'] = 'api/frontend/v1/stv/Students/getPrestudent/$1/$2';
 // // (studiensemester_kurzbz)/person/(person_id)
diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 68e7407bf..12785d6d7 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -82,7 +82,7 @@ class Students extends FHCAPI_Controller
 	 * /(studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)/(verband)			=> getStudentsOrgform
 	 * /(studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)/(verband)/(gruppe)	=> getStudentsOrgform
 	 *
-	 * /(studiensemester_kurzbz)/student/(student_uid)		=> getStudent
+	 * /(studiensemester_kurzbz)/uid/(student_uid)		=> getStudent
 	 * /(studiensemester_kurzbz)/prestudent/(prestudent_id)	=> getPrestudent
 	 * /(studiensemester_kurzbz)/person/(person_id)			=> getPerson
 	 */
diff --git a/public/js/api/factory/stv/students.js b/public/js/api/factory/stv/students.js
index 582ba04e8..18f3b1743 100644
--- a/public/js/api/factory/stv/students.js
+++ b/public/js/api/factory/stv/students.js
@@ -16,22 +16,34 @@
  */
 
 export default {
-	uid(uid) {
+	uid(uid, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/students/'
+			+ encodeURIComponent(studiensemester_kurzbz)
+			+ '/uid/'
+			+ encodeURIComponent(uid);
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/students/uid/' + uid
+			url: url
 		};
 	},
-	prestudent(prestudent_id) {
+	prestudent(prestudent_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/students/'
+			+ encodeURIComponent(studiensemester_kurzbz)
+			+ '/prestudent/'
+			+ encodeURIComponent(prestudent_id);
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/students/prestudent/' + prestudent_id
+			url: url
 		};
 	},
-	person(person_id) {
+	person(person_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/students/'
+			+ encodeURIComponent(studiensemester_kurzbz)
+			+ '/person/'
+			+ encodeURIComponent(person_id);
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/stv/students/person/' + person_id
+			url: url
 		};
 	},
 	verband(relative_path) {
diff --git a/public/js/api/stv/students.js b/public/js/api/stv/students.js
index 797a13bb3..5a6c13922 100644
--- a/public/js/api/stv/students.js
+++ b/public/js/api/stv/students.js
@@ -1,12 +1,24 @@
 export default {
-	uid(uid) {
-		return this.$fhcApi.getUri('api/frontend/v1/stv/students/uid/' + uid);
+	uid(uid, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/students/'
+			+ encodeURIComponent(studiensemester_kurzbz)
+			+ '/uid/'
+			+ encodeURIComponent(uid);
+		return this.$fhcApi.getUri(url);
 	},
-	prestudent(prestudent_id) {
-		return this.$fhcApi.getUri('api/frontend/v1/stv/students/prestudent/' + prestudent_id);
+	prestudent(prestudent_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/students/'
+			+ encodeURIComponent(studiensemester_kurzbz)
+			+ '/prestudent/'
+			+ encodeURIComponent(prestudent_id);
+		return this.$fhcApi.getUri(url);
 	},
-	person(person_id) {
-		return this.$fhcApi.getUri('api/frontend/v1/stv/students/person/' + person_id);
+	person(person_id, studiensemester_kurzbz) {
+		let url = 'api/frontend/v1/stv/students/'
+			+ encodeURIComponent(studiensemester_kurzbz)
+			+ '/person/'
+			+ encodeURIComponent(person_id);
+		return this.$fhcApi.getUri(url);
 	},
 	verband(relative_path) {
 		return this.$fhcApi.getUri('api/frontend/v1/stv/students/' + relative_path);
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 9c53dc529..34622f406 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -201,17 +201,17 @@ export default {
 		//FHC_JS_DATA_STORAGE_OBJECT.systemerror_mailto = 'ma0068@technikum-wien.at';this.$fhcAlert.handleSystemError(1);
 		if (this.$route.params.id) {
 			this.$refs.stvList.updateUrl(
-				ApiStv.students.uid(this.$route.params.id),
+				ApiStv.students.uid(this.$route.params.id, this.studiensemesterKurzbz),
 				true
 			);
 		} else if (this.$route.params.prestudent_id) {
 			this.$refs.stvList.updateUrl(
-				ApiStv.students.prestudent(this.$route.params.prestudent_id),
+				ApiStv.students.prestudent(this.$route.params.prestudent_id, this.studiensemesterKurzbz),
 				true
 			);
 		} else if (this.$route.params.person_id) {
 			this.$refs.stvList.updateUrl(
-				ApiStv.students.person(this.$route.params.person_id),
+				ApiStv.students.person(this.$route.params.person_id, this.studiensemesterKurzbz),
 				true
 			);
 		}

From 9a5790edf0152d08691aaef96217ec84edbc706a Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 31 Jul 2025 09:24:33 +0200
Subject: [PATCH 482/572] searchbar: better layout for clear button

---
 public/css/components/searchbar/searchbar.css | 12 ++++++++++++
 public/js/components/searchbar/searchbar.js   | 14 +++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css
index a27ffe224..dfb222c2a 100644
--- a/public/css/components/searchbar/searchbar.css
+++ b/public/css/components/searchbar/searchbar.css
@@ -10,6 +10,18 @@
 }
 
 
+.searchbar_input_clear {
+	/* 1rem * 5 / 8 = width of icon */
+	margin-inline-start: calc(-1rem * 5 / 8 - var(--bs-btn-padding-x) * 2 - var(--bs-border-width)) !important;
+	border: 0;
+	margin-inline-end: 1px;
+	z-index: 1;
+}
+.searchbar_input_clear:hover,
+.searchbar_input_clear:focus {
+	color: var(--bs-body-color);
+	background-color: transparent;
+}
 .searchbar_input:focus,
 .searchbar_input:focus ~ .searchbar_input_clear {
 	z-index: 5; /* same as bootstrap .input-group > .form-control:focus */
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index a63365d29..18d596cef 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -98,17 +98,13 @@ export default {
                     :placeholder="$p.t('search/input_search_label', { types: searchTypesPlaceholder })"
                     :aria-label="$p.t('search/input_search_label', { types: searchTypesPlaceholder })"
                 >
-				<span
+				<button
 					v-if="searchsettings.searchstr"
-					class="w-0 position-relative searchbar_input_clear"
+					class="searchbar_input_clear btn btn-outline-secondary"
+					@click="clearInput"
 				>
-					<button
-						class="position-absolute top-0 bottom-0 end-0 btn bg-transparent"
-						@click="clearInput"
-					>
-						<i class="fas fa-close"></i>
-					</button>
-				</span>
+					<i class="fas fa-close"></i>
+				</button>
                 <span
                     data-bs-toggle="collapse"
                     data-bs-target="#searchSettings"

From bc7c811227c8c494e08ce64d5aa0427a48b622f9 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 31 Jul 2025 09:29:43 +0200
Subject: [PATCH 483/572] searchbar: filter btn accessisible (real button)

---
 public/css/components/searchbar/searchbar.css | 6 ++++++
 public/js/components/searchbar/searchbar.js   | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css
index dfb222c2a..41bc6fa8f 100644
--- a/public/css/components/searchbar/searchbar.css
+++ b/public/css/components/searchbar/searchbar.css
@@ -27,6 +27,12 @@
 	z-index: 5; /* same as bootstrap .input-group > .form-control:focus */
 }
 
+.searchbar_setting_btn {
+	--bs-btn-color: var(--bs-body-color);
+	--bs-btn-bg: var(--bs-tertiary-bg);
+	--bs-btn-border-color: var(--bs-border-color);
+}
+
 
 .searchbar_searchbox.open {
 	z-index: 10000;
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 18d596cef..c828182f0 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -105,19 +105,19 @@ export default {
 				>
 					<i class="fas fa-close"></i>
 				</button>
-                <span
+                <button
                     data-bs-toggle="collapse"
                     data-bs-target="#searchSettings"
                     aria-expanded="false"
                     aria-controls="searchSettings"
                     ref="settingsbutton"
-                    class="input-group-text"
+                    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>
-                </span>
+                </button>
             </div>
 
             <div v-show="showresult"

From c4bb543c0a8679125ed3d7305c405f1251a53813 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 31 Jul 2025 09:37:13 +0200
Subject: [PATCH 484/572] HeaderDetails: delete empty space before titelpost

---
 public/js/components/DetailHeader/DetailHeader.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js
index aa0bb549d..5c1573753 100644
--- a/public/js/components/DetailHeader/DetailHeader.js
+++ b/public/js/components/DetailHeader/DetailHeader.js
@@ -132,8 +132,7 @@ export default {
 						<h2 class="h4">
 							{{headerData[0].titelpre}}
 							{{headerData[0].vorname}}
-							{{headerData[0].nachname}}
-							<span v-if="headerData[0].titelpost">, </span>
+							{{headerData[0].nachname}}<span v-if="headerData[0].titelpost">, </span>
 							{{headerData[0].titelpost}}
 						</h2>
 

From 9c3c8cd186a01a0ca21dc0abe408ecf85e63ff14 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 31 Jul 2025 10:33:25 +0200
Subject: [PATCH 485/572] status sorting in mergedperson search results

---
 application/config/search.php                 | 20 ++++++++++++++++++-
 .../searchbar/result/mergedperson.js          |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/application/config/search.php b/application/config/search.php
index 1450dff7b..bedf8d888 100644
--- a/application/config/search.php
+++ b/application/config/search.php
@@ -210,6 +210,23 @@ $config['student'] = [
 		JOIN public.tbl_person p USING(person_id)"
 ];
 
+$prestudent_sort = [
+	"Student",
+	"Incoming",
+	"Outgoing",
+	"Diplomand",
+	"Unterbrecher",
+	"Aufgenommener",
+	"Wartender",
+	"Bewerber",
+	"Interessent",
+	"Abgewiesener",
+	"Absolvent",
+	"Abbrecher",
+	"Ausserordentlicher",
+	"Praktikant"
+];
+$prestudent_sort_array = "array['" . implode("','", $prestudent_sort) . "']";
 $config['prestudent'] = [
 	'primarykey' => 'prestudent_id',
 	'table' => 'public.tbl_prestudent',
@@ -322,7 +339,8 @@ $config['prestudent'] = [
 			),
 			sg.orgform_kurzbz
 		) AS orgform",
-		"b.aktiv"
+		"b.aktiv",
+		"array_position(" . $prestudent_sort_array . ", public.get_rolle_prestudent(ps.prestudent_id, NULL)) AS sort"
 	],
 	'resultjoin' => "
 		LEFT JOIN public.tbl_prestudent ps USING (prestudent_id)
diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
index 0f6f3f0ee..bb395cb45 100644
--- a/public/js/components/searchbar/result/mergedperson.js
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -64,7 +64,7 @@ export default {
 						return false;
 					}
 					return true;
-				});
+				}).sort((a, b) => (a.sort || 0) - (b.sort || 0));
 			return students.length ? students : null;
 		},
 		emails() {

From 9a231d4bb4d0bd74dacf899331d9238ae23e8a91 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 31 Jul 2025 11:09:09 +0200
Subject: [PATCH 486/572] name for searchbar components

---
 public/css/components/searchbar/searchbar.css             | 4 ++--
 public/js/components/searchbar/result/cms.js              | 1 +
 public/js/components/searchbar/result/dms.js              | 1 +
 public/js/components/searchbar/result/employee.js         | 1 +
 public/js/components/searchbar/result/mergedperson.js     | 1 +
 public/js/components/searchbar/result/mergedstudent.js    | 3 ++-
 public/js/components/searchbar/result/organisationunit.js | 1 +
 public/js/components/searchbar/result/person.js           | 1 +
 public/js/components/searchbar/result/prestudent.js       | 1 +
 public/js/components/searchbar/result/room.js             | 1 +
 public/js/components/searchbar/result/student.js          | 1 +
 public/js/components/searchbar/result/template/action.js  | 3 ++-
 public/js/components/searchbar/result/template/actions.js | 3 ++-
 public/js/components/searchbar/result/template/frame.js   | 3 ++-
 public/js/components/searchbar/searchbar.js               | 1 +
 15 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css
index 41bc6fa8f..7dc653cb8 100644
--- a/public/css/components/searchbar/searchbar.css
+++ b/public/css/components/searchbar/searchbar.css
@@ -135,13 +135,13 @@
 
 /* new variant with template/frame */
 
-.searchbar-result {
+.searchbar-result-template-frame {
 	border-bottom: 1px solid lightgrey;
 	margin-bottom: 1rem;
 	padding-bottom: 1rem;
 }
 
-.searchbar-actions {
+.searchbar-result-template-actions {
 	display: flex;
 	flex-wrap: wrap;
 	gap: .5rem;
diff --git a/public/js/components/searchbar/result/cms.js b/public/js/components/searchbar/result/cms.js
index 5eebc3826..dfd2b575a 100644
--- a/public/js/components/searchbar/result/cms.js
+++ b/public/js/components/searchbar/result/cms.js
@@ -1,6 +1,7 @@
 import TemplateFrame from "./template/frame.js";
 
 export default {
+	name: 'SearchbarResultCms',
 	components: {
 		TemplateFrame
 	},
diff --git a/public/js/components/searchbar/result/dms.js b/public/js/components/searchbar/result/dms.js
index 8516c1555..adb0172a3 100644
--- a/public/js/components/searchbar/result/dms.js
+++ b/public/js/components/searchbar/result/dms.js
@@ -1,6 +1,7 @@
 import TemplateFrame from "./template/frame.js";
 
 export default {
+	name: 'SearchbarResultDms',
 	components: {
 		TemplateFrame
 	},
diff --git a/public/js/components/searchbar/result/employee.js b/public/js/components/searchbar/result/employee.js
index b86aa3ca5..d9d2332a5 100644
--- a/public/js/components/searchbar/result/employee.js
+++ b/public/js/components/searchbar/result/employee.js
@@ -1,6 +1,7 @@
 import TemplateFrame from "./template/frame.js";
 
 export default {
+	name: 'SearchbarResultEmployee',
 	components: {
 		TemplateFrame
 	},
diff --git a/public/js/components/searchbar/result/mergedperson.js b/public/js/components/searchbar/result/mergedperson.js
index bb395cb45..2b3397fde 100644
--- a/public/js/components/searchbar/result/mergedperson.js
+++ b/public/js/components/searchbar/result/mergedperson.js
@@ -2,6 +2,7 @@ import TemplateFrame from "./template/frame.js";
 import TemplateAction from "./template/action.js";
 
 export default {
+	name: 'SearchbarResultMergedperson',
 	components: {
 		TemplateFrame,
 		TemplateAction
diff --git a/public/js/components/searchbar/result/mergedstudent.js b/public/js/components/searchbar/result/mergedstudent.js
index e8ed89b65..7c59b0bf8 100644
--- a/public/js/components/searchbar/result/mergedstudent.js
+++ b/public/js/components/searchbar/result/mergedstudent.js
@@ -2,7 +2,8 @@ import ResultPrestudent from "./prestudent.js";
 import ResultStudent from "./student.js";
 
 export default {
-	components: {
+name: 'SearchbarResultMergedstudent',
+		components: {
 		ResultPrestudent,
 		ResultStudent
 	},
diff --git a/public/js/components/searchbar/result/organisationunit.js b/public/js/components/searchbar/result/organisationunit.js
index 66dda9726..d0b191da4 100644
--- a/public/js/components/searchbar/result/organisationunit.js
+++ b/public/js/components/searchbar/result/organisationunit.js
@@ -1,6 +1,7 @@
 import TemplateFrame from "./template/frame.js";
 
 export default {
+	name: 'SearchbarResultOrganistationunit',
 	components: {
 		TemplateFrame
 	},
diff --git a/public/js/components/searchbar/result/person.js b/public/js/components/searchbar/result/person.js
index f255caffe..da920be2c 100644
--- a/public/js/components/searchbar/result/person.js
+++ b/public/js/components/searchbar/result/person.js
@@ -1,6 +1,7 @@
 import TemplateFrame from "./template/frame.js";
 
 export default {
+	name: 'SearchbarResultPerson',
 	components: {
 		TemplateFrame
 	},
diff --git a/public/js/components/searchbar/result/prestudent.js b/public/js/components/searchbar/result/prestudent.js
index 574f9c4fb..f142fcdaa 100644
--- a/public/js/components/searchbar/result/prestudent.js
+++ b/public/js/components/searchbar/result/prestudent.js
@@ -1,6 +1,7 @@
 import TemplateFrame from "./template/frame.js";
 
 export default {
+	name: 'SearchbarResultPrestudent',
 	components: {
 		TemplateFrame
 	},
diff --git a/public/js/components/searchbar/result/room.js b/public/js/components/searchbar/result/room.js
index 03c59deb5..39e50395d 100644
--- a/public/js/components/searchbar/result/room.js
+++ b/public/js/components/searchbar/result/room.js
@@ -1,6 +1,7 @@
 import TemplateFrame from "./template/frame.js";
 
 export default {
+	name: 'SearchbarResultRoom',
 	components: {
 		TemplateFrame
 	},
diff --git a/public/js/components/searchbar/result/student.js b/public/js/components/searchbar/result/student.js
index 6a38ba9bc..db31bb689 100644
--- a/public/js/components/searchbar/result/student.js
+++ b/public/js/components/searchbar/result/student.js
@@ -1,6 +1,7 @@
 import TemplateFrame from "./template/frame.js";
 
 export default {
+	name: 'SearchbarResultStudent',
 	components: {
 		TemplateFrame
 	},
diff --git a/public/js/components/searchbar/result/template/action.js b/public/js/components/searchbar/result/template/action.js
index f41d9925f..7c50eb134 100644
--- a/public/js/components/searchbar/result/template/action.js
+++ b/public/js/components/searchbar/result/template/action.js
@@ -1,4 +1,5 @@
 export default {
+	name: 'SearchbarResultTemplateAction',
 	emits: [ 'actionexecuted' ],
 	props: { 
 		res: Object,
@@ -22,7 +23,7 @@ export default {
 		}
 	},
 	template: `
-	<a :href="actionHref" @click="actionFunc">
+	<a class="searchbar-result-template-action" :href="actionHref" @click="actionFunc">
 		<slot>{{ $p.t('search/action_default_label') }}</slot>
 	</a>`
 };
\ No newline at end of file
diff --git a/public/js/components/searchbar/result/template/actions.js b/public/js/components/searchbar/result/template/actions.js
index 5849594ed..726fef4dd 100644
--- a/public/js/components/searchbar/result/template/actions.js
+++ b/public/js/components/searchbar/result/template/actions.js
@@ -1,6 +1,7 @@
 import ResultAction from "./action.js";
 
 export default {
+	name: 'SearchbarResultTemplateActions',
 	components: {
 		ResultAction
 	},
@@ -10,7 +11,7 @@ export default {
 		actions: Array
 	},
 	template: `
-	<div v-if="actions.length" class="searchbar-actions">
+	<div v-if="actions.length" class="searchbar-result-template-actions">
 		<result-action
 			v-for="(action, index) in actions"
 			:key="action.label"
diff --git a/public/js/components/searchbar/result/template/frame.js b/public/js/components/searchbar/result/template/frame.js
index 336c2d9f9..5c8f8aa02 100644
--- a/public/js/components/searchbar/result/template/frame.js
+++ b/public/js/components/searchbar/result/template/frame.js
@@ -2,6 +2,7 @@ import ResultAction from "./action.js";
 import ResultActions from "./actions.js";
 
 export default {
+	name: 'SearchbarResultTemplateFrame',
 	components: {
 		ResultAction,
 		ResultActions
@@ -15,7 +16,7 @@ export default {
 		imageFallback: String
 	},
 	template: `
-	<div class="searchbar-result">
+	<div class="searchbar-result-template-frame">
 		<div class="searchbar_grid">
 			<div class="searchbar_icon">
 				<result-action
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index c828182f0..6a41fe2f5 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -10,6 +10,7 @@ import mergedStudent from "./result/mergedstudent.js";
 import mergedPerson from "./result/mergedperson.js";
 
 export default {
+	name: "FhcSearchbar",
 	components: {
 		person,
 		room,

From 25da0d6865017abf24c6a8bc3970420575374eaf Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 31 Jul 2025 11:12:58 +0200
Subject: [PATCH 487/572] cleanup - remove old/unused searchbar files

---
 public/js/components/searchbar/action.js      | 43 ---------
 public/js/components/searchbar/actions.js     | 37 --------
 public/js/components/searchbar/employee.js    | 89 ------------------
 .../components/searchbar/organisationunit.js  | 83 -----------------
 public/js/components/searchbar/person.js      | 55 -----------
 public/js/components/searchbar/prestudent.js  | 88 ------------------
 public/js/components/searchbar/raum.js        | 54 -----------
 public/js/components/searchbar/student.js     | 91 -------------------
 8 files changed, 540 deletions(-)
 delete mode 100644 public/js/components/searchbar/action.js
 delete mode 100644 public/js/components/searchbar/actions.js
 delete mode 100644 public/js/components/searchbar/employee.js
 delete mode 100644 public/js/components/searchbar/organisationunit.js
 delete mode 100644 public/js/components/searchbar/person.js
 delete mode 100644 public/js/components/searchbar/prestudent.js
 delete mode 100644 public/js/components/searchbar/raum.js
 delete mode 100644 public/js/components/searchbar/student.js

diff --git a/public/js/components/searchbar/action.js b/public/js/components/searchbar/action.js
deleted file mode 100644
index d13cd0551..000000000
--- a/public/js/components/searchbar/action.js
+++ /dev/null
@@ -1,43 +0,0 @@
-export default {
-    props: { 
-        res: {
-            type: Object
-        }, 
-        action: {
-            type: Object
-        }, 
-        cssclass: {
-            type: String,
-            default: ''
-        }
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-		<template v-if="this.renderif()">
-			<a :class="this.cssclass" :href="this.getactionhref()"
-				@click="this.execaction()">
-				<slot>Action</slot>
-			</a>
-		</template>
-		<template v-else>
-			<slot>Action</slot>
-		</template>
-    `,
-    methods: {
-        getactionhref: function() {
-            return (this.action.type === 'link') ? this.action.action(this.res) 
-                : 'javascript:void(0);';
-        },
-        execaction: function() { 
-            this.action.action(this.res);
-            this.$emit('actionexecuted');
-        },
-		renderif: function() {
-			if(this.action?.renderif === undefined) {
-				return true;
-			}
-
-			return this.action.renderif(this.res);
-		}
-    }
-};
diff --git a/public/js/components/searchbar/actions.js b/public/js/components/searchbar/actions.js
deleted file mode 100644
index c4e99f2b9..000000000
--- a/public/js/components/searchbar/actions.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import action from "./action.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-        <ul class="searchbar_actions" v-if="this.actions.length > 0">
-		<template v-for="(action, index) in this.actions" :key="action.label">
-          <li v-if="this.renderif(action)">
-            <action :res="this.res" :action="action" :cssclass="'btn btn-primary btn-sm'" @actionexecuted="$emit('actionexecuted')">
-                <i v-if="this.hasicon(index)" :class="this.geticonclass(index)"></i>
-                <span class="p-2">{{ action.label }}</span>
-            </action>
-          </li>
-		</template>
-        </ul>
-        <div class="mb-3" v-else=""></div>
-    `,
-    methods: {
-        hasicon: function(index) {
-            return (typeof this.actions[index].icon !== "undefined");
-        },
-        geticonclass: function(index) {            
-            return this.actions[index].icon;
-        },
-		renderif: function(action) {
-			if(action?.renderif === undefined) {
-				return true;
-			}
-
-			return action.renderif(this.res);
-		}
-    }
-};
diff --git a/public/js/components/searchbar/employee.js b/public/js/components/searchbar/employee.js
deleted file mode 100644
index f1e6a67f6..000000000
--- a/public/js/components/searchbar/employee.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action,
-        actions: actions
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-        <div class="searchbar_result searchbar_employee">
-    
-          <div class="searchbar_grid">
-              <div class="searchbar_icon">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <img v-if="(typeof res.photo_url !== 'undefined') && (res.photo_url !== null)" :src="res.photo_url" 
-                    class="rounded" style="max-height: 120px; max-width: 90px;" />
-                  <i v-else class="fas fa-user-circle fa-5x"></i>
-                </action>
-              </div>
-              
-              <div class="searchbar_data">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <span class="fw-bold">{{ res.name }}</span>
-                </action>
-        
-                <div class="mb-3"></div>
-        
-                <div class="searchbar_table">
-
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell searchbar_label">Standard-Kostenstelle</div>
-                    <div class="searchbar_tablecell searchbar_value">
-                        <ul class="searchbar_inline_ul" v-if="res.standardkostenstelle.length > 0">
-                          <li v-for="(stdkst, idx) in res.standardkostenstelle" :key="idx">{{ stdkst }}</li>
-                        </ul>
-                        <span v-else="">keine</span>
-                    </div>
-                  </div>
-
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell searchbar_label">Organisations-Einheit</div>
-                    <div class="searchbar_tablecell searchbar_value">
-                        <ul class="searchbar_inline_ul" v-if="res.organisationunit_name.length > 0">
-                          <li v-for="(oe, idx) in res.organisationunit_name" :key="idx">{{ oe }}</li>
-                        </ul>
-                        <span v-else="">keine</span> 
-                    </div>
-                  </div>
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell searchbar_label">EMail</div>
-                    <div class="searchbar_tablecell searchbar_value">
-                        <a :href="this.mailtourl">
-                          {{ res.email }}
-                        </a>
-                    </div>
-                  </div>
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell searchbar_label">Telefon</div>
-                    <div class="searchbar_tablecell searchbar_value">
-                        <a :href="this.telurl">
-                          {{ res.phone }}
-                        </a>
-                    </div>
-                  </div>        
-        
-                </div>
-        
-                <actions :res="this.res" :actions="this.actions.childactions" @actionexecuted="$emit('actionexecuted')"></actions>
-        
-              </div>
-          </div>
-          
-        </div>
-    `,
-    methods: {
-    },
-    computed: {
-        mailtourl: function() {
-            return 'mailto:' + this.res.email;
-        },
-        telurl: function() {
-            return 'tel:' + this.res.phone;
-        }
-    }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/organisationunit.js b/public/js/components/searchbar/organisationunit.js
deleted file mode 100644
index 09e2822a3..000000000
--- a/public/js/components/searchbar/organisationunit.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action,
-        actions: actions
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-        <div class="searchbar_result searchbar_organisationunit">
-    
-          <div class="searchbar_grid">
-              <div class="searchbar_icon">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <i class="fas fa-sitemap fa-4x"></i>
-                </action>
-              </div>
-              
-              <div class="searchbar_data">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <span class="fw-bold">{{ res.name }}</span>
-                </action>
-        
-                <div class="mb-3"></div>
-        
-                <div class="searchbar_table">
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell searchbar_label">übergeordnete OrgEinheit</div>
-                    <div class="searchbar_tablecell searchbar_value">
-                          {{ res.parentoe_name }}
-                    </div>
-                  </div>
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell searchbar_label">Gruppen-EMail</div>
-                    <div class="searchbar_tablecell searchbar_value">
-                        <a :href="this.mailtourl" v-if="res.mailgroup">
-                          {{ res.mailgroup }}
-                        </a>
-                        <span v-else>-</span>
-                    </div>
-                  </div>
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell searchbar_label">Leiter</div>
-                    <div class="searchbar_tablecell searchbar_value">
-                        <ul class="searchbar_inline_ul" v-if="res.leaders.length > 0">
-                          <li v-for="(leader, idx) in res.leaders" :key="idx">{{ leader.name }}</li>
-                        </ul>
-                        <span v-else="">N.N.</span>                                
-                    </div>
-                  </div>        
-        
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell searchbar_label">Mitarbeiter-Anzahl</div>
-                    <div class="searchbar_tablecell searchbar_value">
-                        {{ res.number_of_people }}
-                    </div>
-                  </div>
-        
-                </div>
-        
-                <actions :res="this.res" :actions="this.actions.childactions" @actionexecuted="$emit('actionexecuted')"></actions>
-        
-              </div>
-          </div>
-          
-        </div>
-    `,
-    methods: {
-    },
-    computed: {
-        mailtourl: function() {
-            return 'mailto:' + this.res.mailgroup;
-        },
-        telurl: function() {
-            return 'tel:' + this.res.phone;
-        }
-    }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/person.js b/public/js/components/searchbar/person.js
deleted file mode 100644
index eeb476149..000000000
--- a/public/js/components/searchbar/person.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action,
-        actions: actions
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-        <div class="searchbar_result searchbar_person">
-    
-          <div class="searchbar_grid">
-              <div class="searchbar_icon">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <img v-if="(typeof res.foto !== 'undefined') && (res.foto !== null)" :src="res.foto" 
-                    class="rounded" style="max-height: 120px; max-width: 90px;" />
-                  <i v-else class="fas fa-user-circle fa-5x"></i>
-                </action>
-              </div>
-              
-              <div class="searchbar_data">
-                <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                  <span class="fw-bold">{{ res.gn }} {{ res.sn }}</span>
-                </action>
-        
-                <div class="mb-3"></div>
-        
-                <div class="searchbar_table">
-                  <div class="searchbar_tablerow">
-                    <div class="searchbar_tablecell searchbar_label">EMail</div>
-                    <div class="searchbar_tablecell searchbar_value">
-                        <a :href="this.mailtourl">
-                          {{ res.mail }}
-                        </a>
-                    </div>
-                  </div>
-                </div>
-        
-                <actions :res="this.res" :actions="this.actions.childactions" @actionexecuted="$emit('actionexecuted')"></actions>
-        
-              </div>
-          </div>
-          
-        </div>
-    `,
-    methods: {
-    },
-    computed: {
-        mailtourl: function() {
-            return 'mailto:' + this.res.mail;
-        }
-    }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/prestudent.js b/public/js/components/searchbar/prestudent.js
deleted file mode 100644
index 99837fe4b..000000000
--- a/public/js/components/searchbar/prestudent.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-	props: [ "res", "actions" ],
-	components: {
-		action: action,
-		actions: actions
-	},
-	emits: [ 'actionexecuted' ],
-	template: `
-		<div class="searchbar_result searchbar_prestudent">
-		
-			<div class="searchbar_grid">
-				<div class="searchbar_icon">
-					<action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-						<img v-if="(typeof res.foto !== 'undefined') && (res.foto !== null)"
-							 :src="'data:image/jpeg;base64,' + res.foto"
-							 class="rounded-circle" height="100"/>
-						<i v-else class="fas fa-user-circle fa-5x"></i>
-					</action>
-				</div>
-		
-				<div class="searchbar_data">
-					<action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-						<span class="fw-bold">{{ res.name }}</span>
-					</action>
-		
-					<div class="mb-3"></div>
-		
-					<div class="searchbar_table">
-		
-						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell searchbar_label">Prestudent_id</div>
-							<div class="searchbar_tablecell searchbar_value">
-								{{ res.prestudent_id }}
-							</div>
-						</div>
-		
-						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell searchbar_label">Student_uid</div>
-							<div class="searchbar_tablecell searchbar_value">
-								{{ res.uid }}
-							</div>
-						</div>
-		
-						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell searchbar_label">Person_id</div>
-							<div class="searchbar_tablecell searchbar_value">
-								{{ res.person_id }}
-							</div>
-						</div>
-		
-						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell searchbar_label">Studiengang</div>
-							<div class="searchbar_tablecell searchbar_value">
-								{{ res.bezeichnung }}
-							</div>
-						</div>
-		
-						<div class="searchbar_tablerow">
-							<div class="searchbar_tablecell searchbar_label">EMail</div>
-							<div class="searchbar_tablecell searchbar_value">
-								<a :href="this.mailtourl">
-									{{ res.email }}
-								</a>
-							</div>
-						</div>
-		
-		
-					</div>
-		
-					<actions :res="this.res" :actions="this.actions.childactions"
-							 @actionexecuted="$emit('actionexecuted')"></actions>
-		
-				</div>
-			</div>
-		
-		</div>
-    `,
-	methods: {
-	},
-	computed: {
-		mailtourl: function() {
-			return 'mailto:' + this.res.email;
-		}
-	}
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/raum.js b/public/js/components/searchbar/raum.js
deleted file mode 100644
index 4a55b417a..000000000
--- a/public/js/components/searchbar/raum.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action, 
-        actions: actions
-    },
-    emits: [ 'actionexecuted' ],
-    template: /*html*/`
-        <div class="searchbar_result searchbar_raum">
-          <div class="searchbar_grid">
-            <div class="searchbar_icon">
-              <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                <i class="fas fa-door-open fa-4x"></i>
-              </action>
-            </div>
-            <div class="searchbar_data">
-              <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                <span class="fw-bold">{{ res.ort_kurzbz }}</span>
-              </action>
-        
-              <div class="mb-3"></div>
-        
-              <div class="searchbar_table">
-                <div class="searchbar_tablerow">
-                  <div class="searchbar_tablecell searchbar_label">Standort</div>
-                  <div class="searchbar_tablecell searchbar_value">{{ res.standort }}</div>
-                </div>
-                <div class="searchbar_tablerow">
-                  <div class="searchbar_tablecell searchbar_label">Sitzplätze</div>
-                  <div class="searchbar_tablecell searchbar_value">{{ res.sitzplaetze }}</div>
-                </div>
-                <div class="searchbar_tablerow">
-                  <div class="searchbar_tablecell searchbar_label">Gebäude</div>
-                  <div class="searchbar_tablecell searchbar_value">{{ res.building }}</div>
-                </div>
-                <div class="searchbar_tablerow">
-                  <div class="searchbar_tablecell searchbar_label">Zusatz Informationen</div>
-                  <div class="searchbar_tablecell searchbar_value"><div v-html="res.austattung.replace('<br />','')"></div></div>
-                </div>
-              </div>
-        
-              <actions :res="this.res" :actions="this.actions.childactions" @actionexecuted="$emit('actionexecuted')"></actions>
-        
-            </div>
-          </div>
-        
-        </div>
-    `,
-    methods: {
-    }
-};
\ No newline at end of file
diff --git a/public/js/components/searchbar/student.js b/public/js/components/searchbar/student.js
deleted file mode 100644
index ac7362d23..000000000
--- a/public/js/components/searchbar/student.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import action from "./action.js";
-import actions from "./actions.js";
-
-export default {
-    props: [ "res", "actions" ],
-    components: {
-        action: action,
-        actions: actions
-    },
-    emits: [ 'actionexecuted' ],
-    template: `
-        <div class="searchbar_result searchbar_student" :class="(!res?.aktiv) ? 'searchbar_inaktiv' : ''">
-        
-            <div class="searchbar_grid">
-                <div class="searchbar_icon">
-                    <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                        <img v-if="(typeof res.foto !== 'undefined') && (res.foto !== null)"
-                             :src="studentImage"
-                             class="rounded" style="max-height: 120px; max-width: 90px;" />
-                        <i v-else class="fas fa-user-circle fa-5x"></i>
-                    </action>
-                </div>
-        
-                <div class="searchbar_data">
-                    <action :res="this.res" :action="this.actions.defaultaction" @actionexecuted="$emit('actionexecuted')">
-                        <span class="fw-bold">{{ res.name }}</span>
-                    </action>
-        
-                    <div class="mb-3"></div>
-                
-                    <div class="searchbar_table">
-
-                        <div class="searchbar_tablerow">
-                            <div class="searchbar_tablecell searchbar_label">Student UID</div>
-                            <div class="searchbar_tablecell searchbar_value">
-                                {{ res.uid }}
-                            </div>
-                        </div>
-
-                        <div class="searchbar_tablerow">
-                            <div class="searchbar_tablecell searchbar_label">{{$p.t('lehre','studiengang')}}</div>
-                            <div class="searchbar_tablecell searchbar_value">
-                                {{ res.studiengang }}
-                            </div>
-                        </div>
-
-						<div class="searchbar_tablerow">
-                            <div class="searchbar_tablecell searchbar_label">Verband</div>
-                            <div class="searchbar_tablecell searchbar_value">
-                                {{ res.verband }}
-                            </div>
-                        </div>
-        
-                        <div class="searchbar_tablerow">
-                            <div class="searchbar_tablecell searchbar_label">{{$p.t('person','personenkennzeichen')}}</div>
-                            <div class="searchbar_tablecell searchbar_value">
-                                {{ res.matrikelnr }}
-                            </div>
-                        </div>
-        
-                        <div class="searchbar_tablerow">
-                            <div class="searchbar_tablecell searchbar_label">{{$p.t('person','email')}}</div>
-                            <div class="searchbar_tablecell searchbar_value">
-                                <a :href="this.mailtourl">
-                                    {{ res.email }}
-                                </a>
-                            </div>
-                        </div>
-        
-                    </div>
-        
-                    <actions :res="this.res" :actions="this.actions.childactions"
-                             @actionexecuted="$emit('actionexecuted')"></actions>
-        
-                </div>
-            </div>
-        
-        </div>
-    `,
-    methods: {
-    },
-    computed: {
-        mailtourl: function() {
-            return 'mailto:' + this.res.email;
-        },
-		studentImage: function () {
-			if (!this.res.foto) return;
-			return 'data:image/jpeg;base64,'.concat(this.res.foto);
-		},
-    }
-};
\ No newline at end of file

From 9c1eb35e884ee498d1e8155ba541e8115fef16be Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 31 Jul 2025 11:18:37 +0200
Subject: [PATCH 488/572] Tab Contact: Phrase for Validation Length PLZ

---
 .../api/frontend/v1/stv/Address.php           | 11 +++++++++-
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Address.php b/application/controllers/api/frontend/v1/stv/Address.php
index 324e306f3..d14111e99 100644
--- a/application/controllers/api/frontend/v1/stv/Address.php
+++ b/application/controllers/api/frontend/v1/stv/Address.php
@@ -31,6 +31,11 @@ class Address extends FHCAPI_Controller
 			'getNations' => self::PERM_LOGGED,
 			'getPlaces' => self::PERM_LOGGED
 		]);
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
 	}
 
 	public function getNations()
@@ -53,7 +58,11 @@ class Address extends FHCAPI_Controller
 		
 		$this->form_validation->set_data(['address.plz' => $plz]);
 
-		$this->form_validation->set_rules('address.plz', 'PLZ', 'required|numeric|less_than[10000]');
+		$this->form_validation->set_rules('address.plz', 'PLZ', 'required|numeric|less_than[10000]', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'PLZ']),
+			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'PLZ']),
+			'less_than' => $this->p->t('ui', 'error_fieldLessThan10000', ['field' => 'PLZ'])
+		]);
 
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index c190d7b4f..5ca44148d 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44597,6 +44597,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_fieldLessThan10000',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Eingabefeld {field} darf maximal 4-stellig sein.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The Field {Field} must contain a number less then 10000.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-4 Finetuning END
 );
 

From 7755e2c7a6638957bf913cd1d38d689d856223f7 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 31 Jul 2025 15:20:05 +0200
Subject: [PATCH 489/572] searchbar: code quality

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

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 6a41fe2f5..8c85ceaec 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -47,7 +47,7 @@ export default {
             lastQuery: ''
       };
     },
-	computed:{
+	computed: {
 		searchTypesPlaceholder() {
 			if (!this.searchsettings.types.length) {
 				return Object.values(this.typeLabels).join(' / ');

From 6217309c6f58be0d8aed12fb39a83d9308b7d635 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 31 Jul 2025 16:34:24 +0200
Subject: [PATCH 490/572] add infotext to reload button filtercomponent tab
 archive: add infotext to reload button, edit and delete button

---
 public/js/components/Betriebsmittel/Betriebsmittel.js         | 1 +
 public/js/components/Funktionen/Funktionen.js                 | 1 +
 public/js/components/Messages/Details/TableMessages.js        | 1 +
 public/js/components/Notiz/Notiz.js                           | 1 +
 .../Details/Abschlusspruefung/Abschlusspruefung.js            | 1 +
 .../Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js  | 1 +
 .../js/components/Stv/Studentenverwaltung/Details/Archiv.js   | 3 +++
 .../Details/Aufnahmetermine/Aufnahmetermine.js                | 1 +
 .../Studentenverwaltung/Details/Dokumente/List/Accepted.js    | 1 +
 .../Studentenverwaltung/Details/Dokumente/List/Unaccepted.js  | 1 +
 .../Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js        | 1 +
 .../Studentenverwaltung/Details/JointStudies/JointStudies.js  | 1 +
 .../Stv/Studentenverwaltung/Details/Kontakt/Address.js        | 1 +
 .../Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js    | 1 +
 .../Stv/Studentenverwaltung/Details/Kontakt/Contact.js        | 1 +
 public/js/components/Stv/Studentenverwaltung/Details/Konto.js | 1 +
 .../ListLehrveranstaltungstermine.js                          | 1 +
 .../Stv/Studentenverwaltung/Details/Mobility/Mobility.js      | 1 +
 .../Stv/Studentenverwaltung/Details/Noten/Teacher.js          | 1 +
 .../Stv/Studentenverwaltung/Details/Noten/Zeugnis.js          | 1 +
 .../Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js | 1 +
 .../Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js  | 1 +
 public/js/components/filter/Filter.js                         | 4 ++--
 23 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index d197c341e..5ef85369c 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -317,6 +317,7 @@ export default {
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="this.$p.t('ui', 'betriebsmittel')"
 			@click:new="actionNewBetriebsmittel"
diff --git a/public/js/components/Funktionen/Funktionen.js b/public/js/components/Funktionen/Funktionen.js
index 0b5a71155..e83eca7e4 100644
--- a/public/js/components/Funktionen/Funktionen.js
+++ b/public/js/components/Funktionen/Funktionen.js
@@ -444,6 +444,7 @@ export default {
 				table-only
 				:side-menu="false"
 				:reload= "!this.stylePv21"
+				:reload-btn-infotext="this.$p.t('table', 'reload')"
 				new-btn-show
 				:new-btn-class="this.newBtnStyle"
 				:new-btn-label="this.$p.t('person', 'funktion')"
diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js
index 8d539983f..5095f4223 100644
--- a/public/js/components/Messages/Details/TableMessages.js
+++ b/public/js/components/Messages/Details/TableMessages.js
@@ -401,6 +401,7 @@ export default {
 						table-only
 						:side-menu="false"
 						reload
+						:reload-btn-infotext="this.$p.t('table', 'reload')"
 						new-btn-show
 						:new-btn-label="this.$p.t('global', 'nachricht')"
 						@click:new="actionNewMessage"
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index a2702c7f0..33abdd2db 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -1268,6 +1268,7 @@ export default {
 					table-only
 					:side-menu="false"
 					reload
+					:reload-btn-infotext="this.$p.t('table', 'reload')"
 					new-btn-show
 					:new-btn-label="this.$p.t('global', 'notiz')"
 					@click:new="actionNewNotiz"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index a9cae9bc5..c95d29705 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -542,6 +542,7 @@ export default {
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="this.$p.t('stv', 'tab_finalexam')"
 			@click:new="actionNewAbschlusspruefung"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
index 8f32479a9..4c29cec3e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen/Anrechnungen.js
@@ -357,6 +357,7 @@ export default {
 							table-only
 							:side-menu="false"
 							reload
+							:reload-btn-infotext="this.$p.t('table', 'reload')"
 						>
 						</core-filter-cmpt>
 					</template>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index 7f615f8b5..5bd20e154 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -130,6 +130,7 @@ export default {
 							let editButton = document.createElement('button');
 							editButton.className = 'btn btn-outline-secondary';
 							editButton.innerHTML = '<i class="fa fa-edit"></i>';
+							editButton.title = this.$p.t('ui', 'bearbeiten');
 							editButton.addEventListener('click', () =>
 								this.$refs.edit.open(cell.getData())
 							);
@@ -139,6 +140,7 @@ export default {
 						let deleteButton = document.createElement('button');
 						deleteButton.className = 'btn btn-outline-secondary';
 						deleteButton.innerHTML = '<i class="fa fa-trash"></i>';
+						deleteButton.title = this.$p.t('ui', 'loeschen');
 						deleteButton.addEventListener('click', evt => {
 							evt.stopPropagation();
 							this.$fhcAlert
@@ -262,6 +264,7 @@ export default {
 			:tabulator-options="tabulatorOptions"
 			:tabulator-events="tabulatorEvents"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			>
 			<template #actions>
 				<div class="input-group w-auto">
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
index fe667aa74..955ca1a9d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js
@@ -358,6 +358,7 @@ export default {
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="this.$p.t('lehre', 'reihungstest')"
 			@click:new="actionNewPlacementTest"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
index e07d1a45d..d8bd2ed82 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js
@@ -336,6 +336,7 @@ export default {
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 	 	>
 			<template #actions="{selected}">
 				<button
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
index 93b3a1b70..95880e233 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js
@@ -347,6 +347,7 @@ export default {
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="this.$p.t('global', 'dokument')"
 			@click:new="actionUploadFile"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
index 4ecf26d6e..e89564c2d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
@@ -180,6 +180,7 @@ export default {
 						table-only
 						:side-menu="false"
 						reload
+						:reload-btn-infotext="this.$p.t('table', 'reload')"
 					>
 					</core-filter-cmpt>
 				</div>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
index c24e4cba5..d8cd0aacd 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/JointStudies/JointStudies.js
@@ -329,6 +329,7 @@ export default {
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="this.$p.t('jointstudies', 'gemeinsamesStudium')"
 			@click:new="actionNewJointStudy"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index d0c7fbd04..491714520 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -610,6 +610,7 @@ export default{
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="this.$p.t('person', 'adresse')"
 			@click:new="actionNewAdress"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index 6c02677ce..40a629bcf 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -348,6 +348,7 @@ export default{
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="this.$p.t('person', 'bankverbindung')"
 			@click:new="actionNewBankverbindung"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index ee37427b1..622aa61e7 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -449,6 +449,7 @@ export default{
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="this.$p.t('global', 'kontakt')"
 			@click:new="actionNewContact"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
index a5532addc..54c1db6c4 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto.js
@@ -248,6 +248,7 @@ export default {
 			:side-menu="false"
 			:tabulator-options="tabulatorOptions"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="$p.t('konto/buchung')"
 			:new-btn-disabled="stg_kz === ''"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
index 0f1c2f2f0..20cb95fbd 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
@@ -175,6 +175,7 @@ export default {
 				table-only
 				:side-menu="false"
 				reload
+				:reload-btn-infotext="this.$p.t('table', 'reload')"
 				>
 					<template #actions>	
 						<button
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
index 7ea34497b..1399d76e1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
@@ -436,6 +436,7 @@ export default {
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="this.$p.t('stv', 'tab_mobility')"
 			@click:new="actionNewMobility"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
index 171202163..54342a955 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
@@ -95,6 +95,7 @@ export default {
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			>
 			<template #actions="{selected}">
 				<button class="btn btn-primary" :disabled="!selected.length" @click="copyGrades(selected)">
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
index 81745897d..0cc30f606 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
@@ -264,6 +264,7 @@ export default {
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			>
 			<template v-if="['both', 'header'].includes(config.edit) || ['both', 'header'].includes(config.delete)" #actions="{selected}">
 				<zeugnis-actions :selected="selected" @set-grade="setGrade" @delete-grade="deleteGrade"></zeugnis-actions>
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index b6480c583..15664665f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -428,6 +428,7 @@ export default{
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="this.$p.t('global', 'status')"
 			@click:new="actionNewStatus"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
index f90aa298d..4dd3139ab 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js
@@ -420,6 +420,7 @@ export default{
 			table-only
 			:side-menu="false"
 			reload
+			:reload-btn-infotext="this.$p.t('table', 'reload')"
 			new-btn-show
 			:new-btn-label="this.$p.t('lehre', 'pruefung')"
 			@click:new="actionNewPruefung"
diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index 2602a26c2..fc4ed81c5 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -66,6 +66,7 @@ export const CoreFilterCmpt = {
 		tableOnly: Boolean,
 		noColumnFilter:Boolean,
 		reload: Boolean,
+		reloadBtnInfotext: String,
 		download: {
 			type: [Boolean, String, Function, Array, Object],
 			default: false
@@ -648,7 +649,6 @@ export const CoreFilterCmpt = {
 				</h3>
 			</div>
 		</div>
-
 		<div :id="'filterCollapsables' + idExtra">
 
 			<div class="d-flex flex-row justify-content-between flex-wrap">
@@ -658,7 +658,7 @@ export const CoreFilterCmpt = {
 						{{ newBtnLabel }}
 					</button>
 					<button v-if="reload" class="btn btn-outline-secondary" aria-label="Reload" @click="reloadTable">
-						<span class="fa-solid fa-rotate-right" aria-hidden="true"></span>
+						<span class="fa-solid fa-rotate-right" aria-hidden="true"  :title="reloadBtnInfotext ? reloadBtnInfotext : 'Reload'" ></span>
 					</button>
 					<span v-if="$slots.actions && tabulatorHasSelector">
 						<span v-if="countOnly">{{ selectedData.length }} ausgewählt</span>

From 38fe68362d2b14854687003062ec8e9cd48fce3e Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 31 Jul 2025 16:40:33 +0200
Subject: [PATCH 491/572] use correct function in routing

---
 application/config/routes.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index c129c7b3b..b42ae89eb 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -98,7 +98,7 @@ $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/(:num)/(:any)/(:a
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgformSpezialgruppe/$1/$2/$3/$4/$5';
 
 // (studiensemester_kurzbz)/(studiengang_kz)/(orgform)[/(semester)[/(verband)[/(gruppe)]]]
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3';
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4';
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5';
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5/$6';

From 562eb0a890d2512674b5d4fb33146a8966776ae2 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 31 Jul 2025 17:00:11 +0200
Subject: [PATCH 492/572] remove selectable from tables with not selectable
 rows

---
 public/js/components/Betriebsmittel/Betriebsmittel.js           | 2 --
 public/js/components/Notiz/Notiz.js                             | 2 --
 .../Details/Abschlusspruefung/Abschlusspruefung.js              | 1 -
 .../Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js          | 1 -
 .../Stv/Studentenverwaltung/Details/Kontakt/Address.js          | 1 -
 .../Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js      | 1 -
 .../Stv/Studentenverwaltung/Details/Kontakt/Contact.js          | 1 -
 .../Stv/Studentenverwaltung/Details/Mobility/Mobility.js        | 1 -
 8 files changed, 10 deletions(-)

diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 5ef85369c..502ede059 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -137,8 +137,6 @@ export default {
 				layout: 'fitColumns',
 				layoutColumnsOnNewData: false,
 				height: '550',
-				selectableRangeMode: 'click',
-				selectable: true,
 				persistenceID: 'core-betriebsmittel'
 			},
 			tabulatorEvents: [
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 33abdd2db..5a3944803 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -178,8 +178,6 @@ export default {
 				layoutColumnsOnNewData: false,
 				//responsiveLayout: "collapse",
 				maxHeight: '200px',
-				//selectableRangeMode: 'click',
-				//selectable: true,
 				index: 'notiz_id',
 				persistenceID: 'core-notiz'
 			},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index c95d29705..e5c4cade1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -168,7 +168,6 @@ export default {
 				layoutColumnsOnNewData: false,
 				height: 'auto',
 				minHeight: '200',
-				selectable: true,
 				index: 'abschlusspruefung_id',
 				persistenceID: 'stv-details-finalexam'
 			},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
index e89564c2d..ab0c8d8e4 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Gruppen/Gruppen.js
@@ -78,7 +78,6 @@ export default {
 				],
 				layout: 'fitDataFill',
 				height: 'auto',
-				selectable: true,
 				index: 'group_id',
 				persistenceID: 'stv-details-gruppe'
 			},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
index 491714520..7bb8080e1 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Address.js
@@ -123,7 +123,6 @@ export default{
 					},
 				],
 				height:	'auto',
-				selectable:	true,
 				index: 'adresse_id',
 				persistenceID: 'stv-details-kontakt-address'
 			},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
index 40a629bcf..d937d3d1c 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Bankaccount.js
@@ -87,7 +87,6 @@ export default{
 					},
 				],
 				height:	'auto',
-				selectable:	true,
 				index: 'bankverbindung_id',
 				persistenceID: 'stv-details-kontakt-bankaccount'
 			},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
index 622aa61e7..e429e5933 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js
@@ -95,7 +95,6 @@ export default{
 					},
 				],
 				height:	'auto',
-				selectable:	true,
 				index: 'kontakt_id',
 				persistenceID: 'stv-details-kontakt-contact'
 			},
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
index 1399d76e1..a2b54e7b5 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js
@@ -113,7 +113,6 @@ export default {
 				layoutColumnsOnNewData: false,
 				height: 'auto',
 				minHeight: 200,
-				selectable: true,
 				index: 'bisio_id',
 				persistenceID: 'stv-details-table_mobiliy'
 			},

From 913b218fcac54aeac6260762769f641795d66fda Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Fri, 1 Aug 2025 10:53:15 +0200
Subject: [PATCH 493/572] phrasenupdate Stundenplan -> LV-Plan; tooltip
 update/remove;

---
 system/phrasesupdate.php | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 26472be29..034e4aca5 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31627,12 +31627,12 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'termine',
+		'phrase' => 'termineV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unterricht laut Stundenplan',
+				'text' => 'Unterricht laut LV-Plan',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -31652,7 +31652,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unterricht laut Stundenplan',
+				'text' => 'Unterricht laut LV-Plan',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -32107,12 +32107,12 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'zeitNichtAusStundenplanBeginn',
+		'phrase' => 'zeitNichtAusStundenplanBeginnV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unterrichtbeginn entspricht keinem Unterrichtstermin laut Stundenplan.',
+				'text' => 'Unterrichtbeginn entspricht keinem Unterrichtstermin laut LV-Plan.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -32127,12 +32127,12 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'zeitNichtAusStundenplanEnde',
+		'phrase' => 'zeitNichtAusStundenplanEndeV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unterrichtende entspricht keinem Unterrichtstermin laut Stundenplan.',
+				'text' => 'Unterrichtende entspricht keinem Unterrichtstermin laut LV-Plan.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -32147,12 +32147,12 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'datumNichtAusStundenplan',
+		'phrase' => 'datumNichtAusStundenplanV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Datum entspricht keinem Stundenplan Termin.',
+				'text' => 'Datum entspricht keinem LV-Plan Termin.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -32323,14 +32323,14 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'tooltipLektorStartKontrolleV2',
+		'phrase' => 'tooltipLektorStartKontrolleV4',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Um eine Anwesenheitskontrolle für Ihre ausgewählte Unterrichtsgruppe durchzuführen, wählen Sie bitte einen Termin aus dem Stundenplan aus oder geben händisch die gewünschte Gültigkeitkeitsdauer der Kontrolle an.
+				'text' => 'Um eine Anwesenheitskontrolle für Ihre ausgewählte Unterrichtsgruppe durchzuführen, wählen Sie bitte einen Termin aus dem LV-Plan aus oder geben händisch die gewünschte Gültigkeitkeitsdauer der Kontrolle an.
 
-				Die Gültigkeitsdauer bestimmt die Gewichtung der Anwesenheit in Relation zum Gesamtausmaß, sie können diese aber nach eigenem Ermessen anpassen und müssen sich nicht streng an die Termine im Stundenplan halten.
+				Die Gültigkeitsdauer bestimmt die Gewichtung der Anwesenheit in Relation zum Gesamtausmaß, sie können diese aber nach eigenem Ermessen anpassen und müssen sich nicht streng an die Termine im LV-Plan halten.
 
 				Sie können pro Datum und Unterrichtsgruppe mehrere Anwesenheitskontrollen am Tag durchführen, solange sich diese nicht in Ihren Zeiten überschneiden und eine Mindestlänge von {0} Minuten beträgt.',
 				'description' => '',
@@ -32599,12 +32599,12 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'termineAusStundenplan',
+		'phrase' => 'termineAusStundenplanV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unterricht Termine laut Stundenplan',
+				'text' => 'Unterricht Termine laut LV-Plan',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -32619,12 +32619,12 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'tooltipUnterrichtZeitCustom',
+		'phrase' => 'tooltipUnterrichtZeitCustomV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unterrichtszeiten werden aus dem Stundenplan geladen, überschreiben Sie diese nur falls Ihre tatsächliche Unterrichtszeiten davon abweichen!',
+				'text' => 'Unterrichtszeiten werden aus dem LV-Plan geladen, überschreiben Sie diese nur falls Ihre tatsächliche Unterrichtszeiten davon abweichen!',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -32639,12 +32639,12 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'tooltipUnterrichtDatumCustom',
+		'phrase' => 'tooltipUnterrichtDatumCustomV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Unterrichtsdaten werden aus dem Stundenplan geladen, überschreiben Sie dieses nur falls Ihr tatsächliches Unterrichtsdatum abweicht!',
+				'text' => 'Unterrichtsdaten werden aus dem LV-Plan geladen, überschreiben Sie dieses nur falls Ihr tatsächliches Unterrichtsdatum abweicht!',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -40200,7 +40200,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Stundenplan',
+				'text' => 'LV-Plan',
 				'description' => '',
 				'insertvon' => 'system'
 			),

From 1cb637cb7f7ea3ffac32f0e8d3c2872fbcb14c21 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 1 Aug 2025 10:55:11 +0200
Subject: [PATCH 494/572] Tab Betriebsmittel: change type kaution to text, edit
 validations and add translations

---
 .../v1/betriebsmittel/BetriebsmittelP.php     | 35 +++++++++++++------
 .../Betriebsmittel/Betriebsmittel.js          |  9 +----
 system/phrasesupdate.php                      | 24 +++++++++++--
 3 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
index 4405952a4..05d7c66c2 100644
--- a/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
+++ b/application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php
@@ -75,8 +75,9 @@ class BetriebsmittelP extends FHCAPI_Controller
 			'required' => $this->p->t('ui', 'error_fieldRequired')
 		]);
 
-		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric|less_than_equal_to[9999.99]', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric')
+		$this->form_validation->set_rules('kaution', 'Kaution', 'callback_valid_number|callback_not_less_than_equal', [
+			'valid_number' => $this->p->t('ui', 'error_fieldNoValidNumber'),
+			'not_less_than_equal' => $this->p->t('ui', 'error_fieldLessThan1000'),
 		]);
 
 		$this->form_validation->set_rules('ausgegebenam', 'Ausgegeben am', 'required|is_valid_date', [
@@ -159,10 +160,6 @@ class BetriebsmittelP extends FHCAPI_Controller
 			'uid_in_person' => $this->p->t('person', 'error_uidNotInPerson')
 		]);
 
-		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
-		]);
-
 		$this->validateNewOrUpdate();
 
 		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
@@ -172,6 +169,7 @@ class BetriebsmittelP extends FHCAPI_Controller
 		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
 		$anmerkung = $this->input->post('anmerkung');
 		$kaution = $this->input->post('kaution');
+		if($kaution) $kaution = str_replace(',', '.', $kaution);
 		$ausgegebenam = $this->input->post('ausgegebenam');
 		$retouram = $this->input->post('retouram');
 		$uid = $this->input->post('uid');
@@ -246,10 +244,6 @@ class BetriebsmittelP extends FHCAPI_Controller
 
 	public function updateBetriebsmittel($betriebsmittelperson_id)
 	{
-		$this->form_validation->set_rules('kaution', 'Kaution', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Kaution'])
-		]);
-
 		$this->validateNewOrUpdate();
 
 		$betriebsmitteltyp = $this->input->post('betriebsmitteltyp');
@@ -259,6 +253,7 @@ class BetriebsmittelP extends FHCAPI_Controller
 		$betriebsmittel_id = $this->input->post('betriebsmittel_id');
 		$anmerkung = $this->input->post('anmerkung');
 		$kaution = $this->input->post('kaution');
+		if($kaution) $kaution = str_replace(',', '.', $kaution);
 		$ausgegebenam = $this->input->post('ausgegebenam');
 		$retouram = $this->input->post('retouram');
 
@@ -391,6 +386,26 @@ class BetriebsmittelP extends FHCAPI_Controller
 
 		$this->terminateWithSuccess($data);
 	}
+
+	public function valid_number($number)
+	{
+		if(is_null($number)) return true;
+		$number = str_replace(',', '.', $number);
+		if (!is_numeric($number))
+		{
+			return false;
+		}
+		return true;
+	}
+
+	public function not_less_than_equal($number)
+	{
+		$number = str_replace(',', '.', $number);
+		if ($number < 1000)
+			return true;
+		return false;
+
+	}
 }
 
 
diff --git a/public/js/components/Betriebsmittel/Betriebsmittel.js b/public/js/components/Betriebsmittel/Betriebsmittel.js
index 502ede059..6d976a1fa 100644
--- a/public/js/components/Betriebsmittel/Betriebsmittel.js
+++ b/public/js/components/Betriebsmittel/Betriebsmittel.js
@@ -290,12 +290,6 @@ export default {
 			this.formData.anmerkung = null;
 			this.formData.beschreibung = null;
 			this.statusNew = true;
-		},
-		//helper function: workaround to trigger validation if input is not a number
-		normalizeKaution() {
-			if (this.formData.kaution === null || this.formData.kaution === '') {
-				this.formData.kaution = 'xxx'
-			}
 		}
 	},
 	created() {
@@ -406,10 +400,9 @@ export default {
 				
 				<div class="row mb-3">
 					<form-input
-						type="number"
+						type="text"
 						:label="$p.t('infocenter/kaution')"
 						name="kaution"
-						@blur="normalizeKaution"
 						v-model="formData.kaution"
 						>
 					</form-input>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 5ca44148d..b3af0d059 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -44600,12 +44600,12 @@ and represent the current state of research on the topic. The prescribed citatio
 	array(
 		'app' => 'core',
 		'category' => 'ui',
-		'phrase' => 'error_fieldLessThan10000',
+		'phrase' => 'error_fieldLessThan1000',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Das Eingabefeld {field} darf maximal 4-stellig sein.',
+				'text' => 'Das Eingabefeld {field} muss kleiner als 1000 sein.',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -44617,6 +44617,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_fieldNoValidNumber',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Eingabefeld {field} muss eine gültige Zahl sein',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The Input Field {field} has to be a valid number',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	// FHC-4 Finetuning END
 );
 

From 247de82e8162769315e621d6253e2c79cfe8e4de Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 1 Aug 2025 11:59:29 +0200
Subject: [PATCH 495/572] add config
 number_displayed_past_studiensemester_default and use it in api endpoint

---
 application/config/stv.php                              | 1 +
 application/controllers/api/frontend/v1/stv/Verband.php | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/application/config/stv.php b/application/config/stv.php
index 1fdd5b28a..aa885c9e1 100644
--- a/application/config/stv.php
+++ b/application/config/stv.php
@@ -1,5 +1,6 @@
 <?php
 
+$config['number_displayed_past_studiensemester_default'] = 5;
 $config['tabs'] =
 	[
 		'details' => [
diff --git a/application/controllers/api/frontend/v1/stv/Verband.php b/application/controllers/api/frontend/v1/stv/Verband.php
index e8c532652..4060704de 100644
--- a/application/controllers/api/frontend/v1/stv/Verband.php
+++ b/application/controllers/api/frontend/v1/stv/Verband.php
@@ -355,7 +355,11 @@ class Verband extends FHCAPI_Controller
 		$this->load->model('system/Variable_model', 'VariableModel');
 		$result = $this->VariableModel->getVariables(getAuthUID(), ['number_displayed_past_studiensemester']);
 		$data = $this->getDataOrTerminateWithError($result);
-		$number_displayed_past_studiensemester = $data['number_displayed_past_studiensemester'] ?? null;
+
+		$this->load->config('stv');
+		$number_displayed_past_studiensemester_default = $this->config->item('number_displayed_past_studiensemester_default');
+
+		$number_displayed_past_studiensemester = $data['number_displayed_past_studiensemester'] ?? $number_displayed_past_studiensemester_default;
 
 		$this->StudiensemesterModel->addPlusMinus(null, $number_displayed_past_studiensemester);
 		$this->StudiensemesterModel->addOrder('ende');

From 472fceaf625b34c4ae5f2d90816f4e202bfa8aa7 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 1 Aug 2025 12:22:27 +0200
Subject: [PATCH 496/572] changes to support studiensemester_kurz as part of
 the url

---
 public/js/apps/Studentenverwaltung.js         | 115 +++++++++++++++++-
 .../js/components/Stv/Studentenverwaltung.js  | 102 ++++++++++++----
 .../Stv/Studentenverwaltung/List.js           |  28 ++++-
 .../Studentenverwaltung/Studiensemester.js    |  15 ++-
 4 files changed, 218 insertions(+), 42 deletions(-)

diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index bef605a10..a4dafc5bc 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -26,14 +26,119 @@ const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*
 const router = VueRouter.createRouter({
 	history: VueRouter.createWebHistory(),
 	routes: [
-		{ path: `/${ciPath}/studentenverwaltung`, component: FhcStudentenverwaltung },
-		{ path: `/${ciPath}/studentenverwaltung/prestudent/:prestudent_id`, component: FhcStudentenverwaltung },
-		{ path: `/${ciPath}/studentenverwaltung/prestudent/:prestudent_id/:tab`, component: FhcStudentenverwaltung },
-		{ path: `/${ciPath}/studentenverwaltung/student/:id`, component: FhcStudentenverwaltung },
-		{ path: `/${ciPath}/studentenverwaltung/person/:person_id`, component: FhcStudentenverwaltung }
+		{
+			name: 'index',
+			path: `/${ciPath}/studentenverwaltung`,
+			component: FhcStudentenverwaltung
+		},
+		{
+			name: 'studiensemester',
+			path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz`,
+			component: FhcStudentenverwaltung,
+			props: (route) => {
+				return {
+					url_studiensemester_kurzbz: route.params.studiensemester_kurzbz
+				};
+			},
+			beforeEnter: (to, from, next) => {
+				const isSemester = /^[WS]S\d{4}$/.test(to.params.studiensemester_kurzbz);
+				if (!isSemester) {
+					return next({name: 'index'});
+				}
+				next();
+			}
+		},
+		{
+			path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz/prestudent/:prestudent_id`,
+			component: FhcStudentenverwaltung,
+			props: (route) => {
+				return {
+					url_studiensemester_kurzbz: route.params.studiensemester_kurzbz,
+					url_mode: 'prestudent',
+					url_prestudent_id: route.params.prestudent_id
+				};
+			},
+			beforeEnter: (to, from, next) => {
+				const isSemester = /^[WS]S\d{4}$/.test(to.params.studiensemester_kurzbz);
+				if (!isSemester) {
+					return next({name: 'index'});
+				}
+				next();
+			}
+		},
+		{
+			path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz/prestudent/:prestudent_id/:tab`,
+			component: FhcStudentenverwaltung,
+			props: (route) => {
+				return {
+					url_studiensemester_kurzbz: route.params.studiensemester_kurzbz,
+					url_mode: 'prestudent',
+					url_prestudent_id: route.params.prestudent_id,
+					url_tab: route.params.tab
+				};
+			},
+			beforeEnter: (to, from, next) => {
+				const isSemester = /^[WS]S\d{4}$/.test(to.params.studiensemester_kurzbz);
+				if (!isSemester) {
+					return next({name: 'index'});
+				}
+				next();
+			}
+		},
+		{
+			path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz/student/:id`,
+			component: FhcStudentenverwaltung,
+			props: (route) => {
+				return {
+					url_studiensemester_kurzbz: route.params.studiensemester_kurzbz,
+					url_mode: 'student',
+					url_student_id: route.params.id
+				};
+			},
+			beforeEnter: (to, from, next) => {
+				const isSemester = /^[WS]S\d{4}$/.test(to.params.studiensemester_kurzbz);
+				if (!isSemester) {
+					return next({name: 'index'});
+				}
+				next();
+			}
+		},
+		{
+			path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz/person/:person_id`,
+			component: FhcStudentenverwaltung,
+			props: (route) => {
+				return {
+					url_studiensemester_kurzbz: route.params.studiensemester_kurzbz,
+					url_mode: 'person',
+					url_prestudent_id: route.params.person_id
+				};
+			},
+			beforeEnter: (to, from, next) => {
+				const isSemester = /^[WS]S\d{4}$/.test(to.params.studiensemester_kurzbz);
+				if (!isSemester) {
+					return next({name: 'index'});
+				}
+				next();
+			}
+		},
+		{
+			path: '/:pathMatch(.*)*',
+			redirect: {
+				name: 'index'
+			}
+		}
 	]
 });
 
+router.afterEach((to, from, failure) => {
+	console.log('vue router afterEach: ' + to.params.studiensemester_kurzbz);
+	if (to.params.studiensemester_kurzbz) {
+		document.title = to.params.studiensemester_kurzbz + ' - Studierendenverwaltung FH-Complete';
+	} else {
+		document.title = 'Studierendenverwaltung FH-Complete';
+	}
+});
+
 const app = Vue.createApp({
 	name: 'StudentenverwaltungApp'
 });
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 34622f406..c6f271a50 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -85,9 +85,7 @@ export default {
 					student: {
 						defaultaction: {
 							type: "link",
-							action: function(data) {
-								return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/studentenverwaltung/student/' + data.uid;
-							}
+							action: this.buildStudentSearchResultLink
 						},
 						childactions: [
 						]
@@ -95,9 +93,7 @@ export default {
 					prestudent: {
 						defaultaction: {
 							type: "link",
-							action: function(data) {
-								return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/studentenverwaltung/prestudent/' + data.prestudent_id;
-							}
+							action: this.buildPrestudentSearchResultLink
 						},
 						childactions: [
 						]
@@ -113,20 +109,61 @@ export default {
 			}
 		}
 	},
+	watch: {
+		'$attrs.url_studiensemester_kurzbz': function (newVal, oldVal) {
+			if (newVal !== oldVal) {
+				this.studiensemesterKurzbz = newVal;
+				this.$refs.stvList.updateUrl();
+				this.$refs.details.reload();
+			}
+		},
+		'$attrs.url_mode': function () {
+			this.handlePersonUrl();
+		}
+	},
 	methods: {
+		buildPrestudentSearchResultLink(data) {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router
+				+ '/studentenverwaltung'
+				+ '/' + this.studiensemesterKurzbz
+				+ '/prestudent/'
+				+ data.prestudent_id;
+		},
+		buildStudentSearchResultLink(data) {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router
+				+ '/studentenverwaltung'
+				+ '/' + this.studiensemesterKurzbz
+				+ '/student/'
+				+ data.uid;
+		},
 		onSelectVerband( {link, studiengang_kz}) {
 			let urlpath = String(link);
 			if (!urlpath.match(/\/prestudent/))
 			{
-				urlpath = this.studiensemesterKurzbz + '/' + urlpath;
+				urlpath = 'CURRENT_SEMESTER' + '/' + urlpath;
 			}
 			this.studiengangKz = studiengang_kz;
 			this.$refs.stvList.updateUrl(
 				ApiStv.students.verband(urlpath)
-			);
+				);
+			this.$router.push({
+				name: 'studiensemester',
+				params: {
+					studiensemester_kurzbz: this.studiensemesterKurzbz
+				}
+			});
 		},
 		studiensemesterChanged(v) {
 			this.studiensemesterKurzbz = v;
+
+			this.$router.push({
+				params: {
+					studiensemester_kurzbz: v
+				}
+			});
+
 			this.$refs.stvList.updateUrl();
 			this.$refs.details.reload();
 		},
@@ -135,9 +172,38 @@ export default {
 		},
 		searchfunction(params) {
 			return this.$api.call(ApiSearchbar.search(params));
+		},
+		handlePersonUrl() {
+			if (this.$route.params.id) {
+				this.$refs.stvList.updateUrl(
+					ApiStv.students.uid(this.$route.params.id, 'CURRENT_SEMESTER'),
+					true
+					);
+			} else if (this.$route.params.prestudent_id) {
+				this.$refs.stvList.updateUrl(
+					ApiStv.students.prestudent(this.$route.params.prestudent_id, 'CURRENT_SEMESTER'),
+					true
+					);
+			} else if (this.$route.params.person_id) {
+				this.$refs.stvList.updateUrl(
+					ApiStv.students.person(this.$route.params.person_id, 'CURRENT_SEMESTER'),
+					true
+					);
+			}
 		}
 	},
 	created() {
+		if (!this.$attrs?.url_studiensemester_kurzbz) {
+			this.$router.replace({
+				name: 'studiensemester',
+				params: {
+					studiensemester_kurzbz: this.defaultSemester
+				}
+			});
+		} else {
+			this.studiensemesterKurzbz = this.$attrs.url_studiensemester_kurzbz;
+		}
+
 		this.$api
 			.call(ApiStv.kontakt.address.getNations())
 			.then(result => {
@@ -199,23 +265,7 @@ export default {
 	mounted() {
 		//Test manu Systemerror
 		//FHC_JS_DATA_STORAGE_OBJECT.systemerror_mailto = 'ma0068@technikum-wien.at';this.$fhcAlert.handleSystemError(1);
-		if (this.$route.params.id) {
-			this.$refs.stvList.updateUrl(
-				ApiStv.students.uid(this.$route.params.id, this.studiensemesterKurzbz),
-				true
-			);
-		} else if (this.$route.params.prestudent_id) {
-			this.$refs.stvList.updateUrl(
-				ApiStv.students.prestudent(this.$route.params.prestudent_id, this.studiensemesterKurzbz),
-				true
-			);
-		} else if (this.$route.params.person_id) {
-			this.$refs.stvList.updateUrl(
-				ApiStv.students.person(this.$route.params.person_id, this.studiensemesterKurzbz),
-				true
-			);
-		}
-
+		this.handlePersonUrl();
 	},
 	template: `
 	<div class="stv">
@@ -231,7 +281,7 @@ export default {
 						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
 					</div>
 					<stv-verband @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
-					<stv-studiensemester :default="defaultSemester" @changed="studiensemesterChanged"></stv-studiensemester>
+					<stv-studiensemester v-model:studiensemester-kurzbz="studiensemesterKurzbz" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
 				</nav>
 				<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
 					<vertical-split>
diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index c5f7a07c0..5de57bf77 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -8,9 +8,16 @@ export default {
 		CoreFilterCmpt,
 		ListNew
 	},
-	inject: [
-		'lists'
-	],
+	inject: {
+		'lists': {
+			from: 'lists',
+			required: true
+		},
+		currentSemester: {
+			from: 'currentSemester',
+			required: true
+		}
+	},
 	props: {
 		selected: Array,
 		studiengangKz: Number,
@@ -155,7 +162,8 @@ export default {
 			filterKontoMissingCounter: undefined,
 			count: 0,
 			filteredcount: 0,
-			selectedcount: 0
+			selectedcount: 0,
+			currentEndpointRawUrl: ''
 		}
 	},
 	methods: {
@@ -192,13 +200,21 @@ export default {
 
 			if( endpoint === undefined ) 
 			{
-				endpoint = { url: '' };
+				endpoint = {url: this.currentEndpointRawUrl};
 			} 
 			else if( endpoint.url === undefined ) 
 			{
-				endpoint.url = '';
+				endpoint.url = this.currentEndpointRawUrl;
+			} else
+			{
+				this.currentEndpointRawUrl = endpoint.url;
 			}
 
+			endpoint.url = endpoint.url.replace(
+				'CURRENT_SEMESTER',
+				encodeURIComponent(this.currentSemester)
+				);
+
 			const params = {}, filter = {};
 			if (this.filterKontoCount0)
 				filter.konto_count_0 = this.filterKontoCount0;
diff --git a/public/js/components/Stv/Studentenverwaltung/Studiensemester.js b/public/js/components/Stv/Studentenverwaltung/Studiensemester.js
index c52d584fd..32b0a831d 100644
--- a/public/js/components/Stv/Studentenverwaltung/Studiensemester.js
+++ b/public/js/components/Stv/Studentenverwaltung/Studiensemester.js
@@ -2,12 +2,12 @@ import {CoreRESTClient} from '../../../RESTClient.js';
 
 export default {
 	emits: [
-		'changed'
+		'update:studiensemesterKurzbz'
 	],
 	props: {
-		default: {
+		studiensemesterKurzbz: {
 			type: String,
-			default: ''
+			required: true
 		}
 	},
 	data() {
@@ -68,7 +68,7 @@ export default {
 				})
 				.then(() => {
 					this.loading = false;
-					this.$emit('changed', this.list[this.current]);
+					this.$emit('update:studiensemesterKurzbz', this.list[this.current]);
 				})
 				.catch(error => {
 					this.current = fallback;
@@ -77,6 +77,11 @@ export default {
 				});
 		}
 	},
+	watch: {
+		'studiensemesterKurzbz': function () {
+			this.current = this.list.indexOf(this.studiensemesterKurzbz);
+		}
+	},
 	created() {
 		CoreRESTClient
 			.get('components/stv/studiensemester')
@@ -84,7 +89,7 @@ export default {
 			.then(result => {
 				this.list = result.map(el => el.studiensemester_kurzbz);
 				this.loading = false;
-				this.current = this.list.indexOf(this.default);
+				this.current = this.list.indexOf(this.studiensemesterKurzbz);
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},

From cf073d04b400b53f960f54ab52e4f7773ebb9d85 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 1 Aug 2025 12:27:00 +0200
Subject: [PATCH 497/572] remove console.log

---
 public/js/apps/Studentenverwaltung.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index a4dafc5bc..8be451297 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -131,7 +131,6 @@ const router = VueRouter.createRouter({
 });
 
 router.afterEach((to, from, failure) => {
-	console.log('vue router afterEach: ' + to.params.studiensemester_kurzbz);
 	if (to.params.studiensemester_kurzbz) {
 		document.title = to.params.studiensemester_kurzbz + ' - Studierendenverwaltung FH-Complete';
 	} else {

From e326c9483dd6269fc1219c5c47de268acbda09d6 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 1 Aug 2025 15:10:04 +0200
Subject: [PATCH 498/572] correct default value for calender date prop

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

diff --git a/public/js/components/Calendar/Base.js b/public/js/components/Calendar/Base.js
index 9d344ca09..2069347da 100644
--- a/public/js/components/Calendar/Base.js
+++ b/public/js/components/Calendar/Base.js
@@ -58,7 +58,7 @@ export default {
 		},
 		date: {
 			type: [Date, String, Number, luxon.DateTime],
-			default: luxon.DateTime.local()
+			default: props => luxon.DateTime.now().setZone(props.timezone).startOf('day')
 		},
 		modes: {
 			type: Object,

From 219507ffa3ed17cef35dc16995452c630efbb604 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 1 Aug 2025 15:22:34 +0200
Subject: [PATCH 499/572] Shareable calendar components

---
 public/js/components/Calendar/LvPlan.js       | 164 ++++++++++++++++++
 public/js/components/Calendar/Widget.js       | 106 +++++++++++
 public/js/components/Cis/LvPlan/LvPlan.js     | 129 ++------------
 .../js/components/Cis/Mylv/RoomInformation.js | 126 +-------------
 .../js/components/DashboardWidget/LvPlan.js   | 100 +----------
 5 files changed, 302 insertions(+), 323 deletions(-)
 create mode 100644 public/js/components/Calendar/LvPlan.js
 create mode 100644 public/js/components/Calendar/Widget.js

diff --git a/public/js/components/Calendar/LvPlan.js b/public/js/components/Calendar/LvPlan.js
new file mode 100644
index 000000000..c1cffb5be
--- /dev/null
+++ b/public/js/components/Calendar/LvPlan.js
@@ -0,0 +1,164 @@
+import FhcCalendar from "./Base.js";
+
+import ApiLvPlan from '../../api/factory/lvPlan.js';
+
+import { useEventLoader } from '../../composables/EventLoader.js';
+
+import ModeDay from './Mode/Day.js';
+import ModeWeek from './Mode/Week.js';
+import ModeMonth from './Mode/Month.js';
+
+export default {
+	name: "CalendarLvPlan",
+	components: {
+		FhcCalendar
+	},
+	inject: [
+		"renderers"
+	],
+	props: {
+		timezone: {
+			type: String,
+			required: true
+		},
+		date: {
+			type: [Date, String, Number, luxon.DateTime],
+			default: luxon.DateTime.local()
+		},
+		mode: {
+			type: String,
+			default: 'Week'
+		},
+		getPromiseFunc: {
+			type: Function,
+			required: true
+		}
+	},
+	emits: [
+		"update:date",
+		"update:mode",
+		"update:range"
+	],
+	data() {
+		return {
+			modes: {
+				day: Vue.markRaw(ModeDay),
+				week: Vue.markRaw(ModeWeek),
+				month: Vue.markRaw(ModeMonth)
+			},
+			modeOptions: {
+				day: {
+					emptyMessage: Vue.computed(() => this.$p.t('lehre/noLvFound')),
+					emptyMessageDetails: Vue.computed(() => this.$p.t('lehre/noLvFound'))
+				},
+				week: {
+					collapseEmptyDays: false
+				}
+			},
+			teachingunits: null
+		};
+	},
+	computed: {
+		backgrounds() {
+			let now = luxon.DateTime.now().setZone(this.timezone);
+
+			if (this.mode == 'Month')
+				return [
+					{
+						class: 'background-past',
+						end: now.startOf('day')
+					}
+				];
+
+			return [
+				{
+					class: 'background-past',
+					end: now,
+					label: now.startOf('minute').toISOTime({ suppressSeconds: true, includeOffset: false })
+				}
+			];
+		}
+	},
+	methods: {
+		eventStyle(event) {
+			if (!event.farbe)
+				return undefined;
+			return '--event-bg:#' + event.farbe;
+		},
+		updateRange(rangeInterval) {
+			this.rangeInterval = rangeInterval;
+			this.$emit('update:range', rangeInterval);
+		}
+	},
+	setup(props, context) {
+		const rangeInterval = Vue.ref(null);
+		
+		const { events, lv } = useEventLoader(rangeInterval, props.getPromiseFunc);
+
+		Vue.watch(lv, newValue => {
+			context.emit('update:lv', newValue);
+		});
+
+		return {
+			rangeInterval,
+			events,
+			lv
+		};
+	},
+	created() {
+		this.$api
+			.call(ApiLvPlan.getStunden())
+			.then(res => {
+				return this.teachingunits = res.data.map(el => ({
+					id: el.stunde,
+					start: el.beginn,
+					end: el.ende
+				}));
+			});
+	},
+	template: /* html */`
+	<fhc-calendar
+		ref="calendar"
+		class="fhc-calendar-lvplan"
+		:date="date"
+		:modes="modes"
+		:mode-options="modeOptions"
+		:mode="mode"
+		:timezone="timezone"
+		:locale="$p.user_locale.value"
+		:events="events || []"
+		:backgrounds="backgrounds"
+		:time-grid="teachingunits"
+		show-btns
+		@update:date="$emit('update:date', $event)"
+		@update:mode="$emit('update:mode', $event)"
+		@update:range="updateRange"
+	>
+		<template v-slot="{ event, mode }">
+			<div
+				:class="'event-type-' + event.type + ' ' + mode + 'PageContainer'"
+				:type="mode == 'day' ? 'button' : undefined"
+ 				:style="eventStyle(event)"
+			>
+				<component
+					v-if="mode == 'event'"
+					:is="renderers[event.type]?.modalContent"
+					:event="event"
+				></component>
+				<component
+					v-else-if="mode == 'eventheader'"
+					:is="renderers[event.type]?.modalTitle"
+					:event="event"
+				></component>
+				<component
+					v-else
+					:is="renderers[event.type]?.calendarEvent"
+					:event="event"
+				></component>
+			</div>
+		</template>
+		<template #actions>
+			<slot />
+		</template>
+	</fhc-calendar>`
+}
diff --git a/public/js/components/Calendar/Widget.js b/public/js/components/Calendar/Widget.js
new file mode 100644
index 000000000..f9d641d4e
--- /dev/null
+++ b/public/js/components/Calendar/Widget.js
@@ -0,0 +1,106 @@
+import FhcCalendar from "./Base.js";
+
+import { useEventLoader } from '../../composables/EventLoader.js';
+
+import ModeList from '../Calendar/Mode/List.js';
+
+export default {
+	name: "CalendarWidget",
+	components: {
+		FhcCalendar
+	},
+	inject: [
+		"renderers"
+	],
+	props: {
+		timezone: {
+			type: String,
+			required: true
+		},
+		getPromiseFunc: {
+			type: Function,
+			required: true
+		}
+	},
+	data() {
+		return {
+			now: luxon.DateTime.now().setZone(this.timezone),
+			modes: {
+				list: Vue.markRaw(ModeList)
+			},
+			modeOptions: {
+				list: {
+					length: 7
+				}
+			}
+		};
+	},
+	methods: {
+		eventStyle(event) {
+			const styles = {};
+			if (event.farbe)
+				styles['--event-bg'] = '#' + event.farbe;
+			else if (event.type == 'reservierung')
+				styles['--event-bg'] = '#ffffff';
+			else
+				styles['--event-bg'] = '#cccccc';
+
+			const eventEnd = luxon.DateTime.fromISO(event.isoend, { zone: this.timezone });
+			if (eventEnd < this.now)
+				styles['opacity'] = .5;
+			
+			return styles;
+		},
+		updateRange(rangeInterval) {
+			this.rangeInterval = rangeInterval;
+		}
+	},
+	setup(props) {
+		const rangeInterval = Vue.ref(null);
+		
+		const { events } = useEventLoader(rangeInterval, props.getPromiseFunc);
+
+		return {
+			rangeInterval,
+			events
+		};
+	},
+	template: /* html */`
+	<fhc-calendar
+		:modes="modes"
+		:mode-options="modeOptions"
+		:timezone="timezone"
+		:locale="$p.user_locale.value"
+		:events="events || []"
+		@update:range="updateRange"
+	>
+		<template v-slot="{ event, mode }">
+			<div
+				v-if="!event"
+				class="h-100 d-flex justify-content-center align-items-center"
+			>
+				{{ $p.t('lehre/noLvFound') }}
+			</div>
+			<component
+				v-else-if="mode == 'eventheader'"
+				:is="renderers[event.type]?.modalTitle"
+				:event="event"
+			></component>
+			<component
+				v-else-if="mode == 'event'"
+				:is="renderers[event.type]?.modalContent"
+				:event="event"
+			></component>
+			<div
+				v-else
+				:class="'event-type-' + event.type + ' ' + mode + 'PageContainer'"
+ 				:style="eventStyle(event)"
+			>
+				<component
+					:is="renderers[event.type]?.calendarEvent"
+					:event="event"
+				></component>
+			</div>
+		</template>
+	</fhc-calendar>`
+}
diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 73c91734c..2fbac0e3a 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -1,14 +1,8 @@
-import FhcCalendar from "../../Calendar/Base.js";
+import FhcCalendar from "../../Calendar/LvPlan.js";
 
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 import ApiAuthinfo from '../../../api/factory/authinfo.js';
 
-import { useEventLoader } from '../../../composables/EventLoader.js';
-
-import ModeDay from '../../Calendar/Mode/Day.js';
-import ModeWeek from '../../Calendar/Mode/Week.js';
-import ModeMonth from '../../Calendar/Mode/Month.js';
-
 export const DEFAULT_MODE_LVPLAN = 'Week'
 
 export default {
@@ -16,9 +10,6 @@ export default {
 	components: {
 		FhcCalendar
 	},
-	inject: [
-		"renderers"
-	],
 	props: {
 		viewData: Object, // NOTE(chris): this is inherited from router-view
 		propsViewData: Object
@@ -26,25 +17,11 @@ export default {
 	data() {
 		const now = luxon.DateTime.now().setZone(this.viewData.timezone);
 		return {
-			modes: {
-				day: Vue.markRaw(ModeDay),
-				week: Vue.markRaw(ModeWeek),
-				month: Vue.markRaw(ModeMonth)
-			},
-			modeOptions: {
-				day: {
-					emptyMessage: Vue.computed(() => this.$p.t('lehre/noLvFound')),
-					emptyMessageDetails: Vue.computed(() => this.$p.t('lehre/noLvFound'))
-				},
-				week: {
-					collapseEmptyDays: false
-				}
-			},
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
 			studiensemester_ende: null,
 			uid: null,
-			teachingunits: null
+			lv: null
 		};
 	},
 	computed:{
@@ -54,25 +31,6 @@ export default {
 		currentMode() {
 			return this.propsViewData?.mode || DEFAULT_MODE_LVPLAN;
 		},
-		backgrounds() {
-			let now = luxon.DateTime.now().setZone(this.viewData.timezone);
-
-			if (this.currentMode == 'Month')
-				return [
-					{
-						class: 'background-past',
-						end: now.startOf('day')
-					}
-				];
-
-			return [
-				{
-					class: 'background-past',
-					end: now,
-					label: now.startOf('minute').toISOTime({ suppressSeconds: true, includeOffset: false })
-				}
-			];
-		},
 		downloadLinks() {
 			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
 				return false;
@@ -101,11 +59,6 @@ export default {
 		}
 	},
 	methods: {
-		eventStyle(event) {
-			if (!event.farbe)
-				return undefined;
-			return '--event-bg:#' + event.farbe;
-		},
 		handleChangeDate(day, newMode) {
 			return this.handleChangeMode(newMode, day);
 		},
@@ -123,35 +76,22 @@ export default {
 			});
 		},
 		updateRange(rangeInterval) {
-			this.rangeInterval = rangeInterval;
 			this.$api
 				.call(ApiLvPlan.studiensemesterDateInterval(
-					this.rangeInterval.end.startOf('week').toISODate()
+					rangeInterval.end.startOf('week').toISODate()
 				))
 				.then(res => {
 					this.studiensemester_kurzbz = res.data.studiensemester_kurzbz;
 					this.studiensemester_start = res.data.start;
 					this.studiensemester_ende = res.data.ende;
 				});
-		}
-	},
-	setup(props) {
-		const $api = Vue.inject('$api');
-
-		const rangeInterval = Vue.ref(null);
-		
-		const { events, lv } = useEventLoader(rangeInterval, (start, end) => {
+		},
+		getPromiseFunc(start, end) {
 			return [
-				$api.call(ApiLvPlan.LvPlanEvents(start.toISODate(), end.toISODate(), props.propsViewData.lv_id)),
-				$api.call(ApiLvPlan.getLvPlanReservierungen(start.toISODate(), end.toISODate()))
+				this.$api.call(ApiLvPlan.LvPlanEvents(start.toISODate(), end.toISODate(), this.propsViewData.lv_id)),
+				this.$api.call(ApiLvPlan.getLvPlanReservierungen(start.toISODate(), end.toISODate()))
 			];
-		});
-
-		return {
-			rangeInterval,
-			events,
-			lv
-		};
+		}
 	},
 	created() {
 		this.$api
@@ -159,19 +99,10 @@ export default {
 			.then(res => {
 				this.uid = res.data.uid;
 			});
-		this.$api
-			.call(ApiLvPlan.getStunden())
-			.then(res => {
-				return this.teachingunits = res.data.map(el => ({
-					id: el.stunde,
-					start: el.beginn,
-					end: el.ende
-				}));
-			});
 	},
-	template:/*html*/`
-	<div class="fhc-lvplan d-flex flex-column h-100" v-if="renderers">
-		<h2 @click="modeOptions.week.collapseEmptyDays = !modeOptions.week.collapseEmptyDays">
+	template: /*html*/`
+	<div class="cis-lvplan-personal d-flex flex-column h-100">
+		<h2>
 			{{ $p.t('lehre/stundenplan') }}
 			<span style="padding-left: 0.4em;" v-show="studiensemester_kurzbz">
 				{{ studiensemester_kurzbz }}
@@ -183,45 +114,17 @@ export default {
 		<hr>
 		<fhc-calendar
 			ref="calendar"
-			class="responsive-calendar"
+			v-model:lv="lv"
+			:timezone="viewData.timezone"
+			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
-			:modes="modes"
-			:mode-options="modeOptions"
 			:mode="currentMode"
 			@update:date="handleChangeDate"
 			@update:mode="handleChangeMode"
 			@update:range="updateRange"
-			:timezone="viewData.timezone"
-			:locale="$p.user_locale.value"
-			show-btns
-			:events="events || []"
-			:backgrounds="backgrounds"
-			:time-grid="teachingunits"
+			class="responsive-calendar"
 		>
-			<template v-slot="{ event, mode }">
-				<div
-					:class="'event-type-' + event.type + ' ' + mode + 'PageContainer'"
-					:type="mode == 'day' ? 'button' : undefined"
-	 				:style="eventStyle(event)"
-				>
-					<component
-						v-if="mode == 'event'"
-						:is="renderers[event.type]?.modalContent"
-						:event="event"
-					></component>
-					<component
-						v-else-if="mode == 'eventheader'"
-						:is="renderers[event.type]?.modalTitle"
-						:event="event"
-					></component>
-					<component
-						v-else
-						:is="renderers[event.type]?.calendarEvent"
-						:event="event"
-					></component>
-				</div>
-			</template>
-			<template #actions>
+			<template>
 				<div
 					v-if="downloadLinks"
 					class="d-flex gap-1 justify-items-start"
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 1a1d1543d..2dd3d518d 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -1,13 +1,7 @@
-import FhcCalendar from "../../Calendar/Base.js";
+import FhcCalendar from "../../Calendar/LvPlan.js";
 
 import ApiLvPlan from '../../../api/factory/lvPlan.js';
 
-import { useEventLoader } from '../../../composables/EventLoader.js';
-
-import ModeDay from '../../Calendar/Mode/Day.js';
-import ModeWeek from '../../Calendar/Mode/Week.js';
-import ModeMonth from '../../Calendar/Mode/Month.js';
-
 export const DEFAULT_MODE_RAUMINFO = 'Week'
 
 export default {
@@ -15,65 +9,19 @@ export default {
 	components: {
 		FhcCalendar
 	},
-	inject: [
-		"renderers"
-	],
 	props:{
 		viewData: Object, // NOTE(chris): this is inherited from router-view
 		propsViewData: Object
 	},
-	data() {
-		return {
-			modes: {
-				day: Vue.markRaw(ModeDay),
-				week: Vue.markRaw(ModeWeek),
-				month: Vue.markRaw(ModeMonth)
-			},
-			modeOptions: {
-				day: {
-					emptyMessage: Vue.computed(() => this.$p.t('rauminfo/keineRaumReservierung')),
-					emptyMessageDetails: Vue.computed(() => this.$p.t('rauminfo/keineRaumReservierung'))
-				},
-				week: {
-					collapseEmptyDays: false
-				}
-			},
-			teachingunits: null
-		}
-	},
 	computed: {
 		currentDay() {
 			return this.propsViewData?.focus_date || luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
 		},
 		currentMode() {
 			return this.propsViewData?.mode || DEFAULT_MODE_RAUMINFO;
-		},
-		backgrounds() {
-			let now = luxon.DateTime.now().setZone(this.viewData.timezone);
-
-			if (this.currentMode == 'Month')
-				return [
-					{
-						class: 'background-past',
-						end: now.startOf('day')
-					}
-				];
-
-			return [
-				{
-					class: 'background-past',
-					end: now,
-					label: now.startOf('minute').toISOTime({ suppressSeconds: true, includeOffset: false })
-				}
-			];
 		}
 	},
 	methods:{
-		eventStyle(event) {
-			if (!event.farbe)
-				return undefined;
-			return '--event-bg:#' + event.farbe;
-		},
 		handleChangeDate(day, newMode) {
 			return this.handleChangeMode(newMode, day);
 		},
@@ -90,37 +38,12 @@ export default {
 				}
 			});
 		},
-		updateRange(rangeInterval) {
-			this.rangeInterval = rangeInterval;
-		}
-	},
-	setup(props) {
-		const $api = Vue.inject('$api');
-
-		const rangeInterval = Vue.ref(null);
-		
-		const { events } = useEventLoader(rangeInterval, (start, end) => {
+		getPromiseFunc(start, end) {
 			return [
-				$api.call(ApiLvPlan.getRoomInfo(props.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate())),
-				$api.call(ApiLvPlan.getOrtReservierungen(props.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate()))
+				this.$api.call(ApiLvPlan.getRoomInfo(this.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate())),
+				this.$api.call(ApiLvPlan.getOrtReservierungen(this.propsViewData.ort_kurzbz, start.toISODate(), end.toISODate()))
 			];
-		});
-
-		return {
-			rangeInterval,
-			events
-		};
-	},
-	created() {
-		this.$api
-			.call(ApiLvPlan.getStunden())
-			.then(res => {
-				return this.teachingunits = res.data.map(el => ({
-					id: el.stunde,
-					start: el.beginn,
-					end: el.ende
-				}));
-			});
+		}
 	},
 	template: /*html*/`
 	<div class="fhc-roominformation d-flex flex-column h-100">
@@ -128,44 +51,13 @@ export default {
 		<hr>
 		<fhc-calendar 
 			ref="calendar"
-			class="responsive-calendar"
+			:timezone="viewData.timezone"
+			:get-promise-func="getPromiseFunc"
 			:date="currentDay"
-			:modes="modes"
-			:mode-options="modeOptions"
 			:mode="currentMode"
 			@update:date="handleChangeDate"
 			@update:mode="handleChangeMode"
-			@update:range="updateRange"
-			:timezone="viewData.timezone"
-			:locale="$p.user_locale.value"
-			show-btns
-			:events="events || []"
-			:backgrounds="backgrounds"
-			:time-grid="teachingunits"
-		>
-			<template v-slot="{ event, mode }">
-				<div
-					:class="'event-type-' + event.type + ' ' + mode + 'PageContainer'"
-					:type="mode == 'day' ? 'button' : undefined"
-	 				:style="eventStyle(event)"
-				>
-					<component
-						v-if="mode == 'event'"
-						:is="renderers[event.type]?.modalContent"
-						:event="event"
-					></component>
-					<component
-						v-else-if="mode == 'eventheader'"
-						:is="renderers[event.type]?.modalTitle"
-						:event="event"
-					></component>
-					<component
-						v-else
-						:is="renderers[event.type]?.calendarEvent"
-						:event="event"
-					></component>
-				</div>
-			</template>
-		</fhc-calendar>
+			class="responsive-calendar"
+		></fhc-calendar>
 	</div>`
 };
diff --git a/public/js/components/DashboardWidget/LvPlan.js b/public/js/components/DashboardWidget/LvPlan.js
index 3961bae78..c82db2e0c 100644
--- a/public/js/components/DashboardWidget/LvPlan.js
+++ b/public/js/components/DashboardWidget/LvPlan.js
@@ -1,12 +1,8 @@
 import AbstractWidget from './Abstract.js';
-import FhcCalendar from '../Calendar/Base.js';
+import FhcCalendar from '../Calendar/Widget.js';
 
 import ApiLvPlan from '../../api/factory/lvPlan.js';
 
-import { useEventLoader } from '../../composables/EventLoader.js';
-
-import ModeList from '../Calendar/Mode/List.js';
-
 export default {
 	name: "LvPlanWidget",
 	components: {
@@ -16,103 +12,21 @@ export default {
 		AbstractWidget
 	],
 	inject: [
-		"renderers",
 		"timezone"
 	],
-	data() {
-		return {
-			now: luxon.DateTime.now().setZone(this.timezone),
-			modes: {
-				list: Vue.markRaw(ModeList)
-			},
-			modeOptions: {
-				list: {
-					length: 7
-				}
-			},
-			currentDay: luxon.DateTime.now().setZone(this.timezone).startOf('day')
-		}
-	},
 	methods: {
-		eventStyle(event) {
-			const styles = {};
-			if (event.farbe)
-				styles['--event-bg'] = '#' + event.farbe;
-			else if (event.type == 'reservierung')
-				styles['--event-bg'] = '#ffffff';
-			else
-				styles['--event-bg'] = '#cccccc';
-
-			const eventEnd = luxon.DateTime.fromISO(event.isoend, { zone: this.timezone });
-			if (eventEnd < this.now)
-				styles['opacity'] = .5;
-			
-			return styles;
-		},
-		updateRange(rangeInterval) {
-			this.rangeInterval = rangeInterval;
-		}
-	},
-	setup() {
-		const $api = Vue.inject('$api');
-
-		const rangeInterval = Vue.ref(null);
-		
-		const { events } = useEventLoader(rangeInterval, (start, end) => {
+		getPromiseFunc(start, end) {
 			return [
-				$api.call(ApiLvPlan.LvPlanEvents(start.toISODate(), end.toISODate())),
-				$api.call(ApiLvPlan.getLvPlanReservierungen(start.toISODate(), end.toISODate()))
+				this.$api.call(ApiLvPlan.LvPlanEvents(start.toISODate(), end.toISODate())),
+				this.$api.call(ApiLvPlan.getLvPlanReservierungen(start.toISODate(), end.toISODate()))
 			];
-		});
-
-		return {
-			rangeInterval,
-			events
-		};
+		}
 	},
 	created() {
 		this.$emit('setConfig', false);
 	},
 	template: /*html*/`
 	<div class="dashboard-widget-lvplan d-flex flex-column h-100">
-		<fhc-calendar
-			v-model:date="currentDay"
-			:modes="modes"
-			:mode-options="modeOptions"
-			@update:range="updateRange"
-			:timezone="timezone"
-			:locale="$p.user_locale.value"
-			:events="events"
-		>
-			<template v-slot="{ event, mode }">
-				<div
-					v-if="!event"
-					class="h-100 d-flex justify-content-center align-items-center"
-				>
-					{{ $p.t('lehre/noLvFound') }}
-				</div>
-				<component
-					v-else-if="mode == 'eventheader'"
-					:is="renderers[event.type]?.modalTitle"
-					:event="event"
-				></component>
-				<component
-					v-else-if="mode == 'event'"
-					:is="renderers[event.type]?.modalContent"
-					:event="event"
-				></component>
-				<div
-					v-else
-					:class="'event-type-' + event.type + ' ' + mode + 'PageContainer'"
-	 				:style="eventStyle(event)"
-				>
-					<component
-						:is="renderers[event.type]?.calendarEvent"
-						:event="event"
-					></component>
-				</div>
-			</template>
-		</fhc-calendar>
-	</div>
-`
+		<fhc-calendar :timezone="timezone" :get-promise-func="getPromiseFunc" />
+	</div>`
 }
\ No newline at end of file

From 5329fadbac58c4b69a2eb83733327f0f480513c9 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 1 Aug 2025 17:25:30 +0200
Subject: [PATCH 500/572] add searchresultlink function to generate urls with
 current studiensemester in extended search

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

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index 55892c02b..05b71aa48 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -101,19 +101,11 @@ export default {
 					mergedPerson: {
 						defaultaction: {
 							type: "link",
-							action: data => this.$fhcApi.getUri('/studentenverwaltung/person/' + data.person_id)
+							action: this.buildPersonSearchResultLink
 						},
 						defaultactionstudent: {
 							type: "link",
-							action: data => {
-								if (data.prestudent_id) {
-									return this.$fhcApi.getUri('/studentenverwaltung/prestudent/' + data.prestudent_id);
-								} else if (data.uid) {
-									return this.$fhcApi.getUri('/studentenverwaltung/student/' + data.uid);
-								} else {
-									return this.$fhcApi.getUri('/studentenverwaltung/person/' + data.person_id);
-								}
-							}
+							action: this.buildMergedPersonSearchResultLink
 						},
 						childactions: []
 					}
@@ -142,21 +134,38 @@ export default {
 		}
 	},
 	methods: {
+		buildMergedPersonSearchResultLink(data) {
+			if (data.prestudent_id) {
+				return this.buildPrestudentSearchResultLink(data);
+			} else if (data.uid) {
+				return this.buildStudentSearchResultLink(data);
+			} else {
+				return this.buildPersonSearchResultLink(data);
+			}
+		},
 		buildPrestudentSearchResultLink(data) {
-			return FHC_JS_DATA_STORAGE_OBJECT.app_root
-				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router
-				+ '/studentenverwaltung'
+			return this.$fhcApi.getUri(
+				'/studentenverwaltung'
 				+ '/' + this.studiensemesterKurzbz
 				+ '/prestudent/'
-				+ data.prestudent_id;
+				+ data.prestudent_id
+				);
 		},
 		buildStudentSearchResultLink(data) {
-			return FHC_JS_DATA_STORAGE_OBJECT.app_root
-				+ FHC_JS_DATA_STORAGE_OBJECT.ci_router
-				+ '/studentenverwaltung'
+			return this.$fhcApi.getUri(
+				'/studentenverwaltung'
 				+ '/' + this.studiensemesterKurzbz
 				+ '/student/'
-				+ data.uid;
+				+ data.uid
+				);
+		},
+		buildPersonSearchResultLink(data) {
+			return this.$fhcApi.getUri(
+				'/studentenverwaltung'
+				+ '/' + this.studiensemesterKurzbz
+				+ '/person/'
+				+ data.person_id
+				);
 		},
 		onSelectVerband( {link, studiengang_kz}) {
 			let urlpath = String(link);

From 9999cb47c2ae66894f6ebe02eefe50c91402c343 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 1 Aug 2025 17:32:54 +0200
Subject: [PATCH 501/572] use extende Verband component from branch
 feature/60973, add route for studiengang kuerzel in url, adapt for switching
 studiengang also via url

---
 public/js/apps/Studentenverwaltung.js         | 38 ++++++++-
 .../js/components/Stv/Studentenverwaltung.js  | 79 +++++++++++++++----
 .../Stv/Studentenverwaltung/Verband.js        | 77 +++++++++++++++---
 3 files changed, 162 insertions(+), 32 deletions(-)

diff --git a/public/js/apps/Studentenverwaltung.js b/public/js/apps/Studentenverwaltung.js
index 8be451297..5eda16dd6 100644
--- a/public/js/apps/Studentenverwaltung.js
+++ b/public/js/apps/Studentenverwaltung.js
@@ -48,6 +48,33 @@ const router = VueRouter.createRouter({
 				next();
 			}
 		},
+		{
+			name: 'studiengang',
+			path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz/:studiengang`,
+			component: FhcStudentenverwaltung,
+			props: (route) => {
+				return {
+					url_studiensemester_kurzbz: route.params.studiensemester_kurzbz,
+					url_studiengang: route.params.studiengang,
+				};
+			},
+			beforeEnter: (to, from, next) => {
+				const isSemester = /^[WS]S\d{4}$/.test(to.params.studiensemester_kurzbz);
+				if (!isSemester) {
+					return next({name: 'index'});
+				}
+				const isStudiengang = /^[A-Z]{3}/.test(to.params.studiengang);
+				if (!isStudiengang) {
+					return next({
+						name: 'studiensemester',
+						params: {
+							studiensemester_kurzbz: to.params.studiensemester_kurzbz
+						}
+					});
+				}
+				next();
+			}
+		},
 		{
 			path: `/${ciPath}/studentenverwaltung/:studiensemester_kurzbz/prestudent/:prestudent_id`,
 			component: FhcStudentenverwaltung,
@@ -131,11 +158,14 @@ const router = VueRouter.createRouter({
 });
 
 router.afterEach((to, from, failure) => {
-	if (to.params.studiensemester_kurzbz) {
-		document.title = to.params.studiensemester_kurzbz + ' - Studierendenverwaltung FH-Complete';
-	} else {
-		document.title = 'Studierendenverwaltung FH-Complete';
+	let title = 'Studierendenverwaltung FH-Complete';
+	if (to.params.studiengang) {
+		title = to.params.studiengang + ' ' + title;
 	}
+	if (to.params.studiensemester_kurzbz) {
+		title = to.params.studiensemester_kurzbz + ' ' + title;
+	}
+	document.title = title;
 });
 
 const app = Vue.createApp({
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index c6f271a50..e590f0606 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -24,6 +24,7 @@ import StvStudiensemester from "./Studentenverwaltung/Studiensemester.js";
 
 import ApiSearchbar from "../../api/factory/searchbar.js";
 import ApiStv from "../../api/factory/stv.js";
+import ApiStvVerband from '../../api/factory/stv/verband.js';
 
 
 export default {
@@ -42,7 +43,12 @@ export default {
 		permissions: Object,
 		stvRoot: String,
 		cisRoot: String,
-		activeAddons: String // semicolon separated list of active addons
+		activeAddons: String, // semicolon separated list of active addons
+		url_studiensemester_kurzbz: String,
+		url_mode: String,
+		url_prestudent_id: String,
+		url_tab: String,
+		url_studiengang: String
 	},
 	provide() {
 		return {
@@ -101,23 +107,37 @@ export default {
 				}
 			},
 			studiengangKz: undefined,
+			studiengangKuerzel: '',
 			studiensemesterKurzbz: this.defaultSemester,
 			lists: {
 				nations: [],
 				sprachen: [],
 				geschlechter: []
-			}
+			},
+			verbandEndpoint: ApiStvVerband
 		}
 	},
 	watch: {
-		'$attrs.url_studiensemester_kurzbz': function (newVal, oldVal) {
+		'url_studiensemester_kurzbz': function (newVal, oldVal) {
 			if (newVal !== oldVal) {
 				this.studiensemesterKurzbz = newVal;
 				this.$refs.stvList.updateUrl();
 				this.$refs.details.reload();
 			}
 		},
-		'$attrs.url_mode': function () {
+		'url_studiengang': function (newVal, oldVal) {
+			if (newVal !== oldVal) {
+				const stg = this.lists.stgs.find((element) => {
+					const kuerzel = (element.typ + element.kurzbz).toUpperCase();
+					return (this.url_studiengang === kuerzel);
+				});
+				if (stg) {
+					this.studiengangKz = stg.studiengang_kz;
+					this.studiengangKuerzel = (stg.typ + stg.kurzbz).toUpperCase();
+				}
+			}
+		},
+		'url_mode': function () {
 			this.handlePersonUrl();
 		}
 	},
@@ -144,16 +164,32 @@ export default {
 			{
 				urlpath = 'CURRENT_SEMESTER' + '/' + urlpath;
 			}
+			this.$refs.stvList.updateUrl(ApiStv.students.verband(urlpath));
+
 			this.studiengangKz = studiengang_kz;
-			this.$refs.stvList.updateUrl(
-				ApiStv.students.verband(urlpath)
-				);
-			this.$router.push({
-				name: 'studiensemester',
-				params: {
-					studiensemester_kurzbz: this.studiensemesterKurzbz
-				}
+			const stg = this.lists.stgs.find((element) => {
+				return (element.studiengang_kz === this.studiengangKz);
 			});
+			if (stg)
+			{
+				this.studiengangKuerzel = (stg.typ + stg.kurzbz).toUpperCase()
+				this.$router.push({
+					name: 'studiengang',
+					params: {
+						studiensemester_kurzbz: this.studiensemesterKurzbz,
+						studiengang: this.studiengangKuerzel
+					}
+				});
+			} else
+			{
+				this.studiengangKuerzel = '';
+				this.$router.push({
+					name: 'studiensemester',
+					params: {
+						studiensemester_kurzbz: this.studiensemesterKurzbz
+					}
+				});
+		}
 		},
 		studiensemesterChanged(v) {
 			this.studiensemesterKurzbz = v;
@@ -193,7 +229,7 @@ export default {
 		}
 	},
 	created() {
-		if (!this.$attrs?.url_studiensemester_kurzbz) {
+		if (!this.url_studiensemester_kurzbz) {
 			this.$router.replace({
 				name: 'studiensemester',
 				params: {
@@ -201,7 +237,7 @@ export default {
 				}
 			});
 		} else {
-			this.studiensemesterKurzbz = this.$attrs.url_studiensemester_kurzbz;
+			this.studiensemesterKurzbz = this.url_studiensemester_kurzbz;
 		}
 
 		this.$api
@@ -237,6 +273,17 @@ export default {
 			.then(result => {
 				this.lists.stgs = result.data;
 				this.lists.active_stgs = this.lists.stgs.filter(stg => stg.aktiv);
+
+				if (this.url_studiengang) {
+					const stg = this.lists.stgs.find((element) => {
+						const kuerzel = (element.typ + element.kurzbz).toUpperCase();
+						return (this.url_studiengang === kuerzel);
+					});
+					if (stg) {
+						this.studiengangKz = stg.studiengang_kz;
+						this.studiengangKuerzel = (stg.typ + stg.kurzbz).toUpperCase();
+					}
+				}
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
@@ -270,7 +317,7 @@ export default {
 	template: `
 	<div class="stv">
 		<header class="navbar navbar-expand-lg navbar-dark bg-dark flex-md-nowrap p-0 shadow">
-			<a class="navbar-brand col-md-4 col-lg-3 col-xl-2 me-0 px-3" :href="stvRoot">FHC 4.0</a>
+			<a class="navbar-brand col-md-4 col-lg-3 col-xl-2 me-0 px-3" :href="stvRoot">StudVw: {{studiensemesterKurzbz}} {{studiengangKuerzel}}</a>
 			<button class="navbar-toggler d-md-none m-1 collapsed" type="button" data-bs-toggle="offcanvas" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" :aria-label="$p.t('ui/toggle_nav')"><span class="navbar-toggler-icon"></span></button>
 			<core-searchbar :searchoptions="searchbaroptions" :searchfunction="searchfunction" class="searchbar w-100"></core-searchbar>
 		</header>
@@ -280,7 +327,7 @@ export default {
 					<div class="offcanvas-header justify-content-end px-1 d-md-none">
 						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
 					</div>
-					<stv-verband @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
+					<stv-verband :preselectedKey="'' + studiengangKz" :endpoint="verbandEndpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
 					<stv-studiensemester v-model:studiensemester-kurzbz="studiensemesterKurzbz" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
 				</nav>
 				<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index 8ae2b6b40..a5d0e55a8 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -5,8 +5,6 @@ import PvTree from "../../../../../index.ci.php/public/js/components/primevue/tr
 import PvTreetable from "../../../../../index.ci.php/public/js/components/primevue/treetable/treetable.esm.min.js";
 import PvColumn from "../../../../../index.ci.php/public/js/components/primevue/column/column.esm.min.js";
 
-import ApiStvVerband from '../../../api/factory/stv/verband.js';
-
 export default {
 	components: {
 		PvTree,
@@ -16,11 +14,22 @@ export default {
 	emits: [
 		'selectVerband'
 	],
+	props: {
+		endpoint: {
+			type: Object,
+			required: true,
+		},
+		preselectedKey: {
+			type: String,
+			default: null
+		}
+	},
 	data() {
 		return {
 			loading: true,
 			nodes: [],
 			selectedKey: [],
+			expandedKeys: {},
 			filters: {}, // TODO(chris): filter only 1st level?
 			favnodes: [],
 			favorites: {on: false, list: []}
@@ -32,6 +41,13 @@ export default {
 			return this.favorites.on ? this.favnodes : this.nodes;
 		}
 	},
+	watch: {
+		'preselectedKey': function (newVal, oldVal) {
+			if (newVal !== oldVal) {
+				this.setPreselection();
+			}
+		}
+	},
 	methods: {
 		findNodeByKey(key, arr) {
 			if (!arr)
@@ -44,7 +60,7 @@ export default {
 				return res.pop();
 			return null;
 		},
-		onExpandTreeNode(node) {
+		async onExpandTreeNode(node) {
 			if (!node.children) {
 				if (node.data.link) {
 					let activeEl = null;
@@ -55,8 +71,8 @@ export default {
 					});
 					this.loading = true;
 					
-					this.$api
-						.call(ApiStvVerband.get(node.data.link))
+					return this.$api
+						.call(this.endpoint.get(node.data.link))
 						.then(result => result.data)
 						.then(result => {
 							const subNodes = result.map(this.mapResultToTreeData);
@@ -68,7 +84,7 @@ export default {
 
 							let treeitem = this.$refs.tree.$el.querySelector('[data-tree-item-key="' + node.key + '"]');
 							treeitem = treeitem.closest('[role="row"]');
-							
+
 							this.$nextTick(() => {
 								if (activeEl == document.activeElement)
 									treeitem.dispatchEvent(new KeyboardEvent('keydown', {
@@ -108,7 +124,7 @@ export default {
 			}
 			this.favorites.on = !this.favorites.on;
 			this.$api
-				.call(ApiStvVerband.favorites.set(
+				.call(this.endpoint.favorites.set(
 					JSON.stringify(this.favorites)
 				));
 			this.loading = false;
@@ -135,7 +151,7 @@ export default {
 			for (let parent in sortedInParents)
 				promises.push(
 					this.$api
-						.call(ApiStvVerband.get(parent == '_' ? '' : parent))
+						.call(this.endpoint.get(parent == '_' ? '' : parent))
 						.then(res => res.data)
 						.then(res => res.filter(node => sortedInParents[parent].includes(node.link + '')))
 				);
@@ -160,9 +176,9 @@ export default {
 					this.favnodes.push((await this.loadNodes([key.data.link])).pop());
 				this.favorites.list.push(key.data.link + '');
 			}
-			
+
 			this.$api
-				.call(ApiStvVerband.favorites.set(
+				.call(this.endpoint.favorites.set(
 					JSON.stringify(this.favorites)
 				));
 		},
@@ -181,19 +197,55 @@ export default {
 				let items = e.target.querySelectorAll('[data-link-fav-add][tabindex="-1"]');
 				items.forEach(el => el.tabIndex = 0);
 			}
+		},
+		async setPreselection()
+		{
+			if (!this.preselectedKey)
+				return;
+
+			let rawKey = this.preselectedKey
+
+			if (!rawKey || typeof rawKey !== 'string')
+				return;
+
+			const parts = this.preselectedKey.split('/');
+			let currentKey = parts[0];
+			let currentNode = this.findNodeByKey(currentKey);
+
+			if (!currentNode)
+				return;
+
+			for (let i = 1; i < parts.length; i++)
+			{
+				this.expandedKeys[currentNode.key] = true;
+
+				await this.onExpandTreeNode(currentNode);
+
+				currentKey += '-' + parts[i];
+				currentNode = this.findNodeByKey(currentKey);
+
+				if (!currentNode)
+				{
+					return;
+				}
+			}
+
+			this.selectedKey = {[currentNode.key]: true};
+			this.onSelectTreeNode(currentNode);
 		}
 	},
 	mounted() {
 		this.$api
-			.call(ApiStvVerband.get())
+			.call(this.endpoint.get())
 			.then(result => {
 				this.nodes = result.data.map(this.mapResultToTreeData);
+				this.setPreselection();
 				this.loading = false;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 
 		this.$api
-			.call(ApiStvVerband.favorites.get())
+			.call(this.endpoint.favorites.get())
 			.then(result => {
 				if (result.data) {
 					let f = JSON.parse(result.data);
@@ -218,6 +270,7 @@ export default {
 			:value="filteredNodes"
 			@node-expand="onExpandTreeNode"
 			selection-mode="single"
+			v-model:expanded-keys="expandedKeys"
 			v-model:selection-keys="selectedKey"
 			@node-select="onSelectTreeNode"
 			scrollable

From 6714432c3078fe230b2803e0ea72f756c457298a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 1 Aug 2025 18:02:01 +0200
Subject: [PATCH 502/572] handle no existing stgs from url

---
 .../js/components/Stv/Studentenverwaltung.js  | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index e590f0606..0652ace05 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -127,14 +127,7 @@ export default {
 		},
 		'url_studiengang': function (newVal, oldVal) {
 			if (newVal !== oldVal) {
-				const stg = this.lists.stgs.find((element) => {
-					const kuerzel = (element.typ + element.kurzbz).toUpperCase();
-					return (this.url_studiengang === kuerzel);
-				});
-				if (stg) {
-					this.studiengangKz = stg.studiengang_kz;
-					this.studiengangKuerzel = (stg.typ + stg.kurzbz).toUpperCase();
-				}
+				this.checkUrlStudiengang();
 			}
 		},
 		'url_mode': function () {
@@ -226,6 +219,25 @@ export default {
 					true
 					);
 			}
+		},
+		checkUrlStudiengang() {
+			if (this.url_studiengang) {
+				const stg = this.lists.stgs.find((element) => {
+					const kuerzel = (element.typ + element.kurzbz).toUpperCase();
+					return (this.url_studiengang === kuerzel);
+				});
+				if (stg) {
+					this.studiengangKz = stg.studiengang_kz;
+					this.studiengangKuerzel = (stg.typ + stg.kurzbz).toUpperCase();
+				} else {
+					this.$router.replace({
+						name: 'studiensemester',
+						params: {
+							studiensemester_kurzbz: this.studiensemesterKurzbz
+						}
+					});
+				}
+			}
 		}
 	},
 	created() {
@@ -273,17 +285,7 @@ export default {
 			.then(result => {
 				this.lists.stgs = result.data;
 				this.lists.active_stgs = this.lists.stgs.filter(stg => stg.aktiv);
-
-				if (this.url_studiengang) {
-					const stg = this.lists.stgs.find((element) => {
-						const kuerzel = (element.typ + element.kurzbz).toUpperCase();
-						return (this.url_studiengang === kuerzel);
-					});
-					if (stg) {
-						this.studiengangKz = stg.studiengang_kz;
-						this.studiengangKuerzel = (stg.typ + stg.kurzbz).toUpperCase();
-					}
-				}
+				this.checkUrlStudiengang();
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 

From 02a52d1aee531cb9c24596acd2d4e8b7ed7a2999 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 4 Aug 2025 08:44:27 +0200
Subject: [PATCH 503/572] Bugfix: forward both params in LvPlan update:date and
 update:mode events

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

diff --git a/public/js/components/Calendar/LvPlan.js b/public/js/components/Calendar/LvPlan.js
index c1cffb5be..e0e918f01 100644
--- a/public/js/components/Calendar/LvPlan.js
+++ b/public/js/components/Calendar/LvPlan.js
@@ -130,8 +130,8 @@ export default {
 		:backgrounds="backgrounds"
 		:time-grid="teachingunits"
 		show-btns
-		@update:date="$emit('update:date', $event)"
-		@update:mode="$emit('update:mode', $event)"
+		@update:date="(newDate, newMode) => $emit('update:date', newDate, newMode)"
+		@update:mode="(newMode, newDate) => $emit('update:mode', newMode, newDate)"
 		@update:range="updateRange"
 	>
 		<template v-slot="{ event, mode }">

From 502942deb3b7cca782d0865a2d0622b9a0bd0580 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 4 Aug 2025 09:28:50 +0200
Subject: [PATCH 504/572] Remove template from slot

---
 public/js/components/Cis/LvPlan/LvPlan.js | 34 +++++++++++------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/LvPlan.js b/public/js/components/Cis/LvPlan/LvPlan.js
index 2fbac0e3a..f7763c54b 100644
--- a/public/js/components/Cis/LvPlan/LvPlan.js
+++ b/public/js/components/Cis/LvPlan/LvPlan.js
@@ -124,25 +124,23 @@ export default {
 			@update:range="updateRange"
 			class="responsive-calendar"
 		>
-			<template>
-				<div
-					v-if="downloadLinks"
-					class="d-flex gap-1 justify-items-start"
-				>
-					<div v-for="{ title, icon, link } in downloadLinks">
-						<a
-							:href="link"
-							:aria-label="title"
-							class="py-1 btn btn-outline-secondary"
-						>
-							<div class="d-flex flex-column">
-								<i aria-hidden="true" :class="icon"></i>
-								<span style="font-size:.5rem">{{ title }}</span>
-							</div>
-						</a>
-					</div>
+			<div
+				v-if="downloadLinks"
+				class="d-flex gap-1 justify-items-start"
+			>
+				<div v-for="{ title, icon, link } in downloadLinks">
+					<a
+						:href="link"
+						:aria-label="title"
+						class="py-1 btn btn-outline-secondary"
+					>
+						<div class="d-flex flex-column">
+							<i aria-hidden="true" :class="icon"></i>
+							<span style="font-size:.5rem">{{ title }}</span>
+						</div>
+					</a>
 				</div>
-			</template>
+			</div>
 		</fhc-calendar>
 	</div>`
 };

From 89c64cadc7a28eaa63f4b5c7cc870d2dae86cda3 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 4 Aug 2025 10:20:11 +0200
Subject: [PATCH 505/572] calc current Studiensemester by start_date, to avoid
 gap and error msg during summer

---
 application/controllers/api/frontend/v1/LvPlan.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index a1d40cb81..6a1f9bf7f 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -115,7 +115,7 @@ class LvPlan extends FHCAPI_Controller
 
 		$this->load->model('education/Studentlehrverband_model','StudentLehrverbandModel');
 		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
-		$current_Studiensemester = $this->StudiensemesterModel->getAkt();
+		$current_Studiensemester = $this->StudiensemesterModel->getByDate($start_date);
 		$current_Studiensemester = $this->getDataOrTerminateWithError($current_Studiensemester);
 		$current_Studiensemester = current($current_Studiensemester)->studiensemester_kurzbz;
 		$studiengang = $this->StudentLehrverbandModel->loadWhere(["student_uid"=>getAuthUID(),"studiensemester_kurzbz"=>$current_Studiensemester]);

From 8bcd0961f6c4c2a131032bdb3de968f6d9381a86 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 4 Aug 2025 13:06:32 +0200
Subject: [PATCH 506/572] remove unused empty file

---
 ...55991_55992_60874_60875_61229_61230_61231_TabAbschlusspruefung | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231_TabAbschlusspruefung

diff --git a/merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231_TabAbschlusspruefung b/merge_FHC4_55354_55991_55992_60874_60875_61229_61230_61231_TabAbschlusspruefung
deleted file mode 100644
index e69de29bb..000000000

From e727c03a422e325579cb4e896ede9b291581c6bf Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 4 Aug 2025 13:42:51 +0200
Subject: [PATCH 507/572] fix current simple search with modified searchbar,
 let action always emit actionexecuted event on click to close search in
 combination with vue router

---
 application/libraries/SearchBarLib.php               |  7 +++++++
 .../components/searchbar/result/template/action.js   |  5 ++---
 public/js/components/searchbar/searchbar.js          | 12 ++++++++++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php
index 13b0efdbb..f19365c02 100644
--- a/application/libraries/SearchBarLib.php
+++ b/application/libraries/SearchBarLib.php
@@ -115,6 +115,7 @@ class SearchBarLib
 
 		$sql = '
 			SELECT
+				\'employee\' AS renderer,
 				\''.$type.'\' AS type,
 				b.uid AS uid,
 				p.person_id AS person_id,
@@ -205,6 +206,7 @@ EOSC;
 
 		$employees = $dbModel->execReadOnlyQuery('
 			SELECT
+				\'employee\' AS renderer,
 				\''.$type.'\' AS type,
 				b.uid AS uid,
 				p.person_id AS person_id,
@@ -268,6 +270,7 @@ EOSC;
 
 		$ous = $dbModel->execReadOnlyQuery('
 			SELECT
+				\'' . $type . '\' AS renderer,
 				\''.$type.'\' AS type,
 				o.oe_kurzbz AS oe_kurzbz,
 				\'[\' || ot.bezeichnung || \'] \' || o.bezeichnung AS name,
@@ -365,6 +368,7 @@ EOSC;
 		$gesperrtes_foto = base64_encode(file_get_contents(DOC_ROOT.'skin/images/profilbild_dummy.jpg'));
 		$students = $dbModel->execReadOnlyQuery('
 		SELECT
+			\'' . $type . '\' AS renderer,
 			\''.$type.'\' AS type,
 			s.student_uid AS uid,
 			CONCAT(s.student_uid,\'@'.DOMAIN.'\') AS email,
@@ -413,6 +417,7 @@ EOSC;
 
 		$students = $dbModel->execReadOnlyQuery('
 		SELECT
+			\'student\' AS renderer,
 			\''.$type.'\' AS type,
 			s.student_uid AS uid,
 			s.matrikelnr,
@@ -458,6 +463,7 @@ EOSC;
 
 		$prestudent = $dbModel->execReadOnlyQuery('
 		SELECT
+			\'' . $type . '\' AS renderer,
 			\''.$type.'\' AS type,
 			ps.prestudent_id,
 			ps.studiengang_kz,
@@ -517,6 +523,7 @@ EOSC;
 
 		$rooms = $dbModel->execReadOnlyQuery('
 			SELECT
+				\'room\' AS renderer,
 				\''.$type.'\' AS type,
 				COALESCE(ort.ort_kurzbz, \'N/A\') as ort_kurzbz,
 				COALESCE(ort.gebteil, \'N/A\') as building,
diff --git a/public/js/components/searchbar/result/template/action.js b/public/js/components/searchbar/result/template/action.js
index 7c50eb134..eb4b1db3a 100644
--- a/public/js/components/searchbar/result/template/action.js
+++ b/public/js/components/searchbar/result/template/action.js
@@ -16,9 +16,8 @@ export default {
 	},
 	methods: {
 		actionFunc() {
-			if (this.action.type !== 'function')
-				return;
-			this.action.action(this.res);
+			if (this.action.type === 'function')
+				this.action.action(this.res);
 			this.$emit('actionexecuted');
 		}
 	},
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index 6a41fe2f5..f571b733b 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -77,6 +77,7 @@ export default {
 		<form
 			ref="searchform"
 			class="d-flex me-3"
+			:class="searchoptions.cssclass"
 			action="javascript:void(0);"
 			@focusin="searchfocusin"
 			@focusout="searchfocusout"
@@ -136,7 +137,7 @@ export default {
                         :is="res.renderer"
                         :mode="searchmode"
                         :res="res"
-                        :actions="searchoptions.actions[dash2camelCase(res.renderer)]"
+                        :actions="getActions(res)"
                         @actionexecuted="hideresult"
                     ></component>
                     <div v-else class="searchbar-result text-danger fw-bold">{{ $p.t('search/error_unknown_type', res) }}</div>
@@ -418,6 +419,13 @@ export default {
         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)];
+			if (actions) {
+				return actions;
+			}
+			return this.searchoptions.actions[res.type];
+		}
     }
 };

From b76bdfa4314cb4d365590aa61f544e6b6c69a511 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 4 Aug 2025 14:08:59 +0200
Subject: [PATCH 508/572] Close calendar modal on unmount

---
 public/js/components/Calendar/Base.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/js/components/Calendar/Base.js b/public/js/components/Calendar/Base.js
index 2069347da..36d9877da 100644
--- a/public/js/components/Calendar/Base.js
+++ b/public/js/components/Calendar/Base.js
@@ -258,6 +258,9 @@ export default {
 				this.modalEvent.closeFn();
 		}
 	},
+	beforeUnmount() {
+		this.hideEventModal();
+	},
 	template: /* html */`
 	<div class="fhc-calendar-base h-100">
 		<base-draganddrop

From 9b396088c33e8cef06efcea66e2f26c73cf21573 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 4 Aug 2025 14:09:27 +0200
Subject: [PATCH 509/572] Refactor LvPlan endpoints to be more granular

---
 .../controllers/api/frontend/v1/LvPlan.php    | 218 +++++----
 application/libraries/StundenplanLib.php      | 423 ++++++++++--------
 public/js/api/factory/lvPlan.js               |  17 +-
 3 files changed, 397 insertions(+), 261 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index 6a1f9bf7f..b6c629fe1 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -36,6 +36,8 @@ class LvPlan extends FHCAPI_Controller
             'Stunden' => self::PERM_LOGGED,
             'getReservierungen' => self::PERM_LOGGED,
 			'LvPlanEvents' => self::PERM_LOGGED,
+			'eventsPersonal' => self::PERM_LOGGED,
+			'eventsLv' => self::PERM_LOGGED,
 			'getLehreinheitStudiensemester' => self::PERM_LOGGED,
 			'studiensemesterDateInterval' => self::PERM_LOGGED,
 			'getLvPlanForStudiensemester' => self::PERM_LOGGED,
@@ -51,100 +53,95 @@ class LvPlan extends FHCAPI_Controller
 		));
 
         $this->load->library('form_validation');
-
-		//load models
-		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-		$this->load->model('ressource/Reservierung_model', 'ReservierungModel');
-
-
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
-	 /**
+	/**
      * fetches LvPlan and Moodle events together
      * @access public
      *
      */
-	public function LvPlanEvents(){
+	public function LvPlanEvents()
+	{
+		$hasLv = $this->input->post('lv_id');
+
+		return $hasLv ? $this->eventsLv() : $this->eventsPersonal();
+	}
+
+	/**
+	 * fetches LvPlan, Moodle and Ferien events together for the logged in user
+	 *
+	 * @access public
+	 */
+	public function eventsPersonal()
+	{
 		$this->load->library('StundenplanLib');
 
 		// form validation
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
 		$this->form_validation->set_rules('start_date', "start_date", "required");
 		$this->form_validation->set_rules('end_date', "end_date", "required");
-		if ($this->form_validation->run() === FALSE)
+		
+		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
-		// storing the get parameter in local variables
-		$start_date = $this->input->get('start_date', TRUE);
-		$end_date = $this->input->get('end_date', TRUE);
-		$lv_id = $this->input->get('lv_id', TRUE);
+		// storing the post parameter in local variables
+		$start_date = $this->input->post('start_date', true);
+		$end_date = $this->input->post('end_date', true);
 
-		$res_lvplan_events = $this->stundenplanlib->getStundenplan($start_date,$end_date,$lv_id);
-		$lvplan_events = $this->getDataOrTerminateWithError($res_lvplan_events);
-		if( is_null($lvplan_events) || isEmptyArray($lvplan_events) )
-		{
-			$lvplan_events = array();
-		}
+		// fetching lvplan events
+		$result = $this->stundenplanlib->getEventsUser($start_date, $end_date);
+		$lvplanEvents = $this->getDataOrTerminateWithError($result);
 
 		// fetching moodle events
-		$this->load->config('calendar');
-		$tz = new DateTimeZone($this->config->item('timezone'));
-		$start = new DateTime($start_date);
-		$start->setTimezone($tz);
-		$end = new DateTime($end_date);
-		$end->setTimezone($tz);
-		$end->modify('+1 day -1 second');
-		$moodle_events = [];
-		Events::trigger(
-			'moodleCalendarEvents',
-			function & () use (&$moodle_events) {
-				return $moodle_events;
-			},
-			[
-				'start_date' => $start->format('c'),
-				'end_date' => $end->format('c'),
-				'username' => getAuthUID()
-			]
-		);
+		$moodleEvents = $this->fetchMoodleEvents($start_date, $end_date);
 
-		$lvAndMoodleEvents = array_merge($lvplan_events,$moodle_events);
+		// fetching ferien events
+		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
+		
 
-		$this->load->model('education/Studentlehrverband_model','StudentLehrverbandModel');
-		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
-		$current_Studiensemester = $this->StudiensemesterModel->getByDate($start_date);
-		$current_Studiensemester = $this->getDataOrTerminateWithError($current_Studiensemester);
-		$current_Studiensemester = current($current_Studiensemester)->studiensemester_kurzbz;
-		$studiengang = $this->StudentLehrverbandModel->loadWhere(["student_uid"=>getAuthUID(),"studiensemester_kurzbz"=>$current_Studiensemester]);
-		$studiengang = $this->getDataOrTerminateWithError($studiengang);
-		if(!empty($studiengang)){
-			$studiengang = current($studiengang)->studiengang_kz;
-		}else{
-			$studiengang = 0;
-		}
+		$this->terminateWithSuccess(array_merge(
+			$lvplanEvents,
+			$moodleEvents,
+			$ferienEvents
+		));
+	}
 
-		$ferienEvents = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $studiengang);
-		$ferienEvents = $this->getDataOrTerminateWithError($ferienEvents);
-		$allEvents = array_merge($lvAndMoodleEvents,$ferienEvents);
-		// sort array with moodle events first
-		usort($lvAndMoodleEvents, function($a, $b){
-			if ($a->type === 'moodle' && $b->type !== 'moodle') {
-				return -1;
-			} elseif ($a->type !== 'moodle' && $b->type === 'moodle') {
-				return 1;
-			} elseif ($a->type === 'ferien' && ($b->type !== 'moodle' && $b->type !== 'ferien')) {
-				return -1;
-			} elseif (($a->type !== 'ferien' && $a->type !== 'moodle') && $b->type === 'ferien') {
-				return 1;
-			} else {
-				return 0;
-			}
-		});
+	/**
+	 * fetches LvPlan and Ferien events together for the lv
+	 *
+	 * @access public
+	 */
+	public function eventsLv()
+	{
+		$this->load->library('StundenplanLib');
 
-		$this->terminateWithSuccess($allEvents);
+		// form validation
+		$this->form_validation->set_rules('start_date', "start_date", "required");
+		$this->form_validation->set_rules('end_date', "end_date", "required");
+		$this->form_validation->set_rules('lv_id', "lv_id", "required|integer");
+		
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		// storing the post parameter in local variables
+		$start_date = $this->input->post('start_date', true);
+		$end_date = $this->input->post('end_date', true);
+		$lv_id = $this->input->post('lv_id', true);
+
+		// fetching lvplan events
+		$result = $this->stundenplanlib->getEventsLv($lv_id, $start_date, $end_date);
+		$lvplanEvents = $this->getDataOrTerminateWithError($result);
+
+		// fetching ferien events
+		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
+		
+
+		$this->terminateWithSuccess(array_merge(
+			$lvplanEvents,
+			$ferienEvents
+		));
 	}
 
 	//TODO: delete this function if we don't use the old calendar export endpoints anymore
@@ -193,9 +190,6 @@ class LvPlan extends FHCAPI_Controller
 	 */
 	public function getRoomplan()
 	{
-		// form validation
-		$this->load->library('form_validation');
-
 		$this->form_validation->set_rules('ort_kurzbz', "Ort", "required");
 		$this->form_validation->set_rules('start_date', "start_date", "required");
 		$this->form_validation->set_rules('end_date', "end_date", "required");
@@ -228,9 +222,6 @@ class LvPlan extends FHCAPI_Controller
 	 */
 	public function getReservierungen($ort_kurzbz = null)
 	{
-		//form validation
-		$this->load->library('form_validation');
-		
 		$this->form_validation->set_rules('start_date', "StartDate", "required");
 		$this->form_validation->set_rules('end_date', "EndDate", "required");
 		
@@ -259,6 +250,77 @@ class LvPlan extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
-	
+	/**
+	 * fetch moodle events
+	 *
+	 * @param string		$start_date
+	 * @param string		$end_date
+	 * @return array
+	 */
+	private function fetchMoodleEvents($start_date, $end_date)
+	{
+		$this->load->config('calendar');
 
+		$tz = new DateTimeZone($this->config->item('timezone'));
+		
+		$start = new DateTime($start_date);
+		$start->setTimezone($tz);
+		
+		$end = new DateTime($end_date);
+		$end->setTimezone($tz);
+		$end->modify('+1 day -1 second');
+		
+		$moodle_events = [];
+		
+		Events::trigger(
+			'moodleCalendarEvents',
+			function & () use (&$moodle_events) {
+				return $moodle_events;
+			},
+			[
+				'start_date' => $start->format('c'),
+				'end_date' => $end->format('c'),
+				'username' => getAuthUID()
+			]
+		);
+
+		return $moodle_events;
+	}
+
+	/**
+	 * fetch ferien events
+	 *
+	 * @param string		$start_date
+	 * @param string		$end_date
+	 * @return array
+	 */
+	private function fetchFerienEvents($start_date, $end_date)
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->load->model('education/Studentlehrverband_model', 'StudentLehrverbandModel');
+
+		$currentStudiensemester = $this->StudiensemesterModel->getByDate($start_date);
+		$currentStudiensemester = $this->getDataOrTerminateWithError($currentStudiensemester);
+		
+		if ($currentStudiensemester) {
+			$studentsemester_kurzbz = current($currentStudiensemester)->studiensemester_kurzbz;
+
+			$studiengang = $this->StudentLehrverbandModel->loadWhere([
+				"student_uid" => getAuthUID(),
+				"studiensemester_kurzbz" => $studentsemester_kurzbz
+			]);
+			$studiengang = $this->getDataOrTerminateWithError($studiengang);
+			
+			if ($studiengang)
+				$studiengang_kz = current($studiengang)->studiengang_kz;
+			else
+				$studiengang_kz = 0;
+		} else {
+			$studiengang_kz = 0;
+		}
+
+		$ferienEvents = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $studiengang_kz);
+		
+		return $this->getDataOrTerminateWithError($ferienEvents);
+	}
 }
diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index 488fff45a..6d53a2e2e 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -8,125 +8,177 @@ use \DateTimeZone as DateTimeZone;
 use \DateInterval as DateInterval;
 use \DatePeriod as DatePeriod;
 
-class StundenplanLib{
+class StundenplanLib
+{
 
 	private $_ci; // Code igniter instance
 	
 
 	/**
-	 * fetches Stundenplan events from a UID and start/end date
-	 * @access public
+	 * fetches Stundenplan events for the loggedin user between start and end
+	 * or for a lv
 	 *
+	 * @param string		$start
+	 * @param string		$end
+	 * @param string|null	$lehrveranstaltung_id
+	 * @return stdClass
+	 * @access public
 	 */
-	public function getStundenplan($start_date, $end_date, $lv_id = null){
+	public function getStundenplan($start, $end, $lehrveranstaltung_id = null)
+	{
+		if (!$lehrveranstaltung_id && $lehrveranstaltung_id !== 0)
+			return $this->getEventsUser($start, $end);
+
+		return $this->getEventsLv($lehrveranstaltung_id, $start, $end);
+	}
+
+	/**
+	 * fetches Stundenplan events for the loggedin user between start and end
+	 *
+	 * @param string		$start
+	 * @param string		$end
+	 * @return stdClass
+	 * @access public
+	 */
+	public function getEventsUser($start, $end)
+	{
 		$this->_ci =& get_instance();
 
-		// Load Config
-		$this->_ci->load->config('calendar');
+		$this->_ci->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
-		$this->_ci->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
-		$this->_ci->load->model('organisation/Studiensemester_model','StudiensemesterModel');
-		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
-		$this->_ci->load->model('person/Benutzergruppe_model','BenutzergruppeModel');
-		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-		
-
-		$student_uid = getAuthUID();
-		if(is_null($student_uid))
-		{
+		$uid = getAuthUID();
+		if (is_null($uid))
 			return error("No UID");
-		}
 		
-		$semester_range = $this->studienSemesterErmitteln($start_date,$end_date);
-		if(isError($semester_range))
-		{
-			return error(getData($semester_range));
-		}
+		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter($uid));
+
+		if ($is_mitarbeiter)
+			return $this->getEventsEmployee($uid, $start, $end);
+
+		return $this->getEventsStudent($uid, $start, $end);
+	}
+
+	/**
+	 * fetches Stundenplan events for a student between start and end
+	 *
+	 * @param string		$student_uid
+	 * @param string		$start
+	 * @param string		$end
+	 * @return stdClass
+	 * @access public
+	 */
+	public function getEventsStudent($student_uid, $start, $end)
+	{
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		$semester_range = $this->studienSemesterErmitteln($start, $end);
+		if (isError($semester_range))
+			return $semester_range;
 		$semester_range = getData($semester_range);
+
 		$this->sortStudienSemester($semester_range);
+
 		$function_error = $this->applyLoadUeberSemesterHaelfte($semester_range);
-		if(!is_null($function_error)){
+		if ($function_error)
 			return $function_error;
-		}
 		
-		if($lv_id) { // fetch Stundenplan for lva, irrelevant of who is requesting it (for now)
+		// getting the gruppen_kurzbz of the student in the different studiensemester
+		$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($student_uid, $semester_range);
+		if (isError($benutzer_gruppen))
+			return $benutzer_gruppen;
+		$benutzer_gruppen = getData($benutzer_gruppen);
 
-			$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanLVA($start_date, $end_date, $lv_id);
-			if(isError($stundenplan_data))
-			{
-				return error(getData($stundenplan_data));
-			}
-			$stundenplan_data = getData($stundenplan_data) ?? [];
-			$function_error = $this->expand_object_information($stundenplan_data);
-			if(!is_null($function_error)){
-				return $function_error;
-			}
-
-			// query lv itself in case its Stundenplan is being queried and it has no entries
-			$this->_ci->load->model('education/Lehrveranstaltung_model','LehrveranstaltungModel');
-			$lv_result = $this->_ci->LehrveranstaltungModel->load($lv_id);
-			if(isError($lv_result))
-			{
-				return error(getData($lv_result));
-			}
-			$lv = getData($lv_result)[0];
-			return success($stundenplan_data);
-		}
+		// getting the student_lehrverbaende of the student in the different studiensemester
+		$student_lehrverband = $this->fetchStudentlehrverbandFromStudiensemester($student_uid, $semester_range);
+		if (isError($student_lehrverband))
+			return $student_lehrverband;
+		$student_lehrverband = getData($student_lehrverband);
 		
-		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter($student_uid));
-		if($is_mitarbeiter)
-		{
-			
-			$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanMitarbeiter($start_date, $end_date, $student_uid);
-			if(isError($stundenplan_data))
-			{
-				return error(getData($stundenplan_data));
-			}
-			$stundenplan_data = getData($stundenplan_data) ?? [];
-			$function_error = $this->expand_object_information($stundenplan_data);
-			if(!is_null($function_error)){
-				return error($function_error);
-			}
-			return success($stundenplan_data);
-		} else {
-			// getting the gruppen_kurzbz of the student in the different studiensemester
-			$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($semester_range);
-			if(isError($benutzer_gruppen))
-			{
-				return error(getData($benutzer_gruppen));
-			}
-			$benutzer_gruppen = getData($benutzer_gruppen);
-
-			// getting the student_lehrverbaende of the student in the different studiensemester
-			$student_lehrverband = $this->fetchStudentlehrverbandFromStudiensemester($semester_range);
-			if(isError($student_lehrverband))
-			{
-				return error(getData($student_lehrverband));
-			}
-			$student_lehrverband = getData($student_lehrverband);
-			
-			$stundenplan_query = $this->_ci->StundenplanModel->getStundenplanQuery($start_date, $end_date, $semester_range, $benutzer_gruppen, $student_lehrverband);
-			if(!$stundenplan_query)
-			{
-				return success([]);
-			}
-			
-			
-			$stundenplan_data = $this->_ci->StundenplanModel->stundenplanGruppierung($stundenplan_query);
-			if(isError($stundenplan_data))
-			{
-				return error(getData($stundenplan_data));
-			}
-			$stundenplan_data = getData($stundenplan_data) ?? [];
-
-			$function_error = $this->expand_object_information($stundenplan_data);
-			if(!is_null($function_error)){
-				return $function_error;
-			}
-			
-			return success($stundenplan_data);
-		}
+		$stundenplan_query = $this->_ci->StundenplanModel->getStundenplanQuery(
+			$start,
+			$end,
+			$semester_range,
+			$benutzer_gruppen,
+			$student_lehrverband
+		);
+		if (!$stundenplan_query)
+			return success([]);
 		
+		$stundenplan_data = $this->_ci->StundenplanModel->stundenplanGruppierung($stundenplan_query);
+		if (isError($stundenplan_data))
+			return $stundenplan_data;
+		$stundenplan_data = getData($stundenplan_data) ?? [];
+
+		$function_error = $this->expandObjectInformation($stundenplan_data);
+		if ($function_error)
+			return $function_error;
+		
+		return success($stundenplan_data);
+	}
+
+	/**
+	 * fetches Stundenplan events for an employee between start and end
+	 *
+	 * @param string		$uid
+	 * @param string		$start
+	 * @param string		$end
+	 * @return stdClass
+	 * @access public
+	 */
+	public function getEventsEmployee($uid, $start, $end)
+	{
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanMitarbeiter($start, $end, $uid);
+		if (isError($stundenplan_data))
+			return $stundenplan_data;
+		$stundenplan_data = getData($stundenplan_data) ?? [];
+
+		$function_error = $this->expandObjectInformation($stundenplan_data);
+		if ($function_error)
+			return $function_error;
+		
+		return success($stundenplan_data);
+	}
+
+	/**
+	 * fetches Stundenplan events for a LV between start and end
+	 *
+	 * @param integer		$lehrveranstaltung_id
+	 * @param string		$start
+	 * @param string		$end
+	 * @return stdClass
+	 * @access public
+	 */
+	public function getEventsLv($lehrveranstaltung_id, $start, $end)
+	{
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanLVA($start, $end, $lehrveranstaltung_id);
+		if (isError($stundenplan_data))
+			return $stundenplan_data;
+		$stundenplan_data = getData($stundenplan_data) ?? [];
+
+		$function_error = $this->expandObjectInformation($stundenplan_data);
+		if ($function_error)
+			return $function_error;
+
+		// query lv itself in case its Stundenplan is being queried and it has no entries
+		$this->_ci->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+		$lv_result = $this->_ci->LehrveranstaltungModel->load($lehrveranstaltung_id);
+		if (isError($lv_result))
+			return $lv_result;
+		if (!hasData($lv_result))
+			return error('LV not found');
+		
+		return success($stundenplan_data);
 	}
 
 	/**
@@ -152,7 +204,7 @@ class StundenplanLib{
 		if (isError($roomplan_data))
 			return $roomplan_data;
 
-		$this->expand_object_information($roomplan_data->retval);
+		$this->expandObjectInformation($roomplan_data->retval);
 
 		return $roomplan_data;
 	}
@@ -173,6 +225,8 @@ class StundenplanLib{
 		$this->_ci->load->config('calendar');
 		// Load Models
 		$this->_ci->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 
 		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter(getAuthUID()));
 		
@@ -186,7 +240,7 @@ class StundenplanLib{
 		if (isError($reservierungen))
 			return $reservierungen;
 		
-		$function_error = $this->expand_object_information($reservierungen->retval);
+		$function_error = $this->expandObjectInformation($reservierungen->retval);
 		
 		if (!is_null($function_error))
 			return $function_error;
@@ -228,9 +282,15 @@ class StundenplanLib{
 		return success($lektoren);
 	}
 
-	public function expand_object_information($data){
+	public function expandObjectInformation($data)
+	{
 		$this->_ci =& get_instance();
 		
+		// Load Config
+		$this->_ci->load->config('calendar');
+		// Load Model
+		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
 		foreach ($data as $item)
 		{
 			$tz = new DateTimeZone($this->_ci->config->item('timezone'));
@@ -324,69 +384,64 @@ class StundenplanLib{
 		$ferienEvents = $this->_ci->FerienModel->execReadOnlyQuery("
 		SELECT * 
 		FROM lehre.tbl_ferien
-		WHERE (bisdatum >= ? AND vondatum <= ?) AND (studiengang_kz = 0 OR studiengang_kz = ?)
-		",[$start_date, $end_date, $studiengang_kz]);
+		WHERE (bisdatum >= ? AND vondatum < ?) AND (studiengang_kz = 0 OR studiengang_kz = ?)
+		", [$start_date, $end_date, $studiengang_kz]);
 
-		if (isError($ferienEvents)) {
-			return error(getData($ferienEvents));
-		}
+		if (isError($ferienEvents))
+			return $ferienEvents;
+		
 		$ferienEvents = getData($ferienEvents);
-		
-		if(is_array($ferienEvents) && count($ferienEvents) > 0){
-			
-			$ferienEvents = array_map(function($event){
-				$event_start = new DateTime($event->vondatum);
-				$event_end = new DateTime($event->bisdatum);
-				$event_end->modify('+1 day');
-	
-				$interval = new DateInterval('P1D');
-				$period = new DatePeriod($event_start, $interval, $event_end);
-				$event->dates = iterator_to_array($period);
-				return $event;
-			}, $ferienEvents);
-	
-			$start_date = new DateTime($start_date);
-			$start_date->setTime(0, 0, 0);
-			$end_date = new DateTime($end_date);
-			$end_date->setTime(23, 59, 59);
 
-			$ferienEventsFlattened=[];
-			foreach($ferienEvents as $ferien_event){
-				foreach($ferien_event->dates as $date){
-					if ($date < $start_date || $date > $end_date)
-						continue;
-					$event = new stdClass();
-					$event->bezeichnung = $ferien_event->bezeichnung;
-					$event->datum = $date->format('Y-m-d');
-					$event->type = 'ferien';
-					$ferienEventsFlattened[] = $event;
-				}
-			};
-	
-			$today=new DateTime();
-			$ferienEventsFlattened = array_map(function($event) use($today, $tz){
-				$ferien_event = (object) array(
-					'type' => 'ferien',
-					'beginn' => $today->format('H:i:s'),
-					'ende' => $today->format('H:i:s'),
-					'isostart' => (new DateTime($event->datum . ' 00:00:00', $tz))->format('c'),
-					'isoend' => (new DateTime($event->datum . ' 23:59:59', $tz))->format('c'),
-					'allDayEvent' => true,
-					'datum' => $event->datum,
-					'topic' => $event->bezeichnung,
-					'titel' => $event->bezeichnung,
-					'farbe' => '00689E'
-				);
-				return $ferien_event;
-			}, $ferienEventsFlattened);
-			
-			return success($ferienEventsFlattened);
-		}
-		else{
+		if (!$ferienEvents)
 			return success([]);
-		}
-
 		
+		$ferienEvents = array_map(function ($event) {
+			$event_start = new DateTime($event->vondatum);
+			$event_end = new DateTime($event->bisdatum);
+			$event_end->modify('+1 day');
+
+			$interval = new DateInterval('P1D');
+			$period = new DatePeriod($event_start, $interval, $event_end);
+			$event->dates = iterator_to_array($period);
+			return $event;
+		}, $ferienEvents);
+
+		$start_date = new DateTime($start_date);
+		$start_date->setTime(0, 0, 0);
+		$end_date = new DateTime($end_date);
+		$end_date->setTime(23, 59, 59);
+
+		$ferienEventsFlattened = [];
+		foreach ($ferienEvents as $ferien_event) {
+			foreach ($ferien_event->dates as $date) {
+				if ($date < $start_date || $date > $end_date)
+					continue;
+				$event = new stdClass();
+				$event->bezeichnung = $ferien_event->bezeichnung;
+				$event->datum = $date->format('Y-m-d');
+				$event->type = 'ferien';
+				$ferienEventsFlattened[] = $event;
+			}
+		};
+
+		$today = new DateTime();
+		$ferienEventsFlattened = array_map(function ($event) use ($today, $tz) {
+			$ferien_event = (object)array(
+				'type' => 'ferien',
+				'beginn' => $today->format('H:i:s'),
+				'ende' => $today->format('H:i:s'),
+				'isostart' => (new DateTime($event->datum . ' 00:00:00', $tz))->format('c'),
+				'isoend' => (new DateTime($event->datum . ' 23:59:59', $tz))->format('c'),
+				'allDayEvent' => true,
+				'datum' => $event->datum,
+				'topic' => $event->bezeichnung,
+				'titel' => $event->bezeichnung,
+				'farbe' => '00689E'
+			);
+			return $ferien_event;
+		}, $ferienEventsFlattened);
+		
+		return success($ferienEventsFlattened);
 	}
 
 	// start of the private functions ########################################################################################################
@@ -437,8 +492,10 @@ class StundenplanLib{
 
 	
 
-	private function fetchBenutzerGruppenFromStudiensemester($semester_range){
-		$student_uid = getAuthUID();
+	private function fetchBenutzerGruppenFromStudiensemester($student_uid, $semester_range)
+	{
+		$this->_ci->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
+
 		$benutzer_gruppen = [];
 		// for each studiensemester fetch the benutzer gruppen and add them to an associate $bentuzer_gruppen array
 		/*
@@ -499,8 +556,10 @@ class StundenplanLib{
 		return success($benutzer_gruppen);
 	}
 
-	private function fetchStudentlehrverbandFromStudiensemester($semester_range){
-		$student_uid = getAuthUID();
+	private function fetchStudentlehrverbandFromStudiensemester($student_uid, $semester_range)
+	{
+		$this->_ci->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
+
 		$student_lehrverband = [];
 		// for each studiensemester fetch the studentlehrverbaende and add them to an associate $student_lehrverband array
 		/*
@@ -566,7 +625,10 @@ class StundenplanLib{
 		return success($student_lehrverband);
 	}
 
-	private function applyLoadUeberSemesterHaelfte(&$semester_range){
+	private function applyLoadUeberSemesterHaelfte(&$semester_range)
+	{
+		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
 		/*
 		@var($semester_collection)
 		convert the array of studiensemester into an associative array with the studiensemester as the key 
@@ -692,30 +754,29 @@ class StundenplanLib{
 		}
 	}
 
-	private function studienSemesterErmitteln($start_date,$end_date){
-		
+	private function studienSemesterErmitteln($start_date, $end_date)
+	{
+		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
 		// gets all studiensemester from the student from start_date to end_date
-		$semester_range = $this->_ci->StudiensemesterModel->getByDateRange($start_date,$end_date);
-		if(isError($semester_range))
-		{
-			return error(getData($semester_range));
-		}
-		$semester_range = array_map( 
-			function($sem)
-			{
+		$semester_range = $this->_ci->StudiensemesterModel->getByDateRange($start_date, $end_date);
+		if (isError($semester_range))
+			return $semester_range;
+		
+		$semester_range = array_map(
+			function ($sem) {
 				return $sem->studiensemester_kurzbz;
 			},
 			getData($semester_range) ?: []
 		);
 
 		// if no studiensemester is found for the given timespan, get the nearest studiensemester
-		if(count($semester_range) == 0)
+		if (count($semester_range) == 0)
 		{
 			$aktuelle_studiensemester = $this->_ci->StudiensemesterModel->getNearest();
-			if(isError($aktuelle_studiensemester))
-			{
-				return error(getData($aktuelle_studiensemester));
-			}
+			if (isError($aktuelle_studiensemester))
+				return $aktuelle_studiensemester;
+			
 			$aktuelle_studiensemester = getData($aktuelle_studiensemester);
 			if (count($aktuelle_studiensemester) == 0) {
 				return error("No aktuelles semester");
@@ -723,8 +784,8 @@ class StundenplanLib{
 			$aktuelle_studiensemester = current($aktuelle_studiensemester)->studiensemester_kurzbz;
 			// push aktuelles semester in active semester array
 			array_push($semester_range, $aktuelle_studiensemester);
-
 		}
+
 		return success($semester_range);
 	}
 }
diff --git a/public/js/api/factory/lvPlan.js b/public/js/api/factory/lvPlan.js
index 99f7961f6..87e74cff5 100644
--- a/public/js/api/factory/lvPlan.js
+++ b/public/js/api/factory/lvPlan.js
@@ -30,8 +30,21 @@ export default {
 			params: { start_date, end_date, lv_id }
 		};
 	},
+	eventsPersonal(start_date, end_date) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/lvPlan/eventsPersonal',
+			params: { start_date, end_date }
+		};
+	},
+	eventsLv(lv_id, start_date, end_date) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/lvPlan/eventsLv',
+			params: { lv_id, start_date, end_date }
+		};
+	},
 	getStunden() {
-		// TODO(chris): seems to be called from nowhere?
 		return {
 			method: 'get',
 			url: '/api/frontend/v1/LvPlan/Stunden'
@@ -65,7 +78,7 @@ export default {
 	},
 	LvPlanEvents(start_date, end_date, lv_id) {
 		return {
-			method: 'get',
+			method: 'post',
 			url: '/api/frontend/v1/LvPlan/LvPlanEvents',
 			params: { 
 				start_date: start_date, 

From 4a692043843a40b69915c1962729970950020676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 4 Aug 2025 15:53:22 +0200
Subject: [PATCH 510/572] Bugfix for Firefox ESR 128 Bug where Reduce Function
 is not always available

---
 public/js/components/Calendar/Base/Grid.js | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Calendar/Base/Grid.js b/public/js/components/Calendar/Base/Grid.js
index ad0d9ec51..da160ff5c 100644
--- a/public/js/components/Calendar/Base/Grid.js
+++ b/public/js/components/Calendar/Base/Grid.js
@@ -35,7 +35,7 @@ export default {
 			type: Array,
 			required: true,
 			validator(value) {
-				return value.every(item => 
+				return value.every(item =>
 					item instanceof luxon.Duration
 					|| Number.isInteger(item)
 					|| (
@@ -124,7 +124,7 @@ export default {
 			for (var date of this.axisMain)
 				for (var part of partsEnds)
 					ends.push(date.plus(part));
-			
+
 			return ends;
 		},
 		axisMainBorders() {
@@ -212,7 +212,7 @@ export default {
 	methods: {
 		mapIntoMainAxis(target) {
 			const result = Array.from({length: this.axisMain.length}, () => Array());
-			
+
 			target.forEach(event => {
 				const start = event.start || this.axisMainBorders[0].plus(-1);
 				const end = event.end || this.axisMainBorders[this.axisMainBorders.length - 1].plus(1);
@@ -264,13 +264,13 @@ export default {
 
 			return dayTimestamp + this.start + Math.floor((this.end - this.start) * mouseFrac);
 		},
-		
+
 		/* SCROLLING */
 		enableAutoScroll() {
 			if (!this.resizeObserver)
 				this.resizeObserver = new ResizeObserver(this.scrollToEarliestEvent);
 			this.resizeObserver.observe(this.$refs.body);
-			
+
 			if (!this.mutationObserver)
 				this.mutationObserver = new MutationObserver(mutations => {
 					if (mutations.some(m => m.addedNodes.length && [].some.call(m.addedNodes, el => el.matches && el.matches('.fhc-calendar-base-grid-line-event'))))
@@ -294,14 +294,22 @@ export default {
 		},
 		scrollToEarliestEvent() {
 			const eventElements = this.$refs.scroller.querySelectorAll('.fhc-calendar-base-grid-line-event');
-			const earliestEventOffset = eventElements.values()
+			let elements = [];
+
+			// Firefox ESR 128 Workaround ArrayIterator Reduce not available
+			if (typeof eventElements.values().reduce == 'function')
+				elements = eventElements.values();
+			else
+				elements = [...eventElements.values()];
+
+			const earliestEventOffset = elements
 				.reduce((res, el) => {
 					const top = el.offsetTop;
 					if (!res[1] || top < res[0])
 						return [top, el];
 					return res;
 				}, [0, null]);
-			
+
 			this.userScroll = false;
 			if (earliestEventOffset[1]) {
 				earliestEventOffset[1].scrollIntoView({ behavior: "smooth" });

From e9807a210bbcab91dad1dae022b8041c52d10fc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 4 Aug 2025 16:00:53 +0200
Subject: [PATCH 511/572] Removed Error Logs

---
 rdf/reihungstest.rdf.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/rdf/reihungstest.rdf.php b/rdf/reihungstest.rdf.php
index 15860d025..cb4ebf8dc 100644
--- a/rdf/reihungstest.rdf.php
+++ b/rdf/reihungstest.rdf.php
@@ -73,23 +73,18 @@ $rt = new reihungstest();
 
 if(isset($_GET['include_id']) && isset($_GET['studiengang_kz']))
 {
-	error_log("in zweig get zukuenfigte");
 	$include_id=$_GET['include_id'];
-	error_log("include_Id:" . $include_id);
 	$studiengang_kz=$_GET['studiengang_kz'];
-	error_log(" stg_kz: " . $studiengang_kz);
 	$rt->getZukuenftige($include_id, $studiengang_kz);
 }
 elseif(isset($_GET['prestudent_id']))
 {
 	$include_ids=array();
-	error_log("prestudent");
 	$prestudent = new prestudent();
 	$prestudent->getPrestudentRolle($_GET['prestudent_id'], 'Interessent');
 	$studienplan_arr = array();
 	foreach($prestudent->result as $row)
 	{
-		error_log( $row->studienplan_id);
 		$studienplan_arr[] = $row->studienplan_id;
 	}
 

From cc91fe7588e1325fc7c6287aebd4655c03e11c8c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 4 Aug 2025 16:17:38 +0200
Subject: [PATCH 512/572] searchcis only students and employees with active
 useraccount

---
 application/config/searchcis.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/application/config/searchcis.php b/application/config/searchcis.php
index ce385338f..8546d3ee9 100644
--- a/application/config/searchcis.php
+++ b/application/config/searchcis.php
@@ -7,6 +7,15 @@ $CI =& get_instance();
 
 
 $config['employee'] = $CI->config->item('employee', 'search');
+$config['employee']['resultjoin'] = "
+		JOIN public.tbl_mitarbeiter m USING (mitarbeiter_uid)
+		JOIN public.tbl_benutzer b ON (b.uid = m.mitarbeiter_uid AND b.aktiv = true)
+		JOIN public.tbl_person p USING(person_id)
+		LEFT JOIN (
+			SELECT kontakt, standort_id
+			FROM public.tbl_kontakt
+			WHERE kontakttyp = 'telefon'
+		) k ON (k.standort_id = m.standort_id)";
 
 $config['student'] = $CI->config->item('student', 'search');
 unset($config['student']['searchfields']['email']);
@@ -23,6 +32,10 @@ $config['student']['resultfields'] = [
 		AS photo_url",
 	"b.aktiv"
 ];
+$config['student']['resultjoin'] = "
+		JOIN public.tbl_student s USING (student_uid)
+		JOIN public.tbl_benutzer b ON(b.uid = s.student_uid AND b.aktiv = true)
+		JOIN public.tbl_person p USING(person_id)";
 
 $config['organisationunit'] = $CI->config->item('organisationunit', 'search');
 $config['organisationunit']['prepare'] = 'active_organisationseinheit AS (SELECT * FROM public.tbl_organisationseinheit WHERE aktiv = true)';

From cba5b39e293f5e97f3aad242e0bc8f1b0abcf3e4 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 4 Aug 2025 16:28:31 +0200
Subject: [PATCH 513/572] searchcis do not search for
 organisationeinheittyp_kurzbz Container

---
 application/config/searchcis.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/config/searchcis.php b/application/config/searchcis.php
index 8546d3ee9..e3d1e2213 100644
--- a/application/config/searchcis.php
+++ b/application/config/searchcis.php
@@ -38,7 +38,7 @@ $config['student']['resultjoin'] = "
 		JOIN public.tbl_person p USING(person_id)";
 
 $config['organisationunit'] = $CI->config->item('organisationunit', 'search');
-$config['organisationunit']['prepare'] = 'active_organisationseinheit AS (SELECT * FROM public.tbl_organisationseinheit WHERE aktiv = true)';
+$config['organisationunit']['prepare'] = 'active_organisationseinheit AS (SELECT * FROM public.tbl_organisationseinheit WHERE aktiv = true AND organisationseinheittyp_kurzbz <> \'Container\')';
 $config['organisationunit']['table'] = 'active_organisationseinheit';
 
 $config['room'] = $CI->config->item('room', 'search');

From 0516fa2ff55ec13e2352d5660062a7d1035188fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 4 Aug 2025 17:19:44 +0200
Subject: [PATCH 514/572] Alert CSS fixed, Legacy Icons aus Alerts entfernt

---
 public/js/DialogLib.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/public/js/DialogLib.js b/public/js/DialogLib.js
index f594ae67c..9a4f179c6 100644
--- a/public/js/DialogLib.js
+++ b/public/js/DialogLib.js
@@ -95,10 +95,9 @@ var FHC_DialogLib = {
 	 */
 	_displayDialog: function(heading, message, icon, colorClass)
 	{
-		var html = "<p class='dialogmessage'><i class='glyphicon glyphicon-"+icon+"'></i>&nbsp;&nbsp;"+message+"</p>";
+		var html = "<p class='dialogmessage'>"+message+"</p>";
 		FHC_DialogLib.alertDefault(heading, html);
-		$(".ui-dialog-titlebar").addClass(colorClass+" text-center");
-		$(".glyphicon-"+icon).addClass(colorClass);
+		$(".ui-dialog-titlebar").addClass(colorClass+" alert text-center");
 		FHC_DialogLib._formatShortDialog();
 	},
 
@@ -113,7 +112,6 @@ var FHC_DialogLib = {
 		$(".ui-dialog-buttonpane.ui-widget-content").css("padding", ".3em .4em .5em .4em");
 		$(".ui-dialog .ui-dialog-content").css("padding", "0");
 		$(".ui-dialog-buttonset button").css("margin", "0");
-		$(".dialogmessage i.glyphicon").css("background-color", "transparent");
 	}
 
 };

From b8de3110159f7759664be76ff00f722879e3e7b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 4 Aug 2025 17:33:52 +0200
Subject: [PATCH 515/572] Umlaute in Navigation Component gefixed

---
 application/config/navigation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/config/navigation.php b/application/config/navigation.php
index 2327513ad..5cbb6512c 100644
--- a/application/config/navigation.php
+++ b/application/config/navigation.php
@@ -93,7 +93,7 @@ $config['navigation_header'] = array(
 				),
 				'zverfueg' => array(
 					'link' => site_url('lehre/lvplanung/AdminZeitverfuegbarkeit'),
-					'description' => 'Zeitverf&uuml;gbarkeit',
+					'description' => 'Zeitverfügbarkeit',
 					'expand' => true,
 					'sort' => 45,
 					'requiredPermissions' => array(
@@ -325,4 +325,4 @@ $config['navigation_menu']['system/issues/Issues/*'] = array(
 		'target' => '_blank',
 		'requiredPermissions' => array('admin:rw')
 	),
-);
\ No newline at end of file
+);

From ecc7e4672f6b18cad801a9e9e53702c33173834f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 4 Aug 2025 17:34:19 +0200
Subject: [PATCH 516/572] Styling in Navigation Component korrigiert

---
 public/css/components/NavigationComponent.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/css/components/NavigationComponent.css b/public/css/components/NavigationComponent.css
index 4799e2f26..911470fe9 100644
--- a/public/css/components/NavigationComponent.css
+++ b/public/css/components/NavigationComponent.css
@@ -4,7 +4,7 @@
 
  :root{
 	--fhc-nav-component-bg: var(--fhc-tertiary, #f8f8f8);
-	--fhc-nav-component-border: var(--fhc-border, #5e5e5e);
+	--fhc-nav-component-border: var(--fhc-border, #e7e7e7);
 	--fhc-nav-component-color: var(--fhc-text, #5e5e5e);
 	--fhc-nav-left-component-border: var(--fhc-border, #e7e7e7);
 	--fhc-nav-left-component-bg: var(--fhc-tertiary, #f8f8f8);
@@ -99,4 +99,3 @@
 	margin: 0 0 0 250px;
 	padding: 30px 30px;
 }
-

From 459d445f2f564386b5eac722f711b99b83568191 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 5 Aug 2025 06:59:21 +0200
Subject: [PATCH 517/572] trigger search when searchfield gets focus a
 searchstr is there and the searchresult is empty

---
 public/js/components/searchbar/searchbar.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index f571b733b..9f255d607 100644
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -404,6 +404,10 @@ export default {
             if( this.hidetimer !== null ) {
                 clearTimeout(this.hidetimer);
             }
+			if (this.searchsettings.searchstr.length >= 2
+				&& this.searchresult.length === 0) {
+				this.search();
+			}
         },
         searchfocusout: function(e) {
             e.preventDefault();

From 52e05353121548e5af76fa02ba53c32af6fdf46a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 5 Aug 2025 07:21:09 +0200
Subject: [PATCH 518/572] use existing phrase

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

diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index 6878cefc2..3f66a5508 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -197,7 +197,7 @@ export const Raumsuche =  {
 		this.setupMounted()
 	},
 	template: `
-	<h1 class="h3">{{$p.t('lvplan/raumsuche')}}</h1>
+	<h1 class="h3">{{$p.t('rauminfo/roomSearch')}}</h1>
 	<hr>
 	<div class="row">
 		<div class="col-12 col-lg-2">

From 30cc798c0b97853b5a50a554ec79ec498fe896f3 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 5 Aug 2025 08:35:37 +0200
Subject: [PATCH 519/572] Endpoint to get lv details

---
 .../controllers/api/frontend/v1/LvPlan.php    | 36 +++++++++++++++++++
 public/js/api/factory/lvPlan.js               |  6 ++++
 2 files changed, 42 insertions(+)

diff --git a/application/controllers/api/frontend/v1/LvPlan.php b/application/controllers/api/frontend/v1/LvPlan.php
index b6c629fe1..3b6b55911 100644
--- a/application/controllers/api/frontend/v1/LvPlan.php
+++ b/application/controllers/api/frontend/v1/LvPlan.php
@@ -41,6 +41,7 @@ class LvPlan extends FHCAPI_Controller
 			'getLehreinheitStudiensemester' => self::PERM_LOGGED,
 			'studiensemesterDateInterval' => self::PERM_LOGGED,
 			'getLvPlanForStudiensemester' => self::PERM_LOGGED,
+			'getLv' => self::PERM_LOGGED
 		]);
 
         $this->load->library('LogLib');
@@ -250,6 +251,41 @@ class LvPlan extends FHCAPI_Controller
 		$this->terminateWithSuccess($result);
 	}
 
+	/**
+	 * get details for a lv
+	 * @access public
+	 *
+	 * @param integer		$lehrveranstaltung_id
+	 * @return void
+	 */
+	public function getLv($lehrveranstaltung_id)
+	{
+		if (!$lehrveranstaltung_id && $lehrveranstaltung_id !== 0 && $lehrveranstaltung_id !== '0')
+			return show_404();
+
+		// Load Phrases
+		$this->loadPhrases(['lehre']);
+
+		// Validation
+		$this->form_validation->set_data([
+			'lehrveranstaltung_id' => $lehrveranstaltung_id
+		]);
+
+		$this->form_validation->set_rules('lehrveranstaltung_id', $this->p->t('lehre', 'lehrveranstaltung_id'), 'integer');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		// Get Data
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+
+		$result = $this->LehrveranstaltungModel->load($lehrveranstaltung_id);
+
+		$result = $this->getDataOrTerminateWithError($result);
+
+		return $this->terminateWithSuccess(current($result));
+	}
+
 	/**
 	 * fetch moodle events
 	 *
diff --git a/public/js/api/factory/lvPlan.js b/public/js/api/factory/lvPlan.js
index 87e74cff5..0b179c9ba 100644
--- a/public/js/api/factory/lvPlan.js
+++ b/public/js/api/factory/lvPlan.js
@@ -87,4 +87,10 @@ export default {
 			}
 		};
 	},
+	getLv(lehrveranstaltung_id) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/LvPlan/getLv/' + lehrveranstaltung_id
+		};
+	}
 };
\ No newline at end of file

From 72bb465ecf2e111080ee0b91c7be2e3327e5f6cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 5 Aug 2025 09:25:34 +0200
Subject: [PATCH 520/572] Fixed Document Archive und Signature

---
 .../controllers/api/frontend/v1/Documents.php | 12 ++++-----
 application/libraries/DocumentExportLib.php   | 27 +++++++++++--------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Documents.php b/application/controllers/api/frontend/v1/Documents.php
index ebd1b269b..2d2c410cf 100644
--- a/application/controllers/api/frontend/v1/Documents.php
+++ b/application/controllers/api/frontend/v1/Documents.php
@@ -152,7 +152,7 @@ class Documents extends FHCAPI_Controller
 	 * @param string				$xml
 	 * @param string				$xsl
 	 * @param string				$sign_user (optional)
-	 * 
+	 *
 	 * @return array with Akte data and export data
 	 */
 	private function _getAkteExportData($xml, $xsl, $sign_user = null)
@@ -235,7 +235,7 @@ class Documents extends FHCAPI_Controller
 			$student = current($this->getDataOrTerminateWithError($result));
 
 			$ss = $this->input->post_get('ss');
-			
+
 			if ($ss !== null) {
 				$this->load->model('crm/prestudentstatus_model', 'PrestudentstatusModel');
 				$result = $this->PrestudentstatusModel->getLastStatus($student->prestudent_id, $ss);
@@ -334,7 +334,7 @@ class Documents extends FHCAPI_Controller
 				$this->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
 				$result = $this->PrestudentModel->load($prestudent_id);
 				$prestudent = current($this->getDataOrTerminateWithError($result));
-				
+
 				$studiengang_kz = $prestudent->studiengang_kz;
 				$akteData['person_id'] = $prestudent->person_id;
 				$akteData['titel'] = mb_substr($xsl . "_" . $prestudent->kuerzel, 0, 64);
@@ -380,7 +380,7 @@ class Documents extends FHCAPI_Controller
 			// TODO: was bedeutet wenn keine berechtigung?
 			if (!$access_rights || !$access_rights->berechtigung)
 				return show_404();
-			
+
 			$allowed = false;
 			foreach ($access_rights->berechtigung as $access_right) {
 				if ($this->permissionlib->isBerechtigt($access_right)) {
@@ -454,11 +454,11 @@ class Documents extends FHCAPI_Controller
 
 		if (!$vorlage->archivierbar)
 			$this->terminateWithError($this->p->t("stv", "grades_error_archive"));
-		
+
 		if ($sign_user && !$vorlage->signierbar)
 			$this->terminateWithError($this->p->t("stv", "grades_error_sign"));
 
-		
+
 		$this->load->library('DocumentExportLib');
 
 		// XML Data
diff --git a/application/libraries/DocumentExportLib.php b/application/libraries/DocumentExportLib.php
index 595ac461a..a75047cf9 100644
--- a/application/libraries/DocumentExportLib.php
+++ b/application/libraries/DocumentExportLib.php
@@ -55,7 +55,7 @@ use SimpleXMLElement as SimpleXMLElement;
  * $doc->create($outputformat);
  * $doc->output(true);
  * $doc->close();
- * 
+ *
  * New:
  * $xml_data = $this->documentexportlib->getDataXML($data);
  * $images = [[
@@ -397,20 +397,24 @@ class DocumentExportLib
 		$vorlage_stg = current(getData($result));
 		foreach ($vorlage_stg as $k => $v)
 			$vorlage->$k = $v;
-		
+
+		if ($sign_user)
+		{
+			$this->addSignToData($xml_data);
+		}
+
 		$result = $this->create($temp_folder, $outputformat, $vorlage, $xml_data, $images);
 		if (isError($result))
 			return $result;
-		
+
 		$temp_filename = getData($result);
 
-		if ($sign_user) {
-			$this->addSignToData($xml_data);
-
+		if ($sign_user)
+		{
 			$result = $this->sign($temp_folder, $temp_filename, $outputformat, $sign_user, $sign_profile);
 			if (isError($result))
 				return $result;
-			
+
 			$temp_filename = getData($result);
 		}
 
@@ -445,6 +449,7 @@ class DocumentExportLib
 		if ($xml_data->firstChild->tagName == 'error')
 			return error($xml_data->firstChild->textContent);
 
+		$styles_xsl = null;
 		// styles.xml erstellen
 		if ($vorlage->style) {
 			$styles_xsl = new DOMDocument();
@@ -461,7 +466,7 @@ class DocumentExportLib
 		// Template holen
 		$vorlage_found = false;
 		$vorlage_filename = $vorlage->vorlage_kurzbz . ($vorlage->mimetype == 'application/vnd.oasis.opendocument.spreadsheet' ? '.ods' : '.odt');
-		
+
 		$aktive_addons = array_filter(array_map('trim', explode(";", ACTIVE_ADDONS)));
 		foreach($aktive_addons as $addon) {
 			$zipfile = DOC_ROOT . 'addons/' . $addon . '/system/vorlage_zip/' . $vorlage_filename;
@@ -652,7 +657,7 @@ class DocumentExportLib
 		foreach ($files as $file)
 			if (is_file($file))
 				unlink($file);
-		
+
 		chdir($source_folder);
 		rmdir($temp_folder);
 	}
@@ -703,12 +708,12 @@ class DocumentExportLib
 	{
 		if ($outputformat)
 			return $outputformat;
-		
+
 		if ($mimetype == 'application/vnd.oasis.opendocument.spreadsheet')
 			return 'ods';
 		if ($mimetype == 'application/vnd.oasis.opendocument.text')
 			return 'odt';
-		
+
 		return 'pdf';
 	}
 }

From 8f44a8b33e68d257a5e4ec2d0a8a48c86e68d04f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 5 Aug 2025 09:31:20 +0200
Subject: [PATCH 521/572] use for-loop instead of reduce to get rid of Firefox
 ESR 128 Workaround

---
 public/js/components/Calendar/Base/Grid.js | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/public/js/components/Calendar/Base/Grid.js b/public/js/components/Calendar/Base/Grid.js
index da160ff5c..c232dd955 100644
--- a/public/js/components/Calendar/Base/Grid.js
+++ b/public/js/components/Calendar/Base/Grid.js
@@ -294,21 +294,13 @@ export default {
 		},
 		scrollToEarliestEvent() {
 			const eventElements = this.$refs.scroller.querySelectorAll('.fhc-calendar-base-grid-line-event');
-			let elements = [];
 
-			// Firefox ESR 128 Workaround ArrayIterator Reduce not available
-			if (typeof eventElements.values().reduce == 'function')
-				elements = eventElements.values();
-			else
-				elements = [...eventElements.values()];
-
-			const earliestEventOffset = elements
-				.reduce((res, el) => {
-					const top = el.offsetTop;
-					if (!res[1] || top < res[0])
-						return [top, el];
-					return res;
-				}, [0, null]);
+			let earliestEventOffset = [0, null];
+			for (var el of eventElements.values()) {
+				const top = el.offsetTop;
+				if (!earliestEventOffset[1] || top < earliestEventOffset[0])
+					earliestEventOffset = [top, el];
+			}
 
 			this.userScroll = false;
 			if (earliestEventOffset[1]) {

From 043c9fd5f39667769304ec55bc1946888d682b40 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 5 Aug 2025 09:33:11 +0200
Subject: [PATCH 522/572] split LvPlan into MyLvPlan (personal calendar) and
 LvPlan (lv calendar)

---
 application/config/routes.php                 |   1 +
 application/controllers/Cis/MyLvPlan.php      |  39 +++++
 public/js/apps/Dashboard/Fhc.js               |  55 +++----
 .../Cis/LvPlan/Lehrveranstaltung.js           |  96 ++++++++++++
 public/js/components/Cis/LvPlan/Personal.js   | 143 ++++++++++++++++++
 5 files changed, 298 insertions(+), 36 deletions(-)
 create mode 100644 application/controllers/Cis/MyLvPlan.php
 create mode 100644 public/js/components/Cis/LvPlan/Lehrveranstaltung.js
 create mode 100644 public/js/components/Cis/LvPlan/Personal.js

diff --git a/application/config/routes.php b/application/config/routes.php
index 798d29ad0..af6b563d3 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -62,6 +62,7 @@ $route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/b
 $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 
 $route['Cis/LvPlan/.*'] = 'Cis/LvPlan/index/$1';
+$route['Cis/MyLvPlan/.*'] = 'Cis/MyLvPlan/index/$1';
 
 // load routes from extensions
 $subdir = 'application/config/extensions';
diff --git a/application/controllers/Cis/MyLvPlan.php b/application/controllers/Cis/MyLvPlan.php
new file mode 100644
index 000000000..366ce8e65
--- /dev/null
+++ b/application/controllers/Cis/MyLvPlan.php
@@ -0,0 +1,39 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class MyLvPlan extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'index' => ['basis/cis:r']
+		]);
+
+		// Load Config
+		$this->load->config('calendar');
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+		
+		$viewData = array(
+			'uid'=>getAuthUID(),
+			'timezone' => $this->config->item('timezone')
+		);
+		
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'MyLvPlan']);
+	}
+}
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index 075a399d8..b3ffa4315 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -3,7 +3,8 @@ import PluginsPhrasen from '../../plugins/Phrasen.js';
 import Theme from '../../plugin/Theme.js';
 import contrast from '../../directives/contrast.js';
 import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers.js";
-import LvPlan, {DEFAULT_MODE_LVPLAN} from "../../components/Cis/LvPlan/LvPlan.js";
+import LvPlan from "../../components/Cis/LvPlan/Lehrveranstaltung.js";
+import MyLvPlan from "../../components/Cis/LvPlan/Personal.js";
 import MylvStudent from "../../components/Cis/Mylv/Student.js";
 import Profil from "../../components/Cis/Profil/Profil.js";
 import Raumsuche from "../../components/Cis/Raumsuche/Raumsuche.js";
@@ -154,10 +155,14 @@ const router = VueRouter.createRouter({
 			path: "/Cis/LvPlan/:lv_id(\\d+)", 
 			name: "LvPlanOld",
 			component: LvPlan,
-			redirect: (to) => {
+			redirect(to) {
+				const route = Vue.unref(router.currentRoute);
+				const { mode, focus_date } = route.params; // keep mode and focus_date if available
 				return { // redirect to longer LvPlan url and map params
 					name: "LvPlan",
 					params: {
+						mode,
+						focus_date,
 						lv_id: to.params.lv_id
 					},
 				};
@@ -167,42 +172,20 @@ const router = VueRouter.createRouter({
 			path: `/Cis/LvPlan/:mode?/:focus_date?/:lv_id?`,
 			name: 'LvPlan',
 			component: LvPlan,
-			props: (route) => { // validate and set mode/focus date if for some reason missing
-				const validModes = ["Month", "Week", "Day"];
-
-				// check mode string
-				const mode = route.params.mode &&
-					validModes.includes(route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase())
-						? route.params.mode.charAt(0).toUpperCase() + route.params.mode.slice(1).toLowerCase()
-						: DEFAULT_MODE_LVPLAN;
-
-				// default to today date if not provided or string forms invalid date
-				const d = new Date(route.params.focus_date)
-				const focus_date = !isNaN(d) ? route.params.focus_date : new Date().toISOString().split("T")[0];
-				// for consistency reasons format the props into one object but actually use a new name to we dont collide with
-				// existing viewData declaration written from codeigniter 3 into routerview tag
+			props(route) {
 				return {
-					propsViewData: {
-						mode,
-						focus_date,
-						lv_id: route.params.lv_id
-					}
+					propsViewData: route.params
+				};
+			}
+		},
+		{
+			path: `/Cis/MyLvPlan/:mode?/:focus_date?`,
+			name: 'MyLvPlan',
+			component: MyLvPlan,
+			props(route) {
+				return {
+					propsViewData: route.params
 				};
-			},
-			beforeEnter: (to, from, next) => {
-				//  missing mode or focus_date -> set defaults
-				if (!to.params.mode || !to.params.focus_date) {
-					next({
-						name: "LvPlan",
-						params: {
-							mode: to.params.mode || DEFAULT_MODE_LVPLAN,
-							focus_date: to.params.focus_date || new Date().toISOString().split("T")[0],
-							lv_id: to.params.lv_id
-						}
-					});
-				} else {
-					next();
-				}
 			}
 		},
 		{
diff --git a/public/js/components/Cis/LvPlan/Lehrveranstaltung.js b/public/js/components/Cis/LvPlan/Lehrveranstaltung.js
new file mode 100644
index 000000000..70773dce6
--- /dev/null
+++ b/public/js/components/Cis/LvPlan/Lehrveranstaltung.js
@@ -0,0 +1,96 @@
+import FhcCalendar from "../../Calendar/LvPlan.js";
+
+import ApiLvPlan from '../../../api/factory/lvPlan.js';
+import ApiAuthinfo from '../../../api/factory/authinfo.js';
+
+export const DEFAULT_MODE_LVPLAN = 'Week'
+
+export default {
+	name: 'LvPlanLehrveranstaltung',
+	components: {
+		FhcCalendar
+	},
+	props: {
+		viewData: Object, // NOTE(chris): this is inherited from router-view
+		propsViewData: Object
+	},
+	data() {
+		return {
+			lv: null
+		};
+	},
+	computed:{
+		currentDay() {
+			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
+				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+			return this.propsViewData?.focus_date;
+		},
+		currentMode() {
+			if (!this.propsViewData?.mode || !['day', 'week', 'month'].includes(this.propsViewData?.mode.toLowerCase()))
+				return DEFAULT_MODE_LVPLAN;
+			return this.propsViewData?.mode;
+		},
+		currentLv() {
+			if (isNaN(parseInt(this.propsViewData?.lv_id)))
+				return null;
+			return this.propsViewData.lv_id;
+		}
+	},
+	methods: {
+		handleChangeDate(day, newMode) {
+			return this.handleChangeMode(newMode, day);
+		},
+		handleChangeMode(newMode, day) {
+			const mode = newMode[0].toUpperCase() + newMode.slice(1)
+			const focus_date = day.toISODate();
+			
+			this.$router.push({
+				name: "LvPlan",
+				params: {
+					mode,
+					focus_date,
+					lv_id: this.currentLv
+				}
+			});
+		},
+		getPromiseFunc(start, end) {
+			return [
+				this.$api.call(ApiLvPlan.eventsLv(this.propsViewData.lv_id, start.toISODate(), end.toISODate())),
+				this.$api.call(ApiLvPlan.getLvPlanReservierungen(start.toISODate(), end.toISODate()))
+			];
+		}
+	},
+	created() {
+		if (this.currentLv === null)
+			return;
+		this.$api
+			.call(ApiLvPlan.getLv(this.propsViewData?.lv_id))
+			.then(res => {
+				this.lv = res.data;
+			});
+	},
+	template: /*html*/`
+	<div class="cis-lvplan-personal d-flex flex-column h-100">
+		<h2>
+			{{ $p.t('lehre/stundenplan') }}
+			<span v-if="lv" class="ps-3">
+				{{ $p.user_language.value === 'German' ? lv.bezeichnung : lv.bezeichnung_english }}
+			</span>
+		</h2>
+		<hr>
+		<div v-if="currentLv === null || lv === false">
+			{{ $p.t('lehre/noLvFound') }}
+		</div>
+		<fhc-calendar
+			v-else-if="lv"
+			ref="calendar"
+			:timezone="viewData.timezone"
+			:get-promise-func="getPromiseFunc"
+			:date="currentDay"
+			:mode="currentMode"
+			@update:date="handleChangeDate"
+			@update:mode="handleChangeMode"
+			class="responsive-calendar"
+		/>
+	</div>`
+};
diff --git a/public/js/components/Cis/LvPlan/Personal.js b/public/js/components/Cis/LvPlan/Personal.js
new file mode 100644
index 000000000..5c4be5c23
--- /dev/null
+++ b/public/js/components/Cis/LvPlan/Personal.js
@@ -0,0 +1,143 @@
+import FhcCalendar from "../../Calendar/LvPlan.js";
+
+import ApiLvPlan from '../../../api/factory/lvPlan.js';
+import ApiAuthinfo from '../../../api/factory/authinfo.js';
+
+export const DEFAULT_MODE_LVPLAN = 'Week'
+
+export default {
+	name: 'LvPlanPersonal',
+	components: {
+		FhcCalendar
+	},
+	props: {
+		viewData: Object, // NOTE(chris): this is inherited from router-view
+		propsViewData: Object
+	},
+	data() {
+		return {
+			studiensemester_kurzbz: null,
+			studiensemester_start: null,
+			studiensemester_ende: null,
+			uid: null
+		};
+	},
+	computed:{
+		currentDay() {
+			if (!this.propsViewData?.focus_date || isNaN(new Date(this.propsViewData?.focus_date)))
+				return luxon.DateTime.now().setZone(this.viewData.timezone).toISODate();
+			return this.propsViewData?.focus_date;
+		},
+		currentMode() {
+			if (!this.propsViewData?.mode || !['day', 'week', 'month'].includes(this.propsViewData?.mode.toLowerCase()))
+				return DEFAULT_MODE_LVPLAN;
+			return this.propsViewData?.mode;
+		},
+		downloadLinks() {
+			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
+				return false;
+			
+			const opts = { zone: this.viewData.timezone };
+			const start = luxon.DateTime
+				.fromISO(this.studiensemester_start, opts)
+				.toUnixInteger();
+			const ende = luxon.DateTime
+				.fromISO(this.studiensemester_ende, opts)
+				.toUnixInteger();
+
+			const download_link = FHC_JS_DATA_STORAGE_OBJECT.app_root
+				+ 'cis/private/lvplan/stpl_kalender.php'
+				+ '?type=student'
+				+ '&pers_uid=' + this.uid
+				+ '&begin=' + start
+				+ '&ende=' + ende;
+
+			return [
+				{ title: "excel", icon: 'fa-solid fa-file-excel', link: download_link + '&format=excel' },
+				{ title: "csv", icon: 'fa-solid fa-file-csv', link: download_link + '&format=csv' },
+				{ title: "ical1", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=1&target=ical' },
+				{ title: "ical2", icon: 'fa-regular fa-calendar', link: download_link + '&format=ical&version=2&target=ical' }
+			];
+		}
+	},
+	methods: {
+		handleChangeDate(day, newMode) {
+			return this.handleChangeMode(newMode, day);
+		},
+		handleChangeMode(newMode, day) {
+			const mode = newMode[0].toUpperCase() + newMode.slice(1)
+			const focus_date = day.toISODate();
+			
+			this.$router.push({
+				name: "MyLvPlan",
+				params: {
+					mode,
+					focus_date
+				}
+			});
+		},
+		updateRange(rangeInterval) {
+			this.$api
+				.call(ApiLvPlan.studiensemesterDateInterval(
+					rangeInterval.end.startOf('week').toISODate()
+				))
+				.then(res => {
+					this.studiensemester_kurzbz = res.data.studiensemester_kurzbz;
+					this.studiensemester_start = res.data.start;
+					this.studiensemester_ende = res.data.ende;
+				});
+		},
+		getPromiseFunc(start, end) {
+			return [
+				this.$api.call(ApiLvPlan.eventsPersonal(start.toISODate(), end.toISODate())),
+				this.$api.call(ApiLvPlan.getLvPlanReservierungen(start.toISODate(), end.toISODate()))
+			];
+		}
+	},
+	created() {
+		this.$api
+			.call(ApiAuthinfo.getAuthUID())
+			.then(res => {
+				this.uid = res.data.uid;
+			});
+	},
+	template: /*html*/`
+	<div class="cis-lvplan-personal d-flex flex-column h-100">
+		<h2>
+			{{ $p.t('lehre/stundenplan') }}
+			<span v-if="studiensemester_kurzbz" class="ps-3">
+				{{ studiensemester_kurzbz }}
+			</span>
+		</h2>
+		<hr>
+		<fhc-calendar
+			ref="calendar"
+			:timezone="viewData.timezone"
+			:get-promise-func="getPromiseFunc"
+			:date="currentDay"
+			:mode="currentMode"
+			@update:date="handleChangeDate"
+			@update:mode="handleChangeMode"
+			@update:range="updateRange"
+			class="responsive-calendar"
+		>
+			<div
+				v-if="downloadLinks"
+				class="d-flex gap-1 justify-items-start"
+			>
+				<div v-for="{ title, icon, link } in downloadLinks">
+					<a
+						:href="link"
+						:aria-label="title"
+						class="py-1 btn btn-outline-secondary"
+					>
+						<div class="d-flex flex-column">
+							<i aria-hidden="true" :class="icon"></i>
+							<span style="font-size:.5rem">{{ title }}</span>
+						</div>
+					</a>
+				</div>
+			</div>
+		</fhc-calendar>
+	</div>`
+};

From db30fa0d9683746845546136b46fe619b19a3110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 5 Aug 2025 09:42:00 +0200
Subject: [PATCH 523/572] Sorting Akte Results if creation date is the same

---
 application/models/crm/Akte_model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/models/crm/Akte_model.php b/application/models/crm/Akte_model.php
index 601019d3a..b945f414a 100644
--- a/application/models/crm/Akte_model.php
+++ b/application/models/crm/Akte_model.php
@@ -298,6 +298,7 @@ class Akte_model extends DB_Model
 			$this->db->where('person_id', $person_id);
 
 		$this->addOrder('erstelltam', 'DESC');
+		$this->addOrder('akte_id', 'DESC');
 
 		return $this->loadWhere([
 			'archiv' => true

From d33f493543f3ccef3353d111530216072bcdc9e2 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Sat, 24 May 2025 10:14:08 +0200
Subject: [PATCH 524/572] Studentenverwaltung archive: switched to new api
 factory

---
 .../api/frontend/v1/stv/Archiv.php            |   6 +-
 public/js/api/factory/stv/archiv.js           |  44 ++++
 .../Stv/Studentenverwaltung/Details/Archiv.js | 247 +++++++++---------
 .../Details/Archiv/Edit.js                    |   2 +-
 4 files changed, 168 insertions(+), 131 deletions(-)
 create mode 100644 public/js/api/factory/stv/archiv.js

diff --git a/application/controllers/api/frontend/v1/stv/Archiv.php b/application/controllers/api/frontend/v1/stv/Archiv.php
index 91fc9643d..cc636951d 100644
--- a/application/controllers/api/frontend/v1/stv/Archiv.php
+++ b/application/controllers/api/frontend/v1/stv/Archiv.php
@@ -34,7 +34,7 @@ class Archiv extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'get' => ['admin:r', 'assistenz:r'],
+			'getArchiv' => ['admin:r', 'assistenz:r'],
 			'getArchivVorlagen' => ['admin:r', 'assistenz:r'],
 			'archive' => ['admin:w', 'assistenz:w'],
 			'download' => ['admin:w', 'assistenz:w'],
@@ -60,9 +60,9 @@ class Archiv extends FHCAPI_Controller
 	 
 	 * @return void
 	 */
-	public function get()
+	public function getArchiv()
 	{
-		$person_id = $this->input->post('person_id');
+		$person_id = $this->input->get('person_id');
 
 		$this->load->library('form_validation');
 
diff --git a/public/js/api/factory/stv/archiv.js b/public/js/api/factory/stv/archiv.js
new file mode 100644
index 000000000..4205a5ecc
--- /dev/null
+++ b/public/js/api/factory/stv/archiv.js
@@ -0,0 +1,44 @@
+export default {
+	getArchiv(person_id) {
+		console.log(person_id);
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/archiv/getArchiv',
+			params: { person_id }
+		};
+	},
+	getArchivVorlagen() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/archiv/getArchivVorlagen'
+		};
+	},
+	archive(data) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/documents/archive',
+			params: data
+		};
+	},
+	archiveSigned(data) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/documents/archiveSigned',
+			params: data
+		};
+	},
+	update(data) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/archiv/update',
+			params: data
+		};
+	},
+	delete(akte_id, studiengang_kz) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/stv/archiv/delete',
+			params: {akte_id, studiengang_kz}
+		};
+	}
+};
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index 5bd20e154..f9c884782 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -2,6 +2,8 @@ import {CoreFilterCmpt} from "../../../filter/Filter.js";
 import FormInput from "../../../Form/Input.js";
 import AkteEdit from "./Archiv/Edit.js";
 
+import ApiStvArchiv from '../../../../api/factory/stv/archiv.js';
+
 export default {
 	components: {
 		CoreFilterCmpt,
@@ -61,131 +63,118 @@ export default {
 				'abschlussdokument_lehrgaenge.xml.php': [
 						'AbschlussdokumentLehrgaenge'
 				]
-			}
-			//studiengang_kz: false
-		};
-	},
-	computed: {
-		//~ personIds() {
-			//~ if (this.modelValue.person_id)
-				//~ return [this.modelValue.person_id];
-			//~ return this.modelValue.map(e => e.person_id);
-		//~ },
-		tabulatorColumns() {
-			const columns = [
-				{title: "Akte Id", field: "akte_id", visible: false},
-				{title: this.$p.t('stv', 'archiv_title'), field: "titel"},
-				{title: this.$p.t('stv', 'archiv_description'), field: "bezeichnung"},
-				{title: this.$p.t('stv', 'archiv_creation_date'), field: "erstelltam"},
-				{
-					title: this.$p.t('stv', 'archiv_signiert'),
-					field: "signiert",
-					formatter:"tickCross",
-					hozAlign:"center",
-					formatterParams: {
-						tickElement: '<i class="fa fa-check text-success"></i>',
-						crossElement: '<i class="fa fa-xmark text-danger"></i>'
-					}
-				},
-				{
-					title: "Selfservice",
-					field: "stud_selfservice",
-					formatter:"tickCross",
-					hozAlign:"center",
-					formatterParams: {
-						tickElement: '<i class="fa fa-check text-success"></i>',
-						crossElement: '<i class="fa fa-xmark text-danger"></i>'
-					},
-				},
-				{title: this.$p.t('stv', 'archiv_accepted_on_at'), field: "akzeptiertamum"},
-				{
-					title: this.$p.t('stv', 'archiv_gedruckt'),
-					field: "gedruckt",
-					visible: false,
-					formatter:"tickCross",
-					hozAlign:"center",
-					formatterParams: {
-						tickElement: '<i class="fa fa-check text-success"></i>',
-						crossElement: '<i class="fa fa-xmark text-danger"></i>'
-					}
-				},
-				{
-					title: 'Aktionen', field: 'actions',
-					formatter: (cell, formatterParams, onRendered) => {
-						let container = document.createElement('div');
-						container.className = "d-flex gap-2";
-
-						let downloadButton = document.createElement('button');
-						downloadButton.className = 'btn btn-outline-secondary';
-						downloadButton.innerHTML = '<i class="fa fa-download"></i>';
-						downloadButton.title = this.$p.t('ui', 'downloadDok');
-						downloadButton.addEventListener('click', evt => {
-							evt.stopPropagation();
-							this.actionDownload(cell.getData().akte_id);
-						});
-						container.append(downloadButton);
-
-						if (this.config.showEdit)
-						{
-							let editButton = document.createElement('button');
-							editButton.className = 'btn btn-outline-secondary';
-							editButton.innerHTML = '<i class="fa fa-edit"></i>';
-							editButton.title = this.$p.t('ui', 'bearbeiten');
-							editButton.addEventListener('click', () =>
-								this.$refs.edit.open(cell.getData())
-							);
-							container.append(editButton);
+			},
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: () => this.$api.call(
+						ApiStvArchiv.getArchiv(
+							this.modelValue.person_id ? [this.modelValue.person_id] : null || this.modelValue.map(e => e.person_id)
+						)
+					),
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title: "Akte Id", field: "akte_id", visible: false},
+					{title: this.$p.t('stv', 'archiv_title'), field: "titel"},
+					{title: this.$p.t('stv', 'archiv_description'), field: "bezeichnung"},
+					{title: this.$p.t('stv', 'archiv_creation_date'), field: "erstelltam"},
+					{
+						title: this.$p.t('stv', 'archiv_signiert'),
+						field: "signiert",
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
 						}
-
-						let deleteButton = document.createElement('button');
-						deleteButton.className = 'btn btn-outline-secondary';
-						deleteButton.innerHTML = '<i class="fa fa-trash"></i>';
-						deleteButton.title = this.$p.t('ui', 'loeschen');
-						deleteButton.addEventListener('click', evt => {
-							evt.stopPropagation();
-							this.$fhcAlert
-								.confirmDelete()
-								.then(result => result ? {akte_id: cell.getData().akte_id, studiengang_kz: this.modelValue.studiengang_kz} : Promise.reject({handled:true}))
-								.then(this.$fhcApi.factory.stv.archiv.delete)
-								.then(() => {
-									//cell.getRow().delete();
-									this.reload();
-								})
-								.catch(this.$fhcAlert.handleSystemError);
-						});
-						container.append(deleteButton);
-
-						return container;
 					},
-					minWidth: 150, // Ensures Action-buttons will be always fully displayed
-					maxWidth: 150,
-					frozen: true
-				}
-			];
-			return Object.values(columns);
-		},
-		tabulatorOptions() {
-			return this.$fhcApi.factory.stv.archiv.tabulatorConfig({
+					{
+						title: "Selfservice",
+						field: "stud_selfservice",
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
+						},
+					},
+					{title: this.$p.t('stv', 'archiv_accepted_on_at'), field: "akzeptiertamum"},
+					{
+						title: this.$p.t('stv', 'archiv_gedruckt'),
+						field: "gedruckt",
+						visible: false,
+						formatter:"tickCross",
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
+						}
+					},
+					{
+						title: 'Aktionen', field: 'actions',
+						formatter: (cell, formatterParams, onRendered) => {
+							let container = document.createElement('div');
+							container.className = "d-flex gap-2";
+
+							let downloadButton = document.createElement('button');
+							downloadButton.className = 'btn btn-outline-secondary';
+							downloadButton.innerHTML = '<i class="fa fa-download"></i>';
+							downloadButton.title = this.$p.t('ui', 'downloadDok');
+							downloadButton.addEventListener('click', evt => {
+								evt.stopPropagation();
+								this.actionDownload(cell.getData().akte_id);
+							});
+							container.append(downloadButton);
+
+							if (this.config.showEdit)
+							{
+								let editButton = document.createElement('button');
+								editButton.className = 'btn btn-outline-secondary';
+								editButton.innerHTML = '<i class="fa fa-edit"></i>';
+								editButton.addEventListener('click', () =>
+									this.$refs.edit.open(cell.getData())
+								);
+								container.append(editButton);
+							}
+
+							let deleteButton = document.createElement('button');
+							deleteButton.className = 'btn btn-outline-secondary';
+							deleteButton.innerHTML = '<i class="fa fa-trash"></i>';
+							deleteButton.addEventListener('click', evt => {
+								evt.stopPropagation();
+								this.$fhcAlert
+									.confirmDelete()
+									.then(result => result ? {akte_id: cell.getData().akte_id, studiengang_kz : this.modelValue.studiengang_kz} : Promise.reject({handled:true}))
+									.then(params => this.$api.call(ApiStvArchiv.delete(params.akte_id, params.studiengang_kz)))
+									.then(() => {
+										//cell.getRow().delete();
+										this.reload();
+									})
+									.catch(this.$fhcAlert.handleSystemError);
+							});
+							container.append(deleteButton);
+
+							return container;
+						},
+						minWidth: 150, // Ensures Action-buttons will be always fully displayed
+						maxWidth: 150,
+						frozen: true
+					}
+				],
 				layout:"fitDataTable",
-				columns: this.tabulatorColumns,
-				//selectable: true,
-				//selectableRangeMode: 'click',
 				index: 'akte_id',
 				persistenceID: 'stv-details-archiv'
-			}, this);
-		},
-		tabulatorEvents() {
-			const events = [
+			},
+			tabulatorEvents: [
 				{
 					event: "rowDblClick",
 					handler: (e, row) => {
 						this.actionDownload(row.getData().akte_id);
 					}
 				}
-			];
-
-			return events;
-		}
+			]
+		};
+	},
+	computed: {
 	},
 	watch: {
 		modelValue() {
@@ -207,18 +196,22 @@ export default {
 			for (let archiveData of archiveDataArr)
 			{
 				this.loading = true;
+
+				// sign document depending on signierbar property
 				let archiveFunction =
 					this.selectedVorlage.signierbar
-					? this.$fhcApi.factory.stv.archiv.archiveSigned
-					: this.$fhcApi.factory.stv.archiv.archive;
+					? ApiStvArchiv.archiveSigned
+					: ApiStvArchiv.archive;
 
-				archiveFunction({
-					xml: this.getXmlByXsl(this.selectedVorlage.vorlage_kurzbz),
-					xsl: this.selectedVorlage.vorlage_kurzbz,
-					ss: this.defaultSemester,
-					uid: archiveData.uid,
-					prestudent_id: archiveData.prestudent_id
-				})
+				this.$api.call(
+					archiveFunction({
+						xml: this.getXmlByXsl(this.selectedVorlage.vorlage_kurzbz),
+						xsl: this.selectedVorlage.vorlage_kurzbz,
+						ss: this.defaultSemester,
+						uid: archiveData.uid,
+						prestudent_id: archiveData.prestudent_id
+					})
+				)
 				.then(result => result.data)
 				.then(() => {
 					this.reload();
@@ -249,10 +242,10 @@ export default {
 		}
 	},
 	created() {
-		this.$fhcApi
-			.factory.stv.archiv.getArchivVorlagen()
-			.then(result => {this.vorlagenArchiv = result.data; this.selectedVorlage = result.data.filter(o => o.vorlage_kurzbz == 'Zeugnis')[0];})
-			.catch(this.$fhcAlert.handleSystemError);
+			this.$api
+				.call(ApiStvArchiv.getArchivVorlagen())
+				.then(result => {this.vorlagenArchiv = result.data; this.selectedVorlage = result.data.filter(o => o.vorlage_kurzbz == 'Zeugnis')[0];})
+				.catch(this.$fhcAlert.handleSystemError);
 
 	},
 	template: `
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js
index 6e271b4d0..56929a3fc 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv/Edit.js
@@ -115,4 +115,4 @@ export default {
 			</template>
 		</bs-modal>
 	</core-form>`
-};
\ No newline at end of file
+};

From b4a1720a948ad7750e275cdb3b3393fa2a4b1253 Mon Sep 17 00:00:00 2001
From: Alexei Karpenko <karpen_ko@hotmail.com>
Date: Tue, 15 Jul 2025 23:08:12 +0200
Subject: [PATCH 525/572] Studierendenverwaltung archiv: removed tabulator
 columns from computed

---
 .../components/Stv/Studentenverwaltung/Details/Archiv.js  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index f9c884782..ec92539db 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -63,8 +63,12 @@ export default {
 				'abschlussdokument_lehrgaenge.xml.php': [
 						'AbschlussdokumentLehrgaenge'
 				]
-			},
-			tabulatorOptions: {
+			}
+		};
+	},
+	computed: {
+		tabulatorOptions() {
+			const options = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
 						ApiStvArchiv.getArchiv(

From c728f60ec5161253171c2c4fff331ae66a614c65 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 5 Aug 2025 11:28:18 +0200
Subject: [PATCH 526/572] fix cherry picked Archiv.js

---
 .../Stv/Studentenverwaltung/Details/Archiv.js | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index ec92539db..632a14088 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -71,11 +71,14 @@ export default {
 			const options = {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
-						ApiStvArchiv.getArchiv(
-							this.modelValue.person_id ? [this.modelValue.person_id] : null || this.modelValue.map(e => e.person_id)
-						)
-					),
+					ApiStvArchiv.getArchiv(
+						this.modelValue.person_id ? [this.modelValue.person_id] : null || this.modelValue.map(e => e.person_id)
+					)
+				),
 				ajaxResponse: (url, params, response) => response.data,
+				layout:"fitDataTable",
+				index: 'akte_id',
+				persistenceID: 'stv-details-archiv',
 				columns: [
 					{title: "Akte Id", field: "akte_id", visible: false},
 					{title: this.$p.t('stv', 'archiv_title'), field: "titel"},
@@ -147,8 +150,8 @@ export default {
 								evt.stopPropagation();
 								this.$fhcAlert
 									.confirmDelete()
-									.then(result => result ? {akte_id: cell.getData().akte_id, studiengang_kz : this.modelValue.studiengang_kz} : Promise.reject({handled:true}))
-									.then(params => this.$api.call(ApiStvArchiv.delete(params.akte_id, params.studiengang_kz)))
+									.then(result => result ? {akte_id: cell.getData().akte_id, studiengang_kz: this.modelValue.studiengang_kz} : Promise.reject({handled:true}))
+									.then(this.$fhcApi.factory.stv.archiv.delete)
 									.then(() => {
 										//cell.getRow().delete();
 										this.reload();
@@ -163,22 +166,22 @@ export default {
 						maxWidth: 150,
 						frozen: true
 					}
-				],
-				layout:"fitDataTable",
-				index: 'akte_id',
-				persistenceID: 'stv-details-archiv'
-			},
-			tabulatorEvents: [
+				]
+			};
+			return options;
+		},
+		tabulatorEvents() {
+			const events = [
 				{
 					event: "rowDblClick",
 					handler: (e, row) => {
 						this.actionDownload(row.getData().akte_id);
 					}
 				}
-			]
-		};
-	},
-	computed: {
+			];
+
+			return events;
+		}
 	},
 	watch: {
 		modelValue() {

From 70274eef3a3098a69c45f1b2430cb705bb606e36 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 5 Aug 2025 11:33:25 +0200
Subject: [PATCH 527/572] remove console.log

---
 public/js/api/factory/stv/archiv.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/api/factory/stv/archiv.js b/public/js/api/factory/stv/archiv.js
index 4205a5ecc..ca8f25116 100644
--- a/public/js/api/factory/stv/archiv.js
+++ b/public/js/api/factory/stv/archiv.js
@@ -1,6 +1,5 @@
 export default {
 	getArchiv(person_id) {
-		console.log(person_id);
 		return {
 			method: 'get',
 			url: 'api/frontend/v1/stv/archiv/getArchiv',

From 41a46aa7b28c0aea2019732e24048fbc80ec2ac6 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 5 Aug 2025 11:59:07 +0200
Subject: [PATCH 528/572] add component name, cssclass name, replace old delete
 api call with new one

---
 .../components/Stv/Studentenverwaltung/Details/Archiv.js   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index 632a14088..3eca6d47e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -5,6 +5,7 @@ import AkteEdit from "./Archiv/Edit.js";
 import ApiStvArchiv from '../../../../api/factory/stv/archiv.js';
 
 export default {
+	name: 'Archiv',
 	components: {
 		CoreFilterCmpt,
 		FormInput,
@@ -151,7 +152,9 @@ export default {
 								this.$fhcAlert
 									.confirmDelete()
 									.then(result => result ? {akte_id: cell.getData().akte_id, studiengang_kz: this.modelValue.studiengang_kz} : Promise.reject({handled:true}))
-									.then(this.$fhcApi.factory.stv.archiv.delete)
+									.then((params) => {
+										return this.$api.call(ApiStvArchiv.delete(params.akte_id, params.studiengang_kz))
+									})
 									.then(() => {
 										//cell.getRow().delete();
 										this.reload();
@@ -256,7 +259,7 @@ export default {
 
 	},
 	template: `
-	<div class="stv-details-konto h-100 d-flex flex-column">
+	<div class="stv-details-archiv h-100 d-flex flex-column">
 		<core-filter-cmpt
 			ref="table"
 			table-only

From 133e1f08f63e7760964cabed4b7e9554081f8326 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 5 Aug 2025 12:20:29 +0200
Subject: [PATCH 529/572] use currentSemester instead of defaultSemester

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

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
index 3eca6d47e..7a156965f 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js
@@ -12,8 +12,8 @@ export default {
 		AkteEdit
 	},
 	inject: {
-		defaultSemester: {
-			from: 'defaultSemester'
+		currentSemester: {
+			from: 'currentSemester'
 		}
 	},
 	props: {
@@ -217,7 +217,7 @@ export default {
 					archiveFunction({
 						xml: this.getXmlByXsl(this.selectedVorlage.vorlage_kurzbz),
 						xsl: this.selectedVorlage.vorlage_kurzbz,
-						ss: this.defaultSemester,
+						ss: this.currentSemester,
 						uid: archiveData.uid,
 						prestudent_id: archiveData.prestudent_id
 					})

From e241b586a8b6f69164f9c24f7ec3ebd7c8365b47 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 5 Aug 2025 13:28:15 +0200
Subject: [PATCH 530/572] use currentSemester instead of defaultSemester
 because of vuerouter

---
 .../components/Stv/Studentenverwaltung/Details/Konto/New.js | 6 +++---
 .../Studentenverwaltung/Details/Prestudent/MultiStatus.js   | 3 ---
 .../Stv/Studentenverwaltung/Details/Status/Modal.js         | 6 +++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
index 313d34c67..cdb32de99 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js
@@ -17,8 +17,8 @@ export default {
 		lists: {
 			from: 'lists'
 		},
-		defaultSemester: {
-			from: 'defaultSemester'
+		currentSemester: {
+			from: 'currentSemester'
 		}
 	},
 	props: {
@@ -89,7 +89,7 @@ export default {
 				buchungsdatum: new Date(),
 				buchungstext: '',
 				mahnspanne: 30,
-				studiensemester_kurzbz: this.defaultSemester,
+				studiensemester_kurzbz: this.currentSemester,
 				credit_points: null,
 				anmerkung: ''
 			};
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 15664665f..593914916 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -16,9 +16,6 @@ export default{
 		StatusDropdown
 	},
 	inject: {
-		defaultSemester: {
-			from: 'defaultSemester',
-		},
 		hasPermissionToSkipStatusCheck: {
 			from: 'hasPermissionToSkipStatusCheck',
 			default: false
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
index c0ec2cfad..edbd3b6ea 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js
@@ -13,8 +13,8 @@ export default{
 		FormInput
 	},
 	inject: {
-		defaultSemester: {
-			from: 'defaultSemester',
+		currentSemester: {
+			from: 'currentSemester',
 		},
 		hasPermissionToSkipStatusCheck: {
 			from: 'hasPermissionToSkipStatusCheck',
@@ -106,7 +106,7 @@ export default{
 				this.statusId = prestudent.prestudent_id;
 				this.formData = {
 					status_kurzbz: 'Interessent',
-					studiensemester_kurzbz: this.defaultSemester,
+					studiensemester_kurzbz: this.currentSemester,
 					ausbildungssemester: 1,
 					datum: new Date(),
 					bestaetigtam: new Date(),

From aded9067e56971f9262294e11dae49073597bf04 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 5 Aug 2025 14:37:36 +0200
Subject: [PATCH 531/572] remove id-attribute from calendar renderer templates

---
 public/css/Cis4/CoreCalendarEvents.css        |  60 ++++----
 .../Cis/Renderer/Feiertage/calendarEvent.js   |   8 +-
 .../Cis/Renderer/Lehreinheit/calendarEvent.js | 129 +++++++++++-------
 .../Renderer/Reservierungen/calendarEvent.js  |  95 ++++++++++---
 4 files changed, 189 insertions(+), 103 deletions(-)

diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css
index df451ebf1..3941872ef 100644
--- a/public/css/Cis4/CoreCalendarEvents.css
+++ b/public/css/Cis4/CoreCalendarEvents.css
@@ -4,96 +4,96 @@
 	height: 100%;
 }
 
-/* Feiertag */
-.feiertagEventContent {
+/* Feiertage */
+.cis-renderer-feiertage-calendar-event {
 	align-items: center;
 	color: var(--fhc-light);
 }
-.monthPageContainer .feiertagEventContent,
-.weekPageContainer .feiertagEventContent,
-.dayPageContainer .feiertagEventContent {
+.monthPageContainer .cis-renderer-feiertage-calendar-event,
+.weekPageContainer .cis-renderer-feiertage-calendar-event,
+.dayPageContainer .cis-renderer-feiertage-calendar-event {
 	display: grid;
 	grid-template-columns: auto 1fr;
 	justify-items: center;
 }
-.listPageContainer .feiertagEventContent {
+.listPageContainer .cis-renderer-feiertage-calendar-event {
 	display: flex;
 	justify-content: center;
 }
 
-.monthPageContainer .feiertagEventContent #ferienEventIcon {
+.monthPageContainer .cis-renderer-feiertage-calendar-event .event-icon {
 	margin: 0 .5rem;
 }
-.weekPageContainer .feiertagEventContent #ferienEventIcon,
-.dayPageContainer .feiertagEventContent #ferienEventIcon,
-.listPageContainer .feiertagEventContent #ferienEventIcon {
+.weekPageContainer .cis-renderer-feiertage-calendar-event .event-icon,
+.dayPageContainer .cis-renderer-feiertage-calendar-event .event-icon,
+.listPageContainer .cis-renderer-feiertage-calendar-event .event-icon {
 	margin: .5rem;
 }
 
-.listPageContainer .feiertagEventContent #ferienEventTitle {
+.listPageContainer .cis-renderer-feiertage-calendar-event .event-title {
 	flex-grow: 1;
 }
 
 /* Lehreinheit */
-.monthPageContainer .lehreinheitEventContent {
+/* Reservierungen */
+.monthPageContainer .calendar-event-default {
 	padding: 0!important;
 }
-.monthPageContainer .lehreinheitEventContent #lehreinheitEventHeader,
-.monthPageContainer .lehreinheitEventContent #lehreinheitLektoren,
-.monthPageContainer .lehreinheitEventContent #lektorEllipsis {
+.monthPageContainer .calendar-event-default .event-time,
+.monthPageContainer .calendar-event-default .event-lectors {
 	display: none!important;
 }
-.monthPageContainer .lehreinheitEventContent #lehreinheitEventText {
+.monthPageContainer .calendar-event-default .event-text {
 	display: flex;
 	justify-content: space-evenly;
 	align-items: center;
 }
-.weekPageContainer .lehreinheitEventContent {
+.weekPageContainer .calendar-event-default {
 	display: grid;
 	grid-template-columns: auto 1fr;
 }
-.weekPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
+.weekPageContainer .calendar-event-default .event-time {
 	border-inline-end: solid 1px var(--bs-secondary);
 	align-self: stretch;
 	align-content: center;
 	padding: .25em .5em .25em .25em;
 	margin-inline-end: .25rem;
 }
-.weekPageContainer .lehreinheitEventContent #lehreinheitEventText {
+.weekPageContainer .calendar-event-default .event-text {
 	display: flex;
 	flex-direction: column;
 	justify-content: space-evenly;
 	align-items: center;
 }
-.dayPageContainer .lehreinheitEventContent,
-.listPageContainer .lehreinheitEventContent {
+.dayPageContainer .calendar-event-default,
+.listPageContainer .calendar-event-default {
 	display: flex;
 	align-items: center;
 }
-.dayPageContainer .lehreinheitEventContent #lehreinheitEventHeader,
-.listPageContainer .lehreinheitEventContent #lehreinheitEventHeader {
+.dayPageContainer .calendar-event-default .event-time,
+.listPageContainer .calendar-event-default .event-time {
 	align-content: center;
 	padding-inline-end: .5em;
 	border-inline-end: solid 1px;
 	margin-inline-end: .5em;
 }
-.dayPageContainer .lehreinheitEventContent #lehreinheitEventText,
-.listPageContainer .lehreinheitEventContent #lehreinheitEventText {
+.dayPageContainer .calendar-event-default .event-text,
+.listPageContainer .calendar-event-default .event-text {
 	flex: 1 1 auto;
 	display: flex;
 	flex-wrap: wrap;
 	gap: .25em;
 	justify-content: center;
 }
-.dayPageContainer .lehreinheitEventContent #lehreinheitTopic,
-.dayPageContainer .lehreinheitEventContent #lehreinheitOrt,
-.listPageContainer .lehreinheitEventContent #lehreinheitTopic,
-.listPageContainer .lehreinheitEventContent #lehreinheitOrt {
+.dayPageContainer .calendar-event-default .event-topic,
+.dayPageContainer .calendar-event-default .event-place,
+.listPageContainer .calendar-event-default .event-topic,
+.listPageContainer .calendar-event-default .event-place {
 	flex: 0 0 100%;
 	text-align: center;
 }
 
-.fhc-roominformation .lehreinheitEventContent #lehreinheitOrt {
+.fhc-roominformation .calendar-event-default .event-place {
 	display: none;
 }
 
diff --git a/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js b/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
index ffc164117..d226e935a 100644
--- a/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
+++ b/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
@@ -7,8 +7,8 @@ export default {
 		},
 	},
 	template: `
-		<div class="feiertagEventContent " >
-			<i id="ferienEventIcon" class="fa-regular fa-calendar"></i>
-			<span id="ferienEventTitle" class="fw-bold text-center">{{event.titel}}</span>
-		</div>`,
+	<div class="cis-renderer-feiertage-calendar-event">
+		<i class="event-icon" class="fa-regular fa-calendar"></i>
+		<span class="event-title fw-bold text-center">{{ event.titel }}</span>
+	</div>`,
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
index a334ea4d4..ca8d470e2 100644
--- a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
+++ b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js
@@ -1,59 +1,92 @@
 export default {
-	methods:{
-		convertTime: function ([hour, minute]) {
-			let date = new Date();
-			date.setHours(hour);
-			date.setMinutes(minute);
-			// returns date string as hh:mm
-			return date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', hour12: false });
-
-		},
-	},
-	computed:{
-		calendarEventTooltip: function(){
-			let lektorenEmpty = true;
-			let tooltipString = `${this.$p.t('global','uhrzeit')}: ${this.convertTime(this.event.beginn.split(":"))} / ${this.convertTime(this.event.ende.split(":")) }`;
-			
-			tooltipString += `\n${this.$p.t('profilUpdate', 'topic')}: ${this.event.topic}`;
-			tooltipString += `${this.$p.t('person', 'ort')}: ${this.event.ort_kurzbz}`;
-			if(Array.isArray(this.event.lektor) && this.event.lektor.length > 0){
-				lektorenEmpty = false;
-				tooltipString += `\n${this.$p.t('lehre','lektor')}: `;
-				this.event.lektor.slice(0,3).forEach(lektor => {
-					tooltipString += `${lektor.kurzbz}\n`;
-				})
-				if(this.event.lektor.length > 3){
-					tooltipString += `${this.$p.t('lehre', 'weitereLektoren', [(this.event.lektor.length - 3)])}\n`;
-				}
-			}
-			if(lektorenEmpty){
-				tooltipString += "\n";	
-			}
-			
-			
-			return tooltipString;
-		},
-	},
 	props:{
 		event: {
-			type:Object,
-			required:true,
+			type: Object,
+			required: true
+		}
+	},
+	computed:{
+		tooltipString() {
+			const tooltipArray = [];
+
+			tooltipArray.push([
+				this.$p.t('global/uhrzeit'),
+				[this.start, this.end].join(' - ')
+			].join(": "));
+			
+			tooltipArray.push([
+				this.$p.t('profilUpdate/topic'),
+				this.event.topic
+			].join(": "));
+			
+			tooltipArray.push([
+				this.$p.t('person/ort'),
+				this.event.ort_kurzbz
+			].join(": "));
+
+			this.event.lektor = [
+				this.event.lektor[0],
+				this.event.lektor[0],
+				this.event.lektor[0],
+				this.event.lektor[0],
+				this.event.lektor[0],
+			];
+			
+			if (Array.isArray(this.event.lektor) && this.event.lektor.length > 0) {
+				if (this.event.lektor.length > 3) {
+					tooltipArray.push([
+						this.$p.t('lehre/lektor'),
+						this.event.lektor.slice(0, 3).map(lektor => lektor.kurzbz).join("\n")
+						+ "\n" + this.$p.t('lehre/weitereLektoren', [this.event.lektor.length - 3])
+					].join(": "));
+				} else {console.log(this.event.lektor);
+					tooltipArray.push([
+						this.$p.t('lehre/lektor'),
+						this.event.lektor.map(lektor => lektor.kurzbz).join("\n")
+					].join(": "));
+				}
+			}
+			
+			return tooltipArray.join("\n");
 		},
+		start() {
+			return luxon.Duration
+				.fromISOTime(this.event.beginn)
+				.toISOTime({ suppressSeconds: true });
+		},
+		end() {
+			return luxon.Duration
+				.fromISOTime(this.event.ende)
+				.toISOTime({ suppressSeconds: true });
+		}
 	},
 	template: /*html*/`
-	<div class="lehreinheitEventContent h-100 w-100 p-1" @wheel.stop >
-		<div id="lehreinheitEventHeader" class="d-none d-xl-grid h-100 " v-if="!event.allDayEvent && event?.beginn && event?.ende" >
-			<span >{{convertTime(event.beginn.split(":"))}}</span>
-			<span >{{convertTime(event.ende.split(":"))}}</span>
+	<div
+		class="cis-renderer-lehreinheit-calendar-event calendar-event-default h-100 w-100 p-1"
+		@wheel.stop
+	>
+		<div
+			v-if="!event.allDayEvent && event?.beginn && event?.ende"
+			class="event-time d-none d-xl-grid h-100"
+		>
+			<span>{{ start }}</span>
+			<span>{{ end }}</span>
 		</div>
-		<div id="lehreinheitEventText" v-tooltip="calendarEventTooltip">
-			<span id="lehreinheitTopic">{{event.topic}}</span>
-			<span id="lehreinheitOrt">{{event.ort_kurzbz}}</span>
-			<span id="lehreinheitLektoren" v-for="(lektor,index) in event.lektor.slice(0,3)">
-				{{lektor.kurzbz}}
+		<div class="event-text" v-tooltip="tooltipString">
+			<span class="event-topic">{{ event.topic }}</span>
+			<span class="event-place">{{ event.ort_kurzbz }}</span>
+			<span
+				v-for="(lektor,index) in event.lektor.slice(0, 3)"
+				class="event-lectors"
+			>
+				{{ lektor.kurzbz }}
+			</span>
+			<span
+				v-if="event.lektor.length > 3"
+				class="event-lectors-plus"
+			>
+				... +{{ event.lektor.length - 3 }}
 			</span>
-			<span id="lektorEllipsis" class="fw-bold" v-if="event.lektor.length > 3">...+ 
-		 	{{event.lektor.length-3}}</span>
 		</div>
 	</div>
 	`,
diff --git a/public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js b/public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js
index c6b8054c2..2447c4f61 100644
--- a/public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js
+++ b/public/js/components/Cis/Renderer/Reservierungen/calendarEvent.js
@@ -1,30 +1,83 @@
 export default {
-	methods: {
-		convertTime: function ([hour, minute]) {
-			let date = new Date();
-			date.setHours(hour);
-			date.setMinutes(minute);
-			// returns date string as hh:mm
-			return date.toLocaleTimeString(this.$p.user_locale, { hour: '2-digit', minute: '2-digit', hour12: false });
-
-		},
-	},
 	props: {
 		event: {
 			type: Object,
-			required: true,
-		},
+			required: true
+		}
 	},
-	template: `
-	<div class="lehreinheitEventContent h-100 w-100 p-1" >
-		<div id="lehreinheitEventHeader" class="h-100 " v-if="!event.allDayEvent && event?.beginn && event?.ende" >
-			<span class="small">{{convertTime(event.beginn.split(":"))}}</span>
-			<span class="small">{{convertTime(event.ende.split(":"))}}</span>
+	computed: {
+		tooltipString() {
+			const tooltipArray = [];
+
+			tooltipArray.push([
+				this.$p.t('global/uhrzeit'),
+				[this.start, this.end].join(' - ')
+			].join(": "));
+			
+			tooltipArray.push([
+				this.$p.t('profilUpdate/topic'),
+				this.event.topic
+			].join(": "));
+			
+			tooltipArray.push([
+				this.$p.t('person/ort'),
+				this.event.ort_kurzbz
+			].join(": "));
+			
+			if (Array.isArray(this.event.lektor) && this.event.lektor.length > 0) {
+				if (this.event.lektor.length > 3) {
+					tooltipArray.push([
+						this.$p.t('lehre/lektor'),
+						this.event.lektor.slice(0, 3).map(lektor => lektor.kurzbz).join("\n")
+						+ "\n" + this.$p.t('lehre/weitereLektoren', [this.event.lektor.length - 3])
+					].join(": "));
+				} else {
+					tooltipArray.push([
+						this.$p.t('lehre/lektor'),
+						this.event.lektor.map(lektor => lektor.kurzbz).join("\n")
+					].join(": "));
+				}
+			}
+			
+			return tooltipArray.join("\n");
+		},
+		start() {
+			return luxon.Duration
+				.fromISOTime(this.event.beginn)
+				.toISOTime({ suppressSeconds: true });
+		},
+		end() {
+			return luxon.Duration
+				.fromISOTime(this.event.ende)
+				.toISOTime({ suppressSeconds: true });
+		}
+	},
+	template: /* html */`
+	<div
+		class="cis-renderer-reservierungen-calendar-event calendar-event-default h-100 w-100 p-1"
+	>
+		<div
+			v-if="!event.allDayEvent && event?.beginn && event?.ende"
+			class="event-time d-grid h-100"
+		>
+			<span>{{ start }}</span>
+			<span>{{ end }}</span>
 		</div>
-		<div id="lehreinheitEventText">
-			<span>{{event.topic}}</span>
-			<span v-for="lektor in event.lektor">{{lektor.kurzbz}}</span>
-			<span>{{event.ort_kurzbz}}</span>
+		<div class="event-text" v-tooltip="tooltipString">
+			<span class="event-topic">{{ event.topic }}</span>
+			<span
+				v-for="lektor in event.lektor.slice(0, 3)"
+				class="event-lectors"
+			>
+				{{ lektor.kurzbz }}
+			</span>
+			<span
+				v-if="event.lektor.length > 3"
+				class="event-lectors-plus"
+			>
+				... +{{ event.lektor.length - 3 }}
+			</span>
+			<span class="event-place">{{ event.ort_kurzbz }}</span>
 		</div>
 	</div>
 	`,

From 6391e58f7466ef5c947061c4ecbc7e7b56fcac95 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 5 Aug 2025 14:37:57 +0200
Subject: [PATCH 532/572] Bugfix: negation of instanceof

---
 .../js/components/Cis/Renderer/Reservierungen/modalContent.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/Renderer/Reservierungen/modalContent.js b/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
index 66428e37f..0d6c62672 100644
--- a/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
+++ b/public/js/components/Cis/Renderer/Reservierungen/modalContent.js
@@ -34,7 +34,7 @@ export default {
 		start_time: function () {
 			if (!this.event.beginn)
 				return 'N/A';
-			if (!this.event.beginn instanceof Date) {
+			if (!(this.event.beginn instanceof Date)) {
 				return this.event.beginn;
 			}
 			return numberPadding(this.event.beginn.getHours()) + ":" + numberPadding(this.event.beginn.getMinutes());
@@ -42,7 +42,7 @@ export default {
 		end_time: function () {
 			if (!this.event.ende)
 				return 'N/A';
-			if (!this.event.ende instanceof Date) {
+			if (!(this.event.ende instanceof Date)) {
 				return this.event.ende;
 			}
 			return numberPadding(this.event.ende.getHours()) + ":" + numberPadding(this.event.ende.getMinutes());

From 603622a3f19aaa45b86c487ce49f1348dabf931e Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Tue, 5 Aug 2025 14:38:59 +0200
Subject: [PATCH 533/572] LvPlan use computed for lv title

---
 .../js/components/Cis/LvPlan/Lehrveranstaltung.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Cis/LvPlan/Lehrveranstaltung.js b/public/js/components/Cis/LvPlan/Lehrveranstaltung.js
index 70773dce6..4364a5df4 100644
--- a/public/js/components/Cis/LvPlan/Lehrveranstaltung.js
+++ b/public/js/components/Cis/LvPlan/Lehrveranstaltung.js
@@ -34,6 +34,17 @@ export default {
 			if (isNaN(parseInt(this.propsViewData?.lv_id)))
 				return null;
 			return this.propsViewData.lv_id;
+		},
+		lvTitle() {
+			if (this.currentLv === null)
+				return '';
+			if (!this.lv)
+				return '';
+
+			if (this.$p.user_language.value === 'English')
+				return this.lv.bezeichnung_english;
+
+			return this.lv.bezeichnung;
 		}
 	},
 	methods: {
@@ -73,8 +84,8 @@ export default {
 	<div class="cis-lvplan-personal d-flex flex-column h-100">
 		<h2>
 			{{ $p.t('lehre/stundenplan') }}
-			<span v-if="lv" class="ps-3">
-				{{ $p.user_language.value === 'German' ? lv.bezeichnung : lv.bezeichnung_english }}
+			<span v-if="lvTitle" class="ps-3">
+				{{ lvTitle }}
 			</span>
 		</h2>
 		<hr>

From 9de0a41035a8dbf61ddf96aab20fdba0d21b6db9 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 5 Aug 2025 18:36:07 +0200
Subject: [PATCH 534/572] move Theme plugin to plugins folder

---
 public/js/apps/Cis.js                  | 2 +-
 public/js/apps/Dashboard/Fhc.js        | 2 +-
 public/js/{plugin => plugins}/Theme.js | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename public/js/{plugin => plugins}/Theme.js (100%)

diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index 6a5418c96..73703b42b 100644
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -2,7 +2,7 @@ import FhcSearchbar from "../components/searchbar/searchbar.js";
 import CisMenu from "../components/Cis/Menu.js";
 import PluginsPhrasen from '../plugins/Phrasen.js';
 import ApiSearchbar from '../api/factory/searchbar.js';
-import Theme from "../plugin/Theme.js";
+import Theme from "../plugins/Theme.js";
 
 const app = Vue.createApp({
     name: 'CisApp',
diff --git a/public/js/apps/Dashboard/Fhc.js b/public/js/apps/Dashboard/Fhc.js
index b3ffa4315..473e1cf67 100644
--- a/public/js/apps/Dashboard/Fhc.js
+++ b/public/js/apps/Dashboard/Fhc.js
@@ -1,6 +1,6 @@
 import FhcDashboard from '../../components/Dashboard/Dashboard.js';
 import PluginsPhrasen from '../../plugins/Phrasen.js';
-import Theme from '../../plugin/Theme.js';
+import Theme from '../../plugins/Theme.js';
 import contrast from '../../directives/contrast.js';
 import {setScrollbarWidth} from "../../helpers/CssVarCalcHelpers.js";
 import LvPlan from "../../components/Cis/LvPlan/Lehrveranstaltung.js";
diff --git a/public/js/plugin/Theme.js b/public/js/plugins/Theme.js
similarity index 100%
rename from public/js/plugin/Theme.js
rename to public/js/plugins/Theme.js

From 49ddf568e101f9c7d89a571a5e6bd6ada3ed3d1f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 6 Aug 2025 08:46:02 +0200
Subject: [PATCH 535/572] filter component: keep column visibility on reload

---
 public/js/components/filter/Filter.js | 58 ++++++++++++++++++++++-----
 1 file changed, 49 insertions(+), 9 deletions(-)

diff --git a/public/js/components/filter/Filter.js b/public/js/components/filter/Filter.js
index fc4ed81c5..07f88cccc 100644
--- a/public/js/components/filter/Filter.js
+++ b/public/js/components/filter/Filter.js
@@ -91,7 +91,6 @@ export const CoreFilterCmpt = {
 			dataset: null,
 			datasetMetadata: null,
 			selectedFields: null,
-			notSelectedFields: null,
 			filterFields: null,
 
 			availableFilters: null,
@@ -103,6 +102,8 @@ export const CoreFilterCmpt = {
 			fetchCmptApiFunctionParams: null,
 			fetchCmptDataFetched: null,
 
+			fetchResult: null,
+
 			tabulator: null,
 			tableBuilt: false,
 			tabulatorHasSelector: false,
@@ -118,6 +119,11 @@ export const CoreFilterCmpt = {
 		};
 	},
 	computed: {
+		notSelectedFields() {
+			if (!this.fields || !this.selectedFields)
+				return null;
+			return this.fields.filter(x => this.selectedFields.indexOf(x) === -1)
+		},
 		filteredData() {
 			if (!this.dataset)
 				return [];
@@ -215,6 +221,32 @@ export const CoreFilterCmpt = {
 				await this.$p.loadCategory('ui');
 				placeholder = this.$p.t('ui/keineDatenVorhanden');
 			}
+
+			if (!this.tableOnly) {
+				// prefetch data to get fields & selectedFields for filteredColumns & filteredData
+				await new Promise(resolve => {
+					const filterId = window.location.hash ? window.location.hash.slice(1) : null;
+
+					const resolvePromiseFunc = data => {
+						this.setRenderData(data);
+						resolve();
+					};
+					// get the filter data
+					if (filterId === null)
+						this.startFetchCmpt(
+							wsParams => this.$api.call(ApiFilter.getFilter(wsParams)),
+							null,
+							resolvePromiseFunc
+						);
+					else
+						this.startFetchCmpt(
+							wsParams => this.$api.call(ApiFilter.getFilterById(wsParams)),
+							{ filterId },
+							resolvePromiseFunc
+						);
+				});
+			}
+
 			// Define a default tabulator options in case it was not provided
 			let tabulatorOptions = {...{
 					layout: "fitDataStretchFrozen",
@@ -236,6 +268,11 @@ export const CoreFilterCmpt = {
 			if (!this.tableOnly) {
 				tabulatorOptions.data = this.filteredData;
 				tabulatorOptions.columns = this.filteredColumns;
+			} else {
+				tabulatorOptions.columns.forEach(col => {
+					if (col.visible === undefined)
+						col.visible = true;
+				});
 			}
 
 			if (tabulatorOptions.selectable || (tabulatorOptions.columns && tabulatorOptions.columns.filter(el => el.formatter == 'rowSelection').length))
@@ -355,18 +392,14 @@ export const CoreFilterCmpt = {
 					this.render
 				);
 		},
-		/**
-		 *
-		 */
-		render(response) {
-			let data = response;
+		setRenderData(data) {
+			this.fetchResult = data;
 			this.filterName = data.filterName;
 			this.dataset = data.dataset;
 			this.datasetMetadata = data.datasetMetadata;
 
 			this.fields = data.fields;
 			this.selectedFields = data.selectedFields;
-			this.notSelectedFields = this.fields.filter(x => this.selectedFields.indexOf(x) === -1);
 			this.filterFields = [];
 
 			for (let i = 0; i < data.datasetMetadata.length; i++)
@@ -383,6 +416,14 @@ export const CoreFilterCmpt = {
 					}
 				}
 			}
+		},
+		/**
+		 *
+		 */
+		render(response) {
+			let data = response;
+
+			this.setRenderData(data);
 
 			// If the side menu is active
 			if (this.sideMenu === true)
@@ -623,11 +664,10 @@ export const CoreFilterCmpt = {
 		this.$emit('uuidDefined', this.uuid)
 	},
 	mounted() {
-
 		this.initTabulator().then(() => {
 			if (!this.tableOnly) {
 				this.selectedFilter = window.location.hash ? window.location.hash.slice(1) : null;
-				this.getFilter(); // get the filter data
+				this.render(this.fetchResult);
 			}
 		});
 

From 0605baf68f5bc9fef210b8827f8b95f8c51707cc Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Wed, 6 Aug 2025 10:45:37 +0200
Subject: [PATCH 536/572] capitalize tab phrases; style&phrase change for
 Attendance Check Date Datepicker; Picture col min width icrease so the title
 is readable in english;

---
 system/phrasesupdate.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 034e4aca5..01e4fcdfe 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -31767,7 +31767,7 @@ array(
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
-		'phrase' => 'kontrolldatum',
+		'phrase' => 'kontrolldatumV2',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
@@ -31778,7 +31778,7 @@ array(
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Attendance Check Date',
+				'text' => 'Check Date',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From 42a40072fa0eb741a767b3fb00dc9b3f272d7e46 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 6 Aug 2025 10:55:58 +0200
Subject: [PATCH 537/572] show all errors in one alert

- refactor Dropdown.js: use new factory for overwriting errors
- move functionaliy to show Errors and InfoAlerts to Api.js
- extend FhcAlert (primeVue) with slot for toast for ability to use html
---
 .../api/frontend/v1/stv/Status.php            |  7 +-
 .../Details/Status/Dropdown.js                | 49 +++++-------
 public/js/plugins/Api.js                      | 76 ++++++++++++++++++-
 public/js/plugins/FhcAlert.js                 | 19 +++--
 4 files changed, 110 insertions(+), 41 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Status.php b/application/controllers/api/frontend/v1/stv/Status.php
index fcc8007cd..7e649f3cf 100644
--- a/application/controllers/api/frontend/v1/stv/Status.php
+++ b/application/controllers/api/frontend/v1/stv/Status.php
@@ -24,7 +24,6 @@ class Status extends FHCAPI_Controller
 			'updateStatus' => ['admin:rw', 'assistenz:rw'],
 			'advanceStatus' => ['admin:rw', 'assistenz:rw'],
 			'confirmStatus' => ['admin:rw', 'assistenz:rw'],
-
 		]);
 
 		//Load Models
@@ -435,9 +434,10 @@ class Status extends FHCAPI_Controller
 		]);
 
 		if (!$this->form_validation->run())
+		{
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
 
-		
 		$this->load->library('PrestudentLib');
 
 		$this->db->trans_start();
@@ -623,8 +623,9 @@ class Status extends FHCAPI_Controller
 		]);
 
 		if (!$this->form_validation->run())
+		{
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
+		}
 
 		// Start DB transaction
 		$this->db->trans_start();
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
index ab8f83fab..cff6b2be6 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js
@@ -142,14 +142,15 @@ export default {
 			this.addStudent({status_kurzbz: 'student', statusgrund_id});
 		},
 		addStudent(data) {
-			Promise
-				.allSettled(
-					this.prestudentIds.map(prestudent_id => this.$api.call(
-						ApiStvStatus.addStudent(prestudent_id, data),
-						{ errorHeader: prestudent_id }
-					))
-				)
-				.then(res => this.showFeedback(res, data.status_kurzbz));
+			this.$api.call(this.prestudentIds.map(prestudent_id => [
+				prestudent_id,
+				ApiStvStatus.addStudent(prestudent_id, data),
+				{ errorHeader: prestudent_id }
+			]))
+			.then(() => {
+				this.$emit('reloadTable');
+				this.$reloadList();
+			});
 		},
 		changeStatusToAbbrecher(statusgrund_id) {
 			this
@@ -242,31 +243,15 @@ export default {
 			return askForSemester();
 		},
 		changeStatus(data) {
-			Promise
-				.allSettled(
-					this.prestudentIds.map(prestudent_id => this.$api.call(
-						ApiStvStatus.changeStatus(prestudent_id, data),
-						{ errorHeader: prestudent_id }
-					))
-				)
-				.then(res => this.showFeedback(res, data.status_kurzbz));
-		},
-		showFeedback(results, status_kurzbz) {
-			const countSuccess = results.filter(result => result.status == "fulfilled").length;
-			const countError = results.length - countSuccess;
-			
-			//Feedback Success als infoalert
-			this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
-				countSuccess,
-				status: status_kurzbz,
-				countError
-			}));
-
-			if(results.length == 1 && countSuccess > 0){
+			this.$api.call(this.prestudentIds.map(prestudent_id => [
+				prestudent_id,
+				ApiStvStatus.changeStatus(prestudent_id, data)
+			]))
+			.then(() => {
 				this.$emit('reloadTable');
-			}
-			this.$reloadList();
-		}
+				this.$reloadList();
+			});
+		},
 	},
 	created() {
 		this.$api
diff --git a/public/js/plugins/Api.js b/public/js/plugins/Api.js
index d0ffaa439..47139b79f 100644
--- a/public/js/plugins/Api.js
+++ b/public/js/plugins/Api.js
@@ -42,10 +42,13 @@ export default {
 		}
 
 		function _clean_return_value(response) {
+			if (typeof response.data === 'string' || response.data instanceof String)
+				return _clean_return_value({ data: response });
+
 			const result = response.data;
 			delete response.data;
 			if (!result.meta)
-				result.meta = {response};
+				result.meta = { response };
 			else
 				result.meta.response = response;
 			return result;
@@ -159,6 +162,77 @@ export default {
 				return fhcApiAxios.post(uri, data, config);
 			},
 			call(factory, configoverwrite, form) {
+				if (Array.isArray(factory)) {
+					const $fhcAlert = app.config.globalProperties.$fhcAlert;
+					const $api = app.config.globalProperties.$api;
+
+					Promise
+						.allSettled(factory.map((config, index) => {
+							if (Array.isArray(config))
+								return $api.call(config[1], {
+									errorHeader: config[0],
+									errorHandling: false
+								});
+							else
+								return $api.call(config, {
+									errorHeader: '#' + index,
+									errorHandling: false
+								});
+						}))
+						.then(res => {
+							// TODO(chris): obey form & configoverwrite
+							let messagesError = [];
+							let messagesSuccessful = [];
+
+							res.forEach(result => {
+								if (result.status === 'fulfilled') {
+									//console.log(JSON.parse(result.value.data));
+									const successTitle = "<dt>" + result.value.data + "</dt>";
+									messagesSuccessful.push(successTitle + "ok");
+								} else {
+									const errorTitle = "<dt>" + result.reason.config.errorHeader + "</dt>";
+									const errorMsg = JSON.parse(result.reason.request.response);
+									const fullMessage = errorMsg.errors.map(error => {
+										if (error.type == 'validation') {
+											// TODO(chris): do we want the keys?
+											return '<dd>' + Object.values(error.messages).join("</dd><dd>") + '</dd>';
+										}
+										// TODO(chris): other types
+										if (error.message)
+											return '<dd>' + error.message + '</dd>';
+										if (error.messages)
+											return '<dd>' + error.messages.join("\n") + '</dd>';
+										// TODO(chris): what to do here
+										return '<dd>' + "Generic Error" + '</dd>'; // TODO(chris): translate
+									}).join("\n");
+									messagesError.push(errorTitle + fullMessage);
+								}
+							});
+
+							if (messagesError.length)
+							{
+								const test = document.createElement('b');
+								$fhcAlert.alertDefault(
+									'error',
+									messagesError.length + " Fehler", // TODO(chris): translate
+									'<dl>' + messagesError.join("") + '</dl>',
+									true,
+									true
+								);
+							}
+							if (messagesSuccessful.length)
+							{
+								const test = document.createElement('b');
+								$fhcAlert.alertDefault(
+									'info',
+									'Feedback',
+								messagesSuccessful.length + " erfolgreiche Statusänderung(en) durchgeführt", // TODO(chris): translate
+									false,
+									true
+								);
+							}
+						});
+				}
 				let {method, url, params, config} = factory;
 				if (configoverwrite !== undefined) {
 					config = configoverwrite;
diff --git a/public/js/plugins/FhcAlert.js b/public/js/plugins/FhcAlert.js
index f90b61ac2..5d84b1de9 100644
--- a/public/js/plugins/FhcAlert.js
+++ b/public/js/plugins/FhcAlert.js
@@ -140,7 +140,16 @@ const helperApp = Vue.createApp({
 		}
 	},
 	template: /* html */`
-	<pv-toast ref="toast" class="fhc-alert" :base-z-index="99999"></pv-toast>
+	<pv-toast ref="toast" class="fhc-alert" :base-z-index="99999">
+		<template #message="{ message }">
+			<!--span :class="slotProps.iconClass"></span-->
+			<div class="p-toast-message-text">
+				<span class="p-toast-summary">{{ message.summary }}</span>
+				<div v-if="message.detail && message.html" class="p-toast-detail" v-html="message.detail"></div>
+				<div v-else-if="message.detail" class="p-toast-detail">{{ message.detail }}</div>
+			</div>
+		</template>
+	</pv-toast>
 	<pv-toast ref="alert" class="fhc-alert" :base-z-index="99999" position="center">
 		<template #message="slotProps">
 			<i class="fa fa-circle-exclamation fa-2xl mt-3"></i>
@@ -263,18 +272,18 @@ export default {
 					});
 				});
 			},
-			alertDefault(severity, title, message, sticky = false) {
-				let options = { severity: severity, summary: title, detail: message};
+			alertDefault(severity, title, message, sticky = false, html = false) {
+				let options = { severity: severity, summary: title, detail: message, html };
 				
 				if (!sticky)
 					options.life = 3000;
 
 				helperAppInstance.$refs.toast.add(options);
 			},
-			alertMultiple(messageArray, severity = 'info', title = 'Info', sticky = false){
+			alertMultiple(messageArray, severity = 'info', title = 'Info', sticky = false, html = false){
 				// Check, if array has only string values
 				if (messageArray.every(message => typeof message === 'string')) {
-					messageArray.forEach(message => this.alertDefault(severity, title, message, sticky));
+					messageArray.forEach(message => this.alertDefault(severity, title, message, sticky, html));
 					return true;
 				}
 				return false;

From c96db9f57337a7c621cfd0d7bdb1fbfda15dfcbe Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Wed, 6 Aug 2025 11:06:57 +0200
Subject: [PATCH 538/572] reworked StV favorites (only 1st tier version)

---
 .../api/frontend/v1/stv/Favorites.php         |  13 +-
 .../Stv/Studentenverwaltung/Verband.js        | 162 +++++++++---------
 system/phrasesupdate.php                      |  20 +++
 3 files changed, 110 insertions(+), 85 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Favorites.php b/application/controllers/api/frontend/v1/stv/Favorites.php
index b8fe6f3d7..ca8b62da6 100644
--- a/application/controllers/api/frontend/v1/stv/Favorites.php
+++ b/application/controllers/api/frontend/v1/stv/Favorites.php
@@ -35,8 +35,6 @@ class Favorites extends FHCAPI_Controller
 
 		// Load models
 		$this->load->model('system/Variable_model', 'VariableModel');
-
-		// TODO(chris): variable table might be to small to store favorites!
 	}
 
 	public function index()
@@ -62,6 +60,17 @@ class Favorites extends FHCAPI_Controller
 
 		$favorites = $this->input->post('favorites');
 
+		$removed = [];
+		while (strlen($favorites) > 64) {
+			$favObj = json_decode($favorites);
+			if (!$favObj->list)
+				break;
+			$removed[] = array_shift($favObj->list);
+			$favorites = json_encode($favObj);
+		}
+		if ($removed)
+			$this->addMeta('removed', $removed);
+
 		$result = $this->VariableModel->setVariable(getAuthUID(), 'stv_favorites', $favorites);
 
 		$this->getDataOrTerminateWithError($result);
diff --git a/public/js/components/Stv/Studentenverwaltung/Verband.js b/public/js/components/Stv/Studentenverwaltung/Verband.js
index 8ae2b6b40..762d92858 100644
--- a/public/js/components/Stv/Studentenverwaltung/Verband.js
+++ b/public/js/components/Stv/Studentenverwaltung/Verband.js
@@ -1,17 +1,9 @@
-import {CoreRESTClient} from '../../../RESTClient.js';
-
-
-import PvTree from "../../../../../index.ci.php/public/js/components/primevue/tree/tree.esm.min.js";
-import PvTreetable from "../../../../../index.ci.php/public/js/components/primevue/treetable/treetable.esm.min.js";
-import PvColumn from "../../../../../index.ci.php/public/js/components/primevue/column/column.esm.min.js";
-
 import ApiStvVerband from '../../../api/factory/stv/verband.js';
 
 export default {
 	components: {
-		PvTree,
-		PvTreetable,
-		PvColumn
+		PvTreetable: primevue.treetable,
+		PvColumn: primevue.column
 	},
 	emits: [
 		'selectVerband'
@@ -22,14 +14,15 @@ export default {
 			nodes: [],
 			selectedKey: [],
 			filters: {}, // TODO(chris): filter only 1st level?
-			favnodes: [],
 			favorites: {on: false, list: []}
 		}
 	},
 	computed: {
 		filteredNodes() {
-			// TODO(chris): what to display actually?
-			return this.favorites.on ? this.favnodes : this.nodes;
+			if (this.favorites.on)
+				return this.nodes.filter(node => this.favorites.list.includes(node.key));
+			
+			return this.nodes;
 		}
 	},
 	methods: {
@@ -102,69 +95,49 @@ export default {
 			return cp;
 		},
 		async filterFav() {
-			if (!this.favorites.on && !this.favnodes.length && this.favorites.list.length) {
-				this.loading = true;
-				this.favnodes = await this.loadNodes(this.favorites.list);
-			}
 			this.favorites.on = !this.favorites.on;
 			this.$api
 				.call(ApiStvVerband.favorites.set(
 					JSON.stringify(this.favorites)
-				));
-			this.loading = false;
-		},
-		async loadNodes(links) {
-			let sortedInParents = links.reduce((o, link) => {
-				link = link + '';
-				let parent,
-					parts = link.split('/');
-				if (parts.length == 1) {
-					parent = '_';
-				} else {
-					parts.pop();
-					parent = parts.join('/');
-				}
-				if (!o[parent])
-					o[parent] = [link];
-				else
-					o[parent].push(link);
-				return o;
-			}, {});
-			
-			let promises = [];
-			for (let parent in sortedInParents)
-				promises.push(
-					this.$api
-						.call(ApiStvVerband.get(parent == '_' ? '' : parent))
-						.then(res => res.data)
-						.then(res => res.filter(node => sortedInParents[parent].includes(node.link + '')))
-				);
-			
-			// NOTE(chris): merge the resulting arrays and transform them to an associative one
-			let result = [].concat.apply([], await Promise.all(promises)).reduce((o, node) => {
-				o[node.link + ''] = this.mapResultToTreeData({...node, leaf: true, children: undefined});
-				return o;
-			}, {});
-
-			return links.map(link => result[link]);
+				))
+				.then(result => {
+					if (result.meta?.removed) {
+						this.favorites.list = this.favorites.list
+							.filter(fav => !result.meta.removed.includes(fav));
+						const items = result.meta.removed.map(
+							rem => this.nodes.find(
+								node => node.data.link == rem
+							).label
+						).join(',\n');
+						this.$fhcAlert.alertWarning(this.$p.t('stv/warn_removed_favs', { items }));
+					}
+				});
 		},
 		async markFav(key) {
 			let index = this.favorites.list.indexOf(key.data.link + '');
 
 			if (index != -1) {
-				if (this.favnodes.length)
-					this.favnodes = this.favnodes.filter(node => node.data.link != key.data.link);
 				this.favorites.list.splice(index, 1);
 			} else {
-				if (this.favnodes.length || this.favorites.on)
-					this.favnodes.push((await this.loadNodes([key.data.link])).pop());
 				this.favorites.list.push(key.data.link + '');
 			}
 			
 			this.$api
 				.call(ApiStvVerband.favorites.set(
 					JSON.stringify(this.favorites)
-				));
+				))
+				.then(result => {
+					if (result.meta?.removed) {
+						this.favorites.list = this.favorites.list
+							.filter(fav => !result.meta.removed.includes(fav));
+						const items = "\n" + result.meta.removed.map(
+							rem => this.nodes.find(
+								node => node.data.link == rem
+							).label
+						).join(",\n");
+						this.$fhcAlert.alertWarning(this.$p.t('stv/warn_removed_favs', { items }));
+					}
+				});
 		},
 		unsetFavFocus(e) {
 			if (e.target.dataset?.linkFavAdd !== undefined) {
@@ -187,7 +160,10 @@ export default {
 		this.$api
 			.call(ApiStvVerband.get())
 			.then(result => {
-				this.nodes = result.data.map(this.mapResultToTreeData);
+				this.nodes = result.data.map(el => {
+					el.root = true;
+					return this.mapResultToTreeData(el);
+				});
 				this.loading = false;
 			})
 			.catch(this.$fhcAlert.handleSystemError);
@@ -196,21 +172,12 @@ export default {
 			.call(ApiStvVerband.favorites.get())
 			.then(result => {
 				if (result.data) {
-					let f = JSON.parse(result.data);
-					if (f.on) {
-						this.loading = true;
-						this.favorites = f;
-						this.loadNodes(this.favorites.list).then(res => {
-							this.favnodes = res;
-							this.loading = false;
-						});
-					} else
-						this.favorites = f;
+					this.favorites = JSON.parse(result.data);
 				}
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
-	template: `
+	template: /* html */`
 	<div class="overflow-auto" tabindex="-1">
 		<pv-treetable
 			ref="tree"
@@ -225,35 +192,64 @@ export default {
 			@focusin="setFavFocus"
 			@focusout="unsetFavFocus"
 			:filters="filters"
+		>
+			<pv-column
+				field="name"
+				expander
+				class="text-break"
 			>
-			<pv-column field="name" expander>
 				<template #header>
 					<div class="text-right">
 						<div class="p-input-icon-left">
 							<i class="pi pi-search"></i>
-							<input type="text" v-model="filters['global']" class="form-control ps-5" placeholder="Search" />
+							<input
+								type="text"
+								v-model="filters['global']"
+								class="form-control ps-5"
+								placeholder="Search"
+							>
 						</div>
 					</div>
 				</template>
-				<template #body="{node}">
-					<span :data-tree-item-key="node.key" :title="node.data.studiengang_kz">
+				<template #body="{ node }">
+					<span
+						:data-tree-item-key="node.key"
+						:title="node.data.studiengang_kz"
+					>
 						{{node.data.name}}
 					</span>
 				</template>
 			</pv-column>
-			<pv-column field="fav" headerStyle="flex: 0 0 auto" style="flex: 0 0 auto">
+			<pv-column
+				field="fav"
+				class="flex-shrink-0 flex-grow-0"
+				header-class="flex-shrink-0 flex-grow-0"
+			>
 				<template #header>
-					<a href="#" @click.prevent="filterFav"><i :class="favorites.on ? 'fa-solid' : 'fa-regular'" class="fa-star"></i></a>
-				</template>
-				<template #body="{node, column}">
 					<a
+						v-if="favorites.on || favorites.list.length"
+						href="#"
+						@click.prevent="filterFav"
+					>
+						<i
+							:class="favorites.on ? 'fa-solid' : 'fa-regular'"
+							class="fa-star"
+						></i>
+					</a>
+				</template>
+				<template #body="{ node }">
+					<a
+						v-if="node.data.root"
 						href="#"
-						@click.prevent="markFav(node)"
-						@keydown.enter.stop.prevent="markFav(node)"
 						tabindex="-1"
 						data-link-fav-add
-						>
-						<i :class="favorites.list.includes(node.data.link + '') ? 'fa-solid' : 'fa-regular'" class="fa-star"></i>
+						@click.prevent="markFav(node)"
+						@keydown.enter.stop.prevent="markFav(node)"
+					>
+						<i
+							:class="favorites.list.includes(node.data.link + '') ? 'fa-solid' : 'fa-regular'"
+							class="fa-star"
+						></i>
 					</a>
 				</template>
 			</pv-column>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b3af0d059..f653df2a1 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -36650,6 +36650,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'stv',
+		'phrase' => 'warn_removed_favs',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zu viele Favoriten! Die folgenden Einträge wurden entfernt: {items}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Too many favorites! The following entries were removed: {items}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'stv',

From 8104d77399105f9bd365482127216c5779ff5d81 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 6 Aug 2025 11:07:59 +0200
Subject: [PATCH 539/572] improve styling of deactivated lines in stv students
 list

---
 public/js/components/Stv/Studentenverwaltung/List.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js
index 5de57bf77..965395556 100644
--- a/public/js/components/Stv/Studentenverwaltung/List.js
+++ b/public/js/components/Stv/Studentenverwaltung/List.js
@@ -111,7 +111,7 @@ export default {
 				],
 				rowFormatter(row) {
 					if (row.getData().bnaktiv === false) {
-						row.getElement().classList.add('text-muted');
+						row.getElement().classList.add('text-black','text-opacity-50','fst-italic');
 					}
 				},
 
@@ -362,4 +362,4 @@ export default {
 		</div>
 		<list-new ref="new" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz"></list-new>
 	</div>`
-};
\ No newline at end of file
+};

From 9ad2198b02a09a9fd2253cdb79a59328806f1555 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 6 Aug 2025 11:14:37 +0200
Subject: [PATCH 540/572] update phrase Stundenplan => LV-Plan, Feiertag =>
 Ferien / Feiertag, Holiday => Holidays

---
 system/phrasesupdate.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 37a305a94..4a3cfd7ec 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -216,13 +216,13 @@ $phrases = array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Feiertag',
+				'text' => 'Ferien / Feiertag',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Holiday',
+				'text' => 'Holidays',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -40857,7 +40857,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Stundenplan',
+				'text' => 'LV-Plan',
 				'description' => '',
 				'insertvon' => 'system'
 			),

From 9e3ebca0a4c7de976a9eabb3f0db20fd59bf8d9d Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Aug 2025 09:20:24 +0200
Subject: [PATCH 541/572] fix vue warning duplicate attribute class

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

diff --git a/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js b/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
index d226e935a..79e3c8568 100644
--- a/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
+++ b/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js
@@ -8,7 +8,7 @@ export default {
 	},
 	template: `
 	<div class="cis-renderer-feiertage-calendar-event">
-		<i class="event-icon" class="fa-regular fa-calendar"></i>
+		<i class="event-icon fa-regular fa-calendar"></i>
 		<span class="event-title fw-bold text-center">{{ event.titel }}</span>
 	</div>`,
 };
\ No newline at end of file

From 954cd16d100aeab58e4d49f8fcbeb6d69badfb94 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Aug 2025 09:21:12 +0200
Subject: [PATCH 542/572] use getAktOrNextSemester to determine preselected
 semester

---
 application/controllers/api/frontend/v1/Studium.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php
index fb4d3ce3c..d17f0c1a1 100644
--- a/application/controllers/api/frontend/v1/Studium.php
+++ b/application/controllers/api/frontend/v1/Studium.php
@@ -58,8 +58,8 @@ class Studium extends FHCAPI_Controller
 		$parameter_semester = $this->input->get('semester',true);
 		$parameter_studienplan = $this->input->get('studienplan',true);
 
-		$aktuelles_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->getAkt()));
-		
+		$aktuelles_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->getAktOrNextSemester()));
+
 		if($this->getDataOrTerminateWithError($this->StudentModel->isStudent(getAuthUID()))){
 			$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $aktuelles_studiensemester->studiensemester_kurzbz]);
 			$studentLehrverband = current($this->getDataOrTerminateWithError($studentLehrverband));

From 8048b9d9c35328a9027680d8ce76c8a0b6212971 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Aug 2025 09:30:57 +0200
Subject: [PATCH 543/572] use light text color in language selector

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

diff --git a/public/js/components/Cis/Sprachen.js b/public/js/components/Cis/Sprachen.js
index b4db0315a..51dfa4669 100644
--- a/public/js/components/Cis/Sprachen.js
+++ b/public/js/components/Cis/Sprachen.js
@@ -23,7 +23,7 @@ export default {
 	template:/*html*/`
 	<div class="container">
 		<div class="row justify-content-center align-items-center flex-nowrap overflow-hidden">
-			<button v-for="lang in allActiveLanguages" @click.prevent="changeLanguage(lang.sprache)" class="col fhc-text sprachen-entry btn text-center w-100" :selected="$p.user_language.value==lang.sprache">{{lang.bezeichnung}}</button>
+			<button v-for="lang in allActiveLanguages" @click.prevent="changeLanguage(lang.sprache)" class="col fhc-text-light sprachen-entry btn text-center w-100" :selected="$p.user_language.value==lang.sprache">{{lang.bezeichnung}}</button>
 		</div>
 	</div>
 	`,

From 4f2499862fa66f1c072eae451dbc66be3b9d6834 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Aug 2025 09:45:19 +0200
Subject: [PATCH 544/572] scale height of images in news widget

---
 public/css/components/dashboard/news.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css
index 6b42f6160..4c4616aa5 100644
--- a/public/css/components/dashboard/news.css
+++ b/public/css/components/dashboard/news.css
@@ -103,7 +103,8 @@
 
 .widgets-news img
 {
-    max-width: 100%;
+	max-width: 100%;
+	height: auto;
 }
 
 .fhc-news-menu-item {

From 8494033bda777ba02cd258999f0c4143f36f9b95 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Aug 2025 13:35:47 +0200
Subject: [PATCH 545/572] CIS4 Dashboard: add workaround for chrome fireing
 event dragend when styles are manipulated during dragging

---
 public/js/components/Drop/Grid.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js
index 31bdeb74e..74d67e49d 100644
--- a/public/js/components/Drop/Grid.js
+++ b/public/js/components/Drop/Grid.js
@@ -408,16 +408,19 @@ export default {
 			
 			this.draggedItem = item;
 			
-			this.$emit('draggedItem',item);
-			
-			this.draggedNode = evt.target.closest(".drop-grid-item");
-			//clones the widget for the drag Image
-			let clone = evt.target.closest(".drop-grid-item")?.cloneNode(true);
-			
-			clone.style.zIndex = 5;
-			clone.classList.add("widgetClone");
-			this.$refs.container.appendChild(clone);
-			this.clonedWidget = clone;
+			this.$emit('draggedItem', item);
+			// workaround for chrome fireing event dragend when styles are manipulated during dragging
+			setTimeout(() => {
+				this.draggedNode = evt.target.closest(".drop-grid-item");
+				//clones the widget for the drag Image
+				let clone = evt.target.closest(".drop-grid-item")?.cloneNode(true);
+
+				clone.style.zIndex = 5;
+				clone.classList.add("widgetClone");
+				this.$refs.container.appendChild(clone);
+				this.clonedWidget = clone;
+			}, 0);
+
 			this.draggedOffset = [item.x - this.x, item.y - this.y];
 			this._dragStart(evt, item);
 		},

From d071d0d9febb0effe2d6f4dce0bf99d28f31de14 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Aug 2025 14:25:22 +0200
Subject: [PATCH 546/572] fix theme switch position in chrome based browsers

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

diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index ee1b671e6..f073d5a38 100644
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -117,7 +117,7 @@ export default {
     </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="nav-logo" class="d-none d-lg-block">
-		<div class="d-flex h-100">
+		<div class="d-flex h-100 justify-content-between">
 			<a :href="rootUrl">
 				<img :src="logoUrl" alt="Corporate Identity Logo">
 			</a>

From 73d269d54b2f8802d0907cf0c3c648b87834987a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Aug 2025 14:42:59 +0200
Subject: [PATCH 547/572] adapt media breakpoints for degree programs view

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

diff --git a/public/css/Cis4/Studium.css b/public/css/Cis4/Studium.css
index c0c58e1d0..cb249b5a4 100644
--- a/public/css/Cis4/Studium.css
+++ b/public/css/Cis4/Studium.css
@@ -3,13 +3,13 @@
 	gap: 1rem;
 }
 
-@media (min-width: 992px) {
+@media (min-width: 1440px) {
 	.lvUebersicht {
 		grid-template-columns: 1fr 1fr 1fr;
 	}
 }
 
-@media (max-width: 992px){
+@media (max-width: 1439px){
 	.lvUebersicht{
 		grid-template-columns: 1fr 1fr;
 	}
@@ -38,13 +38,13 @@
 
 }
 
-@media (min-width: 1200px) {
+@media (min-width: 1440px) {
 	.lvOptions {
 		grid-template-columns: 1fr 1fr 1fr 1fr;
 	}
 }
 
-@media (max-width: 1200px) {
+@media (max-width: 1439px) {
 	.lvOptions {
 		grid-template-columns: 1fr 1fr;
 	}

From b2d8b81ab5e5c25d96b46be6d0d42069dbde4be4 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 7 Aug 2025 15:30:04 +0200
Subject: [PATCH 548/572] Changes for Tab Notes - change layout to classicFas
 to enable input note with one click less - extend Tab component: add
 headerSuffix - show count of messages in header

---
 application/config/stv.php                    |  4 ++
 .../api/frontend/v1/stv/Config.php            |  7 +-
 application/core/Notiz_Controller.php         | 17 +++++
 public/js/api/factory/notiz/person.js         |  6 ++
 public/js/components/Notiz/Notiz.js           | 33 ++++++++--
 .../Studentenverwaltung/Details/Notizen.js    | 39 ++++++-----
 public/js/components/Tabs.js                  | 66 +++++++++++++------
 7 files changed, 128 insertions(+), 44 deletions(-)

diff --git a/application/config/stv.php b/application/config/stv.php
index 1fdd5b28a..30181d651 100644
--- a/application/config/stv.php
+++ b/application/config/stv.php
@@ -57,6 +57,10 @@ $config['tabs'] =
 			//if true, Anrechnungen can be added and edited in tab Anrechnungen
 			'editableAnrechnungen' => false,
 		],
+		'notes' => [
+			//if true, the count of Messages will be shown in the header of the Tab Messages
+			'showCountNotes' => true
+		]
 	];
 	
 // List of fields to show when ZGV_DOKTOR_ANZEIGEN is defined
diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index adf9f729e..935928c81 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -62,10 +62,15 @@ class Config extends FHCAPI_Controller
 			'component' => './Stv/Studentenverwaltung/Details/Details.js',
 			'config' => $config['details']
 		];
+
+		$showSuffix = $config['notes']['showCountNotes'] ?? false;
 		$result['notes'] = [
 			'title' => $this->p->t('stv', 'tab_notes'),
-			'component' => './Stv/Studentenverwaltung/Details/Notizen.js'
+			'component' => './Stv/Studentenverwaltung/Details/Notizen.js',
+			'config'	=> $config['notes'],
+			'showSuffix' => $showSuffix && ($config['notes']['showCountNotes'] ?? false)
 		];
+
 		$result['contact'] = [
 			'title' => $this->p->t('stv', 'tab_contact'),
 			'component' => './Stv/Studentenverwaltung/Details/Kontakt.js',
diff --git a/application/core/Notiz_Controller.php b/application/core/Notiz_Controller.php
index 472ac7669..c2bb03267 100644
--- a/application/core/Notiz_Controller.php
+++ b/application/core/Notiz_Controller.php
@@ -21,6 +21,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			'loadDokumente' => self::DEFAULT_PERMISSION_R,
 			'getMitarbeiter' => self::DEFAULT_PERMISSION_R,
 			'isBerechtigt' => self::DEFAULT_PERMISSION_R,
+			'getCountNotes' => self::DEFAULT_PERMISSION_R,
 		];
 		
 		if(!is_array($permissions))
@@ -459,4 +460,20 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		return $this->terminateWithSuccess($result);
 	}
 
+	public function getCountNotes($person_id)
+	{
+		$this->NotizzuordnungModel->addSelect('COUNT(*) AS anzahl', false);
+
+		$result = $this->NotizzuordnungModel->loadWhere(
+			array('person_id' => $person_id)
+		);
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		$anzahl = current(getData($result));
+		return $this->terminateWithSuccess($anzahl->anzahl ?: 0);
+	}
+
 }
\ No newline at end of file
diff --git a/public/js/api/factory/notiz/person.js b/public/js/api/factory/notiz/person.js
index 33b572d1a..c75e79acf 100644
--- a/public/js/api/factory/notiz/person.js
+++ b/public/js/api/factory/notiz/person.js
@@ -83,5 +83,11 @@ export default {
 			method: 'get',
 			url: 'api/frontend/v1/notiz/notizPerson/isBerechtigt/'
 		};
+	},
+	getCountNotes(person_id){
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/notiz/notizPerson/getCountNotes/' + person_id
+		};
 	}
 };
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 5a3944803..ab4230681 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -296,6 +296,7 @@ export default {
 				showId: false,
 				showLastupdate: false
 			},
+			newCount: null
 		}
 	},
 	methods: {
@@ -367,6 +368,7 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					window.scrollTo(0, 0);
+					this.getCountNotes();
 				});
 		},
 		deleteNotiz(notiz_id) {
@@ -381,6 +383,7 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					window.scrollTo(0, 0);
+					this.getCountNotes();
 				});
 		},
 		loadNotiz(notiz_id) {
@@ -424,6 +427,7 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					window.scrollTo(0, 0);
+					this.getCountNotes();
 				});
 		},
 		reload() {
@@ -464,7 +468,6 @@ export default {
 				});
 		},
 		initTinyMCE() {
-
 			const vm = this;
 			tinymce.init({
 				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
@@ -503,15 +506,30 @@ export default {
 				this.showVariables[columnToShow] = true;
 			});
 		},
+		getCountNotes(){
+			return this.$api
+				.call(this.endpoint.getCountNotes(this.id))
+				.then(
+					result => {
+						this.newCount = result.data;
+						this.$nextTick(() => {
+							this.$emit('updateCount', this.newCount);
+						});
+					})
+				.catch(this.$fhcAlert.handleSystemError);
+		}
 	},
 	created() {
 		this.initializeShowVariables();
 		this.getUid();
 	},
 	async mounted() {
-		if(this.showTinyMce){
-			this.initTinyMCE();
+		if (this.showTinyMce) {
+			await this.initTinyMCE();
 		}
+		this.$nextTick(() => {
+			this.getCountNotes();
+		});
 	},
 	watch: {
 		//watcher für Tinymce-Textfeld
@@ -548,16 +566,17 @@ export default {
 			this.reload();
 		}
 	},
-	beforeDestroy() {
-		if(this.showTinyMce) {
-			this.editor.destroy();
+	beforeUnmount() {
+		if (this.editor && tinymce.get(this.editor.id)) {
+			tinymce.get(this.editor.id).remove();
+			this.editor = null;
 		}
 	},
 	template: `
 	<div class="core-notiz">
 	
 		<div v-if="notizLayout=='classicFas'">
-		
+
 			<core-filter-cmpt
 				ref="table"
 				:tabulator-options="tabulatorOptions"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index d5f9174d2..6d7033012 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -12,26 +12,35 @@ export default {
 	},
 	data() {
 		return {
-			endpoint: ApiNotizPerson
+			endpoint: ApiNotizPerson,
+			countNotiz: ''
 		};
 	},
+	methods: {
+		updateCountNotes(countNew){
+			this.headerSuffix = "(" +  countNew + ")";
+			this.$emit('update:suffix', this.headerSuffix);
+		}
+	},
 	template: `
 	<div class="stv-details-notizen h-100 pb-3">
-<!--	mit factory als endpoint	-->
-		<core-notiz
-			class="overflow-hidden"
-			:endpoint="endpoint"
-			ref="formc"
-			notiz-layout="popupModal"
-			type-id="person_id"
-			:id="modelValue.person_id"
-			show-document
-			show-tiny-mce
-			:visible-columns="['titel','text','verfasser','bearbeiter','dokumente']"
-			>
-		</core-notiz>
-		
 	
+
+<!--	Test Version classicFas for enter with one click vs popupModal-->
+	<core-notiz
+		class="overflow-hidden"
+		:endpoint="endpoint"
+		ref="formc"
+		notiz-layout="classicFas"
+		type-id="person_id"
+		:id="modelValue.person_id"
+		show-document
+		show-tiny-mce
+		:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
+		@updateCount="updateCountNotes"
+		>
+</core-notiz>
+
 <!--		
 ---------------------------------------------------------------------------------------------
 -------------------- DESCRIPTION FOR PARAMETER PROPS ----------------------------------------
diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index 5c2a5a3d9..349fcf01c 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -14,7 +14,7 @@ export default {
 	emits: [
 		'update:modelValue',
 		'change',
-		'changed'
+		'changed',
 	],
 	props: {
 		config: {
@@ -40,7 +40,7 @@ export default {
 		currentTab() {
 			if (this.tabs[this.current])
 				return this.tabs[this.current];
-			
+
 			return { component: 'div' };
 		},
 		value: {
@@ -97,13 +97,19 @@ export default {
 				if (!item.component)
 					return console.error('Component missing for ' + key);
 
+				//making it reactive for showing headerSuffix
+				const value = Vue.reactive({
+					suffix: '',
+					showSuffix: item.showSuffix || false
+				});
+
 				tabs[key] = {
 					component: Vue.markRaw(Vue.defineAsyncComponent(() => import(item.component))),
 					title: Vue.computed(() => item.title || key),
 					config: item.config,
 					key,
-					value: {}
-				}
+					value
+				};
 			}
 
 			if (Array.isArray(config))
@@ -118,6 +124,11 @@ export default {
 					this.current = Object.keys(tabs)[0];
 			}
 			this.tabs = tabs;
+		},
+		updateSuffix(event) {
+			if (this.currentTab?.value) {
+				this.currentTab.value.suffix = event;
+			}
 		}
 	},
 	created() {
@@ -126,28 +137,34 @@ export default {
 	template: `
 	<template v-if="useprimevue">
 
-	<tabview 
-		:scrollable="true" 
-		:lazy="true"
-		:activeIndex="calcActiveIndex"
-		@tab-click="handleTabClick"
-	>
-		<tabpanel 
-			v-for="tab in tabs" 
-			:key="tab.key" 
-			:header="tab.title"
+		<tabview 
+			:scrollable="true"
+			:lazy="true"
+			:activeIndex="calcActiveIndex"
+			@tab-click="handleTabClick"
 		>
-			<keep-alive>
-				<component :is="tab.component" v-model="value" :config="tab.config"></component>
-			</keep-alive>
-		</tabpanel>
-	</tabview>
+			<tabpanel
+				v-for="tab in tabs"
+				:key="tab.key"
+				:header="tab.title + (tab.value.showSuffix && tab.value.suffix ? tab.value.suffix : '')"
+			>
+				<keep-alive>
+					<component
+						:is="tab.component"
+						v-model="value"
+						:config="tab.config"
+						@update:suffix="updateSuffix($event)"
+						></component>
+				</keep-alive>
+			</tabpanel>
+		</tabview>
 
 	</template>
 	<template v-else="">
 
 	<div class="fhc-tabs d-flex" :class="vertical ? 'align-items-stretch gap-3' : (border ? 'flex-column' : 'flex-column gap-3')" v-if="Object.keys(tabs).length">
 		<div class="nav" :class="vertical ? 'nav-pills flex-column' : 'nav-tabs'">
+
 			<div
 				v-for="tab in tabs"
 				:key="tab.key"
@@ -157,15 +174,22 @@ export default {
 				:aria-current="tab.key == current ? 'page' : ''"
 				v-accessibility:tab.[vertical]
 				>
-				{{tab.title}}
+				{{tab.title}} <span v-if="tab.value.showSuffix && tab.value.suffix"> {{ tab.value.suffix }}</span>
 			</div>
 		</div>
 		<div :style="vertical ? '' : 'flex: 1 1 0%; height: 0%'" class="overflow-auto flex-grow-1" :class="vertical || !border ? '' : 'p-3 border-bottom border-start border-end'">
 			<keep-alive>
-				<component ref="current" :is="currentTab.component" v-model="value" :config="currentTab.config"></component>
+				<component
+					ref="current"
+					:is="currentTab.component"
+					v-model="value"
+					:config="currentTab.config"
+					@update:suffix="updateSuffix($event)"
+					></component>
 			</keep-alive>
 		</div>
 	</div>
 
 	</template>`
 };
+

From 8c797fb212eca6e940a5c348cb8b259d71f38f94 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 7 Aug 2025 15:34:23 +0200
Subject: [PATCH 549/572] Personal LVPlan: generate download links also for
 employees not only for students

---
 .../controllers/api/frontend/v1/AuthInfo.php  | 20 ++++++++++++++++++-
 public/js/api/authinfo.js                     |  7 ++++++-
 public/js/api/factory/authinfo.js             |  6 ++++++
 public/js/components/Cis/LvPlan/Personal.js   | 20 +++++++++++++++----
 4 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/application/controllers/api/frontend/v1/AuthInfo.php b/application/controllers/api/frontend/v1/AuthInfo.php
index 1362aee18..72f396b4f 100644
--- a/application/controllers/api/frontend/v1/AuthInfo.php
+++ b/application/controllers/api/frontend/v1/AuthInfo.php
@@ -20,6 +20,10 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 class AuthInfo extends FHCAPI_Controller
 {
+	protected $uid;
+	protected $pid;
+	protected $isMitarbeiter;
+	protected $isStudent;
 
 	/**
 	 * Object initialization
@@ -28,10 +32,16 @@ class AuthInfo extends FHCAPI_Controller
 	{
 		parent::__construct([
 			'getAuthUID' => self::PERM_LOGGED,
+			'getAuthInfo' => self::PERM_LOGGED,
 		]);
 
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+
 		$this->uid = getAuthUID();
 		$this->pid = getAuthPersonID();
+		$this->isMitarbeiter = getData($this->MitarbeiterModel->isMitarbeiter($this->uid)) ?? false;
+		$this->isStudent = getData($this->StudentModel->isStudent($this->uid)) ?? false;
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -47,6 +57,14 @@ class AuthInfo extends FHCAPI_Controller
 		$this->terminateWithSuccess(['uid'=>$this->uid]);
 	}
 	
-	
+	public function getAuthInfo()
+	{
+		$data = (object) array(
+				'uid' => $this->uid,
+				'isMitarbeiter' => $this->isMitarbeiter,
+				'isStudent' => $this->isStudent
+		);
+		$this->terminateWithSuccess($data);
+	}
 }
 
diff --git a/public/js/api/authinfo.js b/public/js/api/authinfo.js
index 618cf2e26..cb79ac144 100644
--- a/public/js/api/authinfo.js
+++ b/public/js/api/authinfo.js
@@ -6,5 +6,10 @@ export default {
 			{ }
 		);
 	},
-	
+	getAuthInfo() {
+		return this.$fhcApi.get(
+			'/api/frontend/v1/AuthInfo/getAuthInfo',
+			{}
+		);
+	},
 };
\ No newline at end of file
diff --git a/public/js/api/factory/authinfo.js b/public/js/api/factory/authinfo.js
index 5cf88604f..80cec2649 100644
--- a/public/js/api/factory/authinfo.js
+++ b/public/js/api/factory/authinfo.js
@@ -21,5 +21,11 @@ export default {
 			method: 'get',
 			url: '/api/frontend/v1/AuthInfo/getAuthUID'
 		};
+	},
+	getAuthInfo() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/AuthInfo/getAuthInfo'
+		};
 	}
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/LvPlan/Personal.js b/public/js/components/Cis/LvPlan/Personal.js
index 5c4be5c23..f6fd462da 100644
--- a/public/js/components/Cis/LvPlan/Personal.js
+++ b/public/js/components/Cis/LvPlan/Personal.js
@@ -19,7 +19,9 @@ export default {
 			studiensemester_kurzbz: null,
 			studiensemester_start: null,
 			studiensemester_ende: null,
-			uid: null
+			uid: null,
+			isMitarbeiter: false,
+			isStudent: false
 		};
 	},
 	computed:{
@@ -36,7 +38,15 @@ export default {
 		downloadLinks() {
 			if (!this.studiensemester_start || !this.studiensemester_ende || !this.uid)
 				return false;
-			
+
+			let type = false;
+			type = this.isStudent ? 'student' : type;
+			type = this.isMitarbeiter ? 'lektor' : type;
+			if (false === type)
+			{
+				return;
+			}
+
 			const opts = { zone: this.viewData.timezone };
 			const start = luxon.DateTime
 				.fromISO(this.studiensemester_start, opts)
@@ -47,7 +57,7 @@ export default {
 
 			const download_link = FHC_JS_DATA_STORAGE_OBJECT.app_root
 				+ 'cis/private/lvplan/stpl_kalender.php'
-				+ '?type=student'
+				+ '?type=' + type
 				+ '&pers_uid=' + this.uid
 				+ '&begin=' + start
 				+ '&ende=' + ende;
@@ -96,9 +106,11 @@ export default {
 	},
 	created() {
 		this.$api
-			.call(ApiAuthinfo.getAuthUID())
+			.call(ApiAuthinfo.getAuthInfo())
 			.then(res => {
 				this.uid = res.data.uid;
+				this.isMitarbeiter = res.data.isMitarbeiter;
+				this.isStudent = res.data.isStudent;
 			});
 	},
 	template: /*html*/`

From 04cce2af4cb03be8cda3ab2af81f2a9b60eb1c11 Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 8 Aug 2025 12:26:39 +0200
Subject: [PATCH 550/572] CSS fix primevue box-sizing

---
 public/css/components/primevue.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/css/components/primevue.css b/public/css/components/primevue.css
index fbbae4e58..8af7b8049 100644
--- a/public/css/components/primevue.css
+++ b/public/css/components/primevue.css
@@ -3973,6 +3973,9 @@
   border-bottom-right-radius: 4px;
   border-bottom-left-radius: 4px;
 }
+.p-tabview-panel * {
+  box-sizing: initial;
+}
 
 .p-toolbar {
   background: #efefef;

From f6432cdcd05322ae500017dbd1ce56ded3d6548a Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Fri, 8 Aug 2025 12:26:51 +0200
Subject: [PATCH 551/572] accummulate multiple setFeedback calls in
 Form/Valdation

---
 public/js/components/Form/Validation.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/js/components/Form/Validation.js b/public/js/components/Form/Validation.js
index 75fd7d724..530f6b514 100644
--- a/public/js/components/Form/Validation.js
+++ b/public/js/components/Form/Validation.js
@@ -23,7 +23,8 @@ export default {
 			if (!Array.isArray(feedback))
 				feedback = [feedback];
 			const ts = Date.now();
-			this.feedback[valid ? 'success' : 'danger'] = feedback.map(msg => [msg, ts]);
+			this.feedback[valid ? 'success' : 'danger']
+				.push(...feedback.map(msg => [msg, ts]));
 		}
 	},
 	mounted() {

From c109d844924a12f199bdf4a5988a5207ef283aec Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 11 Aug 2025 10:13:42 +0200
Subject: [PATCH 552/572] Tab Details: bugfix: show Zugangscode

---
 application/controllers/api/frontend/v1/stv/Student.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 17cec8b26..c789d7369 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -104,6 +104,7 @@ class Student extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('p.staatsbuergerschaft');
 		$this->PrestudentModel->addSelect('p.matr_nr');
 		$this->PrestudentModel->addSelect('p.anrede');
+		$this->PrestudentModel->addSelect('p.zugangscode');
 
 		if (defined('ACTIVE_ADDONS') && strpos(ACTIVE_ADDONS, 'bewerbung') !== false) {
 			$this->PrestudentModel->addSelect(

From c8c3361783843f69ea1995fe403ecd1a3d6f0ae8 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 11 Aug 2025 11:26:01 +0200
Subject: [PATCH 553/572] use getAktOrNextSemester instead of getNearest to use
 next semester in summer

---
 application/controllers/api/frontend/v1/stv/Student.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 2518e9af9..ac09f39bb 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -159,7 +159,7 @@ class Student extends FHCAPI_Controller
 	{
 		$laufendesStudiensemester = '';
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$result = $this->StudiensemesterModel->getNearest();
+		$result = $this->StudiensemesterModel->getAktOrNextSemester();
 		if(hasData($result)) {
 			$laufendesStudiensemester = (getData($result))[0]->studiensemester_kurzbz;
 		}

From 3fad0fd69a03d68d24d6ac519bc2f1cf8065a13f Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 11 Aug 2025 13:00:26 +0200
Subject: [PATCH 554/572] CSS fix primevue/bootstrap box-sizing

---
 public/css/components/primevue.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/css/components/primevue.css b/public/css/components/primevue.css
index 8af7b8049..5949d6ecc 100644
--- a/public/css/components/primevue.css
+++ b/public/css/components/primevue.css
@@ -3973,8 +3973,9 @@
   border-bottom-right-radius: 4px;
   border-bottom-left-radius: 4px;
 }
-.p-tabview-panel * {
-  box-sizing: initial;
+.p-tabview-panel .btn-close,
+.p-tabview-panel .carousel-indicators [data-bs-target] {
+  box-sizing: content-box;
 }
 
 .p-toolbar {

From 57bc4d7b9230e25801a4939db2ef60af7205bd62 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 12 Aug 2025 08:51:55 +0200
Subject: [PATCH 555/572] load phraseslib in students

---
 application/controllers/api/frontend/v1/stv/Students.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php
index 12785d6d7..26b5000bb 100644
--- a/application/controllers/api/frontend/v1/stv/Students.php
+++ b/application/controllers/api/frontend/v1/stv/Students.php
@@ -45,6 +45,13 @@ class Students extends FHCAPI_Controller
 
 		// Load Libraries
 		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$this->load->library('PhrasesLib');
+		$this->loadPhrases(
+			array(
+				'lehre'
+			)
+		);
+
 	}
 
 	/**

From 50b2334e5cbe76005c72ed275a3c031b3b2b05db Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 13 Aug 2025 10:38:30 +0200
Subject: [PATCH 556/572] work in progess, calc tabs title suffix when
 component is not rendered

---
 .../api/frontend/v1/stv/Config.php            |  3 ++-
 public/js/components/Notiz/Notiz.js           |  3 +++
 public/js/components/Tabs.js                  | 22 ++++++++++++++++---
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index 935928c81..a6a66e670 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -68,7 +68,8 @@ class Config extends FHCAPI_Controller
 			'title' => $this->p->t('stv', 'tab_notes'),
 			'component' => './Stv/Studentenverwaltung/Details/Notizen.js',
 			'config'	=> $config['notes'],
-			'showSuffix' => $showSuffix && ($config['notes']['showCountNotes'] ?? false)
+			'showSuffix' => $showSuffix && ($config['notes']['showCountNotes'] ?? false),
+			'suffixhelper' => APP_ROOT . 'public/js/components/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js'
 		];
 
 		$result['contact'] = [
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index ab4230681..03e3d0c4a 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -517,6 +517,9 @@ export default {
 						});
 					})
 				.catch(this.$fhcAlert.handleSystemError);
+		},
+		getSuffix() {
+			return '(bhtest)';
 		}
 	},
 	created() {
diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index 349fcf01c..e52c724b3 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -67,9 +67,9 @@ export default {
 		}
 	},
 	methods: {
-		handleTabClick: function(index) {
+		handleTabClick: function (e) {
 			let keys = Object.keys(this.tabs);
-			this.change(keys[index]);
+			this.change(keys[e.index]);
 		},
 		change(key) {
 			this.$emit("change", key)
@@ -108,8 +108,24 @@ export default {
 					title: Vue.computed(() => item.title || key),
 					config: item.config,
 					key,
-					value
+					value,
+					suffixhelper: null
 				};
+
+				const fetchhelper = async function (tab, item) {
+					if (!item.showSuffix)
+						return null;
+
+					const mod = await import(item.suffixhelper);
+					tab.suffixhelper = mod.getSuffix;
+					// TODO call suffixhelper with modelValue - but modelValue not defined in this scope
+					/*
+					tab.suffixhelper(modelValue).then((response) => {
+						tab.value.suffix = response.data;
+					});
+					 */
+				};
+				fetchhelper(tabs[key], item);
 			}
 
 			if (Array.isArray(config))

From d4f5a7c92f8d9948b1fa07502d923cfb9443d0f7 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 13 Aug 2025 16:37:28 +0200
Subject: [PATCH 557/572] add missing helper js file

---
 .../Details/Notizen/NotizenSuffixHelper.js                | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 public/js/components/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js
new file mode 100644
index 000000000..4fef188eb
--- /dev/null
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js
@@ -0,0 +1,8 @@
+import ApiNotizPerson from '../../../../../api/factory/notiz/person.js';
+
+export async function getSuffix(modelValue) {
+	const response = await this.$api
+		.call(ApiNotizPerson.getCountNotes(modelValue.person_id));
+	const suffix = ' (' + response.data + ')';
+	return suffix;
+}
\ No newline at end of file

From e11ff91b53e1f1d78bbcdadbe80619e57696128c Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 13 Aug 2025 18:45:58 +0200
Subject: [PATCH 558/572] use (:any) for studiengang_kz since it can be
 negative

---
 application/config/routes.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index 360005db7..a255321b2 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -87,22 +87,22 @@ $route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-
 $route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$5';
 
 // (studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe)
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsSpezialgruppe/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsSpezialgruppe/$1/$2/$3/$4';
 
 // (studiensemester_kurzbz)/(studiengang_kz)[/(semester)[/(verband)[/(gruppe)]]]
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/(:num)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4/$5';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/(:num)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4/$5';
 
 // (studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)/grp/(gruppe)
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgformSpezialgruppe/$1/$2/$3/$4/$5';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/([A-Z]{2,3})/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgformSpezialgruppe/$1/$2/$3/$4/$5';
 
 // (studiensemester_kurzbz)/(studiengang_kz)/(orgform)[/(semester)[/(verband)[/(gruppe)]]]
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:num)/([A-Z]{2,3})/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5/$6';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/([A-Z]{2,3})'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/([A-Z]{2,3})/(:num)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/([A-Z]{2,3})/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/([A-Z]{2,3})/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5/$6';
 
 // // (studiensemester_kurzbz)/uid/(uid)
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/uid/(:any)'] = 'api/frontend/v1/stv/Students/getStudent/$1/$2';
@@ -131,4 +131,4 @@ if ($dirlist)
 			}
 		}
 	}
-}
\ No newline at end of file
+}

From a51f587da71a988e8db0ce6967a4bfca37278954 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 14 Aug 2025 10:29:16 +0200
Subject: [PATCH 559/572] match negative studiengang_kz explicitly

---
 application/config/routes.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index a255321b2..da3a45f03 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -87,22 +87,22 @@ $route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-
 $route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$5';
 
 // (studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe)
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsSpezialgruppe/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsSpezialgruppe/$1/$2/$3/$4';
 
 // (studiensemester_kurzbz)/(studiengang_kz)[/(semester)[/(verband)[/(gruppe)]]]
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/(:num)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4/$5';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudents/$1/$2/$3/$4/$5';
 
 // (studiensemester_kurzbz)/(studiengang_kz)/(orgform)/(semester)/grp/(gruppe)
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/([A-Z]{2,3})/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgformSpezialgruppe/$1/$2/$3/$4/$5';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgformSpezialgruppe/$1/$2/$3/$4/$5';
 
 // (studiensemester_kurzbz)/(studiengang_kz)/(orgform)[/(semester)[/(verband)[/(gruppe)]]]
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/([A-Z]{2,3})'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/([A-Z]{2,3})/(:num)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/([A-Z]{2,3})/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(:any)/([A-Z]{2,3})/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5/$6';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})/(:num)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})/(:num)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/([A-Z]{2,3})/(:num)/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsOrgform/$1/$2/$3/$4/$5/$6';
 
 // // (studiensemester_kurzbz)/uid/(uid)
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/uid/(:any)'] = 'api/frontend/v1/stv/Students/getStudent/$1/$2';

From 1092463beb20c520500b2cdac16c2d40970c6738 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 14 Aug 2025 15:23:42 +0200
Subject: [PATCH 560/572] show count of notes in tab title

---
 .../api/frontend/v1/stv/Config.php            |  5 +-
 public/js/components/Notiz/Notiz.js           | 24 +---------
 .../Studentenverwaltung/Details/Notizen.js    |  8 +---
 public/js/components/Tabs.js                  | 47 ++++++++++---------
 .../Details/Notizen/NotizenSuffixHelper.js    |  6 +--
 5 files changed, 33 insertions(+), 57 deletions(-)
 rename public/js/{components => helpers}/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js (55%)

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index a6a66e670..2fb436384 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -63,13 +63,12 @@ class Config extends FHCAPI_Controller
 			'config' => $config['details']
 		];
 
-		$showSuffix = $config['notes']['showCountNotes'] ?? false;
 		$result['notes'] = [
 			'title' => $this->p->t('stv', 'tab_notes'),
 			'component' => './Stv/Studentenverwaltung/Details/Notizen.js',
 			'config'	=> $config['notes'],
-			'showSuffix' => $showSuffix && ($config['notes']['showCountNotes'] ?? false),
-			'suffixhelper' => APP_ROOT . 'public/js/components/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js'
+			'showSuffix' => ($config['notes']['showCountNotes'] ?? false),
+			'suffixhelper' => APP_ROOT . 'public/js/helpers/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js'
 		];
 
 		$result['contact'] = [
diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js
index 03e3d0c4a..58168fbc7 100644
--- a/public/js/components/Notiz/Notiz.js
+++ b/public/js/components/Notiz/Notiz.js
@@ -295,8 +295,7 @@ export default {
 				showType_id: false,
 				showId: false,
 				showLastupdate: false
-			},
-			newCount: null
+			}
 		}
 	},
 	methods: {
@@ -368,7 +367,6 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					window.scrollTo(0, 0);
-					this.getCountNotes();
 				});
 		},
 		deleteNotiz(notiz_id) {
@@ -383,7 +381,6 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					window.scrollTo(0, 0);
-					this.getCountNotes();
 				});
 		},
 		loadNotiz(notiz_id) {
@@ -427,7 +424,6 @@ export default {
 				.catch(this.$fhcAlert.handleSystemError)
 				.finally(() => {
 					window.scrollTo(0, 0);
-					this.getCountNotes();
 				});
 		},
 		reload() {
@@ -505,21 +501,6 @@ export default {
 				const columnToShow = "show" + column.charAt(0).toUpperCase() + column.slice(1);
 				this.showVariables[columnToShow] = true;
 			});
-		},
-		getCountNotes(){
-			return this.$api
-				.call(this.endpoint.getCountNotes(this.id))
-				.then(
-					result => {
-						this.newCount = result.data;
-						this.$nextTick(() => {
-							this.$emit('updateCount', this.newCount);
-						});
-					})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
-		getSuffix() {
-			return '(bhtest)';
 		}
 	},
 	created() {
@@ -530,9 +511,6 @@ export default {
 		if (this.showTinyMce) {
 			await this.initTinyMCE();
 		}
-		this.$nextTick(() => {
-			this.getCountNotes();
-		});
 	},
 	watch: {
 		//watcher für Tinymce-Textfeld
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index 6d7033012..ea6776dce 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -16,12 +16,6 @@ export default {
 			countNotiz: ''
 		};
 	},
-	methods: {
-		updateCountNotes(countNew){
-			this.headerSuffix = "(" +  countNew + ")";
-			this.$emit('update:suffix', this.headerSuffix);
-		}
-	},
 	template: `
 	<div class="stv-details-notizen h-100 pb-3">
 	
@@ -37,7 +31,7 @@ export default {
 		show-document
 		show-tiny-mce
 		:visibleColumns="['titel','text','verfasser','bearbeiter','dokumente']"
-		@updateCount="updateCountNotes"
+		@reload="$emit('update:suffix')"
 		>
 </core-notiz>
 
diff --git a/public/js/components/Tabs.js b/public/js/components/Tabs.js
index e52c724b3..aedd5c1c9 100644
--- a/public/js/components/Tabs.js
+++ b/public/js/components/Tabs.js
@@ -14,7 +14,7 @@ export default {
 	emits: [
 		'update:modelValue',
 		'change',
-		'changed',
+		'changed'
 	],
 	props: {
 		config: {
@@ -109,23 +109,8 @@ export default {
 					config: item.config,
 					key,
 					value,
-					suffixhelper: null
+					suffixhelper: item.suffixhelper ?? null
 				};
-
-				const fetchhelper = async function (tab, item) {
-					if (!item.showSuffix)
-						return null;
-
-					const mod = await import(item.suffixhelper);
-					tab.suffixhelper = mod.getSuffix;
-					// TODO call suffixhelper with modelValue - but modelValue not defined in this scope
-					/*
-					tab.suffixhelper(modelValue).then((response) => {
-						tab.value.suffix = response.data;
-					});
-					 */
-				};
-				fetchhelper(tabs[key], item);
 			}
 
 			if (Array.isArray(config))
@@ -141,15 +126,35 @@ export default {
 			}
 			this.tabs = tabs;
 		},
-		updateSuffix(event) {
-			if (this.currentTab?.value) {
-				this.currentTab.value.suffix = event;
+		updateSuffix() {
+			this.getTabSuffix(this.currentTab);
+		},
+		async getTabSuffix(tab) {
+			if (!tab.value.showSuffix) {
+				return;
 			}
+
+			if (tab.suffixhelper !== null) {
+				const suffixhelper = await import(tab.suffixhelper);
+				const suffix = await suffixhelper.getSuffix(this.$api, this.modelValue);
+				tab.value.suffix = suffix;
+			} else {
+				tab.value.suffix = '';
+			}
+		},
+		getTabSuffixes() {
+			Object.entries(this.tabs).forEach(([key, item]) => this.getTabSuffix(item));
 		}
 	},
 	created() {
 		this.initConfig(this.config);
 	},
+	mounted() {
+		this.getTabSuffixes();
+	},
+	updated() {
+		this.getTabSuffixes();
+	},
 	template: `
 	<template v-if="useprimevue">
 
@@ -162,7 +167,7 @@ export default {
 			<tabpanel
 				v-for="tab in tabs"
 				:key="tab.key"
-				:header="tab.title + (tab.value.showSuffix && tab.value.suffix ? tab.value.suffix : '')"
+				:header="tab.title + ((tab.value.showSuffix && tab.value.suffix !== '') ? ' ' + tab.value.suffix : '')"
 			>
 				<keep-alive>
 					<component
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js b/public/js/helpers/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js
similarity index 55%
rename from public/js/components/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js
rename to public/js/helpers/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js
index 4fef188eb..541570645 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js
+++ b/public/js/helpers/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js
@@ -1,8 +1,8 @@
 import ApiNotizPerson from '../../../../../api/factory/notiz/person.js';
 
-export async function getSuffix(modelValue) {
-	const response = await this.$api
+export async function getSuffix(api, modelValue) {
+	const response = await api
 		.call(ApiNotizPerson.getCountNotes(modelValue.person_id));
-	const suffix = ' (' + response.data + ')';
+	const suffix = '(' + response.data + ')';
 	return suffix;
 }
\ No newline at end of file

From aaf9e8c8850c0efd42f2d14defa3ad3cd4f53c51 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 14 Aug 2025 16:16:53 +0200
Subject: [PATCH 561/572] revert to popupModal to stay consistent with other
 stv tabs

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

diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
index ea6776dce..de6470d7e 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Notizen.js
@@ -12,8 +12,7 @@ export default {
 	},
 	data() {
 		return {
-			endpoint: ApiNotizPerson,
-			countNotiz: ''
+			endpoint: ApiNotizPerson
 		};
 	},
 	template: `
@@ -25,7 +24,7 @@ export default {
 		class="overflow-hidden"
 		:endpoint="endpoint"
 		ref="formc"
-		notiz-layout="classicFas"
+		notiz-layout="popupModal"
 		type-id="person_id"
 		:id="modelValue.person_id"
 		show-document

From 83d98c258e49db798946c87199fb42a854a293d9 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 14 Aug 2025 16:36:00 +0200
Subject: [PATCH 562/572] stv Notiz Controller add permission for new function
 getCountNotes

---
 application/controllers/api/frontend/v1/stv/Notiz.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Notiz.php b/application/controllers/api/frontend/v1/stv/Notiz.php
index 19e568f33..ba7cd1928 100644
--- a/application/controllers/api/frontend/v1/stv/Notiz.php
+++ b/application/controllers/api/frontend/v1/stv/Notiz.php
@@ -16,7 +16,8 @@ class Notiz extends Notiz_Controller
 			'updateNotiz' => ['admin:rw', 'assistenz:rw'], // TODO(manu): self::PERM_LOGGED
 			'deleteNotiz' => ['admin:r', 'assistenz:r'],
 			'loadDokumente' => ['admin:r', 'assistenz:r'],
-			'getMitarbeiter' => ['admin:r', 'assistenz:r']
+			'getMitarbeiter' => ['admin:r', 'assistenz:r'],
+			'getCountNotes' => ['admin:r', 'assistenz:r'],
 		]);
 
 		//Load Models

From ed00c8d0aee82b08d146d51ab11220ba88af1421 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 14 Aug 2025 16:45:52 +0200
Subject: [PATCH 563/572] add permission for new function in
 Core_Notizcontroller to NotizPerson Controller

---
 application/controllers/api/frontend/v1/notiz/NotizPerson.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/controllers/api/frontend/v1/notiz/NotizPerson.php b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
index cb9d31024..23a8fd199 100644
--- a/application/controllers/api/frontend/v1/notiz/NotizPerson.php
+++ b/application/controllers/api/frontend/v1/notiz/NotizPerson.php
@@ -18,6 +18,7 @@ class NotizPerson extends Notiz_Controller
 			'loadDokumente' => ['admin:r', 'assistenz:r'],
 			'getMitarbeiter' => ['admin:r', 'assistenz:r'],
 			'isBerechtigt' => ['admin:r', 'assistenz:r'],
+			'getCountNotes' => ['admin:r', 'assistenz:r'],
 		]);
 	}
 

From f50171ad9aed21448f96087ad325359ace78901b Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Mon, 18 Aug 2025 15:38:35 +0200
Subject: [PATCH 564/572] Calender: track locale change for day & list mode

---
 public/js/components/Calendar/Mode/Day.js  | 13 +++++++++----
 public/js/components/Calendar/Mode/List.js | 11 ++++++++---
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/public/js/components/Calendar/Mode/Day.js b/public/js/components/Calendar/Mode/Day.js
index 68ca1fa89..e9764b495 100644
--- a/public/js/components/Calendar/Mode/Day.js
+++ b/public/js/components/Calendar/Mode/Day.js
@@ -44,11 +44,16 @@ export default {
 	},
 	watch: {
 		currentDate() {
-			this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days;
-			if (this.rangeOffset) {
-				this.$refs.view.$refs.grid.disableAutoScroll();
+			if (this.currentDate.locale != this.focusDate.locale) {
+				this.focusDate = this.currentDate;
 				this.$emit('update:range', this.range);
-				this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
+			} else {
+				this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days;
+				if (this.rangeOffset) {
+					this.$refs.view.$refs.grid.disableAutoScroll();
+					this.$emit('update:range', this.range);
+					this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
+				}
 			}
 		}
 	},
diff --git a/public/js/components/Calendar/Mode/List.js b/public/js/components/Calendar/Mode/List.js
index 97990a5a3..76acfc610 100644
--- a/public/js/components/Calendar/Mode/List.js
+++ b/public/js/components/Calendar/Mode/List.js
@@ -47,10 +47,15 @@ export default {
 	},
 	watch: {
 		currentDate() {
-			this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days;
-			if (this.rangeOffset) {
+			if (this.currentDate.locale != this.focusDate.locale) {
+				this.focusDate = this.currentDate;
 				this.$emit('update:range', this.range);
-				this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
+			} else {
+				this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days;
+				if (this.rangeOffset) {
+					this.$emit('update:range', this.range);
+					this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage);
+				}
 			}
 		}
 	},

From c5001f87bda7556c148332babd1efdb9647f5a05 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Tue, 19 Aug 2025 11:03:23 +0200
Subject: [PATCH 565/572] modal header flex container for buttons (close,
 expand);

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

diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
index 4487127de..61c5c6857 100644
--- a/public/js/components/Bootstrap/Modal.js
+++ b/public/js/components/Bootstrap/Modal.js
@@ -135,12 +135,13 @@ export default {
 			<div class="modal-content">
 				<div v-if="$slots.title" class="modal-header" :class="headerClass">
 					<h5 class="modal-title"><slot name="title"/></h5>
-					<slot name="popoutButton"></slot>
-					<button type="button" class="btn ms-2" v-if="allowFullscreenExpand" @click="toggleFullscreen">
-					  <i v-if="!fullscreen" class="fa-solid fa-expand"></i>
-					  <i v-else class="fa-solid fa-compress"></i>
-					</button>
-					<button v-if="!noCloseBtn" type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+					<div class="d-flex align-items-center ms-auto">
+						<button type="button" class="btn ms-auto" style="filter: invert(1)" v-if="allowFullscreenExpand" @click="toggleFullscreen">
+						  <i v-if="!fullscreen" class="fa-solid fa-expand"></i>
+						  <i v-else class="fa-solid fa-compress"></i>
+						</button>
+						<button v-if="!noCloseBtn" type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+					</div>
 					<slot name="modal-header-content"></slot>
 				</div>
 				<div class="modal-body" :class="bodyClass">

From ef80a19a2478ae840166c0f7d3ca3d186f6cb3a6 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 19 Aug 2025 13:22:59 +0200
Subject: [PATCH 566/572] allow negative studiengang_kz in prestudent and
 orgform urls

---
 application/config/routes.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index da3a45f03..f6eafbcd2 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -75,16 +75,16 @@ $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/outgoing'] = 'api/
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/gemeinsamestudien'] = 'api/frontend/v1/stv/Students/getGemeinsamestudien';
 
 // (studiengang_kz)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]]
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudents/$1';
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2';
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$3';
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$4';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudents/$1';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$4';
 
 // (studiengang_kz)/(orgform)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]]
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2';
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3';
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$5';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$4';
+$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$5';
 
 // (studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe)
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsSpezialgruppe/$1/$2/$3/$4';

From 2198ea95e413d2a48334e2c2089d4935ff66737a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 19 Aug 2025 13:51:09 +0200
Subject: [PATCH 567/572] use form.post instead of form.send since latter
 expects a promise

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

diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
index dc78aedb6..74b8b49bf 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -193,7 +193,7 @@ export default {
 
 			// TODO(chris): move to fhcapi.factory
 			this.$refs.form
-				.send('api/frontend/v1/stv/student/add', data)
+				.post('api/frontend/v1/stv/student/add', data)
 				.then(result => {
 					this.$fhcAlert.alertSuccess('Gespeichert');
 					this.$refs.modal.hide();

From a482016deec26c1281beae682b59037bbe0bdfe5 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 19 Aug 2025 13:58:41 +0200
Subject: [PATCH 568/572] modal-dialog-scrollable

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

diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js
index 74b8b49bf..8de217e00 100644
--- a/public/js/components/Stv/Studentenverwaltung/List/New.js
+++ b/public/js/components/Stv/Studentenverwaltung/List/New.js
@@ -213,7 +213,7 @@ export default {
 	},
 	template: `
 	<fhc-form ref="form" class="stv-list-new" @submit.prevent="send">
-		<bs-modal ref="modal" dialog-class="modal-lg modal-scrollable" @hidden-bs-modal="reset">
+		<bs-modal ref="modal" dialog-class="modal-lg modal-dialog-scrollable" @hidden-bs-modal="reset">
 			<template #title>
 				InteressentIn anlegen
 			</template>

From 1c86a6ad55f6f165b2e8bdc2ce5a9734cef1cd31 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 19 Aug 2025 16:05:47 +0200
Subject: [PATCH 569/572] add validation callback wrapper method

---
 application/controllers/api/frontend/v1/stv/Student.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 21b07b755..506417ecc 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -710,4 +710,9 @@ class Student extends FHCAPI_Controller
 			return true;
 		return !!$value;
 	}
+
+	public function isValidDate($value)
+	{
+		return isValidDate($value);
+	}
 }

From 905a2dadff8ed2855d8878bbb7e11e57cf97e078 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 19 Aug 2025 17:18:57 +0200
Subject: [PATCH 570/572] terminate with error if receiver person_id or
 prestudent_id is not found

---
 .../controllers/api/frontend/v1/messages/Messages.php  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php
index dbc11735a..fa6748f6a 100644
--- a/application/controllers/api/frontend/v1/messages/Messages.php
+++ b/application/controllers/api/frontend/v1/messages/Messages.php
@@ -418,6 +418,10 @@ class Messages extends FHCAPI_Controller
 		}
 
 		$data = $this->getDataOrTerminateWithError($result);
+		if (count($data) < 1)
+		{
+			$this->terminateWithError('Error: Messages API no person_id found.');
+		}
 		$person = current($data);
 
 		return $person->person_id;
@@ -432,8 +436,12 @@ class Messages extends FHCAPI_Controller
 		);
 
 		$data = $this->getDataOrTerminateWithError($result);
+		if (count($data) < 1)
+		{
+			$this->terminateWithError('Error: Messages API no prestudent_id found.');
+		}
 		$student = current($data);
-	//	$this->terminateWithError($student->prestudent_id, self::ERROR_TYPE_GENERAL);
+
 		return $student->prestudent_id;
 	}
 

From ad8322839653f11c54d22c6de8edd970f66f0328 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 19 Aug 2025 17:34:23 +0200
Subject: [PATCH 571/572] do not terminatewithsuccess in function called in db
 transaction because this results in the transaction being rollbacked

---
 application/controllers/api/frontend/v1/stv/Student.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php
index 506417ecc..4309e88a4 100644
--- a/application/controllers/api/frontend/v1/stv/Student.php
+++ b/application/controllers/api/frontend/v1/stv/Student.php
@@ -694,7 +694,7 @@ class Student extends FHCAPI_Controller
 			return $result;
 		}*/
 
-		$this->terminateWithSuccess(true);
+		return success(true);
 	}
 
 	public function requiredIfNotPersonId($value)

From 1025a8b461f24859524d764737c13318842665ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 25 Aug 2025 11:19:20 +0200
Subject: [PATCH 572/572] Removed Duplicate Phrase

---
 system/phrasesupdate.php | 30 +++++-------------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 49b05b7ef..dd23a1c4a 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -33827,11 +33827,11 @@ array(
 			array(
 				'sprache' => 'German',
 				'text' => 'Die "Digitale Anwesenheiten Timeline" ist ein experimentelles feature, welches eine zeitliche Visualisierung von Entschuldigungszeiträumen und Kontrollzeiträumen im Kontext eines Studenten anzeigt.
-				
+
 					Wenn Sie auf eine aufgelistete Entschuldigung oder Kontrolle klicken, versucht die Timeline diese zu finden, falls diese im angegebenen Zeitraum liegt, welcher standardmäßig das gesamte aktuelle Jahr beträgt. Sie können diese Grenzen manuell anpassen.
-					
+
 					Wenn man innerhalb der Timeline scrollt, ändert sich der visuelle Abstand zwischen einzelnen Tagen.
-					
+
 					Bei Klick auf eine gerenderte Datumsreichweite in der Timeline, listet sich oben rechts eine Liste von zugehörigen Attributen auf, welche Administratoren und Entwicklern in Fehlerfällen helfen sollen den Zustand der digitalen Amwesenheiten im Kontext eines Studierenden nachzuvollziehen',
 				'description' => '',
 				'insertvon' => 'system'
@@ -33841,35 +33841,15 @@ array(
 				'text' => 'The "Digital Attendance Timeline" is an experimental feature that displays a temporal visualization of excuse periods and check-in periods in the context of a student.
 
 					When you click on a listed excuse or check-in period, the timeline attempts to find it if it falls within the specified period, which by default is the entire current year. You can adjust these boundaries manually.
-					
+
 					Scrolling within the timeline changes the visual spacing between individual days.
-					
+
 					Clicking on a rendered date range in the timeline displays a list of associated attributes in the upper right corner. These attributes are intended to help administrators and developers understand the status of digital attendance in the context of a student in case of errors.',
 				'description' => '',
 				'insertvon' => 'system'
 			)
 		)
 	),
-	array(
-		'app' => 'anwesenheiten',
-		'category' => 'global',
-		'phrase' => 'lehreinheit_id',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'LV-Teil ID',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Teaching unit ID',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	//
 	// DIGITALE ANWESENHEITEN PHRASEN END
 	//