This commit is contained in:
滔哥
2017-12-12 10:30:34 +08:00
parent c31cd78f91
commit 9efbce145c
3 changed files with 10 additions and 3 deletions
+4 -2
View File
@@ -987,8 +987,10 @@ class story extends control
public function tasks($storyID, $projectID = 0)
{
$this->loadModel('task');
$this->view->tasks = $this->task->getStoryTasks($storyID, $projectID);
$this->view->users = $this->user->getPairs('noletter');
$tasks = $this->task->getStoryTasks($storyID, $projectID);
$this->view->tasks = $tasks;
$this->view->users = $this->user->getPairs('noletter');
$this->view->summary = $this->loadModel('project')->summary($tasks);
$this->display();
}
+5
View File
@@ -39,6 +39,11 @@ include '../../common/view/chart.html.php';
</tr>
<?php endforeach;?>
</tbody>
<tfoot>
<tr>
<td colspan="9"><?php echo $summary;?></td>
</tr>
</tfoot>
</table>
</form>
</div>
+1 -1
View File
@@ -1357,7 +1357,7 @@ class taskModel extends model
*/
public function getStoryTasks($storyID, $projectID = 0)
{
$tasks = $this->dao->select('id, name, assignedTo, pri, status, estimate, consumed, `left`')
$tasks = $this->dao->select('id, name, assignedTo, pri, status, estimate, consumed, closedReason, `left`')
->from(TABLE_TASK)
->where('story')->eq((int)$storyID)
->andWhere('deleted')->eq(0)