|
|
@@ -287,7 +287,7 @@ class Reports extends Component
|
|
|
Log::info('Getting courses for season: ' . $this->seasonFilter);
|
|
|
Log::info('Season years: ' . json_encode($seasonYears));
|
|
|
|
|
|
- $courses = Course::with(['level', 'type', 'frequency'])
|
|
|
+ $courses = Course::with(['level', 'frequency'])
|
|
|
->where('active', true)
|
|
|
->where(function ($query) use ($seasonYears) {
|
|
|
$query->where('year', $this->seasonFilter)
|
|
|
@@ -318,13 +318,10 @@ class Reports extends Component
|
|
|
return false;
|
|
|
})
|
|
|
->map(function ($course) {
|
|
|
- $type = null;
|
|
|
- if (!empty($course->course_type_id)) {
|
|
|
- $type = \App\Models\CourseType::find($course->course_type_id);
|
|
|
- }
|
|
|
+ Log::info('Processing course: ' . $course->name . ' (ID: ' . $course->id . ')' . $course);
|
|
|
|
|
|
$levelName = is_object($course->level) ? $course->level->name : 'No Level';
|
|
|
- $typeName = is_object($type) ? $type->name : 'No Type';
|
|
|
+ $typeName = $course->getFormattedTypeField();
|
|
|
$frequencyName = is_object($course->frequency) ? $course->frequency->name : 'No Frequency';
|
|
|
$year = $course->year ?? '';
|
|
|
|