diff --git a/app/Http/Controllers/Admin/PplaceController.php b/app/Http/Controllers/Admin/PplaceController.php
index 7134d41..17fdc28 100644
--- a/app/Http/Controllers/Admin/PplaceController.php
+++ b/app/Http/Controllers/Admin/PplaceController.php
@@ -24,10 +24,10 @@ class PplaceController extends Controller
$inputs['list'] = Pplace::search($inputs);
if ($inputs['list']->total() > 0 && $inputs['page'] > $inputs['list']->lastPage()) {
- return redirect()->route('pplace');
+ return redirect()->route('pplaces');
}
- return view('admin.Pplace.list', $inputs);
+ return view('admin.pplace.list', $inputs);
}
public function add(Request $request)
@@ -53,13 +53,13 @@ class PplaceController extends Controller
$pplace->fill($inputs);
$pplace->save();
});
- return redirect()->route('pplace')->with('success', '登録成功');
+ return redirect()->route('pplaces')->with('success', '登録しました。');
} else {
$inputs['errorMsg'] = $this->__buildErrorMessasges($validator);
}
}
- return view('admin.Pplace.add', $inputs);
+ return view('admin.pplace.add', $inputs);
}
public function edit(Request $request, $id, $view = '')
@@ -88,29 +88,38 @@ class PplaceController extends Controller
$record->fill($inputs);
$record->save();
});
- return redirect()->route('pplace')->with('success', '更新成功');
+ return redirect()->route('pplaces')->with('success', '更新成功');
} else {
$data['errorMsg'] = $this->__buildErrorMessasges($validator);
}
}
- return view($view ?: 'admin.Pplace.edit', $data);
+ return view($view ?: 'admin.pplace.edit', $data);
}
public function info(Request $request, $id)
{
- return $this->edit($request, $id, 'admin.Pplace.info');
+ return $this->edit($request, $id, 'admin.pplace.info');
}
public function delete(Request $request)
{
- $pk = $request->get('pk');
- if ($pk && Pplace::destroy($pk)) {
- return redirect()->route('pplace')->with('success', '削除成功');
+ $arr_pk = $request->get('pk');
+
+ if ($arr_pk) {
+ $ids = is_array($arr_pk) ? $arr_pk : [$arr_pk];
+
+ if (Pplace::deleteByPk($ids)) {
+ return redirect()->route('pplaces')->with('success', __("削除成功しました。"));
+ } else {
+ return redirect()->route('pplaces')->with('error', __('削除に失敗しました。'));
+ }
}
- return redirect()->route('pplace')->with('error', '削除失敗');
+
+ return redirect()->route('pplaces')->with('error', __('削除するデータを選択してください。'));
}
+
public function export()
{
$headers = [
@@ -142,7 +151,7 @@ class PplaceController extends Controller
{
$file = $request->file('file');
if (!$file) {
- return redirect()->route('pplace')->with('error', 'CSVファイルを選択してください');
+ return redirect()->route('pplaces')->with('error', 'CSVファイルを選択してください');
}
$data = \App\Utils::csvToArray($file);
@@ -161,10 +170,10 @@ class PplaceController extends Controller
]);
}
DB::commit();
- return redirect()->route('pplace')->with('success', 'インポート成功');
+ return redirect()->route('pplaces')->with('success', 'インポート成功');
} catch (\Exception $e) {
DB::rollBack();
- return redirect()->route('pplace')->with('error', "行 {$record} : " . $e->getMessage());
+ return redirect()->route('pplaces')->with('error', "行 {$record} : " . $e->getMessage());
}
}
diff --git a/app/Http/Controllers/Admin/StationController.php b/app/Http/Controllers/Admin/StationController.php
index beeb510..6943f88 100644
--- a/app/Http/Controllers/Admin/StationController.php
+++ b/app/Http/Controllers/Admin/StationController.php
@@ -16,7 +16,6 @@ class StationController extends Controller
$sort = $request->input('sort', 'station_id');
$sort_type = $request->input('sort_type', 'asc');
- // 許可されたソート項目のみ
$allowedSorts = [
'station_id',
'park_id',
@@ -32,19 +31,23 @@ class StationController extends Controller
$sort_type = 'asc';
}
- // 必要カラムのみ取得
- $stations = Station::select([
- 'station_id',
- 'station_neighbor_station',
- 'station_name_ruby',
- 'station_route_name',
- 'park_id',
- 'operator_id'
- ])->orderBy($sort, $sort_type)->paginate(20);
+ $list = Station::select([
+ 'station_id',
+ 'station_neighbor_station',
+ 'station_name_ruby',
+ 'station_route_name',
+ 'park_id',
+ 'operator_id',
+ 'station_latitude',
+ 'station_longitude',
+ ])
+ ->orderBy($sort, $sort_type)
+ ->paginate(20);
- return view('admin.stations.list', compact('stations', 'sort', 'sort_type'));
+ return view('admin.stations.list', compact('list', 'sort', 'sort_type'));
}
+
/**
* 新規登録
*/
diff --git a/app/Models/Pplace.php b/app/Models/Pplace.php
index 32ac647..53496a2 100644
--- a/app/Models/Pplace.php
+++ b/app/Models/Pplace.php
@@ -65,11 +65,15 @@ class Pplace extends Model
/**
* 主キー配列で一括削除
*/
- public static function deleteByPk($arr)
+ public static function deleteByPk($ids)
{
- return self::whereIn('pplace_id', $arr)->delete();
+ if (!is_array($ids)) {
+ $ids = [$ids];
+ }
+ return self::whereIn('pplace_id', $ids)->delete();
}
+
/**
* 選択リスト取得用(フォーム等)
*/
diff --git a/resources/views/admin/pplace/_form.blade.php b/resources/views/admin/pplace/_form.blade.php
index 0613d7b..9b02bd6 100644
--- a/resources/views/admin/pplace/_form.blade.php
+++ b/resources/views/admin/pplace/_form.blade.php
@@ -17,19 +17,9 @@
@endif
-
-
{{-- 駐輪車室ID --}}
- @if($isInfo || $isEdit)
@@ -39,16 +29,15 @@
name="pplace_id" class="form-control form-control-lg" readonly />
- @endif
{{-- 番号 --}}
-
+
@@ -59,28 +48,37 @@
- {{-- オペレーター --}}
+
- @if($isInfo)
- {{ __('登録') }}
- {{ __('編集') }}
- @else
-
+
+ {{-- 登録ボタン --}}
+
+
+ {{-- 削除ボタン(編集画面のみ表示) --}}
+ @if(!empty($pplace_id))
+
+
@endif
+
diff --git a/resources/views/admin/pplace/add.blade.php b/resources/views/admin/pplace/add.blade.php
index 5b31953..38eae8f 100644
--- a/resources/views/admin/pplace/add.blade.php
+++ b/resources/views/admin/pplace/add.blade.php
@@ -7,13 +7,12 @@
-
[東京都|〇〇駐輪場] 駐輪車室マスタ
+ 新規登録
@@ -35,12 +34,7 @@
-
-
-
-
-
-
+
diff --git a/resources/views/admin/pplace/edit.blade.php b/resources/views/admin/pplace/edit.blade.php
index aa8f830..e38186f 100644
--- a/resources/views/admin/pplace/edit.blade.php
+++ b/resources/views/admin/pplace/edit.blade.php
@@ -7,13 +7,12 @@
-
[東京都|〇〇駐輪場] 駐輪車室マスタ
+ 編集
@@ -30,17 +29,11 @@
-
-
-
-
-
-
diff --git a/resources/views/admin/pplace/list.blade.php b/resources/views/admin/pplace/list.blade.php
index 7e86000..dd05df5 100644
--- a/resources/views/admin/pplace/list.blade.php
+++ b/resources/views/admin/pplace/list.blade.php
@@ -9,8 +9,7 @@
@@ -20,18 +19,31 @@
-
-
-
-
+
+
+
- {{ $list->appends(['sort' => $sort,'sort_type'=>$sort_type])->links('pagination') }}
+
+
+ {{-- ▼ ページネーション --}}
+
+
+ {{ $list->appends([
+ 'sort' => $sort ?? '',
+ 'sort_type' => $sort_type ?? ''
+ ])->links('pagination') }}
+
@@ -55,63 +67,50 @@
@endif
-