From 186e9e6f0848dc39be2885feba69b0cfb8f690cd Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 21 May 2024 15:56:18 +0200
Subject: [PATCH 01/34] WIP room planning in calendar

---
 application/controllers/CisVue/Cms.php        |  4 ++
 .../components/Cis/Stundenplan.php            | 13 +++-
 .../models/ressource/Stundenplan_model.php    | 12 ++++
 .../models/ressource/Stundenplandev_model.php |  2 +
 .../views/CisVue/Cms/RoomInformation.php      | 17 ++++++
 public/js/apps/Cis/RoomInformation.js         | 61 +++++++++++++++++++
 6 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 application/views/CisVue/Cms/RoomInformation.php
 create mode 100644 public/js/apps/Cis/RoomInformation.js

diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
index 2c1fa1fc6..f8bd61a7b 100755
--- a/application/controllers/CisVue/Cms.php
+++ b/application/controllers/CisVue/Cms.php
@@ -115,4 +115,8 @@ class Cms extends FHC_Controller
 			show_error("News number rows: No data found");
 		}
 	}
+
+	public function getRoomInformation(){
+		$this->load->view('CisVue/Cms/RoomInformation');
+	}
 }
diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
index 2b35e11ca..2ec001843 100755
--- a/application/controllers/components/Cis/Stundenplan.php
+++ b/application/controllers/components/Cis/Stundenplan.php
@@ -16,7 +16,8 @@ class Stundenplan extends Auth_Controller
 		parent::__construct([
 			'index' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
 			'Reservierungen' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
-			'Stunden' => ['student/anrechnung_beantragen:r','user:r'] // TODO(chris): permissions?
+			'Stunden' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
+			'RoomInformation'=> ['student/anrechnung_beantragen:r','user:r'],
 		]);
 	}
 
@@ -65,4 +66,14 @@ class Stundenplan extends Auth_Controller
 		$this->outputJsonSuccess(getData($result));
 	}
 
+	public function RoomInformation()
+	{
+		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		$result = $this->StundenplanModel->getRoomDataOnDay('EDV_A2.06','2024-05-21');
+		//echo($this->db->last_query());
+		echo json_encode($result);
+		
+	}
+
 }
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 5ec6ea302..4d0a7893b 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -12,6 +12,18 @@ class Stundenplan_model extends DB_Model
 		$this->pk = 'stundenplan_id';
 	}
 
+	/**
+	 * @param string $ort_kurzbz
+	 * @param string $date
+	 * 
+	 * @return stdClass
+	 */
+	public function getRoomDataOnDay($ort_kurzbz,$date){
+		$res = $this->loadWhere(['ort_kurzbz'=>$ort_kurzbz,'datum'=>$date]);
+		$res = hasData($res) ? getData($res): null;
+		return $res;
+	}
+
 	/**
 	 * @param string $uid
 	 * 
diff --git a/application/models/ressource/Stundenplandev_model.php b/application/models/ressource/Stundenplandev_model.php
index a498e209b..800540d60 100755
--- a/application/models/ressource/Stundenplandev_model.php
+++ b/application/models/ressource/Stundenplandev_model.php
@@ -12,6 +12,8 @@ class Stundenplandev_model extends DB_Model
 		$this->pk = 'stundenplandev_id';
 	}
 
+	
+
 	public function getMissingDirectGroups($studiensemester_kurzbz = null)
 	{
 		$qry = "
diff --git a/application/views/CisVue/Cms/RoomInformation.php b/application/views/CisVue/Cms/RoomInformation.php
new file mode 100644
index 000000000..c14b68024
--- /dev/null
+++ b/application/views/CisVue/Cms/RoomInformation.php
@@ -0,0 +1,17 @@
+<?php
+$includesArray = array(
+	'title' => 'RoomInformation',
+	'customJSModules' => ['public/js/apps/Cis/RoomInformation.js'],
+	'customCSSs' => ['public/css/components/calendar.css']
+);
+
+$this->load->view('templates/CISHTML-Header', $includesArray);
+?>
+
+<div >
+	<h2>Room Information</h2>
+	<hr>
+    <div id="content"></div>
+</div>
+
+<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
new file mode 100644
index 000000000..63587d2d1
--- /dev/null
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -0,0 +1,61 @@
+import FhcCalendar from "../../components/Calendar/Calendar.js";
+
+const app = Vue.createApp({
+	components: {
+		FhcCalendar
+	},
+	data() {
+		return {
+			stunden: [],
+			events: null
+		}
+	},
+	created() {
+		axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan/Stunden').then(res => {
+			
+            
+            res.data.retval.forEach(std => {
+				this.stunden[std.stunde] = std; // TODO(chris): geht besser
+			});
+			console.log("this are the loaded stunden", this.stunden)
+		});
+
+        axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan').then(res => {
+            
+            let events;
+            if (res.data.retval && res.data.retval.forEach) {
+                res.data.retval.forEach((el, i) => {
+                    el.id = i;
+                    el.color = '#' + (el.farbe || 'CCCCCC');
+                    el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
+                    el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+                    el.title = el.lehrfach;
+                    if (el.lehrform)
+                        el.title += '-' + el.lehrform;
+                });
+                events = res.data.retval;
+            }
+
+            console.log("this are the loaded events",events)
+            // TODO(chris): do we need that
+
+        }).catch((e)=>{console.log(e,"this is the exception")})
+
+
+        axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan/RoomInformation').then(res => {
+            console.log(res)
+        console.log("this string got printed after the get was successfully finished")
+        }).catch((e)=>{console.log(e,"this is the exception")})
+
+       
+
+	},
+    template: /*html*/`
+    <div>
+    <!--initialDate="2023-5-12"-->
+        <fhc-calendar  :events="events" initial-mode="week" show-weeks></fhc-calendar>
+    </div>
+    `,
+});
+app.config.unwrapInjectedRef = true;
+app.mount('#content');
\ No newline at end of file

From 729509a45d7ef09ccf71e548a880f0c50e256641 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 23 May 2024 15:40:23 +0200
Subject: [PATCH 02/34] WIP

---
 .../components/Cis/Stundenplan.php            |  3 ++
 .../models/ressource/Stundenplan_model.php    | 14 +++++++-
 public/js/apps/Cis/RoomInformation.js         | 36 ++++++++++++++-----
 public/js/components/Calendar/Week/Page.js    | 16 +++++++--
 4 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
index 2ec001843..3ca8bbc2e 100755
--- a/application/controllers/components/Cis/Stundenplan.php
+++ b/application/controllers/components/Cis/Stundenplan.php
@@ -70,6 +70,9 @@ class Stundenplan extends Auth_Controller
 	{
 		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 
+
+
+		
 		$result = $this->StundenplanModel->getRoomDataOnDay('EDV_A2.06','2024-05-21');
 		//echo($this->db->last_query());
 		echo json_encode($result);
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 4d0a7893b..b566b0325 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -19,9 +19,21 @@ class Stundenplan_model extends DB_Model
 	 * @return stdClass
 	 */
 	public function getRoomDataOnDay($ort_kurzbz,$date){
+
+
+		$this->addSelect(['*',"CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) as eintrag","lektor","CONCAT(lehrfach,'-',lehrform)"]);
+		/* $this->addSelect(["lehre.tbl_stundenplan.*","CONCAT(UPPER(sg.typ),UPPER(sg.kurzbz),'-',lehre.tbl_stundenplan.semester,lehre.tbl_stundenplan.verband) as simml"]);
+		$this->addJoin("public.tbl_lehrverband as lv","lv.studiengang_kz=lehre.tbl_stundenplan.studiengang_kz AND lv.gruppe=lehre.tbl_stundenplan.gruppe AND lv.verband=lehre.tbl_stundenplan.verband AND lv.semester=lehre.tbl_stundenplan.semester","LEFT"); 
+		$this->addJoin("public.tbl_studiengang as sg","sg.studiengang_kz=lehre.tbl_stundenplan.studiengang_kz","LEFT"); 
 		$res = $this->loadWhere(['ort_kurzbz'=>$ort_kurzbz,'datum'=>$date]);
 		$res = hasData($res) ? getData($res): null;
-		return $res;
+		return $res; */
+		$this->db->where('ort_kurzbz','EDV_A2.06',true);
+		$this->db->where('datum','2024-05-21',true);
+
+		$query = $this->db->get_compiled_select('lehre.vw_stundenplan sp');
+		
+		return $this->execQuery($query, [$ort_kurzbz, $date]);
 	}
 
 	/**
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index 63587d2d1..adb571047 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -7,7 +7,8 @@ const app = Vue.createApp({
 	data() {
 		return {
 			stunden: [],
-			events: null
+			events: null,
+            testDate: new Date('2024-05-21'),
 		}
 	},
 	created() {
@@ -18,11 +19,33 @@ const app = Vue.createApp({
 				this.stunden[std.stunde] = std; // TODO(chris): geht besser
 			});
 			console.log("this are the loaded stunden", this.stunden)
+
+            axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan/RoomInformation').then(res => {
+                let events;
+                console.log(" this is the res of the api call room information",res);
+                if (res.data && res.data.forEach) {
+                    res.data.forEach((el, i) => {
+
+                        console.log(el,"this is the element that gets changed")
+                        el.id = i;
+                        el.color = '#' + (el.farbe || 'CCCCCC');
+                        el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
+                        el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+                        el.title = el.lehrfach;
+                        if (el.lehrform)
+                            el.title += '-' + el.lehrform;
+                    });
+                    events = res.data;
+                    //console.log("this are the room events",events)
+                    //this.events = events;
+                }
+            }).catch((e)=>{console.log(e,"this is the exception")})
 		});
 
         axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan').then(res => {
             
             let events;
+            console.log(" this is the res of the api call stundenplan",res);
             if (res.data.retval && res.data.retval.forEach) {
                 res.data.retval.forEach((el, i) => {
                     el.id = i;
@@ -34,18 +57,15 @@ const app = Vue.createApp({
                         el.title += '-' + el.lehrform;
                 });
                 events = res.data.retval;
+                console.log("this are the events of the stundenplan",events)
             }
 
-            console.log("this are the loaded events",events)
             // TODO(chris): do we need that
 
-        }).catch((e)=>{console.log(e,"this is the exception")})
+        }).catch((e)=>{console.log(e,"this is the exception")}) 
 
 
-        axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan/RoomInformation').then(res => {
-            console.log(res)
-        console.log("this string got printed after the get was successfully finished")
-        }).catch((e)=>{console.log(e,"this is the exception")})
+        
 
        
 
@@ -53,7 +73,7 @@ const app = Vue.createApp({
     template: /*html*/`
     <div>
     <!--initialDate="2023-5-12"-->
-        <fhc-calendar  :events="events" initial-mode="week" show-weeks></fhc-calendar>
+        <fhc-calendar :initialDate="testDate" :events="events" initial-mode="week" show-weeks></fhc-calendar>
     </div>
     `,
 });
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 47d48b7f7..ce86f36bd 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -28,7 +28,8 @@ export default {
 	},
 	computed: {
 		days() {
-			let tmpDate = new CalendarDate(this.year, 1, 1); // NOTE(chris): somewhere in the middle of the year
+			
+			let tmpDate = new CalendarDate(this.year,1,1); // NOTE(chris): somewhere in the middle of the year
 			tmpDate.w = this.week;
 			let startDay = tmpDate.firstDayOfWeek;
 			let result = [];
@@ -36,9 +37,11 @@ export default {
 				result.push(new Date(startDay.getFullYear(), startDay.getMonth(), startDay.getDate() + i));
 			}
 			return result;
+
 		},
 		eventsPerDayAndHour() {
 			const res = {};
+			console.log("this are the days",this.days)
 			this.days.forEach(day => {
 				let key = day.toDateString();
 				
@@ -46,6 +49,7 @@ export default {
 				nextDay.setDate(nextDay.getDate()+1);
 				nextDay.setMilliseconds(nextDay.getMilliseconds()-1);
 				let d = {events:[],lanes:1};
+				console.log("this are the events",this.events, "and this is the key",key)
 				if (this.events[key]) {
 					this.events[key].forEach(evt => {
 						let event = {orig:evt,lane:1,maxLane:1,start: evt.start < day ? day : evt.start, end: evt.end > nextDay ? nextDay : evt.end,shared:[],setSharedMaxRecursive(doneItems) {
@@ -75,6 +79,9 @@ export default {
 		}
 	},
 	methods: {
+		printTest:function(param){
+			console.log("HERE",param)
+		},
 		changeToMonth(day) {
 			if (!this.noMonthView) {
 				this.date.set(day);
@@ -91,6 +98,7 @@ export default {
 	},
 	template: `
 	<div class="fhc-calendar-week-page">
+	
 		<div class="d-flex flex-column border-top">
 			<div class="fhc-calendar-week-page-header border-2 border-bottom text-center d-flex">
 				<div v-for="day in days" :key="day" class="flex-grow-1" :title="day.toLocaleString(undefined, {dateStyle:'short'})">
@@ -104,8 +112,10 @@ export default {
 						<div v-for="hour in hours" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
 					<div v-for="day in eventsPerDayAndHour" :key="day" class="day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (1440 / smallestTimeFrame) + ', 1fr)'}">
-						<a href="#" v-for="event in day.events" :key="event" class="small rounded overflow-hidden text-decoration-none text-dark" :style="{'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end), '--test': dateToMinutesOfDay(event.end), background: event.orig.color}" @click.prevent="$emit('input', event.orig)">
-							{{event.orig.title}}
+						<span>test</span>
+					<a href="#" @click="printTest(event)" v-for="event in day.events" :key="event" class="small rounded overflow-hidden text-decoration-none text-dark" :style="{'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end), '--test': dateToMinutesOfDay(event.end), background: event.orig.color}" @click.prevent="$emit('input', event.orig)">
+							
+							{{event.orig.title}}-->
 						</a>
 					</div>
 				</div>

From 39321dcde378b8a3c0aac0e661c17ea73af93006 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 31 May 2024 12:28:06 +0200
Subject: [PATCH 03/34] adds the roomInformation Calendar to the menu and uses
 different template for the calendar page slot

---
 .../controllers/components/Cis/Stundenplan.php     |  1 +
 application/models/content/Content_model.php       |  9 +++++++++
 application/models/ressource/Stundenplan_model.php |  4 ++--
 public/js/apps/Cis/RoomInformation.js              | 14 ++++++++++----
 public/js/components/Calendar/Week/Page.js         |  2 +-
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
index 3ca8bbc2e..e0c163bac 100755
--- a/application/controllers/components/Cis/Stundenplan.php
+++ b/application/controllers/components/Cis/Stundenplan.php
@@ -74,6 +74,7 @@ class Stundenplan extends Auth_Controller
 
 		
 		$result = $this->StundenplanModel->getRoomDataOnDay('EDV_A2.06','2024-05-21');
+		$result = hasData($result) ? getData($result) : [];
 		//echo($this->db->last_query());
 		echo json_encode($result);
 		
diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index ed447b36a..f42a395f9 100755
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -165,6 +165,15 @@ class Content_model extends DB_Model
 						"menu_open": false,
 						"aktiv": true,
 						"childs": []
+					},
+					{
+						"content_id": 1000008,
+						"template_kurzbz": "redirect",
+						"titel": "room information (to delete)",
+						"content": "<content><url><![CDATA[' . site_url('/CisVue/Cms/getRoomInformation') . ']]></url><target><![CDATA[]]></target></content>",
+						"menu_open": false,
+						"aktiv": true,
+						"childs": []
 					}
 					
 				]
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index b566b0325..f67eab166 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -21,7 +21,7 @@ class Stundenplan_model extends DB_Model
 	public function getRoomDataOnDay($ort_kurzbz,$date){
 
 
-		$this->addSelect(['*',"CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) as eintrag","lektor","CONCAT(lehrfach,'-',lehrform)"]);
+		$this->addSelect(['*',"CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) as stg","lektor","CONCAT(lehrfach,'-',lehrform) as lv_info" ]);
 		/* $this->addSelect(["lehre.tbl_stundenplan.*","CONCAT(UPPER(sg.typ),UPPER(sg.kurzbz),'-',lehre.tbl_stundenplan.semester,lehre.tbl_stundenplan.verband) as simml"]);
 		$this->addJoin("public.tbl_lehrverband as lv","lv.studiengang_kz=lehre.tbl_stundenplan.studiengang_kz AND lv.gruppe=lehre.tbl_stundenplan.gruppe AND lv.verband=lehre.tbl_stundenplan.verband AND lv.semester=lehre.tbl_stundenplan.semester","LEFT"); 
 		$this->addJoin("public.tbl_studiengang as sg","sg.studiengang_kz=lehre.tbl_stundenplan.studiengang_kz","LEFT"); 
@@ -29,7 +29,7 @@ class Stundenplan_model extends DB_Model
 		$res = hasData($res) ? getData($res): null;
 		return $res; */
 		$this->db->where('ort_kurzbz','EDV_A2.06',true);
-		$this->db->where('datum','2024-05-21',true);
+		$this->db->where('datum >=','2024-05-21',true);
 
 		$query = $this->db->get_compiled_select('lehre.vw_stundenplan sp');
 		
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index adb571047..cc7aec2bb 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -37,12 +37,12 @@ const app = Vue.createApp({
                     });
                     events = res.data;
                     //console.log("this are the room events",events)
-                    //this.events = events;
+                    this.events = events;
                 }
             }).catch((e)=>{console.log(e,"this is the exception")})
 		});
 
-        axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan').then(res => {
+        /* axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan').then(res => {
             
             let events;
             console.log(" this is the res of the api call stundenplan",res);
@@ -65,7 +65,7 @@ const app = Vue.createApp({
         }).catch((e)=>{console.log(e,"this is the exception")}) 
 
 
-        
+         */
 
        
 
@@ -73,7 +73,13 @@ const app = Vue.createApp({
     template: /*html*/`
     <div>
     <!--initialDate="2023-5-12"-->
-        <fhc-calendar :initialDate="testDate" :events="events" initial-mode="week" show-weeks></fhc-calendar>
+        <fhc-calendar v-slot="{event}" :initialDate="testDate" :events="events" initial-mode="week" show-weeks>
+            <div class="d-flex flex-column align-items-center justify-content-evenly h-100">
+                <span>{{event.orig.lv_info}}</span>	
+                <span>{{event.orig.stg}}</span>
+                <span>{{event.orig.lektor}}</span>
+			</div>
+        </fhc-calendar>
     </div>
     `,
 });
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index eef39011a..cd0ec816e 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -112,7 +112,7 @@ export default {
 						<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
 					<div v-for="day in eventsPerDayAndHour" :key="day" class="day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (1440 / smallestTimeFrame) + ', 1fr)'}">
-						<a  href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'" v-for="event in day.events" :key="event" class="mx-2 border border-dark border-2 small rounded overflow-hidden text-decoration-none text-dark" :style="{'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end), 'background': event.orig.farbe?event.orig.farbe:'white' ,'--test': dateToMinutesOfDay(event.end)}" @click.prevent="$emit('input', event.orig)">
+						<a  href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'" v-for="event in day.events" :key="event" class="mx-2 border border-dark border-2 small rounded overflow-hidden text-decoration-none text-dark" :style="{'background-color': event.orig.farbe?'#'.concat(event.orig.farbe):'white','grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" @click.prevent="$emit('input', event.orig)">
 							<slot :event="event" />
 						</a>
 					</div>

From 3df1aaf371786bf2696ab8fdffff48396a4665ea Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 4 Jun 2024 08:24:58 +0200
Subject: [PATCH 04/34] uses the new fhcApi factory to make the roomInformation
 get request from the frontent/v1/stundenplan api and uses the CalendarDate
 class to get the first day of the week and the last day of the week to make
 the request for the room information over the whole week

---
 .../api/frontend/v1/Stundenplan.php           | 90 +++++++++++++++++++
 .../components/Cis/Stundenplan.php            |  3 -
 .../models/ressource/Stundenplan_model.php    |  9 +-
 public/js/api/fhcapifactory.js                |  4 +-
 public/js/api/studenplan.js                   | 15 ++++
 public/js/apps/Cis/RoomInformation.js         | 63 ++++---------
 public/js/components/Calendar/Week/Page.js    |  1 -
 7 files changed, 132 insertions(+), 53 deletions(-)
 create mode 100644 application/controllers/api/frontend/v1/Stundenplan.php
 create mode 100644 public/js/api/studenplan.js

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
new file mode 100644
index 000000000..5e35ae3c9
--- /dev/null
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the SearchBarLib (back-end)
+ * Provides data to the ajax get calls about the searchbar component
+ * This controller works with JSON calls on the HTTP GET and the output is always JSON
+ */
+class Stundenplan extends FHCAPI_Controller
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+	
+		parent::__construct([
+			'roomInformation' => self::PERM_LOGGED,
+            'Stunden' => self::PERM_LOGGED
+		]);
+
+		// Load the library ...
+		// $this->load->library('');
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Gets a JSON body via HTTP POST and provides the parameters
+	 */
+	public function roomInformation()
+	{
+        // storing the get parameter in local variables
+        $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
+        $start_date = $this->input->get('start_date', TRUE);
+        $end_date = $this->input->get('end_date', TRUE);
+        
+        $this->addMeta("ort",$ort_kurzbz);
+        $this->addMeta("start date",$start_date);
+        $this->addMeta("end date",$end_date);
+        $this->addMeta("testKey","testValue");
+        
+        $this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		
+		$result = $this->StundenplanModel->getRoomDataOnDay($ort_kurzbz,$start_date,$end_date);
+		if(isError($result)){
+            $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+        }
+
+        $result = hasData($result) ? getData($result) : [];
+		//echo($this->db->last_query());
+		$this->terminateWithSuccess($result);
+		
+	}
+
+    public function Stunden()
+	{
+		$this->load->model('ressource/Stunde_model', 'StundeModel');
+
+		$result = $this->StundeModel->load();
+
+		if (isError($result)){
+            $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+        }
+            
+        $result = hasData($result)? getData($result) : [];
+
+        $this->terminateWithSuccess($result);
+	}
+}
+
diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
index e0c163bac..76535befa 100755
--- a/application/controllers/components/Cis/Stundenplan.php
+++ b/application/controllers/components/Cis/Stundenplan.php
@@ -69,9 +69,6 @@ class Stundenplan extends Auth_Controller
 	public function RoomInformation()
 	{
 		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-
-
-
 		
 		$result = $this->StundenplanModel->getRoomDataOnDay('EDV_A2.06','2024-05-21');
 		$result = hasData($result) ? getData($result) : [];
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index f67eab166..64550ccbf 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -18,7 +18,7 @@ class Stundenplan_model extends DB_Model
 	 * 
 	 * @return stdClass
 	 */
-	public function getRoomDataOnDay($ort_kurzbz,$date){
+	public function getRoomDataOnDay($ort_kurzbz='EDV_A2.06',$start_date='2024-05-21',$end_date='2024-05-21'){
 
 
 		$this->addSelect(['*',"CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) as stg","lektor","CONCAT(lehrfach,'-',lehrform) as lv_info" ]);
@@ -28,12 +28,13 @@ class Stundenplan_model extends DB_Model
 		$res = $this->loadWhere(['ort_kurzbz'=>$ort_kurzbz,'datum'=>$date]);
 		$res = hasData($res) ? getData($res): null;
 		return $res; */
-		$this->db->where('ort_kurzbz','EDV_A2.06',true);
-		$this->db->where('datum >=','2024-05-21',true);
+		$this->db->where('ort_kurzbz',$ort_kurzbz,true);
+		$this->db->where('datum >=',$start_date,true);
+		$this->db->where('datum <=',$end_date,true);
 
 		$query = $this->db->get_compiled_select('lehre.vw_stundenplan sp');
 		
-		return $this->execQuery($query, [$ort_kurzbz, $date]);
+		return $this->execQuery($query, [$ort_kurzbz, $start_date, $end_date]);
 	}
 
 	/**
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index 41c89ef50..d5d07e000 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -20,11 +20,13 @@ import phrasen from "./phrasen.js";
 import navigation from "./navigation.js";
 import filter from "./filter.js";
 import studstatus from "./studstatus.js";
+import stundenplan from "./studenplan.js";
 
 export default {
     search,
     phrasen,
     navigation,
     filter,
-    studstatus
+    studstatus,
+    stundenplan,
 };
diff --git a/public/js/api/studenplan.js b/public/js/api/studenplan.js
new file mode 100644
index 000000000..2da67a737
--- /dev/null
+++ b/public/js/api/studenplan.js
@@ -0,0 +1,15 @@
+
+export default {
+	getRoomInfo(ort_kurzbz, start_date, end_date) {
+		return this.$fhcApi.get(
+			'/api/frontend/v1/Stundenplan/roomInformation',
+			{  ort_kurzbz, start_date, end_date}
+		);
+	},
+	getStunden() {
+		return this.$fhcApi.get(
+			'/api/frontend/v1/Stundenplan/Stunden',
+			{}
+		);
+	},
+};
\ No newline at end of file
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index cc7aec2bb..fbe49386d 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -1,4 +1,6 @@
 import FhcCalendar from "../../components/Calendar/Calendar.js";
+import CalendarDate from "../../composables/CalendarDate.js";
+import FhcApi from "../../plugin/FhcApi.js";
 
 const app = Vue.createApp({
 	components: {
@@ -8,25 +10,26 @@ const app = Vue.createApp({
 		return {
 			stunden: [],
 			events: null,
-            testDate: new Date('2024-05-21'),
-		}
+            calendarWeek: new CalendarDate(new Date()),
+        }
 	},
+    computed:{
+        currentDate: function(){
+            return new Date(this.calendarWeek.y, this.calendarWeek.m, this.calendarWeek.d);
+        },
+    },
 	created() {
-		axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan/Stunden').then(res => {
-			
-            
-            res.data.retval.forEach(std => {
+
+        this.$fhcApi.factory.stundenplan.getStunden().then(res =>{
+            res.data.forEach(std => {
 				this.stunden[std.stunde] = std; // TODO(chris): geht besser
 			});
-			console.log("this are the loaded stunden", this.stunden)
 
-            axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan/RoomInformation').then(res => {
+            this.$fhcApi.factory.stundenplan.getRoomInfo('EDV_A6.09', this.calendarWeek.firstDayOfWeek, this.calendarWeek.lastDayOfWeek).then(res =>{
                 let events;
-                console.log(" this is the res of the api call room information",res);
                 if (res.data && res.data.forEach) {
                     res.data.forEach((el, i) => {
 
-                        console.log(el,"this is the element that gets changed")
                         el.id = i;
                         el.color = '#' + (el.farbe || 'CCCCCC');
                         el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
@@ -35,45 +38,16 @@ const app = Vue.createApp({
                         if (el.lehrform)
                             el.title += '-' + el.lehrform;
                     });
-                    events = res.data;
-                    //console.log("this are the room events",events)
-                    this.events = events;
+                    
+                    this.events = res.data;
                 }
-            }).catch((e)=>{console.log(e,"this is the exception")})
-		});
-
-        /* axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan').then(res => {
-            
-            let events;
-            console.log(" this is the res of the api call stundenplan",res);
-            if (res.data.retval && res.data.retval.forEach) {
-                res.data.retval.forEach((el, i) => {
-                    el.id = i;
-                    el.color = '#' + (el.farbe || 'CCCCCC');
-                    el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-                    el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
-                    el.title = el.lehrfach;
-                    if (el.lehrform)
-                        el.title += '-' + el.lehrform;
-                });
-                events = res.data.retval;
-                console.log("this are the events of the stundenplan",events)
-            }
-
-            // TODO(chris): do we need that
-
-        }).catch((e)=>{console.log(e,"this is the exception")}) 
-
-
-         */
-
-       
+            })
+        });
 
 	},
     template: /*html*/`
     <div>
-    <!--initialDate="2023-5-12"-->
-        <fhc-calendar v-slot="{event}" :initialDate="testDate" :events="events" initial-mode="week" show-weeks>
+        <fhc-calendar v-slot="{event}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
             <div class="d-flex flex-column align-items-center justify-content-evenly h-100">
                 <span>{{event.orig.lv_info}}</span>	
                 <span>{{event.orig.stg}}</span>
@@ -84,4 +58,5 @@ const app = Vue.createApp({
     `,
 });
 app.config.unwrapInjectedRef = true;
+app.use(FhcApi);
 app.mount('#content');
\ No newline at end of file
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index cd0ec816e..c6636ad43 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -41,7 +41,6 @@ export default {
 		},
 		eventsPerDayAndHour() {
 			const res = {};
-			console.log("this are the days",this.days)
 			this.days.forEach(day => {
 				let key = day.toDateString();
 				

From 1a5d270936bf6b6c0ec1b07d190bcbfc298d3af1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 4 Jun 2024 15:00:41 +0200
Subject: [PATCH 05/34] calendarDate preparation

---
 .../api/frontend/v1/Stundenplan.php           | 43 +++++++++++++++++++
 .../models/ressource/Stundenplan_model.php    |  2 +-
 public/js/apps/Cis/RoomInformation.js         | 17 ++++++++
 3 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 5e35ae3c9..5970835c9 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -49,11 +49,15 @@ class Stundenplan extends FHCAPI_Controller
 	 */
 	public function roomInformation()
 	{
+
+        
         // storing the get parameter in local variables
         $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
         
+        $this->addMeta("test_start_date",$start_date);
+
         $this->addMeta("ort",$ort_kurzbz);
         $this->addMeta("start date",$start_date);
         $this->addMeta("end date",$end_date);
@@ -67,11 +71,50 @@ class Stundenplan extends FHCAPI_Controller
         }
 
         $result = hasData($result) ? getData($result) : [];
+        
+        // set up the log library and configure the library to log to the db
+        $this->load->library('LogLib');
+        $this->loglib->setConfigs(array(
+			'classIndex' => 5,
+			'functionIndex' => 5,
+			'lineIndex' => 4,
+			'dbLogType' => 'API', // required
+			'dbExecuteUser' => 'RESTful API'
+		));
+
+        /* foreach($result as $event){
+            $this->loglib->logInfoDB($event->datum,"NEW DATE");
+        } */
+
+        $testStartDate = new DateTime($start_date);
+        $this->loglib->logInfoDB($testStartDate->format('Y-m-d'),"php start date");
+        $testStartDate->modify('+1 day');
+        $this->loglib->logInfoDB($testStartDate->format('Y-m-d'),"php start date plus one day");
+        $testStartDate->modify('+1 day');
+        $this->loglib->logInfoDB($testStartDate->format('Y-m-d'),"php start date plus one day");
+        $testStartDate->modify('+1 day');
+        $this->loglib->logInfoDB($testStartDate->format('Y-m-d'),"php start date plus one day");
+        $testStartDate->modify('+1 day');
+        $this->loglib->logInfoDB($testStartDate->format('Y-m-d'),"php start date plus one day");
+        
+        $this->groupTheCalendar($result);
+        //php start date
+        $phpStartDate = new DateTime($start_date);
+
+        //$phpStartDate->modify('+1 day');
+        $this->addMeta('result',$phpStartDate);
+       
+            error_log("test".print_r($result,true));
+        
 		//echo($this->db->last_query());
 		$this->terminateWithSuccess($result);
 		
 	}
 
+    private function groupTheCalendar($data){
+
+    }
+
     public function Stunden()
 	{
 		$this->load->model('ressource/Stunde_model', 'StundeModel');
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 64550ccbf..077201f0f 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -18,7 +18,7 @@ class Stundenplan_model extends DB_Model
 	 * 
 	 * @return stdClass
 	 */
-	public function getRoomDataOnDay($ort_kurzbz='EDV_A2.06',$start_date='2024-05-21',$end_date='2024-05-21'){
+	public function getRoomDataOnDay($ort_kurzbz='EDV_A2.06',$start_date,$end_date){
 
 
 		$this->addSelect(['*',"CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) as stg","lektor","CONCAT(lehrfach,'-',lehrform) as lv_info" ]);
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index fbe49386d..6aa590b31 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -17,6 +17,11 @@ const app = Vue.createApp({
         currentDate: function(){
             return new Date(this.calendarWeek.y, this.calendarWeek.m, this.calendarWeek.d);
         },
+    },
+    methods:{
+        calendarDate_to_UTC_date: function(calendarDate){
+            return [calendarDate.y, calendarDate.m, calendarDate.d].join('-');    
+        }
     },
 	created() {
 
@@ -25,6 +30,18 @@ const app = Vue.createApp({
 				this.stunden[std.stunde] = std; // TODO(chris): geht besser
 			});
 
+
+            console.log(this.calendarDate_to_UTC_date(this.calendarWeek.firstDayOfWeek),"this is the converted calendar date")
+
+            /* console.log(this.convertDateToUtcDate(this.calendarWeek.firstDayOfWeek), "iso string here")
+
+            console.log(this.calendarWeek.cdFirstDayOfWeek.y,"this is the year of the first day of the week");
+            console.log(this.calendarWeek.cdFirstDayOfWeek.m,"this is the month of the first day of the week");
+            console.log(this.calendarWeek.cdFirstDayOfWeek.d,"this is the day of the first day of the week");
+
+            console.log(this.calendarWeek.firstDayOfWeek,"this is the first day of the week");
+            console.log(this.convertDateToUtcDate(this.calendarWeek.firstDayOfWeek), "this is the UTC date")
+ */
             this.$fhcApi.factory.stundenplan.getRoomInfo('EDV_A6.09', this.calendarWeek.firstDayOfWeek, this.calendarWeek.lastDayOfWeek).then(res =>{
                 let events;
                 if (res.data && res.data.forEach) {

From 25d284389a3fa50dea33fa9080fb417a3d32cf0f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 6 Jun 2024 09:25:46 +0200
Subject: [PATCH 06/34] gruppieren algorithm erweitern

---
 .../api/frontend/v1/Stundenplan.php           | 160 ++++++++++++++----
 .../components/Cis/Stundenplan.php            |  10 --
 public/js/apps/Cis/RoomInformation.js         |  23 ++-
 3 files changed, 134 insertions(+), 59 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 5970835c9..c55b225c9 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -37,13 +37,31 @@ class Stundenplan extends FHCAPI_Controller
             'Stunden' => self::PERM_LOGGED
 		]);
 
-		// Load the library ...
-		// $this->load->library('');
+        $this->load->library('LogLib');
+        $this->loglib->setConfigs(array(
+			'classIndex' => 5,
+			'functionIndex' => 5,
+			'lineIndex' => 4,
+			'dbLogType' => 'API', // required
+			'dbExecuteUser' => 'RESTful API'
+		));
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
+    public function Stunden()
+	{
+		$this->load->model('ressource/Stunde_model', 'StundeModel');
+
+		$result = $this->StundeModel->load();
+
+		if (isError($result))
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		$this->terminateWithSuccess(getData($result));
+	}
+    
 	/**
 	 * Gets a JSON body via HTTP POST and provides the parameters
 	 */
@@ -64,39 +82,123 @@ class Stundenplan extends FHCAPI_Controller
         $this->addMeta("testKey","testValue");
         
         $this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-		
+		$this->load->model('ressource/Stunde_model', 'StundeModel');
+
+		$stunden = $this->StundeModel->load();
+        if(isError($stunden)){
+            $this->terminateWithError(getError($stunden), self::ERROR_TYPE_GENERAL);
+        }
+        $stunden = getData($stunden);
+
+        $this->loglib->logInfoDB(print_r($stunden,true),"stunden");
+
+
 		$result = $this->StundenplanModel->getRoomDataOnDay($ort_kurzbz,$start_date,$end_date);
 		if(isError($result)){
             $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
         }
 
         $result = hasData($result) ? getData($result) : [];
-        
+        $this->loglib->logInfoDB(print_r($result,true),"result");
         // set up the log library and configure the library to log to the db
-        $this->load->library('LogLib');
-        $this->loglib->setConfigs(array(
-			'classIndex' => 5,
-			'functionIndex' => 5,
-			'lineIndex' => 4,
-			'dbLogType' => 'API', // required
-			'dbExecuteUser' => 'RESTful API'
-		));
+        
 
         /* foreach($result as $event){
             $this->loglib->logInfoDB($event->datum,"NEW DATE");
         } */
 
         $testStartDate = new DateTime($start_date);
-        $this->loglib->logInfoDB($testStartDate->format('Y-m-d'),"php start date");
-        $testStartDate->modify('+1 day');
-        $this->loglib->logInfoDB($testStartDate->format('Y-m-d'),"php start date plus one day");
-        $testStartDate->modify('+1 day');
-        $this->loglib->logInfoDB($testStartDate->format('Y-m-d'),"php start date plus one day");
-        $testStartDate->modify('+1 day');
-        $this->loglib->logInfoDB($testStartDate->format('Y-m-d'),"php start date plus one day");
-        $testStartDate->modify('+1 day');
-        $this->loglib->logInfoDB($testStartDate->format('Y-m-d'),"php start date plus one day");
+        $testEndDate = new DateTime($end_date);
+        $count =0;
+        $final_events = array();
+        while($testStartDate <= $testEndDate && $count <7){
+            $date = $testStartDate->format('Y-m-d');
+            //TODO: array filtering for every day and hour could be too time consuming causing slow response
+            $day_events = array_filter($result,function($entry) use ($date){
+                return $entry->datum == $date;
+            });
+            //$this->loglib->logInfoDB(print_r($day_events,true),"day_events");
+            foreach($stunden as $stunde){
+                $stunden_events = array_filter($day_events, function($entry) use ($stunde){
+                    return $entry->stunde == $stunde->stunde;
+                });
+
+                // aenderung aller events die am gleichen tag und zur gleichen Stunde gehalten werden
+                foreach($stunden_events as $event_key => $stunden_event){
+                    $this->loglib->logInfoDB(print_r($stunden_event,true),"this is the stunden evnet");
+                    
+                    // lektor bestimmen
+                    if($stunden_event->mitarbeiter_kurzbz == null){
+                        $simml_lektor = $stunden_event->lektor;
+                    }else{
+                        $simml_lektor = $stunden_event->mitarbeiter_kurzbz;
+                    }
+
+                    
+
+                    // lehrverband bestimmen
+                    if(strlen($stunden_event->gruppe_kurzbz)>0){
+                        $lehrverband = $stunden_event->gruppe_kurzbz;
+                    }else{
+                        $lehrverband=$stunden_event->stg.'-'.$stunden_event->sem;
+                        // checks whether the verband is not null, '' or '0'
+                        if($stunden_event->verband !=null && $stunden_event->verband != '0' && $stunden_event->verband != ''){ 
+                            $lehrverband.=$stunden_event->verband;
+                            // if gruppe is not set it will concatenate nothing but it is only appended if the verband is set
+                            $lehrverband.=$stunden_event->gruppe;
+                        }
+                    }
+
+                    // lehrfach bestimmen
+                    $lehrfach = $stunden_event->lehrfach;
+                    if(isset($stunden_event->lehrform)){
+                        $lehrfach .= '-'.$stunden_event->lehrform;
+                    }
+                    
+                    // GRUPIEREN DER GLEICHEN EVENTS
+                    // vergleiche das aktuelle Event mit allen anderen Events die am gleichen Tag und zur gleichen Stunde gehalten werden
+                    foreach($stunden_events as $compare_key => $stunden_event_compare){
+                        if($compare_key != $event_key){
+
+                           if ( 
+                                // the unr's have to be equal to be grouped
+                                $stunden_event->unr==$stunden_event_compare->unr && 
+                                // and either the lektor or the ort_kurzbz have to be equal
+                                ($stunden_event->ort_kurzbz==$stunden_event_compare->ort_kurzbz 
+                                || $stunden_event->lektor==$stunden_event_compare->lektor)
+                           )
+                                {
+
+                                }
+                        }
+                    }
+                    
+
+
+
+                }
+                if (count($stunden_events) == 1){
+                    $final_events[] = current($stunden_events);
+                }else if(count($stunden_events) > 1){
+                    $gruppe = '';
+                    foreach($stunden_events as $stunden_event){
+                        $gruppe .= $stunden_event->gruppe . ',';
+                    }
+                    current($stunden_events)->gruppe = $gruppe;
+                    $final_events[] = current($stunden_events);
+                }
+                //$this->loglib->logInfoDB(print_r($stunden_events,true),"date: " . $date . " - stunde:" .$stunde->stunde);
+            }
+            /* $this->loglib->logInfoDB(print_r($testStartDate,true),"startdate");
+            $this->loglib->logInfoDB($count,"count");
+            $this->loglib->logInfoDB(print_r($testEndDate,true),"enddate");
+            */
+            $testStartDate->modify('+1 day');
+            $count++;
+        }     
         
+        $this->loglib->logInfoDB(print_r($final_events,true),"final_events");
+      
         $this->groupTheCalendar($result);
         //php start date
         $phpStartDate = new DateTime($start_date);
@@ -107,7 +209,7 @@ class Stundenplan extends FHCAPI_Controller
             error_log("test".print_r($result,true));
         
 		//echo($this->db->last_query());
-		$this->terminateWithSuccess($result);
+		$this->terminateWithSuccess($final_events);
 		
 	}
 
@@ -115,19 +217,5 @@ class Stundenplan extends FHCAPI_Controller
 
     }
 
-    public function Stunden()
-	{
-		$this->load->model('ressource/Stunde_model', 'StundeModel');
-
-		$result = $this->StundeModel->load();
-
-		if (isError($result)){
-            $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-        }
-            
-        $result = hasData($result)? getData($result) : [];
-
-        $this->terminateWithSuccess($result);
-	}
 }
 
diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
index 76535befa..6a89458a7 100755
--- a/application/controllers/components/Cis/Stundenplan.php
+++ b/application/controllers/components/Cis/Stundenplan.php
@@ -66,15 +66,5 @@ class Stundenplan extends Auth_Controller
 		$this->outputJsonSuccess(getData($result));
 	}
 
-	public function RoomInformation()
-	{
-		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-		
-		$result = $this->StundenplanModel->getRoomDataOnDay('EDV_A2.06','2024-05-21');
-		$result = hasData($result) ? getData($result) : [];
-		//echo($this->db->last_query());
-		echo json_encode($result);
-		
-	}
 
 }
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index 6aa590b31..c3ce80a75 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -19,8 +19,13 @@ const app = Vue.createApp({
         },
     },
     methods:{
-        calendarDate_to_UTC_date: function(calendarDate){
-            return [calendarDate.y, calendarDate.m, calendarDate.d].join('-');    
+        // returns the string YYYY-MM-DD if param is instance of CalendarDate and null otherwise
+        calendarDateToString: function(calendarDate){
+            
+            return calendarDate instanceof CalendarDate? 
+            [calendarDate.y, calendarDate.m+1, calendarDate.d].join('-'):
+            null; 
+            
         }
     },
 	created() {
@@ -31,18 +36,10 @@ const app = Vue.createApp({
 			});
 
 
-            console.log(this.calendarDate_to_UTC_date(this.calendarWeek.firstDayOfWeek),"this is the converted calendar date")
+            console.log(this.calendarDateToString(this.calendarWeek.cdFirstDayOfWeek),"this is the converted calendar date")
 
-            /* console.log(this.convertDateToUtcDate(this.calendarWeek.firstDayOfWeek), "iso string here")
-
-            console.log(this.calendarWeek.cdFirstDayOfWeek.y,"this is the year of the first day of the week");
-            console.log(this.calendarWeek.cdFirstDayOfWeek.m,"this is the month of the first day of the week");
-            console.log(this.calendarWeek.cdFirstDayOfWeek.d,"this is the day of the first day of the week");
-
-            console.log(this.calendarWeek.firstDayOfWeek,"this is the first day of the week");
-            console.log(this.convertDateToUtcDate(this.calendarWeek.firstDayOfWeek), "this is the UTC date")
- */
-            this.$fhcApi.factory.stundenplan.getRoomInfo('EDV_A6.09', this.calendarWeek.firstDayOfWeek, this.calendarWeek.lastDayOfWeek).then(res =>{
+           
+            this.$fhcApi.factory.stundenplan.getRoomInfo('EDV_A6.09', this.calendarDateToString(this.calendarWeek.cdFirstDayOfWeek), this.calendarDateToString(this.calendarWeek.cdLastDayOfWeek)).then(res =>{
                 let events;
                 if (res.data && res.data.forEach) {
                     res.data.forEach((el, i) => {

From 70b0b3fae7b988ebd6ae60a0d9c3d90941006ad1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 7 Jun 2024 15:06:28 +0200
Subject: [PATCH 07/34] MVP algorithm for stundenplan gruppierung (testing)

---
 .../api/frontend/v1/Stundenplan.php           | 95 ++++++++++++++-----
 application/core/FHCAPI_Controller.php        | 13 +++
 .../models/ressource/Stundenplan_model.php    | 31 +++++-
 public/js/apps/Cis/RoomInformation.js         |  2 +-
 4 files changed, 117 insertions(+), 24 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index c55b225c9..77e7e9a0f 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -84,16 +84,20 @@ class Stundenplan extends FHCAPI_Controller
         $this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 		$this->load->model('ressource/Stunde_model', 'StundeModel');
 
+        
 		$stunden = $this->StundeModel->load();
         if(isError($stunden)){
             $this->terminateWithError(getError($stunden), self::ERROR_TYPE_GENERAL);
         }
         $stunden = getData($stunden);
 
-        $this->loglib->logInfoDB(print_r($stunden,true),"stunden");
-
-
+     
 		$result = $this->StundenplanModel->getRoomDataOnDay($ort_kurzbz,$start_date,$end_date);
+        
+            $this->loglib->logErrorDB(print_r($result,true),"this is an entry of a reservierung");
+        
+        return;
+
 		if(isError($result)){
             $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
         }
@@ -111,6 +115,7 @@ class Stundenplan extends FHCAPI_Controller
         $testEndDate = new DateTime($end_date);
         $count =0;
         $final_events = array();
+        $grouped = array();
         while($testStartDate <= $testEndDate && $count <7){
             $date = $testStartDate->format('Y-m-d');
             //TODO: array filtering for every day and hour could be too time consuming causing slow response
@@ -123,24 +128,16 @@ class Stundenplan extends FHCAPI_Controller
                     return $entry->stunde == $stunde->stunde;
                 });
 
-                // aenderung aller events die am gleichen tag und zur gleichen Stunde gehalten werden
-                foreach($stunden_events as $event_key => $stunden_event){
-                    $this->loglib->logInfoDB(print_r($stunden_event,true),"this is the stunden evnet");
-                    
-                    // lektor bestimmen
-                    if($stunden_event->mitarbeiter_kurzbz == null){
-                        $simml_lektor = $stunden_event->lektor;
-                    }else{
-                        $simml_lektor = $stunden_event->mitarbeiter_kurzbz;
-                    }
-
-                    
+                $lehrverband_array = array();
 
+                
+                // for loop that is just used to fill the lehrverband_array
+                foreach($stunden_events as $key=>$stunden_event){
                     // lehrverband bestimmen
                     if(strlen($stunden_event->gruppe_kurzbz)>0){
                         $lehrverband = $stunden_event->gruppe_kurzbz;
                     }else{
-                        $lehrverband=$stunden_event->stg.'-'.$stunden_event->sem;
+                        $lehrverband=$stunden_event->stg_typ . $stunden_event->stg_kurzbz .'-'.$stunden_event->semester;
                         // checks whether the verband is not null, '' or '0'
                         if($stunden_event->verband !=null && $stunden_event->verband != '0' && $stunden_event->verband != ''){ 
                             $lehrverband.=$stunden_event->verband;
@@ -148,7 +145,24 @@ class Stundenplan extends FHCAPI_Controller
                             $lehrverband.=$stunden_event->gruppe;
                         }
                     }
+                    $lehrverband_array[$key] = $lehrverband;
+                }
+                
+                
+                // aenderung aller events die am gleichen tag und zur gleichen Stunde gehalten werden
+                foreach($stunden_events as $event_key => $stunden_event){
+                    if(isset($grouped[$event_key])){
+                        continue;
+                    }
+                     
+                    // lektor bestimmen
+                    if($stunden_event->mitarbeiter_kurzbz == null){
+                        $simml_lektor = $stunden_event->lektor;
+                    }else{
+                        $simml_lektor = $stunden_event->mitarbeiter_kurzbz;
+                    }
 
+                
                     // lehrfach bestimmen
                     $lehrfach = $stunden_event->lehrfach;
                     if(isset($stunden_event->lehrform)){
@@ -158,26 +172,64 @@ class Stundenplan extends FHCAPI_Controller
                     // GRUPIEREN DER GLEICHEN EVENTS
                     // vergleiche das aktuelle Event mit allen anderen Events die am gleichen Tag und zur gleichen Stunde gehalten werden
                     foreach($stunden_events as $compare_key => $stunden_event_compare){
+                        
                         if($compare_key != $event_key){
-
+                            
+                            // will be used to skip the loop iteration with this index because it was already grouped
+                            $grouped[$compare_key] = 1;
+                            // this if checks if the events can be grouped
                            if ( 
                                 // the unr's have to be equal to be grouped
                                 $stunden_event->unr==$stunden_event_compare->unr && 
                                 // and either the lektor or the ort_kurzbz have to be equal
                                 ($stunden_event->ort_kurzbz==$stunden_event_compare->ort_kurzbz 
                                 || $stunden_event->lektor==$stunden_event_compare->lektor)
+                                // reservierungen muessen auch beachtet werden, wenn der eintrag eine reservierung ist dann koennen die eintraege nicht gruppiert werden
+                                //&& !$stunden_event->reservierung && !$stunden_event_compare->reservierung
+
                            )
                                 {
 
+                                    
+
+                                    // Bezeichnung des Events zusammenfuehren
+                                    // change the event with the $event_key if the compared_event has different properties but is still groupable
+
+                                    //Lektoren
+                                    if(!mb_strstr($stunden_event->lektor,$stunden_event_compare->lektor)){
+                                        $this->loglib->logErrorDB($stunden_event->datum ."-". $stunden_event->stunde,"entered lektor - first if");
+                                        $stunden_events[$event_key]->lektor = $stunden_event->lektor . ' \ ' . $stunden_event_compare->lektor;
+                                        $stunden_events[$event_key]->mitarbeiter_kurzbz = $stunden_event->mitarbeiter_kurzbz . ' \ ' . $stunden_event_compare->mitarbeiter_kurzbz;
+                                    }
+
+                                    //Ort
+                                    if(!mb_strstr($stunden_event->ort_kurzbz,$stunden_event_compare->ort_kurzbz)){
+                                        $this->loglib->logErrorDB($stunden_event->datum ."-". $stunden_event->stunde,"entered ort - second if");
+                                        $stunden_events[$event_key]->ort_kurzbz = $stunden_event->ort_kurzbz . ' \ ' . $stunden_event_compare->ort_kurzbz;
+                                    }
+
+                                    //unset the compared and grouped event
+                                    unset($stunden_events[$compare_key]);
+                                    
+
+                                    //Lehrverband
+                                    if(!mb_strstr($lehrverband_array[$event_key],$lehrverband_array[$compare_key])){
+                                        $this->loglib->logErrorDB($stunden_event->datum ."-". $stunden_event->stunde,"entered gruppe - third if");
+                                        $lehrverband_array[$event_key] .= ' \ ' . $lehrverband_array[$compare_key];
+                                    }
+
                                 }
                         }
                     }
-                    
+
+                    // add the grouped lehrverband entry to the event
+                    $stunden_events[$event_key]->stg = $lehrverband_array[$event_key];
+                    $final_events[] = $stunden_events[$event_key];
 
 
 
                 }
-                if (count($stunden_events) == 1){
+                /* if (count($stunden_events) == 1){
                     $final_events[] = current($stunden_events);
                 }else if(count($stunden_events) > 1){
                     $gruppe = '';
@@ -186,7 +238,7 @@ class Stundenplan extends FHCAPI_Controller
                     }
                     current($stunden_events)->gruppe = $gruppe;
                     $final_events[] = current($stunden_events);
-                }
+                } */
                 //$this->loglib->logInfoDB(print_r($stunden_events,true),"date: " . $date . " - stunde:" .$stunde->stunde);
             }
             /* $this->loglib->logInfoDB(print_r($testStartDate,true),"startdate");
@@ -197,8 +249,7 @@ class Stundenplan extends FHCAPI_Controller
             $count++;
         }     
         
-        $this->loglib->logInfoDB(print_r($final_events,true),"final_events");
-      
+       
         $this->groupTheCalendar($result);
         //php start date
         $phpStartDate = new DateTime($start_date);
diff --git a/application/core/FHCAPI_Controller.php b/application/core/FHCAPI_Controller.php
index 647032795..d5e3ca0ce 100644
--- a/application/core/FHCAPI_Controller.php
+++ b/application/core/FHCAPI_Controller.php
@@ -141,6 +141,19 @@ class FHCAPI_Controller extends Auth_Controller
 		$this->returnObj['meta'][$key] = $value;
 	}
 
+	/**
+	 * @param string				$key
+	 * @return mixed
+	 */
+	public function getMeta($key)
+	{
+		if (!isset($this->returnObj['meta']))
+			return null;
+		if (!isset($this->returnObj['meta'][$key]))
+			return null;
+		return $this->returnObj['meta'][$key];
+	}
+
 	/**
 	 * @param string				$status
 	 * @return void
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 077201f0f..0205b1472 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -21,7 +21,27 @@ class Stundenplan_model extends DB_Model
 	public function getRoomDataOnDay($ort_kurzbz='EDV_A2.06',$start_date,$end_date){
 
 
-		$this->addSelect(['*',"CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) as stg","lektor","CONCAT(lehrfach,'-',lehrform) as lv_info" ]);
+		//$this->addSelect(['*',"CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) as stg","lektor","CONCAT(lehrfach,'-',lehrform) as lv_info" ]);
+		$result = $this->execReadOnlyQuery("
+		
+		SELECT 'stundenplan_eintrag' as eintrags_type, CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, lektor, CONCAT(lehrfach,'-',lehrform) AS lv_info, ort_kurzbz , * FROM lehre.vw_stundenplan sp
+		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ? 
+		UNION ALL
+		SELECT 'reservierungs_eintrag' as eintrags_type, titel, uid, NULL, ort_kurzbz FROM lehre.vw_reservierung res
+		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ?
+		
+		", [$ort_kurzbz, $start_date, $end_date,$ort_kurzbz, $start_date, $end_date]);
+		return $result;
+
+
+		/*
+		"SELECT 'stundenplan_eintrag' as eintrags_type ort_kurzbz studiengang_kz uid stunde datum titel NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL"
+		"SELECT 'reservierungs_eintrag' as eintrags_type, ort_kurzbz studiengang_kz uid stunde datum titel NULL NULL NULL NULL NULL"
+		 
+		 */
+		//to add reservierungen to the query, we have to join the table vw_reservierung to the vw_stundenplan and use the datum/stunde/ort_kurzbz keys
+		
+		
 		/* $this->addSelect(["lehre.tbl_stundenplan.*","CONCAT(UPPER(sg.typ),UPPER(sg.kurzbz),'-',lehre.tbl_stundenplan.semester,lehre.tbl_stundenplan.verband) as simml"]);
 		$this->addJoin("public.tbl_lehrverband as lv","lv.studiengang_kz=lehre.tbl_stundenplan.studiengang_kz AND lv.gruppe=lehre.tbl_stundenplan.gruppe AND lv.verband=lehre.tbl_stundenplan.verband AND lv.semester=lehre.tbl_stundenplan.semester","LEFT"); 
 		$this->addJoin("public.tbl_studiengang as sg","sg.studiengang_kz=lehre.tbl_stundenplan.studiengang_kz","LEFT"); 
@@ -34,7 +54,16 @@ class Stundenplan_model extends DB_Model
 
 		$query = $this->db->get_compiled_select('lehre.vw_stundenplan sp');
 		
+		$raum_stundenplan= $this->execQuery($query, [$ort_kurzbz, $start_date, $end_date]);
+
+		// reseting the query and query reservierungen information
+		$this->resetQuery();
+		$this->db->where('ort_kurzbz',$ort_kurzbz,true);
+		$this->db->where('datum >=',$start_date,true);
+		$this->db->where('datum <=',$end_date,true);
+		$query = $this->db->get_compiled_select('lehre.vw_reservierung res');
 		return $this->execQuery($query, [$ort_kurzbz, $start_date, $end_date]);
+		
 	}
 
 	/**
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index c3ce80a75..f0edefa73 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -10,7 +10,7 @@ const app = Vue.createApp({
 		return {
 			stunden: [],
 			events: null,
-            calendarWeek: new CalendarDate(new Date()),
+            calendarWeek: new CalendarDate(new Date("2024-03-06")),
         }
 	},
     computed:{

From 8442690bc75d46196617714e10fa05ca268e3618 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 10 Jun 2024 10:56:12 +0200
Subject: [PATCH 08/34] splits the multiple stg into different rows if there
 are more than one stg in one lv

---
 .../api/frontend/v1/Stundenplan.php           | 53 +++++++++++++++++--
 .../models/ressource/Stundenplan_model.php    | 49 ++++-------------
 public/js/apps/Cis/RoomInformation.js         |  2 +-
 3 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 77e7e9a0f..091e6c19d 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -94,9 +94,7 @@ class Stundenplan extends FHCAPI_Controller
      
 		$result = $this->StundenplanModel->getRoomDataOnDay($ort_kurzbz,$start_date,$end_date);
         
-            $this->loglib->logErrorDB(print_r($result,true),"this is an entry of a reservierung");
-        
-        return;
+            
 
 		if(isError($result)){
             $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
@@ -111,6 +109,53 @@ class Stundenplan extends FHCAPI_Controller
             $this->loglib->logInfoDB($event->datum,"NEW DATE");
         } */
 
+        //TODO: also implement the following algorithm to block the lectures that are together over different stunden
+        /* $blockcontinue=false;
+						if (isset($blocked[$this->std_plan[$i][$j][$idx]->unr]) && $blocked[$this->std_plan[$i][$j][$idx]->unr]>0)
+						{
+							$blocked[$this->std_plan[$i][$j][$idx]->unr]--;
+							$blockcontinue=true;
+						}
+
+						if (!$blockcontinue)
+						{
+							// Blockungen ueber mehrere Stunden erkennen
+
+							$blockflag=false;
+							for ($blockstunden=1;$blockstunden<=$num_rows_stunde;$blockstunden++)
+							{
+								if (isset($this->std_plan[$i][$j+$blockstunden][$idx]) && isset($this->std_plan[$i][$j+$blockstunden][$idx]->stundenplan_id)
+									&& ($this->std_plan[$i][$j][$idx]->unr == $this->std_plan[$i][$j+$blockstunden][$idx]->unr)
+									&& $this->std_plan[$i][$j][$idx]!='0' && $k<($num_rows_stunde-$blockstunden)
+									&& !($this->std_plan[$i][$j][$idx]->reservierung && $this->std_plan[$i][$j][$idx]->lektor!=$this->std_plan[$i][$j+$blockstunden][$idx]->lektor))
+								{
+
+									if (isset($blocked[$this->std_plan[$i][$j][$idx]->unr]))
+										$blocked[$this->std_plan[$i][$j][$idx]->unr]++;
+									else
+										$blocked[$this->std_plan[$i][$j][$idx]->unr]=1;
+									$row = $this->db_fetch_object($this->stunde, ($k+$blockstunden));
+									$stunden_arr[]=$row->stunde;
+									$end_time=$row->ende;
+									$blockflag=true;
+								}
+								else
+								{
+									if (!$blockflag)
+									{
+										$row = $this->db_fetch_object($this->stunde, $k);
+										$stunden_arr[]=$row->stunde;
+										$end_time=$row->ende;
+										break;
+									}
+									else
+									{
+										break;
+									}
+								}
+							}
+						} */
+
         $testStartDate = new DateTime($start_date);
         $testEndDate = new DateTime($end_date);
         $count =0;
@@ -215,7 +260,7 @@ class Stundenplan extends FHCAPI_Controller
                                     //Lehrverband
                                     if(!mb_strstr($lehrverband_array[$event_key],$lehrverband_array[$compare_key])){
                                         $this->loglib->logErrorDB($stunden_event->datum ."-". $stunden_event->stunde,"entered gruppe - third if");
-                                        $lehrverband_array[$event_key] .= ' \ ' . $lehrverband_array[$compare_key];
+                                        $lehrverband_array[$event_key] .= ' / ' . $lehrverband_array[$compare_key];
                                     }
 
                                 }
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 0205b1472..17516afe0 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -21,49 +21,22 @@ class Stundenplan_model extends DB_Model
 	public function getRoomDataOnDay($ort_kurzbz='EDV_A2.06',$start_date,$end_date){
 
 
-		//$this->addSelect(['*',"CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) as stg","lektor","CONCAT(lehrfach,'-',lehrform) as lv_info" ]);
-		$result = $this->execReadOnlyQuery("
-		
-		SELECT 'stundenplan_eintrag' as eintrags_type, CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, lektor, CONCAT(lehrfach,'-',lehrform) AS lv_info, ort_kurzbz , * FROM lehre.vw_stundenplan sp
+		//TODO alternative query version that unions the reservierungen into the stundenplan with different 'eintrags_type' column
+		/*"
+		-- merging all reservierungs information with the stundenplan information but with different types
+		SELECT 'stundenplan_eintrag' as eintrags_type, ort_kurzbz, studiengang_kz, uid, stunde, datum, titel, semester, verband, gruppe, gruppe_kurzbz, stg_kurzbz, CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, CONCAT(lehrfach,'-',lehrform) AS lv_info, * FROM lehre.vw_stundenplan sp
 		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ? 
 		UNION ALL
-		SELECT 'reservierungs_eintrag' as eintrags_type, titel, uid, NULL, ort_kurzbz FROM lehre.vw_reservierung res
+		SELECT 'reservierungs_eintrag' as eintrags_type, ort_kurzbz, studiengang_kz, uid, stunde, datum, titel, semester, verband, gruppe, gruppe_kurzbz, stg_kurzbz, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL FROM lehre.vw_reservierung res
 		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ?
-		
-		", [$ort_kurzbz, $start_date, $end_date,$ort_kurzbz, $start_date, $end_date]);
-		return $result;
+		"*/
 
+		$raum_stundenplan= $this->execReadOnlyQuery("
+		SELECT 'stundenplan_eintrag' as eintrags_type, ort_kurzbz, studiengang_kz, uid, stunde, datum, titel, semester, verband, gruppe, gruppe_kurzbz, stg_kurzbz, CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, CONCAT(lehrfach,'-',lehrform) AS lv_info, * FROM lehre.vw_stundenplan sp
+		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ? 
+		", [$ort_kurzbz, $start_date, $end_date]);
 
-		/*
-		"SELECT 'stundenplan_eintrag' as eintrags_type ort_kurzbz studiengang_kz uid stunde datum titel NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL"
-		"SELECT 'reservierungs_eintrag' as eintrags_type, ort_kurzbz studiengang_kz uid stunde datum titel NULL NULL NULL NULL NULL"
-		 
-		 */
-		//to add reservierungen to the query, we have to join the table vw_reservierung to the vw_stundenplan and use the datum/stunde/ort_kurzbz keys
-		
-		
-		/* $this->addSelect(["lehre.tbl_stundenplan.*","CONCAT(UPPER(sg.typ),UPPER(sg.kurzbz),'-',lehre.tbl_stundenplan.semester,lehre.tbl_stundenplan.verband) as simml"]);
-		$this->addJoin("public.tbl_lehrverband as lv","lv.studiengang_kz=lehre.tbl_stundenplan.studiengang_kz AND lv.gruppe=lehre.tbl_stundenplan.gruppe AND lv.verband=lehre.tbl_stundenplan.verband AND lv.semester=lehre.tbl_stundenplan.semester","LEFT"); 
-		$this->addJoin("public.tbl_studiengang as sg","sg.studiengang_kz=lehre.tbl_stundenplan.studiengang_kz","LEFT"); 
-		$res = $this->loadWhere(['ort_kurzbz'=>$ort_kurzbz,'datum'=>$date]);
-		$res = hasData($res) ? getData($res): null;
-		return $res; */
-		$this->db->where('ort_kurzbz',$ort_kurzbz,true);
-		$this->db->where('datum >=',$start_date,true);
-		$this->db->where('datum <=',$end_date,true);
-
-		$query = $this->db->get_compiled_select('lehre.vw_stundenplan sp');
-		
-		$raum_stundenplan= $this->execQuery($query, [$ort_kurzbz, $start_date, $end_date]);
-
-		// reseting the query and query reservierungen information
-		$this->resetQuery();
-		$this->db->where('ort_kurzbz',$ort_kurzbz,true);
-		$this->db->where('datum >=',$start_date,true);
-		$this->db->where('datum <=',$end_date,true);
-		$query = $this->db->get_compiled_select('lehre.vw_reservierung res');
-		return $this->execQuery($query, [$ort_kurzbz, $start_date, $end_date]);
-		
+		return $raum_stundenplan;
 	}
 
 	/**
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index f0edefa73..f4c9c21b7 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -64,7 +64,7 @@ const app = Vue.createApp({
         <fhc-calendar v-slot="{event}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
             <div class="d-flex flex-column align-items-center justify-content-evenly h-100">
                 <span>{{event.orig.lv_info}}</span>	
-                <span>{{event.orig.stg}}</span>
+                <span v-for="(item, index) in event.orig.stg.split('/')" :key="index">{{item}}</span>
                 <span>{{event.orig.lektor}}</span>
 			</div>
         </fhc-calendar>

From 392d8f38d290faadbbd45991ce9d8c38abe67693 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 10 Jun 2024 11:39:16 +0200
Subject: [PATCH 09/34] adding the reservierungen to the room plannung

---
 .../api/frontend/v1/Stundenplan.php           | 31 ++++++++++--
 .../models/ressource/Reservierung_model.php   | 17 +++++++
 .../models/ressource/Stundenplan_model.php    |  2 +-
 public/js/api/studenplan.js                   |  6 +++
 public/js/apps/Cis/RoomInformation.js         | 49 +++++++++++++++----
 5 files changed, 89 insertions(+), 16 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 091e6c19d..d360c1b90 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -34,7 +34,8 @@ class Stundenplan extends FHCAPI_Controller
 	
 		parent::__construct([
 			'roomInformation' => self::PERM_LOGGED,
-            'Stunden' => self::PERM_LOGGED
+            'Stunden' => self::PERM_LOGGED,
+            'Reservierungen' => self::PERM_LOGGED
 		]);
 
         $this->load->library('LogLib');
@@ -68,12 +69,16 @@ class Stundenplan extends FHCAPI_Controller
 	public function roomInformation()
 	{
 
-        
+        //TODO please split this algorithm into multiple smaller function it is not really mantainable like this
         // storing the get parameter in local variables
         $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
         
+        if(!$ort_kurzbz || !$start_date || !$end_date){
+            $this->terminateWithError("Missing parameters", self::ERROR_TYPE_GENERAL);
+        }
+
         $this->addMeta("test_start_date",$start_date);
 
         $this->addMeta("ort",$ort_kurzbz);
@@ -295,7 +300,6 @@ class Stundenplan extends FHCAPI_Controller
         }     
         
        
-        $this->groupTheCalendar($result);
         //php start date
         $phpStartDate = new DateTime($start_date);
 
@@ -309,9 +313,26 @@ class Stundenplan extends FHCAPI_Controller
 		
 	}
 
-    private function groupTheCalendar($data){
+    public function Reservierungen()
+	{
 
-    }
+        $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
+        $start_date = $this->input->get('start_date', TRUE);
+        $end_date = $this->input->get('end_date', TRUE);
+
+        if(!$ort_kurzbz || !$start_date || !$end_date){
+            $this->terminateWithError("Missing parameters", self::ERROR_TYPE_GENERAL);
+        }
+
+		$this->load->model('ressource/Reservierung_model', 'ReservierungModel');
+
+		$result = $this->ReservierungModel->getRoomReservierungen($ort_kurzbz, $start_date, $end_date);
+
+		if (isError($result))
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+
+		$this->terminateWithSuccess(getData($result));
+	}
 
 }
 
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index 7a3d1a4a4..260104305 100755
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -12,6 +12,23 @@ class Reservierung_model extends DB_Model
 		$this->pk = 'reservierung_id';
 	}
 
+
+	/**
+	 * @param $uid
+	 * 
+	 * @return stdClass
+	 */
+	public function getRoomReservierungen($ort_kurzbz, $start_date, $end_date)
+	{
+
+		$raum_reservierungen= $this->execReadOnlyQuery("
+		SELECT * FROM lehre.vw_reservierung res
+		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ? 
+		", [$ort_kurzbz, $start_date, $end_date]);
+
+		return $raum_reservierungen;
+	}
+
 	/**
 	 * @param $uid
 	 * 
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 17516afe0..299faa049 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -32,7 +32,7 @@ class Stundenplan_model extends DB_Model
 		"*/
 
 		$raum_stundenplan= $this->execReadOnlyQuery("
-		SELECT 'stundenplan_eintrag' as eintrags_type, ort_kurzbz, studiengang_kz, uid, stunde, datum, titel, semester, verband, gruppe, gruppe_kurzbz, stg_kurzbz, CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, CONCAT(lehrfach,'-',lehrform) AS lv_info, * FROM lehre.vw_stundenplan sp
+		SELECT CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, CONCAT(lehrfach,'-',lehrform) AS lv_info, * FROM lehre.vw_stundenplan sp
 		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ? 
 		", [$ort_kurzbz, $start_date, $end_date]);
 
diff --git a/public/js/api/studenplan.js b/public/js/api/studenplan.js
index 2da67a737..d691a72cf 100644
--- a/public/js/api/studenplan.js
+++ b/public/js/api/studenplan.js
@@ -12,4 +12,10 @@ export default {
 			{}
 		);
 	},
+	getReservierungen(ort_kurzbz, start_date, end_date) {
+		return this.$fhcApi.get(
+			'/api/frontend/v1/Stundenplan/Reservierungen',
+			{  ort_kurzbz, start_date, end_date}
+		);
+	},
 };
\ No newline at end of file
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index f4c9c21b7..a7aced683 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -10,13 +10,19 @@ const app = Vue.createApp({
 		return {
 			stunden: [],
 			events: null,
-            calendarWeek: new CalendarDate(new Date("2024-03-06")),
+            calendarWeek: new CalendarDate(new Date("2024-06-06")),
         }
 	},
     computed:{
         currentDate: function(){
             return new Date(this.calendarWeek.y, this.calendarWeek.m, this.calendarWeek.d);
         },
+        weekFirstDay: function(){
+            return this.calendarDateToString(this.calendarWeek.cdFirstDayOfWeek);
+        },
+        weekLastDay: function(){
+            return this.calendarDateToString(this.calendarWeek.cdLastDayOfWeek);
+        },
     },
     methods:{
         // returns the string YYYY-MM-DD if param is instance of CalendarDate and null otherwise
@@ -26,7 +32,8 @@ const app = Vue.createApp({
             [calendarDate.y, calendarDate.m+1, calendarDate.d].join('-'):
             null; 
             
-        }
+        },
+        
     },
 	created() {
 
@@ -36,10 +43,8 @@ const app = Vue.createApp({
 			});
 
 
-            console.log(this.calendarDateToString(this.calendarWeek.cdFirstDayOfWeek),"this is the converted calendar date")
-
-           
-            this.$fhcApi.factory.stundenplan.getRoomInfo('EDV_A6.09', this.calendarDateToString(this.calendarWeek.cdFirstDayOfWeek), this.calendarDateToString(this.calendarWeek.cdLastDayOfWeek)).then(res =>{
+           // old testing room EDV_A6.09
+            this.$fhcApi.factory.stundenplan.getRoomInfo('SEM_E0.04', this.weekFirstDay, this.weekLastDay).then(res =>{
                 let events;
                 if (res.data && res.data.forEach) {
                     res.data.forEach((el, i) => {
@@ -55,7 +60,27 @@ const app = Vue.createApp({
                     
                     this.events = res.data;
                 }
-            })
+            });
+
+            this.$fhcApi.factory.stundenplan.getReservierungen('SEM_E0.04', this.weekFirstDay, this.weekLastDay).then(res => {
+                if (res.data && res.data.forEach) {
+                    res.data.forEach((el, i) => {
+                        el.reservierung = true;
+                        el.color = '#CCCCCC';
+                        el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
+                        el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+                        el.title = el.titel;
+                        if (el.lehrform)
+                            el.title += '-' + el.lehrform;
+                    });
+                    
+                }
+
+                let reservierungs_events = res.data;
+                console.log(reservierungs_events, " this are the reserverungs event")
+                this.events = [...this.events,...reservierungs_events];
+                
+            });
         });
 
 	},
@@ -63,9 +88,13 @@ const app = Vue.createApp({
     <div>
         <fhc-calendar v-slot="{event}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
             <div class="d-flex flex-column align-items-center justify-content-evenly h-100">
-                <span>{{event.orig.lv_info}}</span>	
-                <span v-for="(item, index) in event.orig.stg.split('/')" :key="index">{{item}}</span>
-                <span>{{event.orig.lektor}}</span>
+                
+
+                <span>{{event.orig.reservierung? event.orig.title :event.orig.lv_info}}</span>	
+                <span v-if="event.orig.reservierung">{{'this is a reservierung'}}</span>
+                <span v-else v-for="(item, index) in event.orig.stg.split('/')" :key="index">{{item}}</span>
+                <span>{{event.orig.reservierung? event.orig.uid : event.orig.lektor}}</span>
+             
 			</div>
         </fhc-calendar>
     </div>

From 022ad26dd236863286cf0901750f70068f6e5a40 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 10 Jun 2024 13:01:55 +0200
Subject: [PATCH 10/34] reservierungen query also joins the studiengangs and
 mitarbeiter information

---
 application/controllers/api/frontend/v1/Stundenplan.php | 2 ++
 application/models/ressource/Reservierung_model.php     | 7 +++++--
 public/js/apps/Cis/RoomInformation.js                   | 6 +++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index d360c1b90..4f7e7a053 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -316,6 +316,8 @@ class Stundenplan extends FHCAPI_Controller
     public function Reservierungen()
 	{
 
+        //TODO the reservierungen have to be grouped like the stundenplan
+
         $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index 260104305..23d17f974 100755
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -22,8 +22,11 @@ class Reservierung_model extends DB_Model
 	{
 
 		$raum_reservierungen= $this->execReadOnlyQuery("
-		SELECT * FROM lehre.vw_reservierung res
-		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ? 
+		SELECT res.*, mit.kurzbz as person_kurzbz , CONCAT(studg.typ,studg.kurzbz,'-') as stg
+		FROM lehre.vw_reservierung res
+		JOIN public.tbl_mitarbeiter mit ON mit.mitarbeiter_uid=res.uid
+		JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
+		WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ? 
 		", [$ort_kurzbz, $start_date, $end_date]);
 
 		return $raum_reservierungen;
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index a7aced683..d485227b2 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -78,7 +78,7 @@ const app = Vue.createApp({
 
                 let reservierungs_events = res.data;
                 console.log(reservierungs_events, " this are the reserverungs event")
-                this.events = [...this.events,...reservierungs_events];
+                this.events = [...(this.events?this.events:[]),...reservierungs_events];
                 
             });
         });
@@ -91,9 +91,9 @@ const app = Vue.createApp({
                 
 
                 <span>{{event.orig.reservierung? event.orig.title :event.orig.lv_info}}</span>	
-                <span v-if="event.orig.reservierung">{{'this is a reservierung'}}</span>
+                <span v-if="event.orig.reservierung">{{event.orig.stg}}</span>
                 <span v-else v-for="(item, index) in event.orig.stg.split('/')" :key="index">{{item}}</span>
-                <span>{{event.orig.reservierung? event.orig.uid : event.orig.lektor}}</span>
+                <span>{{event.orig.reservierung? event.orig.person_kurzbz : event.orig.lektor}}</span>
              
 			</div>
         </fhc-calendar>

From 9c51f25c9e8a885e44da69c9cc8f6e1ffc0462da Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 11 Jun 2024 15:03:09 +0200
Subject: [PATCH 11/34] modifies how the slot template from the Calendar Page
 is passed to the CalendarApp and prints the reservierungen differently (but
 the reservierungen are not grouped yet)

---
 .../api/frontend/v1/Stundenplan.php           |  3 +-
 .../models/ressource/Reservierung_model.php   |  8 +++-
 .../models/ressource/Stundenplan_model.php    | 16 ++++---
 public/js/apps/Cis/RoomInformation.js         | 47 ++++++++++++-------
 public/js/components/Calendar/Calendar.js     |  4 +-
 public/js/components/Calendar/Week.js         |  4 +-
 public/js/components/Calendar/Week/Page.js    |  7 +--
 7 files changed, 57 insertions(+), 32 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 4f7e7a053..2bff6016f 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -98,7 +98,8 @@ class Stundenplan extends FHCAPI_Controller
 
      
 		$result = $this->StundenplanModel->getRoomDataOnDay($ort_kurzbz,$start_date,$end_date);
-        
+        // logging the result of the query
+        //$this->loglib->logErrorDB(print_r($result,true),"this is the result of the query");
             
 
 		if(isError($result)){
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index 23d17f974..e149cf0d7 100755
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -22,7 +22,13 @@ class Reservierung_model extends DB_Model
 	{
 
 		$raum_reservierungen= $this->execReadOnlyQuery("
-		SELECT res.*, mit.kurzbz as person_kurzbz , CONCAT(studg.typ,studg.kurzbz,'-') as stg
+		SELECT res.*, mit.kurzbz as person_kurzbz , 
+		CASE
+			WHEN res.verband IS NOT NULL OR res.semester IS NOT NULL THEN
+				CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',res.verband,res.semester) 
+			ELSE
+				CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz)) 
+		END AS stg
 		FROM lehre.vw_reservierung res
 		JOIN public.tbl_mitarbeiter mit ON mit.mitarbeiter_uid=res.uid
 		JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 299faa049..5ce6a9823 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -18,23 +18,25 @@ class Stundenplan_model extends DB_Model
 	 * 
 	 * @return stdClass
 	 */
-	public function getRoomDataOnDay($ort_kurzbz='EDV_A2.06',$start_date,$end_date){
+	public function getRoomDataOnDay($ort_kurzbz,$start_date,$end_date){
 
 
-		//TODO alternative query version that unions the reservierungen into the stundenplan with different 'eintrags_type' column
-		/*"
+	
+		/*$raum_stundenplan= $this->execReadOnlyQuery("
 		-- merging all reservierungs information with the stundenplan information but with different types
-		SELECT 'stundenplan_eintrag' as eintrags_type, ort_kurzbz, studiengang_kz, uid, stunde, datum, titel, semester, verband, gruppe, gruppe_kurzbz, stg_kurzbz, CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, CONCAT(lehrfach,'-',lehrform) AS lv_info, * FROM lehre.vw_stundenplan sp
+		SELECT 'stundenplan_eintrag' as eintrags_type, CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, CONCAT(lehrfach,'-',lehrform) AS lv_info, ort_kurzbz, studiengang_kz, uid, stunde, datum, titel, semester, verband, gruppe, gruppe_kurzbz, stg_kurzbz, * FROM lehre.vw_stundenplan sp
 		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ? 
 		UNION ALL
-		SELECT 'reservierungs_eintrag' as eintrags_type, ort_kurzbz, studiengang_kz, uid, stunde, datum, titel, semester, verband, gruppe, gruppe_kurzbz, stg_kurzbz, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL FROM lehre.vw_reservierung res
+		SELECT 'reservierungs_eintrag' as eintrags_type, NULL, NULL, ort_kurzbz, studiengang_kz, uid, stunde, datum, titel, semester, verband, gruppe, gruppe_kurzbz, stg_kurzbz, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL FROM lehre.vw_reservierung res
 		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ?
-		"*/
+		", [$ort_kurzbz, $start_date, $end_date,$ort_kurzbz, $start_date, $end_date]);
+		*/
+
 
 		$raum_stundenplan= $this->execReadOnlyQuery("
 		SELECT CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) AS stg, CONCAT(lehrfach,'-',lehrform) AS lv_info, * FROM lehre.vw_stundenplan sp
 		WHERE ort_kurzbz = ? AND datum >= ? AND datum <= ? 
-		", [$ort_kurzbz, $start_date, $end_date]);
+		", [$ort_kurzbz, $start_date, $end_date]); 
 
 		return $raum_stundenplan;
 	}
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index d485227b2..e64348dd8 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -1,7 +1,7 @@
 import FhcCalendar from "../../components/Calendar/Calendar.js";
 import CalendarDate from "../../composables/CalendarDate.js";
 import FhcApi from "../../plugin/FhcApi.js";
-
+import Phrasen from "../../plugin/Phrasen.js";
 const app = Vue.createApp({
 	components: {
 		FhcCalendar
@@ -10,7 +10,9 @@ const app = Vue.createApp({
 		return {
 			stunden: [],
 			events: null,
-            calendarWeek: new CalendarDate(new Date("2024-06-06")),
+            calendarWeek: new CalendarDate(new Date("2024-05-07")),
+            reservierungenLoaded:false,
+            stundenplanLoaded:false,
         }
 	},
     computed:{
@@ -59,14 +61,16 @@ const app = Vue.createApp({
                     });
                     
                     this.events = res.data;
+                    this.stundenplanLoaded = true;
+                    console.log(this.events,"this are the events")
                 }
             });
 
-            this.$fhcApi.factory.stundenplan.getReservierungen('SEM_E0.04', this.weekFirstDay, this.weekLastDay).then(res => {
+           /*  this.$fhcApi.factory.stundenplan.getReservierungen('EDV_F4.26', this.weekFirstDay, this.weekLastDay).then(res => {
                 if (res.data && res.data.forEach) {
                     res.data.forEach((el, i) => {
                         el.reservierung = true;
-                        el.color = '#CCCCCC';
+                        el.color = '#' + (el.farbe || 'ffffff');
                         el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
                         el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
                         el.title = el.titel;
@@ -77,29 +81,40 @@ const app = Vue.createApp({
                 }
 
                 let reservierungs_events = res.data;
+
+                // adding the last reservierung twice for testing purposes
+                let last_reservierung=Object.assign({}, reservierungs_events[reservierungs_events.length-1]);
+                last_reservierung.person_kurzbz="drSimml";
+                reservierungs_events.push(last_reservierung);
+
                 console.log(reservierungs_events, " this are the reserverungs event")
                 this.events = [...(this.events?this.events:[]),...reservierungs_events];
-                
-            });
+                this.reservierungenLoaded=true;
+                console.log(reservierungs_events,"this are the reservierungs events")
+            }); */
         });
 
 	},
     template: /*html*/`
     <div>
-        <fhc-calendar v-slot="{event}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
-            <div class="d-flex flex-column align-items-center justify-content-evenly h-100">
-                
-
-                <span>{{event.orig.reservierung? event.orig.title :event.orig.lv_info}}</span>	
-                <span v-if="event.orig.reservierung">{{event.orig.stg}}</span>
-                <span v-else v-for="(item, index) in event.orig.stg.split('/')" :key="index">{{item}}</span>
-                <span>{{event.orig.reservierung? event.orig.person_kurzbz : event.orig.lektor}}</span>
-             
-			</div>
+        <fhc-calendar v-if="stundenplanLoaded || reservierungenLoaded" v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
+           
+           <template v-if="event.orig.eintrags_type != 'reservierungs_eintrag'">
+            <a class="text-decoration-none text-dark" href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'"   >    
+                <div class="d-flex flex-column align-items-center justify-content-evenly h-100" :style="{'background-color':event.orig.color}">
+                    <span>{{event.orig.reservierung? event.orig.title :event.orig.lv_info}}</span>	
+                    <span v-if="event.orig.reservierung">{{event.orig.stg}}</span>
+                    <span v-else v-for="(item, index) in event.orig.stg.split('/')" :key="index">{{item}}</span>
+                    <span>{{event.orig.reservierung? event.orig.person_kurzbz : event.orig.lektor}}</span>
+                </div>
+            </a>
+            </template>
+            <p v-else>this is a reservierung</p>
         </fhc-calendar>
     </div>
     `,
 });
 app.config.unwrapInjectedRef = true;
 app.use(FhcApi);
+app.use(Phrasen);
 app.mount('#content');
\ No newline at end of file
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 4ce70911e..cef013ff5 100755
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -148,9 +148,9 @@ export default {
 	template: `
 	<div ref="container" class="fhc-calendar card" :class="sizeClass">
 		<calendar-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="calendarModal"  />
-		<component v-slot="{event}" :is="'calendar-' + mode" @update:mode="mode=$event" @change:range="$emit('change:range',$event)" @input="handleInput" >
+		<component v-slot="{event,day}" :is="'calendar-' + mode" @update:mode="mode=$event" @change:range="$emit('change:range',$event)" @input="handleInput" >
 			<!--Week Page layout-->
-			<slot :event="event">
+			<slot :event="event" :day="day">
 				<div class="d-flex flex-column align-items-center justify-content-evenly h-100">
 					<span>{{event.orig.title}}</span>	
 					<span>{{event.orig.ort_kurzbz}}</span>
diff --git a/public/js/components/Calendar/Week.js b/public/js/components/Calendar/Week.js
index b4ec09e52..a6389fe52 100755
--- a/public/js/components/Calendar/Week.js
+++ b/public/js/components/Calendar/Week.js
@@ -42,8 +42,8 @@ export default {
 	<div class="fhc-calendar-week">
 		<calendar-header :title="title" @prev="prev" @next="next" @click="$emit('update:mode', 'weeks')" />
 		<calendar-pane ref="pane" v-slot="slot" @slid="paneChanged">
-			<calendar-week-page v-slot="{event}" :year="focusDate.y" :week="focusDate.w+slot.offset" @update:mode="$emit('update:mode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" >
-				<slot :event="event" ></slot>
+			<calendar-week-page v-slot="{event,day}" :year="focusDate.y" :week="focusDate.w+slot.offset" @update:mode="$emit('update:mode', $event)" @page:back="prev" @page:forward="next" @input="selectEvent" >
+				<slot :event="event" :day="day" ></slot>
 			</calendar-week-page>
 		</calendar-pane>
 	</div>`
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index c6636ad43..db28e7028 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -111,9 +111,10 @@ export default {
 						<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
 					<div v-for="day in eventsPerDayAndHour" :key="day" class="day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (1440 / smallestTimeFrame) + ', 1fr)'}">
-						<a  href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'" v-for="event in day.events" :key="event" class="mx-2 border border-dark border-2 small rounded overflow-hidden text-decoration-none text-dark" :style="{'background-color': event.orig.farbe?'#'.concat(event.orig.farbe):'white','grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" @click.prevent="$emit('input', event.orig)">
-							<slot :event="event" />
-						</a>
+						<div class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">	
+							<slot :event="event" :day="day"></slot>
+						</div>
+						
 					</div>
 				</div>
 			</div>

From d1afd9f09d7707f984c67f1322c2ce7273514308 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 12 Jun 2024 14:42:30 +0200
Subject: [PATCH 12/34] groups the uids of the reservierungen in the raum
 uebersicht and renders different template if the calender entry is a
 reservierung or a stundenplan event

---
 .../api/frontend/v1/Stundenplan.php           | 118 ++++++++++++------
 public/js/apps/Cis/RoomInformation.js         |  78 ++++++------
 public/js/components/Calendar/Calendar.js     |   8 +-
 public/js/components/Calendar/Week/Page.js    |   4 +-
 4 files changed, 122 insertions(+), 86 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 2bff6016f..80e4415b5 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -75,16 +75,10 @@ class Stundenplan extends FHCAPI_Controller
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
         
+        //return early if the get parameter are not present
         if(!$ort_kurzbz || !$start_date || !$end_date){
             $this->terminateWithError("Missing parameters", self::ERROR_TYPE_GENERAL);
         }
-
-        $this->addMeta("test_start_date",$start_date);
-
-        $this->addMeta("ort",$ort_kurzbz);
-        $this->addMeta("start date",$start_date);
-        $this->addMeta("end date",$end_date);
-        $this->addMeta("testKey","testValue");
         
         $this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 		$this->load->model('ressource/Stunde_model', 'StundeModel');
@@ -99,7 +93,7 @@ class Stundenplan extends FHCAPI_Controller
      
 		$result = $this->StundenplanModel->getRoomDataOnDay($ort_kurzbz,$start_date,$end_date);
         // logging the result of the query
-        //$this->loglib->logErrorDB(print_r($result,true),"this is the result of the query");
+        $this->loglib->logErrorDB(print_r($result,true),"this is the result of the original stundenplan query");
             
 
 		if(isError($result)){
@@ -107,14 +101,9 @@ class Stundenplan extends FHCAPI_Controller
         }
 
         $result = hasData($result) ? getData($result) : [];
-        $this->loglib->logInfoDB(print_r($result,true),"result");
-        // set up the log library and configure the library to log to the db
+        $this->loglib->logInfoDB(print_r(count($result),true),"this is the count of the result");
         
 
-        /* foreach($result as $event){
-            $this->loglib->logInfoDB($event->datum,"NEW DATE");
-        } */
-
         //TODO: also implement the following algorithm to block the lectures that are together over different stunden
         /* $blockcontinue=false;
 						if (isset($blocked[$this->std_plan[$i][$j][$idx]->unr]) && $blocked[$this->std_plan[$i][$j][$idx]->unr]>0)
@@ -248,14 +237,12 @@ class Stundenplan extends FHCAPI_Controller
 
                                     //Lektoren
                                     if(!mb_strstr($stunden_event->lektor,$stunden_event_compare->lektor)){
-                                        $this->loglib->logErrorDB($stunden_event->datum ."-". $stunden_event->stunde,"entered lektor - first if");
                                         $stunden_events[$event_key]->lektor = $stunden_event->lektor . ' \ ' . $stunden_event_compare->lektor;
                                         $stunden_events[$event_key]->mitarbeiter_kurzbz = $stunden_event->mitarbeiter_kurzbz . ' \ ' . $stunden_event_compare->mitarbeiter_kurzbz;
                                     }
 
                                     //Ort
                                     if(!mb_strstr($stunden_event->ort_kurzbz,$stunden_event_compare->ort_kurzbz)){
-                                        $this->loglib->logErrorDB($stunden_event->datum ."-". $stunden_event->stunde,"entered ort - second if");
                                         $stunden_events[$event_key]->ort_kurzbz = $stunden_event->ort_kurzbz . ' \ ' . $stunden_event_compare->ort_kurzbz;
                                     }
 
@@ -265,8 +252,7 @@ class Stundenplan extends FHCAPI_Controller
 
                                     //Lehrverband
                                     if(!mb_strstr($lehrverband_array[$event_key],$lehrverband_array[$compare_key])){
-                                        $this->loglib->logErrorDB($stunden_event->datum ."-". $stunden_event->stunde,"entered gruppe - third if");
-                                        $lehrverband_array[$event_key] .= ' / ' . $lehrverband_array[$compare_key];
+                                         $lehrverband_array[$event_key] .= ' / ' . $lehrverband_array[$compare_key];
                                     }
 
                                 }
@@ -280,22 +266,9 @@ class Stundenplan extends FHCAPI_Controller
 
 
                 }
-                /* if (count($stunden_events) == 1){
-                    $final_events[] = current($stunden_events);
-                }else if(count($stunden_events) > 1){
-                    $gruppe = '';
-                    foreach($stunden_events as $stunden_event){
-                        $gruppe .= $stunden_event->gruppe . ',';
-                    }
-                    current($stunden_events)->gruppe = $gruppe;
-                    $final_events[] = current($stunden_events);
-                } */
-                //$this->loglib->logInfoDB(print_r($stunden_events,true),"date: " . $date . " - stunde:" .$stunde->stunde);
+               
             }
-            /* $this->loglib->logInfoDB(print_r($testStartDate,true),"startdate");
-            $this->loglib->logInfoDB($count,"count");
-            $this->loglib->logInfoDB(print_r($testEndDate,true),"enddate");
-            */
+           
             $testStartDate->modify('+1 day');
             $count++;
         }     
@@ -305,9 +278,7 @@ class Stundenplan extends FHCAPI_Controller
         $phpStartDate = new DateTime($start_date);
 
         //$phpStartDate->modify('+1 day');
-        $this->addMeta('result',$phpStartDate);
-       
-            error_log("test".print_r($result,true));
+        $this->loglib->logErrorDB(print_r($final_events,true),"this is the result of the stundenplan query");
         
 		//echo($this->db->last_query());
 		$this->terminateWithSuccess($final_events);
@@ -328,13 +299,84 @@ class Stundenplan extends FHCAPI_Controller
         }
 
 		$this->load->model('ressource/Reservierung_model', 'ReservierungModel');
-
+        $this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
 		$result = $this->ReservierungModel->getRoomReservierungen($ort_kurzbz, $start_date, $end_date);
 
 		if (isError($result))
 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+        $this->load->library('LogLib');
+        $this->loglib->logErrorDB(print_r(getData($result),true),"this is the result of the reservierungen query");
+		
+        $result = hasData($result) ? getData($result) : [];
 
-		$this->terminateWithSuccess(getData($result));
+        // fetching the stunden to do a loop over the days and the stunden
+        $this->load->model('ressource/Stunde_model', 'StundeModel');
+        $stunden = $this->StundeModel->load();
+        if(isError($stunden)){
+            $this->terminateWithError(getError($stunden), self::ERROR_TYPE_GENERAL);
+        }
+        $stunden = getData($stunden);
+
+        $testStartDate = new DateTime($start_date);
+        $testEndDate = new DateTime($end_date);
+        $count =0;
+        $final_events = array();
+        $grouped = array();
+
+        $final_reservierungen = array();
+
+        // loop over the days
+        while($testStartDate <= $testEndDate && $count <7){
+            
+            $date = $testStartDate->format('Y-m-d');
+
+            // filtering all the reservierungen with the date
+            $day_reservierungen = array_filter($result, function($result_entry) use ($date){
+                return $result_entry->datum == $date;
+            });
+
+            // loop over the stunden
+            foreach( $stunden as $stunde){
+                // filtering all the day reservierungen to the reservierungen that happen at the same hour of the day
+                $hour_reservierungen = array_filter($day_reservierungen, function($day_entry) use ($stunde){
+                    return $day_entry->stunde == $stunde->stunde;
+                });
+
+                // if there are no reservierungen within that hour than we skip that iteration of the loop
+                if(!count($hour_reservierungen)){
+                    continue;
+                }
+
+                // looping over the reservierungen that happen at the same day and at the same hour
+                
+                $grouped_uid = array();
+                foreach($hour_reservierungen as $grouping_reservierung){
+                    $grouped_uid[]= $grouping_reservierung->uid;
+                }
+
+                $final_reservierung = $hour_reservierungen[0];
+                
+                
+                $grouped_uid = array_map(function($uid){
+                    $res =$this->MitarbeiterModel->generateKurzbz($uid);
+                    $res = hasData($res)? getData($res): $uid;
+                    return $res;
+               },$grouped_uid);
+                $this->loglib->logErrorDB(print_r($grouped_uid,true),"this are the grouped uids");
+
+                $final_reservierung->person_kurzbz = implode(" / ",$grouped_uid);
+
+                $final_reservierungen[] = $final_reservierung;
+            }
+            
+            
+            $testStartDate->modify('+1 day');
+            ++$count;
+
+        }
+        $this->loglib->logErrorDB(print_r($final_reservierungen,true),"lalala");
+        
+        $this->terminateWithSuccess($final_reservierungen);
 	}
 
 }
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index e64348dd8..db15979da 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -10,9 +10,8 @@ const app = Vue.createApp({
 		return {
 			stunden: [],
 			events: null,
-            calendarWeek: new CalendarDate(new Date("2024-05-07")),
-            reservierungenLoaded:false,
-            stundenplanLoaded:false,
+            calendarWeek: new CalendarDate(new Date()),
+            events_loaded:false,
         }
 	},
     computed:{
@@ -46,7 +45,7 @@ const app = Vue.createApp({
 
 
            // old testing room EDV_A6.09
-            this.$fhcApi.factory.stundenplan.getRoomInfo('SEM_E0.04', this.weekFirstDay, this.weekLastDay).then(res =>{
+            this.$fhcApi.factory.stundenplan.getRoomInfo('EDV_F4.26', this.weekFirstDay, this.weekLastDay).then(res =>{
                 let events;
                 if (res.data && res.data.forEach) {
                     res.data.forEach((el, i) => {
@@ -61,55 +60,54 @@ const app = Vue.createApp({
                     });
                     
                     this.events = res.data;
-                    this.stundenplanLoaded = true;
-                    console.log(this.events,"this are the events")
                 }
+
+                this.$fhcApi.factory.stundenplan.getReservierungen('EDV_F4.26', this.weekFirstDay, this.weekLastDay).then(res => {
+                    if (res.data && res.data.forEach) {
+                        res.data.forEach((el, i) => {
+                            el.reservierung = true;
+                            el.color = '#' + (el.farbe || 'ffffff');
+                            el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
+                            el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+                            el.title = el.titel;
+                            if (el.lehrform)
+                                el.title += '-' + el.lehrform;
+                        });
+                        
+                    }
+    
+                    let reservierungs_events = res.data;
+                    console.log(reservierungs_events,"this are the reservierungs events that are getting from the db query")
+                    this.events = [...(this.events?this.events:[]),...reservierungs_events];
+                    this.events_loaded = true;
+                    
+                }); 
             });
 
-           /*  this.$fhcApi.factory.stundenplan.getReservierungen('EDV_F4.26', this.weekFirstDay, this.weekLastDay).then(res => {
-                if (res.data && res.data.forEach) {
-                    res.data.forEach((el, i) => {
-                        el.reservierung = true;
-                        el.color = '#' + (el.farbe || 'ffffff');
-                        el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-                        el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
-                        el.title = el.titel;
-                        if (el.lehrform)
-                            el.title += '-' + el.lehrform;
-                    });
-                    
-                }
-
-                let reservierungs_events = res.data;
-
-                // adding the last reservierung twice for testing purposes
-                let last_reservierung=Object.assign({}, reservierungs_events[reservierungs_events.length-1]);
-                last_reservierung.person_kurzbz="drSimml";
-                reservierungs_events.push(last_reservierung);
-
-                console.log(reservierungs_events, " this are the reserverungs event")
-                this.events = [...(this.events?this.events:[]),...reservierungs_events];
-                this.reservierungenLoaded=true;
-                console.log(reservierungs_events,"this are the reservierungs events")
-            }); */
+           
         });
 
 	},
     template: /*html*/`
     <div>
-        <fhc-calendar v-if="stundenplanLoaded || reservierungenLoaded" v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
+        <fhc-calendar v-if="events_loaded" v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
            
-           <template v-if="event.orig.eintrags_type != 'reservierungs_eintrag'">
             <a class="text-decoration-none text-dark" href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'"   >    
                 <div class="d-flex flex-column align-items-center justify-content-evenly h-100" :style="{'background-color':event.orig.color}">
-                    <span>{{event.orig.reservierung? event.orig.title :event.orig.lv_info}}</span>	
-                    <span v-if="event.orig.reservierung">{{event.orig.stg}}</span>
-                    <span v-else v-for="(item, index) in event.orig.stg.split('/')" :key="index">{{item}}</span>
-                    <span>{{event.orig.reservierung? event.orig.person_kurzbz : event.orig.lektor}}</span>
+                    <template v-if="event.orig.reservierung">    
+                        <!-- render content for reservierungen -->
+                        <span>{{event.orig.title}}</span>
+                        <span>{{event.orig.stg}}</span>
+                        <span v-for="(item, index) in event.orig.person_kurzbz.split('/')" :key="index">{{item}}</span>
+                    </template>
+                    <template v-else>
+                        <!-- render content for stundenplan -->
+                        <span>{{event.orig.lv_info}}</span>	
+                        <span v-for="(item, index) in event.orig.stg.split('/')" :key="index">{{item}}</span>
+                        <span >{{event.orig.lektor}}</span>
+                    </template>
                 </div>
             </a>
-            </template>
-            <p v-else>this is a reservierung</p>
         </fhc-calendar>
     </div>
     `,
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index cef013ff5..4fb4c821e 100755
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -150,13 +150,7 @@ export default {
 		<calendar-modal v-if="currentlySelectedEvent" :event="currentlySelectedEvent" ref="calendarModal"  />
 		<component v-slot="{event,day}" :is="'calendar-' + mode" @update:mode="mode=$event" @change:range="$emit('change:range',$event)" @input="handleInput" >
 			<!--Week Page layout-->
-			<slot :event="event" :day="day">
-				<div class="d-flex flex-column align-items-center justify-content-evenly h-100">
-					<span>{{event.orig.title}}</span>	
-					<span>{{event.orig.ort_kurzbz}}</span>
-					<span>{{event.orig.mitarbeiter_kurzbz}}</span>
-				</div>
-			</slot>
+			<slot :event="event" :day="day"></slot>
 		</component>
 	</div>`
 }
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index db28e7028..efaaff131 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -112,7 +112,9 @@ export default {
 					</div>
 					<div v-for="day in eventsPerDayAndHour" :key="day" class="day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (1440 / smallestTimeFrame) + ', 1fr)'}">
 						<div class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">	
-							<slot :event="event" :day="day"></slot>
+							<slot :event="event" :day="day">
+								<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
+							</slot>
 						</div>
 						
 					</div>

From de4accab83ed1d252f32bda20ab61d9a9e3d3133 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 13 Jun 2024 12:27:09 +0200
Subject: [PATCH 13/34] cleans up the Stundenplan grouping algorithm

---
 .../api/frontend/v1/Stundenplan.php           | 260 +++++++-----------
 1 file changed, 99 insertions(+), 161 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 80e4415b5..222d472d6 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -68,8 +68,10 @@ class Stundenplan extends FHCAPI_Controller
 	 */
 	public function roomInformation()
 	{
+       
+        $this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		$this->load->model('ressource/Stunde_model', 'StundeModel');
 
-        //TODO please split this algorithm into multiple smaller function it is not really mantainable like this
         // storing the get parameter in local variables
         $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
         $start_date = $this->input->get('start_date', TRUE);
@@ -80,21 +82,15 @@ class Stundenplan extends FHCAPI_Controller
             $this->terminateWithError("Missing parameters", self::ERROR_TYPE_GENERAL);
         }
         
-        $this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-		$this->load->model('ressource/Stunde_model', 'StundeModel');
+		// querying the stunden
+        $stunden = $this->StundeModel->load();
 
-        
-		$stunden = $this->StundeModel->load();
-        if(isError($stunden)){
+        if(isError($stunden))
             $this->terminateWithError(getError($stunden), self::ERROR_TYPE_GENERAL);
-        }
+        
         $stunden = getData($stunden);
 
-     
-		$result = $this->StundenplanModel->getRoomDataOnDay($ort_kurzbz,$start_date,$end_date);
-        // logging the result of the query
-        $this->loglib->logErrorDB(print_r($result,true),"this is the result of the original stundenplan query");
-            
+		$result = $this->StundenplanModel->getRoomDataOnDay($ort_kurzbz,$start_date,$end_date);  
 
 		if(isError($result)){
             $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
@@ -103,76 +99,24 @@ class Stundenplan extends FHCAPI_Controller
         $result = hasData($result) ? getData($result) : [];
         $this->loglib->logInfoDB(print_r(count($result),true),"this is the count of the result");
         
-
-        //TODO: also implement the following algorithm to block the lectures that are together over different stunden
-        /* $blockcontinue=false;
-						if (isset($blocked[$this->std_plan[$i][$j][$idx]->unr]) && $blocked[$this->std_plan[$i][$j][$idx]->unr]>0)
-						{
-							$blocked[$this->std_plan[$i][$j][$idx]->unr]--;
-							$blockcontinue=true;
-						}
-
-						if (!$blockcontinue)
-						{
-							// Blockungen ueber mehrere Stunden erkennen
-
-							$blockflag=false;
-							for ($blockstunden=1;$blockstunden<=$num_rows_stunde;$blockstunden++)
-							{
-								if (isset($this->std_plan[$i][$j+$blockstunden][$idx]) && isset($this->std_plan[$i][$j+$blockstunden][$idx]->stundenplan_id)
-									&& ($this->std_plan[$i][$j][$idx]->unr == $this->std_plan[$i][$j+$blockstunden][$idx]->unr)
-									&& $this->std_plan[$i][$j][$idx]!='0' && $k<($num_rows_stunde-$blockstunden)
-									&& !($this->std_plan[$i][$j][$idx]->reservierung && $this->std_plan[$i][$j][$idx]->lektor!=$this->std_plan[$i][$j+$blockstunden][$idx]->lektor))
-								{
-
-									if (isset($blocked[$this->std_plan[$i][$j][$idx]->unr]))
-										$blocked[$this->std_plan[$i][$j][$idx]->unr]++;
-									else
-										$blocked[$this->std_plan[$i][$j][$idx]->unr]=1;
-									$row = $this->db_fetch_object($this->stunde, ($k+$blockstunden));
-									$stunden_arr[]=$row->stunde;
-									$end_time=$row->ende;
-									$blockflag=true;
-								}
-								else
-								{
-									if (!$blockflag)
-									{
-										$row = $this->db_fetch_object($this->stunde, $k);
-										$stunden_arr[]=$row->stunde;
-										$end_time=$row->ende;
-										break;
-									}
-									else
-									{
-										break;
-									}
-								}
-							}
-						} */
-
-        $testStartDate = new DateTime($start_date);
-        $testEndDate = new DateTime($end_date);
-        $count =0;
+        
         $final_events = array();
         $grouped = array();
-        while($testStartDate <= $testEndDate && $count <7){
-            $date = $testStartDate->format('Y-m-d');
-            //TODO: array filtering for every day and hour could be too time consuming causing slow response
-            $day_events = array_filter($result,function($entry) use ($date){
-                return $entry->datum == $date;
-            });
-            //$this->loglib->logInfoDB(print_r($day_events,true),"day_events");
+        $associative_day_events = $this->filterEventsIntoAssociativeDateArray($result, $start_date, $end_date);
+        foreach($associative_day_events as $date => $day_events ){
+            
             foreach($stunden as $stunde){
+
+                // filtering all the events at the same hour of the day
                 $stunden_events = array_filter($day_events, function($entry) use ($stunde){
                     return $entry->stunde == $stunde->stunde;
                 });
 
                 $lehrverband_array = array();
 
-                
                 // for loop that is just used to fill the lehrverband_array
                 foreach($stunden_events as $key=>$stunden_event){
+
                     // lehrverband bestimmen
                     if(strlen($stunden_event->gruppe_kurzbz)>0){
                         $lehrverband = $stunden_event->gruppe_kurzbz;
@@ -188,25 +132,22 @@ class Stundenplan extends FHCAPI_Controller
                     $lehrverband_array[$key] = $lehrverband;
                 }
                 
-                
-                // aenderung aller events die am gleichen tag und zur gleichen Stunde gehalten werden
+                // compare nested loop start
                 foreach($stunden_events as $event_key => $stunden_event){
+                    
+                    // skip the loop iteration if the event was already grouped
                     if(isset($grouped[$event_key])){
                         continue;
                     }
                      
                     // lektor bestimmen
-                    if($stunden_event->mitarbeiter_kurzbz == null){
-                        $simml_lektor = $stunden_event->lektor;
-                    }else{
-                        $simml_lektor = $stunden_event->mitarbeiter_kurzbz;
+                    if($stunden_event->mitarbeiter_kurzbz != null){
+                        $stunden_events[$event_key]->lektor = $stunden_event->mitarbeiter_kurzbz;
                     }
 
-                
                     // lehrfach bestimmen
-                    $lehrfach = $stunden_event->lehrfach;
                     if(isset($stunden_event->lehrform)){
-                        $lehrfach .= '-'.$stunden_event->lehrform;
+                        $stunden_events[$event_key]->lehrfach .= '-'.$stunden_event->lehrform;
                     }
                     
                     // GRUPIEREN DER GLEICHEN EVENTS
@@ -216,24 +157,19 @@ class Stundenplan extends FHCAPI_Controller
                         if($compare_key != $event_key){
                             
                             // will be used to skip the loop iteration with this index because it was already grouped
-                            $grouped[$compare_key] = 1;
-                            // this if checks if the events can be grouped
+                            $grouped[$compare_key] = TRUE;
+
+                            // can the events be grouped?
                            if ( 
                                 // the unr's have to be equal to be grouped
                                 $stunden_event->unr==$stunden_event_compare->unr && 
                                 // and either the lektor or the ort_kurzbz have to be equal
                                 ($stunden_event->ort_kurzbz==$stunden_event_compare->ort_kurzbz 
                                 || $stunden_event->lektor==$stunden_event_compare->lektor)
-                                // reservierungen muessen auch beachtet werden, wenn der eintrag eine reservierung ist dann koennen die eintraege nicht gruppiert werden
-                                //&& !$stunden_event->reservierung && !$stunden_event_compare->reservierung
-
                            )
                                 {
-
-                                    
-
                                     // Bezeichnung des Events zusammenfuehren
-                                    // change the event with the $event_key if the compared_event has different properties but is still groupable
+                                    // group the events properties if they are groupable
 
                                     //Lektoren
                                     if(!mb_strstr($stunden_event->lektor,$stunden_event_compare->lektor)){
@@ -246,10 +182,6 @@ class Stundenplan extends FHCAPI_Controller
                                         $stunden_events[$event_key]->ort_kurzbz = $stunden_event->ort_kurzbz . ' \ ' . $stunden_event_compare->ort_kurzbz;
                                     }
 
-                                    //unset the compared and grouped event
-                                    unset($stunden_events[$compare_key]);
-                                    
-
                                     //Lehrverband
                                     if(!mb_strstr($lehrverband_array[$event_key],$lehrverband_array[$compare_key])){
                                          $lehrverband_array[$event_key] .= ' / ' . $lehrverband_array[$compare_key];
@@ -262,83 +194,54 @@ class Stundenplan extends FHCAPI_Controller
                     // add the grouped lehrverband entry to the event
                     $stunden_events[$event_key]->stg = $lehrverband_array[$event_key];
                     $final_events[] = $stunden_events[$event_key];
-
-
-
                 }
-               
             }
-           
-            $testStartDate->modify('+1 day');
-            $count++;
         }     
         
-       
-        //php start date
-        $phpStartDate = new DateTime($start_date);
-
-        //$phpStartDate->modify('+1 day');
-        $this->loglib->logErrorDB(print_r($final_events,true),"this is the result of the stundenplan query");
-        
-		//echo($this->db->last_query());
 		$this->terminateWithSuccess($final_events);
 		
 	}
 
     public function Reservierungen()
 	{
+        $this->load->model('ressource/Reservierung_model', 'ReservierungModel');
+        $this->load->model('ressource/Stunde_model', 'StundeModel');
+        $this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
 
-        //TODO the reservierungen have to be grouped like the stundenplan
-
+        // storing the get parameter in local variables
         $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
+        // return early if the get parameter are not present
         if(!$ort_kurzbz || !$start_date || !$end_date){
             $this->terminateWithError("Missing parameters", self::ERROR_TYPE_GENERAL);
         }
 
-		$this->load->model('ressource/Reservierung_model', 'ReservierungModel');
-        $this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
+        // querying the stunden
+        $stunden = $this->StundeModel->load();
+
+        if(isError($stunden))
+            $this->terminateWithError(getError($stunden), self::ERROR_TYPE_GENERAL);
+        
+        $stunden = getData($stunden);
+
+		// querying the reservierungen
 		$result = $this->ReservierungModel->getRoomReservierungen($ort_kurzbz, $start_date, $end_date);
 
 		if (isError($result))
 			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-        $this->load->library('LogLib');
-        $this->loglib->logErrorDB(print_r(getData($result),true),"this is the result of the reservierungen query");
-		
+        
         $result = hasData($result) ? getData($result) : [];
-
-        // fetching the stunden to do a loop over the days and the stunden
-        $this->load->model('ressource/Stunde_model', 'StundeModel');
-        $stunden = $this->StundeModel->load();
-        if(isError($stunden)){
-            $this->terminateWithError(getError($stunden), self::ERROR_TYPE_GENERAL);
-        }
-        $stunden = getData($stunden);
-
-        $testStartDate = new DateTime($start_date);
-        $testEndDate = new DateTime($end_date);
-        $count =0;
-        $final_events = array();
-        $grouped = array();
-
-        $final_reservierungen = array();
-
+        
         // loop over the days
-        while($testStartDate <= $testEndDate && $count <7){
-            
-            $date = $testStartDate->format('Y-m-d');
-
-            // filtering all the reservierungen with the date
-            $day_reservierungen = array_filter($result, function($result_entry) use ($date){
-                return $result_entry->datum == $date;
-            });
+        $day_events = $this->filterEventsIntoAssociativeDateArray($result, $start_date, $end_date);
+        foreach($day_events as $date => $day_eventArray){
 
             // loop over the stunden
             foreach( $stunden as $stunde){
                 // filtering all the day reservierungen to the reservierungen that happen at the same hour of the day
-                $hour_reservierungen = array_filter($day_reservierungen, function($day_entry) use ($stunde){
+                $hour_reservierungen = array_filter($day_eventArray, function($day_entry) use ($stunde){
                     return $day_entry->stunde == $stunde->stunde;
                 });
 
@@ -347,37 +250,72 @@ class Stundenplan extends FHCAPI_Controller
                     continue;
                 }
 
-                // looping over the reservierungen that happen at the same day and at the same hour
-                
-                $grouped_uid = array();
-                foreach($hour_reservierungen as $grouping_reservierung){
-                    $grouped_uid[]= $grouping_reservierung->uid;
+                $grouped_uids = array();
+                foreach($hour_reservierungen as $entry){
+
+                    $mitarbeiter_check = $this->MitarbeiterModel->isMitarbeiter($entry->uid);
+                    
+                    if(isError($mitarbeiter_check)){
+                        $this->terminateWithError(getError($mitarbeiter_check), self::ERROR_TYPE_GENERAL);
+                    }
+
+                    $mitarbeiter_check = getData($mitarbeiter_check);
+
+                    // if the uid belongs to a mitarbeiter store the mitarbeiter_kurzbz otherwise store the student uid
+                    if($mitarbeiter_check){
+                        $mitarbeiterKurzbz = $this->MitarbeiterModel->generateKurzbz($entry->uid);
+                        
+                        if(isError($mitarbeiterKurzbz)){
+                            $this->terminateWithError(getError($mitarbeiterKurzbz), self::ERROR_TYPE_GENERAL);
+                        }
+
+                        $grouped_uids[] = getData($mitarbeiterKurzbz);
+
+                    }else{
+                        $grouped_uids[]= $entry->uid;
+                    }
+                    
                 }
 
+                // merging all the information into the first entry
                 $final_reservierung = $hour_reservierungen[0];
                 
-                
-                $grouped_uid = array_map(function($uid){
-                    $res =$this->MitarbeiterModel->generateKurzbz($uid);
-                    $res = hasData($res)? getData($res): $uid;
-                    return $res;
-               },$grouped_uid);
-                $this->loglib->logErrorDB(print_r($grouped_uid,true),"this are the grouped uids");
-
-                $final_reservierung->person_kurzbz = implode(" / ",$grouped_uid);
+                $final_reservierung->person_kurzbz = implode(" / ",$grouped_uids);
 
                 $final_reservierungen[] = $final_reservierung;
             }
-            
-            
-            $testStartDate->modify('+1 day');
-            ++$count;
 
         }
-        $this->loglib->logErrorDB(print_r($final_reservierungen,true),"lalala");
-        
         $this->terminateWithSuccess($final_reservierungen);
 	}
 
+    private function filterEventsIntoAssociativeDateArray($events, $start_date, $end_date){
+        $php_start_date = new DateTime($start_date);
+        $php_end_date = new DateTime($end_date);
+        // count is used to ensure that the loop does not iterate more than 7 times (7 days per week)
+        $count =0;
+
+       $result = array();
+
+        // loop over the days
+        while($php_start_date <= $php_end_date && $count <7){
+            
+            $date = $php_start_date->format('Y-m-d');
+
+            // filtering all the reservierungen with the date
+            $day_events = array_filter($events, function($event) use ($date){
+                // no filtering is done if the event entries do not have a datum property
+                return isset($event->datum) ? $event->datum == $date : true; 
+                
+            });
+
+            $result[$date] = $day_events;
+            ++$count;
+            $php_start_date->modify('+1 day');
+        }
+
+        return $result;
+    }
+
 }
 

From dd7c8480f3913eaeba916c3583594a540eb7eea5 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 13 Jun 2024 12:29:36 +0200
Subject: [PATCH 14/34] removes unwanted methods and properties from
 CalendarModal

---
 .../js/components/Calendar/CalendarModal.js   | 114 +-----------------
 1 file changed, 2 insertions(+), 112 deletions(-)

diff --git a/public/js/components/Calendar/CalendarModal.js b/public/js/components/Calendar/CalendarModal.js
index 5f6fd9d09..62263c72e 100644
--- a/public/js/components/Calendar/CalendarModal.js
+++ b/public/js/components/Calendar/CalendarModal.js
@@ -29,123 +29,13 @@ export default {
   data() {
     return {
       data:this.event,
-      topic: null,
-      profilUpdate: null,
-      editData: this.value,
-      fileID: null,
-      breadcrumb: null,
-      loading: false,
-
+    
       result: false,
       info: null,
     };
   },
-  methods: {
-    updateFileIDFunction: function (newFileID) {
-      this.fileID = newFileID;
-    },
+  
 
-    async submitProfilChange() {
-      //? check if data is valid before making a request
-      if (this.topic && this.profilUpdate) {
-        //? if profil update contains any attachment
-        if (this.fileID) {
-          const fileData = await this.uploadFiles(this.fileID);
-
-          this.fileID = fileData ? fileData : null;
-        }
-
-        //? inserts new row in public.tbl_cis_profil_update
-        //* calls the update api call if an update field is present in the data that was passed to the modal
-        const handleApiResponse = (res) => {
-          //? toggles the loading to false and closes the loading modal
-          this.loading = false;
-          this.setLoading(false);
-
-          if (res.data.error == 0) {
-            this.result = true;
-            this.hide();
-            Alert.popup(
-              "Ihre Anfrage wurde erfolgreich gesendet. Bitte warten Sie, während sich das Team um Ihre Anfrage kümmert."
-            );
-          } else {
-            this.result = false;
-            this.hide();
-            Alert.popup(
-              "Ein Fehler ist aufgetreten: " + JSON.stringify(res.data.retval)
-            );
-          }
-        };
-
-        //* v-show on EditProfil modal binded to this.loading
-        //? hides the EditProfil modal and shows the loading modal by calling a callback that was passed as prop from the parent component
-        this.loading = true;
-        this.setLoading(true);
-
-        this.editData.updateID
-          ? Vue.$fhcapi.ProfilUpdate.updateProfilRequest(
-              this.topic,
-              this.profilUpdate,
-              this.editData.updateID,
-              this.fileID ? this.fileID[0] : null
-            )
-              .then((res) => {
-                handleApiResponse(res);
-              })
-              .catch((err) => {
-                console.error(err);
-              })
-          : Vue.$fhcapi.ProfilUpdate.insertProfilRequest(
-              this.topic,
-              this.profilUpdate,
-              this.fileID ? this.fileID[0] : null
-            )
-              .then((res) => {
-                handleApiResponse(res);
-              })
-              .catch((err) => {
-                console.error(err);
-              });
-      }
-    },
-
-    uploadFiles: async function (files) {
-      if (files[0].type !== "application/x.fhc-dms+json") {
-        let formData = new FormData();
-        formData.append("files[]", files[0]);
-        const result = this.editData.updateID
-          ? //? updating old attachment by replacing
-            //* second parameter of api request insertFile checks if the file has to be replaced or not
-            await Vue.$fhcapi.ProfilUpdate.insertFile(
-              formData,
-              this.editData.updateID
-            ).then((res) => {
-              return res.data?.map((file) => file.dms_id);
-            })
-          : //? fresh insert of new attachment
-            await Vue.$fhcapi.ProfilUpdate.insertFile(formData).then((res) => {
-              return res.data?.map((file) => file.dms_id);
-            });
-        return result;
-      } else {
-        //? attachment hasn't been replaced
-        return false;
-      }
-    },
-  },
-  computed: {
-    start_time: function(){
-      if(!this.data.start) return 'N/A';
-      return this.data.start.getHours() + ":" + this.data.start.getMinutes();
-    },
-    end_time: function(){
-      if(!this.data.end) return 'N/A';
-      return this.data.end.getHours() + ":" + this.data.end.getMinutes();
-    }
-  },
-  created() {
-    console.log("this is an test")
-  },
   mounted() {
     this.modal = this.$refs.modalContainer.modal;
   },

From a0472c6573a23f9c559c51daca499ee2da6ab725 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 14 Jun 2024 14:44:29 +0200
Subject: [PATCH 15/34] little changes

---
 .../controllers/api/frontend/v1/Stundenplan.php   | 15 ++++++++++++---
 public/js/apps/Cis/RoomInformation.js             |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 222d472d6..fe5ac9e23 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -236,6 +236,7 @@ class Stundenplan extends FHCAPI_Controller
         
         // loop over the days
         $day_events = $this->filterEventsIntoAssociativeDateArray($result, $start_date, $end_date);
+        $final_reservierungen = array();
         foreach($day_events as $date => $day_eventArray){
 
             // loop over the stunden
@@ -246,13 +247,18 @@ class Stundenplan extends FHCAPI_Controller
                 });
 
                 // if there are no reservierungen within that hour than we skip that iteration of the loop
-                if(!count($hour_reservierungen)){
+                if(count($hour_reservierungen) <1){
                     continue;
                 }
 
+                $this->loglib->logInfoDB(print_r($hour_reservierungen,true),"this is the hour reservierungen");
+                
+                // grouping the reservierung information of reservervations of the same hour on the same day
                 $grouped_uids = array();
                 foreach($hour_reservierungen as $entry){
 
+                    // grouping the reservierungs participants
+
                     $mitarbeiter_check = $this->MitarbeiterModel->isMitarbeiter($entry->uid);
                     
                     if(isError($mitarbeiter_check)){
@@ -274,11 +280,14 @@ class Stundenplan extends FHCAPI_Controller
                     }else{
                         $grouped_uids[]= $entry->uid;
                     }
+
+                    // grouping the 
                     
                 }
 
+                
                 // merging all the information into the first entry
-                $final_reservierung = $hour_reservierungen[0];
+                $final_reservierung = current($hour_reservierungen);
                 
                 $final_reservierung->person_kurzbz = implode(" / ",$grouped_uids);
 
@@ -295,7 +304,7 @@ class Stundenplan extends FHCAPI_Controller
         // count is used to ensure that the loop does not iterate more than 7 times (7 days per week)
         $count =0;
 
-       $result = array();
+        $result = array();
 
         // loop over the days
         while($php_start_date <= $php_end_date && $count <7){
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index db15979da..af92fe147 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -97,7 +97,7 @@ const app = Vue.createApp({
                     <template v-if="event.orig.reservierung">    
                         <!-- render content for reservierungen -->
                         <span>{{event.orig.title}}</span>
-                        <span>{{event.orig.stg}}</span>
+                        <span>{{event.orig.gruppe_kurzbz?event.orig.gruppe_kurzbz:event.orig.stg}}</span>
                         <span v-for="(item, index) in event.orig.person_kurzbz.split('/')" :key="index">{{item}}</span>
                     </template>
                     <template v-else>

From 008847e490d6861a04433882bbd20f4aa84fea22 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 24 Jun 2024 13:08:44 +0200
Subject: [PATCH 16/34] adds a sql query for the grouping algorithm

---
 .../api/frontend/v1/Stundenplan.php           | 20 ++--
 .../models/ressource/Stundenplan_model.php    | 94 ++++++++++++++++++-
 public/js/api/ort.js                          | 10 ++
 public/js/apps/Cis/RoomInformation.js         | 37 ++++----
 public/js/components/Calendar/Week/Page.js    |  5 +-
 5 files changed, 137 insertions(+), 29 deletions(-)
 create mode 100644 public/js/api/ort.js

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index fe5ac9e23..243f4b2c5 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -90,16 +90,22 @@ class Stundenplan extends FHCAPI_Controller
         
         $stunden = getData($stunden);
 
-		$result = $this->StundenplanModel->getRoomDataOnDay($ort_kurzbz,$start_date,$end_date);  
-
-		if(isError($result)){
+		$result = $this->StundenplanModel->groupedRoomPlanning($ort_kurzbz,$start_date,$end_date);  
+        //$this->loglib->logErrorDB(print_r($result,TRUE),"this is the result of the grouped query");
+		
+        if(isError($result)){
             $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
         }
 
         $result = hasData($result) ? getData($result) : [];
-        $this->loglib->logInfoDB(print_r(count($result),true),"this is the count of the result");
-        
         
+
+        foreach($result as $entry){
+            if(COUNT($entry->lektor)>1){
+                // gruppierung hat stattgefunden und das array muss in einem String konvertiert werden
+            }
+        }
+        /* 
         $final_events = array();
         $grouped = array();
         $associative_day_events = $this->filterEventsIntoAssociativeDateArray($result, $start_date, $end_date);
@@ -196,9 +202,9 @@ class Stundenplan extends FHCAPI_Controller
                     $final_events[] = $stunden_events[$event_key];
                 }
             }
-        }     
+        } */     
         
-		$this->terminateWithSuccess($final_events);
+		$this->terminateWithSuccess($result);
 		
 	}
 
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 5ce6a9823..5e5dc779d 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -18,7 +18,7 @@ class Stundenplan_model extends DB_Model
 	 * 
 	 * @return stdClass
 	 */
-	public function getRoomDataOnDay($ort_kurzbz,$start_date,$end_date){
+	public function getRoomDataOnInterval($ort_kurzbz,$start_date,$end_date){
 
 
 	
@@ -41,6 +41,98 @@ class Stundenplan_model extends DB_Model
 		return $raum_stundenplan;
 	}
 
+	/**
+	 * @param string $ort_kurzbz The room to query the planning for
+	 * @param string $start_date The start date of the query interval
+	 * @param string $end_date The end date of the query interval
+	 * 
+	 * @return stdClass
+	 */
+	public function groupedRoomPlanning($ort_kurzbz,$start_date,$end_date){
+
+
+		$gruppierteRaumVerplannung= $this->execReadOnlyQuery("
+		SELECT 
+		
+			'reservierung' as type,
+			NULL as unr,datum, stunde,
+			titel AS topic, 
+			beschreibung as beschreibung,
+			string_agg(DISTINCT gruppe, '/') as gruppe,
+			string_agg(DISTINCT lektor, '/') as lektor,
+			res.ort_kurzbz,res.studiengang_kz,  res.titel, res.beschreibung,NULL as lehreinheit_id,NULL as lehrfach_id,NULL as anmerkung, NULL as fix,NULL as lehrveranstaltung_id,NULL as stg_kurzbzlang,NULL as stg_bezeichnung,NULL as stg_typ, NULL as fachbereich_kurzbz,NULL as lehrfach,NULL as lehrfach_bez,NULL as farbe,NULL as lehrform, NULL as anmerkung_lehreinheit
+		
+		FROM 
+		
+		(
+			SELECT 
+			NULL as unr,datum, stunde, 
+			CASE 
+				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
+				ELSE CONCAT(UPPER(studg.typ),UPPER(res.stg_kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/'))  
+			END as gruppe,
+			CASE
+				WHEN mit.kurzbz IS NOT NULL THEN mit.kurzbz
+				ELSE uid
+			END as lektor, 
+			res.ort_kurzbz,res.studiengang_kz,  res.titel, res.beschreibung,NULL as lehreinheit_id,NULL as lehrfach_id,NULL as anmerkung, NULL as fix,NULL as lehrveranstaltung_id,NULL as stg_kurzbzlang,NULL as stg_bezeichnung,NULL as stg_typ, NULL as fachbereich_kurzbz,NULL as lehrfach,NULL as lehrfach_bez,NULL as farbe,NULL as lehrform, NULL as anmerkung_lehreinheit 
+			FROM lehre.vw_reservierung res
+
+			LEFT JOIN public.tbl_mitarbeiter mit ON mit.mitarbeiter_uid=uid
+			JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
+
+			WHERE 
+				res.ort_kurzbz = ? 
+				AND res.datum >= ? 
+				AND res.datum <= ?
+		) as res
+	
+		GROUP BY res.ort_kurzbz,res.studiengang_kz, res.datum, res.stunde, res.titel, res.beschreibung
+
+		UNION ALL
+		
+		SELECT 
+			
+		'stundenplan' as type,
+		unr,datum, stunde,
+		CONCAT(lehrfach,'-',lehrform) as topic,
+		'' as beschreibung,
+		string_agg(DISTINCT gruppe, '/') as gruppe,
+		string_agg(DISTINCT lektor, '/') as lektor,  
+		ort_kurzbz, studiengang_kz, titel,'' as beschreibung,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit 
+
+		FROM
+		(
+			SELECT
+ 			unr,datum, stunde,
+			CASE
+				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
+				ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) 
+			END as gruppe,
+			CASE
+				WHEN sp.mitarbeiter_kurzbz IS NOT NULL THEN sp.mitarbeiter_kurzbz
+				ELSE lektor
+			END as lektor,
+			ort_kurzbz, studiengang_kz, titel,'' as beschreibung,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit 
+
+			FROM lehre.vw_stundenplan sp
+
+			WHERE ort_kurzbz = ? 
+			AND datum >= ? 
+			AND datum <= ?
+
+		) as sp
+
+		GROUP BY 
+
+			ort_kurzbz,unr, datum, stunde, lehreinheit_id, lehrfach_id,studiengang_kz,titel,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit
+
+		ORDER BY datum, stunde
+		", [$ort_kurzbz, $start_date, $end_date, $ort_kurzbz, $start_date, $end_date]); 
+
+		return $gruppierteRaumVerplannung;
+	}
+
 	/**
 	 * @param string $uid
 	 * 
diff --git a/public/js/api/ort.js b/public/js/api/ort.js
new file mode 100644
index 000000000..4c8e2ce73
--- /dev/null
+++ b/public/js/api/ort.js
@@ -0,0 +1,10 @@
+export default {
+  getContentID(ort_kurbz) {
+		return this.$fhcApi.get(
+            FHC_JS_DATA_STORAGE_OBJECT.app_root +
+            FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+            "/api/frontend/v1/Ort/ContentID",
+			{ ort_kurzbz: ort_kurbz }
+		);
+	},
+}
\ No newline at end of file
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index af92fe147..b5559047e 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -51,7 +51,13 @@ const app = Vue.createApp({
                     res.data.forEach((el, i) => {
 
                         el.id = i;
-                        el.color = '#' + (el.farbe || 'CCCCCC');
+                        if(el.type === 'reservierung')
+                        {
+                            el.color = '#' + (el.farbe || 'FFFFFF');
+                        }else{
+                            el.color = '#' + (el.farbe || 'CCCCCC');
+                        }
+                        
                         el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
                         el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
                         el.title = el.lehrfach;
@@ -62,7 +68,8 @@ const app = Vue.createApp({
                     this.events = res.data;
                 }
 
-                this.$fhcApi.factory.stundenplan.getReservierungen('EDV_F4.26', this.weekFirstDay, this.weekLastDay).then(res => {
+                // reservierungen are loaded with the stundenplan
+                /* this.$fhcApi.factory.stundenplan.getReservierungen('EDV_F4.26', this.weekFirstDay, this.weekLastDay).then(res => {
                     if (res.data && res.data.forEach) {
                         res.data.forEach((el, i) => {
                             el.reservierung = true;
@@ -77,11 +84,10 @@ const app = Vue.createApp({
                     }
     
                     let reservierungs_events = res.data;
-                    console.log(reservierungs_events,"this are the reservierungs events that are getting from the db query")
                     this.events = [...(this.events?this.events:[]),...reservierungs_events];
-                    this.events_loaded = true;
                     
-                }); 
+                    
+                }); */
             });
 
            
@@ -90,22 +96,19 @@ const app = Vue.createApp({
 	},
     template: /*html*/`
     <div>
-        <fhc-calendar v-if="events_loaded" v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
+        <fhc-calendar  v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
            
             <a class="text-decoration-none text-dark" href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'"   >    
                 <div class="d-flex flex-column align-items-center justify-content-evenly h-100" :style="{'background-color':event.orig.color}">
-                    <template v-if="event.orig.reservierung">    
-                        <!-- render content for reservierungen -->
-                        <span>{{event.orig.title}}</span>
-                        <span>{{event.orig.gruppe_kurzbz?event.orig.gruppe_kurzbz:event.orig.stg}}</span>
-                        <span v-for="(item, index) in event.orig.person_kurzbz.split('/')" :key="index">{{item}}</span>
-                    </template>
-                    <template v-else>
+                    
                         <!-- render content for stundenplan -->
-                        <span>{{event.orig.lv_info}}</span>	
-                        <span v-for="(item, index) in event.orig.stg.split('/')" :key="index">{{item}}</span>
-                        <span >{{event.orig.lektor}}</span>
-                    </template>
+                        <span >{{event.orig.topic}}</span>
+                        <span v-for="gruppe in event.orig.gruppe.split('/')" :key="gruppe">{{gruppe}}</span>	
+                        <span v-for="lektor in event.orig.lektor.split('/')" :key="lektor">{{lektor}}</span>
+                        <!-- add the beschreibung if the event is a reservierung -->
+                        <span v-if="event.orig.type === 'reservierung'">{{event.orig.beschreibung}}</span>
+                        
+                    
                 </div>
             </a>
         </fhc-calendar>
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index efaaff131..75fef62f1 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -48,7 +48,6 @@ export default {
 				nextDay.setDate(nextDay.getDate()+1);
 				nextDay.setMilliseconds(nextDay.getMilliseconds()-1);
 				let d = {events:[],lanes:1};
-				console.log("this are the events",this.events, "and this is the key",key)
 				if (this.events[key]) {
 					this.events[key].forEach(evt => {
 						let event = {orig:evt,lane:1,maxLane:1,start: evt.start < day ? day : evt.start, end: evt.end > nextDay ? nextDay : evt.end,shared:[],setSharedMaxRecursive(doneItems) {
@@ -78,9 +77,7 @@ export default {
 		}
 	},
 	methods: {
-		printTest:function(param){
-			console.log("HERE",param)
-		},
+		
 		changeToMonth(day) {
 			if (!this.noMonthView) {
 				this.date.set(day);

From 63f089dc27e21ecfcd540e25350940f4068aa079 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 24 Jun 2024 13:50:13 +0200
Subject: [PATCH 17/34] changes the layout of the Stundenplan Events

---
 .../controllers/api/frontend/v1/Stundenplan.php     |  4 +++-
 application/models/ressource/Stundenplan_model.php  |  6 +++---
 application/views/Cis/Stundenplan.php               |  4 +---
 public/js/apps/Cis/RoomInformation.js               |  2 +-
 public/js/apps/Cis/Stundenplan.js                   | 13 ++++++++++++-
 public/js/components/Calendar/Week/Page.js          |  2 +-
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 243f4b2c5..37b384630 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -90,7 +90,7 @@ class Stundenplan extends FHCAPI_Controller
         
         $stunden = getData($stunden);
 
-		$result = $this->StundenplanModel->groupedRoomPlanning($ort_kurzbz,$start_date,$end_date);  
+		$result = $this->StundenplanModel->groupedCalendarEvents($ort_kurzbz,$start_date,$end_date);  
         //$this->loglib->logErrorDB(print_r($result,TRUE),"this is the result of the grouped query");
 		
         if(isError($result)){
@@ -105,6 +105,8 @@ class Stundenplan extends FHCAPI_Controller
                 // gruppierung hat stattgefunden und das array muss in einem String konvertiert werden
             }
         }
+
+        // this is the old way the events were grouped, kept in case that the query doesnt work out as expected
         /* 
         $final_events = array();
         $grouped = array();
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 5e5dc779d..693825e79 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -48,10 +48,10 @@ class Stundenplan_model extends DB_Model
 	 * 
 	 * @return stdClass
 	 */
-	public function groupedRoomPlanning($ort_kurzbz,$start_date,$end_date){
+	public function groupedCalendarEvents($ort_kurzbz,$start_date,$end_date){
 
 
-		$gruppierteRaumVerplannung= $this->execReadOnlyQuery("
+		$gruppierteEvents= $this->execReadOnlyQuery("
 		SELECT 
 		
 			'reservierung' as type,
@@ -130,7 +130,7 @@ class Stundenplan_model extends DB_Model
 		ORDER BY datum, stunde
 		", [$ort_kurzbz, $start_date, $end_date, $ort_kurzbz, $start_date, $end_date]); 
 
-		return $gruppierteRaumVerplannung;
+		return $gruppierteEvents;
 	}
 
 	/**
diff --git a/application/views/Cis/Stundenplan.php b/application/views/Cis/Stundenplan.php
index cb8f8a712..2983f9ae3 100755
--- a/application/views/Cis/Stundenplan.php
+++ b/application/views/Cis/Stundenplan.php
@@ -9,9 +9,7 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 ?>
 
 <div id="content">
-	<h2>Stundenplan</h2>
-	<hr>
-	<fhc-calendar :events="events" initial-mode="week" show-weeks></fhc-calendar>
+	
 </div>
 
 <?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index b5559047e..62920cb66 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -99,7 +99,7 @@ const app = Vue.createApp({
         <fhc-calendar  v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
            
             <a class="text-decoration-none text-dark" href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'"   >    
-                <div class="d-flex flex-column align-items-center justify-content-evenly h-100" :style="{'background-color':event.orig.color}">
+                <div class="d-flex flex-column align-items-center justify-content-evenly h-100" >
                     
                         <!-- render content for stundenplan -->
                         <span >{{event.orig.topic}}</span>
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 25823b193..47d945c29 100755
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -48,7 +48,18 @@ const app = Vue.createApp({
 				});
 			});
 		});
-	}
+	},
+	template:/*html*/`
+	<h2>Stundenplan</h2>
+	<hr>
+	<fhc-calendar v-slot="{event, day}" :events="events" initial-mode="week" show-weeks>
+		<div class="d-flex flex-column align-items-center justify-content-evenly h-100">
+			<span>{{event.orig.title}}</span>
+			<span>{{event.orig.ort_kurzbz}}</span>
+			<span>{{event.orig.mitarbeiter_kurzbz}}</span>
+		</div>
+	</fhc-calendar>
+	`
 });
 app.config.unwrapInjectedRef = true;
 app.use(Phrasen);
diff --git a/public/js/components/Calendar/Week/Page.js b/public/js/components/Calendar/Week/Page.js
index 75fef62f1..0a3794295 100755
--- a/public/js/components/Calendar/Week/Page.js
+++ b/public/js/components/Calendar/Week/Page.js
@@ -108,7 +108,7 @@ export default {
 						<div v-for="hour in hours" style="min-height:100px" :key="hour" class="text-muted text-end small" :ref="'hour' + hour">{{hour}}:00</div>
 					</div>
 					<div v-for="day in eventsPerDayAndHour" :key="day" class="day border-start" :style="{'grid-template-columns': 'repeat(' + day.lanes + ', 1fr)', 'grid-template-rows': 'repeat(' + (1440 / smallestTimeFrame) + ', 1fr)'}">
-						<div class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">	
+						<div :style="{'background-color':event.orig.color}" class="mx-2 border border-dark border-2 small rounded overflow-hidden "  @click.prevent="$emit('input', event.orig)" :style="{'grid-column-start': 1+(event.lane-1)*day.lanes/event.maxLane, 'grid-column-end': 1+event.lane*day.lanes/event.maxLane, 'grid-row-start': dateToMinutesOfDay(event.start), 'grid-row-end': dateToMinutesOfDay(event.end) ,'--test': dateToMinutesOfDay(event.end)}" v-for="event in day.events" :key="event">	
 							<slot :event="event" :day="day">
 								<p>this is a placeholder which means that no template was passed to the Calendar Page slot</p>
 							</slot>

From 917065326096f9be0e9e9c5dd114cd109f14d097 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 22 Jul 2024 14:07:00 +0200
Subject: [PATCH 18/34] adds a childaction for the rooms when searching for a
 room to see the eventoverview of the room

---
 application/controllers/CisVue/Cms.php        |   4 +-
 application/models/content/Content_model.php  |   2 +-
 .../views/CisVue/Cms/RoomInformation.php      |   7 +-
 public/js/apps/Cis.js                         |   8 ++
 public/js/apps/Cis/RoomInformation.js         | 117 +----------------
 .../js/components/Cis/Mylv/RoomInformation.js | 123 ++++++++++++++++++
 public/js/components/searchbar/raum.js        |  17 +++
 7 files changed, 162 insertions(+), 116 deletions(-)
 create mode 100644 public/js/components/Cis/Mylv/RoomInformation.js

diff --git a/application/controllers/CisVue/Cms.php b/application/controllers/CisVue/Cms.php
index f8bd61a7b..17700b223 100755
--- a/application/controllers/CisVue/Cms.php
+++ b/application/controllers/CisVue/Cms.php
@@ -116,7 +116,7 @@ class Cms extends FHC_Controller
 		}
 	}
 
-	public function getRoomInformation(){
-		$this->load->view('CisVue/Cms/RoomInformation');
+	public function getRoomInformation($ort_kurzbz){
+		$this->load->view('CisVue/Cms/RoomInformation',['ort_kurzbz'=>$ort_kurzbz]);
 	}
 }
diff --git a/application/models/content/Content_model.php b/application/models/content/Content_model.php
index f42a395f9..c703ee3c1 100755
--- a/application/models/content/Content_model.php
+++ b/application/models/content/Content_model.php
@@ -170,7 +170,7 @@ class Content_model extends DB_Model
 						"content_id": 1000008,
 						"template_kurzbz": "redirect",
 						"titel": "room information (to delete)",
-						"content": "<content><url><![CDATA[' . site_url('/CisVue/Cms/getRoomInformation') . ']]></url><target><![CDATA[]]></target></content>",
+						"content": "<content><url><![CDATA[' . site_url('/CisVue/Cms/getRoomInformation/EDV_F4.26') . ']]></url><target><![CDATA[]]></target></content>",
 						"menu_open": false,
 						"aktiv": true,
 						"childs": []
diff --git a/application/views/CisVue/Cms/RoomInformation.php b/application/views/CisVue/Cms/RoomInformation.php
index c14b68024..5111a56bd 100644
--- a/application/views/CisVue/Cms/RoomInformation.php
+++ b/application/views/CisVue/Cms/RoomInformation.php
@@ -9,9 +9,12 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
 ?>
 
 <div >
-	<h2>Room Information</h2>
+	<h2>Room Information: <?php echo $ort_kurzbz ?></h2>
 	<hr>
-    <div id="content"></div>
+	<div id="content">
+	<room-information ort_kurzbz="<?php echo $ort_kurzbz ?>"></room-information>
+	</div>
+    
 </div>
 
 <?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
diff --git a/public/js/apps/Cis.js b/public/js/apps/Cis.js
index b514f3662..5294778bb 100755
--- a/public/js/apps/Cis.js
+++ b/public/js/apps/Cis.js
@@ -52,6 +52,14 @@ Vue.createApp({
                                 action: function(data) {
                                     return data.booklink;
                                 }
+                            },
+                            {
+                                label: "Raumübersicht",
+                                icon: "fas fa-bookmark",
+                                type: "link",
+                                action: function(data) {
+                                    return data.roomoverview;
+                                }
                             }
                         ]
                     },
diff --git a/public/js/apps/Cis/RoomInformation.js b/public/js/apps/Cis/RoomInformation.js
index 62920cb66..f11326c11 100644
--- a/public/js/apps/Cis/RoomInformation.js
+++ b/public/js/apps/Cis/RoomInformation.js
@@ -1,121 +1,16 @@
-import FhcCalendar from "../../components/Calendar/Calendar.js";
-import CalendarDate from "../../composables/CalendarDate.js";
-import FhcApi from "../../plugin/FhcApi.js";
 import Phrasen from "../../plugin/Phrasen.js";
+import RoomInformation from "../../components/Cis/Mylv/RoomInformation.js";
+
 const app = Vue.createApp({
+    
 	components: {
-		FhcCalendar
+        RoomInformation
 	},
 	data() {
 		return {
-			stunden: [],
-			events: null,
-            calendarWeek: new CalendarDate(new Date()),
-            events_loaded:false,
-        }
-	},
-    computed:{
-        currentDate: function(){
-            return new Date(this.calendarWeek.y, this.calendarWeek.m, this.calendarWeek.d);
-        },
-        weekFirstDay: function(){
-            return this.calendarDateToString(this.calendarWeek.cdFirstDayOfWeek);
-        },
-        weekLastDay: function(){
-            return this.calendarDateToString(this.calendarWeek.cdLastDayOfWeek);
-        },
-    },
-    methods:{
-        // returns the string YYYY-MM-DD if param is instance of CalendarDate and null otherwise
-        calendarDateToString: function(calendarDate){
-            
-            return calendarDate instanceof CalendarDate? 
-            [calendarDate.y, calendarDate.m+1, calendarDate.d].join('-'):
-            null; 
-            
-        },
-        
-    },
-	created() {
-
-        this.$fhcApi.factory.stundenplan.getStunden().then(res =>{
-            res.data.forEach(std => {
-				this.stunden[std.stunde] = std; // TODO(chris): geht besser
-			});
-
-
-           // old testing room EDV_A6.09
-            this.$fhcApi.factory.stundenplan.getRoomInfo('EDV_F4.26', this.weekFirstDay, this.weekLastDay).then(res =>{
-                let events;
-                if (res.data && res.data.forEach) {
-                    res.data.forEach((el, i) => {
-
-                        el.id = i;
-                        if(el.type === 'reservierung')
-                        {
-                            el.color = '#' + (el.farbe || 'FFFFFF');
-                        }else{
-                            el.color = '#' + (el.farbe || 'CCCCCC');
-                        }
-                        
-                        el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-                        el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
-                        el.title = el.lehrfach;
-                        if (el.lehrform)
-                            el.title += '-' + el.lehrform;
-                    });
-                    
-                    this.events = res.data;
-                }
-
-                // reservierungen are loaded with the stundenplan
-                /* this.$fhcApi.factory.stundenplan.getReservierungen('EDV_F4.26', this.weekFirstDay, this.weekLastDay).then(res => {
-                    if (res.data && res.data.forEach) {
-                        res.data.forEach((el, i) => {
-                            el.reservierung = true;
-                            el.color = '#' + (el.farbe || 'ffffff');
-                            el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-                            el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
-                            el.title = el.titel;
-                            if (el.lehrform)
-                                el.title += '-' + el.lehrform;
-                        });
-                        
-                    }
-    
-                    let reservierungs_events = res.data;
-                    this.events = [...(this.events?this.events:[]),...reservierungs_events];
-                    
-                    
-                }); */
-            });
-
-           
-        });
-
-	},
-    template: /*html*/`
-    <div>
-        <fhc-calendar  v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
-           
-            <a class="text-decoration-none text-dark" href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'"   >    
-                <div class="d-flex flex-column align-items-center justify-content-evenly h-100" >
-                    
-                        <!-- render content for stundenplan -->
-                        <span >{{event.orig.topic}}</span>
-                        <span v-for="gruppe in event.orig.gruppe.split('/')" :key="gruppe">{{gruppe}}</span>	
-                        <span v-for="lektor in event.orig.lektor.split('/')" :key="lektor">{{lektor}}</span>
-                        <!-- add the beschreibung if the event is a reservierung -->
-                        <span v-if="event.orig.type === 'reservierung'">{{event.orig.beschreibung}}</span>
-                        
-                    
-                </div>
-            </a>
-        </fhc-calendar>
-    </div>
-    `,
+		}
+	}
 });
 app.config.unwrapInjectedRef = true;
-app.use(FhcApi);
 app.use(Phrasen);
 app.mount('#content');
\ No newline at end of file
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
new file mode 100644
index 000000000..885130a5f
--- /dev/null
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -0,0 +1,123 @@
+import FhcCalendar from "../../Calendar/Calendar.js";
+import CalendarDate from "../../../composables/CalendarDate.js";
+
+
+export default{
+    props:{
+        ort_kurzbz: {
+            type: String,
+            required: true,
+        }
+    },
+	components: {
+		FhcCalendar
+	},
+	data() {
+		return {
+			stunden: [],
+			events: null,
+            calendarWeek: new CalendarDate(new Date()),
+            events_loaded:false,
+        }
+	},
+    computed:{
+        currentDate: function(){
+            return new Date(this.calendarWeek.y, this.calendarWeek.m, this.calendarWeek.d);
+        },
+        weekFirstDay: function(){
+            return this.calendarDateToString(this.calendarWeek.cdFirstDayOfWeek);
+        },
+        weekLastDay: function(){
+            return this.calendarDateToString(this.calendarWeek.cdLastDayOfWeek);
+        },
+    },
+    methods:{
+        // returns the string YYYY-MM-DD if param is instance of CalendarDate and null otherwise
+        calendarDateToString: function(calendarDate){
+            
+            return calendarDate instanceof CalendarDate? 
+            [calendarDate.y, calendarDate.m+1, calendarDate.d].join('-'):
+            null; 
+            
+        },
+        
+    },
+	created() {
+
+        this.$fhcApi.factory.stundenplan.getStunden().then(res =>{
+            res.data.forEach(std => {
+				this.stunden[std.stunde] = std; // TODO(chris): geht besser
+			});
+
+
+           // old testing room EDV_A6.09
+            this.$fhcApi.factory.stundenplan.getRoomInfo(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay).then(res =>{
+                let events;
+                if (res.data && res.data.forEach) {
+                    res.data.forEach((el, i) => {
+
+                        el.id = i;
+                        if(el.type === 'reservierung')
+                        {
+                            el.color = '#' + (el.farbe || 'FFFFFF');
+                        }else{
+                            el.color = '#' + (el.farbe || 'CCCCCC');
+                        }
+                        
+                        el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
+                        el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+                        el.title = el.lehrfach;
+                        if (el.lehrform)
+                            el.title += '-' + el.lehrform;
+                    });
+                    
+                    this.events = res.data;
+                }
+
+                // reservierungen are loaded with the stundenplan
+                /* this.$fhcApi.factory.stundenplan.getReservierungen('EDV_F4.26', this.weekFirstDay, this.weekLastDay).then(res => {
+                    if (res.data && res.data.forEach) {
+                        res.data.forEach((el, i) => {
+                            el.reservierung = true;
+                            el.color = '#' + (el.farbe || 'ffffff');
+                            el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
+                            el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+                            el.title = el.titel;
+                            if (el.lehrform)
+                                el.title += '-' + el.lehrform;
+                        });
+                        
+                    }
+    
+                    let reservierungs_events = res.data;
+                    this.events = [...(this.events?this.events:[]),...reservierungs_events];
+                    
+                    
+                }); */
+            });
+
+           
+        });
+
+	},
+    template: /*html*/`
+    <div>
+        <fhc-calendar  v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
+           
+            <a class="text-decoration-none text-dark" href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'"   >    
+                <div class="d-flex flex-column align-items-center justify-content-evenly h-100" >
+                    
+                        <!-- render content for stundenplan -->
+                        <span >{{event.orig.topic}}</span>
+                        <span v-for="gruppe in event.orig.gruppe.split('/')" :key="gruppe">{{gruppe}}</span>	
+                        <span v-for="lektor in event.orig.lektor.split('/')" :key="lektor">{{lektor}}</span>
+                        <!-- add the beschreibung if the event is a reservierung -->
+                        <span v-if="event.orig.type === 'reservierung'">{{event.orig.beschreibung}}</span>
+                        
+                    
+                </div>
+            </a>
+        </fhc-calendar>
+    </div>
+    `,
+};
\ No newline at end of file
diff --git a/public/js/components/searchbar/raum.js b/public/js/components/searchbar/raum.js
index 69e303ed4..87fcc7747 100755
--- a/public/js/components/searchbar/raum.js
+++ b/public/js/components/searchbar/raum.js
@@ -15,6 +15,19 @@ export default {
             return FHC_JS_DATA_STORAGE_OBJECT.app_root+'cms/content.php?content_id='+data.content_id;
         }
       }; */ 
+
+      this.res.roomoverview= FHC_JS_DATA_STORAGE_OBJECT.app_root +
+      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+      `/CisVue/Cms/getRoomInformation/${this.res.ort_kurzbz}`; 
+
+      if(this.res.content_id !=="N/A"){
+        this.res.infolink= FHC_JS_DATA_STORAGE_OBJECT.app_root +
+        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+        `/CisVue/Cms/content/${this.res.content_id}`;
+      }else{
+        this.res.infolink= '#';
+      }
+      
     },
     emits: [ 'actionexecuted' ],
     template: /*html*/`
@@ -37,6 +50,10 @@ export default {
                   <div class="searchbar_tablecell">Standort</div>
                   <div class="searchbar_tablecell">{{ res.standort }}</div>
                 </div>
+                <div class="searchbar_tablerow">
+                  <div class="searchbar_tablecell">data</div>
+                  <div class="searchbar_tablecell">{{ JSON.stringify(res,null,2) }}</div>
+                </div>
                 <div class="searchbar_tablerow">
                   <div class="searchbar_tablecell">Sitzplätze</div>
                   <div class="searchbar_tablecell">{{ res.sitzplaetze }}</div>

From e613ac3255a21a6c6ab63eaf9c68be4e598341ff Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 22 Jul 2024 14:33:19 +0200
Subject: [PATCH 19/34] computes the childactions for the room in the search
 result independently

---
 public/js/components/searchbar/raum.js      | 15 +----------
 public/js/components/searchbar/searchbar.js | 29 ++++++++++++++++++++-
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/public/js/components/searchbar/raum.js b/public/js/components/searchbar/raum.js
index 87fcc7747..85a7e3ce8 100755
--- a/public/js/components/searchbar/raum.js
+++ b/public/js/components/searchbar/raum.js
@@ -14,20 +14,7 @@ export default {
         action: function(data) { 
             return FHC_JS_DATA_STORAGE_OBJECT.app_root+'cms/content.php?content_id='+data.content_id;
         }
-      }; */ 
-
-      this.res.roomoverview= FHC_JS_DATA_STORAGE_OBJECT.app_root +
-      FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-      `/CisVue/Cms/getRoomInformation/${this.res.ort_kurzbz}`; 
-
-      if(this.res.content_id !=="N/A"){
-        this.res.infolink= FHC_JS_DATA_STORAGE_OBJECT.app_root +
-        FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-        `/CisVue/Cms/content/${this.res.content_id}`;
-      }else{
-        this.res.infolink= '#';
-      }
-      
+      }; */
     },
     emits: [ 'actionexecuted' ],
     template: /*html*/`
diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js
index d4b35dc80..d116ab286 100755
--- a/public/js/components/searchbar/searchbar.js
+++ b/public/js/components/searchbar/searchbar.js
@@ -47,7 +47,7 @@ export default {
                 <person v-if="res.type === 'person'" :res="res" :actions="this.searchoptions.actions.person" @actionexecuted="this.hideresult"></person>
                 <employee v-else-if="res.type === 'mitarbeiter'" :res="res" :actions="this.searchoptions.actions.employee" @actionexecuted="this.hideresult"></employee>
                 <organisationunit v-else-if="res.type === 'organisationunit'" :res="res" :actions="this.searchoptions.actions.organisationunit" @actionexecuted="this.hideresult"></organisationunit>
-                <raum v-else-if="res.type === 'raum'" :res="res" :actions="this.searchoptions.actions.raum" @actionexecuted="this.hideresult"></raum>
+                <raum v-else-if="res.type === 'raum'" :res="res" :actions="getActionsForRoom(res)" @actionexecuted="this.hideresult"></raum>
                 <div v-else="">Unbekannter Ergebnistyp: '{{ res.type }}'.</div>
               </template>
             </div>
@@ -69,6 +69,33 @@ export default {
         this.updateSearchOptions();
     },
     methods: {
+        getActionsForRoom: function(res){
+            res.roomoverview= FHC_JS_DATA_STORAGE_OBJECT.app_root +
+            FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+            `/CisVue/Cms/getRoomInformation/${res.ort_kurzbz}`; 
+
+            if(res.content_id !=="N/A"){
+                res.infolink= FHC_JS_DATA_STORAGE_OBJECT.app_root +
+                FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+                `/CisVue/Cms/content/${res.content_id}`;
+            }
+
+            let child = this.searchoptions.actions.raum.childactions.filter((child)=>{
+                if(child.label =="Rauminformation" && res.content_id =="N/A"){
+                    return false;
+                }
+                return true;
+            });
+
+            let computedActions = {
+                childactions:child,
+                defaultaction:this.searchoptions.actions.raum.defaultaction
+            }
+            
+            return computedActions;
+            
+            
+        },
         updateSearchOptions: function() {
             this.searchsettings.types = [];
             for( const idx in this.searchoptions.types ) {

From 9e1bd2b64d89625f7602d58092849b96faa9ea80 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 2 Aug 2024 10:36:34 +0200
Subject: [PATCH 20/34] adds form_validation

---
 .../api/frontend/v1/Stundenplan.php           | 139 ++++--------------
 public/js/api/fhcapifactory.js                |   2 +-
 2 files changed, 26 insertions(+), 115 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 37b384630..614f02919 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -18,11 +18,6 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-/**
- * This controller operates between (interface) the JS (GUI) and the SearchBarLib (back-end)
- * Provides data to the ajax get calls about the searchbar component
- * This controller works with JSON calls on the HTTP GET and the output is always JSON
- */
 class Stundenplan extends FHCAPI_Controller
 {
 
@@ -46,32 +41,48 @@ class Stundenplan extends FHCAPI_Controller
 			'dbLogType' => 'API', // required
 			'dbExecuteUser' => 'RESTful API'
 		));
+
+        $this->load->library('form_validation');
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
+    /**
+     * fetches Stunden layout from database
+     * @access public
+     * 
+     */
     public function Stunden()
 	{
 		$this->load->model('ressource/Stunde_model', 'StundeModel');
 
-		$result = $this->StundeModel->load();
+		$stunden = $this->StundeModel->load();
 
-		if (isError($result))
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+        $stunden = $this->getDataOrTerminateWithError($stunden);
 
-		$this->terminateWithSuccess(getData($result));
+		$this->terminateWithSuccess($stunden);
 	}
-    
-	/**
-	 * Gets a JSON body via HTTP POST and provides the parameters
-	 */
+
+    /**
+     * fetches room events from a certain date
+     * @access public
+     * 
+     */
 	public function roomInformation()
 	{
        
         $this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 		$this->load->model('ressource/Stunde_model', 'StundeModel');
-
+		
+        // form validation
+        $this->load->library('form_validation');
+        $this->form_validation->set_data($_GET);
+        $this->form_validation->set_rules('ort_kurzbz',"Ort","required");
+        $this->form_validation->set_rules('start_date',"start_date","required");
+        $this->form_validation->set_rules('end_date',"end_date","required");
+        if($this->form_validation->run() === FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array()); 
+        
         // storing the get parameter in local variables
         $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
         $start_date = $this->input->get('start_date', TRUE);
@@ -106,106 +117,6 @@ class Stundenplan extends FHCAPI_Controller
             }
         }
 
-        // this is the old way the events were grouped, kept in case that the query doesnt work out as expected
-        /* 
-        $final_events = array();
-        $grouped = array();
-        $associative_day_events = $this->filterEventsIntoAssociativeDateArray($result, $start_date, $end_date);
-        foreach($associative_day_events as $date => $day_events ){
-            
-            foreach($stunden as $stunde){
-
-                // filtering all the events at the same hour of the day
-                $stunden_events = array_filter($day_events, function($entry) use ($stunde){
-                    return $entry->stunde == $stunde->stunde;
-                });
-
-                $lehrverband_array = array();
-
-                // for loop that is just used to fill the lehrverband_array
-                foreach($stunden_events as $key=>$stunden_event){
-
-                    // lehrverband bestimmen
-                    if(strlen($stunden_event->gruppe_kurzbz)>0){
-                        $lehrverband = $stunden_event->gruppe_kurzbz;
-                    }else{
-                        $lehrverband=$stunden_event->stg_typ . $stunden_event->stg_kurzbz .'-'.$stunden_event->semester;
-                        // checks whether the verband is not null, '' or '0'
-                        if($stunden_event->verband !=null && $stunden_event->verband != '0' && $stunden_event->verband != ''){ 
-                            $lehrverband.=$stunden_event->verband;
-                            // if gruppe is not set it will concatenate nothing but it is only appended if the verband is set
-                            $lehrverband.=$stunden_event->gruppe;
-                        }
-                    }
-                    $lehrverband_array[$key] = $lehrverband;
-                }
-                
-                // compare nested loop start
-                foreach($stunden_events as $event_key => $stunden_event){
-                    
-                    // skip the loop iteration if the event was already grouped
-                    if(isset($grouped[$event_key])){
-                        continue;
-                    }
-                     
-                    // lektor bestimmen
-                    if($stunden_event->mitarbeiter_kurzbz != null){
-                        $stunden_events[$event_key]->lektor = $stunden_event->mitarbeiter_kurzbz;
-                    }
-
-                    // lehrfach bestimmen
-                    if(isset($stunden_event->lehrform)){
-                        $stunden_events[$event_key]->lehrfach .= '-'.$stunden_event->lehrform;
-                    }
-                    
-                    // GRUPIEREN DER GLEICHEN EVENTS
-                    // vergleiche das aktuelle Event mit allen anderen Events die am gleichen Tag und zur gleichen Stunde gehalten werden
-                    foreach($stunden_events as $compare_key => $stunden_event_compare){
-                        
-                        if($compare_key != $event_key){
-                            
-                            // will be used to skip the loop iteration with this index because it was already grouped
-                            $grouped[$compare_key] = TRUE;
-
-                            // can the events be grouped?
-                           if ( 
-                                // the unr's have to be equal to be grouped
-                                $stunden_event->unr==$stunden_event_compare->unr && 
-                                // and either the lektor or the ort_kurzbz have to be equal
-                                ($stunden_event->ort_kurzbz==$stunden_event_compare->ort_kurzbz 
-                                || $stunden_event->lektor==$stunden_event_compare->lektor)
-                           )
-                                {
-                                    // Bezeichnung des Events zusammenfuehren
-                                    // group the events properties if they are groupable
-
-                                    //Lektoren
-                                    if(!mb_strstr($stunden_event->lektor,$stunden_event_compare->lektor)){
-                                        $stunden_events[$event_key]->lektor = $stunden_event->lektor . ' \ ' . $stunden_event_compare->lektor;
-                                        $stunden_events[$event_key]->mitarbeiter_kurzbz = $stunden_event->mitarbeiter_kurzbz . ' \ ' . $stunden_event_compare->mitarbeiter_kurzbz;
-                                    }
-
-                                    //Ort
-                                    if(!mb_strstr($stunden_event->ort_kurzbz,$stunden_event_compare->ort_kurzbz)){
-                                        $stunden_events[$event_key]->ort_kurzbz = $stunden_event->ort_kurzbz . ' \ ' . $stunden_event_compare->ort_kurzbz;
-                                    }
-
-                                    //Lehrverband
-                                    if(!mb_strstr($lehrverband_array[$event_key],$lehrverband_array[$compare_key])){
-                                         $lehrverband_array[$event_key] .= ' / ' . $lehrverband_array[$compare_key];
-                                    }
-
-                                }
-                        }
-                    }
-
-                    // add the grouped lehrverband entry to the event
-                    $stunden_events[$event_key]->stg = $lehrverband_array[$event_key];
-                    $final_events[] = $stunden_events[$event_key];
-                }
-            }
-        } */     
-        
 		$this->terminateWithSuccess($result);
 		
 	}
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index f8e088ff9..65bde56fd 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -31,6 +31,6 @@ export default {
     filter,
     studstatus,
     profil,
-    profilUpdate,,
+    profilUpdate,
     stundenplan,
 };

From e44c1bccb3e0a85c0584995626a43c0fd5a3b6d5 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 5 Aug 2024 09:17:04 +0200
Subject: [PATCH 21/34] adds shorthands with getDataOrTerminateWithError and
 adds also form_validation

---
 .../api/frontend/v1/Stundenplan.php           | 42 ++++++-------------
 1 file changed, 13 insertions(+), 29 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 614f02919..1e6aa494d 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -88,28 +88,14 @@ class Stundenplan extends FHCAPI_Controller
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
         
-        //return early if the get parameter are not present
-        if(!$ort_kurzbz || !$start_date || !$end_date){
-            $this->terminateWithError("Missing parameters", self::ERROR_TYPE_GENERAL);
-        }
-        
 		// querying the stunden
         $stunden = $this->StundeModel->load();
 
-        if(isError($stunden))
-            $this->terminateWithError(getError($stunden), self::ERROR_TYPE_GENERAL);
-        
-        $stunden = getData($stunden);
+        $stunden = $this->getDataOrTerminateWithError($stunden);
 
 		$result = $this->StundenplanModel->groupedCalendarEvents($ort_kurzbz,$start_date,$end_date);  
-        //$this->loglib->logErrorDB(print_r($result,TRUE),"this is the result of the grouped query");
 		
-        if(isError($result)){
-            $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-        }
-
-        $result = hasData($result) ? getData($result) : [];
-        
+        $result = $this->getDataOrTerminateWithError($result);
 
         foreach($result as $entry){
             if(COUNT($entry->lektor)>1){
@@ -121,37 +107,35 @@ class Stundenplan extends FHCAPI_Controller
 		
 	}
 
+	// reservierungen is not used in the prototype for the students
     public function Reservierungen()
 	{
         $this->load->model('ressource/Reservierung_model', 'ReservierungModel');
         $this->load->model('ressource/Stunde_model', 'StundeModel');
         $this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
 
+		//form validation
+		$this->load->library('form_validation');
+		$this->form_validation->set_data($_GET);
+		$this->form_validation->set_rules('ort_kurzbz',"Ort","required");
+		$this->form_validation->set_rules('start_date', "StartDate", "required");
+		$this->form_validation->set_rules('end_date', "EndDate", "required");
+		if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
         // storing the get parameter in local variables
         $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
-        // return early if the get parameter are not present
-        if(!$ort_kurzbz || !$start_date || !$end_date){
-            $this->terminateWithError("Missing parameters", self::ERROR_TYPE_GENERAL);
-        }
-
         // querying the stunden
         $stunden = $this->StundeModel->load();
 
-        if(isError($stunden))
-            $this->terminateWithError(getError($stunden), self::ERROR_TYPE_GENERAL);
-        
-        $stunden = getData($stunden);
+        $stunden = $this->getDataOrTerminateWithError($stunden);
 
 		// querying the reservierungen
 		$result = $this->ReservierungModel->getRoomReservierungen($ort_kurzbz, $start_date, $end_date);
 
-		if (isError($result))
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-        
-        $result = hasData($result) ? getData($result) : [];
+        $result = $this->getDataOrTerminateWithError($result);
         
         // loop over the days
         $day_events = $this->filterEventsIntoAssociativeDateArray($result, $start_date, $end_date);

From 46a070605735fcf940c783b6f5b46325e902cd40 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 6 Aug 2024 14:29:24 +0200
Subject: [PATCH 22/34] updates roomEvents on change:range / groups the results
 of a studenplan query

---
 .../api/frontend/v1/Stundenplan.php           |  13 +--
 .../components/Cis/Stundenplan.php            |   8 +-
 .../models/ressource/Stundenplan_model.php    |  67 +++++++++++-
 .../js/components/Cis/Mylv/RoomInformation.js | 100 ++++++++----------
 4 files changed, 116 insertions(+), 72 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 1e6aa494d..923c7f6bb 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -87,22 +87,11 @@ class Stundenplan extends FHCAPI_Controller
         $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
-        
-		// querying the stunden
-        $stunden = $this->StundeModel->load();
 
-        $stunden = $this->getDataOrTerminateWithError($stunden);
-
-		$result = $this->StundenplanModel->groupedCalendarEvents($ort_kurzbz,$start_date,$end_date);  
+		$result = $this->StundenplanModel->stundenPlanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date));  
 		
         $result = $this->getDataOrTerminateWithError($result);
 
-        foreach($result as $entry){
-            if(COUNT($entry->lektor)>1){
-                // gruppierung hat stattgefunden und das array muss in einem String konvertiert werden
-            }
-        }
-
 		$this->terminateWithSuccess($result);
 		
 	}
diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
index 6a89458a7..31ed34dbd 100755
--- a/application/controllers/components/Cis/Stundenplan.php
+++ b/application/controllers/components/Cis/Stundenplan.php
@@ -30,12 +30,14 @@ class Stundenplan extends Auth_Controller
 	{
 		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 
-		$result = $this->StundenplanModel->loadForUid(get_uid());
+		/* $result = $this->StundenplanModel->loadForUid(get_uid());
 
 		if (isError($result))
 			return $this->outputJsonError(getError($result));
-
-		$this->outputJsonSuccess(getData($result));
+ */
+		$res = $this->StundenplanModel->stundenPlanGruppierung($this->StundenplanModel->getStudenPlanQuery(get_uid())); 
+		$res = getData($res);	
+		$this->outputJsonSuccess($res);
 	}
 
 	/**
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 693825e79..fed70ac74 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -133,6 +133,71 @@ class Stundenplan_model extends DB_Model
 		return $gruppierteEvents;
 	}
 
+	public function stundenPlanGruppierung($stundenplanViewQuery)
+	{
+		
+
+		$gruppierteEvents = $this->execReadOnlyQuery("
+		SELECT 
+			
+		'stundenplan' as type,
+		unr,datum, stunde,
+		CONCAT(lehrfach,'-',lehrform) as topic,
+		'' as beschreibung,
+		string_agg(DISTINCT gruppe, '/') as gruppe,
+		string_agg(DISTINCT lektor, '/') as lektor,  
+		ort_kurzbz, studiengang_kz, titel,'' as beschreibung,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit 
+
+		FROM
+		(
+			SELECT
+ 			unr,datum, stunde,
+			CASE
+				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
+				ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) 
+			END as gruppe,
+			CASE
+				WHEN sp.mitarbeiter_kurzbz IS NOT NULL THEN sp.mitarbeiter_kurzbz
+				ELSE lektor
+			END as lektor,
+			ort_kurzbz, studiengang_kz, titel,'' as beschreibung,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit 
+
+			FROM (".$stundenplanViewQuery.") sp
+
+		) as sp
+
+		GROUP BY 
+
+			ort_kurzbz,unr, datum, stunde, lehreinheit_id, lehrfach_id,studiengang_kz,titel,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit
+
+		ORDER BY datum, stunde
+		");
+
+		return $gruppierteEvents;
+	}
+
+	public function getStudenPlanQuery($uid){
+			return 
+			"select sp.*
+			from lehre.vw_stundenplan sp
+			left join public.tbl_benutzergruppe bg ON sp.gruppe_kurzbz=bg.gruppe_kurzbz AND bg.uid =".$this->escape($uid)." 
+			left join public.tbl_studiensemester ss1 ON bg.studiensemester_kurzbz=ss1.studiensemester_kurzbz AND ss1.start <=sp.datum AND ss1.ende>= sp.datum
+			left join public.tbl_studentlehrverband slv ON sp.studiengang_kz=slv.studiengang_kz and slv.student_uid=".$this->escape($uid)." and (slv.semester=sp.semester OR sp.semester IS NULL) AND (slv.verband=sp.verband OR sp.verband IS NULL OR sp.verband='' OR sp.verband='0') AND
+			(slv.gruppe=sp.gruppe OR sp.gruppe IS NULL OR sp.gruppe='' OR sp.gruppe='0') AND sp.gruppe_kurzbz IS NULL
+			left join public.tbl_studiensemester ss2 ON slv.studiensemester_kurzbz=ss2.studiensemester_kurzbz AND ss2.start<=sp.datum and ss2.ende >= sp.datum
+			WHERE ss1.studiensemester_kurzbz IS NOT NULL or ss2.studiensemester_kurzbz IS NOT NULL";
+	}
+
+	public function getRoomQuery($ort_kurzbz, $start_date, $end_date)
+	{
+		return
+			"select sp.*
+			FROM lehre.vw_stundenplan sp
+			WHERE ort_kurzbz = ".$this->escape($ort_kurzbz)." 
+			AND datum >= ".$this->escape($start_date)." 
+			AND datum <= ".$this->escape($end_date);
+	}
+
 	/**
 	 * @param string $uid
 	 * 
@@ -149,7 +214,7 @@ class Stundenplan_model extends DB_Model
 		$this->db->or_where('ss2.studiensemester_kurzbz IS NOT NULL', null, false);
 		
 		$query = $this->db->get_compiled_select('lehre.vw_stundenplan sp');
-		
+
 		return $this->execQuery($query, [$uid, $uid]);
 	}
 
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 885130a5f..c905dabd8 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -32,6 +32,13 @@ export default{
         },
     },
     methods:{
+		updateRange: function(data){
+			this.calendarWeek = new CalendarDate(data.start);
+			Vue.nextTick(() => {
+				this.loadRoomEvents();
+			});
+		},
+
         // returns the string YYYY-MM-DD if param is instance of CalendarDate and null otherwise
         calendarDateToString: function(calendarDate){
             
@@ -40,69 +47,50 @@ export default{
             null; 
             
         },
+
+		loadStunden: async function(){
+			await this.$fhcApi.factory.stundenplan.getStunden().then(res => {
+				res.data.forEach(std => {
+					this.stunden[std.stunde] = std; // TODO(chris): geht besser
+				});
+			});
+		},
+
+		loadRoomEvents: function(){
+			this.$fhcApi.factory.stundenplan.getRoomInfo(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay).then(res => {
+				let events;
+				if (res.data && res.data.forEach) {
+					res.data.forEach((el, i) => {
+
+						el.id = i;
+						if (el.type === 'reservierung') {
+							el.color = '#' + (el.farbe || 'FFFFFF');
+						} else {
+							el.color = '#' + (el.farbe || 'CCCCCC');
+						}
+
+						el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
+						el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+						el.title = el.lehrfach;
+						if (el.lehrform)
+							el.title += '-' + el.lehrform;
+					});
+
+					this.events = res.data;
+				}
+			});
+		}
         
     },
-	created() {
+	async mounted() {
 
-        this.$fhcApi.factory.stundenplan.getStunden().then(res =>{
-            res.data.forEach(std => {
-				this.stunden[std.stunde] = std; // TODO(chris): geht besser
-			});
-
-
-           // old testing room EDV_A6.09
-            this.$fhcApi.factory.stundenplan.getRoomInfo(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay).then(res =>{
-                let events;
-                if (res.data && res.data.forEach) {
-                    res.data.forEach((el, i) => {
-
-                        el.id = i;
-                        if(el.type === 'reservierung')
-                        {
-                            el.color = '#' + (el.farbe || 'FFFFFF');
-                        }else{
-                            el.color = '#' + (el.farbe || 'CCCCCC');
-                        }
-                        
-                        el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-                        el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
-                        el.title = el.lehrfach;
-                        if (el.lehrform)
-                            el.title += '-' + el.lehrform;
-                    });
-                    
-                    this.events = res.data;
-                }
-
-                // reservierungen are loaded with the stundenplan
-                /* this.$fhcApi.factory.stundenplan.getReservierungen('EDV_F4.26', this.weekFirstDay, this.weekLastDay).then(res => {
-                    if (res.data && res.data.forEach) {
-                        res.data.forEach((el, i) => {
-                            el.reservierung = true;
-                            el.color = '#' + (el.farbe || 'ffffff');
-                            el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-                            el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
-                            el.title = el.titel;
-                            if (el.lehrform)
-                                el.title += '-' + el.lehrform;
-                        });
-                        
-                    }
-    
-                    let reservierungs_events = res.data;
-                    this.events = [...(this.events?this.events:[]),...reservierungs_events];
-                    
-                    
-                }); */
-            });
-
-           
-        });
+        this.loadStunden();
+		this.loadRoomEvents();
 
 	},
     template: /*html*/`
     <div>
-        <fhc-calendar  v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
+		<fhc-calendar @change:range="updateRange" v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
            
             <a class="text-decoration-none text-dark" href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'"   >    
                 <div class="d-flex flex-column align-items-center justify-content-evenly h-100" >

From 8bc8c67f8d16be5253f245c1e39f26ba14cb3c5b Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 13 Aug 2024 15:10:23 +0200
Subject: [PATCH 23/34] better comments

---
 .../models/ressource/Stundenplan_model.php    | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index fed70ac74..5936106f2 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -133,7 +133,14 @@ class Stundenplan_model extends DB_Model
 		return $gruppierteEvents;
 	}
 
-	public function stundenPlanGruppierung($stundenplanViewQuery)
+
+	/**
+	 * function that takes a query that fetches lehre.vw_stundenplan rows and groups them so that they can be displayed in a calendar
+	 * @param string $stundenplanViewQuery the subquery used to group the result
+	 * 
+	 * @return stdClass
+	 */
+	public function stundenplanGruppierung($stundenplanViewQuery)
 	{
 		
 
@@ -176,6 +183,12 @@ class Stundenplan_model extends DB_Model
 		return $gruppierteEvents;
 	}
 
+	/**
+	 * NO STANDALONE FUNCTION - Generates a SQL query string to fetch 'stundenplan' events for a specific student within the current semester.
+	 * @param string $uid the user id that is used to fetch the stundenplan rows from the lehre.vw_studenplan table
+	 * 
+	 * @return string
+	 */
 	public function getStudenPlanQuery($uid){
 			return 
 			"select sp.*
@@ -188,6 +201,14 @@ class Stundenplan_model extends DB_Model
 			WHERE ss1.studiensemester_kurzbz IS NOT NULL or ss2.studiensemester_kurzbz IS NOT NULL";
 	}
 
+	/**
+	 * NO STANDALONE FUNCTION - Generates a SQL query string to fetch 'stundenplan' events for a specific room within a date range.
+	 * @param string $ort_kurzbz the ort from which we want to query the stundenplan events 
+	 * @param string $start_date (inclusive) the minimum date that an event should have to be fetched
+	 * @param string $end_date (inclusive) the maximum date that an event should not extend to be fetched
+	 * 
+	 * @return string
+	 */
 	public function getRoomQuery($ort_kurzbz, $start_date, $end_date)
 	{
 		return

From f19c1b4eafb8e975bde42cd7f278226c113c3bc8 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 2 Sep 2024 14:47:40 +0200
Subject: [PATCH 24/34] adds the lector and the gruppe as objects to the
 endpoint result instead of just strings

---
 .../components/Cis/Stundenplan.php            | 44 ++++++++++++++++++-
 .../models/ressource/Stundenplan_model.php    | 26 ++++++-----
 public/js/apps/Cis/Stundenplan.js             |  3 +-
 public/js/components/Calendar/Calendar.js     |  1 -
 4 files changed, 60 insertions(+), 14 deletions(-)

diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
index 31ed34dbd..8755212af 100755
--- a/application/controllers/components/Cis/Stundenplan.php
+++ b/application/controllers/components/Cis/Stundenplan.php
@@ -35,8 +35,48 @@ class Stundenplan extends Auth_Controller
 		if (isError($result))
 			return $this->outputJsonError(getError($result));
  */
-		$res = $this->StundenplanModel->stundenPlanGruppierung($this->StundenplanModel->getStudenPlanQuery(get_uid())); 
-		$res = getData($res);	
+
+
+		$res = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStudenPlanQuery(get_uid())); 
+		
+		$res = getData($res);
+
+		// get the benutzer object for the lektor of the lv	
+		$this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
+		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+		foreach($res as $item){
+			$lektor_obj_array = array();
+			$gruppe_obj_array = array();
+			foreach($item->lektor as $lv_lektor){
+				$lektor_obj = $this->MitarbeiterModel->loadWhere(["kurzbz"=>$lv_lektor]);
+				if (isError($lektor_obj)) {
+					$this->outputJsonError(getError($lektor_obj));
+				}
+				$lektor_obj = getData($lektor_obj);
+				$lektor_obj_array[] = $lektor_obj;
+			}
+			foreach ($item->gruppe as $lv_gruppe) {
+				$lv_gruppe = str_replace("(","",$lv_gruppe);
+				$lv_gruppe = str_replace(")", "", $lv_gruppe);
+				$lv_gruppe_array = explode(",",$lv_gruppe);
+				$gruppe = str_replace("\"","",$lv_gruppe_array[0]);
+				$verband = $lv_gruppe_array[1];
+				$semester = $lv_gruppe_array[2];
+				$studiengang_kz = $lv_gruppe_array[3];
+				$lehrverband_obj = $this->LehrverbandModel->loadWhere(["gruppe" => $gruppe, "verband" => $verband, "semester" => $semester, "studiengang_kz" => $studiengang_kz]);
+				if (isError($lehrverband_obj)) {
+					$this->outputJsonError(getError($lehrverband_obj));
+				}
+				$lehrverband_obj = getData($lehrverband_obj);
+				$gruppe_obj_array[] = $lehrverband_obj;
+			}
+			//replace the array of lektor strings with the objects of lektor information
+			$item->lektor = $lektor_obj_array;
+			//replace the array of gruppen string with the lehrverband object information
+			$item->gruppe = $gruppe_obj_array;
+			
+		}
+		
 		$this->outputJsonSuccess($res);
 	}
 
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 5936106f2..11299fe3c 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -142,8 +142,11 @@ class Stundenplan_model extends DB_Model
 	 */
 	public function stundenplanGruppierung($stundenplanViewQuery)
 	{
-		
 
+		/* CASE
+				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
+				ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) 
+			END as gruppe, */
 		$gruppierteEvents = $this->execReadOnlyQuery("
 		SELECT 
 			
@@ -151,23 +154,26 @@ class Stundenplan_model extends DB_Model
 		unr,datum, stunde,
 		CONCAT(lehrfach,'-',lehrform) as topic,
 		'' as beschreibung,
-		string_agg(DISTINCT gruppe, '/') as gruppe,
-		string_agg(DISTINCT lektor, '/') as lektor,  
-		ort_kurzbz, studiengang_kz, titel,'' as beschreibung,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit 
+		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz)) as gruppe,
+		array_agg(DISTINCT gruppe_bezeichnung) as gruppe_bezeichnung,
+		array_agg(DISTINCT lektor) as lektor,  
+		
+		ort_kurzbz, studiengang_kz, titel, lehrform, lehrfach, semester, verband
 
 		FROM
 		(
 			SELECT
  			unr,datum, stunde,
-			CASE
-				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
-				ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) 
-			END as gruppe,
+			
 			CASE
 				WHEN sp.mitarbeiter_kurzbz IS NOT NULL THEN sp.mitarbeiter_kurzbz
 				ELSE lektor
 			END as lektor,
-			ort_kurzbz, studiengang_kz, titel,'' as beschreibung,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit 
+			CASE
+				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
+				ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) 
+			END as gruppe_bezeichnung,
+			ort_kurzbz, studiengang_kz, titel,'' as beschreibung,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit,gruppe, verband, semester
 
 			FROM (".$stundenplanViewQuery.") sp
 
@@ -175,7 +181,7 @@ class Stundenplan_model extends DB_Model
 
 		GROUP BY 
 
-			ort_kurzbz,unr, datum, stunde, lehreinheit_id, lehrfach_id,studiengang_kz,titel,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit
+			unr, datum, stunde, lehrfach, lehrform, ort_kurzbz, titel, studiengang_kz, lehrform, lehrfach, semester, verband
 
 		ORDER BY datum, stunde
 		");
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 47d945c29..70d3f6361 100755
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -54,9 +54,10 @@ const app = Vue.createApp({
 	<hr>
 	<fhc-calendar v-slot="{event, day}" :events="events" initial-mode="week" show-weeks>
 		<div class="d-flex flex-column align-items-center justify-content-evenly h-100">
+			<!--<span>{{JSON.stringify(event.orig,null,2)}}</span>-->
 			<span>{{event.orig.title}}</span>
 			<span>{{event.orig.ort_kurzbz}}</span>
-			<span>{{event.orig.mitarbeiter_kurzbz}}</span>
+			<span>{{event.orig.lektor}}</span>
 		</div>
 	</fhc-calendar>
 	`
diff --git a/public/js/components/Calendar/Calendar.js b/public/js/components/Calendar/Calendar.js
index 4fb4c821e..00f450d15 100755
--- a/public/js/components/Calendar/Calendar.js
+++ b/public/js/components/Calendar/Calendar.js
@@ -113,7 +113,6 @@ export default {
 				this.$refs.calendarModal.show();
 			})
 			
-			console.log(day,"this is the day")
 			this.$emit(day[0], day[1]);
 		}
 	},

From 87f82b7f5dd97063df4fd874d3039cf607bb80a9 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 3 Sep 2024 12:07:13 +0200
Subject: [PATCH 25/34] also adds the stundenplan information as object in the
 response of the endpoint

---
 .../components/Cis/Stundenplan.php            | 24 +++++++++++--------
 .../models/ressource/Stundenplan_model.php    | 19 +++++----------
 public/js/apps/Cis/Stundenplan.js             |  3 +--
 .../js/components/Calendar/CalendarModal.js   |  5 ++--
 4 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
index 8755212af..b33a0ddee 100755
--- a/application/controllers/components/Cis/Stundenplan.php
+++ b/application/controllers/components/Cis/Stundenplan.php
@@ -47,32 +47,36 @@ class Stundenplan extends Auth_Controller
 		foreach($res as $item){
 			$lektor_obj_array = array();
 			$gruppe_obj_array = array();
+			// load lektor object
 			foreach($item->lektor as $lv_lektor){
+				$this->MitarbeiterModel->addLimit(1);
 				$lektor_obj = $this->MitarbeiterModel->loadWhere(["kurzbz"=>$lv_lektor]);
 				if (isError($lektor_obj)) {
 					$this->outputJsonError(getError($lektor_obj));
 				}
-				$lektor_obj = getData($lektor_obj);
+				$lektor_obj = current(getData($lektor_obj));
 				$lektor_obj_array[] = $lektor_obj;
 			}
+			// load gruppe object
 			foreach ($item->gruppe as $lv_gruppe) {
-				$lv_gruppe = str_replace("(","",$lv_gruppe);
-				$lv_gruppe = str_replace(")", "", $lv_gruppe);
+				$lv_gruppe = strtr($lv_gruppe,['('=>'',')'=>'','"'=>'']); 
 				$lv_gruppe_array = explode(",",$lv_gruppe);
-				$gruppe = str_replace("\"","",$lv_gruppe_array[0]);
-				$verband = $lv_gruppe_array[1];
-				$semester = $lv_gruppe_array[2];
-				$studiengang_kz = $lv_gruppe_array[3];
+				list($gruppe,$verband, $semester,$studiengang_kz) = $lv_gruppe_array;
+				$this->LehrverbandModel->addLimit(1);
 				$lehrverband_obj = $this->LehrverbandModel->loadWhere(["gruppe" => $gruppe, "verband" => $verband, "semester" => $semester, "studiengang_kz" => $studiengang_kz]);
 				if (isError($lehrverband_obj)) {
 					$this->outputJsonError(getError($lehrverband_obj));
 				}
-				$lehrverband_obj = getData($lehrverband_obj);
+				$lehrverband_obj = current(getData($lehrverband_obj));
 				$gruppe_obj_array[] = $lehrverband_obj;
 			}
-			//replace the array of lektor strings with the objects of lektor information
+			// studiengangs object
+			$this->load->model('organisation/Studiengang_model','StudiengangModel');
+			$this->StudiengangModel->addLimit(1);
+			$studiengang_object = $this->StudiengangModel->load($item->studiengang_kz);
+			$studiengang_object = current(getData($studiengang_object));
+			$item->studiengang = $studiengang_object;
 			$item->lektor = $lektor_obj_array;
-			//replace the array of gruppen string with the lehrverband object information
 			$item->gruppe = $gruppe_obj_array;
 			
 		}
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 11299fe3c..9f699c6cb 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -142,23 +142,16 @@ class Stundenplan_model extends DB_Model
 	 */
 	public function stundenplanGruppierung($stundenplanViewQuery)
 	{
-
-		/* CASE
-				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
-				ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) 
-			END as gruppe, */
 		$gruppierteEvents = $this->execReadOnlyQuery("
 		SELECT 
 			
-		'stundenplan' as type,
 		unr,datum, stunde,
 		CONCAT(lehrfach,'-',lehrform) as topic,
-		'' as beschreibung,
+		array_agg(DISTINCT gruppen_kurzbz) as gruppen_kurzbz,
 		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz)) as gruppe,
-		array_agg(DISTINCT gruppe_bezeichnung) as gruppe_bezeichnung,
-		array_agg(DISTINCT lektor) as lektor,  
+		array_agg(DISTINCT lektor) as lektor,
 		
-		ort_kurzbz, studiengang_kz, titel, lehrform, lehrfach, semester, verband
+		ort_kurzbz, studiengang_kz, titel, lehrfach, lehrform, lehrfach_bez
 
 		FROM
 		(
@@ -172,8 +165,8 @@ class Stundenplan_model extends DB_Model
 			CASE
 				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
 				ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) 
-			END as gruppe_bezeichnung,
-			ort_kurzbz, studiengang_kz, titel,'' as beschreibung,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit,gruppe, verband, semester
+			END as gruppen_kurzbz,
+			ort_kurzbz, studiengang_kz, titel,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit,gruppe, verband, semester,stg_kurzbz
 
 			FROM (".$stundenplanViewQuery.") sp
 
@@ -181,7 +174,7 @@ class Stundenplan_model extends DB_Model
 
 		GROUP BY 
 
-			unr, datum, stunde, lehrfach, lehrform, ort_kurzbz, titel, studiengang_kz, lehrform, lehrfach, semester, verband
+			unr, datum, stunde, ort_kurzbz, titel, studiengang_kz, lehrform, lehrfach, lehrfach_bez
 
 		ORDER BY datum, stunde
 		");
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 70d3f6361..773495c27 100755
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -54,10 +54,9 @@ const app = Vue.createApp({
 	<hr>
 	<fhc-calendar v-slot="{event, day}" :events="events" initial-mode="week" show-weeks>
 		<div class="d-flex flex-column align-items-center justify-content-evenly h-100">
-			<!--<span>{{JSON.stringify(event.orig,null,2)}}</span>-->
 			<span>{{event.orig.title}}</span>
+			<span v-for="lektor in event.orig.lektor">{{lektor.kurzbz}}</span>
 			<span>{{event.orig.ort_kurzbz}}</span>
-			<span>{{event.orig.lektor}}</span>
 		</div>
 	</fhc-calendar>
 	`
diff --git a/public/js/components/Calendar/CalendarModal.js b/public/js/components/Calendar/CalendarModal.js
index 7ca6e7930..40fb3a7b3 100644
--- a/public/js/components/Calendar/CalendarModal.js
+++ b/public/js/components/Calendar/CalendarModal.js
@@ -55,7 +55,8 @@ export default {
   template: /*html*/ `
   <bs-modal ref="modalContainer" v-bind="$props" body-class="" dialog-class="modal-lg" class="bootstrap-alert" backdrop="false" >
     <template v-slot:title>
-      {{data.title + ' - ' + data.lehrfach_bez + ' [' + data.ort_kurzbz+']' }}  
+    	<template v-if="data.titel">{{ data.titel + ' - ' + data.lehrfach_bez + ' [' + data.ort_kurzbz+']'}}</template>
+		<template v-else>{{ data.lehrfach_bez + ' [' + data.ort_kurzbz+']'}}</template>
     </template>
     <template v-slot:default>
         <div class="row">
@@ -72,7 +73,7 @@ export default {
         </div>
         <div class="row">
         <div class="offset-3 col-4"><span>Lektor:</span></div>
-        <div class=" col"><span>{{data.lektor}}</span></div>
+        <div class=" col"><span>{{data.lektor.map(lektor=>lektor.kurzbz).join("/")}}</span></div>
         </div>
         <div class="row">
         <div class="offset-3 col-4"><span>Zeitraum:</span></div>

From e33162d20e6268de90a0503650005b1b490d73a1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 4 Sep 2024 14:59:56 +0200
Subject: [PATCH 26/34] changes the structure of the JSON data from the
 stundenplan

---
 .../api/frontend/v1/Stundenplan.php           | 28 +++++--
 .../components/Cis/Stundenplan.php            | 47 +-----------
 .../models/ressource/Reservierung_model.php   | 50 ++++++++++---
 .../models/ressource/Stundenplan_model.php    | 75 ++++++++++++++++---
 include/lehrstunde.class.php                  |  2 +-
 include/wochenplan.class.php                  |  2 +-
 public/js/api/fhcapifactory.js                |  2 +-
 .../js/api/{studenplan.js => stundenplan.js}  |  2 +-
 .../js/components/Cis/Mylv/RoomInformation.js | 60 +++++++++++----
 9 files changed, 176 insertions(+), 92 deletions(-)
 rename public/js/api/{studenplan.js => stundenplan.js} (89%)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 923c7f6bb..019a8ab4a 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -28,9 +28,10 @@ class Stundenplan extends FHCAPI_Controller
 	{
 	
 		parent::__construct([
-			'roomInformation' => self::PERM_LOGGED,
+			'getRoomplan' => self::PERM_LOGGED,
             'Stunden' => self::PERM_LOGGED,
-            'Reservierungen' => self::PERM_LOGGED
+            'Reservierungen' => self::PERM_LOGGED,
+			'getStundenplan' => self::PERM_LOGGED,
 		]);
 
         $this->load->library('LogLib');
@@ -69,7 +70,7 @@ class Stundenplan extends FHCAPI_Controller
      * @access public
      * 
      */
-	public function roomInformation()
+	public function getRoomplan()
 	{
        
         $this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
@@ -88,7 +89,7 @@ class Stundenplan extends FHCAPI_Controller
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
-		$result = $this->StundenplanModel->stundenPlanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date));  
+		$result = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date));  
 		
         $result = $this->getDataOrTerminateWithError($result);
 
@@ -96,6 +97,22 @@ class Stundenplan extends FHCAPI_Controller
 		
 	}
 
+	public function getStundenplan(){
+		
+		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+
+		/* $result = $this->StundenplanModel->loadForUid(get_uid());
+
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
+ 		*/
+		$res = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(get_uid())); 
+		
+		$res = getData($res);
+		
+		$this->outputJsonSuccess($res);
+	}
+
 	// reservierungen is not used in the prototype for the students
     public function Reservierungen()
 	{
@@ -125,7 +142,7 @@ class Stundenplan extends FHCAPI_Controller
 		$result = $this->ReservierungModel->getRoomReservierungen($ort_kurzbz, $start_date, $end_date);
 
         $result = $this->getDataOrTerminateWithError($result);
-        
+        $this->terminateWithSuccess($result);
         // loop over the days
         $day_events = $this->filterEventsIntoAssociativeDateArray($result, $start_date, $end_date);
         $final_reservierungen = array();
@@ -173,7 +190,6 @@ class Stundenplan extends FHCAPI_Controller
                         $grouped_uids[]= $entry->uid;
                     }
 
-                    // grouping the 
                     
                 }
 
diff --git a/application/controllers/components/Cis/Stundenplan.php b/application/controllers/components/Cis/Stundenplan.php
index b33a0ddee..a88d061cb 100755
--- a/application/controllers/components/Cis/Stundenplan.php
+++ b/application/controllers/components/Cis/Stundenplan.php
@@ -17,7 +17,6 @@ class Stundenplan extends Auth_Controller
 			'index' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
 			'Reservierungen' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
 			'Stunden' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions?
-			'RoomInformation'=> ['student/anrechnung_beantragen:r','user:r'],
 		]);
 	}
 
@@ -34,52 +33,10 @@ class Stundenplan extends Auth_Controller
 
 		if (isError($result))
 			return $this->outputJsonError(getError($result));
- */
-
-
-		$res = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStudenPlanQuery(get_uid())); 
+ 		*/
+		$res = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(get_uid())); 
 		
 		$res = getData($res);
-
-		// get the benutzer object for the lektor of the lv	
-		$this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
-		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
-		foreach($res as $item){
-			$lektor_obj_array = array();
-			$gruppe_obj_array = array();
-			// load lektor object
-			foreach($item->lektor as $lv_lektor){
-				$this->MitarbeiterModel->addLimit(1);
-				$lektor_obj = $this->MitarbeiterModel->loadWhere(["kurzbz"=>$lv_lektor]);
-				if (isError($lektor_obj)) {
-					$this->outputJsonError(getError($lektor_obj));
-				}
-				$lektor_obj = current(getData($lektor_obj));
-				$lektor_obj_array[] = $lektor_obj;
-			}
-			// load gruppe object
-			foreach ($item->gruppe as $lv_gruppe) {
-				$lv_gruppe = strtr($lv_gruppe,['('=>'',')'=>'','"'=>'']); 
-				$lv_gruppe_array = explode(",",$lv_gruppe);
-				list($gruppe,$verband, $semester,$studiengang_kz) = $lv_gruppe_array;
-				$this->LehrverbandModel->addLimit(1);
-				$lehrverband_obj = $this->LehrverbandModel->loadWhere(["gruppe" => $gruppe, "verband" => $verband, "semester" => $semester, "studiengang_kz" => $studiengang_kz]);
-				if (isError($lehrverband_obj)) {
-					$this->outputJsonError(getError($lehrverband_obj));
-				}
-				$lehrverband_obj = current(getData($lehrverband_obj));
-				$gruppe_obj_array[] = $lehrverband_obj;
-			}
-			// studiengangs object
-			$this->load->model('organisation/Studiengang_model','StudiengangModel');
-			$this->StudiengangModel->addLimit(1);
-			$studiengang_object = $this->StudiengangModel->load($item->studiengang_kz);
-			$studiengang_object = current(getData($studiengang_object));
-			$item->studiengang = $studiengang_object;
-			$item->lektor = $lektor_obj_array;
-			$item->gruppe = $gruppe_obj_array;
-			
-		}
 		
 		$this->outputJsonSuccess($res);
 	}
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index e149cf0d7..c06fce206 100755
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -22,20 +22,46 @@ class Reservierung_model extends DB_Model
 	{
 
 		$raum_reservierungen= $this->execReadOnlyQuery("
-		SELECT res.*, mit.kurzbz as person_kurzbz , 
-		CASE
-			WHEN res.verband IS NOT NULL OR res.semester IS NOT NULL THEN
-				CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',res.verband,res.semester) 
-			ELSE
-				CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz)) 
-		END AS stg
-		FROM lehre.vw_reservierung res
-		JOIN public.tbl_mitarbeiter mit ON mit.mitarbeiter_uid=res.uid
-		JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
-		WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ? 
+		SELECT ort_kurzbz, studiengang_kz, array_agg(uid) as lektor, stunde, datum, titel, beschreibung, gruppe, gruppe_kurzbz, stg_kurzbz, stg 
+		FROM 
+		(
+			SELECT res.* , 
+			CASE
+				WHEN res.verband IS NOT NULL OR res.semester IS NOT NULL THEN
+					CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',res.verband,res.semester) 
+				ELSE
+					CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz)) 
+			END AS stg
+			FROM lehre.vw_reservierung res
+			JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
+			WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ?
+		) AS reservierungen
+		GROUP BY ort_kurzbz, studiengang_kz, stunde, datum, titel, beschreibung, gruppe, stg, gruppe_kurzbz, stg_kurzbz
 		", [$ort_kurzbz, $start_date, $end_date]);
 
-		return $raum_reservierungen;
+		if(isError($raum_reservierungen)){
+			show_error(getError($raum_reservierungen));
+		}
+
+		$raum_reservierungen = getData($raum_reservierungen) ?? [];
+		
+		$this->load->model("ressrouce/Mitarbeiter_model","MitarbeiterModel");
+		foreach($raum_reservierungen as $reservierung){
+			$lektoren_array = array();
+			foreach($reservierung->lektor as $lektor){
+				$this->MitarbeiterModel->addLimit(1);
+				$lektor_obj= $this->MitarbeiterModel->load($lektor);
+				if(isError($lektor_obj)){
+					show_error(getError($lektor_obj));
+				}
+				$lektor_obj = current(getData($lektor_obj));
+				$lektoren_array[] = $lektor_obj;
+			}
+
+			$reservierung->lektor = $lektoren_array;
+			
+		}
+		return success($raum_reservierungen);
 	}
 
 	/**
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 9f699c6cb..6b1ed4ef0 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -145,18 +145,17 @@ class Stundenplan_model extends DB_Model
 		$gruppierteEvents = $this->execReadOnlyQuery("
 		SELECT 
 			
-		unr,datum, stunde,
+		unr,datum, sp.stunde,
 		CONCAT(lehrfach,'-',lehrform) as topic,
-		array_agg(DISTINCT gruppen_kurzbz) as gruppen_kurzbz,
-		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz)) as gruppe,
+		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
 		array_agg(DISTINCT lektor) as lektor,
 		
-		ort_kurzbz, studiengang_kz, titel, lehrfach, lehrform, lehrfach_bez
+		ort_kurzbz, titel, lehrfach, lehrform, lehrfach_bez, beginn, ende
 
 		FROM
 		(
 			SELECT
- 			unr,datum, stunde,
+ 			unr,datum, sp.stunde,beginn, ende,
 			
 			CASE
 				WHEN sp.mitarbeiter_kurzbz IS NOT NULL THEN sp.mitarbeiter_kurzbz
@@ -165,30 +164,84 @@ class Stundenplan_model extends DB_Model
 			CASE
 				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
 				ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) 
-			END as gruppen_kurzbz,
+			END as gruppen_kuerzel,
 			ort_kurzbz, studiengang_kz, titel,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit,gruppe, verband, semester,stg_kurzbz
 
 			FROM (".$stundenplanViewQuery.") sp
+			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
 
 		) as sp
 
 		GROUP BY 
 
-			unr, datum, stunde, ort_kurzbz, titel, studiengang_kz, lehrform, lehrfach, lehrfach_bez
+			unr, datum, sp.stunde, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, beginn, ende
 
-		ORDER BY datum, stunde
+		ORDER BY datum, sp.stunde
 		");
 
-		return $gruppierteEvents;
+		if(isError($gruppierteEvents)){
+			$this->output(getError($gruppierteEvents));
+		}
+		
+		$gruppierteEvents = getData($gruppierteEvents) ?? [];
+
+		// get the benutzer object for the lektor of the lv	
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+		
+		foreach ($gruppierteEvents as $item) {
+			$lektor_obj_array = array();
+			$gruppe_obj_array = array();
+			
+			// load lektor object
+			foreach ($item->lektor as $lv_lektor) {
+				$this->MitarbeiterModel->addLimit(1);
+				$lektor_object = $this->execReadOnlyQuery("
+				SELECT mitarbeiter_uid, vorname, nachname, kurzbz 
+				FROM public.tbl_mitarbeiter 
+				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
+				JOIN public.tbl_person person ON person.person_id = benutzer.person_id 
+				WHERE kurzbz = ?",[$lv_lektor]);
+				if (isError($lektor_object)) {
+					$this->show_error(getError($lektor_object));
+				}
+				$lektor_object = current(getData($lektor_object));
+				// only provide needed information of the mitarbeiter object 
+				$lektor_obj_array[] = $lektor_object;
+			}
+
+			// load gruppe object
+			foreach ($item->gruppe as $lv_gruppe) {
+				$lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
+				$lv_gruppe_array = explode(",", $lv_gruppe);
+				list($gruppe, $verband, $semester, $studiengang_kz, $gruppen_kuerzel) = $lv_gruppe_array;
+				
+				$lv_gruppe_object = new stdClass();
+				$lv_gruppe_object->gruppe = $gruppe;
+				$lv_gruppe_object->verband = $verband;
+				$lv_gruppe_object->semester = $semester;
+				$lv_gruppe_object->studiengang_kz = $studiengang_kz;
+				$lv_gruppe_object->kuerzel = $gruppen_kuerzel;
+				
+				$gruppe_obj_array[] = $lv_gruppe_object;
+			}
+
+			$item->lektor = $lektor_obj_array;
+			$item->gruppe = $gruppe_obj_array;
+		}
+
+		return success($gruppierteEvents);
 	}
 
 	/**
 	 * NO STANDALONE FUNCTION - Generates a SQL query string to fetch 'stundenplan' events for a specific student within the current semester.
-	 * @param string $uid the user id that is used to fetch the stundenplan rows from the lehre.vw_studenplan table
+	 * @param string $uid the user id that is used to fetch the stundenplan rows from the lehre.vw_stundenplan table
 	 * 
 	 * @return string
 	 */
-	public function getStudenPlanQuery($uid){
+	public function getStundenPlanQuery($uid){
 			return 
 			"select sp.*
 			from lehre.vw_stundenplan sp
diff --git a/include/lehrstunde.class.php b/include/lehrstunde.class.php
index a0f52d799..dff4faba2 100755
--- a/include/lehrstunde.class.php
+++ b/include/lehrstunde.class.php
@@ -1073,7 +1073,7 @@ class lehrstunde extends basis_db
 	}
 
 	/**
-	 * Holt Studenplandaten.
+	 * Holt Stundenplandaten.
 	 *
 	 * @param $db_stpl_table
 	 * @param null $lehrveranstaltung_id
diff --git a/include/wochenplan.class.php b/include/wochenplan.class.php
index 34fbadc63..5274beefb 100755
--- a/include/wochenplan.class.php
+++ b/include/wochenplan.class.php
@@ -123,7 +123,7 @@ class wochenplan extends basis_db
 	}
 
 	/**
-	 * initialisiert den Studenplan
+	 * initialisiert den Stundenplan
 	 *
 	 */
 	public function init_stdplan()
diff --git a/public/js/api/fhcapifactory.js b/public/js/api/fhcapifactory.js
index 65bde56fd..c053f272c 100644
--- a/public/js/api/fhcapifactory.js
+++ b/public/js/api/fhcapifactory.js
@@ -22,7 +22,7 @@ import filter from "./filter.js";
 import studstatus from "./studstatus.js";
 import profil from "./profil.js";
 import profilUpdate from "./profilUpdate.js";
-import stundenplan from "./studenplan.js";
+import stundenplan from "./stundenplan.js";
 
 export default {
     search,
diff --git a/public/js/api/studenplan.js b/public/js/api/stundenplan.js
similarity index 89%
rename from public/js/api/studenplan.js
rename to public/js/api/stundenplan.js
index d691a72cf..a522ef3ca 100644
--- a/public/js/api/studenplan.js
+++ b/public/js/api/stundenplan.js
@@ -2,7 +2,7 @@
 export default {
 	getRoomInfo(ort_kurzbz, start_date, end_date) {
 		return this.$fhcApi.get(
-			'/api/frontend/v1/Stundenplan/roomInformation',
+			'/api/frontend/v1/Stundenplan/getRoomplan',
 			{  ort_kurzbz, start_date, end_date}
 		);
 	},
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index c905dabd8..877869fa3 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -17,7 +17,7 @@ export default{
 			stunden: [],
 			events: null,
             calendarWeek: new CalendarDate(new Date()),
-            events_loaded:false,
+            
         }
 	},
     computed:{
@@ -36,6 +36,7 @@ export default{
 			this.calendarWeek = new CalendarDate(data.start);
 			Vue.nextTick(() => {
 				this.loadRoomEvents();
+				//this.loadReservierungen();
 			});
 		},
 
@@ -56,9 +57,37 @@ export default{
 			});
 		},
 
-		loadRoomEvents: function(){
-			this.$fhcApi.factory.stundenplan.getRoomInfo(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay).then(res => {
-				let events;
+		loadRoomEvents: async function () {
+			await this.$fhcApi.factory.stundenplan.getRoomInfo(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay).then(res => {
+				
+				if (res.data && res.data.forEach) {
+					res.data.forEach((el, i) => {
+
+						el.id = i;
+						if (el.type === 'reservierung') {
+							el.color = '#' + (el.farbe || 'FFFFFF');
+						} else {
+							el.color = '#' + (el.farbe || 'CCCCCC');
+						}
+
+						el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
+						el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+						el.title = el.lehrfach;
+						if (el.lehrform)
+							el.title += '-' + el.lehrform;
+					});
+					if (this.events){
+						this.events = [...this.events, ...res.data];
+					}else{
+						this.events = res.data;
+					}
+				}
+			});
+		},
+
+		
+		loadReservierungen: async function () {
+			await this.$fhcApi.factory.stundenplan.getReservierungen(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay).then(res => {
 				if (res.data && res.data.forEach) {
 					res.data.forEach((el, i) => {
 
@@ -76,33 +105,36 @@ export default{
 							el.title += '-' + el.lehrform;
 					});
 
-					this.events = res.data;
+					if (this.events) {
+						this.events = [...this.events, ...res.data];
+					} else {
+						this.events = res.data;
+					}
 				}
 			});
 		}
-        
+
     },
 	async mounted() {
 
         this.loadStunden();
 		this.loadRoomEvents();
+		this.loadReservierungen();
 
 	},
     template: /*html*/`
     <div>
 		<fhc-calendar @change:range="updateRange" v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
-           
-            <a class="text-decoration-none text-dark" href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'"   >    
+            <a class="text-decoration-none text-dark" href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'"   >
                 <div class="d-flex flex-column align-items-center justify-content-evenly h-100" >
-                    
+
                         <!-- render content for stundenplan -->
                         <span >{{event.orig.topic}}</span>
-                        <span v-for="gruppe in event.orig.gruppe.split('/')" :key="gruppe">{{gruppe}}</span>	
-                        <span v-for="lektor in event.orig.lektor.split('/')" :key="lektor">{{lektor}}</span>
-                        <!-- add the beschreibung if the event is a reservierung -->
-                        <span v-if="event.orig.type === 'reservierung'">{{event.orig.beschreibung}}</span>
+                        <span v-for="gruppe_kurzbz in event.orig.gruppen_kurzbz" >{{gruppe_kurzbz}}</span>
+                        <span v-for="lektor in event.orig.lektor" >{{lektor.kurzbz}}</span>
+                        <!-- add the beschreibung if the event is a reservierung
+                        <span v-if="event.orig.type === 'reservierung'">{{event.orig.beschreibung}}</span>-->
                         
-                    
                 </div>
             </a>
         </fhc-calendar>

From f9b69fe08c3948bce5726df9476069762f767ec0 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 5 Sep 2024 14:57:57 +0200
Subject: [PATCH 27/34] changes how the reservierungen are fetched from the
 database to have the same information as the room events

---
 .../api/frontend/v1/Stundenplan.php           |  6 +-
 .../models/ressource/Reservierung_model.php   | 66 ++++++++++++++-----
 .../models/ressource/Stundenplan_model.php    |  3 +-
 .../js/components/Cis/Mylv/RoomInformation.js |  5 +-
 4 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 019a8ab4a..d746990be 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -143,8 +143,8 @@ class Stundenplan extends FHCAPI_Controller
 
         $result = $this->getDataOrTerminateWithError($result);
         $this->terminateWithSuccess($result);
-        // loop over the days
-        $day_events = $this->filterEventsIntoAssociativeDateArray($result, $start_date, $end_date);
+        // imperative approach
+        /* $day_events = $this->filterEventsIntoAssociativeDateArray($result, $start_date, $end_date);
         $final_reservierungen = array();
         foreach($day_events as $date => $day_eventArray){
 
@@ -203,7 +203,7 @@ class Stundenplan extends FHCAPI_Controller
             }
 
         }
-        $this->terminateWithSuccess($final_reservierungen);
+        $this->terminateWithSuccess($final_reservierungen); */
 	}
 
     private function filterEventsIntoAssociativeDateArray($events, $start_date, $end_date){
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index c06fce206..b4fedba5e 100755
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -22,21 +22,26 @@ class Reservierung_model extends DB_Model
 	{
 
 		$raum_reservierungen= $this->execReadOnlyQuery("
-		SELECT ort_kurzbz, studiengang_kz, array_agg(uid) as lektor, stunde, datum, titel, beschreibung, gruppe, gruppe_kurzbz, stg_kurzbz, stg 
+		SELECT 
+		
+		array_agg(DISTINCT uid) as lektor,
+		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
+		COALESCE(titel, beschreibung) as topic,
+		ort_kurzbz, studiengang_kz, reservierungen.stunde, datum, beginn, ende
+		
 		FROM 
 		(
-			SELECT res.* , 
+			SELECT res.*, beginn, ende,
 			CASE
-				WHEN res.verband IS NOT NULL OR res.semester IS NOT NULL THEN
-					CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',res.verband,res.semester) 
-				ELSE
-					CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz)) 
-			END AS stg
+				WHEN res.gruppe_kurzbz IS NOT NULL THEN res.gruppe_kurzbz 
+				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/')) 
+			END as gruppen_kuerzel
 			FROM lehre.vw_reservierung res
 			JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
+			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
 			WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ?
 		) AS reservierungen
-		GROUP BY ort_kurzbz, studiengang_kz, stunde, datum, titel, beschreibung, gruppe, stg, gruppe_kurzbz, stg_kurzbz
+		GROUP BY ort_kurzbz, studiengang_kz, reservierungen.stunde, datum, titel, beschreibung, beginn, ende
 		", [$ort_kurzbz, $start_date, $end_date]);
 
 		if(isError($raum_reservierungen)){
@@ -46,19 +51,48 @@ class Reservierung_model extends DB_Model
 		$raum_reservierungen = getData($raum_reservierungen) ?? [];
 		
 		$this->load->model("ressrouce/Mitarbeiter_model","MitarbeiterModel");
+
 		foreach($raum_reservierungen as $reservierung){
-			$lektoren_array = array();
-			foreach($reservierung->lektor as $lektor){
+
+			$lektor_obj_array = array();
+			$gruppe_obj_array = array();
+
+			// load lektor object
+			foreach ($reservierung->lektor as $lektor) {
 				$this->MitarbeiterModel->addLimit(1);
-				$lektor_obj= $this->MitarbeiterModel->load($lektor);
-				if(isError($lektor_obj)){
-					show_error(getError($lektor_obj));
+				$lektor_object = $this->execReadOnlyQuery("
+				SELECT mitarbeiter_uid, vorname, nachname, kurzbz 
+				FROM public.tbl_mitarbeiter 
+				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
+				JOIN public.tbl_person person ON person.person_id = benutzer.person_id 
+				WHERE mitarbeiter_uid = ?", [$lektor]);
+				if (isError($lektor_object)) {
+					$this->show_error(getError($lektor_object));
 				}
-				$lektor_obj = current(getData($lektor_obj));
-				$lektoren_array[] = $lektor_obj;
+				$lektor_object = current(getData($lektor_object));
+				// only provide needed information of the mitarbeiter object 
+				$lektor_obj_array[] = $lektor_object;
 			}
 
-			$reservierung->lektor = $lektoren_array;
+			// load gruppe object
+			foreach ($reservierung->gruppe as $lv_gruppe) {
+				$lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
+				$lv_gruppe_array = explode(",", $lv_gruppe);
+				list($gruppe, $verband, $semester, $studiengang_kz, $gruppen_kuerzel) = $lv_gruppe_array;
+
+				$lv_gruppe_object = new stdClass();
+				$lv_gruppe_object->gruppe = $gruppe;
+				$lv_gruppe_object->verband = $verband;
+				$lv_gruppe_object->semester = $semester;
+				$lv_gruppe_object->studiengang_kz = $studiengang_kz;
+				$lv_gruppe_object->kuerzel = $gruppen_kuerzel;
+
+				$gruppe_obj_array[] = $lv_gruppe_object;
+			}
+
+
+			$reservierung->gruppe = $gruppe_obj_array;
+			$reservierung->lektor = $lektor_obj_array;
 			
 		}
 		return success($raum_reservierungen);
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 6b1ed4ef0..482e1a30a 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -145,12 +145,11 @@ class Stundenplan_model extends DB_Model
 		$gruppierteEvents = $this->execReadOnlyQuery("
 		SELECT 
 			
-		unr,datum, sp.stunde,
 		CONCAT(lehrfach,'-',lehrform) as topic,
 		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
 		array_agg(DISTINCT lektor) as lektor,
 		
-		ort_kurzbz, titel, lehrfach, lehrform, lehrfach_bez, beginn, ende
+		unr,datum, sp.stunde, ort_kurzbz, titel, lehrfach, lehrform, lehrfach_bez, beginn, ende
 
 		FROM
 		(
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 877869fa3..4be66938b 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -100,6 +100,9 @@ export default{
 
 						el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
 						el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+						if(el.titel){
+							
+						}
 						el.title = el.lehrfach;
 						if (el.lehrform)
 							el.title += '-' + el.lehrform;
@@ -130,7 +133,7 @@ export default{
 
                         <!-- render content for stundenplan -->
                         <span >{{event.orig.topic}}</span>
-                        <span v-for="gruppe_kurzbz in event.orig.gruppen_kurzbz" >{{gruppe_kurzbz}}</span>
+                        <span v-for="gruppe in event.orig.gruppe" >{{gruppe.kuerzel}} </span>
                         <span v-for="lektor in event.orig.lektor" >{{lektor.kurzbz}}</span>
                         <!-- add the beschreibung if the event is a reservierung
                         <span v-if="event.orig.type === 'reservierung'">{{event.orig.beschreibung}}</span>-->

From 8376e8b92d53dd2de0c81fa5e5724e527d2f5232 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 6 Sep 2024 11:02:14 +0200
Subject: [PATCH 28/34] bundles the room_events and the reservierungen api
 calls together with Promise.allSettled

---
 .../models/ressource/Reservierung_model.php   | 16 ++-
 .../models/ressource/Stundenplan_model.php    | 18 ++--
 .../js/components/Cis/Mylv/RoomInformation.js | 97 +++++++------------
 3 files changed, 52 insertions(+), 79 deletions(-)

diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index b4fedba5e..e3bc9a0b6 100755
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -23,11 +23,12 @@ class Reservierung_model extends DB_Model
 
 		$raum_reservierungen= $this->execReadOnlyQuery("
 		SELECT 
-		
+		'reservierung' as type, beginn, ende, subquery.stunde, datum,
+		COALESCE(titel, beschreibung) as topic,
 		array_agg(DISTINCT uid) as lektor,
 		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
-		COALESCE(titel, beschreibung) as topic,
-		ort_kurzbz, studiengang_kz, reservierungen.stunde, datum, beginn, ende
+		
+		ort_kurzbz 
 		
 		FROM 
 		(
@@ -36,12 +37,17 @@ class Reservierung_model extends DB_Model
 				WHEN res.gruppe_kurzbz IS NOT NULL THEN res.gruppe_kurzbz 
 				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/')) 
 			END as gruppen_kuerzel
+
 			FROM lehre.vw_reservierung res
 			JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
 			WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ?
-		) AS reservierungen
-		GROUP BY ort_kurzbz, studiengang_kz, reservierungen.stunde, datum, titel, beschreibung, beginn, ende
+
+		) AS subquery
+
+		GROUP BY datum, subquery.stunde, beginn, ende, ort_kurzbz, titel, beschreibung
+		
+		ORDER BY datum, subquery.stunde 
 		", [$ort_kurzbz, $start_date, $end_date]);
 
 		if(isError($raum_reservierungen)){
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 482e1a30a..1944feb8a 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -144,18 +144,16 @@ class Stundenplan_model extends DB_Model
 	{
 		$gruppierteEvents = $this->execReadOnlyQuery("
 		SELECT 
-			
+		unr, beginn, ende, subquery.stunde, datum,	
 		CONCAT(lehrfach,'-',lehrform) as topic,
-		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
 		array_agg(DISTINCT lektor) as lektor,
+		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
 		
-		unr,datum, sp.stunde, ort_kurzbz, titel, lehrfach, lehrform, lehrfach_bez, beginn, ende
+		ort_kurzbz, titel, lehrfach, lehrform, lehrfach_bez
 
 		FROM
 		(
-			SELECT
- 			unr,datum, sp.stunde,beginn, ende,
-			
+			SELECT unr,datum, sp.stunde,beginn, ende,
 			CASE
 				WHEN sp.mitarbeiter_kurzbz IS NOT NULL THEN sp.mitarbeiter_kurzbz
 				ELSE lektor
@@ -169,13 +167,11 @@ class Stundenplan_model extends DB_Model
 			FROM (".$stundenplanViewQuery.") sp
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
 
-		) as sp
+		) as subquery
 
-		GROUP BY 
+		GROUP BY unr, datum, subquery.stunde, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez
 
-			unr, datum, sp.stunde, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, beginn, ende
-
-		ORDER BY datum, sp.stunde
+		ORDER BY datum, subquery.stunde
 		");
 
 		if(isError($gruppierteEvents)){
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 4be66938b..33c37db63 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -35,8 +35,7 @@ export default{
 		updateRange: function(data){
 			this.calendarWeek = new CalendarDate(data.start);
 			Vue.nextTick(() => {
-				this.loadRoomEvents();
-				//this.loadReservierungen();
+				this.loadEvents();
 			});
 		},
 
@@ -50,80 +49,52 @@ export default{
         },
 
 		loadStunden: async function(){
-			await this.$fhcApi.factory.stundenplan.getStunden().then(res => {
+			this.$fhcApi.factory.stundenplan.getStunden().then(res => {
 				res.data.forEach(std => {
 					this.stunden[std.stunde] = std; // TODO(chris): geht besser
 				});
 			});
 		},
 
-		loadRoomEvents: async function () {
-			await this.$fhcApi.factory.stundenplan.getRoomInfo(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay).then(res => {
-				
-				if (res.data && res.data.forEach) {
-					res.data.forEach((el, i) => {
+		loadEvents: function(){
 
-						el.id = i;
-						if (el.type === 'reservierung') {
-							el.color = '#' + (el.farbe || 'FFFFFF');
-						} else {
-							el.color = '#' + (el.farbe || 'CCCCCC');
+			// bundles the room_events and the reservierungen together into the this.events array
+			Promise.allSettled([
+				this.$fhcApi.factory.stundenplan.getRoomInfo(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay),
+				this.$fhcApi.factory.stundenplan.getReservierungen(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay)
+			]).then((result) => {
+				let events = [];
+				result.forEach((promise_result) => {
+					if(promise_result.status === 'fulfilled' && promise_result.value.meta.status === "success"){
+						
+						let data = promise_result.value.data;
+						// adding additional information to the events 
+						if (data && data.forEach) {
+							data.forEach((el, i) => {
+
+								el.id = i;
+								if (el.type === 'reservierung') {
+									el.color = '#' + (el.farbe || 'FFFFFF');
+								} else {
+									el.color = '#' + (el.farbe || 'CCCCCC');
+								}
+
+								el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
+								el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+								
+							});
 						}
-
-						el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-						el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
-						el.title = el.lehrfach;
-						if (el.lehrform)
-							el.title += '-' + el.lehrform;
-					});
-					if (this.events){
-						this.events = [...this.events, ...res.data];
-					}else{
-						this.events = res.data;
+						events = events.concat(data);
 					}
-				}
-			});
+				})
+				this.events = events;
+			})
 		},
-
 		
-		loadReservierungen: async function () {
-			await this.$fhcApi.factory.stundenplan.getReservierungen(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay).then(res => {
-				if (res.data && res.data.forEach) {
-					res.data.forEach((el, i) => {
-
-						el.id = i;
-						if (el.type === 'reservierung') {
-							el.color = '#' + (el.farbe || 'FFFFFF');
-						} else {
-							el.color = '#' + (el.farbe || 'CCCCCC');
-						}
-
-						el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-						el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
-						if(el.titel){
-							
-						}
-						el.title = el.lehrfach;
-						if (el.lehrform)
-							el.title += '-' + el.lehrform;
-					});
-
-					if (this.events) {
-						this.events = [...this.events, ...res.data];
-					} else {
-						this.events = res.data;
-					}
-				}
-			});
-		}
-
     },
 	async mounted() {
-
-        this.loadStunden();
-		this.loadRoomEvents();
-		this.loadReservierungen();
-
+		// the stunden data are required to display the events accordingly on the calendar
+		await this.loadStunden();
 	},
     template: /*html*/`
     <div>

From 122673d29142a87c749b8f775bd1ab367ff71663 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 6 Sep 2024 11:20:20 +0200
Subject: [PATCH 29/34] gets rid of the stunden dependency and uses the beginn
 and ende property of the queried events

---
 .../models/ressource/Reservierung_model.php     | 10 +++++-----
 .../models/ressource/Stundenplan_model.php      | 10 +++++-----
 .../js/components/Cis/Mylv/RoomInformation.js   | 17 ++---------------
 3 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index e3bc9a0b6..73e21eb2c 100755
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -23,12 +23,12 @@ class Reservierung_model extends DB_Model
 
 		$raum_reservierungen= $this->execReadOnlyQuery("
 		SELECT 
-		'reservierung' as type, beginn, ende, subquery.stunde, datum,
+		'reservierung' as type, beginn, ende, datum,
 		COALESCE(titel, beschreibung) as topic,
 		array_agg(DISTINCT uid) as lektor,
-		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
+		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe, 
 		
-		ort_kurzbz 
+		ort_kurzbz, 'FFFFFF' as farbe
 		
 		FROM 
 		(
@@ -45,9 +45,9 @@ class Reservierung_model extends DB_Model
 
 		) AS subquery
 
-		GROUP BY datum, subquery.stunde, beginn, ende, ort_kurzbz, titel, beschreibung
+		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung
 		
-		ORDER BY datum, subquery.stunde 
+		ORDER BY datum, beginn
 		", [$ort_kurzbz, $start_date, $end_date]);
 
 		if(isError($raum_reservierungen)){
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 1944feb8a..5b61d5351 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -144,16 +144,16 @@ class Stundenplan_model extends DB_Model
 	{
 		$gruppierteEvents = $this->execReadOnlyQuery("
 		SELECT 
-		unr, beginn, ende, subquery.stunde, datum,	
+		'lehreinheit' as type, beginn, ende, datum,	
 		CONCAT(lehrfach,'-',lehrform) as topic,
 		array_agg(DISTINCT lektor) as lektor,
 		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
 		
-		ort_kurzbz, titel, lehrfach, lehrform, lehrfach_bez
+		ort_kurzbz, titel, lehrfach, lehrform, lehrfach_bez, farbe
 
 		FROM
 		(
-			SELECT unr,datum, sp.stunde,beginn, ende,
+			SELECT unr,datum,beginn, ende,
 			CASE
 				WHEN sp.mitarbeiter_kurzbz IS NOT NULL THEN sp.mitarbeiter_kurzbz
 				ELSE lektor
@@ -169,9 +169,9 @@ class Stundenplan_model extends DB_Model
 
 		) as subquery
 
-		GROUP BY unr, datum, subquery.stunde, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez
+		GROUP BY unr, datum, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, farbe
 
-		ORDER BY datum, subquery.stunde
+		ORDER BY datum, beginn
 		");
 
 		if(isError($gruppierteEvents)){
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 33c37db63..a01af0ebc 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -48,14 +48,6 @@ export default{
             
         },
 
-		loadStunden: async function(){
-			this.$fhcApi.factory.stundenplan.getStunden().then(res => {
-				res.data.forEach(std => {
-					this.stunden[std.stunde] = std; // TODO(chris): geht besser
-				});
-			});
-		},
-
 		loadEvents: function(){
 
 			// bundles the room_events and the reservierungen together into the this.events array
@@ -71,7 +63,6 @@ export default{
 						// adding additional information to the events 
 						if (data && data.forEach) {
 							data.forEach((el, i) => {
-
 								el.id = i;
 								if (el.type === 'reservierung') {
 									el.color = '#' + (el.farbe || 'FFFFFF');
@@ -79,8 +70,8 @@ export default{
 									el.color = '#' + (el.farbe || 'CCCCCC');
 								}
 
-								el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-								el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
+								el.start = new Date(el.datum + ' ' + el.beginn);
+								el.end = new Date(el.datum + ' ' + el.ende);
 								
 							});
 						}
@@ -92,10 +83,6 @@ export default{
 		},
 		
     },
-	async mounted() {
-		// the stunden data are required to display the events accordingly on the calendar
-		await this.loadStunden();
-	},
     template: /*html*/`
     <div>
 		<fhc-calendar @change:range="updateRange" v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>

From ec8b3ccb6f0847163e8bb9d9770793439126d5c4 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 6 Sep 2024 13:11:22 +0200
Subject: [PATCH 30/34] adds the organisations bezeichnung through a subquery
 to the lehrveranstaltungs events

---
 .../models/ressource/Stundenplan_model.php        | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 5b61d5351..845b114eb 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -149,7 +149,7 @@ class Stundenplan_model extends DB_Model
 		array_agg(DISTINCT lektor) as lektor,
 		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
 		
-		ort_kurzbz, titel, lehrfach, lehrform, lehrfach_bez, farbe
+		ort_kurzbz, titel, lehrfach, lehrform, lehrfach_bez, organisationseinheit, farbe
 
 		FROM
 		(
@@ -162,14 +162,21 @@ class Stundenplan_model extends DB_Model
 				WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz 
 				ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/')) 
 			END as gruppen_kuerzel,
+			(SELECT bezeichnung 
+			FROM public.tbl_organisationseinheit
+			WHERE oe_kurzbz IN(
+				SELECT oe_kurzbz
+				FROM lehre.tbl_lehrveranstaltung
+				WHERE lehrveranstaltung_id = sp.lehrveranstaltung_id
+			)) as organisationseinheit,
 			ort_kurzbz, studiengang_kz, titel,lehreinheit_id,lehrfach_id,anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit,gruppe, verband, semester,stg_kurzbz
 
 			FROM (".$stundenplanViewQuery.") sp
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
-
+			
 		) as subquery
 
-		GROUP BY unr, datum, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, farbe
+		GROUP BY unr, datum, beginn, ende, ort_kurzbz, titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe
 
 		ORDER BY datum, beginn
 		");
@@ -189,7 +196,7 @@ class Stundenplan_model extends DB_Model
 		foreach ($gruppierteEvents as $item) {
 			$lektor_obj_array = array();
 			$gruppe_obj_array = array();
-			
+
 			// load lektor object
 			foreach ($item->lektor as $lv_lektor) {
 				$this->MitarbeiterModel->addLimit(1);

From 715b8075b80a1ae8a606d197ab394dfab452206f Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 10 Sep 2024 12:30:40 +0200
Subject: [PATCH 31/34] reworks the query for the reservierungen
 stundenplan/room

---
 .../api/frontend/v1/Stundenplan.php           | 134 ++++--------------
 .../models/ressource/Reservierung_model.php   |  39 +++--
 .../models/ressource/Stundenplan_model.php    |   9 +-
 public/js/api/stundenplan.js                  |  16 ++-
 public/js/apps/Cis/Stundenplan.js             | 102 ++++++++-----
 .../js/components/Cis/Mylv/RoomInformation.js |   2 +-
 6 files changed, 141 insertions(+), 161 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index d746990be..61dc5233f 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -97,24 +97,36 @@ class Stundenplan extends FHCAPI_Controller
 		
 	}
 
+	/**
+	 * fetches stundenplan events from a UID and start/end date
+	 * @access public
+	 * 
+	 */
 	public function getStundenplan(){
+
+		// form validation
+		$this->load->library('form_validation');
+		$this->form_validation->set_data($_GET);
+		$this->form_validation->set_rules('start_date', "start_date", "required");
+		$this->form_validation->set_rules('end_date', "end_date", "required");
+		if ($this->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		// storing the get parameter in local variables
+		$start_date = $this->input->get('start_date', TRUE);
+		$end_date = $this->input->get('end_date', TRUE);
 		
 		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 
-		/* $result = $this->StundenplanModel->loadForUid(get_uid());
-
-		if (isError($result))
-			return $this->outputJsonError(getError($result));
- 		*/
-		$res = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(get_uid())); 
+		// the stundenplan query needs the uid and a start and end date
+		$stundenplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(get_uid(),$start_date,$end_date)); 
+		$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data);
 		
-		$res = getData($res);
-		
-		$this->outputJsonSuccess($res);
+		$this->terminateWithSuccess($stundenplan_data);
 	}
 
-	// reservierungen is not used in the prototype for the students
-    public function Reservierungen()
+	// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the stundenplan of a student
+    public function Reservierungen($ort_kurzbz = null)
 	{
         $this->load->model('ressource/Reservierung_model', 'ReservierungModel');
         $this->load->model('ressource/Stunde_model', 'StundeModel');
@@ -123,13 +135,11 @@ class Stundenplan extends FHCAPI_Controller
 		//form validation
 		$this->load->library('form_validation');
 		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('ort_kurzbz',"Ort","required");
 		$this->form_validation->set_rules('start_date', "StartDate", "required");
 		$this->form_validation->set_rules('end_date', "EndDate", "required");
 		if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
 
         // storing the get parameter in local variables
-        $ort_kurzbz = $this->input->get('ort_kurzbz', TRUE);
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
@@ -139,100 +149,18 @@ class Stundenplan extends FHCAPI_Controller
         $stunden = $this->getDataOrTerminateWithError($stunden);
 
 		// querying the reservierungen
-		$result = $this->ReservierungModel->getRoomReservierungen($ort_kurzbz, $start_date, $end_date);
+		if(isset($ort_kurzbz)){
+			$result = $this->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
+		}else{
+			$result = $this->ReservierungModel->getReservierungen($start_date, $end_date);
+		}
 
         $result = $this->getDataOrTerminateWithError($result);
-        $this->terminateWithSuccess($result);
-        // imperative approach
-        /* $day_events = $this->filterEventsIntoAssociativeDateArray($result, $start_date, $end_date);
-        $final_reservierungen = array();
-        foreach($day_events as $date => $day_eventArray){
-
-            // loop over the stunden
-            foreach( $stunden as $stunde){
-                // filtering all the day reservierungen to the reservierungen that happen at the same hour of the day
-                $hour_reservierungen = array_filter($day_eventArray, function($day_entry) use ($stunde){
-                    return $day_entry->stunde == $stunde->stunde;
-                });
-
-                // if there are no reservierungen within that hour than we skip that iteration of the loop
-                if(count($hour_reservierungen) <1){
-                    continue;
-                }
-
-                $this->loglib->logInfoDB(print_r($hour_reservierungen,true),"this is the hour reservierungen");
-                
-                // grouping the reservierung information of reservervations of the same hour on the same day
-                $grouped_uids = array();
-                foreach($hour_reservierungen as $entry){
-
-                    // grouping the reservierungs participants
-
-                    $mitarbeiter_check = $this->MitarbeiterModel->isMitarbeiter($entry->uid);
-                    
-                    if(isError($mitarbeiter_check)){
-                        $this->terminateWithError(getError($mitarbeiter_check), self::ERROR_TYPE_GENERAL);
-                    }
-
-                    $mitarbeiter_check = getData($mitarbeiter_check);
-
-                    // if the uid belongs to a mitarbeiter store the mitarbeiter_kurzbz otherwise store the student uid
-                    if($mitarbeiter_check){
-                        $mitarbeiterKurzbz = $this->MitarbeiterModel->generateKurzbz($entry->uid);
-                        
-                        if(isError($mitarbeiterKurzbz)){
-                            $this->terminateWithError(getError($mitarbeiterKurzbz), self::ERROR_TYPE_GENERAL);
-                        }
-
-                        $grouped_uids[] = getData($mitarbeiterKurzbz);
-
-                    }else{
-                        $grouped_uids[]= $entry->uid;
-                    }
-
-                    
-                }
-
-                
-                // merging all the information into the first entry
-                $final_reservierung = current($hour_reservierungen);
-                
-                $final_reservierung->person_kurzbz = implode(" / ",$grouped_uids);
-
-                $final_reservierungen[] = $final_reservierung;
-            }
-
-        }
-        $this->terminateWithSuccess($final_reservierungen); */
+		$this->terminateWithSuccess($result);
+        
 	}
 
-    private function filterEventsIntoAssociativeDateArray($events, $start_date, $end_date){
-        $php_start_date = new DateTime($start_date);
-        $php_end_date = new DateTime($end_date);
-        // count is used to ensure that the loop does not iterate more than 7 times (7 days per week)
-        $count =0;
-
-        $result = array();
-
-        // loop over the days
-        while($php_start_date <= $php_end_date && $count <7){
-            
-            $date = $php_start_date->format('Y-m-d');
-
-            // filtering all the reservierungen with the date
-            $day_events = array_filter($events, function($event) use ($date){
-                // no filtering is done if the event entries do not have a datum property
-                return isset($event->datum) ? $event->datum == $date : true; 
-                
-            });
-
-            $result[$date] = $day_events;
-            ++$count;
-            $php_start_date->modify('+1 day');
-        }
-
-        return $result;
-    }
+    
 
 }
 
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index 73e21eb2c..9a5bc6af0 100755
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -18,8 +18,31 @@ class Reservierung_model extends DB_Model
 	 * 
 	 * @return stdClass
 	 */
-	public function getRoomReservierungen($ort_kurzbz, $start_date, $end_date)
+	public function getReservierungen($start_date, $end_date, $ort_kurzbz = null)
 	{
+		
+		$stundenplan_reservierungen="SELECT r.* , beginn, ende
+			FROM campus.vw_reservierung r
+			LEFT JOIN public.tbl_benutzergruppe bg ON r.gruppe_kurzbz=bg.gruppe_kurzbz AND bg.uid=?
+			LEFT JOIN public.tbl_studiensemester ss1 ON bg.studiensemester_kurzbz=ss1.studiensemester_kurzbz AND ss1.start <= r.datum AND ss1.ende >= r.datum
+			LEFT JOIN public.tbl_studentlehrverband slv ON r.studiengang_kz=slv.studiengang_kz AND slv.student_uid=? AND (slv.semester=r.semester OR r.semester IS NULL) AND (slv.verband=r.verband OR r.verband IS NULL OR r.verband='' OR r.verband='0') AND (slv.gruppe=r.gruppe OR r.gruppe IS NULL OR r.gruppe ='' OR r.gruppe ='0') AND r.gruppe_kurzbz IS NULL 
+			LEFT JOIN public.tbl_studiensemester ss2 ON slv.studiensemester_kurzbz = ss2.studiensemester_kurzbz AND ss2.start <=r.datum AND ss2.ende >= r.datum 
+			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = r.stunde
+			WHERE datum >= ? AND datum <= ? AND (ss1.studiensemester_kurzbz IS NOT NULL
+			OR ss2.studiensemester_kurzbz IS NOT NULL)";
+		
+		$raum_reservierungen = "SELECT res.*, beginn, ende,
+			CASE
+				WHEN res.gruppe_kurzbz IS NOT NULL THEN res.gruppe_kurzbz 
+				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/')) 
+			END as gruppen_kuerzel
+
+			FROM lehre.vw_reservierung res
+			JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
+			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
+			WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ?";
+
+			
 
 		$raum_reservierungen= $this->execReadOnlyQuery("
 		SELECT 
@@ -32,23 +55,13 @@ class Reservierung_model extends DB_Model
 		
 		FROM 
 		(
-			SELECT res.*, beginn, ende,
-			CASE
-				WHEN res.gruppe_kurzbz IS NOT NULL THEN res.gruppe_kurzbz 
-				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/')) 
-			END as gruppen_kuerzel
-
-			FROM lehre.vw_reservierung res
-			JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
-			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
-			WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ?
-
+			". is_null($ort_kurzbz)? $stundenplan_reservierungen:$raum_reservierungen ."
 		) AS subquery
 
 		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung
 		
 		ORDER BY datum, beginn
-		", [$ort_kurzbz, $start_date, $end_date]);
+		", is_null($ort_kurzbz) ?[getAuthUID(), getAuthUID(),$start_date,$end_date]: [$ort_kurzbz, $start_date, $end_date]);
 
 		if(isError($raum_reservierungen)){
 			show_error(getError($raum_reservierungen));
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 845b114eb..6f291d743 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -148,8 +148,9 @@ class Stundenplan_model extends DB_Model
 		CONCAT(lehrfach,'-',lehrform) as topic,
 		array_agg(DISTINCT lektor) as lektor,
 		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
+		string_agg(DISTINCT ort_kurzbz, '/') as ort_kurzbz,
 		
-		ort_kurzbz, titel, lehrfach, lehrform, lehrfach_bez, organisationseinheit, farbe
+		titel, lehrfach, lehrform, lehrfach_bez, organisationseinheit, farbe
 
 		FROM
 		(
@@ -243,7 +244,7 @@ class Stundenplan_model extends DB_Model
 	 * 
 	 * @return string
 	 */
-	public function getStundenPlanQuery($uid){
+	public function getStundenplanQuery($uid, $start_date, $end_date){
 			return 
 			"select sp.*
 			from lehre.vw_stundenplan sp
@@ -252,7 +253,9 @@ class Stundenplan_model extends DB_Model
 			left join public.tbl_studentlehrverband slv ON sp.studiengang_kz=slv.studiengang_kz and slv.student_uid=".$this->escape($uid)." and (slv.semester=sp.semester OR sp.semester IS NULL) AND (slv.verband=sp.verband OR sp.verband IS NULL OR sp.verband='' OR sp.verband='0') AND
 			(slv.gruppe=sp.gruppe OR sp.gruppe IS NULL OR sp.gruppe='' OR sp.gruppe='0') AND sp.gruppe_kurzbz IS NULL
 			left join public.tbl_studiensemester ss2 ON slv.studiensemester_kurzbz=ss2.studiensemester_kurzbz AND ss2.start<=sp.datum and ss2.ende >= sp.datum
-			WHERE ss1.studiensemester_kurzbz IS NOT NULL or ss2.studiensemester_kurzbz IS NOT NULL";
+			WHERE ss1.studiensemester_kurzbz IS NOT NULL or ss2.studiensemester_kurzbz IS NOT NULL
+			AND sp.datum >= ".$this->escape($start_date)." 
+			AND sp.datum <= ".$this->escape($end_date);
 	}
 
 	/**
diff --git a/public/js/api/stundenplan.js b/public/js/api/stundenplan.js
index a522ef3ca..1e06d3d8c 100644
--- a/public/js/api/stundenplan.js
+++ b/public/js/api/stundenplan.js
@@ -6,16 +6,28 @@ export default {
 			{  ort_kurzbz, start_date, end_date}
 		);
 	},
+	getStundenplan(start_date, end_date) {
+		return this.$fhcApi.get(
+			'/api/frontend/v1/Stundenplan/getStundenplan',
+			{ start_date, end_date }
+		);
+	},
 	getStunden() {
 		return this.$fhcApi.get(
 			'/api/frontend/v1/Stundenplan/Stunden',
 			{}
 		);
 	},
-	getReservierungen(ort_kurzbz, start_date, end_date) {
+	getOrtReservierungen(ort_kurzbz, start_date, end_date) {
+		return this.$fhcApi.get(
+			`/api/frontend/v1/Stundenplan/Reservierungen/${ort_kurzbz}`,
+			{ start_date, end_date}
+		);
+	},
+	getStundenplanReservierungen(start_date, end_date) {
 		return this.$fhcApi.get(
 			'/api/frontend/v1/Stundenplan/Reservierungen',
-			{  ort_kurzbz, start_date, end_date}
+			{ start_date, end_date }
 		);
 	},
 };
\ No newline at end of file
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 773495c27..88ed725c2 100755
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -1,53 +1,77 @@
 import FhcCalendar from "../../components/Calendar/Calendar.js";
 import Phrasen from "../../plugin/Phrasen.js";
+import CalendarDate from "../../composables/CalendarDate.js";
+
 
 const app = Vue.createApp({
-	components: {
-		FhcCalendar
-	},
 	data() {
 		return {
 			stunden: [],
-			events: null
+			events: null,
+			calendarWeek: new CalendarDate(new Date()),
+
 		}
 	},
-	created() {
-		axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan/Stunden').then(res => {
-			res.data.retval.forEach(std => {
-				this.stunden[std.stunde] = std; // TODO(chris): geht besser
-			});
-			axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan').then(res => {
-				let events;
-				if (res.data.retval && res.data.retval.forEach) {
-					res.data.retval.forEach((el, i) => {
-						el.id = i;
-						el.color = '#' + (el.farbe || 'CCCCCC');
-						el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-						el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
-						el.title = el.lehrfach;
-						if (el.lehrform)
-							el.title += '-' + el.lehrform;
-					});
-					events = res.data.retval;
-				}
-				// TODO(chris): do we need that
-				axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Cis/Stundenplan/Reservierungen').then(res => {
-					if (res.data.retval && res.data.retval.forEach) {
-						res.data.retval.forEach((el, i) => {
-							el.id = i + events.length;
-							el.color = '#CCCCCC';
-							el.start = new Date(el.datum + ' ' + this.stunden[el.stunde].beginn);
-							el.end = new Date(el.datum + ' ' + this.stunden[el.stunde].ende);
-							el.title = el.lehrfach;
-							if (el.lehrform)
-								el.title += '-' + el.lehrform;
-						});
-						events = [...events, ...res.data.retval];
+	components: {
+		FhcCalendar
+	},
+	computed:{
+		weekFirstDay: function () {
+			return this.calendarDateToString(this.calendarWeek.cdFirstDayOfWeek);
+		},
+		weekLastDay: function () {
+			return this.calendarDateToString(this.calendarWeek.cdLastDayOfWeek);
+		},
+	},
+	methods:{
+
+		calendarDateToString: function (calendarDate) {
+
+			return calendarDate instanceof CalendarDate ?
+				[calendarDate.y, calendarDate.m + 1, calendarDate.d].join('-') :
+				null;
+
+		},
+
+		loadEvents: function(){
+			console.log("this are the days with which i am testing", this.weekFirstDay, this.weekLastDay)
+			Promise.allSettled([
+				this.$fhcApi.factory.stundenplan.getStundenplan(this.weekFirstDay, this.weekLastDay),
+				this.$fhcApi.factory.stundenplan.getStundenplanReservierungen(this.weekFirstDay, this.weekLastDay)
+			]).then((result) => {
+				let promise_events = [];
+				result.forEach((promise_result) => {
+					if (promise_result.status === 'fulfilled' && promise_result.value.meta.status === "success") {
+
+						let data = promise_result.value.data;
+						// adding additional information to the events 
+						if (data && data.forEach) {
+
+							data.forEach((el, i) => {
+								el.id = i;
+								if (el.type === 'reservierung') {
+									el.color = '#' + (el.farbe || 'FFFFFF');
+								} else {
+									el.color = '#' + (el.farbe || 'CCCCCC');
+								}
+
+								el.start = new Date(el.datum + ' ' + el.beginn);
+								el.end = new Date(el.datum + ' ' + el.ende);
+
+							});
+						}
+						promise_events = promise_events.concat(data);
 					}
-					this.events = events;
-				});
+				})
+				this.events = promise_events;
 			});
-		});
+		},
+	},
+	created() {
+		this.loadEvents();
+			
+			
+		
 	},
 	template:/*html*/`
 	<h2>Stundenplan</h2>
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index a01af0ebc..1c5ab31e0 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -53,7 +53,7 @@ export default{
 			// bundles the room_events and the reservierungen together into the this.events array
 			Promise.allSettled([
 				this.$fhcApi.factory.stundenplan.getRoomInfo(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay),
-				this.$fhcApi.factory.stundenplan.getReservierungen(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay)
+				this.$fhcApi.factory.stundenplan.getOrtReservierungen(this.ort_kurzbz, this.weekFirstDay, this.weekLastDay)
 			]).then((result) => {
 				let events = [];
 				result.forEach((promise_result) => {

From 1de658ace6d3565cfbc99dc25cb6eccc3ca26628 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 11 Sep 2024 09:32:28 +0200
Subject: [PATCH 32/34] fixes the query for the reservierungen in the
 stundenplan and in the raum informations

---
 .../api/frontend/v1/Stundenplan.php           |  8 ++---
 .../models/ressource/Reservierung_model.php   | 30 +++++++++++--------
 public/js/apps/Cis/Stundenplan.js             |  1 -
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 61dc5233f..894fd6870 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -149,11 +149,9 @@ class Stundenplan extends FHCAPI_Controller
         $stunden = $this->getDataOrTerminateWithError($stunden);
 
 		// querying the reservierungen
-		if(isset($ort_kurzbz)){
-			$result = $this->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
-		}else{
-			$result = $this->ReservierungModel->getReservierungen($start_date, $end_date);
-		}
+		
+		$result = $this->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
+		
 
         $result = $this->getDataOrTerminateWithError($result);
 		$this->terminateWithSuccess($result);
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index 9a5bc6af0..727acb219 100755
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -21,30 +21,34 @@ class Reservierung_model extends DB_Model
 	public function getReservierungen($start_date, $end_date, $ort_kurzbz = null)
 	{
 		
-		$stundenplan_reservierungen="SELECT r.* , beginn, ende
+		$stundenplan_reservierungen_query="SELECT r.* , stund.beginn, stund.ende,
+			CASE
+				WHEN r.gruppe_kurzbz IS NOT NULL THEN r.gruppe_kurzbz 
+				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(r.semester AS varchar),'/'),COALESCE(CAST(r.verband AS varchar),'/')) 
+			END as gruppen_kuerzel
 			FROM campus.vw_reservierung r
+			JOIN public.tbl_studiengang studg ON studg.studiengang_kz=r.studiengang_kz
+			JOIN lehre.tbl_stunde stund ON stund.stunde = r.stunde
 			LEFT JOIN public.tbl_benutzergruppe bg ON r.gruppe_kurzbz=bg.gruppe_kurzbz AND bg.uid=?
 			LEFT JOIN public.tbl_studiensemester ss1 ON bg.studiensemester_kurzbz=ss1.studiensemester_kurzbz AND ss1.start <= r.datum AND ss1.ende >= r.datum
 			LEFT JOIN public.tbl_studentlehrverband slv ON r.studiengang_kz=slv.studiengang_kz AND slv.student_uid=? AND (slv.semester=r.semester OR r.semester IS NULL) AND (slv.verband=r.verband OR r.verband IS NULL OR r.verband='' OR r.verband='0') AND (slv.gruppe=r.gruppe OR r.gruppe IS NULL OR r.gruppe ='' OR r.gruppe ='0') AND r.gruppe_kurzbz IS NULL 
 			LEFT JOIN public.tbl_studiensemester ss2 ON slv.studiensemester_kurzbz = ss2.studiensemester_kurzbz AND ss2.start <=r.datum AND ss2.ende >= r.datum 
-			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = r.stunde
 			WHERE datum >= ? AND datum <= ? AND (ss1.studiensemester_kurzbz IS NOT NULL
 			OR ss2.studiensemester_kurzbz IS NOT NULL)";
 		
-		$raum_reservierungen = "SELECT res.*, beginn, ende,
+		$raum_reservierungen_query = "SELECT res.*, beginn, ende,
 			CASE
 				WHEN res.gruppe_kurzbz IS NOT NULL THEN res.gruppe_kurzbz 
 				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/')) 
 			END as gruppen_kuerzel
-
 			FROM lehre.vw_reservierung res
 			JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
 			WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ?";
 
-			
-
-		$raum_reservierungen= $this->execReadOnlyQuery("
+		$subquery = is_null($ort_kurzbz)? $stundenplan_reservierungen_query:$raum_reservierungen_query;
+		
+		$query_result= $this->execReadOnlyQuery("
 		SELECT 
 		'reservierung' as type, beginn, ende, datum,
 		COALESCE(titel, beschreibung) as topic,
@@ -55,7 +59,7 @@ class Reservierung_model extends DB_Model
 		
 		FROM 
 		(
-			". is_null($ort_kurzbz)? $stundenplan_reservierungen:$raum_reservierungen ."
+			". $subquery ."
 		) AS subquery
 
 		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung
@@ -63,15 +67,15 @@ class Reservierung_model extends DB_Model
 		ORDER BY datum, beginn
 		", is_null($ort_kurzbz) ?[getAuthUID(), getAuthUID(),$start_date,$end_date]: [$ort_kurzbz, $start_date, $end_date]);
 
-		if(isError($raum_reservierungen)){
-			show_error(getError($raum_reservierungen));
+		if(isError($query_result)){
+			show_error(getError($query_result));
 		}
 
-		$raum_reservierungen = getData($raum_reservierungen) ?? [];
+		$query_result = getData($query_result) ?? [];
 		
 		$this->load->model("ressrouce/Mitarbeiter_model","MitarbeiterModel");
 
-		foreach($raum_reservierungen as $reservierung){
+		foreach($query_result as $reservierung){
 
 			$lektor_obj_array = array();
 			$gruppe_obj_array = array();
@@ -114,7 +118,7 @@ class Reservierung_model extends DB_Model
 			$reservierung->lektor = $lektor_obj_array;
 			
 		}
-		return success($raum_reservierungen);
+		return success($query_result);
 	}
 
 	/**
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 88ed725c2..13315abb6 100755
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -34,7 +34,6 @@ const app = Vue.createApp({
 		},
 
 		loadEvents: function(){
-			console.log("this are the days with which i am testing", this.weekFirstDay, this.weekLastDay)
 			Promise.allSettled([
 				this.$fhcApi.factory.stundenplan.getStundenplan(this.weekFirstDay, this.weekLastDay),
 				this.$fhcApi.factory.stundenplan.getStundenplanReservierungen(this.weekFirstDay, this.weekLastDay)

From ac35ba3e275d20af97880818c2e7b5b7cb9ef7e4 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 11 Sep 2024 09:50:04 +0200
Subject: [PATCH 33/34] puts the logic that adds the object informtion to the
 json reponse in the controllers instead of the models

---
 .../api/frontend/v1/Stundenplan.php           | 113 +++++++++++++++---
 .../models/ressource/Reservierung_model.php   |  52 +-------
 .../models/ressource/Stundenplan_model.php    |  57 +--------
 3 files changed, 101 insertions(+), 121 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 894fd6870..54c6a50e8 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -104,6 +104,12 @@ class Stundenplan extends FHCAPI_Controller
 	 */
 	public function getStundenplan(){
 
+		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+
 		// form validation
 		$this->load->library('form_validation');
 		$this->form_validation->set_data($_GET);
@@ -116,11 +122,51 @@ class Stundenplan extends FHCAPI_Controller
 		$start_date = $this->input->get('start_date', TRUE);
 		$end_date = $this->input->get('end_date', TRUE);
 		
-		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-
 		// the stundenplan query needs the uid and a start and end date
 		$stundenplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(get_uid(),$start_date,$end_date)); 
-		$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data);
+		$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
+
+		// get the benutzer object for the lektor of the lv	
+		foreach ($stundenplan_data as $item) {
+			$lektor_obj_array = array();
+			$gruppe_obj_array = array();
+
+			// load lektor object
+			foreach ($item->lektor as $lv_lektor) {
+				$this->StundenplanModel->addLimit(1);
+				$lektor_object = $this->StundenplanModel->execReadOnlyQuery("
+				SELECT mitarbeiter_uid, vorname, nachname, kurzbz 
+				FROM public.tbl_mitarbeiter 
+				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
+				JOIN public.tbl_person person ON person.person_id = benutzer.person_id 
+				WHERE kurzbz = ?", [$lv_lektor]);
+				if (isError($lektor_object)) {
+					$this->show_error(getError($lektor_object));
+				}
+				$lektor_object = current(getData($lektor_object));
+				// only provide needed information of the mitarbeiter object 
+				$lektor_obj_array[] = $lektor_object;
+			}
+
+			// load gruppe object
+			foreach ($item->gruppe as $lv_gruppe) {
+				$lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
+				$lv_gruppe_array = explode(",", $lv_gruppe);
+				list($gruppe, $verband, $semester, $studiengang_kz, $gruppen_kuerzel) = $lv_gruppe_array;
+
+				$lv_gruppe_object = new stdClass();
+				$lv_gruppe_object->gruppe = $gruppe;
+				$lv_gruppe_object->verband = $verband;
+				$lv_gruppe_object->semester = $semester;
+				$lv_gruppe_object->studiengang_kz = $studiengang_kz;
+				$lv_gruppe_object->kuerzel = $gruppen_kuerzel;
+
+				$gruppe_obj_array[] = $lv_gruppe_object;
+			}
+
+			$item->lektor = $lektor_obj_array;
+			$item->gruppe = $gruppe_obj_array;
+		}
 		
 		$this->terminateWithSuccess($stundenplan_data);
 	}
@@ -129,8 +175,7 @@ class Stundenplan extends FHCAPI_Controller
     public function Reservierungen($ort_kurzbz = null)
 	{
         $this->load->model('ressource/Reservierung_model', 'ReservierungModel');
-        $this->load->model('ressource/Stunde_model', 'StundeModel');
-        $this->load->model('ressource/Mitarbeiter_model','MitarbeiterModel');
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
 		//form validation
 		$this->load->library('form_validation');
@@ -143,18 +188,56 @@ class Stundenplan extends FHCAPI_Controller
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
-        // querying the stunden
-        $stunden = $this->StundeModel->load();
-
-        $stunden = $this->getDataOrTerminateWithError($stunden);
-
 		// querying the reservierungen
-		
-		$result = $this->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
-		
+		$reservierungen = $this->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
 
-        $result = $this->getDataOrTerminateWithError($result);
-		$this->terminateWithSuccess($result);
+        $reservierungen = $this->getDataOrTerminateWithError($reservierungen) ?? [];
+
+		foreach ($reservierungen as $reservierung) {
+
+			$lektor_obj_array = array();
+			$gruppe_obj_array = array();
+
+			// load lektor object
+			foreach ($reservierung->lektor as $lektor) {
+				$this->MitarbeiterModel->addLimit(1);
+				$lektor_object = $this->MitarbeiterModel->execReadOnlyQuery("
+				SELECT mitarbeiter_uid, vorname, nachname, kurzbz 
+				FROM public.tbl_mitarbeiter 
+				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
+				JOIN public.tbl_person person ON person.person_id = benutzer.person_id 
+				WHERE mitarbeiter_uid = ?", [$lektor]);
+				if (isError($lektor_object)) {
+					$this->show_error(getError($lektor_object));
+				}
+				$lektor_object = current(getData($lektor_object));
+				// only provide needed information of the mitarbeiter object 
+				$lektor_obj_array[] = $lektor_object;
+			}
+
+			// load gruppe object
+			foreach ($reservierung->gruppe as $lv_gruppe) {
+				$lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
+				$lv_gruppe_array = explode(",", $lv_gruppe);
+				list($gruppe, $verband, $semester, $studiengang_kz, $gruppen_kuerzel) = $lv_gruppe_array;
+
+				$lv_gruppe_object = new stdClass();
+				$lv_gruppe_object->gruppe = $gruppe;
+				$lv_gruppe_object->verband = $verband;
+				$lv_gruppe_object->semester = $semester;
+				$lv_gruppe_object->studiengang_kz = $studiengang_kz;
+				$lv_gruppe_object->kuerzel = $gruppen_kuerzel;
+
+				$gruppe_obj_array[] = $lv_gruppe_object;
+			}
+
+
+			$reservierung->gruppe = $gruppe_obj_array;
+			$reservierung->lektor = $lektor_obj_array;
+
+		}
+
+		$this->terminateWithSuccess($reservierungen);
         
 	}
 
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index 727acb219..3247b173f 100755
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -67,58 +67,8 @@ class Reservierung_model extends DB_Model
 		ORDER BY datum, beginn
 		", is_null($ort_kurzbz) ?[getAuthUID(), getAuthUID(),$start_date,$end_date]: [$ort_kurzbz, $start_date, $end_date]);
 
-		if(isError($query_result)){
-			show_error(getError($query_result));
-		}
-
-		$query_result = getData($query_result) ?? [];
 		
-		$this->load->model("ressrouce/Mitarbeiter_model","MitarbeiterModel");
-
-		foreach($query_result as $reservierung){
-
-			$lektor_obj_array = array();
-			$gruppe_obj_array = array();
-
-			// load lektor object
-			foreach ($reservierung->lektor as $lektor) {
-				$this->MitarbeiterModel->addLimit(1);
-				$lektor_object = $this->execReadOnlyQuery("
-				SELECT mitarbeiter_uid, vorname, nachname, kurzbz 
-				FROM public.tbl_mitarbeiter 
-				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
-				JOIN public.tbl_person person ON person.person_id = benutzer.person_id 
-				WHERE mitarbeiter_uid = ?", [$lektor]);
-				if (isError($lektor_object)) {
-					$this->show_error(getError($lektor_object));
-				}
-				$lektor_object = current(getData($lektor_object));
-				// only provide needed information of the mitarbeiter object 
-				$lektor_obj_array[] = $lektor_object;
-			}
-
-			// load gruppe object
-			foreach ($reservierung->gruppe as $lv_gruppe) {
-				$lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
-				$lv_gruppe_array = explode(",", $lv_gruppe);
-				list($gruppe, $verband, $semester, $studiengang_kz, $gruppen_kuerzel) = $lv_gruppe_array;
-
-				$lv_gruppe_object = new stdClass();
-				$lv_gruppe_object->gruppe = $gruppe;
-				$lv_gruppe_object->verband = $verband;
-				$lv_gruppe_object->semester = $semester;
-				$lv_gruppe_object->studiengang_kz = $studiengang_kz;
-				$lv_gruppe_object->kuerzel = $gruppen_kuerzel;
-
-				$gruppe_obj_array[] = $lv_gruppe_object;
-			}
-
-
-			$reservierung->gruppe = $gruppe_obj_array;
-			$reservierung->lektor = $lektor_obj_array;
-			
-		}
-		return success($query_result);
+		return $query_result;
 	}
 
 	/**
diff --git a/application/models/ressource/Stundenplan_model.php b/application/models/ressource/Stundenplan_model.php
index 6f291d743..300794099 100755
--- a/application/models/ressource/Stundenplan_model.php
+++ b/application/models/ressource/Stundenplan_model.php
@@ -142,7 +142,7 @@ class Stundenplan_model extends DB_Model
 	 */
 	public function stundenplanGruppierung($stundenplanViewQuery)
 	{
-		$gruppierteEvents = $this->execReadOnlyQuery("
+		$query_result = $this->execReadOnlyQuery("
 		SELECT 
 		'lehreinheit' as type, beginn, ende, datum,	
 		CONCAT(lehrfach,'-',lehrform) as topic,
@@ -182,60 +182,7 @@ class Stundenplan_model extends DB_Model
 		ORDER BY datum, beginn
 		");
 
-		if(isError($gruppierteEvents)){
-			$this->output(getError($gruppierteEvents));
-		}
-		
-		$gruppierteEvents = getData($gruppierteEvents) ?? [];
-
-		// get the benutzer object for the lektor of the lv	
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-		
-		foreach ($gruppierteEvents as $item) {
-			$lektor_obj_array = array();
-			$gruppe_obj_array = array();
-
-			// load lektor object
-			foreach ($item->lektor as $lv_lektor) {
-				$this->MitarbeiterModel->addLimit(1);
-				$lektor_object = $this->execReadOnlyQuery("
-				SELECT mitarbeiter_uid, vorname, nachname, kurzbz 
-				FROM public.tbl_mitarbeiter 
-				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
-				JOIN public.tbl_person person ON person.person_id = benutzer.person_id 
-				WHERE kurzbz = ?",[$lv_lektor]);
-				if (isError($lektor_object)) {
-					$this->show_error(getError($lektor_object));
-				}
-				$lektor_object = current(getData($lektor_object));
-				// only provide needed information of the mitarbeiter object 
-				$lektor_obj_array[] = $lektor_object;
-			}
-
-			// load gruppe object
-			foreach ($item->gruppe as $lv_gruppe) {
-				$lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
-				$lv_gruppe_array = explode(",", $lv_gruppe);
-				list($gruppe, $verband, $semester, $studiengang_kz, $gruppen_kuerzel) = $lv_gruppe_array;
-				
-				$lv_gruppe_object = new stdClass();
-				$lv_gruppe_object->gruppe = $gruppe;
-				$lv_gruppe_object->verband = $verband;
-				$lv_gruppe_object->semester = $semester;
-				$lv_gruppe_object->studiengang_kz = $studiengang_kz;
-				$lv_gruppe_object->kuerzel = $gruppen_kuerzel;
-				
-				$gruppe_obj_array[] = $lv_gruppe_object;
-			}
-
-			$item->lektor = $lektor_obj_array;
-			$item->gruppe = $gruppe_obj_array;
-		}
-
-		return success($gruppierteEvents);
+		return $query_result;
 	}
 
 	/**

From f2a57f85a8c13cda9ad04e24f0e9dc08e446906a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 11 Sep 2024 10:19:46 +0200
Subject: [PATCH 34/34] fixes the errors with the stundenplan/reservierungen
 data query

---
 .../api/frontend/v1/Stundenplan.php           | 132 ++++++------------
 .../models/ressource/Reservierung_model.php   |   4 +-
 public/js/apps/Cis/Stundenplan.js             |   4 +-
 .../js/components/Cis/Mylv/RoomInformation.js |   2 +-
 4 files changed, 50 insertions(+), 92 deletions(-)

diff --git a/application/controllers/api/frontend/v1/Stundenplan.php b/application/controllers/api/frontend/v1/Stundenplan.php
index 54c6a50e8..398b4e4cc 100644
--- a/application/controllers/api/frontend/v1/Stundenplan.php
+++ b/application/controllers/api/frontend/v1/Stundenplan.php
@@ -44,6 +44,12 @@ class Stundenplan extends FHCAPI_Controller
 		));
 
         $this->load->library('form_validation');
+
+		//load models
+		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
+		$this->load->model('ressource/Reservierung_model', 'ReservierungModel');
+
+
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -72,10 +78,6 @@ class Stundenplan extends FHCAPI_Controller
      */
 	public function getRoomplan()
 	{
-       
-        $this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-		$this->load->model('ressource/Stunde_model', 'StundeModel');
-		
         // form validation
         $this->load->library('form_validation');
         $this->form_validation->set_data($_GET);
@@ -89,11 +91,13 @@ class Stundenplan extends FHCAPI_Controller
         $start_date = $this->input->get('start_date', TRUE);
         $end_date = $this->input->get('end_date', TRUE);
 
-		$result = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date));  
+		$roomplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getRoomQuery($ort_kurzbz, $start_date, $end_date));  
 		
-        $result = $this->getDataOrTerminateWithError($result);
+        $roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
 
-		$this->terminateWithSuccess($result);
+		$this->expand_object_information($roomplan_data);
+
+		$this->terminateWithSuccess($roomplan_data);
 		
 	}
 
@@ -104,12 +108,6 @@ class Stundenplan extends FHCAPI_Controller
 	 */
 	public function getStundenplan(){
 
-		$this->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-
 		// form validation
 		$this->load->library('form_validation');
 		$this->form_validation->set_data($_GET);
@@ -126,8 +124,39 @@ class Stundenplan extends FHCAPI_Controller
 		$stundenplan_data = $this->StundenplanModel->stundenplanGruppierung($this->StundenplanModel->getStundenplanQuery(get_uid(),$start_date,$end_date)); 
 		$stundenplan_data = $this->getDataOrTerminateWithError($stundenplan_data) ?? [];
 
-		// get the benutzer object for the lektor of the lv	
-		foreach ($stundenplan_data as $item) {
+		$this->expand_object_information($stundenplan_data);
+		
+		$this->terminateWithSuccess($stundenplan_data);
+	}
+
+	// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the stundenplan of a student
+    public function Reservierungen($ort_kurzbz = null)
+	{
+		//form validation
+		$this->load->library('form_validation');
+		$this->form_validation->set_data($_GET);
+		$this->form_validation->set_rules('start_date', "StartDate", "required");
+		$this->form_validation->set_rules('end_date', "EndDate", "required");
+		if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
+
+        // storing the get parameter in local variables
+        $start_date = $this->input->get('start_date', TRUE);
+        $end_date = $this->input->get('end_date', TRUE);
+
+		// querying the reservierungen
+		$reservierungen = $this->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
+
+        $reservierungen = $this->getDataOrTerminateWithError($reservierungen) ?? [];
+
+		$this->expand_object_information($reservierungen);
+
+		$this->terminateWithSuccess($reservierungen);
+        
+	}
+
+	private function expand_object_information($data){
+		foreach ($data as $item) {
+
 			$lektor_obj_array = array();
 			$gruppe_obj_array = array();
 
@@ -164,81 +193,10 @@ class Stundenplan extends FHCAPI_Controller
 				$gruppe_obj_array[] = $lv_gruppe_object;
 			}
 
-			$item->lektor = $lektor_obj_array;
 			$item->gruppe = $gruppe_obj_array;
-		}
-		
-		$this->terminateWithSuccess($stundenplan_data);
-	}
-
-	// gets the reservierungen of a room if the ort_kurzbz parameter is supplied otherwise gets the reservierungen of the stundenplan of a student
-    public function Reservierungen($ort_kurzbz = null)
-	{
-        $this->load->model('ressource/Reservierung_model', 'ReservierungModel');
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-
-		//form validation
-		$this->load->library('form_validation');
-		$this->form_validation->set_data($_GET);
-		$this->form_validation->set_rules('start_date', "StartDate", "required");
-		$this->form_validation->set_rules('end_date', "EndDate", "required");
-		if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());
-
-        // storing the get parameter in local variables
-        $start_date = $this->input->get('start_date', TRUE);
-        $end_date = $this->input->get('end_date', TRUE);
-
-		// querying the reservierungen
-		$reservierungen = $this->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
-
-        $reservierungen = $this->getDataOrTerminateWithError($reservierungen) ?? [];
-
-		foreach ($reservierungen as $reservierung) {
-
-			$lektor_obj_array = array();
-			$gruppe_obj_array = array();
-
-			// load lektor object
-			foreach ($reservierung->lektor as $lektor) {
-				$this->MitarbeiterModel->addLimit(1);
-				$lektor_object = $this->MitarbeiterModel->execReadOnlyQuery("
-				SELECT mitarbeiter_uid, vorname, nachname, kurzbz 
-				FROM public.tbl_mitarbeiter 
-				JOIN public.tbl_benutzer benutzer ON benutzer.uid = mitarbeiter_uid
-				JOIN public.tbl_person person ON person.person_id = benutzer.person_id 
-				WHERE mitarbeiter_uid = ?", [$lektor]);
-				if (isError($lektor_object)) {
-					$this->show_error(getError($lektor_object));
-				}
-				$lektor_object = current(getData($lektor_object));
-				// only provide needed information of the mitarbeiter object 
-				$lektor_obj_array[] = $lektor_object;
-			}
-
-			// load gruppe object
-			foreach ($reservierung->gruppe as $lv_gruppe) {
-				$lv_gruppe = strtr($lv_gruppe, ['(' => '', ')' => '', '"' => '']);
-				$lv_gruppe_array = explode(",", $lv_gruppe);
-				list($gruppe, $verband, $semester, $studiengang_kz, $gruppen_kuerzel) = $lv_gruppe_array;
-
-				$lv_gruppe_object = new stdClass();
-				$lv_gruppe_object->gruppe = $gruppe;
-				$lv_gruppe_object->verband = $verband;
-				$lv_gruppe_object->semester = $semester;
-				$lv_gruppe_object->studiengang_kz = $studiengang_kz;
-				$lv_gruppe_object->kuerzel = $gruppen_kuerzel;
-
-				$gruppe_obj_array[] = $lv_gruppe_object;
-			}
-
-
-			$reservierung->gruppe = $gruppe_obj_array;
-			$reservierung->lektor = $lektor_obj_array;
+			$item->lektor = $lektor_obj_array;
 
 		}
-
-		$this->terminateWithSuccess($reservierungen);
-        
 	}
 
     
diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php
index 3247b173f..fdfc9926b 100755
--- a/application/models/ressource/Reservierung_model.php
+++ b/application/models/ressource/Reservierung_model.php
@@ -41,7 +41,7 @@ class Reservierung_model extends DB_Model
 				WHEN res.gruppe_kurzbz IS NOT NULL THEN res.gruppe_kurzbz 
 				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(res.semester AS varchar),'/'),COALESCE(CAST(res.verband AS varchar),'/')) 
 			END as gruppen_kuerzel
-			FROM lehre.vw_reservierung res
+			FROM campus.vw_reservierung res
 			JOIN public.tbl_studiengang studg ON studg.studiengang_kz=res.studiengang_kz
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
 			WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ?";
@@ -52,7 +52,7 @@ class Reservierung_model extends DB_Model
 		SELECT 
 		'reservierung' as type, beginn, ende, datum,
 		COALESCE(titel, beschreibung) as topic,
-		array_agg(DISTINCT uid) as lektor,
+		array_agg(DISTINCT mitarbeiter_kurzbz) as lektor,
 		array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe, 
 		
 		ort_kurzbz, 'FFFFFF' as farbe
diff --git a/public/js/apps/Cis/Stundenplan.js b/public/js/apps/Cis/Stundenplan.js
index 13315abb6..a38208275 100755
--- a/public/js/apps/Cis/Stundenplan.js
+++ b/public/js/apps/Cis/Stundenplan.js
@@ -76,8 +76,8 @@ const app = Vue.createApp({
 	<h2>Stundenplan</h2>
 	<hr>
 	<fhc-calendar v-slot="{event, day}" :events="events" initial-mode="week" show-weeks>
-		<div class="d-flex flex-column align-items-center justify-content-evenly h-100">
-			<span>{{event.orig.title}}</span>
+		<div type="button" class="d-flex flex-column align-items-center justify-content-evenly h-100">
+			<span>{{event.orig.topic}}</span>
 			<span v-for="lektor in event.orig.lektor">{{lektor.kurzbz}}</span>
 			<span>{{event.orig.ort_kurzbz}}</span>
 		</div>
diff --git a/public/js/components/Cis/Mylv/RoomInformation.js b/public/js/components/Cis/Mylv/RoomInformation.js
index 1c5ab31e0..236b84efd 100644
--- a/public/js/components/Cis/Mylv/RoomInformation.js
+++ b/public/js/components/Cis/Mylv/RoomInformation.js
@@ -87,7 +87,7 @@ export default{
     <div>
 		<fhc-calendar @change:range="updateRange" v-slot="{event,day}" :initialDate="currentDate" :events="events" initial-mode="week" show-weeks>
             <a class="text-decoration-none text-dark" href="#" :title="event.orig.title + ' - ' + event.orig.lehrfach_bez + ' [' + event.orig.ort_kurzbz+']'"   >
-                <div class="d-flex flex-column align-items-center justify-content-evenly h-100" >
+                <div type="button" class="d-flex flex-column align-items-center justify-content-evenly h-100" >
 
                         <!-- render content for stundenplan -->
                         <span >{{event.orig.topic}}</span>