From f467ccc3850ecbb647386a6400118f73795383e7 Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Willms Date: Mon, 20 Feb 2023 14:44:55 +0000 Subject: extract color definitions into separate file to avoid duplicated definition, re #2193 Merge request studip/studip!1423 --- lib/classes/calendar/CalendarInstscheduleModel.php | 5 +---- lib/classes/calendar/CalendarScheduleModel.php | 4 +--- lib/classes/calendar/default_color_definitions.php | 4 ++++ 3 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 lib/classes/calendar/default_color_definitions.php diff --git a/lib/classes/calendar/CalendarInstscheduleModel.php b/lib/classes/calendar/CalendarInstscheduleModel.php index efb06de..e99da9d 100644 --- a/lib/classes/calendar/CalendarInstscheduleModel.php +++ b/lib/classes/calendar/CalendarInstscheduleModel.php @@ -14,9 +14,7 @@ * @category Stud.IP */ -define('DEFAULT_COLOR_SEM', 2); -define('DEFAULT_COLOR_NEW', 3); -define('DEFAULT_COLOR_VIRTUAL', 1); +require_once __DIR__ . '/default_color_definitions.php'; /** * Pseudo-namespace containing helper methods for the calendar of institutes. @@ -25,7 +23,6 @@ define('DEFAULT_COLOR_VIRTUAL', 1); */ class CalendarInstscheduleModel { - /** * Returns a schedule entry for a course * diff --git a/lib/classes/calendar/CalendarScheduleModel.php b/lib/classes/calendar/CalendarScheduleModel.php index feb79d2..c57459e 100644 --- a/lib/classes/calendar/CalendarScheduleModel.php +++ b/lib/classes/calendar/CalendarScheduleModel.php @@ -14,9 +14,7 @@ * @category Stud.IP */ -define('DEFAULT_COLOR_SEM', 2); -define('DEFAULT_COLOR_NEW', 3); -define('DEFAULT_COLOR_VIRTUAL', 1); +require_once __DIR__ . '/default_color_definitions.php'; /** * Pseudo-namespace containing helper methods for the schedule. diff --git a/lib/classes/calendar/default_color_definitions.php b/lib/classes/calendar/default_color_definitions.php new file mode 100644 index 0000000..6ae68f0 --- /dev/null +++ b/lib/classes/calendar/default_color_definitions.php @@ -0,0 +1,4 @@ +