diff --git a/src/IDF/Project.php b/src/IDF/Project.php index 2f09219..14f66c7 100644 --- a/src/IDF/Project.php +++ b/src/IDF/Project.php @@ -132,6 +132,47 @@ class IDF_Project extends Pluf_Model } return $projects[0]; } + + /** + * Returns the number of open/closed issues. + * + * @param string Status ('open'), 'closed' + * @param IDF_Tag Subfilter with a label (null) + * @return int Count + */ + public function getIssueCountByOwner($status='open') + { + switch ($status) { + case 'open': + $tags = implode(',', $this->getTagIdsByStatus('open')); + break; + case 'closed': + default: + $tags = implode(',', $this->getTagIdsByStatus('closed')); + break; + } + $sqlIssueTable = Pluf::factory('IDF_Issue')->getSqlTable(); + $query = <<<"QUERY" +SELECT uid AS id,COUNT(uid) AS nb +FROM ( + SELECT COALESCE(owner, -1) AS uid + FROM $sqlIssueTable + WHERE status IN ($tags) + ) AS ff +GROUP BY uid +QUERY; + $db = Pluf::db(); + $dbData = $db->select($query); + $ownerStatistics = array(); + foreach ($dbData as $k => $v) { + $key = ($v['id'] === '-1') ? null : $v['id']; + $ownerStatistics[$key] = (int)$v['nb']; + } + + arsort($ownerStatistics); + + return $ownerStatistics; + } /** * Returns the number of open/closed issues. diff --git a/src/IDF/Views/Issue.php b/src/IDF/Views/Issue.php index 91fdc40..fc9d7b4 100644 --- a/src/IDF/Views/Issue.php +++ b/src/IDF/Views/Issue.php @@ -77,6 +77,79 @@ class IDF_Views_Issue $params, $request); } + /** + * View the issue summary. + * TODO Add thoses data in cache, and process it only after an issue update + */ + public $summary_precond = array('IDF_Precondition::accessIssues'); + public function summary($request, $match) + { + $tagStatistics = array(); + $ownerStatistics = array(); + $status = array(); + $isTrackerEmpty = false; + + $prj = $request->project; + $opened = $prj->getIssueCountByStatus('open'); + $closed = $prj->getIssueCountByStatus('closed'); + + // Check if the tracker is empty + if ($opened === 0 && $closed === 0) { + $isTrackerEmpty = true; + } else { + if ($opened > 0 || $closed > 0) { + // Issue status statistics + $status['Open'] = array($opened, (int)(100 * $opened / ($opened + $closed))); + $status['Closed'] = array($closed, (int)(100 * $closed / ($opened + $closed))); + } + + if ($opened > 0) { + // Issue owner statistics + $owners = $prj->getIssueCountByOwner('open'); + foreach ($owners as $user => $nb) { + if ($user === '') { + $key = __('Not assigned'); + } else { + $obj = Pluf::factory('Pluf_User')->getOne(array('filter'=>'id='.$user)); + $key = $obj->first_name . ' ' . $obj->last_name; + } + $ownerStatistics[$key] = array($nb, (int)(100 * $nb / $opened)); + } + + // Issue class tag statistics + $tags = $prj->getTagCloud(); + foreach ($tags as $t) { + $tagStatistics[$t->class][$t->name] = array($t->nb_use, $t->id); + } + foreach($tagStatistics as $k => $v) { + $nbIssueInClass = 0; + foreach ($v as $val) { + $nbIssueInClass += $val[0]; + } + foreach ($v as $kk => $vv) { + $tagStatistics[$k][$kk] = array($vv[0], (int)(100 * $vv[0] / $nbIssueInClass), $vv[1]); + } + } + + // Sort + krsort($tagStatistics); + arsort($ownerStatistics); + } + } + + $title = sprintf(__('Summary of tracked issues in %s.'), (string) $prj); + + return Pluf_Shortcuts_RenderToResponse('idf/issues/summary.html', + array('page_title' => $title, + 'trackerEmpty' => $isTrackerEmpty, + 'project' => $prj, + 'tagStatistics' => $tagStatistics, + 'ownerStatistics' => $ownerStatistics, + 'status' => $status, + ), + $request); + } + /** * View the issues watch list of a given user. * Limited to a specified project diff --git a/src/IDF/conf/urls.php b/src/IDF/conf/urls.php index 55c47fa..03779c0 100644 --- a/src/IDF/conf/urls.php +++ b/src/IDF/conf/urls.php @@ -117,6 +117,11 @@ $ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/$#', 'base' => $base, 'model' => 'IDF_Views_Issue', 'method' => 'index'); + +$ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/summary/$#', + 'base' => $base, + 'model' => 'IDF_Views_Issue', + 'method' => 'summary'); $ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/search/$#', 'base' => $base, diff --git a/src/IDF/templates/idf/issues/base.html b/src/IDF/templates/idf/issues/base.html index 779de34..636d5da 100644 --- a/src/IDF/templates/idf/issues/base.html +++ b/src/IDF/templates/idf/issues/base.html @@ -2,7 +2,8 @@ {block tabissues} class="active"{/block} {block subtabs}
-{trans 'Open Issues'} +{trans 'Summary'} +| {trans 'Open Issues'} {if !$user.isAnonymous()} | {trans 'New Issue'} | {trans 'My Issues'} | {trans 'My watch list'}{/if} |
diff --git a/src/IDF/templates/idf/issues/summary.html b/src/IDF/templates/idf/issues/summary.html new file mode 100644 index 0000000..bfff813 --- /dev/null +++ b/src/IDF/templates/idf/issues/summary.html @@ -0,0 +1,95 @@ +{extends "idf/issues/base.html"} + +{block docclass}yui-t2{assign $inSummaryIssues=true}{/block} + +{block body} +{if $trackerEmpty} + {aurl 'create_url', 'IDF_Views_Issue::create', array($project.shortname)} +

{blocktrans}The issue tracker is empty.
You can create your first issue here.{/blocktrans}

+{else} +
+{foreach $tagStatistics as $key => $class} +
+

{blocktrans}Unresolved: By {$key}{/blocktrans}

+ + + {foreach $class as $key => $value} + + + + + + {/foreach} + +
{$key}{$value[0]} + + + + + + +
+
+ 		{$value[1]}%
+
+
+{/foreach} +
+ +
+{if $status} +
+

{blocktrans}Status Summary{/blocktrans}

+ + + {foreach $status as $key => $value} + + + + + + {/foreach} + +
{$key}{$value[0]} + + + + + + +
+
+ 		{$value[1]}%
+
+
+{/if} + +{if $ownerStatistics} +
+

{blocktrans}Unresolved: By Assignee{/blocktrans}

+ + + {foreach $ownerStatistics as $key => $value} + + + + + + {/foreach} + +
{$key}{$value[0]} + + + + + + +
+
+ 		{$value[1]}%
+
+
+{/if} +
+{/if} +{/block} diff --git a/test/IDF/ProjectTest.php b/test/IDF/ProjectTest.php new file mode 100644 index 0000000..7881bbe --- /dev/null +++ b/test/IDF/ProjectTest.php @@ -0,0 +1,90 @@ +login = 'user1'; + $user1->create(); + $user2 = new Pluf_User(); + $user2->login = 'user2'; + $user2->create(); + + // Add a project + $prj = new IDF_Project(); + $prj->create(); + $tag = $prj->getTagIdsByStatus('open'); + + // First test with no issue + $stats = $prj->getIssueCountByOwner(); + $this->assertEquals($stats, array()); + + // Add some issues + $issue1 = new IDF_Issue(); + $issue1->project = $prj; + $issue1->submitter = $user1; + $issue1->owner = $user1; + $issue1->status = new IDF_Tag($tag[0]); + $issue1->create(); + + $issue2 = new IDF_Issue(); + $issue2->project = $prj; + $issue2->submitter = $user2; + $issue2->owner = $user1; + $issue2->status = new IDF_Tag($tag[0]); + $issue2->create(); + + $issue3 = new IDF_Issue(); + $issue3->project = $prj; + $issue3->submitter = $user2; + $issue3->status = new IDF_Tag($tag[0]); + $issue3->create(); + + $issue4 = new IDF_Issue(); + $issue4->project = $prj; + $issue4->submitter = $user2; + $issue4->owner = $user2; + $issue4->status = new IDF_Tag($tag[0]); + $issue4->create(); + + // 2nd test + $stats = $prj->getIssueCountByOwner(); + $expected = array(0 => 1, + $user2->id => 1, + $user1->id => 2); + $this->assertEquals($stats, $expected); + + // Clean DB + $issue4->delete(); + $issue3->delete(); + $issue2->delete(); + $issue1->delete(); + $prj->delete(); + $user2->delete(); + $user1->delete(); + } +} + diff --git a/www/media/idf/css/style.css b/www/media/idf/css/style.css index 3480828..4b94eb2 100644 --- a/www/media/idf/css/style.css +++ b/www/media/idf/css/style.css @@ -1104,3 +1104,53 @@ div.p-list-private { right: -3px; position: relative; } + +/* + * Issue summary + */ +div.issue-summary { + float: left; + width: 50%; +} + +div.issue-summary > div { + margin-right: 3em; + padding-top: 1em; +} + +div.issue-summary h2 { + border-bottom: 1px solid #A5E26A; +} + +table.issue-summary { + width: 100%; +} + +table.issue-summary tr td { + border: 0; + padding: .1em .005em; +} + +table.issue-summary td.graph { + width: 60%; +} + +table.issue-summary td.count { + text-align: right; + padding-right: .5em; +} + +table.graph { + width: 100%; + margin: 0; + padding: 0; +} + +table.issue-summary td.graph-color { + background: #3C78B5; +} + +table.issue-summary td.graph-percent { + padding-left: 1em; +} +