From 4d62f325617099ea53eaaf8e6c92a5ffe91c6065 Mon Sep 17 00:00:00 2001 From: Yoga Pangestu Date: Sun, 15 Dec 2024 19:59:46 +0700 Subject: [PATCH] feat(attendance): menambahkan kolom pegawai di kehadiran --- app/Http/Controllers/Admin/Manage/AttendanceController.php | 2 +- public/assets/admin/js/datatable/custom-table/attendance.js | 3 +++ resources/views/pages/admin/manage/attendances.blade.php | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Admin/Manage/AttendanceController.php b/app/Http/Controllers/Admin/Manage/AttendanceController.php index 930e621..143ba69 100644 --- a/app/Http/Controllers/Admin/Manage/AttendanceController.php +++ b/app/Http/Controllers/Admin/Manage/AttendanceController.php @@ -22,7 +22,7 @@ class AttendanceController extends Controller public function index(Request $request): View|JsonResponse { if ($request->ajax()) { - $attendances = Attendance::with('attachments') + $attendances = Attendance::with(['user', 'user.biography', 'attachments']) ->barbershop() ->when(in_array(auth()->user()->role_id, [4, 5]), function ($query) { return $query->where('user_id', auth()->id()); diff --git a/public/assets/admin/js/datatable/custom-table/attendance.js b/public/assets/admin/js/datatable/custom-table/attendance.js index 015ce02..699a42a 100644 --- a/public/assets/admin/js/datatable/custom-table/attendance.js +++ b/public/assets/admin/js/datatable/custom-table/attendance.js @@ -4,6 +4,9 @@ window.columns = [ orderable: false, searchable: false }, + { + data: 'user.biography.full_name' + }, { data: 'created_at' }, { data: 'check_in' }, { data: 'check_in_image' }, diff --git a/resources/views/pages/admin/manage/attendances.blade.php b/resources/views/pages/admin/manage/attendances.blade.php index cf8af9e..e1ace63 100644 --- a/resources/views/pages/admin/manage/attendances.blade.php +++ b/resources/views/pages/admin/manage/attendances.blade.php @@ -120,6 +120,7 @@ No + Pegawai Tanggal Masuk Foto