From a13522f616c94734e5331eea194a31c5c4ceffe4 Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Tue, 22 May 2018 14:34:55 +0800
Subject: [PATCH]  * change tables style.

---
 module/bug/view/browse.html.php      |  4 ++--
 module/project/view/story.html.php   | 36 +++++++++++++++++++++++++---
 module/testcase/view/browse.html.php |  4 ++--
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 0e1b259349..d7fca63458 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -192,8 +192,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
   <div class="main-col">
     <div class="cell" id="queryBox"></div>
     <form class='main-table table-bug' data-ride='table' method='post' id='bugForm'>
-      <div class="table-header">
-        <div class="table-statistic"><?php echo $summary;?></div>
+      <div class="table-header fixed-right">
         <nav class="btn-toolbar pull-right"></nav>
       </div>
       <?php
@@ -376,6 +375,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
           </div>
           <?php endif;?>
         </div>
+        <div class="table-statistic"><?php echo $summary;?></div>
         <?php $pager->show('right', 'pagerjs');?>
       </div>
       <?php elseif(common::hasPriv('bug', 'create')):?>
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index 4093417f7a..f2b2ea871a 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -78,9 +78,8 @@
   </div>
   <div class="main-col">
     <div class="cell" id="queryBox"></div>
-    <form class='main-table table-story' method='post' data-ride='table' id='projectStoryForm'>
-      <div class="table-header">
-        <div class="table-statistic"><?php echo $summary;?></div>
+    <form class='main-table table-story skip-iframe-modal' method='post' id='projectStoryForm'>
+      <div class="table-header fixed-right">
         <nav class="btn-toolbar pull-right"></nav>
       </div>
       <table class='table has-sort-head' id='storyList'>
@@ -239,6 +238,7 @@
           }
           ?>
         </div>
+        <div class="table-statistic"><?php echo $summary;?></div>
         <?php $pager->show('right', 'pagerjs');?>
       </div>
       <?php endif;?>
@@ -265,4 +265,34 @@
 <?php js::set('checkedSummary', $lang->product->checkedSummary);?>
 <?php js::set('projectID', $project->id);?>
 <?php js::set('orderBy', $orderBy)?>
+<script>
+$(function()
+{
+    // Update table summary text
+    var checkedSummary = '<?php echo $lang->product->checkedSummary?>';
+    $('#projectStoryForm').table(
+    {
+        statisticCreator: function(table)
+        {
+            var $checkedRows = table.$.find('tbody>tr.checked');
+            var checkedTotal = $checkedRows.length;
+            if(!checkedTotal) return;
+
+            var checkedEstimate = 0;
+            var checkedCase     = 0;
+            $checkedRows.each(function()
+            {
+                var $row = $(this);
+                var data = $row.data();
+                checkedEstimate += data.estimate;
+                checkedCase += data.cases;
+            });
+            var rate = Math.round(checkedCase / checkedTotal * 10000) / 100 + '' + '%';
+            return checkedSummary.replace('%total%', checkedTotal)
+                  .replace('%estimate%', checkedEstimate)
+                  .replace('%rate%', rate);
+        }
+    });
+});
+</script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 533f9d3d6f..17e7d15094 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -41,8 +41,7 @@ js::set('branch',         $branch);
   <div class='main-col'>
     <div id='queryBox' class='cell <?php if($browseType =='bysearch') echo 'show';?>'></div>
     <form class='main-table table-case' data-ride='table' id='batchForm' method='post'>
-      <div class="table-header">
-        <div class="table-statistic"><?php echo $summary;?></div>
+      <div class="table-header fixed-right">
         <nav class="btn-toolbar pull-right"></nav>
       </div>
       <?php
@@ -193,6 +192,7 @@ js::set('branch',         $branch);
           </div>
           <?php endif;?>
         </div>
+        <div class="table-statistic"><?php echo $summary;?></div>
         <?php $pager->show('right', 'pagerjs');?>
       </div>
       <?php elseif(common::hasPriv('testcase', 'create')):?>