diff --git a/app/my-dashboard/srms/srms.controller.js b/app/my-dashboard/srms/srms.controller.js index ca6869eb8..243c3e135 100644 --- a/app/my-dashboard/srms/srms.controller.js +++ b/app/my-dashboard/srms/srms.controller.js @@ -22,6 +22,7 @@ function getSRMs() { var params = { filter: 'status=future', + orderBy: 'registrationStartAt', limit: 3 }; diff --git a/app/my-srms/my-srms.controller.js b/app/my-srms/my-srms.controller.js index ba8e18adc..b1422697e 100644 --- a/app/my-srms/my-srms.controller.js +++ b/app/my-srms/my-srms.controller.js @@ -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}); diff --git a/app/my-srms/my-srms.spec.js b/app/my-srms/my-srms.spec.js index 72abca768..188768b7d 100644 --- a/app/my-srms/my-srms.spec.js +++ b/app/my-srms/my-srms.spec.js @@ -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); @@ -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