From 3f005b6b012d97d60d422583108ee684f0a8b4d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 25 Jun 2014 12:53:37 +0200 Subject: [PATCH] Finish sprint stats --- app/coffee/modules/taskboard.coffee | 18 ++++++---- .../views/components/sprint-summary.jade | 34 +++++++++---------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/app/coffee/modules/taskboard.coffee b/app/coffee/modules/taskboard.coffee index 94055791..84bb6619 100644 --- a/app/coffee/modules/taskboard.coffee +++ b/app/coffee/modules/taskboard.coffee @@ -35,20 +35,25 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin) constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q) -> @scope.sprintId = @params.id - promise = @.loadInitialData() promise.then null, -> - console.log "FAIL" + console.log "FAIL" #TODO loadSprintStats: -> return @rs.sprints.stats(@scope.projectId, @scope.sprintId).then (stats) => - console.log "loadSprintStats", + totalPointsSum =_.reduce(_.values(stats.total_points), ((res, n) -> res + n), 0) + completedPointsSum = _.reduce(_.values(stats.completed_points), ((res, n) -> res + n), 0) + remainingPointsSum = totalPointsSum - completedPointsSum + remainingTasks = stats.total_tasks - stats.completed_tasks @scope.stats = stats + @scope.stats.totalPointsSum = totalPointsSum + @scope.stats.completedPointsSum = completedPointsSum + @scope.stats.remainingPointsSum = remainingPointsSum + @scope.stats.remainingTasks = remainingTasks return stats loadSprint: -> return @rs.sprints.get(@scope.projectId, @scope.sprintId).then (sprint) => - console.log "loadSprint", sprint @scope.sprint = sprint @scope.userstories = sprint.user_stories return sprint @@ -57,7 +62,6 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin) return @rs.tasks.list(@scope.projectId, @scope.sprintId).then (tasks) => @scope.tasks = tasks @scope.tasksByStatus = _.groupBy(tasks, "status") - console.log "loadTasks", @scope.tasksByStatus return tasks loadProject: -> @@ -65,7 +69,6 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin) @scope.project = project @scope.points = _.sortBy(project.points, "order") @scope.statusList = _.sortBy(project.task_statuses, "id") - console.log "loadProject", @scope.statusList return project loadTaskboard: -> @@ -76,7 +79,6 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin) ]).then(=> @.loadTasks()) loadInitialData: -> - console.log @params promise = @repo.resolve({pslug: @params.pslug}).then (data) => @scope.projectId = data.project return data @@ -84,6 +86,8 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin) return promise.then(=> @.loadProject()) .then(=> @.loadUsersAndRoles()) .then(=> @.loadTaskboard()) + + ############################################################################# ## TaskboardDirective ############################################################################# diff --git a/app/partials/views/components/sprint-summary.jade b/app/partials/views/components/sprint-summary.jade index 0c145d16..c0b2005d 100644 --- a/app/partials/views/components/sprint-summary.jade +++ b/app/partials/views/components/sprint-summary.jade @@ -3,35 +3,33 @@ div.summary.large-summary div.summary-progress-bar div.current-progress div.data - span.number 30% - span.description completed + span.number -- % + ul li - span.number 12 - span.description project
points + span.number(ng-bind="stats.totalPointsSum|default:'--'") + span.description total
points li - span.number 23 - span.description defined
points + span.number(ng-bind="stats.completedPointsSum|default:'--'") + span.description completed
points li - span.number 12 - span.description assigned
points - li - span.number 23 - span.description closed
points + span.number(ng-bind="stats.remainingPointsSum|default:'--'") + span.description remaining
points ul li span.icon.icon-bulk - span.number 73 + span.number(ng-bind="stats.total_tasks|default:'--'") span.description created
tasks li - span.number 72 - span.description closed
tasks + span.number(ng-bind="stats.remainingTasks|default:'--'") + span.description open
tasks li - span.number 18 - span.description remaining
tasks + span.number(ng-bind="stats.completed_tasks|default:'--'") + span.description closed
tasks + ul li span.icon.icon-iocaine - span.number 10 - span.description iocanie
doses + span.number(ng-bind="stats.iocaine_doses|default:'--'") + span.description iocaine
doses