From e8798a6607824dd7e3768f3166239b25a3a92afb Mon Sep 17 00:00:00 2001 From: Tom Ladendorf Date: Tue, 22 Dec 2015 11:36:50 -0600 Subject: [PATCH 1/7] added links --- app/directives/srm-tile/srm-tile.directive.jade | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/directives/srm-tile/srm-tile.directive.jade b/app/directives/srm-tile/srm-tile.directive.jade index 9709b2ab4..e269220ef 100644 --- a/app/directives/srm-tile/srm-tile.directive.jade +++ b/app/directives/srm-tile/srm-tile.directive.jade @@ -3,7 +3,7 @@ .challenge-track header - a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.rounds[0].id}}") {{srm.name}} + a(ng-href="https://community.{{DOMAIN}}/stat?c=round_overview&rd={{srm.rounds[0].id}}") {{srm.name}} .srm-details p.starts-in Starts in #[span {{srm.codingStartAt | timeDiff:"quantity"}} {{srm.codingStartAt | timeDiff:'unit'}}] @@ -17,19 +17,19 @@ .phase-status .registered(ng-show="srm.userStatus === CONSTANTS.REGISTERED") Registered .unregistered(ng-hide="srm.currentPhase !== CONSTANTS.REGISTRATION || srm.userStatus === CONSTANTS.REGISTERED") - a.tc-btn.tc-btn-s.tc-btn-wide(href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.rounds[0].id}}") Register + a.tc-btn.tc-btn-s.tc-btn-wide(href="https://community.{{DOMAIN}}/stat?c=round_overview&rd={{srm.rounds[0].id}}") Register .past-srm(ng-show="srm.status === 'PAST'") .challenge-track header - a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.rounds[0].id}}") {{srm.name}} + a(ng-href="https://community.{{DOMAIN}}/stat?c=round_overview&rd={{srm.rounds[0].id}}") {{srm.name}} .ended-on #[span {{srm.codingEndAt | localTime:"MMM DD, YYYY" }}] .member-stats p.points #[span {{srm.result.finalPoints }}] #[span Points] .ranks - .division + a.division(href="https://community.{{DOMAIN}}/stat?c=round_stats&rd={{srm.rounds[0].id}}&dn=2") p.rank {{srm.result.divisionPlacement}} p.label #[span Division {{srm.result.division}}] .room @@ -42,7 +42,7 @@ .challenge-track header .srm-name - a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.rounds[0].id}}") {{srm.name}} + a(ng-href="https://community.{{DOMAIN}}/stat?c=round_overview&rd={{srm.rounds[0].id}}") {{srm.name}} .srm-details p.starts-in Starts in #[span {{srm.codingStartAt | timeDiff:"quantity"}} {{srm.codingStartAt | timeDiff:'unit'}}] @@ -56,7 +56,7 @@ .challenge-track header .srm-name - a(ng-href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.rounds[0].id}}") {{srm.name}} + a(ng-href="https://community.{{DOMAIN}}/stat?c=round_overview&rd={{srm.rounds[0].id}}") {{srm.name}} .srm-details p.ended-on Ended {{srm.codingEndAt | timeDiff:"quantity"}} {{srm.codingEndAt | timeDiff:'unit'}} ago From 397cd57e33602bec5f01bd69536b8e88d545eb8c Mon Sep 17 00:00:00 2001 From: Tom Ladendorf Date: Tue, 22 Dec 2015 11:45:04 -0600 Subject: [PATCH 2/7] added extra link --- app/directives/srm-tile/srm-tile.directive.jade | 2 +- app/directives/srm-tile/srm-tile.directive.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/directives/srm-tile/srm-tile.directive.jade b/app/directives/srm-tile/srm-tile.directive.jade index e269220ef..3d0ccc8b0 100644 --- a/app/directives/srm-tile/srm-tile.directive.jade +++ b/app/directives/srm-tile/srm-tile.directive.jade @@ -32,7 +32,7 @@ a.division(href="https://community.{{DOMAIN}}/stat?c=round_stats&rd={{srm.rounds[0].id}}&dn=2") p.rank {{srm.result.divisionPlacement}} p.label #[span Division {{srm.result.division}}] - .room + a.room(href="https://community.{{DOMAIN}}/stat?c=coder_room_stats&cr={{userId}}&rd={{srm.rounds[0].id}}") p.rank #[span {{srm.result.roomPlacement}}] p.label #[span Room] p.placement Placement diff --git a/app/directives/srm-tile/srm-tile.directive.js b/app/directives/srm-tile/srm-tile.directive.js index 85bf714b8..0b9dbd038 100644 --- a/app/directives/srm-tile/srm-tile.directive.js +++ b/app/directives/srm-tile/srm-tile.directive.js @@ -8,7 +8,8 @@ srm: '=srm', view: '=', showResults: '=', - showFooter: '=' + showFooter: '=', + userId: '=' }, controller: ['$scope', '$filter', 'CONSTANTS', 'SRMService', function($scope, $filter, CONSTANTS, SRMService) { From 073cd06bf428eafe2ab82bb66ff8d0b73cd3990d Mon Sep 17 00:00:00 2001 From: Tom Ladendorf Date: Tue, 22 Dec 2015 11:47:02 -0600 Subject: [PATCH 3/7] updated link --- app/directives/srm-tile/srm-tile.directive.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/directives/srm-tile/srm-tile.directive.jade b/app/directives/srm-tile/srm-tile.directive.jade index 3d0ccc8b0..726927cdf 100644 --- a/app/directives/srm-tile/srm-tile.directive.jade +++ b/app/directives/srm-tile/srm-tile.directive.jade @@ -29,7 +29,7 @@ .member-stats p.points #[span {{srm.result.finalPoints }}] #[span Points] .ranks - a.division(href="https://community.{{DOMAIN}}/stat?c=round_stats&rd={{srm.rounds[0].id}}&dn=2") + a.division(href="https://community.{{DOMAIN}}/stat?c=round_stats&rd={{srm.rounds[0].id}}&dn={{srm.result.division}}") p.rank {{srm.result.divisionPlacement}} p.label #[span Division {{srm.result.division}}] a.room(href="https://community.{{DOMAIN}}/stat?c=coder_room_stats&cr={{userId}}&rd={{srm.rounds[0].id}}") From 5ecaccb0a27f5332267a2987293962afc402ef98 Mon Sep 17 00:00:00 2001 From: Tom Ladendorf Date: Tue, 22 Dec 2015 13:06:23 -0600 Subject: [PATCH 4/7] Pass in userId --- app/my-dashboard/srms/srms.controller.js | 1 + app/my-dashboard/srms/srms.jade | 2 +- app/my-srms/my-srms.controller.js | 1 + app/my-srms/my-srms.jade | 2 +- app/profile/subtrack/data/data-challenges.jade | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/my-dashboard/srms/srms.controller.js b/app/my-dashboard/srms/srms.controller.js index 01c0ef967..3abf78fd5 100644 --- a/app/my-dashboard/srms/srms.controller.js +++ b/app/my-dashboard/srms/srms.controller.js @@ -12,6 +12,7 @@ var userId = UserService.getUserIdentity().userId; var handle = UserService.getUserIdentity().handle; + vm.userId = userId; activate(); diff --git a/app/my-dashboard/srms/srms.jade b/app/my-dashboard/srms/srms.jade index 1133ed0b7..8bf637b6a 100644 --- a/app/my-dashboard/srms/srms.jade +++ b/app/my-dashboard/srms/srms.jade @@ -6,7 +6,7 @@ header tc-section(state="vm.state") .srm-tiles - srm-tile(ng-repeat="srm in vm.srms", srm="srm", view="'tile'", ng-class="'tile-view'") + srm-tile(ng-repeat="srm in vm.srms", srm="srm", view="'tile'", ng-class="'tile-view'", user-id="vm.userId") .srm-links-card .flex-wrapper diff --git a/app/my-srms/my-srms.controller.js b/app/my-srms/my-srms.controller.js index b1422697e..965363983 100644 --- a/app/my-srms/my-srms.controller.js +++ b/app/my-srms/my-srms.controller.js @@ -28,6 +28,7 @@ var userId = UserService.getUserIdentity().userId; var userHandle = UserService.getUserIdentity().handle; + vm.userId = userId; vm.handle = userHandle; activate(); diff --git a/app/my-srms/my-srms.jade b/app/my-srms/my-srms.jade index fe042f3df..6a91b1314 100644 --- a/app/my-srms/my-srms.jade +++ b/app/my-srms/my-srms.jade @@ -23,6 +23,6 @@ .data(ng-class="vm.view + '-view'") srm-tile.srm-tile( ng-repeat="srm in vm.srms | orderBy:vm.orderBy:vm.reverseOrder", - srm="srm", view="vm.view", ng-class="vm.view + '-view'", show-results="vm.statusFilter === 'past'") + srm="srm", view="vm.view", ng-class="vm.view + '-view'", show-results="vm.statusFilter === 'past'", user-id="vm.userId") tc-endless-paginator(state="vm.loading", page-params="vm.pageParams") diff --git a/app/profile/subtrack/data/data-challenges.jade b/app/profile/subtrack/data/data-challenges.jade index 5055280de..e4f08fcc9 100644 --- a/app/profile/subtrack/data/data-challenges.jade +++ b/app/profile/subtrack/data/data-challenges.jade @@ -10,7 +10,7 @@ .challenges(ng-show="vm.subTrack == 'SRM'") .challenge.tile(ng-repeat="challenge in vm.challenges") - srm-tile(srm="challenge", domain="vm.domain", view="'tile'") + srm-tile(srm="challenge", domain="vm.domain", view="'tile'", user-id="profileVm.profile.userId") .no-challenges(ng-show="!vm.challenges || vm.challenges.length == 0") | Sorry, no rated SRMs found. From 676bf5ea6e48c0db4cd10ec26240a50eeae2e0c0 Mon Sep 17 00:00:00 2001 From: Tom Ladendorf Date: Wed, 23 Dec 2015 11:39:38 -0600 Subject: [PATCH 5/7] fixed link --- app/directives/srm-tile/srm-tile.directive.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/directives/srm-tile/srm-tile.directive.jade b/app/directives/srm-tile/srm-tile.directive.jade index 726927cdf..52c8f6ba0 100644 --- a/app/directives/srm-tile/srm-tile.directive.jade +++ b/app/directives/srm-tile/srm-tile.directive.jade @@ -17,7 +17,7 @@ .phase-status .registered(ng-show="srm.userStatus === CONSTANTS.REGISTERED") Registered .unregistered(ng-hide="srm.currentPhase !== CONSTANTS.REGISTRATION || srm.userStatus === CONSTANTS.REGISTERED") - a.tc-btn.tc-btn-s.tc-btn-wide(href="https://community.{{DOMAIN}}/stat?c=round_overview&rd={{srm.rounds[0].id}}") Register + a.tc-btn.tc-btn-s.tc-btn-wide(href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.rounds[0].id}}") Register .past-srm(ng-show="srm.status === 'PAST'") .challenge-track From 5e4a63e0ec0ab2ea1a99bd4550bccc406368f6b7 Mon Sep 17 00:00:00 2001 From: Tom Ladendorf Date: Wed, 23 Dec 2015 11:59:55 -0600 Subject: [PATCH 6/7] link updates --- app/directives/srm-tile/srm-tile.directive.jade | 4 ++-- assets/css/directives/srm-tile.scss | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/directives/srm-tile/srm-tile.directive.jade b/app/directives/srm-tile/srm-tile.directive.jade index 52c8f6ba0..22a8186bf 100644 --- a/app/directives/srm-tile/srm-tile.directive.jade +++ b/app/directives/srm-tile/srm-tile.directive.jade @@ -65,10 +65,10 @@ p.points #[span {{srm.result.finalPoints }}] Points .ranks - .division + a.division(ng-class="{noclick: !srm.result.divisionPlacement}") p.rank {{srm.result.divisionPlacement}} p.label #[span Div {{srm.result.division}}] #[span Placement] - .room + a.room(ng-class="{noclick: !srm.result.roomPlacement}") p.rank #[span {{srm.result.roomPlacement}}] p.label #[span Room] #[span Placement] diff --git a/assets/css/directives/srm-tile.scss b/assets/css/directives/srm-tile.scss index ca088326a..eb361c3ce 100644 --- a/assets/css/directives/srm-tile.scss +++ b/assets/css/directives/srm-tile.scss @@ -2,6 +2,9 @@ // common styles for both list and tile view .srm { + .noclick { + cursor: default; + } .phase-status { .registered { position: relative; From f47be203be0e6d15ff4f6c19a04643c459e450bb Mon Sep 17 00:00:00 2001 From: Tom Ladendorf Date: Wed, 23 Dec 2015 12:06:47 -0600 Subject: [PATCH 7/7] Cleanup --- .../srm-tile/srm-tile.directive.jade | 20 +++++++++---------- app/directives/srm-tile/srm-tile.directive.js | 10 ++++++---- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/directives/srm-tile/srm-tile.directive.jade b/app/directives/srm-tile/srm-tile.directive.jade index 22a8186bf..fc6b92c95 100644 --- a/app/directives/srm-tile/srm-tile.directive.jade +++ b/app/directives/srm-tile/srm-tile.directive.jade @@ -3,7 +3,7 @@ .challenge-track header - a(ng-href="https://community.{{DOMAIN}}/stat?c=round_overview&rd={{srm.rounds[0].id}}") {{srm.name}} + a(ng-href="https://community.{{DOMAIN}}/stat?c=round_overview&rd={{roundId}}") {{srm.name}} .srm-details p.starts-in Starts in #[span {{srm.codingStartAt | timeDiff:"quantity"}} {{srm.codingStartAt | timeDiff:'unit'}}] @@ -17,22 +17,22 @@ .phase-status .registered(ng-show="srm.userStatus === CONSTANTS.REGISTERED") Registered .unregistered(ng-hide="srm.currentPhase !== CONSTANTS.REGISTRATION || srm.userStatus === CONSTANTS.REGISTERED") - a.tc-btn.tc-btn-s.tc-btn-wide(href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.rounds[0].id}}") Register + a.tc-btn.tc-btn-s.tc-btn-wide(href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{roundId}}") Register .past-srm(ng-show="srm.status === 'PAST'") .challenge-track header - a(ng-href="https://community.{{DOMAIN}}/stat?c=round_overview&rd={{srm.rounds[0].id}}") {{srm.name}} + a(ng-href="https://community.{{DOMAIN}}/stat?c=round_overview&rd={{roundId}}") {{srm.name}} .ended-on #[span {{srm.codingEndAt | localTime:"MMM DD, YYYY" }}] .member-stats p.points #[span {{srm.result.finalPoints }}] #[span Points] .ranks - a.division(href="https://community.{{DOMAIN}}/stat?c=round_stats&rd={{srm.rounds[0].id}}&dn={{srm.result.division}}") + a.division(href="https://community.{{DOMAIN}}/stat?c=round_stats&rd={{roundId}}&dn={{division}}") p.rank {{srm.result.divisionPlacement}} p.label #[span Division {{srm.result.division}}] - a.room(href="https://community.{{DOMAIN}}/stat?c=coder_room_stats&cr={{userId}}&rd={{srm.rounds[0].id}}") + a.room(href="https://community.{{DOMAIN}}/stat?c=coder_room_stats&cr={{userId}}&rd={{roundId}}") p.rank #[span {{srm.result.roomPlacement}}] p.label #[span Room] p.placement Placement @@ -42,7 +42,7 @@ .challenge-track header .srm-name - a(ng-href="https://community.{{DOMAIN}}/stat?c=round_overview&rd={{srm.rounds[0].id}}") {{srm.name}} + a(ng-href="https://community.{{DOMAIN}}/stat?c=round_overview&rd={{roundId}}") {{srm.name}} .srm-details p.starts-in Starts in #[span {{srm.codingStartAt | timeDiff:"quantity"}} {{srm.codingStartAt | timeDiff:'unit'}}] @@ -50,13 +50,13 @@ .phase-status .registered(ng-show="srm.userStatus === CONSTANTS.REGISTERED") Registered .unregistered(ng-hide="srm.currentPhase !== CONSTANTS.REGISTRATION || srm.userStatus === CONSTANTS.REGISTERED") - a.tc-btn.tc-btn-s.tc-btn-wide(href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{srm.rounds[0].id}}") Register + a.tc-btn.tc-btn-s.tc-btn-wide(href="https://community.{{DOMAIN}}/tc?module=MatchDetails&rd={{roundId}}") Register .past-srm(ng-show="srm.status === 'PAST'") .challenge-track header .srm-name - a(ng-href="https://community.{{DOMAIN}}/stat?c=round_overview&rd={{srm.rounds[0].id}}") {{srm.name}} + a(ng-href="https://community.{{DOMAIN}}/stat?c=round_overview&rd={{roundId}}") {{srm.name}} .srm-details p.ended-on Ended {{srm.codingEndAt | timeDiff:"quantity"}} {{srm.codingEndAt | timeDiff:'unit'}} ago @@ -65,10 +65,10 @@ p.points #[span {{srm.result.finalPoints }}] Points .ranks - a.division(ng-class="{noclick: !srm.result.divisionPlacement}") + a.division(ng-class="{noclick: !srm.result.divisionPlacement}", href="https://community.{{DOMAIN}}/stat?c=round_stats&rd={{roundId}}&dn={{division}}") p.rank {{srm.result.divisionPlacement}} p.label #[span Div {{srm.result.division}}] #[span Placement] - a.room(ng-class="{noclick: !srm.result.roomPlacement}") + a.room(ng-class="{noclick: !srm.result.roomPlacement}", href="https://community.{{DOMAIN}}/stat?c=coder_room_stats&cr={{userId}}&rd={{roundId}}") p.rank #[span {{srm.result.roomPlacement}}] p.label #[span Room] #[span Placement] diff --git a/app/directives/srm-tile/srm-tile.directive.js b/app/directives/srm-tile/srm-tile.directive.js index 0b9dbd038..b5ab8afbc 100644 --- a/app/directives/srm-tile/srm-tile.directive.js +++ b/app/directives/srm-tile/srm-tile.directive.js @@ -13,10 +13,12 @@ }, controller: ['$scope', '$filter', 'CONSTANTS', 'SRMService', function($scope, $filter, CONSTANTS, SRMService) { - $scope.DOMAIN = CONSTANTS.domain; - $scope.CONSTANTS = CONSTANTS; - $scope.srm.userStatus = _.get($scope.srm, 'userStatus', null); - SRMService.processSRM($scope.srm); + $scope.DOMAIN = CONSTANTS.domain; + $scope.CONSTANTS = CONSTANTS; + $scope.srm.userStatus = _.get($scope.srm, 'userStatus', null); + SRMService.processSRM($scope.srm); + $scope.roundId = $scope.srm.rounds.length && $scope.srm.rounds[0].id; + $scope.division = $scope.srm.result && $scope.srm.result.division; }] }; });