From c73649a0176c06585b25b88b1270bc60eb243ac2 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 17 Mar 2017 14:45:33 +0800 Subject: [PATCH 1/2] * fix bug for project burn in block. --- module/block/view/projectblock.html.php | 6 +++--- module/project/model.php | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php index 2b049d82d2..dbb22594a3 100644 --- a/module/block/view/projectblock.html.php +++ b/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); }); }); diff --git a/module/project/model.php b/module/project/model.php index fc8b36cf99..431529dc49 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1698,9 +1698,10 @@ class projectModel extends model if(isset($sets[$current])) $preValue = $sets[$current]->value; if($currentTime > time()) { - $preValue = 0; $todayTag = $i + 1; + break; } + if(!isset($sets[$current]) and $mode == 'noempty') { $sets[$current] = new stdclass(); From 6d1474a54182751fed94acd55c3c01e5c7c34ad9 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 17 Mar 2017 17:18:24 +0800 Subject: [PATCH 2/2] * adjust code. --- module/action/lang/zh-cn.php | 1 + module/project/model.php | 2 +- module/testcase/lang/zh-cn.php | 2 +- module/testcase/model.php | 2 ++ module/testreport/lang/zh-cn.php | 1 + module/testreport/view/view.html.php | 6 ++---- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 6a64d2e249..fb0a9df0de 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -131,6 +131,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 = '提交代码'; diff --git a/module/project/model.php b/module/project/model.php index 431529dc49..efc189cacc 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1696,7 +1696,7 @@ 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) { $todayTag = $i + 1; break; diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index 1f1afacd86..8252611e75 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -177,7 +177,7 @@ $lang->testcase->searchStories = '键入来搜索需求'; $lang->testcase->selectLib = '请选择库'; $lang->testcase->action = new stdclass(); -$lang->testcase->action->fromlib = array('main' => '$date, 由 $actor 从公共库 $extra导入。'); +$lang->testcase->action->fromlib = array('main' => '$date, 由 $actor 从用例库 $extra导入。'); $lang->testcase->action->reviewed = array('main' => '$date, 由 $actor 记录评审结果，结果为 $extra。', 'extra' => 'reviewResultList'); $lang->testcase->featureBar['browse']['all'] = $lang->testcase->allCases; diff --git a/module/testcase/model.php b/module/testcase/model.php index dbb611afb3..360cdf8777 100644 --- a/module/testcase/model.php +++ b/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'); diff --git a/module/testreport/lang/zh-cn.php b/module/testreport/lang/zh-cn.php index 07c688678c..691f9f3e5a 100644 --- a/module/testreport/lang/zh-cn.php +++ b/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严重级别分布'; diff --git a/module/testreport/view/view.html.php b/module/testreport/view/view.html.php index 4dd6945347..66963d3a84 100644 --- a/module/testreport/view/view.html.php +++ b/module/testreport/view/view.html.php @@ -53,6 +53,7 @@
  • testreport->legendCase, '', "data-toggle='tab' data-target='#tabCase'")?>
  • testreport->legendLegacyBugs, '', "data-toggle='tab' data-target='#tabLegacyBugs'")?>
  • testreport->legendReport, '', "data-toggle='tab' data-target='#tabReport'")?>
    • +
  • testreport->legendComment, '', "data-toggle='tab' data-target='#tabComment'")?>
    • @@ -85,10 +86,6 @@ ?> - - testreport->report?> - report;?> - session->notHead):?> files?> @@ -105,6 +102,7 @@
    +
    report) ? $lang->testreport->none : $report->report;?>
    session->notHead):?>