From b0d1b2fe163ad2a79c9524801becdf494872f50a Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Fri, 6 Nov 2015 14:44:43 -0800 Subject: [PATCH 1/6] Revert "SUP-2582, Upcoming SRMs should be ordered by most recent date" This reverts commit 5c4211f91c63cb25fb920b80777aa21938450ed1. --- app/my-srms/my-srms.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/my-srms/my-srms.spec.js b/app/my-srms/my-srms.spec.js index 188768b7d..72abca768 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('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 From 70e1bf8956e5cb614fe0cc32e6bf6cd17b21721b Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Fri, 6 Nov 2015 14:46:36 -0800 Subject: [PATCH 2/6] Revert "SUP-2582, Upcoming SRMs should be ordered by most recent date" This reverts commit f0399e13ea1d768312e5fb91892a0cf50bfadca8. --- app/my-dashboard/srms/srms.controller.js | 3 +-- app/my-srms/my-srms.controller.js | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/my-dashboard/srms/srms.controller.js b/app/my-dashboard/srms/srms.controller.js index 243c3e135..d274878b7 100644 --- a/app/my-dashboard/srms/srms.controller.js +++ b/app/my-dashboard/srms/srms.controller.js @@ -21,8 +21,7 @@ function getSRMs() { var params = { - filter: 'status=future', - orderBy: 'registrationStartAt', + 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 b1422697e..e7c558ee3 100644 --- a/app/my-srms/my-srms.controller.js +++ b/app/my-srms/my-srms.controller.js @@ -52,8 +52,6 @@ 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.reverseOrder = filter !== 'future'; // update url but don't reload From 5817d97f5513f775d8fa4e48943fd99965d78e64 Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Fri, 6 Nov 2015 14:46:43 -0800 Subject: [PATCH 3/6] Revert "SUP-2582, Upcoming SRMs should be ordered by most recent date" This reverts commit 5809bd39b37132823d95951dad50606c528ccfb1. --- app/my-dashboard/srms/srms.controller.js | 2 +- app/my-srms/my-srms.controller.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/my-dashboard/srms/srms.controller.js b/app/my-dashboard/srms/srms.controller.js index d274878b7..ca6869eb8 100644 --- a/app/my-dashboard/srms/srms.controller.js +++ b/app/my-dashboard/srms/srms.controller.js @@ -21,7 +21,7 @@ function getSRMs() { var params = { - filter: 'status=future&orderBy=registrationStartAt', + filter: 'status=future', limit: 3 }; diff --git a/app/my-srms/my-srms.controller.js b/app/my-srms/my-srms.controller.js index e7c558ee3..ba8e18adc 100644 --- a/app/my-srms/my-srms.controller.js +++ b/app/my-srms/my-srms.controller.js @@ -52,7 +52,7 @@ function changeFilter(filter) { vm.statusFilter = filter; - 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}); From 557683c51bf7b074878d1628d95916eaf0ce544b Mon Sep 17 00:00:00 2001 From: Parth Shah Date: Wed, 18 Nov 2015 10:33:52 -0800 Subject: [PATCH 4/6] re-implementing SUP-2582 changes --- app/my-dashboard/srms/srms.controller.js | 1 + app/my-srms/my-srms.controller.js | 4 +++- app/my-srms/my-srms.spec.js | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) 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 From 38050f04770d78f4ece8aadbd68b5c549807e9c6 Mon Sep 17 00:00:00 2001 From: Tom Ladendorf Date: Wed, 25 Nov 2015 15:04:11 -0600 Subject: [PATCH 5/6] Updated month to be current --- app/community/members.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/community/members.controller.js b/app/community/members.controller.js index f2baa8f0b..f8ce7ab45 100644 --- a/app/community/members.controller.js +++ b/app/community/members.controller.js @@ -10,7 +10,7 @@ ctrl.notSearch = true; ctrl.showing = 'list'; ctrl.domain = CONSTANTS.domain; - ctrl.currentMonth = 'October 2015'; + ctrl.currentMonth = 'November 2015'; ctrl.memberLeaderboard = []; ctrl.copilots = []; CommunityDataService.getMembersData() From 95cbe4f67e35d656d40edd01d621aa7c294c734f Mon Sep 17 00:00:00 2001 From: Tom Ladendorf Date: Wed, 2 Dec 2015 17:11:45 -0600 Subject: [PATCH 6/6] update .version --- .version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.version b/.version index 75a4ba406..3ec7c5c4f 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -v1.0.16 +v1.0.17