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

Commit be4fbde

Browse files
ajeftsajefts
authored
Merge pull request #300 from appirio-tech/revert-294-dev
Revert "magic suggest integration and misc bug fixes"
2 parents 91e445e + f93212e commit be4fbde

22 files changed

+558
-568
lines changed

‎build.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@
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-
9189
<!-- classes needed to compile the production code -->
9290
<path id="buildlibs">
9391
<path refid="component.tcs-dependencies"/>
@@ -106,7 +104,6 @@
106104
<include name="**/*"/>
107105
</fileset>
108106
</copy>
109-
<copy todir="${tokenized_conf}" file="${webdir}/WEB-INF/includes/${jQ_1_11_1_jsp}" overwrite="true"/>
110107
<replace replacefilterfile="token.properties" dir="${tokenized_conf}"/>
111108
</target>
112109

@@ -583,7 +580,6 @@
583580
<include name="jboss-cache/jgroups.jar" />
584581
</fileset>
585582
</copy>
586-
<copy todir="${jboss_deploy_dir}/${distfilename}.ear/${distfilename}.war/WEB-INF/includes" file="${tokenized_conf}/${jQ_1_11_1_jsp}"/>
587583
</target>
588584

589585
<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

Lines changed: 0 additions & 24 deletions
This file was deleted.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,6 @@ 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());
331329
setResult(configs);
332330
return SUCCESS;
333331
}

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

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -118,23 +118,16 @@
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>
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>
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>
135128
*
136129
* @author BeBetter, TCSDEVELOPER, morehappiness, bugbuka, GreatKevin, TCSCODER
137-
* @version 2.5
130+
* @version 2.4
138131
* @since Direct - View/Edit/Activate Software Contests Assembly
139132
*/
140133
public class SoftwareCompetitionBeanProcessor implements JsonBeanProcessor {
@@ -258,7 +251,7 @@ private Object getMapResult(SoftwareCompetition bean) {
258251
if(r.getResourceRole().getId() == ResourceRole.RESOURCE_ROLE_SUBMITTER) {
259252
Map<String, String> user = new HashMap<String, String>();
260253
user.put("id", String.valueOf(r.getUserId()));
261-
user.put("name", r.getProperty("Handle"));
254+
user.put("handle", r.getProperty("Handle"));
262255
registrant.add(user);
263256
}
264257
// get reviewers
@@ -300,15 +293,15 @@ public Object transform(Object object) {
300293
if (isTechnologyContest(bean)) {
301294
result.put("technologyIds", CollectionUtils.collect(assetDTO.getTechnologies(), new Transformer() {
302295
public Object transform(Object object) {
303-
return ((Technology) object).getId();
296+
return ((Technology) object).getId() + "";
304297
}
305298
}));
306299
}
307300

308301
if(isPlatformContest(bean)) {
309302
result.put("platformIds", CollectionUtils.collect(bean.getProjectHeader().getPlatforms(), new Transformer() {
310303
public Object transform(Object object) {
311-
return ((ProjectPlatform) object).getId();
304+
return ((ProjectPlatform) object).getId() + "";
312305
}
313306
}));
314307
}

‎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, TCSCODER
2+
- Author: BeBetter, isv, GreatKevin, Ghost_141, Veve
33
- Version: 1.11
4-
- Copyright (C) 2010 - 2017 TopCoder Inc., All Rights Reserved.
4+
- Copyright (C) 2010 - 2016 TopCoder Inc., All Rights Reserved.
55
-
66
- Description: Contest Detail page
77
-
@@ -30,8 +30,6 @@
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
3533
--%>
3634
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
3735
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
@@ -43,7 +41,9 @@
4341
<script type="text/javascript" src="/scripts/jquery-1.11.1.min.js"></script>
4442
<script type="text/javascript" src="/scripts/bootstrap.min.js"></script>
4543
<script type="text/javascript" src="/scripts/magicsuggest.js"></script>
46-
<jsp:include page="includes/jq_1_11_1.jsp"/>
44+
<script type="text/javascript">
45+
var jQuery_1_11_1 = $.noConflict(true);
46+
</script>
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: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<%--
2-
- Version: 2.9
2+
- Version: 2.8
33
- Copyright (C) 2010 - 2017 TopCoder Inc., All Rights Reserved.
44
-
55
- Description: Edit Tab for studio contest detail page
@@ -60,9 +60,6 @@
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
6663
--%>
6764
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
6865

@@ -323,14 +320,12 @@
323320
</div>
324321
<br />
325322
<div id="preRegisterUsersEditDiv" class="hide">
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>
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>
330325
</div>
331-
<div class="ms-group-display">
326+
<div id="groupDisplay">
332327
<span class="name fixWidthName" title="Enter challenge groups"><strong>Group(s):</strong></span>
333-
<div class="ms-group-div"><div id="groups"></div></div>
328+
<div id="groupDiv"><div id="groups"></div></div>
334329
</div>
335330
<br/><br/>
336331
<span class="name fixWidthName"><strong>Created By</strong></span>

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

Lines changed: 47 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<%--
2-
- Version: 3.2
2+
- Version: 3.1
33
- Copyright (C) 2010 - 2017 TopCoder Inc., All Rights Reserved.
44
-
55
- Description: This page fragment renders edit softeware contest page.
@@ -81,9 +81,6 @@
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
8784
--%>
8885
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
8986

@@ -346,16 +343,14 @@
346343
<input type="checkbox" name="privateProject" id="privateProject"/>
347344
</div>
348345
<div id="preRegisterUsersEditDiv" class="hide">
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>
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>
353348
</div>
354-
<div class="ms-group-display">
349+
<div id="groupDisplay">
355350
<span class="name fixWidthName" title="Enter challenge groups"><strong>Group(s):</strong></span>
356-
<div class="ms-group-div"><div id="groups"></div></div>
351+
<div id="groupDiv"><div id="groups"></div></div>
357352
</div>
358-
<br/>
353+
<br/><br/>
359354
<div>
360355

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

901896
<s:if test='result.projectHeader.projectCategory.id != 29'>
897+
902898
<div class="prizes platform" id="swPlatformDiv">
903899
<h3>Choose Your Platform:</h3>
904-
<div class="techPlatformDiv">
905-
<div id="platforms"></div>
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>
906919
</div>
907920
</div>
908921

909-
<div class="prizes technology" id="swTechnologyDiv">
922+
923+
<div class="prizes technology" id="swTechnologyDiv">
910924
<h3>Choose Your Technology:</h3>
911-
<div class="techPlatformDiv">
912-
<div id="technologies"></div>
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>
913944
</div>
914945
</div>
915946

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

Lines changed: 0 additions & 10 deletions
This file was deleted.

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

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<%--
22
- Author: GreatKevin, bugbuka, GreatKevin, TCSCODER
3-
- Version: 2.7
4-
- Copyright (C) 2010 - 2017 TopCoder Inc., All Rights Reserved.
3+
- Version: 2.6
4+
- Copyright (C) 2010 - 2016 TopCoder Inc., All Rights Reserved.
55
-
66
- Description: Contest selection page.
77
@@ -45,14 +45,11 @@
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
53-
-
54-
- Version 2.7 (TOPCODER - SUPPORT TYPEAHEAD FOR TASK ASSIGNEES IN DIRECT APP):
55-
- - Move task assign member to use magicSuggest
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
5653
--%>
5754
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
5855

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

208-
<div class="ms-row preRegisterUsersRow hide">
205+
<div class="row preRegisterUsersRow hide">
209206
<label>Assign Member(s):</label>
210-
<div class="ms-group-div">
211-
<div id="preRegisterUsers"></div>
212-
</div>
207+
<input name="preRegisterUsers" type="text" class="text"/>
213208
</div>
214-
<div class="ms-row">
209+
<div class="row">
215210
<label>Group(s):</label>
216-
<div class="ms-group-div">
211+
<div id="groupDiv">
217212
<div id="groups"></div>
218213
</div>
219214
</div>
@@ -272,7 +267,7 @@
272267
pattern="z" timeZone="${defaultTimeZone}"/></span>
273268
</div>
274269

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
</tr>
9898
</table>
9999

100-
<table lass="total">
100+
<tablec 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)