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

Commit 745e81e

Browse files
author
Dushyant Bhalgami
authored
Merge pull request #504 from appirio-tech/hot-fix-submission-platform
Hot fix submission platform
2 parents 11db055 + a21bb4c commit 745e81e

File tree

12 files changed

+349
-181
lines changed

12 files changed

+349
-181
lines changed

‎components/project_management/src/java/main/com/topcoder/management/project/ProjectPropertyType.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,12 @@ public class ProjectPropertyType implements Serializable {
106106
* @since 1.2.1
107107
*/
108108
public static final String VIEWABLE_SUBMISSIONS_FLAG_KEY_STRING = "Viewable Submissions Flag";
109+
110+
/**
111+
* Represent "Viewable Submissions Flag Id" property type
112+
* @since 1.2.8
113+
*/
114+
public static final Long VIEWABLE_SUBMISSIONS_FLAG_ID = 53L;
109115

110116
/**
111117
* Represents key for Viewable Submitters property.

‎components/project_management/src/java/main/com/topcoder/management/project/persistence/AbstractInformixProjectPersistence.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10302,6 +10302,9 @@ public void createOrUpdateMarathonMatch(Project project, Date startDate, Date re
1030210302
Map<Long, String> newProps = new HashMap<Long,String>();
1030310303
newProps.put(ProjectPropertyType.MM_MATCH_ID, String.valueOf(mmRound.getId()));
1030410304
newProps.put(ProjectPropertyType.MM_CONTEST_ID, String.valueOf(mmRound.getContest().getId()));
10305+
10306+
// defaulting this to flase; and submissions should not be able to download by other members
10307+
newProps.put(ProjectPropertyType.VIEWABLE_SUBMISSIONS_FLAG_ID, "false");
1030510308

1030610309
createProjectProperties(project.getId(), project, newProps, operator, conn);
1030710310

‎src/web/WEB-INF/includes/contest/editTabMarathon.jsp‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,28 @@
655655
</span>
656656
</div>
657657
</p>
658-
<div class="bottom_spec"></div>
658+
<div class="bottom_spec"></div>
659+
660+
<div class="platform">
661+
<p class="det_font">
662+
<span class="name"><strong>Current Project Platforms</strong></span>
663+
<br /><br />
664+
<span class="small_info_spec" id="rPlatforms"></span>
665+
</p>
666+
667+
<div class="bottom_spec"></div>
668+
</div> <!-- End of .platform -->
669+
670+
<div class="technology">
671+
<p class="det_font">
672+
<span class="name"><strong>Current Project Technologies</strong></span>
673+
<br /><br />
674+
<span class="small_info_spec" id="rTechnologies"></span>
675+
</p>
676+
677+
<div class="bottom_spec"></div>
678+
</div> <!-- End of .technology -->
679+
659680
<%--
660681
<p class="det_font">
661682
<span class="name"><strong>Environment </strong></span>
@@ -706,6 +727,20 @@
706727

707728
</div>
708729
<!-- end .guidelines -->
730+
731+
<div class="prizes platform" id="swPlatformDiv">
732+
<h3>Choose Your Platform:</h3>
733+
<div class="techPlatformDiv">
734+
<div id="platforms"></div>
735+
</div>
736+
</div>
737+
738+
<div class="prizes technology" id="swTechnologyDiv">
739+
<h3>Choose Your Technology:</h3>
740+
<div class="techPlatformDiv">
741+
<div id="technologies"></div>
742+
</div>
743+
</div>
709744
<%--
710745
<div class="envRepo">
711746
<h3>Environment</h3>

‎src/web/WEB-INF/includes/contest/editTabSoftware.jsp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,7 @@
891891
<span class="name"><strong>Current Project Platforms</strong></span>
892892

893893
<br /><br />
894-
<span class="small_info_spec" id="rswPlatforms">
894+
<span class="small_info_spec" id="rPlatforms">
895895
</span>
896896
</p>
897897

@@ -904,7 +904,7 @@
904904
<span class="name"><strong>Current Project Technologies</strong></span>
905905

906906
<br /><br />
907-
<span class="small_info_spec" id="rswTechnologies">
907+
<span class="small_info_spec" id="rTechnologies">
908908
</span>
909909
</p>
910910

‎src/web/WEB-INF/includes/launch/overviewAlgorithm.jsp‎

Lines changed: 56 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<%--
22
- Author: bugbuka, GreatKevin, TCSCODER
3-
- Version: 1.6
4-
- Copyright (C) 2013 - 2018 TopCoder Inc., All Rights Reserved.
5-
-
6-
- Description: This page fragment renders edit algorithm contest page.
3+
- Version: 1.6
4+
- Copyright (C) 2013 - 2018 TopCoder Inc., All Rights Reserved.
5+
-
6+
- Description: This page fragment renders edit algorithm contest page.
77
-
88
- Version 1.2 (Module Assembly - TC Cockpit Launch Code Contest)
99
- - Add a specific CSS class for algorithm contest prize add and remove
@@ -15,9 +15,9 @@
1515
- Add support for custom copilot fee
1616
- Version 1.5 (Topcoder - Add Basic Marathon Match Creation And Update In Direct App):
1717
- - Remove MM problem selection
18-
-
19-
- Version 1.6 (Topcoder - Support Points Prize Type For Challenges):
20-
- - Add "Challenge Points" section.
18+
-
19+
- Version 1.6 (Topcoder - Support Points Prize Type For Challenges):
20+
- - Add "Challenge Points" section.
2121
--%>
2222
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
2323

@@ -40,6 +40,23 @@
4040
</div>
4141
</div>
4242
<!-- end Match Rules -->
43+
44+
<!-- Platform -->
45+
<div class="prizes" id="alPlatformDiv">
46+
<h3>Choose Your Platform:</h3>
47+
<div class="techPlatformDiv">
48+
<div id="alPlatforms"></div>
49+
</div>
50+
</div>
51+
52+
<!-- Technology -->
53+
<div class="prizes" id="alTechnologyDiv">
54+
<h3>Choose Your Technology:</h3>
55+
<div class="techPlatformDiv">
56+
<div id="alTechnologies"></div>
57+
</div>
58+
</div>
59+
4360
<%--
4461
<!-- Environment -->
4562
<div class="prizes">
@@ -104,38 +121,38 @@
104121
<label>Copilot Fee:</label> <span class="dw">$</span> <input type="text" class="copilotFee algorithm" value="0" disabled="true"/>
105122
</div>
106123

107-
<!-- points -->
108-
<div id="alPoints" class="points">
109-
110-
<h3>Challenge Points:</h3>
111-
112-
<div class="prizesInner">
113-
<label class="first">1st Place</label>
114-
<span class="dw">Pt.</span>
115-
<input type="text" id="alPoint1" class="pointsInput" value="" />
116-
<label class="second">2nd Place</label>
117-
<span class="dw">Pt.</span>
118-
<input type="text" id="alPoint2" class="pointsInput" value="" />
119-
<label class="third">3rd Place</label>
120-
<span class="dw">Pt.</span>
121-
<input type="text" id="alPoint3" class="pointsInput" value="" />
122-
<a href="javascript:;" class="addButton addPoint"><span class="hide">ADD</span></a>
123-
</div>
124-
125-
<div id="alExtraPoints" class="prizesInner extraPoints hide">
126-
<label class="first">4th Place</label>
127-
<span class="dw">Pt.</span>
128-
<input type="text" id="alPoint4" class="pointsInput" value="" />
129-
<label class="second">5th Place</label>
130-
<span class="dw">Pt.</span>
131-
<input type="text" id="alPoint5" class="pointsInput" value="" />
132-
<label class="third">&nbsp;</label>
133-
<span class="dw">&nbsp;</span>
134-
<a href="javascript:;" class="removeButton removePoint"><span class="hide">REMOVE</span></a>
135-
</div>
136-
</div>
137-
<!-- end .points -->
138-
124+
<!-- points -->
125+
<div id="alPoints" class="points">
126+
127+
<h3>Challenge Points:</h3>
128+
129+
<div class="prizesInner">
130+
<label class="first">1st Place</label>
131+
<span class="dw">Pt.</span>
132+
<input type="text" id="alPoint1" class="pointsInput" value="" />
133+
<label class="second">2nd Place</label>
134+
<span class="dw">Pt.</span>
135+
<input type="text" id="alPoint2" class="pointsInput" value="" />
136+
<label class="third">3rd Place</label>
137+
<span class="dw">Pt.</span>
138+
<input type="text" id="alPoint3" class="pointsInput" value="" />
139+
<a href="javascript:;" class="addButton addPoint"><span class="hide">ADD</span></a>
140+
</div>
141+
142+
<div id="alExtraPoints" class="prizesInner extraPoints hide">
143+
<label class="first">4th Place</label>
144+
<span class="dw">Pt.</span>
145+
<input type="text" id="alPoint4" class="pointsInput" value="" />
146+
<label class="second">5th Place</label>
147+
<span class="dw">Pt.</span>
148+
<input type="text" id="alPoint5" class="pointsInput" value="" />
149+
<label class="third">&nbsp;</label>
150+
<span class="dw">&nbsp;</span>
151+
<a href="javascript:;" class="removeButton removePoint"><span class="hide">REMOVE</span></a>
152+
</div>
153+
</div>
154+
<!-- end .points -->
155+
139156
<div class="buttonBox">
140157
<a href="javascript:continueOverview();" class="button6 contiune"><span class="left"><span class="right">CONTINUE</span></span></a>
141158
<a href="javascript:saveAsDraftOverview();" class="button6 newButtonGreen draft"><span class="left"><span class="right">SAVE AS DRAFT</span></span></a>

‎src/web/WEB-INF/includes/launch/overviewSoftware.jsp‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<%--
22
- Author: isv, Ghost_141, GreatKevin, TCSCODER
3-
- Version: 1.12
4-
- Copyright (C) 2010 - 2018 TopCoder Inc., All Rights Reserved.
3+
- Version: 1.12
4+
- Copyright (C) 2010 - 2018 TopCoder Inc., All Rights Reserved.
55
-
66
- Description: This page fragment renders edit softeware contest page.
77
-
@@ -38,9 +38,9 @@
3838
-
3939
- Version 1.11 (TOPCODER - SUPPORT CUSTOM COPILOT FEE FOR CHALLENGE IN DIRECT APP):
4040
- Add support for custom copilot fee
41-
-
42-
- Version 1.12 (Topcoder - Support Points Prize Type For Challenges):
43-
- - Add "Challenge Points" section.
41+
-
42+
- Version 1.12 (Topcoder - Support Points Prize Type For Challenges):
43+
- - Add "Challenge Points" section.
4444
--%>
4545
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
4646

@@ -71,14 +71,14 @@
7171
<div class="prizes" id="swPlatformDiv">
7272
<h3>Choose Your Platform:</h3>
7373
<div class="techPlatformDiv">
74-
<div id="platforms"></div>
74+
<div id="swPlatforms"></div>
7575
</div>
7676
</div>
7777

78-
<div class="prizes" id="swTechnologyDiv">
78+
<div class="prizes" id="swTechnologyDiv">
7979
<h3>Choose Your Technology:</h3>
8080
<div class="techPlatformDiv">
81-
<div id="technologies"></div>
81+
<div id="swTechnologies"></div>
8282
</div>
8383
</div>
8484

@@ -259,39 +259,39 @@
259259
</div>
260260
</div>
261261
<!-- end .prizes -->
262-
263-
<div class="clear"></div>
264-
<!-- points -->
265-
<div id="swPoints" class="points">
266-
267-
<h3>Challenge Points:</h3>
268-
269-
<div class="prizesInner">
270-
<label class="first">1st Place</label>
271-
<span class="dw">Pt.</span>
272-
<input type="text" id="swPoint1" class="pointsInput" value="" />
273-
<label class="second">2nd Place</label>
274-
<span class="dw">Pt.</span>
275-
<input type="text" id="swPoint2" class="pointsInput" value="" />
276-
<a href="javascript:;" class="addButton addPoint"><span class="hide">ADD</span></a>
277-
</div>
278-
279-
<div id="swExtraPoints" class="prizesInner extraPoints hide">
280-
<label class="first">3rd Place</label>
281-
<span class="dw">Pt.</span>
282-
<input type="text" id="swPoint3" class="pointsInput" value="" />
283-
<label class="first">4th Place</label>
284-
<span class="dw">Pt.</span>
285-
<input type="text" id="swPoint4" class="pointsInput" value="" />
286-
<label class="first">5th Place</label>
287-
<span class="dw">Pt.</span>
288-
<input type="text" id="swPoint5" class="pointsInput" value="" />
289-
<label class="third">&nbsp;</label>
290-
<span class="dw">&nbsp;</span>
291-
<a href="javascript:;" class="removeButton removePoint"><span class="hide">REMOVE</span></a>
292-
</div>
293-
</div>
294-
<!-- end .points -->
262+
263+
<div class="clear"></div>
264+
<!-- points -->
265+
<div id="swPoints" class="points">
266+
267+
<h3>Challenge Points:</h3>
268+
269+
<div class="prizesInner">
270+
<label class="first">1st Place</label>
271+
<span class="dw">Pt.</span>
272+
<input type="text" id="swPoint1" class="pointsInput" value="" />
273+
<label class="second">2nd Place</label>
274+
<span class="dw">Pt.</span>
275+
<input type="text" id="swPoint2" class="pointsInput" value="" />
276+
<a href="javascript:;" class="addButton addPoint"><span class="hide">ADD</span></a>
277+
</div>
278+
279+
<div id="swExtraPoints" class="prizesInner extraPoints hide">
280+
<label class="first">3rd Place</label>
281+
<span class="dw">Pt.</span>
282+
<input type="text" id="swPoint3" class="pointsInput" value="" />
283+
<label class="first">4th Place</label>
284+
<span class="dw">Pt.</span>
285+
<input type="text" id="swPoint4" class="pointsInput" value="" />
286+
<label class="first">5th Place</label>
287+
<span class="dw">Pt.</span>
288+
<input type="text" id="swPoint5" class="pointsInput" value="" />
289+
<label class="third">&nbsp;</label>
290+
<span class="dw">&nbsp;</span>
291+
<a href="javascript:;" class="removeButton removePoint"><span class="hide">REMOVE</span></a>
292+
</div>
293+
</div>
294+
<!-- end .points -->
295295
<div class="clear"></div>
296296
<div class="buttonBox">
297297
<a href="javascript:continueOverview();" class="button6 contiune"><span class="left"><span class="right">CONTINUE</span></span></a>

‎src/web/WEB-INF/includes/launch/reviewAlgorithm.jsp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,13 @@
8080

8181
<dt>Match Rules :</dt>
8282
<dd><span id="ralMatchRules"></span><a href="javascript: showPage('overviewAlgorithmPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
83+
84+
<dt>Platforms :</dt>
85+
<dd class="rPlatforms"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
86+
87+
<dt>Technologies :</dt>
88+
<dd class="rTechnologies"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
89+
8390
<%--
8491
<dt>Environment :</dt>
8592
<dd class="rEnvironment"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>

‎src/web/WEB-INF/includes/launch/reviewSoftware.jsp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@
9797
<dd><span id="rswSoftwareGuidelines"></span><a href="javascript: showPage('overviewSoftwarePage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
9898

9999
<dt>Platforms :</dt>
100-
<dd id="rPlatforms"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
100+
<dd class="rPlatforms"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
101101

102102
<dt>Technologies :</dt>
103-
<dd id="rTechnologies"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
103+
<dd class="rTechnologies"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
104104

105105
<dt>Environment :</dt>
106106
<dd class="rEnvironment"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>

‎src/web/css/direct/launchcontest.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3194,14 +3194,14 @@ div#winnerDiv {
31943194
padding: 10px;
31953195
}
31963196

3197-
.rGroups td span, #rTechnologies span, #rPlatforms span {
3197+
.rGroups td span, .rTechnologies span, .rPlatforms span {
31983198
border: #e7e7e7 solid 1px;
31993199
border-radius: 5px;
32003200
padding: 2px 5px 2px 5px;
32013201
margin-right: 5px;
32023202
}
32033203

3204-
#rTechnologies, #rPlatforms{
3204+
.rTechnologies, .rPlatforms{
32053205
padding-top: 7px;
32063206
}
32073207

‎src/web/scripts/launch/contestDetailSoftware.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2943,7 +2943,7 @@ function populateSpecSection(initFlag) {
29432943
selectedTechName.push(technologyMap[val]);
29442944
});
29452945

2946-
$('#rswTechnologies').html(selectedTechName.join("<br/>"));
2946+
$('#rTechnologies').html(selectedTechName.join("<br/>"));
29472947
technologyAndPlatformSelectsChanged();
29482948
}
29492949
if(isPlatformContest()) {
@@ -2959,7 +2959,7 @@ function populateSpecSection(initFlag) {
29592959
selectedPlatformName.push(platformMap[val]);
29602960
});
29612961

2962-
$('#rswPlatforms').html(selectedPlatformName.join("<br/>"));
2962+
$('#rPlatforms').html(selectedPlatformName.join("<br/>"));
29632963
technologyAndPlatformSelectsChanged();
29642964
}
29652965

0 commit comments

Comments
 (0)