liquid_feedback_frontend
changeset 935:bbe07befa4e4
Added justiefied intervals to issue and policy selector
author | bsw |
---|---|
date | Sun Nov 04 18:48:04 2012 +0100 (2012-11-04) |
parents | 39cf8f1304a7 |
children | c0a9c2762af7 |
files | model/issue.lua model/policy.lua |
line diff
1.1 --- a/model/issue.lua Sun Nov 04 18:47:36 2012 +0100 1.2 +++ b/model/issue.lua Sun Nov 04 18:48:04 2012 +0100 1.3 @@ -5,8 +5,12 @@ 1.4 1.5 function Issue:new_selector() 1.6 local selector = new_selector(self) 1.7 - selector:add_field("coalesce(issue.fully_frozen + issue.voting_time, issue.half_frozen + issue.verification_time, issue.accepted + issue.discussion_time, issue.created + issue.admission_time) - now()", "state_time_left") 1.8 - selector:add_field("now() - issue.closed", "closed_ago") 1.9 + selector:add_field("justify_interval(admission_time)::text", "admission_time_text") 1.10 + selector:add_field("justify_interval(discussion_time)::text", "discussion_time_text") 1.11 + selector:add_field("justify_interval(verification_time)::text", "verification_time_text") 1.12 + selector:add_field("justify_interval(voting_time)::text", "voting_time_text") 1.13 + selector:add_field("justify_interval(coalesce(issue.fully_frozen + issue.voting_time, issue.half_frozen + issue.verification_time, issue.accepted + issue.discussion_time, issue.created + issue.admission_time) - now())", "state_time_left") 1.14 + selector:add_field("justify_interval(now() - issue.closed)", "closed_ago") 1.15 return selector 1.16 end 1.17
2.1 --- a/model/policy.lua Sun Nov 04 18:47:36 2012 +0100 2.2 +++ b/model/policy.lua Sun Nov 04 18:48:04 2012 +0100 2.3 @@ -10,6 +10,18 @@ 2.4 back_ref = 'policy' 2.5 } 2.6 2.7 +local new_selector = Policy.new_selector 2.8 + 2.9 +function Policy:new_selector() 2.10 + local selector = new_selector(self) 2.11 + selector:add_field("justify_interval(admission_time)::text", "admission_time_text") 2.12 + selector:add_field("justify_interval(discussion_time)::text", "discussion_time_text") 2.13 + selector:add_field("justify_interval(verification_time)::text", "verification_time_text") 2.14 + selector:add_field("justify_interval(voting_time)::text", "voting_time_text") 2.15 + return selector 2.16 +end 2.17 + 2.18 + 2.19 function Policy:build_selector(args) 2.20 local selector = self:new_selector() 2.21 if args.active ~= nil then