diff --git a/module/execution/css/task.css b/module/execution/css/task.css index bd2fa387c6..b67991eb5d 100644 --- a/module/execution/css/task.css +++ b/module/execution/css/task.css @@ -25,3 +25,5 @@ body {margin-bottom: 10px;} .dtable-row.is-normal .dtable-cell[data-col="name"] {padding-left: 20px;} .dtable-cell[data-col="actions"] > .dtable-cell-content .c-actions .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #F4F5F7; margin: 0 4px 0 0;} + +span.delayed {display: inline-block; height: 20px; line-height: 18px; background: #FFEBEB; color: #FB2B2B; border-radius: 20px; padding: 2px 8px;} diff --git a/module/task/config.php b/module/task/config.php index c852c7e22f..fdd9c468a8 100644 --- a/module/task/config.php +++ b/module/task/config.php @@ -120,7 +120,7 @@ $config->task->datatable->fieldList['finishedBy']['sortType'] = true; $config->task->datatable->fieldList['finishedBy']['required'] = 'no'; $config->task->datatable->fieldList['deadline']['title'] = 'deadlineAB'; -$config->task->datatable->fieldList['deadline']['type'] = 'date'; +$config->task->datatable->fieldList['deadline']['type'] = 'html'; $config->task->datatable->fieldList['deadline']['width'] = '70'; $config->task->datatable->fieldList['deadline']['fixed'] = 'no'; $config->task->datatable->fieldList['deadline']['sortType'] = true; diff --git a/module/task/model.php b/module/task/model.php index 127475f241..7de9bfc65f 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -4710,7 +4710,15 @@ class taskModel extends model $task->mailto = implode('  ', $mailto); foreach($userFields as $field) $task->$field = zget($users, $task->$field); - foreach($dateFields as $field) $task->$field = empty($task->$field) || helper::isZeroDate($task->$field) ? '' : $task->$field; + foreach($dateFields as $field) + { + $task->$field = empty($task->$field) || helper::isZeroDate($task->$field) ? '' : $task->$field; + if($field == 'deadline') + { + $delayed = isset($task->delay) ? "class='delayed'" : ''; + $task->deadline = "" . substr($task->deadline, 5, 6) . ''; + } + } $children = isset($task->children) ? $task->children : array(); unset($task->children);