From 250254ed0f893301e8e564cd0e700c4d0f97dbe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Fri, 24 Jun 2016 12:32:33 +0200
Subject: [PATCH] Add project picture to dashboard

---
 app/modules/home/duties/duty.directive.coffee |  4 +++-
 app/modules/home/duties/duty.jade             | 16 +++++++++++-----
 app/modules/home/home.service.coffee          |  3 +--
 app/modules/home/working-on/working-on.jade   |  2 ++
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/modules/home/duties/duty.directive.coffee b/app/modules/home/duties/duty.directive.coffee
index 5ffbf653..798db53c 100644
--- a/app/modules/home/duties/duty.directive.coffee
+++ b/app/modules/home/duties/duty.directive.coffee
@@ -21,6 +21,7 @@ DutyDirective = (navurls, $translate) ->
     link = (scope, el, attrs, ctrl) ->
         scope.vm = {}
         scope.vm.duty = scope.duty
+        scope.vm.type = scope.type
 
         scope.vm.getDutyType = () ->
             if scope.vm.duty
@@ -34,7 +35,8 @@ DutyDirective = (navurls, $translate) ->
     return {
         templateUrl: "home/duties/duty.html"
         scope: {
-            "duty": "=tgDuty"
+            "duty": "=tgDuty",
+            "type": "@"
         }
         link: link
     }
diff --git a/app/modules/home/duties/duty.jade b/app/modules/home/duties/duty.jade
index fa3b5411..eb7e2601 100644
--- a/app/modules/home/duties/duty.jade
+++ b/app/modules/home/duties/duty.jade
@@ -1,27 +1,33 @@
 a.list-itemtype-ticket(
     href="{{ ::vm.duty.get('url') }}"
     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(
+            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') }}"
             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(
+            ng-if="!vm.duty.get('assigned_to_extra_info')"
             src="/#{v}/images/unnamed.png"
             title="{{'ACTIVITY.VALUES.UNASSIGNED' | translate}}"
         )
     div.list-itemtype-ticket-data
         p
-            span.ticket-project {{ ::vm.duty.get('projectName')}}
+            span.ticket-project {{ ::vm.duty.getIn(['project', 'name']) }}
 
             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') }}
 
             tg-svg(
-                ng-if="vm.duty.get('blockedProject')",
+                ng-if="vm.duty.getIn(['project', 'blocked_code'])"
                 svg-icon="icon-blocked-project",
                 svg-title-translate="PROJECT.BLOCKED_PROJECT.BLOCKED"
             )
diff --git a/app/modules/home/home.service.coffee b/app/modules/home/home.service.coffee
index fe068447..74bb9e5f 100644
--- a/app/modules/home/home.service.coffee
+++ b/app/modules/home/home.service.coffee
@@ -40,8 +40,7 @@ class HomeService extends taiga.Service
             url = @navurls.resolve("project-#{objType}-detail", ctx)
 
             duty = duty.set('url', url)
-            duty = duty.set('projectName', project.get('name'))
-            duty = duty.set('blockedProject', project.get('blocked_code'))
+            duty = duty.set('project', project)
             duty = duty.set("_name", objType)
 
             return duty
diff --git a/app/modules/home/working-on/working-on.jade b/app/modules/home/working-on/working-on.jade
index 22b032de..dc001bd1 100644
--- a/app/modules/home/working-on/working-on.jade
+++ b/app/modules/home/working-on/working-on.jade
@@ -5,6 +5,7 @@ section.working-on-container
     .working-on(ng-if="vm.assignedTo.size")
         .duty-single(
             tg-duty="duty"
+            type="working-on"
             tg-repeat="duty in vm.assignedTo"
         )
     .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")
         .duty-single(
             tg-duty="duty"
+            type="watching"
             tg-repeat="duty in vm.watching"
             ng-class="{'blocked': duty.is_blocked}"
         )