From 9a26fa32aaa4db556a0e4757b02a11bbe7b8079f Mon Sep 17 00:00:00 2001
From: RafficMohammed <mohammed.raffic@ladybirdweb.com>
Date: Tue, 7 Feb 2023 12:01:22 +0530
Subject: [PATCH] datatables

---
 .../Agent/helpdesk/TicketController.php        | 11 +++++++++++
 .../vendor/Chumper/ticket-javascript.blade.php | 15 ++++++---------
 .../Chumper/tickets-javascript.blade.php       | 18 +++++++++++++-----
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php
index 3fcbad598..205cccbbf 100755
--- a/app/Http/Controllers/Agent/helpdesk/TicketController.php
+++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Agent\helpdesk;
 
 // controllers
+use App\Http\Controllers\Agent\helpdesk\Filter\FilterControllerOld;
 use App\Http\Controllers\Common\FileuploadController;
 use App\Http\Controllers\Common\NotificationController as Notify;
 use App\Http\Controllers\Common\PhpMailController;
@@ -2817,7 +2818,16 @@ class TicketController extends Controller
                                 }
                             }
                         })
+                        ->editColumn('updated_at', function ($tickets) {
+                            $TicketDatarow = $tickets->updated_at;
+                            $updated = '--';
+                            if ($TicketDatarow) {
+                                $updated = $tickets->updated_at;
+                            }
 
+                            return '<span style="display:none">'.$updated.'</span>'.UTC::usertimezone($updated);
+                        })
+                        ->rawColumns(['id', 'title', 'ticket_number', 'c_uname', 'a_uname', 'updated_at'])
                         ->make();
     }
 
@@ -3253,6 +3263,7 @@ class TicketController extends Controller
 
                     return '<span style="display:none">'.$updated.'</span>'.UTC::usertimezone($updated);
                 })
+                ->rawColumns(['id', 'title', 'ticket_number', 'priority', 'user_name', 'assign_user_name', 'updated_at', 'created_at'])
                 ->make();
     }
 }
diff --git a/resources/views/vendor/Chumper/ticket-javascript.blade.php b/resources/views/vendor/Chumper/ticket-javascript.blade.php
index e1e4edec8..de7d3f771 100644
--- a/resources/views/vendor/Chumper/ticket-javascript.blade.php
+++ b/resources/views/vendor/Chumper/ticket-javascript.blade.php
@@ -29,7 +29,6 @@ foreach($segments as $seg){
                         "<'row'<'col-sm-6'i><'col-sm-6'p>>",
                 "sPaginationType": "full_numbers",
                 "bProcessing": true,
-                "bServerSide": true,
                 "lengthMenu": [[10, 25, 50, 100, 500], [10, 25, 50, 100, 500]],
                 "ajax": {
                     url: "{{url('filter')}}",
@@ -43,19 +42,17 @@ foreach($segments as $seg){
                 "columnDefs": [
                     {"defaultContent": "-",
                         "targets": "_all"},
-                    { "searchable": true, "targets": [6,7] },
                     { "visible": last, "targets": 6 },
                     {"visible": create, "targets":7},
                 ],
                 "columns":[
-                    {data: "check_box"},
-                    {data: "ticket_number"},
-                    {data: "ticket_number"},
-                    {data: "ticket_number"},
-                    {data: "ticket_number"},
-                    {data: "ticket_number"},
-                    {data: "ticket_number"},
+                    {data: "id"},
+                    {data: "title"},
                     {data: "ticket_number"},
+                    {data: "priority"},
+                    {data: "user_name"},
+                    {data: "assign_user_name"},
+                    {data: "updated_at"},
                 ],
                 "fnCreatedRow": function (nRow, aData, iDataIndex) {
                     var str = aData['ticket_number'];
diff --git a/resources/views/vendor/Chumper/tickets-javascript.blade.php b/resources/views/vendor/Chumper/tickets-javascript.blade.php
index 7d42e1010..27d98a477 100755
--- a/resources/views/vendor/Chumper/tickets-javascript.blade.php
+++ b/resources/views/vendor/Chumper/tickets-javascript.blade.php
@@ -29,7 +29,6 @@ $path = public_path();
                         "<'row'<'col-sm-6'i><'col-sm-6'p>>",
                 "sPaginationType": "full_numbers",
                 "bProcessing": true,
-                "bServerSide": true,
                 "bStateSave" : true,
                 "bStateDuration": -1,
                 "oLanguage": {
@@ -93,8 +92,9 @@ $path = public_path();
                 },
                 "aaSorting": [[5, "desc"]],
                 "columnDefs": [
+                    {"defaultContent": "-",
+                        "targets": "_all"},
                     { "orderable": false, "targets": 0},
-                    { "searchable": false, "targets": [5] },
                     { "visible": true, "targets": 5 },
                     {
                         "aTargets": [0],
@@ -106,10 +106,18 @@ $path = public_path();
                         }
                     } 
                 ],
+                "columns":[
+                    {data: "id"},
+                    {data: "title"},
+                    {data: "ticket_number"},
+                    {data: "c_uname"},
+                    {data: "a_uname"},
+                    {data: "updated_at"},
+                ],
                 "fnCreatedRow": function (nRow, aData, iDataIndex) {
-                    var str = aData[0];
-                    var length = aData[2].indexOf('*') - aData[2].indexOf('$');
-                    var p = aData[2].substr(aData[2].indexOf('$')+1, length-1);
+                    var str = aData['id'];
+                    var length = aData['ticket_number'].indexOf('*') - aData['ticket_number'].indexOf('$');
+                    var p = aData['ticket_number'].substr(aData['ticket_number'].indexOf('$')+1, length-1);
                     $("td", nRow).attr('title', "{!! Lang::get('lang.ticket-has-x-priority', ['priority' => '"+p+"']) !!}");
                     if (str.search("#000") == -1) {
                         $("td", nRow).css({"background-color": "#F3F3F3", "font-weight": "600", "border-bottom": "solid 0.5px #ddd", "border-right": "solid 0.5px #F3F3F3"});