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

Add project users overview

Browse Source
This commit is contained in:
Frederic Guillot
2015-08-16 22:17:45 -04:00
parent 06638ff5e9
commit 2fd177363b
21 changed files with 468 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Model/Acl.php
View File

@@ -76,6 +76,7 @@ class Acl extends Base
*/
private $project_admin_acl = array(
'project' => array('remove'),
'projectuser' => '*',
);
/**

37
app/Model/Project.php
View File

@@ -260,6 +260,24 @@ class Project extends Base
return $projects;
}
/**
* Fetch more information for each project
*
* @access public
* @param array $projects
* @return array
*/
public function applyProjectDetails(array $projects)
{
foreach ($projects as &$project) {
$this->getColumnStats($project);
$project['managers'] = $this->projectPermission->getManagers($project['id']);
$project['members'] = $this->projectPermission->getOnlyMembers($project['id']);
}
return $projects;
}
/**
* Get project summary for a list of project
*
@@ -279,6 +297,25 @@ class Project extends Base
->callback(array($this, 'applyColumnStats'));
}
/**
* Get project details (users + columns) for a list of project
*
* @access public
* @param array $project_ids List of project id
* @return \PicoDb\Table
*/
public function getQueryProjectDetails(array $project_ids)
{
if (empty($project_ids)) {
return $this->db->table(Project::TABLE)->limit(0);
}
return $this->db
->table(Project::TABLE)
->in('id', $project_ids)
->callback(array($this, 'applyProjectDetails'));
}
/**
* Create a project
*

77
app/Model/ProjectPermission.php
View File

@@ -66,18 +66,19 @@ class ProjectPermission extends Base
}
/**
* Get a list of people associated to the project
* Get a list of standard user members for a project
*
* @access public
* @param integer $project_id Project id
* @return array
*/
public function getAssociatedUsers($project_id)
public function getOnlyMembers($project_id)
{
$users = $this->db
->table(self::TABLE)
->join(User::TABLE, 'id', 'user_id')
->eq('project_id', $project_id)
->eq('is_owner', 0)
->asc('username')
->columns(User::TABLE.'.id', User::TABLE.'.username', User::TABLE.'.name')
->findAll();
@@ -106,6 +107,57 @@ class ProjectPermission extends Base
return $this->user->prepareList($users);
}
/**
* Get query for project users overview
*
* @access public
* @param array $project_ids
* @param integer $is_owner
* @return \PicoDb\Table
*/
public function getQueryByRole(array $project_ids, $is_owner = 0)
{
if (empty($project_ids)) {
$project_ids = array(-1);
}
return $this
->db
->table(self::TABLE)
->join(User::TABLE, 'id', 'user_id')
->join(Project::TABLE, 'id', 'project_id')
->eq(self::TABLE.'.is_owner', $is_owner)
->eq(Project::TABLE.'.is_private', 0)
->in(Project::TABLE.'.id', $project_ids)
->columns(
User::TABLE.'.id',
User::TABLE.'.username',
User::TABLE.'.name',
Project::TABLE.'.name AS project_name',
Project::TABLE.'.id'
);
}
/**
* Get a list of people associated to the project
*
* @access public
* @param integer $project_id Project id
* @return array
*/
public function getAssociatedUsers($project_id)
{
$users = $this->db
->table(self::TABLE)
->join(User::TABLE, 'id', 'user_id')
->eq('project_id', $project_id)
->asc('username')
->columns(User::TABLE.'.id', User::TABLE.'.username', User::TABLE.'.name')
->findAll();
return $this->user->prepareList($users);
}
/**
* Get allowed and not allowed users for a project
*
@@ -127,7 +179,6 @@ class ProjectPermission extends Base
$users['managers'] = $this->getManagers($project_id);
foreach ($all_users as $user_id => $username) {
if (! isset($users['allowed'][$user_id])) {
$users['not_allowed'][$user_id] = $username;
}
@@ -269,26 +320,6 @@ class ProjectPermission extends Base
->exists();
}
/**
* Filter a list of projects for a given user
*
* @access public
* @param array $projects Project list: ['project_id' => 'project_name']
* @param integer $user_id User id
* @param string $filter Method name to apply
* @return array
*/
public function filterProjects(array $projects, $user_id, $filter = 'isUserAllowed')
{
foreach ($projects as $project_id => $project_name) {
if (! $this->$filter($project_id, $user_id)) {
unset($projects[$project_id]);
}
}
return $projects;
}
/**
* Return a list of allowed active projects for a given user
*

37
app/Model/TaskFinder.php
View File

@@ -12,6 +12,43 @@ use PDO;
*/
class TaskFinder extends Base
{
/**
* Get query for project user overview
*
* @access public
* @param array $project_ids
* @param integer $is_active
* @return \PicoDb\Table
*/
public function getProjectUserOverviewQuery(array $project_ids, $is_active)
{
if (empty($project_ids)) {
$project_ids = array(-1);
}
return $this->db
->table(Task::TABLE)
->columns(
Task::TABLE.'.id',
Task::TABLE.'.title',
Task::TABLE.'.date_due',
Task::TABLE.'.date_started',
Task::TABLE.'.project_id',
Task::TABLE.'.color_id',
Task::TABLE.'.time_spent',
Task::TABLE.'.time_estimated',
Project::TABLE.'.name AS project_name',
Board::TABLE.'.title AS column_name',
User::TABLE.'.username AS assignee_username',
User::TABLE.'.name AS assignee_name'
)
->eq(Task::TABLE.'.is_active', $is_active)
->in(Project::TABLE.'.id', $project_ids)
->join(Project::TABLE, 'id', 'project_id')
->join(Board::TABLE, 'id', 'column_id', Task::TABLE)
->join(User::TABLE, 'id', 'owner_id', Task::TABLE);
}
/**
* Get query for assigned user tasks
*

11
app/Model/User.php
View File

@@ -208,12 +208,19 @@ class User extends Base
* List all users (key-value pairs with id/username)
*
* @access public
* @param boolean $prepend Prepend "All users"
* @return array
*/
public function getList()
public function getList($prepend = false)
{
$users = $this->db->table(self::TABLE)->columns('id', 'username', 'name')->findAll();
return $this->prepareList($users);
$listing = $this->prepareList($users);
if ($prepend) {
return array(User::EVERYBODY_ID => t('Everybody')) + $listing;
}
return $listing;
}
/**