Przeglądaj źródła

corsi - aggiunta colonna numero partecipanti + rimossa colonna durata

ferrari 2 miesięcy temu
rodzic
commit
4703ceeb3e

+ 4 - 2
resources/views/livewire/course_member_two.blade.php

@@ -20,11 +20,12 @@
                     <th scope="col">Nome</th>
                     <th scope="col">Frequenza</th>
                     <th scope="col">Livello</th>
-                    <th scope="col">Durata</th>
+                    {{-- <th scope="col">Durata</th> --}}
                     @if($_GET["type"] != "custom")
                         <th scope="col">Giorni</th>
                     @endif
                     <th scope="col">Istruttore</th>
+                    <th scope="col">N° partecipanti</th>
                     <th scope="col">...</th>
                 </tr>
             </thead>
@@ -34,7 +35,7 @@
                         <td>{{$record->name}}</td>
                         <td>{{$record->frequency->name ?? ""}}</td>
                         <td>{{$record->level->name ?? ""}}</td>
-                        <td>{{date("d/m/Y", strtotime($record->date_from))}} - {{date("d/m/Y", strtotime($record->date_to))}}                                                                </td>
+                        {{-- <td>{{date("d/m/Y", strtotime($record->date_from))}} - {{date("d/m/Y", strtotime($record->date_to))}}                                                         </td> --}}
                         @if($_GET["type"] != "custom")
                         <td>
                             @if($record->when != null)
@@ -51,6 +52,7 @@
                         </td>
                         @endif
                         <td>{{$record->getins->name ?? ""}} {{$record->getins->cognome ?? ""}}</td>
+                        <td>{{$record->getCount()}}</td>
                         <td>
                             <a href="/course_member?id={{$record->id}}" type="button" class="btn" ><b> <i class="fa-solid fa-chevron-right"></i></b></button>
                         </td>

+ 3 - 3
routes/web.php

@@ -1207,7 +1207,7 @@ Route::group(['middleware' => 'tenant'], function () {
             $course_ids = \App\Models\Course::whereIn('course_frequency_id', $frequencies)->pluck('id');
             $member_course = $member_course->whereIn('course_id', $course_ids);
         }
-        if ($_GET["filterType"] != "null") {
+        if ($_GET["filterType"] != "null" && $_GET["filterType"] != "undefined") {
             $types = explode(",", $_GET["filterType"]);
             $course_ids = \App\Models\Course::whereIn('course_type_id', $types)->pluck('id');
             $member_course = $member_course->whereIn('course_id', $course_ids);
@@ -1538,7 +1538,7 @@ Route::group(['middleware' => 'tenant'], function () {
             ->leftJoin('courses', 'member_courses.course_id', '=', 'courses.id')
             ->leftJoin('members', 'member_courses.member_id', '=', 'members.id');
 
-        if (isset($_GET["search"]["value"])) {
+        if (isset($_GET["search"]["value"]) && trim($_GET["search"]["value"]) != "") {
             $v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
 
             $member_ids = \App\Models\Member::where(function ($query) use ($v) {
@@ -1578,7 +1578,7 @@ Route::group(['middleware' => 'tenant'], function () {
             $course_ids = \App\Models\Course::whereIn('course_frequency_id', $frequencies)->pluck('id');
             $datas = $datas->whereIn('course_id', $course_ids);
         }
-        if ($_GET["filterType"] != "null") {
+        if ($_GET["filterType"] != "null" && $_GET["filterType"] != "undefined") {
             $types = explode(",", $_GET["filterType"]);
             $course_ids = \App\Models\Course::whereIn('course_type_id', $types)->pluck('id');
             $datas = $datas->whereIn('course_id', $course_ids);