From 3d3ad862c33a5951c4a218589b8076ed8ac1d977 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Mon, 16 Dec 2024 15:37:38 +0000
Subject: [PATCH] fixed errors in new schedule, re #4421
Merge request studip/studip!3757
---
app/views/calendar/schedule/entry.php | 2 +-
.../6.0.35_new_schedule_improvements.php | 2 +-
lib/classes/calendar/Helper.php | 3 ++-
resources/assets/stylesheets/scss/my_courses.scss | 15 +++++++++++----
4 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/app/views/calendar/schedule/entry.php b/app/views/calendar/schedule/entry.php
index 561588aa2de..61090413a8a 100644
--- a/app/views/calendar/schedule/entry.php
+++ b/app/views/calendar/schedule/entry.php
@@ -10,7 +10,7 @@
<?= CSRFProtection::tokenTag() ?>
<fieldset>
<legend><?= _('Farbe') ?></legend>
- <table class="default colour-selector">
+ <table class="colour-selector">
<tr>
<?= $this->render_partial(
'calendar/schedule/_colour_selector',
diff --git a/db/migrations/6.0.35_new_schedule_improvements.php b/db/migrations/6.0.35_new_schedule_improvements.php
index 4b14785dbcb..13708f597b2 100644
--- a/db/migrations/6.0.35_new_schedule_improvements.php
+++ b/db/migrations/6.0.35_new_schedule_improvements.php
@@ -49,7 +49,7 @@ class NewScheduleImprovements extends Migration
'end_time' => sprintf('%02u:00', $old_config['glb_end_time']),
'semester_id' => $old_config['semester_id'] ?? $old_config['glb_sem'] ?? null,
];
- if (count($old_config['glb_days']) === 7) {
+ if (!empty($old_config['glb_days']) && count($old_config['glb_days']) === 7) {
$new_config['weekdays'] = 7;
} else {
$new_config['weekdays'] = 5;
diff --git a/lib/classes/calendar/Helper.php b/lib/classes/calendar/Helper.php
index 8be9891a173..2582480dd79 100644
--- a/lib/classes/calendar/Helper.php
+++ b/lib/classes/calendar/Helper.php
@@ -128,7 +128,7 @@ class Helper
if (!$semester_id) {
$semester_id = \Semester::findCurrent()?->id ?? '';
}
- $schedule_settings = \UserConfig::get($GLOBALS['user']->id)->getValue('SCHEDULE_SETTINGS') ?? [];
+ $schedule_settings = \UserConfig::get()->getValue('SCHEDULE_SETTINGS') ?? [];
$slot_duration = '00:30:00';
if (!empty($schedule_settings['size']) && in_array($schedule_settings['size'], ['small', 'large'])) {
if ($schedule_settings['size'] === 'small') {
@@ -174,6 +174,7 @@ class Helper
'slotDuration' => $slot_duration
]
],
+ 'columnHeaderFormat' => ['weekday' => 'short'],
'defaultView' => 'timeGridWeek',
'defaultDate' => date('Y-m-d'),
'slotLabelFormat' => [
diff --git a/resources/assets/stylesheets/scss/my_courses.scss b/resources/assets/stylesheets/scss/my_courses.scss
index d288908463d..2e26dee3ca6 100644
--- a/resources/assets/stylesheets/scss/my_courses.scss
+++ b/resources/assets/stylesheets/scss/my_courses.scss
@@ -19,18 +19,25 @@ form.default table.mycourses-group-selector {
}
form.default td.mycourses-group-selector,
-form.default table.colour-selector td.colour {
+table.colour-selector td.colour {
position: relative;
background-clip: padding-box;
- border: 1px solid fade-out($brand-color-lighter, 0.8);
+
+ &.mycourses-group-selector {
+ border: 1px solid fade-out($brand-color-lighter, 0.8);
+ }
+
+ &.colour {
+ padding-left: 0.1em;
+ padding-right: 0.1em;
+ }
input[type="radio"] {
@extend .sr-only;
&:checked + label {
- .group-number,
- .colour-id {
+ .group-number {
display: none;
}
.checked-icon {
--
GitLab