From f42beaddb5d77822aa69300bc8523c4e18b808ca Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Fri, 6 Oct 2017 09:52:11 +0800 Subject: [PATCH] Add marriage/couple detail page Auto html title tag text which detect h2.page-header element content via javascript --- app/Http/Controllers/CouplesController.php | 14 +++++++++ .../2017_06_27_151536_create_couples_table.php | 6 ++-- resources/lang/en/couple.php | 3 +- resources/lang/id/couple.php | 3 +- resources/views/couples/partials/stat.blade.php | 35 ++++++++++++++++++++++ resources/views/couples/show.blade.php | 29 ++++++++++++++++++ resources/views/layouts/app.blade.php | 15 ++++++++++ .../views/layouts/user-profile-wide.blade.php | 4 +-- resources/views/layouts/user-profile.blade.php | 4 +-- resources/views/users/marriages.blade.php | 8 ++--- resources/views/users/search.blade.php | 4 +-- routes/web.php | 5 ++++ 12 files changed, 115 insertions(+), 15 deletions(-) create mode 100644 app/Http/Controllers/CouplesController.php create mode 100644 resources/views/couples/partials/stat.blade.php create mode 100644 resources/views/couples/show.blade.php diff --git a/app/Http/Controllers/CouplesController.php b/app/Http/Controllers/CouplesController.php new file mode 100644 index 0000000..cad560a --- /dev/null +++ b/app/Http/Controllers/CouplesController.php @@ -0,0 +1,14 @@ +increments('id'); - $table->unsignedInteger('husband_id')->index(); - $table->unsignedInteger('wife_id')->index(); - $table->date('marriege_date')->nullable(); + $table->unsignedInteger('husband_id'); + $table->unsignedInteger('wife_id'); + $table->date('marriage_date')->nullable(); $table->date('divorce_date')->nullable(); $table->timestamps(); diff --git a/resources/lang/en/couple.php b/resources/lang/en/couple.php index ddbcdc4..45fdf0f 100644 --- a/resources/lang/en/couple.php +++ b/resources/lang/en/couple.php @@ -3,12 +3,13 @@ return [ // Labels 'show' => 'Show Marriage Profile', + 'detail' => 'Marriage Profile', 'childs_count' => 'Childs Count', 'grand_childs_count' => 'Grand Childs Count', // Attributes 'husband' => 'Head of Family', - 'wive' => 'Wife', + 'wife' => 'Wife', 'marriage_date' => 'Marriage Date', 'divorce_date' => 'Divorce Date', ]; \ No newline at end of file diff --git a/resources/lang/id/couple.php b/resources/lang/id/couple.php index c92334f..0b27c9b 100644 --- a/resources/lang/id/couple.php +++ b/resources/lang/id/couple.php @@ -3,12 +3,13 @@ return [ // Labels 'show' => 'Lhat Profil Pernikahan', + 'detail' => 'Profil Pernikahan', 'childs_count' => 'Jumlah Anak', 'grand_childs_count' => 'Jumlah Cucu', // Attributes 'husband' => 'Kepala Keluarga', - 'wive' => 'Isteri', + 'wife' => 'Isteri', 'marriage_date' => 'Tanggal Pernikahan', 'divorce_date' => 'Tanggal Perceraian', ]; \ No newline at end of file diff --git a/resources/views/couples/partials/stat.blade.php b/resources/views/couples/partials/stat.blade.php new file mode 100644 index 0000000..b4a5d01 --- /dev/null +++ b/resources/views/couples/partials/stat.blade.php @@ -0,0 +1,35 @@ + + + \ No newline at end of file diff --git a/resources/views/couples/show.blade.php b/resources/views/couples/show.blade.php new file mode 100644 index 0000000..a6615f1 --- /dev/null +++ b/resources/views/couples/show.blade.php @@ -0,0 +1,29 @@ +@extends('layouts.app') + +@section('content') + + +@include('couples.partials.stat') +
+ + +@foreach($couple->childs->chunk(4) as $chunkedChild) +
+ @foreach($chunkedChild as $child) +
+

{{ ++$no }}. {{ $child->profileLink() }} ({{ $child->gender }})

+
    + @foreach($child->childs as $grand) +
  • {{ $grand->profileLink() }} ({{ $grand->gender }})
  • + @endforeach +
+
+ @endforeach + @if (! $loop->last) +

+ @endif +
+@endforeach +@endsection diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 39b8cd0..824deb5 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -32,5 +32,20 @@ @yield('ext_js') @yield('script') + diff --git a/resources/views/layouts/user-profile-wide.blade.php b/resources/views/layouts/user-profile-wide.blade.php index dbc6a87..c8b4452 100644 --- a/resources/views/layouts/user-profile-wide.blade.php +++ b/resources/views/layouts/user-profile-wide.blade.php @@ -3,9 +3,9 @@ @section('content')
-

+

+ @yield('user-content') @endsection diff --git a/resources/views/layouts/user-profile.blade.php b/resources/views/layouts/user-profile.blade.php index c4894b1..dd551e6 100644 --- a/resources/views/layouts/user-profile.blade.php +++ b/resources/views/layouts/user-profile.blade.php @@ -1,9 +1,9 @@ @extends('layouts.app') @section('content') -

+

+ @yield('user-content') @endsection diff --git a/resources/views/users/marriages.blade.php b/resources/views/users/marriages.blade.php index e4efb24..793437b 100644 --- a/resources/views/users/marriages.blade.php +++ b/resources/views/users/marriages.blade.php @@ -10,7 +10,7 @@
- + @if ($marriage->divorce_date) @@ -18,9 +18,9 @@ {{-- --}}
{{ trans('couple.husband') }}{{ $marriage->husband->profileLink() }}
{{ trans('couple.wive') }}{{ $marriage->wife->profileLink() }}
{{ trans('couple.wife') }}{{ $marriage->wife->profileLink() }}
{{ trans('couple.marriage_date') }}{{ $marriage->marriage_date }}
{{ trans('couple.divorce_date') }}{{ $marriage->divorce_date }}
{{ trans('couple.childs_count') }}{{ $marriage->childs_count }}
{{ trans('couple.grand_childs_count') }}?
- {{-- --}} +
@endforeach diff --git a/resources/views/users/search.blade.php b/resources/views/users/search.blade.php index e82d084..2f167be 100644 --- a/resources/views/users/search.blade.php +++ b/resources/views/users/search.blade.php @@ -1,12 +1,12 @@ @extends('layouts.app') @section('content') - + {{ Form::open(['method' => 'get','class' => '']) }} diff --git a/routes/web.php b/routes/web.php index a633b3b..c929d84 100644 --- a/routes/web.php +++ b/routes/web.php @@ -34,6 +34,11 @@ Route::get('users/{user}/tree', 'UsersController@tree')->name('users.tree'); Route::get('users/{user}/marriages', 'UserMarriagesController@index')->name('users.marriages'); /** + * Couple/Marriages Routes + */ +Route::get('couples/{couple}', ['as'=>'couples.show', 'uses'=>'CouplesController@show']); + +/** * Backup Restore Database Routes */ Route::post('backups/upload', ['as'=>'backups.upload', 'uses'=>'BackupsController@upload']);