From eee9d6b691f3c9c1939757c9d0b399f95a3e9465 Mon Sep 17 00:00:00 2001
From: Johann Hoffmann <ma0646@technikum-wien.at>
Date: Mon, 8 Sep 2025 17:28:09 +0200
Subject: [PATCH] raumsuche phrasen change & fix; fhcapi -> api; lvMenu try to
 use phrasenkey for responsiveness instead of the already looked up phrase;
 tried investigating news carousel bug, not sure if bug or feature - at least
 declared non changing variables as const;

---
 public/js/api/factory/ort.js                  | 14 ++++++
 .../Cms/Content_types/Raum_contentmittitel.js |  4 +-
 public/js/components/Cis/Mylv/LvMenu.js       |  9 +++-
 .../js/components/Cis/Raumsuche/Raumsuche.js  | 46 +++++++++++--------
 public/js/components/DashboardWidget/News.js  | 10 ++--
 system/phrasesupdate.php                      | 46 +++++++++++++++++--
 6 files changed, 98 insertions(+), 31 deletions(-)

diff --git a/public/js/api/factory/ort.js b/public/js/api/factory/ort.js
index 90488df1b..2e06d6b71 100644
--- a/public/js/api/factory/ort.js
+++ b/public/js/api/factory/ort.js
@@ -22,5 +22,19 @@ export default {
 			url: '/api/frontend/v1/Ort/ContentID',
 			params: { ort_kurzbz: ort_kurbz }
 		};
+	},
+	getRooms(datum, von, bis, typ, personenanzahl = 0) {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Ort/getRooms',
+			params: { datum, von, bis, typ, personenanzahl }
+		};
+	},
+	getRoomTypes() {
+		return {
+			method: 'get',
+			url: '/api/frontend/v1/Ort/getTypes',
+			params: { }
+		};
 	}
 };
\ No newline at end of file
diff --git a/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js b/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js
index d7b9ed956..8373b6ac9 100644
--- a/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js
+++ b/public/js/components/Cis/Cms/Content_types/Raum_contentmittitel.js
@@ -12,7 +12,7 @@ export default {
           required:true,
       },
 	  content_id:{
-		type:Number,
+		type: [Number, String],
 	  }
     },
 	methods: {
@@ -129,7 +129,7 @@ export default {
     template: /*html*/ `
       <!-- div that contains the content -->
 <!--       TODO: test with more img content from cms-->
-      <div v-if="imgContent"><img v-bind="imgContent"></img></div>
+      <div v-if="imgContent"><img v-bind="imgContent"/></div>
       <div v-html="content" v-else-if="content" ></div>
       <p v-else>Content was not found</p>
       `,
diff --git a/public/js/components/Cis/Mylv/LvMenu.js b/public/js/components/Cis/Mylv/LvMenu.js
index 88340f01b..ef820ebb0 100644
--- a/public/js/components/Cis/Mylv/LvMenu.js
+++ b/public/js/components/Cis/Mylv/LvMenu.js
@@ -43,6 +43,13 @@ export default {
 				return menuItem.c4_link ?? null;
 			}
 		},
+		getMenuName(menuItem) {
+			if(menuItem.phrase) {
+				return this.$p.t(menuItem.phrase)
+			} else {
+				return menuItem.name
+			}
+		}
 	},
 	template:/*html*/`
 	<div v-if="!menu">{{$p.t('lehre','lehrveranstaltungsUnavailable')}}</div>
@@ -54,7 +61,7 @@ export default {
 					:disabled="c4_disabled(menuItem)" :data-bs-toggle="menuItem.c4_moodle_links?.length?'dropdown':null"
 					class="menu-entry p-2 w-100 text-wrap border border-1 rounded-3 d-flex flex-column align-items-center justify-content-center text-center text-decoration-none link h-100">
 						<img :src="menuItem.c4_icon" :alt="menuItem.name" />
-						<p class="w-100 mt-2 mb-0">{{menuItem.name}}</p>
+						<p class="w-100 mt-2 mb-0">{{ getMenuName(menuItem) }}</p>
 						<a v-for="([text,link],index) in menuItem.c4_linkList" target="_blank" :href="link" class="my-1 w-100 submenu text-decoration-none" :index="index">{{text}}</a>
 					</a>
 					<ul v-if="menuItem.c4_moodle_links?.length" class="dropdown-menu p-0" :aria-labelledby="menuItem.name">
diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js
index 3f66a5508..f45c8c61f 100644
--- a/public/js/components/Cis/Raumsuche/Raumsuche.js
+++ b/public/js/components/Cis/Raumsuche/Raumsuche.js
@@ -1,6 +1,6 @@
 import {CoreFilterCmpt} from "../../../components/filter/Filter.js";
 import VueDatePicker from '../../vueDatepicker.js.php';
-
+import ApiOrt from '../../../api/factory/ort.js'
 export const Raumsuche =  {
 	name: "Raumsuche",
 	props: {
@@ -54,8 +54,8 @@ export const Raumsuche =  {
 				columns: [
 					{title: Vue.computed(() => this.$p.t('rauminfo/raum_kurzbz')), field: 'ort_kurzbz', widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('global/bezeichnung')), field: 'bezeichnung', widthGrow: 2},
-					{title: Vue.computed(() => this.$p.t('global/nummer')), field: 'nummer', widthGrow: 1},
-					{title: Vue.computed(() => this.$p.t('global/personen')), field: 'personen', widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('rauminfo/raumnummer')), field: 'nummer', widthGrow: 1},
+					{title: Vue.computed(() => this.$p.t('rauminfo/personcap')), field: 'personen', widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('rauminfo/rauminfo')),
 						field: 'linkInfo', formatter: this.linkFormatter, widthGrow: 1},
 					{title: Vue.computed(() => this.$p.t('rauminfo/roomReservations')), 
@@ -68,17 +68,6 @@ export const Raumsuche =  {
 				handler: async () => {
 					this.tableBuiltResolve()
 				}
-			},
-			{
-				event: "cellClick",
-				handler: async (e, cell) => {
-
-					if((cell.column.field === 'linkInfo' || cell.column.field === 'linkRes') && cell.value){
-						window.open(cell.value, '_blank');
-						e.stopPropagation();
-					}
-					
-				}
 			}
 			]};
 	},
@@ -132,7 +121,8 @@ export const Raumsuche =  {
 			this.$refs.raumsucheTable.tabulator.setData(d);
 		},
 		loadRoomTypes() {
-			this.$fhcApi.factory.ort.getRoomTypes().then(res => {
+			this.$api.call(ApiOrt.getRoomTypes())
+				.then(res => {
 				res?.data?.forEach(type => {
 					type.beschreibung = type.beschreibung.replace('&amp;', '&')
 				})
@@ -141,7 +131,7 @@ export const Raumsuche =  {
 			})
 		},
 		loadRooms() {
-			this.$fhcApi.factory.ort.getRooms(this.datum.toISOString(), this.getTimeString(this.von), this.getTimeString(this.bis), this.selectedType?.raumtyp_kurzbz ?? '', this.anzahl)
+			this.$api.call(ApiOrt.getRooms(this.datum.toISOString(), this.getTimeString(this.von), this.getTimeString(this.bis), this.selectedType?.raumtyp_kurzbz ?? '', this.anzahl))
 				.then(res => {
 					if(res?.data?.retval) this.setupData(res.data.retval)
 			})
@@ -183,6 +173,18 @@ export const Raumsuche =  {
 				this.$refs.raumsucheTable.$refs.table.style.setProperty('height', h+'px')
 			}
 
+			const cols = this.$refs.raumsucheTable.tabulator.getColumns()
+
+			// phrasen race condition bandaid
+			this.raumsucheTableOptions.columns[0].title = await this.$p.t('rauminfo/raum_kurzbz')
+			this.raumsucheTableOptions.columns[1].title = await this.$p.t('global/bezeichnung')
+			this.raumsucheTableOptions.columns[2].title = await this.$p.t('rauminfo/raumnummer')
+			this.raumsucheTableOptions.columns[3].title = await this.$p.t('rauminfo/personcap')
+			this.raumsucheTableOptions.columns[4].title = await this.$p.t('rauminfo/rauminfo')
+			this.raumsucheTableOptions.columns[5].title = await this.$p.t('rauminfo/roomReservations')
+
+			this.$refs.raumsucheTable.tabulator.setColumns(cols)
+			
 		}
 	},
 	computed: {
@@ -239,7 +241,7 @@ export const Raumsuche =  {
 			</VueDatePicker>
 		</div>
 		
-		<div class="col-lg-auto">
+		<div class="col-12 col-lg-3">
 			<select ref="raumtyp" id="raumtypSelect" v-model="selectedType" class="form-select" 
 			:aria-label="$p.t('global/studiensemester_auswaehlen')" @change="setRoute($event.target.value)">
 				<option :key="defaultType" selected :value="defaultType">{{defaultType.beschreibung}}</option>
@@ -248,10 +250,14 @@ export const Raumsuche =  {
 		</div>
 		
 
-		<div class="col-4 col-lg-2">
-			<InputNumber v-model="anzahl" :prefix="$p.t('rauminfo/anzahlPersonen') + ': '" inputId="anzahlInput" :min="1" :max="100" />
+		<div class="col-12 col-lg-3">
+			<InputNumber v-model="anzahl" 
+			:prefix="$p.t('rauminfo/minCapacity') + ': '" 
+			inputId="anzahlInput" :min="1" :max="1000" 
+			:style="{'width': '100%'}"
+			/>
 		</div>
-		<div class="col-8 col-lg-2 d-flex justify-content-center align-items-center">
+		<div class="col-12 col-lg-2">
 			<button class="btn btn-primary border-0" @click="search">{{ $p.t('rauminfo/roomSearch') }} <i class="fa fa-magnifying-glass"></i></button>
 		</div>
 	</div>
diff --git a/public/js/components/DashboardWidget/News.js b/public/js/components/DashboardWidget/News.js
index f0b6ec75a..103bc4fa1 100644
--- a/public/js/components/DashboardWidget/News.js
+++ b/public/js/components/DashboardWidget/News.js
@@ -106,7 +106,7 @@ export default {
 		setPrev() {
 			const thisIndex = this.allNewsList.findIndex(n=>n.news_id == this.selected.news_id)
 			const prevIndex = thisIndex ? thisIndex - 1 : this.allNewsList.length - 1
-			
+
 			this.setSelected(this.allNewsList[prevIndex])
 			this.updateNewsContentClasses();
 		},
@@ -118,14 +118,14 @@ export default {
 			return classString
 		},
 		async setSelected(news) {
-			let clickedElement = document.getElementById('card-'+news.news_id);
-			let clickedElementIndex = this.allNewsList.indexOf(news);
-			let oldElementIndex = this.allNewsList.indexOf(this.selected);
+			const clickedElement = document.getElementById('card-'+news.news_id);
+			const clickedElementIndex = this.allNewsList.indexOf(news);
+			const oldElementIndex = this.allNewsList.indexOf(this.selected);
 			
 			//if the clicked element is already active, do nothing
 			if(clickedElementIndex === oldElementIndex) return;
 			//add prev/next class to the clicked element
-			if(clickedElementIndex > oldElementIndex){
+			if(clickedElementIndex > oldElementIndex) {
 				clickedElement.classList.add('carousel-item-next');
 			}else{
 				clickedElement.classList.add('carousel-item-prev');
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 76cc70f06..8f3be1fb9 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -20707,18 +20707,18 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'rauminfo',
-		'phrase' => 'anzahlPersonen',
+		'phrase' => 'minCapacity',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => "Anzahl Person",
+				'text' => "Mindestpersonenkapazität",
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => "Number of People",
+				'text' => "Minimum person capacity",
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -20744,6 +20744,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'rauminfo',
+		'phrase' => 'personcap',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Personen Kapazität",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Person Capacity",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'rauminfo',
+		'phrase' => 'raumnummer',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Raumnummer",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Room Number",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'rauminfo',