【編集ボタン】をdefault統一 ＆ 【グローバルメニュー】画面修正
All checks were successful
Deploy main / deploy (push) Successful in 24s
All checks were successful
Deploy main / deploy (push) Successful in 24s
This commit is contained in:
你的名字
parent
833f07f9bc
commit
c214bf4a5c
@ -28,13 +28,16 @@ class OperatorQue extends Model
|
|||||||
1 => '本人確認（社会人）',
|
1 => '本人確認（社会人）',
|
||||||
2 => '本人確認（学生）',
|
2 => '本人確認（学生）',
|
||||||
3 => 'タグ発送',
|
3 => 'タグ発送',
|
||||||
4 => '予約告知電話',
|
4 => '予約告知通知',
|
||||||
5 => '定期更新電話',
|
5 => '定期更新通知',
|
||||||
6 => '返金',
|
6 => '返金処理',
|
||||||
7 => '再発行リミット超過',
|
7 => '再発行リミット超過',
|
||||||
8 => '支払い催促',
|
8 => '支払い催促',
|
||||||
9 => 'シール発行催促',
|
9 => 'シール発行催促',
|
||||||
10 => 'シール再発行許可',
|
10 => 'シール再発行',
|
||||||
|
11 => '名寄せフリガナ照合エラー',
|
||||||
|
12 => '本人確認（減免更新）',
|
||||||
|
13 => '本人確認（学生更新）',
|
||||||
101 => 'サーバーエラー',
|
101 => 'サーバーエラー',
|
||||||
102 => 'プリンタエラー',
|
102 => 'プリンタエラー',
|
||||||
103 => 'スキャナーエラー',
|
103 => 'スキャナーエラー',
|
||||||
@ -51,7 +54,7 @@ class OperatorQue extends Model
|
|||||||
|
|
||||||
public function getQueClassLabel(): string
|
public function getQueClassLabel(): string
|
||||||
{
|
{
|
||||||
return self::QueClass[$this->que_class] ?? (string)$this->que_class;
|
return self::QueClass[$this->que_class] ?? 'キュー種別未設定';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getQueStatusLabel(): string
|
public function getQueStatusLabel(): string
|
||||||
|
|||||||
@ -72,9 +72,9 @@
|
|||||||
<tbody>
|
<tbody>
|
||||||
@foreach ($list as $city)
|
@foreach ($list as $city)
|
||||||
<tr>
|
<tr>
|
||||||
<td style="background: #faebd7;">
|
<td style="background: #faebd7; width:100px; padding-right:4px; padding-left:4px;">
|
||||||
<input type="checkbox" name="pk[]" value="{{ $city->city_id }}">
|
<input type="checkbox" name="pk[]" value="{{ $city->city_id }}">
|
||||||
<a href="{{ route('city_edit', ['id' => $city->city_id]) }}" class="btn btn-sm btn-outline-primary ml-2">編集</a>
|
<a href="{{ route('city_edit', ['id' => $city->city_id]) }}" class="btn btn-sm btn-default" style="margin-left:4px;">編集</a>
|
||||||
</td>
|
</td>
|
||||||
<td>{{ $city->city_id }}</td>
|
<td>{{ $city->city_id }}</td>
|
||||||
<td>{{ $city->city_name }}</td>
|
<td>{{ $city->city_name }}</td>
|
||||||
|
|||||||
@ -73,7 +73,7 @@
|
|||||||
<div class="actions-wrap">
|
<div class="actions-wrap">
|
||||||
<input type="checkbox" name="ids[]" value="{{ $r->id }}">
|
<input type="checkbox" name="ids[]" value="{{ $r->id }}">
|
||||||
<a href="{{ route('news_edit', ['id' => $r->id]) }}"
|
<a href="{{ route('news_edit', ['id' => $r->id]) }}"
|
||||||
class="btn btn-sm btn-outline-primary ml-2">編集</a>
|
class="btn btn-sm btn-default ml10">編集</a>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
|
|||||||
@ -124,7 +124,7 @@
|
|||||||
<td style="background: #faebd7; white-space: nowrap;">
|
<td style="background: #faebd7; white-space: nowrap;">
|
||||||
<input type="checkbox" name="pk[]" value="{{ $park->park_id }}" class="row_checkbox">
|
<input type="checkbox" name="pk[]" value="{{ $park->park_id }}" class="row_checkbox">
|
||||||
<a href="{{ route('parks.edit', ['id' => $park->park_id]) }}"
|
<a href="{{ route('parks.edit', ['id' => $park->park_id]) }}"
|
||||||
class="btn btn-sm btn-outline-primary ml-2">編集</a>
|
class="btn btn-sm btn-default ml10">編集</a>
|
||||||
</td>
|
</td>
|
||||||
<td class='sm-item text-left'><span>{{ $park->park_id }}</span></td>
|
<td class='sm-item text-left'><span>{{ $park->park_id }}</span></td>
|
||||||
<td class='sm-item text-right'><span>{{ $park->city_name }}</span></td>
|
<td class='sm-item text-right'><span>{{ $park->city_name }}</span></td>
|
||||||
|
|||||||
@ -97,7 +97,7 @@
|
|||||||
<input type="checkbox" name="pk[]"
|
<input type="checkbox" name="pk[]"
|
||||||
value="{{$item->price_parkplaceid}}">
|
value="{{$item->price_parkplaceid}}">
|
||||||
<a href="{{route('price_info', ['id' => $item->price_parkplaceid])}}"
|
<a href="{{route('price_info', ['id' => $item->price_parkplaceid])}}"
|
||||||
class="btn btn-sm btn-outline-primary ml-2">{{__('編集')}}</a>
|
class="btn btn-sm btn-default ml10">{{__('編集')}}</a>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
{{-- ▼ データ本体（既存表示そのまま） --}}
|
{{-- ▼ データ本体（既存表示そのまま） --}}
|
||||||
|
|||||||
@ -81,7 +81,7 @@
|
|||||||
<td style="background: #faebd7;">
|
<td style="background: #faebd7;">
|
||||||
<input type="checkbox" name="pk[]" value="{{ $item->psection_id }}">
|
<input type="checkbox" name="pk[]" value="{{ $item->psection_id }}">
|
||||||
<a href="{{ route('psection_edit', ['id' => $item->psection_id]) }}"
|
<a href="{{ route('psection_edit', ['id' => $item->psection_id]) }}"
|
||||||
class="btn btn-sm btn-outline-primary ml-2">編集</a>
|
class="btn btn-sm btn-default ml10">編集</a>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
{{-- ▼ データ列 --}}
|
{{-- ▼ データ列 --}}
|
||||||
|
|||||||
@ -124,7 +124,7 @@
|
|||||||
<td style="background:#faebd7;">
|
<td style="background:#faebd7;">
|
||||||
<input type="checkbox" name="pk[]" value="{{ $item->ptype_id }}">
|
<input type="checkbox" name="pk[]" value="{{ $item->ptype_id }}">
|
||||||
<a href="{{ route('ptype_edit', ['id' => $item->ptype_id]) }}"
|
<a href="{{ route('ptype_edit', ['id' => $item->ptype_id]) }}"
|
||||||
class="btn btn-sm btn-outline-primary ml-2">編集</a>
|
class="btn btn-sm btn-default ml10">編集</a>
|
||||||
</td>
|
</td>
|
||||||
{{-- ▼ データ列 --}}
|
{{-- ▼ データ列 --}}
|
||||||
<td>{{ $item->ptype_id }}</td>
|
<td>{{ $item->ptype_id }}</td>
|
||||||
|
|||||||
@ -1,20 +1,114 @@
|
|||||||
@extends('layouts.app')
|
@extends('layouts.app')
|
||||||
@section('title', '[東京都|〇〇駐輪場]ここに画面メニュー名が入ります')
|
@section('title', 'インフォメーション')
|
||||||
@section('content')
|
@section('content')
|
||||||
<div class="container">
|
@php
|
||||||
<div class="row justify-content-center">
|
use App\Models\OperatorLog;
|
||||||
<div class="col-md-8">
|
use App\Models\Ope;
|
||||||
<div class="card">
|
$logs = OperatorLog::orderByDesc('created_at')->limit(20)->get();
|
||||||
<div class="card-header">Dashboard</div>
|
$operatorNames = [];
|
||||||
|
$queLabels = [];
|
||||||
|
$queIcons = [];
|
||||||
|
$queClassNums = [];
|
||||||
|
foreach ($logs as $log) {
|
||||||
|
// オペレータ名取得
|
||||||
|
$operatorNames[$log->operator_id] = $operatorNames[$log->operator_id] ?? (\App\Models\Ope::find($log->operator_id)->ope_name ?? $log->operator_id);
|
||||||
|
// operator_queからque_class, que_status取得
|
||||||
|
$que = null;
|
||||||
|
if (!empty($log->user_id) && !empty($log->contract_id)) {
|
||||||
|
$que = \App\Models\OperatorQue::where('user_id', $log->user_id)->where('contract_id', $log->contract_id)->first();
|
||||||
|
}
|
||||||
|
// 条件を満たさない場合はスキップ
|
||||||
|
if (!$que || !in_array($que->que_status, [3,4])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if ($que->que_class < 100) {
|
||||||
|
$queLabels[$log->operator_log_id] = '<span class="badge badge-primary">タスク</span>';
|
||||||
|
$queIcons[$log->operator_log_id] = '';
|
||||||
|
} elseif ($que->que_class > 99) {
|
||||||
|
$queLabels[$log->operator_log_id] = '<span class="badge badge-danger">ハード異常</span>';
|
||||||
|
$queIcons[$log->operator_log_id] = '';
|
||||||
|
} else {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$queClassNums[$log->operator_log_id] = \App\Models\OperatorQue::QueClass[$que->que_class] ?? $que->que_class;
|
||||||
|
}
|
||||||
|
@endphp
|
||||||
|
<div class="container-fluid" style="background:#f4f6f9;min-height:calc(100vh - 60px);">
|
||||||
|
<div class="row">
|
||||||
|
<!-- メイン -->
|
||||||
|
<div class="col-md-10">
|
||||||
|
<div class="row mt-4">
|
||||||
|
<div class="col-lg-7">
|
||||||
|
<div class="card mb-4">
|
||||||
|
<div class="card-header bg-white font-weight-bold">インフォメーション</div>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
@if (session('status'))
|
@php
|
||||||
<div class="alert alert-success" role="alert">
|
$infoQue = \App\Models\OperatorQue::whereIn('que_status', [1,2])
|
||||||
{{ session('status') }}
|
->orderByDesc('created_at')
|
||||||
|
->limit(5)
|
||||||
|
->get();
|
||||||
|
@endphp
|
||||||
|
@if(count($infoQue) > 0)
|
||||||
|
@foreach($infoQue as $q)
|
||||||
|
<div class="card mb-3" style="box-shadow:none;border:1px solid #e0e0e0;">
|
||||||
|
<div class="card-body py-3 px-4" style="position:relative;">
|
||||||
|
<div class="d-flex align-items-center mb-2">
|
||||||
|
<div class="text-secondary" style="font-size:1.1em; margin-right:1em;">
|
||||||
|
{{ $q->created_at }}
|
||||||
</div>
|
</div>
|
||||||
|
@if($q->que_class > 99)
|
||||||
|
<span class="badge badge-danger" style="font-size:0.95em;">ハード異常</span>
|
||||||
|
@elseif($q->que_class < 100)
|
||||||
|
<span class="badge badge-primary" style="font-size:0.95em;">タスク</span>
|
||||||
@endif
|
@endif
|
||||||
|
</div>
|
||||||
You are logged in!
|
<div>
|
||||||
|
<a href="{{ url('/admin/manual_personal_check/edit/'.$q->que_id) }}" style="font-weight:bold;color:#007bff;font-size:1.1em;text-decoration:underline;">
|
||||||
|
{{ $q->getQueClassLabel() }}
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@endforeach
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-lg-5">
|
||||||
|
<div class="card mb-4">
|
||||||
|
<div class="card-header bg-white font-weight-bold">操作履歴</div>
|
||||||
|
<div class="card-body p-0">
|
||||||
|
<table class="table table-sm mb-0">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th scope="col">操作内容</th>
|
||||||
|
<th scope="col"></th>
|
||||||
|
<th scope="col"></th>
|
||||||
|
<th scope="col">オペレーター</th>
|
||||||
|
<th scope="col">日時</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
@php $hasData = false; @endphp
|
||||||
|
@foreach($logs as $log)
|
||||||
|
@if(isset($queLabels[$log->operator_log_id]))
|
||||||
|
@php $hasData = true; @endphp
|
||||||
|
<tr>
|
||||||
|
<td>{!! $queIcons[$log->operator_log_id] !!}{!! $queLabels[$log->operator_log_id] !!}</td>
|
||||||
|
<td></td>
|
||||||
|
<td>{{ $queClassNums[$log->operator_log_id] }}</td>
|
||||||
|
<td>{{ $operatorNames[$log->operator_id] ?? $log->operator_id }}</td>
|
||||||
|
<td>{{ $log->created_at }}</td>
|
||||||
|
</tr>
|
||||||
|
@endif
|
||||||
|
@endforeach
|
||||||
|
@if(!$hasData)
|
||||||
|
<tr><td colspan="5" class="text-center">データがありません</td></tr>
|
||||||
|
@endif
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -129,38 +129,6 @@
|
|||||||
<span class="brand-text font-weight-light">So-Manager</span>
|
<span class="brand-text font-weight-light">So-Manager</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<!-- Sidebar -->
|
|
||||||
<div class="sidebar">
|
|
||||||
<!-- Sidebar user panel (optional) -->
|
|
||||||
<div class="user-panel mt-3 pb-3 mb-3 d-flex">
|
|
||||||
<a href="#">
|
|
||||||
<!--<i class="fa fa-bicycle nav-icon"></i>-->
|
|
||||||
<form class="form" action="./index3.html">
|
|
||||||
<select class="form-control form-control-lg">
|
|
||||||
<optgroup label="駐輪場を選んでください"></optgroup>
|
|
||||||
<optgroup label="東京都">
|
|
||||||
<option selected="">〇〇駐輪場</option>
|
|
||||||
<option>〇〇駐輪場</option>
|
|
||||||
</optgroup>
|
|
||||||
<optgroup label="埼玉県">
|
|
||||||
<option>〇〇駐輪場</option>
|
|
||||||
</optgroup>
|
|
||||||
<optgroup label="千葉県">
|
|
||||||
<option>〇〇駐輪場</option>
|
|
||||||
<option>〇〇駐輪場</option>
|
|
||||||
<option>〇〇駐輪場</option>
|
|
||||||
</optgroup>
|
|
||||||
<optgroup label="大阪府">
|
|
||||||
<option>〇〇駐輪場</option>
|
|
||||||
</optgroup>
|
|
||||||
<option>XX様インフォメーション</option>
|
|
||||||
</select>
|
|
||||||
<button type="button" class="btn btn-block btn-danger">上記駐輪場の管理画面に移動</button>
|
|
||||||
</form>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
@php
|
@php
|
||||||
// タグ・シール管理
|
// タグ・シール管理
|
||||||
$tagRoutes = [
|
$tagRoutes = [
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user