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 @@
Phone |
Email |
Join Date |
+ Last Login |
Company |
Role |
Status |
@@ -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 @@
Action |
Vehicle |
Name |
-
- {{-- Kir Exp | --}}
+ Manufacture Year |
+ Type |
Service Start |
@if ($user_role != \App\Models\Users::ROLE_VENDOR)
Device ID |
SIM Card |
Last Update |
@endif
- Type |
- Manufacture Year |
Mileage (km) |
Fuel (L) |
Company |
@@ -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}
-
${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}
-
${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',