diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index 7ade80f..e222213 100644 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -130,6 +130,7 @@ class UsersController extends Controller $user->gender_id = $request->get('gender_id'); $user->dob = $request->get('dob'); $user->dod = $request->get('dod'); + $user->birth_order = $request->get('birth_order'); if ($request->get('dod')) { $user->yod = substr($request->get('dod'), 0, 4); diff --git a/app/Http/Requests/Users/UpdateRequest.php b/app/Http/Requests/Users/UpdateRequest.php index e82c2b7..ecf1f0f 100644 --- a/app/Http/Requests/Users/UpdateRequest.php +++ b/app/Http/Requests/Users/UpdateRequest.php @@ -26,17 +26,18 @@ class UpdateRequest extends FormRequest public function rules() { return [ - 'nickname' => 'required|string|max:255', - 'name' => 'required|string|max:255', - 'gender_id' => 'required|numeric', - 'dob' => 'nullable|date|date_format:Y-m-d', - 'dod' => 'nullable|date|date_format:Y-m-d', - 'yod' => 'nullable|date_format:Y', - 'phone' => 'nullable|string|max:255', - 'address' => 'nullable|string|max:255', - 'city' => 'nullable|string|max:255', - 'email' => 'nullable|string|max:255', - 'password' => 'nullable|min:6|max:15', + 'nickname' => 'required|string|max:255', + 'name' => 'required|string|max:255', + 'gender_id' => 'required|numeric', + 'dob' => 'nullable|date|date_format:Y-m-d', + 'dod' => 'nullable|date|date_format:Y-m-d', + 'yod' => 'nullable|date_format:Y', + 'phone' => 'nullable|string|max:255', + 'address' => 'nullable|string|max:255', + 'city' => 'nullable|string|max:255', + 'email' => 'nullable|string|max:255', + 'password' => 'nullable|min:6|max:15', + 'birth_order' => 'nullable|numeric|min:1', ]; } diff --git a/app/User.php b/app/User.php index 9a10f7e..68cd16d 100644 --- a/app/User.php +++ b/app/User.php @@ -23,7 +23,7 @@ class User extends Authenticatable * @var array */ protected $fillable = [ - 'id', + 'id', 'birth_order', 'nickname', 'gender_id', 'name', 'email', 'password', 'address', 'phone', 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 a0e407c..31bd368 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -1,8 +1,8 @@ uuid('mother_id')->nullable(); $table->uuid('parent_id')->nullable(); $table->date('dob')->nullable(); + $table->unsignedTinyInteger('birth_order')->nullable(); $table->date('dod')->nullable(); $table->date('yod')->nullable(); $table->string('email')->unique()->nullable(); diff --git a/resources/lang/en/user.php b/resources/lang/en/user.php index 5a2bf49..7b67031 100644 --- a/resources/lang/en/user.php +++ b/resources/lang/en/user.php @@ -17,6 +17,7 @@ return [ 'grand_father' => 'Grand Father', 'nieces' => 'Nieces', 'marriages' => 'Marriages', + 'birth_order' => 'Birth Order', // Actions 'edit' => 'Edit Profile', diff --git a/resources/lang/id/user.php b/resources/lang/id/user.php index efa3977..e2425e0 100644 --- a/resources/lang/id/user.php +++ b/resources/lang/id/user.php @@ -17,6 +17,7 @@ return [ 'grand_father' => 'Kakek', 'nieces' => 'Keponakan', 'marriages' => 'Pernikahan', + 'birth_order' => 'Anak ke', // Actions 'edit' => 'Edit Profil', diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 479281a..6414677 100644 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -70,6 +70,11 @@