diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index e10bbdd..8d51665 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -78,30 +78,32 @@ class AppServiceProvider extends ServiceProvider { view()->composer('layouts.app', function($view){ + // 未対応のみ集計 $stats = DB::table('operator_que') ->selectRaw(" - SUM(CASE WHEN que_status IN (1,2) AND que_class < 100 THEN 1 ELSE 0 END) AS task_total, - MAX(CASE WHEN que_status IN (1,2) AND que_class < 100 THEN created_at END) AS task_latest, - SUM(CASE WHEN que_status IN (1,2) AND que_class > 99 THEN 1 ELSE 0 END) AS hard_total, - MAX(CASE WHEN que_status IN (1,2) AND que_class > 99 THEN created_at END) AS hard_latest + SUM(CASE WHEN que_status = 1 AND que_class < 100 THEN 1 ELSE 0 END) AS task_untreated, + MAX(CASE WHEN que_status = 1 AND que_class < 100 THEN created_at END) AS task_latest, + SUM(CASE WHEN que_status = 1 AND que_class > 99 THEN 1 ELSE 0 END) AS hard_untreated, + MAX(CASE WHEN que_status = 1 AND que_class > 99 THEN created_at END) AS hard_latest ") ->first(); - $taskCount = (int)($stats->task_total ?? 0); - $hardCount = (int)($stats->hard_total ?? 0); + // 変数名は互換維持(内容は未対応件数) + $taskCount = (int)($stats->task_untreated ?? 0); + $hardCount = (int)($stats->hard_untreated ?? 0); $taskLatest = $stats->task_latest ?? null; $hardLatest = $stats->hard_latest ?? null; - // 最新5件 (未対応/作業中) + // ドロップダウン最新5件 も未対応のみ $latestTasks = DB::table('operator_que') - ->whereIn('que_status',[1,2]) + ->where('que_status',1) ->where('que_class','<',100) ->orderByDesc('created_at') ->limit(5) ->get(); $latestHards = DB::table('operator_que') - ->whereIn('que_status',[1,2]) + ->where('que_status',1) ->where('que_class','>',99) ->orderByDesc('created_at') ->limit(5) diff --git a/resources/views/admin/information/list.blade.php b/resources/views/admin/information/list.blade.php index 9715d08..05b04b8 100644 --- a/resources/views/admin/information/list.blade.php +++ b/resources/views/admin/information/list.blade.php @@ -198,9 +198,58 @@ -
- {{ $jobs->links() }} + @php + $paginator = $jobs; + $current = $paginator->currentPage(); + $last = $paginator->lastPage(); + $query = request()->except('page'); + $pages = []; + if($last <= 20){ + $pages = range(1,$last); + }else{ + $pages[] = 1; + if($current > 4) $pages[] = '...L'; + $windowStart = max(2, $current - 2); + $windowEnd = min($last-1, $current + 2); + for($i=$windowStart; $i<=$windowEnd; $i++){ + $pages[] = $i; + } + if($current < $last - 3) $pages[] = '...R'; + $pages[] = $last; + } + function pageUrl($page,$query){ + return url()->current() . '?' . http_build_query(array_merge($query,['page'=>$page])); + } + @endphp + @if($last > 1) +
+
+ @endif
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index ad596f9..5b4d9ae 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -89,7 +89,7 @@ @foreach($latestHards as $hq) - {{ Str::limit($hq->que_comment ?? 'ハード異常', 40) }} @@ -98,7 +98,7 @@ @endforeach - + すべてを見る @@ -124,7 +124,7 @@ @foreach($latestTasks as $tq) - {{ Str::limit($tq->que_comment ?? 'タスク', 40) }} @@ -133,7 +133,7 @@ @endforeach - + 過去のタスクを全て見る