浏览代码

fix report

FabioFratini 7 月之前
父节点
当前提交
94894295c8
共有 2 个文件被更改,包括 12 次插入6 次删除
  1. 3 6
      app/Http/Livewire/Reports.php
  2. 9 0
      app/Models/Course.php

+ 3 - 6
app/Http/Livewire/Reports.php

@@ -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 ?? '';
 

+ 9 - 0
app/Models/Course.php

@@ -131,5 +131,14 @@ class Course extends Model
     {
         return \App\Models\MemberCourse::where('course_id', $this->id)->count();
     }
+    public function getTypeFieldAttribute()
+    {
+        return $this->attributes['type'] ?? null;
+    }
 
+    // Method to get type field with capitalization
+    public function getFormattedTypeField()
+    {
+        return ucfirst($this->attributes['type'] ?? 'No Type');
+    }
 }