Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

sup 2582 sort srms by registration start #546

Merged
merged 11 commits into from
Nov 10, 2015
1 change: 1 addition & 0 deletions app/my-dashboard/srms/srms.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
function getSRMs() {
var params = {
filter: 'status=future',
orderBy: 'registrationStartAt',
limit: 3
};

Expand Down
4 changes: 3 additions & 1 deletion app/my-srms/my-srms.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@

function changeFilter(filter) {
vm.statusFilter = filter;
vm.orderBy = filter === 'future'? 'startDate': 'endDate';
// for upcoming SRMs sorting is done ascending order of codingStartAt
// for past SRMs sorting is done descending order of codingEndAt
vm.orderBy = filter === 'future'? 'codingStartAt': 'codingEndAt';
vm.reverseOrder = filter !== 'future';
// update url but don't reload
$state.go($state.$current.name, {status: filter}, {notify: false});
Expand Down
4 changes: 2 additions & 2 deletions app/my-srms/my-srms.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ describe('My SRMs Controller', function() {
// by default it should load upcoming SRMs
expect(mySRMs.statusFilter).to.equal('past');
expect(mySRMs.srms).to.exist;
expect(mySRMs.orderBy).to.equal('endDate');
expect(mySRMs.orderBy).to.equal('codingEndAt');
expect(mySRMs.reverseOrder).to.be.true;
expect(mySRMs.srms.length).to.equal(srms.length - 1);
expect(spy.withArgs(0).calledOnce);
Expand Down Expand Up @@ -107,7 +107,7 @@ describe('My SRMs Controller', function() {
it('upcoming SRMs should be fetched', function() {
expect(mySRMs.srms).to.exist;
expect(mySRMs.statusFilter).to.equal('future');
expect(mySRMs.orderBy).to.equal('startDate');
expect(mySRMs.orderBy).to.equal('codingStartAt');
expect(mySRMs.reverseOrder).to.be.false;
expect(mySRMs.srms).to.exist;
// should have one extra srm for past filter as per mocked method
Expand Down