* [refac bug #57903] Check delay is or not for assigntomeblock.

2024-12-17 10:46:06 +08:00
parent 2ed5f416a5
commit 3e60c23434
1 changed files with 9 additions and 4 deletions
@@ -35,17 +35,22 @@ window.renderCell = function(result, info)
 {
    if(info.col.name == 'deadline' && result[0])
    {
-        const today     = zui.formatDate(zui.createDate(), 'yyyy-MM-dd');
+        const current   = zui.createDate();
+        const year      = zui.formatDate(current, 'yyyy');
+        const today     = zui.formatDate(current, 'yyyy-MM-dd');
        const yesterday = zui.formatDate(convertStringToDate(today) - 24 * 60 * 60 * 1000, 'yyyy-MM-dd');
-        if(result[0] == today)
+
+        let deadline = result[0];
+        if(deadline.split('-').length == 2) deadline = year + '-' + deadline;
+        if(deadline == today)
        {
            result[0] = {html: '<span class="label warning-pale rounded-full size-sm">' + todayLabel + '</span>'};
        }
-        else if(result == yesterday)
+        else if(deadline == yesterday)
        {
            result[0] = {html: '<span class="label danger-pale rounded-full size-sm">' + yesterdayLabel + '</span>'};
        }
-        else if(result < yesterday)
+        else if(deadline < yesterday)
        {
            result[0] = {html: '<span class="label danger-pale rounded-full size-sm">' + result + '</span>'};
        }