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

Add scorecard selection #479

Merged
merged 2 commits into from
Apr 19, 2019
Merged

Add scorecard selection #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9970543
fix billing account dropdown
deedee Apr 17, 2019
2d41b87
Add scorecard dropdown on challenge launch page
deedee Apr 18, 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
1 change: 1 addition & 0 deletions ...project_services/src/java/main/com/topcoder/project/service/impl/ProjectServicesImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1594,6 +1594,7 @@ public FullProjectData createProject(Project projectHeader, com.topcoder.project
phase.setId(0);
}

setScorecards(projectHeader, projectPhases);
// call phaseManager.updatePhases(projectPhases,operator)
Util.log(logger, Level.DEBUG, "Starts calling ProjectManager#updatePhases method.");
phaseManager.updatePhases(projectPhases, operator);
Expand Down
9 changes: 9 additions & 0 deletions 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 @@ -219,6 +219,15 @@
</div>
</div>

<div class="row scorecardRow hide">
<label>Review Scorecard :</label>
<div class="scorecardSelect">
<select id="scorecards" name="scorecards">
<option value="0">Default Scorecard</option>
</select>
</div>
</div>

<div class="row privateProjectRow hide">
<label>Task</label>
<input type="checkbox" name="privateProject" title="Is this challenge private?">
Expand Down
4 changes: 4 additions & 0 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 @@ -44,6 +44,10 @@
<td>TopCoder Community Review Board</td>
</tr>
<tr>
<th>Review Scorecard :</th>
<td class="rScorecard">Default Scorecard</td>
</tr>
<tr>
<th>Competition Title :</th>
<td><span id="sworContestName"></span><a href="javascript:showPage('contestSelectionPage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
</tr>
Expand Down
8 changes: 4 additions & 4 deletions src/web/css/direct/launchcontest.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@
border: 1px solid #a8abad;
}

#launchContestOut .addNewContest .projectSelect, #launchContestOut .addNewContest .billingSelect, #launchContestOut .addNewContest .copilotSelect, .reviewScorecardSelect, .milestoneSelect, .reviewerSelect, .registrantsSelect, .mmTypeSelect{
#launchContestOut .addNewContest .projectSelect, #launchContestOut .addNewContest .billingSelect, #launchContestOut .addNewContest .copilotSelect, .reviewScorecardSelect, .milestoneSelect, .reviewerSelect, .registrantsSelect, .mmTypeSelect, .scorecardSelect {
width: auto;
float: left;
display: inline;
Expand Down Expand Up @@ -1964,7 +1964,7 @@ a.draft:hover span.right, a.preview:hover span.right {
}

/** billing and round select **/
.reviewScorecardSelect .newListSelected, .billingSelect .newListSelected, .prizeBillingSelect .newListSelected, .roundelect .newListSelected, .copilotSelect .newListSelected, .milestoneSelect .newListSelected, .projectsSelect .newListSelected, .copilotsSelect .newListSelected, .problemSelect .newListSelected, .reviewerSelect .newListSelected, .registrantsSelect .newListSelected, .mmTypeSelect .newListSelected {
.reviewScorecardSelect .newListSelected, .billingSelect .newListSelected, .prizeBillingSelect .newListSelected, .roundelect .newListSelected, .copilotSelect .newListSelected, .milestoneSelect .newListSelected, .projectsSelect .newListSelected, .copilotsSelect .newListSelected, .problemSelect .newListSelected, .reviewerSelect .newListSelected, .registrantsSelect .newListSelected, .mmTypeSelect .newListSelected, .scorecardSelect .newListSelected {
width: 283px;
height: 28px;
padding: 0 5px;
Expand All @@ -1981,11 +1981,11 @@ a.draft:hover span.right, a.preview:hover span.right {
color: #6c6c6c;
}

.reviewScorecardSelect .selectedTxt, .billingSelect .selectedTxt, .prizeBillingSelect .selectedTxt, .roundelect .selectedTxt, .copilotSelect .selectedTxt, .milestoneSelect .selectedTxt, .copilotsSelect .selectedTxt, .projectsSelect .selectedTxt, .problemSelect .selectedTxt, .reviewerSelect .selectedTxt, .registrantsSelect .selectedTxt, .mmTypeSelect .selectedTxt {
.reviewScorecardSelect .selectedTxt, .billingSelect .selectedTxt, .prizeBillingSelect .selectedTxt, .roundelect .selectedTxt, .copilotSelect .selectedTxt, .milestoneSelect .selectedTxt, .copilotsSelect .selectedTxt, .projectsSelect .selectedTxt, .problemSelect .selectedTxt, .reviewerSelect .selectedTxt, .registrantsSelect .selectedTxt, .mmTypeSelect .selectedTxt, .scorecardSelect .selectedTxt {
width: 281px;
}

.reviewScorecardSelect .newList, .billingSelect .newList, .prizeBillingSelect .newList, .roundelect .newList, .copilotSelect .newList, .milestoneSelect .newList, .copilotsSelect .newList, .projectsSelect .newList, .problemSelect .newList, .reviewerSelect .newList, .registrantsSelect .newList, .mmTypeSelect .newList{
.reviewScorecardSelect .newList, .billingSelect .newList, .prizeBillingSelect .newList, .roundelect .newList, .copilotSelect .newList, .milestoneSelect .newList, .copilotsSelect .newList, .projectsSelect .newList, .problemSelect .newList, .reviewerSelect .newList, .registrantsSelect .newList, .mmTypeSelect .newList, .scorecardSelect .newList {
width: 290px;
border: #ccc solid 1px;
background: #fff;
Expand Down
15 changes: 12 additions & 3 deletions src/web/scripts/launch/pages/selection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,8 @@ function validateFieldsContestSelectionAlgorithm() {
mainWidget.softwareCompetition.subEndDate = endDate;
mainWidget.softwareCompetition.regEndDate = regEndDate;
mainWidget.softwareCompetition.projectHeader.properties[MM_TYPE] = $('#mmType').val().trim();

mainWidget.softwareCompetition.projectHeader.reviewScorecardId = 0;
mainWidget.softwareCompetition.projectHeader.iterativeReviewScorecardId = 0;
//prizes is on category id
// fillPrizes();

Expand Down Expand Up @@ -341,7 +342,13 @@ function validateFieldsContestSelectionSoftware() {

//prizes is on category id
fillPrizes();

if (categoryId === SOFTWARE_CATEGORY_ID_F2F) {
mainWidget.softwareCompetition.projectHeader.reviewScorecardId = 0;
mainWidget.softwareCompetition.projectHeader.iterativeReviewScorecardId = Number($('#scorecards').val());
} else {
mainWidget.softwareCompetition.projectHeader.reviewScorecardId = Number($('#scorecards').val());
mainWidget.softwareCompetition.projectHeader.iterativeReviewScorecardId = 0;
}
return true;
}

Expand Down Expand Up @@ -519,7 +526,8 @@ function validateFieldsContestSelectionStudio() {
});
enableMCEPlaceholderText = false;
}

mainWidget.softwareCompetition.projectHeader.reviewScorecardId = 0;
mainWidget.softwareCompetition.projectHeader.iterativeReviewScorecardId = 0;
return true;
}

Expand All @@ -534,6 +542,7 @@ function continueContestSelection() {
groupsSpan+='<span>'+ g.name+'</span>';
});
$(".overviewData .rGroups td span").remove();

$(groupsSpan).insertBefore(".overviewData .rGroups td a");

if(mainWidget.isSoftwareContest()) {
Expand Down
15 changes: 12 additions & 3 deletions src/web/scripts/launchcontest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,8 +620,7 @@ $(document).ready(function() {


handleProjectDropDownChange();


$('#scorecards').sSelect();
$('#overviewAlgorithmPage').hide();
}); // end of jQuery onload

Expand Down Expand Up @@ -664,7 +663,7 @@ function handleProjectDropDownChange() {
$("#billingProjects").val(0);

if(hasCMCBilling && !CMCBillingExisting) {
$("#billingProjects").append($('<option></option>').val($("input[name=CMCBillingID]").val()).html($("input[name=CMCBillingName]").val()).data("cca", false).data("enableEffortDays", value["enableEffortDays"]));
$("#billingProjects").append($('<option></option>').val($("input[name=CMCBillingID]").val()).html($("input[name=CMCBillingName]").val()).data("cca", false).data("enableEffortDays", false));
}

$("#billingProjects").resetSS();
Expand Down Expand Up @@ -829,7 +828,17 @@ function onContestTypeChange() {
templates: getDRTemplatesName(typeId),
templates_files: DRTemplatesList
});
$('#scorecards').html('<option value="0">Default Scorecard</option>');
$('.scorecardRow').show();
var scorecards = getReviewScorecards(typeId);
$.each(scorecards, function(i, value) {
$('#scorecards').append('<option value="' + value['id'] + '">' + value['scorecardName'] + ' - ' + value['scorecardVersion'] + '</option>'); });
$('#scorecards').resetSS();
$('#scorecards').bind('change', function(){
$('.rScorecard').html($(this).find(':selected').text());
});
} else {
$('.scorecardRow').hide();
var contestDescription = CKEDITOR.instances['contestDescription'];
if (contestDescription) {
contestDescription.destroy(true);
Expand Down
6 changes: 4 additions & 2 deletions token.properties.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,10 @@
############################################################################################
# file storage location for DefaultUploadExternalServices in onlineReviewUpload_config.xml #
############################################################################################
@file_storage_location@=/root/submission_dev
@studio_file_storage_location@=/root/submission_design
#@file_storage_location@=/root/submission_dev
#@studio_file_storage_location@=/root/submission_design
@file_storage_location@=/tmp
@studio_file_storage_location@=/tmp

##############
# struts.xml #
Expand Down