diff --git a/app/Http/Controllers/EjaculationController.php b/app/Http/Controllers/EjaculationController.php index 78ba14d..b671e50 100644 --- a/app/Http/Controllers/EjaculationController.php +++ b/app/Http/Controllers/EjaculationController.php @@ -42,9 +42,26 @@ class EjaculationController extends Controller return redirect()->route('home')->with('status', 'チェックインしました!'); } - public function show() + public function show($id) { - // TODO: not implemented + $ejaculation = Ejaculation::findOrFail($id); + $user = User::findOrFail($ejaculation->user_id); + + // 1つ前のチェックインからの経過時間を求める + $previousEjaculation = Ejaculation::select('ejaculated_date') + ->where('user_id', $ejaculation->user_id) + ->where('ejaculated_date', '<', $ejaculation->ejaculated_date) + ->orderByDesc('ejaculated_date') + ->first(); + if (!empty($previousEjaculation)) { + $ejaculatedSpan = $ejaculation->ejaculated_date + ->diff($previousEjaculation->ejaculated_date) + ->format('%a日 %h時間 %i分'); + } else { + $ejaculatedSpan = null; + } + + return view('ejaculation.show')->with(compact('user', 'ejaculation', 'ejaculatedSpan')); } public function edit() diff --git a/resources/views/ejaculation/show.blade.php b/resources/views/ejaculation/show.blade.php new file mode 100644 index 0000000..37b3311 --- /dev/null +++ b/resources/views/ejaculation/show.blade.php @@ -0,0 +1,97 @@ +@extends('layouts.base') + +@section('content') +
+ @if ($ejaculation->is_private) + 非公開 + @endif + {{-- + 催眠音声 + 適当なタグ + --}} +
+ @endif + + {{-- + + --}} + + @if (!empty($ejaculation->note)) ++ {!! Formatter::linkify(nl2br(e($ejaculation->note))) !!} +
+ @endif +