diff --git a/app/Http/Controllers/ScheduleController.php b/app/Http/Controllers/ScheduleController.php index d400d5fd190f0ce79214243af40fa456a2495871..5ed0b1127b3a30587de48290cffd9aee9836e660 100644 --- a/app/Http/Controllers/ScheduleController.php +++ b/app/Http/Controllers/ScheduleController.php @@ -5,8 +5,11 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use App\Schedule; +use App\Tps; +use App\User; +use Mail; use App\Http\Requests; - +use Illuminate\Support\Facades\Input; class ScheduleController extends Controller { protected $user_roles = []; @@ -40,58 +43,111 @@ class ScheduleController extends Controller public function index() { + $arr = []; if ($this->has_role('all_schedule')) { - return view('menu.schedule',['data' => Schedule::all()]); + $all = Schedule::all(); } else { - return view('menu.schedule', ['data' => Schedule::where('id_user', Auth::user()->id)->get()]); + $all = Schedule::where('id_user', Auth::user()->id)->get(); + } + foreach ($all as $jadwal) { + $tmp = []; + $tmp = $jadwal; + // dd($jadwal); + // $tmp->namauser = $jadwal->user()->get()['name']; + $tmp->namauser = User::find($jadwal->id_user)->name; + $tmp->namatps = Tps::find($jadwal->id_tps)->nama; + // $tmp->namatps = $jadwal->tps()->get()['nama']; + array_push($arr,$tmp); } + // dd($arr); + return view('menu.schedule', ['data' => $arr]); } public function store() - { - $sched = Schedule::create(Input::all()); - return $sched; + { + if ($this->has_role('all_schedule')) + { + $sched = new Schedule; + $sched->id_tps = Input::get('id_tps',0); + $sched->id_user = Input::get('id_user',0); + $sched->time = Input::get('time',''); + $sched->amount = Input::get('amount',1); + $sched->is_done = Input::get('is_done', 0); + $sched->id = 0; + $sched->save(); + } + return redirect('/schedule'); } public function create() { - // view create doang + if ($this->has_role('all_schedule')) + { + return view('menu.insertSchedule', ['dataTPS' => Tps::all(['id', 'nama']),'dataManager' => User::all(['id', 'name'])]); + }else{ + return redirect('/schedule'); + } } public function show($id) { // viewnya pake get - return Schedule::find($id); + if ($this->has_role('all_schedule')||$this->has_role('edit_schedule')) + { + return Schedule::find($id); + }else{ + return redirect('/schedule'); + } + } public function edit($id) { - // viewnya pake form edit - return Schedule::find($id); + if ($this->has_role('all_schedule')||$this->has_role('edit_schedule')) + { + return view('menu.editSchedule', + ['id' => $id, + 'data' => Schedule::find($id), + 'dataTPS' => Tps::all(['id', 'nama']), + 'dataManager' => User::all(['id', 'name'])]); + }else{ + return redirect('/schedule'); + } } public function update($id) { $sched = Schedule::find($id); - $sched->update($input); - - $tps = $sched->tps(); - $tps->capacity_now += $sched->amount; - if ($tps->capacity_now >= $tps->capacity_full) + if ($this->has_role('all_schedule')) { - notify('TPS '.$tps->name.' penuh'); - } + $sched = Schedule::find($id); + $sched->id_tps = Input::get('id_tps'); + $sched->id_user = Input::get('id_user'); + $sched->time = Input::get('time',''); + $sched->amount = Input::get('amount',1); + $sched->is_done = Input::get('is_done'); + $sched->save(); + $tps = Tps::find($sched->id_tps); + $tps->capacity_now += $sched->amount; + if ($tps->capacity_now >= $tps->capacity_full) + { + $this->notify('TPS '.$tps->nama.' penuh'); + $tps->capacity_now = $tps->capacity_full; + $tps->is_full = 1; + } + $tps->save(); + } return redirect('/schedule'); } public function destroy($id) { Schedule::find($id)->delete(); - return Schedule::all(); + return redirect('/schedule'); } public function notify($notif) @@ -99,10 +155,10 @@ class ScheduleController extends Controller $data = [ 'content' => $notif, ]; - - Mail::send('emails.welcome', $data, function ($message) { + $user = User::findOrFail(Input::get('id_user')); + Mail::send('email.notification', $data, function ($message) use ($user) { $message->from(env('MAIL_USERNAME', 'user@host.suffix'), 'Notifikasi'); - $message->to($request->input('email'))->subject('Notifikasi Status TPS'); + $message->to($user->email)->subject('Notifikasi Status TPS'); }); } } \ No newline at end of file diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 14d6cf6f1284a96b15c4c64706fd164d2b8b7512..aaf51fc190eb7b94434aec343df467d24cbe1343 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -6,7 +6,6 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use App\User; use App\Http\Requests; - use Illuminate\Support\Facades\Input; class UserController extends Controller { diff --git a/resources/views/email/notification.blade.php b/resources/views/email/notification.blade.php index ffecbccf5150a91a62ad03adf490ea385794953e..15ccf104e5557cc8aa0f86418b0ceb06f8e2fff2 100644 --- a/resources/views/email/notification.blade.php +++ b/resources/views/email/notification.blade.php @@ -7,7 +7,7 @@ </head> <body> <div> - {{ content }} + <?=$content?> </div> </body> </html> \ No newline at end of file diff --git a/resources/views/menu/editSchedule.blade.php b/resources/views/menu/editSchedule.blade.php index f22b1cb74c0174474cc8d343b51f72c29350acf3..8d2825a8deb291a584103c4713729a193bfe0390 100644 --- a/resources/views/menu/editSchedule.blade.php +++ b/resources/views/menu/editSchedule.blade.php @@ -22,14 +22,14 @@ Form schedule </div> <div class="panel-body"> - <form class="form-horizontal" method="POST" action="{{ url('/schedule') }}"> + <form class="col-md-12" action="<?php echo URL::to('/schedule');?>/<?=$data->id?>" method="POST"> {!! csrf_field() !!} <input type="hidden" name="_method" value="put" /> <div class="line line-dashed b-b line-lg pull-in"></div> <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"> + <select name="id_user" ui-jq="chosen" class="w-full"> <optgroup label="Nama Pengelola"> @foreach ($dataManager as $Manager) <option value=<?php echo $Manager->id;?> @@ -45,18 +45,25 @@ <div class="form-group"> <label class="col-sm-2 control-label">Nama TPS</label> <div class="col-sm-10"> - <select name="idPengelola" ui-jq="chosen" class="w-full"> + <select name="id_tps" ui-jq="chosen" class="w-full"> <optgroup label="Nama Pengelola"> @foreach ($dataTPS as $TPS) <option value=<?php echo $TPS->id;?> <?php if($data->id_tps==$TPS->id) echo "selected";?> - ><?php echo $TPS->name;?></option> + ><?php echo $TPS->nama;?></option> @endforeach </optgroup> </select> </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">Amount</label> + <div class="col-sm-10"> + <input type="text" placeholder="Amount" class="form-control" name="amount" required value="<?php echo $data->amount; ?>"> + </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">Selesai</label> @@ -68,8 +75,9 @@ <i>Yes</i> </label> <label class="i-switch bg-warning m-t-xs m-r"> - <input type="radio" name='is_full' value='0' > + <input type="radio" name='is_done' value='0' <?php if($data->is_done==0){echo "checked";}?> + > <i>No</i> </label> </div> @@ -92,7 +100,7 @@ <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> + <button type="submit" class="btn btn-info">Edit</button> </div> </div> diff --git a/resources/views/menu/insertSchedule.blade.php b/resources/views/menu/insertSchedule.blade.php index 083569149c97070966dfeba0cb768dc13f7245dc..a8d57839f1476d3ed3d1756b443c946e539df3bc 100644 --- a/resources/views/menu/insertSchedule.blade.php +++ b/resources/views/menu/insertSchedule.blade.php @@ -30,7 +30,7 @@ <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"> + <select name="id_user" 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> @@ -44,18 +44,22 @@ <div class="form-group"> <label class="col-sm-2 control-label">Nama TPS</label> <div class="col-sm-10"> - <select name="idPengelola" ui-jq="chosen" class="w-full"> + <select name="id_tps" ui-jq="chosen" class="w-full"> <optgroup label="Nama Pengelola"> @foreach ($dataTPS as $TPS) - <option value=<?php echo $TPS->id;?>><?php echo $TPS->name;?></option> + <option value=<?php echo $TPS->id;?>><?php echo $TPS->nama;?></option> @endforeach </optgroup> </select> </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">Amount</label> + <div class="col-sm-10"> + <input type="text" placeholder="Amount" class="form-control" name="amount" required > + </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">Waktu Pengantaran</label> diff --git a/resources/views/menu/schedule.blade.php b/resources/views/menu/schedule.blade.php index 6b6843205ee85bc85f2cd1bf61e1e6ccf6a8dbde..855e42698b4d1ae4ffe5b240a60f7a55e2b0b9df 100644 --- a/resources/views/menu/schedule.blade.php +++ b/resources/views/menu/schedule.blade.php @@ -58,10 +58,11 @@ <i></i> </label> </th> - <th>schedule</th> - <th>Supir Truk</th> + <th>Nama TPS</th> + <th>Nama Supir Truk</th> + <th>Amount</th> <th>Waktu</th> - <th style="width:30px;"></th> + <th>Selesai</th> </tr> </thead> <tbody> @@ -71,11 +72,15 @@ @foreach ($data as $jadwal) <tr> <td><label class="checkbox-inline "><input type="radio" name="id" value="<?=$jadwal->id?>"><i></i></label></td> - <td><?php echo $jadwal->id_tps;?></td> - <td><?php echo $jadwal->id_user;?></td> + <td><?php echo $jadwal->namatps;?></td> + <td><?php echo $jadwal->namauser;?></td> + <td><?php echo $jadwal->amount;?></td> <td><?php echo $jadwal->time;?></td> <td> + <?php if($jadwal->is_done==1){?> <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