From ff3ef94e325a02f43085c18e22db6bb71bab8192 Mon Sep 17 00:00:00 2001
From: chaideqing <chaideqing@easycorp.ltd>
Date: Tue, 14 Nov 2023 15:26:45 +0800
Subject: [PATCH] * Merge module-block to Merge184.

---
 module/block/js/dashboard.js                  |  6 ++++--
 module/block/view/executionblock.html.php     |  8 ++++----
 module/block/view/productblock.html.php       |  8 ++++----
 module/block/view/recentprojectblock.html.php |  2 +-
 module/block/view/scrumlistblock.html.php     | 10 +++++-----
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/module/block/js/dashboard.js b/module/block/js/dashboard.js
index 63f476ff44..63785ed6e9 100644
--- a/module/block/js/dashboard.js
+++ b/module/block/js/dashboard.js
@@ -64,8 +64,10 @@ function resizeBlock(blockID, width, callback)
 function refreshBlock($panel, afterRefresh)
 {
     var url = $panel.data('url');
+    var headers = {};
+    if(forceRefresh) headers['X-Zt-Refresh'] = forceRefresh;
     $panel.addClass('load-indicator loading');
-    $.ajax({url: url, dataType: 'html'}).done(function(data)
+    $.ajax({url: url, dataType: 'html', headers: headers}).done(function(data)
     {
         var $data = $(data);
         if($data.hasClass('panel')) $panel.empty().append($data.children());
@@ -284,7 +286,7 @@ $(function()
         always: function(){sortMessager.isShow && sortMessager.hide();}
     }).on('click', '.refresh-panel', function()
     {
-        refreshBlock($(this).closest('.panel'));
+        refreshBlock($(this).closest('.panel'), null, 1);
     });
 });
 
diff --git a/module/block/view/executionblock.html.php b/module/block/view/executionblock.html.php
index aa1d3d527e..79c6b1be7e 100644
--- a/module/block/view/executionblock.html.php
+++ b/module/block/view/executionblock.html.php
@@ -56,12 +56,12 @@
           <span class="status-project status-<?php echo $execution->status?>" title='<?php echo $statusName;?>'><?php echo $statusName;?></span>
           <?php endif;?>
         </td>
-        <td class="c-hours" title="<?php echo $execution->hours->totalEstimate . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalEstimate . $lang->execution->workHourUnit;?></td>
-        <td class="c-hours" title="<?php echo $execution->hours->totalLeft     . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalLeft     . $lang->execution->workHourUnit;?></td>
+        <td class="c-hours" title="<?php echo $execution->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $execution->estimate . $lang->execution->workHourUnit;?></td>
+        <td class="c-hours" title="<?php echo $execution->left     . ' ' . $lang->execution->workHour;?>"><?php echo $execution->left     . $lang->execution->workHourUnit;?></td>
         <?php endif;?>
         <td class="c-progress">
-          <div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='<?php echo round($execution->hours->progress);?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
-            <div class='progress-info'><?php echo round($execution->hours->progress);?></div>
+          <div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='<?php echo round($execution->progress);?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
+            <div class='progress-info'><?php echo round($execution->progress);?></div>
           </div>
         </td>
         <?php if($longBlock):?>
diff --git a/module/block/view/productblock.html.php b/module/block/view/productblock.html.php
index 6b0b237be1..d8e1adde09 100644
--- a/module/block/view/productblock.html.php
+++ b/module/block/view/productblock.html.php
@@ -42,10 +42,10 @@
         <?php $executionName = zget($executions, $product->id, '');?>
         <td class='c-name c-execution text-left' title='<?php echo $executionName;?>'><?php echo $executionName;?></td>
         <?php endif;?>
-        <td class="c-num"><?php echo $product->plans?></td>
-        <td class="c-num"><?php echo $product->releases?></td>
-        <td class="c-num"><?php echo $product->stories['active']?></td>
-        <td class="c-num"><?php echo $product->unResolved?></td>
+        <td class="c-num"><?php echo $product->plans;?></td>
+        <td class="c-num"><?php echo $product->releases;?></td>
+        <td class="c-num"><?php echo $product->activeStories;?></td>
+        <td class="c-num"><?php echo $product->unresolvedBugs;?></td>
       </tr> 
       <?php endforeach;?>
     </tbody>
diff --git a/module/block/view/recentprojectblock.html.php b/module/block/view/recentprojectblock.html.php
index da19da4548..cd3e14a250 100644
--- a/module/block/view/recentprojectblock.html.php
+++ b/module/block/view/recentprojectblock.html.php
@@ -102,7 +102,7 @@
               <div class='col-xs-7'>
                 <div class="progress progress-text-left">
                   <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $project->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $project->hours->progress;?>%">
-                  <span class="progress-text"><?php echo $project->hours->progress;?>%</span>
+                  <span class="progress-text"><?php echo $project->progress;?>%</span>
                 </div>
               </div>
               </div>
diff --git a/module/block/view/scrumlistblock.html.php b/module/block/view/scrumlistblock.html.php
index 8d08bf51c3..a5a8748b3d 100644
--- a/module/block/view/scrumlistblock.html.php
+++ b/module/block/view/scrumlistblock.html.php
@@ -56,13 +56,13 @@
           <span class="status-project status-<?php echo $execution->status?>" title='<?php echo $statusName;?>'><?php echo $statusName;?></span>
           <?php endif;?>
         </td>
-        <td class="c-hours" title="<?php echo $execution->hours->totalEstimate . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalEstimate . $lang->execution->workHourUnit;?></td>
-        <td class="c-hours" title="<?php echo $execution->hours->totalConsumed . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalConsumed . $lang->execution->workHourUnit;?></td>
-        <td class="c-hours" title="<?php echo $execution->hours->totalLeft     . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalLeft     . $lang->execution->workHourUnit;?></td>
+        <td class="c-hours" title="<?php echo $execution->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $execution->estimate . $lang->execution->workHourUnit;?></td>
+        <td class="c-hours" title="<?php echo $execution->consumed . ' ' . $lang->execution->workHour;?>"><?php echo $execution->consumed . $lang->execution->workHourUnit;?></td>
+        <td class="c-hours" title="<?php echo $execution->left     . ' ' . $lang->execution->workHour;?>"><?php echo $execution->left     . $lang->execution->workHourUnit;?></td>
         <?php endif;?>
         <td class="c-progress">
-          <div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='<?php echo round($execution->hours->progress);?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
-            <div class='progress-info'><?php echo round($execution->hours->progress);?></div>
+          <div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='<?php echo round($execution->progress);?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
+            <div class='progress-info'><?php echo round($execution->progress);?></div>
           </div>
         </td>
         <?php if($longBlock):?>