diff --git a/module/block/control.php b/module/block/control.php index 03c9c0a6ca..0cb08a9091 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1108,14 +1108,14 @@ class block extends control */ public function printWaterfallReportBlock() { - $this->loadModel('program'); $program = $this->loadModel('project')->getByID($this->session->program); $today = helper::today(); - $date = date('Ymd', strtotime($this->loadModel('weekly')->getThisMonday($today))); + $date = date('Ymd', strtotime('this week Monday')); $begin = $program->begin; - $weeks = $this->weekly->getWeekPairs($begin); + $weeks = $this->loadModel('weekly')->getWeekPairs($begin); $current = zget($weeks, $date, ''); - $task = $this->dao->select(" + + $task = $this->dao->select(" sum(consumed) as totalConsumed, sum(if(status != 'cancel' and status != 'closed', `left`, 0)) as totalLeft") ->from(TABLE_TASK)->where('program')->eq($this->session->program) @@ -1304,7 +1304,7 @@ class block extends control * @access public * @return void */ - public function printScrumprojectBlock() + public function printSprintBlock() { $status = $this->dao->select('status, count(*) as count')->from(TABLE_PROJECT) ->where('deleted')->eq(0) diff --git a/module/block/view/sprintblock.html.php b/module/block/view/sprintblock.html.php new file mode 100644 index 0000000000..6cc721b8cf --- /dev/null +++ b/module/block/view/sprintblock.html.php @@ -0,0 +1,44 @@ + + * @package block + * @version $Id$ + * @link http://www.zentao.net + */ +?> +total): ?> +