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

Merge branch 'master_xieqiyu_54467' into 'master'

Browse Source 
* Code for task#54467.

See merge request easycorp/zentaopms!3481
This commit is contained in:
王怡栋
2022-05-18 06:21:47 +00:00
parent 7b4f3b4abd b223f55900
commit cbef1578ca
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/js/kanban.js
+6 -3
View File
@@ -430,9 +430,10 @@ function renderUserAvatar(user, objectType, objectID, size)
/**
* Render deadline
* @param {String|Date} deadline Deadline
* @param {string} status
* @returns {JQuery}
*/
function renderDeadline(deadline)
function renderDeadline(deadline, status)
{
if(deadline == '0000-00-00') return;
@@ -444,8 +445,10 @@ function renderDeadline(deadline)
now.setMilliseconds(0);
var isEarlyThanToday = date.getTime() < now.getTime();
var deadlineDate = $.zui.formatDate(date, 'MM-dd');
var statusList = ['wait','doing','pause'];
var textColor = isEarlyThanToday && typeof(status) != 'undefined' && statusList.indexOf(status) != -1 ? 'text-red' : 'text-muted';
return $('<span class="info info-deadline"/>').text(deadlineLang + ' ' + deadlineDate).addClass(isEarlyThanToday ? 'text-red' : 'text-muted');
return $('<span class="info info-deadline"/>').text(deadlineLang + ' ' + deadlineDate).addClass(textColor);
}
/**
@@ -607,7 +610,7 @@ function renderTaskItem(item, $item, col)
var $infos = $item.find('.infos');
if(!$infos.length) $infos = $('<div class="infos"></div>');
$infos.html([priHtml, hoursHtml].join(''));
if(item.deadline && scaleSize <= 1) $infos.append(renderDeadline(item.deadline));
if(item.deadline && scaleSize <= 1) $infos.append(renderDeadline(item.deadline, item.status));
$infos[scaleSize <= 1 ? 'append' : 'prepend'](avatarHtml);
if(scaleSize <= 1) $infos.appendTo($item);
module/execution/js/taskkanban.js
+6 -3
View File
@@ -45,9 +45,10 @@ function renderUserAvatar(user, objectType, objectID, size)
/**
* Render deadline
* @param {String|Date} deadline Deadline
@param {string} status
* @returns {JQuery}
*/
function renderDeadline(deadline)
function renderDeadline(deadline, status)
{
if(deadline == '0000-00-00') return;
@@ -59,8 +60,10 @@ function renderDeadline(deadline)
now.setMilliseconds(0);
var isEarlyThanToday = date.getTime() < now.getTime();
var deadlineDate = $.zui.formatDate(date, 'MM-dd');
var statusList = ['wait','doing','pause'];
var textColor = isEarlyThanToday && typeof(status) != 'undefined' && statusList.indexOf(status) != -1 ? 'text-red' : 'text-muted';
return $('<span class="info info-deadline"/>').text(deadlineLang + ' ' + deadlineDate).addClass(isEarlyThanToday ? 'text-red' : 'text-muted');
return $('<span class="info info-deadline"/>').text(deadlineLang + ' ' + deadlineDate).addClass(textColor);
}
/**
@@ -222,7 +225,7 @@ function renderTaskItem(item, $item, col)
var $infos = $item.find('.infos');
if(!$infos.length) $infos = $('<div class="infos"></div>');
$infos.html([priHtml, hoursHtml].join(''));
if(item.deadline && scaleSize <= 1) $infos.append(renderDeadline(item.deadline));
if(item.deadline && scaleSize <= 1) $infos.append(renderDeadline(item.deadline, item.status));
$infos[scaleSize <= 1 ? 'append' : 'prepend'](avatarHtml);
if(scaleSize <= 1) $infos.appendTo($item);