From 6237f0a8327fafba51bdb594eae3c8b92c50eb96 Mon Sep 17 00:00:00 2001
From: Halim <Halim@workstation>
Date: Wed, 9 Nov 2016 23:42:26 -0500
Subject: [PATCH] Datatables work

---
 ...es3DataTable.php => ArticlesDataTable.php} | 14 ++++--
 app/Http/Controllers/Article3Controller.php   | 19 -------
 app/Http/Controllers/Articles2Controller.php  | 42 ----------------
 app/Http/Controllers/ArticlesDTController.php | 50 +++++++++++++++++++
 .../Controllers/ArticlesDTSController.php     | 19 +++++++
 .../{articles2 => datatables}/index.blade.php | 35 ++++++-------
 .../index2.blade.php}                         |  2 +-
 resources/views/layouts/app.blade.php         |  2 +
 resources/views/layouts/navbar.blade.php      |  2 +-
 routes/web.php                                | 13 +++--
 10 files changed, 112 insertions(+), 86 deletions(-)
 rename app/DataTables/{Articles3DataTable.php => ArticlesDataTable.php} (75%)
 delete mode 100644 app/Http/Controllers/Article3Controller.php
 delete mode 100644 app/Http/Controllers/Articles2Controller.php
 create mode 100644 app/Http/Controllers/ArticlesDTController.php
 create mode 100644 app/Http/Controllers/ArticlesDTSController.php
 rename resources/views/{articles2 => datatables}/index.blade.php (64%)
 rename resources/views/{articles2/index3.blade.php => datatables/index2.blade.php} (85%)

diff --git a/app/DataTables/Articles3DataTable.php b/app/DataTables/ArticlesDataTable.php
similarity index 75%
rename from app/DataTables/Articles3DataTable.php
rename to app/DataTables/ArticlesDataTable.php
index b9dcb59..08cc9c7 100644
--- a/app/DataTables/Articles3DataTable.php
+++ b/app/DataTables/ArticlesDataTable.php
@@ -5,7 +5,7 @@
 use App\Article;
 use Yajra\Datatables\Services\DataTable;
 
-class Articles3DataTable extends DataTable
+class ArticlesDataTable extends DataTable
 {
     /**
      * Display ajax response.
@@ -18,6 +18,10 @@ public function ajax()
             ->eloquent($this->query())
             ->addColumn('action', 'path.to.action.view')
             ->make(true);
+        
+        // $articles = Article::select(['id', 'title', 'body', 'created_at', 'updated_at']);
+       // return Datatables::of($articles)->editColumn('title', '{{ $title."-title" }}')->make();
+        
     }
 
     /**
@@ -27,9 +31,12 @@ public function ajax()
      */
     public function query()
     {
-        $query = Article::query();
+        //$query = Article::query();
+        $query = Article::query()->select(['id', 'title', 'created_at', 'updated_at']);
 
-        return $this->applyScopes($query);
+        //return $this->applyScopes($query);
+        
+        return $query;
     }
 
     /**
@@ -56,6 +63,7 @@ protected function getColumns()
         return [
             'id',
             // add your columns
+            'title',
             'created_at',
             'updated_at',
         ];
diff --git a/app/Http/Controllers/Article3Controller.php b/app/Http/Controllers/Article3Controller.php
deleted file mode 100644
index 2869671..0000000
--- a/app/Http/Controllers/Article3Controller.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-use App\DataTables\Articles3DataTable;
-
-class Article3Controller extends Controller {
-
-    
-    public function index(Articles3DataTable $dataTable) {
-        
-        
-        return $dataTable->render('articles2.index3');
-
-        
-    }
-
-}
diff --git a/app/Http/Controllers/Articles2Controller.php b/app/Http/Controllers/Articles2Controller.php
deleted file mode 100644
index 96388dc..0000000
--- a/app/Http/Controllers/Articles2Controller.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-
-//use DB;
-use Yajra\Datatables\Facades\Datatables;
-use App\Article;
-
-class Articles2Controller extends Controller {
-    /*
-     * 
-     */
-    public function __construct() {
-        $this->middleware('auth');
-    }
-
-    /**
-     * Display a listing of the resource.
-     */
-    public function index() {
-        return view('articles2.index');
-    }
-
-    /**
-     * Process datatables ajax request.
-     */
-    public function anyData() {
-        //return Datatables::of(\App\Article::query())->make(true);
-        
-       // $articles = Article::select(['id', 'title', 'body', 'created_at', 'updated_at']);
-        
-       // return Datatables::of($articles)->editColumn('title', '{{ $title."-title" }}')->make();
-        
-        
-        return Datatables::of(Article::query())->make();
-        
-    }
-
-
-}
diff --git a/app/Http/Controllers/ArticlesDTController.php b/app/Http/Controllers/ArticlesDTController.php
new file mode 100644
index 0000000..463f703
--- /dev/null
+++ b/app/Http/Controllers/ArticlesDTController.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use DB;
+use Yajra\Datatables\Facades\Datatables;
+use App\Article;
+
+class ArticlesDTController extends Controller {
+    /*
+     * 
+     */
+
+    public function __construct() {
+        $this->middleware('auth');
+    }
+
+    /**
+     * Display a listing of the resource.
+     */
+    public function index() {
+        return view('datatables.index');
+    }
+
+    /**
+     * Process datatables ajax request.
+     */
+    public function getBasicData() {
+
+        $articles = Article::select(['id', 'title', 'body', 'created_at', 'updated_at']);
+        return Datatables::of($articles)->make();
+
+        //return Datatables::of(Article::query())->make();
+    }
+
+    /**
+     * Process datatables ajax request.
+     */
+    public function AddEditRemoveColumn() {
+
+        $articles = Article::select(['id', 'title', 'body', 'created_at', 'updated_at']);
+
+        return Datatables::of($articles)->addColumn('action', 'edit')->make();
+
+        //return Datatables::of(Article::query())->make();
+    }
+
+
+}
diff --git a/app/Http/Controllers/ArticlesDTSController.php b/app/Http/Controllers/ArticlesDTSController.php
new file mode 100644
index 0000000..85ee6fd
--- /dev/null
+++ b/app/Http/Controllers/ArticlesDTSController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\DataTables\ArticlesDataTable;
+
+class ArticlesDTSController extends Controller {
+
+    
+    public function index(ArticlesDataTable $dataTable) {
+        
+        
+        return $dataTable->render('datatables.index2');
+
+        
+    }
+
+}
diff --git a/resources/views/articles2/index.blade.php b/resources/views/datatables/index.blade.php
similarity index 64%
rename from resources/views/articles2/index.blade.php
rename to resources/views/datatables/index.blade.php
index db8b47a..99d0516 100644
--- a/resources/views/articles2/index.blade.php
+++ b/resources/views/datatables/index.blade.php
@@ -7,7 +7,7 @@
             <h2>Articles List (Using Datatables)</h2>
 
 
-            <table class="table table-bordered" id="users-table">
+            <table class="table table-bordered" id="datatable">
                 <thead>
                     <tr>
                         <th>Id</th>
@@ -15,6 +15,7 @@
                         <th>Article Body</th>
                         <th>Created At</th>
                         <th>Updated At</th>
+                       
                     </tr>
                 </thead>
             </table>
@@ -31,27 +32,27 @@
 <script src="//cdn.datatables.net/1.10.7/js/jquery.dataTables.min.js"></script>
 <script>
     $(function () {
-        $('#users-table00').DataTable({
-            processing: true,
-            serverSide: true,
-            ajax: "{{ url('articles2/anyData') }}",
-            columns: [
-                {data: 'id', name: 'id'},
-                {data: 'title', name: 'title'},
-                {data: 'body', name: 'body'},
-                {data: 'created_at', name: 'created_at'},
-                {data: 'updated_at', name: 'updated_at'}
-            ]
-        });
-
         $(function () {
-            $('#users-table').DataTable({
+            $('#datatable0').DataTable({
                 processing: true,
                 serverSide: true,
-                ajax: '{{ url("articles2/anyData") }}'
+                ajax: '{{ url("datatable/ajaxdata") }}'
             });
         });
-
+        
+        $('#datatable').DataTable({
+            processing: true,
+            serverSide: true,
+            ajax: '{{ url("datatable/ajaxdata") }}',
+            columns: [
+                {data: 0, name: 'id'},
+                {data: 1, name: 'title'},
+                {data: 2, name: 'body', searchable: false},
+                {data: 3, name: 'created_at'},
+                {data: 4, name: 'updated_at'}
+            ]
+        });
+        
     });
 </script>
 @endpush
\ No newline at end of file
diff --git a/resources/views/articles2/index3.blade.php b/resources/views/datatables/index2.blade.php
similarity index 85%
rename from resources/views/articles2/index3.blade.php
rename to resources/views/datatables/index2.blade.php
index e6957a6..cd46dbd 100644
--- a/resources/views/articles2/index3.blade.php
+++ b/resources/views/datatables/index2.blade.php
@@ -4,7 +4,7 @@
 <div class="container">
     <div class="row">
         <div class="col-md-12">
-            <h2>Articles List (Using Datatables)</h2>
+            <h2>Articles List (Using Datatables as a Service Implementation)</h2>
 
             {!! $dataTable->table() !!}
 
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 34e2988..0e74eb4 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -37,6 +37,8 @@
 
         <!-- Scripts -->
         <script src="/js/app.js"></script>
+<!--        <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js"></script>-->
 
         <script>
             $('div.alert').not('.alert-important').delay(1500).slideUp(300);
diff --git a/resources/views/layouts/navbar.blade.php b/resources/views/layouts/navbar.blade.php
index bcc3eb3..dc638b0 100644
--- a/resources/views/layouts/navbar.blade.php
+++ b/resources/views/layouts/navbar.blade.php
@@ -31,7 +31,7 @@
                         <li><a href="{{ url('articles/create') }}">New Article</a></li>
                         <li><a href="{{ url('articles') }}">Articles List</a></li>
                         <li class="divider"></li>
-                        <li><a href="{{ url('articles2') }}">Articles List (Datatables)</a></li>
+                        <li><a href="{{ url('datatable') }}">Articles List (Datatables)</a></li>
                     </ul>
                 </li>
                 <li class="dropdown">
diff --git a/routes/web.php b/routes/web.php
index 2287e47..ee13299 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -38,11 +38,18 @@
 /*
  * Datatables routes
  */
-Route::get('articles2', 'Articles2Controller@index');
-Route::get('articles2/anyData', 'Articles2Controller@anyData');
+Route::get('datatable', 'ArticlesDTController@index');
+//Route::get('datatable/ajaxdata', 'ArticlesDTController@getBasicData'); // getBasicData, AddEditRemoveColumn
+Route::get('datatable/ajaxdata', 'ArticlesDTController@AddEditRemoveColumn');
 
 
-Route::resource('articles3', 'Article3Controller');
+
+
+/*
+ * Datatables routes as Service
+ */
+Route::resource('datatable2', 'ArticlesDTSController');
+
 
 
 /*