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

* Refactor code.

Browse Source
This commit is contained in:
chaideqing
2022-12-01 10:16:26 +08:00
parent bf3e8e33b3
commit 6c3e107f78
9 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/js/taskkanban.js
+1 -1
View File
@@ -288,7 +288,7 @@ function renderTaskItem(item, $item, col)
var priHtml = '<span class="info info-pri' + (item.pri ? ' label-pri label-pri-' + item.pri : '') + '" title="' + item.pri + '">' + item.pri + '</span>';
var hoursHtml = scaleSize <= 1 && item.status != 'wait' ? ('<span class="info info-estimate text-muted">' + taskLang.leftAB + ' ' + item.left + 'h</span>') : ('<span class="info info-estimate text-muted">' + taskLang.estimateAB + ' ' + item.estimate + 'h</span>');
var avatarHtml = '';
if(item.assignedTo == '' && item.mode == 'multi') avatarHtml = renderUserAvatar({title: item.assignedMembers, realname: iconTeam}, 'task', item.id, '', col.type);
if(item.assignedTo == '' && item.mode == 'multi') avatarHtml = renderUserAvatar({title: item.teamMembers, realname: teamWords}, 'task', item.id, '', col.type);
else avatarHtml = renderUserAvatar(item.assignedTo, 'task', item.id, '', col.type);
var $infos = $item.find('.infos');
if(!$infos.length) $infos = $('<div class="infos"></div>');
module/execution/lang/de.php
+1 -1
View File
@@ -478,7 +478,7 @@ $lang->execution->kanbanViewList['story'] = "{$lang->SRCommon}";
$lang->execution->kanbanViewList['bug'] = 'Bug';
$lang->execution->kanbanViewList['task'] = 'Task';
$lang->execution->iconTeam = 'Team';
$lang->execution->teamWords = 'Team';
$lang->kanbanSetting = new stdclass();
$lang->kanbanSetting->noticeReset = 'Möchten Sie die Einstellungen des Kanbans zurücksetzen?';
module/execution/lang/en.php
+1 -1
View File
@@ -478,7 +478,7 @@ $lang->execution->kanbanViewList['story'] = "{$lang->SRCommon}";
$lang->execution->kanbanViewList['bug'] = 'Bug';
$lang->execution->kanbanViewList['task'] = 'Task';
$lang->execution->iconTeam = 'Team';
$lang->execution->teamWords = 'Team';
$lang->kanbanSetting = new stdclass();
$lang->kanbanSetting->noticeReset = 'Do you want to reset Kanban?';
module/execution/lang/fr.php
+1 -1
View File
@@ -478,7 +478,7 @@ $lang->execution->kanbanViewList['story'] = "{$lang->SRCommon}";
$lang->execution->kanbanViewList['bug'] = 'Bug';
$lang->execution->kanbanViewList['task'] = 'Task';
$lang->execution->iconTeam = 'Team';
$lang->execution->teamWords = 'Team';
$lang->kanbanSetting = new stdclass();
$lang->kanbanSetting->noticeReset = 'Voulez-vous réinitialiser le tableau Kanban ?';
module/execution/lang/zh-cn.php
+1 -1
View File
@@ -478,7 +478,7 @@ $lang->execution->kanbanViewList['story'] = "{$lang->SRCommon}看板";
$lang->execution->kanbanViewList['bug'] = 'Bug看板';
$lang->execution->kanbanViewList['task'] = '任务看板';
$lang->execution->iconTeam = '团队';
$lang->execution->teamWords = '团队';
$lang->kanbanSetting = new stdclass();
$lang->kanbanSetting->noticeReset = '是否恢复看板默认设置？';
module/execution/lang/zh-tw.php
+1 -1
View File
@@ -453,6 +453,6 @@ $lang->execution->statusColorList['doing'] = '#0BD986';
$lang->execution->statusColorList['suspended'] = '#fdc137';
$lang->execution->statusColorList['closed'] = '#838A9D';
$lang->execution->iconTeam = '團隊';
$lang->execution->teamWords = '團隊';
$lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#7FBB00', '#424BAC', '#66c5f8', '#EC2761');
module/execution/view/taskkanban.html.php
+1 -1
View File
@@ -231,5 +231,5 @@ js::set('priv',
<?php js::set('orderBy', $storyOrder);?>
<?php js::set('defaultMinColWidth', $this->config->minColWidth);?>
<?php js::set('defaultMaxColWidth', $this->config->maxColWidth);?>
<?php js::set('iconTeam', $lang->execution->iconTeam);?>
<?php js::set('teamWords', $lang->execution->teamWords);?>
<?php include '../../common/view/footer.html.php';?>
module/kanban/model.php
+1 -1
View File
@@ -1514,7 +1514,7 @@ class kanbanModel extends model
$cardData['mode'] = $object->mode;
if($object->mode == 'multi')
{
$cardData['assignedMembers'] = $object->assignedMembers;
$cardData['teamMembers'] = $object->teamMembers;
}
}
else
module/task/model.php
+2 -2
View File
@@ -3208,12 +3208,12 @@ class taskModel extends model
if($task->mode == 'multi')
{
$assignedMembers = $this->dao->select('t1.realname')->from(TABLE_USER)->alias('t1')
$teamMembers = $this->dao->select('t1.realname')->from(TABLE_USER)->alias('t1')
->leftJoin(TABLE_TASKTEAM)->alias('t2')
->on('t1.account = t2.account')
->where('t2.task')->eq($task->id)
->fetchPairs();
$task->assignedMembers= join(',', array_keys($assignedMembers));
$task->teamMembers= join(',', array_keys($teamMembers));
}
return $task;