Fix create form and progress bars

stable
David Barragán Merino 2016-08-01 13:13:56 +02:00
parent 209e33b647
commit 8e23148920
5 changed files with 26 additions and 16 deletions

View File

@ -44,7 +44,7 @@ tg-lightbox-close
input( input(
type="checkbox" type="checkbox"
name="team_requirement" name="team_requirement"
ng-model="vm.newEpic.teamRequirement" ng-model="vm.newEpic.team_requirement"
id="team-requirement" id="team-requirement"
) )
label.requirement.trans-button( label.requirement.trans-button(
@ -55,7 +55,7 @@ tg-lightbox-close
input( input(
type="checkbox" type="checkbox"
name="client_requirement" name="client_requirement"
ng-model="vm.newEpic.clientRequirement" ng-model="vm.newEpic.client_requirement"
id="client-requirement" id="client-requirement"
) )
label.requirement.trans-button( label.requirement.trans-button(
@ -66,7 +66,7 @@ tg-lightbox-close
input( input(
type="checkbox" type="checkbox"
name="blocked" name="blocked"
ng-model="vm.newEpic.isBlocked" ng-model="vm.newEpic.is_blocked"
id="blocked" id="blocked"
ng-click="displayBlockedReason = !displayBlockedReason" ng-click="displayBlockedReason = !displayBlockedReason"
) )
@ -87,4 +87,4 @@ tg-lightbox-close
type="submit" type="submit"
translate="EPICS.CREATE.CREATE_EPIC" translate="EPICS.CREATE.CREATE_EPIC"
) )

View File

@ -31,9 +31,16 @@ class EpicRowController
@.displayAssignedTo = false @.displayAssignedTo = false
_calculateProgressBar: () -> _calculateProgressBar: () ->
totalUs = @.epic.getIn(['user_stories_counts', 'closed']) if @.epic.getIn(['status_extra_info', 'is_closed']) == true
totalUsCompleted = @.epic.getIn(['user_stories_counts', 'opened']) @.percentage = "100%"
@.percentage = totalUs * 100 / totalUsCompleted else
opened = @.epic.getIn(['user_stories_counts', 'opened'])
closed = @.epic.getIn(['user_stories_counts', 'closed'])
total = opened + closed
if total == 0
@.percentage = "0%"
else
@.percentage = "#{closed * 100 / total}%"
updateEpicStatus: (status) -> updateEpicStatus: (status) ->
id = @.epic.get('id') id = @.epic.get('id')

View File

@ -74,7 +74,7 @@
.progress-bar .progress-bar
.progress-status( .progress-status(
ng-if="::vm.percentage" ng-if="::vm.percentage"
ng-attr-width="::vm.percentage" ng-style="{'width':vm.percentage}"
) )
.epic-stories-wrapper(ng-if="vm.displayUserStories && vm.epicStories") .epic-stories-wrapper(ng-if="vm.displayUserStories && vm.epicStories")

View File

@ -26,11 +26,14 @@ class StoryRowController
@._calculateProgressBar() @._calculateProgressBar()
_calculateProgressBar: () -> _calculateProgressBar: () ->
tasks = @.story.get('tasks').toJS() if @.story.get('is_closed') == true
totalTasks = @.story.get('tasks').size @.percentage = "100%"
areTasksCompleted = _.map(tasks, 'is_closed') else
totalTasksCompleted = _.pull(areTasksCompleted, false).length tasks = @.story.get('tasks').toJS()
@.percentage = totalTasksCompleted * 100 / totalTasks totalTasks = @.story.get('tasks').size
areTasksCompleted = _.map(tasks, 'is_closed')
totalTasksCompleted = _.pull(areTasksCompleted, false).length
@.percentage = "#{totalTasksCompleted * 100 / totalTasks}%"
onSelectAssignedTo: () -> onSelectAssignedTo: () ->
console.log 'ng-click="vm.onSelectAssignedTo()"' console.log 'ng-click="vm.onSelectAssignedTo()"'

View File

@ -4,10 +4,10 @@
.vote( .vote(
ng-if="vm.column.votes" ng-if="vm.column.votes"
ng-class="{'is-voter': vm.story.get('is_voter')}" ng-class="{'is-voter': vm.story.get('is_voter')}"
) )
tg-svg(svg-icon='icon-upvote') tg-svg(svg-icon='icon-upvote')
span {{::vm.story.get('total_voters')}} span {{::vm.story.get('total_voters')}}
.name(ng-if="vm.column.name") .name(ng-if="vm.column.name")
- var hash = "#"; - var hash = "#";
a( a(
@ -48,5 +48,5 @@
.progress-bar .progress-bar
.progress-status( .progress-status(
ng-if="::vm.percentage" ng-if="::vm.percentage"
ng-attr-width="::vm.percentage" ng-style="{'width':vm.percentage}"
) )