diff --git a/app/Http/Requests/Users/UpdateRequest.php b/app/Http/Requests/Users/UpdateRequest.php index b77795c..289f09e 100644 --- a/app/Http/Requests/Users/UpdateRequest.php +++ b/app/Http/Requests/Users/UpdateRequest.php @@ -30,6 +30,7 @@ class UpdateRequest extends FormRequest 'name' => 'required|string|max:255', 'gender_id' => 'required|numeric', 'dob' => 'nullable|date|date_format:Y-m-d', + 'yob' => 'nullable|date_format:Y', 'dod' => 'nullable|date|date_format:Y-m-d', 'yod' => 'nullable|date_format:Y', 'phone' => 'nullable|string|max:255', @@ -59,6 +60,12 @@ class UpdateRequest extends FormRequest $formData['yod'] = $formData['yod']; } + if ($formData['dob']) { + $formData['yob'] = substr($formData['dob'], 0, 4); + } else { + $formData['yob'] = $formData['yob']; + } + if ($formData['password']) { $formData['password'] = bcrypt($formData['password']); } diff --git a/app/User.php b/app/User.php index 11257d7..f811a17 100644 --- a/app/User.php +++ b/app/User.php @@ -27,7 +27,7 @@ class User extends Authenticatable 'nickname', 'gender_id', 'name', 'email', 'password', 'address', 'phone', - 'dob', 'dod', 'yod', 'city', + 'dob', 'yob', 'dod', 'yod', 'city', 'father_id', 'mother_id', 'parent_id', ]; diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index bf4c98a..d446047 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -22,6 +22,7 @@ class CreateUsersTable extends Migration $table->uuid('mother_id')->nullable(); $table->uuid('parent_id')->nullable(); $table->date('dob')->nullable(); + $table->year('yob')->nullable(); $table->unsignedTinyInteger('birth_order')->nullable(); $table->date('dod')->nullable(); $table->year('yod')->nullable(); diff --git a/resources/lang/en/user.php b/resources/lang/en/user.php index 7b67031..40640c8 100644 --- a/resources/lang/en/user.php +++ b/resources/lang/en/user.php @@ -38,6 +38,7 @@ return [ 'mother' => 'Mother', 'parent' => 'Parent', 'dob' => 'Date of Birth', + 'yob' => 'Year of Birth', 'dod' => 'Date of Death', 'yod' => 'Year of Death', 'email' => 'Email', diff --git a/resources/lang/id/user.php b/resources/lang/id/user.php index e2425e0..6e5ac73 100644 --- a/resources/lang/id/user.php +++ b/resources/lang/id/user.php @@ -38,6 +38,7 @@ return [ 'mother' => 'Ibu', 'parent' => 'Orang Tua', 'dob' => 'Tanggal Lahir', + 'yob' => 'Tahun Lahir', 'dod' => 'Tanggal Meninggal', 'yod' => 'Tahun Meninggal', 'email' => 'Email', diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 158969d..1493cf0 100644 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -67,14 +67,15 @@ {!! FormField::text('nickname', ['label' => trans('user.nickname')]) !!}
{!! FormField::radios('gender_id', [1 => trans('app.male_code'), trans('app.female_code')], ['label' => trans('user.gender')]) !!}
-
{!! FormField::text('dob', ['label' => trans('user.dob'), 'placeholder' => trans('app.example').' 1959-07-20']) !!}
-
-
{!! FormField::text('birth_order', ['label' => trans('user.birth_order'), 'type' => 'number', 'min' => 1]) !!}
+
{!! FormField::text('yob', ['label' => trans('user.yob'), 'placeholder' => trans('app.example').' 1959']) !!}
+
{!! FormField::text('dob', ['label' => trans('user.dob'), 'placeholder' => trans('app.example').' 1959-07-20']) !!}
+
+
{!! FormField::text('yod', ['label' => trans('user.yod'), 'placeholder' => trans('app.example').' 2003']) !!}
{!! FormField::text('dod', ['label' => trans('user.dod'), 'placeholder' => trans('app.example').' 2003-10-17']) !!}
diff --git a/tests/Feature/UsersProfileTest.php b/tests/Feature/UsersProfileTest.php index 2bdbf9b..76f43dc 100644 --- a/tests/Feature/UsersProfileTest.php +++ b/tests/Feature/UsersProfileTest.php @@ -31,6 +31,7 @@ class UsersProfileTest extends TestCase 'name' => 'Nama User', 'gender_id' => 1, 'dob' => '1959-06-09', + 'yob' => '', 'dod' => '2003-10-17', 'yod' => '', 'address' => 'Jln. Angkasa, No. 70', @@ -46,6 +47,7 @@ class UsersProfileTest extends TestCase 'name' => 'Nama User', 'gender_id' => 1, 'dob' => '1959-06-09', + 'yob' => '1959', 'dod' => '2003-10-17', 'yod' => '2003', 'address' => 'Jln. Angkasa, No. 70',