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

Commit 853fffd

Browse files
author
vikasrohit
committed
SUP-1595, Dashboard: My Challenge page needs to be styled
-- Added state param for detecting challenge status for listing -- updated links on my dashboard pages to include status state params
1 parent 674e4d9 commit 853fffd

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

app/my-challenges/my-challenges.controller.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
angular.module('tc.myChallenges').controller('MyChallengesController', MyChallengesController);
55

6-
MyChallengesController.$inject = ['ChallengeService', 'UserService', '$q', '$log', 'CONSTANTS', 'Helpers', '$scope', 'userIdentity'];
6+
MyChallengesController.$inject = ['ChallengeService', 'UserService', '$q', '$log', 'CONSTANTS', 'Helpers', '$scope', 'userIdentity', 'statusFilter'];
77

8-
function MyChallengesController(ChallengeService, UserService, $q, $log, CONSTANTS, Helpers, $scope, userIdentity) {
8+
function MyChallengesController(ChallengeService, UserService, $q, $log, CONSTANTS, Helpers, $scope, userIdentity, statusFilter) {
99
var vm = this;
1010
vm.domain = CONSTANTS.domain;
1111
vm.loading = true;
@@ -15,7 +15,8 @@
1515
vm.viewPastChallenges = viewPastChallenges;
1616
vm.view = 'list';
1717
vm.changeView = changeView;
18-
vm.statusFilter = 'active';
18+
vm.statusFilter = statusFilter ? statusFilter : 'active';
19+
1920
// paging params, these are updated by tc-pager
2021
vm.pageParams = {
2122
offset : 0,
@@ -27,8 +28,8 @@
2728
};
2829
vm.orderBy = 'submissionEndDate';
2930

30-
var userId = UserService.getUserIdentity().userId;
31-
var handle = UserService.getUserIdentity().handle;
31+
var userId = userIdentity.userId;
32+
var handle = userIdentity.handle;
3233

3334
activate();
3435

@@ -39,7 +40,11 @@
3940
$scope.$watch('vm.pageParams.updated', function(updatedParams) {
4041
_getChallenges();
4142
});
42-
viewActiveChallenges();
43+
if (vm.statusFilter == 'completed') {
44+
viewPastChallenges();
45+
} else {
46+
viewActiveChallenges();
47+
}
4348
}
4449

4550
function changeView(view) {

app/my-challenges/my-challenges.routes.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
function routes($stateProvider, $urlRouterProvider, $httpProvider) {
1212
var states = {
1313
'my-challenges': {
14-
url: '/my-challenges/',
14+
url: '/my-challenges/:status',
1515
parent: 'root',
1616
templateUrl: 'my-challenges/my-challenges.html',
1717
controller: 'MyChallengesController',
@@ -23,7 +23,10 @@
2323
resolve: {
2424
userIdentity: ['UserService', function(UserService) {
2525
return UserService.getUserIdentity();
26-
}]
26+
}],
27+
statusFilter: ['$stateParams', function($stateParams) {
28+
return $stateParams.status;
29+
}],
2730
}
2831
}
2932
};

app/my-dashboard/my-challenges/my-challenges.jade

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ section.hasChallenges(ng-if="vm.userHasChallenges && !vm.loading", ng-class="{ '
4545
challenge-tile(ng-repeat="challenge in vm.myChallenges | orderBy:registrationEndDate:true", challenge="challenge", view="vm.challengeView", ng-class="vm.challengeView + '-view'")
4646

4747
.my-challenges-links(ng-if="vm.userHasChallenges && !vm.loading")
48-
a(ui-sref="my-challenges") View All Active Challenges
48+
a(ui-sref="my-challenges({status: 'active'})") View All Active Challenges
4949

50-
a(ui-sref="my-challenges") View All Past Challenges
50+
a(ui-sref="my-challenges({status: 'completed'})") View All Past Challenges

0 commit comments

Comments
 (0)