Refactoring assign-to

2018-08-22 14:13:10 +02:00 · 2018-08-22 14:13:10 +02:00 · 3e3187dc0a
parent b853a26261
commit 3e3187dc0a
6 changed files with 109 additions and 154 deletions
--- a/app/coffee/modules/common/components.coffee
+++ b/app/coffee/modules/common/components.coffee
@ -333,7 +333,7 @@ AssignedUsersDirective = ($rootscope, $confirm, $repo, $modelTransform, $templat
            item = _.clone($model.$modelValue, false)
            $rootscope.$broadcast("assigned-user:add", item)

-        assignToMe = ->
+        $scope.selfAssign = () ->
            return if not isEditable()
            currentUserId = $currentUserService.getUser().get('id')
            assignedUsers = _.clone($model.$modelValue.assigned_users, false)
@ -341,6 +341,22 @@ AssignedUsersDirective = ($rootscope, $confirm, $repo, $modelTransform, $templat
            assignedUsers = _.uniq(assignedUsers)
            save(assignedUsers, currentUserId)

+        $scope.unassign = (user) ->
+            return if not isEditable()
+            target = angular.element(event.currentTarget)
+            assignedUserId = user.id
+
+            title = $translate.instant("COMMON.ASSIGNED_USERS.TITLE_LIGHTBOX_DELETE_ASSIGNED")
+            message = $scope.usersById[assignedUserId].full_name_display
+
+            $confirm.askOnDelete(title, message).then (askResponse) ->
+                askResponse.finish()
+
+                assignedUserIds = _.clone($model.$modelValue.assigned_users, false)
+                assignedUserIds = _.pull(assignedUserIds, assignedUserId)
+
+                deleteAssignedUser(assignedUserIds)
+
        deleteAssignedUser = (assignedUserIds) ->
            transform = $modelTransform.save (item) ->
                item.assigned_users = assignedUserIds
@ -368,24 +384,6 @@ AssignedUsersDirective = ($rootscope, $confirm, $repo, $modelTransform, $templat
            $scope.isEditable = isEditable()
            $scope.isAssigned = isAssigned()
            $scope.openAssignedUsers = openAssignedUsers
-            $scope.assignToMe = assignToMe
-
-        $el.on "click", ".remove-user", (event) ->
-            event.preventDefault()
-            return if not isEditable()
-            target = angular.element(event.currentTarget)
-            assignedUserId = target.data("assigned-user-id")
-
-            title = $translate.instant("COMMON.ASSIGNED_USERS.TITLE_LIGHTBOX_DELETE_ASSIGNED")
-            message = $scope.usersById[assignedUserId].full_name_display
-
-            $confirm.askOnDelete(title, message).then (askResponse) =>
-                askResponse.finish()
-
-                assignedUserIds = _.clone($model.$modelValue.assigned_users, false)
-                assignedUserIds = _.pull(assignedUserIds, assignedUserId)
-
-                deleteAssignedUser(assignedUserIds)

        $scope.$on "assigned-user:deleted", (ctx, assignedUserId) ->
            assignedUsersIds = _.clone($model.$modelValue.assigned_users, false)
@ -418,15 +416,17 @@ AssignedUsersDirective = ($rootscope, $confirm, $repo, $modelTransform, $templat
        require:"ngModel"
    }

-module.directive("tgAssignedUsers", ["$rootScope", "$tgConfirm", "$tgRepo", "$tgQueueModelTransformation", "$tgTemplate", "$compile",
-                                "$translate", "tgCurrentUserService", AssignedUsersDirective])
+module.directive("tgAssignedUsers", ["$rootScope", "$tgConfirm", "$tgRepo",
+"$tgQueueModelTransformation", "$tgTemplate", "$compile", "$translate", "tgCurrentUserService",
+AssignedUsersDirective])


 #############################################################################
 ## Assigned to directive
 #############################################################################

-AssignedToDirective = ($rootscope, $confirm, $repo, $loading, $modelTransform, $template, $translate, $compile, $currentUserService, avatarService) ->
+AssignedToDirective = ($rootscope, $confirm, $repo, $loading, $modelTransform, $template,
+$translate, $compile, $currentUserService, avatarService) ->
    # You have to include a div with the tg-lb-assignedto directive in the page
    # where use this directive
    template = $template.get("common/components/assigned-to.html", true)
@ -445,12 +445,10 @@ AssignedToDirective = ($rootscope, $confirm, $repo, $loading, $modelTransform, $

            transform = $modelTransform.save (item) ->
                item.assigned_to = userId
-
                return item

-            transform.then ->
+            transform.then (item) ->
                currentLoading.finish()
-                renderAssignedTo($modelTransform.getObj())
                $rootscope.$broadcast("object:updated")

            transform.then null, ->
@ -459,60 +457,48 @@ AssignedToDirective = ($rootscope, $confirm, $repo, $loading, $modelTransform, $

            return transform

-        renderAssignedTo = (assignedObject) ->
-            avatar = avatarService.getAvatar(assignedObject?.assigned_to_extra_info)
-            bg = null
+        render = () ->
+            template = $template.get("common/components/assigned-to.html")
+            templateScope = $scope.$new()
+            compiledTemplate = $compile(template)(templateScope)
+            $el.html(compiledTemplate)

-            if assignedObject?.assigned_to?
-                fullName = assignedObject.assigned_to_extra_info.full_name_display
-                isUnassigned = false
-                bg = avatar.bg
-            else
-                fullName = $translate.instant("COMMON.ASSIGNED_TO.ASSIGN")
-                isUnassigned = true
-
-            isIocaine = assignedObject?.is_iocaine
-
-            ctx = {
-                fullName: fullName
-                avatar: avatar.url
-                bg: bg
-                isUnassigned: isUnassigned
-                isEditable: isEditable()
-                isIocaine: isIocaine
-                fullNameVisible: !(isUnassigned && !$currentUserService.isAuthenticated())
-            }
-            html = $compile(template(ctx))($scope)
-            $el.html(html)
-
-        $el.on "click", ".user-assigned", (event) ->
-            event.preventDefault()
-            return if not isEditable()
-            $scope.$apply ->
+        $scope.assign = () ->
            $rootscope.$broadcast("assigned-to:add", $model.$modelValue)

-        $el.on "click", ".assign-to-me", (event) ->
-            event.preventDefault()
-            return if not isEditable()
-            $model.$modelValue.assigned_to = $currentUserService.getUser().get('id')
-            save($currentUserService.getUser().get('id'))
-
-        $el.on "click", ".remove-user", (event) ->
-            event.preventDefault()
-            return if not isEditable()
+        $scope.unassign = () ->
            title = $translate.instant("COMMON.ASSIGNED_TO.CONFIRM_UNASSIGNED")
-
-            $confirm.ask(title).then (response) =>
+            $confirm.ask(title).then (response) ->
                response.finish()
-                $model.$modelValue.assigned_to  = null
                save(null)

+        $scope.selfAssign = () ->
+            userId = $currentUserService.getUser().get('id')
+            save(userId)
+
        $scope.$on "assigned-to:added", (ctx, userId, item) ->
            return if item.id != $model.$modelValue.id
            save(userId)

        $scope.$watch $attrs.ngModel, (instance) ->
-            renderAssignedTo(instance)
+            if instance?.assigned_to
+                $scope.selected = instance.assigned_to
+                assigned_to_extra_info = $scope.usersById[$scope.selected]
+                $scope.fullName = assigned_to_extra_info?.full_name_display
+                $scope.isUnassigned = false
+                $scope.avatar = avatarService.getAvatar(assigned_to_extra_info)
+                $scope.bg = $scope.avatar.bg
+                $scope.isIocaine = instance?.is_iocaine
+            else
+                $scope.fullName = $translate.instant("COMMON.ASSIGNED_TO.ASSIGN")
+                $scope.isUnassigned = true
+                $scope.avatar = avatarService.getAvatar(null)
+                $scope.bg = null
+                $scope.isIocaine = false
+
+            $scope.fullNameVisible = !($scope.isUnassigned && !$currentUserService.isAuthenticated())
+            $scope.isEditable = isEditable()
+            render()

        $scope.$on "$destroy", ->
            $el.off()
@ -522,8 +508,9 @@ AssignedToDirective = ($rootscope, $confirm, $repo, $loading, $modelTransform, $
        require:"ngModel"
    }

-module.directive("tgAssignedTo", ["$rootScope", "$tgConfirm", "$tgRepo", "$tgLoading", "$tgQueueModelTransformation", "$tgTemplate", "$translate", "$compile","tgCurrentUserService", "tgAvatarService",
-                                  AssignedToDirective])
+module.directive("tgAssignedTo", ["$rootScope", "$tgConfirm", "$tgRepo", "$tgLoading",
+"$tgQueueModelTransformation", "$tgTemplate", "$translate", "$compile","tgCurrentUserService",
+"tgAvatarService", AssignedToDirective])



@ -544,7 +531,7 @@ $translate, $compile, $currentUserService, avatarService) ->
            text = normalizeString(text)
            return _.includes(username, text)

-        renderUserlist = (text) ->
+        renderUserList = (text) ->
            users = _.clone($scope.activeUsers, true)
            users = _.reject(users, {"id": $scope.selected.id}) if $scope.selected?
            users = _.sortBy(users, (o) -> if o.id is $scope.user.id then 0 else o.id)
@ -575,33 +562,27 @@ $translate, $compile, $currentUserService, avatarService) ->
            $scope.fullNameVisible = !($scope.isUnassigned && !$currentUserService.isAuthenticated())
            $scope.isEditable = isEditable()

-        $el.on "click", ".users-dropdown", (event) ->
-            event.preventDefault()
-            event.stopPropagation()
-            renderUserlist()
-            $scope.$apply()
-            $el.find(".pop-users").popover().open()
-
        $el.on "click", ".users-search", (event) ->
            event.stopPropagation()

-        $el.on "click", ".assign-to-me", (event) ->
+        $el.on "click", ".users-dropdown", (event) ->
            event.preventDefault()
-            return if not isEditable()
+            event.stopPropagation()
+            renderUserList()
+            $scope.$apply()
+            $el.find(".pop-users").popover().open()
+
+        $scope.selfAssign = () ->
            $model.$modelValue.assigned_to = $currentUserService.getUser().get('id')
            renderUser($model.$modelValue)
-            $scope.$apply()

-        $el.on "click", ".remove-user", (event) ->
-            event.preventDefault()
-            return if not isEditable()
+        $scope.unassign = () ->
            $model.$modelValue.assigned_to  = null
            renderUser()
-            $scope.$apply()

        $scope.$watch "usersSearch", (searchingText) ->
            if searchingText?
-                renderUserlist(searchingText)
+                renderUserList(searchingText)
                $el.find('input').focus()

        $el.on "click", ".user-list-single", (event) ->
@ -704,16 +685,14 @@ $translate, $compile, $currentUserService, avatarService) ->
            $scope.$apply()
            $el.find(".pop-users").popover().open()

-        $el.on "click", ".users-search", (event) ->
-            event.stopPropagation()
-
-        $el.on "click", ".assign-to-me", (event) ->
-            event.preventDefault()
+        $scope.selfAssign = () ->
            currentAssignedIds.push($currentUserService.getUser().get('id'))
            renderUsers()
            applyToModel()
            $scope.usersSearch = null
-            $scope.$apply()
+
+        $el.on "click", ".users-search", (event) ->
+            event.stopPropagation()

        $scope.$watch "usersSearch", (searchingText) ->
            if searchingText?
@ -722,6 +701,7 @@ $translate, $compile, $currentUserService, avatarService) ->

        $el.on "click", ".user-list-single", (event) ->
            event.preventDefault()
+            event.stopPropagation()
            target = angular.element(event.currentTarget)
            index = currentAssignedIds.indexOf(target.data("user-id"))
            if index == -1
@ -729,21 +709,10 @@ $translate, $compile, $currentUserService, avatarService) ->
            else
                currentAssignedIds.splice(index, 1)
            renderUsers()
-            applyToModel()
            $el.find(".pop-users").popover().close()
            $scope.usersSearch = null
            $scope.$apply()

-        $el.on "click", ".remove-user", (event) ->
-            event.preventDefault()
-            target = angular.element(event.currentTarget)
-            index = currentAssignedIds.indexOf(target.data("user-id"))
-            if index > -1
-                currentAssignedIds.splice(index, 1)
-            renderUsers()
-            applyToModel()
-            $scope.$apply()
-
        $scope.$watch $attrs.ngModel, (item) ->
            return if not item?
            currentAssignedIds = []
--- a/app/coffee/modules/common/lightboxes.coffee
+++ b/app/coffee/modules/common/lightboxes.coffee
@ -1079,11 +1079,6 @@ $confirm, $q, attachmentsService, $template, $compile) ->
            $scope.$broadcast("status:changed", $scope.obj.status)
            $el.find(".pop-status").popover().close()

-        $el.on "click", ".users-dropdown", (event) ->
-            event.preventDefault()
-            event.stopPropagation()
-            $el.find(".pop-users").popover().open()
-
        $el.on "click", ".team-requirement", (event) ->
            $scope.obj.team_requirement = not $scope.obj.team_requirement
            $scope.$apply()
--- a/app/partials/common/components/assigned-to-inline.jade
+++ b/app/partials/common/components/assigned-to-inline.jade
@ -53,11 +53,13 @@
        div(ng-if="isUnassigned")
            a.assign-to-me(
                href="#"
+                ng-click="selfAssign()"
                title="{{'COMMON.ASSIGNED_TO.SELF' | translate}}"
            )
                span {{ "COMMON.ASSIGNED_TO.SELF" | translate }}

    tg-svg.remove-user(
+        ng-click="unassign()"
        ng-if="isEditable && !isUnassigned"
        svg-icon="icon-close",
        title="{{'COMMON.ASSIGNED_TO.DELETE_ASSIGNMENT' | translate}}"
--- a/app/partials/common/components/assigned-to.jade
+++ b/app/partials/common/components/assigned-to.jade
@ -1,55 +1,44 @@
-.user-avatar(class!="<% if (isIocaine) { %> is-iocaine <% }; %>")
+.user-avatar(ng-class!="{ 'is-iocaine': isIocaine }")
    img(
-      style!="background-color: <%- bg %>"
-      src!="<%- avatar %>"
-      alt!="<%- fullName %>"
+      style="background-color: {{ bg }}"
+      src="{{ avatar.url }}"
+      alt="{{ fullName }}"
+    )
+    .iocaine-symbol(
+        ng-if="isIocaine"
+        title="{{ 'TASK.TITLE_ACTION_IOCAINE' | translate }}"
    )
-    <% if (isIocaine) { %>
-    .iocaine-symbol(title="{{ 'TASK.TITLE_ACTION_IOCAINE' | translate }}")
       tg-svg(svg-icon="icon-iocaine")
-    <% }; %>

 .assigned-to
-    <% if (isUnassigned) { %>
-    .assigned-title {{ "COMMON.ASSIGNED_TO.NOT_ASSIGNED" | translate }}
-    <% } else { %>
-    .assigned-title {{ "COMMON.FIELDS.ASSIGNED_TO" | translate }}
-    <% }; %>
-
    .assigned-to-options
-        <% if (!isEditable && fullNameVisible) { %>
-        span.assigned-name(ng-non-bindable)
-            <%- fullName %>
-        <% }; %>
+        span.assigned-name(
+            ng-if="!isEditable && fullNameVisible"
+        ) {{ fullName }}

-        <% if (isEditable) { %>
-        a(
-            href=""
+        span.user-assigned(
            title="{{ 'COMMON.ASSIGNED_TO.TITLE_ACTION_EDIT_ASSIGNMENT'|translate }}"
-            class!="user-assigned <% if (isEditable) { %>editable<% }; %>"
+            ng-class="{ 'editable': isEditable }"
+            ng-if="isEditable"
+            ng-click="assign()"
        )
-            span.assigned-name(ng-non-bindable)
-                <% if (fullNameVisible) { %>
-                <%- fullName %>
-                <% }; %>
-                <% if (!isUnassigned) { %>
-                tg-svg(svg-icon="icon-arrow-down")
-                <% }; %>
-        <% }; %>
+            span.assigned-name
+                span(ng-if="fullNameVisible") {{ fullName }}

-        <% if (isEditable && isUnassigned) { %>
+        span(ng-if="isUnassigned")
+            | &nbsp;
            span(translate="COMMON.OR")
            | &nbsp;
            a.assign-to-me(
                href="#"
                title="{{'COMMON.ASSIGNED_TO.SELF' | translate}}"
+                ng-click="selfAssign()"
            )
                span {{ "COMMON.ASSIGNED_TO.SELF" | translate }}
-        <% }; %>

-    <% if (isEditable && !isUnassigned) { %>
    tg-svg.remove-user(
+        ng-click="unassign()"
+        ng-if="isEditable && !isUnassigned"
        svg-icon="icon-close",
        title="{{'COMMON.ASSIGNED_TO.DELETE_ASSIGNMENT' | translate}}"
    )
-    <% } %>
--- a/app/partials/common/components/assigned-users-inline.jade
+++ b/app/partials/common/components/assigned-users-inline.jade
@ -22,13 +22,12 @@ div(ng-if="isAssigned")
            tg-svg.remove-user(
                svg-icon="icon-close",
                title="{{'COMMON.ASSIGNED_TO.DELETE_ASSIGNMENT' | translate}}"
-                data-user-id="{{ assignedUsers[0].id }}"
+                ng-click="unassign(assignedUsers[0])"
            )

    div.add-assigned
        a.users-dropdown.tg-add-assigned(
            href=""
-            ng-click="openAssignedUsers()"
        )
            tg-svg.add-assigned(
                data-assigned-user-id="{{assignedUser.id}}",
@ -49,7 +48,6 @@ div(ng-if="isAssigned")
            a.users-dropdown.user-assigned(
                href=""
                title="{{ 'COMMON.ASSIGNED_TO.TITLE_ACTION_EDIT_ASSIGNMENT'|translate }}"
-                class="user-assigned"
            )
                span.assigned-name {{ "COMMON.ASSIGNED_TO.ASSIGN" | translate }}
            | &nbsp;
@ -57,6 +55,7 @@ div(ng-if="isAssigned")
            | &nbsp;
            a.assign-to-me(
                href="#"
+                ng-click="selfAssign()"
                title="{{'COMMON.ASSIGNED_TO.SELF' | translate}}"
            )
                span {{ "COMMON.ASSIGNED_TO.SELF" | translate }}
@ -85,7 +84,7 @@ div.pop-users.popover(ng-class="{'multiple': assignedUsers.length > 0}")
        ) {{ user.full_name_display }}
        tg-svg.remove(
            href=""
-            data-user-id="{{ user.id }}"
+            ng-click="unassign(user)"
            ng-if="selected.indexOf(user) > -1"
            svg-icon="icon-close",
            title="{{'COMMON.ASSIGNED_TO.DELETE_ASSIGNMENT' | translate}}"
--- a/app/partials/common/components/assigned-users.jade
+++ b/app/partials/common/components/assigned-users.jade
@ -28,7 +28,7 @@
                    a.assign-to-me(
                        href="#"
                        title="{{'COMMON.ASSIGNED_TO.SELF' | translate}}"
-                        ng-click="assignToMe()"
+                        ng-click="selfAssign()"
                    )
                        span {{ "COMMON.ASSIGNED_TO.SELF" | translate }}

@ -41,13 +41,14 @@
        .user-list-name.assigned-users-options
            a(
                href=""
+                ng-click="assign()"
                title="{{ 'COMMON.ASSIGNED_TO.TITLE_ACTION_EDIT_ASSIGNMENT'|translate }}"
                class!="user-assigned <% if (isEditable) { %>editable<% }; %>"
            )
                span.assigned-name {{assignedUser.full_name_display}}
            tg-svg.remove-user(
                ng-if="isEditable",
-                data-assigned-user-id="{{assignedUser.id}}"
+                ng-click="unassign(assignedUser)"
                svg-icon="icon-close",
                title="{{'COMMON.ASSIGNED_TO.DELETE_ASSIGNMENT' | translate}}"
            )