From fd844f67df5e03b587e408327d540f30d31a6480 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 5 Jan 2016 09:50:08 +0100 Subject: [PATCH] Issue 3610: Team requirement mislabeled --- app/coffee/modules/backlog/main.coffee | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/app/coffee/modules/backlog/main.coffee b/app/coffee/modules/backlog/main.coffee index 6b072eb0..4fb67e09 100644 --- a/app/coffee/modules/backlog/main.coffee +++ b/app/coffee/modules/backlog/main.coffee @@ -1038,12 +1038,6 @@ BurndownBacklogGraphDirective = ($translate) -> lines: fillColor : "rgba(102,153,51,0.3)" }) - team_increment_line = _.map(dataToDraw.milestones, (ml) -> -ml["team-increment"]) - data.push({ - data: _.zip(milestonesRange, team_increment_line) - lines: - fillColor : "rgba(153,51,51,0.3)" - }) client_increment_line = _.map dataToDraw.milestones, (ml) -> -ml["team-increment"] - ml["client-increment"] data.push({ @@ -1051,7 +1045,12 @@ BurndownBacklogGraphDirective = ($translate) -> lines: fillColor : "rgba(255,51,51,0.3)" }) - + team_increment_line = _.map(dataToDraw.milestones, (ml) -> -ml["team-increment"]) + data.push({ + data: _.zip(milestonesRange, team_increment_line) + lines: + fillColor : "rgba(153,51,51,0.3)" + }) colors = [ "rgba(0,0,0,1)" "rgba(120,120,120,0.2)" @@ -1107,10 +1106,10 @@ BurndownBacklogGraphDirective = ($translate) -> return $translate.instant("BACKLOG.CHART.REAL", ctx) else if flotItem.seriesIndex == 3 ctx = {sprintName: dataToDraw.milestones[xval].name, value: Math.abs(yval)} - return $translate.instant("BACKLOG.CHART.INCREMENT_TEAM", ctx) + return $translate.instant("BACKLOG.CHART.INCREMENT_CLIENT", ctx) else ctx = {sprintName: dataToDraw.milestones[xval].name, value: Math.abs(yval)} - return $translate.instant("BACKLOG.CHART.INCREMENT_CLIENT", ctx) + return $translate.instant("BACKLOG.CHART.INCREMENT_TEAM", ctx) } }