liquid_feedback_frontend
changeset 1482:7cdc537f991f
Show correct quorum in initiative not admitted info
author | bsw |
---|---|
date | Wed Oct 24 14:49:56 2018 +0200 (2018-10-24) |
parents | 4f4a42bb84ec |
children | 18831d75ea87 |
files | app/main/initiative/_sidebar_state.lua |
line diff
1.1 --- a/app/main/initiative/_sidebar_state.lua Wed Oct 24 14:41:00 2018 +0200 1.2 +++ b/app/main/initiative/_sidebar_state.lua Wed Oct 24 14:49:56 2018 +0200 1.3 @@ -71,7 +71,20 @@ 1.4 attr = { class = "sectionRow not_admitted_info" }, 1.5 content = function () 1.6 ui.heading { level = 1, content = _"Initiative not admitted" } 1.7 - ui.container { content = _("This initiative has not been admitted! It failed the 2nd quorum of #{quorum}.", { quorum = format.percentage ( policy.initiative_quorum_num / policy.initiative_quorum_den ) } ) } 1.8 + local num = policy.initiative_quorum_num 1.9 + local den = policy.initiative_quorum_den 1.10 + local quorums = {} 1.11 + if num and num > 0 and den == 100 or den == 10 then 1.12 + table.insert(quorums, _("#{percentage}%", { percentage = num * 100 / den })) 1.13 + elseif num and num > 0 and den and den > 0 then 1.14 + table.insert(quorums, num .. "/" .. den) 1.15 + end 1.16 + if policy.initiative_quorum then 1.17 + table.insert(quorums, policy.initiative_quorum) 1.18 + end 1.19 + local quorum = table.concat(quorums, " / ") 1.20 + 1.21 + ui.container { content = _("This initiative has not been admitted! It failed the 2nd quorum of #{quorum}.", { quorum = quorum } ) } 1.22 end 1.23 } 1.24 end