rm-vm

Author: test@exmaple.com

src/java/main/com/topcoder/direct/services/view/dto/contest/ContestStatsDTO.java

@@ -59,14 +59,9 @@
  * Version 1.7 - Topcoder - Remove JIRA Issues Related Functionality In Direct App v1.0
  * - remove JIRA related functionality
  * </p>
- * 
- * <p>
- * Version 1.8 - Quick72Hrs!! Topcoder - Remove VM Management Feature In Direct App version 1.0
- * - remove VM related functionality
- * </p>
  *
  * @author isv, Veve, jiajizhou86, -jacob-, TCCoder 
- * @version 1.8 
+ * @version 1.7 
  */
 public class ContestStatsDTO implements Serializable {
 
@@ -200,6 +195,13 @@ public static interface Aware {
      */
     private boolean showStudioFinalFixTab;
 
+    /**
+     * <p>An <code>int</code> providing the number of active VM's associated to the contest.</p>
+     *
+     * @since 1.4
+     */
+    private int totalActiveVMNumber;
+
     /**
      * <p>Constructs new <code>ContestStatsDTO</code> instance. This implementation does nothing.</p>
      */
@@ -432,6 +434,26 @@ public void setSvn(String svn) {
         this.svn = svn;
     }
 
+    /**
+     * <p>Gets the number of the active VM instances associated to the contest.</p>
+     *
+     * @return tht total number of active VM instances associated to the contest.
+     * @since 1.4
+     */
+    public int getTotalActiveVMNumber() {
+        return totalActiveVMNumber;
+    }
+
+    /**
+     * <p>Sets the total number of active VM instances associated to the contest.</p>
+     *
+     * @param totalActiveVMNumber the number of active VM instances.
+     * @since 1.4
+     */
+    public void setTotalActiveVMNumber(int totalActiveVMNumber) {
+        this.totalActiveVMNumber = totalActiveVMNumber;
+    }
+
     /**
      * <p>Set if show spec review.</p>
      *

src/web/WEB-INF/projectPlanner.jsp

@@ -12,9 +12,6 @@
   -
   - Version 1.3 (TopCoder Direct - Change Right Sidebar to pure Ajax)
   - Add the right sidebar script reference
-  -
-  - Version 1.4 (Quick72Hrs!! Topcoder - Remove VM Management Feature In Direct App version 1.0)
-  - remove the vm related things
   -
   - Copyright (C) 2013 - 2014 TopCoder Inc., All Rights Reserved.
   -
@@ -452,6 +449,16 @@
 </div>
 <!-- End .bugRacesWrapper -->
 
+<!-- bugRacesWrapper -->
+<div class="planVMWrapper">
+    <p><label>VM Environment Cost</label></p>
+    <p><input type="checkbox" name="useVM" title="Check if the project is planned to use VM for dev"/> Do you plan to use VM (Virtual Machine environments)
+
+    </p>
+    <p><span>Based on our calculations, you should expect to spend about <span id="vmCost">$0.00</span> on VM's during the course of this project</span></p>
+</div>
+<!-- End .bugRacesWrapper -->
+
 <!-- buttonBar -->
 <div class="buttonBar bottom">
     <a class="newButton1 exportToExcel fRight" href="javascript:;"><span class="btnR"><span

src/web/css/direct/projectPlanner.css

@@ -1,9 +1,4 @@
 /* project planner */
-/*
- *
- * - Quick72Hrs!! Topcoder - Remove VM Management Feature In Direct App v1.0
- * - Remove jira related css
- */
 #mainContent.projectPlanner {
     background: #ffffff;
 }
@@ -142,13 +137,41 @@
         font-size: 13px;
     }
 
+#area1 .projectPlanner .planVMWrapper {
+    padding: 15px 0 20px 25px;
+    height: 76px;
+    line-height: 20px;
+    border-bottom: 1px solid #a9acae;
+}
+
+#area1 .projectPlanner .planVMWrapper input {
+    width: 35px;
+    line-height: 20px;
+    padding: 0 5px;
+}
+
+#area1 .projectPlanner .planVMWrapper p {
+    padding-bottom: 7px;
+}
+
+
+#area1 .projectPlanner .planVMWrapper label {
+    vertical-align: middle;
+    padding-right: 8px;
+    font-weight: bold;
+}
+
 #area1 .projectPlanner .planBugRacesWrapper span.total {
     vertical-align: middle;
     padding-right: 8px;
     font-weight: bold;
     font-size: 13px;
 }
 
+#vmCost {
+    font-weight: bold;
+}
+
 #area1 .projectPlanner .buttonBar {
     padding: 20px 0 0 25px;
     line-height: 24px;

src/web/scripts/projectPlanner.js

@@ -11,18 +11,53 @@
  * Version 1.2 - Topcoder - Remove JIRA Issues Related Functionality In Direct App v1.0
  * - remove JIRA related functionality
  * 
- * Version 1.3 - Quick72Hrs!! Topcoder - Remove VM Management Feature In Direct App version 1.0
- * - remove VM related functionality
- * 
  *
  * @author GreatKevin, TCCoder
- * @version 1.3 
+ * @version 1.2 
  */
 $(function(){
 
     var contestInterval = 72;
     var contestDescription;
 
+    var updateVMCost = function (result) {
+
+        if (!result && ($("select[name=billingAccount]").val() <= 0 || !$('input[name=useVM]').is(":checked"))) {
+            $("#vmCost").text("$0.00");
+            return 0;
+        }
+
+        var contests;
+
+        if (result) {
+            contests = result.contests;
+
+            if (result.useVM == false) {
+                return 0;
+            }
+
+        } else {
+            contests = buildProjectTree(true);
+
+            if(contests.circular) {
+                contests = contests.contests;
+            }
+
+        }
+
+
+        var vmCost = 0;
+        $.each(contests, function (index, c) {
+            if (c.type == '2' || c.type == '9' || c.type == '13' || c.type == '14') {
+                vmCost += getContestTypeValue(c.type, 'cost') * 0.15;
+            }
+        })
+
+        $("#vmCost").text('$' + vmCost.formatMoney(2));
+
+        return vmCost;
+    };
+
     $(':input').live('focus',function(){
         $(this).attr('autocomplete', 'off');
     });
@@ -31,6 +66,7 @@ $(function(){
     $("select[name=contestType]").val(0);
 
     $("input[name=contestName]").live('keydown keyup paste', limitContestProjectNameChars(200));
+    $("input[name=contestName]").live('keydown keyup paste', updateVMCost);
 
     $("select[name=billingAccount]").change(function(){
         var billingAccountId = $(this).val();
@@ -301,6 +337,8 @@ $(function(){
 
         $(this).closest('tr').find('.memberCost').text('$' + parseFloat(cost).toFixed(1));
         $(this).closest('tr').find('.contestFee').text('$' + parseFloat(getContestTypeContestFee(this.value)).toFixed(1));
+
+        updateVMCost();
     });
 
     // delete contest row
@@ -314,6 +352,8 @@ $(function(){
         if ($('tr', contestTable).length <= 1) {
             $('.deleteContest', contestTable).addClass('hide');
         }
+
+        updateVMCost();
     });
 
     // returns project tree for gantt chart if no circulars presents
@@ -575,6 +615,15 @@ $(function(){
         updateDisabledControls();
 
         $("select[name=contestType]").trigger('change');
+
+        if (data.useVM == true) {
+            $("input[name=useVM]").attr('checked', 'checked');
+        }
+        else {
+            $("input[name=useVM]").removeAttr('checked');
+        }
+
+        updateVMCost();
     }
 
     var projectPlanUploader =
@@ -637,7 +686,7 @@ $(function(){
 
         // show possible send-to-server json for generate export excel file
         var exportJson = {
-            useVM : false,
+            useVM : $("input[name=useVM]").is(":checked"),
             contests:contests
         }
 
@@ -697,10 +746,12 @@ $(function(){
         calculateWidth();
         modalPosition();
 
-        var totalCost = totalContestFee + totalMemberCost;
+        var vmCost = updateVMCost();
+
+        var totalCost = totalContestFee + totalMemberCost + vmCost;
 
         $("#durationStat").text(((maxHours - minHours) / 24) + " Days");
-        $("#totalStat").text(("$" + totalCost.formatMoney(0))).attr('title', 'Member Cost: $' + totalMemberCost + "  Fee: $" + totalContestFee);
+        $("#totalStat").text(("$" + totalCost.formatMoney(0))).attr('title', 'Member Cost: $' + totalMemberCost + "  Fee: $" + totalContestFee + "  VM Cost: $" + vmCost);
 
 
     });
@@ -814,6 +865,14 @@ $(function(){
 
     // add event handler for input bug race plan
 
+    $("input[name=useVM]").click(function() {
+        if($(this).is(":checked")) {
+            updateVMCost();
+        } else {
+            $("#vmCost").text("$0.00");
+        }
+    })
+
     if ($("#CopilotPostingSubmissions").length > 0) {
 
         var submissionsResultCache = {};
@@ -838,7 +897,10 @@ $(function(){
                 maxHours = value.timeEnd > maxHours ? value.timeEnd : maxHours;
             }
 
-            var totalCost = totalContestFee + totalMemberCost;
+
+            var vmCost = updateVMCost(result);
+
+            var totalCost = totalContestFee + totalMemberCost + vmCost;
             var totalDuration = (maxHours - minHours) / 24;
 
             if(!viewType) {
@@ -847,7 +909,7 @@ $(function(){
                 calculateWidth();
                 modalPosition();
                 $("#durationStat").text(totalDuration + " Days");
-                $("#totalStat").text(("$" + totalCost.formatMoney(0))).attr('title', 'Member Cost: $' + totalMemberCost + "  Fee: $" + totalContestFee);
+                $("#totalStat").text(("$" + totalCost.formatMoney(0))).attr('title', 'Member Cost: $' + totalMemberCost + "  Fee: $" + totalContestFee + "  VM Cost: $" + vmCost);
             } else {
                 var estHolder;
                 if(viewType == 'list') {
@@ -884,7 +946,7 @@ $(function(){
                 estHolder.append("<p>Duration: " + totalDuration + " days </p>");
                 estHolder.append($("<p>Total Member Cost: $" + totalMemberCost.formatMoney(0) + "</p>").attr('title', ' Challenges Cost: $' + (totalMemberCost)));
                 estHolder.append($("<p>Total Challenge Fee: $" + totalContestFee.formatMoney(0) + "</p>").attr('title', 'Challenges Fee: $' + (totalContestFee)));
-                estHolder.append($("<p>Total Cost: $" + totalCost.formatMoney(0) + "</p>").attr('title', 'Member Cost: $' + totalMemberCost + "  Fee: $" + totalContestFee));
+                estHolder.append($("<p>Total Cost: $" + totalCost.formatMoney(0) + "</p>").attr('title', 'Member Cost: $' + totalMemberCost + "  Fee: $" + totalContestFee + "  VM Cost: $" + vmCost));
                 estHolder.append("<p>Planned Challenge Number: " + result.contests.length + " </p>");
             }
         }