# HG changeset patch
# User jbe
# Date 1360344982 -3600
# Node ID 48a5036d5eb11209301a1a2e457e95b321947582
# Parent  3a7f06a88ecb235de9e961336956e94d7dea838d
Require "satisfied" support for "admitted" initiatives when calculating "harmonic_weight"

diff -r 3a7f06a88ecb -r 48a5036d5eb1 core.sql
--- a/core.sql	Fri Feb 08 18:26:25 2013 +0100
+++ b/core.sql	Fri Feb 08 18:36:22 2013 +0100
@@ -3071,6 +3071,10 @@
     AND "direct_interest_snapshot"."member_id" = "direct_supporter_snapshot"."member_id"
   JOIN "initiative"
     ON "direct_supporter_snapshot"."initiative_id" = "initiative"."id"
+    AND (
+      "direct_supporter_snapshot"."satisfied" = TRUE OR
+      coalesce("initiative"."admitted", FALSE) = FALSE
+    )
     AND "initiative"."harmonic_weight" ISNULL
   GROUP BY
     "direct_interest_snapshot"."issue_id",
@@ -3095,6 +3099,10 @@
     AND "remaining_harmonic_supporter_weight"."member_id" = "direct_supporter_snapshot"."member_id"
   JOIN "initiative"
     ON "direct_supporter_snapshot"."initiative_id" = "initiative"."id"
+    AND (
+      "direct_supporter_snapshot"."satisfied" = TRUE OR
+      coalesce("initiative"."admitted", FALSE) = FALSE
+    )
     AND "initiative"."harmonic_weight" ISNULL
   GROUP BY
     "initiative"."issue_id",
diff -r 3a7f06a88ecb -r 48a5036d5eb1 update/core-update.v2.1.0-v2.1.1.sql
--- a/update/core-update.v2.1.0-v2.1.1.sql	Fri Feb 08 18:26:25 2013 +0100
+++ b/update/core-update.v2.1.0-v2.1.1.sql	Fri Feb 08 18:36:22 2013 +0100
@@ -27,6 +27,10 @@
     AND "direct_interest_snapshot"."member_id" = "direct_supporter_snapshot"."member_id"
   JOIN "initiative"
     ON "direct_supporter_snapshot"."initiative_id" = "initiative"."id"
+    AND (
+      "direct_supporter_snapshot"."satisfied" = TRUE OR
+      coalesce("initiative"."admitted", FALSE) = FALSE
+    )
     AND "initiative"."harmonic_weight" ISNULL
   GROUP BY
     "direct_interest_snapshot"."issue_id",
@@ -50,6 +54,10 @@
     AND "remaining_harmonic_supporter_weight"."member_id" = "direct_supporter_snapshot"."member_id"
   JOIN "initiative"
     ON "direct_supporter_snapshot"."initiative_id" = "initiative"."id"
+    AND (
+      "direct_supporter_snapshot"."satisfied" = TRUE OR
+      coalesce("initiative"."admitted", FALSE) = FALSE
+    )
     AND "initiative"."harmonic_weight" ISNULL
   GROUP BY
     "initiative"."issue_id",