From ec789ce7db963fcfe9f6814ea228ea925c1b32f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 25 Jun 2014 16:08:47 +0200 Subject: [PATCH] Change statusList to taskStatusList in the taskboard --- app/coffee/modules/taskboard.coffee | 7 +++++-- app/partials/views/modules/taskboard-table.jade | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/coffee/modules/taskboard.coffee b/app/coffee/modules/taskboard.coffee index 84bb6619..ef9dffca 100644 --- a/app/coffee/modules/taskboard.coffee +++ b/app/coffee/modules/taskboard.coffee @@ -68,7 +68,8 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin) return @rs.projects.get(@scope.projectId).then (project) => @scope.project = project @scope.points = _.sortBy(project.points, "order") - @scope.statusList = _.sortBy(project.task_statuses, "id") + @scope.taskStatusList = _.sortBy(project.task_statuses, "order") + @scope.usStatusList = _.sortBy(project.us_statuses, "order") return project loadTaskboard: -> @@ -99,6 +100,7 @@ TaskboardDirective = -> ######################### linkSortable = ($scope, $el, $attrs, $ctrl) -> + console.log "TaskboardDirective.linkSortable" #TODO link = ($scope, $el, $attrs) -> $ctrl = $el.controller() @@ -112,13 +114,14 @@ TaskboardDirective = -> TaskboardTaskrowDirective = -> link = ($scope, $el, $attrs) -> - taiga.bindOnce $scope, "statusList", (statuses) -> + taiga.bindOnce $scope, "taskStatusList", (statuses) -> itemSize = 300 + (10 * statuses.length) size = (1 + statuses.length) * itemSize $el.css("width", size + "px") return {link: link} + module = angular.module("taigaTaskboard", []) module.controller("TaskboardController", TaskboardController) module.directive("tgTaskboard", TaskboardDirective) diff --git a/app/partials/views/modules/taskboard-table.jade b/app/partials/views/modules/taskboard-table.jade index fb1a46cb..2faf80f1 100644 --- a/app/partials/views/modules/taskboard-table.jade +++ b/app/partials/views/modules/taskboard-table.jade @@ -2,7 +2,7 @@ div.taskboard-table div.taskboard-table-header div.taskboard-table-inner(tg-taskboard-taskrow) h2.task-colum_name "User story" - h2.task-colum_name(ng-repeat="s in statusList track by s.id", tg-bo-html="s.name") + h2.task-colum_name(ng-repeat="s in taskStatusList track by s.id", tg-bo-html="s.name") div.taskboard-table-body div.taskboard-table-inner div.task-row(ng-repeat="us in userstories track by us.id", tg-taskboard-taskrow) @@ -24,5 +24,5 @@ div.taskboard-table li Back span 4.5 include ../components/addnewus - div.taskboard_task-playground.task-column(ng-repeat="s in statusList track by s.id") + div.taskboard_task-playground.task-column(ng-repeat="s in taskStatusList track by s.id") include ../components/taskboard-task