From 9970543318eb39c58c3e4e0261154084631504f1 Mon Sep 17 00:00:00 2001 From: Deddy Syefria Date: Wed, 17 Apr 2019 16:18:58 +0700 Subject: [PATCH 1/2] fix billing account dropdown --- src/web/scripts/launchcontest.js | 2 +- token.properties.docker | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/web/scripts/launchcontest.js b/src/web/scripts/launchcontest.js index e44aa05f6..8d7ef7866 100644 --- a/src/web/scripts/launchcontest.js +++ b/src/web/scripts/launchcontest.js @@ -664,7 +664,7 @@ function handleProjectDropDownChange() { $("#billingProjects").val(0); if(hasCMCBilling && !CMCBillingExisting) { - $("#billingProjects").append($('').val($("input[name=CMCBillingID]").val()).html($("input[name=CMCBillingName]").val()).data("cca", false).data("enableEffortDays", value["enableEffortDays"])); + $("#billingProjects").append($('').val($("input[name=CMCBillingID]").val()).html($("input[name=CMCBillingName]").val()).data("cca", false).data("enableEffortDays", false)); } $("#billingProjects").resetSS(); diff --git a/token.properties.docker b/token.properties.docker index 997f94d93..792b8a16d 100644 --- a/token.properties.docker +++ b/token.properties.docker @@ -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 # From 2d41b870905248cbe9978d24947cc72e76bc613a Mon Sep 17 00:00:00 2001 From: Deddy Syefria Date: Thu, 18 Apr 2019 20:17:15 +0700 Subject: [PATCH 2/2] Add scorecard dropdown on challenge launch page --- .../project/service/impl/ProjectServicesImpl.java | 1 + .../WEB-INF/includes/launch/contestSelection.jsp | 9 +++++++++ .../includes/launch/orderReviewSoftware.jsp | 4 ++++ src/web/css/direct/launchcontest.css | 8 ++++---- src/web/scripts/launch/pages/selection.js | 15 ++++++++++++--- src/web/scripts/launchcontest.js | 13 +++++++++++-- 6 files changed, 41 insertions(+), 9 deletions(-) diff --git a/services/project_services/src/java/main/com/topcoder/project/service/impl/ProjectServicesImpl.java b/services/project_services/src/java/main/com/topcoder/project/service/impl/ProjectServicesImpl.java index db3b0e5fc..a4bbe4b0b 100644 --- a/services/project_services/src/java/main/com/topcoder/project/service/impl/ProjectServicesImpl.java +++ b/services/project_services/src/java/main/com/topcoder/project/service/impl/ProjectServicesImpl.java @@ -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); diff --git a/src/web/WEB-INF/includes/launch/contestSelection.jsp b/src/web/WEB-INF/includes/launch/contestSelection.jsp index 8c1f04851..2ed3b18fb 100644 --- a/src/web/WEB-INF/includes/launch/contestSelection.jsp +++ b/src/web/WEB-INF/includes/launch/contestSelection.jsp @@ -219,6 +219,15 @@ +
+ +
+ +
+
+
diff --git a/src/web/WEB-INF/includes/launch/orderReviewSoftware.jsp b/src/web/WEB-INF/includes/launch/orderReviewSoftware.jsp index d7c2d23d3..071209afa 100644 --- a/src/web/WEB-INF/includes/launch/orderReviewSoftware.jsp +++ b/src/web/WEB-INF/includes/launch/orderReviewSoftware.jsp @@ -44,6 +44,10 @@ TopCoder Community Review Board + Review Scorecard : + Default Scorecard + + Competition Title : Edit diff --git a/src/web/css/direct/launchcontest.css b/src/web/css/direct/launchcontest.css index 2d387c78b..1e6d43fef 100644 --- a/src/web/css/direct/launchcontest.css +++ b/src/web/css/direct/launchcontest.css @@ -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; @@ -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; @@ -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; diff --git a/src/web/scripts/launch/pages/selection.js b/src/web/scripts/launch/pages/selection.js index a256f79af..54ed05123 100644 --- a/src/web/scripts/launch/pages/selection.js +++ b/src/web/scripts/launch/pages/selection.js @@ -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(); @@ -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; } @@ -519,7 +526,8 @@ function validateFieldsContestSelectionStudio() { }); enableMCEPlaceholderText = false; } - + mainWidget.softwareCompetition.projectHeader.reviewScorecardId = 0; + mainWidget.softwareCompetition.projectHeader.iterativeReviewScorecardId = 0; return true; } @@ -534,6 +542,7 @@ function continueContestSelection() { groupsSpan+=''+ g.name+''; }); $(".overviewData .rGroups td span").remove(); + $(groupsSpan).insertBefore(".overviewData .rGroups td a"); if(mainWidget.isSoftwareContest()) { diff --git a/src/web/scripts/launchcontest.js b/src/web/scripts/launchcontest.js index 8d7ef7866..33261c8a9 100644 --- a/src/web/scripts/launchcontest.js +++ b/src/web/scripts/launchcontest.js @@ -620,8 +620,7 @@ $(document).ready(function() { handleProjectDropDownChange(); - - + $('#scorecards').sSelect(); $('#overviewAlgorithmPage').hide(); }); // end of jQuery onload @@ -829,7 +828,17 @@ function onContestTypeChange() { templates: getDRTemplatesName(typeId), templates_files: DRTemplatesList }); + $('#scorecards').html(''); + $('.scorecardRow').show(); + var scorecards = getReviewScorecards(typeId); + $.each(scorecards, function(i, value) { + $('#scorecards').append(''); }); + $('#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);