diff --git a/P3/aside.php b/P3/aside.php
index fbb0ce7b9a42224756165a2c1361edbec8bd6161..68bda2b81c8b47b35527e17ae4ba475aa9fa1827 100644
--- a/P3/aside.php
+++ b/P3/aside.php
@@ -98,7 +98,7 @@
                 </ul>
               </li>
 
-               <li <?php if ($current_page=="Rekomendasi_Pribadi" || $current_page=="Perilaku Kerja Pribadi" || $current_page="Penilaian Performansi") echo "class= \"active\""?> >
+               <li <?php if (strpos($current_page, 'Pribadi')) echo "class= \"active\""?> >
                 <a href class="auto">
                   <span class="pull-right text-muted">
                     <i class="text8 icon-bdg_arrow3 text"></i>
diff --git a/P3/controller/penilaian_controller.php b/P3/controller/penilaian_controller.php
index 08b0a9b4279172bdc384e576c069d1bd2964197f..e134c5182e72d384185b563127869b0f3ae12c29 100644
--- a/P3/controller/penilaian_controller.php
+++ b/P3/controller/penilaian_controller.php
@@ -6,7 +6,7 @@ require_once '../header.php';
 $func = $_GET['func'];
 
 if ($func == 1){
-	$nip_pegawai = $_GET['nip'];
+	$nip_pegawai = $nip_login;
 	getPenilaian($nip_pegawai);
 } 
 
@@ -25,12 +25,67 @@ function getPenilaian($nip_pegawai){
 	    while($row = $result->fetch_assoc()) {
 	        $id_penilaian = $row["id_penilaian"];
 	    }
-	} 
+	}
 
+	$penilai = getPegawai(getNIPPejabatPenilai($nip_pegawai));
+	$_SESSION['penilai_nip'] = $penilai['nip'];
+	$_SESSION['penilai_nama'] = $penilai['nama'];
+	$_SESSION['penilai_golongan'] = $penilai['golongan'];
+	$_SESSION['penilai_pangkat'] = $penilai['pangkat'];
+	$_SESSION['penilai_unit'] = $penilai['unit_kerja'];
+
+	$atasan = getPegawai(getNIPAtasanPenilai($nip_pegawai));
+	$_SESSION['atasan_nip'] = $atasan['nip'];
+	$_SESSION['atasan_nama'] = $atasan['nama'];
+	$_SESSION['atasan_golongan'] = $atasan['golongan'];
+	$_SESSION['atasan_pangkat'] = $atasan['pangkat'];
+	$_SESSION['atasan_unit'] = $atasan['unit_kerja'];
 
 	header( 'Location: ../lihat_penilaian.php' ) ;
 	exit();
 
 }
 
+function getNIPPejabatPenilai($nip_pegawai){
+	$conn = connect_database2();
+	$sql = "SELECT id_atasan FROM pegawai WHERE nip = '$nip_pegawai' ;";
+	$result = $conn->query($sql);
+
+	$nip_penilai ="";
+	if ($result->num_rows > 0) { 
+	    while($row = $result->fetch_assoc()) {
+	       $nip_penilai=$row["id_atasan"];
+	    }
+	} else {
+		echo "0 results<br>";
+	}
+
+	return $nip_penilai;
+}
+
+function getNIPAtasanPenilai($nip_pegawai){
+	$nip_penilai = getNIPPejabatPenilai($nip_pegawai);
+	$nip_atasan = getNIPPejabatPenilai($nip_penilai);
+
+	return $nip_atasan;
+}
+
+function getPegawai($nip_pegawai){
+	$conn = connect_database2();
+	$sql = "SELECT nip, nama, golongan, unit_kerja, pangkat FROM pegawai WHERE nip = '$nip_pegawai' ;";
+	$result = $conn->query($sql);
+
+	if ($result->num_rows > 0) { 
+	    while($row = $result->fetch_assoc()) {
+	    	$pegawai['nip'] = $row['nip'];
+	    	$pegawai['nama'] = $row['nama'];
+	    	$pegawai['golongan'] = $row['golongan'];
+	    	$pegawai['unit_kerja'] = $row['unit_kerja'];
+	    	$pegawai['pangkat'] = $row['pangkat'];
+	    }
+	}
+
+	return $pegawai;
+}
+
 ?>
\ No newline at end of file
diff --git a/P3/header.php b/P3/header.php
index 5d26dd9246ae761577e83d91cf7e13f1905e7c32..354c4e93c67a930fffc3c7bba756daf94ed99a61 100644
--- a/P3/header.php
+++ b/P3/header.php
@@ -35,43 +35,6 @@
           
         <!-- navbar right -->
         <ul class="nav navbar-nav navbar-right">
-            <li class="dropdown">
-             <a href="#" data-toggle="dropdown" class="dropdown-toggle">
-               <i class="icon-bdg_alert text14"></i>
-               <span class="visible-xs-inline">Notifikasi</span>
-               <span class="badge badge-sm up bg-danger pull-right-xs">2</span>
-             </a>
-             <!-- dropdown -->
-             <div class="dropdown-menu w-xl animated fadeIn">
-               <div class="panel bg-white">
-                 <div class="panel-heading b-light bg-light">
-                   <strong>Kamu Punya <span>2</span> Notifikasi</strong>
-                 </div>
-                 <div class="list-group">
-                   <a href class="list-group-item">
-                     <span class="pull-left m-r thumb-sm">
-                       <img src="img/01.jpg" alt="..." class="img-circle">
-                     </span>
-                     <span class="clear block m-b-none">
-                       Pembangunan Taman daerah Bandung Barat<br>
-                       <small class="text-muted">10 minutes ago</small>
-                     </span>
-                   </a>
-                   <a href class="list-group-item">
-                     <span class="clear block m-b-none">
-                       Revitalisasi Sungai Cikapundung<br>
-                       <small class="text-muted">1 hour ago</small>
-                     </span>
-                   </a>
-                 </div>
-                 <div class="panel-footer text-sm">
-                   <a href class="pull-right"><i class="icon-bdg_setting3"></i></a>
-                   <a href="#notes" data-toggle="class:show animated fadeInRight">Lihat Semua Notifikasi</a>
-                 </div>
-               </div>
-             </div>
-             <!-- / dropdown -->
-           </li>
           <li class="dropdown">
             <a href="#" data-toggle="dropdown" class="dropdown-toggle">
               <i class="icon-bdg_search text14"></i>              
diff --git a/P3/lihat_penilaian.php b/P3/lihat_penilaian.php
index 479a71383f0c51d134f066983ff868b91d9446e1..9b37eef0fdf497ad5c2e53749ea7d58f5a8421f4 100644
--- a/P3/lihat_penilaian.php
+++ b/P3/lihat_penilaian.php
@@ -1,3 +1,4 @@
+<?php session_start(); ?>
 <!DOCTYPE html>
 <html lang="en" class="">
 <head>
@@ -13,13 +14,12 @@
   <link rel="stylesheet" href="css/font.css" type="text/css" />
   <link rel="stylesheet" href="css/style.css" type="text/css" />
 
-<?php $current_page = "Penilaian Performansi" ; ?>
-
 </head>
 <body>
 <div class="app app-header-fixed ">
-        <?php require_once 'header.php' ?>
-        <?php require_once 'aside.php' ?>
+  <?php $current_page = "Penilaian Pribadi" ; ?>
+  <?php require_once 'header.php' ?>
+  <?php require_once 'aside.php' ?>
 
 <!-- content -->
 <div id="content" class="app-content" role="main">
@@ -67,11 +67,11 @@
               <div class="panel-body">
                 <table class="table table-striped b-t b-light">
                   <tbody>
-                    <tr><td><b>NIP</b></td><td><?php echo $nip_login; ?></td></tr>
-                    <tr><td><b>Nama</b></td><td><?php echo $nama; ?></td></tr>
-                    <tr><td><b>Golongan</b></td><td><?php echo $golongan; ?></td></tr>
-                    <tr><td><b>Pangkat</b></td><td><?php echo $pangkat; ?></td></tr>
-                    <tr><td><b>Unit Kerja</b></td><td><?php echo $unit_kerja; ?></td></tr>
+                    <tr><td><b>NIP</b></td><td><?php echo $_SESSION['penilai_nip']; ?></td></tr>
+                    <tr><td><b>Nama</b></td><td><?php echo $_SESSION['penilai_nama']; ?></td></tr>
+                    <tr><td><b>Golongan</b></td><td><?php echo $_SESSION['penilai_golongan']; ?></td></tr>
+                    <tr><td><b>Pangkat</b></td><td><?php echo $_SESSION['penilai_pangkat']; ?></td></tr>
+                    <tr><td><b>Unit Kerja</b></td><td><?php echo $_SESSION['penilai_unit']; ?></td></tr>
                   </tbody>
                 </table>
               </div>
@@ -83,11 +83,11 @@
               <div class="panel-body">
                 <table class="table table-striped b-t b-light">
                   <tbody>
-                    <tr><td><b>NIP</b></td><td><?php echo $nip_login; ?></td></tr>
-                    <tr><td><b>Nama</b></td><td><?php echo $nama; ?></td></tr>
-                    <tr><td><b>Golongan</b></td><td><?php echo $golongan; ?></td></tr>
-                    <tr><td><b>Pangkat</b></td><td><?php echo $pangkat; ?></td></tr>
-                    <tr><td><b>Unit Kerja</b></td><td><?php echo $unit_kerja; ?></td></tr>
+                    <tr><td><b>NIP</b></td><td><?php echo $_SESSION['atasan_nip']; ?></td></tr>
+                    <tr><td><b>Nama</b></td><td><?php echo $_SESSION['atasan_nama']; ?></td></tr>
+                    <tr><td><b>Golongan</b></td><td><?php echo $_SESSION['atasan_golongan']; ?></td></tr>
+                    <tr><td><b>Pangkat</b></td><td><?php echo $_SESSION['atasan_pangkat']; ?></td></tr>
+                    <tr><td><b>Unit Kerja</b></td><td><?php echo $_SESSION['atasan_unit']; ?></td></tr>
                   </tbody>
                 </table>
               </div>