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 1/6] 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 2/6] 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 3/6] 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 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 4/6] 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 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 5/6] 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 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 6/6] 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'
+			)
+		);
+
 	}
 
 	/**