Merge branch 'master' of https://github.com/easysoft/zentaopms

module/action/lang/zh-cn.php

@@ -133,6 +133,7 @@ $lang->action->label->confirmed           = '确认了需求，';
 $lang->action->label->bugconfirmed        = '确认了';
 $lang->action->label->tostory             = '转需求';
 $lang->action->label->frombug             = '转需求';
+$lang->action->label->fromlib             = '从用例库导入';
 $lang->action->label->totask              = '转任务';
 $lang->action->label->svncommited         = '提交代码';
 $lang->action->label->gitcommited         = '提交代码';

module/block/view/projectblock.html.php

@@ -64,7 +64,7 @@ $(function()
     $sparks = $sparks.not('.sparked');
     var rowHeight = $sparks.first().closest('tr').outerHeight() - ($.zui.browser.ie === 8 ? 0.3 : 0);
 
-    var scrollFn = false, scrollStart, i, id, $spark;
+    var scrollFn = false, scrollStart = 6, i, id, $spark;
     $projectbox.parent().on('scroll.spark', function(e)
     {
         if(!$sparks.length)
@@ -76,8 +76,7 @@ $(function()
 
         scrollFn = setTimeout(function()
         {
-            scrollStart = Math.floor(($projectbox.scrollTop() - 30) / (rowHeight)) + 1;
-            for(i = scrollStart; i <= scrollStart + 7; i++)
+            for(i = scrollStart; i <= scrollStart + 10; i++)
             {
                 id = '#spark-' + i;
                 $spark = $(id);
@@ -85,6 +84,7 @@ $(function()
                 $spark.addClass('sparked').projectLine();
                 $sparks = $sparks.not(id);
             }
+            scrollStart += 10;
         },100);
     });
 });

module/project/model.php

@@ -1696,11 +1696,12 @@ class projectModel extends model
             $currentTime = strtotime($current);
             if($currentTime > $endTime) break;
             if(isset($sets[$current])) $preValue = $sets[$current]->value;
-            if($currentTime > time())
+            if($currentTime > time() and !$todayTag)
             {
-                $preValue = 0;
                 $todayTag = $i + 1;
+                break;
             }
+
             if(!isset($sets[$current]) and $mode == 'noempty')
             {
                 $sets[$current]  = new stdclass();

module/testcase/lang/zh-cn.php

@@ -179,7 +179,7 @@ $lang->testcase->searchStories = '键入来搜索需求';
 $lang->testcase->selectLib     = '请选择库';
 
 $lang->testcase->action = new stdclass();
-$lang->testcase->action->fromlib  = array('main' => '$date, 由 <strong>$actor</strong> 从公共库 <strong>$extra</strong>导入。');
+$lang->testcase->action->fromlib  = array('main' => '$date, 由 <strong>$actor</strong> 从用例库 <strong>$extra</strong>导入。');
 $lang->testcase->action->reviewed = array('main' => '$date, 由 <strong>$actor</strong> 记录评审结果，结果为 <strong>$extra</strong>。', 'extra' => 'reviewResultList');
 
 $lang->testcase->featureBar['browse']['all']         = $lang->testcase->allCases;

module/testcase/model.php

@@ -1272,6 +1272,7 @@ class testcaseModel extends model
             $stepNumber = $this->dao->select('count(distinct t1.id) as count, t1.`case`')->from(TABLE_CASESTEP)->alias('t1')
                 ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.`case`=t2.`id`')
                 ->where('t1.`case`')->in($caseIdList)
+                ->andWhere('t1.type')->eq('item')
                 ->andWhere('t1.version=t2.version')
                 ->groupBy('t1.`case`')
                 ->fetchPairs('case', 'count');
@@ -1283,6 +1284,7 @@ class testcaseModel extends model
             $stepNumber = $this->dao->select('count(distinct t1.id) as count, t1.`case`')->from(TABLE_CASESTEP)->alias('t1')
                 ->leftJoin(TABLE_TESTRUN)->alias('t2')->on('t1.`case`=t2.`case`')
                 ->where('t2.`id`')->in($caseIdList)
+                ->andWhere('t1.type')->eq('item')
                 ->andWhere('t1.version=t2.version')
                 ->groupBy('t1.`case`')
                 ->fetchPairs('case', 'count');

module/testreport/lang/zh-cn.php

@@ -32,6 +32,7 @@ $lang->testreport->legendBuild       = '测试轮次';
 $lang->testreport->legendCase        = '执行的用例';
 $lang->testreport->legendLegacyBugs  = '遗留的Bug';
 $lang->testreport->legendReport      = '报表';
+$lang->testreport->legendComment     = '总结';
 $lang->testreport->legendMore        = '更多功能';
 
 $lang->testreport->bugSeverityGroups   = 'Bug严重级别分布';

module/testreport/view/view.html.php

@@ -53,6 +53,7 @@
       <li><?php echo html::a('###', $lang->testreport->legendCase, '', "data-toggle='tab' data-target='#tabCase'")?></li>
       <li><?php echo html::a('###', $lang->testreport->legendLegacyBugs, '', "data-toggle='tab' data-target='#tabLegacyBugs'")?></li>
       <li><?php echo html::a('###', $lang->testreport->legendReport, '', "data-toggle='tab' data-target='#tabReport'")?></li>
+      <li><?php echo html::a('###', $lang->testreport->legendComment, '', "data-toggle='tab' data-target='#tabComment'")?></li>
     </ul>
     <div class='tab-content'>
       <div class='tab-pane' id='basic'>
@@ -85,10 +86,6 @@
             ?>
             </td>
           </tr>
-          <tr>
-            <th><?php echo $lang->testreport->report?></th>
-            <td><?php echo $report->report;?></td>
-          </tr>
           <?php if(!$this->session->notHead):?>
           <tr>
             <th><?php echo $lang->files?></th>
@@ -105,6 +102,7 @@
       <div class='tab-pane' id='tabCase'><?php include './blockcases.html.php'?></div>
       <div class='tab-pane' id='tabLegacyBugs'><?php include './blocklegacybugs.html.php'?></div>
       <div class='tab-pane active' id='tabReport'><?php include './blockbugreport.html.php'?></div>
+      <div class='tab-pane' id='tabComment'><div class='article-content'><?php echo empty($report->report) ? $lang->testreport->none : $report->report;?></div></div>
     </div>
   </div>
 <?php if(!$this->session->notHead):?>