topcoder-archive · skyhit · Apr 25, 2018 · Apr 21, 2018 · Apr 24, 2018
diff --git a/...acade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java b/...acade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 - 2017 TopCoder Inc., All Rights Reserved.
+ * Copyright (C) 2009 - 2018 TopCoder Inc., All Rights Reserved.
  */
 package com.topcoder.service.facade.contest.ejb;
 
@@ -912,9 +912,14 @@
  *     <li>Sync MM data with informixoltp</li>
  * </ul>
  *
+ * Version 3.12 (Topcoder - Support Points Prize Type For Challenges):
+ * <ul>
+ *     <li>Add CONTEST_PRIZE_TYPE_ID</li>
+ * </ul>
+ *
  * @author snow01, pulky, murphydog, waits, BeBetter, hohosky, isv, tangzx, GreatKevin, lmmortal, minhu, GreatKevin, tangzx
  * @author isv, GreatKevin, Veve, deedee, TCSCODER, TCSASSEMBLER
- * @version 3.11
+ * @version 3.12
  */
 @Stateless
 @TransactionManagement(TransactionManagementType.CONTAINER)
@@ -1198,6 +1203,13 @@ public class ContestServiceFacadeBean implements ContestServiceFacadeLocal, Cont
      */
     private final static long CHECKPOINT_PRIZE_TYPE_ID = 14L;
 
+    /**
+     * Represents the contest prize type id.
+     *
+     * @since 3.12
+     */
+    private final static long CONTEST_PRIZE_TYPE_ID = 15L;
+
     /**
      * Cancelled status list.
      *
@@ -2523,7 +2535,9 @@ private SoftwareContestPaymentResult processContestSaleInternal(TCSubject tcSubj
 				}
 
                 for (Prize prize : competition.getProjectHeader().getPrizes()) {
-                    totalFee = totalFee + prize.getPrizeAmount() * prize.getNumberOfSubmissions();
+                    if (prize.getPrizeType().getId() == CONTEST_PRIZE_TYPE_ID) {
+                        totalFee = totalFee + prize.getPrizeAmount() * prize.getNumberOfSubmissions();
+                    }
                 }
             }
 

diff --git a/src/web/WEB-INF/includes/contest/editTab.jsp b/src/web/WEB-INF/includes/contest/editTab.jsp
@@ -1,6 +1,6 @@
 <%--
-  - Version: 2.9
-  - Copyright (C) 2010 - 2017 TopCoder Inc., All Rights Reserved.
+  - Version: 3.0
+  - Copyright (C) 2010 - 2018 TopCoder Inc., All Rights Reserved.
   -
   - Description: Edit Tab for studio contest detail page
   -
@@ -63,6 +63,9 @@
   -
   - Version 2.9 (TOPCODER - SUPPORT TYPEAHEAD FOR TASK ASSIGNEES IN DIRECT APP):
   - - Move task assign member to use magicSuggest
+  - 
+  - Version 3.0 (Topcoder - Support Points Prize Type For Challenges):
+  - - Add "Points" section.
 --%>
 <%@ include file="/WEB-INF/includes/taglibs.jsp" %>
 
@@ -756,10 +759,81 @@
                 </div><!-- End .detailsContent -->                                              
 </div><!-- End .details -->
 <!-- End Prize Edit -->
-
-
-
-
+
+<!-- Point Display -->
+<div class="no_details contest_point">
+        <div class="caption_det_point">
+			<div class="captionInner">
+				<h2>Points </h2>
+                <c:if test="${viewData.hasContestWritePermission}">
+				<a href="javascript:;" class="button11 edit_type edit_point"><span class="btnR"><span class="btnC"><span class="btnIcon">Edit</span></span></span></a>
+                </c:if>
+			</div>
+		</div><!-- End .caption -->
+
+	    <div class="detailsContent_det_point">
+			<table cellspacing="10" class="det_font_tab">
+                <tr class="rightbor">
+                  <td class="first_tab hide" align="left"><strong>1st Place:</strong> Pt. <span></span></td>
+                  <td class="sec_tab_prize extraPoint hide"><strong>2nd Place:</strong> Pt. <span></span></td>
+                  <td class="sec_tab_prize extraPoint hide"><strong>3rd Place</strong> Pt. <span></span></td>
+                  <td class="sec_tab_prize extraPoint hide"><strong>4th Place</strong> Pt. <span></span></td>
+                  <td class="sec_tab_prize extraPoint hide"><strong>5th Place</strong> Pt. <span></span></td>
+                  <td class="na_tab hide">N/A</td>
+                </tr>
+            </table>
+            <div class="clear"></div>
+        </div><!-- End .detailsContent -->
+</div>
+<!-- End Point Display -->
+
+<!-- Point Edit -->
+<div class="no_details contest_point_edit hide">
+	    <div class="caption_det_point_edit">
+			<div class="captionInner">
+				<h2>Points</h2>
+			</div>
+	    </div><!-- End .caption -->
+
+		<div class="detailsContent_det_point_edit">
+            <div id="stPoints" class="points pointsInner">
+                <div class="prizesInner">
+                    <label class="first">1st Place</label>
+                    <span class="dw">Pt.</span>
+                    <input type="text" id="point1" class="pointsInput" value="" />
+                    <label class="second">2nd Place</label>
+                    <span class="dw">Pt.</span>
+                    <input type="text" id="point2" class="pointsInput" value="" />
+                    <label class="third">3rd Place</label>
+                    <span class="dw">Pt.</span>
+                    <input type="text" id="point3" class="pointsInput" value="" />
+                    <a href="javascript:;" class="addButton addPoint"><span class="hide">ADD</span></a>
+                </div>
+
+                <div id="extraPoints" class="prizesInner extraPoints hide">
+                    <label class="first">4th Place</label>
+                    <span class="dw">Pt.</span>
+                    <input type="text" id="point4" class="pointsInput" value="" />
+                    <label class="second">5th Place</label>
+                    <span class="dw">Pt.</span>
+                    <input type="text" id="point5" class="pointsInput" value="" />
+                    <label class="third">&nbsp;</label>
+                    <span class="dw">&nbsp;</span>
+                    <a href="javascript:;" class="removeButton removePoint"><span class="hide">REMOVE</span></a>
+                </div>
+            </div>
+            <!-- end .points -->
+
+            <div class="clear"></div>
+
+            <p class="save">
+                <a href="javascript:;" class="cancel_text_point">cancel</a>
+                <a href="javascript:;"><img src="/images/save_change.png" alt="save" class="save_btn_point" /></a>
+            </p>
+		</div><!-- End .detailsContent -->
+</div>
+<!-- End Point Edit -->
+
 <!-- Spec Display -->                                                         
 <div class="no_details contest_spec">                                           
                 <div class="caption_det_spec">                  

diff --git a/src/web/WEB-INF/includes/contest/editTabMarathon.jsp b/src/web/WEB-INF/includes/contest/editTabMarathon.jsp
@@ -1,6 +1,6 @@
 <%--
-  - Version: 1.9
-  - Copyright (C) 2013 - 2017 TopCoder Inc., All Rights Reserved.
+  - Version: 2.0
+  - Copyright (C) 2013 - 2018 TopCoder Inc., All Rights Reserved.
   -
   - Version 1.1 BUGR-8788 (TC Cockpit - New Client Billing Config Type) change notes:
   - - change on #billingProjects, will load by jquery
@@ -33,6 +33,9 @@
   - Version 1.9 (Topcoder - Add Basic Marathon Match Creation And Update In Direct App):
   - - Remove MM problem selection
   - - Add registration date input
+  - 
+  - Version 2.0 (Topcoder - Support Points Prize Type For Challenges):
+  - - Add "Points" section.
 --%>
 <%@ include file="/WEB-INF/includes/taglibs.jsp" %>
 
@@ -515,8 +518,79 @@
 </div><!-- End .details -->
 <!-- End Prize Edit -->
 
-
-
+<!-- Point Display -->
+<div class="no_details contest_point">
+        <div class="caption_det_point">
+			<div class="captionInner">
+				<h2>Points </h2>
+                <c:if test="${viewData.hasContestWritePermission}">
+				<a href="javascript:;" class="button11 edit_type edit_point"><span class="btnR"><span class="btnC"><span class="btnIcon">Edit</span></span></span></a>
+                </c:if>
+			</div>
+		</div><!-- End .caption -->
+
+	    <div class="detailsContent_det_point">
+			<table cellspacing="10" class="det_font_tab">
+                <tr class="rightbor">
+                  <td class="first_tab hide" align="left"><strong>1st Place:</strong> Pt. <span></span></td>
+                  <td class="sec_tab_prize extraPoint hide"><strong>2nd Place:</strong> Pt. <span></span></td>
+                  <td class="sec_tab_prize extraPoint hide"><strong>3rd Place</strong> Pt. <span></span></td>
+                  <td class="sec_tab_prize extraPoint hide"><strong>4th Place</strong> Pt. <span></span></td>
+                  <td class="sec_tab_prize extraPoint hide"><strong>5th Place</strong> Pt. <span></span></td>
+                  <td class="na_tab hide">N/A</td>
+                </tr>
+            </table>
+            <div class="clear"></div>
+        </div><!-- End .detailsContent -->
+</div>
+<!-- End Point Display -->
+
+<!-- Point Edit -->
+<div class="no_details contest_point_edit hide">
+	    <div class="caption_det_point_edit">
+			<div class="captionInner">
+				<h2>Points</h2>
+			</div>
+	    </div><!-- End .caption -->
+
+		<div class="detailsContent_det_point_edit">
+            <div id="alPoints" class="points pointsInner">
+                <div class="prizesInner">
+                    <label class="first">1st Place</label>
+                    <span class="dw">Pt.</span>
+                    <input type="text" id="point1" class="pointsInput" value="" />
+                    <label class="second">2nd Place</label>
+                    <span class="dw">Pt.</span>
+                    <input type="text" id="point2" class="pointsInput" value="" />
+                    <label class="third">3rd Place</label>
+                    <span class="dw">Pt.</span>
+                    <input type="text" id="point3" class="pointsInput" value="" />
+                    <a href="javascript:;" class="addButton addPoint"><span class="hide">ADD</span></a>
+                </div>
+
+                <div id="extraPoints" class="prizesInner extraPoints hide">
+                    <label class="first">4th Place</label>
+                    <span class="dw">Pt.</span>
+                    <input type="text" id="point4" class="pointsInput" value="" />
+                    <label class="second">5th Place</label>
+                    <span class="dw">Pt.</span>
+                    <input type="text" id="point5" class="pointsInput" value="" />
+                    <label class="third">&nbsp;</label>
+                    <span class="dw">&nbsp;</span>
+                    <a href="javascript:;" class="removeButton removePoint"><span class="hide">REMOVE</span></a>
+                </div>
+            </div>
+            <!-- end .points -->
+
+            <div class="clear"></div>
+
+            <p class="save">
+                <a href="javascript:;" class="cancel_text_point">cancel</a>
+                <a href="javascript:;"><img src="/images/save_change.png" alt="save" class="save_btn_point" /></a>
+            </p>
+		</div><!-- End .detailsContent -->
+</div>
+<!-- End Point Edit -->
 
 <!-- Spec Display -->
 <div class="no_details contest_spec">

diff --git a/src/web/WEB-INF/includes/contest/editTabSoftware.jsp b/src/web/WEB-INF/includes/contest/editTabSoftware.jsp
@@ -1,6 +1,6 @@
 <%--
-  - Version: 3.2
-  - Copyright (C) 2010 - 2017 TopCoder Inc., All Rights Reserved.
+  - Version: 3.3
+  - Copyright (C) 2010 - 2018 TopCoder Inc., All Rights Reserved.
   -
   - Description: This page fragment renders edit softeware contest page.
   -
@@ -84,6 +84,9 @@
   -
   - Version 3.2 (TOPCODER - SUPPORT TYPEAHEAD FOR TASK ASSIGNEES IN DIRECT APP):
   - - Move task assign member to use magicSuggest
+  - 
+  - Version 3.3 (Topcoder - Support Points Prize Type For Challenges):
+  - - Add "Points" section.
 --%>
 <%@ include file="/WEB-INF/includes/taglibs.jsp" %>
 
@@ -714,10 +717,81 @@
 				</div><!-- End .detailsContent -->												
 </div><!-- End .details -->
 <!-- End Prize Edit -->
-
-
-
-
+
+<!-- Point Display -->
+<div class="no_details contest_point">
+        <div class="caption_det_point">
+			<div class="captionInner">
+				<h2>Points </h2>
+                <c:if test="${viewData.hasContestWritePermission}">
+				<a href="javascript:;" class="button11 edit_type edit_point"><span class="btnR"><span class="btnC"><span class="btnIcon">Edit</span></span></span></a>
+                </c:if>
+			</div>
+		</div><!-- End .caption -->
+
+	    <div class="detailsContent_det_point">
+			<table cellspacing="10" class="det_font_tab">
+                <tr class="rightbor">
+                  <td class="first_tab hide" align="left"><strong>1st Place:</strong> Pt. <span></span></td>
+                  <td class="sec_tab_prize extraPoint hide"><strong>2nd Place:</strong> Pt. <span></span></td>
+                  <td class="sec_tab_prize extraPoint hide"><strong>3rd Place</strong> Pt. <span></span></td>
+                  <td class="sec_tab_prize extraPoint hide"><strong>4th Place</strong> Pt. <span></span></td>
+                  <td class="sec_tab_prize extraPoint hide"><strong>5th Place</strong> Pt. <span></span></td>
+                  <td class="na_tab hide">N/A</td>
+                </tr>
+            </table>
+            <div class="clear"></div>
+        </div><!-- End .detailsContent -->
+</div>
+<!-- End Point Display -->
+
+<!-- Point Edit -->
+<div class="no_details contest_point_edit hide">
+	    <div class="caption_det_point_edit">
+			<div class="captionInner">
+				<h2>Points</h2>
+			</div>
+	    </div><!-- End .caption -->
+
+		<div class="detailsContent_det_point_edit">
+            <div id="swPoints" class="points pointsInner">
+                <div class="prizesInner">
+                    <label class="first">1st Place</label>
+                    <span class="dw">Pt.</span>
+                    <input type="text" id="point1" class="pointsInput" value="" />
+                    <label class="second">2nd Place</label>
+                    <span class="dw">Pt.</span>
+                    <input type="text" id="point2" class="pointsInput" value="" />
+                    <a href="javascript:;" class="addButton addPoint"><span class="hide">ADD</span></a>
+                </div>
+
+                <div id="extraPoints" class="prizesInner extraPoints hide">
+                    <label class="first">3rd Place</label>
+                    <span class="dw">Pt.</span>
+                    <input type="text" id="point3" class="pointsInput" value="" />
+                    <label class="first">4th Place</label>
+                    <span class="dw">Pt.</span>
+                    <input type="text" id="point4" class="pointsInput" value="" />
+                    <label class="first">5th Place</label>
+                    <span class="dw">Pt.</span>
+                    <input type="text" id="point5" class="pointsInput" value="" />
+                    <label class="third">&nbsp;</label>
+                    <span class="dw">&nbsp;</span>
+                    <a href="javascript:;" class="removeButton removePoint"><span class="hide">REMOVE</span></a>
+                </div>
+            </div>
+            <!-- end .points -->
+
+            <div class="clear"></div>
+
+            <p class="save">
+                <a href="javascript:;" class="cancel_text_point">cancel</a>
+                <a href="javascript:;"><img src="/images/save_change.png" alt="save" class="save_btn_point" /></a>
+            </p>
+		</div><!-- End .detailsContent -->
+</div>
+<!-- End Point Edit -->
+
 <!-- Spec Display -->                                                         
 <div class="no_details contest_spec">											
 				<div class="caption_det_spec">					

diff --git a/src/web/WEB-INF/includes/launch/orderReview.jsp b/src/web/WEB-INF/includes/launch/orderReview.jsp
@@ -1,7 +1,7 @@
 <%--
   - Author: TCSASSEMBER, Ghost_141
-  - Version: 1.2
-  - Copyright (C) 2010 - 2011 TopCoder Inc., All Rights Reserved.
+  - Version: 1.3
+  - Copyright (C) 2010 - 2018 TopCoder Inc., All Rights Reserved.
   -
   - Description: order review page for studio contest page.
   -
@@ -11,6 +11,9 @@
   - 
   - Version 1.2 - Release Assembly - TopCoder Cockpit Direct UI Text and Layout Bugs Termination 1.0 Change Note
   - - Fix multiple bugs.
+  - 
+  - Version 1.3 - Topcoder - Support Points Prize Type For Challenges
+  - - Add "Challenge Points" section.
 --%>
 <%@ include file="/WEB-INF/includes/taglibs.jsp" %>
 
@@ -62,6 +65,10 @@
 <div class="contestDetails">
 
 	<h2 class="sectionHead">Challenge Details</h2>
+	<h3>Challenge Points</h3>
+	<table class="prizesTable" id="orPointsTable">
+		<tbody><tr></tr></tbody>
+	</table>
 	<h3>Challenge Prizes</h3>
 	<table class="prizesTable">
 		<tr id='orPrizesTR'>
@@ -122,4 +129,4 @@
     <a href="javascript:;" class="specrev-goto">Go to my Spec Review</a>
     <p></p>
     <br /><br /><br />
-</div>
+</div>