diff --git a/app/User.php b/app/User.php index 8255803..9a10f7e 100644 --- a/app/User.php +++ b/app/User.php @@ -2,9 +2,9 @@ namespace App; -use Illuminate\Foundation\Auth\User as Authenticatable; -use Illuminate\Notifications\Notifiable; use Ramsey\Uuid\Uuid; +use Illuminate\Notifications\Notifiable; +use Illuminate\Foundation\Auth\User as Authenticatable; class User extends Authenticatable { @@ -218,4 +218,14 @@ class User extends Authenticatable { return $this->belongsTo(User::class); } + + public function managedUsers() + { + return $this->hasMany(User::class, 'manager_id'); + } + + public function managedCouples() + { + return $this->hasMany(Couple::class, 'manager_id'); + } } diff --git a/resources/lang/en/user.php b/resources/lang/en/user.php index 86aa8e9..2065364 100644 --- a/resources/lang/en/user.php +++ b/resources/lang/en/user.php @@ -19,18 +19,15 @@ return [ 'marriages' => 'Marriages', // Actions - 'edit' => 'Edit Profile', - 'set_father' => 'Set Father', - 'set_mother' => 'Set Mother', - 'set_parent' => 'Set Parent', - 'add_spouse' => 'Add Spouse', - 'add_wife' => 'Add Wife', - 'add_husband' => 'Add Husband', - 'add_child' => 'Add Child', + 'edit' => 'Edit Profile', + 'set_father' => 'Set Father', + 'set_mother' => 'Set Mother', + 'set_parent' => 'Set Parent', + 'add_spouse' => 'Add Spouse', + 'add_wife' => 'Add Wife', + 'add_husband' => 'Add Husband', + 'add_child' => 'Add Child', 'add_child_from_existing_couples' => 'Parent (select spouse of :name)', - 'delete' => 'Delete User', - 'delete_confirm' => 'Are you sure to delete this user?', - 'delete_confirm_button' => 'Yes, I am sure', // Attributes 'name' => 'Name', @@ -52,4 +49,13 @@ return [ // Photo 'reupload_photo' => 'Re-upload Photo', 'update_photo' => 'Update Photo', -]; \ No newline at end of file + + // Deletion confirm attributes + 'delete' => 'Delete User', + 'delete_confirm' => 'Are you sure to delete this user?', + 'delete_confirm_button' => 'Yes, I am sure', + 'spouses_count' => 'Number of Spouse', + 'childs_count' => 'Number of Child', + 'managed_user' => 'Number of Managed Users', + 'managed_couple' => 'Number of Managed Couples', +]; diff --git a/resources/lang/id/user.php b/resources/lang/id/user.php index dd73db3..2afa610 100644 --- a/resources/lang/id/user.php +++ b/resources/lang/id/user.php @@ -19,18 +19,15 @@ return [ 'marriages' => 'Pernikahan', // Actions - 'edit' => 'Edit Profil', - 'set_father' => 'Set Ayah', - 'set_mother' => 'Set Ibu', - 'set_parent' => 'Set Orang Tua', - 'add_spouse' => 'Tambah Pasangan', - 'add_wife' => 'Tambah Isteri', - 'add_husband' => 'Tambah Suami', - 'add_child' => 'Tambah Anak', + 'edit' => 'Edit Profil', + 'set_father' => 'Set Ayah', + 'set_mother' => 'Set Ibu', + 'set_parent' => 'Set Orang Tua', + 'add_spouse' => 'Tambah Pasangan', + 'add_wife' => 'Tambah Isteri', + 'add_husband' => 'Tambah Suami', + 'add_child' => 'Tambah Anak', 'add_child_from_existing_couples' => 'Dari Pernikahan (pilih pasangan :name)', - 'delete' => 'Hapus User', - 'delete_confirm' => 'Anda yakin akan menghapus user ini?', - 'delete_confirm_button' => 'Saya yakin hapus user ini', // Attributes 'name' => 'Nama', @@ -52,4 +49,13 @@ return [ // Photo 'reupload_photo' => 'Upload ulang Foto', 'update_photo' => 'Update Foto', -]; \ No newline at end of file + + // Deletion confirm attributes + 'delete' => 'Hapus User', + 'delete_confirm' => 'Anda yakin akan menghapus user ini?', + 'delete_confirm_button' => 'Saya yakin hapus user ini', + 'spouses_count' => 'Jumlah Pasangan', + 'childs_count' => 'Jumlah Anak', + 'managed_user' => 'Jumlah User Dikelola', + 'managed_couple' => 'Jumlah Pasangan Dikelola', +]; diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 7bc7dc6..5cfe1fd 100644 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -7,6 +7,19 @@

{{ __('user.delete') }} : {{ $user->name }}

+
+ + + + + + + + + + +
{{ __('user.name') }}{{ $user->name }}
{{ __('user.nickname') }}{{ $user->nickname }}
{{ __('user.gender') }}{{ $user->gender }}
{{ __('user.father') }}{{ $user->father_id ? $user->father->name : '' }}
{{ __('user.mother') }}{{ $user->mother_id ? $user->mother->name : '' }}
{{ __('user.childs_count') }}{{ $user->childs()->count() }}
{{ __('user.spouses_count') }}{{ $user->marriages()->count() }}
{{ __('user.managed_user') }}{{ $user->managedUsers()->count() }}
{{ __('user.managed_couple') }}{{ $user->managedCouples()->count() }}
+
{{ __('user.delete_confirm') }}
{!! FormField::delete( diff --git a/tests/Unit/UserTest.php b/tests/Unit/UserTest.php index bd441d4..f9848ec 100644 --- a/tests/Unit/UserTest.php +++ b/tests/Unit/UserTest.php @@ -3,8 +3,10 @@ namespace Tests\Unit; use App\User; -use Illuminate\Foundation\Testing\RefreshDatabase; +use App\Couple; use Tests\TestCase; +use Illuminate\Support\Collection; +use Illuminate\Foundation\Testing\RefreshDatabase; class UserTest extends TestCase { @@ -81,4 +83,24 @@ class UserTest extends TestCase $this->assertTrue($user->manager instanceof User); } + + /** @test */ + public function a_user_has_many_managed_users_relation() + { + $user = factory(User::class)->create(); + $managedUser = factory(User::class)->create(['manager_id' => $user->id]); + + $this->assertInstanceOf(Collection::class, $user->managedUsers); + $this->assertInstanceOf(User::class, $user->managedUsers->first()); + } + + /** @test */ + public function a_user_has_many_managed_couples_relation() + { + $user = factory(User::class)->create(); + $managedCouple = factory(Couple::class)->create(['manager_id' => $user->id]); + + $this->assertInstanceOf(Collection::class, $user->managedCouples); + $this->assertInstanceOf(Couple::class, $user->managedCouples->first()); + } }