# HG changeset patch
# User bsw
# Date 1329488090 -3600
# Node ID 38dbcd5106573c6dc274c58f3edd0df29d25889e
# Parent  9c1dea936554fe01bd7a05034566c4786989dffe
Added filter for delegating interest and support

diff -r 9c1dea936554 -r 38dbcd510657 app/main/issue/_filters.lua
--- a/app/main/issue/_filters.lua	Fri Feb 17 14:00:16 2012 +0100
+++ b/app/main/issue/_filters.lua	Fri Feb 17 15:14:50 2012 +0100
@@ -1,3 +1,5 @@
+local member = param.get("member", "table")
+
 local filters = {}
 
 -- FIXME: the filter should be named like the corresponding issue.state value
@@ -6,7 +8,7 @@
   name = "filter",
   {
     name = "any",
-    label = _"Any state",
+    label = _"Any phase",
     selector_modifier = function(selector) end
   },
   {
@@ -55,43 +57,6 @@
 }
 
 
-filters[#filters+1] = {
-  name = "filter_interest",
-  {
-    name = "any",
-    label = _"Any",
-    selector_modifier = function()  end
-  },
-  {
-    name = "my",
-    label = _"Interested",
-    selector_modifier = function(selector)
-      selector:join("interest", "filter_interest", { "filter_interest.issue_id = issue.id AND filter_interest.member_id = ? ", app.session.member.id })
-    end
-  },
-  {
-    name = "supported",
-    label = _"Supported",
-    selector_modifier = function(selector)
-      selector:add_where({ "EXISTS (SELECT 1 FROM initiative JOIN supporter ON supporter.initiative_id = initiative.id AND supporter.member_id = ? LEFT JOIN opinion ON opinion.initiative_id = initiative.id AND opinion.member_id = ? AND ((opinion.degree = 2 AND NOT fulfilled) OR (opinion.degree = -2 AND fulfilled)) WHERE initiative.issue_id = issue.id AND opinion.member_id ISNULL LIMIT 1)", app.session.member.id, app.session.member.id })
-    end
-  },
-  {
-    name = "potentially_supported",
-    label = _"Potential supported",
-    selector_modifier = function(selector)
-      selector:add_where({ "EXISTS (SELECT 1 FROM initiative JOIN supporter ON supporter.initiative_id = initiative.id AND supporter.member_id = ? JOIN opinion ON opinion.initiative_id = initiative.id AND opinion.member_id = ? AND ((opinion.degree = 2 AND NOT fulfilled) OR (opinion.degree = -2 AND fulfilled)) WHERE initiative.issue_id = issue.id LIMIT 1)", app.session.member.id, app.session.member.id })
-    end
-  },
-  {
-    name = "initiated",
-    label = _"Initiated",
-    selector_modifier = function(selector)
-      selector:add_where({ "EXISTS (SELECT 1 FROM initiative JOIN initiator ON initiator.initiative_id = initiative.id AND initiator.member_id = ? AND initiator.accepted WHERE initiative.issue_id = issue.id)", app.session.member.id })
-    end
-  },
-}
-
 if not param.get("no_sort", atom.boolean) then
   
   local filter = { name = "order" }
@@ -129,7 +94,89 @@
   
 end
 
-if app.session.member and param.get("filter") == "frozen" then
+
+filters[#filters+1] = {
+  name = "filter_interest",
+  {
+    name = "any",
+    label = _"Any",
+    selector_modifier = function()  end
+  },
+  {
+    name = "my",
+    label = _"Interested",
+    selector_modifier = function() end
+  },
+  {
+    name = "supported",
+    label = _"Supported",
+    selector_modifier = function() end
+  },
+  {
+    name = "potentially_supported",
+    label = _"Potentially supported",
+    selector_modifier = function() end
+  },
+  {
+    name = "initiated",
+    label = _"Initiated",
+    selector_modifier = function(selector)
+      selector:add_where({ "EXISTS (SELECT 1 FROM initiative JOIN initiator ON initiator.initiative_id = initiative.id AND initiator.member_id = ? AND initiator.accepted WHERE initiative.issue_id = issue.id)", member.id })
+    end
+  },
+}
+
+local filter_interest = param.get_all_cgi()["filter_interest"]
+  
+if filter_interest ~= "any" and filter_interest ~= nil and filter_interest ~= "initiated" then
+  filters[#filters+1] = {
+    name = "filter_delegation",
+    {
+      name = "any",
+      label = _"Direct and by delegation",
+      selector_modifier = function(selector)
+        if filter_interest == "my" then
+          selector:left_join("delegating_interest_snapshot", "filter_interest", { "filter_interest.issue_id = issue.id AND filter_interest.member_id = ? AND filter_interest.event = issue.latest_snapshot_event", member.id })
+          selector:left_join("interest", "filter_delegating_interest", { "filter_delegating_interest.issue_id = issue.id AND filter_delegating_interest.member_id = ? ", member.id })
+          selector:add_where{ "filter_interest.member_id NOTNULL OR filter_delegating_interest.member_id NOTNULL" }
+        elseif filter_interest == "supported" then
+          selector:add_where({ "EXISTS (SELECT 1 FROM initiative JOIN supporter ON supporter.initiative_id = initiative.id AND supporter.member_id = ? LEFT JOIN critical_opinion ON critical_opinion.initiative_id = initiative.id AND critical_opinion.member_id = ? WHERE initiative.issue_id = issue.id AND critical_opinion.member_id ISNULL LIMIT 1) OR EXISTS (SELECT 1 FROM initiative JOIN direct_supporter_snapshot ON direct_supporter_snapshot.initiative_id = initiative.id AND direct_supporter_snapshot.event = issue.latest_snapshot_event JOIN delegating_interest_snapshot ON delegating_interest_snapshot.delegate_member_ids[array_upper(delegating_interest_snapshot.delegate_member_ids, 1)] = direct_supporter_snapshot.member_id AND delegating_interest_snapshot.issue_id = issue.id AND delegating_interest_snapshot.member_id = ? AND delegating_interest_snapshot.event = issue.latest_snapshot_event WHERE initiative.issue_id = issue.id AND direct_supporter_snapshot.satisfied LIMIT 1)", member.id, member.id, member.id })
+        elseif filter_interest == "potentially_supported" then
+          selector:add_where({ "EXISTS (SELECT 1 FROM initiative JOIN supporter ON supporter.initiative_id = initiative.id AND supporter.member_id = ? JOIN critical_opinion ON critical_opinion.initiative_id = initiative.id AND critical_opinion.member_id = ? WHERE initiative.issue_id = issue.id LIMIT 1) OR EXISTS (SELECT 1 FROM initiative JOIN direct_supporter_snapshot ON direct_supporter_snapshot.initiative_id = initiative.id AND direct_supporter_snapshot.event = issue.latest_snapshot_event JOIN delegating_interest_snapshot ON delegating_interest_snapshot.delegate_member_ids[array_upper(delegating_interest_snapshot.delegate_member_ids, 1)] = direct_supporter_snapshot.member_id AND delegating_interest_snapshot.issue_id = issue.id AND delegating_interest_snapshot.member_id = ? AND delegating_interest_snapshot.event = issue.latest_snapshot_event WHERE initiative.issue_id = issue.id AND NOT direct_supporter_snapshot.satisfied LIMIT 1)", member.id, member.id, member.id, member.id })
+        end
+      end
+    },
+    {
+      name = "direct",
+      label = _"Direct",
+      selector_modifier = function(selector)
+        if filter_interest == "my" then
+          selector:join("interest", "filter_interest", { "filter_interest.issue_id = issue.id AND filter_interest.member_id = ? ", member.id })
+        elseif filter_interest == "supported" then
+          selector:add_where({ "EXISTS (SELECT 1 FROM initiative JOIN supporter ON supporter.initiative_id = initiative.id AND supporter.member_id = ? LEFT JOIN critical_opinion ON critical_opinion.initiative_id = initiative.id AND critical_opinion.member_id = ? WHERE initiative.issue_id = issue.id AND critical_opinion.member_id ISNULL LIMIT 1)", member.id, member.id })
+        elseif filter_interest == "potentially_supported" then
+          selector:add_where({ "EXISTS (SELECT 1 FROM initiative JOIN supporter ON supporter.initiative_id = initiative.id AND supporter.member_id = ? JOIN critical_opinion ON critical_opinion.initiative_id = initiative.id AND critical_opinion.member_id = ? WHERE initiative.issue_id = issue.id LIMIT 1)", member.id, member.id })
+        end
+      end
+    },
+    {
+      name = "delegated",
+      label = _"By delegation",
+      selector_modifier = function(selector)
+        if filter_interest == "my" then
+          selector:join("delegating_interest_snapshot", "filter_interest", { "filter_interest.issue_id = issue.id AND filter_interest.member_id = ? AND filter_interest.event = issue.latest_snapshot_event", member.id })
+        elseif filter_interest == "supported" then
+          selector:add_where({ "EXISTS (SELECT 1 FROM initiative JOIN direct_supporter_snapshot ON direct_supporter_snapshot.initiative_id = initiative.id AND direct_supporter_snapshot.event = issue.latest_snapshot_event JOIN delegating_interest_snapshot ON delegating_interest_snapshot.delegate_member_ids[array_upper(delegating_interest_snapshot.delegate_member_ids, 1)] = direct_supporter_snapshot.member_id AND delegating_interest_snapshot.issue_id = issue.id AND delegating_interest_snapshot.member_id = ? AND delegating_interest_snapshot.event = issue.latest_snapshot_event WHERE initiative.issue_id = issue.id AND direct_supporter_snapshot.satisfied LIMIT 1)", member.id })
+        elseif filter_interest == "potentially_supported" then
+          selector:add_where({ "EXISTS (SELECT 1 FROM initiative JOIN direct_supporter_snapshot ON direct_supporter_snapshot.initiative_id = initiative.id AND direct_supporter_snapshot.event = issue.latest_snapshot_event JOIN delegating_interest_snapshot ON delegating_interest_snapshot.delegate_member_ids[array_upper(delegating_interest_snapshot.delegate_member_ids, 1)] = direct_supporter_snapshot.member_id AND delegating_interest_snapshot.issue_id = issue.id AND delegating_interest_snapshot.member_id = ? AND delegating_interest_snapshot.event = issue.latest_snapshot_event WHERE initiative.issue_id = issue.id AND NOT direct_supporter_snapshot.satisfied LIMIT 1)", member.id, member.id })
+        end
+      end
+    }
+  }
+end
+
+
+if member.id == app.session.member_id and param.get_all_cgi()["filter"] == "frozen" then
   filters[#filters+1] = {
     name = "filter_voting",
     {
@@ -141,7 +188,7 @@
       name = "not_voted",
       label = _"Not voted",
       selector_modifier = function(selector)
-        selector:left_join("direct_voter", nil, { "direct_voter.issue_id = issue.id AND direct_voter.member_id = ?", app.session.member.id })
+        selector:left_join("direct_voter", nil, { "direct_voter.issue_id = issue.id AND direct_voter.member_id = ?", member.id })
         selector:add_where("direct_voter.member_id ISNULL")
       end
     },
@@ -149,7 +196,7 @@
       name = "voted",
       label = _"Voted",
       selector_modifier = function(selector)
-        selector:join("direct_voter", nil, { "direct_voter.issue_id = issue.id AND direct_voter.member_id = ?", app.session.member.id })
+        selector:join("direct_voter", nil, { "direct_voter.issue_id = issue.id AND direct_voter.member_id = ?", member.id })
       end
     },
   }