diff --git a/build/classes/simrskhanza/frmUtama$309.class b/build/classes/simrskhanza/frmUtama$309.class
diff --git a/build/classes/simrskhanza/frmUtama$31.class b/build/classes/simrskhanza/frmUtama$31.class
diff --git a/build/classes/simrskhanza/frmUtama$310.class b/build/classes/simrskhanza/frmUtama$310.class
diff --git a/build/classes/simrskhanza/frmUtama$311.class b/build/classes/simrskhanza/frmUtama$311.class
diff --git a/build/classes/simrskhanza/frmUtama$312.class b/build/classes/simrskhanza/frmUtama$312.class
diff --git a/build/classes/simrskhanza/frmUtama$313.class b/build/classes/simrskhanza/frmUtama$313.class
diff --git a/build/classes/simrskhanza/frmUtama$314.class b/build/classes/simrskhanza/frmUtama$314.class
diff --git a/build/classes/simrskhanza/frmUtama$315.class b/build/classes/simrskhanza/frmUtama$315.class
diff --git a/build/classes/simrskhanza/frmUtama$316.class b/build/classes/simrskhanza/frmUtama$316.class
diff --git a/build/classes/simrskhanza/frmUtama$317.class b/build/classes/simrskhanza/frmUtama$317.class
diff --git a/build/classes/simrskhanza/frmUtama$318.class b/build/classes/simrskhanza/frmUtama$318.class
diff --git a/build/classes/simrskhanza/frmUtama$319.class b/build/classes/simrskhanza/frmUtama$319.class
diff --git a/build/classes/simrskhanza/frmUtama$32.class b/build/classes/simrskhanza/frmUtama$32.class
diff --git a/build/classes/simrskhanza/frmUtama$320.class b/build/classes/simrskhanza/frmUtama$320.class
diff --git a/build/classes/simrskhanza/frmUtama$321.class b/build/classes/simrskhanza/frmUtama$321.class
diff --git a/build/classes/simrskhanza/frmUtama$322.class b/build/classes/simrskhanza/frmUtama$322.class
diff --git a/build/classes/simrskhanza/frmUtama$323.class b/build/classes/simrskhanza/frmUtama$323.class
diff --git a/build/classes/simrskhanza/frmUtama$324.class b/build/classes/simrskhanza/frmUtama$324.class
diff --git a/build/classes/simrskhanza/frmUtama$325.class b/build/classes/simrskhanza/frmUtama$325.class
diff --git a/build/classes/simrskhanza/frmUtama$326.class b/build/classes/simrskhanza/frmUtama$326.class
diff --git a/build/classes/simrskhanza/frmUtama$327.class b/build/classes/simrskhanza/frmUtama$327.class
diff --git a/build/classes/simrskhanza/frmUtama$328.class b/build/classes/simrskhanza/frmUtama$328.class
diff --git a/build/classes/simrskhanza/frmUtama$329.class b/build/classes/simrskhanza/frmUtama$329.class
diff --git a/build/classes/simrskhanza/frmUtama$33.class b/build/classes/simrskhanza/frmUtama$33.class
diff --git a/build/classes/simrskhanza/frmUtama$330.class b/build/classes/simrskhanza/frmUtama$330.class
diff --git a/build/classes/simrskhanza/frmUtama$331.class b/build/classes/simrskhanza/frmUtama$331.class
diff --git a/build/classes/simrskhanza/frmUtama$332.class b/build/classes/simrskhanza/frmUtama$332.class
diff --git a/build/classes/simrskhanza/frmUtama$333.class b/build/classes/simrskhanza/frmUtama$333.class
diff --git a/build/classes/simrskhanza/frmUtama$334.class b/build/classes/simrskhanza/frmUtama$334.class
diff --git a/build/classes/simrskhanza/frmUtama$335.class b/build/classes/simrskhanza/frmUtama$335.class
diff --git a/build/classes/simrskhanza/frmUtama$336.class b/build/classes/simrskhanza/frmUtama$336.class
diff --git a/build/classes/simrskhanza/frmUtama$337.class b/build/classes/simrskhanza/frmUtama$337.class
diff --git a/build/classes/simrskhanza/frmUtama$338.class b/build/classes/simrskhanza/frmUtama$338.class
diff --git a/build/classes/simrskhanza/frmUtama$339.class b/build/classes/simrskhanza/frmUtama$339.class
diff --git a/build/classes/simrskhanza/frmUtama$34.class b/build/classes/simrskhanza/frmUtama$34.class
diff --git a/build/classes/simrskhanza/frmUtama$340.class b/build/classes/simrskhanza/frmUtama$340.class
diff --git a/build/classes/simrskhanza/frmUtama$341.class b/build/classes/simrskhanza/frmUtama$341.class
diff --git a/build/classes/simrskhanza/frmUtama$342.class b/build/classes/simrskhanza/frmUtama$342.class
diff --git a/build/classes/simrskhanza/frmUtama$343.class b/build/classes/simrskhanza/frmUtama$343.class
diff --git a/build/classes/simrskhanza/frmUtama$344.class b/build/classes/simrskhanza/frmUtama$344.class
diff --git a/build/classes/simrskhanza/frmUtama$345.class b/build/classes/simrskhanza/frmUtama$345.class
diff --git a/build/classes/simrskhanza/frmUtama$346.class b/build/classes/simrskhanza/frmUtama$346.class
diff --git a/build/classes/simrskhanza/frmUtama$347.class b/build/classes/simrskhanza/frmUtama$347.class
diff --git a/build/classes/simrskhanza/frmUtama$348.class b/build/classes/simrskhanza/frmUtama$348.class
diff --git a/build/classes/simrskhanza/frmUtama$349.class b/build/classes/simrskhanza/frmUtama$349.class
diff --git a/build/classes/simrskhanza/frmUtama$35.class b/build/classes/simrskhanza/frmUtama$35.class
diff --git a/build/classes/simrskhanza/frmUtama$350.class b/build/classes/simrskhanza/frmUtama$350.class
diff --git a/build/classes/simrskhanza/frmUtama$351.class b/build/classes/simrskhanza/frmUtama$351.class
diff --git a/build/classes/simrskhanza/frmUtama$352.class b/build/classes/simrskhanza/frmUtama$352.class
diff --git a/build/classes/simrskhanza/frmUtama$353.class b/build/classes/simrskhanza/frmUtama$353.class
diff --git a/build/classes/simrskhanza/frmUtama$354.class b/build/classes/simrskhanza/frmUtama$354.class
diff --git a/build/classes/simrskhanza/frmUtama$355.class b/build/classes/simrskhanza/frmUtama$355.class
diff --git a/build/classes/simrskhanza/frmUtama$356.class b/build/classes/simrskhanza/frmUtama$356.class
diff --git a/build/classes/simrskhanza/frmUtama$357.class b/build/classes/simrskhanza/frmUtama$357.class
diff --git a/build/classes/simrskhanza/frmUtama$358.class b/build/classes/simrskhanza/frmUtama$358.class
diff --git a/build/classes/simrskhanza/frmUtama$359.class b/build/classes/simrskhanza/frmUtama$359.class
diff --git a/build/classes/simrskhanza/frmUtama$36.class b/build/classes/simrskhanza/frmUtama$36.class
diff --git a/build/classes/simrskhanza/frmUtama$360.class b/build/classes/simrskhanza/frmUtama$360.class
diff --git a/build/classes/simrskhanza/frmUtama$361.class b/build/classes/simrskhanza/frmUtama$361.class
diff --git a/build/classes/simrskhanza/frmUtama$362.class b/build/classes/simrskhanza/frmUtama$362.class
diff --git a/build/classes/simrskhanza/frmUtama$363.class b/build/classes/simrskhanza/frmUtama$363.class
diff --git a/build/classes/simrskhanza/frmUtama$364.class b/build/classes/simrskhanza/frmUtama$364.class
diff --git a/build/classes/simrskhanza/frmUtama$365.class b/build/classes/simrskhanza/frmUtama$365.class
diff --git a/build/classes/simrskhanza/frmUtama$366.class b/build/classes/simrskhanza/frmUtama$366.class
diff --git a/build/classes/simrskhanza/frmUtama$367.class b/build/classes/simrskhanza/frmUtama$367.class
diff --git a/build/classes/simrskhanza/frmUtama$368.class b/build/classes/simrskhanza/frmUtama$368.class
diff --git a/build/classes/simrskhanza/frmUtama$369.class b/build/classes/simrskhanza/frmUtama$369.class
diff --git a/build/classes/simrskhanza/frmUtama$37.class b/build/classes/simrskhanza/frmUtama$37.class
diff --git a/build/classes/simrskhanza/frmUtama$370.class b/build/classes/simrskhanza/frmUtama$370.class
diff --git a/build/classes/simrskhanza/frmUtama$371.class b/build/classes/simrskhanza/frmUtama$371.class
diff --git a/build/classes/simrskhanza/frmUtama$372.class b/build/classes/simrskhanza/frmUtama$372.class
diff --git a/build/classes/simrskhanza/frmUtama$373.class b/build/classes/simrskhanza/frmUtama$373.class
diff --git a/build/classes/simrskhanza/frmUtama$38.class b/build/classes/simrskhanza/frmUtama$38.class
diff --git a/build/classes/simrskhanza/frmUtama$39.class b/build/classes/simrskhanza/frmUtama$39.class
diff --git a/build/classes/simrskhanza/frmUtama$4.class b/build/classes/simrskhanza/frmUtama$4.class
diff --git a/build/classes/simrskhanza/frmUtama$40.class b/build/classes/simrskhanza/frmUtama$40.class
diff --git a/build/classes/simrskhanza/frmUtama$41.class b/build/classes/simrskhanza/frmUtama$41.class
diff --git a/build/classes/simrskhanza/frmUtama$42.class b/build/classes/simrskhanza/frmUtama$42.class
diff --git a/build/classes/simrskhanza/frmUtama$43.class b/build/classes/simrskhanza/frmUtama$43.class
diff --git a/build/classes/simrskhanza/frmUtama$44.class b/build/classes/simrskhanza/frmUtama$44.class
diff --git a/build/classes/simrskhanza/frmUtama$45.class b/build/classes/simrskhanza/frmUtama$45.class
diff --git a/build/classes/simrskhanza/frmUtama$46.class b/build/classes/simrskhanza/frmUtama$46.class
diff --git a/build/classes/simrskhanza/frmUtama$47.class b/build/classes/simrskhanza/frmUtama$47.class
diff --git a/build/classes/simrskhanza/frmUtama$48.class b/build/classes/simrskhanza/frmUtama$48.class
diff --git a/build/classes/simrskhanza/frmUtama$49.class b/build/classes/simrskhanza/frmUtama$49.class
diff --git a/build/classes/simrskhanza/frmUtama$5.class b/build/classes/simrskhanza/frmUtama$5.class
diff --git a/build/classes/simrskhanza/frmUtama$50.class b/build/classes/simrskhanza/frmUtama$50.class
diff --git a/build/classes/simrskhanza/frmUtama$51.class b/build/classes/simrskhanza/frmUtama$51.class
diff --git a/build/classes/simrskhanza/frmUtama$52.class b/build/classes/simrskhanza/frmUtama$52.class
diff --git a/build/classes/simrskhanza/frmUtama$53.class b/build/classes/simrskhanza/frmUtama$53.class
diff --git a/build/classes/simrskhanza/frmUtama$54.class b/build/classes/simrskhanza/frmUtama$54.class
diff --git a/build/classes/simrskhanza/frmUtama$55.class b/build/classes/simrskhanza/frmUtama$55.class
diff --git a/build/classes/simrskhanza/frmUtama$56.class b/build/classes/simrskhanza/frmUtama$56.class
diff --git a/build/classes/simrskhanza/frmUtama$57.class b/build/classes/simrskhanza/frmUtama$57.class
diff --git a/build/classes/simrskhanza/frmUtama$58.class b/build/classes/simrskhanza/frmUtama$58.class
diff --git a/build/classes/simrskhanza/frmUtama$59.class b/build/classes/simrskhanza/frmUtama$59.class
diff --git a/build/classes/simrskhanza/frmUtama$6.class b/build/classes/simrskhanza/frmUtama$6.class
diff --git a/build/classes/simrskhanza/frmUtama$60.class b/build/classes/simrskhanza/frmUtama$60.class
diff --git a/build/classes/simrskhanza/frmUtama$61.class b/build/classes/simrskhanza/frmUtama$61.class
diff --git a/build/classes/simrskhanza/frmUtama$62.class b/build/classes/simrskhanza/frmUtama$62.class
diff --git a/build/classes/simrskhanza/frmUtama$63.class b/build/classes/simrskhanza/frmUtama$63.class
diff --git a/build/classes/simrskhanza/frmUtama$64.class b/build/classes/simrskhanza/frmUtama$64.class
diff --git a/build/classes/simrskhanza/frmUtama$65.class b/build/classes/simrskhanza/frmUtama$65.class
diff --git a/build/classes/simrskhanza/frmUtama$66.class b/build/classes/simrskhanza/frmUtama$66.class
diff --git a/build/classes/simrskhanza/frmUtama$67.class b/build/classes/simrskhanza/frmUtama$67.class
diff --git a/build/classes/simrskhanza/frmUtama$68.class b/build/classes/simrskhanza/frmUtama$68.class
diff --git a/build/classes/simrskhanza/frmUtama$69.class b/build/classes/simrskhanza/frmUtama$69.class
diff --git a/build/classes/simrskhanza/frmUtama$7.class b/build/classes/simrskhanza/frmUtama$7.class
diff --git a/build/classes/simrskhanza/frmUtama$70.class b/build/classes/simrskhanza/frmUtama$70.class
diff --git a/build/classes/simrskhanza/frmUtama$71.class b/build/classes/simrskhanza/frmUtama$71.class
diff --git a/build/classes/simrskhanza/frmUtama$72.class b/build/classes/simrskhanza/frmUtama$72.class
diff --git a/build/classes/simrskhanza/frmUtama$73.class b/build/classes/simrskhanza/frmUtama$73.class
diff --git a/build/classes/simrskhanza/frmUtama$74.class b/build/classes/simrskhanza/frmUtama$74.class
diff --git a/build/classes/simrskhanza/frmUtama$75.class b/build/classes/simrskhanza/frmUtama$75.class
diff --git a/build/classes/simrskhanza/frmUtama$76.class b/build/classes/simrskhanza/frmUtama$76.class
diff --git a/build/classes/simrskhanza/frmUtama$77.class b/build/classes/simrskhanza/frmUtama$77.class
diff --git a/build/classes/simrskhanza/frmUtama$78.class b/build/classes/simrskhanza/frmUtama$78.class
diff --git a/build/classes/simrskhanza/frmUtama$79.class b/build/classes/simrskhanza/frmUtama$79.class
diff --git a/build/classes/simrskhanza/frmUtama$8.class b/build/classes/simrskhanza/frmUtama$8.class
diff --git a/build/classes/simrskhanza/frmUtama$80.class b/build/classes/simrskhanza/frmUtama$80.class
diff --git a/build/classes/simrskhanza/frmUtama$81.class b/build/classes/simrskhanza/frmUtama$81.class
diff --git a/build/classes/simrskhanza/frmUtama$82.class b/build/classes/simrskhanza/frmUtama$82.class
diff --git a/build/classes/simrskhanza/frmUtama$83.class b/build/classes/simrskhanza/frmUtama$83.class
diff --git a/build/classes/simrskhanza/frmUtama$84.class b/build/classes/simrskhanza/frmUtama$84.class
diff --git a/build/classes/simrskhanza/frmUtama$85.class b/build/classes/simrskhanza/frmUtama$85.class
diff --git a/build/classes/simrskhanza/frmUtama$86.class b/build/classes/simrskhanza/frmUtama$86.class
diff --git a/build/classes/simrskhanza/frmUtama$87.class b/build/classes/simrskhanza/frmUtama$87.class
diff --git a/build/classes/simrskhanza/frmUtama$88.class b/build/classes/simrskhanza/frmUtama$88.class
diff --git a/build/classes/simrskhanza/frmUtama$89.class b/build/classes/simrskhanza/frmUtama$89.class
diff --git a/build/classes/simrskhanza/frmUtama$9.class b/build/classes/simrskhanza/frmUtama$9.class
diff --git a/build/classes/simrskhanza/frmUtama$90.class b/build/classes/simrskhanza/frmUtama$90.class
diff --git a/build/classes/simrskhanza/frmUtama$91.class b/build/classes/simrskhanza/frmUtama$91.class
diff --git a/build/classes/simrskhanza/frmUtama$92.class b/build/classes/simrskhanza/frmUtama$92.class
diff --git a/build/classes/simrskhanza/frmUtama$93.class b/build/classes/simrskhanza/frmUtama$93.class
diff --git a/build/classes/simrskhanza/frmUtama$94.class b/build/classes/simrskhanza/frmUtama$94.class
diff --git a/build/classes/simrskhanza/frmUtama$95.class b/build/classes/simrskhanza/frmUtama$95.class
diff --git a/build/classes/simrskhanza/frmUtama$96.class b/build/classes/simrskhanza/frmUtama$96.class
diff --git a/build/classes/simrskhanza/frmUtama$97.class b/build/classes/simrskhanza/frmUtama$97.class
diff --git a/build/classes/simrskhanza/frmUtama$98.class b/build/classes/simrskhanza/frmUtama$98.class
diff --git a/build/classes/simrskhanza/frmUtama$99.class b/build/classes/simrskhanza/frmUtama$99.class
diff --git a/build/classes/simrskhanza/frmUtama.class b/build/classes/simrskhanza/frmUtama.class
diff --git a/build/classes/widget/MenuBar.class b/build/classes/widget/MenuBar.class
diff --git a/dist/SIMRSKhanza.jar b/dist/SIMRSKhanza.jar
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -3,10 +3,9 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="1"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/kepegawaian/DlgMasterBerkasPegawai.java</file>
-            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/keuangan/DlgKamar.java</file>
+            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/widget/MenuBar.java</file>
             <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/simrskhanza/frmUtama.java</file>
-            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/fungsi/sekuel.java</file>
+            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/kepegawaian/DlgBerkasKepegawaian.java</file>
         </group>
     </open-files>
 </project-private>
diff --git a/sik.sql b/sik.sql
diff --git a/src/fungsi/var.java b/src/fungsi/var.java
@@ -72,7 +72,7 @@ public final class var {
             billing_parsial=false,bpjs_cek_nomor_rujukan_rs=false,bpjs_cek_rujukan_kartu_pcare=false,bpjs_cek_rujukan_kartu_rs=false,akses_depo_obat=false,
             bpjs_rujukan_keluar=false,grafik_lab_ralanbulan=false,pengeluaran_stok_apotek=false,grafik_rad_ralanbulan=false,detailjmdokter2=false,
             pengaduan_pasien=false,grafik_lab_ralanhari=false,grafik_rad_ralanhari=false,sensus_harian_ralan=false,metode_racik=false,pembayaran_akun_bayar=false,
-            pengguna_obat_resep=false,rekap_pemesanan=false,master_berkas_pegawai=false;
+            pengguna_obat_resep=false,rekap_pemesanan=false,master_berkas_pegawai=false,berkas_kepegawaian=false;
 
     public static void setData(String user, String pass) {
        try {                
@@ -411,6 +411,7 @@ public static void setData(String user, String pass) {
                         var.pengguna_obat_resep=true;
                         var.rekap_pemesanan=true;
                         var.master_berkas_pegawai=true;
+                        var.berkas_kepegawaian=true;
                     }else if(rs2.getRow()>=1){   
                         rs2.beforeFirst();
                         rs2.next();
@@ -733,6 +734,7 @@ public static void setData(String user, String pass) {
                         var.pengguna_obat_resep=rs2.getBoolean("pengguna_obat_resep");
                         var.rekap_pemesanan=rs2.getBoolean("rekap_pemesanan");
                         var.master_berkas_pegawai=rs2.getBoolean("master_berkas_pegawai");
+                        var.berkas_kepegawaian=rs2.getBoolean("berkas_kepegawaian");
                     }else if((rs.getRow()==0)&&(rs2.getRow()==0)){
                         var.kode="";                  
                         var.penyakit= false;
@@ -1053,6 +1055,7 @@ public static void setData(String user, String pass) {
                         var.pengguna_obat_resep=false;
                         var.rekap_pemesanan=false;
                         var.master_berkas_pegawai=false;
+                        var.berkas_kepegawaian=false;
                     }
                 } catch (Exception e) {
                     System.out.println("Notifikasi : "+e);
@@ -1420,4 +1423,5 @@ public static void setData(String user, String pass) {
     public static boolean getpengguna_obat_resep(){return var.pengguna_obat_resep;}
     public static boolean getrekap_pemesanan(){return var.rekap_pemesanan;}
     public static boolean getmaster_berkas_pegawai(){return var.master_berkas_pegawai;}
+    public static boolean getberkas_kepegawaian(){return var.berkas_kepegawaian;}
 }   
diff --git a/src/kepegawaian/DlgBerkasKepegawaian.form b/src/kepegawaian/DlgBerkasKepegawaian.form
diff --git a/src/kepegawaian/DlgBerkasKepegawaian.java b/src/kepegawaian/DlgBerkasKepegawaian.java
diff --git a/src/kepegawaian/DlgCariPegawai.java b/src/kepegawaian/DlgCariPegawai.java
@@ -36,7 +36,7 @@ public DlgCariPegawai(java.awt.Frame parent, boolean modal) {
         this.setLocation(10,2);
         setSize(656,250);
 
-        Object[] row={"NIP","Nama","J.K.","Jabatan","Kode Jenjang","Departemen","Bagian","Status","Status Karyawan",
+        Object[] row={"NIP","Nama","J.K.","Jabatan","Kode Jenjang","Departemen","Bidang","Status","Status Karyawan",
                       "NPWP","Pendidikan","Tmp.Lahir","Tgl.Lahir","Alamat","Kota","Mulai Kerja","Kode Ms Kerja",
                       "Kode Index","BPD","Rekening","Stts Aktif","Wajib Masuk","Mulai Kontrak"};
         tabMode=new DefaultTableModel(null,row){

diff --git a/src/keuangan/DlgBilingRanap.form b/src/keuangan/DlgBilingRanap.form
@@ -1915,7 +1915,7 @@
               <Properties>
                 <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
                   <StringArray count="1">
-                    <StringItem index="0" value="23-05-2018 01:12:23"/>
+                    <StringItem index="0" value="05-06-2018 11:09:56"/>
                   </StringArray>
                 </Property>
                 <Property name="displayFormat" type="java.lang.String" value="dd-MM-yyyy HH:mm:ss"/>

diff --git a/src/keuangan/DlgBilingRanap.java b/src/keuangan/DlgBilingRanap.java
@@ -98,12 +98,12 @@ public class DlgBilingRanap extends javax.swing.JDialog {
                     "(beri_obat_operasi.hargasatuan*beri_obat_operasi.jumlah) as total "+
                     "from obatbhp_ok inner join beri_obat_operasi "+
                     "on beri_obat_operasi.kd_obat=obatbhp_ok.kd_obat where "+
-                    "beri_obat_operasi.no_rawat=? group by obatbhp_ok.nm_obat",
+                    "beri_obat_operasi.no_rawat=? group by beri_obat_operasi.kd_obat",
             sqlpsreturobat="select databarang.nama_brng,detreturjual.h_retur, "+
                     "sum(detreturjual.jml_retur * -1) as jml, "+
                     "sum(detreturjual.subtotal * -1) as ttl from detreturjual inner join databarang inner join returjual "+
                     "on detreturjual.kode_brng=databarang.kode_brng "+
-                    "and returjual.no_retur_jual=detreturjual.no_retur_jual where returjual.no_retur_jual=? group by databarang.nama_brng",
+                    "and returjual.no_retur_jual=detreturjual.no_retur_jual where returjual.no_retur_jual=? group by databarang.kode_brng",
             sqlpsobatlangsung="select besar_tagihan from tagihan_obat_langsung where no_rawat=? ",
             sqlpskamarin="select kamar_inap.kd_kamar,bangsal.nm_bangsal,kamar_inap.trf_kamar,"+
                     "kamar_inap.lama,kamar_inap.ttl_biaya as total,kamar_inap.tgl_masuk, "+

diff --git a/src/laporan/DlgRL4ASebab.java b/src/laporan/DlgRL4ASebab.java
@@ -38,7 +38,6 @@ public DlgRL4ASebab(java.awt.Frame parent, boolean modal) {
         super(parent, modal);
         initComponents();
 
-
         HTMLEditorKit kit = new HTMLEditorKit();
         LoadHTML.setEditable(true);
         LoadHTML.setEditorKit(kit);

diff --git a/src/setting/DlgUser.java b/src/setting/DlgUser.java
@@ -105,7 +105,7 @@ public DlgUser(java.awt.Frame parent, boolean modal) {
                     "[K]Cek No.Rujukan RS di VClaim","[K]Cek Rujukan Kartu PCare di VClaim","[K]Cek Rujukan Kartu RS di VClaim","[A]Akses Depo Obat/BHP","[K]Pembuatan Rujukan VClaim",
                     "[N]Kunjungan Lab Ralan Per Bulan","[D]Stok Keluar Medis","[N]Kunjungan Rad Ralan Per Bulan","[H]Detail JM Dokter 2","[L]Pengaduan/Chat","[N]Kunjungan Lab Ralan Per Tanggal",
                     "[N]Kunjungan Rad Ralan Per Tanggal","[I]Sensus Harian Ralan","[D]Metode Racik","[H]Pembayaran Per Akun Bayar","[D]Pengguna Obat/Alkes/BHP Resep","[D]Rekap Penerimaan Obat & BHP",
-                    "[C]Master Berkas Pegawai"
+                    "[C]Master Berkas Pegawai","[C]Berkas Kepegawaian"
         };
 
         tabMode=new DefaultTableModel(null,row){
@@ -215,7 +215,7 @@ public Class getColumnClass(int columnIndex) {
         tbUser.setPreferredScrollableViewportSize(new Dimension(500,500));
         tbUser.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
 
-        for (i = 0; i < 318;i++) {
+        for (i = 0; i < 319;i++) {
             TableColumn column = tbUser.getColumnModel().getColumn(i);
             if(i==0){
                 column.setPreferredWidth(130);
@@ -487,6 +487,8 @@ public Class getColumnClass(int columnIndex) {
                 column.setPreferredWidth(168);
             }else if(i==317){
                 column.setPreferredWidth(132);
+            }else if(i==318){
+                column.setPreferredWidth(120);
             }else{
                 column.setPreferredWidth(130);
             }
@@ -921,7 +923,7 @@ private void BtnSimpanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
                     "'false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false',"+
                     "'false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false',"+
                     "'false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false',"+
-                    "'false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false'","User")==true){
+                    "'false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false','false'","User")==true){
                 tampil();
                 emptTeks();
             }            
@@ -1281,7 +1283,8 @@ private void BtnEditActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST
                     "pembayaran_akun_bayar='"+tbUser.getValueAt(i,314).toString()+"',"+
                     "pengguna_obat_resep='"+tbUser.getValueAt(i,315).toString()+"',"+
                     "rekap_pemesanan='"+tbUser.getValueAt(i,316).toString()+"',"+
-                    "master_berkas_pegawai='"+tbUser.getValueAt(i,317).toString()+"'");
+                    "master_berkas_pegawai='"+tbUser.getValueAt(i,317).toString()+"',"+
+                    "berkas_kepegawaian='"+tbUser.getValueAt(i,318).toString()+"'");
             }            
             tampil();
             emptTeks();
@@ -1561,7 +1564,7 @@ private void tampil() {
                         "billing_parsial,bpjs_cek_nomor_rujukan_rs,bpjs_cek_rujukan_kartu_pcare,bpjs_cek_rujukan_kartu_rs,akses_depo_obat,"+
                         "bpjs_rujukan_keluar,grafik_lab_ralanbulan,pengeluaran_stok_apotek,grafik_rad_ralanbulan,detailjmdokter2,"+
                         "pengaduan_pasien,grafik_lab_ralanhari,grafik_rad_ralanhari,sensus_harian_ralan,metode_racik,pembayaran_akun_bayar, "+
-                        "pengguna_obat_resep,rekap_pemesanan,master_berkas_pegawai from user order by AES_DECRYPT(id_user,'nur')");
+                        "pengguna_obat_resep,rekap_pemesanan,master_berkas_pegawai,berkas_kepegawaian from user order by AES_DECRYPT(id_user,'nur')");
             try {
                 rs=ps.executeQuery();
                 while(rs.next()){
@@ -1890,7 +1893,8 @@ private void tampil() {
                                rs.getBoolean("pembayaran_akun_bayar"),
                                rs.getBoolean("pengguna_obat_resep"),
                                rs.getBoolean("rekap_pemesanan"),
-                               rs.getBoolean("master_berkas_pegawai")
+                               rs.getBoolean("master_berkas_pegawai"),
+                               rs.getBoolean("berkas_kepegawaian")
                             });
                         }   
                     } catch (Exception e) {
@@ -2209,7 +2213,8 @@ private void tampil() {
                            rs.getBoolean("pembayaran_akun_bayar"),
                            rs.getBoolean("pengguna_obat_resep"),
                            rs.getBoolean("rekap_pemesanan"),
-                           rs.getBoolean("master_berkas_pegawai")
+                           rs.getBoolean("master_berkas_pegawai"),
+                           rs.getBoolean("berkas_kepegawaian")
                         });
                     }                                             
                  }

diff --git a/src/simrskhanza/frmUtama.form b/src/simrskhanza/frmUtama.form
@@ -5623,6 +5623,22 @@
                         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnMasterBerkasPegawaiActionPerformed"/>
                       </Events>
                     </Component>
+                    <Component class="widget.ButtonBig" name="btnBerkasPegawai">
+                      <Properties>
+                        <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                          <Image iconType="3" name="/48x48/1481002437_partners.png"/>
+                        </Property>
+                        <Property name="text" type="java.lang.String" value="Berkas Kepegawaian"/>
+                        <Property name="iconTextGap" type="int" value="0"/>
+                        <Property name="name" type="java.lang.String" value="btnBerkasPegawai" noResource="true"/>
+                        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                          <Dimension value="[200, 90]"/>
+                        </Property>
+                      </Properties>
+                      <Events>
+                        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnBerkasPegawaiActionPerformed"/>
+                      </Events>
+                    </Component>
                   </SubComponents>
                 </Container>
               </SubComponents>
@@ -5639,7 +5655,7 @@
         </Property>
         <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
           <StringArray count="1">
-            <StringItem index="0" value="04/06/2018"/>
+            <StringItem index="0" value="05/06/2018"/>
           </StringArray>
         </Property>
         <Property name="displayFormat" type="java.lang.String" value="dd/MM/yyyy"/>

diff --git a/src/simrskhanza/frmUtama.java b/src/simrskhanza/frmUtama.java
@@ -288,6 +288,7 @@
 import parkir.DlgParkirJenis;
 import parkir.DlgParkirMasuk;
 import kepegawaian.DlgBelum;
+import kepegawaian.DlgBerkasKepegawaian;
 import kepegawaian.DlgBulanan;
 import kepegawaian.DlgBulanan2;
 import kepegawaian.DlgHarian;
@@ -784,6 +785,7 @@ private void initComponents() {
         btnPenggunaObatResep = new widget.ButtonBig();
         btnRekapPenerimaanObat = new widget.ButtonBig();
         btnMasterBerkasPegawai = new widget.ButtonBig();
+        btnBerkasPegawai = new widget.ButtonBig();
         tanggal = new widget.Tanggal();
         btnDataPenjualan = new widget.ButtonBig();
         btnInputPenjualan = new widget.ButtonBig();
@@ -4870,6 +4872,18 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         });
         Panelmenu.add(btnMasterBerkasPegawai);
 
+        btnBerkasPegawai.setIcon(new javax.swing.ImageIcon(getClass().getResource("/48x48/1481002437_partners.png"))); // NOI18N
+        btnBerkasPegawai.setText("Berkas Kepegawaian");
+        btnBerkasPegawai.setIconTextGap(0);
+        btnBerkasPegawai.setName("btnBerkasPegawai"); // NOI18N
+        btnBerkasPegawai.setPreferredSize(new java.awt.Dimension(200, 90));
+        btnBerkasPegawai.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                btnBerkasPegawaiActionPerformed(evt);
+            }
+        });
+        Panelmenu.add(btnBerkasPegawai);
+
         scrollPane2.setViewportView(Panelmenu);
 
         panelMenu.add(scrollPane2, java.awt.BorderLayout.CENTER);
@@ -10332,6 +10346,17 @@ private void btnMasterBerkasPegawaiActionPerformed(java.awt.event.ActionEvent ev
         this.setCursor(Cursor.getDefaultCursor());
     }//GEN-LAST:event_btnMasterBerkasPegawaiActionPerformed
 
+    private void btnBerkasPegawaiActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnBerkasPegawaiActionPerformed
+        isTutup();
+        this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+        DlgBerkasKepegawaian form=new DlgBerkasKepegawaian(null,false);
+        form.setSize(PanelUtama.getWidth(),PanelUtama.getHeight());
+        form.setLocationRelativeTo(PanelUtama);
+        form.setVisible(true);
+        DlgHome.dispose();
+        this.setCursor(Cursor.getDefaultCursor());
+    }//GEN-LAST:event_btnBerkasPegawaiActionPerformed
+
     /**
     * @param args the command line arguments
     */
@@ -10408,6 +10433,7 @@ public static void main(String args[]) {
     private widget.ButtonBig btnBayarPiutang;
     private widget.ButtonBig btnBeriObat;
     private widget.ButtonBig btnBerkasDigitalPerawatan;
+    private widget.ButtonBig btnBerkasPegawai;
     private widget.ButtonBig btnBubes;
     private widget.ButtonBig btnBulananHAIs;
     private widget.ButtonBig btnCashFlow;
@@ -11205,6 +11231,11 @@ private void isCombo() {
                 Panelmenu.add(btnMasterBerkasPegawai); 
                 jmlmenu++;
             }
+
+            if(var.getberkas_kepegawaian()==true){                
+                Panelmenu.add(btnBerkasPegawai); 
+                jmlmenu++;
+            }
 
             if(var.getsms()==true){                
                 Panelmenu.add(btnSMS);
@@ -12797,6 +12828,11 @@ private void isCariKosong() {
             jmlmenu++;
         }
 
+        if(var.getberkas_kepegawaian()==true){                
+            Panelmenu.add(btnBerkasPegawai); 
+            jmlmenu++;
+        }
+
         if(var.getsms()==true){                
             Panelmenu.add(btnSMS);
             jmlmenu++;
@@ -14441,6 +14477,13 @@ private void isCariIsi() {
             }                
         }
 
+        if(var.getberkas_kepegawaian()==true){    
+            if(btnBerkasPegawai.getText().toLowerCase().trim().contains(TCari.getText().toLowerCase().trim())){
+                Panelmenu.add(btnBerkasPegawai);
+                jmlmenu++;
+            }                
+        }
+
         if(var.getsms()==true){    
             if(btnSMS.getText().toLowerCase().trim().contains(TCari.getText().toLowerCase().trim())){
                 Panelmenu.add(btnSMS);

diff --git a/src/widget/MenuBar.java b/src/widget/MenuBar.java
@@ -23,7 +23,7 @@ public class MenuBar extends JMenuBar {
     private BufferedImage gradientImage;
     private BufferedImage ligthImage;
     private final Color light = new Color(1F, 1F, 1F, 0.35F);
-    private final Color dark = new Color(1F, 1F, 1F, 0.15F);
+    private final Color dark = new Color(1F, 1F, 1F, 0.20F);
     //private Color black = Color.black;
     //private Color warna = Color.magenta.darker().darker().darker().darker();
     private final Color black = new Color(70,110,70);

diff --git a/webapps/antrian.php b/webapps/antrian.php
diff --git a/webapps/berkasrawat/css/default.css b/webapps/berkasrawat/css/default.css
@@ -111,16 +111,16 @@ h1 {
 	width: 100%;
         border-bottom-width: 1px;
 	border-bottom-style: solid;
-	border-bottom-color: #eafae9;
+	border-bottom-color: #f1f6ec;
         border-top-width: 1px;
 	border-top-style: solid;
-	border-top-color: #eafae9;
+	border-top-color: #f1f6ec;
         border-right-width: 1px;
 	border-right-style: solid;
-	border-right-color: #eafae9;
+	border-right-color: #f1f6ec;
         border-left-width: 1px;
 	border-left-style: solid;
-	border-left-color: #eafae9;        
+	border-left-color: #f1f6ec;        
 }
 
 #navcontainer table tr td {
@@ -153,16 +153,16 @@ h1 {
     height: 99.5%;
     border-bottom-width: 1px;
 	border-bottom-style: solid;
-	border-bottom-color: #eafae9;
+	border-bottom-color: #f1f6ec;
         border-top-width: 1px;
 	border-top-style: solid;
-	border-top-color: #eafae9;
+	border-top-color: #f1f6ec;
         border-right-width: 1px;
 	border-right-style: solid;
-	border-right-color: #eafae9;
+	border-right-color: #f1f6ec;
         border-left-width: 1px;
 	border-left-style: solid;
-	border-left-color: #eafae9; 
+	border-left-color: #f1f6ec; 
 }
 
 
@@ -451,7 +451,7 @@ background:#7bbcc7; color:#aaceaf;background-position:5px 5px;font: 11px  Tahoma
     font: 11px  Tahoma;
 	height:28px;
         display:inline;
-        background:url(images/65.png) no-repeat left #eafae9;
+        background:url(images/65.png) no-repeat left #f1f6ec;
         background-position:4px 5px;
         border-bottom:1px #fffff9 solid;
         color:#65795b;

diff --git a/webapps/berkasrawat/pages/detail.php b/webapps/berkasrawat/pages/detail.php
@@ -34,45 +34,45 @@
                           <a href=?act=List>| List Berkas |</a>
                       </div>";
             ?>
-            <div style="width: 100%; height: 52%; overflow: auto;">
+            <div style="width: 100%; height: 45%; overflow: auto;">
             <table width="100%" align="center">
-                <tr class="head">
+                <tr class="isi2">
                     <td width="25%" >No.Rawat</td><td width="">:</td>
                     <td width="75%"><?php echo $no_rawat;?></td>
                 </tr>
-                <tr class="head">
+                <tr class="isi2">
                     <td width="25%" >No.RM</td><td width="">:</td>
                     <td width="75%"><?php echo $no_rkm_medis;?></td>
                 </tr>
-		<tr class="head">
+		<tr class="isi2">
                     <td width="25%">Nama Pasien</td><td width="">:</td>
                     <td width="75%"><?php echo $nm_pasien.", ".$umurdaftar." ".$sttsumur;?></td>
                 </tr>
-                <tr class="head">
+                <tr class="isi2">
                     <td width="25%">Jenis Kelamin</td><td width="">:</td>
                     <td width="75%"><?php echo $jk;?></td>
                 </tr>
-                <tr class="head">
+                <tr class="isi2">
                     <td width="25%">Alamat</td><td width="">:</td>
                     <td width="75%"><?php echo $almt_pj;?></td>
                 </tr>
-                <tr class="head">
+                <tr class="isi2">
                     <td width="25%">Tgl.Registrasi</td><td width="">:</td>
                     <td width="75%"><?php echo $tgl_registrasi;?></td>
                 </tr>   
-                <tr class="head">
+                <tr class="isi2">
                     <td width="25%">Poliklinik</td><td width="">:</td>
                     <td width="75%"><?php echo $nm_poli;?></td>
                 </tr> 
-                <tr class="head">
+                <tr class="isi2">
                     <td width="25%">Dokter</td><td width="">:</td>
                     <td width="75%"><?php echo $nm_dokter;?></td>
                 </tr> 
-                <tr class="head">
+                <tr class="isi2">
                     <td width="25%">Status</td><td width="">:</td>
                     <td width="75%"><?php echo $status_lanjut." (".$png_jawab.")";?></td>
                 </tr>
-                <tr class="head">
+                <tr class="isi2">
                     <td width="25%" >Berkas Digital</td><td width="">:</td>
                     <td width="75%">
                         <select name="kode" class="text2" onkeydown="setDefault(this, document.getElementById('MsgIsi1'));" id="TxtIsi1">
@@ -88,7 +88,7 @@
                         <span id="MsgIsi1" style="color:#CC0000; font-size:10px;"></span>
                     </td>
                 </tr>
-                <tr class="head">
+                <tr class="isi2">
                     <td width="25%" >File Berkas(PDF/JPG)</td><td width="">:</td>
                     <td width="75%"><input name="dokumen" class="text" onkeydown="setDefault(this, document.getElementById('MsgIsi2'));" type=file id="TxtIsi2" value="<?php echo $dokumen;?>" size="30" maxlength="255" />
                     <span id="MsgIsi2" style="color:#CC0000; font-size:10px;"></span>
@@ -117,7 +117,7 @@
                     }
                 }
             ?>
-            <div style="width: 100%; height: 28%; overflow: auto;">
+            <div style="width: 100%; height: 35%; overflow: auto;">
             <?php
                 $_sql = "SELECT berkas_digital_perawatan.no_rawat,berkas_digital_perawatan.kode, 
                         master_berkas_digital.nama,berkas_digital_perawatan.lokasi_file 
@@ -140,7 +140,7 @@
                       echo "<tr class='isi'>
                                 <td>
                                     <center>
-                                    <a href='?act=Detail&action=HAPUS&no_rawat=".$baris["no_rawat"]."&kode=".$baris["kode"]."'>[hapus]</a>
+                                    <a href='?act=Detail&action=HAPUS&no_rawat=".$baris["no_rawat"]."&kode=".$baris["kode"]."&lokasi_file=".$baris["lokasi_file"]."'>[hapus]</a>
                                    </center>
                                 </td>
                                 <td>".$baris["nama"]."</td>
@@ -160,7 +160,8 @@
         </div>
         </form>
         <?php
-            if ($action=="HAPUS") {
+            if ($action=="HAPUS") {                
+                unlink($_GET['lokasi_file']);
                 Hapus(" berkas_digital_perawatan "," no_rawat ='".$_GET['no_rawat']."' and kode ='".$_GET['kode']."' ","?act=Detail&action=TAMBAH&no_rawat=$no_rawat");
             }
 

diff --git a/webapps/berkasrawat/pages/detail2.php b/webapps/berkasrawat/pages/detail2.php
@@ -31,23 +31,23 @@
                 echo "<input type=hidden name=no_rawat  value=$no_rawat>
                       <input type=hidden name=action value=$action>";
             ?>
-            <div style="width: 100%; height: 30%; overflow: auto;">
+            <div style="width: 100%; height: 27%; overflow: auto;">
             <table width="100%" align="center">
-                <tr class="head">
-                    <td width="25%" >No.Rawat</td><td width="">:</td>
-                    <td width="75%"><?php echo $no_rawat;?></td>
+                <tr class="isi2">
+                    <td width="25%" valign="top">No.Rawat</td><td width="" valign="top">:</td>
+                    <td width="75%" valign="top"><?php echo $no_rawat;?></td>
                 </tr>
-                <tr class="head">
-                    <td width="25%" >No.RM</td><td width="">:</td>
-                    <td width="75%"><?php echo $no_rkm_medis;?></td>
+                <tr class="isi2">
+                    <td width="25%" valign="top">No.RM</td><td width="" valign="top">:</td>
+                    <td width="75%" valign="top"><?php echo $no_rkm_medis;?></td>
                 </tr>
-		<tr class="head">
-                    <td width="25%">Nama Pasien</td><td width="">:</td>
-                    <td width="75%"><?php echo $nm_pasien.", ".$umurdaftar." ".$sttsumur;?></td>
+		<tr class="isi2">
+                    <td width="25%" valign="top">Nama Pasien</td><td width="" valign="top">:</td>
+                    <td width="75%" valign="top"><?php echo $nm_pasien.", ".$umurdaftar." ".$sttsumur;?></td>
                 </tr>                
-                <tr class="head">
-                    <td width="25%" >Berkas Digital</td><td width="">:</td>
-                    <td width="75%">
+                <tr class="isi2">
+                    <td width="25%" valign="top">Berkas Digital</td><td width="" valign="top">:</td>
+                    <td width="75%" valign="top">
                         <select name="kode" class="text2" onkeydown="setDefault(this, document.getElementById('MsgIsi1'));" id="TxtIsi1">
                             <?php
                                 $_sql = "SELECT kode,nama FROM master_berkas_digital ORDER BY nama";
@@ -61,9 +61,9 @@
                         <span id="MsgIsi1" style="color:#CC0000; font-size:10px;"></span>
                     </td>
                 </tr>
-                <tr class="head">
-                    <td width="25%" >File Berkas(PDF/JPG)</td><td width="">:</td>
-                    <td width="75%"><input name="dokumen" class="text" onkeydown="setDefault(this, document.getElementById('MsgIsi2'));" type=file id="TxtIsi2" value="<?php echo $dokumen;?>" size="30" maxlength="255" />
+                <tr class="isi2">
+                    <td width="25%" valign="top">File Berkas(PDF/JPG)</td><td width="" valign="top">:</td>
+                    <td width="75%" valign="top"><input name="dokumen" class="text" onkeydown="setDefault(this, document.getElementById('MsgIsi2'));" type=file id="TxtIsi2" value="<?php echo $dokumen;?>" size="30" maxlength="255" />
                     </td>
                 </tr>        
             </table>
@@ -89,7 +89,7 @@
                     }
                 }
             ?>
-            <div style="width: 100%; height: 53%; overflow: auto;">
+            <div style="width: 100%; height: 56%; overflow: auto;">
             <?php
                 $_sql = "SELECT berkas_digital_perawatan.no_rawat,berkas_digital_perawatan.kode, 
                         master_berkas_digital.nama,berkas_digital_perawatan.lokasi_file 
@@ -112,7 +112,7 @@
                       echo "<tr class='isi'>
                                 <td>
                                     <center>
-                                    <a href='?act=Detail2&action=HAPUS&no_rawat=".$baris["no_rawat"]."&kode=".$baris["kode"]."'>[hapus]</a>
+                                    <a href='?act=Detail2&action=HAPUS&no_rawat=".$baris["no_rawat"]."&kode=".$baris["kode"]."&lokasi_file=".$baris["lokasi_file"]."'>[hapus]</a>
                                    </center>
                                 </td>
                                 <td>".$baris["nama"]."</td>
@@ -132,6 +132,7 @@
         </div>
         <?php
             if ($action=="HAPUS") {
+                unlink($_GET['lokasi_file']);
                 Hapus(" berkas_digital_perawatan "," no_rawat ='".$_GET['no_rawat']."' and kode ='".$_GET['kode']."' ","?act=Detail2&action=TAMBAH&no_rawat=$no_rawat");
             }
 

diff --git a/webapps/berkasrawat/pages/upload/CARA_BUAT_AUTO_BACKUP_DATABASE_SIM_KHANZA_HMS.pdf b/webapps/berkasrawat/pages/upload/CARA_BUAT_AUTO_BACKUP_DATABASE_SIM_KHANZA_HMS.pdf
diff --git a/webapps/berkasrawat/pages/upload/akhwat.jpg b/webapps/berkasrawat/pages/upload/akhwat.jpg
diff --git a/webapps/berkasrawat/pages/upload/polos1.jpg b/webapps/berkasrawat/pages/upload/polos1.jpg
diff --git a/webapps/css/default.css b/webapps/css/default.css
@@ -111,16 +111,16 @@ h1 {
 	width: 100%;
         border-bottom-width: 1px;
 	border-bottom-style: solid;
-	border-bottom-color: #eafae9;
+	border-bottom-color: #f1f6ec;
         border-top-width: 1px;
 	border-top-style: solid;
-	border-top-color: #eafae9;
+	border-top-color: #f1f6ec;
         border-right-width: 1px;
 	border-right-style: solid;
-	border-right-color: #eafae9;
+	border-right-color: #f1f6ec;
         border-left-width: 1px;
 	border-left-style: solid;
-	border-left-color: #eafae9;        
+	border-left-color: #f1f6ec;        
 }
 
 #navcontainer table tr td {
@@ -153,16 +153,16 @@ h1 {
     height: 99.5%;
     border-bottom-width: 1px;
 	border-bottom-style: solid;
-	border-bottom-color: #eafae9;
+	border-bottom-color: #f1f6ec;
         border-top-width: 1px;
 	border-top-style: solid;
-	border-top-color: #eafae9;
+	border-top-color: #f1f6ec;
         border-right-width: 1px;
 	border-right-style: solid;
-	border-right-color: #eafae9;
+	border-right-color: #f1f6ec;
         border-left-width: 1px;
 	border-left-style: solid;
-	border-left-color: #eafae9; 
+	border-left-color: #f1f6ec; 
 }
 
 
@@ -467,7 +467,7 @@ background:#7bbcc7; color:#aaceaf;background-position:5px 5px;font: 11px  Tahoma
     font: 11px  Tahoma;
 	height:28px;
         display:inline;
-        background:url(images/65.png) no-repeat left #eafae9;
+        background:url(images/65.png) no-repeat left #f1f6ec;
         background-position:4px 5px;
         border-bottom:1px #fffff9 solid;
         color:#65795b;

diff --git a/webapps/inacbg/css/default.css b/webapps/inacbg/css/default.css
@@ -111,16 +111,16 @@ h1 {
 	width: 100%;
         border-bottom-width: 1px;
 	border-bottom-style: solid;
-	border-bottom-color: #eafae9;
+	border-bottom-color: #f1f6ec;
         border-top-width: 1px;
 	border-top-style: solid;
-	border-top-color: #eafae9;
+	border-top-color: #f1f6ec;
         border-right-width: 1px;
 	border-right-style: solid;
-	border-right-color: #eafae9;
+	border-right-color: #f1f6ec;
         border-left-width: 1px;
 	border-left-style: solid;
-	border-left-color: #eafae9;        
+	border-left-color: #f1f6ec;        
 }
 
 #navcontainer table tr td {
@@ -153,16 +153,16 @@ h1 {
     height: 99.5%;
     border-bottom-width: 1px;
 	border-bottom-style: solid;
-	border-bottom-color: #eafae9;
+	border-bottom-color: #f1f6ec;
         border-top-width: 1px;
 	border-top-style: solid;
-	border-top-color: #eafae9;
+	border-top-color: #f1f6ec;
         border-right-width: 1px;
 	border-right-style: solid;
-	border-right-color: #eafae9;
+	border-right-color: #f1f6ec;
         border-left-width: 1px;
 	border-left-style: solid;
-	border-left-color: #eafae9; 
+	border-left-color: #f1f6ec; 
 }
 
 
@@ -446,7 +446,7 @@ background:#7bbcc7; color:#aaceaf;background-position:5px 5px;font: 11px  Tahoma
     font: 11px  Tahoma;
 	height:28px;
         display:inline;
-        background:url(images/65.png) no-repeat left #eafae9;
+        background:url(images/65.png) no-repeat left #f1f6ec;
         background-position:4px 5px;
         border-bottom:1px #fffff9 solid;
         color:#65795b;

diff --git a/webapps/medrec/css/default.css b/webapps/medrec/css/default.css
@@ -111,16 +111,16 @@ h1 {
 	width: 100%;
         border-bottom-width: 1px;
 	border-bottom-style: solid;
-	border-bottom-color: #eafae9;
+	border-bottom-color: #f1f6ec;
         border-top-width: 1px;
 	border-top-style: solid;
-	border-top-color: #eafae9;
+	border-top-color: #f1f6ec;
         border-right-width: 1px;
 	border-right-style: solid;
-	border-right-color: #eafae9;
+	border-right-color: #f1f6ec;
         border-left-width: 1px;
 	border-left-style: solid;
-	border-left-color: #eafae9;        
+	border-left-color: #f1f6ec;        
 }
 
 #navcontainer table tr td {
@@ -153,16 +153,16 @@ h1 {
     height: 99.5%;
     border-bottom-width: 1px;
 	border-bottom-style: solid;
-	border-bottom-color: #eafae9;
+	border-bottom-color: #f1f6ec;
         border-top-width: 1px;
 	border-top-style: solid;
-	border-top-color: #eafae9;
+	border-top-color: #f1f6ec;
         border-right-width: 1px;
 	border-right-style: solid;
-	border-right-color: #eafae9;
+	border-right-color: #f1f6ec;
         border-left-width: 1px;
 	border-left-style: solid;
-	border-left-color: #eafae9; 
+	border-left-color: #f1f6ec; 
 }
 
 
@@ -436,7 +436,7 @@ background:#7bbcc7; color:#aaceaf;background-position:5px 5px;font: 11px  Tahoma
     font: 11px  Tahoma;
 	height:28px;
         display:inline;
-        background:url(images/65.png) no-repeat left #eafae9;
+        background:url(images/65.png) no-repeat left #f1f6ec;
         background-position:4px 5px;
         border-bottom:1px #fffff9 solid;
         color:#65795b;

diff --git a/webapps/medrec/pages/detail.php b/webapps/medrec/pages/detail.php
@@ -143,7 +143,7 @@
                       echo "<tr class='isi'>
                                 <td width='70'>
                                     <center>"; ?>
-                                    <a href="?act=Detail&action=HAPUS&tgl_retensi=<?php print $baris[2] ?>&id=<?php echo $id ?>" >[hapus]</a>
+                                    <a href="?act=Detail&action=HAPUS&tgl_retensi=<?php print $baris[2] ?>&id=<?php echo $id ?>&lokasi_pdf=<?php print $baris[3] ?>" >[hapus]</a>
                             <?php
                             echo "</center>
                                 </td>
@@ -167,6 +167,7 @@
         </form>
         <?php
             if ($action=="HAPUS") {
+                unlink($_GET['lokasi_pdf']);
                 Hapus(" retensi_pasien "," no_rkm_medis ='".$_GET['id']."' and tgl_retensi ='".$_GET['tgl_retensi']."' ","?act=Detail&action=TAMBAH&id=$id");
             }
 

diff --git a/webapps/monitoringberkas/css/default.css b/webapps/monitoringberkas/css/default.css
@@ -111,16 +111,16 @@ h1 {
 	width: 100%;
         border-bottom-width: 1px;
 	border-bottom-style: solid;
-	border-bottom-color: #eafae9;
+	border-bottom-color: #f1f6ec;
         border-top-width: 1px;
 	border-top-style: solid;
-	border-top-color: #eafae9;
+	border-top-color: #f1f6ec;
         border-right-width: 1px;
 	border-right-style: solid;
-	border-right-color: #eafae9;
+	border-right-color: #f1f6ec;
         border-left-width: 1px;
 	border-left-style: solid;
-	border-left-color: #eafae9;        
+	border-left-color: #f1f6ec;        
 }
 
 #navcontainer table tr td {
@@ -153,16 +153,16 @@ h1 {
     height: 99.5%;
     border-bottom-width: 1px;
 	border-bottom-style: solid;
-	border-bottom-color: #eafae9;
+	border-bottom-color: #f1f6ec;
         border-top-width: 1px;
 	border-top-style: solid;
-	border-top-color: #eafae9;
+	border-top-color: #f1f6ec;
         border-right-width: 1px;
 	border-right-style: solid;
-	border-right-color: #eafae9;
+	border-right-color: #f1f6ec;
         border-left-width: 1px;
 	border-left-style: solid;
-	border-left-color: #eafae9; 
+	border-left-color: #f1f6ec; 
 }
 
 
@@ -483,7 +483,7 @@ background:#7bbcc7; color:#aaceaf;background-position:5px 5px;font: 11px  Tahoma
     font: 11px  Tahoma;
 	height:28px;
         display:inline;
-        background:url(images/65.png) no-repeat left #eafae9;
+        background:url(images/65.png) no-repeat left #f1f6ec;
         background-position:4px 5px;
         border-bottom:1px #fffff9 solid;
         color:#65795b;

diff --git a/webapps/nbproject/private/private.xml b/webapps/nbproject/private/private.xml
@@ -3,6 +3,11 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group/>
+        <group>
+            <file>file:/opt/lampp/htdocs/webapps/penggajian/pages/pegawai/inputpegawai.php</file>
+            <file>file:/opt/lampp/htdocs/webapps/penggajian/loginberkaspegawai.php</file>
+            <file>file:/opt/lampp/htdocs/webapps/penggajian/pages/berkaspegawai/detail.php</file>
+            <file>file:/opt/lampp/htdocs/webapps/penggajian/pages/pegawai/listcaripegawai.php</file>
+        </group>
     </open-files>
 </project-private>
diff --git a/webapps/pendaftaran/config.php b/webapps/pendaftaran/config.php
@@ -24,7 +24,7 @@
 define('URL', '');
 define('DIR', '');
 define('HARIDAFTAR', '03'); // Batasi hari pendaftaran 3 hari kedepan
-define('LIMITJAM', '12:00:00'); // Batasi jam pendaftaran
+define('LIMITJAM', '21:00:00'); // Batasi jam pendaftaran
 define('SIGNUP', 'ENABLE'); // ENABLE atau DISABLE pendaftaran pasien baru
 define('KODE_BERKAS', '002'); // Kode katergori berkas digital
 define('UKURAN_BERKAS', '5000000'); // Ukuran berkas digital dalam byte

diff --git a/webapps/pendaftaran/pendaftaran.php b/webapps/pendaftaran/pendaftaran.php
@@ -135,8 +135,18 @@
 
         //menentukan umur sekarang
         list($cY, $cm, $cd) = explode('-', date('Y-m-d'));
-        list($Y, $m, $d) = explode('-', date('Y-m-d', strtotime($get_pasien["tgl_lahir"])));
-        $umurdaftar = $cY - $Y;
+		//menentukan tanggal_lahir pasien sesuai dengan no rekam medis
+                                        $pasien = fetch_array(query("
+                                            SELECT 
+                                                tgl_lahir 
+                                            FROM 
+                                                pasien 
+                                            WHERE 
+                                                no_rkm_medis = '{$_SESSION['username']}'
+                                        "));
+         //end query   
+        list($Y, $m, $d) = explode('-', date('Y-m-d', strtotime($pasien[tgl_lahir])));
+        $umurdaftar = $cY-$Y;
 
         if($_FILES['file']['name']!='') {
             $file='../berkasrawat/'.$photo_rujukan;

diff --git a/webapps/penggajian/conf/command.php b/webapps/penggajian/conf/command.php
@@ -75,7 +75,7 @@ function formProtek() {
                                       'DetailPresensi','ListKS','InputJasLa','ListJasLa','InputPasien','ListRj','ListPinjam',
                                       'DetailPinjam','BayarPinjam','ListJam','SisaDankes','ListKoperasi','InputRiwayatPangkat','ListRiwayatPangkat',
                                       'InputRiwayatPendidikan','ListRiwayatPendidikan','InputRiwayatSeminar','ListRiwayatSeminar','ListRiwayatGaji',
-                                      'InputBank','ListBank','DetailBpjs','DetailHarianBulanan');
+                                      'InputBank','ListBank','DetailBpjs','DetailHarianBulanan','DetailBerkasPegawai');
 				foreach ($form as $page) {
 					if ($aksi==$page) {
 						echo "<META HTTP-EQUIV = 'Refresh' Content = '0; URL = ?act=Home'>";
@@ -205,7 +205,9 @@ function actionPages() {
                         case 'InputRiwayatGaji'         : include_once('pages/riwayatgaji/detail.php'); break;
                         case 'ListRiwayatGaji'          : include_once('pages/riwayatgaji/list.php'); break;
 
-                        default			        : include_once('pages/kontak.php');
+                        case 'DetailBerkasPegawai'      : include_once('pages/berkaspegawai/detail.php'); break;
+
+                    default			        : include_once('pages/kontak.php');
 
 		}
 	}

diff --git a/webapps/penggajian/css/default.css b/webapps/penggajian/css/default.css
@@ -111,16 +111,16 @@ h1 {
 	width: 100%;
         border-bottom-width: 1px;
 	border-bottom-style: solid;
-	border-bottom-color: #eafae9;
+	border-bottom-color: #f1f6ec;
         border-top-width: 1px;
 	border-top-style: solid;
-	border-top-color: #eafae9;
+	border-top-color: #f1f6ec;
         border-right-width: 1px;
 	border-right-style: solid;
-	border-right-color: #eafae9;
+	border-right-color: #f1f6ec;
         border-left-width: 1px;
 	border-left-style: solid;
-	border-left-color: #eafae9;        
+	border-left-color: #f1f6ec;        
 }
 
 #navcontainer table tr td {
@@ -153,16 +153,16 @@ h1 {
     height: 99.5%;
     border-bottom-width: 1px;
 	border-bottom-style: solid;
-	border-bottom-color: #eafae9;
+	border-bottom-color: #f1f6ec;
         border-top-width: 1px;
 	border-top-style: solid;
-	border-top-color: #eafae9;
+	border-top-color: #f1f6ec;
         border-right-width: 1px;
 	border-right-style: solid;
-	border-right-color: #eafae9;
+	border-right-color: #f1f6ec;
         border-left-width: 1px;
 	border-left-style: solid;
-	border-left-color: #eafae9; 
+	border-left-color: #f1f6ec; 
 }
 
 
@@ -276,6 +276,14 @@ color: #65795b;
 	font: 11px  tahoma;
 }
 
+.isi a{
+	text-decoration:none;
+        color:#65795b;
+        padding:0 0 0 0px;
+        font-family: Tahoma;
+        font-size: 11px;
+}
+
 .isi2 td{
 	padding-top:3px;
 	padding-bottom:3px;
@@ -336,10 +344,10 @@ color: #65795b;
 	margin-left: 10px;
 	padding: 4px 4px;
 	border: none;
-	background: #C11212;
+	background: #f2f7eb;
 	font-size: 11px;
         font: Tahoma;
-	color: #ffffff;
+	color: #65795b;
 }
 
 .text {
@@ -371,6 +379,17 @@ color: #65795b;
         width:90px;
 }
 
+.text4 {
+	background: #fffff9;
+        font-size: 11px;
+        font: Tahoma;
+	padding: 3px 0 3px 5px;
+	border: 1px solid #e2e7de;
+	color: #65795b;
+        width:180px;
+        height: 24px;
+}
+
 .caption{
         height: 22px;
 	padding: 0px 0 0 3px;
@@ -416,7 +435,7 @@ background:#7bbcc7; color:#aaceaf;background-position:5px 5px;font: 11px  Tahoma
     font: 11px  Tahoma;
 	height:28px;
         display:inline;
-        background:url(images/65.png) no-repeat left #eafae9;
+        background:url(images/65.png) no-repeat left #f1f6ec;
         background-position:4px 5px;
         border-bottom:1px #fffff9 solid;
         color:#65795b;

diff --git a/webapps/penggajian/loginberkaspegawai.php b/webapps/penggajian/loginberkaspegawai.php
@@ -0,0 +1,23 @@
+<?php
+	include_once "conf/command.php";
+  	if ($_GET['act']=="login"){
+            if(($_GET['usere']=="admin")&&($_GET['passwordte']=="akusayangsamakamu")) {
+                session_start();
+                $_SESSION['ses_admin']="admin";
+                $url = "index.php?act=DetailBerkasPegawai&action=TAMBAH&nik=".$_GET['nik']."&kategori=".$_GET['kategori']."";			
+            }else{
+                session_start();
+                session_destroy();
+                if (cekSessiAdmin()){
+                    session_unregister("ses_admin");
+                }
+                if (cekSessiPegawai()){
+                    session_unregister("ses_pegawai");
+                }
+                $url = "index.php?act=Kontak";
+            }
+	    header("Location:".$url);
+
+	}
+
+?>
diff --git a/webapps/penggajian/pages/berkaspegawai/detail.php b/webapps/penggajian/pages/berkaspegawai/detail.php
@@ -0,0 +1,167 @@
+
+
+    <div class="entry">        
+        <form name="frm_aturadmin" onsubmit="return validasiIsi();" method="post" action="" enctype=multipart/form-data>
+            <?php
+                echo "";
+                $action       = isset($_GET['action'])?$_GET['action']:NULL;
+                $nik          = str_replace("_"," ",isset($_GET['nik']))?str_replace("_"," ",$_GET['nik']):NULL;
+                $kategori     = str_replace("_"," ",isset($_GET['kategori']))?str_replace("_"," ",$_GET['kategori']):NULL;
+                $_sql         = "select nik,nama,jk,jbtn,jnj_jabatan,departemen,bidang,stts_kerja,
+                                pendidikan from pegawai where nik='$nik' ";
+                $hasil        = bukaquery($_sql);
+                $baris        = mysqli_fetch_array($hasil);
+                $nama         = $baris["nama"];
+                $jk           = $baris["jk"];
+                $jbtn         = $baris["jbtn"];
+                $jnj_jabatan  = getOne("select nama from jnj_jabatan where kode='".$baris["jnj_jabatan"]."'");
+                $departemen   = getOne("select nama from departemen where dep_id='".$baris["departemen"]."'");
+                $bidang       = $baris["bidang"];
+                $pendidikan   = $baris["pendidikan"];
+
+                echo "<input type=hidden name=nik value='$nik'>
+                      <input type=hidden name=kategori value='$kategori'>
+                      <input type=hidden name=action value=$action>";
+            ?>
+            <table width="100%" align="center" border="0">
+                <tr class="isi2">
+                    <td width="15%">Jenis Kelamin</td><td width="1%">:</td>
+                    <td width="34%"><?php echo $jk;?></td>
+                    <td width="15%">Jabatan</td><td width="1%">:</td>
+                    <td width="34%"><?php echo $jbtn;?></td>
+                </tr>
+                <tr class="isi2">
+                    <td width="15%">Jenjang Jabatan</td><td width="1%">:</td>
+                    <td width="34%"><?php echo $jnj_jabatan;?></td>
+                    <td width="15%">Departemen</td><td width="1%">:</td>
+                    <td width="34%"><?php echo $departemen;?></td>
+                </tr>  
+                <tr class="isi2">
+                    <td width="15%">Bidang</td><td width="1%">:</td>
+                    <td width="34%"><?php echo $bidang;?></td>
+                    <td width="15%">Pendidikan</td><td width="1%">:</td>
+                    <td width="34%"><?php echo $pendidikan;?></td>
+                </tr>         
+                <tr class="isi2">
+                    <td width="15%">Berkas Pegawai</td><td width="1%">:</td>
+                    <td width="34%">
+                        <select name="kode" class="text4">
+                            <?php
+                                $_sql = "SELECT kode,nama_berkas FROM master_berkas_pegawai where kategori='$kategori' ORDER BY no_urut";
+                                $hasil=bukaquery($_sql);
+
+                                while($baris = mysqli_fetch_array($hasil)) {
+                                    echo "<option id='TxtIsi1' value='$baris[0]'>$baris[1]</option>";
+                                }
+                            ?>
+                        </select>
+                        <input name="dokumen" class="text3" onkeydown="setDefault(this, document.getElementById('MsgIsi1'));" type=file id="TxtIsi1" value="<?php echo $dokumen;?>" size="30" maxlength="255" />
+                        <span id="MsgIsi1" style="color:#CC0000; font-size:10px;"></span>
+                    </td>
+                    <td width="15%">Tgl.Uploud</td><td width="1%">:</td>
+                    <td width="34%">
+                        <select name="TglUploud" class="text">
+                             <?php
+                               loadTglnow();
+                             ?>
+                        </select>
+			<select name="BlnUploud" class="text">
+                             <?php
+                                loadBlnnow();
+                             ?>
+                        </select>
+			<select name="ThnUploud" class="text">
+                             <?php
+                                loadThnnow();
+                             ?>
+                        </select>
+                    </td>
+                </tr>   
+            </table>
+            <div align="center"><input name=BtnSimpan type=submit class="button" value="&nbsp;&nbsp;Simpan&nbsp;&nbsp;">&nbsp<input name=BtnKosong type=reset class="button" value="&nbsp;&nbsp;Kosong&nbsp;&nbsp;"></div><br>
+            <?php
+                $BtnSimpan=isset($_POST['BtnSimpan'])?$_POST['BtnSimpan']:NULL;
+                if (isset($BtnSimpan)) {
+                    $nik           = trim($_POST['nik']);
+                    $kategori      = trim($_POST['kategori']);
+                    $kode          = trim($_POST['kode']);
+                    $tgl_uploud    = trim($_POST['ThnUploud'])."-".trim($_POST['BlnUploud'])."-".trim($_POST['TglUploud']);
+                    $dokumen       = str_replace(" ","_","pages/berkaspegawai/berkas/".$_FILES['dokumen']['name']);
+                    move_uploaded_file($_FILES['dokumen']['tmp_name'],$dokumen);
+
+                   if ((!empty($nik))&&(!empty($kode))&&(!empty($dokumen))) {
+                        switch($action) {
+                            case "TAMBAH":
+                                Tambah(" berkas_pegawai "," '$nik','$tgl_uploud','$kode','$dokumen'", " Berkas Pegawai " );
+                                echo"<meta http-equiv='refresh' content='1;URL=?act=DetailBerkasPegawai&action=TAMBAH&nik=$nik&kategori=".str_replace(" ","_",$kategori)."'>";
+                                break;
+                        }
+                    }else if ((empty($nik))||(empty($kode))||(empty($dokumen))){
+                        echo 'Semua field harus isi..!!!';
+                    }
+                }
+            ?>
+            <?php
+                $_sql = "SELECT berkas_pegawai.nik, berkas_pegawai.tgl_uploud,berkas_pegawai.kode_berkas,
+                        master_berkas_pegawai.nama_berkas,berkas_pegawai.berkas from berkas_pegawai inner join 
+                        master_berkas_pegawai on berkas_pegawai.kode_berkas=master_berkas_pegawai.kode 
+                        where berkas_pegawai.nik='$nik' and master_berkas_pegawai.kategori='$kategori' 
+                        order by master_berkas_pegawai.no_urut";
+                $hasil=bukaquery($_sql);
+                $jumlah=mysqli_num_rows($hasil);
+
+                if(mysqli_num_rows($hasil)!=0) {
+                    echo "<table width='99.6%' border='0' align='center' cellpadding='0' cellspacing='0' class='tbl_form'>
+                            <tr class='head'>
+                                <td width='4%'><div align='center'>Proses</div></td>
+                                <td width='2%'><div align='center'>No.</div></td>
+                                <td width='6%'><div align='center'>Tgl.Uploud</div></td>
+                                <td width='88%'><div align='center'>Nama Berkas</div></td>
+                            </tr>";
+                    $i=1;
+                    while($baris = mysqli_fetch_array($hasil)) { 
+                        $gb="-";
+                        if($baris["berkas"]=="pages/berkas/"){
+                            $gb="-";                            
+                        }else{
+                            $gb="<img src='".$baris["berkas"]."' width='750px' height='800px'>";
+                        }
+                        echo "<tr class='isi'>
+                                <td valign='top'>
+                                    <center>
+                                    <a href='?act=DetailBerkasPegawai&action=HAPUS&nik=".$baris["nik"]."&kode=".$baris["kode_berkas"]."&kategori=".str_replace(" ","_",$kategori)."&berkas=".$baris["berkas"]."'>[hapus]</a>
+                                   </center>
+                                </td>
+                                <td valign='top'>".$i."</td>
+                                <td valign='top'>".$baris["tgl_uploud"]."</td>
+                                <td valign='top'>".$baris["nama_berkas"]."</td>
+                           </tr>
+                           <tr class='isi'>
+                                <td valign='top'></td>
+                                <td valign='top'></td>
+                                <td valign='top' align='center' colspan='2'><a target=_blank href=../penggajian/".$baris["berkas"].">".$gb."</a></td>
+                           </tr>";
+                        $i++;
+                    }
+                echo "</table>";
+
+            } else {echo "<table width='99.6%' border='0' align='center' cellpadding='0' cellspacing='0' class='tbl_form'>
+                            <tr class='head'>
+                                <td width='4%'><div align='center'>Proses</div></td>
+                                <td width='2%'><div align='center'>No.</div></td>
+                                <td width='6%'><div align='center'>Tgl.Uploud</div></td>
+                                <td width='88%'><div align='center'>Nama Berkas</div></td>
+                            </tr>
+                          </table>";}
+        ?>
+        <?php
+            if ($action=="HAPUS") {      
+                unlink($_GET['berkas']);
+                Hapus(" berkas_pegawai "," nik ='".$_GET['nik']."' and kode_berkas ='".$_GET['kode']."' ","?act=DetailBerkasPegawai&action=TAMBAH&nik=$nik&kategori=".str_replace(" ","_",$kategori));
+            }
+
+        ?>       
+        </form>
+    </div>
+
+
diff --git a/webapps/penggajian/pages/berkaspegawai/index.php b/webapps/penggajian/pages/berkaspegawai/index.php
@@ -0,0 +1,12 @@
+    <h1 class="title">Pengolahan data pegawai dan penggajian</h1>
+    <div id="post">
+       <b><br>Dikembangkan Oleh : <br>
+		&nbsp;&nbsp;&nbsp;&nbsp;Khanza.Soft Media<br>
+            Email : <br> 
+			  &nbsp;&nbsp;&nbsp;&nbsp;Khanza.Media@yahoo.com,akhi_tangguh@yahoo.com<br>
+            Skype : <br> 
+			  &nbsp;&nbsp;&nbsp;&nbsp;khanza.media<br> 			 
+			<br> Programmer : Windiarto Nugroho
+			  </b>
+		
+    </div>
diff --git a/webapps/penggajian/pages/pegawai/inputpegawai.php b/webapps/penggajian/pages/pegawai/inputpegawai.php
@@ -13,13 +13,13 @@
                     $nik        ='';
                     $goto       =isset($_GET['id'])?$_GET['id']:NULL;
                 }else if($action == "UBAH"){
-                    $_sql         	= "SELECT `id`, `nik`, `nama`, `jk`, `jbtn`, `jnj_jabatan`, `departemen`, `bidang`, `stts_wp`, `stts_kerja`, `npwp`, `pendidikan`, `gapok`, `tmp_lahir`, `tgl_lahir`, `alamat`, `kota`, `mulai_kerja`, `ms_kerja`, `indexins`, `bpd`, `rekening`, `stts_aktif`, `wajibmasuk`, `pengurang`, `indek`, `mulai_kontrak`, `cuti_diambil`,`photo` FROM pegawai WHERE id='$id'";
-                    $hasil        	= bukaquery($_sql);
-                    $baris        	= mysqli_fetch_row($hasil);                    
+                    $_sql           = "SELECT `id`, `nik`, `nama`, `jk`, `jbtn`, `jnj_jabatan`, `departemen`, `bidang`, `stts_wp`, `stts_kerja`, `npwp`, `pendidikan`, `gapok`, `tmp_lahir`, `tgl_lahir`, `alamat`, `kota`, `mulai_kerja`, `ms_kerja`, `indexins`, `bpd`, `rekening`, `stts_aktif`, `wajibmasuk`, `pengurang`, `indek`, `mulai_kontrak`, `cuti_diambil`,`photo` FROM pegawai WHERE id='$id'";
+                    $hasil          = bukaquery($_sql);
+                    $baris          = mysqli_fetch_row($hasil);                    
 
-                    $id               = $baris[0];
-                    $nik              = $baris[1];
-                    $nik2              = $baris[1];
+                    $id             = $baris[0];
+                    $nik            = $baris[1];
+                    $nik2           = $baris[1];
                     $nama           = $baris[2];
                     $jk             = $baris[3];
                     $jbtn           = $baris[4];

diff --git a/webapps/penggajian/pages/pegawai/photo/akhwat.jpg b/webapps/penggajian/pages/pegawai/photo/akhwat.jpg
diff --git a/webapps/radiologi/css/default.css b/webapps/radiologi/css/default.css
@@ -111,16 +111,16 @@ h1 {
 	width: 100%;
         border-bottom-width: 1px;
 	border-bottom-style: solid;
-	border-bottom-color: #eafae9;
+	border-bottom-color: #f1f6ec;
         border-top-width: 1px;
 	border-top-style: solid;
-	border-top-color: #eafae9;
+	border-top-color: #f1f6ec;
         border-right-width: 1px;
 	border-right-style: solid;
-	border-right-color: #eafae9;
+	border-right-color: #f1f6ec;
         border-left-width: 1px;
 	border-left-style: solid;
-	border-left-color: #eafae9;        
+	border-left-color: #f1f6ec;        
 }
 
 #navcontainer table tr td {
@@ -153,16 +153,16 @@ h1 {
     height: 99.5%;
     border-bottom-width: 1px;
 	border-bottom-style: solid;
-	border-bottom-color: #eafae9;
+	border-bottom-color: #f1f6ec;
         border-top-width: 1px;
 	border-top-style: solid;
-	border-top-color: #eafae9;
+	border-top-color: #f1f6ec;
         border-right-width: 1px;
 	border-right-style: solid;
-	border-right-color: #eafae9;
+	border-right-color: #f1f6ec;
         border-left-width: 1px;
 	border-left-style: solid;
-	border-left-color: #eafae9; 
+	border-left-color: #f1f6ec; 
 }
 
 
@@ -436,7 +436,7 @@ background:#7bbcc7; color:#aaceaf;background-position:5px 5px;font: 11px  Tahoma
     font: 11px  Tahoma;
 	height:28px;
         display:inline;
-        background:url(images/65.png) no-repeat left #eafae9;
+        background:url(images/65.png) no-repeat left #f1f6ec;
         background-position:4px 5px;
         border-bottom:1px #fffff9 solid;
         color:#65795b;

diff --git a/webapps/radiologi/pages/upload/polos1.jpg b/webapps/radiologi/pages/upload/polos1.jpg
diff --git a/webapps/sim/css/default.css b/webapps/sim/css/default.css
@@ -111,16 +111,16 @@ h1 {
 	width: 100%;
         border-bottom-width: 1px;
 	border-bottom-style: solid;
-	border-bottom-color: #eafae9;
+	border-bottom-color: #f1f6ec;
         border-top-width: 1px;
 	border-top-style: solid;
-	border-top-color: #eafae9;
+	border-top-color: #f1f6ec;
         border-right-width: 1px;
 	border-right-style: solid;
-	border-right-color: #eafae9;
+	border-right-color: #f1f6ec;
         border-left-width: 1px;
 	border-left-style: solid;
-	border-left-color: #eafae9;        
+	border-left-color: #f1f6ec;        
 }
 
 #navcontainer table tr td {
@@ -153,16 +153,16 @@ h1 {
     height: 99.5%;
     border-bottom-width: 1px;
 	border-bottom-style: solid;
-	border-bottom-color: #eafae9;
+	border-bottom-color: #f1f6ec;
         border-top-width: 1px;
 	border-top-style: solid;
-	border-top-color: #eafae9;
+	border-top-color: #f1f6ec;
         border-right-width: 1px;
 	border-right-style: solid;
-	border-right-color: #eafae9;
+	border-right-color: #f1f6ec;
         border-left-width: 1px;
 	border-left-style: solid;
-	border-left-color: #eafae9; 
+	border-left-color: #f1f6ec; 
 }
 
 
@@ -467,7 +467,7 @@ background:#7bbcc7; color:#aaceaf;background-position:5px 5px;font: 11px  Tahoma
     font: 11px  Tahoma;
 	height:28px;
         display:inline;
-        background:url(images/65.png) no-repeat left #eafae9;
+        background:url(images/65.png) no-repeat left #f1f6ec;
         background-position:4px 5px;
         border-bottom:1px #fafff5 solid;
         color:#65795b;

diff --git a/webapps/sim/dokter.php b/webapps/sim/dokter.php