diff --git a/bdgwebkit/statistik.html b/bdgwebkit/statistik.html
new file mode 100644
index 0000000000000000000000000000000000000000..ee6b1f792ca4f60ef982f0c93f82d5f33efa5671
--- /dev/null
+++ b/bdgwebkit/statistik.html
@@ -0,0 +1,781 @@
+<!DOCTYPE html>
+<html lang="en" class="">
+<head>
+  <meta charset="utf-8" />
+  <title>Bandung Web Kit | BDGWEBKIT</title>
+  <meta name="description" content="Bandung Web Kit" />
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
+  <link rel="stylesheet" href="../libs/assets/animate.css/animate.css" type="text/css" />
+  <link rel="stylesheet" href="../libs/assets/font-awesome/css/font-awesome.min.css" type="text/css" />
+  <link rel="stylesheet" href="../libs/assets/simple-line-icons/css/simple-line-icons.css" type="text/css" />
+  <link rel="stylesheet" href="../libs/jquery/bootstrap/dist/css/bootstrap.css" type="text/css" />
+
+  <link rel="stylesheet" href="css/font.css" type="text/css" />
+  <link rel="stylesheet" href="css/style.css" type="text/css" />
+  
+
+</head>
+<body>
+<div class="app app-header-fixed ">
+  
+
+    <!-- header -->
+  <header id="header" class="app-header navbar" role="menu">
+      <!-- navbar header -->
+      <div class="navbar-header bg-info">
+        <button class="pull-right visible-xs dk" ui-toggle-class="show" target=".navbar-collapse">
+          <i class="glyphicon glyphicon-cog"></i>
+        </button>
+        <button class="pull-right visible-xs" ui-toggle-class="off-screen" target=".app-aside" ui-scroll="app">
+          <i class="glyphicon glyphicon-align-justify"></i>
+        </button>
+        <!-- brand -->
+        <a href="#/" class="navbar-brand text-lt">          
+          <img src="img/logo-small.png" alt="." class="small-logo hide">
+          <img src="img/logo.png" alt="." class="large-logo">
+        </a>
+        <!-- / brand -->
+      </div>
+      <!-- / navbar header -->
+
+      <!-- navbar collapse -->
+      <div class="collapse pos-rlt navbar-collapse bg-info">
+        <!-- buttons -->
+        <div class="nav navbar-nav hidden-xs">
+                  
+        </div>
+        <!-- / buttons -->
+
+        <!-- link and dropdown -->
+        <ul class="nav navbar-nav hidden-sm">
+          <li>
+            <a href="#">HOME</a>
+          </li>
+          <li class="dropdown">
+            <a href="#" data-toggle="dropdown" class="dropdown-toggle">
+              <i class="fa fa-fw fa-plus visible-xs-inline-block"></i>
+              <span>PAGES</span> <span class="caret"></span>
+            </a>
+            <ul class="dropdown-menu" role="menu">
+              
+              <li>
+                <a href="#">
+                  <span class="badge bg-danger pull-right">5</span>
+                  <span>Form Elements</span>
+                </a>
+              </li>
+
+              <li>
+                <a href="#">
+                  <span class="badge bg-info pull-right">15</span>
+                  <span>Form Validation</span>
+                </a>
+              </li>
+
+              <li>
+                <a href="#">
+                  <span>Form Wizard</span>
+                </a>
+              </li>
+              
+            </ul>
+          </li>
+           <li>
+            <a href="#">PROJECT</a>
+          </li>
+        </ul>
+        <!-- / link and dropdown -->
+
+        <!-- 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="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>              
+            </a>
+            <!-- dropdown -->
+             <div class="search_wrapper pull-right w-xl animated fadeIn">
+              <form action="">
+                <i class="pull-left glyphicon glyphicon-search"></i>
+                  <input type="text" class="pull-left" placeholder="Type Here">
+                <a href="#" class="remove-search"><i class="pull-right icon-bdg_cross"></i></a>
+              </form>
+            </div>
+            <!-- / dropdown -->
+          </li>
+          <li class="dropdown">
+            <a href="#" data-toggle="dropdown" class="bg-blue profile-header dropdown-toggle clear" data-toggle="dropdown">
+              <span class="thumb-sm avatar pull-left m-t-n-sm m-b-n-sm m-r-sm">
+                <img src="img/01.jpg" alt="...">                
+              </span>
+              <span class="hidden-sm hidden-md m-r-xl">Ridwan Kamil</span> <i class="text14 icon-bdg_setting3 pull-right"></i>
+            </a>
+            <!-- dropdown -->
+            <ul class="dropdown-menu animated fadeIn w-ml">             
+              <li>
+                <a href>
+                  <span class="badge bg-danger pull-right">30%</span>
+                  <span>Settings</span>
+                </a>
+              </li>
+              <li>
+                <a href>Profile</a>
+              </li>
+              <li>
+                <a href>
+                  <span class="label bg-info pull-right">new</span>
+                  Help
+                </a>
+              </li>
+              <li class="divider"></li>
+              <li>
+                <a>Logout</a>
+              </li>
+            </ul>
+            <!-- / dropdown -->
+          </li>
+        </ul>
+        <!-- / navbar right -->
+      </div>
+      <!-- / navbar collapse -->
+  </header>
+  <!-- / header -->
+
+
+    <!-- aside -->
+  <aside id="aside" class="app-aside hidden-xs bg-dark">
+      <div class="aside-wrap">
+        <div class="navi-wrap">
+          <!-- user -->
+          <div class="clearfix hidden-xs text-center hide" id="aside-user">
+            <div class="dropdown wrapper">
+              <a href="app.page.profile">
+                <span class="thumb-lg w-auto-folded avatar m-t-sm">
+                  <img src="img/01.jpg" class="img-full" alt="...">
+                </span>
+              </a>
+              <a href="#" data-toggle="dropdown" class="dropdown-toggle hidden-folded">
+                <span class="clear">
+                  <span class="block m-t-sm">
+                    <strong class="font-bold text-lt">John.Smith</strong> 
+                    <b class="caret"></b>
+                  </span>
+                  <span class="text-muted text-xs block">Art Director</span>
+                </span>
+              </a>
+              <!-- dropdown -->
+              <ul class="dropdown-menu animated fadeInRight w hidden-folded">
+                <li class="wrapper b-b m-b-sm bg-info m-t-n-xs">
+                  <span class="arrow top hidden-folded arrow-info"></span>
+                  <div>
+                    <p>300mb of 500mb used</p>
+                  </div>
+                  <div class="progress progress-xs m-b-none dker">
+                    <div class="progress-bar bg-white" data-toggle="tooltip" data-original-title="50%" style="width: 50%"></div>
+                  </div>
+                </li>
+                <li>
+                  <a href>Settings</a>
+                </li>
+                <li>
+                  <a href="page_profile.html">Profile</a>
+                </li>
+                <li>
+                  <a href>
+                    <span class="badge bg-danger pull-right">3</span>
+                    Notifications
+                  </a>
+                </li>
+                <li class="divider"></li>
+                <li>
+                  <a href="page_signin.html">Logout</a>
+                </li>
+              </ul>
+              <!-- / dropdown -->
+            </div>
+            <div class="line dk hidden-folded"></div>
+          </div>
+          <!-- / user -->
+
+         <!-- nav -->
+          <nav ui-nav class="navi clearfix">
+            <ul class="nav">
+              <li class="hidden-folded m-t text-dark-grey text-xs padder-md padder-v-sm">
+                <span>Navigation</span>
+              </li>
+              <li>
+                <a href="index.html" class="text-dark-grey" >      
+                  <i class="icon-bdg_dashboard icon-grey"></i>
+                  <span class="font-bold">Dashboard</span>
+                </a>               
+              </li>
+              
+              <li class="line1 dg"></li>
+
+              <li class="hidden-folded text-dark-grey text-xs padder-md padder-v-sm">
+                <span>Components</span>
+              </li>
+              
+              <li>
+                <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">UI Kits</span>
+                </a>
+                <ul class="nav nav-sub dk">
+                  <li class="nav-sub-header">
+                    <a href>
+                      <span>UI Kits</span>
+                    </a>
+                  </li>
+                  <li>
+                    <a href="ui_button.html">
+                      <span>Buttons</span>
+                    </a>
+                  </li>
+                  <li >
+                    <a href="ui_icons.html">
+                      <b class="badge bg-danger pull-right">3</b>
+                      <span>Icons</span>
+                    </a>
+                  </li>
+                  <li>
+                    <a href="ui_grid.html">
+                      <span>Grid</span>
+                    </a>
+                  </li>
+                  
+                 
+                </ul>
+              </li>
+              <li>
+                <a href="table_static.html" class="auto">
+                  
+                  <b class="badge bg-info pull-right">2</b>
+                  <i class="icon-bdg_table"></i>
+                  <span class="font-bold">Table</span>
+                </a>
+               
+              </li>
+              <li>
+                  <a href="form_element.html" class="auto">                  
+                  <i class="icon-bdg_form"></i>
+                  <span class="font-bold">Form</span>
+                </a>                
+              </li>
+              <li class="active">
+                <a href="ui_chart.html">
+                  <i class="icon-bdg_chart2"></i>
+                  <span class="font-bold">Chart</span>
+                </a>
+              </li>
+              <li>
+                <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_layout"></i>
+                  <span class="font-bold">Pages</span>
+                </a>
+                <ul class="nav nav-sub dk">
+                  <li class="nav-sub-header">
+                    <a href>
+                      <span>Pages</span>
+                    </a>
+                  </li>
+    
+                 
+                  <li>
+                    <a href="lockscreen.html">
+                      <span>Lock screen</span>
+                    </a>
+                  </li>
+                  <li>
+                    <a href="signin.html">
+                      <span>Signin</span>
+                    </a>
+                  </li>
+                  <li>
+                    <a href="register.html">
+                      <span>Signup</span>
+                    </a>
+                  </li>
+                  <li>
+                    <a href="forgot_password.html">
+                      <span>Forgot password</span>
+                    </a>
+                  </li>
+                 
+                </ul>
+              </li>
+             
+              
+            </ul>
+          </nav>
+          <!-- nav -->
+
+
+
+        </div>
+      </div>
+  </aside>
+  <!-- / aside -->
+
+<!-- content -->
+<div id="content" class="app-content" role="main">
+
+  <div class="hbox hbox-auto-xs hbox-auto-sm ng-scope">
+      <div class="app-content-body ">
+
+          <div class="bg-light lter">    
+              <ul class="breadcrumb bg-grey-breadcrumb m-b-none">
+                <li><a href="#" class="btn no-shadow" ui-toggle-class="app-aside-folded" target=".app">
+                  <i class="icon-bdg_expand1 text"></i>
+                  <i class="icon-bdg_expand2 text-active"></i>
+                </a>   </li>
+                <li><a href>Home</a></li>                
+                <li class="active"><i class="fa fa-angle-right"></i>Chart</li>
+              </ul>
+          </div>
+          
+          <div class="bg-light b-b wrapper-md padder-md ">
+            <h1 class="m-n font-bold h4 padder">BDG Chart</h1>
+          </div>
+      
+
+        <div class="wrapper-lg bg-light">
+  
+   <div class="row">
+
+            <!-- Pie Chart-->
+            <div class="col-md-6">
+              <div class="panel panel-default">
+                <div class="panel-heading font-semibold">Pie</div>
+                <div class="panel-body no-padder">   
+                  
+                  <div class="col-xs-8">
+                    <div class="wrapper text-center">
+                        <div ui-jq="sparkline" ui-options="[20,5,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>
+
+                </div>
+              </div>
+            </div>
+
+            <!-- Sparkline Chart -->
+            <div class="col-md-6">
+              <div class="panel panel-default">
+                <div class="panel-heading font-semibold">Investment Progress</div>
+                <div class="panel-body no-padder">
+                  <div class="row">
+                    <div class="col-xs-6">
+                      <div class="wrapper text-center">
+                        <div ui-jq="sparkline" ui-options="[ [2, 8], [4, 6], [6, 4], [8, 2], [10, 0], [8, 2], [6, 4], [4, 6], [2,8] ], {type:'bar', width:100, height:178, barWidth:7, barSpacing:15, stackedBarColor:['#8dc80e', '#e5e6ec']}" class="sparkline inline"></div>
+                      </div>
+
+                    </div>
+
+                    <div class="col-xs-6">
+                      
+                      <div class="wrapper">
+                        <p class="h3 m-b-sm">Investings</p>
+                        Revenue
+                        <div class="h3 m-b-sm font-light m-t-sm">4500,00</div>
+                        Costs
+                        <div class="h3 m-b-sm font-light m-t-sm text-success">3450,00</div>
+                      </div>
+
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <!-- End Sparkline Chart -->
+          
+          </div>
+
+          <div class="row">
+            <div class="col-lg-6">
+              <div class="panel panel-default">
+                <div class="panel-heading font-semibold">Double 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>
+                </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>
+                </div>                  
+              </div>
+            </div>
+
+          </div>
+
+
+          <div class="row">
+              <div class="col-lg-4">
+                <div class="panel panel-default">
+                  <div class="panel-heading font-semibold">
+                    New Visitors
+                  </div>
+                  <div class="panel-body text-center no-padder">
+                    <h4 class="text-warning">120.000</h4>
+                    <small class="text-light-grey block">Updated at 1 minutes ago</small>
+                    <div class="inline">
+                      <div ui-jq="easyPieChart" ui-options="{
+                                percent: 75,
+                                lineWidth: 10,
+                                trackColor: '#e5e6ec',
+                                barColor: '#ff7e00',
+                                scaleColor: '#fff',
+                                size: 188,
+                                lineCap: 'butt'
+                              }">
+                        <div>
+                          <span class="h2">75%</span>
+                          <div class="text">Yesterday</div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="panel-footer"><small>% of avarage rate of the Conversion</small></div>
+                </div>
+              </div>
+              <div class="col-lg-4">
+                <div class="panel panel-default">
+                  <div class="panel-heading font-semibold">
+                    Today Visitors
+                  </div>
+                  <div class="panel-body no-padder text-center">
+                    <h4 class="text-success">40.000</h4>
+                    <small class="text-light-grey block">Updated at 3 minutes ago</small>
+                    <div class="inline">
+                      <div ui-jq="easyPieChart"  ui-options="{
+                                percent: 25,
+                                lineWidth: 10,
+                                trackColor: '#e5e6ec',
+                                barColor: '#8dc80e',
+                                scaleColor: '#ffffff',
+                                size: 188,
+                                lineCap: 'butt',
+                                animate: 1000
+                              }">
+                        <div>
+                          <span class="h2 m-l-sm step">25</span>%
+                          <div class="text">today</div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="panel-footer"><small>% of change</small></div>
+                </div>
+              </div>
+
+              <div class="col-lg-4">
+                <div class="panel panel-default">
+                  <div class="panel-heading font-semibold">
+                    Daily Visitors
+                  </div>
+                  <div class="panel-body text-center no-padder">
+                    <h4 class="text-info">430.000</h4>
+                    <small class="text-light-grey block">All Domestic Visitors</small>
+                    <div class="inline">
+                      <div ui-jq="easyPieChart"  ui-options="{
+                                percent: 97,
+                                lineWidth: 10,
+                                trackColor: '#e5e6ec',
+                                barColor: '#00b0ff',
+                                scaleColor: '#ffffff',
+                                size: 188,
+                                lineCap: 'butt',
+                                animate: 1000
+                              }">
+                        <div>
+                          <span class="h2 m-l-sm step">97</span>%
+                          <div class="text">All Visitors</div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="panel-footer"><small>% of change</small></div>
+                </div>
+              </div>
+   
+          </div>
+
+          <div class="row">
+              <div class="col-md-6">
+                <div class="panel panel-default">
+                  <div class="panel-heading font-semibold">Order bar</div>
+                  <div class="panel-body no-padder">
+                     <div class="wrapper">
+                        <div ui-jq="plot" ui-options="
+                          [ 
+                            { label: 'A', data: [ [10, 120], [20, 100], [30, 70], [40, 90], [50, 115] ] },
+                            { label: 'B', data: [ [10, 80],  [20, 70], [30, 50],  [40, 75], [50, 115] ] },
+                            { label: 'C', data: [ [10, 30],  [20, 40], [30, 90],  [40, 80], [50, 115] ] },
+                            { label: 'D', data: [ [10, 10],  [20, 15], [30, 54],  [40, 50], [50, 115] ] }
+                          ],
+                          {
+                            bars: { show: true, fill: true, lineWidth: 0, order: 1, fillColor: { colors: [{ opacity: 0.5 }, { opacity: 0.9}] } },
+                            colors: ['#00e5ff', '#00b0ff', '#2979ff' ,'#3d5afe' ],
+                            series: { shadowSize: 1 },
+                            xaxis:{ font: { color: '#ccc' } },
+                            yaxis:{ font: { color: '#ccc' } },
+                            grid: { hoverable: true, clickable: true, borderWidth: 0, color: '#ccc' },                
+                            tooltip: true,
+                            legend: {show: false}
+                          }
+                        " style="height:240px"></div>
+
+                        <div class="panel-info">
+                          <span class="pull-left text-blue-a"> <i class="fa fa-circle"></i>Unique Visits</span>                          
+                          <span class="pull-left text-blue-b"><i class="fa fa-circle"></i>Pages View</span>
+                          <span class="pull-left text-blue-c"><i class="fa fa-circle"></i>Comments</span>
+                          <span class="pull-left text-blue-d"><i class="fa fa-circle"></i>Likes</span>
+                        </div> 
+
+                      </div>
+                  </div>                  
+                </div>
+              </div>
+              <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 ui-jq="plot" ui-options="
+                          [ {label : 'Windows',data: [10, 80]},{label : 'OSX',data: [20, 45]},{label : 'Linux',data: [30, 50]},{label : 'Others',data: [40, 10]} ],
+                          {
+                            series: { pie: { show: true, innerRadius: 0.5, 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 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>
+                </div>
+              </div>
+            
+          <div class="row">
+            <div class="col-md-6">
+              <div class="panel panel-default">
+                <div class="panel-heading font-regular">Double Chart</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: 3, fill:true,fillColor : '#00b0ff' }, lines: { show: true, fill: true, fillColor: { colors: [{ opacity: 0.1 }, { opacity: 0.1}] } } }, 
+                        { 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: 3,fill:true,fillColor : '#8dc80e' } }
+                      ],
+                      {
+                        colors: [ '#00b0ff','#8dc80e' ],
+                        series: { shadowSize: 2 },
+                        xaxis:{ font: { color: '#ccc' } },
+                        yaxis:{ font: { color: '#ccc' } },
+                        grid: { hoverable: true, clickable: true, borderWidth: 0, color: '#ccc' },
+                        tooltip: true,
+                        legend : false,
+                        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>              
+                </div>   
+               
+              </div>
+            </div>
+            
+            <div class="col-md-6">
+              <div class="panel panel-default">
+                <div class="panel-heading font-regular">Background Chart</div>
+                <div class="panel-body no-padder">
+                  <div class="wrapper">
+                    <div ui-jq="plot" ui-options="
+                      [
+                        { data: [ [0,7],[1,5],[2,8],[3,10],[4,17],[5,20],[6,16],[7,10],[8,17],[9,22] ], label: 'Unique Visits', points: { show: true, radius : 2,fill:true,fillColor : '#00b0ff' },splines: { show: true, tension: 0.45, lineWidth: 1, fill: 0 } }
+                      ],
+                      {
+                        colors: [ '#01b0ff','#90cb23' ],
+                        series: { shadowSize: 2 },
+                        xaxis:{ font: { color: '#ccc' } },
+                        yaxis:{ font: { color: '#ccc' } },
+                        grid: { hoverable: true, clickable: true, borderWidth: 0, color: '#7b8092', backgroundColor: '#555b70' },
+                        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"> <h4><i class="fa fa-caret-up"></i>9.879 <small>Users</small> </h4> </span>
+                      <span class="pull-left text-success"><h4><i class="fa fa-caret-up"></i>12.879 <small>Users</small></h4> </span>
+                      <span class="pull-left text-grey"><h4><i class="fa fa-caret-down"></i>379 <small>Orders</small></h4> </span>
+                    </div> 
+
+                  </div>
+                </div>                  
+              </div>
+            </div>
+
+          </div>
+
+          <div class="row">
+            <div class="col-md-12 padder-v"></div>
+          </div>
+   
+</div>
+
+
+      </div>
+      <!-- App-content-body -->  
+</div>
+    <!-- end hbox hbox-auto-xs -->
+</div>
+
+
+   <!-- footer -->
+  <footer id="footer" class="app-footer" role="footer">
+    <div class="wrapper-md padder-lg b-t bg-light">
+      <span class="pull-right">&copy; Copyright Bandung <a href ui-scroll="app" class="m-l-sm text-muted"><i class="icon-bdg_arrow11"></i></a></span>
+     Made with <i class="text-danger fa fa-heart"></i> in Bandung
+    </div>
+  </footer>
+  <!-- / footer -->
+
+
+
+</div>
+
+<script src="../libs/jquery/jquery/dist/jquery.js"></script>
+<script src="../libs/jquery/bootstrap/dist/js/bootstrap.js"></script>
+<script src="js/ui-load.js"></script>
+<script src="js/ui-jp.config.js"></script>
+<script src="js/ui-jp.js"></script>
+<script src="js/ui-nav.js"></script>
+<script src="js/ui-toggle.js"></script>
+<script src="js/ui-client.js"></script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/penjadwalan.sql b/penjadwalan.sql
new file mode 100644
index 0000000000000000000000000000000000000000..6ca4529e3a80bfbf03c6b838a9f93995e17ac235
--- /dev/null
+++ b/penjadwalan.sql
@@ -0,0 +1,66 @@
+-- phpMyAdmin SQL Dump
+-- version 4.2.11
+-- http://www.phpmyadmin.net
+--
+-- Host: 127.0.0.1
+-- Generation Time: May 14, 2016 at 02:36 PM
+-- Server version: 5.6.21
+-- PHP Version: 5.5.19
+
+SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
+SET time_zone = "+00:00";
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+
+--
+-- Database: `ppl2`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `penjadwalan`
+--
+
+CREATE TABLE IF NOT EXISTS `penjadwalan` (
+`kegiatan_id` int(11) NOT NULL,
+  `judul_kegiatan` varchar(50) NOT NULL,
+  `nama_penyelenggara` varchar(50) NOT NULL,
+  `ruangan` int(11) NOT NULL,
+  `waktu` datetime NOT NULL
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=latin1;
+
+--
+-- Dumping data for table `penjadwalan`
+--
+
+INSERT INTO `penjadwalan` (`kegiatan_id`, `judul_kegiatan`, `nama_penyelenggara`, `ruangan`, `waktu`) VALUES
+(7, '', '', 1, '2016-05-13 10:00:00'),
+(8, 'HAHAHAHAHA', 'sssss', 1, '2016-05-14 13:00:00');
+
+--
+-- Indexes for dumped tables
+--
+
+--
+-- Indexes for table `penjadwalan`
+--
+ALTER TABLE `penjadwalan`
+ ADD PRIMARY KEY (`kegiatan_id`);
+
+--
+-- AUTO_INCREMENT for dumped tables
+--
+
+--
+-- AUTO_INCREMENT for table `penjadwalan`
+--
+ALTER TABLE `penjadwalan`
+MODIFY `kegiatan_id` int(11) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=9;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/ppl2(new).sql b/ppl2(new).sql
new file mode 100644
index 0000000000000000000000000000000000000000..14a943ee29d2ba39077c3c185bf864bc564da817
--- /dev/null
+++ b/ppl2(new).sql
@@ -0,0 +1,306 @@
+-- phpMyAdmin SQL Dump
+-- version 4.3.11
+-- http://www.phpmyadmin.net
+--
+-- Host: 127.0.0.1
+-- Generation Time: May 16, 2016 at 06:48 PM
+-- Server version: 5.6.24
+-- PHP Version: 5.6.8
+
+SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
+SET time_zone = "+00:00";
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+
+--
+-- Database: `ppl2`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `informals`
+--
+-- Creation: May 16, 2016 at 04:40 PM
+--
+
+CREATE TABLE IF NOT EXISTS `informals` (
+  `id` int(11) NOT NULL DEFAULT '0',
+  `nip` varchar(20) NOT NULL,
+  `id_institusi` int(11) NOT NULL,
+  `keahlian` varchar(140) NOT NULL,
+  `no_ijazah` varchar(30) NOT NULL,
+  `tahun` year(4) NOT NULL,
+  `durasi` int(11) NOT NULL,
+  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `updated_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `ip` varchar(255) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+--
+-- RELATIONS FOR TABLE `informals`:
+--   `id_institusi`
+--       `institusi` -> `id_institusi`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `institusi`
+--
+-- Creation: May 16, 2016 at 04:42 PM
+--
+
+CREATE TABLE IF NOT EXISTS `institusi` (
+  `id_institusi` int(11) NOT NULL,
+  `nama_institusi` varchar(255) NOT NULL,
+  `alamat_institusi` varchar(255) NOT NULL,
+  `email_institusi` varchar(255) NOT NULL,
+  `notelp_institusi` varchar(255) NOT NULL,
+  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `updated_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `ip` varchar(255) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+--
+-- RELATIONS FOR TABLE `institusi`:
+--
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `migrations`
+--
+-- Creation: May 16, 2016 at 12:10 PM
+--
+
+CREATE TABLE IF NOT EXISTS `migrations` (
+  `migration` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `batch` int(11) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+--
+-- RELATIONS FOR TABLE `migrations`:
+--
+
+--
+-- Dumping data for table `migrations`
+--
+
+INSERT INTO `migrations` (`migration`, `batch`) VALUES
+('2014_10_12_000000_create_users_table', 1),
+('2014_10_12_100000_create_password_resets_table', 1),
+('2016_04_04_173639_non_formal', 2);
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `password_resets`
+--
+-- Creation: May 16, 2016 at 12:10 PM
+--
+
+CREATE TABLE IF NOT EXISTS `password_resets` (
+  `email` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `token` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+--
+-- RELATIONS FOR TABLE `password_resets`:
+--
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `pelatihan`
+--
+-- Creation: May 16, 2016 at 04:31 PM
+--
+
+CREATE TABLE IF NOT EXISTS `pelatihan` (
+  `id_jadwal` int(11) NOT NULL,
+  `id_institusi` int(11) NOT NULL,
+  `keahlian` varchar(140) NOT NULL,
+  `durasi_ijazah` int(11) NOT NULL,
+  `tanggal` date NOT NULL,
+  `jam` time NOT NULL,
+  `tempat` varchar(50) NOT NULL,
+  `kapasitas` int(5) NOT NULL,
+  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `updated_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `ip` varchar(255) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+--
+-- RELATIONS FOR TABLE `pelatihan`:
+--   `id_institusi`
+--       `institusi` -> `id_institusi`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `pendaftaran_pelatihan`
+--
+-- Creation: May 16, 2016 at 04:32 PM
+--
+
+CREATE TABLE IF NOT EXISTS `pendaftaran_pelatihan` (
+  `id_pendaftaran` int(11) NOT NULL,
+  `id_jadwal` int(11) NOT NULL,
+  `nip` varchar(20) NOT NULL,
+  `email` varchar(50) NOT NULL,
+  `no_ijazah` varchar(30) NOT NULL,
+  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `updated_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `ip` varchar(255) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+--
+-- RELATIONS FOR TABLE `pendaftaran_pelatihan`:
+--   `id_jadwal`
+--       `pelatihan` -> `id_jadwal`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `pendidikan_formal`
+--
+-- Creation: May 16, 2016 at 04:36 PM
+--
+
+CREATE TABLE IF NOT EXISTS `pendidikan_formal` (
+  `id` int(11) NOT NULL,
+  `nip` varchar(20) NOT NULL,
+  `id_institusi` int(11) NOT NULL,
+  `tingkatan` varchar(20) NOT NULL,
+  `gelar` varchar(10) NOT NULL,
+  `jurusan` varchar(140) NOT NULL,
+  `no_ijazah` varchar(30) NOT NULL,
+  `tahun` year(4) NOT NULL,
+  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `updated_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `ip` varchar(255) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+--
+-- RELATIONS FOR TABLE `pendidikan_formal`:
+--   `id_institusi`
+--       `institusi` -> `id_institusi`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `users`
+--
+-- Creation: May 16, 2016 at 12:10 PM
+--
+
+CREATE TABLE IF NOT EXISTS `users` (
+  `id` int(10) unsigned NOT NULL,
+  `name` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `email` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `password` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `remember_token` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+--
+-- RELATIONS FOR TABLE `users`:
+--
+
+--
+-- Indexes for dumped tables
+--
+
+--
+-- Indexes for table `informals`
+--
+ALTER TABLE `informals`
+  ADD PRIMARY KEY (`id`), ADD KEY `id_institusi` (`id_institusi`);
+
+--
+-- Indexes for table `institusi`
+--
+ALTER TABLE `institusi`
+  ADD PRIMARY KEY (`id_institusi`);
+
+--
+-- Indexes for table `password_resets`
+--
+ALTER TABLE `password_resets`
+  ADD PRIMARY KEY (`email`,`token`), ADD KEY `password_resets_email_index` (`email`), ADD KEY `password_resets_token_index` (`token`);
+
+--
+-- Indexes for table `pelatihan`
+--
+ALTER TABLE `pelatihan`
+  ADD PRIMARY KEY (`id_jadwal`), ADD KEY `id_institusi` (`id_institusi`);
+
+--
+-- Indexes for table `pendaftaran_pelatihan`
+--
+ALTER TABLE `pendaftaran_pelatihan`
+  ADD PRIMARY KEY (`id_pendaftaran`), ADD KEY `id_jadwal` (`id_jadwal`);
+
+--
+-- Indexes for table `pendidikan_formal`
+--
+ALTER TABLE `pendidikan_formal`
+  ADD PRIMARY KEY (`id`), ADD KEY `id_institusi` (`id_institusi`);
+
+--
+-- Indexes for table `users`
+--
+ALTER TABLE `users`
+  ADD PRIMARY KEY (`id`), ADD UNIQUE KEY `users_email_unique` (`email`);
+
+--
+-- AUTO_INCREMENT for dumped tables
+--
+
+--
+-- AUTO_INCREMENT for table `users`
+--
+ALTER TABLE `users`
+  MODIFY `id` int(10) unsigned NOT NULL AUTO_INCREMENT;
+--
+-- Constraints for dumped tables
+--
+
+--
+-- Constraints for table `informals`
+--
+ALTER TABLE `informals`
+ADD CONSTRAINT `informals_ibfk_1` FOREIGN KEY (`id_institusi`) REFERENCES `institusi` (`id_institusi`);
+
+--
+-- Constraints for table `pelatihan`
+--
+ALTER TABLE `pelatihan`
+ADD CONSTRAINT `pelatihan_ibfk_1` FOREIGN KEY (`id_institusi`) REFERENCES `institusi` (`id_institusi`);
+
+--
+-- Constraints for table `pendaftaran_pelatihan`
+--
+ALTER TABLE `pendaftaran_pelatihan`
+ADD CONSTRAINT `pendaftaran_pelatihan_ibfk_1` FOREIGN KEY (`id_jadwal`) REFERENCES `pelatihan` (`id_jadwal`);
+
+--
+-- Constraints for table `pendidikan_formal`
+--
+ALTER TABLE `pendidikan_formal`
+ADD CONSTRAINT `pendidikan_formal_ibfk_1` FOREIGN KEY (`id_institusi`) REFERENCES `institusi` (`id_institusi`);
+
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/ppl2/app/Http/Controllers/InstitusiController.php b/ppl2/app/Http/Controllers/InstitusiController.php
index d405867df7189fb29ee4eecd0d855e778bbe9b99..618136a3f81b21b3472324a82a39d4a612ed92b8 100644
--- a/ppl2/app/Http/Controllers/InstitusiController.php
+++ b/ppl2/app/Http/Controllers/InstitusiController.php
@@ -90,7 +90,7 @@ class InstitusiController extends Controller
     {
         //
         $institusi = Institusi::where('institusi_id',$id)->get();
-        return view('institusi',compact('institusi','institusi_id'));;
+        return view('institusi',compact('institusi','institusi_id'));
     }
 
     /**
@@ -117,7 +117,6 @@ class InstitusiController extends Controller
         //
         $institusi = Institusi::find($id);
 
-        $institusi->institusi_id = $request->input('institusi_id');
         $institusi->nama_institusi = $request->input('nama_institusi');
         $institusi->alamat_institusi = $request->input('alamat_institusi');
         $institusi->email_institusi = $request->input('email_institusi');
diff --git a/ppl2/app/Http/Controllers/PendFormalApi.php b/ppl2/app/Http/Controllers/PendFormalApi.php
new file mode 100644
index 0000000000000000000000000000000000000000..77044ef0f83b460970262b4def4f336c78758861
--- /dev/null
+++ b/ppl2/app/Http/Controllers/PendFormalApi.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+use App\Http\Requests;
+
+use App\PendidikanFormal;
+
+use Response;
+
+class PendFormalApi extends Controller
+{
+        public function getAll() {
+        $pend = PendidikanFormal::all()->sortby('nip');
+       $arr = array();
+       foreach ($pend as $key => $value) {
+          array_push($arr, $value);
+       }
+       return Response::json(['pendidikan_formal' => $arr]); 	
+    }
+
+    public function getPendidikan($nip) {
+    	$pend = PendidikanFormal::where('nip',$nip)->get()->sortby('tahun');
+        foreach ($pend as $key => $value) {
+          array_push($arr, $value);
+       }
+       return Response::json(['pendidikan_formal' => $arr]); 
+    }
+
+    public function store(Request $request) {
+        $formal = new PendidikanFormal;
+
+        $formal->nip = $request->input('nip');
+        $formal->nama_institusi = $request->input('nama_institusi');
+        $formal->tingkatan = $request->input('tingkatan');
+        $formal->gelar = $request->input('gelar');
+        $formal->jurusan = $request->input('jurusan');
+        $formal->no_ijazah = $request->input('no_ijazah');
+        $formal->tahun = $request->input('tahun');
+        $formal->save();
+
+        return response()->json(['status' => 'ok']);
+
+    }
+
+    public function update(Request $request, $id) {
+
+        $formal = PendidikanFormal::find($id);
+        
+        $formal->nip = $request->input('nip');
+        $formal->nama_institusi = $request->input('nama_institusi');
+        $formal->tingkatan = $request->input('tingkatan');
+        $formal->gelar = $request->input('gelar');
+        $formal->jurusan = $request->input('jurusan');
+        $formal->no_ijazah = $request->input('no_ijazah');
+        $formal->tahun = $request->input('tahun');
+        $formal->save();
+
+        return response()->json(['status' => 'ok']);
+    }
+
+    public function delete($id) {
+        $formal = PendidikanFormal::find($id);
+        $formal->delete();
+        return response()->json(['status' => 'ok']);
+    }
+
+    public function search(Request $request) {
+        $res = $request->input('query');
+        
+    }
+}
diff --git a/ppl2/app/Http/Controllers/PenjadwalanController.php b/ppl2/app/Http/Controllers/PenjadwalanController.php
new file mode 100644
index 0000000000000000000000000000000000000000..198eb677fc63adb9d964a616aaec3d71f96c8c94
--- /dev/null
+++ b/ppl2/app/Http/Controllers/PenjadwalanController.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Http\Requests;
+use App\Penjadwalan;
+use View;
+use Validator;
+use Illuminate\Support\Facades\Input;
+use Redirect;
+use Session;
+
+class PenjadwalanController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return Response
+     */
+    public function index()
+    {
+        // get penjadwalan from database
+        $penjadwalan = Penjadwalan::all();
+
+        return view('penjadwalan', ['week' => strtotime("next monday -1 week"), 'penjadwalan' => $penjadwalan ]);
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @return Response
+     */
+    public function store()
+    {
+        //
+        $rules = array(
+            'judul'         => 'required',
+            'nama'          => 'required',
+            'ruangan'       => 'required'
+        );
+        $validator = Validator::make(Input::all(), $rules);
+
+        // process the login
+        if ($validator->fails()) {
+            return Redirect::to('penjadwalan')
+                ->withErrors($validator)
+                ->withInput(Input::all());
+        } else {
+            // store
+            $penjadwalan = new Penjadwalan;
+            $penjadwalan->judul_kegiatan        = Input::get('judul');
+            $penjadwalan->nama_penyelenggara    = Input::get('nama');
+            $penjadwalan->ruangan               = Input::get('ruangan');
+            $penjadwalan->waktu                 = Input::get('waktu');
+            $penjadwalan->save();
+
+            // redirect
+            Session::flash('message', 'Successfully created penjadwalan!');
+            return Redirect::to('penjadwalan');
+        }
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  int  $id
+     * @return Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+        $penjadwalan = Penjadwalan::find($id);
+
+        $penjadwalan->judul_kegiatan = $request->input('judul');
+        $penjadwalan->nama_penyelenggara = $request->input('nama');
+        $penjadwalan->ruangan = $request->input('ruangan');
+        $penjadwalan->waktu = $request->input('waktu');
+        $penjadwalan->save();
+
+        Session::flash('message', 'Penjadwalan successfully updated');
+        return Redirect::to('penjadwalan');
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return Response
+     */
+    public function destroy($id)
+    {
+        //
+        $penjadwalan = Institusi::find($id);
+        $penjadwalan->delete();
+        Session::flash('message', 'Penjadwalan berhasil dihapus');
+        return Redirect::to('penjadwalan');
+    }
+
+    public function next($week) {
+        $penjadwalan = Penjadwalan::all();
+        $week = strtotime("+1 week", $week);
+        return view('penjadwalan', ['week' => $week, 'penjadwalan' => $penjadwalan ]);
+    }
+
+    public function prev($week) {
+        $penjadwalan = Penjadwalan::all();
+        $week = strtotime("-1 week", $week);
+        return view('penjadwalan', ['week' => $week, 'penjadwalan' => $penjadwalan ]);
+    }
+}
diff --git a/ppl2/app/Http/routes.php b/ppl2/app/Http/routes.php
index 750fb8ae772e1ebb4ad7bf59a7260f8afda04a63..b040253db4a4212a44068b29329f93b4f2e2d0e0 100644
--- a/ppl2/app/Http/routes.php
+++ b/ppl2/app/Http/routes.php
@@ -26,6 +26,21 @@ Route::get('pendidikan-formal/new', function() {
 	return view('pages.formPendidikan');
 });
 
+//API pendidikan formal
+Route::get('api/pendidikan-formal/delete/{id}', 'PendFormalApi@delete');
+
+Route::post('api/pendidikan-formal/{id}/update', 'PendFormalApi@update');
+
+Route::get('api/pendidikan-formal/all/{nip}','PendFormalApi@getPendidikan');
+
+Route::post('api/pendidikan-formal/add', 'PendFormalApi@store');
+
+Route::get('api/pendidikan-formal', 'PendFormalApi@getAll');
+
+Route::get('api/pendidikan-formal/search', 'PendFormalApi@search');
+
+//Router untuk pendidikan formal
+
 Route::get('pendidikan-formal/delete/{id}', 'PendFormalController@delete');
 
 Route::post('pendidikan-formal/{id}/update', 'PendFormalController@update');
@@ -72,6 +87,8 @@ Route::get('daftarinstitusi', 'InstitusiController@index');
 
 Route::post('InstitusiController/add', 'InstitusiController@store');
 
+Route::post('daftarinstitusi/{id}/update','InstitusiController@update');
+
 Route::get('daftarinstitusi/{id}/edit','InstitusiController@edit');
 
 Route::get('daftarinstitusi/{id}/delete','InstitusiController@destroy');
@@ -82,9 +99,15 @@ Route::get('daftarinstitusi/search','InstitusiController@search');
 
 Route::resource('InstitusiController', 'InstitusiController');
 
-Route::get('/penjadwalan', function () {
-    return view('penjadwalan');
-});
+Route::get('/penjadwalan', 'PenjadwalanController@index');
+
+Route::get('/penjadwalan/prev/{week}', 'PenjadwalanController@prev');
+
+Route::get('/penjadwalan/next/{week}', 'PenjadwalanController@next');
+
+Route::post('/penjadwalan/add', 'PenjadwalanController@store');
+
+Route::post('/penjadwalan/{id}/update','PenjadwalanController@update');
 
 Route::get('/statistik','PendFormalController@getAllStatistik');
 
diff --git a/ppl2/app/Penjadwalan.php b/ppl2/app/Penjadwalan.php
new file mode 100644
index 0000000000000000000000000000000000000000..f3ff906b019e552fd80037fc4e43cf55ce403dc4
--- /dev/null
+++ b/ppl2/app/Penjadwalan.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Penjadwalan extends Model
+{
+    //
+    protected $table = 'penjadwalan';
+    protected $primaryKey = 'kegiatan_id';
+    public $timestamps = false; //tidak ada create_at dan update_at
+    protected $connection = 'mysql';
+}
diff --git a/ppl2/resources/views/formInstitusi.blade.php b/ppl2/resources/views/formInstitusi.blade.php
index 9685a56b079ed0ee463e98aa174dc96be486897d..f41880c49a7f24b3f1225ceb913720736737f086 100644
--- a/ppl2/resources/views/formInstitusi.blade.php
+++ b/ppl2/resources/views/formInstitusi.blade.php
@@ -24,7 +24,7 @@
 <div class="panel panel-default">
   <div class="panel-heading font-bold">Form Institusi</div>
   <div class="panel-body">
-    <form class="bs-example form-horizontal" method="POST" action="{{ URL::to('InstitusiController') }}">
+    <form class="bs-example form-horizontal" method="POST" action="{{ URL::to('InstitusiController/add') }}">
     
       <div class="form-group">
         <label class="col-lg-2 control-label">Nama</label>
diff --git a/ppl2/resources/views/penjadwalan.blade.php b/ppl2/resources/views/penjadwalan.blade.php
index 39ceb249556c3b15ad36ee90aecd04278789f684..ec3ddc6a072e573be23004290d08f40e75934872 100644
--- a/ppl2/resources/views/penjadwalan.blade.php
+++ b/ppl2/resources/views/penjadwalan.blade.php
@@ -19,12 +19,22 @@
 @stop
 
 @section('content')
+<?php
+  $dates = array(strtotime("monday", $week), strtotime("tuesday", $week), strtotime("wednesday", $week), strtotime("thursday", $week), strtotime("friday", $week), strtotime("saturday", $week), strtotime("sunday", $week));
+  $senin =  date("d/m", $dates[0]);
+  $selasa = date("d/m", $dates[1]);
+  $rabu = date("d/m", $dates[2]);
+  $kamis = date("d/m", $dates[3]);
+  $jumat = date("d/m", $dates[4]);
+  $sabtu = date("d/m", $dates[5]);
+  $minggu = date("d/m", $dates[6]);
+?>
 <div class="panel panel-default">
   <div class="panel-heading font-semibold">
       <div style="display: inline-block;">Penjadwalan</div>
       <div style="display: inline-block; width: 93%; text-align: right;">
-        <button class="btn btn-default">Prev</button>
-        <button class="btn btn-default">Next</button>
+        <a class="btn btn-default" href="{{URL::to('/')}}/penjadwalan/prev/{{$week}}">Prev</a>
+        <a class="btn btn-default" href="{{URL::to('/')}}/penjadwalan/next/{{$week}}">Next</a>
       </div>
   </div>
   <div>
@@ -32,168 +42,64 @@
       <thead>
         <tr>
           <th data-breakpoints="xs">Waktu</th>
-          <th>Senin, 17/4</th>
-          <th>Selasa, 18/4</th>
-          <th>Rabu, 19/4</th>
-          <th>Kamis, 20/4</th>
-          <th>Jumat, 21/4</th>
-          <th>Sabtu, 22/4</th>
-          <th>Minggu, 23/4</th>
+          <th>Senin, {{ $senin }}</th>
+          <th>Selasa, {{ $selasa }}</th>
+          <th>Rabu, {{ $rabu }}</th>
+          <th>Kamis, {{ $kamis }}</th>
+          <th>Jumat, {{ $jumat }}</th>
+          <th>Sabtu, {{ $sabtu }}</th>
+          <th>Minggu, {{ $minggu }}</th>
         </tr>
       </thead>
       <tbody>
         <tr data-expanded="true">
-          <td>07.00</td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
+          <td>07.00</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
         </tr>
         <tr data-expanded="true">
-          <td>08.00</td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
+          <td>08.00</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
         </tr>
         <tr data-expanded="true">
-          <td>09.00</td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
+          <td>09.00</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
         </tr>
         <tr data-expanded="true">
-          <td>10.00</td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
+          <td>10.00</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
         </tr>
         <tr data-expanded="true">
-          <td>11.00</td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
+          <td>11.00</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
         </tr>
         <tr data-expanded="true">
-          <td>12.00</td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
+          <td>12.00</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
         </tr>
         <tr data-expanded="true">
-          <td>13.00</td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
+          <td>13.00</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
         </tr>
         <tr data-expanded="true">
-          <td>14.00</td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
+          <td>14.00</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
         </tr>
         <tr data-expanded="true">
-          <td>15.00</td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
+          <td>15.00</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
         </tr>
         <tr data-expanded="true">
-          <td>16.00</td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
+          <td>16.00</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
         </tr>
         <tr data-expanded="true">
-          <td>17.00</td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
+          <td>17.00</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
         </tr>
         <tr data-expanded="true">
-          <td>18.00</td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
+          <td>18.00</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
         </tr>
         <tr data-expanded="true">
-          <td>19.00</td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
+          <td>19.00</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
         </tr>
         <tr data-expanded="true">
-          <td>20.00</td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
+          <td>20.00</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
         </tr>
         <tr data-expanded="true">
-          <td>21.00</td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
+          <td>21.00</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
         </tr>
       </tbody>
     </table>
+
   </div>
 
   <!-- Modal -->
@@ -202,29 +108,73 @@
     
       <!-- Modal content-->
       <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal">&times;</button>
-          <h4 class="modal-title">Input Jadwal</h4>
-        </div>
-        <div class="modal-body">
-          <form class="form-group" method = "POST" action = "{{URL::to('daftarinstitusi')}}" >
-            <label for="judul">Judul kegiatan</label>
-            <input type="text" class="form-control" id="judul">
-            <label for="nama">Nama penyelenggara</label>
-            <input type="text" class="form-control" id="nama">
-            <label for="ruangan">Ruangan</label>
-            <select class="form-control" id="ruangan">
-              <option>Ruangan 1</option>
-              <option>Ruangan 2</option>
-            </select>
-
-          
-        </div>
-        <div class="modal-footer">
-          <button type="submit" class="btn btn-primary">Submit</button> 
-          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        <form method="POST" action="{{URL::to('penjadwalan/add')}}">
+          <input type="hidden" name="waktu" id="waktu" >
+          <input type="hidden" name="_token" value="{{ csrf_token() }}">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal">&times;</button>
+            <h4 class="modal-title">Input Jadwal</h4>
+          </div>
+          <div class="modal-body">
+            
+              <div class="form-group">
+                <label for="judul">Judul kegiatan</label>
+                <input type="text" class="form-control" id="judul" name="judul">
+              </div><div class="form-group">
+                <label for="nama">Nama penyelenggara</label>
+                <input type="text" class="form-control" id="nama" name="nama">
+              </div><div class="form-group">
+                <label for="ruangan">Ruangan</label>
+                <select class="form-control" id="ruangan" name="ruangan">
+                  <option value=1>Ruangan 1</option>
+                  <option value=2>Ruangan 2</option>
+                </select>
+              </div>
+            
+          </div>
+          <div class="modal-footer">
+            <input type="submit" class="btn btn-primary" value="Submit"> 
+            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+          </div>
+        </form>
+      </div>
+      
+    </div>
+  </div>
 
-        </div>
+  <div class="modal fade" id="editModal" role="dialog">
+    <div class="modal-dialog">
+    
+      <!-- Modal content-->
+      <div class="modal-content">
+        <form method="POST" id="editForm">
+          <input type="hidden" name="waktu" id="waktuEdit" >
+          <input type="hidden" name="_token" value="{{ csrf_token() }}">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal">&times;</button>
+            <h4 class="modal-title">Edit Jadwal</h4>
+          </div>
+          <div class="modal-body">
+            
+              <div class="form-group">
+                <label for="judul">Judul kegiatan</label>
+                <input type="text" class="form-control" id="judulEdit" name="judul">
+              </div><div class="form-group">
+                <label for="nama">Nama penyelenggara</label>
+                <input type="text" class="form-control" id="namaEdit" name="nama">
+              </div><div class="form-group">
+                <label for="ruangan">Ruangan</label>
+                <select class="form-control" id="ruanganEdit" name="ruangan">
+                  <option value=1>Ruangan 1</option>
+                  <option value=2>Ruangan 2</option>
+                </select>
+              </div>
+            
+          </div>
+          <div class="modal-footer">
+            <input type="submit" class="btn btn-primary" value="Submit"> 
+            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+          </div>
         </form>
       </div>
       
@@ -234,9 +184,57 @@
 
 @section('js')
     <script>
+    var arrayPenjadwalan = [];
+
     $(function(){
+      @foreach($penjadwalan as $key => $value)
+        @if (strtotime($value->waktu) >= $dates[0] && strtotime($value->waktu) < strtotime("+1 day", $dates[6]))
+          console.log("{{$value->waktu}}");
+          var waktu = new Date({{strtotime($value->waktu)}}*1000);
+          console.log("waktu = " + waktu);
+
+          var rowNum = waktu.getHours()-13;
+          var colNum = waktu.getDate()-{{date("d", $dates[0])}}+1;
+          console.log("COL ROW : " + colNum + " " + rowNum);
+          $('#penjadwalan').find('tr:eq('+rowNum+')'+' td:eq('+colNum+')').html( "{{$value->judul_kegiatan}}" );
+          arrayPenjadwalan.push({ id: '{{$value->kegiatan_id}}', judul:'{{$value->judul_kegiatan}}', nama: '{{$value->nama_penyelenggara}}', ruangan: {{$value->ruangan}}, waktu: '{{$value->waktu}}', row: rowNum, col: colNum });
+        @endif
+      @endforeach
+      
+
       $('#penjadwalan td').click(function () {
-        $('#myModal').modal('show');
+        var col = $(this).parent().children().index($(this));
+        var row = $(this).parent().parent().children().index($(this).parent());
+        var dates = [ {{$dates[0]}}, {{$dates[1]}}, {{$dates[2]}}, {{$dates[3]}}, {{$dates[4]}}, {{$dates[5]}}, {{$dates[6]}} ];
+        var hari = new Date(dates[col-1] * 1000);
+        var bulan = hari.getMonth() + 1;
+        var jam = row+7;
+        var waktu = hari.getFullYear() + '-' + bulan + '-' + hari.getDate() + ' ' + jam + ':00';
+        $('#waktu').val( waktu );
+        console.log(waktu);
+        if ($(this).is(':empty'))
+          $('#myModal').modal('show');
+        else {
+          var i = 0;
+          var found = 0;
+          console.log(arrayPenjadwalan[0]);
+          while (i<arrayPenjadwalan.length && found == 0) {
+            console.log(row);
+            console.log(arrayPenjadwalan[i].row);
+            console.log(col);
+            console.log(arrayPenjadwalan[i].col);
+            if (row == arrayPenjadwalan[i].row-1 && col == arrayPenjadwalan[i].col)
+              found = 1;
+            else
+              i++;
+          }
+          $('#judulEdit').val(arrayPenjadwalan[i].judul);
+          $('#namaEdit').val(arrayPenjadwalan[i].nama);
+          $('#ruanganEdit').val(arrayPenjadwalan[i].ruangan);
+          $('#waktuEdit').val( waktu );
+          $('#editForm').attr('action', '{{URL::to("penjadwalan")}}'+ '/' + arrayPenjadwalan[i].id + '/update');
+          $('#editModal').modal('show');
+        }
       });
     });
   </script>
diff --git a/ppl2/resources/views/penjadwalan.php b/ppl2/resources/views/penjadwalan.php
deleted file mode 100644
index f2cc187d699edc6b85088df2a1c665fc2efc20c5..0000000000000000000000000000000000000000
--- a/ppl2/resources/views/penjadwalan.php
+++ /dev/null
@@ -1,107 +0,0 @@
-@extends('app_template')
-
-@section('title')
-  Penjadwalan
-@stop
-
-@section('page_title')
-  <h2>Penjadwalan</h2>
-@stop
-
-
-<!-- content -->
-@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('/')}}/formInstitusi';"><i class="m-r-xs fa fa-plus"></i>Tambahkan Institusi</button>
-    </div>
-    <div class="col-md-6">
-      <form action = "{{URL::to('/')}}/daftarinstitusi/search" method="GET">
-      <div class="input-group">
-        <input type="text" class="form-control" placeholder="Cari Institusi" 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">
-      Penjadwalan
-  </div>
-  <div>
-    <table class="table" ui-jq="footable" ui-options='{
-      "paging": {
-        "enabled": true
-      }}'>
-      <thead>
-        <tr>
-          <th>Minggu ke-</th>
-          <th>Senin</th>
-          <th>Selasa</th>
-          <th>Rabu</th>
-          <th>Kamis</th>
-          <th>Jumat</th>
-          <th>Sabtu</th>
-          <th>Minggu</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr data-expanded="true">
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-        </tr>
-        <tr data-expanded="true">
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-        </tr>
-        <tr data-expanded="true">
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-        </tr>
-        <tr data-expanded="true">
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-        </tr>
-        <tr data-expanded="true">
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-          <td></td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
-@stop
\ No newline at end of file