diff --git a/app/Services/HR/LeaveService.php b/app/Services/HR/LeaveService.php index ab4f1181..7605c9c0 100644 --- a/app/Services/HR/LeaveService.php +++ b/app/Services/HR/LeaveService.php @@ -787,7 +787,7 @@ public function getActiveEmployees(): \Illuminate\Database\Eloquent\Collection $tenantId = session('selected_tenant_id'); return \App\Models\HR\Employee::query() - ->with('user:id,name') + ->with(['user:id,name', 'department:id,name']) ->forTenant($tenantId) ->activeEmployees() ->where(function ($q) { diff --git a/resources/views/approvals/partials/_leave-promotion-1st-form.blade.php b/resources/views/approvals/partials/_leave-promotion-1st-form.blade.php index 3923ee31..e9b93af1 100644 --- a/resources/views/approvals/partials/_leave-promotion-1st-form.blade.php +++ b/resources/views/approvals/partials/_leave-promotion-1st-form.blade.php @@ -27,10 +27,10 @@ class="w-full px-3 py-2 border border-gray-300 rounded-lg text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"> @foreach($employees as $emp) - @endforeach diff --git a/resources/views/approvals/partials/_leave-promotion-2nd-form.blade.php b/resources/views/approvals/partials/_leave-promotion-2nd-form.blade.php index a3b1c19d..ad5ccf3c 100644 --- a/resources/views/approvals/partials/_leave-promotion-2nd-form.blade.php +++ b/resources/views/approvals/partials/_leave-promotion-2nd-form.blade.php @@ -32,10 +32,10 @@ class="w-full px-3 py-2 border border-gray-300 rounded-lg text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"> @foreach($employees as $emp) - @endforeach