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

Add project picture to dashboard

stable
Xavier Julián 2016-06-24 12:32:33 +02:00 committed by Juanfran
parent 7362d6151b
commit 250254ed0f
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/modules/home/duties/duty.directive.coffee
View File

@ -21,6 +21,7 @@ DutyDirective = (navurls, $translate) ->
link = (scope, el, attrs, ctrl) -> link = (scope, el, attrs, ctrl) ->
scope.vm = {} scope.vm = {}
scope.vm.duty = scope.duty scope.vm.duty = scope.duty
scope.vm.type = scope.type
scope.vm.getDutyType = () -> scope.vm.getDutyType = () ->
if scope.vm.duty if scope.vm.duty
@ -34,7 +35,8 @@ DutyDirective = (navurls, $translate) ->
return { return {
templateUrl: "home/duties/duty.html" templateUrl: "home/duties/duty.html"
scope: { scope: {
"duty": "=tgDuty" "duty": "=tgDuty",
"type": "@"
} }
link: link link: link
} }

16
app/modules/home/duties/duty.jade
View File

@ -1,27 +1,33 @@
a.list-itemtype-ticket( a.list-itemtype-ticket(
href="{{ ::vm.duty.get('url') }}" href="{{ ::vm.duty.get('url') }}"
title="{{ ::duty.get('subject') }}" title="{{ ::duty.get('subject') }}"
ng-class="{'blocked': vm.duty.get('is_blocked'), 'blocked-project': vm.duty.get('blockedProject')}" ng-class="{'blocked': vm.duty.get('is_blocked'), 'blocked-project': vm.duty.getIn(['project', 'blocked_code'])}"
) )
div.list-itemtype-avatar(ng-if="::vm.duty.get('assigned_to_extra_info')") div.list-itemtype-avatar(ng-if="vm.type == 'working-on'")
img( img(
tg-project-logo-small-src="::vm.duty.get('project')"
title="{{ ::vm.duty.getIn(['project', 'name']) }}"
)
div.list-itemtype-avatar(ng-if="vm.type == 'watching'")
img(
ng-if="vm.duty.get('assigned_to_extra_info')"
ng-src="{{ ::vm.duty.get('assigned_to_extra_info').get('photo') }}" ng-src="{{ ::vm.duty.get('assigned_to_extra_info').get('photo') }}"
title="{{ ::vm.duty.get('assigned_to_extra_info').get('full_name_display') }}" title="{{ ::vm.duty.get('assigned_to_extra_info').get('full_name_display') }}"
) )
div.list-itemtype-avatar(ng-if="::!vm.duty.get('assigned_to_extra_info')")
img( img(
ng-if="!vm.duty.get('assigned_to_extra_info')"
src="/#{v}/images/unnamed.png" src="/#{v}/images/unnamed.png"
title="{{'ACTIVITY.VALUES.UNASSIGNED' | translate}}" title="{{'ACTIVITY.VALUES.UNASSIGNED' | translate}}"
) )
div.list-itemtype-ticket-data div.list-itemtype-ticket-data
p p
span.ticket-project {{ ::vm.duty.get('projectName')}} span.ticket-project {{ ::vm.duty.getIn(['project', 'name']) }}
span.ticket-type {{ ::vm.getDutyType() }} span.ticket-type {{ ::vm.getDutyType() }}
span.ticket-status(ng-style="{'color': vm.duty.get('status_extra_info').get('color')}") {{ ::vm.duty.get('status_extra_info').get('name') }} span.ticket-status(ng-style="{'color': vm.duty.get('status_extra_info').get('color')}") {{ ::vm.duty.get('status_extra_info').get('name') }}
tg-svg( tg-svg(
ng-if="vm.duty.get('blockedProject')", ng-if="vm.duty.getIn(['project', 'blocked_code'])"
svg-icon="icon-blocked-project", svg-icon="icon-blocked-project",
svg-title-translate="PROJECT.BLOCKED_PROJECT.BLOCKED" svg-title-translate="PROJECT.BLOCKED_PROJECT.BLOCKED"
) )

3
app/modules/home/home.service.coffee
View File

@ -40,8 +40,7 @@ class HomeService extends taiga.Service
url = @navurls.resolve("project-#{objType}-detail", ctx) url = @navurls.resolve("project-#{objType}-detail", ctx)
duty = duty.set('url', url) duty = duty.set('url', url)
duty = duty.set('projectName', project.get('name')) duty = duty.set('project', project)
duty = duty.set('blockedProject', project.get('blocked_code'))
duty = duty.set("_name", objType) duty = duty.set("_name", objType)
return duty return duty

2
app/modules/home/working-on/working-on.jade
View File

@ -5,6 +5,7 @@ section.working-on-container
.working-on(ng-if="vm.assignedTo.size") .working-on(ng-if="vm.assignedTo.size")
.duty-single( .duty-single(
tg-duty="duty" tg-duty="duty"
type="working-on"
tg-repeat="duty in vm.assignedTo" tg-repeat="duty in vm.assignedTo"
) )
.working-on-empty(ng-if="vm.assignedTo != undefined && vm.assignedTo.size === 0") .working-on-empty(ng-if="vm.assignedTo != undefined && vm.assignedTo.size === 0")
@ -18,6 +19,7 @@ section.watching-container
.watching(ng-if="vm.watching.size") .watching(ng-if="vm.watching.size")
.duty-single( .duty-single(
tg-duty="duty" tg-duty="duty"
type="watching"
tg-repeat="duty in vm.watching" tg-repeat="duty in vm.watching"
ng-class="{'blocked': duty.is_blocked}" ng-class="{'blocked': duty.is_blocked}"
) )