Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

Commit facea4f

Browse files
skyhitskyhit
authored
Merge pull request #386 from liuliquan/points-prize-type
Support Points Prize Type For Challenges
2 parents 61d0d3f + 07a79c3 commit facea4f

File tree

24 files changed

+993
-126
lines changed

24 files changed

+993
-126
lines changed

‎services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2009 - 2017 TopCoder Inc., All Rights Reserved.
2+
* Copyright (C) 2009 - 2018 TopCoder Inc., All Rights Reserved.
33
*/
44
package com.topcoder.service.facade.contest.ejb;
55

@@ -912,9 +912,14 @@
912912
* <li>Sync MM data with informixoltp</li>
913913
* </ul>
914914
*
915+
* Version 3.12 (Topcoder - Support Points Prize Type For Challenges):
916+
* <ul>
917+
* <li>Add CONTEST_PRIZE_TYPE_ID</li>
918+
* </ul>
919+
*
915920
* @author snow01, pulky, murphydog, waits, BeBetter, hohosky, isv, tangzx, GreatKevin, lmmortal, minhu, GreatKevin, tangzx
916921
* @author isv, GreatKevin, Veve, deedee, TCSCODER, TCSASSEMBLER
917-
* @version 3.11
922+
* @version 3.12
918923
*/
919924
@Stateless
920925
@TransactionManagement(TransactionManagementType.CONTAINER)
@@ -1198,6 +1203,13 @@ public class ContestServiceFacadeBean implements ContestServiceFacadeLocal, Cont
11981203
*/
11991204
private final static long CHECKPOINT_PRIZE_TYPE_ID = 14L;
12001205

1206+
/**
1207+
* Represents the contest prize type id.
1208+
*
1209+
* @since 3.12
1210+
*/
1211+
private final static long CONTEST_PRIZE_TYPE_ID = 15L;
1212+
12011213
/**
12021214
* Cancelled status list.
12031215
*
@@ -2523,7 +2535,9 @@ private SoftwareContestPaymentResult processContestSaleInternal(TCSubject tcSubj
25232535
}
25242536

25252537
for (Prize prize : competition.getProjectHeader().getPrizes()) {
2526-
totalFee = totalFee + prize.getPrizeAmount() * prize.getNumberOfSubmissions();
2538+
if (prize.getPrizeType().getId() == CONTEST_PRIZE_TYPE_ID) {
2539+
totalFee = totalFee + prize.getPrizeAmount() * prize.getNumberOfSubmissions();
2540+
}
25272541
}
25282542
}
25292543

‎src/web/WEB-INF/includes/contest/editTab.jsp‎

Lines changed: 80 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<%--
2-
- Version: 2.9
3-
- Copyright (C) 2010 - 2017 TopCoder Inc., All Rights Reserved.
2+
- Version: 3.0
3+
- Copyright (C) 2010 - 2018 TopCoder Inc., All Rights Reserved.
44
-
55
- Description: Edit Tab for studio contest detail page
66
-
@@ -63,6 +63,9 @@
6363
-
6464
- Version 2.9 (TOPCODER - SUPPORT TYPEAHEAD FOR TASK ASSIGNEES IN DIRECT APP):
6565
- - Move task assign member to use magicSuggest
66+
-
67+
- Version 3.0 (Topcoder - Support Points Prize Type For Challenges):
68+
- - Add "Points" section.
6669
--%>
6770
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
6871

@@ -756,10 +759,81 @@
756759
</div><!-- End .detailsContent -->
757760
</div><!-- End .details -->
758761
<!-- End Prize Edit -->
759-
760-
761-
762-
762+
763+
<!-- Point Display -->
764+
<div class="no_details contest_point">
765+
<div class="caption_det_point">
766+
<div class="captionInner">
767+
<h2>Points </h2>
768+
<c:if test="${viewData.hasContestWritePermission}">
769+
<a href="javascript:;" class="button11 edit_type edit_point"><span class="btnR"><span class="btnC"><span class="btnIcon">Edit</span></span></span></a>
770+
</c:if>
771+
</div>
772+
</div><!-- End .caption -->
773+
774+
<div class="detailsContent_det_point">
775+
<table cellspacing="10" class="det_font_tab">
776+
<tr class="rightbor">
777+
<td class="first_tab hide" align="left"><strong>1st Place:</strong> Pt. <span></span></td>
778+
<td class="sec_tab_prize extraPoint hide"><strong>2nd Place:</strong> Pt. <span></span></td>
779+
<td class="sec_tab_prize extraPoint hide"><strong>3rd Place</strong> Pt. <span></span></td>
780+
<td class="sec_tab_prize extraPoint hide"><strong>4th Place</strong> Pt. <span></span></td>
781+
<td class="sec_tab_prize extraPoint hide"><strong>5th Place</strong> Pt. <span></span></td>
782+
<td class="na_tab hide">N/A</td>
783+
</tr>
784+
</table>
785+
<div class="clear"></div>
786+
</div><!-- End .detailsContent -->
787+
</div>
788+
<!-- End Point Display -->
789+
790+
<!-- Point Edit -->
791+
<div class="no_details contest_point_edit hide">
792+
<div class="caption_det_point_edit">
793+
<div class="captionInner">
794+
<h2>Points</h2>
795+
</div>
796+
</div><!-- End .caption -->
797+
798+
<div class="detailsContent_det_point_edit">
799+
<div id="stPoints" class="points pointsInner">
800+
<div class="prizesInner">
801+
<label class="first">1st Place</label>
802+
<span class="dw">Pt.</span>
803+
<input type="text" id="point1" class="pointsInput" value="" />
804+
<label class="second">2nd Place</label>
805+
<span class="dw">Pt.</span>
806+
<input type="text" id="point2" class="pointsInput" value="" />
807+
<label class="third">3rd Place</label>
808+
<span class="dw">Pt.</span>
809+
<input type="text" id="point3" class="pointsInput" value="" />
810+
<a href="javascript:;" class="addButton addPoint"><span class="hide">ADD</span></a>
811+
</div>
812+
813+
<div id="extraPoints" class="prizesInner extraPoints hide">
814+
<label class="first">4th Place</label>
815+
<span class="dw">Pt.</span>
816+
<input type="text" id="point4" class="pointsInput" value="" />
817+
<label class="second">5th Place</label>
818+
<span class="dw">Pt.</span>
819+
<input type="text" id="point5" class="pointsInput" value="" />
820+
<label class="third">&nbsp;</label>
821+
<span class="dw">&nbsp;</span>
822+
<a href="javascript:;" class="removeButton removePoint"><span class="hide">REMOVE</span></a>
823+
</div>
824+
</div>
825+
<!-- end .points -->
826+
827+
<div class="clear"></div>
828+
829+
<p class="save">
830+
<a href="javascript:;" class="cancel_text_point">cancel</a>
831+
<a href="javascript:;"><img src="/images/save_change.png" alt="save" class="save_btn_point" /></a>
832+
</p>
833+
</div><!-- End .detailsContent -->
834+
</div>
835+
<!-- End Point Edit -->
836+
763837
<!-- Spec Display -->
764838
<div class="no_details contest_spec">
765839
<div class="caption_det_spec">

‎src/web/WEB-INF/includes/contest/editTabMarathon.jsp‎

Lines changed: 78 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<%--
2-
- Version: 1.9
3-
- Copyright (C) 2013 - 2017 TopCoder Inc., All Rights Reserved.
2+
- Version: 2.0
3+
- Copyright (C) 2013 - 2018 TopCoder Inc., All Rights Reserved.
44
-
55
- Version 1.1 BUGR-8788 (TC Cockpit - New Client Billing Config Type) change notes:
66
- - change on #billingProjects, will load by jquery
@@ -33,6 +33,9 @@
3333
- Version 1.9 (Topcoder - Add Basic Marathon Match Creation And Update In Direct App):
3434
- - Remove MM problem selection
3535
- - Add registration date input
36+
-
37+
- Version 2.0 (Topcoder - Support Points Prize Type For Challenges):
38+
- - Add "Points" section.
3639
--%>
3740
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
3841

@@ -515,8 +518,79 @@
515518
</div><!-- End .details -->
516519
<!-- End Prize Edit -->
517520

518-
519-
521+
<!-- Point Display -->
522+
<div class="no_details contest_point">
523+
<div class="caption_det_point">
524+
<div class="captionInner">
525+
<h2>Points </h2>
526+
<c:if test="${viewData.hasContestWritePermission}">
527+
<a href="javascript:;" class="button11 edit_type edit_point"><span class="btnR"><span class="btnC"><span class="btnIcon">Edit</span></span></span></a>
528+
</c:if>
529+
</div>
530+
</div><!-- End .caption -->
531+
532+
<div class="detailsContent_det_point">
533+
<table cellspacing="10" class="det_font_tab">
534+
<tr class="rightbor">
535+
<td class="first_tab hide" align="left"><strong>1st Place:</strong> Pt. <span></span></td>
536+
<td class="sec_tab_prize extraPoint hide"><strong>2nd Place:</strong> Pt. <span></span></td>
537+
<td class="sec_tab_prize extraPoint hide"><strong>3rd Place</strong> Pt. <span></span></td>
538+
<td class="sec_tab_prize extraPoint hide"><strong>4th Place</strong> Pt. <span></span></td>
539+
<td class="sec_tab_prize extraPoint hide"><strong>5th Place</strong> Pt. <span></span></td>
540+
<td class="na_tab hide">N/A</td>
541+
</tr>
542+
</table>
543+
<div class="clear"></div>
544+
</div><!-- End .detailsContent -->
545+
</div>
546+
<!-- End Point Display -->
547+
548+
<!-- Point Edit -->
549+
<div class="no_details contest_point_edit hide">
550+
<div class="caption_det_point_edit">
551+
<div class="captionInner">
552+
<h2>Points</h2>
553+
</div>
554+
</div><!-- End .caption -->
555+
556+
<div class="detailsContent_det_point_edit">
557+
<div id="alPoints" class="points pointsInner">
558+
<div class="prizesInner">
559+
<label class="first">1st Place</label>
560+
<span class="dw">Pt.</span>
561+
<input type="text" id="point1" class="pointsInput" value="" />
562+
<label class="second">2nd Place</label>
563+
<span class="dw">Pt.</span>
564+
<input type="text" id="point2" class="pointsInput" value="" />
565+
<label class="third">3rd Place</label>
566+
<span class="dw">Pt.</span>
567+
<input type="text" id="point3" class="pointsInput" value="" />
568+
<a href="javascript:;" class="addButton addPoint"><span class="hide">ADD</span></a>
569+
</div>
570+
571+
<div id="extraPoints" class="prizesInner extraPoints hide">
572+
<label class="first">4th Place</label>
573+
<span class="dw">Pt.</span>
574+
<input type="text" id="point4" class="pointsInput" value="" />
575+
<label class="second">5th Place</label>
576+
<span class="dw">Pt.</span>
577+
<input type="text" id="point5" class="pointsInput" value="" />
578+
<label class="third">&nbsp;</label>
579+
<span class="dw">&nbsp;</span>
580+
<a href="javascript:;" class="removeButton removePoint"><span class="hide">REMOVE</span></a>
581+
</div>
582+
</div>
583+
<!-- end .points -->
584+
585+
<div class="clear"></div>
586+
587+
<p class="save">
588+
<a href="javascript:;" class="cancel_text_point">cancel</a>
589+
<a href="javascript:;"><img src="/images/save_change.png" alt="save" class="save_btn_point" /></a>
590+
</p>
591+
</div><!-- End .detailsContent -->
592+
</div>
593+
<!-- End Point Edit -->
520594

521595
<!-- Spec Display -->
522596
<div class="no_details contest_spec">

‎src/web/WEB-INF/includes/contest/editTabSoftware.jsp‎

Lines changed: 80 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<%--
2-
- Version: 3.2
3-
- Copyright (C) 2010 - 2017 TopCoder Inc., All Rights Reserved.
2+
- Version: 3.3
3+
- Copyright (C) 2010 - 2018 TopCoder Inc., All Rights Reserved.
44
-
55
- Description: This page fragment renders edit softeware contest page.
66
-
@@ -84,6 +84,9 @@
8484
-
8585
- Version 3.2 (TOPCODER - SUPPORT TYPEAHEAD FOR TASK ASSIGNEES IN DIRECT APP):
8686
- - Move task assign member to use magicSuggest
87+
-
88+
- Version 3.3 (Topcoder - Support Points Prize Type For Challenges):
89+
- - Add "Points" section.
8790
--%>
8891
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
8992

@@ -714,10 +717,81 @@
714717
</div><!-- End .detailsContent -->
715718
</div><!-- End .details -->
716719
<!-- End Prize Edit -->
717-
718-
719-
720-
720+
721+
<!-- Point Display -->
722+
<div class="no_details contest_point">
723+
<div class="caption_det_point">
724+
<div class="captionInner">
725+
<h2>Points </h2>
726+
<c:if test="${viewData.hasContestWritePermission}">
727+
<a href="javascript:;" class="button11 edit_type edit_point"><span class="btnR"><span class="btnC"><span class="btnIcon">Edit</span></span></span></a>
728+
</c:if>
729+
</div>
730+
</div><!-- End .caption -->
731+
732+
<div class="detailsContent_det_point">
733+
<table cellspacing="10" class="det_font_tab">
734+
<tr class="rightbor">
735+
<td class="first_tab hide" align="left"><strong>1st Place:</strong> Pt. <span></span></td>
736+
<td class="sec_tab_prize extraPoint hide"><strong>2nd Place:</strong> Pt. <span></span></td>
737+
<td class="sec_tab_prize extraPoint hide"><strong>3rd Place</strong> Pt. <span></span></td>
738+
<td class="sec_tab_prize extraPoint hide"><strong>4th Place</strong> Pt. <span></span></td>
739+
<td class="sec_tab_prize extraPoint hide"><strong>5th Place</strong> Pt. <span></span></td>
740+
<td class="na_tab hide">N/A</td>
741+
</tr>
742+
</table>
743+
<div class="clear"></div>
744+
</div><!-- End .detailsContent -->
745+
</div>
746+
<!-- End Point Display -->
747+
748+
<!-- Point Edit -->
749+
<div class="no_details contest_point_edit hide">
750+
<div class="caption_det_point_edit">
751+
<div class="captionInner">
752+
<h2>Points</h2>
753+
</div>
754+
</div><!-- End .caption -->
755+
756+
<div class="detailsContent_det_point_edit">
757+
<div id="swPoints" class="points pointsInner">
758+
<div class="prizesInner">
759+
<label class="first">1st Place</label>
760+
<span class="dw">Pt.</span>
761+
<input type="text" id="point1" class="pointsInput" value="" />
762+
<label class="second">2nd Place</label>
763+
<span class="dw">Pt.</span>
764+
<input type="text" id="point2" class="pointsInput" value="" />
765+
<a href="javascript:;" class="addButton addPoint"><span class="hide">ADD</span></a>
766+
</div>
767+
768+
<div id="extraPoints" class="prizesInner extraPoints hide">
769+
<label class="first">3rd Place</label>
770+
<span class="dw">Pt.</span>
771+
<input type="text" id="point3" class="pointsInput" value="" />
772+
<label class="first">4th Place</label>
773+
<span class="dw">Pt.</span>
774+
<input type="text" id="point4" class="pointsInput" value="" />
775+
<label class="first">5th Place</label>
776+
<span class="dw">Pt.</span>
777+
<input type="text" id="point5" class="pointsInput" value="" />
778+
<label class="third">&nbsp;</label>
779+
<span class="dw">&nbsp;</span>
780+
<a href="javascript:;" class="removeButton removePoint"><span class="hide">REMOVE</span></a>
781+
</div>
782+
</div>
783+
<!-- end .points -->
784+
785+
<div class="clear"></div>
786+
787+
<p class="save">
788+
<a href="javascript:;" class="cancel_text_point">cancel</a>
789+
<a href="javascript:;"><img src="/images/save_change.png" alt="save" class="save_btn_point" /></a>
790+
</p>
791+
</div><!-- End .detailsContent -->
792+
</div>
793+
<!-- End Point Edit -->
794+
721795
<!-- Spec Display -->
722796
<div class="no_details contest_spec">
723797
<div class="caption_det_spec">

‎src/web/WEB-INF/includes/launch/orderReview.jsp‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<%--
22
- Author: TCSASSEMBER, Ghost_141
3-
- Version: 1.2
4-
- Copyright (C) 2010 - 2011 TopCoder Inc., All Rights Reserved.
3+
- Version: 1.3
4+
- Copyright (C) 2010 - 2018 TopCoder Inc., All Rights Reserved.
55
-
66
- Description: order review page for studio contest page.
77
-
@@ -11,6 +11,9 @@
1111
-
1212
- Version 1.2 - Release Assembly - TopCoder Cockpit Direct UI Text and Layout Bugs Termination 1.0 Change Note
1313
- - Fix multiple bugs.
14+
-
15+
- Version 1.3 - Topcoder - Support Points Prize Type For Challenges
16+
- - Add "Challenge Points" section.
1417
--%>
1518
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
1619

@@ -62,6 +65,10 @@
6265
<div class="contestDetails">
6366

6467
<h2 class="sectionHead">Challenge Details</h2>
68+
<h3>Challenge Points</h3>
69+
<table class="prizesTable" id="orPointsTable">
70+
<tbody><tr></tr></tbody>
71+
</table>
6572
<h3>Challenge Prizes</h3>
6673
<table class="prizesTable">
6774
<tr id='orPrizesTR'>
@@ -122,4 +129,4 @@
122129
<a href="javascript:;" class="specrev-goto">Go to my Spec Review</a>
123130
<p></p>
124131
<br /><br /><br />
125-
</div>
132+
</div>

0 commit comments

Comments
 (0)