fix vari

app/Http/Livewire/Presence.php

@@ -337,13 +337,16 @@ class Presence extends Component
                 $motivation = \App\Models\Motivation::findOrFail($has_presence->motivation_id)->name;
             }
             $status = $has_presence->status;
-            $instructor = \App\Models\User::find($has_presence->user_id)?->name;
+            // cerca nel master con ::on('mysql')
+            $user_instructor = \Illuminate\Foundation\Auth\User::on('mysql')->find($has_presence->user_id);
+            $instructor = $user_instructor?->name;
 
             if ($has_presence->court_id > 0) {
                 $court = \App\Models\Court::findOrFail($has_presence->court_id)->name;
             }
             if ($has_presence->instructor_id > 0 && $has_presence->instructor_id !== $has_presence->user_id) {
-                $additional_instructor = \App\Models\User::find($has_presence->instructor_id)?->name;
+                $additional_user_instructor = \App\Models\User::find($has_presence->instructor_id);
+                $additional_instructor = $additional_user_instructor?->name . ' ' . $additional_user_instructor?->cognome;
             }
             if (!is_null($has_presence->notes)) {
                 $notes = $has_presence->notes;
@@ -619,7 +622,7 @@ class Presence extends Component
         ]);
 
         $this->instructor_id = $user->id;
-        $this->instructors = \App\Models\User::select('*')->where('level', 2)->where('enabled', true)->orderBy('name', 'asc')->get();
+        $this->instructors = \App\Models\User::select('*')->where('level', 2)->where('enabled', true)->orderBy('name', 'asc')->orderBy('cognome', 'asc')->get();
         $this->emit('saved');
     }
 

app/Http/Livewire/PresenceReport.php

@@ -80,8 +80,8 @@ class PresenceReport extends Component
         $presencesAll = \App\Models\Presence::with([
             'member:id,first_name,last_name',
             'court:id,name',
-            'user:id,name',
-            'instructor:id,name',
+            'user:id',
+            'instructor:id,name,cognome',
             'motivation:id,name',
             'motivationCourse:id,name,course_level_id',
             'motivationCourse.level:id,name',
@@ -291,11 +291,13 @@ class PresenceReport extends Component
 
         $court = $presence->court?->name ?? '';
 
+        // cerca nel master con ::on('mysql')
+        $user_instructor = \Illuminate\Foundation\Auth\User::on('mysql')->find($presence->user_id);
+        $main_instructor = $user_instructor?->name;
+
         $instructorParts = [
-            $presence->user?->name ?? '',
-            ($presence->instructor && $presence->user && $presence->instructor->id !== $presence->user->id)
-                ? $presence->instructor->name
-                : ($presence->instructor?->name ?? ''),
+            $main_instructor ?? '',
+            ($presence->instructor) ? $presence->instructor->name . " " . $presence->instructor->cognome : '',
         ];
         $instructor = implode(', ', array_values(array_filter(array_unique($instructorParts))));
 

resources/views/layouts/app.blade.php

@@ -185,9 +185,7 @@
             if (Request::is('course_member'))
                 print "Iscritti corsi";
             if (Request::is('course_list'))
-                print "Pagamento corsi";
-            if (Request::is('presence_reports'))
-                print "Report presenze";                
+                print "Pagamento corsi";            
             if (Request::is('calendar'))
                 print "Calendario";
             if (Request::is('reminders'))

resources/views/livewire/presence.blade.php

@@ -434,14 +434,13 @@
                         <div class="col">
                             <label for="save_instructor_id" class="form-label">Istruttore aggiuntivo</label>
                             <select id="save_instructor_id" class="form-select form-select-lg me-1">
-                                <option value="0">
-                                    @foreach($instructors as $i)
-                                <option value="{{$i["id"]}}" {{\Auth::user()->id == $i["id"] ? "disabled" : ""}}>{{$i["name"]}}</option>
+                                <option value="0"></option>
+                                @foreach($instructors as $i)
+                                <option value="{{$i["id"]}}" {{\Auth::user()->id == $i["id"] ? "disabled" : ""}}>{{$i["name"]}} {{$i["cognome"]}}</option>
                                 @endforeach
                             </select>
                         </div>
-                        <div class="col-auto mt-2">
-                            <br>
+                        <div class="col-auto mt-4">
                             <button type="button" class="btn--ui primary" data-bs-toggle="modal" data-bs-target="#instructorModal" style="width:50px">&nbsp;<i class="fa-solid fa-plus"></i></button>
                         </div>
 

resources/views/livewire/records_out.blade.php

@@ -265,7 +265,6 @@
                             <div class="col-6">
                                 <span class="title-form d-block w-100">Metodo di pagamento</span>
                                 <div class="col-md-12">
-                                    <span class="title-form d-block w-100">Metodo di pagamento</span>
                                     <select name="payment_method_id" class="form-select paymentClass @error('payment_method_id') is-invalid @enderror" aria-label="Seleziona un metodo di pagamento" wire:model="payment_method_id">
                                         <option value="">--Seleziona--
                                         @foreach($payments as $payment)

resources/views/livewire/settings.blade.php

@@ -110,7 +110,7 @@
             <div id="contabilita">
                 <a href="/banks">
                     <div class="row">
-                        <div class="col-md-11 p-2"><h5>Banche</h5></div>
+                        <div class="col-md-11 p-2"><h5>Canali finanziari</h5></div>
                         <div class="col-md-1 p-2"><i class="fa-solid fa-chevron-right"></i></div>
                     </div>
                 </a>