Merge pull request #494 from appirio-tech/dev

modified active member count and active challenge count

Author: ajefts

queries/tc_direct_facts

@@ -1,14 +1,7 @@
 SELECT
     (SELECT count(unique p.project_id)
 FROM project p
-   ,project_phase submpp
-   ,project_phase regpp
-WHERE regpp.project_id = p.project_id
-AND regpp.phase_type_id = 1
-AND submpp.project_id = p.project_id
-AND submpp.phase_type_id = 2
-and p.project_status_id = 1
-AND (regpp.phase_status_id = 2)
+WHERE p.project_status_id = 1
 AND NOT EXISTS (SELECT 'has_eligibility_constraints' FROM contest_eligibility ce
 WHERE ce.contest_id = p.project_id)
 ) +
@@ -33,13 +26,13 @@ WHERE ce.contest_id = p.project_id)
 
     (select count (unique rur.user_id)
   from resource rur
-  	 , resource_info ri
+         , resource_info ri
      , project p
  where p.project_id = rur.project_id
   and rur.resource_id = ri.resource_id
-  and rur.resource_role_id = 1
+  and rur.resource_role_id in (1,2,3,4,5,6,7,8,9,14,18,19,20,21)
   and ri.resource_info_type_id = 1
-  and p.project_status_id = 1) AS active_members_count, 
+  and p.project_status_id = 1) AS active_members_count,
 
 (SELECT COUNT(*) 
   FROM user u