diff --git a/resources/views/admin/users/list.blade.php b/resources/views/admin/users/list.blade.php index 1d28125..353a663 100644 --- a/resources/views/admin/users/list.blade.php +++ b/resources/views/admin/users/list.blade.php @@ -3,40 +3,40 @@ @section('title', '利用者マスタ') @section('content') -@php - $curSort = $sort ?? request('sort', 'user_seq'); - $curDir = strtolower($dir ?? request('dir', $sort_type ?? 'desc')); - if (!in_array($curDir, ['asc', 'desc'], true)) { - $curDir = 'desc'; - } - - $queryBase = collect([ - 'user_id' => $user_id ?? null, - 'user_categoryid' => $user_categoryid ?? null, - 'user_tag_serial' => $user_tag_serial ?? null, - 'quit_flag' => $quit_flag ?? null, - 'user_phonetic' => $user_phonetic ?? null, - 'phone' => $phone ?? null, - 'email' => $email ?? null, - 'tag_qr_flag' => $tag_qr_flag ?? null, - 'quit_from' => $quit_from ?? null, - 'quit_to' => $quit_to ?? null, - ])->filter(function ($value) { - return !is_null($value) && $value !== ''; - })->all(); - - $thClass = function (string $key) use ($curSort, $curDir) { - if ($curSort !== $key) { - return 'sorting'; + @php + $curSort = $sort ?? request('sort', 'user_seq'); + $curDir = strtolower($dir ?? request('dir', $sort_type ?? 'desc')); + if (!in_array($curDir, ['asc', 'desc'], true)) { + $curDir = 'desc'; } - return $curDir === 'asc' ? 'sorting_asc' : 'sorting_desc'; - }; - $urlFor = function (string $key) use ($curSort, $curDir, $queryBase) { - $next = ($curSort === $key && $curDir === 'asc') ? 'desc' : 'asc'; - return route('users', array_merge($queryBase, ['sort' => $key, 'dir' => $next])); - }; -@endphp + $queryBase = collect([ + 'user_id' => $user_id ?? null, + 'user_categoryid' => $user_categoryid ?? null, + 'user_tag_serial' => $user_tag_serial ?? null, + 'quit_flag' => $quit_flag ?? null, + 'user_phonetic' => $user_phonetic ?? null, + 'phone' => $phone ?? null, + 'email' => $email ?? null, + 'tag_qr_flag' => $tag_qr_flag ?? null, + 'quit_from' => $quit_from ?? null, + 'quit_to' => $quit_to ?? null, + ])->filter(function ($value) { + return !is_null($value) && $value !== ''; + })->all(); + + $thClass = function (string $key) use ($curSort, $curDir) { + if ($curSort !== $key) { + return 'sorting'; + } + return $curDir === 'asc' ? 'sorting_asc' : 'sorting_desc'; + }; + + $urlFor = function (string $key) use ($curSort, $curDir, $queryBase) { + $next = ($curSort === $key && $curDir === 'asc') ? 'desc' : 'asc'; + return route('users', array_merge($queryBase, ['sort' => $key, 'dir' => $next])); + }; + @endphp {{-- ▼ コンテンツヘッダー(パンくず) --}}
| @@ -296,15 +301,16 @@ ? route('user_edit', ['seq' => $item->user_seq]) : url('/users/edit/' . $item->user_seq)); $chk = (string) ($item->user_idcard_chk_flag ?? '0'); - $categoryDisplay = collect([ - $item->usertype_subject1 ?? '', - $item->usertype_subject2 ?? '', - $item->usertype_subject3 ?? '', - ])->filter(fn ($v) => $v !== '')->implode('/'); + $categoryDisplay = collect([ + $item->usertype_subject1 ?? '', + $item->usertype_subject2 ?? '', + $item->usertype_subject3 ?? '', + ])->filter(fn($v) => $v !== '')->implode('/'); @endphp | ||
|---|---|---|
| {{ $item->user_id }} △ {{ $item->user_name }} | +{{ $item->user_id }} △ + {{ $item->user_name }} | {{-- タグ/QR --}}{{ $item->tag_qr_flag ? 'QR' : 'タグ' }} | {{-- 利用者分類ID/氏名/フリガナ --}} @@ -345,6 +351,7 @@ #users-list tfoot th { background: #fff !important; } + .table-users thead th .header-link { color: #212529 !important; text-decoration: none !important; @@ -352,6 +359,7 @@ white-space: nowrap; padding-right: 1.8rem; } + .table-users.dataTable thead th.sorting, .table-users.dataTable thead th.sorting_asc, .table-users.dataTable thead th.sorting_desc {