report presenze - modifiche

app/Http/Livewire/PresenceReport.php

@@ -188,7 +188,12 @@ class PresenceReport extends Component
 
                 if ($show)
                 {
+                    $course_level = "";
+                    if ($calendar->course && $calendar->course->level) {
+                        $course_level = trim($calendar->course->level->name);
+                    }
                     $this->records[$calendar->name][$h][] = array(
+                        "course_level" => $course_level,
                         "last_name" => $member->member->last_name,
                         "first_name" => $member->member->first_name,
                         "court" => $court,
@@ -230,7 +235,14 @@ class PresenceReport extends Component
                 $instructor = implode(", ", array_filter($instructor));
                 $motivation = $p->motivation ? $p->motivation->name : "";
                 $status = "<span class='fw-bold' style='color:gray'>Recupero</span>";
+                // $status = "<span class='fw-bold' style='color:#0c6197'>Presente</span>";
+                
+                $course_level = "";
+                if ($calendar->course && $calendar->course->level) {
+                    $course_level = trim($calendar->course->level->name);
+                }
                 $this->records[$calendar->name][$h][] = array(
+                    "course_level" => $course_level,
                     "last_name" => $p->member->last_name,
                     "first_name" => $p->member->first_name,
                     "court" => $court,
@@ -255,10 +267,11 @@ class PresenceReport extends Component
             // sort records per cognome-nome
             if (isset($this->records[$calendar->name]) && isset($this->records[$calendar->name][$h])) {
                 usort($this->records[$calendar->name][$h], function($a, $b) {
+                    $course_level_compare = strcmp($a['course_level'], $b['course_level']);
                     $last_name_compare = strcmp($a['last_name'], $b['last_name']);
                     $first_name_compare = strcmp($a['first_name'], $b['first_name']);
-    
-                    return $last_name_compare != 0 ? $last_name_compare : $first_name_compare;
+                    
+                    return $course_level_compare != 0 ? $course_level_compare : ($last_name_compare != 0 ? $last_name_compare : $first_name_compare);
                 });
             }
         }

resources/views/livewire/presence_report.blade.php

@@ -48,7 +48,6 @@
                 @endforeach
             </select>
         </div>
-        @if(false)
             <div class="col-auto d-flex gap-3 align-items-center mb-3">
                 <label for="from" class="form-label fw-medium text-uppercase mb-0" style="white-space:nowrap;">Ora inizio</label>
                 <select wire:model="from" class="form-select" id="from" style="width: fit-content">
@@ -59,6 +58,7 @@
                     @endfor
                 </select>
             </div>
+        @if(false)
             <div class="col-auto d-flex gap-3 align-items-center mb-3">
                 <label for="to" class="form-label fw-medium text-uppercase mb-0" style="white-space:nowrap;">Ora fine</label>
                 <select wire:model="to" class="form-select" id="to" style="width: fit-content">
@@ -109,6 +109,7 @@
                     <table class="report-table">
                         <thead>
                             <tr>
+                                <td>Livello</td>
                                 <td>Cognome</td>
                                 <td>Nome</td>
                                 <td>Campo</td>
@@ -118,8 +119,19 @@
                             </tr>
                         </thead>
                         <tbody>
+                            @php
+                                $last_level = "";
+                                $index = 0;
+                            @endphp
                             @foreach($presences as $presence)
-                            <tr>
+                            @php
+                                if ($last_level != $presence["course_level"]) {
+                                    $index++;
+                                }
+                                $last_level = $presence["course_level"];
+                            @endphp
+                            <tr @if ($index % 2 == 0) style="background-color: rgba(12 97 151 / 0.15)" @endif>
+                                <td>{{$presence["course_level"]}}</td>
                                 <td>{{$presence["last_name"]}}</td>
                                 <td>{{$presence["first_name"]}}</td>
                                 <td>{{$presence["court"]}}</td>