|
|
@@ -226,9 +226,16 @@ class Reports extends Component
|
|
|
->orderBy('name')
|
|
|
->get()
|
|
|
->map(function ($course) {
|
|
|
- $levelName = $course->level ? $course->level->name : 'No Level';
|
|
|
- $typeName = $course->type ? $course->type->name : 'No Type';
|
|
|
- $frequencyName = $course->frequency ? $course->frequency->name : 'No Frequency';
|
|
|
+ if (!empty($course->course_type_id)) {
|
|
|
+ $type = \App\Models\CourseType::find($course->course_type_id);
|
|
|
+ if ($type) {
|
|
|
+ $typeName = $type->name;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ $levelName = is_object($course->level) ? $course->level->name : 'No Level';
|
|
|
+ $typeName = is_object($type) ? $type->name : 'No Type';
|
|
|
+ $frequencyName = is_object($course->frequency) ? $course->frequency->name : 'No Frequency';
|
|
|
$year = $course->year ?? '';
|
|
|
|
|
|
return [
|