@@ -76,11 +79,8 @@
if(isset($currentFilter) and $currentFilter != 'all')
{
if($groupBy == 'story' and $currentFilter == 'linked' and empty($task->story)) continue;
- if($groupBy == 'pri' and $currentFilter == 'setted' and empty($task->pri)) continue;
+ if($groupBy == 'pri' and $currentFilter == 'noset' and !empty($task->pri)) continue;
if($groupBy == 'assignedTo' and $currentFilter == 'undone' and $task->status != 'wait' and $task->status != 'doing') continue;
- if($groupBy == 'finishedBy' and $currentFilter == 'done' and $task->status != 'done') continue;
- if($groupBy == 'closedBy' and $currentFilter == 'closed' and $task->status != 'closed') continue;
- if($groupBy == 'deadline' and $currentFilter == 'setted' and $task->deadline == '0000-00-00') continue;
}
?>
assignedTo == $app->user->account ? "style='color:red'" : '';?>
@@ -121,18 +121,23 @@
|
" . $groupName, '', "class='expandGroup' data-action='expand' title='$groupName'");?>
+
+ assignedTo])) printf($lang->project->memberHours, $users[$task->assignedTo], $members[$task->assignedTo]->totalHours);?>
+ project->groupSummary, $groupSum, $groupWait, $groupDoing, $groupEstimate, $groupConsumed, $groupLeft);?>
|
- id . $lang->colon; if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;?> |
- task->priList, $task->pri, $task->pri)?>'>pri == '0' ? '' : zget($lang->task->priList, $task->pri, $task->pri);?> |
+ id;?> |
+ task->priList, $task->pri, $task->pri)?>'>task->priList, $task->pri, $task->pri);?> |
+ id", $task->name)) echo $task->name;?> |
+ status;?> >task->statusList[$task->status];?> |
+ delay)) echo 'delayed';?>>deadline, 0, 4) > 0) echo $task->deadline;?> |
>assignedToRealName;?> |
finishedBy];?> |
estimate;?> |
consumed;?> |
left;?> |
+ progess . '%';?> |
task->typeList[$task->type];?> |
- delay)) echo 'delayed';?>>deadline, 0, 4) > 0) echo $task->deadline;?> |
- status;?> >task->statusList[$task->status];?> |
id", '', 'list');?>
project&taskid=$task->id", '', 'list', '', 'hiddenwin');?>
@@ -141,31 +146,20 @@
- |
- |
-
- assignedTo])) printf($lang->project->memberHours, $users[$task->assignedTo], $members[$task->assignedTo]->totalHours);?>
- project->noTimeSummary, $groupSum, $groupWait, $groupDoing);?>
- |
- |
- |
- |
- |
-
- |
+ |
" . $groupName, '', "class='collapseGroup' data-action='collapse' title='$groupName'");?>
+ |
+ |
+ |
+
assignedTo])) printf($lang->project->memberHours, $users[$task->assignedTo], $members[$task->assignedTo]->totalHours);?>
- project->noTimeSummary, $groupSum, $groupWait, $groupDoing);?>
+ project->groupSummary, $groupSum, $groupWait, $groupDoing, $groupEstimate, $groupConsumed, $groupLeft);?>
|
- |
- |
- |
- |
diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php
index 2b07eeb07d..f31355e368 100644
--- a/module/project/view/kanban.html.php
+++ b/module/project/view/kanban.html.php
@@ -70,6 +70,7 @@