diff --git a/src/Controller/JsonRequestHandlerController.php b/src/Controller/JsonRequestHandlerController.php index 903bd43a0..acc4d0fa9 100644 --- a/src/Controller/JsonRequestHandlerController.php +++ b/src/Controller/JsonRequestHandlerController.php @@ -55,6 +55,8 @@ class JsonRequestHandlerController extends AppController { } case 'userDelete': return $this->userDelete($jsonData->user); case 'moveTransaction': return $this->moveTransaction($jsonData->pubkeys, $jsonData->memo, $jsonData->session_id); + case 'checkUser': return $this->checkUser($jsonData->email, $jsonData->last_name); + case 'getUsers' : return $this->getUsers($jsonData->page, $jsonData->limit); } return $this->returnJson(['state' => 'error', 'msg' => 'unknown method for post', 'details' => $method]); } @@ -146,6 +148,42 @@ class JsonRequestHandlerController extends AppController { } + private function checkUser($email, $last_name) { + $userTable = TableRegistry::getTableLocator()->get('Users'); + $user = $userTable->find('all') + ->where(['email' => $email]) + ->contain([]) + ->select(['first_name', 'last_name', 'email']); + if(!$user->count()) { + return $this->returnJson(['state' => 'not found', 'msg' => 'user not found']); + } + if($user->count() == 1 && $user->first()->last_name == $last_name) { + return $this->returnJson(['state' => 'success']); + } + return $this->returnJson(['state' => 'not identical', 'user' => $user->toArray()]); + } + + private function getUsers($page, $count) { + + $userTable = TableRegistry::getTableLocator()->get('Users'); + $this->paginate = [ + 'limit' => $count, + 'page' => $page + ]; + $usersQuery = $userTable->find('all') + ->select(['first_name', 'last_name', 'email']) + ->order(['id']); + try { + return $this->returnJson(['state' => 'success', 'users' => $this->paginate($usersQuery)]); + } catch (Exception $ex) { + return $this->returnJson(['state' => 'exception', 'msg' => 'error paginate users', 'details' => $ex->getMessage()]); + } + + + //return $this->returnJson(['state' => 'success', 'users' => $users->toArray()]); + + } + private function getRunningUserTasks() { $session = $this->getRequest()->getSession(); $state_user_email = $session->read('StateUser.email'); diff --git a/src/Template/Dashboard/index.ctp b/src/Template/Dashboard/index.ctp index c457bb06d..cec1e823e 100644 --- a/src/Template/Dashboard/index.ctp +++ b/src/Template/Dashboard/index.ctp @@ -11,6 +11,11 @@ if(isset($user)) { } $this->assign('title', __('Willkommen') . ' ' . $user['first_name'] . ' ' . $user['last_name']); ?> + = round($requestTime * 1000.0) ?> ms @@ -66,14 +71,21 @@ $this->assign('title', __('Willkommen') . ' ' . $user['first_name'] . '&nbs