From 98ec5b63e7ea9bcda91d5175a8ea5ccc14026803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <admin@lvtao.net>
Date: Thu, 18 Oct 2018 09:22:29 +0800
Subject: [PATCH] * Finished task#7021.

---
 module/report/view/productsummary.html.php   | 32 ++++++++++----------
 module/report/view/projectdeviation.html.php |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/module/report/view/productsummary.html.php b/module/report/view/productsummary.html.php
index 5c000b7694..2638e9f430 100644
--- a/module/report/view/productsummary.html.php
+++ b/module/report/view/productsummary.html.php
@@ -9,21 +9,6 @@
     </div>
   </div>
   <div class='main-col'>
-    <div class='cell'>
-      <div class="table-row" id='conditions'>
-        <div class="col-xs text-right text-gray text-middle"><?php echo $lang->report->conditions?></div>
-        <div class='col'>
-          <div class="checkbox-primary inline-block">
-            <input type="checkbox" name="closedProduct" value="closedProduct" id="closedProduct" <?php if(strpos($conditions, 'closedProduct') !== false) echo "checked='checked'"?> />
-            <label for="closedProduct"><?php echo $lang->report->closedProduct?></label>
-          </div>
-          <div class="checkbox-primary inline-block">
-            <input type="checkbox" name="overduePlan" value="overduePlan" id="overduePlan" <?php if(strpos($conditions, 'overduePlan') !== false) echo "checked='checked'"?> />
-            <label for="overduePlan"><?php echo $lang->report->overduePlan?></label>
-          </div>
-        </div>
-      </div>
-    </div>
     <?php if(empty($products)):?>
     <div class="cell">
       <div class="table-empty-tip">
@@ -34,7 +19,22 @@
     <div class='cell'>
       <div class='panel'>
         <div class="panel-heading">
-          <div class="panel-title"><?php echo $title;?></div>
+          <div class="panel-title">
+            <div class="table-row" id='conditions'>
+              <div class="col-xs"><?php echo $title;?></div>
+              <div class="col-xs text-right text-gray text-middle"><?php echo $lang->report->conditions?></div>
+              <div class='col'>
+                <div class="checkbox-primary inline-block">
+                  <input type="checkbox" name="closedProduct" value="closedProduct" id="closedProduct" <?php if(strpos($conditions, 'closedProduct') !== false) echo "checked='checked'"?> />
+                  <label for="closedProduct"><?php echo $lang->report->closedProduct?></label>
+                </div>
+                <div class="checkbox-primary inline-block">
+                  <input type="checkbox" name="overduePlan" value="overduePlan" id="overduePlan" <?php if(strpos($conditions, 'overduePlan') !== false) echo "checked='checked'"?> />
+                  <label for="overduePlan"><?php echo $lang->report->overduePlan?></label>
+                </div>
+              </div>
+            </div>
+          </div>
           <nav class="panel-actions btn-toolbar"></nav>
         </div>
         <div data-ride='table'>
diff --git a/module/report/view/projectdeviation.html.php b/module/report/view/projectdeviation.html.php
index 637c403f95..aea6532e47 100644
--- a/module/report/view/projectdeviation.html.php
+++ b/module/report/view/projectdeviation.html.php
@@ -51,7 +51,7 @@
               <?php foreach($projects as $id  =>$project):?>
               <tr class="text-center">
                 <td><?php echo $id;?></td>
-                <td class="text-left"><?php echo html::a($this->createLink('project', 'view', "projectID=$id"), $project->name);?></td>
+                <td class="text-left" title="<?php echo $project->name;?>"><?php echo html::a($this->createLink('project', 'view', "projectID=$id"), $project->name);?></td>
                 <td><?php echo $project->estimate;?></td>
                 <td><?php echo $project->consumed;?></td>
                 <?php $deviation = $project->consumed - $project->estimate;?>