From 66df7b49905b566ba44634eb11f0aee8dceae1a7 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Tue, 26 Apr 2022 16:43:10 +0800
Subject: [PATCH]  * code for bug #15377.

---
 .../block/view/waterfallestimateblock.html.php  | 17 ++++++++++-------
 module/block/view/waterfallganttblock.html.php  |  5 +++++
 module/block/view/waterfallreportblock.html.php |  4 ++++
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/module/block/view/waterfallestimateblock.html.php b/module/block/view/waterfallestimateblock.html.php
index 40058eefb5..5135671541 100644
--- a/module/block/view/waterfallestimateblock.html.php
+++ b/module/block/view/waterfallestimateblock.html.php
@@ -1,21 +1,24 @@
-<style> .block-waterfallestimate table{margin-bottom: 15px} </style>
+<style>
+.block-waterfallestimate table{margin-bottom: 15px}
+.block-waterfallestimate table th{width: 135px !important}
+</style>
 <table class='table table-data'>
   <tr>
-    <th class='w-100px'><?php echo $lang->durationestimation->people;?></th>
+    <th><?php echo $lang->durationestimation->people;?></th>
     <td><?php echo $people ? $people : 0;?></td>
-    <th class='w-100px'><?php echo $lang->workestimation->duration;?></th>
+    <th><?php echo $lang->workestimation->duration;?></th>
     <td><?php echo zget($budget, 'duration', 0);?></td>
   </tr>
   <tr>
-    <th class='w-100px'><?php echo $lang->durationestimation->members;?></th>
+    <th><?php echo $lang->durationestimation->members;?></th>
     <td><?php echo $members;?></td>
-    <th class='w-100px'><?php echo $lang->workestimation->consumed;?></th>
+    <th><?php echo $lang->workestimation->consumed;?></th>
     <td><?php echo $consumed ? $consumed : 0;?></td>
   </tr>
   <tr>
-    <th class='w-100px'><?php echo $lang->workestimation->totalLaborCost;?></th>
+    <th><?php echo $lang->workestimation->totalLaborCost;?></th>
     <td><?php echo '￥' . zget($budget, 'totalLaborCost', 0);?></td>
-    <th class='w-100px'><?php echo $lang->block->remain;?></th>
+    <th><?php echo $lang->block->remain;?></th>
     <td><?php echo $totalLeft ? $totalLeft : 0;?></td>
   </tr>
 </table>
diff --git a/module/block/view/waterfallganttblock.html.php b/module/block/view/waterfallganttblock.html.php
index 92fa398422..672dfa6916 100644
--- a/module/block/view/waterfallganttblock.html.php
+++ b/module/block/view/waterfallganttblock.html.php
@@ -20,7 +20,11 @@
     <?php endif;?>
   </div>
   <style>
+  <?php if(common::checkNotCN()):?>
+  .gantt-product-tips {position: absolute; top: -32px; left: 280px; opacity: 0.5;}
+  <?php else:?>
   .gantt-product-tips {position: absolute; top: -32px; left: 240px; opacity: 0.5;}
+  <?php endif;?>
   .gantt-product-tips i {vertical-align: middle;}
   .block-waterfallgantt > .panel-body {overflow: visible!important}
   #<?php echo $waterfallGanttID; ?> {position: relative}
@@ -95,6 +99,7 @@
         $.each(tasks, function(index, task)
         {
             var plan = plansMap[task.parent];
+            if(typeof(plan) == 'undefined') return;
             while(plan.parent > 0)
             {
                 plan = plansMap[plan.parent];
diff --git a/module/block/view/waterfallreportblock.html.php b/module/block/view/waterfallreportblock.html.php
index 577228719c..04775ba3dd 100644
--- a/module/block/view/waterfallreportblock.html.php
+++ b/module/block/view/waterfallreportblock.html.php
@@ -3,7 +3,11 @@
 .block-waterfallreport .col-right {width: 87%;}
 .block-waterfallreport .panel-body {padding-top: 0;}
 .block-waterfallreport .table-row {margin-bottom: 20px;}
+<?php if(common::checkNotCN()):?>
+.block-waterfallreport .stage {position: absolute; top: 14px; left: 140px;}
+<?php else:?>
 .block-waterfallreport .stage {position: absolute; top: 14px; left: 90px;}
+<?php endif;?>
 .block-waterfallreport .col-right .tiles {padding: 10px 0 0 16px;}
 .block-waterfallreport .col-right .tile {width: 20%;}
 .block-waterfallreport .col-right .tile .tile-title {font-weight: 700;}