[Backport] Improving epics progress

stable
Alejandro Alonso 2017-06-22 14:31:44 +02:00 committed by Jesús Espino
parent b3f15414fa
commit 3ad3790c30
3 changed files with 8 additions and 9 deletions

View File

@ -40,13 +40,12 @@ class EpicRowController
if @.epic.getIn(['status_extra_info', 'is_closed']) == true if @.epic.getIn(['status_extra_info', 'is_closed']) == true
@.percentage = "100%" @.percentage = "100%"
else else
opened = @.epic.getIn(['user_stories_counts', 'opened']) progress = @.epic.getIn(['user_stories_counts', 'progress'])
closed = @.epic.getIn(['user_stories_counts', 'closed']) total = @.epic.getIn(['user_stories_counts', 'total'])
total = opened + closed
if total == 0 if total == 0
@.percentage = "0%" @.percentage = "0%"
else else
@.percentage = "#{closed * 100 / total}%" @.percentage = "#{progress * 100 / total}%"
canEditEpics: () -> canEditEpics: () ->
return @projectService.hasPermission("modify_epic") return @projectService.hasPermission("modify_epic")

View File

@ -68,8 +68,8 @@ describe "EpicRow", ->
is_closed: false is_closed: false
} }
user_stories_counts: { user_stories_counts: {
opened: 10, total: 10,
closed: 10 progress: 5
} }
}) })
} }
@ -83,8 +83,8 @@ describe "EpicRow", ->
is_closed: false is_closed: false
} }
user_stories_counts: { user_stories_counts: {
opened: 0, total: 10,
closed: 0 progress: 0
} }
}) })
} }

View File

@ -27,7 +27,7 @@
) )
tg-svg( tg-svg(
svg-icon="icon-arrow-down" svg-icon="icon-arrow-down"
ng-if="vm.epic.getIn(['user_stories_counts', 'opened']) || vm.epic.getIn(['user_stories_counts', 'closed'])" ng-if="vm.epic.getIn(['user_stories_counts', 'total'])"
) )
.project(ng-if="vm.column.project") .project(ng-if="vm.column.project")