courses - i vari select del sito ora hanno la disciplina visualizzata

app/Http/Livewire/EmailComunications.php

@@ -54,7 +54,10 @@ class EmailComunications extends Component
         $this->getCategories(\App\Models\Category::select('id', 'name')->where('parent_id', null)->orderBy('name')->get(), 0);
 
         $this->courses = [];
-        $this->getCourses(\App\Models\Course::select('id', 'name')->where('parent_id', null)->orderBy('name', 'ASC')->get(), 0);
+        $this->getCourses(\App\Models\Course::query()->where('parent_id', null)->orderBy('name', 'ASC')->get(), 0);
+        usort($this->courses, function($a, $b) {
+            return strcmp($a['name'], $b['name']);
+        });
 
         $this->schedule_at = now($this->timezone)->addHour()->format('Y-m-d\TH:i');
     }
@@ -70,7 +73,10 @@ class EmailComunications extends Component
             $this->getCategories(\App\Models\Category::select('id', 'name')->where('parent_id', null)->orderBy('name')->get(), 0);
 
             $this->courses = [];
-            $this->getCourses(\App\Models\Course::select('id', 'name')->where('parent_id', null)->orderBy('name', 'ASC')->get(), 0);
+            $this->getCourses(\App\Models\Course::query()->where('parent_id', null)->orderBy('name', 'ASC')->get(), 0);
+            usort($this->courses, function($a, $b) {
+                return strcmp($a['name'], $b['name']);
+            });
         }
 
         return view('livewire.email_comunications');
@@ -355,7 +361,8 @@ class EmailComunications extends Component
     {
         /** @var \App\Models\Course $record */
         foreach ($records as $record) {
-            $this->courses[] = array('id' => $record->id, 'name' => $record->getTree());
+            // $this->courses[] = array('id' => $record->id, 'name' => $record->getDetailsName());
+            $this->courses[] = array('id' => $record->id, 'name' => ($record->discipline?->name ? $record->discipline->name . ' - ' : '') . $record->name);
             if (count($record->childs))
                 $this->getCourses($record->childs, $indentation + 1);
         }

app/Http/Livewire/Member.php

@@ -724,9 +724,10 @@ class Member extends Component
         $allC = \App\Models\Course::where('type', $this->course_course_type)->where('enabled', true)->orderBy('name')->get();
         foreach ($allC as $c) {
             $cN = $c->name . " (" . $c->year . ")";
-            if (!in_array($cN, $this->course_names))
-                $this->course_names[] = $cN;
+            if (!in_array($cN, array_keys($this->course_names)))
+                $this->course_names[$cN] = ($c->discipline?->name ? $c->discipline->name . ' - ' : '') . $cN;
         }
+        asort($this->course_names);
 
 
         $datas = [];

app/Http/Livewire/Reports.php

@@ -370,13 +370,15 @@ class Reports extends Component
 
                 return [
                     'id' => $course->id,
-                    'name' => $course->name,
-                    'full_name' => "{$course->name} - {$levelName} - {$typeName} - {$frequencyName} ({$year})",
+                    'name' => ($course->discipline?->name ? $course->discipline->name . ' - ' : '') . $course->name,
+                    'full_name' => ($course->discipline?->name ? $course->discipline->name . ' - ' : '') . "{$course->name} - {$levelName} - {$typeName} - {$frequencyName} ({$year})",
                     'level_name' => $levelName,
                     'type_name' => $typeName,
                     'frequency_name' => $frequencyName,
                     'year' => $year
                 ];
+            })->sort(function($a, $b) {
+                return strcmp($a['full_name'], $b['full_name']);
             })->values()->toArray();
 
         Log::info('Found ' . count($courses) . ' courses for season ' . $this->seasonFilter);

resources/views/livewire/member.blade.php

@@ -1472,8 +1472,8 @@
                                                                     <label for="course_name" class="form-label">Corso</label>
                                                                     <select id="course_name" class="form-select" aria-label="Livello" wire:model="course_name" >
                                                                         <option value="">
-                                                                        @foreach($course_names as $cn)
-                                                                            <option value="{{$cn}}">{{$cn}}
+                                                                        @foreach($course_names as $key => $value)
+                                                                            <option value="{{$key}}">{{$value}}
                                                                         @endforeach
                                                                     </select>
                                                                 </div>

resources/views/livewire/presence.blade.php

@@ -12,7 +12,7 @@
         <div class="col-sm-12">
             <div class="row">
                 <div class="col-auto">
-                    <h3 class="text-primary">{{$calendar->course ? $calendar->course->name : $calendar->name}}</h3>
+                    <h3 class="text-primary">{{$calendar->name}}</h3>
                 </div>
                 <div class="col"></div>
                 <div class="col-auto text-end">