1.1 --- a/app/main/unit/show.lua	Sat Mar 10 13:54:14 2012 +0100
     1.2 +++ b/app/main/unit/show.lua	Sat Mar 10 16:57:49 2012 +0100
     1.3 @@ -44,10 +44,17 @@
     1.4    :join("privilege", "trustee_privilege", "trustee_privilege.member_id = trustee.id AND trustee_privilege.unit_id = delegation.unit_id AND trustee_privilege.voting_right")
     1.5    :add_where{ "delegation.unit_id = ?", unit.id }
     1.6  
     1.7 -local issues_selector = Issue:new_selector()
     1.8 +local open_issues_selector = Issue:new_selector()
     1.9    :join("area", nil, "area.id = issue.area_id")
    1.10    :add_where{ "area.unit_id = ?", unit.id }
    1.11 -  
    1.12 +  :add_where("issue.closed ISNULL")
    1.13 +  :add_order_by("coalesce(issue.fully_frozen + issue.voting_time, issue.half_frozen + issue.verification_time, issue.accepted + issue.discussion_time, issue.created + issue.admission_time) - now()")
    1.14 +
    1.15 +local closed_issues_selector = Issue:new_selector()
    1.16 +  :join("area", nil, "area.id = issue.area_id")
    1.17 +  :add_where{ "area.unit_id = ?", unit.id }
    1.18 +  :add_where("issue.closed NOTNULL")
    1.19 +  :add_order_by("issue.closed DESC")
    1.20  
    1.21  local tabs = {
    1.22    module = "unit",
    1.23 @@ -64,11 +71,32 @@
    1.24  }
    1.25  
    1.26  tabs[#tabs+1] = {
    1.27 -  name = "issues",
    1.28 -  label = _"Issues",
    1.29 +  name = "timeline",
    1.30 +  label = _"Events",
    1.31 +  module = "event",
    1.32 +  view = "_list",
    1.33 +  params = { for_unit = unit }
    1.34 +}
    1.35 +
    1.36 +tabs[#tabs+1] = {
    1.37 +  name = "open",
    1.38 +  label = _"Open issues",
    1.39    module = "issue",
    1.40    view = "_list",
    1.41 -  params = { issues_selector = issues_selector }
    1.42 +  params = {
    1.43 +    for_state = "open",
    1.44 +    issues_selector = open_issues_selector, for_unit = true
    1.45 +  }
    1.46 +}
    1.47 +tabs[#tabs+1] = {
    1.48 +  name = "closed",
    1.49 +  label = _"Closed issues",
    1.50 +  module = "issue",
    1.51 +  view = "_list",
    1.52 +  params = {
    1.53 +    for_state = "closed",
    1.54 +    issues_selector = closed_issues_selector, for_unit = true
    1.55 +  }
    1.56  }
    1.57  
    1.58  if app.session.member_id then