|
@@ -21,9 +21,11 @@ class CalendarSettings extends Component
|
|
|
{
|
|
{
|
|
|
$this->changed = false;
|
|
$this->changed = false;
|
|
|
|
|
|
|
|
- $courses = \App\Models\Course::select('name')->groupBy('name')->orderBy('name', 'asc')->get();
|
|
|
|
|
|
|
+ $course_names = [];
|
|
|
|
|
+ $courses = \App\Models\Course::select('name')->where('enabled', true)->groupBy('name')->orderBy('name', 'asc')->get();
|
|
|
foreach ($courses as $course) {
|
|
foreach ($courses as $course) {
|
|
|
$name = $course->name;
|
|
$name = $course->name;
|
|
|
|
|
+ array_push($course_names, $name);
|
|
|
if (!\App\Models\CourseColor::where('name', $name)->exists()) {
|
|
if (!\App\Models\CourseColor::where('name', $name)->exists()) {
|
|
|
\App\Models\CourseColor::create([
|
|
\App\Models\CourseColor::create([
|
|
|
'name' => $name,
|
|
'name' => $name,
|
|
@@ -31,9 +33,15 @@ class CalendarSettings extends Component
|
|
|
]);
|
|
]);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ $course_names = array_values(array_unique($course_names));
|
|
|
|
|
|
|
|
$this->course_colors = \App\Models\CourseColor::get();
|
|
$this->course_colors = \App\Models\CourseColor::get();
|
|
|
- foreach ($this->course_colors as $color) {
|
|
|
|
|
|
|
+ foreach ($this->course_colors as $index => $color) {
|
|
|
|
|
+ if (!in_array($color->name, $course_names)) {
|
|
|
|
|
+ unset($this->course_colors[$index]);
|
|
|
|
|
+ continue;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
$this->colors[$color->id] = $color->hex;
|
|
$this->colors[$color->id] = $color->hex;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|