From b987d545acb65f1fd3c5061fb11c037586f86586 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Tue, 17 Dec 2024 14:40:16 +0000
Subject: [PATCH] removed occurrences of "weekdays" key in schedule settings,
fixes #5032
Closes #5032
Merge request studip/studip!3773
---
app/controllers/calendar/schedule.php | 9 ---------
app/views/calendar/schedule/settings.php | 10 ----------
db/migrations/6.0.35_new_schedule_improvements.php | 5 -----
lib/classes/calendar/Helper.php | 1 -
4 files changed, 25 deletions(-)
diff --git a/app/controllers/calendar/schedule.php b/app/controllers/calendar/schedule.php
index 50196608de3..67bec545c24 100644
--- a/app/controllers/calendar/schedule.php
+++ b/app/controllers/calendar/schedule.php
@@ -652,13 +652,11 @@ class Calendar_ScheduleController extends AuthenticatedController
$default_config = [
'start_time' => '08:00',
'end_time' => '20:00',
- 'weekdays' => 5,
'visible_days' => [1, 2, 3, 4, 5]
];
if (
empty($this->schedule_settings['start_time'])
&& empty($this->schedule_settings['end_time'])
- && empty($this->schedule_settings['weekdays'])
&& empty($this->schedule_settings['visible_days'])
) {
//Use the defaults:
@@ -675,18 +673,12 @@ class Calendar_ScheduleController extends AuthenticatedController
$start_time = Request::get('start_time', '08:00');
$end_time = Request::get('end_time', '20:00');
- $weekdays = Request::int('weekdays', 5);
$visible_days = Request::intArray('visible_days');
if ($start_time >= $end_time) {
PageLayout::postError(_('Die Startuhrzeit muss vor der Enduhrzeit liegen.'));
$this->redirect('calendar/schedule/settings');
return;
}
- if (!in_array($weekdays, [5, 7])) {
- PageLayout::postError(_('Der Stundenplan kann nur 5 oder 7 Tage anzeigen.'));
- $this->redirect('calendar/schedule/settings');
- return;
- }
if (empty($visible_days)) {
PageLayout::postError(_('Es wurde kein Wochentag ausgewählt.'));
$this->redirect('calendar/schedule/settings');
@@ -697,7 +689,6 @@ class Calendar_ScheduleController extends AuthenticatedController
$schedule_settings = [
'start_time' => $start_time,
'end_time' => $end_time,
- 'weekdays' => $weekdays,
'visible_days' => $visible_days
];
diff --git a/app/views/calendar/schedule/settings.php b/app/views/calendar/schedule/settings.php
index 6c03ba60555..175a51c53c1 100644
--- a/app/views/calendar/schedule/settings.php
+++ b/app/views/calendar/schedule/settings.php
@@ -33,16 +33,6 @@
<? endfor ?>
</select>
</label>
- <label>
- <input type="radio" name="weekdays" value="7"
- <?= $schedule_settings['weekdays'] === 7 ? 'checked' : '' ?>>
- <?= _('Alle Wochentage im Stundenplan anzeigen.') ?>
- </label>
- <label>
- <input type="radio" name="weekdays" value="5"
- <?= $schedule_settings['weekdays'] === 5 ? 'checked' : '' ?>>
- <?= _('Nur Montag bis Freitag im Stundenplan anzeigen.') ?>
- </label>
</fieldset>
<fieldset>
<legend><?= _('Wochentage') ?></legend>
diff --git a/db/migrations/6.0.35_new_schedule_improvements.php b/db/migrations/6.0.35_new_schedule_improvements.php
index 13708f597b2..e7c0f46a7bc 100644
--- a/db/migrations/6.0.35_new_schedule_improvements.php
+++ b/db/migrations/6.0.35_new_schedule_improvements.php
@@ -49,11 +49,6 @@ 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 (!empty($old_config['glb_days']) && count($old_config['glb_days']) === 7) {
- $new_config['weekdays'] = 7;
- } else {
- $new_config['weekdays'] = 5;
- }
//Convert the visible days array:
$visible_days = [];
if (is_array($old_config['glb_days'])) {
diff --git a/lib/classes/calendar/Helper.php b/lib/classes/calendar/Helper.php
index 2582480dd79..2a317721382 100644
--- a/lib/classes/calendar/Helper.php
+++ b/lib/classes/calendar/Helper.php
@@ -170,7 +170,6 @@ class Helper
'views' => [
'timeGridWeek' => [
'columnHeaderFormat' => ['weekday' => 'short'],
- 'weekends' => !empty($schedule_settings['weekdays']) && $schedule_settings['weekdays'] === 7,
'slotDuration' => $slot_duration
]
],
--
GitLab