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

Commit 0006bd3

Browse files
tladendotladendo
committed
finished nearly all of feedback fixes
1 parent bd65567 commit 0006bd3

File tree

13 files changed

+377
-70
lines changed

13 files changed

+377
-70
lines changed

‎app/index.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ html
9494
script(src='../bower_components/angucomplete-alt/angucomplete-alt.js')
9595
script(src='../bower_components/angular-cookies/angular-cookies.js')
9696
script(src='../bower_components/angular-dropdowns/dist/angular-dropdowns.js')
97-
script(src='../bower_components/angular-filter/dist/angular-filter.js')
97+
script(src='../bower_components/angular-filter/dist/angular-filter.min.js')
9898
script(src='../bower_components/angular-img-fallback/angular.dcb-img-fallback.js')
9999
script(src='../bower_components/intro.js/intro.js')
100100
script(src='../bower_components/angular-intro.js/src/angular-intro.js')

‎app/profile/about/about.controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
profileVm.skillsPromise.then(function() {
4141
// show section if user is viewing his/her own profile OR if we have data
4242
vm.fullSkills = profileVm.skills;
43-
vm.someSkills = profileVm.skills.slice(0, 9);
43+
vm.someSkills = profileVm.skills.slice(0, 6);
4444
vm.skills = vm.someSkills;
4545
vm.displaySection.skills = profileVm.showEditProfileLink || !!vm.skills.length;
4646
});

‎app/profile/about/about.jade

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
.skill(ng-repeat="skill in vm.skills")
1111
skill-tile(skill="skill")
1212

13-
button.more(ng-show="vm.skills.length < vm.fullSkills.length", ng-click="vm.skills = vm.fullSkills") VIEW MORE
13+
button.more(ng-if="vm.skills.length < vm.fullSkills.length", ng-click="vm.skills = vm.fullSkills") VIEW MORE
14+
button.more(ng-if="vm.skills.length > 6", ng-click="vm.skills = vm.someSkills") VIEW LESS
1415

1516
.empty-state(ng-show="!profileVm.skills || (profileVm.skills && profileVm.skills.length == 0)")
1617
.action-text show us your skills &amp; tools, we'd love that!

‎app/profile/profile.controller.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
$log.debug('Calling ProfileController activate()');
6767
// show edit profile link if user is authenticated and is viewing their own profile
6868
vm.showEditProfileLink = TcAuthService.isAuthenticated() && UserService.getUserIdentity().handle.toLowerCase() === vm.userHandle.toLowerCase();
69+
vm.isUser = vm.showEditProfileLink;
6970
if (profile.createdAt) {
7071
profile.startMonth = moment(profile.createdAt).format('MMMM YYYY');
7172
} else {

‎app/profile/subtrack/data/data.jade

Lines changed: 97 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
1-
.develop(ng-if="vm.track == 'DATA_SCIENCE'")
1+
.data.develop(ng-if="vm.track == 'DATA_SCIENCE'")
22
.top
33
ul.horizontal-stats
4-
li.stat
5-
.value {{vm.typeStats.rank.rank}}
6-
.name RANK
7-
8-
li.stat
9-
.value {{vm.typeStats.rank.countryRank}}
10-
.name COUNTRY RANK
11-
124
li.stat
135
.value.rating {{vm.typeStats.rank.rating}}
146
span.square(style="background-color: {{vm.typeStats.rank.rating | ratingColor}}")
157
.name RATING
168

9+
li.stat
10+
.value {{vm.typeStats.rank.rank}}
11+
.name RANK
12+
1713
li.stat
1814
.value {{vm.typeStats.rank.percentile / 100 | percentage}}
1915
.name PERCENTILE
2016

17+
li.stat(ng-if="vm.subTrack == 'SRM'")
18+
.value {{vm.typeStats.challenges}}
19+
.name COMPETITIONS
20+
21+
li.stat(ng-if="vm.subTrack == 'MARATHON_MATCH' || vm.subTrack == 'MARATHON'")
22+
.value {{vm.typeStats.wins}}
23+
.name WINS
24+
2125
.tabs
2226
a.left(id="challenges", ng-click="vm.viewing = 'challenges'",
2327
ng-class="vm.viewing == 'challenges' ? 'selected' : ''"
@@ -27,6 +31,8 @@
2731
ng-class="vm.viewing == 'stats' ? 'selected' : ''"
2832
) Stats
2933

34+
hr
35+
3036
tc-section(
3137
ng-show="vm.viewing == 'challenges'",
3238
state="vm.status.challenges"
@@ -39,28 +45,100 @@
3945
| no past challenges available for this user
4046

4147
.stats(ng-show="vm.viewing == 'stats' && profileVm.status.stats === 'ready'")
42-
.graphs
48+
.graphs(ng-if="vm.subTrack == 'SRM'")
4349
distribution-graph(promise="vm.distributionPromise", rating="vm.typeStats.rank.rating", graph-state="vm.graphState")
4450

4551
history-graph(promise="vm.historyPromise", rating="vm.typeStats.rank.rating", graph-state="vm.graphState")
4652

4753
.bottom(ng-show="vm.viewing == 'stats'")
4854
h2.detailed Details
4955

50-
ul.vertical-stats
51-
li.first
52-
.left Rank
53-
.right {{vm.typeStats.rank.rank}}
54-
56+
ul.vertical-stats(ng-show="vm.subTrack == 'MARATHON_MATCH' || vm.subTrack == 'MARATHON'")
5557
li
5658
.left Country Rank
5759
.right {{vm.typeStats.rank.countryRank}}
5860

5961
li
60-
.left Rating
61-
.right {{vm.typeStats.rank.rating}}
62+
.left Volatility
63+
.right {{vm.typeStats.rank.volatility}}
6264

6365
li
64-
.left Percentile
65-
.right {{vm.typeStats.rank.percentile / 100 | percentage}}
66+
.left Maximum Rating
67+
.right {{vm.typeStats.rank.maximumRating}}
68+
69+
li
70+
.left Best Rank
71+
.right {{vm.typeStats.rank.bestRank}}
72+
73+
li.first
74+
.left Wins
75+
.right {{vm.typeStats.wins}}
76+
77+
li.first
78+
.left Top Five Finishes
79+
.right {{vm.typeStats.rank.topFiveFinishes}}
80+
81+
li.first
82+
.left Top Ten Finishes
83+
.right {{vm.typeStats.rank.topTenFinishes}}
84+
85+
li.first
86+
.left Average Rank
87+
.right {{vm.typeStats.rank.avgRank}}
88+
89+
li.first
90+
.left Average # Submissions
91+
.right {{vm.typeStats.rank.avgNumSubmissions}}
92+
93+
li.first
94+
.left Competitions
95+
.right {{vm.typeStats.challenges}}
96+
97+
li
98+
.left Most Recent Event
99+
.right {{vm.typeStats.mostRecentEventDate | date}}
100+
101+
ul.divisions(ng-show="vm.subTrack == 'SRM'")
102+
li.division(ng-repeat="division in vm.divisionList")
103+
ul(class="{{division.levelName}}")
104+
li.totals
105+
ul.row
106+
li.left
107+
h2 DIVISION {{$index + 1}}
108+
span TOTAL
109+
li.success
110+
h3 {{division.total.problemsSuccessful / division.total.problemsSubmitted | percentage }}
111+
span SUCCESS
112+
113+
li.submitted
114+
h3 {{division.total.problemsSubmitted}}
115+
span SUBMITTED
116+
117+
li.failed
118+
h3 {{division.total.problemsFailed}}
119+
span FAILED CHALLENGES
120+
121+
li.failed-sys
122+
h3 {{division.total.problemsSysByTest}}
123+
span FAILED SYS. TEST
124+
125+
li.level(ng-repeat="level in division.levels")
126+
ul.row
127+
li.left
128+
h3 {{level.levelName}}
129+
130+
li.success
131+
h3 {{level.problemsSuccessful / level.problemsSubmitted | percentage }}
132+
span SUCCESS
133+
134+
li.submitted
135+
h3 {{level.problemsSubmitted}}
136+
span SUBMITTED
137+
138+
li.failed
139+
h3 {{level.problemsFailed}}
140+
span FAILED CHALLENGES
66141

142+
li.failed-sys
143+
h3 {{level.problemsSysByTest}}
144+
span FAILED SYS. TEST

‎app/profile/subtrack/design/design.jade

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,7 @@
99
.value {{vm.typeStats.wins}}
1010
.name CHALLENGES
1111

12-
.tabs
13-
a.left(id="challenges", ng-click="vm.viewing = 'challenges'",
14-
ng-class="vm.viewing == 'challenges' ? 'selected' : ''"
15-
) Challenges
16-
17-
a.right(id="stats", ng-click="vm.viewing = 'stats'",
18-
ng-class="vm.viewing == 'stats' ? 'selected' : ''"
19-
) Stats
12+
hr
2013

2114
tc-section(
2215
ng-show="vm.viewing == 'challenges'",

‎app/profile/subtrack/develop/develop.jade

Lines changed: 45 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
.develop(ng-if="vm.track == 'DEVELOP'")
22
.top
33
ul.horizontal-stats
4+
li.stat
5+
.value.rating {{vm.typeStats.rank.rating}}
6+
span.square(style="background-color: {{vm.typeStats.rank.rating | ratingColor}}")
7+
.name RATING
8+
49
li.stat
510
.value {{vm.typeStats.rank.overallRank}}
611
.name RANK
712

813
li.stat
9-
.value.rating {{vm.typeStats.rank.rating}}
10-
span.square(style="background-color: {{vm.typeStats.rank.rating | ratingColor}}")
11-
.name RATING
14+
.value {{vm.typeStats.rank.overallPercentile / 100 | percentage}}
15+
.name PERCENTILE
1216

1317
li.stat
1418
.value {{vm.typeStats.challenges}}
15-
.name PROJECTS
19+
.name CHALLENGES
1620

1721
li.stat
18-
.value {{vm.typeStats.rank.overallCountryRank}}
19-
.name COUNTRY RANK
22+
.value {{vm.typeStats.wins}}
23+
.name WINS
2024

2125
li.stat
2226
.value {{vm.typeStats.rank.reliability | percentage}}
@@ -31,6 +35,8 @@
3135
ng-class="vm.viewing == 'stats' ? 'selected' : ''"
3236
) Stats
3337

38+
hr
39+
3440
tc-section(
3541
ng-show="vm.viewing == 'challenges'",
3642
state="vm.status.challenges"
@@ -53,57 +59,69 @@
5359

5460
ul.vertical-stats
5561
li.first
62+
.left Win Percentage
63+
.right {{vm.typeStats.submissions.winPercent | percentage}}
64+
65+
li
66+
.left Country Rank
67+
.right {{vm.typeStats.rank.overallCountryRank}}
68+
69+
li
70+
.left Volatility
71+
.right {{vm.typeStats.rank.volatility}}
72+
73+
li
74+
.left Maximum Rating
75+
.right {{vm.typeStats.rank.maxRating}}
76+
77+
li(ng-if="profileVm.isUser")
78+
.left Inquiries
79+
.right {{vm.typeStats.submissions.numInquiries}}
80+
81+
li(ng-if="profileVm.isUser")
5682
.left Submissions
5783
.right {{vm.typeStats.submissions.submissions}}
5884

5985
li
6086
.left Submission Rate
6187
.right {{vm.typeStats.submissions.submissionRate | percentage}}
62-
63-
li
88+
89+
li(ng-if="profileVm.isUser")
6490
.left Passed Screening
6591
.right {{vm.typeStats.submissions.passedScreening}}
6692

6793
li
6894
.left Screening Success Rate
6995
.right {{vm.typeStats.submissions.screeningSuccessRate | percentage}}
7096

71-
li
97+
li(ng-if="profileVm.isUser")
7298
.left Passed Review
7399
.right {{vm.typeStats.submissions.passedReview}}
74100

75101
li
76102
.left Review Success Rate
77103
.right {{vm.typeStats.submissions.reviewSuccessRate | percentage}}
78104

79-
li
80-
.left Maximum Score
81-
.right {{vm.typeStats.submissions.maxScore}}
82-
83-
li
84-
.left Minimum Score
85-
.right {{vm.typeStats.submissions.minScore}}
86-
87-
li
105+
li(ng-if="profileVm.isUser")
88106
.left Appeals
89107
.right {{vm.typeStats.submissions.appeals}}
90108

91109
li
92110
.left Appeals Success Rate
93111
.right {{vm.typeStats.submissions.appealSuccessRate | percentage}}
94112

95-
li
113+
li(ng-if="profileVm.isUser")
114+
.left Maximum Score
115+
.right {{vm.typeStats.submissions.maxScore}}
116+
117+
li(ng-if="profileVm.isUser")
118+
.left Minimum Score
119+
.right {{vm.typeStats.submissions.minScore}}
120+
121+
li(ng-if="profileVm.isUser")
96122
.left Average Score
97123
.right {{vm.typeStats.submissions.avgScore | number: 2}}
98124

99125
li
100126
.left Average Placement
101127
.right {{vm.typeStats.submissions.avgPlacement | number: 2}}
102-
103-
li
104-
.left Wins
105-
.right {{vm.typeStats.wins}}
106-
107-
li
108-
.left Win Percentage
109-
.right {{vm.typeStats.submissions.winPercent | percentage}}

‎app/profile/subtrack/subtrack.controller.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@
3737
activate();
3838

3939
function activate() {
40+
if (vm.subTrack == 'SRM') {
41+
vm.graphState = { show: 'distribution' };
42+
}
4043
if (vm.track == 'DEVELOP' || vm.track == 'DATA_SCIENCE') {
4144
vm.distributionPromise = ProfileService.getDistributionStats(vm.track, vm.subTrack);
4245
vm.distributionPromise.then(function(data) {
@@ -53,6 +56,16 @@
5356
}
5457

5558
profileVm.statsPromise.then(function(data) {
59+
if (vm.subTrack == 'SRM') {
60+
vm.divisions = ProfileService.getDivisions(profileVm.stats);
61+
vm.divisionList = [
62+
vm.divisions.division1,
63+
vm.divisions.division2,
64+
vm.divisions.challenges
65+
];
66+
console.log('diviviv');
67+
console.log(vm.divisionList);
68+
}
5669
vm.typeStats = ProfileService.getChallengeTypeStats(
5770
profileVm.stats,
5871
vm.track,

0 commit comments

Comments
 (0)