diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index cc3e47bca92936573e950acd095016213ad1111b..73b917ba62dc977c8fa4455dd825f8b2cd39f3ec 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -22,19 +22,25 @@ class ProfileController extends APIBaseController public function index() { if(!$this->authenticate(4)){return redirect('/');} - $data_kinerja = Kinerja::where('id_pegawai', Auth::user()->id) + $id = Auth::user()->id; + + $data_kinerja = Kinerja::where('id_pegawai', $id) ->orderBy('tahun', 'ASC') ->orderBy('semester', 'ASC') ->get(); $unit_kerja = UnitKerja::all(); $posisi = Posisi::all(); $kelompok_kompetensi = KelompokKompetensi::all(); - $rekomendasi_training = RekomendasiTraining::where('id_pegawai', Auth::user()->id)->get(); + $rekomendasi_training = RekomendasiTraining::where('id_pegawai', $id)->get(); $training_list = Training::all(); - $rekomendasi_posisi = RekomendasiPosisi::where('id_pegawai', Auth::user()->id)->get(); - $id_pengubah = Pegawai::where('id_user', Auth::user()->id)->first()->id_pengubah; - $nama_pengubah = User::where('id', $id_pengubah)->first()->name; - $last_edited = Pegawai::where('id_user', Auth::user()->id)->first()->updated_at; + $rekomendasi_posisi = RekomendasiPosisi::where('id_pegawai', $id)->get(); + $id_pengubah = Pegawai::where('id_user', $id)->first()->id_pengubah; + if ($id_pengubah === $id) { + $nama_pengubah = "Anda"; + } else { + $nama_pengubah = User::where('id', $id_pengubah)->first()->name; + } + $last_edited = Pegawai::where('id_user', $id)->first()->updated_at; return view("profile.index", compact('last_edited', 'nama_pengubah','data_kinerja', 'unit_kerja', 'posisi', 'kelompok_kompetensi', 'rekomendasi_training', 'training_list', 'rekomendasi_posisi')); } diff --git a/resources/views/layout-profile/footer.blade.php b/resources/views/layout-profile/footer.blade.php index a1422c760529e4514636944a8f620abd317dc2a7..c00d514200e07766384c52f513b0a045e23ba74d 100644 --- a/resources/views/layout-profile/footer.blade.php +++ b/resources/views/layout-profile/footer.blade.php @@ -1,7 +1,12 @@ <footer class="footer"> <div class="container"> - <p class="float-right">Terakhir diedit oleh <b>{{$nama_pengubah}}</b> pada <b>{{$last_edited}}</b> <a class="btn btn-sm btn-primary"href="#"><i class="fas fa-angle-double-up"></i></a></p> + @if ($nama_pengubah === "Anda") + <p class="float-right">Terakhir <b>{{$nama_pengubah}}</b> edit + @else + <p class="float-right">Terakhir diedit oleh <b>{{$nama_pengubah}}</b> + @endif + pada <b>{{$last_edited}}</b> <a class="btn btn-sm btn-primary"href="#"><i class="fas fa-angle-double-up"></i></a></p> <p>© 2018 PMO ITB · </p> </div> </footer> \ No newline at end of file