Merge remote-tracking branch 'refs/remotes/origin/master'

resources/views/livewire/course_list.blade.php

@@ -113,7 +113,7 @@
         </div>
     </div>
 
-    <section id="resume-table" class="scrollTableXXX">
+    <section id="resume-table" class="scrollTable">
         <div class="compare--chart_wrapper d-none"></div>
 
 
@@ -894,14 +894,14 @@
         }
 
         $( document ).ready( function(){
-            /*
+
             setMaxWidth();
             $( window ).bind( "resize", setMaxWidth ); //Remove this if it's not needed. It will react when window changes size.
 
             function setMaxWidth() {
                  $("#resume-table").width( Math.round( $(window ).width() - 400 ) ) ;
             }
-            */
+
         });
 
     </script>

routes/web.php

@@ -367,11 +367,24 @@ Route::group(['middleware' => 'auth'],function(){
         $hasFilter = false;
 
         if (isset($_GET["search"]["value"]))
-        {            
+        {
             if ($_GET["search"]["value"] != '')
             {
                 $hasFilter = true;
+
                 $v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
+                $x = $x->where(function ($query) use ($v) {
+                    $query->whereRaw("CONCAT(first_name, ' ', last_name) like '%" . $v . "%'")
+                        ->orWhereRaw("CONCAT(last_name, ' ', first_name) like '%" . $v . "%'");
+                });
+
+                $y = $y->where(function ($query) use ($v) {
+                    $query->whereRaw("CONCAT(first_name, ' ', last_name) like '%" . $v . "%'")
+                        ->orWhereRaw("CONCAT(last_name, ' ', first_name) like '%" . $v . "%'");
+                });
+            }
+
+                /*$v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
                 $x = $x->where(function ($query) use ($v) {
                     $query->where('first_name', 'like', '%' . $v . '%')
                             ->orWhere('last_name', 'like', '%' . $v . '%');
@@ -380,7 +393,7 @@ Route::group(['middleware' => 'auth'],function(){
                                     $query->where('first_name', 'like', '%' . $v . '%')
                                             ->orWhere('last_name', 'like', '%' . $v . '%');
                                 });
-                            }
+                            }*/
             //where('first_name', 'like', '%' . $_GET["search"]["value"] . '%');
         }
 
@@ -656,12 +669,22 @@ Route::group(['middleware' => 'auth'],function(){
 
         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');
-            $member_course = $member_course->whereIn('member_id', $member_ids);
+
+            if ($_GET["search"]["value"] != '')
+            {
+                $v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
+                $member_ids = \App\Models\Member::where(function ($query) use ($v) {
+                    $query->whereRaw("CONCAT(first_name, ' ', last_name) like '%" . $v . "%'")
+                        ->orWhereRaw("CONCAT(last_name, ' ', first_name) like '%" . $v . "%'");
+                })->pluck('id');
+                /*
+                $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');*/
+                $member_course = $member_course->whereIn('member_id', $member_ids);
+            }
         }
 
         if ($_GET["filterCourse"] != "null")
@@ -866,10 +889,16 @@ Route::group(['middleware' => 'auth'],function(){
         if (isset($_GET["search"]["value"]))
         {
             $v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
+
             $member_ids = \App\Models\Member::where(function ($query) use ($v) {
+                $query->whereRaw("CONCAT(first_name, ' ', last_name) like '%" . $v . "%'")
+                    ->orWhereRaw("CONCAT(last_name, ' ', first_name) like '%" . $v . "%'");
+            })->pluck('id');
+
+            /*$member_ids = \App\Models\Member::where(function ($query) use ($v) {
                 $query->where('first_name', 'like', '%' . $v . '%')
                         ->orWhere('last_name', 'like', '%' . $v . '%');
-            })->pluck('id');
+            })->pluck('id');*/
             $datas = $datas->whereIn('member_id', $member_ids);
         }
 
@@ -1078,9 +1107,13 @@ Route::group(['middleware' => 'auth'],function(){
         {
             $v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
             $member_ids = \App\Models\Member::where(function ($query) use ($v) {
+                $query->whereRaw("CONCAT(first_name, ' ', last_name) like '%" . $v . "%'")
+                    ->orWhereRaw("CONCAT(last_name, ' ', first_name) like '%" . $v . "%'");
+            })->pluck('id');
+            /*$member_ids = \App\Models\Member::where(function ($query) use ($v) {
                 $query->where('first_name', 'like', '%' . $v . '%')
                         ->orWhere('last_name', 'like', '%' . $v . '%');
-            })->pluck('id');
+            })->pluck('id');*/
             $x = $x->whereIn('member_id', $member_ids);
         }
         if ($_GET["filterStatus"] != '')
@@ -1140,15 +1173,6 @@ Route::group(['middleware' => 'auth'],function(){
 
     });
 
-function sortByColor($c)
-{
-    $return = "0";
-    if ($c == "green") $return = "1";
-    if ($c == "yellow") $return = "2";
-    if ($c == "orange") $return = "3";
-    if ($c == "wgrey") $return = "4";    
-    return $return;
-}
 
 function getColor($months, $m)
 {