From 6d67d13d876d6656fb6d9d4aba2fc8f239d1968a Mon Sep 17 00:00:00 2001 From: Thabo Date: Tue, 12 May 2015 13:12:35 -0700 Subject: [PATCH] add review type to upcoming and active software challenges --- queries/get_active_challenges | 4 ++++ queries/get_open_challenges | 5 +++++ queries/get_upcoming_challenges | 4 ++++ queries/search_software_studio_challenges | 4 ++++ 4 files changed, 17 insertions(+) diff --git a/queries/get_active_challenges b/queries/get_active_challenges index 68ea5b77a..07053bad9 100644 --- a/queries/get_active_challenges +++ b/queries/get_active_challenges @@ -4,6 +4,7 @@ SELECT , pn.value AS challenge_name , p.project_id AS challenge_id , pi4.value AS forum_id +, pi79.value AS review_type , (SELECT COUNT(*) FROM submission s1 INNER JOIN upload u1 ON s1.upload_id = u1.upload_id WHERE u1.project_id = p.project_id AND s1.submission_type_id = 1 @@ -41,6 +42,7 @@ FROM project p , outer project_phase nd_phase , project_category_lu pcl , outer project_info pi4 --forum id +, outer project_info pi79 , project_info pi1 -- external id WHERE p.project_status_id = pstatus.project_status_id AND p.project_id = pn.project_id @@ -56,6 +58,8 @@ AND pidr.project_info_type_id = 26 --digital run AND pi4.project_id = p.project_id AND pi4.project_info_type_id = 4 --forum id AND p.project_Id = nd_phase.project_id +AND pi79.project_info_type_id = 79 -- review type (COMMUNITY, INTERNAL, PEER) +AND pi79.project_id = p.project_id AND nd_phase.project_phase_id = (SELECT MIN(project_phase_id) FROM project_phase WHERE project_id = p.project_id AND phase_status_id = 2 AND phase_type_id IN (1,2,3,4,5,6,7,8,9,10,11,12)) AND p.project_category_id = pcl.project_category_id AND p.project_status_id = 1 diff --git a/queries/get_open_challenges b/queries/get_open_challenges index 4814d5a0a..47ff4ee5f 100644 --- a/queries/get_open_challenges +++ b/queries/get_open_challenges @@ -3,6 +3,7 @@ SELECT is_studio , challenge_name , challenge_id , forum_id +, review_type , num_submissions , num_registrants , number_of_checkpoints_prizes @@ -33,6 +34,7 @@ FIRST @page_size@ , pn.value AS challenge_name , p.project_id AS challenge_id , pi4.value AS forum_id +, pi79.value as review_type , (SELECT COUNT(*) FROM submission s1 INNER JOIN upload u1 ON s1.upload_id = u1.upload_id WHERE u1.project_id = p.project_id AND s1.submission_type_id = 1 @@ -66,6 +68,7 @@ FROM project p , outer project_phase nd_phase , project_category_lu pcl , outer project_info pi4 --forum id +, outer project_info pi79 , project_info pi1 -- external id WHERE p.project_status_id = pstatus.project_status_id AND p.project_id = pn.project_id @@ -80,6 +83,8 @@ AND pidr.project_id = p.project_id AND pidr.project_info_type_id = 26 --digital run AND pi4.project_id = p.project_id AND pi4.project_info_type_id = 4 --forum id +AND pi79.project_info_type_id = 79 -- review type (COMMUNITY, INTERNAL, PEER) +AND pi79.project_id = p.project_id AND p.project_Id = nd_phase.project_id AND nd_phase.project_phase_id = (SELECT MAX(project_phase_id) FROM project_phase WHERE project_id = p.project_id AND phase_status_id = 2 AND phase_type_id IN (1,2,3,4,5,6,7,8,9,10,11,12)) AND p.project_category_id = pcl.project_category_id diff --git a/queries/get_upcoming_challenges b/queries/get_upcoming_challenges index 7e5ab3101..35f4903c6 100644 --- a/queries/get_upcoming_challenges +++ b/queries/get_upcoming_challenges @@ -4,6 +4,7 @@ SELECT , pn.value AS challenge_name , p.project_id AS challenge_id , pi4.value AS forum_id +, pi79.value as review_type , NVL((SELECT SUM(pr.number_of_submissions) FROM prize pr WHERE pr.project_id = p.project_id AND pr.prize_type_id = 14), 0) AS number_of_checkpoints_prizes , (SELECT pr.prize_amount FROM prize pr WHERE pr.project_id = p.project_id AND pr.prize_type_id = 15 AND pr.place = 1) AS first_place_prize , (SELECT SUM(prize_amount) FROM prize pr WHERE pr.project_id = p.project_id AND pr.prize_type_id = 15) AS total_prize @@ -33,6 +34,7 @@ FROM project p , outer project_info pidr , project_category_lu pcl , outer project_info pi4 --forum id +, outer project_info pi79 , project_info pi1 -- external id WHERE p.project_status_id = pstatus.project_status_id AND p.project_id = pn.project_id @@ -47,6 +49,8 @@ AND pidr.project_id = p.project_id AND pidr.project_info_type_id = 26 --digital run AND pi4.project_id = p.project_id AND pi4.project_info_type_id = 4 --forum id +AND pi79.project_id = p.project_id +AND pi79.project_info_type_id = 79 -- review type (COMMUNITY, INTERNAL, PEER) AND pi32.project_id = p.project_id AND pi32.project_info_type_id = 32 AND pcl.project_type_id IN (@track@) diff --git a/queries/search_software_studio_challenges b/queries/search_software_studio_challenges index 48f850e67..0f148ac57 100644 --- a/queries/search_software_studio_challenges +++ b/queries/search_software_studio_challenges @@ -11,6 +11,7 @@ FIRST @pageSize@ , pc4.parameter AS review_scorecard_id , (select value from project_info pi70 where pi70.project_id = p.project_id and project_info_type_id = 70) AS cmc_task_id , pi4.value AS forum_id + , pi79.value as review_type , (SELECT COUNT(*) FROM submission s1 INNER JOIN upload u1 ON s1.upload_id = u1.upload_id WHERE u1.project_id = p.project_id AND s1.submission_type_id = 1 @@ -66,6 +67,7 @@ FIRST @pageSize@ , outer project_phase nd_phase , project_category_lu pcl , outer project_info pi4 --forum id + , outer project_info pi79 , project_info pi1 WHERE 1=1 AND p.project_status_id = pstatus.project_status_id @@ -94,6 +96,8 @@ FIRST @pageSize@ AND pidr.project_info_type_id = 26 --digital run AND pi4.project_id = p.project_id AND pi4.project_info_type_id = 4 --forum id + AND pi79.project_id = p.project_id + AND pi79.project_info_type_id = 79 -- review type (COMMUNITY, INTERNAL, PEER) AND p.project_Id = nd_phase.project_id AND nd_phase.phase_type_id = (SELECT MIN(phase_type_id) FROM project_phase WHERE project_id = p.project_id AND phase_status_id = 2 AND phase_type_id not in (13,14)) AND p.project_category_id = pcl.project_category_id