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

Add technology and platform to Marathon Match #499

Merged
merged 1 commit into from
Sep 6, 2019
Merged

Add technology and platform to Marathon Match #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 36 additions & 1 deletion src/web/WEB-INF/includes/contest/editTabMarathon.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,28 @@
</span>
</div>
</p>
<div class="bottom_spec"></div>
<div class="bottom_spec"></div>

<div class="platform">
<p class="det_font">
<span class="name"><strong>Current Project Platforms</strong></span>
<br /><br />
<span class="small_info_spec" id="rPlatforms"></span>
</p>

<div class="bottom_spec"></div>
</div> <!-- End of .platform -->

<div class="technology">
<p class="det_font">
<span class="name"><strong>Current Project Technologies</strong></span>
<br /><br />
<span class="small_info_spec" id="rTechnologies"></span>
</p>

<div class="bottom_spec"></div>
</div> <!-- End of .technology -->

<%--
<p class="det_font">
<span class="name"><strong>Environment </strong></span>
Expand Down Expand Up @@ -706,6 +727,20 @@

</div>
<!-- end .guidelines -->

<div class="prizes platform" id="swPlatformDiv">
<h3>Choose Your Platform:</h3>
<div class="techPlatformDiv">
<div id="platforms"></div>
</div>
</div>

<div class="prizes technology" id="swTechnologyDiv">
<h3>Choose Your Technology:</h3>
<div class="techPlatformDiv">
<div id="technologies"></div>
</div>
</div>
<%--
<div class="envRepo">
<h3>Environment</h3>
Expand Down
4 changes: 2 additions & 2 deletions src/web/WEB-INF/includes/contest/editTabSoftware.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,7 +891,7 @@
<span class="name"><strong>Current Project Platforms</strong></span>

<br /><br />
<span class="small_info_spec" id="rswPlatforms">
<span class="small_info_spec" id="rPlatforms">
</span>
</p>

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

<br /><br />
<span class="small_info_spec" id="rswTechnologies">
<span class="small_info_spec" id="rTechnologies">
</span>
</p>

Expand Down
95 changes: 56 additions & 39 deletions src/web/WEB-INF/includes/launch/overviewAlgorithm.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<%--
- Author: bugbuka, GreatKevin, TCSCODER
- Version: 1.6
- Copyright (C) 2013 - 2018 TopCoder Inc., All Rights Reserved.
-
- Description: This page fragment renders edit algorithm contest page.
- Version: 1.6
- Copyright (C) 2013 - 2018 TopCoder Inc., All Rights Reserved.
-
- Description: This page fragment renders edit algorithm contest page.
-
- Version 1.2 (Module Assembly - TC Cockpit Launch Code Contest)
- - Add a specific CSS class for algorithm contest prize add and remove
Expand All @@ -15,9 +15,9 @@
- Add support for custom copilot fee
- Version 1.5 (Topcoder - Add Basic Marathon Match Creation And Update In Direct App):
- - Remove MM problem selection
-
- Version 1.6 (Topcoder - Support Points Prize Type For Challenges):
- - Add "Challenge Points" section.
-
- Version 1.6 (Topcoder - Support Points Prize Type For Challenges):
- - Add "Challenge Points" section.
--%>
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>

Expand All @@ -40,6 +40,23 @@
</div>
</div>
<!-- end Match Rules -->

<!-- Platform -->
<div class="prizes" id="alPlatformDiv">
<h3>Choose Your Platform:</h3>
<div class="techPlatformDiv">
<div id="alPlatforms"></div>
</div>
</div>

<!-- Technology -->
<div class="prizes" id="alTechnologyDiv">
<h3>Choose Your Technology:</h3>
<div class="techPlatformDiv">
<div id="alTechnologies"></div>
</div>
</div>

<%--
<!-- Environment -->
<div class="prizes">
Expand Down Expand Up @@ -104,38 +121,38 @@
<label>Copilot Fee:</label> <span class="dw">$</span> <input type="text" class="copilotFee algorithm" value="0" disabled="true"/>
</div>

<!-- points -->
<div id="alPoints" class="points">

<h3>Challenge Points:</h3>

<div class="prizesInner">
<label class="first">1st Place</label>
<span class="dw">Pt.</span>
<input type="text" id="alPoint1" class="pointsInput" value="" />
<label class="second">2nd Place</label>
<span class="dw">Pt.</span>
<input type="text" id="alPoint2" class="pointsInput" value="" />
<label class="third">3rd Place</label>
<span class="dw">Pt.</span>
<input type="text" id="alPoint3" class="pointsInput" value="" />
<a href="javascript:;" class="addButton addPoint"><span class="hide">ADD</span></a>
</div>

<div id="alExtraPoints" class="prizesInner extraPoints hide">
<label class="first">4th Place</label>
<span class="dw">Pt.</span>
<input type="text" id="alPoint4" class="pointsInput" value="" />
<label class="second">5th Place</label>
<span class="dw">Pt.</span>
<input type="text" id="alPoint5" class="pointsInput" value="" />
<label class="third">&nbsp;</label>
<span class="dw">&nbsp;</span>
<a href="javascript:;" class="removeButton removePoint"><span class="hide">REMOVE</span></a>
</div>
</div>
<!-- end .points -->

<!-- points -->
<div id="alPoints" class="points">
<h3>Challenge Points:</h3>
<div class="prizesInner">
<label class="first">1st Place</label>
<span class="dw">Pt.</span>
<input type="text" id="alPoint1" class="pointsInput" value="" />
<label class="second">2nd Place</label>
<span class="dw">Pt.</span>
<input type="text" id="alPoint2" class="pointsInput" value="" />
<label class="third">3rd Place</label>
<span class="dw">Pt.</span>
<input type="text" id="alPoint3" class="pointsInput" value="" />
<a href="javascript:;" class="addButton addPoint"><span class="hide">ADD</span></a>
</div>
<div id="alExtraPoints" class="prizesInner extraPoints hide">
<label class="first">4th Place</label>
<span class="dw">Pt.</span>
<input type="text" id="alPoint4" class="pointsInput" value="" />
<label class="second">5th Place</label>
<span class="dw">Pt.</span>
<input type="text" id="alPoint5" class="pointsInput" value="" />
<label class="third">&nbsp;</label>
<span class="dw">&nbsp;</span>
<a href="javascript:;" class="removeButton removePoint"><span class="hide">REMOVE</span></a>
</div>
</div>
<!-- end .points -->
<div class="buttonBox">
<a href="javascript:continueOverview();" class="button6 contiune"><span class="left"><span class="right">CONTINUE</span></span></a>
<a href="javascript:saveAsDraftOverview();" class="button6 newButtonGreen draft"><span class="left"><span class="right">SAVE AS DRAFT</span></span></a>
Expand Down
82 changes: 41 additions & 41 deletions src/web/WEB-INF/includes/launch/overviewSoftware.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<%--
- Author: isv, Ghost_141, GreatKevin, TCSCODER
- Version: 1.12
- Copyright (C) 2010 - 2018 TopCoder Inc., All Rights Reserved.
- Version: 1.12
- Copyright (C) 2010 - 2018 TopCoder Inc., All Rights Reserved.
-
- Description: This page fragment renders edit softeware contest page.
-
Expand Down Expand Up @@ -38,9 +38,9 @@
-
- Version 1.11 (TOPCODER - SUPPORT CUSTOM COPILOT FEE FOR CHALLENGE IN DIRECT APP):
- Add support for custom copilot fee
-
- Version 1.12 (Topcoder - Support Points Prize Type For Challenges):
- - Add "Challenge Points" section.
-
- Version 1.12 (Topcoder - Support Points Prize Type For Challenges):
- - Add "Challenge Points" section.
--%>
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>

Expand Down Expand Up @@ -71,14 +71,14 @@
<div class="prizes" id="swPlatformDiv">
<h3>Choose Your Platform:</h3>
<div class="techPlatformDiv">
<div id="platforms"></div>
<div id="swPlatforms"></div>
</div>
</div>

<div class="prizes" id="swTechnologyDiv">
<div class="prizes" id="swTechnologyDiv">
<h3>Choose Your Technology:</h3>
<div class="techPlatformDiv">
<div id="technologies"></div>
<div id="swTechnologies"></div>
</div>
</div>

Expand Down Expand Up @@ -259,39 +259,39 @@
</div>
</div>
<!-- end .prizes -->

<div class="clear"></div>
<!-- points -->
<div id="swPoints" class="points">

<h3>Challenge Points:</h3>

<div class="prizesInner">
<label class="first">1st Place</label>
<span class="dw">Pt.</span>
<input type="text" id="swPoint1" class="pointsInput" value="" />
<label class="second">2nd Place</label>
<span class="dw">Pt.</span>
<input type="text" id="swPoint2" class="pointsInput" value="" />
<a href="javascript:;" class="addButton addPoint"><span class="hide">ADD</span></a>
</div>

<div id="swExtraPoints" class="prizesInner extraPoints hide">
<label class="first">3rd Place</label>
<span class="dw">Pt.</span>
<input type="text" id="swPoint3" class="pointsInput" value="" />
<label class="first">4th Place</label>
<span class="dw">Pt.</span>
<input type="text" id="swPoint4" class="pointsInput" value="" />
<label class="first">5th Place</label>
<span class="dw">Pt.</span>
<input type="text" id="swPoint5" class="pointsInput" value="" />
<label class="third">&nbsp;</label>
<span class="dw">&nbsp;</span>
<a href="javascript:;" class="removeButton removePoint"><span class="hide">REMOVE</span></a>
</div>
</div>
<!-- end .points -->
<div class="clear"></div>
<!-- points -->
<div id="swPoints" class="points">
<h3>Challenge Points:</h3>
<div class="prizesInner">
<label class="first">1st Place</label>
<span class="dw">Pt.</span>
<input type="text" id="swPoint1" class="pointsInput" value="" />
<label class="second">2nd Place</label>
<span class="dw">Pt.</span>
<input type="text" id="swPoint2" class="pointsInput" value="" />
<a href="javascript:;" class="addButton addPoint"><span class="hide">ADD</span></a>
</div>
<div id="swExtraPoints" class="prizesInner extraPoints hide">
<label class="first">3rd Place</label>
<span class="dw">Pt.</span>
<input type="text" id="swPoint3" class="pointsInput" value="" />
<label class="first">4th Place</label>
<span class="dw">Pt.</span>
<input type="text" id="swPoint4" class="pointsInput" value="" />
<label class="first">5th Place</label>
<span class="dw">Pt.</span>
<input type="text" id="swPoint5" class="pointsInput" value="" />
<label class="third">&nbsp;</label>
<span class="dw">&nbsp;</span>
<a href="javascript:;" class="removeButton removePoint"><span class="hide">REMOVE</span></a>
</div>
</div>
<!-- end .points -->
<div class="clear"></div>
<div class="buttonBox">
<a href="javascript:continueOverview();" class="button6 contiune"><span class="left"><span class="right">CONTINUE</span></span></a>
Expand Down
7 changes: 7 additions & 0 deletions src/web/WEB-INF/includes/launch/reviewAlgorithm.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,13 @@

<dt>Match Rules :</dt>
<dd><span id="ralMatchRules"></span><a href="javascript: showPage('overviewAlgorithmPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>

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

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

<%--
<dt>Environment :</dt>
<dd class="rEnvironment"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
Expand Down
4 changes: 2 additions & 2 deletions src/web/WEB-INF/includes/launch/reviewSoftware.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@
<dd><span id="rswSoftwareGuidelines"></span><a href="javascript: showPage('overviewSoftwarePage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>

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

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

<dt>Environment :</dt>
<dd class="rEnvironment"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
Expand Down
4 changes: 2 additions & 2 deletions src/web/css/direct/launchcontest.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3194,14 +3194,14 @@ div#winnerDiv {
padding: 10px;
}

.rGroups td span, #rTechnologies span, #rPlatforms span {
.rGroups td span, .rTechnologies span, .rPlatforms span {
border: #e7e7e7 solid 1px;
border-radius: 5px;
padding: 2px 5px 2px 5px;
margin-right: 5px;
}

#rTechnologies, #rPlatforms{
.rTechnologies, .rPlatforms{
padding-top: 7px;
}

Expand Down
4 changes: 2 additions & 2 deletions src/web/scripts/launch/contestDetailSoftware.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2943,7 +2943,7 @@ function populateSpecSection(initFlag) {
selectedTechName.push(technologyMap[val]);
});

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

$('#rswPlatforms').html(selectedPlatformName.join("<br/>"));
$('#rPlatforms').html(selectedPlatformName.join("<br/>"));
technologyAndPlatformSelectsChanged();
}

Expand Down
Loading