bugfix: use new version of query getStundenplanQuery

Avoid multiple records for same active STGL.
e.g. double entries

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

@@ -60,8 +60,8 @@ class LvTermine extends FHCAPI_Controller
 				$semester_range,
 				$benutzer_gruppen,
 				$student_lehrverband,
-				true,
-				$dbStundenplanTable
+				$dbStundenplanTable,
+				true
 			);
 
 		if(!$stundenplan_query)

application/libraries/StundenplanLib.php

@@ -94,13 +94,13 @@ class StundenplanLib
 		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 +632,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);

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

@@ -225,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;
 	}

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

@@ -532,12 +532,12 @@ 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 showLvsStundenplan if Lvs of stundenplan should be shown
 	 * @param db_stpl_table enables switch to db 'stundenplandev'
 	 *
 	 * @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){
 
 		// helper function to check if either $gruppen or $studentlehrverbaende are empty for each semester
 		$emptyCheck = function($toBeCheckedArray) use ($semester){
@@ -559,17 +559,17 @@ class Stundenplan_model extends DB_Model
 		}
 
 		$query =
-		"select sp.*
+			"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 ( ";
-		} 
+		}
 
 		foreach($semester as $sem => $semester_date_range)
 		{
@@ -583,10 +583,10 @@ class Stundenplan_model extends DB_Model
 				}
 				// 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))
@@ -594,12 +594,6 @@ 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)
@@ -617,9 +611,24 @@ class Stundenplan_model extends DB_Model
 					$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";
+					// Eintraege vom Stundenplan
+					if($showLvsStundenplan)
+					{
+						$query .= "
+							OR EXISTS (
+								SELECT 1
+								FROM lehre.tbl_stundenplan tsp
+								WHERE tsp.lehreinheit_id = sp.lehreinheit_id
+									AND tsp.studiengang_kz = " . $this->escape($lehrverband->studiengang_kz) . "
+									AND (tsp.semester = " . $this->escape($lehrverband->semester) . " OR tsp.semester IS NULL)
+										AND (tsp.verband = " . $this->escape($lehrverband->verband) . " OR tsp.verband IS NULL OR tsp.verband = '0' OR tsp.verband = '')
+										AND (tsp.gruppe = " . $this->escape($lehrverband->gruppe) . " OR tsp.gruppe IS NULL	OR tsp.gruppe = '0'	OR tsp.gruppe = '')
+										AND tsp.gruppe_kurzbz IS NULL)";
+					}
+
+					$query .= "OR";
 				}
-			}	
+			}
 		}
 
 		// if the studentlehrverbaende is not empty we can remove the last OR that was added to the query
@@ -632,7 +641,7 @@ class Stundenplan_model extends DB_Model
 		if(!$emptyCheck($gruppen) || !$emptyCheck($studentlehrverbaende))
 		{
 			$query .= ")";
-		} 
+		}
 
 		return $query;
 	}

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/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/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">