diff --git a/ppl2/app/Http/Controllers/PendFormalController.php b/ppl2/app/Http/Controllers/PendFormalController.php
index b25ea01af485594d261f0c2c1e571f0681d4d2e5..6489c07f85b825e95fc9ad74cd15c1487ee9d803 100644
--- a/ppl2/app/Http/Controllers/PendFormalController.php
+++ b/ppl2/app/Http/Controllers/PendFormalController.php
@@ -10,6 +10,8 @@ use App\PendidikanFormal;
use Session;
+use DB;
+
class PendFormalController extends Controller
{
//
@@ -21,9 +23,12 @@ class PendFormalController extends Controller
public function getPendidikan($nip) {
$pend = PendidikanFormal::where('nip',$nip)->get();
- return view('pages.pendidikanPegawai',compact('pend','nip'));;
+ return view('pages.pendidikanPegawai',compact('pend','nip'));
}
+
+
+
public function edit($id) {
$pend = PendidikanFormal::find($id);
return view('pages.editFormal', compact('pend'));
@@ -72,4 +77,46 @@ class PendFormalController extends Controller
$res = $request->input('query');
return \Redirect::to('pendidikan-formal/all/'.$res);
}
+
+ public function getStatistikStrata() {
+ $pend = DB::table('pendidikan_formal')
+ ->select(DB::raw('count(*) as jumlah, tingkatan'))
+ ->groupBy('tingkatan')
+ ->get();
+ $nip = null;
+ return $pend;
+ }
+
+ public function getStatistikInstitusi() {
+ $first = DB::table('pendidikan_formal')
+ ->select(DB::raw('count(*) as jumlah, nama_institusi'))
+ ->groupBy('nama_institusi')
+ ->get();
+ $second = DB::table('informals')
+ ->select(DB::raw('count(*) as jumlah, nama_institusi'))
+ ->groupBy('nama_institusi')
+ ->get();
+ $result = array_merge($first, $second);
+ return $second;
+ }
+
+ public function getStatistikKeahlian() {
+ $pend = DB::table('informals')
+ ->select(DB::raw('count(*) as jumlah, keahlian'))
+ ->groupBy('keahlian')
+ ->get();
+ $nip = null;
+ return $pend;
+ }
+
+ public function getAllStatistik() {
+ $stratastat= PendFormalController::getStatistikStrata();
+ $institusistat= PendFormalController::getStatistikInstitusi();
+ $keahlianstat= PendFormalController::getStatistikKeahlian();
+ $nip = null;
+ return view('pages.statistik',compact('stratastat','nip','institusistat','keahlianstat'));
+ }
+
+
+
}
diff --git a/ppl2/app/Http/routes.php b/ppl2/app/Http/routes.php
index ee42cf7bcd14c132bfe8cbba0311a3c2f94450e6..ffecfea4d5990f0ff9ee0503c655145f7efc9de0 100644
--- a/ppl2/app/Http/routes.php
+++ b/ppl2/app/Http/routes.php
@@ -79,6 +79,4 @@ Route::get('/penjadwalan', function () {
return view('penjadwalan');
});
-Route::get('/statistik',function(){
- return view('pages.statistik');
-});
+Route::get('/statistik','PendFormalController@getAllStatistik');
diff --git a/ppl2/app/informal.php b/ppl2/app/informal.php
index d64108ab3c1ad5c658b2555f70185e57bb55e907..7554cfbb531136286b0de95964b134c66084881f 100644
--- a/ppl2/app/informal.php
+++ b/ppl2/app/informal.php
@@ -6,8 +6,8 @@ use Illuminate\Database\Eloquent\Model;
class informal extends Model
{
- protected $table = 'booking';
- protected $primaryKey = 'id_booking';
+ protected $table = 'informals';
+ protected $primaryKey = 'id';
public $timestamps = false; //tidak ada create_at dan update_at
protected $connection = 'mysql';
}
diff --git a/ppl2/resources/views/pages/statistik.blade.php b/ppl2/resources/views/pages/statistik.blade.php
index c65bfb3d22093d89a2452fe6cd842484380ea926..5e0cacbb9b4724223b617b052ac76511105f2197 100644
--- a/ppl2/resources/views/pages/statistik.blade.php
+++ b/ppl2/resources/views/pages/statistik.blade.php
@@ -1,11 +1,11 @@
@extends('app_template')
@section('title')
- Login Pendidikan Pegawai
+ Statistik
@stop
@section('page_title')
- <h2>Login Aplikasi Pendidikan Pegawai</h2>
+ <h2>Statistik Aplikasi Pendidikan Pegawai</h2>
@stop
@section('head_content')
@@ -24,7 +24,11 @@
<div class="panel-body no-padder">
<div class="wrapper">
<div ui-jq="plot" ui-options="
- [ {label : 'Windows',data: [ 200]},{label : 'OSX',data: [45]},{label : 'Linux',data: [50]},{label : 'Others',data: [10]} ],
+ [
+ @foreach($stratastat as $strata)
+ {label : '{{$strata->tingkatan}}',data:[{{$strata->jumlah}}]},
+ @endforeach
+ ],
{
series: { pie: { show: true, innerRadius: 0.5, stroke: { width: 0 }, label: { show: true, threshold: 0.05 } } },
colors: ['#00b0ff','#ff7e00','#8560a8','#8dc80e','#b8bcce'],
@@ -35,12 +39,6 @@
}
" style="height:240px"></div>
- <div class="panel-info">
- <span class="pull-left text-info"> <i class="fa fa-circle"></i>Windows</span>
- <span class="pull-left text-warning"><i class="fa fa-circle"></i>OSX</span>
- <span class="pull-left text-purple"><i class="fa fa-circle"></i>Linux</span>
- <span class="pull-left text-success"><i class="fa fa-circle"></i>Others</span>
- </div>
</div>
</div>
</div>
@@ -49,45 +47,42 @@
<!-- Pie Chart-->
<div class="col-md-6">
<div class="panel panel-default">
- <div class="panel-heading font-semibold">Statistik Almamater</div>
- <div class="panel-body no-padder">
-
- <div class="col-xs-8">
- <div class="wrapper text-center">
- <div ui-jq="sparkline" ui-options="[80,150,35,40], {type:'pie', height:140, sliceColors:['#8560a8','#ff7e00','#8dc80e','#00b0ff']}" class="sparkline inline text-center"></div>
- <div class="line pull-in"></div>
- </div>
- </div>
-
- <div class="col-xs-4 border-left">
- <div class="wrapper">
- <div class="text-xs">
- <ul class="sparkline-info">
- <li class="mb20 text-info font-light"><i class="fa fa-circle text-info"></i> Windows</li>
- <li class="mb20 text-success font-light"><i class="fa fa-circle text-success"></i> Linux</li>
- <li class="mb20 text-warning font-light"><i class="fa fa-circle text-warning"></i> Ubuntu</li>
- <li class="mb20 text-purple font-light"><i class="fa fa-circle text-purple"></i> OSX</li>
- </ul>
- </div>
- </div>
+ <div class="panel-heading font-semibold">Statistik Almamater</div>
+ <div class="panel-body no-padder">
+ <div class="wrapper">
+ <div ui-jq="plot" ui-options="
+ [
+ @foreach($institusistat as $strata)
+ {label : '{{$strata->nama_institusi}}',data:[{{$strata->jumlah}}]},
+ @endforeach
+ ],
+ {
+ series: { pie: { show: true, stroke: { width: 0 }, label: { show: true, threshold: 0.05 } } },
+ colors: ['#00b0ff','#ff7e00','#8560a8','#8dc80e','#b8bcce'],
+ grid: { hoverable: true, clickable: true, borderWidth: 0, color: '#ccc' },
+ tooltip: true,
+ tooltipOpts: { content: '%s: %p.0%' },
+ legend: {show: false}
+ }
+ " style="height:240px"></div>
</div>
-
</div>
</div>
</div>
<!-- Bar table-->
<div class="col-md-6">
<div class="panel panel-default">
- <div class="panel-heading font-semibold">Donut Chart</div>
- <div class="panel-body no-padder">
- <div class="wrapper">
+ <div class="panel-heading font-semibold">Statistik Keahlian</div>
+ <div class="panel-body no-padder">
+ <div class="wrapper">
<div ui-jq="plot" ui-options="
[
- { label: 'A', data: [ [10,10]] },
- { label: 'B', data: [ [20,20] ] },
- { label: 'C', data: [ [30,30] ] },
- { label: 'D', data: [ [40,40] ] }
+ <?php $i = 10; ?>
+ @foreach($keahlianstat as $keahlian)
+ {label : '{{$keahlian->keahlian}}',data: [ [ {{$i}},{{$keahlian->jumlah}} ] ]},
+ <?php $i=$i+10;?>
+ @endforeach
],
{
bars: { show: true, fill: true, lineWidth: 0, order: 1, fillColor: { colors: [{ opacity: 0.5 }, { opacity: 0.9}] } },
@@ -100,13 +95,6 @@
legend: {show: false}
}
" style="height:240px"></div>
-
- <div class="panel-info">
- <span class="pull-left text-info"> <i class="fa fa-circle"></i>Windows</span>
- <span class="pull-left text-warning"><i class="fa fa-circle"></i>OSX</span>
- <span class="pull-left text-purple"><i class="fa fa-circle"></i>Linux</span>
- <span class="pull-left text-success"><i class="fa fa-circle"></i>Others</span>
- </div>
</div>
</div>
</div>
diff --git a/ppl2/resources/views/pages/statistikStrata.blade.php b/ppl2/resources/views/pages/statistikStrata.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..5025a696ed6d77225e300f68a33f505a60158ab3
--- /dev/null
+++ b/ppl2/resources/views/pages/statistikStrata.blade.php
@@ -0,0 +1,68 @@
+@extends('app_template')
+
+@section('title')
+ Pendidikan Formal Pegawai
+@stop
+
+@section('page_title')
+ <h2>Pendidikan Formal Pegawai</h2>
+@stop
+
+@section('head_content')
+ @if (Session::has('message'))
+ <div class="alert alert-info fade in">{{ Session::get('message') }}
+ <a href="#" class="close" data-dismiss="alert" aria-label="close" title="close">×</a>
+ </div>
+ @endif
+ <div class="row">
+ <div class="col-md-3">
+ <button class="btn m-b-sm m-r-sm btn-success" onclick="location.href = '{{URL::to('/')}}/pendidikan-formal/new';"><i class="m-r-xs fa fa-plus"></i>Tambahkan Pendidikan</button>
+ </div>
+ <div class="col-md-6">
+ <form action = "{{URL::to('/')}}/pendidikan-formal/search" method="GET">
+ <div class="input-group">
+ <input type="text" class="form-control" placeholder="Cari berdasarkan NIP" name="query" required>
+ <span class="input-group-btn">
+ <button class="btn btn-default" type="submit">Go!</button>
+ </span>
+ </div>
+ </form>
+ </div>
+ </div>
+@stop
+
+@section('content')
+<div class="panel panel-default">
+ <div class="panel-heading font-semibold">
+ <!-- Tampilkan Pesan -->
+ Tabel Pendidikan
+ @if($nip == null)
+ Semua Pegawai
+ @else
+ Pegawai NIP : {{$nip}}
+ @endif
+ </div>
+ <div>
+ <table class="table" ui-jq="footable" ui-options='{
+ "paging": {
+ "enabled": true
+ }}'>
+ <thead>
+ <tr>
+ <th data-breakpoints="xs">tingkatan</th>
+ <th>strata</th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php $i = 1; ?>
+ @foreach($pend as $pendidikan)
+ <tr data-expanded="true">
+ <td>{{$pendidikan -> jumlah}}</td>
+ <td>{{$pendidikan -> tingkatan}}</td>
+ </tr>
+ <?php $i++ ;?>
+ @endforeach
+ </tbody>
+ </table>
+ </div>
+@stop
\ No newline at end of file