From 6d0472c14b4570273da1b739544a67f20177ba44 Mon Sep 17 00:00:00 2001 From: shibafu Date: Tue, 7 Nov 2017 00:22:40 +0900 Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E5=90=8D=E3=81=AA=E3=83=92=E3=83=BC?= =?UTF-8?q?=E3=83=88=E3=83=9E=E3=83=83=E3=83=97=E3=81=AE=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AA=E3=82=84=E3=81=A4=E3=82=92=E6=90=AD=E8=BC=89=E3=81=97?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/UserController.php | 18 ++++++++++++++++- resources/views/user/stats.blade.php | 27 ++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index bb17762..fb017ea 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -47,7 +47,23 @@ SQL abort(404); } - return view('user.stats')->with(compact('user')); + $groupByDay = Ejaculation::select(DB::raw(<<<'SQL' +to_char(ejaculated_date, 'YYYY/MM/DD') AS "date", +count(*) AS "count" +SQL + )) + ->where('user_id', $user->id) + ->where('ejaculated_date', '>=', Carbon::now()->addMonths(-9)->firstOfMonth()) + ->groupBy(DB::raw("to_char(ejaculated_date, 'YYYY/MM/DD')")) + ->orderBy(DB::raw("to_char(ejaculated_date, 'YYYY/MM/DD')")) + ->get(); + $calendarData = []; + foreach ($groupByDay as $data) { + $timestamp = Carbon::createFromFormat('Y/m/d', $data->date)->getTimestamp(); + $calendarData[$timestamp] = $data->count; + } + + return view('user.stats')->with(compact('user', 'calendarData')); } public function okazu($name) diff --git a/resources/views/user/stats.blade.php b/resources/views/user/stats.blade.php index b1f135e..74e21de 100644 --- a/resources/views/user/stats.blade.php +++ b/resources/views/user/stats.blade.php @@ -1,10 +1,35 @@ @extends('user.base') +@push('head') + +@endpush + @section('tab-content') @if ($user->is_protected && !$user->isMe())

このユーザはチェックイン履歴を公開していません。

@else +
Shikontribution graph
+
+
@endif -@endsection \ No newline at end of file +@endsection + +@push('script') + + + +@endpush \ No newline at end of file