From 6aeb2829c299b2087e9bff389777a4accc4094fb Mon Sep 17 00:00:00 2001 From: Thabo Date: Wed, 13 May 2015 15:52:57 -0700 Subject: [PATCH 1/2] allow sorting in active and upcoming challenges --- actions/challenges.js | 3 ++- queries/get_active_challenges | 4 +++- queries/get_upcoming_challenges | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/actions/challenges.js b/actions/challenges.js index b9952d86d..e03414f49 100755 --- a/actions/challenges.js +++ b/actions/challenges.js @@ -3670,7 +3670,8 @@ var getChallenges = function (api, connection, listType, isMyChallenges, next) { } } - sortOrder = query.sortorder || "desc"; + sortOrder = query.sortorder || + (!query.sortcolumn && (listType == api.helper.ListType.ACTIVE || listType == api.helper.ListType.UPCOMING) ? "asc" : "desc"); sortColumn = query.sortcolumn || DEFAULT_SORT_COLUMN; pageIndex = Number(query.pageindex || 1); pageSize = Number(query.pagesize || 150); diff --git a/queries/get_active_challenges b/queries/get_active_challenges index 07053bad9..f8a6e9635 100644 --- a/queries/get_active_challenges +++ b/queries/get_active_challenges @@ -1,4 +1,6 @@ SELECT +SKIP @first_row_index@ +FIRST @page_size@ CASE WHEN (p.project_studio_spec_id IS NOT NULL) THEN 1 ELSE 0 END AS is_studio , pcl.description AS challenge_type , pn.value AS challenge_name @@ -71,4 +73,4 @@ AND pp1.phase_status_id IN (2, 3) AND pi1.project_info_type_id = 1 -- external reference id AND pi1.project_id = p.project_id -ORDER BY NVL(pp2.actual_end_time, pp2.scheduled_end_time) ASC +ORDER BY @sort_column@ @sort_order@ diff --git a/queries/get_upcoming_challenges b/queries/get_upcoming_challenges index 35f4903c6..30f5bcaf2 100644 --- a/queries/get_upcoming_challenges +++ b/queries/get_upcoming_challenges @@ -68,4 +68,4 @@ AND pp1.scheduled_start_time < CURRENT + 90 UNITS DAY AND pi1.project_info_type_id = 1 -- external reference id AND pi1.project_id = p.project_id -ORDER BY pp2.scheduled_end_time ASC +ORDER BY @sort_column@ @sort_order@ From 504d4b02cb87fab960068e40d70090ef8c738d5b Mon Sep 17 00:00:00 2001 From: Thabo Date: Wed, 13 May 2015 15:53:21 -0700 Subject: [PATCH 2/2] fix sort columns for total prize and first place prize --- initializers/helper.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/initializers/helper.js b/initializers/helper.js index 55389269f..466d970b1 100644 --- a/initializers/helper.js +++ b/initializers/helper.js @@ -261,7 +261,7 @@ var apiName2dbNameMap = { currentphaseremainingtime: 'current_phase_remaining_time', currentphasename: 'current_phase_name', registrationopen: 'registration_open', - totalPrize: 'total_prize', + totalprize: 'total_prize', registrationstartdate: 'registration_start_date', challengecommunity: 'challenge_community', problemid: 'problem_id', @@ -280,7 +280,8 @@ var apiName2dbNameMap = { challengestarttime: "challenge_start_time", challengeendtime: "challenge_end_time", systeststarttime: "systest_start_time", - systestendtime: "systest_end_time" + systestendtime: "systest_end_time", + firstplaceprize: "first_place_prize" }; /**