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

* Fix bug #15902.

Browse Source
This commit is contained in:
tianshujie
2021-11-01 17:34:25 +08:00
parent 5cfaf07475
commit 5444d35cde
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/js/kanban.js
+6 -3
View File
@@ -32,14 +32,17 @@ function renderUserAvatar(user, objectType, objectID)
*/
function renderDeadline(deadline)
{
var date = $.zui.createDate(deadline);
var now = new Date();
if(deadline == '0000-00-00') return;
var date = $.zui.createDate(deadline);
var now = new Date();
now.setHours(0);
now.setMinutes(0);
now.setSeconds(0);
now.setMilliseconds(0);
var isEarlyThanToday = date.getTime() < now.getTime();
return $('<span class="info info-deadline"/>').text(deadline).addClass(isEarlyThanToday ? 'text-red' : 'text-muted');
var deadlineDate = $.zui.formatDate(date, 'MM-dd')
return $('<span class="info info-deadline"/>').text(deadlineLang + ' ' + deadlineDate).addClass(isEarlyThanToday ? 'text-red' : 'text-muted');
}
/**
module/execution/view/kanban.html.php
+1
View File
@@ -145,4 +145,5 @@ js::set('priv',
<?php js::set('setWIP', $lang->execution->setWIP);?>
<?php js::set('sortColumn', $lang->execution->sortColumn);?>
<?php js::set('kanbanLang', $lang->kanban);?>
<?php js::set('deadlineLang', $lang->task->deadlineAB);?>
<?php include '../../common/view/footer.html.php';?>