From f7a6c5a12df2069dcdda9557fb7defcfbdda32a0 Mon Sep 17 00:00:00 2001 From: JokoPrasetio Date: Mon, 29 Jun 2026 13:31:18 +0700 Subject: [PATCH] add log activity mutu & turt --- app/Http/Controllers/DashboardController.php | 74 ++++++++++++++++++-- 1 file changed, 69 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index cdeea0b..e85a47b 100644 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -3402,7 +3402,7 @@ class DashboardController extends Controller ->values() ->all(); if (!empty($unitIds)) { - $query->whereIn('log.id_unit_kerja', $unitIds); + $query->whereIn('log.id_unit_kerja', $unitIds)->orWhere('log.pegawai_id_entry', auth()->user()->objectpegawaifk); } else { $query->whereRaw('1 = 0'); } @@ -3964,10 +3964,26 @@ class DashboardController extends Controller 'mod_change' => null, 'id_unit_kerja' => $data ? $data->id_unit_kerja : null, 'id_sub_unit_kerja' => $data ? $data->id_sub_unit_kerja : null, - 'action_type' => 'Approved Dokumen Mutu', + 'action_type' => 'Approved Dokumen Mutu By ' . auth()->user()?->dataUser?->namalengkap, ]; LogActivity::create($payloadLog); + $payloadLogApprovedByMutu = [ + 'file_directory_id' => $data->file_directory_id, + 'pegawai_id_entry' => auth()->user()->objectpegawaifk, + 'pegawai_nama_entry' => auth()->user()?->dataUser?->namalengkap, + 'entry_at' => now(), + 'file' => $data->file, + 'statusenabled' => true, + 'nama_dokumen' => $data->nama_dokumen ?? null, + 'no_dokumen' => $data->no_dokumen ?? null, + 'mod_change' => null, + 'id_unit_kerja' => $data ? $data->id_unit_kerja : null, + 'id_sub_unit_kerja' => $data ? $data->id_sub_unit_kerja : null, + 'action_type' => 'Approved Dokumen Mutu', + ]; + LogActivity::create($payloadLogApprovedByMutu); + DB::connection('dbDirectory')->commit(); return response()->json([ 'status' => true, @@ -4036,10 +4052,26 @@ class DashboardController extends Controller 'mod_change' => null, 'id_unit_kerja' => $data ? $data->id_unit_kerja : null, 'id_sub_unit_kerja' => $data ? $data->id_sub_unit_kerja : null, - 'action_type' => 'Approved Dokumen Turt', + 'action_type' => 'Approved Dokumen Turt By '. auth()->user()?->dataUser?->namalengkap , ]; LogActivity::create($payloadLog); + $payloadLogApprovedTurt = [ + 'file_directory_id' => $data->file_directory_id, + 'pegawai_id_entry' => auth()->user()?->objectpegawaifk, + 'pegawai_nama_entry' => auth()->user()?->dataUser?->namalengkap, + 'entry_at' => now(), + 'file' => $data->file, + 'statusenabled' => true, + 'nama_dokumen' => $data->nama_dokumen ?? null, + 'no_dokumen' => $data->no_dokumen ?? null, + 'mod_change' => null, + 'id_unit_kerja' => $data ? $data->id_unit_kerja : null, + 'id_sub_unit_kerja' => $data ? $data->id_sub_unit_kerja : null, + 'action_type' => 'Approved Dokumen Turt', + ]; + LogActivity::create($payloadLogApprovedTurt); + DB::connection('dbDirectory')->commit(); return response()->json([ 'status' => true, @@ -4115,9 +4147,25 @@ class DashboardController extends Controller 'no_dokumen' => $data->no_dokumen ?? null, 'id_unit_kerja' => $data ? $data->id_unit_kerja : null, 'id_sub_unit_kerja' => $data ? $data->id_sub_unit_kerja : null, - 'action_type' => 'Rejected Dokumen Mutu', + 'action_type' => 'Rejected Dokumen Mutu By '. auth()->user()?->dataUser?->namalengkap, ]; LogActivity::create($payloadLog); + + $payloadLogRejectedByMutu = [ + 'file_directory_id' => $data->file_directory_id, + 'pegawai_id_entry' => auth()->user()->objectpegawaifk, + 'pegawai_nama_entry' => auth()->user()?->dataUser?->namalengkap, + 'entry_at' => now(), + 'file' => $data->file, + 'statusenabled' => true, + 'nama_dokumen' => $data->nama_dokumen ?? null, + 'no_dokumen' => $data->no_dokumen ?? null, + 'mod_change' => null, + 'id_unit_kerja' => $data ? $data->id_unit_kerja : null, + 'id_sub_unit_kerja' => $data ? $data->id_sub_unit_kerja : null, + 'action_type' => 'Rejected Dokumen Mutu', + ]; + LogActivity::create($payloadLogRejectedByMutu); DB::connection('dbDirectory')->commit(); return response()->json([ 'status' => true, @@ -4193,9 +4241,25 @@ class DashboardController extends Controller 'mod_change' => null, 'id_unit_kerja' => $data ? $data->id_unit_kerja : null, 'id_sub_unit_kerja' => $data ? $data->id_sub_unit_kerja : null, - 'action_type' => 'Rejected Dokumen Turt', + 'action_type' => 'Rejected Dokumen Turt By ' . auth()->user()?->dataUser?->namalengkap ]; LogActivity::create($payloadLog); + + $payloadLogApprovedByTurt = [ + 'file_directory_id' => $data->file_directory_id, + 'pegawai_id_entry' => auth()->user()->objectpegawaifk, + 'pegawai_nama_entry' => auth()->user()?->dataUser?->namalengkap, + 'entry_at' => now(), + 'file' => $data->file, + 'statusenabled' => true, + 'nama_dokumen' => $data->nama_dokumen ?? null, + 'no_dokumen' => $data->no_dokumen ?? null, + 'mod_change' => null, + 'id_unit_kerja' => $data ? $data->id_unit_kerja : null, + 'id_sub_unit_kerja' => $data ? $data->id_sub_unit_kerja : null, + 'action_type' => 'Rejected Dokumen Turt', + ]; + LogActivity::create($payloadLogApprovedByTurt); DB::connection('dbDirectory')->commit(); return response()->json([ 'status' => true,