Add user dashboard view

2015-02-04 22:05:41 -05:00 · 2015-02-04 22:05:41 -05:00 · 2d070627d7
parent 24300f828a
commit 2d070627d7
17 changed files with 36 additions and 5 deletions
--- a/app/Controller/App.php
+++ b/app/Controller/App.php
@ -22,34 +22,44 @@ class App extends Base
        $this->response->text('OK');
    }

+    /**
+     * User dashboard view for admins
+     *
+     * @access public
+     */
+    public function dashboard()
+    {
+        $this->index($this->request->getIntegerParam('user_id'), 'dashboard');
+    }
+
    /**
     * Dashboard for the current user
     *
     * @access public
     */
-    public function index()
+    public function index($user_id = 0, $action = 'index')
    {
        $status = array(SubTaskModel::STATUS_TODO, SubTaskModel::STATUS_INPROGRESS);
-        $user_id = $this->userSession->getId();
+        $user_id = $user_id ?: $this->userSession->getId();
        $projects = $this->projectPermission->getActiveMemberProjects($user_id);
        $project_ids = array_keys($projects);

        $task_paginator = $this->paginator
-            ->setUrl('app', 'index', array('pagination' => 'tasks'))
+            ->setUrl('app', $action, array('pagination' => 'tasks'))
            ->setMax(10)
            ->setOrder('tasks.id')
            ->setQuery($this->taskFinder->getUserQuery($user_id))
            ->calculateOnlyIf($this->request->getStringParam('pagination') === 'tasks');

        $subtask_paginator = $this->paginator
-            ->setUrl('app', 'index', array('pagination' => 'subtasks'))
+            ->setUrl('app', $action, array('pagination' => 'subtasks'))
            ->setMax(10)
            ->setOrder('tasks.id')
            ->setQuery($this->subTask->getUserQuery($user_id, $status))
            ->calculateOnlyIf($this->request->getStringParam('pagination') === 'subtasks');

        $project_paginator = $this->paginator
-            ->setUrl('app', 'index', array('pagination' => 'projects'))
+            ->setUrl('app', $action, array('pagination' => 'projects'))
            ->setMax(10)
            ->setOrder('name')
            ->setQuery($this->project->getQueryColumnStats($project_ids))
--- a/app/Locale/da_DK/translations.php
+++ b/app/Locale/da_DK/translations.php
@ -700,4 +700,5 @@ return array(
    // 'Add a comment logging moving the task between columns' => '',
    // 'Moved to column %s' => '',
    // 'Change description' => '',
+    // 'User dashboard' => '',
 );
--- a/app/Locale/de_DE/translations.php
+++ b/app/Locale/de_DE/translations.php
@ -700,4 +700,5 @@ return array(
    // 'Add a comment logging moving the task between columns' => '',
    // 'Moved to column %s' => '',
    // 'Change description' => '',
+    // 'User dashboard' => '',
 );
--- a/app/Locale/es_ES/translations.php
+++ b/app/Locale/es_ES/translations.php
@ -700,4 +700,5 @@ return array(
    // 'Add a comment logging moving the task between columns' => '',
    'Moved to column %s' => 'Movido a columna %s',
    // 'Change description' => '',
+    // 'User dashboard' => '',
 );
--- a/app/Locale/fi_FI/translations.php
+++ b/app/Locale/fi_FI/translations.php
@ -700,4 +700,5 @@ return array(
    // 'Add a comment logging moving the task between columns' => '',
    // 'Moved to column %s' => '',
    // 'Change description' => '',
+    // 'User dashboard' => '',
 );
--- a/app/Locale/fr_FR/translations.php
+++ b/app/Locale/fr_FR/translations.php
@ -700,4 +700,5 @@ return array(
    'Add a comment logging moving the task between columns' => 'Ajouter un commentaire de log lorsqu\'une tâche est déplacée dans une autre colonne',
    'Moved to column %s' => 'Tâche déplacée à la colonne %s',
    'Change description' => 'Changer la description',
+    'User dashboard' => 'Tableau de bord de l\'utilisateur',
 );
--- a/app/Locale/hu_HU/translations.php
+++ b/app/Locale/hu_HU/translations.php
@ -700,4 +700,5 @@ return array(
    // 'Add a comment logging moving the task between columns' => '',
    // 'Moved to column %s' => '',
    // 'Change description' => '',
+    // 'User dashboard' => '',
 );
--- a/app/Locale/it_IT/translations.php
+++ b/app/Locale/it_IT/translations.php
@ -700,4 +700,5 @@ return array(
    // 'Add a comment logging moving the task between columns' => '',
    // 'Moved to column %s' => '',
    // 'Change description' => '',
+    // 'User dashboard' => '',
 );
--- a/app/Locale/ja_JP/translations.php
+++ b/app/Locale/ja_JP/translations.php
@ -700,4 +700,5 @@ return array(
    // 'Add a comment logging moving the task between columns' => '',
    // 'Moved to column %s' => '',
    // 'Change description' => '',
+    // 'User dashboard' => '',
 );
--- a/app/Locale/pl_PL/translations.php
+++ b/app/Locale/pl_PL/translations.php
@ -700,4 +700,5 @@ return array(
    'Add a comment logging moving the task between columns' => 'Dodaj komentarz dokumentujący przeniesienie zadania pomiędzy kolumnami',
    'Moved to column %s' => 'Przeniosiono do kolumny %s',
    // 'Change description' => '',
+    // 'User dashboard' => '',
 );
--- a/app/Locale/pt_BR/translations.php
+++ b/app/Locale/pt_BR/translations.php
@ -700,4 +700,5 @@ return array(
    'Add a comment logging moving the task between columns' => 'Adicionar un comentário de log ao mover uma tarefa em outra coluna',
    'Moved to column %s' => 'Mover para a coluna %s',
    // 'Change description' => '',
+    // 'User dashboard' => '',
 );
--- a/app/Locale/ru_RU/translations.php
+++ b/app/Locale/ru_RU/translations.php
@ -700,4 +700,5 @@ return array(
    // 'Add a comment logging moving the task between columns' => '',
    // 'Moved to column %s' => '',
    // 'Change description' => '',
+    // 'User dashboard' => '',
 );
--- a/app/Locale/sv_SE/translations.php
+++ b/app/Locale/sv_SE/translations.php
@ -700,4 +700,5 @@ return array(
    // 'Add a comment logging moving the task between columns' => '',
    // 'Moved to column %s' => '',
    // 'Change description' => '',
+    // 'User dashboard' => '',
 );
--- a/app/Locale/th_TH/translations.php
+++ b/app/Locale/th_TH/translations.php
@ -700,4 +700,5 @@ return array(
    // 'Add a comment logging moving the task between columns' => '',
    // 'Moved to column %s' => '',
    // 'Change description' => '',
+    // 'User dashboard' => '',
 );
--- a/app/Locale/zh_CN/translations.php
+++ b/app/Locale/zh_CN/translations.php
@ -700,4 +700,5 @@ return array(
    // 'Add a comment logging moving the task between columns' => '',
    // 'Moved to column %s' => '',
    // 'Change description' => '',
+    // 'User dashboard' => '',
 );
--- a/app/Model/Acl.php
+++ b/app/Model/Acl.php
@ -64,6 +64,7 @@ class Acl extends Base
     * @var array
     */
    private $admin_acl = array(
+        'app' => array('dashboard'),
        'user' => array('index', 'create', 'save', 'remove'),
        'config' => '*',
        'project' => array('remove'),
--- a/app/Template/user/sidebar.php
+++ b/app/Template/user/sidebar.php
@ -29,6 +29,12 @@
                <?= $this->a(t('Persistent connections'), 'user', 'sessions', array('user_id' => $user['id'])) ?>
            </li>
        <?php endif ?>
+        
+        <?php if ($this->userSession->isAdmin()): ?>
+            <li>
+                <?= $this->a(t('User dashboard'), 'app', 'dashboard', array('user_id' => $user['id'])) ?>
+            </li>
+        <?php endif ?>

        <?php if ($this->userSession->isAdmin() && ! $this->userSession->isCurrentUser($user['id'])): ?>
            <li>