Merge branch 'master' of http://gitlab.informatika.org/CliffTheDragonJohn/templatePPL2

ppl2/app/Http/Controllers/InstitusiController.php

@@ -49,7 +49,7 @@ class InstitusiController extends Controller
      *
      * @return Response
      */
-    public function store()
+    public function store(Request $request)
     {
         //
         $rules = array(
@@ -78,7 +78,7 @@ class InstitusiController extends Controller
 
             // redirect
             Session::flash('message', 'Successfully created institusi!');
-            return Redirect::to('daftarinstitusi');
+            return \Redirect::to('daftarinstitusi');
         }
     }
 
@@ -91,8 +91,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'));
     }
 
     /**
@@ -119,15 +119,15 @@ 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->ip = $request->ip();
+        $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');
     }
 
     /**
@@ -142,11 +142,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);   
     }
 }

ppl2/app/Http/Controllers/PendinFormalController.php

@@ -70,6 +70,7 @@ class PendinFormalController extends Controller
 
     public function search(Request $request) {
         $res = $request->input('query');
+        error_log("asdfafdasf");
         return \Redirect::to('pendidikan-informal/all/'.$res);   
     }
 }

ppl2/app/Http/Controllers/PenjadwalanController.php

@@ -31,7 +31,7 @@ class PenjadwalanController extends Controller
      *
      * @return Response
      */
-    public function store()
+    public function store(Request $request)
     {
         //
         $rules = array(

ppl2/app/Http/Controllers/pendaftaranController.php

@@ -32,7 +32,7 @@ class pendaftaranController extends Controller
      *
      * @return Response
      */
-    public function store()
+    public function store(Request $request)
     {
         //
         $rules = array(

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');
 

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>

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>