diff --git a/app/partials/includes/modules/sprint.jade b/app/partials/includes/modules/sprint.jade index 6ed9f428..babce2be 100644 --- a/app/partials/includes/modules/sprint.jade +++ b/app/partials/includes/modules/sprint.jade @@ -24,6 +24,12 @@ div.sprint-table(tg-bind-scope, ng-class="{'sprint-empty-wrapper': !sprint.user_ ng-if="us.epics" epics="us.epics" ) + tg-due-date.due-date( + due-date="us.due_date" + is-closed="us.is_closed" + ng-if="us.due_date" + obj-type="us" + ) div.column-points.width-1(tg-bo-bind="us.total_points", ng-class="{closed: us.is_closed, blocked: us.is_blocked}") diff --git a/app/partials/includes/modules/taskboard-table.jade b/app/partials/includes/modules/taskboard-table.jade index 6b749d5e..a06dfd1a 100644 --- a/app/partials/includes/modules/taskboard-table.jade +++ b/app/partials/includes/modules/taskboard-table.jade @@ -62,9 +62,16 @@ div.taskboard-table( ng-if="us.epics" epics="us.epics" ) - p.points-value - span(ng-bind="us.total_points") - span(translate="TASKBOARD.TABLE.FIELD_POINTS") + div.us-data + p.points-value + span(ng-bind="us.total_points") + span(translate="TASKBOARD.TABLE.FIELD_POINTS") + tg-due-date.due-date( + due-date="us.due_date" + is-closed="us.is_closed" + ng-if="us.due_date" + obj-type="us" + ) include ../components/addnewtask diff --git a/app/styles/modules/backlog/taskboard-table.scss b/app/styles/modules/backlog/taskboard-table.scss index d1ad298c..8df3967f 100644 --- a/app/styles/modules/backlog/taskboard-table.scss +++ b/app/styles/modules/backlog/taskboard-table.scss @@ -233,6 +233,14 @@ $column-padding: .5rem 1rem; margin-right: .1rem; } } + .us-data { + display: flex; + } + .due-date { + tg-svg { + position: inherit; + } + } tg-svg { cursor: pointer; display: block;