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

allow multiple submissions for challenge type of Marathon Match #476

Merged
merged 8 commits into from
Mar 26, 2019
Merged

allow multiple submissions for challenge type of Marathon Match #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f9eed8c
Add Effort Estimates Offshore/Onsite fields
deedee Mar 20, 2019
667169d
allow multiple submissions for challenge type of Marathon Match
Mar 22, 2019
92e3fd8
Merge pull request #473 from appirio-tech/fix_mm_allow_multiple_subs
cwdcwd Mar 22, 2019
5059ad6
allow multiple submissions for challenge type of Marathon Match
Mar 22, 2019
089d0db
Merge pull request #474 from appirio-tech/fix_mm_allow_multiple_subs
cwdcwd Mar 22, 2019
6fcbce3
allow multiple submissions for challenge type of Marathon Match
Mar 22, 2019
8b9fbdc
Merge pull request #475 from appirio-tech/fix_mm_allow_multiple_subs
Mar 22, 2019
e860808
Merge pull request #472 from deedee/dev
ajefts Mar 25, 2019
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
26 changes: 23 additions & 3 deletions ...acade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,10 +922,18 @@
* <ul>
* <li>Add enable effort hours</li>
* </ul>
*
* Version 3.14 (Topcoder - Allow Multiple Subs for MM):
* <ul>
* <li>Added method {@link #isMMContest(com.topcoder.service.project.SoftwareCompetition)} to check if
* the contest is of type Marathon Match</li>
* <li>Updated method {@link #createUpdateAssetDTO(com.topcoder.security.TCSubject, com.topcoder.service.project.SoftwareCompetition)}
* to set project properties For Marathon Match to allow multiple submissions.</li>
* </ul>
*
* @author snow01, pulky, murphydog, waits, BeBetter, hohosky, isv, tangzx, GreatKevin, lmmortal, minhu, GreatKevin, tangzx
* @author snow01, pulky, murphydog, waits, BeBetter, hohosky, isv, tangzx, GreatKevin, lmmortal, minhu, GreatKevin, tangzx, dushyantb
* @author isv, GreatKevin, Veve, deedee, TCSCODER, TCSASSEMBLER
* @version 3.13
* @version 3.14
*/
@Stateless
@TransactionManagement(TransactionManagementType.CONTAINER)
Expand Down Expand Up @@ -3223,6 +3231,17 @@ private boolean isStudio(SoftwareCompetition contest) {
return contest.getProjectHeader().getProjectCategory().getProjectType().getId() == ProjectType.STUDIO.getId();
}

/**
* Checks if the contest is of type Marathon Match.
*
* @param contest the contest
* @return true if yes
* @since 3.14
*/
private boolean isMMContest(SoftwareCompetition contest) {
return contest.getProjectHeader().getProjectCategory().getId() == ProjectCategory.MARATHON_MATCH.getId();
}

/**
* <p>
* Creates a new <code>SoftwareCompetition</code> in the persistence.
Expand Down Expand Up @@ -3783,7 +3802,8 @@ else if (isDevContest)
if (contest.getProjectHeader().getProperty(ProjectPropertyType.DIGITAL_RRUN_FLAG_PROJECT_PROPERTY_KEY) == null)
{ contest.getProjectHeader().setProperty(ProjectPropertyType.DIGITAL_RRUN_FLAG_PROJECT_PROPERTY_KEY, "On"); }

if(isF2FContest(contest) || isDesignF2FContest(contest)) {
if(isF2FContest(contest) || isDesignF2FContest(contest) || isMMContest(contest)
) {
contest.getProjectHeader().setProperty(ProjectPropertyType.ALLOW_MULTIPLE_SUBMISSIONS_PROPERTY_KEY, "true");
}

Expand Down
18 changes: 14 additions & 4 deletions src/web/WEB-INF/includes/contest/editTab.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,13 @@
</tr>
<tr></tr>
<tr class="effortEstimateRow hide">
<td class="first_tab_type"><strong>Estimated Effort<br/>(in Person Days):</strong></td>
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimate"></span></strong></td>
<td class="first_tab_type"><strong>Estimated Efforts</strong><br/><small>Offshore (In Person Days)</small></td>
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimateOffshore"></span></strong></td>
</tr>
<tr></tr>
<tr class="effortEstimateRow hide">
<td class="first_tab_type"><strong>Estimated Efforts</strong><br/><small>Onsite (In Person Days)</small></td>
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimateOnsite"></span></strong></td>
</tr>
<tr></tr>
<tr>
Expand Down Expand Up @@ -342,8 +347,13 @@
</div>
<br/><br/>
<div class="effortEstimateRow">
<span class="name fixWidthName" title="Enter effort days estimate"><strong>Estimated Effort<br/>(in Person Days):&nbsp;</strong><a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></span>
<input id="effortDaysEstimate" class="bigin" name="effortDaysEstimate" type="text" value="" />
<span class="name fixWidthName"><strong>Estimated Efforts</strong><br/><small>Offshore (In Person Days)</small></span>
<input id="effortDaysEstimateOffshore" class="bigin" name="effortDaysEstimateOffshore" type="text" value="" />
</div>
<br/><br/>
<div class="effortEstimateRow">
<span class="name fixWidthName"><strong>Estimated Efforts</strong><br/><small>Onsite(In Person Days)</small></span>
<input id="effortDaysEstimateOnsite" class="bigin" name="effortDaysEstimateOnsite" type="text" value="" />
</div>
<br/><br/>
<span class="name fixWidthName"><strong>Created By</strong></span>
Expand Down
18 changes: 14 additions & 4 deletions 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 @@ -135,8 +135,13 @@
</tr>
<tr></tr>
<tr class="effortEstimateRow hide">
<td class="first_tab_type"><strong>Estimated Effort<br/>(in Person Days):</strong></td>
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimate"></span></strong></td>
<td class="first_tab_type"><strong>Estimated Efforts</strong><br/><small>Offshore (In Person Days)</small></td>
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimateOffshore"></span></strong></td>
</tr>
<tr></tr>
<tr class="effortEstimateRow hide">
<td class="first_tab_type"><strong>Estimated Efforts</strong><br/><small>Onsite (In Person Days)</small></td>
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimateOnsite"></span></strong></td>
</tr>
<tr></tr>
<tr>
Expand Down Expand Up @@ -295,8 +300,13 @@
</div>
<br /><br />
<div class="effortEstimateRow">
<span class="name fixWidthName" title="Enter effort days estimate"><strong>Estimated Effort<br/>(in Person Days):&nbsp;</strong><a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></span>
<input id="effortDaysEstimate" class="bigin" name="effortDaysEstimate" type="text" value="" />
<span class="name fixWidthName"><strong>Estimated Efforts</strong><br/><small>Offshore (In Person Days)</small></span>
<input id="effortDaysEstimateOffshore" class="bigin" name="effortDaysEstimateOffshore" type="text" value="" />
</div>
<br/><br/>
<div class="effortEstimateRow">
<span class="name fixWidthName"><strong>Estimated Efforts</strong><br/><small>Onsite(In Person Days)</small></span>
<input id="effortDaysEstimateOnsite" class="bigin" name="effortDaysEstimateOnsite" type="text" value="" />
</div>
<br/><br/>
<span class="name fixWidthName"><strong>Created By</strong></span>
Expand Down
19 changes: 14 additions & 5 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 @@ -185,8 +185,13 @@
</tr>
<tr></tr>
<tr class="effortEstimateRow hide">
<td class="first_tab_type"><strong>Estimated Effort<br/>(in Person Days):</strong></td>
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimate"></span></strong></td>
<td class="first_tab_type"><strong>Estimated Efforts</strong><br/><small>Offshore (In Person Days)</small></td>
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimateOffshore"></span></strong></td>
</tr>
<tr></tr>
<tr class="effortEstimateRow hide">
<td class="first_tab_type"><strong>Estimated Efforts</strong><br/><small>Onsite (In Person Days)</small></td>
<td class="sec_tab_type"><strong>: <span id="rEffortDaysEstimateOnsite"></span></strong></td>
</tr>
<tr></tr>
<tr>
Expand Down Expand Up @@ -369,13 +374,17 @@
<br/>

<div class="effortEstimateRow">
<span class="name fixWidthName" title="Enter effort days estimate"><strong>Estimated Effort<br/>(in Person Days):&nbsp;</strong><a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></span>
<input id="effortDaysEstimate" class="bigin" name="effortDaysEstimate" type="text" value="" />
<span class="name fixWidthName"><strong>Estimated Efforts</strong><br/><small>Offshore (In Person Days)</small></span>
<input id="effortDaysEstimateOffshore" class="bigin" name="effortDaysEstimateOffshore" type="text" value="" />
</div>
<br/><br/>
<div class="effortEstimateRow">
<span class="name fixWidthName"><strong>Estimated Efforts</strong><br/><small>Onsite(In Person Days)</small></span>
<input id="effortDaysEstimateOnsite" class="bigin" name="effortDaysEstimateOnsite" type="text" value="" />
<br/>
<br/>
<br/>
</div>

<div>
<span class="name fixWidthName"><strong>Created By</strong></span>
<span class ='small_info_spec' id="challegneCreatorLabel"></span>
Expand Down
11 changes: 10 additions & 1 deletion src/web/WEB-INF/includes/launch/contestSelection.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,18 @@
<div id="groups"></div>
</div>
</div>
<div class="ms-row effortEstimateRow">
<%-- <div class="ms-row effortEstimateRow">
<label>Estimated Effort<br/>(in Person Days):&nbsp;&nbsp;<a href="javascript:;" class="helpme"><img src="/images/help_ico5.gif" alt="help"/></a></label>
<input id="effortDaysEstimate" class="text" name="effortDaysEstimate" type="text"/>
</div> --%>

<div class="ms-row effortEstimateRow">
<label>Estimated Efforts: Offshore (In Person Days)</label>
<input id="effortDaysEstimateOffshore" class="text" name="effortDaysEstimateOffshore" type="text"/>
</div>
<div class="ms-row effortEstimateRow">
<label>Estimated Efforts: Onsite (In Person Days)</label>
<input id="effortDaysEstimateOnsite" class="text" name="effortDaysEstimateOnsite" type="text"/>
</div>
</div>
<!-- end .addNewContest -->
Expand Down
8 changes: 6 additions & 2 deletions src/web/WEB-INF/includes/launch/orderReview.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,13 @@
<td><span id="orStartDate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Days Estimate :</th>
<td><span id="orEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
<th>Effort Estimates :<div><small>Offshore (In Person Days)</small></div></th>
<td><span id="orEffortDaysEstimateOffshore"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Estimates :<div><small>Onsite (In Person Days)</small></div></th>
<td><span id="orEffortDaysEstimateOnsite"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
</table>
</div>
<!-- end .overviewBox -->
Expand Down
8 changes: 6 additions & 2 deletions src/web/WEB-INF/includes/launch/orderReviewAlgorithm.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,13 @@
<td><span id="alorStartDate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Days Estimate :</th>
<td><span id="alorEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
<th>Effort Estimates :<div><small>Offshore (In Person Days)</small></div></th>
<td><span id="alorEffortDaysEstimateOffshore"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Estimates :<div><small>Onsite (In Person Days)</small></div></th>
<td><span id="alorEffortDaysEstimateOnsite"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
</table>
</div>
<!-- end .overviewBox -->
Expand Down
8 changes: 6 additions & 2 deletions src/web/WEB-INF/includes/launch/orderReviewSoftware.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,13 @@
<td><span id="sworStartDate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Days Estimate :</th>
<td><span id="sworEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
<th>Effort Estimates :<div><small>Offshore (In Person Days)</small></div></th>
<td><span id="sworEffortDaysEstimateOffshore"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Estimates :<div><small>Onsite (In Person Days)</small></div></th>
<td><span id="sworEffortDaysEstimateOnsite"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
</table>
</div>
<!-- end .overviewBox -->
Expand Down
10 changes: 8 additions & 2 deletions src/web/WEB-INF/includes/launch/review.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,14 @@
<td><a href="javascript:backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Days Estimate :</th>
<td><span id="rEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
<th>Effort Estimates :<div><small>Offshore (In Person Days)</small></div></th>
<td><span id="rEffortDaysEstimateOffshore"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
<img src="/images/edit-icon.png" alt="Edit"/></a>
</td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Estimates :<div><small>Onsite (In Person Days)</small></div></th>
<td><span id="rEffortDaysEstimateOnsite"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
<img src="/images/edit-icon.png" alt="Edit"/></a>
</td>
</tr>
Expand Down
16 changes: 12 additions & 4 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 @@ -53,10 +53,18 @@
<th>Group(s) :</th>
<td><a href="javascript:backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Days Estimate :</th>
<td><span id="ralEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Estimates :<div><small>Offshore (In Person Days)</small></div></th>
<td><span id="ralEffortDaysEstimateOffshore"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
<img src="/images/edit-icon.png" alt="Edit"/></a>
</td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Estimates :<div><small>Onsite (In Person Days)</small></div></th>
<td><span id="ralEffortDaysEstimateOnsite"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
<img src="/images/edit-icon.png" alt="Edit"/></a>
</td>
</tr>
</table>
</div>
<!-- End .overviewBox -->
Expand Down
16 changes: 12 additions & 4 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 @@ -71,10 +71,18 @@
<th>Group(s) :</th>
<td><a href="javascript:backOverview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Days Estimate :</th>
<td><span id="rswEffortDaysEstimate"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Estimates :<div><small>Offshore (In Person Days)</small></div></th>
<td><span id="rswEffortDaysEstimateOffshore"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
<img src="/images/edit-icon.png" alt="Edit"/></a>
</td>
</tr>
<tr class="effortEstimateRow">
<th>Effort Estimates :<div><small>Onsite (In Person Days)</small></div></th>
<td><span id="rswEffortDaysEstimateOnsite"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink">
<img src="/images/edit-icon.png" alt="Edit"/></a>
</td>
</tr>
</table>
</div>
<!-- End .overviewBox -->
Expand Down
27 changes: 18 additions & 9 deletions src/web/css/direct/launchcontest.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,13 +303,17 @@

/** label **/
#launchContestOut .addNewContest label {
width: 125px;
float: left;
display: inline;
margin-left: 14px;
font-family: "Source Sans Pro", Arial, Helvetica, sans-serif;
font-size: 14px;
line-height: 24px;
width: 125px;
float: left;
display: inline;
margin-left: 14px;
font-family: "Source Sans Pro", Arial, Helvetica, sans-serif;
font-size: 14px;
line-height: 24px;
}

#launchContestOut .addNewContest .effortEstimateRow label {
width: 270px;
}

#launchContestOut.launchCopilotContest .addNewContest label {
Expand All @@ -331,6 +335,10 @@
font-size: 12px;
}

#launchContestOut .addNewContest .effortEstimateRow .text {
width: 50px;
}

#launchContestOut.launchCopilotContest .addNewContest .text {
background: none;
width: 370px;
Expand Down Expand Up @@ -3256,8 +3264,9 @@ div.ms-group-display .ms-group-div{
margin-top: 17px;
}

.effortEstimateRow {
height: 50px;
.effortEstimateRow th {
line-height: 15px;
padding: 7px 0 7px 0;
}

.dropdown-menu {
Expand Down
25 changes: 12 additions & 13 deletions src/web/scripts/launch/contestDetailSoftware.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,11 +608,6 @@ $(document).ready(function(){
}
}
});
$('.effortEstimateRow .helpme').hover(function() {
showPopup(this, 'effortDaysToolTip');
}, function() {
$('#effortDaysToolTip').hide();
});
});

var ACTIVE_PROJECT_STATUS = 1;
Expand Down Expand Up @@ -890,7 +885,8 @@ function initContest(contestJson) {
mainWidget.softwareCompetition.regEndDate = parseDate(contestJson.regEndDate);

$('#contestTypeNameText').text(getProjectCategoryById(mainWidget.softwareCompetition.projectHeader.projectCategory.id).name);
mainWidget.softwareCompetition.projectHeader.properties['Effort Hours Estimate'] = contestJson.properties['Effort Hours Estimate'];
mainWidget.softwareCompetition.projectHeader.properties[ESTIMATE_EFFORT_OFFSHORE] = contestJson.properties[ESTIMATE_EFFORT_OFFSHORE];
mainWidget.softwareCompetition.projectHeader.properties[ESTIMATE_EFFORT_ONSITE] = contestJson.properties[ESTIMATE_EFFORT_ONSITE];

// copilots
var copilots = contestJson.copilots; // get copilots data from result
Expand Down Expand Up @@ -1437,14 +1433,17 @@ function populateTypeSection() {
$(".matchRoundId").show();
}

// change to days
var effortDaysEstimate = parseFloat(p['Effort Hours Estimate']) / 24;
if (!isNaN(effortDaysEstimate) && effortDaysEstimate > 0 ) {
$('#rEffortDaysEstimate').text(parseFloat(effortDaysEstimate));
$('input[name=effortDaysEstimate]').val(effortDaysEstimate);
$('.effortEstimateRow').show();
var effortDaysEstimateOffshore = p[ESTIMATE_EFFORT_OFFSHORE] || '';
var effortDaysEstimateOnsite = p[ESTIMATE_EFFORT_ONSITE] || '';
$('#rEffortDaysEstimateOffshore').text(effortDaysEstimateOffshore);
$('#rEffortDaysEstimateOnsite').text(effortDaysEstimateOnsite);
$('input[name=effortDaysEstimateOffshore]').val(effortDaysEstimateOffshore);
$('input[name=effortDaysEstimateOnsite]').val(effortDaysEstimateOnsite);

if (isNaN(p[ESTIMATE_EFFORT_OFFSHORE]) && isNaN(p[ESTIMATE_EFFORT_ONSITE]) ) {
$('.effortEstimateRow').hide();
} else {
$('#rEffortDaysEstimate').text('');
$('.effortEstimateRow').show();
}

if (mainWidget.softwareCompetition.projectHeader.properties.hasOwnProperty(MM_TYPE)) {
Expand Down
Loading