From 18c9be8020096018261f1c96f214c0192e834e55 Mon Sep 17 00:00:00 2001
From: Venny Larasati <venny_la@yahoo.com>
Date: Tue, 17 May 2016 19:12:15 +0700
Subject: [PATCH] minor change: statistik

---
 P3/controller/statistik_controller.php | 60 +++++++++++++++++---------
 P3/index.php                           |  9 +++-
 2 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/P3/controller/statistik_controller.php b/P3/controller/statistik_controller.php
index df530d1..059df8c 100644
--- a/P3/controller/statistik_controller.php
+++ b/P3/controller/statistik_controller.php
@@ -2,9 +2,27 @@
 require_once 'connectdb.php';
 
 function getStatistik(){
-	$connp = connect_database2();
-	$connl = connect_database();
+	
+	$skpd = getSKPD();
+	$penilaian = getPenilaianUnitKerja();
 
+	// hitung per skpd
+	foreach ($skpd as $skpd){
+		$skpd['sum'] = 0;
+		$skpd['count'] = 0;
+		foreach($penilaian as $n){
+			if ($skpd['nama'] == $n['unit_kerja']){
+				$skpd['sum'] += $n['nilai'];
+				$skpd['count']++;
+			}
+		}
+		$skpd['avg'] = $skpd['sum']/$skpd['count'];
+	}
+
+}
+
+function getSKPD(){
+	$connp = connect_database2();
 	// get all skpd
 	$skpd = array();
 	$sql = "SELECT nama FROM skpd;";
@@ -18,9 +36,14 @@ function getStatistik(){
 		echo "0 results <br>";
 	}
 
+	return $skpd;
+}
+
+function getPenilaian(){
+	$connl = connect_database();
 	// get nilai
 	$penilaian = array();
-	$sql = "SELECT nip, nilai FROM penilaian;";
+	$sql = "SELECT id_pegawai, nilai FROM penilaian;";
 	$result = $connl->query($sql);
 
 	if ($result->num_rows > 0) { 
@@ -31,15 +54,26 @@ function getStatistik(){
 		echo "0 results <br>";
 	}
 
+	return $penilaian;
+}
+
+function getPenilaianUnitKerja(){
+	$connp = connect_database2();
+	$penilaian = getPenilaian();
+	
 	// get unit kerja pegawai
 	$sql = "SELECT nip, unit_kerja FROM pegawai;";
 	$result = $connp->query($sql);
 
+	$ret=array();
+
 	if ($result->num_rows > 0) { 
 	    while($row = $result->fetch_assoc()) {
 	        foreach ($penilaian as $n){
-	        	if ($row['nip'] == $n['nip']){
-	        		$n['unit_kerja'] = $row['unit_kerja'];
+	        	if ($row['nip'] == $n['id_pegawai']){
+	        		$ret[]['unit_kerja'] = $row['unit_kerja'];
+	        		$ret[]['nip'] = $n['id_pegawai'];
+	        		$ret[]['nilai'] = $n['nilai'];
 	        		break;
 	        	}
 			}
@@ -48,21 +82,7 @@ function getStatistik(){
 		echo "0 results <br>";
 	}
 
-	// hitung per skpd
-	foreach ($skpd as $skpd){
-		$skpd['sum'] = 0;
-		$skpd['count'] = 0;
-		foreach($penilaian as $p){
-			if ($skpd['nama'] == $p['unit_kerja']){
-				$skpd['sum'] += $p['nilai'];
-				$skpd['count']++;
-			}
-		}
-		$skpd['avg'] = $skpd['sum']/$skpd['count'];
-	}
-
-
-
+	return $ret;
 }
 
 ?>
\ No newline at end of file
diff --git a/P3/index.php b/P3/index.php
index 5a56500..f186d2c 100644
--- a/P3/index.php
+++ b/P3/index.php
@@ -67,7 +67,8 @@
             </div>
           </div>
         </div>
-        <?php require_once 'controller/statistik_controller.php'; ?>
+        <?php require_once 'controller/statistik_controller.php'; 
+        //getStatistik(); ?>
         <div class="row">
           <div class="col-sm-8">
             <div class="panel panel-default">
@@ -76,7 +77,11 @@
                 
                 <div class="text-center m-b-n m-t-sm">
                     <div ui-jq="sparkline" class="sparkline inline" ui-options="
-                    [ 10.2,6.3,11,10,11,10,12,10,9,10,11,9,0 ], 
+                    [<?php 
+                      //foreach ($skpd as $skpd){
+                        //echo $skpd['avg'] . ", ";
+                      //}
+                    ?> 0], 
                     {
                       type:'bar', 
                       height:300, 
-- 
GitLab