From c6eeec553a6c3cecd97f8bfb8a508e5de40dffa5 Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Fri, 21 Aug 2020 09:29:33 +0800 Subject: [PATCH] * Add Scrum dynamic. --- module/block/control.php | 11 +++++++-- module/block/model.php | 1 + module/block/view/scrumdynamicblock.html.php | 25 ++++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/module/block/control.php b/module/block/control.php index b646575654..0aaf7ce82a 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1522,6 +1522,13 @@ class block extends control */ public function printScrumdynamicBlock() { - $this->view->program = $this->loadModel('project')->getByID($this->session->program); - } + $projects = $this->loadModel('project')->getPairs(); + $actions = $this->dao->select('*')->from(TABLE_ACTION) + ->where('project')->in(array_keys($projects)) + ->orderBy('id_desc') + ->fetchAll(); + + $this->view->actions = $this->loadModel('action')->transformActions($actions); + $this->view->users = $this->loadModel('user')->getPairs('noletter'); + } } diff --git a/module/block/model.php b/module/block/model.php index 703856cd5e..1aa789eba7 100644 --- a/module/block/model.php +++ b/module/block/model.php @@ -682,4 +682,5 @@ class blockModel extends model return json_encode($params); } + } diff --git a/module/block/view/scrumdynamicblock.html.php b/module/block/view/scrumdynamicblock.html.php index e69de29bb2..05b98b0f15 100644 --- a/module/block/view/scrumdynamicblock.html.php +++ b/module/block/view/scrumdynamicblock.html.php @@ -0,0 +1,25 @@ + +