diff --git a/module/block/control.php b/module/block/control.php index 4d2261daef..d1e936a5bc 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -885,7 +885,7 @@ class block extends control $this->app->loadClass('pager', $static = true); $pager = pager::init(0, 3, 1); $project->progress = $project->allStories == 0 ? 0 : round($project->doneStories / $project->allStories, 3) * 100; - $project->executions = $this->project->getStats($projectID, 'all', 0, 0, 30, 'id_asc', $pager); + $project->executions = $this->project->getStats($projectID, 'all', 0, 0, 30, 'id_desc', $pager); } elseif($project->model == 'waterfall' and isset($this->config->maxVersion)) { diff --git a/module/block/lang/de.php b/module/block/lang/de.php index e585018161..2d4307671a 100644 --- a/module/block/lang/de.php +++ b/module/block/lang/de.php @@ -11,12 +11,20 @@ */ global $config; $lang->block = new stdclass(); -$lang->block->common = 'InfoBlock'; -$lang->block->name = 'Name'; -$lang->block->style = 'Style'; -$lang->block->grid = 'Gitter'; -$lang->block->color = 'Farbe'; -$lang->block->reset = 'Zurücksetzen'; +$lang->block->common = 'InfoBlock'; +$lang->block->name = 'Name'; +$lang->block->style = 'Style'; +$lang->block->grid = 'Gitter'; +$lang->block->color = 'Farbe'; +$lang->block->reset = 'Zurücksetzen'; +$lang->block->story = 'Story'; +$lang->block->bug = 'Bug'; +$lang->block->investment = 'Investment'; +$lang->block->left = 'Left'; +$lang->block->estimate = 'Estimate'; +$lang->block->doneBugs = 'Done'; +$lang->block->leftBugs = 'Left'; +$lang->block->last = 'Last'; $lang->block->account = 'Konto'; $lang->block->module = 'Modul'; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 9cc986161e..fd92c396d1 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -11,12 +11,20 @@ */ global $config; $lang->block = new stdclass(); -$lang->block->common = 'Block'; -$lang->block->name = 'Name'; -$lang->block->style = 'Style'; -$lang->block->grid = 'Position'; -$lang->block->color = 'Color'; -$lang->block->reset = 'Reset Layout'; +$lang->block->common = 'Block'; +$lang->block->name = 'Name'; +$lang->block->style = 'Style'; +$lang->block->grid = 'Position'; +$lang->block->color = 'Color'; +$lang->block->reset = 'Reset Layout'; +$lang->block->story = 'Story'; +$lang->block->bug = 'Bug'; +$lang->block->investment = 'Investment'; +$lang->block->left = 'Left'; +$lang->block->estimate = 'Estimate'; +$lang->block->doneBugs = 'Done'; +$lang->block->leftBugs = 'Left'; +$lang->block->last = 'Last'; $lang->block->account = 'Account'; $lang->block->module = 'Module'; diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php index 5d94570219..0b2043849d 100644 --- a/module/block/lang/fr.php +++ b/module/block/lang/fr.php @@ -11,12 +11,20 @@ */ global $config; $lang->block = new stdclass(); -$lang->block->common = 'Bloc'; -$lang->block->name = 'Nom'; -$lang->block->style = 'Style'; -$lang->block->grid = 'Position'; -$lang->block->color = 'Couleur'; -$lang->block->reset = 'Réinit'; +$lang->block->common = 'Bloc'; +$lang->block->name = 'Nom'; +$lang->block->style = 'Style'; +$lang->block->grid = 'Position'; +$lang->block->color = 'Couleur'; +$lang->block->reset = 'Réinit'; +$lang->block->story = 'Story'; +$lang->block->bug = 'Bug'; +$lang->block->investment = 'Investment'; +$lang->block->left = 'Left'; +$lang->block->estimate = 'Estimate'; +$lang->block->doneBugs = 'Done'; +$lang->block->leftBugs = 'Left'; +$lang->block->last = 'Last'; $lang->block->account = 'Compte'; $lang->block->module = 'Module'; diff --git a/module/block/lang/vi.php b/module/block/lang/vi.php index 4090bb741f..2b82f707ab 100644 --- a/module/block/lang/vi.php +++ b/module/block/lang/vi.php @@ -11,12 +11,20 @@ */ global $config; $lang->block = new stdclass(); -$lang->block->common = 'Block'; -$lang->block->name = 'Tên'; -$lang->block->style = 'Kiểu'; -$lang->block->grid = 'Vị trí'; -$lang->block->color = 'Màu'; -$lang->block->reset = 'Thiết lập lại giao diện'; +$lang->block->common = 'Block'; +$lang->block->name = 'Tên'; +$lang->block->style = 'Kiểu'; +$lang->block->grid = 'Vị trí'; +$lang->block->color = 'Màu'; +$lang->block->reset = 'Thiết lập lại giao diện'; +$lang->block->story = 'Story'; +$lang->block->bug = 'Bug'; +$lang->block->investment = 'Investment'; +$lang->block->left = 'Left'; +$lang->block->estimate = 'Estimate'; +$lang->block->doneBugs = 'Done'; +$lang->block->leftBugs = 'Left'; +$lang->block->last = 'Last'; $lang->block->account = 'Tài khoản'; $lang->block->module = 'Module'; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index e21a448b05..74d5d7e6d1 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -11,12 +11,20 @@ */ global $config; $lang->block = new stdclass(); -$lang->block->common = '区块'; -$lang->block->name = '区块名称'; -$lang->block->style = '外观'; -$lang->block->grid = '位置'; -$lang->block->color = '颜色'; -$lang->block->reset = '恢复默认'; +$lang->block->common = '区块'; +$lang->block->name = '区块名称'; +$lang->block->style = '外观'; +$lang->block->grid = '位置'; +$lang->block->color = '颜色'; +$lang->block->reset = '恢复默认'; +$lang->block->story = '需求'; +$lang->block->bug = 'Bug'; +$lang->block->investment = '投入'; +$lang->block->left = '剩余'; +$lang->block->estimate = '预计工时'; +$lang->block->doneBugs = '已解决'; +$lang->block->leftBugs = '未解决'; +$lang->block->last = '近期'; $lang->block->account = '所属用户'; $lang->block->module = '所属模块'; diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php index 3f23fa21e7..9efd424987 100644 --- a/module/block/lang/zh-tw.php +++ b/module/block/lang/zh-tw.php @@ -10,12 +10,20 @@ * @link http://www.zentao.net */ $lang->block = new stdclass(); -$lang->block->common = '區塊'; -$lang->block->name = '區塊名稱'; -$lang->block->style = '外觀'; -$lang->block->grid = '位置'; -$lang->block->color = '顏色'; -$lang->block->reset = '恢復預設'; +$lang->block->common = '區塊'; +$lang->block->name = '區塊名稱'; +$lang->block->style = '外觀'; +$lang->block->grid = '位置'; +$lang->block->color = '顏色'; +$lang->block->reset = '恢復預設'; +$lang->block->story = '需求'; +$lang->block->bug = 'Bug'; +$lang->block->investment = '投入'; +$lang->block->left = '剩余'; +$lang->block->estimate = '预计工时'; +$lang->block->doneBugs = '已解决'; +$lang->block->leftBugs = '未解决'; +$lang->block->last = '近期'; $lang->block->account = '所屬用戶'; $lang->block->module = '所屬模組'; diff --git a/module/block/view/projectstatisticblock.html.php b/module/block/view/projectstatisticblock.html.php index 31ff3874e9..c9ecda7842 100644 --- a/module/block/view/projectstatisticblock.html.php +++ b/module/block/view/projectstatisticblock.html.php @@ -60,6 +60,13 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po .block-statistic .project-info .col-xs-5, .block-statistic .project-info .col-xs-7 {margin-top: 8px;} .block-statistic .project-info .col-xs-5 {padding-left: 0;} +.block-statistic .data {width: 40%; text-align: left; padding: 10px 0px; font-size: 14px; font-weight: 700;} +.block-statistic .dataTitle {width: 60%; text-align: right; padding: 10px 0px; font-size: 14px;} +.block-statistic .executionName {padding-top: 2px; font-size: 14px;} +.block-statistic .lastIteration {padding-top: 6px;} +.block-statistic .progress-text-left {margin-right: 90px} +.block-statistic .progress-text-left .progress-text {padding-top: 2px; font-size: 14px;} + .status-count {margin: auto;} .status-count tr:first-child td:last-child {color: #000; font-weight: bold;} @@ -127,57 +134,66 @@ $(function()
model == 'scrum'):?> -
-
- -
- story->common . $lang->project->doneStories;?> - doneStories;?> -
+
+
+

block->story;?>

+
+
project->allStories . ":";?>
+
allStories;?>
-
-
-
project->allStories;?>
-
allStories;?>
-
-
- -
project->doneStories;?>
-
doneStories;?>
-
-
- -
project->leftStories;?>
-
leftStories;?>
-
+
+
project->doneStories . ":";?>
+
doneStories;?>
+
+
+
block->left . ":";?>
+
leftStories;?>
-
-
-

project->allInput;?>

-
- project->membersUnit, $project->teamCount);?> - project->hoursUnit, $project->estimate);?> - budget . ' ' . zget($lang->project->unitList, $project->budgetUnit);?> -
+
+

block->investment;?>

+
+
block->totalPeople . ":";?>
+
teamCount;?>
-
- -

project->lastIteration;?>

- executions as $execution):?> - - 3) break;?> -
name;?>
-
-
-
- hours->progress . '%';?> -
+
+
block->estimate . ":";?>
+
estimate;?>
+
+
+
block->consumedHours . ":";?>
+
consumed;?>
+
+
+
+

block->bug;?>

+
+
block->totalBug . ":";?>
+
allBugs;?>
+
+
+
block->doneBugs . ":";?>
+
doneBugs;?>
+
+
+
block->leftBugs . ":";?>
+
leftBugs;?>
+
+
+
+
+

block->last;?>

+
+
executions[0]->name;?>
+
+
+
+ executions[0]->hours->progress . '%';?>
-
+