diff --git a/src/Controller/UsersController.php b/src/Controller/UsersController.php index 7837cda91..f4eff803a 100644 --- a/src/Controller/UsersController.php +++ b/src/Controller/UsersController.php @@ -62,8 +62,14 @@ class UsersController extends AppController $newAccountsTree[$created->year][$created->month]['count'] += intval($entry['count']); } + // last 5 new users + $lastUsers = $this->Users->find('all')->order(['created DESC'])->limit(5); + $timeUsed = microtime(true) - $startTime; - $this->set(compact('users', 'newUsersThisMonth', 'newUsersLastMonth', 'timeUsed', 'newAccountsTree')); + + $this->set(compact( + 'users', 'newUsersThisMonth', 'newUsersLastMonth', + 'timeUsed', 'newAccountsTree', 'lastUsers')); } /** diff --git a/src/Template/Dashboard/index.ctp b/src/Template/Dashboard/index.ctp index b3fc19bc2..c457bb06d 100644 --- a/src/Template/Dashboard/index.ctp +++ b/src/Template/Dashboard/index.ctp @@ -33,9 +33,12 @@ $this->assign('title', __('Willkommen') . ' ' . $user['first_name'] . '&nbs

Account ...

--> + +

+ -
-

Server Admin Gradido ...

+
+

Gradido ...

Html->link( __('einzeln schöpfen'), ['controller' => 'TransactionCreations', 'action' => 'create'], @@ -47,21 +50,29 @@ $this->assign('title', __('Willkommen') . ' ' . $user['first_name'] . '&nbs ['class' => 'grd-nav-bn grd-nav-bn-large'] );?>
+
+ Statistik + Html->link( + __('Anmeldungen'), + ['controller' => 'Users', 'action' => 'statistics'], + ['class' => 'grd-nav-bn grd-nav-bn-large'] + );?> +
Html->link( __('Fehler') . ' (' . $adminErrorCount . ')', ['controller' => 'AdminErrors'], ['class' => 'grd-nav-bn']); ?> -
-

Adminbereich

+
+

Benutzer ...

Html->link( - __('Benutzer suchen'), + __('suchen'), ['controller' => 'StateUsers', 'action' => 'search'], ['class' => 'grd-nav-bn grd-nav-bn-large'] ); ?> - +
diff --git a/src/Template/Users/statistics.ctp b/src/Template/Users/statistics.ctp index 06359ae39..3d8221127 100644 --- a/src/Template/Users/statistics.ctp +++ b/src/Template/Users/statistics.ctp @@ -56,6 +56,36 @@ if($users->count() > 0 && $newUsersLastMonth->count()) { +
+
+
+
+

+
+
+ + + + + + + + + + + + + + + + + +
first_name . ' ' . $user->last_name ?>email ?>created ?>
+
+ toArray()); ?> +
+
+
@@ -87,5 +117,6 @@ if($users->count() > 0 && $newUsersLastMonth->count()) {
- -Html->script(['core', 'vendor.addons']); ?> \ No newline at end of file + +Html->script(['core', 'vendor.addons']); ?> +Html->script('userSearch') ?> \ No newline at end of file diff --git a/webroot/css/styles.css b/webroot/css/styles.css index 8b1840080..b59250cd3 100644 --- a/webroot/css/styles.css +++ b/webroot/css/styles.css @@ -349,3 +349,6 @@ p.grd_small { .grd-negative-currency { color: red; } +.admin-border { + border-color: #ffa600; +}