From 1a76aa5d1ada7ebd9de95a670b4d5e4495179abb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Mon, 1 Aug 2016 16:53:00 +0200
Subject: [PATCH] Filter Current assigned

---
 .../assigned-item/assigned-item.jade          |  4 +++-
 .../assigned-item/assigned-item.scss          | 20 +++++++++++++++++++
 .../assigned-to-selector.controller.coffee    |  9 +++++++++
 .../assigned-to-selector.jade                 |  6 +++---
 .../assigned-to-selector.scss                 |  7 +++++++
 .../assigned-to/assigned-to.controller.coffee |  6 +++---
 6 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100644 app/modules/components/assigned-to/assigned-item/assigned-item.scss
 create mode 100644 app/modules/components/assigned-to/assigned-to-selector/assigned-to-selector.scss

diff --git a/app/modules/components/assigned-to/assigned-item/assigned-item.jade b/app/modules/components/assigned-to/assigned-item/assigned-item.jade
index d3c97e4f..28564e61 100644
--- a/app/modules/components/assigned-to/assigned-item/assigned-item.jade
+++ b/app/modules/components/assigned-to/assigned-item/assigned-item.jade
@@ -1 +1,3 @@
-.member {{member}}
+.assignable-member-single(ng-click="onSelectMember()")
+    img.assignable-member-avatar(tg-avatar="member")
+    .assignable-member-name {{member.full_name}}
diff --git a/app/modules/components/assigned-to/assigned-item/assigned-item.scss b/app/modules/components/assigned-to/assigned-item/assigned-item.scss
new file mode 100644
index 00000000..a4865088
--- /dev/null
+++ b/app/modules/components/assigned-to/assigned-item/assigned-item.scss
@@ -0,0 +1,20 @@
+.assignable-member-single {
+    align-items: center;
+    background: $white;
+    border-bottom: 1px solid $whitish;
+    display: flex;
+    padding: .25rem 0;
+    &:hover {
+        background: rgba($primary-light, .05);
+        cursor: pointer;
+    }
+    .assignable-member-avatar {
+        flex-basis: 3rem;
+        margin-right: .5rem;
+        max-height: 3rem;
+        max-width: 3rem;
+    }
+    .assignable-member-name {
+        flex: 1;
+    }
+}
diff --git a/app/modules/components/assigned-to/assigned-to-selector/assigned-to-selector.controller.coffee b/app/modules/components/assigned-to/assigned-to-selector/assigned-to-selector.controller.coffee
index 6d05b878..65bf4b42 100644
--- a/app/modules/components/assigned-to/assigned-to-selector/assigned-to-selector.controller.coffee
+++ b/app/modules/components/assigned-to/assigned-to-selector/assigned-to-selector.controller.coffee
@@ -21,5 +21,14 @@ class AssignedToSelectorController
     @.$inject = []
 
     constructor: () ->
+        @._filterAssignedMember()
+
+    _filterAssignedMember: () ->
+        @.nonAssignedMembers = _.filter(@.project.members, (member) =>
+            return member.id != @.assigned.get('id')
+        )
+
+    onAssignTo: (member) ->
+        console.log member
 
 angular.module('taigaComponents').controller('AssignedToSelectorCtrl', AssignedToSelectorController)
diff --git a/app/modules/components/assigned-to/assigned-to-selector/assigned-to-selector.jade b/app/modules/components/assigned-to/assigned-to-selector/assigned-to-selector.jade
index e14d5c8c..12c02a7c 100644
--- a/app/modules/components/assigned-to/assigned-to-selector/assigned-to-selector.jade
+++ b/app/modules/components/assigned-to/assigned-to-selector/assigned-to-selector.jade
@@ -9,9 +9,9 @@ tg-lightbox-close
         ng-model="vm.assignToMember.name"
         ng-model-options="{debounce: 200}"
     )
-    ul.tags-dropdown
-        li(ng-repeat="member in vm.project.members | filter: vm.assignToMember.name")
+    ul.assignable-member-list
+        li(ng-repeat="member in vm.nonAssignedMembers | filter: vm.assignToMember.name | limitTo:6")
             tg-assigned-item.assigned-members-option(
                 member="member"
-                ng-click="vm.onAddTag(tag[0], tag[1], vm.project)"
+                ng-click="vm.onAssignTo(member)"
             )
diff --git a/app/modules/components/assigned-to/assigned-to-selector/assigned-to-selector.scss b/app/modules/components/assigned-to/assigned-to-selector/assigned-to-selector.scss
new file mode 100644
index 00000000..c5b1aec3
--- /dev/null
+++ b/app/modules/components/assigned-to/assigned-to-selector/assigned-to-selector.scss
@@ -0,0 +1,7 @@
+.assigned-to-container {
+    width: 600px;
+}
+
+.assignable-member-list {
+    margin-top: 1rem;
+}
diff --git a/app/modules/components/assigned-to/assigned-to.controller.coffee b/app/modules/components/assigned-to/assigned-to.controller.coffee
index 9a04e103..d3e1c878 100644
--- a/app/modules/components/assigned-to/assigned-to.controller.coffee
+++ b/app/modules/components/assigned-to/assigned-to.controller.coffee
@@ -27,11 +27,11 @@ class AssignedToController
 
     onSelectAssignedTo: (assigned, project) ->
         @lightboxFactory.create('tg-assigned-to-selector', {
-            "class": "lightbox lightbox-assigned-to-selector open"
-            "assignedTo": "assignedTo"
+            "class": "lightbox lightbox-assigned-to-selector open",
+            "assigned": "assigned",
             "project": "project"
         }, {
-            "assignedTo": @.assignedTo
+            "assigned": @.assignedTo,
             "project": @.project
         })