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

Promote task exclusion updates to master #496

Merged
merged 7 commits into from
Mar 11, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion queries/get_active_challenges
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ AND pcl.project_category_id NOT IN (27, 37) --exclude when spec review was a 'co
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

AND not exists (select 1 from resource r, project_info pi82 where r.project_id = p.project_id and r.resource_role_id = 1 and p.project_id = pi82.project_id and project_info_type_id = 82 and pi82.value = 1) -- exclude assigned tasks
ORDER BY @sort_column@ @sort_order@
1 change: 1 addition & 0 deletions queries/get_open_challenges
Original file line number Diff line number Diff line change
Expand Up @@ -102,5 +102,6 @@ AND pn.value LIKE ('@challenge_name@')
AND NVL((SELECT pr.prize_amount FROM prize pr WHERE pr.project_id = p.project_id AND pr.prize_type_id = 15 AND pr.place = 1), 0) >= @prize_lower_bound@
AND NVL((SELECT pr.prize_amount FROM prize pr WHERE pr.project_id = p.project_id AND pr.prize_type_id = 15 AND pr.place = 1), 0) <= @prize_upper_bound@
AND p.tc_direct_project_id = DECODE(@project_id@, 0, p.tc_direct_project_id, @project_id@)
AND not exists (select 1 from resource r, project_info pi82 where r.project_id = p.project_id and r.resource_role_id = 1 and p.project_id = pi82.project_id and project_info_type_id = 82 and pi82.value = 1) -- exclude assigned tasks
ORDER BY @sort_column@ @sort_order@
)
1 change: 1 addition & 0 deletions queries/get_open_challenges_count
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ AND pn.value LIKE ('@challenge_name@')
AND NVL((SELECT pr.prize_amount FROM prize pr WHERE pr.project_id = p.project_id AND pr.prize_type_id = 15 AND pr.place = 1), 0) >= @prize_lower_bound@
AND NVL((SELECT pr.prize_amount FROM prize pr WHERE pr.project_id = p.project_id AND pr.prize_type_id = 15 AND pr.place = 1), 0) <= @prize_upper_bound@
AND p.tc_direct_project_id = DECODE(@project_id@, 0, p.tc_direct_project_id, @project_id@)
AND not exists (select 1 from resource r, project_info pi82 where r.project_id = p.project_id and r.resource_role_id = 1 and p.project_id = pi82.project_id and project_info_type_id = 82 and pi82.value = 1) -- exclude assigned tasks
1 change: 1 addition & 0 deletions queries/get_past_challenges
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,6 @@ AND LOWER(pn.value) LIKE('@challenge_name@')
AND NVL((SELECT pr.prize_amount FROM prize pr WHERE pr.project_id = p.project_id AND pr.prize_type_id = 15 AND pr.place = 1), 0) >= @prize_lower_bound@
AND NVL((SELECT pr.prize_amount FROM prize pr WHERE pr.project_id = p.project_id AND pr.prize_type_id = 15 AND pr.place = 1), 0) <= @prize_upper_bound@
AND p.tc_direct_project_id = DECODE(@project_id@, 0, p.tc_direct_project_id, @project_id@)
AND not exists (select 1 from resource r, project_info pi82 where r.project_id = p.project_id and r.resource_role_id = 1 and p.project_id = pi82.project_id and project_info_type_id = 82 and pi82.value = 1) -- exclude assigned tasks
ORDER BY @sort_column@ @sort_order@
)
1 change: 1 addition & 0 deletions queries/get_past_challenges_count
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ AND (not exists (select contest_id from contest_eligibility where contest_id = p
or exists(select contest_id from contest_eligibility ce, group_contest_eligibility gce, user_group_xref x
where x.login_id = @user_id@ AND x.group_id = gce.group_id AND gce.contest_eligibility_id = ce.contest_eligibility_id
AND ce.contest_id = p.project_id))
AND not exists (select 1 from resource r, project_info pi82 where r.project_id = p.project_id and r.resource_role_id = 1 and p.project_id = pi82.project_id and project_info_type_id = 82 and pi82.value = 1) -- exclude assigned tasks
2 changes: 1 addition & 1 deletion queries/get_upcoming_challenges
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,5 @@ AND pp1.scheduled_start_time > CURRENT
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

AND not exists (select 1 from resource r, project_info pi82 where r.project_id = p.project_id and r.resource_role_id = 1 and p.project_id = pi82.project_id and project_info_type_id = 82 and pi82.value = 1) -- exclude assigned tasks
ORDER BY @sort_column@ @sort_order@