app/Http/Controllers/RegularContractCreateController.php を更新

Reviewed-on: #43

app/Http/Controllers/RegularContractCreateController.php

@@ -82,6 +82,7 @@ class RegularContractCreateController extends Controller
         // 並び替えパラメータ取得
         $sort = request()->input('sort', 'park_id');
         $order = request()->input('order', 'asc');
+        \Log::info('sort param: ' . $sort);
         $sortable = [
             'park_ruby' => 'park.park_ruby',
             'city_id' => 'city.city_id',
@@ -98,14 +99,13 @@ class RegularContractCreateController extends Controller
         $parks_table = $query->skip(($page - 1) * $perPage)->take($perPage)->get();
 
         if ($sort === 'park_ruby' || $sort === 'station_name_ruby') {
-            setlocale(LC_COLLATE, 'ja_JP.UTF-8');
+            $collator = new \Collator('ja_JP');
-            $parks_table = $parks_table->sort(function ($a, $b) use ($order, $sort) {
+            $parks_table = $parks_table->sort(function ($a, $b) use ($order, $sort, $collator) {
-                // null対策
                 $a_val = $a->$sort ?? '';
                 $b_val = $b->$sort ?? '';
                 return $order === 'asc'
-                    ? strcoll($a_val, $b_val)
+                    ? $collator->compare($a_val, $b_val)
-                    : strcoll($b_val, $a_val);
+                    : $collator->compare($b_val, $a_val);
             })->values();
         }
 

resources/views/regular_contract/create.blade.php

@@ -54,7 +54,7 @@
                             </div>
                         </form>
                         <div style="overflow-x: auto; width: 100%;">
-                            <table id="searchTable" class="table table-striped">
+                            <table id="searchTable" class="tablesorter table table-striped">
                                 <thead>
                                     <tr>
                                         <th class="header">
@@ -202,4 +202,16 @@
         </div>
     </div>
 </div>
+<script>
+    document.querySelectorAll('#searchTable th a, #searchTable .header a').forEach(function(el) {
+        el.addEventListener('click', function(e) {
+            // サーバーに遷移させる
+            window.location.href = el.href;
+            // 既存のJSによるイベントを止める
+            e.stopImmediatePropagation();
+            e.preventDefault();
+            return false;
+        }, true); // trueでキャプチャフェーズに
+    });
+</script>
 @endsection