use new endpoint in frontend, skip next semester spezialgruppen

- extend timeInterval for followup semester
- refactor function applyLoadUeberSemesterHaelfte
- use ausbildungssemester of student for semesterFilter in function getStundenplanQuery
- use old logic of studentlehrverbaende to avoid error for arrayfilter studentlehrverbaende

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

@@ -114,6 +114,7 @@ class LvPlan extends FHCAPI_Controller
 
 		// fetching lvplan events
 		$result = $this->stundenplanlib->getEventsUser($start_date, $end_date, $uid);
+
 		$lvplanEvents = $this->getDataOrTerminateWithError($result);
 
 		// fetching moodle events

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

@@ -11,6 +11,7 @@ class LvTermine extends FHCAPI_Controller
 		parent::__construct([
 			'getStundenplan' => ['admin:r', 'assistenz:r'],
 			'getStudiensemester' => ['admin:r', 'assistenz:r'],
+			'getStundenplanForStudiensemester' => ['admin:r', 'assistenz:r'],
 		]);
 
 		// Load Libraries
@@ -32,37 +33,147 @@ class LvTermine extends FHCAPI_Controller
 		$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, $dbStundenplanTable = "stundenplan", $groupConsecutiveHours = false)
 	{
+		$this->getStundenplanbh($uid, '2026-02-04', '2027-02-03', $dbStundenplanTable, $groupConsecutiveHours);
+	}
+
+	public function getStundenplanForStudiensemester($uid, $studiensemester_kurzbz, $dbStundenplanTable = "stundenplan", $groupConsecutiveHours = false)
+	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$resstudiensemester = getData($this->StudiensemesterModel->getStartEndeFromStudiensemester($studiensemester_kurzbz));
+		$resnextstudiensemester = getData($this->StudiensemesterModel->getNextFrom($studiensemester_kurzbz));
+
+		$studiensemester = ($resstudiensemester && count($resstudiensemester) > 0) ? $resstudiensemester[0] : null;
+		$studiensemester->studiensemester_kurzbz = $studiensemester_kurzbz;
+		$nextstudiensemester = ($resnextstudiensemester && count($resnextstudiensemester) > 0) ? $resnextstudiensemester[0] : null;
+
+		$this->addMeta('bhsemester', $studiensemester);
+		$this->addMeta('bhnextsemester', $nextstudiensemester);
+
+		$this->getStundenplanbh($uid, $studiensemester, $nextstudiensemester, $dbStundenplanTable, $groupConsecutiveHours);
+	}
+
+	//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 getStundenplanbh($uid, $studiensemester, $nextstudiensemester, $dbStundenplanTable = "stundenplan", $groupConsecutiveHours = false)
+	{
+		$start_date = $studiensemester->start;
+		$end_date = $nextstudiensemester->ende;
+		$this->load->library('StundenplanLib');
+
+		$ci = get_instance();
 		$student_uid = $uid;
-		$semester_range = $this->studienSemesterErmitteln($start_date, $end_date);
+		$semester_range = $this->stundenplanlib->studienSemesterErmitteln($start_date, $end_date);
+		if (isError($semester_range))
+			return $semester_range;
+		$semester_range = getData($semester_range);
+		$ci->addMeta('semester_range', $semester_range);
+
+		$first_semester = $semester_range[0];
 
 		$this->sortStudienSemester($semester_range);
-		$this->applyLoadUeberSemesterHaelfte($semester_range);
+		$function_error = $this->stundenplanlib->applyLoadUeberSemesterHaelfte($semester_range);
+		$ci->addMeta('nach_apply_semester_range', $semester_range);
+		if ($function_error)
+			return $function_error;
 
-		$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($semester_range, $student_uid);
-		$student_lehrverband = $this->fetchStudentlehrverbandFromStudiensemester($semester_range, $student_uid);
+		$benutzer_gruppen = $this->fetchBenutzerGruppenFromStudiensemester($student_uid, $semester_range, $nextstudiensemester->studiensemester_kurzbz);
+		if (isError($benutzer_gruppen))
+			return $benutzer_gruppen;
+		$benutzer_gruppen = getData($benutzer_gruppen);
+		$ci->addMeta('spezialgruppen', $benutzer_gruppen);
+		// getting the student_lehrverbaende of the student in the different studiensemester
 
-		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
-			);
+		$ci->addMeta('bhsemtest', print_r($semester_range, true));
+/*
+		$semester_range = array(
+			'SS2026' => array(
+				'WS2025' => (object) array(
+					'start' => '2026-02-04',
+					'ende' => '2026-05-19'
+				),
+				'SS2026' => (object) array(
+					'start' => '2026-02-04',
+					'ende' => '2026-11-15'
+				),
+				'WS2026' => (object) array(
+					'start' => '2026-09-01',
+					'ende' => '2027-02-03'
+				)
+			)
+		);
+*/
+		$student_lehrverband = $this->fetchStudentlehrverbandFromStudiensemester($student_uid, $semester_range, $studiensemester->studiensemester_kurzbz, $nextstudiensemester->studiensemester_kurzbz);
+
+		//get semester
+		if (isError($student_lehrverband))
+			return $student_lehrverband;
+		$student_lehrverband = getData($student_lehrverband);
+/*
+		$student_lehrverband = array (
+			'SS2026' =>
+			array (
+			  0 =>
+				  (object) array(
+				 'verbandsgruppe' => 'BEE1A',
+				 'studiengang_kz' => 476,
+				 'semester' => 1,
+				 'verband' => 'A',
+				 'gruppe' => ' ',
+				 'studiensemester_kurzbz' => 'WS2025',
+			  ),
+			  1 =>
+				  (object) array(
+				 'verbandsgruppe' => 'BEE2A',
+				 'studiengang_kz' => 476,
+				 'semester' => 2,
+				 'verband' => 'A',
+				 'gruppe' => ' ',
+				 'studiensemester_kurzbz' => 'SS2026',
+			  ),
+			  2 =>
+				  (object) array(
+				 'verbandsgruppe' => 'BEE3A',
+				 'studiengang_kz' => 476,
+				 'semester' => 3,
+				 'verband' => 'A',
+				 'gruppe' => ' ',
+				 'studiensemester_kurzbz' => 'SS2026',
+			  ),
+			),
+		);
+*/
+		$ci->addMeta('studentlehrverbaende', $student_lehrverband);
+
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->StudentModel->addSelect('ausbildungssemester');
+		$this->StudentModel->addJoin('public.tbl_prestudentstatus ps', 'prestudent_id');
+		$result = $this->StudentModel->loadWhere(array(
+			"student_uid"=>$student_uid,
+			'studiensemester_kurzbz' => $first_semester,
+		));
+		if (isError($result))
+			$semesterStud = null;
+		if(hasData($result)){
+			$result = getData($result);
+			$data = current($result);
+			$semesterStud = $data->ausbildungssemester;
+		}
+
+		$stundenplan_query = $this->StundenplanModel->getStundenplanQuery(
+			$start_date,
+			$end_date, //will be overwritten in model if $ende_semProlonged
+			$semester_range,
+			$benutzer_gruppen,
+			$student_lehrverband,
+			$dbStundenplanTable,
+			$groupConsecutiveHours,
+			null,
+			null
+		);
+
+		$ci->addMeta('bhstdplanquery', $stundenplan_query);
 
 		if(!$stundenplan_query)
 		{
@@ -84,47 +195,23 @@ class LvTermine extends FHCAPI_Controller
 
 	public function getStudiensemester()
 	{
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+			$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
-		$this->StudiensemesterModel->addOrder('studienjahr_kurzbz', 'DESC');
-		$result = $this->StudiensemesterModel->load();
-		$data = $this->getDataOrTerminateWithError($result);
-		$this->terminateWithSuccess($data);
+			$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)
-		);
+	// TODO(Manu) following 5 private functions are copybased of StundenplanLib,
+	// just applyLoadUeberSemesterHaelfte is different
+	// after approval: change to public in StundenplanLib and use it here?
 
-		// 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)
-	{
+	private function sortStudienSemester(&$semester_range){
 		usort(
 			$semester_range,
-			function ($first, $second) {
+			function($first, $second)
+			{
 				$sem_first = null;
 				$year_first = null;
 				$match_first = null;
@@ -133,8 +220,8 @@ class LvTermine extends FHCAPI_Controller
 				$year_second = null;
 				$match_second = null;
 
-				preg_match('/([WS]+)([0-9]+)/', $first, $match_first);
-				preg_match('/([WS]+)([0-9]+)/', $second, $match_second);
+				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]);
@@ -146,15 +233,15 @@ class LvTermine extends FHCAPI_Controller
 				{
 					return -1;
 				}
-				elseif($year_first > $year_second)
+				else if($year_first > $year_second)
 				{
 					return 1;
 				}
-				elseif($year_first == $year_second && $sem_first > $sem_second)
+				else if($year_first == $year_second && $sem_first > $sem_second)
 				{
 					return 1;
 				}
-				elseif($year_first == $year_second && $sem_first < $sem_second)
+				else if($year_first == $year_second && $sem_first < $sem_second)
 				{
 					return -1;
 				}
@@ -163,9 +250,151 @@ class LvTermine extends FHCAPI_Controller
 		);
 	}
 
-	//copied from Stundenplan.php
+	private function fetchBenutzerGruppenFromStudiensemester($student_uid, $semester_range, $skip_semester_kurzbz)
+	{
+		$this->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
+
+		$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)
+			{
+				if($semester === $skip_semester_kurzbz)
+				{
+					continue;
+				}
+				// 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]);
+				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($student_uid, $semester_range, $studiensemester_kurzbz, $nextstudiensemester_kurzbz)
+	{
+		$this->load->model('person/Benutzergruppe_model', 'BenutzergruppeModel');
+
+		$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 vbd.*, UPPER(s.typ || s.kurzbz) as stg FROM tbl_studentlehrverband vbd join tbl_studiengang s USING(studiengang_kz) where vbd.student_uid = ? AND vbd.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) use($nextstudiensemester_kurzbz, $studiensemester_kurzbz)
+					{
+						$result = new stdClass();
+						$result->verbandsgruppe = $item->stg . $item->semester . trim($item->verband) . trim($item->gruppe);
+						$result->studiengang_kz = $item->studiengang_kz;
+						$result->semester = $item->semester;
+						$result->verband = $item->verband;
+						$result->gruppe = $item->gruppe;
+						$result->studiensemester_kurzbz = $item->studiensemester_kurzbz;
+						$result->query_studiensemester_kurzbz = ($item->studiensemester_kurzbz === $nextstudiensemester_kurzbz) ? $studiensemester_kurzbz : $item->studiensemester_kurzbz;
+						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);
+	}
+
+	//note: this is different to the version in StundenplanLib, changes apply just to LVTermine in StudVW
 	private function applyLoadUeberSemesterHaelfte(&$semester_range)
 	{
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
 		/*
 		@var($semester_collection)
 		convert the array of studiensemester into an associative array with the studiensemester as the key
@@ -185,9 +414,13 @@ class LvTermine extends FHCAPI_Controller
 		foreach($semester_range as $studiensemester)
 		{
 			$previous_studiensemester = $this->StudiensemesterModel->getPreviousFrom($studiensemester);
-			$previous_studiensemester = $this->getDataOrTerminateWithError($previous_studiensemester);
+			if(isError($previous_studiensemester))
+			{
+				return error(getData($previous_studiensemester));
+			}
+			$previous_studiensemester = getData($previous_studiensemester);
 			if (count($previous_studiensemester) == 0) {
-				$this->terminateWithError("No previous semester");
+				return error('no previous semester');
 			}
 			$previous_studiensemester = current($previous_studiensemester)->studiensemester_kurzbz;
 			$semester_collection[$studiensemester] = [$previous_studiensemester, $studiensemester];
@@ -237,25 +470,33 @@ class LvTermine extends FHCAPI_Controller
 		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));
+			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);
+			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 = 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');
+				$semester_start_ende->ende = date_format($summer_studiensemester_end_date,'Y-m-d');
 			}
-			if (defined('LVPLAN_LOAD_UEBER_SEMESTERHAELFTE') && LVPLAN_LOAD_UEBER_SEMESTERHAELFTE === true)
+
+			//TODO(Manu) config not taken into account
+			if (defined('LVPLAN_LOAD_UEBER_SEMESTERHAELFTE') && LVPLAN_LOAD_UEBER_SEMESTERHAELFTE)
 			{
+				$this->addMeta('LVPLAN_LOAD_UEBER_SEMESTERHAELFTE_TRUE', $semester_range);
+
 				foreach($semester_adjoint as $adjoint)
 				{
 					$studienSemesterDateRanges[$semester_original][$adjoint]=$semester_start_ende;
@@ -263,139 +504,106 @@ class LvTermine extends FHCAPI_Controller
 			}
 			else
 			{
+				$this->addMeta('LVPLAN_LOAD_UEBER_SEMESTERHAELFTE_FALSE', $semester_range);
 				//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_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');
+				$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;
+				$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'
+				);
+
+				$second_semester_end_date = clone $studiensemester_end_date;
+				$second_semester_end_date->add($half_dateInterval);
+
+				$second_semester_date_range = clone $semester_start_ende;
+				$second_semester_date_range->ende = $second_semester_end_date->format('Y-m-d');
+
+				// 2nd Adjacent-Semester: old time intervall plus half next semester
+				$studienSemesterDateRanges[$semester_original][$semester_adjoint[1]] = $second_semester_date_range;
 			}
 			$semester_range = $studienSemesterDateRanges;
 		}
 	}
 
-	//copied from Stundenplan.php, extended with $student_uid
-	private function fetchBenutzerGruppenFromStudiensemester($semester_range, $student_uid)
+	private function studienSemesterErmitteln($start_date, $end_date)
 	{
-		//$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
-					)
-				);
-			}
-		}
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
-		// 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;
+		// gets all studiensemester from the student from start_date to end_date
+		//$semester_range = $this->StudiensemesterModel->getByDateRange($start_date, $end_date);
+		$semester_range = $this->StudiensemesterModel->getContainingOrNearestByDateRange($start_date, $end_date);
+		if (isError($semester_range))
+			return $semester_range;
+
+		$semester_range = array_map(
+			function ($sem) {
+				return $sem->studiensemester_kurzbz;
 			},
-			$benutzer_gruppen
+			getData($semester_range) ?: []
 		);
 
-		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)
+		// if no studiensemester is found for the given timespan, get the nearest studiensemester
+		if (count($semester_range) == 0)
 		{
-			$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));
+			$aktuelle_studiensemester = $this->StudiensemesterModel->getNearest();
+			if (isError($aktuelle_studiensemester))
+				return $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);
 		}
 
-		// 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
-		);
+		//auf jeden Fall Semester 2 dazunehmen, wenn nur eines vorhanden ist für Anzeige der ersten Hälfte des folgenden Semesters?
+		if (count($semester_range) == 1)
+		{
+			$nextStudiensemester = $this->StudiensemesterModel->getNextFrom($semester_range[0]);
+			if (isError($nextStudiensemester))
+				return $nextStudiensemester;
 
-		return $student_lehrverband;
+			$nextStudiensemester = getData($nextStudiensemester);
+			if (count($nextStudiensemester) == 0) {
+				return error("No aktuelles semester");
+			}
+			$nextStudiensemester = current($nextStudiensemester)->studiensemester_kurzbz;
+			// push aktuelles semester in active semester array
+			array_push($semester_range, $nextStudiensemester);
+		}
+
+
+		return success($semester_range);
 	}
 }

application/libraries/StundenplanLib.php

@@ -88,19 +88,34 @@ class StundenplanLib
 		$this->_ci->addMeta('nach_apply_semester_range', $semester_range);
 		if ($function_error)
 			return $function_error;
-		
+
+		$this->_ci->addMeta('bhsemtest', print_r($semester_range, true));
+
+		$semester_range = array(
+			'SS2026' => array(
+				'WS2025' => (object) array(
+					'start' => '2026-02-04',
+					'ende' => '2026-05-19'
+				),
+				'SS2026' => (object) array(
+					'start' => '2026-02-04',
+					'ende' => '2026-11-15'
+				),
+			)
+		);
+
 		// 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);
-
+		$this->_ci->addMeta('spezialgruppen', $benutzer_gruppen);
 		// 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);
-		
+		$this->_ci->addMeta('studentlehrvebaende', $student_lehrverband);
 		$stundenplan_query = $this->_ci->StundenplanModel->getStundenplanQuery(
 			$start,
 			$end,
@@ -632,6 +647,7 @@ class StundenplanLib
 						$result->semester = $item->semester;
 						$result->verband = $item->verband;
 						$result->gruppe = $item->gruppe;
+						$result->studiensemester_kurzbz = $item->studiensemester_kurzbz;
 						return $result;
 					},
 					$lehrverband_query_result);
@@ -667,8 +683,9 @@ class StundenplanLib
 		return success($student_lehrverband);
 	}
 
-	private function applyLoadUeberSemesterHaelfte(&$semester_range)
+	public function applyLoadUeberSemesterHaelfte(&$semester_range)
 	{
+		$this->_ci = &get_instance();
 		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		/*
@@ -796,8 +813,9 @@ class StundenplanLib
 		}
 	}
 
-	private function studienSemesterErmitteln($start_date, $end_date)
+	public function studienSemesterErmitteln($start_date, $end_date)
 	{
+		$this->_ci = &get_instance();
 		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		// gets all studiensemester from the student from start_date to end_date

application/libraries/tags/CoreMissingZgvTagLib.php

@@ -28,10 +28,21 @@ class CoreMissingZgvTagLib
 		$this->ci->PrestudentModel->addJoin('public.tbl_prestudentstatus', 'prestudent_id');
 		$this->ci->PrestudentModel->addJoin('public.tbl_benutzer bn', 'person_id');
 		$this->ci->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
+
+		$this->ci->PrestudentModel->db->group_start();
+
+		$this->ci->PrestudentModel->db->where('zgvdatum', null);
+		$this->ci->PrestudentModel->db->where('typ', 'b');
+
+		$this->ci->PrestudentModel->db->or_group_start();
+		$this->ci->PrestudentModel->db->where('zgvmadatum', null);
+		$this->ci->PrestudentModel->db->where('typ', 'm');
+		$this->ci->PrestudentModel->db->group_end();
+
+		$this->ci->PrestudentModel->db->group_end();
+
 		$result = $this->ci->PrestudentModel-> loadWhere(array(
-			'bn.aktiv' => true, //check if necessary
-			'zgvdatum' => null,
-			'typ' => 'b',
+			'bn.aktiv' => true,
 			'studiensemester_kurzbz' => $semester
 		));
 
@@ -60,16 +71,36 @@ class CoreMissingZgvTagLib
 		$semester = $params['studiensemester_kurzbz'];
 		$prestudent_id = $params['id'];
 
+		$this->ci->PrestudentModel->addSelect('prestudent_id');
+		$this->ci->PrestudentModel->addSelect('start as von');
+		$this->ci->PrestudentModel->addSelect('ende as bis');
 		$this->ci->PrestudentModel->addJoin('public.tbl_prestudentstatus', 'prestudent_id');
+
+		//add studiensemester also here for manual rebuild
+		$this->ci->PrestudentModel->addJoin('public.tbl_studiensemester', 'studiensemester_kurzbz');
+
 		$this->ci->PrestudentModel->addJoin('public.tbl_benutzer bn', 'person_id');
 		$this->ci->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
-		$result = $this->ci->PrestudentModel->loadWhere(array(
-			'bn.aktiv' => true, //check if necessary
-			'zgvdatum' => null,
-			'typ' => 'b',
+
+		$this->ci->PrestudentModel->db->group_start();
+
+		$this->ci->PrestudentModel->db->where('zgvdatum', null);
+		$this->ci->PrestudentModel->db->where('typ', 'b');
+
+		$this->ci->PrestudentModel->db->or_group_start();
+		$this->ci->PrestudentModel->db->where('zgvmadatum', null);
+		$this->ci->PrestudentModel->db->where('typ', 'm');
+		$this->ci->PrestudentModel->db->group_end();
+
+		$this->ci->PrestudentModel->db->group_end();
+		$this->ci->PrestudentModel->db->limit(1);
+
+		$result = $this->ci->PrestudentModel-> loadWhere(array(
+			'bn.aktiv' => true,
 			'studiensemester_kurzbz' => $semester,
 			'prestudent_id' => $prestudent_id
 		));
+
 		if(hasData($result))
 		{
 			return $result;

application/libraries/vertragsbestandteil/Gehaltsbestandteil.php

@@ -13,6 +13,7 @@ class Gehaltsbestandteil extends AbstractBestandteil implements \JsonSerializabl
 	protected $dienstverhaeltnis_id;
 	protected $vertragsbestandteil_id;
 	protected $gehaltstyp_kurzbz;
+	protected $gehaltsanpassungtyp_kurzbz = '';
 	protected $von;
     protected $bis;
 	protected $anmerkung;
@@ -21,6 +22,7 @@ class Gehaltsbestandteil extends AbstractBestandteil implements \JsonSerializabl
 	protected $valorisierungssperre;
 	protected $valorisierung;
 	protected $auszahlungen;
+	protected $gehaltstyp_bezeichnung;
 	
 	protected $insertamum;
 	protected $insertvon;
@@ -39,6 +41,10 @@ class Gehaltsbestandteil extends AbstractBestandteil implements \JsonSerializabl
 		isset($data->dienstverhaeltnis_id) && $this->setDienstverhaeltnis_id($data->dienstverhaeltnis_id);
 		isset($data->vertragsbestandteil_id) && $this->setVertragsbestandteil_id($data->vertragsbestandteil_id);
 		isset($data->gehaltstyp_kurzbz) && $this->setGehaltstyp_kurzbz($data->gehaltstyp_kurzbz);
+		//isset($data->gehaltsanpassungtyp_kurzbz) && $this->setGehaltsanpassungtyp_kurzbz($data->gehaltsanpassungtyp_kurzbz);
+		if (!empty($data->gehaltsanpassungtyp_kurzbz)) {
+			$this->setGehaltsanpassungtyp_kurzbz($data->gehaltsanpassungtyp_kurzbz);
+		}
 		isset($data->von) && $this->setVon($data->von);
 		isset($data->bis) && $this->setBis($data->bis);
 		isset($data->anmerkung) && $this->setAnmerkung($data->anmerkung);
@@ -47,7 +53,8 @@ class Gehaltsbestandteil extends AbstractBestandteil implements \JsonSerializabl
 		isset($data->valorisierungssperre) && $this->setValorisierungssperre($data->valorisierungssperre);
 		isset($data->valorisierung) && $this->setValorisierung($data->valorisierung);
 		isset($data->auszahlungen) && $this->setAuszahlungen($data->auszahlungen);
-		
+		isset($data->gehaltstyp_bezeichnung) && $this->setGehaltstyp_bezeichnung($data->gehaltstyp_bezeichnung);
+
 		isset($data->insertamum) && $this->setInsertamum($data->insertamum);
 		isset($data->insertvon) && $this->setInsertvon($data->insertvon);
 		isset($data->updateamum) && $this->setUpdateamum($data->updateamum);
@@ -75,6 +82,11 @@ class Gehaltsbestandteil extends AbstractBestandteil implements \JsonSerializabl
 		return $this->gehaltstyp_kurzbz;
 	}
 
+	public function getGehaltsanpassungtyp_kurzbz()
+	{
+		return $this->gehaltsanpassungtyp_kurzbz;
+	}
+
 	public function getVon()
 	{
 		return $this->von;
@@ -178,6 +190,13 @@ class Gehaltsbestandteil extends AbstractBestandteil implements \JsonSerializabl
 		return $this;
 	}
 
+	public function setGehaltsanpassungtyp_kurzbz($gehaltsanpassungtyp_kurzbz)
+	{
+		$this->markDirty('gehaltsanpassungtyp_kurzbz', $this->gehaltsanpassungtyp_kurzbz, $gehaltsanpassungtyp_kurzbz);
+		$this->gehaltsanpassungtyp_kurzbz = $gehaltsanpassungtyp_kurzbz;
+		return $this;
+	}
+
 	public function setVon($von)
 	{
 		$this->markDirty('von', $this->von, $von);
@@ -206,6 +225,10 @@ class Gehaltsbestandteil extends AbstractBestandteil implements \JsonSerializabl
 		    $grundbetrag = number_format($grundbetrag, 2, '.', '');
 		}
 		$this->markDirty('grundbetrag', $this->grundbetrag, $grundbetrag);
+		if(in_array('grundbetrag', $this->modifiedcolumns))
+		{
+			$this->setBetrag_valorisiert($grundbetrag);
+		}
 		$this->grundbetrag = $grundbetrag;
 		return $this;
 	}
@@ -242,6 +265,13 @@ class Gehaltsbestandteil extends AbstractBestandteil implements \JsonSerializabl
 		return $this;
 	}
 
+	public function setGehaltstyp_bezeichnung($gehaltstyp_bezeichnung)
+	{
+		$this->markDirty('gehaltstyp_bezeichnung', $this->gehaltstyp_bezeichnung, $gehaltstyp_bezeichnung);
+		$this->gehaltstyp_bezeichnung = $gehaltstyp_bezeichnung;
+		return $this;
+	}
+
 	public function setInsertamum($insertamum)
 	{
 		$this->markDirty('insertamum', $this->insertamum, $insertamum);
@@ -284,6 +314,7 @@ class Gehaltsbestandteil extends AbstractBestandteil implements \JsonSerializabl
 			'dienstverhaeltnis_id' => $this->getDienstverhaeltnis_id(),
 			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
 			'gehaltstyp_kurzbz' => $this->getGehaltstyp_kurzbz(),
+			'gehaltsanpassungtyp_kurzbz' => $this->getGehaltsanpassungtyp_kurzbz(),
 			'von' => $this->getVon(),
 			'bis' => $this->getBis(),
 			'anmerkung' => $this->getAnmerkung(),
@@ -312,6 +343,7 @@ class Gehaltsbestandteil extends AbstractBestandteil implements \JsonSerializabl
 		dienstverhaeltnis_id: {$this->getDienstverhaeltnis_id()}
 		vertragsbestandteil_id: {$this->getVertragsbestandteil_id()}
 		gehaltstyp_kurzbz: {$this->getGehaltstyp_kurzbz()}
+		gehaltsanpassungtyp_kurzbz: {$this->getGehaltsanpassungtyp_kurzbz()}
 		von: {$this->getVon()}
 		bis: {$this->getBis()}
 		anmerkung: {$this->getAnmerkung()}

application/models/crm/Student_model.php

@@ -204,7 +204,7 @@ class Student_model extends DB_Model
 
 		Events::trigger(
 			'generate_student_uid',
-			function ($value) use ($uid) {
+			function ($value) use (&$uid) {
 				$uid = $value;
 			},
 			$stgkzl,

application/models/organisation/Studiengang_model.php

@@ -457,6 +457,7 @@ class Studiengang_model extends DB_Model
 	 */
 	public function getLeitung($studiengang_kz = null)
 	{
+		$this->addDistinct();
 		$this->addSelect('uid, studiengang_kz, oe_kurzbz, vorname, nachname, email, titelpre, titelpost, alias');
 		$this->addJoin('public.tbl_benutzerfunktion', 'oe_kurzbz');
 		$this->addJoin('public.tbl_benutzer', 'uid');

application/models/ressource/Stundenplan_model.php

@@ -193,7 +193,8 @@ class Stundenplan_model extends DB_Model
 	 */
 	public function stundenplanGruppierungConsecutive($stundenplanViewQuery)
 	{
-		$query_result = $this->execReadOnlyQuery("
+		$query_result = $this->execReadOnlyQuery(
+			$stundenplanViewQuery . "
 			SELECT
 			  distinct lehrveranstaltung_id,
 			  datum,
@@ -247,7 +248,7 @@ class Stundenplan_model extends DB_Model
 					anmerkung_lehreinheit,gruppe, verband, semester,stg_kurzbz,
 					  CONCAT(p.nachname, ' ', p.vorname) as lektorname
 
-					FROM (".$stundenplanViewQuery.") sp
+					FROM stundenplaneintraege 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
@@ -280,7 +281,7 @@ class Stundenplan_model extends DB_Model
 
 	/**
 	 * queries Stundenplan but for a whole lva, irrespective of who is requesting it
-	 * 
+	 *
 	 * @return void
 	 */
 	public function getStundenplanLVA($start_date, $end_date, $lv_id) {
@@ -528,7 +529,96 @@ class Stundenplan_model extends DB_Model
 
 		return $this->execReadOnlyQuery($qry, $qry_params);
 	}
-	
+
+	protected function genLehrverbandClauses($semester, $studentlehrverbaende)
+	{
+		$lvbdclauses = array();
+		$studiengang_kz = null;
+		foreach($semester as $sem=>$semester_date_range)
+		{
+			foreach($semester_date_range as $sem_date => $sem_date_range)
+			{
+				if(!array_key_exists($sem,$studentlehrverbaende) || count($studentlehrverbaende[$sem]) == 0)
+				{
+					continue;
+				}
+
+				$studlvbds = array_filter(
+					$studentlehrverbaende[$sem],
+					function($value) use ($sem_date) {
+						return $value->studiensemester_kurzbz === $sem_date;
+					}
+				);
+
+				foreach($studlvbds as $key=>$lehrverband)
+				{
+					$studiengang_kz = $lehrverband->studiengang_kz;
+					$lvbdclauses[] = <<<EOCLAUSE
+							(
+								{$this->escape($lehrverband->verbandsgruppe)} like sp.verbandsgruppe || '%'
+								and sp.datum between {$this->escape($sem_date_range->start)} and {$this->escape($sem_date_range->ende)}
+								and (sp.studiensemester_kurzbz is null or sp.studiensemester_kurzbz = {$this->escape($lehrverband->query_studiensemester_kurzbz)})
+							)
+EOCLAUSE;
+
+				}
+			}
+		}
+		$sql = implode(PHP_EOL . "							OR" . PHP_EOL, $lvbdclauses);
+		if($sql)
+		{
+			$sql = <<<EOSQL
+(
+						sp.studiengang_kz = {$this->escape($studiengang_kz)}
+						and
+						sp.gruppe_kurzbz is null
+						and
+						(
+{$sql}
+						)
+					)
+EOSQL;
+
+		}
+		return $sql;
+	}
+
+	protected function genSpezialgruppenClauses($semester, $gruppen)
+	{
+		$spezgrpclauses = array();
+		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
+				if(!array_key_exists($sem_date,$gruppen) || count($gruppen[$sem_date]) == 0)
+				{
+					continue;
+				}
+				// converts the array of gruppen strings into a sql IN (_,_,_) chain
+				$groups = implode(', ', $gruppen[$sem_date]);
+				$spezgrpclauses[] = <<<EOSPEZGRP
+						(
+							sp.gruppe_kurzbz IN ({$groups})
+							AND sp.datum BETWEEN {$this->escape($sem_date_range->start)} AND {$this->escape($sem_date_range->ende)}
+						)
+EOSPEZGRP;
+
+			}
+		}
+		$sql = implode(PHP_EOL . "						OR" . PHP_EOL, $spezgrpclauses);
+		if($sql)
+		{
+			$sql = <<<EOSQL
+(
+{$sql}
+					)
+EOSQL;
+		}
+		return $sql;
+	}
+
 	/**
 	 * NO STANDALONE FUNCTION - Generates a SQL query string to fetch 'stundenplan' events for a specific student within the current semester.
 	 *
@@ -537,8 +627,8 @@ class Stundenplan_model extends DB_Model
 	 *
 	 * @return mixed
 	 */
-	public function getStundenplanQuery($start_date, $end_date, $semester, $gruppen, $studentlehrverbaende, $isLvList=false, $db_stpl_table='stundenplan'){
-
+	public function getStundenplanQuery($start_date, $end_date, $semester, $gruppen, $studentlehrverbaende, $db_stpl_table='stundenplan', $showLvsStundenplan=false, $endDateNextSemHalf=null, $semesterFilter=null)
+	{
 		// helper function to check if either $gruppen or $studentlehrverbaende are empty for each semester
 		$emptyCheck = function($toBeCheckedArray) use ($semester){
 			$result = true;
@@ -552,87 +642,42 @@ class Stundenplan_model extends DB_Model
 			return $result;
 		};
 
-		// if both the gruppen and the studentlehrverbaende are empty we early return 
+		// if both the gruppen and the studentlehrverbaende are empty we early return
 		if($emptyCheck($gruppen) && $emptyCheck($studentlehrverbaende))
 		{
 			return false;
 		}
 
-		$query =
-		"select sp.*
-		from lehre.vw_".$db_stpl_table." sp
-		WHERE
-		sp.datum >= ".$this->escape($start_date)."
-		AND sp.datum <= ".$this->escape($end_date);
-		
-		// adds the AND sql chain only if both $gruppen and $studentlehrverbaende are not empty
-		if(!$emptyCheck($gruppen) || !$emptyCheck($studentlehrverbaende))
-		{
-			$query .= " AND ( ";
-		} 
+		$lvbdclauses = $this->genLehrverbandClauses($semester, $studentlehrverbaende);
+		$spezgrpclauses = $this->genSpezialgruppenClauses($semester, $gruppen);
+		$chainingor = ($lvbdclauses && $spezgrpclauses) ? 'OR' : '';
 
-		foreach($semester as $sem => $semester_date_range)
-		{
+		$query = <<<EOSQL
+			with preprocessedsp as (
+				select
+					(UPPER(sp.stg_typ || sp.stg_kurzbz)) || sp.semester || sp.verband || sp.gruppe as verbandsgruppe,
+					sp.*,
+					le.studiensemester_kurzbz
+				from
+					lehre.vw_stundenplan sp
+				join
+					lehre.tbl_lehreinheit le on sp.lehreinheit_id = le.lehreinheit_id
+				where
+					sp.datum >= {$this->escape($start_date)}
+					and sp.datum <= {$this->escape($end_date)}
+			),
+			stundenplaneintraege as (
+				select
+					sp.*
+				from
+					 preprocessedsp sp
+				where
+					{$lvbdclauses}
+					{$chainingor}
+					{$spezgrpclauses}
+			)
 
-			foreach($semester_date_range as $sem_date => $sem_date_range)
-			{
-				// if there are not groups for the semester skip the iteration step
-				if(!array_key_exists($sem_date,$gruppen) || count($gruppen[$sem_date]) == 0)
-				{
-					continue;
-				}
-				// converts the array of gruppen strings into a sql IN (_,_,_) chain
-				$query .="(sp.gruppe_kurzbz IN (" .implode(',',$gruppen[$sem_date]).") AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende)." )";
-				
-				$query .="OR";
-			}
-		} 
-
-		// if there are no studentlehrverbaende and the gruppen are not empty, we can remove the last OR added after the groups
-		if($emptyCheck($studentlehrverbaende) && !$emptyCheck($gruppen))
-		{
-			$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)
-			{
-				if(!array_key_exists($sem_date,$studentlehrverbaende) || count($studentlehrverbaende[$sem_date]) == 0)
-				{
-					continue;
-				}
-				foreach($studentlehrverbaende[$sem_date] as $key=>$lehrverband)
-				{
-					$query .= "(((sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND sp.gruppe = ".$this->escape($lehrverband->gruppe)." AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende).")";
-					// Eintraege fuer den ganzen Verband
-					$query .= "OR (sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND (sp.gruppe is null OR sp.gruppe='') AND sp.datum BETWEEN ".$this->escape($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";
-				}
-			}	
-		}
-
-		// if the studentlehrverbaende is not empty we can remove the last OR that was added to the query
-		if(!$emptyCheck($studentlehrverbaende))
-		{
-			$query = substr($query, 0, -2);
-		}
-
-		// closes the AND sql chain only if it was opened previously
-		if(!$emptyCheck($gruppen) || !$emptyCheck($studentlehrverbaende))
-		{
-			$query .= ")";
-		} 
+EOSQL;
 
 		return $query;
 	}
@@ -724,4 +769,4 @@ class Stundenplan_model extends DB_Model
 
 		return $this->execQuery($qry, [$lehrveranstaltung_id, $studiensemester_kurzbz]);
 	}
-}
+}

application/models/vertragsbestandteil/Gehaltsbestandteil_model.php

@@ -41,6 +41,7 @@ with gbt as (
 	    gb.anmerkung,
 	    gb.dienstverhaeltnis_id,
 	    gb.gehaltstyp_kurzbz,
+		gb.gehaltsanpassungtyp_kurzbz,
 	    gb.valorisierungssperre,
 	    gb.valorisierung,
 	    gb.grundbetrag as grund_betrag_decrypted,
@@ -76,11 +77,13 @@ select
     gbt.anmerkung,
     gbt.dienstverhaeltnis_id,
     gbt.gehaltstyp_kurzbz,
+	gbt.gehaltsanpassungtyp_kurzbz,
     gbt.valorisierungssperre,
     gbt.valorisierung,
     gbt.grund_betrag_decrypted,
     gbt.betrag_val_decrypted,
 	gt.bezeichnung as gehaltstyp_bezeichnung,
+	ga.bezeichnung as gehaltsanpassungtyp_bezeichnung,
 	vb.vertragsbestandteiltyp_kurzbz,
 	bf.funktion_kurzbz,
 	bf.oe_kurzbz,
@@ -93,6 +96,8 @@ from
 	gbt
 LEFT JOIN 
 	hr.tbl_gehaltstyp gt using(gehaltstyp_kurzbz)
+LEFT JOIN 
+	hr.tbl_gehaltsanpassungtyp ga using(gehaltsanpassungtyp_kurzbz)
 LEFT JOIN 
 	hr.tbl_vertragsbestandteil vb using(vertragsbestandteil_id)
 LEFT JOIN 
@@ -177,7 +182,8 @@ LEFT JOIN
 			$stichtagclause .= ')';
 		}
 
-		$this->addSelect('*');
+		$this->addSelect('tbl_gehaltsbestandteil.*, tbl_gehaltstyp.bezeichnung AS gehaltstyp_bezeichnung');
+		$this->addJoin('hr.tbl_gehaltstyp', 'gehaltstyp_kurzbz');
 		$where = <<<EOSQL
 				dienstverhaeltnis_id = {$this->escape($dienstverhaeltnis_id)} 
 				{$stichtagclause}
@@ -202,6 +208,7 @@ SELECT
 	g.dienstverhaeltnis_id, 
 	g.vertragsbestandteil_id, 
 	g.gehaltstyp_kurzbz, 
+	g.gehaltsanpassungtyp_kurzbz,
 	g.von, 
 	g.bis, 
 	g.anmerkung, 
@@ -213,9 +220,11 @@ SELECT
 	g.updateamum, 
 	g.updatevon, 
 	g.valorisierung, 
-	g.auszahlungen 
+	g.auszahlungen,
+	gt.bezeichnung AS gehaltstyp_bezeichnung
 FROM 
-	hr.tbl_gehaltsbestandteil g 
+	hr.tbl_gehaltsbestandteil g
+	JOIN hr.tbl_gehaltstyp gt USING (gehaltstyp_kurzbz)
 LEFT JOIN 
 	hr.tbl_valorisierung_historie vh ON vh.gehaltsbestandteil_id = g.gehaltsbestandteil_id AND vh.valorisierungsdatum = (
           SELECT 
@@ -263,7 +272,7 @@ EOSQL;
 		// Note: replaced gb.betrag_valorisiert with vh.betrag_valorisiert!
 		$qry = "
         	SELECT 
-				gb.gehaltsbestandteil_id,gb.dienstverhaeltnis_id,gb.vertragsbestandteil_id,gb.gehaltstyp_kurzbz,
+				gb.gehaltsbestandteil_id,gb.dienstverhaeltnis_id,gb.vertragsbestandteil_id,gb.gehaltstyp_kurzbz,gb.gehaltsanpassungtyp_kurzbz,
 				gb.von,gb.bis,gb.anmerkung,gb.grundbetrag as grundbetrag,gb.valorisierungssperre,gb.insertamum,
 				gb.insertvon,gb.updateamum,gb.updatevon,gb.valorisierung,gb.auszahlungen,
 				vh.valorisierungsdatum, vh.betrag_valorisiert as betrag_valorisiert

public/css/components/Detailheader.css

@@ -62,3 +62,16 @@
     top:13%;"
     z-index: 104; font-size: 1rem; width: 2.5rem; height: 2.5rem; opacity:0; transition: opacity 0.2s; top:13%;"
 }*/
+
+.tag-hover:hover {
+    background-color: #e9ecef;
+}
+
+.green {
+    background-color: #e9ecef;
+}
+
+.btn-hover {
+    --bs-btn-hover-bg: #e9ecef; /* Neue Hintergrundfarbe beim Hover */
+    --bs-btn-hover-border-color: #e9ecef; /* Neue Rahmenfarbe beim Hover */
+}

public/css/tags.css

@@ -145,3 +145,8 @@
 	float: right;
 	margin-top: 3px;
 }
+
+.btn-hover {
+	--bs-btn-hover-bg:  #e9ecef;
+	--bs-btn-hover-border-color: #e9ecef;
+}

public/js/api/factory/stv/coursedates.js

@@ -26,6 +26,15 @@ export default {
 				+ encodeURIComponent(true)
 		};
 	},
+	getCourselistByStudiensemester(student_uid, studiensemester_kurzbz, stundenplan) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/stv/LvTermine/getStundenplanForStudiensemester/' + encodeURIComponent(student_uid) + '/'
+				+ encodeURIComponent(studiensemester_kurzbz) + '/'
+				+ encodeURIComponent(stundenplan) + '/'
+				+ encodeURIComponent(true)
+		};
+	},
 	exportCalendar(student_uid, stundenplan)
 	{
 		return FHC_JS_DATA_STORAGE_OBJECT.app_root +  'content/statistik/termine.xls.php?student_uid=' + encodeURIComponent(student_uid) + '&db_stpl_table='+encodeURIComponent(stundenplan);

public/js/components/Calendar/LvPlan.js

@@ -174,6 +174,9 @@ export default {
 			>
 				{{ $p.t('lehre/noLvFound') }}
 			</div>
+			<div v-else-if="!renderers || !renderers[event.type]" class="placeholder-glow">
+				<span class="placeholder col-12"></span>
+			</div>
 			<div
 				v-else
 				:class="'event-type-' + event.type + ' ' + mode + 'PageContainer'"

public/js/components/Calendar/Widget.js

@@ -79,6 +79,9 @@ export default {
 			>
 				{{ $p.t('lehre/noLvFound') }}
 			</div>
+			<div v-else-if="!renderers || !renderers[event.type]" class="placeholder-glow">
+				<span class="placeholder col-12"></span>
+			</div>
 			<component
 				v-else-if="mode == 'eventheader'"
 				:is="renderers[event.type]?.modalTitle"

public/js/components/DetailHeader/DetailHeader.js

@@ -400,32 +400,37 @@ export default {
 
 				<div v-if="headerData.length == 1">
 					<div v-if="!isLoading" class="d-flex align-items-center gap-3">
-						<h2 class="h4">
+						<h2 class="h4 mt-2">
 							{{headerData[0].titelpre}}
 							{{headerData[0].vorname}}
 							{{headerData[0].nachname}}
 							<span v-if="headerData[0].titelpost">, </span>
 							{{headerData[0].titelpost}}
 						</h2>
-						<core-tag ref="tagComponent"
-							v-if="tagsEnabled"
-							:endpoint="tagEndpoint"
-							:values="prestudentIds"
-							@added="addedTag"
-							@deleted="deletedTag"
-							@updated="updatedTag"
-							zuordnung_typ="prestudent_id"
-						></core-tag>
-						<div
-							role="button"
-							v-if="tagsEnabled"
-							@click="rebuildPrestudentTags"
-							class="btn btn-outline btn-light mb-1"
-							:title="'Automatische Tags fuer ' + currentSemester + ' neu laden'"
-							>
-							<i class="fa-solid fa-refresh pe-1"></i>
-							<span>{{currentSemester}}</span>
+
+						<div class="d-flex border rounded align-items-center ps-1">
+							<core-tag ref="tagComponent"
+								v-if="tagsEnabled"
+								:endpoint="tagEndpoint"
+								:values="prestudentIds"
+								:show-hover="true"
+								@added="addedTag"
+								@deleted="deletedTag"
+								@updated="updatedTag"
+								zuordnung_typ="prestudent_id"
+							></core-tag>
+							<div
+								role="button"
+								v-if="tagsEnabled"
+								@click="rebuildPrestudentTags"
+								class="btn btn-outline btn-sm btn-hover m-1"
+								:title="$p.t('tag','rebuild_tags') +  ' ' + currentSemester"
+								>
+								<i class="fa-solid fa-refresh pe-1"></i>
+								<span>{{currentSemester}}</span>
+							</div>
 						</div>
+
 						<h6  v-if="headerData[0].unruly" class="badge" :class="'bg-unruly rounded-0'"><strong>unruly</strong></h6>
 					</div>
 					<div v-else class="d-flex align-items-center gap-3">

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

@@ -553,8 +553,12 @@ export default {
 			}
 
 			if (!this.formData.akadgrad_id && this.arrAkadGrad.length > 0) {
-				if(this.student.geschlecht == 'w')
-					this.formData.akadgrad_id = this.arrAkadGrad[1].akadgrad_id;
+				const akadGradByGeschlecht = this.arrAkadGrad.find((item) => {
+					return item.geschlecht === this.student.geschlecht;
+				});
+
+				if(akadGradByGeschlecht)
+					this.formData.akadgrad_id = akadGradByGeschlecht.akadgrad_id;
 				else
 					this.formData.akadgrad_id = this.arrAkadGrad[0].akadgrad_id;
 			}

public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js

@@ -1,6 +1,7 @@
 import {CoreFilterCmpt} from "../../../../filter/Filter.js";
 import FormInput from "../../../../Form/Input.js";
 import FormForm from '../../../../Form/Form.js';
+import { capitalize } from '../../../../../helpers/StringHelpers.js';
 
 export default {
 	name: "TblCourseList",
@@ -30,7 +31,7 @@ export default {
 			tabulatorEvents: [],
 			listStudiensemester: [],
 			dataSem: {},
-			showStundenplanDev: false
+			stundenplanEnvironment: 'prod'
 		};
 	},
 	computed: {
@@ -46,14 +47,15 @@ export default {
 			return link;
 		},
 		dbStundenplanTable: function (){
-			return this.showStundenplanDev ? 'stundenplandev' : 'stundenplan';
+			return this.stundenplanEnvironment === 'dev' ? 'stundenplandev' : 'stundenplan';
 		},
 	},
 	methods: {
 		initTabulatorOptions(){
 			this.tabulatorOptions = {
 				ajaxURL: 'dummy',
-				ajaxRequestFunc: () => this.$api.call(this.endpoint.getCourselist(this.id, this.dataSem.start, this.dataSem.ende, this.dbStundenplanTable)),
+				//ajaxRequestFunc: () => this.$api.call(this.endpoint.getCourselist(this.id, this.dataSem.start, this.dataSem.ende, this.dbStundenplanTable)),
+				ajaxRequestFunc: () => this.$api.call(this.endpoint.getCourselistByStudiensemester(this.id, this.currentSemester, this.dbStundenplanTable)),
 				ajaxResponse: (url, params, response) => {
 					return response.data;
 				},
@@ -112,15 +114,15 @@ export default {
 							}
 						};
 
-						setHeader('lehrveranstaltung_id', this.$p.t('lehre', 'lehrveranstaltung_id'));
-						setHeader('lehreinheit_id', this.$p.t('global', 'lehreinheit_id'));
-						setHeader('datum', this.$p.t('global', 'datum'));
-						setHeader('beginn', this.$p.t('ui', 'dateFrom'));
-						setHeader('ende', this.$p.t('ui', 'dateTo'));
-						setHeader('gruppen_kuerzel', this.$p.t('global', 'gruppen'));
-						setHeader('ort_kurzbz', this.$p.t('global', 'ortLocation'));
-						setHeader('lektorname', this.$p.t('lehre', 'lektor'));
-						setHeader('lehrfach_bez', this.$p.t('global', 'lehrfach'));
+						setHeader('lehrveranstaltung_id', capitalize(this.$p.t('lehre','lehrveranstaltung_id')));
+						setHeader('lehreinheit_id', capitalize(this.$p.t('global','lehreinheit_id')));
+						setHeader('datum', capitalize(this.$p.t('global','datum')));
+						setHeader('beginn', capitalize(this.$p.t('ui','dateFrom')));
+						setHeader('ende', capitalize(this.$p.t('ui','dateTo')));
+						setHeader('gruppen_kuerzel', capitalize(this.$p.t('global','gruppen')));
+						setHeader('ort_kurzbz', capitalize(this.$p.t('global','ortLocation')));
+						setHeader('lektorname', capitalize(this.$p.t('lehre','lektor')));
+						setHeader('lehrfach_bez', capitalize(this.$p.t('global','lehrfach')));
 					}
 				}
 			];
@@ -135,7 +137,6 @@ export default {
 			this.$refs.table.reloadTable();
 		},
 		switchStundenplan(){
-			this.showStundenplanDev = !this.showStundenplanDev;
 			this.reload();
 		}
 	},
@@ -172,18 +173,45 @@ export default {
 				reload
 				:reload-btn-infotext="this.$p.t('table', 'reload')"
 				>
-					<template #actions>	
+					<template #actions>
 						<button
-							class="btn btn-outline-secondary"
+							class="btn btn-outline-secondary me-2"
 							@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>
+
+						<div class="btn-group" role="group">
+							<input
+								type="radio"
+								class="btn-check"
+								name="btnradio"
+								id="btnradio_prod"
+								value="prod"
+								v-model="stundenplanEnvironment"
+								@change="switchStundenplan()"
+							>
+							<label
+								class="btn btn-outline-secondary"
+								for="btnradio_prod"
+							>
+								{{$p.t('lehre', 'btn_stundenplanProd')}}
+							</label>
+							<input
+								type="radio"
+								class="btn-check"
+								name="btnradio"
+								id="btnradio_dev"
+								value="dev"
+								v-model="stundenplanEnvironment"
+								@change="switchStundenplan()"
+							>
+							<label
+								class="btn btn-outline-secondary"
+								for="btnradio_dev"
+							>
+								{{$p.t('lehre', 'btn_stundenplanDev')}}
+							</label>
+						</div>
 					</template>
 			</core-filter-cmpt>
 		</div>

public/js/components/Stv/Studentenverwaltung/List.js

@@ -317,6 +317,7 @@ export default {
     "$p.user_language.value"(n, o) {
       if (n !== o && o !== undefined && this.$refs.table.tableBuilt) {
         this.translateTabulator();
+        this.$reloadList();
       }
     },
     "tagFilterState.selectedOptions": {
@@ -842,35 +843,39 @@ export default {
         </div>
        </template>
 
-      <template #actions>
-        <core-tag ref="tagComponent"
-          v-if="tagsEnabled"
-          :endpoint="tagEndpoint"
-          :values="selectedColumnValues"
-          @added="addedTag"
-          @deleted="deletedTag"
-          @updated="updatedTag"
-          zuordnung_typ="prestudent_id"
-        ></core-tag>
+      <template #tags>
+        <div class="d-flex border rounded align-items-center ps-1">
+          <core-tag ref="tagComponent"
+            v-if="tagsEnabled"
+            :endpoint="tagEndpoint"
+            :values="selectedColumnValues"
+            @added="addedTag"
+            @deleted="deletedTag"
+            @updated="updatedTag"
+            zuordnung_typ="prestudent_id"
+            show-hover
+          ></core-tag>
 
-		<button
-			v-if="!selected.length"
-			class="btn btn-outline btn-light mb-1"
-			@click="rebuild(selected)"
-			:title="$p.t('tag','rebuild_tags') + ' Stg ' + currentSemester"
-			>
-				<i class="fa-solid fa-refresh pe-1"></i> STG
-		</button>
-		<button
-			v-else
-			class="btn btn-outline btn-light mb-1"
-			@click="rebuild(selected)"
-			:title="$p.t('tag','rebuild_tags') + ' ' + $p.t('ui','selection') + ' ' + currentSemester"
-			>
-				<i class="fa-solid fa-refresh pe-1"></i> {{selected.length}}
-		</button>
+          <button
+              v-if="!selected.length"
+              class="btn btn-outline btn-sm m-1 btn-hover"
+              @click="rebuild(selected)"
+              :title="$p.t('tag','rebuild_tags') + ' Stg ' + currentSemester"
+              >
+                  <i class="fa-solid fa-refresh pe-1"></i> STG
+          </button>
+          <button
+              v-else
+              class="btn btn-outline btn-sm m-1 btn-hover"
+              @click="rebuild(selected)"
+              :title="$p.t('tag','rebuild_tags') + ' ' + $p.t('ui','selection') + ' ' + currentSemester"
+              >
+                  <i class="fa-solid fa-refresh pe-1"></i> {{selected.length}}
+          </button>
+        </div>
+      </template>
 
-        <template v-if="filter.length || headerFilterActive">
+      <template v-if="filter.length || headerFilterActive">
         <div class="d-flex justify-content-center align-items-center gap-2 ps-4 position-absolute start-50 translate-middle-x">
           <p class="text-danger mb-0">
             <strong>{{$p.t('filter','filterActive')}}</strong>
@@ -884,8 +889,6 @@ export default {
             <span class="fa-solid fa-filter-circle-xmark"></span>
           </button>
         </div>
-        </template>
-
       </template>
 
       <template #filter>
@@ -895,6 +898,7 @@ export default {
           </div>
         </div>
       </template>
+
       </core-filter-cmpt>
     </div>
     <list-new ref="new" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz"></list-new>

public/js/components/Tag/Tag.js

@@ -28,6 +28,10 @@ export default {
 		confirmLimit: {
 			type: Number,
 			default: 20
+		},
+		showHover: {
+			type: Boolean,
+			default: false
 		}
 	},
 	data() {
@@ -228,7 +232,8 @@ export default {
 			<span :title="values.length === 0 ? 'Bitte Zeilen markieren' : ''">
 			<button @mouseover="showList = true" 
 					:disabled="!values || values.length === 0"
-					class="btn btn-sm">
+					class="btn btn-sm"
+					:class="{'btn-hover': showHover}">
 				<i class="fa-solid fa-tag fa-xl"></i>
 			</button>
 			</span>

public/js/components/filter/Filter.js

@@ -1094,7 +1094,7 @@ export const CoreFilterCmpt = {
 		<div :id="'filterCollapsables' + idExtra">
 
 			<div class="d-flex flex-row justify-content-between flex-wrap">
-				<div v-if="newBtnShow || reload || $slots.search || $slots.actions" class="d-flex gap-2 align-items-baseline flex-wrap">
+				<div v-if="newBtnShow || reload || $slots.search || $slots.actions || $slots.tags" class="d-flex gap-2 align-items-baseline flex-wrap">
 					<button v-if="newBtnShow" class="btn btn-primary" :class="newBtnClass" :title="newBtnLabel ? undefined : 'New'" :aria-label="newBtnLabel ? undefined : 'New'" @click="$emit('click:new', $event)" :disabled="newBtnDisabled">
 						<span class="fa-solid fa-plus" aria-hidden="true"></span>
 						{{ newBtnLabel }}
@@ -1107,6 +1107,7 @@ export const CoreFilterCmpt = {
 						<span v-else id="selected-info-text"> Mit {{ selectedData.length }} ausgewählten:</span>
 					</span>
 					<slot name="actions" v-bind="{selected: tabulatorHasSelector ? selectedData : []}"></slot>
+					<slot name="tags"></slot>
 					<slot name="search"></slot>
 				</div>
 				<div class="d-flex gap-1 align-items-baseline flex-grow-1 justify-content-end">

system/dbupdate_3.4.php

@@ -100,6 +100,7 @@ require_once('dbupdate_3.4/68530_Dashboard_Cleanup.php');
 require_once('dbupdate_3.4/75959_StudVw_Automatische_Tags.php');
 require_once('dbupdate_3.4/76160_lvv_favorites.php');
 require_once('dbupdate_3.4/77080_tabulator_presets_table.php');
+require_once('dbupdate_3.4/78292_gehaltsanpassungtyp.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';

system/dbupdate_3.4/78292_gehaltsanpassungtyp.php

@@ -0,0 +1,47 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table_name='tbl_gehaltsanpassungtyp' AND table_schema='hr'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "
+
+		ALTER TABLE 
+			hr.tbl_gehaltsbestandteil 
+		    ADD COLUMN IF NOT EXISTS
+			gehaltsanpassungtyp_kurzbz character varying(32);
+
+		COMMENT ON COLUMN hr.tbl_gehaltsbestandteil.gehaltsanpassungtyp_kurzbz IS E'Ersteinstufung, indiv. Erhöhung, etc.';
+		
+		CREATE TABLE IF NOT EXISTS hr.tbl_gehaltsanpassungtyp
+		(
+			gehaltsanpassungtyp_kurzbz character varying(32) NOT NULL,
+			bezeichnung varchar(256),
+			sort smallint,
+			aktiv boolean NOT NULL DEFAULT true,
+			CONSTRAINT tbl_gehaltsanpassungtyp_pk PRIMARY KEY (gehaltsanpassungtyp_kurzbz)
+		);
+
+		COMMENT ON TABLE hr.tbl_gehaltsanpassungtyp IS E'Key-Table of Salary Adaption Types';
+
+		ALTER TABLE hr.tbl_gehaltsbestandteil DROP CONSTRAINT IF EXISTS tbl_gehaltsanpassungtyp_fk;
+		ALTER TABLE hr.tbl_gehaltsbestandteil ADD CONSTRAINT tbl_gehaltsanpassungtyp_fk FOREIGN KEY (gehaltsanpassungtyp_kurzbz)
+		REFERENCES hr.tbl_gehaltsanpassungtyp (gehaltsanpassungtyp_kurzbz) MATCH FULL
+		ON DELETE RESTRICT ON UPDATE CASCADE;
+		
+		GRANT SELECT, UPDATE, INSERT, DELETE ON hr.tbl_gehaltsanpassungtyp TO vilesci;
+
+		INSERT INTO hr.tbl_gehaltsanpassungtyp(gehaltsanpassungtyp_kurzbz, bezeichnung, sort, aktiv) VALUES('ersteinstufung','Ersteinstufung', 1, true);
+		INSERT INTO hr.tbl_gehaltsanpassungtyp(gehaltsanpassungtyp_kurzbz, bezeichnung, sort, aktiv) VALUES('individuelle_erhoehung','Indiv. Gehaltserhöhung', 2, true);
+		INSERT INTO hr.tbl_gehaltsanpassungtyp(gehaltsanpassungtyp_kurzbz, bezeichnung, sort, aktiv) VALUES('strukturelle_anpassung','Strukturelle Anpassung', 3, true);
+		INSERT INTO hr.tbl_gehaltsanpassungtyp(gehaltsanpassungtyp_kurzbz, bezeichnung, sort, aktiv) VALUES('funktionsaenderung','Funktionsänderung', 4, true);
+		
+		";
+
+		if (! $db->db_query($qry))
+			echo '<strong>Gehaltsanpassungtyp: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'Tabelle und Feld für Gehaltsanpassungtyp wurden neu erstellt<br>';
+	}
+}

system/phrasesupdate.php

@@ -62411,6 +62411,46 @@ I have been informed that I am under no obligation to consent to the transmissio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'btn_stundenplanDev',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV-Plan (Planungs-Daten)',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'LV-Plan (developing data)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'btn_stundenplanProd',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LV-Plan (Produktiv Daten)',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'LV-Plan (produktive data',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );