From 9e3ebca0a4c7de976a9eabb3f0db20fd59bf8d9d Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Thu, 7 Aug 2025 09:20:24 +0200 Subject: [PATCH 1/9] fix vue warning duplicate attribute class --- public/js/components/Cis/Renderer/Feiertage/calendarEvent.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js b/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js index d226e935a..79e3c8568 100644 --- a/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js +++ b/public/js/components/Cis/Renderer/Feiertage/calendarEvent.js @@ -8,7 +8,7 @@ export default { }, template: `
- + {{ event.titel }}
`, }; \ No newline at end of file From 954cd16d100aeab58e4d49f8fcbeb6d69badfb94 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Thu, 7 Aug 2025 09:21:12 +0200 Subject: [PATCH 2/9] use getAktOrNextSemester to determine preselected semester --- application/controllers/api/frontend/v1/Studium.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/controllers/api/frontend/v1/Studium.php b/application/controllers/api/frontend/v1/Studium.php index fb4d3ce3c..d17f0c1a1 100644 --- a/application/controllers/api/frontend/v1/Studium.php +++ b/application/controllers/api/frontend/v1/Studium.php @@ -58,8 +58,8 @@ class Studium extends FHCAPI_Controller $parameter_semester = $this->input->get('semester',true); $parameter_studienplan = $this->input->get('studienplan',true); - $aktuelles_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->getAkt())); - + $aktuelles_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->getAktOrNextSemester())); + if($this->getDataOrTerminateWithError($this->StudentModel->isStudent(getAuthUID()))){ $studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $aktuelles_studiensemester->studiensemester_kurzbz]); $studentLehrverband = current($this->getDataOrTerminateWithError($studentLehrverband)); From 8048b9d9c35328a9027680d8ce76c8a0b6212971 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Thu, 7 Aug 2025 09:30:57 +0200 Subject: [PATCH 3/9] use light text color in language selector --- public/js/components/Cis/Sprachen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/components/Cis/Sprachen.js b/public/js/components/Cis/Sprachen.js index b4db0315a..51dfa4669 100644 --- a/public/js/components/Cis/Sprachen.js +++ b/public/js/components/Cis/Sprachen.js @@ -23,7 +23,7 @@ export default { template:/*html*/`
- +
`, From 4f2499862fa66f1c072eae451dbc66be3b9d6834 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Thu, 7 Aug 2025 09:45:19 +0200 Subject: [PATCH 4/9] scale height of images in news widget --- public/css/components/dashboard/news.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/css/components/dashboard/news.css b/public/css/components/dashboard/news.css index 6b42f6160..4c4616aa5 100644 --- a/public/css/components/dashboard/news.css +++ b/public/css/components/dashboard/news.css @@ -103,7 +103,8 @@ .widgets-news img { - max-width: 100%; + max-width: 100%; + height: auto; } .fhc-news-menu-item { From 8494033bda777ba02cd258999f0c4143f36f9b95 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Thu, 7 Aug 2025 13:35:47 +0200 Subject: [PATCH 5/9] CIS4 Dashboard: add workaround for chrome fireing event dragend when styles are manipulated during dragging --- public/js/components/Drop/Grid.js | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/public/js/components/Drop/Grid.js b/public/js/components/Drop/Grid.js index 31bdeb74e..74d67e49d 100644 --- a/public/js/components/Drop/Grid.js +++ b/public/js/components/Drop/Grid.js @@ -408,16 +408,19 @@ export default { this.draggedItem = item; - this.$emit('draggedItem',item); - - this.draggedNode = evt.target.closest(".drop-grid-item"); - //clones the widget for the drag Image - let clone = evt.target.closest(".drop-grid-item")?.cloneNode(true); - - clone.style.zIndex = 5; - clone.classList.add("widgetClone"); - this.$refs.container.appendChild(clone); - this.clonedWidget = clone; + this.$emit('draggedItem', item); + // workaround for chrome fireing event dragend when styles are manipulated during dragging + setTimeout(() => { + this.draggedNode = evt.target.closest(".drop-grid-item"); + //clones the widget for the drag Image + let clone = evt.target.closest(".drop-grid-item")?.cloneNode(true); + + clone.style.zIndex = 5; + clone.classList.add("widgetClone"); + this.$refs.container.appendChild(clone); + this.clonedWidget = clone; + }, 0); + this.draggedOffset = [item.x - this.x, item.y - this.y]; this._dragStart(evt, item); }, From d071d0d9febb0effe2d6f4dce0bf99d28f31de14 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Thu, 7 Aug 2025 14:25:22 +0200 Subject: [PATCH 6/9] fix theme switch position in chrome based browsers --- public/js/components/Cis/Menu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js index ee1b671e6..f073d5a38 100644 --- a/public/js/components/Cis/Menu.js +++ b/public/js/components/Cis/Menu.js @@ -117,7 +117,7 @@ export default {