AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move dashboard menu for calendar and activity stream

Browse Source
This commit is contained in:
Frederic Guillot
2017-03-11 19:36:48 -05:00
parent cfd3000d83
commit 8f6b3295e8
11 changed files with 59 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/Controller/ActivityController.php
View File

@@ -10,6 +10,22 @@ namespace Kanboard\Controller;
*/
class ActivityController extends BaseController
{
/**
* Activity page for a user
*
* @access public
*/
public function user()
{
$user = $this->getUser();
$this->response->html($this->helper->layout->dashboard('activity/user', array(
'title' => t('Activity stream for %s', $this->helper->user->getFullname($user)),
'events' => $this->helper->projectActivity->getProjectsEvents($this->projectPermissionModel->getActiveProjectIds($user['id']), 100),
'user' => $user,
)));
}
/**
* Activity page for a project
*
@@ -20,9 +36,9 @@ class ActivityController extends BaseController
$project = $this->getProject();
$this->response->html($this->helper->layout->app('activity/project', array(
'events' => $this->helper->projectActivity->getProjectEvents($project['id']),
'title' => t('%s\'s activity', $project['name']),
'events' => $this->helper->projectActivity->getProjectEvents($project['id']),
'project' => $project,
'title' => t('%s\'s activity', $project['name'])
)));
}
@@ -36,11 +52,11 @@ class ActivityController extends BaseController
$task = $this->getTask();
$this->response->html($this->helper->layout->task('activity/task', array(
'title' => $task['title'],
'task' => $task,
'title' => $task['title'],
'task' => $task,
'project' => $this->projectModel->getById($task['project_id']),
'events' => $this->helper->projectActivity->getTaskEvents($task['id']),
'tags' => $this->taskTagModel->getList($task['id']),
'events' => $this->helper->projectActivity->getTaskEvents($task['id']),
'tags' => $this->taskTagModel->getList($task['id']),
)));
}
}

28
app/Controller/CalendarController.php
View File

@@ -17,17 +17,31 @@ use Kanboard\Model\TaskModel;
class CalendarController extends BaseController
{
/**
* Show calendar view for projects
* Show calendar view for a user
*
* @access public
*/
public function show()
public function user()
{
$user = $this->getUser();
$this->response->html($this->helper->layout->app('calendar/user', array(
'user' => $user,
)));
}
/**
* Show calendar view for a project
*
* @access public
*/
public function project()
{
$project = $this->getProject();
$this->response->html($this->helper->layout->app('calendar/show', array(
'project' => $project,
'title' => $project['name'],
$this->response->html($this->helper->layout->app('calendar/project', array(
'project' => $project,
'title' => $project['name'],
'description' => $this->helper->projectHeader->getDescription($project),
)));
}
@@ -37,7 +51,7 @@ class CalendarController extends BaseController
*
* @access public
*/
public function project()
public function projectEvents()
{
$project_id = $this->request->getIntegerParam('project_id');
$start = $this->request->getStringParam('start');
@@ -62,7 +76,7 @@ class CalendarController extends BaseController
*
* @access public
*/
public function user()
public function userEvents()
{
$user_id = $this->request->getIntegerParam('user_id');
$start = $this->request->getStringParam('start');

31
app/Controller/DashboardController.php
View File

@@ -75,35 +75,4 @@ class DashboardController extends BaseController
'user' => $user,
)));
}
/**
* My activity stream
*
* @access public
*/
public function activity()
{
$user = $this->getUser();
$this->response->html($this->helper->layout->dashboard('dashboard/activity', array(
'title' => t('Activity stream for %s', $this->helper->user->getFullname($user)),
'events' => $this->helper->projectActivity->getProjectsEvents($this->projectPermissionModel->getActiveProjectIds($user['id']), 100),
'user' => $user,
)));
}
/**
* My calendar
*
* @access public
*/
public function calendar()
{
$user = $this->getUser();
$this->response->html($this->helper->layout->dashboard('dashboard/calendar', array(
'title' => t('Calendar for %s', $this->helper->user->getFullname($user)),
'user' => $user,
)));
}
}