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

Commit 47733e4

Browse files
skyhitskyhit
committed
merge latest dev
2 parents 916dcff + 81a5996 commit 47733e4

File tree

14 files changed

+218
-121
lines changed

14 files changed

+218
-121
lines changed

‎build.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@
8686
<property name="dist_envsetupdir" value="${build_distdir}/envsetup"/>
8787
<property name="tokenized_conf" value="${builddir}/conf"/>
8888

89+
<property name="jQ_1_11_1_jsp" value="jq_1_11_1.jsp"/>
90+
8991
<!-- classes needed to compile the production code -->
9092
<path id="buildlibs">
9193
<path refid="component.tcs-dependencies"/>
@@ -104,6 +106,7 @@
104106
<include name="**/*"/>
105107
</fileset>
106108
</copy>
109+
<copy todir="${tokenized_conf}" file="${webdir}/WEB-INF/includes/${jQ_1_11_1_jsp}" overwrite="true"/>
107110
<replace replacefilterfile="token.properties" dir="${tokenized_conf}"/>
108111
</target>
109112

@@ -580,6 +583,7 @@
580583
<include name="jboss-cache/jgroups.jar" />
581584
</fileset>
582585
</copy>
586+
<copy todir="${jboss_deploy_dir}/${distfilename}.ear/${distfilename}.war/WEB-INF/includes" file="${tokenized_conf}/${jQ_1_11_1_jsp}"/>
583587
</target>
584588

585589
<target name="first_deploy" depends="clean, deploy-jboss-files, deploy-static-files, deploy" description="setup the local clean jboss instance to run the direct application">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4520,7 +4520,7 @@ public SoftwareCompetition updateSoftwareContest(TCSubject tcSubject, SoftwareCo
45204520
public SoftwareCompetition updateSoftwareContest(TCSubject tcSubject, SoftwareCompetition contest,
45214521
long tcDirectProjectId, Date multiRoundEndDate, Date endDate) throws ContestServiceException, PermissionServiceException {
45224522

4523-
return updateSoftwareContest(tcSubject, contest, tcDirectProjectId, null, null, null);
4523+
return updateSoftwareContest(tcSubject, contest, tcDirectProjectId, null, multiRoundEndDate, endDate);
45244524
}
45254525

45264526
/**

‎src/java/main/com/topcoder/direct/services/view/ajax/SoftwareCompetitionBeanProcessor.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,15 @@
126126
* </ul>
127127
* </p>
128128
*
129+
* <p>
130+
* Version 2.5 (TOPCODER - SUPPORT TYPEAHEAD FOR TASK ASSIGNEES IN DIRECT APP)
131+
* <ul>
132+
* <li>Refactor registrants response</li>
133+
* </ul>
134+
* </p>
135+
*
129136
* @author BeBetter, TCSDEVELOPER, morehappiness, bugbuka, GreatKevin, TCSCODER
130-
* @version 2.4
137+
* @version 2.5
131138
* @since Direct - View/Edit/Activate Software Contests Assembly
132139
*/
133140
public class SoftwareCompetitionBeanProcessor implements JsonBeanProcessor {
@@ -251,7 +258,7 @@ private Object getMapResult(SoftwareCompetition bean) {
251258
if(r.getResourceRole().getId() == ResourceRole.RESOURCE_ROLE_SUBMITTER) {
252259
Map<String, String> user = new HashMap<String, String>();
253260
user.put("id", String.valueOf(r.getUserId()));
254-
user.put("handle", r.getProperty("Handle"));
261+
user.put("name", r.getProperty("Handle"));
255262
registrant.add(user);
256263
}
257264
// get reviewers

‎src/web/WEB-INF/contest-details2.jsp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<%--
2-
- Author: BeBetter, isv, GreatKevin, Ghost_141, Veve
2+
- Author: BeBetter, isv, GreatKevin, Ghost_141, Veve, TCSCODER
33
- Version: 1.11
4-
- Copyright (C) 2010 - 2016 TopCoder Inc., All Rights Reserved.
4+
- Copyright (C) 2010 - 2017 TopCoder Inc., All Rights Reserved.
55
-
66
- Description: Contest Detail page
77
-
@@ -30,6 +30,8 @@
3030
- - Update dashboard part to show the real time line graph.
3131
- Version 1.11 (TOPCODER DIRECT - CLOSE PRIVATE CHALLENGE IMMEDIATELY):
3232
- - Add CANCEL and CLOSE button on active private challenge
33+
- Version 1.12 (TOPCODER - SUPPORT TYPEAHEAD FOR TASK ASSIGNEES IN DIRECT APP):
34+
- - Split jquery import to other file
3335
--%>
3436
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
3537
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
@@ -41,9 +43,7 @@
4143
<script type="text/javascript" src="/scripts/jquery-1.11.1.min.js"></script>
4244
<script type="text/javascript" src="/scripts/bootstrap.min.js"></script>
4345
<script type="text/javascript" src="/scripts/magicsuggest.js"></script>
44-
<script type="text/javascript">
45-
var jQuery_1_11_1 = $.noConflict(true);
46-
</script>
46+
<jsp:include page="includes/jq_1_11_1.jsp"/>
4747
<jsp:include page="includes/htmlhead.jsp"/>
4848
<!--[if IE 7]>
4949
<link rel="stylesheet" type="text/css" media="screen" href="/css/direct/dashboard-ie7.css" />

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<%--
2-
- Version: 2.8
2+
- Version: 2.9
33
- Copyright (C) 2010 - 2017 TopCoder Inc., All Rights Reserved.
44
-
55
- Description: Edit Tab for studio contest detail page
@@ -60,6 +60,9 @@
6060
-
6161
- Version 2.8 (TOPCODER - SUPPORT CUSTOM COPILOT FEE FOR CHALLENGE IN DIRECT APP):
6262
- Add support for custom copilot fee
63+
-
64+
- Version 2.9 (TOPCODER - SUPPORT TYPEAHEAD FOR TASK ASSIGNEES IN DIRECT APP):
65+
- - Move task assign member to use magicSuggest
6366
--%>
6467
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
6568

@@ -320,12 +323,14 @@
320323
</div>
321324
<br />
322325
<div id="preRegisterUsersEditDiv" class="hide">
323-
<span class="name fixWidthName" title="Enter 1 or more members in a comma separated list. Member terms will be validated upon saving."><strong>Assign Member(s):</strong></span>
324-
<span class="value"><input type="text" name="preRegisterUsers" class="bigin" id="preRegisterUsers"/></span>
326+
<div class="ms-group-display">
327+
<span class="name fixWidthName" title="Enter 1 or more members in a comma separated list. Member terms will be validated upon saving."><strong>Assign Member(s):</strong></span>
328+
<div class="ms-group-div"><div id="preRegisterUsers"></div></div>
329+
</div>
325330
</div>
326-
<div id="groupDisplay">
331+
<div class="ms-group-display">
327332
<span class="name fixWidthName" title="Enter challenge groups"><strong>Group(s):</strong></span>
328-
<div id="groupDiv"><div id="groups"></div></div>
333+
<div class="ms-group-div"><div id="groups"></div></div>
329334
</div>
330335
<br/><br/>
331336
<span class="name fixWidthName"><strong>Created By</strong></span>

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<%--
2-
- Version: 3.1
2+
- Version: 3.2
33
- Copyright (C) 2010 - 2017 TopCoder Inc., All Rights Reserved.
44
-
55
- Description: This page fragment renders edit softeware contest page.
@@ -81,6 +81,9 @@
8181
-
8282
- Version 3.1 (TOPCODER - SUPPORT CUSTOM COPILOT FEE FOR CHALLENGE IN DIRECT APP):
8383
- Add support for custom copilot fee
84+
-
85+
- Version 3.2 (TOPCODER - SUPPORT TYPEAHEAD FOR TASK ASSIGNEES IN DIRECT APP):
86+
- - Move task assign member to use magicSuggest
8487
--%>
8588
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
8689

@@ -343,12 +346,14 @@
343346
<input type="checkbox" name="privateProject" id="privateProject"/>
344347
</div>
345348
<div id="preRegisterUsersEditDiv" class="hide">
346-
<span class="name fixWidthName" title="Enter 1 or more members in a comma separated list. Member terms will be validated upon saving."><strong>Assign Member(s):</strong></span>
347-
<span class="value"><input type="text" name="preRegisterUsers" class="bigin" id="preRegisterUsers"/></span>
349+
<div class="ms-group-display">
350+
<span class="name fixWidthName" title="Enter 1 or more members in a comma separated list. Member terms will be validated upon saving."><strong>Assign Member(s):</strong></span>
351+
<div class="ms-group-div"><div id="preRegisterUsers"></div></div>
352+
</div>
348353
</div>
349-
<div id="groupDisplay">
354+
<div class="ms-group-display">
350355
<span class="name fixWidthName" title="Enter challenge groups"><strong>Group(s):</strong></span>
351-
<div class="groupDiv"><div id="groups"></div></div>
356+
<div class="ms-group-div"><div id="groups"></div></div>
352357
</div>
353358
<br/>
354359
<div>

‎src/web/WEB-INF/includes/jq_1_11_1.jsp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<%--
2+
- Version: 1.0
3+
- Copyright (C) 2017 TopCoder Inc., All Rights Reserved.
4+
-
5+
- Description: Html fragment to import jquery 1.11.1 and setup other variable
6+
--%>
7+
<script type="text/javascript">
8+
var jQuery_1_11_1 = $.noConflict(true);
9+
var member_api_url = "@memberSearchApiUrl@";
10+
</script>

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<%--
22
- Author: GreatKevin, bugbuka, GreatKevin, TCSCODER
3-
- Version: 2.6
4-
- Copyright (C) 2010 - 2016 TopCoder Inc., All Rights Reserved.
3+
- Version: 2.7
4+
- Copyright (C) 2010 - 2017 TopCoder Inc., All Rights Reserved.
55
-
66
- Description: Contest selection page.
77
@@ -50,6 +50,9 @@
5050
- Added registration and submission end date/time for design F2F
5151
- Added registration length for studio contests (excluding design F2F)
5252
- All software contests support modification of registration and submission end date/time
53+
-
54+
- Version 2.7 (TOPCODER - SUPPORT TYPEAHEAD FOR TASK ASSIGNEES IN DIRECT APP):
55+
- - Move task assign member to use magicSuggest
5356
--%>
5457
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
5558

@@ -202,13 +205,15 @@
202205
<input type="checkbox" name="privateProject" title="Is this challenge private?">
203206
</div>
204207

205-
<div class="row preRegisterUsersRow hide">
208+
<div class="ms-row preRegisterUsersRow hide">
206209
<label>Assign Member(s):</label>
207-
<input name="preRegisterUsers" type="text" class="text"/>
210+
<div class="ms-group-div">
211+
<div id="preRegisterUsers"></div>
212+
</div>
208213
</div>
209214
<div class="ms-row">
210215
<label>Group(s):</label>
211-
<div class="groupDiv">
216+
<div class="ms-group-div">
212217
<div id="groups"></div>
213218
</div>
214219
</div>

‎src/web/WEB-INF/launch-contest.jsp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<%--
2-
- Author: bugbuka
3-
- Version: 1.3
4-
- Copyright (C) 2011 - 2013 TopCoder Inc., All Rights Reserved.
2+
- Author: bugbuka, TCSCODER
3+
- Version: 1.4
4+
- Copyright (C) 2011 - 2017 TopCoder Inc., All Rights Reserved.
55
-
66
- Description: This page provides function of creating project in dashboard.
77
-
@@ -13,6 +13,8 @@
1313
- Version 1.3 (Release Assembly - TopCoder Cockpit - Launch Contest Update for Marathon Match) changes:
1414
- - Update to support launching mm contest.
1515
-
16+
- Version 1.4 (TOPCODER - SUPPORT TYPEAHEAD FOR TASK ASSIGNEES IN DIRECT APP):
17+
- - Split jquery import to other file
1618
--%>
1719
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
1820
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
@@ -24,9 +26,7 @@
2426
<script type="text/javascript" src="/scripts/jquery-1.11.1.min.js"></script>
2527
<script type="text/javascript" src="/scripts/bootstrap.min.js"></script>
2628
<script type="text/javascript" src="/scripts/magicsuggest.js"></script>
27-
<script type="text/javascript">
28-
var jQuery_1_11_1 = $.noConflict(true);
29-
</script>
29+
<jsp:include page="includes/jq_1_11_1.jsp"/>
3030
<jsp:include page="includes/htmlhead.jsp"/>
3131
<link rel="stylesheet" href="/css/direct/projectMilestone.css" media="all" type="text/css" />
3232

‎src/web/css/direct/launchcontest.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3193,7 +3193,7 @@ div#winnerDiv {
31933193
padding-top: 7px;
31943194
}
31953195

3196-
.groupDiv{
3196+
.ms-group-div{
31973197
border: 1px solid #CCC;
31983198
border-radius: 4px;
31993199
margin-left: 132px;
@@ -3207,15 +3207,15 @@ div#winnerDiv {
32073207
margin-top: 8px;
32083208
}
32093209

3210-
#groupDisplay .groupDiv{
3210+
.ms-group-display .ms-group-div{
32113211
margin-left: 150px;
32123212
}
32133213

3214-
div#groupDisplay {
3214+
div.ms-group-display {
32153215
margin-top: 20px;
32163216
}
32173217

3218-
div#groupDisplay .groupDiv{
3218+
div.ms-group-display .ms-group-div{
32193219
margin-top: 20px;
32203220
width: 293px;
32213221
}

0 commit comments

Comments
 (0)