diff --git a/app/Http/Controllers/TpsController.php b/app/Http/Controllers/TpsController.php
index be791416c61d7e20fd4a600d795e7d36d8ff8e42..b0eff5f7bcc8414f418a856acccf28a77fc6feea 100644
--- a/app/Http/Controllers/TpsController.php
+++ b/app/Http/Controllers/TpsController.php
@@ -50,7 +50,7 @@ class TpsController extends Controller
foreach ($all as $tps) {
$tmp = [];
$tmp = $tps;
- $tmp->name = $tps->manager()->get(['name'])[0]->name;
+ $tmp->managerName = $tps->manager()->get(['name'])[0]->name;
array_push($arr,$tmp);
}
return view('menu.tps',['data' => $arr]);
@@ -61,9 +61,12 @@ class TpsController extends Controller
$tps = new Tps;
$tps->capacity_now = Input::get('capacity_now',0);
$tps->capacity_full = Input::get('capacity_full',0);
+ $tps->nama = Input::get('name','');
+ $tps->is_full = Input::get('is_full',0);
$tps->id_manager = Input::get('idPengelola',0);
$tps->id = 0;
$tps->save();
+ //$tps = Tps::create(Input::all());
return redirect('/tps');
}
@@ -90,6 +93,8 @@ class TpsController extends Controller
$tps = Tps::find($id);
$tps->capacity_now = Input::get('capacity_now',0);
$tps->capacity_full = Input::get('capacity_full',0);
+ $tps->nama = Input::get('name','');
+ $tps->is_full = Input::get('is_full',0);
$tps->id_manager = Input::get('idPengelola',0);
$tps->save();
return redirect('/tps');
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index e6385696c915744723a79c34d751de85b18d8f71..5b0ecdcc5cdd95c1c0d4cd7d526dc2d15ef6c8c0 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -76,14 +76,17 @@ class UserController extends Controller
public function update($id)
{
$user = User::find($id);
- $user->update($input);
+ $user->update([
+ 'name' => Input::get('name'),
+ 'email' => Input::get('email'),
+ 'password' => bcrypt(Input::get('password')),
+ ]);
return redirect('/user');
}
public function destroy($id)
{
User::find($id)->delete();
-
return redirect('/user');
}
}
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index a7d0ebb44843586aa143ca7fb6f12cb924f4500e..b76b3d5a220e8406aa7b0276cb30853cdba8aea8 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -54,38 +54,6 @@
<li>
<a href="{{ url('/') }}">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 -->
diff --git a/resources/views/menu/editTps.blade.php b/resources/views/menu/editTps.blade.php
index 3312e07e260f89e56d6540520ef845be1f1ee72e..79b6e3ce9b2aed124f55e9b77903c6f96a574513 100644
--- a/resources/views/menu/editTps.blade.php
+++ b/resources/views/menu/editTps.blade.php
@@ -25,16 +25,17 @@
<form class="col-md-12" action="<?php echo URL::to('/tps');?>/<?=$data->id?>" method="POST">
{!! csrf_field() !!}
<input type="hidden" name="_method" value="put" />
- <div class="form-group">
- <label class="col-sm-2 control-label">Lokasi</label>
+ <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 TPS</label>
<div class="col-sm-10">
- <select ui-jq="chosen" class="w-full">
- <optgroup label="Bandung Barat">
- <option value="AK">Alaska</option>
- <option value="HI">Hawaii</option>
- </optgroup>
- </select>
- </div>
+ <input type="text" placeholder="Nama TPS" class="form-control" name="name" required value="<?php echo $data->nama; ?>">
+ @if ($errors->has('name'))
+ <span class="help-block">
+ <strong>{{ $errors->first('name') }}</strong>
+ </span>
+ @endif
+ </div>
</div>
<div class="line line-dashed b-b line-lg pull-in"></div>
<div class="form-group">
@@ -74,6 +75,26 @@
document.getElementById("capacity_full").value;
}
</script>
+
+ <div class="line line-dashed b-b line-lg pull-in"></div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">Penuh</label>
+ <div class="col-sm-10">
+ <label class="i-switch bg-primary m-t-xs m-r">
+ <input type="radio" name='is_full' value='1'
+ <?php if($data->is_full==1){echo "checked";}?>
+
+ >
+ <i>Yes</i>
+ </label>
+ <label class="i-switch bg-warning m-t-xs m-r">
+ <input type="radio" name='is_full' value='0' >
+ <?php if($data->is_full==0){echo "checked";}?>
+ <i>No</i>
+ </label>
+ </div>
+ </div>
+
<div class="line line-dashed b-b line-lg pull-in"></div>
<div class="form-group">
<label class="col-sm-2 control-label">Nama Pengelola</label>
diff --git a/resources/views/menu/editUser.blade.php b/resources/views/menu/editUser.blade.php
index 9786f55a093f42cd9fffc3700a70e37abdcfce06..9a3f897ae0f171537c530046d20a4b0a461994c7 100644
--- a/resources/views/menu/editUser.blade.php
+++ b/resources/views/menu/editUser.blade.php
@@ -22,13 +22,15 @@
Form user
</div>
<div class="panel-body">
- <form class="form-horizontal" method="POST" action="{{ url('/user') }}">
+ <form class="col-md-12" 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>
<div class="col-sm-10">
- <input type="text" placeholder="Nama" class="form-control" name="name" required value="{{ old('name') }}">
+ <input type="text" placeholder="Nama" class="form-control" name="name" required value="<?php echo $data->name; ?>">
@if ($errors->has('name'))
<span class="help-block">
<strong>{{ $errors->first('name') }}</strong>
@@ -36,10 +38,12 @@
@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">
- <input type="email" placeholder="Email" class="form-control" required name="email" value="{{ old('email') }}">
+ <input type="email" placeholder="Email" class="form-control" required name="email" value="<?php echo $data->email; ?>">
@if ($errors->has('email'))
<span class="help-block">
<strong>{{ $errors->first('email') }}</strong>
diff --git a/resources/views/menu/insertSchedule.blade.php b/resources/views/menu/insertSchedule.blade.php
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..32bd66d98885b71d3f6a05320281f5dff47ca396 100644
--- a/resources/views/menu/insertSchedule.blade.php
+++ b/resources/views/menu/insertSchedule.blade.php
@@ -0,0 +1,71 @@
+@extends('layouts.app')
+
+@section('content')
+
+ <div class="hbox hbox-auto-xs hbox-auto-sm ng-scope">
+ <div class="col">
+
+<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="{{ url('/') }}">Home</a></li>
+ <li><i class="fa fa-angle-right"></i><a href="{{ url('/schedule') }}">schedule</a></li>
+ <li class="active"><i class="fa fa-angle-right"></i>Insert schedule</li>
+ </ul>
+ </div>
+<div class="wrapper-lg bg-light" ng-controller="FormDemoCtrl">
+ <div class="panel panel-default">
+ <div class="panel-heading font-bold">
+ Form schedule
+ </div>
+ <div class="panel-body">
+ <form class="form-horizontal" method="POST" action="{{ url('/schedule') }}">
+ {!! csrf_field() !!}
+
+ <div class="line line-dashed b-b line-lg pull-in"></div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">Penuh</label>
+ <div class="col-sm-10">
+ <label class="i-switch bg-primary m-t-xs m-r">
+ <input type="radio" name='is_full' value='1' >
+ <i>Yes</i>
+ </label>
+ <label class="i-switch bg-warning m-t-xs m-r">
+ <input type="radio" name='is_full' value='0' checked >
+ <i>No</i>
+ </label>
+ </div>
+ </div>
+
+ <div class="line line-dashed b-b line-lg pull-in"></div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">Nama Pengelola</label>
+ <div class="col-sm-10">
+ <select name="idPengelola" ui-jq="chosen" class="w-full">
+ <optgroup label="Nama Pengelola">
+ @foreach ($dataManager as $Manager)
+ <option value=<?php echo $Manager->id;?>><?php echo $Manager->name;?></option>
+ @endforeach
+ </optgroup>
+ </select>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <div class="col-sm-4 col-sm-offset-2">
+ <a href="{{ url('/schedule') }}"><button type="button" class="btn btn-default m-r-sm">Cancel</button></a>
+ <button type="submit" class="btn btn-info">Create</button>
+ </div>
+ </div>
+
+ </form>
+ </div>
+ </div>
+</div>
+</div>
+</div>
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/menu/insertTps.blade.php b/resources/views/menu/insertTps.blade.php
index 858becddf9c5d27705d10e0c982d7eb3df8431db..4fd0badb1eb4305ce6b8ae605b4e39447b588fd9 100644
--- a/resources/views/menu/insertTps.blade.php
+++ b/resources/views/menu/insertTps.blade.php
@@ -24,22 +24,23 @@
<div class="panel-body">
<form class="form-horizontal" method="POST" action="{{ url('/tps') }}">
{!! csrf_field() !!}
- <div class="form-group">
- <label class="col-sm-2 control-label">Lokasi</label>
+ <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 TPS</label>
<div class="col-sm-10">
- <select ui-jq="chosen" class="w-full">
- <optgroup label="Bandung Barat">
- <option value="AK">Alaska</option>
- <option value="HI">Hawaii</option>
- </optgroup>
- </select>
- </div>
+ <input type="text" placeholder="Nama TPS" class="form-control" name="name" required value="{{ old('name') }}">
+ @if ($errors->has('name'))
+ <span class="help-block">
+ <strong>{{ $errors->first('name') }}</strong>
+ </span>
+ @endif
+ </div>
</div>
<div class="line line-dashed b-b line-lg pull-in"></div>
<div class="form-group">
<label class="col-sm-2 control-label">Kapasitas Sekarang</label>
<div class="col-sm-10">
- <input id="slider" name="capacity_now" ui-jq="slider" ui-options="{
+ <input id="slider" name="capacity_now" value="50" ui-jq="slider" ui-options="{
min: 0,
max: 500,
step: 1,
@@ -51,7 +52,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">Kapasitas Penuh</label>
<div class="col-sm-10">
- <input id="slider" name="capacity_full" ui-jq="slider" ui-options="{
+ <input id="slider" name="capacity_full" value="50" ui-jq="slider" ui-options="{
min: 0,
max: 500,
step: 1,
@@ -60,6 +61,21 @@
</div>
</div>
+ <div class="line line-dashed b-b line-lg pull-in"></div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">Penuh</label>
+ <div class="col-sm-10">
+ <label class="i-switch bg-primary m-t-xs m-r">
+ <input type="radio" name='is_full' value='1' >
+ <i>Yes</i>
+ </label>
+ <label class="i-switch bg-warning m-t-xs m-r">
+ <input type="radio" name='is_full' value='0' checked >
+ <i>No</i>
+ </label>
+ </div>
+ </div>
+
<div class="line line-dashed b-b line-lg pull-in"></div>
<div class="form-group">
<label class="col-sm-2 control-label">Nama Pengelola</label>
@@ -74,7 +90,6 @@
</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">
<a href="{{ url('/tps') }}"><button type="button" class="btn btn-default m-r-sm">Cancel</button></a>
diff --git a/resources/views/menu/tps.blade.php b/resources/views/menu/tps.blade.php
index fe3d9c811100343ceed64fc9c4152b20266a5c5b..302d4eec9f3faa54145895bb3b6d4c44d407024e 100644
--- a/resources/views/menu/tps.blade.php
+++ b/resources/views/menu/tps.blade.php
@@ -63,10 +63,11 @@
<!-- <input type="checkbox"><i></i> -->
</label>
</th>
+ <th>Nama</th>
<th>Kapasitas saat ini</th>
<th>Kapasitas penuh</th>
<th>Manager</th>
- <th style="width:30px;"></th>
+ <th>Tidak penuh</th>
</tr>
</thead>
<tbody>
@@ -76,11 +77,15 @@
@foreach ($data as $tps)
<tr>
<td><label class="checkbox-inline "><input type="radio" name="id" value="<?=$tps->id?>"><i></i></label></td>
+ <td><?php echo $tps->nama;?></td>
<td><?php echo $tps->capacity_now;?></td>
<td><?php echo $tps->capacity_full;?></td>
- <td><?php echo $tps->name;?></td>
+ <td><?php echo $tps->managerName;?></td>
<td>
+ <?php if($tps->is_full==0){?>
<a href class="active" ui-toggle-class><i class="fa fa-check text-success text-active"></i><i class="fa fa-times text-danger text"></i></a>
+ <?php }else{?>
+ <a href ui-toggle-class><i class="fa fa-check text-success text-active"></i><i class="fa fa-times text-danger text"></i></a><?php }?>
</td>
</tr>
@endforeach