liquid_feedback_frontend

changeset 1481:4f4a42bb84ec

Show quora correctly
author bsw
date Wed Oct 24 14:41:00 2018 +0200 (2018-10-24)
parents ce00a6d5f610
children 7cdc537f991f
files app/main/issue/_sidebar_state.lua
line diff
     1.1 --- a/app/main/issue/_sidebar_state.lua	Thu Oct 18 17:57:49 2018 +0200
     1.2 +++ b/app/main/issue/_sidebar_state.lua	Wed Oct 24 14:41:00 2018 +0200
     1.3 @@ -21,24 +21,27 @@
     1.4  local function quorum_text(policy, quorum)
     1.5    local num
     1.6    local den
     1.7 -  
     1.8 +
     1.9    if quorum == 1 then
    1.10      return math.max(policy.issue_quorum or 0, issue.issue_quorum or 0)
    1.11    elseif quorum == 2 then
    1.12      num = policy.initiative_quorum_num
    1.13      den = policy.initiative_quorum_den
    1.14    end
    1.15 -  
    1.16 -  if num == nil or den == nil then
    1.17 -    return 0
    1.18 +
    1.19 +  local quorums = {}
    1.20 +
    1.21 +  if num and num > 0 and den == 100 or den == 10 then
    1.22 +    table.insert(quorums, _("#{percentage}%", { percentage = num * 100 / den }))
    1.23 +  elseif num and num > 0 and den and den > 0 then
    1.24 +    table.insert(quorums, num .. "/" .. den)
    1.25    end
    1.26 -  
    1.27 -  if den == 100 or den == 10 then
    1.28 -    return _("#{percentage}%", { percentage = num * 100 / den })
    1.29 -  else
    1.30 -    return num .. "/" .. den
    1.31 +
    1.32 +  if policy.initiative_quorum then
    1.33 +    table.insert(quorums, policy.initiative_quorum)
    1.34    end
    1.35 -  
    1.36 +
    1.37 +  return table.concat(quorums, " / ")
    1.38  end
    1.39  
    1.40  local phases = { "admission", "discussion", "verification", "voting" }

Impressum / About Us