fixed errors in new schedule, re #4421

Merge request studip/studip!3757

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',

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;

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' => [

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;
+
+    &.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 {