# HG changeset patch # User bsw # Date 1352051284 -3600 # Node ID bbe07befa4e499aff76c5f65c70bde4ef772db07 # Parent 39cf8f1304a76202b58fc35a6260d6b56def8355 Added justiefied intervals to issue and policy selector diff -r 39cf8f1304a7 -r bbe07befa4e4 model/issue.lua --- a/model/issue.lua Sun Nov 04 18:47:36 2012 +0100 +++ b/model/issue.lua Sun Nov 04 18:48:04 2012 +0100 @@ -5,8 +5,12 @@ function Issue:new_selector() local selector = new_selector(self) - 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") - selector:add_field("now() - issue.closed", "closed_ago") + selector:add_field("justify_interval(admission_time)::text", "admission_time_text") + selector:add_field("justify_interval(discussion_time)::text", "discussion_time_text") + selector:add_field("justify_interval(verification_time)::text", "verification_time_text") + selector:add_field("justify_interval(voting_time)::text", "voting_time_text") + 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") + selector:add_field("justify_interval(now() - issue.closed)", "closed_ago") return selector end diff -r 39cf8f1304a7 -r bbe07befa4e4 model/policy.lua --- a/model/policy.lua Sun Nov 04 18:47:36 2012 +0100 +++ b/model/policy.lua Sun Nov 04 18:48:04 2012 +0100 @@ -10,6 +10,18 @@ back_ref = 'policy' } +local new_selector = Policy.new_selector + +function Policy:new_selector() + local selector = new_selector(self) + selector:add_field("justify_interval(admission_time)::text", "admission_time_text") + selector:add_field("justify_interval(discussion_time)::text", "discussion_time_text") + selector:add_field("justify_interval(verification_time)::text", "verification_time_text") + selector:add_field("justify_interval(voting_time)::text", "voting_time_text") + return selector +end + + function Policy:build_selector(args) local selector = self:new_selector() if args.active ~= nil then