From 97ef914d270ac4890797ca1f7738ee6cb9a24720 Mon Sep 17 00:00:00 2001 From: Ivan Diaz Date: Thu, 8 Dec 2016 17:39:47 -0300 Subject: [PATCH] Guillermo - staff/add-last-login [skip ci] --- server/controllers/staff/get-all.php | 1 + server/controllers/user/login.php | 4 ++++ server/models/Staff.php | 6 ++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/server/controllers/staff/get-all.php b/server/controllers/staff/get-all.php index 13428201..2c93165a 100644 --- a/server/controllers/staff/get-all.php +++ b/server/controllers/staff/get-all.php @@ -35,6 +35,7 @@ class GetAllStaffController extends Controller { 'departments' => $staff->sharedDepartmentList->toArray(), 'assignedTickets' => $assignedTickets, 'closedTickets' => $closedTickets, + 'lastLogin' => $staff->lastLogin ]; } diff --git a/server/controllers/user/login.php b/server/controllers/user/login.php index 07cb3340..020eae13 100644 --- a/server/controllers/user/login.php +++ b/server/controllers/user/login.php @@ -22,6 +22,10 @@ class LoginController extends Controller { if ($this->checkInputCredentials() || $this->checkRememberToken()) { $this->createUserSession(); $this->createSessionCookie(); + if(Controller::request('staff')) { + $this->userInstance->lastLogin = Date::getCurrentDate(); + $this->userInstance->store(); + } Response::respondSuccess($this->getUserData()); } else { diff --git a/server/models/Staff.php b/server/models/Staff.php index d2895eb4..cca0bc4c 100644 --- a/server/models/Staff.php +++ b/server/models/Staff.php @@ -17,7 +17,8 @@ class Staff extends DataStore { 'profilePic', 'level', 'sharedDepartmentList', - 'sharedTicketList' + 'sharedTicketList', + 'lastLogin' ]; } @@ -39,7 +40,8 @@ class Staff extends DataStore { 'profilePic' => $this->profilePic, 'level' => $this->level, 'departments' => $this->sharedDepartmentList->toArray(), - 'tickets' => $this->sharedTicketList->toArray() + 'tickets' => $this->sharedTicketList->toArray(), + 'lastLogin' => $this->lastLogin ]; } }