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

Commit 43234fe

Browse files
ajeftsajefts
authored
Merge pull request #294 from appirio-tech/dev
magic suggest integration and misc bug fixes
2 parents 9d931cc + 47733e4 commit 43234fe

22 files changed

+568
-558
lines changed

‎build.xml

+4
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">

‎circle.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
machine:
2+
services:
3+
- docker
4+
5+
dependencies:
6+
pre:
7+
- pip install --upgrade pip
8+
- pip install awsebcli
9+
10+
test:
11+
override:
12+
- docker run -v $PWD:/root/direct appiriodevops/direct-app:build2 /root/scripts/build.sh
13+
14+
#deployment:
15+
# development:
16+
# branch: ["dev", "group_ids_filtering"]
17+
# commands:
18+
# - .deploy/dockerhub_push.sh DEV $CIRCLE_BUILD_NUM
19+
# - .deploy/ebs_deploy.sh ap-challenge DEV $CIRCLE_BUILD_NUM
20+
# production:
21+
# branch: master
22+
# commands:
23+
# - .deploy/dockerhub_push.sh PROD $CIRCLE_BUILD_NUM
24+
# - .deploy/ebs_deploy.sh ap-challenge PROD $CIRCLE_BUILD_NUM

‎src/java/main/com/topcoder/direct/services/view/action/contest/launch/CommonAction.java

+2
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,8 @@ public String getContestConfigs() throws Exception {
326326
configs.put("copilotFees", ConfigUtils.getCopilotFees());
327327
configs.put("billingInfos", getBillingProjectInfos());
328328
configs.put("groups", getAllProjectGroups());
329+
configs.put("platforms", getReferenceDataBean().getPlatforms());
330+
configs.put("technologies", getReferenceDataBean().getTechnologies());
329331
setResult(configs);
330332
return SUCCESS;
331333
}

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

+18-11
Original file line numberDiff line numberDiff line change
@@ -118,16 +118,23 @@
118118
* <ul>
119119
* <li>Updated {@link #getMapResult(SoftwareCompetition)}include project groups of challenge</li>
120120
* </ul>
121-
*
122-
* <p>
123-
* Version 2.4 (Topcoder - Ability To Set End Date For Registration Phase and Submission Phase)
124-
* <ul>
125-
* <li>Added regEndDate in response</li>
126-
* </ul>
127-
* </p>
121+
*
122+
* <p>
123+
* Version 2.4 (Topcoder - Ability To Set End Date For Registration Phase and Submission Phase)
124+
* <ul>
125+
* <li>Added regEndDate in response</li>
126+
* </ul>
127+
* </p>
128+
*
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>
128135
*
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
@@ -293,15 +300,15 @@ public Object transform(Object object) {
293300
if (isTechnologyContest(bean)) {
294301
result.put("technologyIds", CollectionUtils.collect(assetDTO.getTechnologies(), new Transformer() {
295302
public Object transform(Object object) {
296-
return ((Technology) object).getId() + "";
303+
return ((Technology) object).getId();
297304
}
298305
}));
299306
}
300307

301308
if(isPlatformContest(bean)) {
302309
result.put("platformIds", CollectionUtils.collect(bean.getProjectHeader().getPlatforms(), new Transformer() {
303310
public Object transform(Object object) {
304-
return ((ProjectPlatform) object).getId() + "";
311+
return ((ProjectPlatform) object).getId();
305312
}
306313
}));
307314
}

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

+5-5
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

+10-5
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

+16-47
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,14 +346,16 @@
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 id="groupDiv"><div id="groups"></div></div>
356+
<div class="ms-group-div"><div id="groups"></div></div>
352357
</div>
353-
<br/><br/>
358+
<br/>
354359
<div>
355360

356361
<span class="name fixWidthName"><strong>Created By</strong></span>
@@ -894,53 +899,17 @@
894899
<!-- end .guidelines -->
895900

896901
<s:if test='result.projectHeader.projectCategory.id != 29'>
897-
898902
<div class="prizes platform" id="swPlatformDiv">
899903
<h3>Choose Your Platform:</h3>
900-
901-
<div class="prizesInner_tech">
902-
<span class="head_font">Master Platforms&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
903-
<span class="head_font_space">Your Project Platforms</span>
904-
<br />
905-
<select multiple id="masterPlatformsSelect">
906-
<s:iterator value="referenceDataBean.platforms">
907-
<option value='<s:property value="id" />'><s:property value="name" /></option>
908-
</s:iterator>
909-
</select>
910-
911-
<div id="button_platform">
912-
<img src="/images/add_tech.png" alt="add" id="addPlatforms" />
913-
<br /><br />
914-
<img src="/images/remove_tech.png" alt="remove" id="removePlatforms" />
915-
</div>
916-
917-
<select multiple id="masterPlatformsChoosenSelect">
918-
</select>
904+
<div class="techPlatformDiv">
905+
<div id="platforms"></div>
919906
</div>
920907
</div>
921908

922-
923-
<div class="prizes technology" id="swTechnologyDiv">
909+
<div class="prizes technology" id="swTechnologyDiv">
924910
<h3>Choose Your Technology:</h3>
925-
926-
<div class="prizesInner_tech">
927-
<span class="head_font">Master Technologies</span>
928-
<span class="head_font_space">Your Project Technologies</span>
929-
<br />
930-
<select multiple id="masterTechnologiesSelect">
931-
<s:iterator value="referenceDataBean.technologies">
932-
<option value='<s:property value="id" />'><s:property value="name" /></option>
933-
</s:iterator>
934-
</select>
935-
936-
<div id="button_tech">
937-
<img src="/images/add_tech.png" alt="add" id="addTechnologies" />
938-
<br /><br />
939-
<img src="/images/remove_tech.png" alt="remove" id="removeTechnologies" />
940-
</div>
941-
942-
<select multiple id="masterTechnologiesChoosenSelect">
943-
</select>
911+
<div class="techPlatformDiv">
912+
<div id="technologies"></div>
944913
</div>
945914
</div>
946915

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

+10
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

+17-12
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
@@ -45,11 +45,14 @@
4545
- - Add review type radios to choose 'community' or 'internal' review
4646
- Version 2.2 (Provide Way To Pre_register members When Launching Challenge)
4747
- - Add support pre-register member
48-
-
49-
- Version 2.6 (Topcoder - Ability To Set End Date For Registration Phase and Submission Phase)
50-
- Added registration and submission end date/time for design F2F
51-
- Added registration length for studio contests (excluding design F2F)
52-
- All software contests support modification of registration and submission end date/time
48+
-
49+
- Version 2.6 (Topcoder - Ability To Set End Date For Registration Phase and Submission Phase)
50+
- Added registration and submission end date/time for design F2F
51+
- Added registration length for studio contests (excluding design F2F)
52+
- 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>
209-
<div class="row">
214+
<div class="ms-row">
210215
<label>Group(s):</label>
211-
<div id="groupDiv">
216+
<div class="ms-group-div">
212217
<div id="groups"></div>
213218
</div>
214219
</div>
@@ -267,7 +272,7 @@
267272
pattern="z" timeZone="${defaultTimeZone}"/></span>
268273
</div>
269274

270-
275+
271276
<div id="subEndDateDiv" class="row software designF2F">
272277
<label>Submission End:</label>
273278
<input id="subEndDate" name="subEndDate" type="text" class="text date-pick" readonly="true"/>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
</tr>
9898
</table>
9999

100-
<tablec lass="total">
100+
<table lass="total">
101101
<tr>
102102
<p class="note">
103103
Note: Challenge prizes, costs, and fees in this section are estimates. <br>

0 commit comments

Comments
 (0)