Release v0.1.6-beta (#450)

InfyOmLabs · Apr 14, 2020 · 0833bd7 · 0833bd7
1 parent c91387a
commit 0833bd7
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 8 deletions.
diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php
@@ -46,7 +46,7 @@ public function __construct(ClientRepository $clientRepo)
     public function index(Request $request)
     {
         if ($request->ajax()) {
-            return Datatables::of((new ClientDataTable())->get())->make(true);
+            return Datatables::of((new ClientDataTable())->get($request->only(['filter_department'])))->make(true);
         }
         $departments = Department::all()->pluck('name', 'id')->toArray();
 

diff --git a/app/Queries/ClientDataTable.php b/app/Queries/ClientDataTable.php
@@ -3,6 +3,7 @@
 namespace App\Queries;
 
 use App\Models\Client;
+use Illuminate\Database\Eloquent\Builder as BuilderAlias;
 use Illuminate\Database\Query\Builder;
 
 /**
@@ -11,12 +12,21 @@
 class ClientDataTable
 {
     /**
+     * @param array $input
+     *
      * @return Client|Builder
      */
-    public function get()
+    public function get($input = [])
     {
         /** @var Client $query */
-        $query = Client::with('department');
+        $query = Client::with('department')->select('clients.*');
+
+        $query->when(
+            isset($input['filter_department']) && !empty($input['filter_department']),
+            function (BuilderAlias $q) use ($input) {
+                $q->where('department_id', '=', $input['filter_department']);
+            }
+        );
 
         return $query;
     }

diff --git a/resources/assets/js/clients/client.js b/resources/assets/js/clients/client.js
@@ -3,12 +3,19 @@ $('#department_id,#edit_department_id').select2({
     placeholder: 'Select Department',
 });
 
-$('#clients_table').DataTable({
+$('#filter_department').select2();
+
+let tbl = $('#clients_table').DataTable({
     processing: true,
     serverSide: true,
     'order': [[0, 'asc']],
     ajax: {
         url: clientUrl,
+        data: function (data) {
+            data.filter_department = $('#filter_department').
+                find('option:selected').
+                val();
+        },
     },
     columnDefs: [
         {
@@ -24,7 +31,9 @@ $('#clients_table').DataTable({
             name: 'name',
         },
         {
-            data: 'department.name',
+            data: function (row) {
+                return (row.department !== null) ? row.department.name : '';
+            },
             name: 'department.name',
         },
         {
@@ -52,6 +61,11 @@ $('#clients_table').DataTable({
             }, name: 'id',
         },
     ],
+    'fnInitComplete': function () {
+        $('#filter_department').change(function () {
+            tbl.ajax.reload();
+        });
+    },
 });
 
 $('#addNewForm').submit(function (event) {

diff --git a/resources/views/clients/index.blade.php b/resources/views/clients/index.blade.php
@@ -9,9 +9,12 @@
             @include('flash::message')
             <div class="page-header">
                 <h3 class="page__heading">Clients</h3>
-                <div style="display: flex;align-items: center">
-                    <a href="#" class="btn btn-primary" data-toggle="modal" data-target="#AddModal"></i>New
-                        Client</a>
+                <div class="filter-container">
+                    <div class="mr-2">
+                        <label class="lbl-block"><b>Department</b></label>
+                        {!!Form::select('department_id', $departments, Auth::id(), ['id' => 'filter_department', 'class'=>'form-control', 'placeholder' => 'All'])  !!}
+                    </div>
+                    <a href="#" class="btn btn-primary filter-container__btn" data-toggle="modal" data-target="#AddModal"></i>New Client</a>
                 </div>
             </div>
             <div class="row">