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$374.class b/build/classes/simrskhanza/frmUtama$374.class
diff --git a/build/classes/simrskhanza/frmUtama$375.class b/build/classes/simrskhanza/frmUtama$375.class
diff --git a/build/classes/simrskhanza/frmUtama$376.class b/build/classes/simrskhanza/frmUtama$376.class
diff --git a/build/classes/simrskhanza/frmUtama$377.class b/build/classes/simrskhanza/frmUtama$377.class
diff --git a/build/classes/simrskhanza/frmUtama$378.class b/build/classes/simrskhanza/frmUtama$378.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/dist/SIMRSKhanza.jar b/dist/SIMRSKhanza.jar
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -3,7 +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/setting/database.xml</file>
+            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/simrskhanza/frmUtama.java</file>
+            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/kepegawaian/DlgRiwayatPenghargaan.java</file>
+            <file>file:/media/khanzamedia/Data/Source%20Java/SIMRSKhanza/src/fungsi/var.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
@@ -73,7 +73,7 @@ public final class var {
             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,berkas_kepegawaian=false,riwayat_jabatan=false,riwayat_pendidikan=false,
-            riwayat_naik_gaji=false,kegiatan_ilmiah=false;
+            riwayat_naik_gaji=false,kegiatan_ilmiah=false,riwayat_penghargaan=false;
 
     public static void setData(String user, String pass) {
        try {                
@@ -417,6 +417,7 @@ public static void setData(String user, String pass) {
                         var.riwayat_pendidikan=true;
                         var.riwayat_naik_gaji=true;
                         var.kegiatan_ilmiah=true;
+                        var.riwayat_penghargaan=true;
                     }else if(rs2.getRow()>=1){   
                         rs2.beforeFirst();
                         rs2.next();
@@ -744,6 +745,7 @@ public static void setData(String user, String pass) {
                         var.riwayat_pendidikan=rs2.getBoolean("riwayat_pendidikan");
                         var.riwayat_naik_gaji=rs2.getBoolean("riwayat_naik_gaji");
                         var.kegiatan_ilmiah=rs2.getBoolean("kegiatan_ilmiah");
+                        var.riwayat_penghargaan=rs2.getBoolean("riwayat_penghargaan");
                     }else if((rs.getRow()==0)&&(rs2.getRow()==0)){
                         var.kode="";                  
                         var.penyakit= false;
@@ -1069,6 +1071,7 @@ public static void setData(String user, String pass) {
                         var.riwayat_pendidikan=false;
                         var.riwayat_naik_gaji=false;
                         var.kegiatan_ilmiah=false;
+                        var.riwayat_penghargaan=false;
                     }
                 } catch (Exception e) {
                     System.out.println("Notifikasi : "+e);
@@ -1441,4 +1444,5 @@ public static void setData(String user, String pass) {
     public static boolean getriwayat_pendidikan(){return var.riwayat_pendidikan;}
     public static boolean getriwayat_naik_gaji(){return var.riwayat_naik_gaji;}
     public static boolean getkegiatan_ilmiah(){return var.kegiatan_ilmiah;}
+    public static boolean getriwayat_penghargaan(){return var.riwayat_penghargaan;}
 }   
diff --git a/src/kepegawaian/DlgRiwayatPenghargaan.form b/src/kepegawaian/DlgRiwayatPenghargaan.form
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Form version="1.3" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+  <Properties>
+    <Property name="defaultCloseOperation" type="int" value="2"/>
+    <Property name="title" type="java.lang.String" value="::[ About Program ]::"/>
+    <Property name="undecorated" type="boolean" value="true"/>
+    <Property name="resizable" type="boolean" value="false"/>
+  </Properties>
+  <SyntheticProperties>
+    <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
+  </SyntheticProperties>
+  <Events>
+    <EventHandler event="windowStateChanged" listener="java.awt.event.WindowStateListener" parameters="java.awt.event.WindowEvent" handler="formWindowStateChanged"/>
+    <EventHandler event="windowClosed" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="formWindowClosed"/>
+  </Events>
+  <AuxValues>
+    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-73,0,0,2,-2"/>
+  </AuxValues>
+
+  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
+  <SubComponents>
+    <Container class="widget.InternalFrame" name="internalFrame1">
+      <Properties>
+        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
+            <TitledBorder title="::[ Riwayat Penghargaan ]::">
+              <Border PropertyName="innerBorder" info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
+                <LineBorder>
+                  <Color PropertyName="color" blue="eb" green="f5" red="f0" type="rgb"/>
+                </LineBorder>
+              </Border>
+              <Font PropertyName="font" name="Tahoma" size="11" style="0"/>
+              <Color PropertyName="color" blue="50" green="78" red="5a" type="rgb"/>
+            </TitledBorder>
+          </Border>
+        </Property>
+        <Property name="name" type="java.lang.String" value="internalFrame1" noResource="true"/>
+      </Properties>
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+          <BorderConstraints direction="Center"/>
+        </Constraint>
+      </Constraints>
+
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout">
+        <Property name="horizontalGap" type="int" value="1"/>
+        <Property name="verticalGap" type="int" value="1"/>
+      </Layout>
+      <SubComponents>
+        <Container class="widget.panelisi" name="panelGlass5">
+          <Properties>
+            <Property name="name" type="java.lang.String" value="panelGlass5" noResource="true"/>
+            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[55, 55]"/>
+            </Property>
+          </Properties>
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+              <BorderConstraints direction="Last"/>
+            </Constraint>
+          </Constraints>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout">
+            <Property name="alignment" type="int" value="0"/>
+            <Property name="verticalGap" type="int" value="9"/>
+          </Layout>
+          <SubComponents>
+            <Component class="widget.Label" name="jLabel6">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="Key Word :"/>
+                <Property name="name" type="java.lang.String" value="jLabel6" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[65, 23]"/>
+                </Property>
+              </Properties>
+            </Component>
+            <Component class="widget.TextBox" name="TCari">
+              <Properties>
+                <Property name="name" type="java.lang.String" value="TCari" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[460, 23]"/>
+                </Property>
+              </Properties>
+              <Events>
+                <EventHandler event="keyTyped" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="TCariKeyTyped"/>
+                <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="TCariKeyPressed"/>
+              </Events>
+            </Component>
+            <Component class="widget.Button" name="BtnCari">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/picture/accept.png"/>
+                </Property>
+                <Property name="mnemonic" type="int" value="50"/>
+                <Property name="toolTipText" type="java.lang.String" value="Alt+2"/>
+                <Property name="name" type="java.lang.String" value="BtnCari" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[28, 23]"/>
+                </Property>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="BtnCariActionPerformed"/>
+                <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="BtnCariKeyPressed"/>
+              </Events>
+            </Component>
+            <Component class="widget.Button" name="BtnAll">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" noResource="true" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/picture/Search-16x16.png"/>
+                </Property>
+                <Property name="mnemonic" type="int" value="77"/>
+                <Property name="toolTipText" type="java.lang.String" value="Alt+M"/>
+                <Property name="name" type="java.lang.String" value="BtnAll" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[28, 23]"/>
+                </Property>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="BtnAllActionPerformed"/>
+                <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="BtnAllKeyPressed"/>
+              </Events>
+            </Component>
+            <Component class="widget.Label" name="jLabel7">
+              <Properties>
+                <Property name="name" type="java.lang.String" value="jLabel7" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[30, 23]"/>
+                </Property>
+              </Properties>
+            </Component>
+            <Component class="widget.Button" name="BtnKeluar">
+              <Properties>
+                <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                  <Image iconType="3" name="/picture/exit.png"/>
+                </Property>
+                <Property name="mnemonic" type="int" value="75"/>
+                <Property name="text" type="java.lang.String" value="Keluar"/>
+                <Property name="toolTipText" type="java.lang.String" value="Alt+K"/>
+                <Property name="name" type="java.lang.String" value="BtnKeluar" noResource="true"/>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[100, 30]"/>
+                </Property>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="BtnKeluarActionPerformed"/>
+                <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="BtnKeluarKeyPressed"/>
+              </Events>
+            </Component>
+          </SubComponents>
+        </Container>
+        <Container class="widget.panelisi" name="panel">
+          <Properties>
+            <Property name="name" type="java.lang.String" value="panel" noResource="true"/>
+          </Properties>
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+              <BorderConstraints direction="Center"/>
+            </Constraint>
+          </Constraints>
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
+        </Container>
+      </SubComponents>
+    </Container>
+  </SubComponents>
+</Form>
diff --git a/src/kepegawaian/DlgRiwayatPenghargaan.java b/src/kepegawaian/DlgRiwayatPenghargaan.java
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]Berkas Kepegawaian","[C]Riwayat Jabatan","[C]Riwayat Pendidikan","[C]Riwayat Naik Gaji","[C]Kegiatan Ilmiah & Pelatihan"
+                    "[C]Master Berkas Pegawai","[C]Berkas Kepegawaian","[C]Riwayat Jabatan","[C]Riwayat Pendidikan","[C]Riwayat Naik Gaji","[C]Kegiatan Ilmiah & Pelatihan","[C]Riwayat Penghargaan"
         };
 
         tabMode=new DefaultTableModel(null,row){
@@ -203,6 +203,7 @@ public boolean isCellEditable(int rowIndex, int colIndex){
                 java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class, 
                 java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class, 
                 java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class,
+                java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class,
                 java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class, java.lang.Boolean.class
              };
              @Override
@@ -216,7 +217,7 @@ public Class getColumnClass(int columnIndex) {
         tbUser.setPreferredScrollableViewportSize(new Dimension(500,500));
         tbUser.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
 
-        for (i = 0; i < 323;i++) {
+        for (i = 0; i < 324;i++) {
             TableColumn column = tbUser.getColumnModel().getColumn(i);
             if(i==0){
                 column.setPreferredWidth(130);
@@ -498,6 +499,8 @@ public Class getColumnClass(int columnIndex) {
                 column.setPreferredWidth(104);
             }else if(i==322){
                 column.setPreferredWidth(150);
+            }else if(i==323){
+                column.setPreferredWidth(127);
             }else{
                 column.setPreferredWidth(130);
             }
@@ -932,7 +935,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','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','false','false','false','false','false'","User")==true){
                 tampil();
                 emptTeks();
             }            
@@ -1297,7 +1300,8 @@ private void BtnEditActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST
                     "riwayat_jabatan='"+tbUser.getValueAt(i,319).toString()+"',"+
                     "riwayat_pendidikan='"+tbUser.getValueAt(i,320).toString()+"',"+
                     "riwayat_naik_gaji='"+tbUser.getValueAt(i,321).toString()+"',"+
-                    "kegiatan_ilmiah='"+tbUser.getValueAt(i,322).toString()+"'");
+                    "kegiatan_ilmiah='"+tbUser.getValueAt(i,322).toString()+"',"+
+                    "riwayat_penghargaan='"+tbUser.getValueAt(i,323).toString()+"'");
             }            
             tampil();
             emptTeks();
@@ -1578,7 +1582,7 @@ private void tampil() {
                         "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,berkas_kepegawaian,riwayat_jabatan,riwayat_pendidikan,"+
-                        "riwayat_naik_gaji,kegiatan_ilmiah from user order by AES_DECRYPT(id_user,'nur')");
+                        "riwayat_naik_gaji,kegiatan_ilmiah,riwayat_penghargaan from user order by AES_DECRYPT(id_user,'nur')");
             try {
                 rs=ps.executeQuery();
                 while(rs.next()){
@@ -1912,7 +1916,8 @@ private void tampil() {
                                rs.getBoolean("riwayat_jabatan"),
                                rs.getBoolean("riwayat_pendidikan"),
                                rs.getBoolean("riwayat_naik_gaji"),
-                               rs.getBoolean("kegiatan_ilmiah")
+                               rs.getBoolean("kegiatan_ilmiah"),
+                               rs.getBoolean("riwayat_penghargaan")
                             });
                         }   
                     } catch (Exception e) {
@@ -2236,7 +2241,8 @@ private void tampil() {
                            rs.getBoolean("riwayat_jabatan"),
                            rs.getBoolean("riwayat_pendidikan"),
                            rs.getBoolean("riwayat_naik_gaji"),
-                           rs.getBoolean("kegiatan_ilmiah")
+                           rs.getBoolean("kegiatan_ilmiah"),
+                           rs.getBoolean("riwayat_penghargaan")
                         });
                     }                                             
                  }

diff --git a/src/setting/DlgVakum.java b/src/setting/DlgVakum.java
@@ -2447,6 +2447,7 @@ private void BtnICD40ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
         hapus("Riwayat Jabatan","lain","riwayat_jabatan");
         hapus("Riwayat Kenaikan Gaji","lain","riwayat_naik_gaji");
         hapus("Riwayat Pendidikan","lain","riwayat_pendidikan");
+        hapus("Riwayat Penghargaan","lain","riwayat_penghargaan");
         hapus("Angsuran Koperasi","lain","angsuran_koperasi");
         hapus("Riwayat Kegiatan Ilmiah & Pelatihan","lain","riwayat_seminar");
         hapus("Peminjaman Koperasi","lain","peminjaman_koperasi");

diff --git a/src/simrskhanza/frmUtama.form b/src/simrskhanza/frmUtama.form
@@ -5703,6 +5703,22 @@
                         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnKegiatanIlmiahActionPerformed"/>
                       </Events>
                     </Component>
+                    <Component class="widget.ButtonBig" name="btnRiwayatPenghargaan">
+                      <Properties>
+                        <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                          <Image iconType="3" name="/48x48/if_folder_images_61610.png"/>
+                        </Property>
+                        <Property name="text" type="java.lang.String" value="Riwayat Penghargaan"/>
+                        <Property name="iconTextGap" type="int" value="0"/>
+                        <Property name="name" type="java.lang.String" value="btnRiwayatPenghargaan" 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="btnRiwayatPenghargaanActionPerformed"/>
+                      </Events>
+                    </Component>
                   </SubComponents>
                 </Container>
               </SubComponents>
@@ -5719,7 +5735,7 @@
         </Property>
         <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
           <StringArray count="1">
-            <StringItem index="0" value="12/06/2018"/>
+            <StringItem index="0" value="13/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
@@ -303,6 +303,7 @@
 import kepegawaian.DlgRiwayatJabatan;
 import kepegawaian.DlgRiwayatNaikGaji;
 import kepegawaian.DlgRiwayatPendidikan;
+import kepegawaian.DlgRiwayatPenghargaan;
 import kepegawaian.DlgSidikJari;
 import kepegawaian.DlgTemporaryPresensi;
 import setting.DlgClosingKasir;
@@ -794,6 +795,7 @@ private void initComponents() {
         btnRiwayatPendidikan = new widget.ButtonBig();
         btnRiwayatNaikGaji = new widget.ButtonBig();
         btnKegiatanIlmiah = new widget.ButtonBig();
+        btnRiwayatPenghargaan = new widget.ButtonBig();
         tanggal = new widget.Tanggal();
         btnDataPenjualan = new widget.ButtonBig();
         btnInputPenjualan = new widget.ButtonBig();
@@ -4940,6 +4942,18 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         });
         Panelmenu.add(btnKegiatanIlmiah);
 
+        btnRiwayatPenghargaan.setIcon(new javax.swing.ImageIcon(getClass().getResource("/48x48/if_folder_images_61610.png"))); // NOI18N
+        btnRiwayatPenghargaan.setText("Riwayat Penghargaan");
+        btnRiwayatPenghargaan.setIconTextGap(0);
+        btnRiwayatPenghargaan.setName("btnRiwayatPenghargaan"); // NOI18N
+        btnRiwayatPenghargaan.setPreferredSize(new java.awt.Dimension(200, 90));
+        btnRiwayatPenghargaan.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                btnRiwayatPenghargaanActionPerformed(evt);
+            }
+        });
+        Panelmenu.add(btnRiwayatPenghargaan);
+
         scrollPane2.setViewportView(Panelmenu);
 
         panelMenu.add(scrollPane2, java.awt.BorderLayout.CENTER);
@@ -4948,7 +4962,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
         tanggal.setEditable(false);
         tanggal.setForeground(new java.awt.Color(50, 70, 50));
-        tanggal.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "12/06/2018" }));
+        tanggal.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "13/06/2018" }));
         tanggal.setDisplayFormat("dd/MM/yyyy");
         tanggal.setName("tanggal"); // NOI18N
         tanggal.setOpaque(false);
@@ -10481,6 +10495,23 @@ private void btnKegiatanIlmiahActionPerformed(java.awt.event.ActionEvent evt) {/
         this.setCursor(Cursor.getDefaultCursor());
     }//GEN-LAST:event_btnKegiatanIlmiahActionPerformed
 
+    private void btnRiwayatPenghargaanActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnRiwayatPenghargaanActionPerformed
+        isTutup();
+        this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+        DlgRiwayatPenghargaan form=new DlgRiwayatPenghargaan(this,false);
+        try {
+            form.loadURL("http://"+koneksiDB.HOST2()+":"+prop.getProperty("PORTWEB")+"/"+prop.getProperty("HYBRIDWEB")+"/"+"penggajian/loginriwayatpenghargaan.php?act=login&usere=admin&passwordte=akusayangsamakamu");                    
+        } catch (Exception ex) {
+            System.out.println("Notifikasi : "+ex);
+        }
+
+        form.setSize(PanelUtama.getWidth(),PanelUtama.getHeight());
+        form.setLocationRelativeTo(PanelUtama);        
+        form.setVisible(true);        
+        DlgHome.dispose();
+        this.setCursor(Cursor.getDefaultCursor());
+    }//GEN-LAST:event_btnRiwayatPenghargaanActionPerformed
+
     /**
     * @param args the command line arguments
     */
@@ -10779,6 +10810,7 @@ public static void main(String args[]) {
     private widget.ButtonBig btnRiwayatJabatan;
     private widget.ButtonBig btnRiwayatNaikGaji;
     private widget.ButtonBig btnRiwayatPendidikan;
+    private widget.ButtonBig btnRiwayatPenghargaan;
     private widget.ButtonBig btnRl32;
     private widget.ButtonBig btnRl33;
     private widget.ButtonBig btnRl34;
@@ -11387,6 +11419,11 @@ private void isCombo() {
                 Panelmenu.add(btnKegiatanIlmiah); 
                 jmlmenu++;
             }
+
+            if(var.getriwayat_penghargaan()==true){                
+                Panelmenu.add(btnRiwayatPenghargaan); 
+                jmlmenu++;
+            }
 
             if(var.getsms()==true){                
                 Panelmenu.add(btnSMS);
@@ -13003,6 +13040,11 @@ private void isCariKosong() {
             Panelmenu.add(btnKegiatanIlmiah); 
             jmlmenu++;
         }
+
+        if(var.getriwayat_penghargaan()==true){                
+            Panelmenu.add(btnRiwayatPenghargaan); 
+            jmlmenu++;
+        }
 
         if(var.getsms()==true){                
             Panelmenu.add(btnSMS);
@@ -14683,6 +14725,13 @@ private void isCariIsi() {
             }                
         }
 
+        if(var.getriwayat_penghargaan()==true){    
+            if(btnRiwayatPenghargaan.getText().toLowerCase().trim().contains(TCari.getText().toLowerCase().trim())){
+                Panelmenu.add(btnRiwayatPenghargaan);
+                jmlmenu++;
+            }                
+        }
+
         if(var.getsms()==true){    
             if(btnSMS.getText().toLowerCase().trim().contains(TCari.getText().toLowerCase().trim())){
                 Panelmenu.add(btnSMS);

diff --git a/webapps/nbproject/private/private.xml b/webapps/nbproject/private/private.xml
@@ -3,6 +3,10 @@
     <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/conf/command.php</file>
+            <file>file:/opt/lampp/htdocs/webapps/penggajian/pages/riwayatpenghargaan/list.php</file>
+            <file>file:/opt/lampp/htdocs/webapps/penggajian/pages/riwayatpenghargaan/detail.php</file>
+        </group>
     </open-files>
 </project-private>
diff --git a/webapps/penggajian/conf/command.php b/webapps/penggajian/conf/command.php
@@ -75,7 +75,8 @@ 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','DetailBerkasPegawai');
+                                      'InputBank','ListBank','DetailBpjs','DetailHarianBulanan','DetailBerkasPegawai','InputRiwayatPenghargaan',
+                                      'ListRiwayatPenghargaan');
 				foreach ($form as $page) {
 					if ($aksi==$page) {
 						echo "<META HTTP-EQUIV = 'Refresh' Content = '0; URL = ?act=Home'>";
@@ -205,7 +206,10 @@ function actionPages() {
                         case 'InputRiwayatGaji'         : include_once('pages/riwayatgaji/detail.php'); break;
                         case 'ListRiwayatGaji'          : include_once('pages/riwayatgaji/list.php'); break;
 
-                        case 'DetailBerkasPegawai'      : include_once('pages/berkaspegawai/detail.php'); break;
+                        case 'InputRiwayatPenghargaan'  : include_once('pages/riwayatpenghargaan/detail.php'); break;
+                        case 'ListRiwayatPenghargaan'   : include_once('pages/riwayatpenghargaan/list.php'); break;
+
+                    case 'DetailBerkasPegawai'      : include_once('pages/berkaspegawai/detail.php'); break;
 
                     default			        : include_once('pages/kontak.php');
 

diff --git a/webapps/penggajian/loginriwayatpenghargaan.php b/webapps/penggajian/loginriwayatpenghargaan.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=ListRiwayatPenghargaan&action=TAMBAH";			
+            }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/riwayatpenghargaan/detail.php b/webapps/penggajian/pages/riwayatpenghargaan/detail.php
@@ -0,0 +1,192 @@
+<div id="entry">       
+    <form name="frm_aturadmin" onsubmit="return validasiIsi();" method="post" action="" enctype=multipart/form-data>
+        <?php
+            echo "";
+            $action             =isset($_GET['action'])?$_GET['action']:NULL;
+            $id                 =isset($_GET['id'])?$_GET['id']:NULL;
+            $jenis              =isset($_GET['jenis'])?$_GET['jenis']:NULL;
+            $Penghargaan        =isset($_GET['Penghargaan'])?$_GET['Penghargaan']:NULL;
+            echo "<input type=hidden name=id  value=$id><input type=hidden name=action value=$action>";
+            $_sql = "SELECT nik,nama FROM pegawai where id='$id'";
+            $hasil=bukaquery($_sql);
+            $baris = mysqli_fetch_row($hasil);   
+
+            $_sqlnext         	= "SELECT id FROM pegawai WHERE id>'$id' order by id asc limit 1";
+            $hasilnext        	= bukaquery($_sqlnext);
+            $barisnext        	= mysqli_fetch_row($hasilnext);
+            $next               = $barisnext[0];
+
+            $_sqlprev         	= "SELECT id FROM pegawai WHERE id<'$id' order by id desc limit 1";
+            $hasilprev        	= bukaquery($_sqlprev);
+            $barisprev        	= mysqli_fetch_row($hasilprev);
+            $prev               = $barisprev[0];
+
+            if(empty($prev)){
+                $prev=$next;
+            }
+
+            if(empty($next)){
+                $next=$prev;
+            }
+
+            echo "<div align='center' class='link'>
+                  <a href=?act=InputRiwayatPenghargaan&action=TAMBAH&id=$prev><<--</a>
+                  <a href=?act=ListRiwayatPenghargaan&action=LIHAT>| List Riwayat Penghargaan |</a>
+                  <a href=?act=InputRiwayatPenghargaan&action=TAMBAH&id=$next>-->></a>
+                  </div>";
+        ?>
+        <table width="100%" align="center">
+            <tr class="isi2">
+                <td width="31%" >NIP</td><td width="">:</td>
+                <td width="67%"><?php echo $baris[0];?></td>
+            </tr>
+            <tr class="isi2">
+                <td width="31%">Nama</td><td width="">:</td>
+                <td width="67%"><?php echo $baris[1];?></td>
+            </tr>
+            <tr class="isi2">
+                <td width="31%" >Jenis Penghargaan</td><td width="">:</td>
+                <td width="67%"><input name="jenis" class="text" onkeydown="setDefault(this, document.getElementById('MsgIsi1'));" type=text id="TxtIsi1" class="inputbox" value="<?php echo isset($jenis)?$jenis:NULL;?>" size="50" maxlength="30">
+                <span id="MsgIsi1" style="color:#CC0000; font-size:10px;"></span>
+                </td>
+            </tr>  
+            <tr class="isi2">
+                <td width="31%" >Nama Penghargaan</td><td width="">:</td>
+                <td width="67%"><input name="nama_penghargaan" class="text" onkeydown="setDefault(this, document.getElementById('MsgIsi2'));" type=text id="TxtIsi2" class="inputbox" value="<?php echo isset($nama_penghargaan)?$nama_penghargaan:NULL;?>" size="50" maxlength="60">
+                <span id="MsgIsi2" style="color:#CC0000; font-size:10px;"></span>
+                </td>
+            </tr>
+            <tr class="isi2">
+                <td width="31%" >Tanggal Penghargaan</td><td width="">:</td>
+                <td width="67%">
+                    <select name="TglPenghargaan" class="text" onkeydown="setDefault(this, document.getElementById('MsgIsi3'));" id="TxtIsi3">
+                         <?php
+                            loadTglnow();
+                         ?>
+                    </select>
+                    <select name="BlnPenghargaan" class="text" onkeydown="setDefault(this, document.getElementById('MsgIsi3'));" id="TxtIsi3">
+                         <?php
+                            loadBlnnow();
+                         ?>
+                    </select>
+                    <select name="ThnPenghargaan" class="text" onkeydown="setDefault(this, document.getElementById('MsgIsi3'));" id="TxtIsi3">
+                         <?php
+                            loadThnnow();
+                         ?>
+                    </select>
+                    <span id="MsgIsi3" style="color:#CC0000; font-size:10px;"></span>
+                </td>
+            </tr>
+            <tr class="isi2">
+                <td width="31%" >Instansi Pemberi Penghargaan</td><td width="">:</td>
+                <td width="67%"><input name="instansi" class="text" onkeydown="setDefault(this, document.getElementById('MsgIsi4'));" type=text id="TxtIsi4" class="inputbox" value="<?php echo isset($instansi)?$instansi:NULL;?>" size="50" maxlength="40">
+                <span id="MsgIsi4" style="color:#CC0000; font-size:10px;"></span>
+                </td>
+            </tr>             
+            <tr class="isi2">
+                <td width="31%" >Pejabat Pemberi Penghargaan</td><td width="">:</td>
+                <td width="67%"><input name="pejabat_pemberi" class="text" onkeydown="setDefault(this, document.getElementById('MsgIsi5'));" type=text id="TxtIsi5" class="inputbox" value="<?php echo isset($pejabat_pemberi)?$pejabat_pemberi:NULL;?>" size="50" maxlength="40">
+                <span id="MsgIsi5" style="color:#CC0000; font-size:10px;"></span>
+                </td>
+            </tr> 
+            <tr class="isi2">
+                <td width="31%" >Sertifikat/Piagam Penghargaan</td><td width="">:</td>
+                <td width="67%">
+                    <input name="dokumen" class="text2" onkeydown="setDefault(this, document.getElementById('MsgIsi6'));" type=file id="TxtIsi6" value="<?php echo $dokumen;?>" size="50" maxlength="255" />
+                    <span id="MsgIsi6" style="color:#CC0000; font-size:10px;"></span>
+                </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)) {
+                $id                 =trim($_POST['id']);
+                $jenis              =trim($_POST['jenis']);
+                $nama_penghargaan   =trim($_POST['nama_penghargaan']);
+                $tanggal            =trim($_POST['ThnPenghargaan'])."-".trim($_POST['BlnPenghargaan'])."-".trim($_POST['TglPenghargaan']);
+                $instansi           =trim($_POST['instansi']);
+                $pejabat_pemberi    =trim($_POST['pejabat_pemberi']);
+                $dokumen            = str_replace(" ","_","pages/riwayatpenghargaan/berkas/".$_FILES['dokumen']['name']);
+                if ((!empty($id))&&(!empty($jenis))&&(!empty($nama_penghargaan))) {
+                    switch($action) {
+                        case "TAMBAH":
+                            if((strtolower(substr($dokumen,-3))=="jpg")||(strtolower(substr($dokumen,-3))=="jpeg")){
+                                move_uploaded_file($_FILES['dokumen']['tmp_name'],$dokumen);
+                                Tambah(" riwayat_penghargaan "," '$id','$jenis','$nama_penghargaan','$tanggal','$instansi','$pejabat_pemberi','$dokumen'", " Riwayat Penghargaan " );
+                                echo"<meta http-equiv='refresh' content='1;URL=?act=InputRiwayatPenghargaan&action=TAMBAH&id=$id'>";
+                            }else{
+                                echo "Berkas harus JPEG/JPG";
+                            } 
+                            break;
+                    }
+                }else if ((empty($id))||(empty($jenis))||(empty($nama_penghargaan))){
+                    echo 'Semua field harus isi..!!!';
+                }
+            }
+
+            $_sql = "SELECT jenis, nama_penghargaan,tanggal, instansi, pejabat_pemberi,
+                    berkas from riwayat_penghargaan where id='$id' ORDER BY tanggal ASC ";
+            $hasil=bukaquery($_sql);
+            $jumlah=mysqli_num_rows($hasil);
+            $ttllembur=0;
+            $ttlhr=0;
+
+            if(mysqli_num_rows($hasil)!=0) {
+                echo "<table width='99.8%' border='0' align='center' cellpadding='0' cellspacing='0' class='tbl_form'>
+                        <tr class='head3'>
+                            <td width='5%'><div align='center'>Proses</div></td>
+                            <td width='20%'><div align='center'>Jenis Penghargaan</div></td>
+                            <td width='30%'><div align='center'>Nama Penghargaan</div></td>
+                            <td width='5%'><div align='center'>Tanggal</div></td>
+                            <td width='20%'><div align='center'>Instansi Pemberi Penghargaan</div></td>
+                            <td width='20%'><div align='center'>Pejabat Pemberi Penghargaan</div></td>
+                        </tr>";
+                while($baris = mysqli_fetch_array($hasil)) {   
+                    $gb="-";
+                    if($baris["berkas"]=="pages/riwayatpenghargaan/berkas"){
+                        $gb="-";                            
+                    }else{
+                        $gb="<img src='".$baris["berkas"]."' width='850px' height='950px'>";
+                    }
+                  echo "<tr class='isi'>
+                            <td width='70'>
+                                <center>"; ?>
+                                <a href="?act=InputRiwayatPenghargaan&action=HAPUS&tanggal=<?php print $baris["tanggal"] ?>&nama_penghargaan=<?php print $baris["nama_penghargaan"] ?>&id=<?php echo $id ?>&berkas=<?php print $baris["berkas"];?>" >[hapus]</a>
+                        <?php
+                        echo "</center>
+                            </td>
+                            <td>$baris[0]</td>
+                            <td>$baris[1]</td>
+                            <td>$baris[2]</td>
+                            <td>$baris[3]</td>
+                            <td>$baris[4]</td>
+                       </tr>";
+                        echo "<tr class='isi'>
+                            <td width='70'></td>
+                            <td valign='top' align='center' colspan='7'><a target=_blank href=../penggajian/".$baris["berkas"].">".$gb."</a></td>
+                       </tr>";   
+                }
+            echo "</table>";
+
+        } else {
+            echo "<table width='99.8%' border='0' align='center' cellpadding='0' cellspacing='0' class='tbl_form'>
+                       <tr class='head3'>
+                            <td width='5%'><div align='center'>Proses</div></td>
+                            <td width='20%'><div align='center'>Jenis Penghargaan</div></td>
+                            <td width='30%'><div align='center'>Nama Penghargaan</div></td>
+                            <td width='5%'><div align='center'>Tanggal</div></td>
+                            <td width='20%'><div align='center'>Instansi Pemberi Penghargaan</div></td>
+                            <td width='20%'><div align='center'>Pejabat Pemberi Penghargaan</div></td>
+                        </tr>
+                  </table>";            
+        }
+    ?>
+    </form>
+    <?php
+        if ($action=="HAPUS") {
+            unlink($_GET['berkas']);
+            Hapus(" riwayat_penghargaan "," id ='".$_GET['id']."' and tanggal ='".$_GET['tanggal']."' and nama_penghargaan ='".$_GET['nama_penghargaan']."'","?act=InputRiwayatPenghargaan&action=TAMBAH&id=$id");
+        }
+    ?>
+</div>
diff --git a/webapps/penggajian/pages/riwayatpenghargaan/index.php b/webapps/penggajian/pages/riwayatpenghargaan/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/riwayatpenghargaan/list.php b/webapps/penggajian/pages/riwayatpenghargaan/list.php
@@ -0,0 +1,70 @@
+<?php
+    $action      =isset($_GET['action'])?$_GET['action']:NULL;
+    $keyword      = str_replace("_"," ",isset($_GET['keyword']))?str_replace("_"," ",$_GET['keyword']):NULL;
+    echo "<input type=hidden name=keyword value=$keyword><input type=hidden name=action value=$action>";
+?>
+<div style="width: 100%; height: 99%; overflow: auto;">
+    <?php
+        $_sql = "SELECT pegawai.id,pegawai.nik,pegawai.nama FROM  pegawai
+		 where  pegawai.stts_aktif<>'KELUAR' and pegawai.nik like '%".$keyword."%' or 
+		 pegawai.stts_aktif<>'KELUAR' and pegawai.nama like '%".$keyword."%'
+		 order by pegawai.id ASC ";
+        $hasil=bukaquery($_sql);
+        $jumlah=mysqli_num_rows($hasil);
+        if(mysqli_num_rows($hasil)!=0) {
+            echo "<table width='99.8%' border='0' align='center' cellpadding='0' cellspacing='0' class='tbl_form'>
+                    <tr class='head2'>
+                        <td width='5%'><div align='center'>Proses</div></td>
+                        <td width='11%'><div align='center'>NIP</div></td>
+                        <td width='25%'><div align='center'>Nama</div></td>
+                        <td width='59%'><div align='center'>Riwayat Penghargaan Pegawai</div></td>
+                    </tr>";
+                    while($baris = mysqli_fetch_array($hasil)) {
+                        echo "<tr class='isi' title='$baris[1] $baris[2]'>
+                                <td>
+                                    <center>
+                                        <a href=?act=InputRiwayatPenghargaan&action=TAMBAH&id=$baris[0]>[Detail]</a>
+                                    </center>
+                               </td>
+                                <td><a href=?act=InputRiwayatPenghargaan&action=TAMBAH&id=$baris[0]>$baris[1]</a></td>
+                                <td><a href=?act=InputRiwayatPenghargaan&action=TAMBAH&id=$baris[0]>$baris[2]</a></td>
+                                <td>
+                                   <table width='99.8%' border='0' align='center' cellpadding='0' cellspacing='0' class='tbl_form'>";
+                                        $_sql2 = "SELECT nama_penghargaan, tanggal, instansi,pejabat_pemberi from riwayat_penghargaan where id='$baris[0]' ORDER BY tanggal ASC ";
+                                        $hasil2=bukaquery($_sql2);
+                                        if(mysqli_num_rows($hasil2)!=0) {
+                                            echo "<tr class='isi7'>
+                                                    <td width='5%'><div align='center'>NO.</div></td>
+                                                    <td width='35%'><div align='center'>Nama Penghargaan</div></td>
+                                                    <td width='10%'><div align='center'>Tanggal</div></td>
+                                                    <td width='25%'><div align='center'>Instansi Pemberi</div></td>
+                                                    <td width='25%'><div align='center'>Pejabat Pemberi</div></td>
+                                                  </tr>";
+                                        }
+                                        $no=1;
+                                        while($baris2 = mysqli_fetch_array($hasil2)) { 
+                                            echo "<tr> 
+                                                    <td>$no</td>
+                                                    <td>$baris2[0]</td>
+                                                    <td>$baris2[1]</td>
+                                                    <td>$baris2[2]</td>
+                                                    <td>$baris2[3]</td>
+                                                  </tr>";$no++;
+                                        }
+                             echo "</table>
+                                </td>
+                             </tr>";
+                    }
+            echo "</table>";           
+        } else {
+            echo "<table width='99.8%' border='0' align='center' cellpadding='0' cellspacing='0' class='tbl_form'>
+                    <tr class='head2'>
+                        <td width='5%'><div align='center'>Proses</div></td>
+                        <td width='11%'><div align='center'>NIP</div></td>
+                        <td width='25%'><div align='center'>Nama</div></td>
+                        <td width='59%'><div align='center'>Riwayat Penghargaan Pegawai</div></td>
+                    </tr>
+                  </table>";
+        }
+    ?>
+</div>
diff --git a/webapps/penggajian/pages/riwayatseminar/detail.php b/webapps/penggajian/pages/riwayatseminar/detail.php
@@ -170,7 +170,7 @@
                             } 
                             break;
                     }
-                }else if ((empty($id))||(empty($jabatan))){
+                }else if ((empty($id))||(empty($nama_seminar))){
                     echo 'Semua field harus isi..!!!';
                 }
             }