From 5154d3bc0d7c007434e9f3bbd8254d8e4ae04b4d Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Mon, 31 Aug 2020 17:16:44 +0800
Subject: [PATCH] * Finish task#7764.

---
 module/block/control.php               | 10 +++---
 module/block/view/sprintblock.html.php | 44 ++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 module/block/view/sprintblock.html.php

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 @@
+<?php
+/**
+ * The sprint block view file of block module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yidong Wang <yidong@cnezsoft.com>
+ * @package     block
+ * @version     $Id$
+ * @link        http://www.zentao.net
+ */
+?>
+<?php if(!$summary->total): ?>
+<div class='empty-tip'><?php echo $lang->block->emptyTip;?></div>
+<?php else:?>
+<style>
+.status-bars {display: table;width: 60%;height: 140px;padding: 5px;padding-top: 50px;margin: 0;overflow: hidden;}
+</style>
+<div class="panel-body table-row">
+  <div class="col-4 text-middle text-center">
+    <div class="tile">
+      <div class="tile-title"><?php echo $lang->block->allProject;?></div>
+      <?php $projectLink = $this->createLink('project', 'all', 'status=all')?>
+      <div class="tile-amount"><?php echo $summary->total ? html::a($projectLink, $summary->total) : 0;?></div>
+    </div>
+  </div>
+  <div class="col-8 text-middle">
+    <ul class="status-bars  all-statistics">
+      <li>
+        <span class="bar" style="height: <?php echo $progress->doing * 100;?>%">
+          <span class="value"><?php echo $summary->doing;?></span>
+        </span>
+        <span class="title"><?php echo $lang->block->doingProject;?></span>
+      </li>
+      <li>
+        <span class="bar" style="height: <?php echo $progress->closed * 100;?>%">
+          <span class="value"><?php echo $summary->closed;?></span>
+        </span>
+        <span class="title"><?php echo $lang->block->finishProject;?></span>
+      </li>
+    </ul>
+  </div>
+</div>
+<?php endif;?>