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

Commit b4023da

Browse files
thabofletcherthabofletcher
committed
Merge pull request #149 from appirio-tech/release
Release
2 parents 62520b9 + 313ba18 commit b4023da

File tree

5 files changed

+9
-21
lines changed

5 files changed

+9
-21
lines changed

‎src/js/app/challenge-details/partials/ng-content-basic-challenge-details.tpl.html‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ <h3><small>$</small><span ng-bind="CD.challenge.prize[j]"></span></h3>
9595
</td>
9696
</tr>
9797
<tr><!-- Bugfix: Added noPrize class when challenge has no reliability bonus -->
98-
<td ng-if="!CD.isDesign" colspan="{{CD.challenge.challengeType == 'Code' ? '2' : ''}}" class="{{ (!CD.challenge.reliabilityBonus || CD.challenge.challengeType === 'Bug Hunt') ? 'noPrize' : ''}}">
98+
<td ng-if="!CD.isDesign" colspan="5" class="{{ (!CD.challenge.reliabilityBonus || CD.challenge.challengeType === 'Bug Hunt') ? 'noPrize' : ''}}">
9999
<p class="realibilityPara">
100100
Reliability Bonus
101101
<span ng-if="CD.reliabilityBonus && CD.challenge.challengeType !== 'Bug Hunt'" ng-bind-template="${{CD.challenge.reliabilityBonus}}">
@@ -104,15 +104,9 @@ <h3><small>$</small><span ng-bind="CD.challenge.prize[j]"></span></h3>
104104
N/A
105105
</span>
106106
</p>
107-
</td><!-- Bugfix: Added noPrize class when challenge has no DR points -->
108-
<td ng-if="!CD.isDesign" colspan="{{CD.challenge.challengeType == 'Code' ? '3' : ''}}" class="{{!CD.challenge.digitalRunPoints ? 'noPrize' : ''}}">
109-
<p class="drPointsPara">DR Points <span ng-bind="CD.challenge.digitalRunPoints ? CD.challenge.digitalRunPoints : 'N/A'"></span></p>
110107
</td>
111108
</td>
112-
<td ng-if="CD.isDesign" colspan="2">
113-
<p class="scPoints"><span ng-bind="CD.challenge.digitalRunPoints ? CD.challenge.digitalRunPoints : ''"></span>{{!CD.challenge.digitalRunPoints ? 'NO' : ''}} STUDIO CUP POINTS</p>
114-
</td>
115-
<td ng-if="CD.isDesign" colspan="3">
109+
<td ng-if="CD.isDesign" colspan="5">
116110
<p class="scPoints" ng-if="CD.challenge.numberOfCheckpointsPrizes > 0"><span ng-bind="CD.challenge.numberOfCheckpointsPrizes"></span> CHECKPOINT AWARDS WORTH <span ng-bind-template="${{CD.challenge.topCheckPointPrize}}"></span>
117111
EACH</p>
118112
<p class="scPoints" ng-if="CD.challenge.numberOfCheckpointsPrizes == 0">NO CHECKPOINT AWARDS</p>
@@ -223,7 +217,7 @@ <h3><small>$</small><span ng-bind="CD.challenge.prize[j]"></span></h3>
223217
</td>
224218
</tr>
225219
<tr>
226-
<td ng-if="!CD.isDesign" colspan="{{CD.challenge.challengeType == 'Code' ? '2' : ''}}">
220+
<td ng-if="!CD.isDesign" colspan="5">
227221
<p class="realibilityPara">
228222
Reliability Bonus
229223
<span ng-if="CD.reliabilityBonus && CD.reliabilityBonus.length > 0">
@@ -234,14 +228,8 @@ <h3><small>$</small><span ng-bind="CD.challenge.prize[j]"></span></h3>
234228
</span>
235229
</p>
236230
</td>
237-
<td ng-if="!CD.isDesign" colspan="{{CD.challenge.challengeType == 'Code' ? '3' : ''}}">
238-
<p class="drPointsPara">DR Points <span ng-bind="CD.challenge.digitalRunPoints ? CD.challenge.digitalRunPoints : 'N/A'"></span></p>
239-
</td>
240-
</td>
241-
<td ng-if="CD.isDesign" colspan="2">
242-
<p class="scPoints"><span ng-bind="CD.challenge.digitalRunPoints ? CD.challenge.digitalRunPoints : 'NO'"></span> STUDIO CUP POINTS</p>
243231
</td>
244-
<td ng-if="CD.isDesign" colspan="3">
232+
<td ng-if="CD.isDesign" colspan="5">
245233
<p class="scPoints"><span ng-bind="CD.challenge.numberOfCheckpointsPrizes"></span> CHECKPOINT AWARDS WORTH $<span ng-bind="CD.challenge.topCheckPointPrize"></span>
246234
EACH</p>
247235
</td>

‎src/js/app/challenges/jsx/build/challenge-grid-view.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
return (
115115
React.createElement("div", {className: "contest "+ trackTag +" trackSD type-" + challenge.challengeCommunity, key: challenge.challengeId},
116116
React.createElement("div", {className: "cgCh"},
117-
React.createElement("a", {href: challenge.challengeCommunity != 'data' ? "/challenge-details/" +challenge.challengeId+"/?type="+challenge.challengeCommunity : tcconfig.communityURL + '/longcontest/?module=ViewProblemStatement&rd=' + challenge.roundId + '&pm=' + challenge.problemId, className: "contestName"},
117+
React.createElement("a", {href: challenge.challengeCommunity != 'data' ? "/challenge-details/" +challenge.challengeId+"/?type="+challenge.challengeCommunity : tcconfig.communityURL + '/tc?module=MatchDetails&rd=' + challenge.roundId, className: "contestName"},
118118
React.createElement("img", {alt: "", className: "allContestIco", src: images + '/ico-track-' + challenge.challengeCommunity + '.png'}),
119119
React.createElement("span", {className: "gridChallengName"}, challenge.challengeName),
120120
React.createElement("img", {alt: "", className: challenge.challengeCommunity != 'data' ? "allContestTCOIco" : "allContestTCOIco ng-hide", src: images + '/tco-flag-' + challenge.challengeCommunity + '.png'}),

‎src/js/app/challenges/jsx/src/challenge-grid-view.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
return (
115115
<div className={"contest "+ trackTag +" trackSD type-" + challenge.challengeCommunity} key={challenge.challengeId}>
116116
<div className="cgCh">
117-
<a href={challenge.challengeCommunity != 'data' ? "/challenge-details/" +challenge.challengeId+"/?type="+challenge.challengeCommunity : tcconfig.communityURL + '/longcontest/?module=ViewProblemStatement&rd=' + challenge.roundId + '&pm=' + challenge.problemId} className="contestName">
117+
<a href={challenge.challengeCommunity != 'data' ? "/challenge-details/" +challenge.challengeId+"/?type="+challenge.challengeCommunity : tcconfig.communityURL + '/tc?module=MatchDetails&rd=' + challenge.roundId} className="contestName">
118118
<img alt="" className="allContestIco" src={images + '/ico-track-' + challenge.challengeCommunity + '.png'} />
119119
<span className="gridChallengName">{challenge.challengeName}</span>
120120
<img alt="" className={challenge.challengeCommunity != 'data' ? "allContestTCOIco" : "allContestTCOIco ng-hide"} src={images + '/tco-flag-' + challenge.challengeCommunity + '.png'} />

‎src/js/script-challenges.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ appChallenges = {
823823
* generate table row for design past contest type
824824
*/
825825
if (typeof rec.numberOfRegistrants !== "undefined") {
826-
$('.contestName', row).html('<img alt="" class="allContestIco" src="' + stylesheet_dir + '/i/ico-track-data.png" />' + '<a href="' + tcconfig.communityURL + '/longcontest/?module=ViewProblemStatement&rd=' + rec.roundId + '&pm=' + rec.problemId + '">' + rec.fullName + '</a>');
826+
$('.contestName', row).html('<img alt="" class="allContestIco" src="' + stylesheet_dir + '/i/ico-track-data.png" />' + '<a href="' + tcconfig.communityURL + '/tc?module=MatchDetails&rd=' + rec.roundId + '">' + rec.fullName + '</a>');
827827
$('.colType', row).html("Marathon");
828828
$('.vStartDate', row).html(app.formatDate2(rec.startDate));
829829
$('.vEndDate', row).html(app.formatDate2(rec.endDate));
@@ -832,7 +832,7 @@ appChallenges = {
832832
$('.colSub', row).html(rec.numberOfSubmissions);
833833
} else {
834834
//$('.contestName', row).html(rec.fullName);
835-
$('.contestName', row).html('<img alt="" class="allContestIco" src="' + stylesheet_dir + '/i/ico-track-data.png" />' + '<a href="' + tcconfig.communityURL + '/longcontest/?module=ViewProblemStatement&rd=' + rec.roundId + '&pm=' + rec.problemId + '">' + rec.fullName + '</a>');
835+
$('.contestName', row).html('<img alt="" class="allContestIco" src="' + stylesheet_dir + '/i/ico-track-data.png" />' + '<a href="' + tcconfig.communityURL + '/tc?module=MatchDetails&rd=' + rec.roundId + '">' + rec.fullName + '</a>');
836836
$('.colType', row).html("Marathon");
837837
$('.vStartDate', row).html(app.formatDate2(rec.startDate));
838838
$('.vEndDate', row).html(app.formatDate2(rec.endDate));

‎wp/wp-content/themes/tcs-responsive/ng-page-challenges.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ class="ngHeaderCell" ng-header-cell>
480480
</div>
481481
<div class="colCh" ng-if="row.getProperty('challengeCommunity') === 'data'">
482482
<div>
483-
<a ng-href="//community.topcoder.com/longcontest/?module=ViewProblemStatement&rd={{row.getProperty('roundId')}}&pm={{row.getProperty('problemId')}}" class="contestName">
483+
<a ng-href="//community.topcoder.com/tc?module=MatchDetails&rd={{row.getProperty('roundId')}}" class="contestName">
484484
<img alt="allContestIco" class="allContestIco" ng-src="{{images}}/ico-track-{{row.getProperty('challengeCommunity')}}.png">
485485
<span ng-cell-text>{{row.getProperty('fullName')}}</span>
486486
<img alt="allContestTCOIco" class="allContestTCOIco" ng-src="{{images}}/tco-flag-{{row.getProperty('challengeCommunity') != 'data'?row.getProperty('challengeCommunity'):'develop'}}.png" ng-show="contest.contestType != 'data'">

0 commit comments

Comments
 (0)