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]); 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: `
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 {
- + ` }; diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js index 58b9bfc09..855ba70fc 100644 --- a/public/js/components/Cis/Profil/MitarbeiterProfil.js +++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js @@ -338,9 +338,9 @@ export default {
-
- -
+
+ +
+
-
@@ -367,30 +367,42 @@ export default {
+
-
+ +
+
+ +
+
+ +
+
+ +
+
+
-
+
-
+
-
@@ -412,9 +424,9 @@ export default {
+
-
@@ -439,8 +451,8 @@ 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..f6e13da77 100644 --- a/public/js/components/Cis/Profil/Profil.js +++ b/public/js/components/Cis/Profil/Profil.js @@ -171,8 +171,8 @@ export const Profil = { const data = viewDataResult.data; if (!data) return; + this.isEditable = data.editable; this.view = data.profil_data.view; - this.isEditable = data.profil_data.editable; this.data = data.profil_data.data; this.calendarSyncUrls = data.calendar_sync_urls ?? []; this.authPermissions = data.permissions; diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js index 9b0367f84..badc892f6 100644 --- a/public/js/components/Cis/Profil/StudentProfil.js +++ b/public/js/components/Cis/Profil/StudentProfil.js @@ -280,26 +280,25 @@ export default {
-
-
+
+
+
-
-
@@ -308,30 +307,42 @@ export default {
+
-
+ +
+
+ +
+
+ +
+
+ +
+
+
-
+
-
+
-
@@ -354,9 +365,9 @@ export default {
+
-
@@ -398,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 /> @@ -408,27 +419,34 @@ 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 {
-
+ +