taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bug #685: Show creation date of an item

stable
David Barragán Merino 2014-08-27 16:14:18 +02:00
parent 738e66d333
commit 9b857c172e
9 changed files with 52 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/coffee/modules/common/components.coffee
View File

@ -272,52 +272,6 @@ AssignedToDirective = ($rootscope, $confirm) ->
module.directive("tgAssignedTo", ["$rootScope", "$tgConfirm", AssignedToDirective])
#############################################################################
## Created by directive
#############################################################################
CreatedByDirective = ->
# TODO: i18n
template = _.template("""
<div class="user-avatar">
<img src="<%= owner.photo %>" alt="<%- owner.full_name_display %>" />
</div>
<div class="created-by">
<span class="assigned-title">Created by</span>
<a href="" title="edit assignment" class="user-assigned">
<%- owner.full_name_display %>
</a>
<span class="assigned-title"><%- date %></span>
</div>
""")
link = ($scope, $el, $attrs, $model) ->
renderAssignedTo = (instance) ->
owner = {}
date = null
if instance?
ownerId = instance.owner
date = moment(instance.created_date).format("DD MMM YYYY HH:mm")
owner = $scope.usersById?[ownerId]
html = template({owner: owner, date: date})
$el.html(html)
$scope.$watch $attrs.ngModel, (instance) ->
renderAssignedTo(instance)
return {
link:link,
require:"ngModel"
}
module.directive("tgCreatedBy", CreatedByDirective)
#############################################################################
## Common list directives
#############################################################################

14
app/coffee/modules/issues/detail.coffee
View File

@ -226,6 +226,16 @@ IssueStatusDirective = () ->
</span>
<span class="us-detail-status" style="color:<%= status.color %>"><%= status.name %></span>
</h1>
<div class="us-created-by">
<div class="user-avatar">
<img src="<%= owner.photo %>" alt="<%- owner.full_name_display %>" />
</div>
<div class="created-by">
<span class="created-title">Created by <%- owner.full_name_display %></span>
<span class="created-date"><%- date %></span>
</div>
</div>
<div class="issue-data">
<div class="type-data <% if (editable) { %>clickable<% } %>">
<span class="level" style="background-color:<%= type.color %>"></span>
@ -298,11 +308,15 @@ IssueStatusDirective = () ->
editable = $attrs.editable?
renderIssuestatus = (issue) ->
owner = $scope.usersById?[issue.owner]
date = moment(issue.created_date).format("DD MMM YYYY HH:mm")
type = $scope.typeById[issue.type]
status = $scope.statusById[issue.status]
severity = $scope.severityById[issue.severity]
priority = $scope.priorityById[issue.priority]
html = template({
owner: owner
date: date
editable: editable
status: status
severity: severity

15
app/coffee/modules/tasks/detail.coffee
View File

@ -219,6 +219,17 @@ TaskStatusDirective = () ->
<% } %>
<span class="us-detail-status" style="color:<%= status.color %>"><%= status.name %></span>
</h1>
<div class="us-created-by">
<div class="user-avatar">
<img src="<%= owner.photo %>" alt="<%- owner.full_name_display %>" />
</div>
<div class="created-by">
<span class="created-title">Created by</span>
<span class="created-user"><%- owner.full_name_display %></span>
<span class="created-date"><%- date %></span>
</div>
</div>
<div class="issue-data">
<div class="status-data <% if (editable) { %>clickable<% } %>">
<span class="level" style="background-color:<%= status.color %>"></span>
@ -243,8 +254,12 @@ TaskStatusDirective = () ->
editable = $attrs.editable?
renderTaskstatus = (task) ->
owner = $scope.usersById?[task.owner]
date = moment(task.created_date).format("DD MMM YYYY HH:mm")
status = $scope.statusById[task.status]
html = template({
owner: owner
date: date
editable: editable
status: status
})

16
app/coffee/modules/userstories/detail.coffee
View File

@ -239,6 +239,18 @@ UsStatusDetailDirective = () ->
</span>
</div>
<div class="us-created-by">
<div class="user-avatar">
<img src="<%= owner.photo %>" alt="<%- owner.full_name_display %>" />
</div>
<div class="created-by">
<span class="created-title">Created by</span>
<span class="created-user"><%- owner.full_name_display %></span>
<span class="created-date"><%- date %></span>
</div>
</div>
<ul class="points-per-role">
<li class="total">
<span class="points"><%- totalPoints %></span>
@ -301,6 +313,8 @@ UsStatusDetailDirective = () ->
return _.reduce(values, (acc, num) -> acc + num)
renderUsstatus = (us) ->
owner = $scope.usersById?[us.owner]
date = moment(us.created_date).format("DD MMM YYYY HH:mm")
status = $scope.statusById[us.status]
rolePoints = _.clone(_.filter($scope.project.roles, "computable"), true)
_.map rolePoints, (v, k) ->
@ -313,6 +327,8 @@ UsStatusDetailDirective = () ->
usProgress = 0
usProgress = 100 * totalClosedTasks / totalTasks if totalTasks > 0
html = template({
owner: owner
date: date
editable: editable
status: status
totalPoints: us.total_points

1
app/partials/issues-detail-edit.jade
View File

@ -51,7 +51,6 @@ block content
sidebar.menu-secondary.sidebar
section.us-status(tg-issue-status, ng-model="issue", editable="true")
section.us-assigned-to(tg-assigned-to, ng-model="issue", editable="true")
section.us-created-by(tg-created-by, ng-model="issue")
section.watchers(tg-watchers, ng-model="issue", editable="true")
section.us-detail-settings

1
app/partials/issues-detail.jade
View File

@ -51,5 +51,4 @@ block content
sidebar.menu-secondary.sidebar
section.us-status(tg-issue-status, ng-model="issue")
section.us-assigned-to(tg-assigned-to, ng-model="issue")
section.us-created-by(tg-created-by, ng-model="issue")
section.watchers(tg-watchers, ng-model="issue")

1
app/partials/task-detail.jade
View File

@ -51,7 +51,6 @@ block content
sidebar.menu-secondary.sidebar
section.us-status(tg-task-status, ng-model="task")
section.us-assigned-to(tg-assigned-to, ng-model="task")
section.us-created-by(tg-created-by, ng-model="task")
section.watchers(tg-watchers, ng-model="task")
section.us-detail-settings

1
app/partials/us-detail-edit.jade
View File

@ -51,7 +51,6 @@ block content
sidebar.menu-secondary.sidebar
section.us-status(tg-us-status-detail, ng-model="us", editable="true")
section.us-assigned-to(tg-assigned-to, ng-model="us", editable="true")
section.us-created-by(tg-created-by, ng-model="us")
section.watchers(tg-watchers, ng-model="us", editable="true")
section.us-detail-settings

23
app/styles/components/created-by.scss
View File

@ -1,24 +1,25 @@
.us-created-by {
@include table-flex();
margin-top: .5rem;
margin-bottom: 1rem;
position: relative;
.user-avatar {
@include table-flex-child(1, 0);
@include table-flex-child(0, 40px, 0);
img {
border-radius: 8%;
width: 100%;
}
}
.created-by {
@include table-flex-child(3, 0);
margin-left: 1rem;
margin-top: 5px;
.assigned-title {
@include table-flex-child(3, 70px, 0);
margin-left: .5rem;
.created-title,
.created-date {
@extend %small;
color: $gray-light;
display: block;
}
.user-assigned {
.created-user {
@extend %large;
color: $green-taiga;
cursor: default;
@ -26,15 +27,5 @@
cursor: pointer;
}
}
.icon-delete {
color: $gray-light;
opacity: 1;
position: absolute;
right: 1rem;
top: 1rem;
&:hover {
color: $red;
}
}
}
}