From 30dee9c844410f64d20b62305c546d2407c959c4 Mon Sep 17 00:00:00 2001
From: Pringgosutono <pringgosutono@gmail.com>
Date: Fri, 12 Dec 2025 13:02:38 +0700
Subject: [PATCH] last login user

---
 app/Models/Users.php                       |  3 ++
 resources/views/menu_v1/users.blade.php    | 11 +++++
 resources/views/menu_v1/vehicles.blade.php | 48 +++++++++++-----------
 3 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/app/Models/Users.php b/app/Models/Users.php
index 6fb9579..f9d6285 100755
--- a/app/Models/Users.php
+++ b/app/Models/Users.php
@@ -86,12 +86,15 @@ class Users extends Authenticatable
                 Users::defaultSelected .
                 "
                 $select_select
+				, ul.crt lastLogin
                 FROM t_users AS u
                 LEFT JOIN t_clients AS c ON u.client_group_id = c.id
                 -- LEFT JOIN t_users_roles AS r ON u.role = r.id
                 LEFT JOIN model_has_roles AS mhr ON mhr.model_id = u.id
                 LEFT JOIN roles as rl ON rl.id = mhr.role_id
                 $join_join
+                left join (select userId, crt from t_user_log where log->'$.desc' = 'User login' order by crt desc limit 1) ul
+					on ul.userId = u.id
                 WHERE u.dlt is null
                 $where_where
                 $other_other
diff --git a/resources/views/menu_v1/users.blade.php b/resources/views/menu_v1/users.blade.php
index aa85421..3d04629 100755
--- a/resources/views/menu_v1/users.blade.php
+++ b/resources/views/menu_v1/users.blade.php
@@ -46,6 +46,7 @@
                                             <th class="text-nowrap">Phone</th>
                                             <th class="text-nowrap">Email</th>
                                             <th class="text-nowrap">Join Date</th>
+                                            <th class="text-nowrap">Last Login</th>
                                             <th class="text-nowrap">Company</th>
                                             <th class="text-start">Role</th>
                                             <th class="text-center">Status</th>
@@ -708,6 +709,16 @@
                                 return moment.unix(data).format('DD MMM YYYY HH:mm')
                             },
                         },
+						{
+							data: 'lastLogin',
+							className: 'text-start text-nowrap',
+							visible: true,
+							orderable: true,
+							searchable: true,
+							render: function(data, type, row, meta) {
+								return data ? moment.unix(data).format('DD MMM YYYY HH:mm') : '-';
+							},
+						},
                         {
                             data: 'client_group_name',
                             className: 'text-start text-nowrap',
diff --git a/resources/views/menu_v1/vehicles.blade.php b/resources/views/menu_v1/vehicles.blade.php
index 5b2a8bd..f7096ec 100755
--- a/resources/views/menu_v1/vehicles.blade.php
+++ b/resources/views/menu_v1/vehicles.blade.php
@@ -45,16 +45,14 @@
                                     <th class="text-center">Action</th>
                                     <th class="">Vehicle</th>
                                     <th class="">Name</th>
-                                    <!-- <th class="">Tax Exp</th> -->
-                                    {{-- <th class="">Kir Exp</th> --}}
+                                    <th class="">Manufacture Year</th>
+                                    <th class="">Type</th>
                                     <th class="">Service Start</th>
                                     @if ($user_role != \App\Models\Users::ROLE_VENDOR)
                                         <th class="">Device ID</th>
                                         <th class="">SIM Card</th>
                                         <th class="">Last Update</th>
                                     @endif
-                                    <th class="">Type</th>
-                                    <th class="">Manufacture Year</th>
                                     <th class=""><span class="text-nowrap">Mileage <span class="text-lowercase">(km)</span></span></th>
                                     <th class=""><span class="text-nowrap">Fuel <span class="text-lowercase">(L)</span></span></th>
                                     <th class="">Company</th>
@@ -754,6 +752,27 @@
                             },
                         },
 						{ data: 'name', className: 'text-start text-nowrap', visible: true, orderable: true, searchable: true },
+                        {
+                            data: 'vyear',
+                            className: 'text-end',
+                            visible: true,
+                            orderable: true,
+                            searchable: true,
+                            render: function(data, type, row, meta) {
+                                return (`${(data || '-')}`);
+                            },
+                        },
+                        {
+                            data: 'type_name',
+                            className: 'text-start text-nowrap',
+                            visible: true,
+                            orderable: true,
+                            searchable: true,
+                            render: function(data, type, row, meta) {
+                                // return (`${row.brand_name}<br>-<br>${data}`);
+                                return data;
+                            },
+                        },
                         {
                             data: 'crt',
                             className: 'text-end text-nowrap',
@@ -799,27 +818,6 @@
 								},
 							},
                         @endif
-                        {
-                            data: 'type_name',
-                            className: 'text-start text-nowrap',
-                            visible: true,
-                            orderable: true,
-                            searchable: true,
-                            render: function(data, type, row, meta) {
-                                // return (`${row.brand_name}<br>-<br>${data}`);
-                                return data;
-                            },
-                        },
-                        {
-                            data: 'vyear',
-                            className: 'text-end',
-                            visible: true,
-                            orderable: true,
-                            searchable: true,
-                            render: function(data, type, row, meta) {
-                                return (`${(data || '-')}`);
-                            },
-                        },
                         {
                             data: 'sum_milleage',
                             className: 'text-end',