Merge back from technology-2014-10-23

src/web/WEB-INF/editCockpitProject.jsp

@@ -216,7 +216,7 @@
         </div>
 
         <div class="projectMetaAreaField">
-            <h4 class="projectMetaLabel pmIcon">Appirio Manager :</h4>
+            <h4 class="projectMetaLabel pmIcon">Appirio Project Manager :</h4>
 
             <div class="memberList appirioManagerList">
                 <ul>

src/web/WEB-INF/includes/popups.jsp

@@ -2574,7 +2574,7 @@
                 <div class="modalHeader">
                     <div class="modalHeaderRight">
                         <div class="modalHeaderCenter">
-                            <span>Manage Appirio Manager</span>
+                            <span>Manage Appirio Project Manager</span>
                             <a href="javascript:;" class="closeModal" title="Close">Close</a>
                         </div>
                     </div>

src/web/WEB-INF/project-overview.jsp

@@ -476,14 +476,14 @@
                                                 </ul>
                                             </div>
 
-                                            <div class="projectManagers" data-intro="Appirio Manager are TopCoder resources that are responsible for your relationship with TopCoder." data-step="12" data-position="left">
-                                                <h3>TopCoder Appirio Managers :</h3>
+                                            <div class="projectManagers" data-intro="Appirio Project Manager are TopCoder resources that are responsible for your relationship with TopCoder." data-step="12" data-position="left">
+                                                <h3>TopCoder Appirio Project Managers :</h3>
 
                                                 <s:if test="viewData.projectGeneralInfo.appirioManager == null">
                                                     <c:if test="${hasWritePermission}">
                                                         <a class="projectEditLink"
                                                            href="<s:url action='editProject'><s:param name='formData.projectId'>${viewData.projectGeneralInfo.project.projectId}</s:param></s:url>">Add
-                                                            TopCoder Appirio Manager</a>
+                                                            TopCoder Appirio Project Manager</a>
                                                     </c:if>
                                                 </s:if>
                                                 <s:else>

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($('<a href="javascript:;" class="close" title="Remove this handle"></a>'));
             $(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,14 +1238,22 @@ $(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 () {
             var modal = $(this).parents('.userManagementModal:first');
 
             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;
             }
 
@@ -1725,7 +1733,7 @@ $(document).ready(function (e) {
 
                                 var entry = $('<li class="memberLink"><span name="' + key + '" class="hide"></span>'
                                     + '<a href="https://' + SERVER_CONFIG_SERVER_NAME + '/tc?module=MemberProfile&cr='
-                                    + value.userId + '" class="memberLink">' + value.handle + '</a></li>');
+                                    + value.userId + '" class="memberLink">' + value.handle + '</a><a href="javascript:;" class="close" title="Remove this handle"></a></li>');
                                 handleList.append(entry);
                                 entry.hover(
                                     function () {
@@ -1737,6 +1745,7 @@ $(document).ready(function (e) {
                                 );
                             });
 
+                            checkAppirioManagerNumber();
                         },
                         function (errorMessage) {
                             modalAllClose();

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;
        }
 

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();
     }