From ba98e406a365a9ccdfafbf432ac06fad3b8013a2 Mon Sep 17 00:00:00 2001 From: hohosky Date: Mon, 20 Oct 2014 23:57:21 +0800 Subject: [PATCH 1/2] Fix multiple round software challenge cost display issues --- src/web/scripts/editCockpitProject.js | 17 ++++++++++---- .../scripts/launch/contestDetailSoftware.js | 22 +++++++++++++------ src/web/scripts/launch/main.js | 3 ++- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/web/scripts/editCockpitProject.js b/src/web/scripts/editCockpitProject.js index 795fd322a..cf4960bfb 100644 --- a/src/web/scripts/editCockpitProject.js +++ b/src/web/scripts/editCockpitProject.js @@ -911,7 +911,7 @@ $(document).ready(function (e) { return false; }); - /*$('.memberList ul li, .techList ul li').each(function () { + $('.memberList ul li, .techList ul li').each(function () { $(this).append($('')); $(this).hover( function () { @@ -921,7 +921,7 @@ $(document).ready(function (e) { $(this).removeClass('hovered'); } ); - });*/ + }); $('.memberList .close').live('click', function () { var p = $(this).parent(); @@ -991,7 +991,7 @@ $(document).ready(function (e) { p.remove(); - + checkAppirioManagerNumber(); return false; }); @@ -1238,6 +1238,14 @@ $(document).ready(function (e) { } + function checkAppirioManagerNumber() { + if($("div.appirioManagerList ul li.memberLink").length > 0) { + $("div.appirioManagerList .triggerManagerModal").addClass('hidden'); + } else { + $("div.appirioManagerList .triggerManagerModal").removeClass('hidden'); + } + + } // add item $('.userManagementModal .addUserForm .addItem').live('click', function () { @@ -1725,7 +1733,7 @@ $(document).ready(function (e) { var entry = $('
  • ' + '' + value.handle + '
    • '); + + value.userId + '" class="memberLink">' + value.handle + ''); handleList.append(entry); entry.hover( function () { @@ -1737,6 +1745,7 @@ $(document).ready(function (e) { ); }); + checkAppirioManagerNumber(); }, function (errorMessage) { modalAllClose(); diff --git a/src/web/scripts/launch/contestDetailSoftware.js b/src/web/scripts/launch/contestDetailSoftware.js index 02f8fb8c0..81af267cb 100644 --- a/src/web/scripts/launch/contestDetailSoftware.js +++ b/src/web/scripts/launch/contestDetailSoftware.js @@ -108,9 +108,12 @@ var contestHasSpecReview = true; var loadingChallengeDetails = false; function getContestPrize(prizesData, place) { - if(prizesData && prizesData.length >= place - && mainWidget.softwareCompetition.projectHeader.prizes[place - 1].place == place) { - return mainWidget.softwareCompetition.projectHeader.prizes[place - 1].prizeAmount; + if(prizesData && prizesData.length >= place) { + for(var i = 0; i < prizesData.length; ++i) { + if(prizesData[i].place == place && prizesData[i].prizeType.id == 15) { + return prizesData[i].prizeAmount; + } + } } return -1; @@ -816,11 +819,16 @@ function initContest(contestJson) { customCosts.reliabilityBonusCost = parseFloat(projectHeader.getReliabilityBonusCost()); customCosts.specReviewCost = parseFloat(projectHeader.getSpecReviewCost()); customCosts.drCost = parseFloat(digitalRunPoints); + if(projectHeader.prizes.length > 2) { // there are extra prizes var extraPrizes = []; - for(var k = 2; k < projectHeader.prizes.length; ++k) { - extraPrizes.push(projectHeader.prizes[k].prizeAmount); + + for(var placement = 3; placement <= 5; ++placement) { + var extraPrizeAmount = getContestPrize(mainWidget.softwareCompetition.projectHeader.prizes, placement); + if(extraPrizeAmount > 0) { + extraPrizes.push(extraPrizeAmount); + } } customCosts.extraPrizes = extraPrizes; } @@ -1916,12 +1924,12 @@ function updateContestCostData() { actualFee = (firstPlacePrize + (secondPlacePrize || 0) + extraPrize + checkpointPrize + reviewCost + (reliability || 0) + specReview + (digitalRun || 0) + copilotFee) * contestPercentage; } - $('#rswContestFee').html(actualFee.formatMoney(2) + ' (' + (contestPercentage * 100).toFixed(2) + '% markup)'); + $('#rswContestFee').html(actualFee.formatMoney(2) + ' (' + (contestPercentage * 100).toFixed(2) + '% markup)'); $('#swContestFee').html(actualFee.formatMoney(2)); $("#swContestFeePercentage").text(' (' + (contestPercentage * 100).toFixed(2) + '% markup)'); if(actualFee != contestFee) { // this can be commented out for debug the contest fee consistency - //alert('DEBUG:not matched'); + // alert('DEBUG:not matched -> calculated fee:' + actualFee + " fee value in project info:" + contestFee); contestFee = actualFee; } diff --git a/src/web/scripts/launch/main.js b/src/web/scripts/launch/main.js index f5395b783..7477c2274 100644 --- a/src/web/scripts/launch/main.js +++ b/src/web/scripts/launch/main.js @@ -1788,7 +1788,8 @@ function fillPrizes(billingProjectId) { $(".contest_prize td.extraPrize").hide(); - if(contestCost.secondPlaceCost && contestCost.secondPlaceCost > 0) { + + if(contestCost.secondPlaceCost && contestCost.secondPlaceCost > 0 && projectCategoryId == SOFTWARE_CATEGORY_ID_CODE) { $('.contest_prize td.extraPrize:eq(0) span').html(contestCost.secondPlaceCost.formatMoney(2)).parent().show(); } From d041bb5f303afb6575f92ed372725fbe847d1c26 Mon Sep 17 00:00:00 2001 From: Shannon Ma Date: Mon, 20 Oct 2014 11:03:47 -0500 Subject: [PATCH 2/2] I-135417 Field label is saying ' Appirio Manager' instead of 'Appirio Project Manager' --- src/web/WEB-INF/editCockpitProject.jsp | 2 +- src/web/WEB-INF/includes/popups.jsp | 2 +- src/web/WEB-INF/project-overview.jsp | 6 +++--- src/web/scripts/editCockpitProject.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/web/WEB-INF/editCockpitProject.jsp b/src/web/WEB-INF/editCockpitProject.jsp index 87bd78e57..d45186cd5 100644 --- a/src/web/WEB-INF/editCockpitProject.jsp +++ b/src/web/WEB-INF/editCockpitProject.jsp @@ -216,7 +216,7 @@
    -

    Appirio Manager :

    +

    Appirio Project Manager :

      diff --git a/src/web/WEB-INF/includes/popups.jsp b/src/web/WEB-INF/includes/popups.jsp index ee22b9240..f8f96fba3 100644 --- a/src/web/WEB-INF/includes/popups.jsp +++ b/src/web/WEB-INF/includes/popups.jsp @@ -2574,7 +2574,7 @@
      - Manage Appirio Manager + Manage Appirio Project Manager Close
      diff --git a/src/web/WEB-INF/project-overview.jsp b/src/web/WEB-INF/project-overview.jsp index a8e71cdfe..0a93ac755 100644 --- a/src/web/WEB-INF/project-overview.jsp +++ b/src/web/WEB-INF/project-overview.jsp @@ -476,14 +476,14 @@
    -
    -

    TopCoder Appirio Managers :

    +
    +

    TopCoder Appirio Project Managers :

    Add - TopCoder Appirio Manager + TopCoder Appirio Project Manager diff --git a/src/web/scripts/editCockpitProject.js b/src/web/scripts/editCockpitProject.js index 795fd322a..f1791f27f 100644 --- a/src/web/scripts/editCockpitProject.js +++ b/src/web/scripts/editCockpitProject.js @@ -1245,7 +1245,7 @@ $(document).ready(function (e) { if(modal.find('.addUserForm .addUserLeft ul li.selected').length > 1 && modal.attr('id') == 'appirioManagersModal') { - showErrors("A project can only have 1 Appirio Manager"); + showErrors("A project can only have 1 Appirio Project Manager"); return; }