Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch dev/story-75383 of zentao/zentaopms (#9651)

Browse Source
This commit is contained in:
刘刚
2025-06-18 16:33:55 +08:00
committed by Gitfox
parent aac7126b04 6831273863
commit 4ec52538ce
3 changed files with 22 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+1 -1
View File
@@ -2680,7 +2680,7 @@ class actionModel extends model
->where($condition)
->andWhere("`date`")->ge($lastDate)
->andWhere("`date`")->lt($lastDate . ' 23:59:59')
->andWhere('action.id' . $direction . $lastActionID)
->andWhere("`date` {$direction} '{$lastAction->date}'")
->orderBy($this->session->actionOrderBy)
->limit($limit)
->fetchAll('id', false);
module/my/control.php
+2 -35
View File
@@ -1472,45 +1472,12 @@ class my extends control
*/
public function dynamic(string $type = 'today', int $recTotal = 0, string $date = '', string $direction = 'next')
{
/* Save session. */
$uri = $this->app->getURI(true);
$this->session->set('productList', $uri, 'product');
$this->session->set('storyList', $uri, 'product');
$this->session->set('designList', $uri, 'project');
$this->session->set('productPlanList', $uri, 'product');
$this->session->set('releaseList', $uri, 'product');
$this->session->set('projectList', $uri, 'project');
$this->session->set('executionList', $uri, 'execution');
$this->session->set('taskList', $uri, 'execution');
$this->session->set('buildList', $uri, 'execution');
$this->session->set('bugList', $uri, 'qa');
$this->session->set('caseList', $uri, 'qa');
$this->session->set('caselibList', $uri, 'qa');
$this->session->set('testsuiteList', $uri, 'qa');
$this->session->set('testtaskList', $uri, 'qa');
$this->session->set('reportList', $uri, 'qa');
$this->session->set('docList', $uri, 'doc');
$this->session->set('todoList', $uri, 'my');
$this->session->set('riskList', $uri, 'project');
$this->session->set('issueList', $uri, 'project');
$this->session->set('stakeholderList', $uri, 'project');
$this->session->set('meetingroomList', $uri, 'admin');
$this->session->set('meetingList', $uri, 'project');
$this->session->set('meetingList', $uri, 'assetlib');
$this->session->set('storyLibList', $uri, 'assetlib');
$this->session->set('issueLibList', $uri, 'assetlib');
$this->session->set('riskLibList', $uri, 'assetlib');
$this->session->set('opportunityLibList', $uri, 'assetlib');
$this->session->set('practiceLibList', $uri, 'assetlib');
$this->session->set('componentLibList', $uri, 'assetlib');
$this->session->set('opportunityList', $uri, 'project');
/* Append id for second sort. */
$orderBy = $direction == 'next' ? 'date_desc' : 'date_asc';
$date = empty($date) ? '' : date('Y-m-d', (int)$date);
$actions = $this->loadModel('action')->getDynamic($this->app->user->account, $type, $orderBy, 50, 'all', 'all', 'all', $date, $direction);
$actions = $this->loadModel('action')->getDynamicByAccount($this->app->user->account, $type, $orderBy, 50, $date, $direction);
$dateGroups = $this->action->buildDateGroup($actions, $direction);
if(empty($recTotal)) $recTotal = count($dateGroups) < 2 ? count($dateGroups, 1) - count($dateGroups) : $this->action->getDynamicCount();
if(empty($recTotal) && $dateGroups) $recTotal = count($dateGroups) < 2 ? count($dateGroups, 1) - count($dateGroups) : $this->action->getDynamicCount();
/* Assign. */
$this->view->title = $this->lang->my->common . $this->lang->hyphen . $this->lang->my->dynamic;
module/my/ui/dynamic.html.php
+19 -2
View File
@@ -37,7 +37,8 @@ else
$lastAction = '';
foreach($dateGroups as $date => $actions)
{
$isToday = date(DT_DATE3) == $date;
$lastAction = end($actions);
$isToday = date(DT_DATE3) == $date;
if(empty($firstAction)) $firstAction = reset($actions);
$content[] = li
(
@@ -70,9 +71,25 @@ else
)
)
);
$lastAction = end($actions);
}
global $app;
$hasMore = $app->control->loadModel('action')->hasMoreAction($lastAction);
if($hasMore)
{
$content[] = li
(
a
(
setID('showMoreDynamic'),
setClass('block text-center'),
setData(array('lastid' => $lastAction->id)),
set::href('###'),
on::click('showMore'),
icon('chevron-double-down')
)
);
}
$content = ul
(
setClass('timeline list-none pl-0'),