Merge branch 'master' of github.com:appirio-tech/topcoder-app

Author: Parth Shah

app/my-dashboard/srms/srms.controller.js

@@ -22,7 +22,6 @@
     function getSRMs() {
       var params = {
         filter: 'status=future',
-        orderBy: 'registrationStartAt',
         limit: 3
       };
 

app/my-srms/my-srms.controller.js

@@ -52,9 +52,7 @@
 
     function changeFilter(filter) {
       vm.statusFilter = filter;
-      // 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.orderBy = filter === 'future'? 'startDate': 'endDate';
       vm.reverseOrder = filter !== 'future';
       // update url but don't reload
       $state.go($state.$current.name, {status: filter}, {notify: false});

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('codingEndAt');
+      expect(mySRMs.orderBy).to.equal('endDate');
       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('codingStartAt');
+      expect(mySRMs.orderBy).to.equal('startDate');
       expect(mySRMs.reverseOrder).to.be.false;
       expect(mySRMs.srms).to.exist;
       // should have one extra srm for past filter as per mocked method