From d9ea5a95af0288a33b629cefbf1bc2b55bf5b8bf Mon Sep 17 00:00:00 2001 From: adisposkofh Date: Mon, 11 May 2026 15:04:32 +0200 Subject: [PATCH 1/5] fixed issue with undefined reservierung attributes --- application/models/ressource/Reservierung_model.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/application/models/ressource/Reservierung_model.php b/application/models/ressource/Reservierung_model.php index 59de896eb..461a009b0 100644 --- a/application/models/ressource/Reservierung_model.php +++ b/application/models/ressource/Reservierung_model.php @@ -95,11 +95,12 @@ class Reservierung_model extends DB_Model $query_result = $this->execReadOnlyQuery(" SELECT + DISTINCT(insertvon), 'reservierung' as type, beginn, ende, datum, COALESCE(titel, beschreibung) as topic, array_agg(DISTINCT mitarbeiter_kurzbz) as lektor, array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe, - + array_agg(DISTINCT(uid)) as uids, ort_kurzbz, 'FFFFFF' as farbe FROM @@ -107,7 +108,7 @@ class Reservierung_model extends DB_Model " . $subquery . " ) AS subquery - GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung + GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung, insertvon ORDER BY datum, beginn ", [$uid ?? getAuthUID(), $start_date, $end_date]); From 0b40455e3cd31decd066c280869fe62ff7f6ae15 Mon Sep 17 00:00:00 2001 From: adisposkofh Date: Mon, 11 May 2026 15:49:20 +0200 Subject: [PATCH 2/5] only displaying avg grade for students --- .../components/Cis/Mylv/Semester/Studiengang.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang.js b/public/js/components/Cis/Mylv/Semester/Studiengang.js index 7ff1a0d51..c026f952f 100644 --- a/public/js/components/Cis/Mylv/Semester/Studiengang.js +++ b/public/js/components/Cis/Mylv/Semester/Studiengang.js @@ -2,6 +2,8 @@ import MylvSemesterStudiengangLv from "./Studiengang/Lv.js"; import MylvSemesterStudiengangAverageGrade from "./Studiengang/AverageGrade.js"; import Phrasen from "../../../../mixins/Phrasen.js"; +import ApiAuthinfo from '../../../../api/factory/authinfo.js'; + export default { name: 'Studiengang', components: { @@ -19,6 +21,11 @@ export default { lvs: Array, sg_bezeichnung_eng: String }, + data() { + return { + isAverageGradeDisplayed: false, + } + }, computed: { lehrveranstaltungen() { return [... new Map( @@ -34,6 +41,14 @@ export default { note(lv) { return lv.benotung ? lv.znote || lv.lvnote || null : null; }, + async checkIfAverageGradeIsDisplayed() { + const authInfoResponse = await this.$api.call(ApiAuthinfo.getAuthInfo()); + const authInfo = authInfoResponse.data; + this.isAverageGradeDisplayed = !!authInfo.isStudent; + }, + }, + created() { + this.checkIfAverageGradeIsDisplayed(); }, template: `
@@ -46,7 +61,7 @@ export default {
- + ` }; From e840be84ebd19625b4c9c5e2da0d8754d53c4f09 Mon Sep 17 00:00:00 2001 From: adisposkofh Date: Mon, 11 May 2026 16:47:41 +0200 Subject: [PATCH 3/5] positioning of profile cards 'quick links' and 'calendar sync' --- .../Cis/Profil/MitarbeiterProfil.js | 82 +++++++++++-------- .../Cis/Profil/MitarbeiterViewProfil.js | 27 +++--- public/js/components/Cis/Profil/Profil.js | 1 + .../js/components/Cis/Profil/StudentProfil.js | 53 +++++++----- .../Cis/Profil/StudentViewProfil.js | 15 ++-- 5 files changed, 102 insertions(+), 76 deletions(-) diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js index 58b9bfc09..bccbf4eb5 100644 --- a/public/js/components/Cis/Profil/MitarbeiterProfil.js +++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js @@ -338,8 +338,8 @@ export default {
-
- +
+
+
-
@@ -367,30 +367,42 @@ export default {
+
-
+ +
+
+ +
+
+ +
+
+ +
+
+
-
+
-
+
-
@@ -412,9 +424,9 @@ export default {
+
-
@@ -439,8 +451,8 @@ export default {
+
-
+
-
-
-
- -
-
@@ -485,29 +492,36 @@ export default {
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
+ +
+
+ +
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js index a1cf77aea..3362b56d7 100644 --- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js +++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js @@ -225,15 +225,6 @@ export default {
- - -
@@ -242,27 +233,33 @@ export default {
+
-
+ +
+
+ +
+
+
-
+
-
@@ -284,15 +281,15 @@ export default {
- -
+ +
+
-
diff --git a/public/js/components/Cis/Profil/Profil.js b/public/js/components/Cis/Profil/Profil.js index cba34951c..ab7eb0f3d 100644 --- a/public/js/components/Cis/Profil/Profil.js +++ b/public/js/components/Cis/Profil/Profil.js @@ -176,6 +176,7 @@ export const Profil = { this.data = data.profil_data.data; this.calendarSyncUrls = data.calendar_sync_urls ?? []; this.authPermissions = data.permissions; + console.log(data.profil_data); }, zustellAdressenCount() { if (!this.data || !this.data.adressen) { diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js index 9b0367f84..ac4f367b5 100644 --- a/public/js/components/Cis/Profil/StudentProfil.js +++ b/public/js/components/Cis/Profil/StudentProfil.js @@ -292,14 +292,13 @@ export default {
+
-
-
@@ -308,30 +307,42 @@ export default {
+
-
+ +
+
+ +
+
+ +
+
+ +
+
+
-
+
-
+
-
@@ -354,9 +365,9 @@ export default {
+
-
@@ -408,11 +419,6 @@ export default {
-
-
- -
-
@@ -426,9 +432,21 @@ export default {
+ +
+
+ +
+
+ +
+
+ +
+
+
-
@@ -438,18 +456,13 @@ export default {
+
-
-
-
-
- -
-
+
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js index 426bb9df3..cca9b22a5 100644 --- a/public/js/components/Cis/Profil/StudentViewProfil.js +++ b/public/js/components/Cis/Profil/StudentViewProfil.js @@ -121,12 +121,12 @@ export default {
- -
-
- -
-
+ +
+
+ +
+
@@ -155,7 +155,8 @@ export default {
-
+ +
From a9a56bb1e952a639805d35a4549f21c1e4dbe827 Mon Sep 17 00:00:00 2001 From: adisposkofh Date: Mon, 11 May 2026 17:03:33 +0200 Subject: [PATCH 4/5] fixed issue with parsing isEditable from fetched profile view data --- .../components/Cis/Profil/MitarbeiterProfil.js | 4 ++-- public/js/components/Cis/Profil/Profil.js | 3 +-- public/js/components/Cis/Profil/StudentProfil.js | 16 ++++++++-------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js index bccbf4eb5..855ba70fc 100644 --- a/public/js/components/Cis/Profil/MitarbeiterProfil.js +++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js @@ -340,7 +340,7 @@ export default {
-
+
@@ -409,7 +409,7 @@ export default { @tableBuilt="zutrittsgruppenTableBuilt" :title="$p.t('profil','zutrittsGruppen')" ref="zutrittsgruppenTable" - :tabulator-options="zutrittsgruppen_table_options" + :tabulator-options="zutrittsgruppen_table_options" tableOnly :sideMenu="false" noColumnFilter /> @@ -420,14 +420,14 @@ export default {
-
+
From 15441a46f7850747bdb78c78ac59dff3c2517128 Mon Sep 17 00:00:00 2001 From: adisposkofh Date: Mon, 11 May 2026 17:35:09 +0200 Subject: [PATCH 5/5] initializing stg org lv plan with provided url params --- public/js/components/Cis/LvPlan/StgOrg.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/js/components/Cis/LvPlan/StgOrg.js b/public/js/components/Cis/LvPlan/StgOrg.js index 3a42505e9..5b6ddb8e6 100644 --- a/public/js/components/Cis/LvPlan/StgOrg.js +++ b/public/js/components/Cis/LvPlan/StgOrg.js @@ -319,6 +319,10 @@ export default { this.loadListGroup(); } } + + if (this.formData.stgkz) { + this.loadLvPlan(); + } }, template: `