Luca Parisio 2 månader sedan
förälder
incheckning
25ad307555

+ 2 - 2
app/Http/Livewire/CourseMember.php

@@ -13,7 +13,7 @@ class CourseMember extends Component
 
     public $courses = [];
     public $course_frequencies = [];
-    // public $course_types = [];
+    public $course_types = [];
     public $course_levels = [];
     public $course_durations = [];
     public $course_years = [];
@@ -59,7 +59,7 @@ class CourseMember extends Component
             $this->type = \App\Models\Course::findOrFail($_GET["id"])->type;
         }
 
-        // $this->course_types = \App\Models\CourseType::select('*')->where('enabled', true)->get();
+        $this->course_types = \App\Models\CourseType::select('*')->where('enabled', true)->get();
         $this->course_frequencies = \App\Models\CourseFrequency::select('*')->where('enabled', true)->get();
         $this->course_levels = \App\Models\CourseLevel::select('*')->where('enabled', true)->get();
         $this->course_durations = \App\Models\CourseDuration::select('*')->where('enabled', true)->get();

+ 3 - 4
resources/views/livewire/course_member.blade.php

@@ -57,7 +57,7 @@
                     </div>
                 </div>
             </div>
-            {{-- <div class="col-md-2">
+            <div class="col-md-2">
                 <div class="row">
                     <div class="col-md-12" style="margin-bottom:10px;">
                         <b>Tipologia</b>
@@ -70,7 +70,7 @@
                         </select>
                     </div>
                 </div>
-            </div> --}}
+            </div>
             <div class="col-md-2">
                 <div class="row">
                     <div class="col-md-12" style="margin-bottom:10px;">
@@ -693,8 +693,7 @@
                                 html += '<span style="float:right"></span>';
                             }else {
                                 console.log(status);
-                                html += '<i class="ico--ui check absent me-2"></i>';
-                                html += 'Non consegnato';
+                                html += 'Non Presente';
                             }
                             html += '</span>';
                             return html;

+ 3 - 3
routes/web.php

@@ -97,7 +97,7 @@ Route::group(['middleware' => 'tenant'], function () {
     Route::get('/banks', \App\Http\Livewire\Bank::class);
     Route::get('/vats', \App\Http\Livewire\Vat::class);
     Route::get('/disciplines', \App\Http\Livewire\Discipline::class);
-    // Route::get('/course_types', \App\Http\Livewire\CourseType::class);
+    Route::get('/course_types', \App\Http\Livewire\CourseType::class);
     Route::get('/course_subscriptions', \App\Http\Livewire\CourseSubscription::class);
     Route::get('/course_durations', \App\Http\Livewire\CourseDuration::class);
     Route::get('/course_levels', \App\Http\Livewire\CourseLevel::class);
@@ -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"] != "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);
@@ -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"] != "undefined") {
             $types = explode(",", $_GET["filterType"]);
             $course_ids = \App\Models\Course::whereIn('course_type_id', $types)->pluck('id');
             $datas = $datas->whereIn('course_id', $course_ids);