taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[Backport] Issue 3610: Team requirement mislabeled

stable
Alejandro Alonso 2016-01-05 09:50:08 +01:00
parent c34c66fa16
commit dfa49ab6a1
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/coffee/modules/backlog/main.coffee
View File

@ -1038,12 +1038,6 @@ BurndownBacklogGraphDirective = ($translate) ->
lines: lines:
fillColor : "rgba(102,153,51,0.3)" 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) -> client_increment_line = _.map dataToDraw.milestones, (ml) ->
-ml["team-increment"] - ml["client-increment"] -ml["team-increment"] - ml["client-increment"]
data.push({ data.push({
@ -1051,7 +1045,12 @@ BurndownBacklogGraphDirective = ($translate) ->
lines: lines:
fillColor : "rgba(255,51,51,0.3)" 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 = [ colors = [
"rgba(0,0,0,1)" "rgba(0,0,0,1)"
"rgba(120,120,120,0.2)" "rgba(120,120,120,0.2)"
@ -1107,10 +1106,10 @@ BurndownBacklogGraphDirective = ($translate) ->
return $translate.instant("BACKLOG.CHART.REAL", ctx) return $translate.instant("BACKLOG.CHART.REAL", ctx)
else if flotItem.seriesIndex == 3 else if flotItem.seriesIndex == 3
ctx = {sprintName: dataToDraw.milestones[xval].name, value: Math.abs(yval)} 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 else
ctx = {sprintName: dataToDraw.milestones[xval].name, value: Math.abs(yval)} 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)
} }
} }