Browse Source

Add user year of birth attribute

pull/27/head
Nafies Luthfi 7 years ago
parent
commit
6d72fd6098
  1. 7
      app/Http/Requests/Users/UpdateRequest.php
  2. 2
      app/User.php
  3. 1
      database/migrations/2014_10_12_000000_create_users_table.php
  4. 1
      resources/lang/en/user.php
  5. 1
      resources/lang/id/user.php
  6. 7
      resources/views/users/edit.blade.php
  7. 2
      tests/Feature/UsersProfileTest.php

7
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']);
}

2
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',
];

1
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();

1
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',

1
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',

7
resources/views/users/edit.blade.php

@ -67,14 +67,15 @@
{!! FormField::text('nickname', ['label' => trans('user.nickname')]) !!}
<div class="row">
<div class="col-md-6">{!! FormField::radios('gender_id', [1 => trans('app.male_code'), trans('app.female_code')], ['label' => trans('user.gender')]) !!}</div>
<div class="col-md-6">{!! FormField::text('dob', ['label' => trans('user.dob'), 'placeholder' => trans('app.example').' 1959-07-20']) !!}</div>
</div>
<div class="row">
<div class="col-md-4">
{!! FormField::text('birth_order', ['label' => trans('user.birth_order'), 'type' => 'number', 'min' => 1]) !!}
</div>
</div>
<div class="row">
<div class="col-md-6">{!! FormField::text('yob', ['label' => trans('user.yob'), 'placeholder' => trans('app.example').' 1959']) !!}</div>
<div class="col-md-6">{!! FormField::text('dob', ['label' => trans('user.dob'), 'placeholder' => trans('app.example').' 1959-07-20']) !!}</div>
</div>
<div class="row">
<div class="col-md-6">{!! FormField::text('yod', ['label' => trans('user.yod'), 'placeholder' => trans('app.example').' 2003']) !!}</div>
<div class="col-md-6">{!! FormField::text('dod', ['label' => trans('user.dod'), 'placeholder' => trans('app.example').' 2003-10-17']) !!}</div>
</div>

2
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',

Loading…
Cancel
Save