diff --git a/ppl2/app/Http/Controllers/InstitusiController.php b/ppl2/app/Http/Controllers/InstitusiController.php index 618136a3f81b21b3472324a82a39d4a612ed92b8..92c2d51129dd8de702017c9192d1c08889294893 100644 --- a/ppl2/app/Http/Controllers/InstitusiController.php +++ b/ppl2/app/Http/Controllers/InstitusiController.php @@ -76,7 +76,7 @@ class InstitusiController extends Controller // redirect Session::flash('message', 'Successfully created institusi!'); - return Redirect::to('daftarinstitusi'); + return \Redirect::to('daftarinstitusi'); } } @@ -89,8 +89,8 @@ class InstitusiController extends Controller public function show($id) { // - $institusi = Institusi::where('institusi_id',$id)->get(); - return view('institusi',compact('institusi','institusi_id')); + $institusi = Institusi::where('id',$id)->get(); + return view('institusi',compact('institusi','id')); } /** @@ -117,14 +117,14 @@ class InstitusiController extends Controller // $institusi = Institusi::find($id); - $institusi->nama_institusi = $request->input('nama_institusi'); - $institusi->alamat_institusi = $request->input('alamat_institusi'); - $institusi->email_institusi = $request->input('email_institusi'); - $institusi->notelp_institusi = $request->input('notelp_institusi'); + $institusi->nama_institusi = $request->input('name'); + $institusi->alamat_institusi = $request->input('alamat'); + $institusi->email_institusi = $request->input('email'); + $institusi->notelp_institusi = $request->input('notelp'); $institusi->save(); Session::flash('message', 'Institusi successfully updated'); - return Redirect::to('daftarinstitusi'); + return \Redirect::to('daftarinstitusi'); } /** @@ -139,11 +139,11 @@ class InstitusiController extends Controller $institusi = Institusi::find($id); $institusi->delete(); Session::flash('message', 'Institusi berhasil dihapus'); - return Redirect::to('daftarinstitusi'); + return \Redirect::to('daftarinstitusi'); } public function search(Request $request) { $res = $request->input('query'); - return Redirect::to('daftarinstitusi/'.$res); + return \Redirect::to('daftarinstitusi/all/'.$res); } } diff --git a/ppl2/app/Http/Controllers/PendinFormalController.php b/ppl2/app/Http/Controllers/PendinFormalController.php index 8c2ce6a64f3b1b96475139716a64600df828430e..97b8582bc2bda8833f1563ad3b36a591dbf373dc 100644 --- a/ppl2/app/Http/Controllers/PendinFormalController.php +++ b/ppl2/app/Http/Controllers/PendinFormalController.php @@ -68,6 +68,7 @@ class PendinFormalController extends Controller public function search(Request $request) { $res = $request->input('query'); + error_log("asdfafdasf"); return \Redirect::to('pendidikan-informal/all/'.$res); } } diff --git a/ppl2/app/Http/routes.php b/ppl2/app/Http/routes.php index c8f71306584c56201e980aea8c8ec20d41371826..50042c0891b85c88cbed050748e72bf7ae1c49e9 100644 --- a/ppl2/app/Http/routes.php +++ b/ppl2/app/Http/routes.php @@ -93,7 +93,7 @@ Route::get('daftarinstitusi/{id}/edit','InstitusiController@edit'); Route::get('daftarinstitusi/{id}/delete','InstitusiController@destroy'); -Route::get('daftarinstitusi/{id}','InstitusiController@show'); +Route::get('daftarinstitusi/all/{id}','InstitusiController@show'); Route::get('daftarinstitusi/search','InstitusiController@search'); diff --git a/ppl2/resources/views/editInstitusi.blade.php b/ppl2/resources/views/editInstitusi.blade.php index 0844f346db02fd9f347f3f947a92513c05913930..a681a50ac3bec62064ca29b9a60067ec604362b2 100644 --- a/ppl2/resources/views/editInstitusi.blade.php +++ b/ppl2/resources/views/editInstitusi.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('/')}}/daftarinstitusi/{{$institusi->institusi_id}}/update"> + <form class="bs-example form-horizontal" method="POST" action="{{ URL::to('/')}}/daftarinstitusi/{{$institusi->id}}/update"> <div class="form-group"> <label class="col-lg-2 control-label">Nama</label> diff --git a/ppl2/resources/views/institusi.blade.php b/ppl2/resources/views/institusi.blade.php index b0dc068d2d5bae60b4f0708d37715237119d1717..c6658f82e0cdfabb1062cc949783b78d1c1d0411 100644 --- a/ppl2/resources/views/institusi.blade.php +++ b/ppl2/resources/views/institusi.blade.php @@ -56,7 +56,7 @@ <tbody> @foreach($institusi as $key => $value) <tr data-expanded="true"> - <td>{{ $value->institusi_id }}</td> + <td>{{ $value->id }}</td> <td>{{ $value->nama_institusi }}</td> <td>{{ $value->alamat_institusi }}</td> <td>{{ $value->email_institusi }}</td>