From 9fe7dd069fef40a738b5ce3021c1ca91bd43c0cf Mon Sep 17 00:00:00 2001 From: SimonGschnell Date: Mon, 14 Jul 2025 15:23:57 +0200 Subject: [PATCH] refactor(LvPlan Lektoren in LV Ansicht): passt die Ansicht der Lektoren in den LVs des LvPlan an wenn mehrere Lektoren vorhanden sind --- public/css/Cis4/Cis.css | 18 ++++++++++++++++ public/css/Cis4/CoreCalendarEvents.css | 21 ++++++++++++++++++- .../Cis/Renderer/Lehreinheit/calendarEvent.js | 19 +++++++++++------ .../Cis/Renderer/Lehreinheit/modalContent.js | 8 ++++--- system/phrasesupdate.php | 20 ++++++++++++++++++ 5 files changed, 76 insertions(+), 10 deletions(-) diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css index 99ab609b9..8311ceadb 100644 --- a/public/css/Cis4/Cis.css +++ b/public/css/Cis4/Cis.css @@ -807,4 +807,22 @@ html { .mylv-semester-studiengang-lv .card-header { min-height: 55px; +} + +#lektorenContainer{ + display: grid; + grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr; + +} + +@media(max-width: 990px) { + #lektorenContainer{ + grid-template-columns: 1fr 1fr 1fr; + } +} + +@media(max-width: 575px) { + #lektorenContainer { + grid-template-columns: 1fr 1fr; + } } \ No newline at end of file diff --git a/public/css/Cis4/CoreCalendarEvents.css b/public/css/Cis4/CoreCalendarEvents.css index f248f4a61..d886e024e 100644 --- a/public/css/Cis4/CoreCalendarEvents.css +++ b/public/css/Cis4/CoreCalendarEvents.css @@ -16,7 +16,8 @@ white-space: nowrap; text-overflow: ellipsis; display:flex; - place-content: center space-evenly; + justify-content: space-evenly; + align-items:center; } @@ -24,6 +25,10 @@ display:none; } +.monthPageContainer .lehreinheitEventContent #lektorEllipsis { + display: none; +} + /* Lehreinheits Events in Week Page */ .weekPageContainer .lehreinheitEventContent { display: grid; @@ -32,6 +37,13 @@ } +@media(max-width: 1199px){ + .weekPageContainer .lehreinheitEventContent { + grid-template-columns: 1fr; + } +} + + .weekPageContainer .lehreinheitEventContent #lehreinheitEventHeader { display: grid; padding: .25rem .5rem .25rem .25rem; @@ -100,6 +112,13 @@ align-items:center; color: var(--fhc-light); } +.weekPageContainer .feiertagEventContent { + display: grid; + grid-template-columns: auto 1fr; + justify-items: center; + align-items: center; + color: var(--fhc-light); +} .weekPageContainer .feiertagEventContent #ferienEventIcon { margin: 0.25rem; diff --git a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js index dc3cdb443..a334ea4d4 100644 --- a/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js +++ b/public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js @@ -15,18 +15,21 @@ export default { let tooltipString = `${this.$p.t('global','uhrzeit')}: ${this.convertTime(this.event.beginn.split(":"))} / ${this.convertTime(this.event.ende.split(":")) }`; tooltipString += `\n${this.$p.t('profilUpdate', 'topic')}: ${this.event.topic}`; - + tooltipString += `${this.$p.t('person', 'ort')}: ${this.event.ort_kurzbz}`; if(Array.isArray(this.event.lektor) && this.event.lektor.length > 0){ lektorenEmpty = false; tooltipString += `\n${this.$p.t('lehre','lektor')}: `; - this.event.lektor.forEach(lektor => { + this.event.lektor.slice(0,3).forEach(lektor => { tooltipString += `${lektor.kurzbz}\n`; }) + if(this.event.lektor.length > 3){ + tooltipString += `${this.$p.t('lehre', 'weitereLektoren', [(this.event.lektor.length - 3)])}\n`; + } } if(lektorenEmpty){ tooltipString += "\n"; } - tooltipString += `${this.$p.t('person','ort')}: ${this.event.ort_kurzbz}`; + return tooltipString; }, @@ -38,15 +41,19 @@ export default { }, }, template: /*html*/` -
-
+
+
{{convertTime(event.beginn.split(":"))}} {{convertTime(event.ende.split(":"))}}
{{event.topic}} - {{lektor.kurzbz}} {{event.ort_kurzbz}} + + {{lektor.kurzbz}} + + ...+ + {{event.lektor.length-3}}
`, diff --git a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js index 2d5f34eee..0be28962a 100644 --- a/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js +++ b/public/js/components/Cis/Renderer/Lehreinheit/modalContent.js @@ -95,9 +95,11 @@ export default { :'' }} -
- - {{lektor.kurzbz}} +
+
+ + {{lektor.kurzbz}} +
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index b0e9f8888..7e58d0e98 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -3064,6 +3064,26 @@ $phrases = array( ) ) ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'weitereLektoren', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => '...und {0} weitere Lektoren', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'group', + 'description' => '...and {0} more lecturers', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'core', 'category' => 'lehre',