diff --git a/module/action/model.php b/module/action/model.php index 64d2ac9def..0aa57c4eec 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -1082,13 +1082,13 @@ class actionModel extends model * @access public * @return array */ - public function buildDateGroup($actions, $direction = 'next') + public function buildDateGroup($actions, $direction = 'next', $type = 'today') { $dateGroup = array(); foreach($actions as $action) { $timeStamp = strtotime(isset($action->originalDate) ? $action->originalDate : $action->date); - $date = date(DT_DATE4, $timeStamp); + $date = $type == 'all' ? date(DT_DATE3, $timeStamp) : date(DT_DATE4, $timeStamp); $action->time = date(DT_TIME2, $timeStamp); $dateGroup[$date][] = $action; } @@ -1103,7 +1103,7 @@ class actionModel extends model foreach($lastDateActions as $action) { $timeStamp = strtotime(isset($action->originalDate) ? $action->originalDate : $action->date); - $date = date(DT_DATE4, $timeStamp); + $date = $type == 'all' ? date(DT_DATE3, $timeStamp) : date(DT_DATE4, $timeStamp); $action->time = date(DT_TIME2, $timeStamp); $dateGroup[$date][] = $action; } diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php index f8d1725938..3e2a2e876f 100644 --- a/module/block/view/taskblock.html.php +++ b/module/block/view/taskblock.html.php @@ -16,6 +16,7 @@ diff --git a/module/company/control.php b/module/company/control.php index e3633a5e63..4c1c107308 100644 --- a/module/company/control.php +++ b/module/company/control.php @@ -243,7 +243,7 @@ class company extends control $this->view->orderBy = $orderBy; $this->view->pager = $pager; $this->view->param = $param; - $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction); + $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $browseType); $this->view->direction = $direction; $this->display(); } diff --git a/module/company/css/dynamic.css b/module/company/css/dynamic.css index 7857018ad7..0beed2ab9c 100644 --- a/module/company/css/dynamic.css +++ b/module/company/css/dynamic.css @@ -17,3 +17,4 @@ .dynamic.collapsed .timeline {max-height: 58px;} .dynamic.collapsed .timeline > li + li {display: none;} .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8'; } +.margin-l-50px {margin-left: 50px;} diff --git a/module/company/view/dynamic.html.php b/module/company/view/dynamic.html.php index 3ee42be80f..a2465c1753 100644 --- a/module/company/view/dynamic.html.php +++ b/module/company/view/dynamic.html.php @@ -41,14 +41,14 @@ $actions):?>
-
+
action->dynamic->today;?>
-
+ show('right', 'pagerjs');?>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index 6f74b29c35..54ab7f2bfb 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -341,7 +341,12 @@ -
+
+ app->rawParams['type'] = 'story'; + $storyPager->show('right', 'pagerjs'); + $this->app->rawParams['type'] = $type; + ?> @@ -415,7 +420,12 @@ productplan->batchUnlink, '', 'btn');?> -
productplan->bugSummary, count($planBugs));?>
+
productplan->bugSummary, count($planBugs));?>
+ app->rawParams['type'] = 'bug'; + $bugPager->show('right', 'pagerjs'); + $this->app->rawParams['type'] = $type; + ?> diff --git a/module/project/control.php b/module/project/control.php index 6631a89c6e..7ac0974948 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -1249,20 +1249,32 @@ class project extends control unset($this->lang->project->endList[365]); } + $this->loadModel('user'); + $poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst', $project->PO, $this->config->maxCount); + if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PM"] = $this->config->user->moreLink; + + $pmUsers = $this->user->getPairs('noclosed|nodeleted|pmfirst', $project->PM, $this->config->maxCount); + if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PO"] = $this->config->user->moreLink; + + $qdUsers = $this->user->getPairs('noclosed|nodeleted|qdfirst', $project->QD, $this->config->maxCount); + if(!empty($this->config->user->moreLink)) $this->config->moreLinks["QD"] = $this->config->user->moreLink; + + $rdUsers = $this->user->getPairs('noclosed|nodeleted|devfirst', $project->RD, $this->config->maxCount); + if(!empty($this->config->user->moreLink)) $this->config->moreLinks["RD"] = $this->config->user->moreLink; + $this->view->title = $title; $this->view->position = $position; $this->view->projects = $projects; $this->view->project = $project; - $this->view->poUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pofirst', $project->PO); - $this->view->pmUsers = $this->user->getPairs('noclosed|nodeleted|pmfirst', $project->PM); - $this->view->qdUsers = $this->user->getPairs('noclosed|nodeleted|qdfirst', $project->QD); - $this->view->rdUsers = $this->user->getPairs('noclosed|nodeleted|devfirst', $project->RD); + $this->view->poUsers = $poUsers; + $this->view->pmUsers = $pmUsers; + $this->view->qdUsers = $qdUsers; + $this->view->rdUsers = $rdUsers; $this->view->groups = $this->loadModel('group')->getPairs(); $this->view->allProducts = $allProducts; $this->view->linkedProducts = $linkedProducts; $this->view->productPlans = $productPlans; $this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($linkedProducts), '', $linkedBranches); - $this->display(); } @@ -1310,14 +1322,27 @@ class project extends control $this->view->customFields = $customFields; $this->view->showFields = $this->config->project->custom->batchEditFields; + $this->loadModel('user'); + $pmUsers = $this->user->getPairs('noclosed|nodeleted|pmfirst', $appendPmUsers, $this->config->maxCount); + if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PM"] = $this->config->user->moreLink; + + $poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst', $appendPoUsers, $this->config->maxCount); + if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PO"] = $this->config->user->moreLink; + + $qdUsers = $this->user->getPairs('noclosed|nodeleted|qdfirst', $appendQdUsers, $this->config->maxCount); + if(!empty($this->config->user->moreLink)) $this->config->moreLinks["QD"] = $this->config->user->moreLink; + + $rdUsers = $this->user->getPairs('noclosed|nodeleted|devfirst', $appendRdUsers, $this->config->maxCount); + if(!empty($this->config->user->moreLink)) $this->config->moreLinks["RD"] = $this->config->user->moreLink; + $this->view->title = $this->lang->project->batchEdit; $this->view->position[] = $this->lang->project->batchEdit; $this->view->projectIDList = $projectIDList; $this->view->projects = $projects; - $this->view->pmUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst', $appendPmUsers); - $this->view->poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst', $appendPoUsers); - $this->view->qdUsers = $this->user->getPairs('noclosed|nodeleted|qdfirst', $appendQdUsers); - $this->view->rdUsers = $this->user->getPairs('noclosed|nodeleted|devfirst', $appendRdUsers); + $this->view->pmUsers = $pmUsers; + $this->view->poUsers = $poUsers; + $this->view->qdUsers = $qdUsers; + $this->view->rdUsers = $rdUsers; $this->display(); } @@ -1893,7 +1918,7 @@ class project extends control $this->loadModel('dept'); $project = $this->project->getById($projectID); - $users = $this->user->getPairs('noclosed|nodeleted|devfirst|nofeedback'); + $users = $this->user->getPairs('noclosed|nodeleted|devfirst|nofeedback', '', $this->config->maxCount); $roles = $this->user->getUserRoles(array_keys($users)); $deptUsers = $dept === '' ? array() : $this->dept->getDeptUserPairs($dept); $currentMembers = $this->project->getTeamMembers($projectID); @@ -1903,6 +1928,7 @@ class project extends control /* Set menu. */ $this->project->setMenu($this->projects, $project->id); + if(!empty($this->config->user->moreLink)) $this->config->moreLinks["accounts[]"] = $this->config->user->moreLink; $title = $this->lang->project->manageMembers . $this->lang->colon . $project->name; $position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name); @@ -2027,7 +2053,7 @@ class project extends control } else { - $allStories = $this->story->getProductStories(array_keys($products), $branches, $moduleID = '0', $status = 'active', 'story', 'id_desc', $pager = null, $hasParent = false); + $allStories = $this->story->getProductStories(array_keys($products), $branches, $moduleID = '0', $status = 'active', 'story', 'id_desc', $hasParent = false, '', $pager = null); } foreach($allStories as $id => $story) { @@ -2195,7 +2221,7 @@ class project extends control $this->view->orderBy = $orderBy; $this->view->pager = $pager; $this->view->param = $param; - $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction); + $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $type); $this->view->direction = $direction; $this->display(); } diff --git a/module/project/css/dynamic.css b/module/project/css/dynamic.css index ca418df21d..d26c43a9b8 100644 --- a/module/project/css/dynamic.css +++ b/module/project/css/dynamic.css @@ -19,3 +19,4 @@ .dynamic.collapsed .timeline {max-height: 58px;} .dynamic.collapsed .timeline > li + li {display: none;} .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8'; } +.margin-l-50px {margin-left: 50px;} diff --git a/module/project/js/managemembers.js b/module/project/js/managemembers.js index ad634b0871..db7fa3260f 100644 --- a/module/project/js/managemembers.js +++ b/module/project/js/managemembers.js @@ -17,9 +17,18 @@ function addItem(obj) { var item = $('#addItem').html().replace(/%i%/g, i); $(obj).closest('tr').after('' + item + ''); - var accounts = $('#hours' + i).closest('tr').find('select:first') - accounts.trigger('liszt:updated'); - accounts.chosen(); + var $accounts = $('#hours' + i).closest('tr').find('select:first') + + if($accounts.attr('data-pickertype') != 'remote') + { + $accounts.chosen(); + } + else + { + $accounts.parent().find('.picker.picker-ready').remove(); + var pickerremote = $accounts.attr('data-pickerremote'); + $accounts.picker({chosenMode: true, remote: pickerremote}); + } i ++; } diff --git a/module/project/model.php b/module/project/model.php index 3123842427..938cfc8c82 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -2962,6 +2962,7 @@ class projectModel extends model $buttons .= common::buildIconButton('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $task, 'list', '', '', 'iframe', true); $buttons .= common::buildIconButton('task', 'start', "taskID=$task->id", $task, 'list', '', '', 'iframe', true); $buttons .= common::buildIconButton('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'time', '', 'iframe', true); + if(isset($task->children)) $taskItem->children = $this->formatTasksForTree($task->children); if($taskItem->storyChanged) { diff --git a/module/project/view/batchedit.html.php b/module/project/view/batchedit.html.php index 437e5d8b1a..e6da13707a 100755 --- a/module/project/view/batchedit.html.php +++ b/module/project/view/batchedit.html.php @@ -60,6 +60,12 @@ + config->moreLinks["PM"])) $this->config->moreLinks["PMs[$projectID]"] = $this->config->moreLinks["PM"]; + if(!empty($this->config->moreLinks["PO"])) $this->config->moreLinks["POs[$projectID]"] = $this->config->moreLinks["PO"]; + if(!empty($this->config->moreLinks["QD"])) $this->config->moreLinks["QDs[$projectID]"] = $this->config->moreLinks["QD"]; + if(!empty($this->config->moreLinks["RD"])) $this->config->moreLinks["RDs[$projectID]"] = $this->config->moreLinks["RD"]; + ?> name, "class='form-control'");?> @@ -82,6 +88,12 @@ order, "class='form-control'")?> + config->moreLinks["PMs[$projectID]"])) unset($this->config->moreLinks["PMs[$projectID]"]); + if(isset($this->config->moreLinks["POs[$projectID]"])) unset($this->config->moreLinks["POs[$projectID]"]); + if(isset($this->config->moreLinks["QDs[$projectID]"])) unset($this->config->moreLinks["QDs[$projectID]"]); + if(isset($this->config->moreLinks["RDs[$projectID]"])) unset($this->config->moreLinks["RDs[$projectID]"]); + ?> diff --git a/module/project/view/dynamic.html.php b/module/project/view/dynamic.html.php index 2cee4f31d7..2b7770dbdd 100755 --- a/module/project/view/dynamic.html.php +++ b/module/project/view/dynamic.html.php @@ -68,14 +68,14 @@ $actions):?>
-
+
action->dynamic->today;?>
-