Luca Parisio 1 anno fa
parent
commit
e488a8001f
2 ha cambiato i file con 25 aggiunte e 3 eliminazioni
  1. 14 2
      resources/views/livewire/course_member.blade.php
  2. 11 1
      routes/web.php

+ 14 - 2
resources/views/livewire/course_member.blade.php

@@ -527,8 +527,20 @@
                 },
                 columns: [
                     {data: 'column_0'},
-                    {data: 'column_1'},
-                    {data: 'column_2'},
+                    {
+                        data: 'column_1',
+                        render: function (data, type, row){
+                            var ret = '<a href="/members?member_detail=' + row["column_7"] + '">' + data + '</a>';
+                            return ret;
+                        }
+                    },
+                    {
+                        data: 'column_2',
+                        render: function (data, type, row){
+                            var ret = '<a href="/members?member_detail=' + row["column_7"] + '">' + data + '</a>';
+                            return ret;
+                        }
+                    },
                     {data: 'column_3'},
                     {data: 'column_4'},
                     {data: 'column_5'},

+ 11 - 1
routes/web.php

@@ -359,7 +359,7 @@ Route::group(['middleware' => 'auth'],function(){
             });
             //where('first_name', 'like', '%' . $_GET["search"]["value"] . '%');
         }
-        
+
 
         //$x = $x->where(function ($query) use ($v) {
 
@@ -913,6 +913,16 @@ Route::group(['middleware' => 'auth'],function(){
 
         $datas = \App\Models\MemberCourse::select('member_courses.*', 'members.first_name', 'members.last_name', 'members.email', 'members.phone', 'members.birth_date')->leftJoin('members', 'member_courses.member_id', '=', 'members.id');
 
+        if (isset($_GET["search"]["value"]))
+        {
+            $v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
+            $member_ids = \App\Models\Member::where(function ($query) use ($v) {
+                $query->where('first_name', 'like', '%' . $v . '%')
+                        ->orWhere('last_name', 'like', '%' . $v . '%');
+            })->pluck('id');
+            $datas = $datas->whereIn('member_id', $member_ids);
+        }
+
         if ($_GET["filterCourse"] != "null")
         {
             $course_ids = [];