1.1 --- a/app/main/event/_list.lua	Sun Aug 12 22:14:06 2012 +0200
     1.2 +++ b/app/main/event/_list.lua	Fri Aug 17 00:03:23 2012 +0200
     1.3 @@ -1,4 +1,4 @@
     1.4 -local global = param.get("global", atom.boolean)
     1.5 +--local global = param.get("global", atom.boolean)
     1.6  local for_member = param.get("for_member", "table")
     1.7  local for_unit = param.get("for_unit", "table")
     1.8  local for_area = param.get("for_area", "table")
     1.9 @@ -20,8 +20,8 @@
    1.10    event_selector:add_where{ "area.unit_id = ?", for_unit.id }
    1.11  elseif for_area then
    1.12    event_selector:add_where{ "issue.area_id = ?", for_area.id }
    1.13 -elseif not global then
    1.14 -  event_selector:join("event_seen_by_member", nil, { "event_seen_by_member.id = event.id AND event_seen_by_member.seen_by_member_id = ?", app.session.member_id })
    1.15 +--elseif not global then
    1.16 +--  event_selector:join("event_seen_by_member", nil, { "event_seen_by_member.id = event.id AND event_seen_by_member.seen_by_member_id = ?", app.session.member_id })
    1.17  end
    1.18    
    1.19  if app.session.member_id then
    1.20 @@ -34,176 +34,192 @@
    1.21      :add_field("array_length(_delegating_interest.delegate_member_ids, 1)", "delegation_chain_length")
    1.22  end
    1.23  
    1.24 -local last_event_id
    1.25 +local filters = execute.load_chunk{module="issue", chunk="_filters.lua", params = {
    1.26 +  for_events = true,
    1.27 +  member = app.session.member, for_member = for_member, state = for_state, for_unit = for_unit and true or false, for_area = for_area and true or false
    1.28 +}}
    1.29  
    1.30 -local events = event_selector:exec()
    1.31 +filters.opened = true
    1.32 +filters.selector = event_selector
    1.33 +
    1.34 +filters.content = function()
    1.35 +
    1.36  
    1.37 -local issues = events:load("issue")
    1.38 -issues:load_everything_for_member_id(app.session.member_id)
    1.39 +  local last_event_id
    1.40 +
    1.41 +  local events = event_selector:exec()
    1.42  
    1.43 -events:load("initiative")
    1.44 -events:load("suggestion")
    1.45 -events:load("member")
    1.46 +  local issues = events:load("issue")
    1.47 +  issues:load_everything_for_member_id(app.session.member_id)
    1.48 +
    1.49 +  events:load("initiative")
    1.50 +  events:load("suggestion")
    1.51 +  events:load("member")
    1.52  
    1.53  
    1.54 -ui.container{ attr = { class = "issues events" }, content = function()
    1.55 +  ui.container{ attr = { class = "issues events" }, content = function()
    1.56  
    1.57 -  local last_event_date
    1.58 -  for i, event in ipairs(events) do
    1.59 -    last_event_id = event.id
    1.60 +    local last_event_date
    1.61 +    for i, event in ipairs(events) do
    1.62 +      last_event_id = event.id
    1.63  
    1.64 -    ui.container{ attr = { class = "event_info" }, content = function()
    1.65 -      local event_name = event.event_name
    1.66 -      local event_image
    1.67 -      if event.event == "issue_state_changed" then
    1.68 -        if event.state == "discussion" then
    1.69 -          event_name = _"Discussion started"
    1.70 -          event_image = "comments.png"
    1.71 -        elseif event.state == "verification" then
    1.72 -          event_name = _"Verification started"
    1.73 -          event_image = "lock.png"
    1.74 -        elseif event.state == "voting" then
    1.75 -          event_name = _"Voting started"
    1.76 -          event_image = "email_open.png"
    1.77 -        elseif event.state == "finished_with_winner" then
    1.78 -          event_name = event.state_name
    1.79 -          event_image = "award_star_gold_2.png"
    1.80 -        elseif event.state == "finished_without_winner" then
    1.81 -          event_name = event.state_name
    1.82 -          event_image = "cross.png"
    1.83 -        else
    1.84 -          event_name = event.state_name
    1.85 -        end
    1.86 -        if event_image then
    1.87 -          ui.image{ static = "icons/16/" .. event_image }
    1.88 -          slot.put(" ")
    1.89 +      ui.container{ attr = { class = "event_info" }, content = function()
    1.90 +        local event_name = event.event_name
    1.91 +        local event_image
    1.92 +        if event.event == "issue_state_changed" then
    1.93 +          if event.state == "discussion" then
    1.94 +            event_name = _"Discussion started"
    1.95 +            event_image = "comments.png"
    1.96 +          elseif event.state == "verification" then
    1.97 +            event_name = _"Verification started"
    1.98 +            event_image = "lock.png"
    1.99 +          elseif event.state == "voting" then
   1.100 +            event_name = _"Voting started"
   1.101 +            event_image = "email_open.png"
   1.102 +          elseif event.state == "finished_with_winner" then
   1.103 +            event_name = event.state_name
   1.104 +            event_image = "award_star_gold_2.png"
   1.105 +          elseif event.state == "finished_without_winner" then
   1.106 +            event_name = event.state_name
   1.107 +            event_image = "cross.png"
   1.108 +          else
   1.109 +            event_name = event.state_name
   1.110 +          end
   1.111 +          if event_image then
   1.112 +            ui.image{ static = "icons/16/" .. event_image }
   1.113 +            slot.put(" ")
   1.114 +          end
   1.115          end
   1.116 -      end
   1.117 -      local days_ago_text
   1.118 -      if event.time_ago == 0 then
   1.119 -        days_ago_text = _("Today at #{time}", { time = format.time(event.occurrence) })
   1.120 -      elseif event.time_ago == 1 then
   1.121 -        days_ago_text = _("Yesterday at #{time}", { time = format.time(event.occurrence) })
   1.122 -      else
   1.123 -        days_ago_text = _("#{date} at #{time}", { date = format.date(event.occurrence.date), time = format.time(event.occurrence) })
   1.124 -      end
   1.125 -      ui.tag{ attr = { class = "event_name" }, content = event_name }
   1.126 -      slot.put("<br />") 
   1.127 -      ui.tag{ content = days_ago_text }
   1.128 ---[[      if event.time_ago > 1 then
   1.129 -        slot.put("<br />(")
   1.130 -        ui.tag{ content = _("#{count} days ago", { count = event.time_ago }) }
   1.131 -        slot.put(")")
   1.132 -      end
   1.133 -      --]]
   1.134 -      if app.session:has_access("authors_pseudonymous") and event.member_id then
   1.135 +        local days_ago_text
   1.136 +        if event.time_ago == 0 then
   1.137 +          days_ago_text = _("Today at #{time}", { time = format.time(event.occurrence) })
   1.138 +        elseif event.time_ago == 1 then
   1.139 +          days_ago_text = _("Yesterday at #{time}", { time = format.time(event.occurrence) })
   1.140 +        else
   1.141 +          days_ago_text = _("#{date} at #{time}", { date = format.date(event.occurrence.date), time = format.time(event.occurrence) })
   1.142 +        end
   1.143 +        ui.tag{ attr = { class = "event_name" }, content = event_name }
   1.144          slot.put("<br />") 
   1.145 -        slot.put("<br />") 
   1.146 -        if app.session.member_id then
   1.147 +        ui.tag{ content = days_ago_text }
   1.148 +  --[[      if event.time_ago > 1 then
   1.149 +          slot.put("<br />(")
   1.150 +          ui.tag{ content = _("#{count} days ago", { count = event.time_ago }) }
   1.151 +          slot.put(")")
   1.152 +        end
   1.153 +        --]]
   1.154 +        if app.session:has_access("authors_pseudonymous") and event.member_id then
   1.155 +          slot.put("<br />") 
   1.156 +          slot.put("<br />") 
   1.157 +          if app.session.member_id then
   1.158 +            ui.link{
   1.159 +              content = function()
   1.160 +                execute.view{
   1.161 +                  module = "member_image",
   1.162 +                  view = "_show",
   1.163 +                  params = {
   1.164 +                    member = event.member,
   1.165 +                    image_type = "avatar",
   1.166 +                    show_dummy = true,
   1.167 +                    class = "micro_avatar",
   1.168 +                    popup_text = text
   1.169 +                  }
   1.170 +                }
   1.171 +              end,
   1.172 +              module = "member", view = "show", id = event.member_id
   1.173 +            }
   1.174 +            slot.put(" ")
   1.175 +          end
   1.176            ui.link{
   1.177 -            content = function()
   1.178 -              execute.view{
   1.179 -                module = "member_image",
   1.180 -                view = "_show",
   1.181 -                params = {
   1.182 -                  member = event.member,
   1.183 -                  image_type = "avatar",
   1.184 -                  show_dummy = true,
   1.185 -                  class = "micro_avatar",
   1.186 -                  popup_text = text
   1.187 -                }
   1.188 -              }
   1.189 -            end,
   1.190 +            text = event.member.name,
   1.191              module = "member", view = "show", id = event.member_id
   1.192            }
   1.193 -          slot.put(" ")
   1.194 -        end
   1.195 -        ui.link{
   1.196 -          text = event.member.name,
   1.197 -          module = "member", view = "show", id = event.member_id
   1.198 -        }
   1.199 -      end
   1.200 -    end }
   1.201 -
   1.202 -    ui.container{ attr = { class = "issue" }, content = function()
   1.203 -
   1.204 -      execute.view{ module = "delegation", view = "_info", params = { issue = event.issue } }
   1.205 -
   1.206 -      ui.container{ attr = { class = "content" }, content = function()
   1.207 -        ui.link{
   1.208 -          module = "unit", view = "show", id = event.issue.area.unit_id,
   1.209 -          attr = { class = "unit_link" }, text = event.issue.area.unit.name
   1.210 -        }
   1.211 -        slot.put(" ")
   1.212 -        ui.link{
   1.213 -          module = "area", view = "show", id = event.issue.area_id,
   1.214 -          attr = { class = "area_link" }, text = event.issue.area.name
   1.215 -        }
   1.216 -      end }
   1.217 -      
   1.218 -      ui.container{ attr = { class = "title" }, content = function()
   1.219 -        ui.link{
   1.220 -          attr = { class = "issue_id" },
   1.221 -          text = _("#{policy} ##{id}", { policy = event.issue.policy.name, id = event.issue_id }),
   1.222 -          module = "issue",
   1.223 -          view = "show",
   1.224 -          id = event.issue_id
   1.225 -        }
   1.226 -      end }
   1.227 -
   1.228 -      ui.container{ attr = { class = "initiative_list" }, content = function()
   1.229 -        if not event.initiative_id then
   1.230 -          local initiatives_selector = Initiative:new_selector()
   1.231 -            :add_where{ "initiative.issue_id = ?", event.issue_id }
   1.232 -            :add_order_by("initiative.rank, initiative.supporter_count DESC")
   1.233 -          execute.view{ module = "initiative", view = "_list", params = { 
   1.234 -            issue = event.issue,
   1.235 -            initiatives_selector = initiatives_selector,
   1.236 -            no_sort = true,
   1.237 -            limit = 5
   1.238 -          } }
   1.239 -        else
   1.240 -          local initiatives_selector = Initiative:new_selector()
   1.241 -            :add_where{ "initiative.id = ?", event.initiative_id }
   1.242 -          execute.view{ module = "initiative", view = "_list", params = { 
   1.243 -            initiatives_selector = initiatives_selector,
   1.244 -            no_sort = true,
   1.245 -            hide_more_initiatives = true
   1.246 -          } }
   1.247          end
   1.248        end }
   1.249  
   1.250 -      ui.container{ attr = { class = "content suggestion" }, content = function()
   1.251 -        if event.suggestion_id then
   1.252 +      ui.container{ attr = { class = "issue" }, content = function()
   1.253 +
   1.254 +        execute.view{ module = "delegation", view = "_info", params = { issue = event.issue } }
   1.255 +
   1.256 +        ui.container{ attr = { class = "content" }, content = function()
   1.257 +          ui.link{
   1.258 +            module = "unit", view = "show", id = event.issue.area.unit_id,
   1.259 +            attr = { class = "unit_link" }, text = event.issue.area.unit.name
   1.260 +          }
   1.261 +          slot.put(" ")
   1.262 +          ui.link{
   1.263 +            module = "area", view = "show", id = event.issue.area_id,
   1.264 +            attr = { class = "area_link" }, text = event.issue.area.name
   1.265 +          }
   1.266 +        end }
   1.267 +        
   1.268 +        ui.container{ attr = { class = "title" }, content = function()
   1.269            ui.link{
   1.270 -            text = event.suggestion.name,
   1.271 -            module = "suggestion", view = "show", id = event.suggestion_id
   1.272 +            attr = { class = "issue_id" },
   1.273 +            text = _("#{policy} ##{id}", { policy = event.issue.policy.name, id = event.issue_id }),
   1.274 +            module = "issue",
   1.275 +            view = "show",
   1.276 +            id = event.issue_id
   1.277            }
   1.278 -        end
   1.279 +        end }
   1.280 +
   1.281 +        ui.container{ attr = { class = "initiative_list" }, content = function()
   1.282 +          if not event.initiative_id then
   1.283 +            local initiatives_selector = Initiative:new_selector()
   1.284 +              :add_where{ "initiative.issue_id = ?", event.issue_id }
   1.285 +              :add_order_by("initiative.rank, initiative.supporter_count DESC")
   1.286 +            execute.view{ module = "initiative", view = "_list", params = { 
   1.287 +              issue = event.issue,
   1.288 +              initiatives_selector = initiatives_selector,
   1.289 +              no_sort = true,
   1.290 +              limit = 5
   1.291 +            } }
   1.292 +          else
   1.293 +            local initiatives_selector = Initiative:new_selector()
   1.294 +              :add_where{ "initiative.id = ?", event.initiative_id }
   1.295 +            execute.view{ module = "initiative", view = "_list", params = { 
   1.296 +              initiatives_selector = initiatives_selector,
   1.297 +              no_sort = true,
   1.298 +              hide_more_initiatives = true
   1.299 +            } }
   1.300 +          end
   1.301 +        end }
   1.302 +
   1.303 +        ui.container{ attr = { class = "content suggestion" }, content = function()
   1.304 +          if event.suggestion_id then
   1.305 +            ui.link{
   1.306 +              text = event.suggestion.name,
   1.307 +              module = "suggestion", view = "show", id = event.suggestion_id
   1.308 +            }
   1.309 +          end
   1.310 +        end }
   1.311        end }
   1.312 -    end }
   1.313 +    end
   1.314 +
   1.315 +  end }
   1.316 +
   1.317 +  slot.put("<br />")
   1.318 +
   1.319 +  if #events > 0 then
   1.320 +    ui.link{
   1.321 +      attr = { class = "more_events_links" },
   1.322 +      text = _"Show older events",
   1.323 +      module = request.get_module(),
   1.324 +      view = request.get_view(),
   1.325 +      id = for_unit and for_unit.id or for_area and for_area.id,
   1.326 +      params = {
   1.327 +        tab = param.get_all_cgi()["tab"],
   1.328 +        events = param.get_all_cgi()["events"],
   1.329 +        event_max_id = last_event_id
   1.330 +      }
   1.331 +    }
   1.332 +  else
   1.333 +    ui.tag{ content = _"No more events available" }
   1.334    end
   1.335  
   1.336 -end }
   1.337 -
   1.338 -slot.put("<br />")
   1.339 +  slot.put("<br />")
   1.340 +  slot.put("<br />")
   1.341  
   1.342 -if #events > 0 then
   1.343 -  ui.link{
   1.344 -    attr = { class = "more_events_links" },
   1.345 -    text = _"Show older events",
   1.346 -    module = request.get_module(),
   1.347 -    view = request.get_view(),
   1.348 -    id = for_unit and for_unit.id or for_area and for_area.id,
   1.349 -    params = {
   1.350 -      tab = param.get_all_cgi()["tab"],
   1.351 -      events = param.get_all_cgi()["events"],
   1.352 -      event_max_id = last_event_id
   1.353 -    }
   1.354 -  }
   1.355 -else
   1.356 -  ui.tag{ content = _"No more events available" }
   1.357  end
   1.358  
   1.359 -slot.put("<br />")
   1.360 -slot.put("<br />")
   1.361 +
   1.362 +ui.filters(filters)
   1.363 \ No newline at end of file