From d9322e91e237644bf21cfd51ef3fc06df7b713e0 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 17 Feb 2023 09:33:34 +0800
Subject: [PATCH] * Code for finish task#84576.

---
 .../view/executionstatisticblock.html.php     | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/module/block/view/executionstatisticblock.html.php b/module/block/view/executionstatisticblock.html.php
index a9c1ebdbbb..ff61feb789 100644
--- a/module/block/view/executionstatisticblock.html.php
+++ b/module/block/view/executionstatisticblock.html.php
@@ -7,17 +7,17 @@
 .types-line > li > div:after {content: ''; display: block; background: #FFFFFF; box-shadow: 0 2px 4px 0 rgba(170,170,170,0.50), 0 0 5px 0 rgba(0,0,0,0.1); width: 10px; height: 10px; position: absolute; border-radius: 50%; top: 0; left: 50%; margin-left: -2px;}
 .types-line > li > div > small {display: block; color: #A6AAB8;}
 .types-line > li > div > span {display: block; color: #CBD0DB; font-size: 16px;}
-.product-info {position: relative; height: 65px;}
-.product-info + .product-info {margin-top: 10px;}
-.product-info .progress {position: absolute; left: 10px; top: 35px; right: 100px;}
-.product-info .progress-info {position: absolute; left: 8px; top: 10px; width: 180px; font-size: 12px;}
-.product-info .type-info {color: #A6AAB8; text-align: center; position: absolute; right: 0; top: 6px; width: 100px;}
-html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; position: absolute; right: 0; top: 6px; width: 110px;}
-.product-info .type-value,
-.product-info .type-label {font-size: 12px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
-.product-info .type-value {font-size: 14px;}
-.product-info .type-value > strong {font-size: 20px; color: #3C4353;}
-.product-info .actions {position: absolute; left: 10px; top: 14px;}
+.execution-info {position: relative; height: 65px;}
+.execution-info + .execution-info {margin-top: 10px;}
+.execution-info .progress {position: absolute; left: 10px; top: 35px; right: 100px;}
+.execution-info .progress-info {position: absolute; left: 8px; top: 10px; width: 180px; font-size: 12px;}
+.execution-info .type-info {color: #A6AAB8; text-align: center; position: absolute; right: 0; top: 6px; width: 100px;}
+html[lang="en"] .execution-info .type-info {color: #A6AAB8; text-align: center; position: absolute; right: 0; top: 6px; width: 110px;}
+.execution-info .type-value,
+.execution-info .type-label {font-size: 12px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
+.execution-info .type-value {font-size: 14px;}
+.execution-info .type-value > strong {font-size: 20px; color: #3C4353;}
+.execution-info .actions {position: absolute; left: 10px; top: 14px;}
 .block-statistic .panel-body {padding-top: 0}
 .block-statistic .tile {margin-bottom: 30px;}
 .block-statistic .tile-title {font-size: 18px; color: #A6AAB8;}
@@ -58,6 +58,7 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po
 
 .status-count{margin:auto}
 .status-count tr:first-child td:last-child{color:#000;font-weight:bold}
+.block-statistic .execution-progress {vertical-align: middle;}
 </style>
 <script>
 <?php $blockNavId = 'nav-' . uniqid(); ?>
@@ -132,8 +133,8 @@ $(function()
               </div>
             </div>
           </div>
-          <div class="col-7">
-            <div class="product-info">
+          <div class="col-7 execution-progress">
+            <div class="execution-info">
               <div class="progress-info"><i class="icon icon-check-circle text-success icon-sm"></i> <span class="text-muted"><?php echo $lang->task->yesterdayFinished;?></span> <strong><?php echo $execution->yesterdayFinished;?></strong></div>
               <div class="progress">
                 <div class="progress-bar" role="progressbar" aria-valuenow="<?php echo $execution->taskProgress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $execution->taskProgress;?>%">
@@ -154,7 +155,8 @@ $(function()
                 </div>
               </div>
             </div>
-            <div class="product-info">
+            <?php if($execution->lifetime != 'ops' and !in_array($execution->attribute, array('request', 'review'))):?>
+            <div class="execution-info">
               <div class="progress-info"><i class="icon icon-check-circle text-success icon-sm"></i> <span class="text-muted"><?php echo $lang->story->released;?></span> <strong><?php echo $execution->releasedStories;?></strong></div>
               <div class="progress">
                 <div class="progress-bar" role="progressbar" aria-valuenow="<?php echo $execution->storyProgress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $execution->storyProgress;?>%"></div>
@@ -174,7 +176,8 @@ $(function()
                 </div>
               </div>
             </div>
-            <div class="product-info">
+            <?php if($execution->attribute != 'design'):?>
+            <div class="execution-info">
               <div class="progress-info"><i class="icon icon-check-circle text-success icon-sm"></i> <span class="text-muted"><?php echo $lang->bug->yesterdayResolved;?></span> <strong><?php echo $execution->yesterdayResolved;?></strong></div>
               <div class="progress">
                 <div class="progress-bar" role="progressbar" aria-valuenow="<?php echo $execution->bugProgress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $execution->bugProgress;?>%">
@@ -195,6 +198,8 @@ $(function()
                 </div>
               </div>
             </div>
+            <?php endif;?>
+            <?php endif;?>
           </div>
         </div>
       </div>