From c13ea43b7cb1db9f8325893632c4bc358109ea9b Mon Sep 17 00:00:00 2001
From: gazandic <gazandic@gmail.com>
Date: Tue, 5 Apr 2016 02:15:36 +0700
Subject: [PATCH] modul statistik selesai
---
resources/views/layouts/app.blade.php | 53 ++-------------------
resources/views/menu/editSchedule.blade.php | 2 +-
resources/views/menu/editTps.blade.php | 2 +-
resources/views/menu/editUser.blade.php | 17 +++++--
resources/views/menu/insertUser.blade.php | 12 +++--
resources/views/menu/schedule.blade.php | 39 +++++++++++++++
resources/views/menu/tps.blade.php | 42 +++++++++++++++-
7 files changed, 108 insertions(+), 59 deletions(-)
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 88402e1..fe8eed4 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -59,43 +59,7 @@
<!-- nabar right -->
<ul class="nav navbar-nav navbar-right">
- <li class="dropdown">
- <a href="#" data-toggle="dropdown" class="dropdown-toggle">
- <i class="icon-bdg_alert text14"></i>
- <span class="visible-xs-inline">Notifikasi</span>
- <span class="badge badge-sm up bg-danger pull-right-xs">2</span>
- </a>
- <!-- dropdown -->
- <div class="dropdown-menu w-xl animated fadeIn">
- <div class="panel bg-white">
- <div class="panel-heading b-light bg-light">
- <strong>Kamu Punya <span>2</span> Notifikasi</strong>
- </div>
- <div class="list-group">
- <a href class="list-group-item">
- <span class="pull-left m-r thumb-sm">
- <img src="/templatePPL2/libs/img/01.jpg" alt="..." class="img-circle">
- </span>
- <span class="clear block m-b-none">
- Pembangunan Taman daerah Bandung Barat<br>
- <small class="text-muted">10 minutes ago</small>
- </span>
- </a>
- <a href class="list-group-item">
- <span class="clear block m-b-none">
- Revitalisasi Sungai Cikapundung<br>
- <small class="text-muted">1 hour ago</small>
- </span>
- </a>
- </div>
- <div class="panel-footer text-sm">
- <a href class="pull-right"><i class="icon-bdg_setting3"></i></a>
- <a href="#notes" data-toggle="class:show animated fadeInRight">Lihat Semua Notifikasi</a>
- </div>
- </div>
- </div>
- <!-- / dropdown -->
- </li>
+
<li class="dropdown">
<a href="#" data-toggle="dropdown" class="dropdown-toggle">
<i class="icon-bdg_search text14"></i>
@@ -121,18 +85,12 @@
<ul class="dropdown-menu animated fadeIn w-ml">
<li>
<a href>
- <span class="badge bg-danger pull-right">30%</span>
- <span>Settings</span>
+ <span class="badge bg-danger pull-right"></span>
+ <span>{{ Auth::user()->email }}</span>
</a>
</li>
<li>
- <a href>Profile</a>
- </li>
- <li>
- <a href>
- <span class="label bg-info pull-right">new</span>
- Help
- </a>
+ <a href>{{ Auth::user()->name }}</a>
</li>
<li class="divider"></li>
<li>
@@ -152,7 +110,7 @@
<li class="hidden-folded m-t text-dark-grey text-xs padder-md padder-v-sm">
<span>Navigation</span>
</li>
- <li class="active">
+ <li>
<a href="{{ url('/') }}" class="text-dark-grey" >
<i class="icon-bdg_dashboard icon-grey"></i>
<span class="font-bold">Dashboard</span>
@@ -180,7 +138,6 @@
</li>
<li >
<a href="{{ url('/schedule') }}">
- <b class="badge bg-danger pull-right">3</b>
<span>Schedule</span>
</a>
</li>
diff --git a/resources/views/menu/editSchedule.blade.php b/resources/views/menu/editSchedule.blade.php
index 8d2825a..7b62865 100644
--- a/resources/views/menu/editSchedule.blade.php
+++ b/resources/views/menu/editSchedule.blade.php
@@ -22,7 +22,7 @@
Form schedule
</div>
<div class="panel-body">
- <form class="col-md-12" action="<?php echo URL::to('/schedule');?>/<?=$data->id?>" method="POST">
+ <form class="col-md-12 form-horizontal" action="<?php echo URL::to('/schedule');?>/<?=$data->id?>" method="POST">
{!! csrf_field() !!}
<input type="hidden" name="_method" value="put" />
<div class="line line-dashed b-b line-lg pull-in"></div>
diff --git a/resources/views/menu/editTps.blade.php b/resources/views/menu/editTps.blade.php
index 79b6e3c..da729a0 100644
--- a/resources/views/menu/editTps.blade.php
+++ b/resources/views/menu/editTps.blade.php
@@ -22,7 +22,7 @@
Form TPS
</div>
<div class="panel-body">
- <form class="col-md-12" action="<?php echo URL::to('/tps');?>/<?=$data->id?>" method="POST">
+ <form class="col-md-12 form-horizontal" action="<?php echo URL::to('/tps');?>/<?=$data->id?>" method="POST">
{!! csrf_field() !!}
<input type="hidden" name="_method" value="put" />
<div class="line line-dashed b-b line-lg pull-in"></div>
diff --git a/resources/views/menu/editUser.blade.php b/resources/views/menu/editUser.blade.php
index 9a3f897..35bfd0d 100644
--- a/resources/views/menu/editUser.blade.php
+++ b/resources/views/menu/editUser.blade.php
@@ -22,10 +22,11 @@
Form user
</div>
<div class="panel-body">
- <form class="col-md-12" action="<?php echo URL::to('/user');?>/<?=$data->id?>" method="POST">
+ <form class="form-horizontal" action="<?php echo URL::to('/user');?>/<?=$data->id?>" method="POST">
{!! csrf_field() !!}
<input type="hidden" name="_method" value="put" />
+
<div class="line line-dashed b-b line-lg pull-in"></div>
<div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
<label class="col-sm-2 control-label">Nama</label>
@@ -39,6 +40,7 @@
</div>
</div>
+
<div class="line line-dashed b-b line-lg pull-in"></div>
<div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
<label class="col-sm-2 control-label">Email</label>
@@ -51,6 +53,8 @@
@endif
</div>
</div>
+
+
<div class="line line-dashed b-b line-lg pull-in"></div>
<div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
<label class="col-sm-2 control-label">Password</label>
@@ -61,10 +65,11 @@
<strong>{{ $errors->first('password') }}</strong>
</span>
@endif
-
</div>
- <div class="line line-dashed b-b line-lg pull-in"></div>
</div>
+
+
+ <div class="line line-dashed b-b line-lg pull-in"></div>
<div class="form-group{{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
<label class="col-sm-2 control-label">Confirm Password</label>
<div class="col-sm-10">
@@ -76,7 +81,8 @@
@endif
</div>
</div>
- </div>
+
+
<div class="line line-dashed b-b line-lg pull-in"></div>
<div class="form-group">
<div class="col-sm-4 col-sm-offset-2">
@@ -86,10 +92,11 @@
</div>
</form>
+
+ </div>
</div>
</div>
</div>
</div>
-</div>
@endsection
\ No newline at end of file
diff --git a/resources/views/menu/insertUser.blade.php b/resources/views/menu/insertUser.blade.php
index beea530..00266c3 100644
--- a/resources/views/menu/insertUser.blade.php
+++ b/resources/views/menu/insertUser.blade.php
@@ -36,6 +36,8 @@
@endif
</div>
</div>
+
+ <div class="line line-dashed b-b line-lg pull-in"></div>
<div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
<label class="col-sm-2 control-label">Email</label>
<div class="col-sm-10">
@@ -47,6 +49,7 @@
@endif
</div>
</div>
+
<div class="line line-dashed b-b line-lg pull-in"></div>
<div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
<label class="col-sm-2 control-label">Password</label>
@@ -57,10 +60,10 @@
<strong>{{ $errors->first('password') }}</strong>
</span>
@endif
-
</div>
- <div class="line line-dashed b-b line-lg pull-in"></div>
</div>
+
+ <div class="line line-dashed b-b line-lg pull-in"></div>
<div class="form-group{{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
<label class="col-sm-2 control-label">Confirm Password</label>
<div class="col-sm-10">
@@ -72,7 +75,8 @@
@endif
</div>
</div>
- </div>
+
+
<div class="line line-dashed b-b line-lg pull-in"></div>
<div class="form-group">
<div class="col-sm-4 col-sm-offset-2">
@@ -81,6 +85,8 @@
</div>
</div>
+ </div>
+
</form>
</div>
</div>
diff --git a/resources/views/menu/schedule.blade.php b/resources/views/menu/schedule.blade.php
index 855e426..7c61795 100644
--- a/resources/views/menu/schedule.blade.php
+++ b/resources/views/menu/schedule.blade.php
@@ -1,3 +1,14 @@
+<?php
+$jumlahSelesai = 0;
+$jumlahBelumSelesai = 0;
+foreach ($data as $jadwal ) {
+ if($jadwal->is_done==0){
+ $jumlahBelumSelesai+=1;
+ }else{
+ $jumlahSelesai+=1;
+ }
+}
+?>
@extends('layouts.app')
@section('content')
<div class="hbox hbox-auto-xs hbox-auto-sm ng-scope">
@@ -15,6 +26,34 @@
</div>
<div class="wrapper-lg bg-light">
<div class="row">
+ <!-- Pie Chart-->
+ <div class="col-md-12">
+ <div class="panel panel-default">
+ <div class="panel-heading font-regular">Statistik jadwal</div>
+ <div class="panel-body no-padder">
+
+ <div class="col-xs-8">
+ <div class="wrapper text-center">
+ <div ui-jq="sparkline" ui-options="[<?=$jumlahSelesai?>,<?=$jumlahBelumSelesai?>], {type:'pie', height:140, sliceColors:['#001080','#8dc80e']}" 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>Selesai</li>
+ <li class="mb20 text-success font-light"><i class="fa fa-circle text-success"></i>BelumSelesai</li>
+ </ul>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+ </div>
+ </div>
<div class="col-md-12">
<div class="panel panel-default">
<div class="panel-heading font-semibold">
diff --git a/resources/views/menu/tps.blade.php b/resources/views/menu/tps.blade.php
index 302d4ee..983c06a 100644
--- a/resources/views/menu/tps.blade.php
+++ b/resources/views/menu/tps.blade.php
@@ -1,3 +1,14 @@
+<?php
+$jumlahPenuh = 0;
+$jumlahTakPenuh = 0;
+foreach ($data as $tps ) {
+ if($tps->is_full==0){
+ $jumlahTakPenuh+=1;
+ }else{
+ $jumlahPenuh+=1;
+ }
+}
+?>
@extends('layouts.app')
@section('content')
@@ -16,7 +27,36 @@
</ul>
</div>
<div class="wrapper-lg bg-light">
- <div class="row">
+ <div class="row">
+ <!-- Pie Chart-->
+ <div class="col-md-12">
+ <div class="panel panel-default">
+ <div class="panel-heading font-regular">Statistik TPS</div>
+ <div class="panel-body no-padder">
+
+ <div class="col-xs-8">
+ <div class="wrapper text-center">
+ <div ui-jq="sparkline" ui-options="[<?=$jumlahPenuh?>,<?=$jumlahTakPenuh?>], {type:'pie', height:140, sliceColors:['#001080','#8dc80e']}" 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> Penuh</li>
+ <li class="mb20 text-success font-light"><i class="fa fa-circle text-success"></i> Takpenuh</li>
+ </ul>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+ </div>
+ </div>
+
<div class="col-md-12">
<div class="panel panel-default">
<div class="panel-heading font-semibold">
--
GitLab