From f6c00415fcf4c084abac7244536c7ca009d77ae8 Mon Sep 17 00:00:00 2001
From: Venny Larasati <venny_la@yahoo.com>
Date: Tue, 17 May 2016 19:45:07 +0700
Subject: [PATCH] revert back changes yang ketimpa
---
P3/aside.php | 64 ++++---------------
.../form_penilaian_skp_controller.php | 2 +-
P3/controller/form_rekomendasi_controller.php | 2 +-
P3/controller/form_skp_controller.php | 2 +-
P3/controller/penilaian_controller.php | 2 +-
P3/controller/perilaku_kerja_controller.php | 2 +-
P3/form_penilaian_skp.php | 41 ++++++++++--
P3/index.php | 57 ++---------------
8 files changed, 55 insertions(+), 117 deletions(-)
diff --git a/P3/aside.php b/P3/aside.php
index dd17dc3..5567ab4 100644
--- a/P3/aside.php
+++ b/P3/aside.php
@@ -148,66 +148,48 @@
<span>Evaluasi Pegawai</span>
</li>
- <li <?php if ($current_page=="Persetujuan SKP") echo "class= \"active\""?>>
+ <li <?php if ($current_page=="Persetujuan SKP" || $current_page=="Persetujuan Penilaian") echo "class= \"active\""?>>
<a href class="auto">
<span class="pull-right text-muted">
<i class="text8 icon-bdg_arrow3 text"></i>
<i class="text8 icon-bdg_arrow1 text-active"></i>
</span>
<i class="icon-bdg_uikit"></i>
- <span class="font-bold">Persetujuan Formulir SKP</span>
+ <span class="font-bold">Persetujuan</span>
</a>
<ul class="nav nav-sub dk">
<li class="nav-sub-header">
<a href>
- <span>Persetujuan Formulir SKP</span>
+ <span>Persetujuan</span>
</a>
</li>
<li >
<a href="list_persetujuan_skp.php">
- <span>Lihat Formulir SKP</span>
+ <span>Lihat Persetujuan SKP</span>
</a>
- </li>
- </ul>
- </li>
-
- <li <?php if ($current_page=="Persetujuan Penilaian") echo "class= \"active\""?>>
- <a href class="auto">
- <span class="pull-right text-muted">
- <i class="text8 icon-bdg_arrow3 text"></i>
- <i class="text8 icon-bdg_arrow1 text-active"></i>
- </span>
- <i class="icon-bdg_uikit"></i>
- <span class="font-bold">Persetujuan Penilaian</span>
- </a>
- <ul class="nav nav-sub dk">
- <li class="nav-sub-header">
- <a href>
- <span>Persetujuan Penilaian</span>
- </a>
- </li>
+ </li>
<li >
<a href="list_persetujuan_penilaian.php">
- <span>Lihat Persetujuan</span>
+ <span>Lihat Persetujuan Penilaian</span>
</a>
- </li>
+ </li>
</ul>
</li>
<li>
- <li <?php if ($current_page=="Perilaku Kerja") echo "class= \"active\""?>>
+ <li <?php if ($current_page=="Perilaku Kerja" || $current_page=="Penilaian SKP") echo "class= \"active\""?>>
<a href class="auto">
<span class="pull-right text-muted">
<i class="text8 icon-bdg_arrow3 text"></i>
<i class="text8 icon-bdg_arrow1 text-active"></i>
</span>
<i class="icon-bdg_uikit"></i>
- <span class="font-bold">Penilaian Perilaku Kerja</span>
+ <span class="font-bold">Penilaian</span>
</a>
<ul class="nav nav-sub dk">
<li class="nav-sub-header">
<a href>
- <span>Penilaian Perilaku Kerja</span>
+ <span>Penilaian</span>
</a>
</li>
<li >
@@ -215,34 +197,12 @@
<span>Isi Penilaian Perilaku Kerja</span>
</a>
</li>
-
- </ul>
- </li>
-
-
-
- <li>
- <li <?php if ($current_page=="Penilaian SKP") echo "class= \"active\""?>>
- <a href class="auto">
- <span class="pull-right text-muted">
- <i class="text8 icon-bdg_arrow3 text"></i>
- <i class="text8 icon-bdg_arrow1 text-active"></i>
- </span>
- <i class="icon-bdg_uikit"></i>
- <span class="font-bold">Penilaian SKP</span>
- </a>
- <ul class="nav nav-sub dk">
- <li class="nav-sub-header">
- <a href>
- <span>Penilaian SKP</span>
- </a>
- </li>
-
<li >
<a href="list_penilaian_skp.php">
<span>Isi Penilaian SKP</span>
</a>
- </li>
+ </li>
+
</ul>
</li>
diff --git a/P3/controller/form_penilaian_skp_controller.php b/P3/controller/form_penilaian_skp_controller.php
index ee2fee9..c2f285f 100644
--- a/P3/controller/form_penilaian_skp_controller.php
+++ b/P3/controller/form_penilaian_skp_controller.php
@@ -39,7 +39,7 @@
echo "update done ";
- header( 'Location: ../form_penilaian_skp.php?nip='.$nip ) ;
+ header( 'Location: ../list_penilaian_skp.php' ) ;
exit();
}
diff --git a/P3/controller/form_rekomendasi_controller.php b/P3/controller/form_rekomendasi_controller.php
index 623061b..3ba6577 100644
--- a/P3/controller/form_rekomendasi_controller.php
+++ b/P3/controller/form_rekomendasi_controller.php
@@ -72,7 +72,7 @@ function insertRekomendasi(){
}
$sql1 = "UPDATE rekomendasi
- SET rek_pelatihan='$Rek_pendidikan' , rek_promosi = '$Rek_promosi', rek_mutasi = '$Rek_mutasi'
+ SET rek_pelatihan='$Rek_pendidikan' , rek_promosi = '$Rek_promosi', rek_mutasi = '$Rek_mutasi', modified_at=now();
WHERE id_rekomendasi = '$id_rekomendasi' ";
if ($conn->query($sql1) === TRUE) {
diff --git a/P3/controller/form_skp_controller.php b/P3/controller/form_skp_controller.php
index ee7785c..6fa5b49 100644
--- a/P3/controller/form_skp_controller.php
+++ b/P3/controller/form_skp_controller.php
@@ -265,7 +265,7 @@ if ($func == 1){
echo "belom ada skp <br>";
}
- $sql = "UPDATE skp SET status=1 WHERE id_skp=$id_skp";
+ $sql = "UPDATE skp SET status=1, modified_at=now() WHERE id_skp=$id_skp";
if ($conn->query($sql) === TRUE) {
echo "New record created successfully";
diff --git a/P3/controller/penilaian_controller.php b/P3/controller/penilaian_controller.php
index f6c6e1c..504c5fc 100644
--- a/P3/controller/penilaian_controller.php
+++ b/P3/controller/penilaian_controller.php
@@ -126,7 +126,7 @@ function getPegawai($nip_pegawai){
function updateNilai($id_penilaian, $nilai){
$conn = connect_database();
- $sql = "UPDATE penilaian SET nilai=$nilai WHERE id_penilaian = '$id_penilaian' ";
+ $sql = "UPDATE penilaian SET nilai=$nilai, modified_at=now() WHERE id_penilaian = '$id_penilaian' ";
if ($conn->query($sql) === TRUE) {
echo "New record created successfully";
diff --git a/P3/controller/perilaku_kerja_controller.php b/P3/controller/perilaku_kerja_controller.php
index 2a0f671..0778e7b 100644
--- a/P3/controller/perilaku_kerja_controller.php
+++ b/P3/controller/perilaku_kerja_controller.php
@@ -83,7 +83,7 @@ function insertPerilakuKerja($nip_pegawai){
}
$sql1 = "UPDATE perilaku_kerja
- SET pelayanan=$pelayanan , integritas=$integritas, komitmen=$komitmen, disiplin=$disiplin, kerjasama=$kerjasama, kepemimpinan=$kepemimpinan
+ SET pelayanan=$pelayanan , integritas=$integritas, komitmen=$komitmen, disiplin=$disiplin, kerjasama=$kerjasama, kepemimpinan=$kepemimpinan, modified_at=now()
WHERE id_perilaku = '$id_perilaku' ";
if ($conn->query($sql1) === TRUE) {
diff --git a/P3/form_penilaian_skp.php b/P3/form_penilaian_skp.php
index 00ddb53..ae727ac 100644
--- a/P3/form_penilaian_skp.php
+++ b/P3/form_penilaian_skp.php
@@ -23,6 +23,7 @@
<?php require_once 'header.php' ?>
<?php require_once 'aside.php' ?>
+ <?php require_once 'controller/connectdb.php' ?>
<!-- content -->
<div id="content" class="app-content" role="main">
@@ -67,7 +68,7 @@
<td><b>Realisasi Kuantitas</b></td>
<td><b>Realisasi Waktu</b></td>
<td><b>Realisasi Biaya</b></td>
- <td><b>Status</b></td>
+ <td><b>Nilai</b></td>
</tr>
</thead>
<tbody>
@@ -98,6 +99,32 @@
<td><?php if(is_null($k["real_biaya"])) echo "-" ;
else echo $k["real_biaya"]; ?>
</td>
+ <td><?php if(is_null($k["real_ak"]) && is_null($k["real_biaya"]) && is_null($k["real_kualitas"]) && is_null($k["real_waktu"]) && is_null($k["real_kuantitas"]) ) echo "Belum dinilai" ;
+ else {
+ $KL = ($k["real_kualitas"] / $k["target_kualitas"]) *100;
+ $KT = ($k["real_kuantitas"] / $k["target_kuantitas"]) *100;
+ $W = 100 - ($k["real_waktu"] / $k["target_waktu"] *100 );
+ if($W<=24) $W = (1.76 * $k["target_waktu"] - $k["real_waktu"] )/ $k["target_waktu"] * 100;
+
+ $B = 100 - ($k["real_biaya"] / $k["target_biaya"] *100 );
+ if($B<=24) $B = (1.76 * $k["target_biaya"] - $k["real_biaya"]) / $k["target_biaya"] * 100;
+
+ $hasil = ($KL + $KT +$W + $B)/4;
+ //echo "(",$KL, "+", $KT ,"+",$W ,"+", $B,") /",4;
+ echo $hasil;
+
+ $conn = connect_database();
+ $skp = $k["id_skp"];
+ $keg = $k["id_kegiatan"];
+
+ $sql = "UPDATE kegiatan
+ SET nilai_kegiatan=$hasil
+ WHERE id_skp = $skp AND id_kegiatan = $keg ";
+ $result = $conn->query($sql);
+
+
+ }?>
+ </td>
<td>
<div class="">
@@ -125,31 +152,31 @@
<div class="form-group">
<label class="col-lg-3 control-label">Realisasi Angka Kredit</label>
<div class="col-lg-9">
- <input type="number" name="r_kredit" class="form-control">
+ <input type="number" name="r_kredit" class="form-control" value="<?php if(!is_null($k["real_ak"])) echo $k["real_ak"]?>">
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">Realisasi Output / Kuantitas</label>
<div class="col-lg-9">
- <input type="text" name="r_kuantitas" class="form-control">
+ <input type="text" name="r_kuantitas" class="form-control" value="<?php if(!is_null($k["real_kuantitas"])) echo $k["real_kuantitas"]?>">
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">Realisasi Mutu / Kualitas</label>
<div class="col-lg-9">
- <input type="number" name="r_kualitas" class="form-control">
+ <input type="number" name="r_kualitas" class="form-control" value="<?php if(!is_null($k["real_kualitas"])) echo $k["real_kualitas"]?>">
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">Realisasi Waktu</label>
<div class="col-lg-9">
- <input type="text" name="r_waktu" class="form-control">
+ <input type="text" name="r_waktu" class="form-control"value="<?php if(!is_null($k["real_waktu"])) echo $k["real_waktu"] ?>" >
</div>
</div>
<div class="form-group">
<label class="col-lg-3 control-label">Realisasi Biaya</label>
<div class="col-lg-9">
- <input type="number" name="r_biaya" class="form-control">
+ <input type="number" name="r_biaya" class="form-control" value="<?php if(!is_null($k["real_biaya"])) echo $k["real_biaya"]?>" >
</div>
</div>
@@ -220,4 +247,4 @@
<script src="js/ui-client.js"></script>
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/P3/index.php b/P3/index.php
index 1bf07ae..f186d2c 100644
--- a/P3/index.php
+++ b/P3/index.php
@@ -70,15 +70,12 @@
<?php require_once 'controller/statistik_controller.php';
//getStatistik(); ?>
<div class="row">
- <div class="col-lg-6">
+ <div class="col-sm-8">
<div class="panel panel-default">
- <div class="panel-heading font-semibold">Double Chart</div>
+ <div class="panel-heading font-semibold">Chart</div>
<div class="bg-dark-grey wrapper pb-zero">
<div class="text-center m-b-n m-t-sm">
- <div ui-jq="sparkline" ui-options="[50.32,45.23,47.56,36.25,53.85,40.15,41.25,50.15,57.14,36.15,97.26,50.15,45.32,47.19,37.75,25.15,56.34,50.35,47.25,53.15], {type:'line', height:114, width: '100%', lineWidth:2, valueSpots:{'0:':'#fff'}, lineColor:'#fff', spotColor:'#fff', fillColor:'', highlightLineColor:'#fff', spotRadius:3}"></div>
-
- <div ui-jq="sparkline" ui-options="[ 10,9,11,10,11,10,12,10,9,10,11,9,8 ], {type:'bar', height:124, barWidth:7, barSpacing:15, barColor:'#00b0ff'}" class="sparkline inline">loading...</div>
<div ui-jq="sparkline" class="sparkline inline" ui-options="
[<?php
//foreach ($skpd as $skpd){
@@ -95,55 +92,9 @@
</div>
</div>
<div class="panel-body no-padder">
-
- <div class="wrapper20 inline full-width">
- <div class="col-xs-4">
- <p class="block font-semibold">Market</p>
- <span class="block">Rp.3.500.000</span>
- </div>
- <div class="col-xs-4">
- <p class="block font-semibold">Referal</p>
- <span>Rp.1.150.000</span>
- </div>
- <div class="col-xs-4">
- <p class="block font-semibold">Affiliate</p>
- <span>Rp.950.000</span>
- </div>
- </div>
-
- </div>
- </div>
- </div>
-
- <div class="col-md-6">
- <div class="panel panel-default">
- <div class="panel-heading font-semibold">Double Chart Overlay</div>
- <div class="panel-body no-padder">
- <div class="wrapper">
- <div ui-jq="plot" ui-options="
- [
- { data: [ [0,7],[1,6.5],[2,12.5],[3,7],[4,9],[5,6],[6,11],[7,6.5],[8,8],[9,7] ], label: 'Unique Visits', points: { show: true, radius : 2,fill:true,fillColor : '#00b0ff' },splines: { show: true, tension: 0.45, lineWidth: 1, fill: 0.4 } },
- { data: [ [0,4],[1,4.5],[2,7],[3,4.5],[4,3],[5,3.5],[6,6],[7,3],[8,4],[9,3] ], label: 'Pages View', points: { show: true, radius: 2,fill:true,fillColor : '#90cb23' },splines: { show: true, tension: 0.45, lineWidth: 1, fill: 0.4 } }
- ],
- {
- colors: [ '#01b0ff','#90cb23' ],
- series: { shadowSize: 2 },
- xaxis:{ font: { color: '#ccc' } },
- yaxis:{ font: { color: '#ccc' } },
- grid: { hoverable: true, clickable: true, borderWidth: 0, color: '#ccc' },
- legend: false,
- tooltip: true,
- tooltipOpts: { content: '%s of %x.1 is %y.4', defaultTheme: false, shifts: { x: 0, y: 20 } }
- }
- " style="height:240px"></div>
-
- <div class="panel-info">
- <span class="pull-left text-info"> <i class="fa fa-circle"></i>Unique Visits</span>
- <span class="pull-left text-success"><i class="fa fa-circle"></i>Pages View</span>
- </div>
-
+ <div class="wrapper20 inline full-width">
</div>
- </div>
+ </div>
</div>
</div>
</div>
--
GitLab