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

qa-integration before 12/23 release #625

Merged
merged 11 commits into from
Dec 23, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/community/members.jade
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@
small {{ctrl.currentMonth}}
.members-wrapper
.user-tile(ng-repeat="item in ctrl.memberLeaderboard")
.avatar-wrapper: img(ng-src="{{item.avatar}}")
.user-name {{item.name}}
a.avatar-wrapper(ui-sref="profile.about({userHandle: item.name})")
img(ng-src="{{item.avatar}}")
a.user-name(ui-sref="profile.about({userHandle: item.name})") {{item.name}}
.user-tag(class="{{item.class}}") {{item.contestType}}
p.user-desc {{item.description}}
a(ng-href="//www.{{ctrl.domain}}/community/member-programs/topcoder-member-of-the-month/", target="_blank").user-more Read the story
Expand Down
20 changes: 10 additions & 10 deletions app/directives/srm-tile/srm-tile.directive.jade
Original file line number Diff line number Diff line change
Expand Up @@ -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={{roundId}}") {{srm.name}}

.srm-details
p.starts-in Starts in #[span {{srm.codingStartAt | timeDiff:"quantity"}} {{srm.codingStartAt | timeDiff:'unit'}}]
Expand All @@ -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}}/tc?module=MatchDetails&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
.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}}]
.room
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
Expand All @@ -42,21 +42,21 @@
.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={{roundId}}") {{srm.name}}

.srm-details
p.starts-in Starts in #[span {{srm.codingStartAt | timeDiff:"quantity"}} {{srm.codingStartAt | timeDiff:'unit'}}]

.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}}/tc?module=MatchDetails&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
Expand All @@ -65,10 +65,10 @@
p.points #[span {{srm.result.finalPoints }}] Points

.ranks
.division
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]
.room
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]

Expand Down
13 changes: 8 additions & 5 deletions app/directives/srm-tile/srm-tile.directive.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,17 @@
srm: '=srm',
view: '=',
showResults: '=',
showFooter: '='
showFooter: '=',
userId: '='
},
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;
}]
};
});
Expand Down
1 change: 1 addition & 0 deletions app/my-dashboard/srms/srms.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

var userId = UserService.getUserIdentity().userId;
var handle = UserService.getUserIdentity().handle;
vm.userId = userId;

activate();

Expand Down
2 changes: 1 addition & 1 deletion app/my-dashboard/srms/srms.jade
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions app/my-srms/my-srms.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

var userId = UserService.getUserIdentity().userId;
var userHandle = UserService.getUserIdentity().handle;
vm.userId = userId;
vm.handle = userHandle;

activate();
Expand Down
2 changes: 1 addition & 1 deletion app/my-srms/my-srms.jade
Original file line number Diff line number Diff line change
Expand Up @@ -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")
2 changes: 1 addition & 1 deletion app/profile/subtrack/data/data-challenges.jade
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 5 additions & 1 deletion assets/css/community/members.scss
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .1);
text-align: center;
background: $white;
.avatar-wrapper {
.avatar-wrapper img {
margin: 0 auto;
border-radius: 100px;
border: 1px solid $gray-light;
Expand Down Expand Up @@ -209,6 +209,10 @@
.user-more {
text-transform: uppercase;
}
.user-name {
color: black;
display: block;
}
.user-desc {
color: $gray-dark-alt;
min-height: 54px;
Expand Down
3 changes: 3 additions & 0 deletions assets/css/directives/srm-tile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

// common styles for both list and tile view
.srm {
.noclick {
cursor: default;
}
.phase-status {
.registered {
position: relative;
Expand Down
14 changes: 14 additions & 0 deletions assets/images/skills/id-109.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 9 additions & 12 deletions assets/images/skills/id-110.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading