liquid_feedback_frontend
changeset 190:256d9be75916
Fixing highlighting of delegated member weight usage for votes.
author | bsw |
---|---|
date | Mon Nov 08 02:38:03 2010 +0100 (2010-11-08) |
parents | 94075385f7ab |
children | 6af32e8c0917 |
files | app/main/initiative/_show_voting.lua app/main/member/_list.lua app/main/vote/show_incoming.lua |
line diff
1.1 --- a/app/main/initiative/_show_voting.lua Mon Nov 08 01:44:05 2010 +0100 1.2 +++ b/app/main/initiative/_show_voting.lua Mon Nov 08 02:38:03 2010 +0100 1.3 @@ -22,10 +22,13 @@ 1.4 view = "_list", 1.5 params = { 1.6 initiative = initiative, 1.7 + for_votes = true, 1.8 members_selector = initiative.issue:get_reference_selector("direct_voters") 1.9 :left_join("vote", nil, { "vote.initiative_id = ? AND vote.member_id = member.id", initiative.id }) 1.10 :add_field("direct_voter.weight as voter_weight") 1.11 :add_field("coalesce(vote.grade, 0) as grade") 1.12 + :join("initiative", nil, "initiative.id = vote.initiative_id") 1.13 + :join("issue", nil, "issue.id = initiative.issue_id") 1.14 } 1.15 } 1.16
2.1 --- a/app/main/member/_list.lua Mon Nov 08 01:44:05 2010 +0100 2.2 +++ b/app/main/member/_list.lua Mon Nov 08 02:38:03 2010 +0100 2.3 @@ -3,11 +3,16 @@ 2.4 local issue = param.get("issue", "table") 2.5 local trustee = param.get("trustee", "table") 2.6 local initiator = param.get("initiator", "table") 2.7 - 2.8 +local for_votes = param.get("for_votes", atom.boolean) 2.9 2.10 if initiative or issue then 2.11 - members_selector:left_join("delegating_interest_snapshot", "_member_list__delegating_interest", { "_member_list__delegating_interest.event = issue.latest_snapshot_event AND _member_list__delegating_interest.issue_id = issue.id AND _member_list__delegating_interest.member_id = ?", app.session.member_id }) 2.12 - members_selector:add_field("_member_list__delegating_interest.delegate_member_ids", "delegate_member_ids") 2.13 + if for_votes then 2.14 + members_selector:left_join("delegating_voter", "_member_list__delegating_voter", { "_member_list__delegating_voter.issue_id = issue.id AND _member_list__delegating_voter.member_id = ?", app.session.member_id }) 2.15 + members_selector:add_field("_member_list__delegating_voter.delegate_member_ids", "delegate_member_ids") 2.16 + else 2.17 + members_selector:left_join("delegating_interest_snapshot", "_member_list__delegating_interest", { "_member_list__delegating_interest.event = issue.latest_snapshot_event AND _member_list__delegating_interest.issue_id = issue.id AND _member_list__delegating_interest.member_id = ?", app.session.member_id }) 2.18 + members_selector:add_field("_member_list__delegating_interest.delegate_member_ids", "delegate_member_ids") 2.19 + end 2.20 end 2.21 2.22 ui.add_partial_param_names{ "member_list" }
3.1 --- a/app/main/vote/show_incoming.lua Mon Nov 08 01:44:05 2010 +0100 3.2 +++ b/app/main/vote/show_incoming.lua Mon Nov 08 02:38:03 2010 +0100 3.3 @@ -7,6 +7,7 @@ 3.4 :add_where{ "delegating_voter.issue_id = ?", issue.id } 3.5 :add_where{ "delegating_voter.delegate_member_ids[1] = ?", member.id } 3.6 :add_field("delegating_voter.weight", "voter_weight") 3.7 + :join("issue", nil, "issue.id = delegating_voter.issue_id") 3.8 3.9 execute.view{ 3.10 module = "member",