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

Commit 2f72b48

Browse files
ajeftsajefts
committed
Merge pull request #125 from skyhit/cleanup_challenge_type_list
cleanup challenge type list
2 parents 1f432aa + 0525a09 commit 2f72b48

File tree

3 files changed

+36
-30
lines changed

3 files changed

+36
-30
lines changed

‎src/web/scripts/launch/contestDetailSoftware.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,9 @@ function initContest(contestJson) {
717717
//general initialization
718718
// populate the select option for software group
719719
$.each(projectCategoryArray, function (i, projectCategory) {
720+
if (projectCategory.hideInDropdown) {
721+
return;
722+
}
720723
// not show copilot contest type
721724
if (isSoftware && projectCategory.id != 29 && projectCategory.id != 37 && projectCategory.typeId != 3) {
722725
if ($("optgroup[label='Software']").length > 0) {

‎src/web/scripts/launch/entity.js‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -192,37 +192,37 @@ var ALGORITHM_CATEGORY_ID_MARATHON = 37;
192192
var STUDIO_IDEA_GENERATION = 22;
193193

194194
var DRAFT_STATUS = "Draft";
195-
195+
196196
var projectCategoryArray = [
197-
{id:SOFTWARE_CATEGORY_ID_CONCEPT, name:'CONCEPTUALIZATION', label:'Software Conceptualization', typeId:2, typeName:'Application', hasMulti:true},
198-
{id:SOFTWARE_CATEGORY_ID_SPEC, name:'SPECIFICATION', label:'Software Specification', typeId:2, typeName:'Application', hasMulti:true},
199-
{id:7, name:'ARCHITECTURE', label:'Architecture', typeId:2, typeName:'Application', hasMulti:true},
200-
{id:SOFTWARE_CATEGORY_ID_DESIGN, name:'DESIGN', label:'Component Design', typeId:1, typeName:'Component', hasMulti:false},
201-
{id:SOFTWARE_CATEGORY_ID_DEVELOPMENT, name:'DEVELOPMENT', label:'Component Development', typeId:1, typeName:'Component', hasMulti:false},
202-
{id:25, name:'RIACOMPONENT', label:'RIA Component', typeId:2, typeName:'Application', hasMulti:true},
203-
{id:24, name:'RIABUILD', label:'RIA Build', typeId:2, typeName:'Application', hasMulti:true},
204-
{id:19, name:'UIPROTOTYPE', label:'UI Prototype', typeId:2, typeName:'Application', hasMulti:true},
205-
{id:SOFTWARE_CATEGORY_ID_ASSEMBLY, name:'SOFTWARE ASSEMBLY', label:'Software Assembly', typeId:2, typeName:'Application', hasMulti:true},
206-
{id:13, name:'TESTSUITES', label:'Test Suites', typeId:2, typeName:'Application', hasMulti:true},
207-
{id:26, name:'TESTSCENARIOS', label:'Test Scenarios', typeId:2, typeName:'Application', hasMulti:true},
208-
{id:29, name:'Copilot Posting', label:'Copilot Posting', typeId:2, typeName:'Application', hasMulti:false},
209-
{id:SOFTWARE_CATEGORY_ID_CONTENT, name:'Content Creation', label:'Content Creation', typeId:2, typeName:'Application', hasMulti:true},
210-
{id:17, name:'Web Design', label:'Web Design', typeId:3, typeName:'Studio', hasMulti:true},
211-
{id:STUDIO_CATEGORY_ID_DESIGN_F2F, name:'Design First2Finish', label:'Design First2Finish', typeId:3, typeName:'Studio', hasMulti:false},
212-
{id:20, name:'Logo Design', label:'Logo Design', typeId:3, typeName:'Studio', hasMulti:true},
213-
{id:16, name:'Banners/Icons', label:'Banners/Icons', typeId:3, typeName:'Studio', hasMulti:true},
214-
{id:32, name:'Application Front-End Design', label:'Application Front-End Design', typeId:3, typeName:'Studio', hasMulti:true},
215-
{id:30, name:'Widget or Mobile Screen Design', label:'Widget or Mobile Screen Design', typeId:3, typeName:'Studio', hasMulti:true},
216-
{id:31, name:'Front-End Flash', label:'Front-End Flash', typeId:3, typeName:'Studio', hasMulti:true},
217-
{id:21, name:'Print/Presentation', label:'Print/Presentation', typeId:3, typeName:'Studio', hasMulti:true},
218-
{id:34, name:'Studio Other', label:'Studio Other', typeId:3, typeName:'Studio', hasMulti:true},
219-
{id:18, name:'Wireframes', label:'Wireframes', typeId:3, typeName:'Studio', hasMulti:true},
220-
{id:22, name:'Idea Generation', label:'Idea Generation', typeId:3, typeName:'Studio', hasMulti:true},
221-
{id:36, name:'REPORTING', label:'Reporting', typeId:2, typeName:'Application', hasMulti:true},
222-
{id:ALGORITHM_CATEGORY_ID_MARATHON, name:'Marathon Match', label:'Marathon Match', typeId:2, typeName:'Application', hasMulti:false},
223-
{id:SOFTWARE_CATEGORY_ID_BUG_HUNT, name:'Bug Hunt', label:'Bug Hunt', typeId:2, typeName:'Application', hasMulti:false},
224-
{id:SOFTWARE_CATEGORY_ID_F2F, name:'First2Finish', label:'First2Finish', typeId:2, typeName:'Application', hasMulti:false},
225-
{id:SOFTWARE_CATEGORY_ID_CODE, name:'Code', label:'Code', typeId:2, typeName:'Application', hasMulti:false}
197+
{id:SOFTWARE_CATEGORY_ID_CONCEPT, name:'CONCEPTUALIZATION', label:'Software Conceptualization', typeId:2, typeName:'Application', hasMulti:true, hideInDropdown: true},
198+
{id:SOFTWARE_CATEGORY_ID_SPEC, name:'SPECIFICATION', label:'Software Specification', typeId:2, typeName:'Application', hasMulti:true, hideInDropdown: true},
199+
{id:7, name:'ARCHITECTURE', label:'Architecture', typeId:2, typeName:'Application', hasMulti:true, hideInDropdown: false},
200+
{id:SOFTWARE_CATEGORY_ID_DESIGN, name:'DESIGN', label:'Component Design', typeId:1, typeName:'Component', hasMulti:false, hideInDropdown: true},
201+
{id:SOFTWARE_CATEGORY_ID_DEVELOPMENT, name:'DEVELOPMENT', label:'Component Development', typeId:1, typeName:'Component', hasMulti:false, hideInDropdown: true},
202+
{id:25, name:'RIACOMPONENT', label:'RIA Component', typeId:2, typeName:'Application', hasMulti:true, hideInDropdown: true},
203+
{id:24, name:'RIABUILD', label:'RIA Build', typeId:2, typeName:'Application', hasMulti:true, hideInDropdown: true},
204+
{id:19, name:'UIPROTOTYPE', label:'UI Prototype', typeId:2, typeName:'Application', hasMulti:true, hideInDropdown: false},
205+
{id:SOFTWARE_CATEGORY_ID_ASSEMBLY, name:'SOFTWARE ASSEMBLY', label:'Software Assembly', typeId:2, typeName:'Application', hasMulti:true, hideInDropdown: false},
206+
{id:13, name:'TESTSUITES', label:'Test Suites', typeId:2, typeName:'Application', hasMulti:true, hideInDropdown: false},
207+
{id:26, name:'TESTSCENARIOS', label:'Test Scenarios', typeId:2, typeName:'Application', hasMulti:true, hideInDropdown: true},
208+
{id:29, name:'Copilot Posting', label:'Copilot Posting', typeId:2, typeName:'Application', hasMulti:false, hideInDropdown: true},
209+
{id:SOFTWARE_CATEGORY_ID_CONTENT, name:'Content Creation', label:'Content Creation', typeId:2, typeName:'Application', hasMulti:true, hideInDropdown: true},
210+
{id:17, name:'Web Design', label:'Web Design', typeId:3, typeName:'Studio', hasMulti:true, hideInDropdown: false},
211+
{id:STUDIO_CATEGORY_ID_DESIGN_F2F, name:'Design First2Finish', label:'Design First2Finish', typeId:3, typeName:'Studio', hasMulti:false, hideInDropdown: false},
212+
{id:20, name:'Logo Design', label:'Logo Design', typeId:3, typeName:'Studio', hasMulti:true, hideInDropdown: true},
213+
{id:16, name:'Banners/Icons', label:'Banners/Icons', typeId:3, typeName:'Studio', hasMulti:true, hideInDropdown: true},
214+
{id:32, name:'Application Front-End Design', label:'Application Front-End Design', typeId:3, typeName:'Studio', hasMulti:true, hideInDropdown: false},
215+
{id:30, name:'Widget or Mobile Screen Design', label:'Widget or Mobile Screen Design', typeId:3, typeName:'Studio', hasMulti:true, hideInDropdown: false},
216+
{id:31, name:'Front-End Flash', label:'Front-End Flash', typeId:3, typeName:'Studio', hasMulti:true, hideInDropdown: true},
217+
{id:21, name:'Print/Presentation', label:'Print/Presentation', typeId:3, typeName:'Studio', hasMulti:true, hideInDropdown: false},
218+
{id:34, name:'Studio Other', label:'Studio Other', typeId:3, typeName:'Studio', hasMulti:true, hideInDropdown: true},
219+
{id:18, name:'Wireframes', label:'Wireframes', typeId:3, typeName:'Studio', hasMulti:true, hideInDropdown: false},
220+
{id:22, name:'Idea Generation', label:'Idea Generation', typeId:3, typeName:'Studio', hasMulti:true, hideInDropdown: false},
221+
{id:36, name:'REPORTING', label:'Reporting', typeId:2, typeName:'Application', hasMulti:true, hideInDropdown: true},
222+
{id:ALGORITHM_CATEGORY_ID_MARATHON, name:'Marathon Match', label:'Marathon Match', typeId:2, typeName:'Application', hasMulti:false, hideInDropdown: false},
223+
{id:SOFTWARE_CATEGORY_ID_BUG_HUNT, name:'Bug Hunt', label:'Bug Hunt', typeId:2, typeName:'Application', hasMulti:false, hideInDropdown: false},
224+
{id:SOFTWARE_CATEGORY_ID_F2F, name:'First2Finish', label:'First2Finish', typeId:2, typeName:'Application', hasMulti:false, hideInDropdown: false},
225+
{id:SOFTWARE_CATEGORY_ID_CODE, name:'Code', label:'Code', typeId:2, typeName:'Application', hasMulti:false, hideInDropdown: false}
226226
];
227227

228228
/**

‎src/web/scripts/launchcontest.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,9 @@ $(document).ready(function() {
445445
// initialize selects
446446
// populate the select option for software group
447447
$.each(projectCategoryArray, function(i, projectCategory) {
448+
if (projectCategory.hideInDropdown) {
449+
return;
450+
}
448451
// not show copilot contest type
449452
if (projectCategory.id != 29 && projectCategory.id != ALGORITHM_CATEGORY_ID_MARATHON && projectCategory.typeId != 3) {
450453
$("<option/>").val("SOFTWARE" + projectCategory.id).text(projectCategory.label).appendTo("optgroup[label='Development']");

0 commit comments

Comments
 (0)