liquid_feedback_frontend
changeset 534:3e4f6534bb15
merge
| author | bsw |
|---|---|
| date | Mon May 21 22:00:49 2012 +0200 (2012-05-21) |
| parents | c92e2f2dcc2e 79710861a3c3 |
| children | 346eb72a2a6a |
| files | app/main/admin/_action/member_update.lua app/main/admin/member_edit.lua app/main/admin/member_list.lua app/main/index/index.lua app/main/initiative/_list_element.lua app/main/issue/_details.lua app/main/member/_profile.lua |
line diff
5.1 --- a/app/main/initiative/_list_element.lua Mon May 21 21:30:58 2012 +0200 5.2 +++ b/app/main/initiative/_list_element.lua Mon May 21 22:00:49 2012 +0200 5.3 @@ -38,10 +38,16 @@ 5.4 end 5.5 else 5.6 local max_value = initiative.issue.population or 0 5.7 + local quorum 5.8 + if initiative.issue.accepted then 5.9 + quorum = initiative.issue.policy.initiative_quorum_num / initiative.issue.policy.initiative_quorum_den 5.10 + else 5.11 + quorum = initiative.issue.policy.issue_quorum_num / initiative.issue.policy.issue_quorum_den 5.12 + end 5.13 ui.bargraph{ 5.14 max_value = max_value, 5.15 width = 100, 5.16 - quorum = max_value * (initiative.issue.policy.initiative_quorum_num / initiative.issue.policy.initiative_quorum_den), 5.17 + quorum = max_value * quorum, 5.18 quorum_color = "#00F", 5.19 bars = { 5.20 { color = "#0a0", value = (initiative.satisfied_supporter_count or 0) }, 5.21 @@ -116,4 +122,4 @@ 5.22 5.23 end } 5.24 5.25 -end } 5.26 \ No newline at end of file 5.27 +end }