From 03c3226ca4ac69d63ea9e3f556a1b93b080652ea Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 25 Jan 2018 10:52:03 +0800
Subject: [PATCH]  * finish task #3604.

---
 module/block/control.php                 |  3 +-
 module/block/view/bugblock.html.php      |  3 --
 module/block/view/buildblock.html.php    |  3 --
 module/block/view/caseblock.html.php     |  3 --
 module/block/view/planblock.html.php     |  3 --
 module/block/view/productblock.html.php  |  3 --
 module/block/view/projectblock.html.php  | 60 +++++++++---------------
 module/block/view/releaseblock.html.php  |  3 --
 module/block/view/storyblock.html.php    |  3 --
 module/block/view/taskblock.html.php     |  3 --
 module/block/view/testtaskblock.html.php |  3 --
 module/block/view/todoblock.html.php     |  3 --
 12 files changed, 25 insertions(+), 68 deletions(-)

diff --git a/module/block/control.php b/module/block/control.php
index 3a79299572..37398b8471 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -317,7 +317,7 @@ class block extends control
             $this->get->set('module', $block->module);
             $this->get->set('source', $block->source);
             $this->get->set('blockid', $block->block);
-            $this->get->set('param',base64_encode(json_encode($block->params)));
+            $this->get->set('param', base64_encode(json_encode($block->params)));
             $html = $this->fetch('block', 'main', "module={$block->source}&id=$id");
         }
         elseif($block->block == 'dynamic')
@@ -406,6 +406,7 @@ class block extends control
             $this->params      = $params;
             $this->view->code  = $this->get->blockid;
             $this->view->title = $this->get->blockTitle;
+            $this->view->block = $this->block->getByID($id);
 
             $func = 'print' . ucfirst($code) . 'Block';
             if(method_exists('block', $func))
diff --git a/module/block/view/bugblock.html.php b/module/block/view/bugblock.html.php
index aaa394eed3..2ddc84a9b7 100644
--- a/module/block/view/bugblock.html.php
+++ b/module/block/view/bugblock.html.php
@@ -34,6 +34,3 @@
   </tr>
   <?php endforeach;?>
 </table>
-<script>
-if(typeof(dataTable) == 'function')$('.block-bug').dataTable();
-</script>
diff --git a/module/block/view/buildblock.html.php b/module/block/view/buildblock.html.php
index 520cb61b87..e563cc2050 100644
--- a/module/block/view/buildblock.html.php
+++ b/module/block/view/buildblock.html.php
@@ -32,6 +32,3 @@
   </tr>
   <?php endforeach;?>
 </table>
-<script>
-if(typeof(dataTable) == 'function')$('.block-build').dataTable();
-</script>
diff --git a/module/block/view/caseblock.html.php b/module/block/view/caseblock.html.php
index b19e9cf3b2..895a73e019 100644
--- a/module/block/view/caseblock.html.php
+++ b/module/block/view/caseblock.html.php
@@ -36,6 +36,3 @@
   </tr>
   <?php endforeach;?>
 </table>
-<script>
-if(typeof(dataTable) == 'function')$('.block-case').dataTable();
-</script>
diff --git a/module/block/view/planblock.html.php b/module/block/view/planblock.html.php
index 5d5a56c8b4..c6ccb9c230 100644
--- a/module/block/view/planblock.html.php
+++ b/module/block/view/planblock.html.php
@@ -34,6 +34,3 @@
   </tr>
   <?php endforeach;?>
 </table>
-<script>
-if(typeof(dataTable) == 'function')$('.block-plan').dataTable();
-</script>
diff --git a/module/block/view/productblock.html.php b/module/block/view/productblock.html.php
index 309018596d..826431eaef 100644
--- a/module/block/view/productblock.html.php
+++ b/module/block/view/productblock.html.php
@@ -42,6 +42,3 @@
     <?php endforeach;?>
   </tbody>
 </table>
-<script>
-if(typeof(dataTable) == 'function')$('.block-product').dataTable();
-</script>
diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php
index ac4b9fd2e3..b3e89fc5d3 100644
--- a/module/block/view/projectblock.html.php
+++ b/module/block/view/projectblock.html.php
@@ -13,18 +13,23 @@
 <?php $jsRoot = $this->config->webRoot . 'js/';?>
 <?php include '../../common/view/sparkline.html.php';?>
 <?php $projectboxId = 'projectbox-' . rand(); ?>
+<?php $longBlock = $block->grid >= 6;?>
 <div id='<?php echo $projectboxId ?>'>
-  <table class='table tablesorter table-data table-hover table-striped table-fixed block-project'>
+  <table class='table table-borderless table-fixed block-project'>
     <thead>
       <tr class='text-center'>
         <th class='text-left'><?php echo $lang->project->name;?></th>
-        <th width='80'><?php echo $lang->project->end;?></th>
-        <th width='70'><?php echo $lang->statusAB;?></th>
+        <th width='85'><?php echo $lang->project->end;?></th>
+        <?php if($longBlock):?>
+        <th width='80'><?php echo $lang->statusAB;?></th>
         <th width='60'><?php echo $lang->project->totalEstimate;?></th>
         <th width='60'><?php echo $lang->project->totalConsumed;?></th>
         <th width='60'><?php echo $lang->project->totalLeft;?></th>
+        <?php endif;?>
         <th width='115'><?php echo $lang->project->progress;?></th>
+        <?php if($longBlock):?>
         <th width='100' class='{sorter: false}'><?php echo $lang->project->burn;?></th>
+        <?php endif;?>
       </tr>
     </thead>
     <tbody>
@@ -35,21 +40,28 @@
       $viewLink = $this->createLink('project', 'task', 'project=' . $project->id);
       ?>
       <tr data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
-        <td class='text-left' title='<?php echo $project->name;?>'><?php echo html::a($this->createLink('project', 'task', 'project=' . $project->id), $project->name, '', "title='$project->name'");?></td>
+        <td class='text-left' title='<?php echo $project->name;?>'><nobr><?php echo html::a($this->createLink('project', 'task', 'project=' . $project->id), $project->name, '', "title='$project->name'");?></nobr></td>
         <td><?php echo $project->end;?></td>
+        <?php if($longBlock):?>
         <?php if(isset($project->delay)):?>
-        <td><?php echo $lang->project->delayed;?></td>
+        <td><span class="project-status-delayed"><span class="label label-dot"></span> <?php echo $lang->project->delayed;?></span></td>
         <?php else:?>
-        <td class='status-<?php echo $project->status?>'><?php echo $lang->project->statusList[$project->status];?></td>
+        <td><span class="project-status-<?php echo $project->status?>"><span class="label label-dot"></span> <?php echo $lang->project->statusList[$project->status];?></span></td>
         <?php endif;?>
         <td><?php echo $project->hours->totalEstimate;?></td>
         <td><?php echo $project->hours->totalConsumed;?></td>
         <td><?php echo $project->hours->totalLeft;?></td>
-        <td class='text-left'>
-          <img class='progressbar' src='<?php echo $this->app->getWebRoot();?>theme/default/images/main/green.png' alt='' height='16' width='<?php echo $project->hours->progress == 0 ? 1 : round($project->hours->progress * 0.7);?>'>
-          <small><?php echo $project->hours->progress;?>%</small>
+        <?php endif;?>
+        <td>
+          <div class="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>
+            </div>
+          </div>
         </td>
-        <td id='spark-<?php echo $id++?>' class='spark text-left pd-0' values='<?php echo join(',', $project->burns);?>'></td>
+        <?php if($longBlock):?>
+        <td id='spark-<?php echo $id++?>' class='spark' values='<?php echo join(',', $project->burns);?>'></td>
+        <?php endif;?>
      </tr>
      <?php endforeach;?>
     </tbody>
@@ -60,32 +72,6 @@ $(function()
 {
     var $projectbox = $('#<?php echo $projectboxId ?>');
     var $sparks = $projectbox.find('.spark');
-    $sparks.filter(':lt(6)').addClass('sparked').projectLine();
-    $sparks = $sparks.not('.sparked');
-    var rowHeight = $sparks.first().closest('tr').outerHeight() - ($.zui.browser.ie === 8 ? 0.3 : 0);
-
-    var scrollFn = false, scrollStart = 6, i, id, $spark;
-    $projectbox.parent().on('scroll.spark', function(e)
-    {
-        if(!$sparks.length)
-        {
-            $projectbox.off('scroll.spark');
-            return;
-        }
-        if(scrollFn) clearTimeout(scrollFn);
-
-        scrollFn = setTimeout(function()
-        {
-            for(i = scrollStart; i <= scrollStart + 10; i++)
-            {
-                id = '#spark-' + i;
-                $spark = $(id);
-                if($spark.hasClass('sparked')) continue;
-                $spark.addClass('sparked').projectLine();
-                $sparks = $sparks.not(id);
-            }
-            scrollStart += 10;
-        },100);
-    });
+    $sparks.addClass('sparked').projectLine();
 });
 </script>
diff --git a/module/block/view/releaseblock.html.php b/module/block/view/releaseblock.html.php
index d26e1e478d..d72cf68e89 100644
--- a/module/block/view/releaseblock.html.php
+++ b/module/block/view/releaseblock.html.php
@@ -36,6 +36,3 @@
   </tr>
   <?php endforeach;?>
 </table>
-<script>
-if(typeof(dataTable) == 'function')$('.block-release').dataTable();
-</script>
diff --git a/module/block/view/storyblock.html.php b/module/block/view/storyblock.html.php
index f6c1602b24..2dc0142b69 100644
--- a/module/block/view/storyblock.html.php
+++ b/module/block/view/storyblock.html.php
@@ -36,6 +36,3 @@
   </tr>
   <?php endforeach;?>
 </table>
-<script>
-if(typeof(dataTable) == 'function')$('.block-story').dataTable();
-</script>
diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php
index 60c6eafb32..806210a534 100644
--- a/module/block/view/taskblock.html.php
+++ b/module/block/view/taskblock.html.php
@@ -39,6 +39,3 @@ td.delayed{background: #e84e0f!important; color: white;}
   </tr>
   <?php endforeach;?>
 </table>
-<script>
-if(typeof(dataTable) == 'function')$('.block-task').dataTable();
-</script>
diff --git a/module/block/view/testtaskblock.html.php b/module/block/view/testtaskblock.html.php
index b4dc0d55fd..80c1e243c8 100644
--- a/module/block/view/testtaskblock.html.php
+++ b/module/block/view/testtaskblock.html.php
@@ -36,6 +36,3 @@
   </tr>
   <?php endforeach;?>
 </table>
-<script>
-if(typeof(dataTable) == 'function')$('.block-testtask').dataTable();
-</script>
diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php
index 868393caae..d6871fc080 100644
--- a/module/block/view/todoblock.html.php
+++ b/module/block/view/todoblock.html.php
@@ -34,6 +34,3 @@
   </tr>
   <?php endforeach;?>
 </table>
-<script>
-if(typeof(dataTable) == 'function')$('.block-todo').dataTable();
-</script>