From 2c3754b33f61bfcdb88e78d6f6191f4aa1d86012 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Wed, 3 Sep 2025 13:51:41 +0200 Subject: [PATCH 1/8] more tooltips so people can avoid reading the wiki --- system/phrasesupdate.php | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 82ea03ba0..76cc70f06 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -34030,6 +34030,46 @@ array( ) ) ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'tooltipAssistenzVonDatum', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Untere Datumsgrenze für das Laden von Entschuldigungsdaten', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Lower date limit for the data loading of excuse notes', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'tooltipAssistenzBisDatum', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Obere Datumsgrenze für das Laden von Entschuldigungsdaten', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Upper date limit for the data loading of excuse notes', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), // // DIGITALE ANWESENHEITEN PHRASEN END // From 56e74fc3656c93040f8350fe47f3d099617b0b04 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Mon, 8 Sep 2025 11:59:25 +0200 Subject: [PATCH 2/8] fix phrasesLib init so reference in lvMenuBuild event doesnt break --- application/controllers/api/frontend/v1/LvMenu.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php index 2a305dbb5..18f86c389 100644 --- a/application/controllers/api/frontend/v1/LvMenu.php +++ b/application/controllers/api/frontend/v1/LvMenu.php @@ -51,7 +51,7 @@ class LvMenu extends FHCAPI_Controller $this->load->library("PermissionLib", null, 'PermissionLib'); - $this->load->library("PhrasesLib"); + $this->load->library("PhrasesLib", null, 'PhrasesLib'); $this->loadPhrases(array('global', 'lehre')); } From d015b208fc8191bde68370394bbe89d2617c5ce2 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Mon, 8 Sep 2025 14:35:20 +0200 Subject: [PATCH 3/8] dont reassign event.lektor inside computed property depending on event.lektor --- .../components/Cis/Renderer/Lehreinheit/calendarEvent.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js index ca8d470e2..badbf537f 100644 --- a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js +++ b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js @@ -23,14 +23,6 @@ export default { this.$p.t('person/ort'), this.event.ort_kurzbz ].join(": ")); - - this.event.lektor = [ - this.event.lektor[0], - this.event.lektor[0], - this.event.lektor[0], - this.event.lektor[0], - this.event.lektor[0], - ]; if (Array.isArray(this.event.lektor) && this.event.lektor.length > 0) { if (this.event.lektor.length > 3) { From eee9d6b691f3c9c1939757c9d0b399f95a3e9465 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Mon, 8 Sep 2025 17:28:09 +0200 Subject: [PATCH 4/8] 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*/ ` -
+

Content was not found

`, 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*/`
{{$p.t('lehre','lehrveranstaltungsUnavailable')}}
@@ -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"> -

{{menuItem.name}}

+

{{ getMenuName(menuItem) }}

{{text}}
    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('&', '&') }) @@ -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 = { -
    +