diff --git a/resources/views/menu/schedule.blade.php b/resources/views/menu/schedule.blade.php
index df5648b723e19a5cf6714fd0761d391eebbd8a58..32df5f6119bfa78ea7ab4b48a1d4357b3f99764f 100644
--- a/resources/views/menu/schedule.blade.php
+++ b/resources/views/menu/schedule.blade.php
@@ -1,7 +1,8 @@
 <?php 
 $jumlahSelesai = 0;
-$jumlahBelumSelesai = 0;
+$jumlahBelumSelesai = 0;;
 foreach ($data as $jadwal ) {
+  $time = $jadwal->time;
   if($jadwal->is_done==0){
     $jumlahBelumSelesai+=1;
   }else{
@@ -11,6 +12,20 @@ foreach ($data as $jadwal ) {
 ?>
 @extends('layouts.app')
 @section('content')
+
+<form id="doneForm" method="POST">
+{!! csrf_field() !!}       
+<input type="hidden" name="_method" value="PUT">
+<input type="hidden" name="is_done" value="1">
+</form>
+
+<form id="deleteForm" method="POST">
+{!! csrf_field() !!}       
+<input type="hidden" name="_method" value="DELETE">
+<input type="radio" id="delete_id" name="id">
+</form>
+
+
 <div class="hbox hbox-auto-xs hbox-auto-sm ng-scope">
                 <div class="col">
                   <div class="app-content-body ">
@@ -20,7 +35,7 @@ foreach ($data as $jadwal ) {
                               <i class="icon-bdg_expand1 text"></i>
                               <i class="icon-bdg_expand2 text-active"></i>
                             </a>   </li>
-                            <li><a href="{{ url('/') }}">Home</a></li>               
+                            <li><a href="{{ url('/') }}">Home<?php echo $time;?></a></li>               
                             <li class="active"><i class="fa fa-angle-right"></i>Schedule</li>
                           </ul>
                       </div>
@@ -103,9 +118,6 @@ foreach ($data as $jadwal ) {
                                         </tr>
                                       </thead>
                                       <tbody>
-                                        <form id="deleteForm" method="POST">
-                                        {!! csrf_field() !!}       
-                                        <input type="hidden" name="_method" value="DELETE">
                                         @foreach ($data as $jadwal)
                                         <tr>
                                           <td><label class="checkbox-inline "><input type="radio" name="id" value="<?=$jadwal->id?>"><i></i></label></td>
@@ -122,13 +134,7 @@ foreach ($data as $jadwal ) {
                                           </td>
                                         </tr>
                                         @endforeach
-                                        </form>
 
-                                            <form id="doneForm" method="POST">
-                                            {!! csrf_field() !!}       
-                                            <input type="hidden" name="_method" value="PUT">
-                                            <input type="hidden" name="is_done" value="1">
-                                            </form>
                                       </tbody>
                                     </table>
                                   </div>
@@ -142,6 +148,49 @@ foreach ($data as $jadwal ) {
                                         </select>
                                         <button  onclick="aksi();return false;" class="btn btn-sm btn-default">Apply</button>                  
                                       </div>
+                                      <div class="col-sm-4 text-center">
+                                        <small id="itemsfooter"sclass="text-muted inline m-t-sm m-b-sm">showing 20-30 of 50 items</small>
+                                      </div>
+                                    </div>
+                                  </footer>
+                                </div>
+                              </div>
+                            </div>
+                        </div>
+                  </div>
+                </div>
+            </div>
+<style type="text/css">
+  .dataTables_filter {
+    display: none; 
+  }
+
+  .dataTables_info {
+    display: none; 
+  }
+
+  .dataTables_info {
+    display: none; 
+  }
+  .dataTables_length {
+    margin-left: 30px;
+    }
+
+
+</style>
+<script src="/templatePPL2/libs/datatables/datatables.min.js"></script>
+<script type="text/javascript">
+  var table = $('#jadwal').DataTable();
+  var info = table.page.info();
+  $('#jadwals').on( 'keyup', function () {
+    table.search( this.value ).draw();
+    info = table.page.info();
+    $("#itemsfooter").html('Currently showing page '+(info.page+1)+' of '+info.pages+' pages.');
+  });
+  $("#itemsfooter").html('Currently showing page '+(info.page+1)+' of '+info.pages+' pages.');
+
+</script>
+
                                       <script type="text/javascript">
                                         function aksi(){
                                           var lol = document.getElementById("aksi").value;
@@ -158,15 +207,18 @@ foreach ($data as $jadwal ) {
                                             lol=3;
                                           }
                                           if(lol==0){
-                                            var s = '/templatePPL2/public/schedule/'+id;
-                                            document.getElementById("doneForm").action = s;
+                                            var ss = '/templatePPL2/public/schedule/'+id;
+                                            alert(document.getElementById("doneForm"));
+                                            
+                                            document.getElementById("doneForm").action = ss;
                                             document.getElementById("doneForm").submit();
                                           }
                                           if(lol==1){
                                             var r = confirm("Hapus data ? ");
                                             if (r == true) {
-                                              var s = '/templatePPL2/public/schedule/'+id;
-                                              document.getElementById("deleteForm").action = s;
+                                              var ss = '/templatePPL2/public/schedule/'+id;
+                                              document.getElementById("delete_id").value = id;
+                                              document.getElementById("deleteForm").action = ss;
                                               document.getElementById("deleteForm").submit();
                                             } else {
 
@@ -201,6 +253,7 @@ foreach ($data as $jadwal ) {
                                             var r = confirm("Hapus data ? ");
                                             if (r == true) {
                                               var s = '/templatePPL2/public/schedule/'+id;
+                                              document.getElementById("delete_id").value = id;
                                               document.getElementById("deleteForm").action = s;
                                               document.getElementById("deleteForm").submit();
                                             } else {
@@ -215,46 +268,4 @@ foreach ($data as $jadwal ) {
                                         }
 
                                       </script>
-                                      <div class="col-sm-4 text-center">
-                                        <small id="itemsfooter"sclass="text-muted inline m-t-sm m-b-sm">showing 20-30 of 50 items</small>
-                                      </div>
-                                    </div>
-                                  </footer>
-                                </div>
-                              </div>
-                            </div>
-                        </div>
-                  </div>
-                </div>
-            </div>
-<style type="text/css">
-  .dataTables_filter {
-    display: none; 
-  }
-
-  .dataTables_info {
-    display: none; 
-  }
-
-  .dataTables_info {
-    display: none; 
-  }
-  .dataTables_length {
-    margin-left: 30px;
-    }
-
-
-</style>
-<script src="/templatePPL2/libs/datatables/datatables.min.js"></script>
-<script type="text/javascript">
-  var table = $('#jadwal').DataTable();
-  var info = table.page.info();
-  $('#jadwals').on( 'keyup', function () {
-    table.search( this.value ).draw();
-    info = table.page.info();
-    $("#itemsfooter").html('Currently showing page '+(info.page+1)+' of '+info.pages+' pages.');
-  });
-  $("#itemsfooter").html('Currently showing page '+(info.page+1)+' of '+info.pages+' pages.');
-
-</script>
 @endsection
\ No newline at end of file
diff --git a/resources/views/menu/tps.blade.php b/resources/views/menu/tps.blade.php
index 230de96864d1e0e58ea8b4c3f0e0217f05857a5e..9cc8bfa6ec20edb547283f969f6e04e4cf75c309 100644
--- a/resources/views/menu/tps.blade.php
+++ b/resources/views/menu/tps.blade.php
@@ -15,6 +15,18 @@ foreach ($data as $tps ) {
 {!! csrf_field() !!}
 
   
+<form id="doneForm" method="POST">
+{!! csrf_field() !!}       
+<input type="hidden" name="_method" value="PUT">
+<input type="hidden" name="is_done" value="1">
+</form>
+
+<form id="deleteForm" method="POST">
+{!! csrf_field() !!}       
+<input type="hidden" name="_method" value="DELETE">
+<input type="radio" id="delete_id" name="id">
+</form>
+
 <div class="hbox hbox-auto-xs hbox-auto-sm ng-scope">
                 <div class="col">
                   <div class="app-content-body ">
@@ -127,12 +139,9 @@ foreach ($data as $tps ) {
                                         </tr>
                                       </thead>
                                       <tbody>
-                                        <form id="deleteForm" method="POST">
-                                        {!! csrf_field() !!}       
-                                        <input type="hidden" name="_method" value="DELETE">
                                         @foreach ($data as $tps)
                                         <tr>
-                                          <td><label class="checkbox-inline "><input type="radio" name="id" value="<?=$tps->id?>"><i></i></label></td>
+                                          <td><label class="checkbox-inline "><i></i></label></td>
                                           <td><?php echo $tps->nama;?></td>
                                           <td><?php echo $tps->capacity_now;?></td>
                                           <td><?php echo $tps->capacity_full;?></td>
@@ -159,7 +168,52 @@ foreach ($data as $tps ) {
                                         </select>
                                         <button  onclick="aksi();return false;" class="btn btn-sm btn-default">Apply</button>                  
                                       </div>
-                                      <script type="text/javascript">
+                                      <div class="col-sm-4 text-center">
+                                        <small id="itemsfooter" class="text-muted inline m-t-sm m-b-sm">showing 20-30 of 50 items</small>
+                                      </div>
+                                    </div>
+                                  </footer>
+                                </div>
+                              </div>
+                            </div>
+                        </div>
+                  </div>
+                </div>
+            </div>
+  <!-- JavaScripts
+
+    <script src="/templatePPL2/libs/jquery/jquery/dist/jquery.js"></script> -->
+<style type="text/css">
+  .dataTables_filter {
+    display: none; 
+  }
+
+  .dataTables_info {
+    display: none; 
+  }
+
+  .dataTables_info {
+    display: none; 
+  }
+  .dataTables_length {
+    margin-left: 30px;
+    }
+
+
+</style>
+<script src="/templatePPL2/libs/datatables/datatables.min.js"></script>
+<script type="text/javascript">
+  var table = $('#tps').DataTable();
+  var info = table.page.info();
+  $('#tpss').on( 'keyup', function () {
+    table.search( this.value ).draw();
+    info = table.page.info();
+    $("#itemsfooter").html('Currently showing page '+(info.page+1)+' of '+info.pages+' pages.');
+  });
+  $("#itemsfooter").html('Currently showing page '+(info.page+1)+' of '+info.pages+' pages.');
+
+</script>
+<script type="text/javascript">
                                         function aksi(){
                                           var lol = document.getElementById("aksi").value;
                                           var KumpulanId = document.getElementsByName("id");
@@ -177,8 +231,9 @@ foreach ($data as $tps ) {
                                           if(lol==1){
                                             var r = confirm("Hapus data ? ");
                                             if (r == true) {
-                                              var s = '/templatePPL2/public/tps/'+id;
-                                              document.getElementById("deleteForm").action = s;
+                                              var ss = '/templatePPL2/public/tps/'+id;
+                                              document.getElementById("delete_id").value = id;
+                                              document.getElementById("deleteForm").action = ss;
                                               document.getElementById("deleteForm").submit();
                                             }else{
 
@@ -207,8 +262,9 @@ foreach ($data as $tps ) {
                                           if(lol==1){
                                             var r = confirm("Hapus data ? ");
                                             if (r == true) {
-                                              var s = '/templatePPL2/public/tps/'+id;
-                                              document.getElementById("deleteForm").action = s;
+                                              var ss = '/templatePPL2/public/tps/'+id;
+                                              document.getElementById("delete_id").value = id;
+                                              document.getElementById("deleteForm").action = ss;
                                               document.getElementById("deleteForm").submit();
                                             }else{
 
@@ -220,49 +276,5 @@ foreach ($data as $tps ) {
                                           }
                                         }
                                       </script>
-                                      <div class="col-sm-4 text-center">
-                                        <small id="itemsfooter" class="text-muted inline m-t-sm m-b-sm">showing 20-30 of 50 items</small>
-                                      </div>
-                                    </div>
-                                  </footer>
-                                </div>
-                              </div>
-                            </div>
-                        </div>
-                  </div>
-                </div>
-            </div>
-  <!-- JavaScripts
-
-    <script src="/templatePPL2/libs/jquery/jquery/dist/jquery.js"></script> -->
-<style type="text/css">
-  .dataTables_filter {
-    display: none; 
-  }
-
-  .dataTables_info {
-    display: none; 
-  }
-
-  .dataTables_info {
-    display: none; 
-  }
-  .dataTables_length {
-    margin-left: 30px;
-    }
-
-
-</style>
-<script src="/templatePPL2/libs/datatables/datatables.min.js"></script>
-<script type="text/javascript">
-  var table = $('#tps').DataTable();
-  var info = table.page.info();
-  $('#tpss').on( 'keyup', function () {
-    table.search( this.value ).draw();
-    info = table.page.info();
-    $("#itemsfooter").html('Currently showing page '+(info.page+1)+' of '+info.pages+' pages.');
-  });
-  $("#itemsfooter").html('Currently showing page '+(info.page+1)+' of '+info.pages+' pages.');
-
-</script>
+                                      
 @endsection
\ No newline at end of file