so-manager/so-manager-dev.com
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app/Http/Controllers/RegularContractCreateController.php を更新
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 23s
Details

Browse Source
This commit is contained in:
y.higashide 2025-10-07 17:07:42 +09:00
parent d84b0fb9e1
commit ca283fc9a9
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Http/Controllers/RegularContractCreateController.php
View File

@ -99,29 +99,13 @@ class RegularContractCreateController extends Controller
$parks_table = $query->skip(($page - 1) * $perPage)->take($perPage)->get(); $parks_table = $query->skip(($page - 1) * $perPage)->take($perPage)->get();
if ($sort === 'park_ruby' || $sort === 'station_name_ruby') { if ($sort === 'park_ruby' || $sort === 'station_name_ruby') {
$locales = [ $collator = new \Collator('ja_JP');
'ja_JP.UTF-8', $parks_table = $parks_table->sort(function ($a, $b) use ($order, $sort, $collator) {
'ja_JP.utf8',
'ja_JP',
'japanese',
'Japanese_Japan.932',
'Japanese_Japan',
'ja',
];
foreach ($locales as $locale) {
$result = setlocale(LC_COLLATE, $locale);
\Log::info("setlocale try: {$locale} => {$result}");
if ($result !== false) {
break;
}
}
$parks_table = $parks_table->sort(function ($a, $b) use ($order, $sort) {
// null対策
$a_val = $a->$sort ?? ''; $a_val = $a->$sort ?? '';
$b_val = $b->$sort ?? ''; $b_val = $b->$sort ?? '';
return $order === 'asc' 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(); })->values();
} }