From 03591f4e004d8f1a1c2155da8579e4871e24eae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E8=BE=B0=E8=BD=A9?= <songchenxuan@easycorp.ltd>
Date: Mon, 26 Dec 2022 10:57:06 +0800
Subject: [PATCH] * Filter execution status.

---
 module/screen/css/burn.css       | 2 +-
 module/screen/model.php          | 6 +++---
 module/screen/view/burn.html.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/screen/css/burn.css b/module/screen/css/burn.css
index b9da3b4832..f1be9ddee0 100644
--- a/module/screen/css/burn.css
+++ b/module/screen/css/burn.css
@@ -1,6 +1,6 @@
 .header {display:flex; justify-content:center; }
 .img-header {width:1300px; height:120px; background-image:url("/static/images/screen_header.png"); background-repeat:no-repeat;}
-.title {padding-top:39px; padding-left:541px; white-space:nowrap; color:#B2D5E5; font-family: "Helvetica Neue",Helvetica,Tahoma,Arial,'PingFang SC','Source Han Sans CN','Source Han Sans','Source Han Serif','Hiragino Sans GB','WenQuanYi Micro Hei','Microsoft YaHei',sans-serif; letter-spacing:5px;}
+.title {padding-top:39px; padding-left:525px; white-space:nowrap; color:#B2D5E5; font-family: "Helvetica Neue",Helvetica,Tahoma,Arial,'PingFang SC','Source Han Sans CN','Source Han Sans','Source Han Serif','Hiragino Sans GB','WenQuanYi Micro Hei','Microsoft YaHei',sans-serif; letter-spacing:5px;}
 .time {position:absolute; right:10px; top:30px; color:#eee}
 
 .content {display:flex; justify-content:center; margin-top: 20px;}
diff --git a/module/screen/model.php b/module/screen/model.php
index 5a73b6918b..cba8dc0102 100644
--- a/module/screen/model.php
+++ b/module/screen/model.php
@@ -742,10 +742,11 @@ class screenModel extends model
     {
         $type = 'withdelay';
         $this->loadModel('execution');
-        $executions    = $this->execution->getPairs(0, 'sprint') + $this->execution->getPairs(0, 'stage');
+        $executions    = $this->execution->getList(0, 'sprint', 'doing') + $this->execution->getList(0, 'stage', 'doing');
+
         $executionData = array();
 
-        foreach($executions as $executionID => $executionName)
+        foreach($executions as $executionID => $execution)
         {
             $execution = $this->execution->getByID($executionID);
 
@@ -767,7 +768,6 @@ class screenModel extends model
             $execution->chartData = $chartData;
             $executionData[$executionID] = $execution;
         }
-
         return $executionData;
     }
 }
diff --git a/module/screen/view/burn.html.php b/module/screen/view/burn.html.php
index c49baeaeeb..75dcf390c4 100644
--- a/module/screen/view/burn.html.php
+++ b/module/screen/view/burn.html.php
@@ -4,7 +4,7 @@
 <?php js::set('executions', $executions);?>
 <div class='header'>
   <div class='img-header'>
-    <h2 class='title'>迭代燃尽图</h2>
+    <h2 class='title'>迭代燃尽图大屏</h2>
     <span class='time'><?php echo '更新时间:' . $date;?></span>
   </div>
 </div>