discard elapsed timeフラグの立ったチェックインの表示対応
This commit is contained in:
@@ -121,21 +121,7 @@ class EjaculationController extends Controller
|
||||
->firstOrFail();
|
||||
$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'));
|
||||
return view('ejaculation.show')->with(compact('user', 'ejaculation'));
|
||||
}
|
||||
|
||||
public function edit(Request $request, $id)
|
||||
|
@@ -35,6 +35,7 @@ is_private,
|
||||
is_too_sensitive,
|
||||
link,
|
||||
source,
|
||||
discard_elapsed_time,
|
||||
to_char(before_dates.before_date, 'YYYY/MM/DD HH24:MI') AS before_date,
|
||||
to_char(ejaculated_date - before_dates.before_date, 'FMDDD日 FMHH24時間 FMMI分') AS ejaculated_span
|
||||
SQL
|
||||
@@ -169,6 +170,7 @@ is_private,
|
||||
is_too_sensitive,
|
||||
link,
|
||||
source,
|
||||
discard_elapsed_time,
|
||||
to_char(before_dates.before_date, 'YYYY/MM/DD HH24:MI') AS before_date,
|
||||
to_char(ejaculated_date - before_dates.before_date, 'FMDDD日 FMHH24時間 FMMI分') AS ejaculated_span
|
||||
SQL
|
||||
|
Reference in New Issue
Block a user