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

Sorting work in progress by modified date

stable
Alejandro Alonso 2015-05-28 09:19:54 +02:00 committed by Juanfran
parent fb56511f08
commit 455b49660d
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/modules/home/working-on/working-on.controller.coffee
View File

@ -13,6 +13,8 @@ class WorkingOnController
issues = workInProgress.get("assignedTo").get("issues") issues = workInProgress.get("assignedTo").get("issues")
@.assignedTo = userStories.concat(tasks).concat(issues) @.assignedTo = userStories.concat(tasks).concat(issues)
if @.assignedTo.size > 0
@.assignedTo = @.assignedTo.sortBy((elem) -> elem.get("modified_date")).reverse()
_setWatching: (workInProgress) -> _setWatching: (workInProgress) ->
userStories = workInProgress.get("watching").get("userStories") userStories = workInProgress.get("watching").get("userStories")
@ -20,6 +22,8 @@ class WorkingOnController
issues = workInProgress.get("watching").get("issues") issues = workInProgress.get("watching").get("issues")
@.watching = userStories.concat(tasks).concat(issues) @.watching = userStories.concat(tasks).concat(issues)
if @.watching.size > 0
@.watching = @.watching.sortBy((elem) -> elem.get("modified_date")).reverse()
getWorkInProgress: (userId) -> getWorkInProgress: (userId) ->
return @homeService.getWorkInProgress(userId).then (workInProgress) => return @homeService.getWorkInProgress(userId).then (workInProgress) =>

27
app/modules/home/working-on/working-on.controller.spec.coffee
View File

@ -32,14 +32,14 @@ describe "WorkingOn", ->
workInProgress = Immutable.fromJS({ workInProgress = Immutable.fromJS({
assignedTo: { assignedTo: {
userStories: [{id: 1}, {id: 2}], userStories: [{id: 1, modified_date: "2015-01-01"}, {id: 2, modified_date: "2015-01-04"}],
tasks: [{id: 3}, {id: 4}], tasks: [{id: 3, modified_date: "2015-01-02"}, {id: 4, modified_date: "2015-01-05"}],
issues: [{id: 5}, {id: 6}] issues: [{id: 5, modified_date: "2015-01-03"}, {id: 6, modified_date: "2015-01-06"}]
}, },
watching: { watching: {
userStories: [{id: 7}, {id: 8}], userStories: [{id: 7, modified_date: "2015-01-01"}, {id: 8, modified_date: "2015-01-04"}],
tasks: [{id: 9}, {id: 10}], tasks: [{id: 9, modified_date: "2015-01-02"}, {id: 10, modified_date: "2015-01-05"}],
issues: [{id: 11}, {id: 12}] issues: [{id: 11, modified_date: "2015-01-03"}, {id: 12, modified_date: "2015-01-06"}]
} }
}) })
@ -48,12 +48,23 @@ describe "WorkingOn", ->
ctrl = $controller("WorkingOn") ctrl = $controller("WorkingOn")
ctrl.getWorkInProgress(userId).then () -> ctrl.getWorkInProgress(userId).then () ->
console.log ctrl.assignedTo.toJS()
expect(ctrl.assignedTo.toJS()).to.be.eql([ expect(ctrl.assignedTo.toJS()).to.be.eql([
{id: 1}, {id: 2}, {id: 3}, {id: 4}, {id: 5}, {id: 6} {id: 6, modified_date: '2015-01-06'},
{id: 4, modified_date: '2015-01-05'},
{id: 2, modified_date: '2015-01-04'},
{id: 5, modified_date: '2015-01-03'},
{id: 3, modified_date: '2015-01-02'},
{id: 1, modified_date: '2015-01-01'}
]) ])
expect(ctrl.watching.toJS()).to.be.eql([ expect(ctrl.watching.toJS()).to.be.eql([
{id: 7}, {id: 8}, {id: 9}, {id: 10}, {id: 11}, {id: 12} {id: 12, modified_date: '2015-01-06'},
{id: 10, modified_date: '2015-01-05'},
{id: 8, modified_date: '2015-01-04'},
{id: 11, modified_date: '2015-01-03'},
{id: 9, modified_date: '2015-01-02'},
{id: 7, modified_date: '2015-01-01'}
]) ])
done() done()