Merge branch 'master' of https://github.com/kmanjari/hrms

Author: kmanjari

app/Http/Controllers/EmpController.php

@@ -92,7 +92,9 @@ public function showEmployee()
     {
       $emps = User::with('employee', 'role.role')->paginate(40);
 
-      return view('hrms.employee.show_emp', compact('emps'));
+      $column = '';
+      $string = '';
+      return view('hrms.employee.show_emp', compact('emps', 'column', 'string'));
     }
 
     public function showEdit($id)
@@ -524,7 +526,7 @@ public function searchEmployee(Request $request)
           })->with('employee')->paginate(20);
         }
 
-        return view('hrms.employee.show_emp', compact('emps'));
+        return view('hrms.employee.show_emp', compact('emps', 'column', 'string'));
       } else
       {
         if($column == '')
@@ -541,8 +543,6 @@ public function searchEmployee(Request $request)
           })->with('employee')->get();
         }
 
-        $results = [];
-
         $fileName = 'Employee_Listing_'. rand(1,1000). '.xlsx';
         $filePath = storage_path('exports/'). $fileName;
         $file = new \SplFileObject($filePath, "a");

app/Http/Helper/helper.php

@@ -60,5 +60,16 @@ function getFormattedDate($date)
 {
     $date = new DateTime($date);
     return date_format($date,'l jS \\of F Y');
+}
 
-}
+    function getEmployeeDropDown()
+    {
+        $data = [
+            'name' => 'Name',
+            'code' => 'Code',
+            'department' => 'Department',
+            'email' => 'Email',
+            'number' => 'Number'
+        ];
+        return $data;
+    }

resources/views/hrms/employee/show_emp.blade.php

@@ -41,18 +41,11 @@
                         <div class="row">
                             {!! Form::open() !!}
                             <div class="col-md-3">
-                                <input type="text" class="field form-control" placeholder="query string" style="height:40px" name="string">
+                                <input type="text" class="field form-control" placeholder="query string" style="height:40px" value="{{$string}}" name="string">
                             </div>
                             <div class="col-md-3">
                                 <label class="field select">
-                                    <select id="column" name="column">
-                                        <option value="">Filter by</option>
-                                        <option value="name">Name</option>
-                                        <option value="code">Code</option>
-                                        <option value="department">Department</option>
-                                        <option value="email">Email</option>
-                                        <option value="number">Number</option>
-                                    </select>
+                                    {!! Form::select('column', getEmployeeDropDown(),$column) !!}
                                     <i class="arrow double"></i>
                                 </label>
                             </div>