From 660f9076ce32c1f99aa2df8d9df0dc7a85bd1023 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 14 Feb 2025 09:38:33 +0100
Subject: [PATCH] delete commented out sections

---
 application/models/ressource/Mitarbeiter_model.php   | 11 ++++-------
 public/js/components/Vertraege/Vertragsverwaltung.js | 11 ++---------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php
index e1493e1e8..f240a9d9a 100644
--- a/application/models/ressource/Mitarbeiter_model.php
+++ b/application/models/ressource/Mitarbeiter_model.php
@@ -107,7 +107,7 @@ class Mitarbeiter_model extends DB_Model
 	{
 		$qry = "
 			SELECT
-				 b.uid , p.person_id,
+				b.uid , p.person_id,
 				p.vorname, p.nachname,
 				gebdatum,
 				COALESCE(b.alias, b.uid) AS email,
@@ -115,9 +115,6 @@ class Mitarbeiter_model extends DB_Model
 				STRING_AGG(DISTINCT u.bezeichnung, ', ') AS Unternehmen,
 				STRING_AGG(d.dienstverhaeltnis_id::TEXT, ', ') AS ids,
 				b.aktiv
-	--			CASE WHEN b.aktiv=true THEN 'aktiv'
-	--			 	 ELSE 'nicht aktiv'
-	--				 END as status //not working in header filter	*/  
 				FROM
 					hr.tbl_dienstverhaeltnis d
 				JOIN
@@ -128,7 +125,7 @@ class Mitarbeiter_model extends DB_Model
 					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)
 		{
@@ -138,9 +135,9 @@ class Mitarbeiter_model extends DB_Model
 		$qry.= " 
 			GROUP BY
 				b.uid, p.person_id, p.vorname, p.nachname, b.alias
-			 ORDER BY
+			ORDER BY
 					p.nachname, p.vorname;
-			    ";
+			";
 
 		$params = array($person_id);
 
diff --git a/public/js/components/Vertraege/Vertragsverwaltung.js b/public/js/components/Vertraege/Vertragsverwaltung.js
index cc96c1f79..1a6100913 100644
--- a/public/js/components/Vertraege/Vertragsverwaltung.js
+++ b/public/js/components/Vertraege/Vertragsverwaltung.js
@@ -21,15 +21,8 @@ export default {
 		}
 	},
 	data() {
-		//TODO(Manu) props for filter: actually not necessary
 		return {
 			person_id: null,
-/*			filterMa: {
-				active: true,
-				hasVertraege: true
-			},*/
-/*			vertragsarten:
-				[ 'echterdv', 'externerlehrender', 'gastlektor']*/
 		}
 	},
 	methods: {
@@ -43,9 +36,9 @@ export default {
 			<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
 				<vertical-split ref="vsplit">
 					<template #top>	
-	<!--					<div class="d-flex flex-column" style="height: 100%;">-->
+						<div class="d-flex flex-column" style="height: 100%;">
 							<mitarbeiter-header :filterMa="filterMa" :vertragsarten="vertragsarten" @selectedPerson="selectPerson" />
-<!--						</div>-->
+						</div>
 					</template>
 					<template #bottom>
 						<div class="col" v-if="person_id!=null">