diff --git a/module/block/control.php b/module/block/control.php
index 4d2261daef..9ea995f2ec 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -1322,6 +1322,7 @@ class block extends control
{
$projectID = $this->session->project;
$this->app->loadLang('execution');
+ $this->app->loadLang('bug');
$totalData = $this->loadModel('project')->getOverviewList('byId', $projectID, 'id_desc', 1);
$this->view->totalData = $totalData;
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index e21a448b05..7947c7b380 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -142,7 +142,7 @@ $lang->block->default['waterfall']['project']['7']['params']['type'] = 'all';
$lang->block->default['waterfall']['project']['7']['params']['count'] = '15';
$lang->block->default['waterfall']['project']['7']['params']['orderBy'] = 'id_desc';
-$lang->block->default['scrum']['project']['1']['title'] = '项目整体情况';
+$lang->block->default['scrum']['project']['1']['title'] = '项目概况';
$lang->block->default['scrum']['project']['1']['block'] = 'scrumoverview';
$lang->block->default['scrum']['project']['1']['grid'] = 8;
@@ -363,7 +363,7 @@ if($config->systemMode == 'new') $lang->block->modules['project']->availableBloc
$lang->block->modules['scrum']['index'] = new stdclass();
$lang->block->modules['scrum']['index']->availableBlocks = new stdclass();
-$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview = '项目整体情况';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview = '项目概况';
$lang->block->modules['scrum']['index']->availableBlocks->scrumlist = $lang->executionCommon . '列表';
$lang->block->modules['scrum']['index']->availableBlocks->sprint = $lang->executionCommon . '总览';
$lang->block->modules['scrum']['index']->availableBlocks->scrumtest = '待测版本';
diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php
index 3f23fa21e7..8e0114c099 100644
--- a/module/block/lang/zh-tw.php
+++ b/module/block/lang/zh-tw.php
@@ -141,7 +141,7 @@ $lang->block->default['waterfall']['project']['7']['params']['type'] = 'all';
$lang->block->default['waterfall']['project']['7']['params']['count'] = '15';
$lang->block->default['waterfall']['project']['7']['params']['orderBy'] = 'id_desc';
-$lang->block->default['scrum']['project']['1']['title'] = '項目整體情況';
+$lang->block->default['scrum']['project']['1']['title'] = '項目概況';
$lang->block->default['scrum']['project']['1']['block'] = 'scrumoverview';
$lang->block->default['scrum']['project']['1']['grid'] = 8;
@@ -355,7 +355,7 @@ $lang->block->modules['project']->availableBlocks->projectteam = '項目人力
$lang->block->modules['scrum']['index'] = new stdclass();
$lang->block->modules['scrum']['index']->availableBlocks = new stdclass();
-$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview = '項目整體情況';
+$lang->block->modules['scrum']['index']->availableBlocks->scrumoverview = '項目概況';
$lang->block->modules['scrum']['index']->availableBlocks->scrumlist = $lang->executionCommon . '列表';
$lang->block->modules['scrum']['index']->availableBlocks->sprint = $lang->executionCommon . '總覽';
$lang->block->modules['scrum']['index']->availableBlocks->scrumtest = '待測版本';
diff --git a/module/block/view/scrumoverviewblock.html.php b/module/block/view/scrumoverviewblock.html.php
index 5c8e2a704e..7269f3cce1 100644
--- a/module/block/view/scrumoverviewblock.html.php
+++ b/module/block/view/scrumoverviewblock.html.php
@@ -14,80 +14,57 @@
" . $lang->project->create, '', "class='btn btn-primary'")?>
-
-
-
-
block->totalInvestment;?>
-
-
-
block->totalPeople;?>
-
- teamCount ? html::a($this->createLink('project', 'manageMembers', 'projectID=' . $projectID), $totalData[$projectID]->teamCount) : 0;?>
-
-
-
-
block->consumedHours;?>
-
- consumed ? html::a($this->createLink('project', 'index', 'locate=no'), $totalData[$projectID]->consumed . $lang->execution->workHourUnit) : 0;?>
-
-
-
-
-
-
-
block->spent;?>
-
￥0
-
- budget != 0 ? zget($lang->project->currencySymbol, $totalData[$projectID]->budgetUnit) . number_format($totalData[$projectID]->budget, 2) : $lang->project->future;?>
-
-
-
-
-
-
-
block->totalStory;?>
-
- allStories;?>
-
-
-
- block->done;?>
- doneStories;?>
-
-
- block->left;?>
- leftStories;?>
-
-
-
-
block->totalBug;?>
-
- allBugs;?>
-
-
-
- block->done;?>
- doneBugs;?>
-
-
- block->left;?>
- leftBugs;?>
-
-
-
-
+
+
+ | block->storyNum;?> |
+ |
+ personnel->invest;?> |
+ |
+ workingHour;?> |
+ |
+ block->bugNum;?> |
+ |
+
+
+
+
+ | block->totalStory . ':';?> |
+ allStories;?> |
+ block->totalPeople . ':';?> |
+ teamCount ? html::a($this->createLink('project', 'manageMembers', 'projectID=' . $projectID), $totalData[$projectID]->teamCount) : 0;?> |
+ block->estimatedHours . ':';?> |
+ estimate . $lang->execution->workHour;?> |
+ block->totalBug. ':';?> |
+ allBugs;?> |
+
+
+ | block->done . ':';?> |
+ doneStories;?> |
+ |
+ |
+ block->consumedHours . ':';?> |
+ consumed . $lang->execution->workHour;?> |
+ block->done . ':';?> |
+ doneBugs;?> |
+
+
+ | block->left . ':';?> |
+ leftStories;?> |
+ |
+ |
+ |
+ |
+ bug->unResolved . ':';?> |
+ leftBugs;?> |
+
+
+
+
+
diff --git a/module/block/view/storyblock.html.php b/module/block/view/storyblock.html.php
index 3c0ffc9374..c8822ffa87 100644
--- a/module/block/view/storyblock.html.php
+++ b/module/block/view/storyblock.html.php
@@ -48,7 +48,7 @@
story->priList, $story->pri, $story->pri)?> |
title);?> |
- estimate . ' ' . $config->hourUnit?> |
+ estimate . $config->hourUnit?> |
processStatus('story', $story);?>
diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php
index faef7d03cf..0e28c95bf0 100644
--- a/module/build/view/linkstory.html.php
+++ b/module/build/view/linkstory.html.php
@@ -53,7 +53,7 @@
|
openedBy);?> |
assignedTo);?> |
- estimate . ' ' . $config->hourUnit;?> |
+ estimate . $config->hourUnit;?> |
processStatus('story', $story);?>
diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index 75726fdea3..03ddaeda2c 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -118,7 +118,7 @@ tbody tr td:first-child input {display: none;}
?>
|
openedBy);?> |
- estimate . ' ' . $config->hourUnit;?> |
+ estimate . $config->hourUnit;?> |
processStatus('story', $story);?>
diff --git a/module/execution/control.php b/module/execution/control.php
index 1b939277fc..a2bc444732 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1192,6 +1192,7 @@ class execution extends control
*/
public function create($projectID = '', $executionID = '', $copyExecutionID = '', $planID = 0, $confirm = 'no', $productID = 0)
{
+ /* Set menu. */
if($this->app->openApp == 'project')
{
if(!empty($copyExecutionID)) $projectID = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($copyExecutionID)->fetch('project');
@@ -1200,6 +1201,11 @@ class execution extends control
$this->project->setMenu($projectID);
}
+ elseif($this->app->openApp == 'execution')
+ {
+ $executionID = key($this->executions);
+ $this->execution->setMenu($executionID);
+ }
$this->app->loadLang('program');
$this->app->loadLang('stage');
@@ -1291,9 +1297,6 @@ class execution extends control
}
}
- $executionID = key($this->executions);
- $this->execution->setMenu($executionID);
-
$this->view->title = $this->lang->execution->create;
$this->view->position[] = $this->view->title;
$this->view->executions = array('' => '') + $this->execution->getList();
diff --git a/module/my/control.php b/module/my/control.php
index 8c77c1141f..80a612cae2 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -893,7 +893,7 @@ class my extends control
* @access public
* @return void
*/
- public function dynamic($type = 'today', $recTotal = 0, $date = '', $direction = 'next')
+ public function dynamic($type = 'today', $recTotal = 0, $date = '', $direction = 'next', $originTotal = 0)
{
/* Save session. */
$uri = $this->app->getURI(true);
@@ -933,13 +933,15 @@ class my extends control
$date = empty($date) ? '' : date('Y-m-d', $date);
$actions = $this->loadModel('action')->getDynamic($this->app->user->account, $type, $sort, $pager, 'all', 'all', 'all', $date, $direction);
+ if(empty($recTotal)) $originTotal = $pager->recTotal;
/* Assign. */
- $this->view->type = $type;
- $this->view->orderBy = $orderBy;
- $this->view->pager = $pager;
- $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $type);
- $this->view->direction = $direction;
+ $this->view->type = $type;
+ $this->view->orderBy = $orderBy;
+ $this->view->pager = $pager;
+ $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $type);
+ $this->view->direction = $direction;
+ $this->view->originTotal = $originTotal;
$this->display();
}
diff --git a/module/my/view/dynamic.html.php b/module/my/view/dynamic.html.php
index 21f4d8eeb5..cc78908d65 100644
--- a/module/my/view/dynamic.html.php
+++ b/module/my/view/dynamic.html.php
@@ -20,7 +20,7 @@
if($period == $type)
{
$active = 'btn-active-text';
- $label .= " {$pager->recTotal}";
+ $label .= " {$originTotal}";
}
echo html::a(inlink('dynamic', "type=$period"), $label, '', "class='btn btn-link $active' id='{$period}'")
?>
@@ -76,8 +76,8 @@ $firstDate = date('Y-m-d', strtotime($firstAction->originalDate) + 24 * 3600);
$lastDate = substr($action->originalDate, 0, 10);
$hasPre = $this->action->hasPreOrNext($firstDate, 'pre');
$hasNext = $this->action->hasPreOrNext($lastDate, 'next');
-$preLink = $hasPre ? inlink('dynamic', "type=$type&recTotal={$pager->recTotal}&date=" . strtotime($firstDate) . '&direction=pre') : 'javascript:;';
-$nextLink = $hasNext ? inlink('dynamic', "type=$type&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next') : 'javascript:;';
+$preLink = $hasPre ? inlink('dynamic', "type=$type&recTotal={$pager->recTotal}&date=" . strtotime($firstDate) . '&direction=pre&originTotal=' . $originTotal) : 'javascript:;';
+$nextLink = $hasNext ? inlink('dynamic', "type=$type&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next&originTotal=' . $originTotal) : 'javascript:;';
?>
diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php
index d149a5dbb2..21f3009dcb 100644
--- a/module/productplan/view/linkstory.html.php
+++ b/module/productplan/view/linkstory.html.php
@@ -56,7 +56,7 @@
|
openedBy);?> |
assignedTo);?> |
- estimate . ' ' . $config->hourUnit;?> |
+ estimate . $config->hourUnit;?> |
processStatus('story', $story);?>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 2c5a66f9f6..230ed30e44 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -154,7 +154,7 @@
|
openedBy);?> |
assignedTo);?> |
- estimate . ' ' . $config->hourUnit;?> |
+ estimate . $config->hourUnit;?> |
processStatus('story', $story);?>
diff --git a/module/projectrelease/view/linkstory.html.php b/module/projectrelease/view/linkstory.html.php
index a8bb6c8ba6..986fcfdaff 100644
--- a/module/projectrelease/view/linkstory.html.php
+++ b/module/projectrelease/view/linkstory.html.php
@@ -56,7 +56,7 @@
|
openedBy);?> |
assignedTo);?> |
- estimate . ' ' . $config->hourUnit;?> |
+ estimate . $config->hourUnit;?> |
processStatus('story', $story);?> |
story->stageList, $story->stage);?> |
diff --git a/module/projectrelease/view/view.html.php b/module/projectrelease/view/view.html.php
index 3fa35f6376..be6482613c 100644
--- a/module/projectrelease/view/view.html.php
+++ b/module/projectrelease/view/view.html.php
@@ -115,7 +115,7 @@
?>
openedBy);?> |
- estimate . ' ' . $config->hourUnit;?> |
+ estimate . $config->hourUnit;?> |
processStatus('story', $story);?>
|
diff --git a/module/release/view/linkstory.html.php b/module/release/view/linkstory.html.php
index 0e746d0e2d..507da2c9c5 100644
--- a/module/release/view/linkstory.html.php
+++ b/module/release/view/linkstory.html.php
@@ -56,7 +56,7 @@
openedBy);?> |
assignedTo);?> |
- estimate . ' ' . $config->hourUnit;?> |
+ estimate . $config->hourUnit;?> |
processStatus('story', $story);?> |
story->stageList, $story->stage);?> |
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index 190cfd230f..cb7b8bc7d0 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -115,7 +115,7 @@
?>
openedBy);?> |
- estimate . ' ' . $config->hourUnit;?> |
+ estimate . $config->hourUnit;?> |
processStatus('story', $story);?>
|
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 7227e14f51..9ca55b1b54 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -159,7 +159,7 @@
id", '', true); ?>">title;?> |
assignedTo);?> |
- estimate . ' ' . $config->hourUnit;?> |
+ estimate . $config->hourUnit;?> |
processStatus('story', $child);?> |
|
| story->estimate;?> |
- estimate . ' ' . $config->hourUnit;?> |
+ estimate . $config->hourUnit;?> |
| story->keywords;?> |