diff --git a/module/product/control.php b/module/product/control.php
index ac5957a401..97f1463622 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -132,7 +132,7 @@ class product extends control
$this->loadModel('execution');
/* Set product, module and query. */
- $productID = $this->product->saveState($productID, $this->products);
+ $productID = $this->app->rawModule != 'projectstory' ? $this->product->saveState($productID, $this->products) : $productID;
$branch = ($branch === '') ? (int)$this->cookie->preBranch : (int)$branch;
setcookie('preProductID', $productID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
setcookie('preBranch', (int)$branch, $this->config->cookieLife, $this->config->webRoot, '', false, true);
@@ -174,11 +174,25 @@ class product extends control
{
setcookie('treeBranch', (int)$branch, 0, $this->config->webRoot, '', false, false);
$browseType = 'unclosed';
- $moduleTree = $this->tree->getTreeMenu($productID, 'story', $startModuleID = 0, array('treeModel', $createModuleLink), '', $branch, "¶m=$param&storyType=$storyType");
+ if($this->app->rawModule == 'projectstory' and empty($productID))
+ {
+ $moduleTree = $this->tree->getExecutionStoryTreeMenu($this->session->PRJ, 0, array('treeModel', 'createProjectStoryLink'));
+ }
+ else
+ {
+ $moduleTree = $this->tree->getTreeMenu($productID, 'story', $startModuleID = 0, array('treeModel', $createModuleLink), '', $branch, "¶m=$param&storyType=$storyType");
+ }
}
else
{
- $moduleTree = $this->tree->getTreeMenu($productID, 'story', $startModuleID = 0, array('treeModel', $createModuleLink), '', (int)$this->cookie->treeBranch, "¶m=$param&storyType=$storyType");
+ if($this->app->rawModule == 'projectstory' and empty($productID))
+ {
+ $moduleTree = $this->tree->getExecutionStoryTreeMenu($this->session->PRJ, 0, array('treeModel', 'createProjectStoryLink'));
+ }
+ else
+ {
+ $moduleTree = $this->tree->getTreeMenu($productID, 'story', $startModuleID = 0, array('treeModel', $createModuleLink), '', (int)$this->cookie->treeBranch, "¶m=$param&storyType=$storyType");
+ }
}
if($browseType != 'bymodule' and $browseType != 'bybranch') $this->session->set('storyBrowseType', $browseType);
@@ -201,7 +215,7 @@ class product extends control
$stories = $this->product->getStories($productID, $branch, $browseType, $queryID, $moduleID, $storyType, $sort, $pager);
if($this->app->rawModule == 'projectstory')
{
- $this->session->set('currentProductType', $product->type);
+ if(!empty($product)) $this->session->set('currentProductType', $product->type);
$projectProducts = $this->product->getProducts($this->session->PRJ);
$productPlans = $this->execution->getPlans($projectProducts);
@@ -244,13 +258,15 @@ class product extends control
$showModule = !empty($this->config->datatable->productBrowse->showModule) ? $this->config->datatable->productBrowse->showModule : '';
$this->view->modulePairs = $showModule ? $this->tree->getModulePairs($productID, 'story', $showModule) : array();
+ $productName = ($this->app->rawModule == 'projectstory' and empty($productID)) ? $this->lang->product->all : $this->products[$productID];
+
/* Assign. */
- $this->view->title = $this->products[$productID]. $this->lang->colon . $this->lang->product->browse;
- $this->view->position[] = $this->products[$productID];
+ $this->view->title = $productName . $this->lang->colon . $this->lang->product->browse;
+ $this->view->position[] = $productName;
$this->view->position[] = $this->lang->product->browse;
$this->view->productID = $productID;
$this->view->product = $product;
- $this->view->productName = $this->products[$productID];
+ $this->view->productName = $productName;
$this->view->moduleID = $moduleID;
$this->view->stories = $stories;
$this->view->plans = $this->loadModel('productplan')->getPairs($productID, $branch, '', true);
diff --git a/module/product/model.php b/module/product/model.php
index a81c632fcd..90a25c7106 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -823,9 +823,18 @@ class productModel extends model
{
$this->config->product->search['actionURL'] = $actionURL;
$this->config->product->search['queryID'] = $queryID;
- $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productID);
- $this->config->product->search['params']['product']['values'] = array($productID => $products[$productID], 'all' => $this->lang->product->allProduct);
- $this->config->product->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'story', $startModuleID = 0);
+ $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productID);
+
+ if($this->app->rawModule == 'projectstory' and empty($productID))
+ {
+ $this->config->product->search['params']['product']['values'] = array('all' => $this->lang->product->allProduct, 'all' => $this->lang->product->allProduct);
+ }
+ else
+ {
+ $this->config->product->search['params']['product']['values'] = array($productID => $products[$productID], 'all' => $this->lang->product->allProduct);
+ }
+
+ $this->config->product->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'story', $startModuleID = 0);
if($this->session->currentProductType == 'normal')
{
unset($this->config->product->search['fields']['branch']);
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 2526773b87..7930134d2e 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -51,9 +51,10 @@ $isProjectStory = $this->app->rawModule == 'projectstory';
diff --git a/module/project/control.php b/module/project/control.php
index 36d6b31d06..dfdd8422ae 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -573,6 +573,89 @@ class project extends control
$this->display('group', 'create');
}
+ /**
+ * Project dynamic.
+ *
+ * @param int $projectID
+ * @param string $type
+ * @param string $param
+ * @param int $recTotal
+ * @param string $date
+ * @param string $direction next|pre
+ * @access public
+ * @return void
+ */
+ public function dynamic($projectID = 0, $type = 'today', $param = '', $recTotal = 0, $date = '', $direction = 'next')
+ {
+ $this->lang->noMenuModule[] = 'project';
+
+ /* Save session. */
+ $uri = $this->app->getURI(true);
+ $this->session->set('productList', $uri);
+ $this->session->set('productPlanList', $uri);
+ $this->session->set('releaseList', $uri);
+ $this->session->set('storyList', $uri);
+ $this->session->set('executionList', $uri);
+ $this->session->set('taskList', $uri);
+ $this->session->set('buildList', $uri);
+ $this->session->set('bugList', $uri);
+ $this->session->set('caseList', $uri);
+ $this->session->set('testtaskList', $uri);
+
+ /* Append id for secend sort. */
+ $orderBy = $direction == 'next' ? 'date_desc' : 'date_asc';
+ $sort = $this->loadModel('common')->appendOrder($orderBy);
+
+ /* Set the pager. */
+ $this->app->loadClass('pager', $static = true);
+ $pager = new pager($recTotal, $recPerPage = 50, $pageID = 1);
+
+ /* Set the user and type. */
+ $account = 'all';
+ if($type == 'account')
+ {
+ $user = $this->loadModel('user')->getById($param, 'account');
+ if($user) $account = $user->account;
+ }
+ $period = $type == 'account' ? 'all' : $type;
+ $date = empty($date) ? '' : date('Y-m-d', $date);
+ $actions = $this->loadModel('action')->getDynamic($account, $period, $sort, $pager, 'all', $projectID, $date, $direction);
+
+ /* The header and position. */
+ $project = $this->project->getByID($projectID);
+ $this->view->title = $project->name . $this->lang->colon . $this->lang->project->dynamic;
+ $this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
+ $this->view->position[] = $this->lang->project->dynamic;
+
+ $this->view->userIdPairs = $this->project->getTeamMemberPairs($project->parent);
+ $this->view->accountPairs = $this->loadModel('user')->getPairs('noletter|nodeleted');
+
+ /* Assign. */
+ $this->view->projectID = $projectID;
+ $this->view->type = $type;
+ $this->view->orderBy = $orderBy;
+ $this->view->pager = $pager;
+ $this->view->account = $account;
+ $this->view->param = $param;
+ $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $type);
+ $this->view->direction = $direction;
+ $this->display();
+ }
+
+ /**
+ * Execution list.
+ *
+ * @access public
+ * @return void
+ */
+ public function execution()
+ {
+ $PRJ = $this->session->PRJ;
+ if(!$PRJ) $PRJ = current(explode(',', $this->app->user->view->projects));
+
+ $this->locate($this->createLink('execution', 'all', "status=all&executionID=0&from=project", '', false, $PRJ));
+ }
+
/**
* Project manage view.
*
diff --git a/module/project/css/dynamic.css b/module/project/css/dynamic.css
new file mode 100644
index 0000000000..ca418df21d
--- /dev/null
+++ b/module/project/css/dynamic.css
@@ -0,0 +1,21 @@
+#mainMenu .btn-group ul.dropdown-menu{max-height: 300px; overflow: auto;}
+#dynamics {padding: 10px 0;}
+.dynamic {position: relative; padding-left: 170px;}
+.dynamic-date {position: absolute; left: 0; top: 0; width: 150px; border: 2px solid #eee; border-radius: 4px; padding: 14px 20px; height: 58px;}
+.dynamic-date:before {content: ' '; display: block; position: absolute; right: -22px; top: 26px; height: 2px; width: 20px; background-color: #eee;}
+.dynamic-date > .date-label,
+.dynamic-date > .date-text {font-size: 18px; display: block;}
+.dynamic-date > .date-label + .date-text {font-size: 14px; line-height: 14px;}
+.dynamic-date > .date-label {margin-top: -8px;}
+.dynamic-date > .btn {position: absolute; right: 10px; top: 15px;}
+.dynamic .timeline {border: 2px solid #eee; border-radius: 4px; margin-bottom: 20px; padding: 10px 20px 10px 100px; transition: max-height .2s; overflow: hidden;}
+.dynamic .timeline-tag {left: -75px; font-size: 14px; color: #838A9D;}
+.dynamic .timeline-text {color: #3C4353;}
+.dynamic .text-muted {color: #838A9D;}
+.dynamic .label-id {top: -1px;}
+.dynamic.active .timeline,
+.dynamic.active .dynamic-date {border-color: #00a9fc;}
+.dynamic.active .dynamic-date:before {background-color: #00a9fc;}
+.dynamic.collapsed .timeline {max-height: 58px;}
+.dynamic.collapsed .timeline > li + li {display: none;}
+.dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8'; }
diff --git a/module/project/js/browse.js b/module/project/js/browse.js
index 6efb00afd4..f3f57b523e 100644
--- a/module/project/js/browse.js
+++ b/module/project/js/browse.js
@@ -8,5 +8,4 @@ $(function()
});
});
-$('#project' + projectID).addClass('active');
$(".tree .active").parent('li').addClass('active');
diff --git a/module/project/model.php b/module/project/model.php
index 5a2264225c..67505c5ab8 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -144,7 +144,6 @@ class projectModel extends model
{
$this->session->set('moreProjectLink', $this->app->getURI(true));
- $this->loadModel('project');
$currentProjectName = $this->lang->project->common;
if($projectID)
{
diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index de7693255a..867bcd8bd7 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -50,7 +50,7 @@ foreach($projects as $project)
?>