From a322707b69503314f179ce0bb9ac440b8bfc84d7 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 31 Aug 2015 10:57:42 +0800
Subject: [PATCH]  * finish task #2305.

---
 module/report/model.php                  |  1 +
 module/testcase/lang/en.php              |  3 ++-
 module/testcase/lang/zh-cn.php           |  3 ++-
 module/testcase/model.php                |  2 +-
 module/testcase/view/showimport.html.php | 16 +++++++++++-----
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/module/report/model.php b/module/report/model.php
index 5e47c2a23e..823ee52e41 100644
--- a/module/report/model.php
+++ b/module/report/model.php
@@ -153,6 +153,7 @@ class reportModel extends model
         {
             foreach($stories as $story)
             {
+                if(!isset($plans[$story->plan])) continue;
                 $plan = $plans[$story->plan];
                 $products[$plan->product]->plans[$story->plan]->status[$story->status] = isset($products[$plan->product]->plans[$story->plan]->status[$story->status]) ? $products[$plan->product]->plans[$story->plan]->status[$story->status] + 1 : 1;
             }
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index e395b1b9fa..1789a4eccc 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -75,7 +75,8 @@ $lang->testcase->confirmStoryChange = 'Confirm story change';
 
 $lang->testcase->new = 'New';
   
-$lang->testcase->num = 'The number of cases';
+$lang->testcase->num    = 'The number of cases';
+$lang->testcase->insert = 'New insertion';
 
 $lang->testcase->deleteStep   = 'Delete';
 $lang->testcase->insertBefore = 'Insert before';
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index 2a910c416f..9be6110891 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -75,7 +75,8 @@ $lang->testcase->confirmStoryChange = '确认需求变动';
 
 $lang->testcase->new = '新增';
 
-$lang->testcase->num = '用例记录数：';
+$lang->testcase->num    = '用例记录数：';
+$lang->testcase->insert = '全新插入';
 
 $lang->testcase->deleteStep   = '删除';
 $lang->testcase->insertBefore = '之前添加';
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 8b1414240f..1d3d5084b2 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -480,7 +480,7 @@ class testcaseModel extends model
 
         foreach($cases as $key => $caseData)
         {
-            if(!empty($_POST['id'][$key]))
+            if(!empty($_POST['id'][$key]) and empty($_POST['insert']))
             {
                 $caseID      = $data->id[$key];
                 $stepChanged = false;
diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php
index eb0bbaa607..a2e05fcabd 100644
--- a/module/testcase/view/showimport.html.php
+++ b/module/testcase/view/showimport.html.php
@@ -3,7 +3,7 @@
 .affix {position:fixed; top:0px; width:95.6%;z-index:10000;}
 </style>
 <form target='hiddenwin' method='post' class='form-condensed'>
-<table class='table table-fixed active-disabled'>
+<table class='table table-fixed active-disabled table-custom'>
   <thead>
     <tr>
       <th class='w-80px'><?php echo $lang->testcase->id?></th>
@@ -28,6 +28,8 @@
       </th>
     </tr>
   </thead>
+  <tbody>
+  <?php $insert = true;?>
   <?php foreach($caseData as $key => $case):?>
   <?php if(empty($case->title)) continue;?>
   <tr valign='top' align='center'>
@@ -36,6 +38,7 @@
       if(!empty($case->id))
       {
           echo $case->id . html::hidden("id[$key]", $case->id);
+          $insert = false;
       }
       else
       {
@@ -65,11 +68,14 @@
       <?php endif;?>
     </td>
   </tr>
-  <?php unset($caseData[$key]);?>
   <?php endforeach;?>
+  </tbody>
   <tfoot>
     <tr>
-      <td colspan='10' class='text-center'><?php echo html::submitButton() . ' &nbsp; ' . html::backButton()?></td>
+      <td colspan='10' class='text-center'>
+        <?php if(!$insert) echo "<label for='insert' class='pull-left'><input type='checkbox' id='insert' name='insert' value='1' />{$lang->testcase->insert}</label>"?>
+        <?php echo html::submitButton() . ' &nbsp; ' . html::backButton()?>
+      </td>
     </tr>
   </tfoot>
 </table>
@@ -79,7 +85,7 @@ $(function(){affix('thead')})
 function affix(obj)
 {
     var fixH = $(obj).offset().top;
-    var first = true;          
+    var first = true;
     $(window).scroll(function()
     {
         var scroH = $(this).scrollTop();
@@ -88,7 +94,7 @@ function affix(obj)
             $(obj).parent().parent().before("<table id='headerClone' class='table'></table>");
             $('#headerClone').append($(obj).clone()).addClass('affix');
             $('.active-disabled ' + obj + ' th').each(function(i){$('#headerClone ' + obj + ' th').eq(i).width($(this).width())});
-            first = false;     
+            first = false;
         }
         else if(scroH<fixH)    
         {