liquid_feedback_frontend

changeset 1559:7eda69e1d14f

Fixed layout of incoming delegations in vote view
author bsw
date Tue Nov 10 20:29:19 2020 +0100 (2020-11-10)
parents 5e7d76a32227
children 7b0160721f60
files app/main/vote/list.lua
line diff
     1.1 --- a/app/main/vote/list.lua	Tue Nov 10 20:23:37 2020 +0100
     1.2 +++ b/app/main/vote/list.lua	Tue Nov 10 20:29:19 2020 +0100
     1.3 @@ -155,37 +155,6 @@
     1.4    end
     1.5  }
     1.6  
     1.7 -if issue.state == "finished_with_winner" 
     1.8 -  or issue.state == "finished_without_winner" 
     1.9 -then
    1.10 -
    1.11 -  local members_selector = Member:new_selector()
    1.12 -    :join("delegating_voter", nil, "delegating_voter.member_id = member.id")
    1.13 -    :add_where{ "delegating_voter.issue_id = ?", issue.id }
    1.14 -    :add_where{ "delegating_voter.delegate_member_ids[1] = ?", member.id }
    1.15 -    :add_field("delegating_voter.weight", "voter_weight")
    1.16 -    :add_field("delegating_voter.ownweight", "ownweight")
    1.17 -    :join("issue", nil, "issue.id = delegating_voter.issue_id")
    1.18 -    
    1.19 -  ui.sidebar( "tab-members", function()
    1.20 -    ui.sidebarHead(function()
    1.21 -      ui.heading{ level = 4, content = _"Incoming delegations" }
    1.22 -    end)
    1.23 -    execute.view{
    1.24 -      module = "member",
    1.25 -      view = "_list",
    1.26 -      params = {
    1.27 -        members_selector = members_selector,
    1.28 -        trustee = member,
    1.29 -        issue = issue,
    1.30 -        initiative = initiative,
    1.31 -        for_votes = true, no_filter = true,
    1.32 -        member_class = "sidebarRow sidebarRowNarrow",
    1.33 -      }
    1.34 -    }
    1.35 -  end)
    1.36 -end
    1.37 -
    1.38  ui.container{ attr = { class = "mdl-grid" }, content = function()
    1.39    ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function()
    1.40  
    1.41 @@ -591,5 +560,43 @@
    1.42          
    1.43        end }
    1.44      end }
    1.45 +
    1.46 +    if issue.state == "finished_with_winner" 
    1.47 +      or issue.state == "finished_without_winner" 
    1.48 +    then
    1.49 +
    1.50 +      local members_selector = Member:new_selector()
    1.51 +        :join("delegating_voter", nil, "delegating_voter.member_id = member.id")
    1.52 +        :add_where{ "delegating_voter.issue_id = ?", issue.id }
    1.53 +        :add_where{ "delegating_voter.delegate_member_ids[1] = ?", member.id }
    1.54 +        :add_field("delegating_voter.weight", "voter_weight")
    1.55 +        :add_field("delegating_voter.ownweight", "ownweight")
    1.56 +        :join("issue", nil, "issue.id = delegating_voter.issue_id")
    1.57 +        
    1.58 +      ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function()
    1.59 +        ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
    1.60 +          ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = function()
    1.61 +            ui.tag{ content = _"Incoming delegations" }
    1.62 +          end }
    1.63 +        end }
    1.64 +
    1.65 +        ui.container{ attr = { class = "mdl-card__content" }, content = function()
    1.66 +          execute.view{
    1.67 +            module = "member",
    1.68 +            view = "_list",
    1.69 +            params = {
    1.70 +              members_selector = members_selector,
    1.71 +              trustee = member,
    1.72 +              issue = issue,
    1.73 +              initiative = initiative,
    1.74 +              for_votes = true, no_filter = true,
    1.75 +              member_class = "sidebarRow sidebarRowNarrow",
    1.76 +            }
    1.77 +          }
    1.78 +        end }
    1.79 +      end }
    1.80 +    end
    1.81 +
    1.82 +
    1.83    end }
    1.84  end }

Impressum / About Us