1.1 --- a/app/main/interest/show_incoming.lua	Thu Jun 23 03:30:57 2016 +0200
     1.2 +++ b/app/main/interest/show_incoming.lua	Sun Jul 15 14:07:29 2018 +0200
     1.3 @@ -1,34 +1,63 @@
     1.4  local issue = Issue:by_id(param.get("issue_id", atom.integer))
     1.5  local member = Member:by_id(param.get("member_id", atom.integer))
     1.6  
     1.7 +if not issue or not member then
     1.8 +  return execute.view { module = "index", view = "404" }
     1.9 +end
    1.10 +
    1.11 +if app.session.member_id then
    1.12 +  issue:load_everything_for_member_id ( app.session.member_id )
    1.13 +end
    1.14 +
    1.15 +
    1.16  local members_selector = Member:new_selector()
    1.17    :join("delegating_interest_snapshot", nil, "delegating_interest_snapshot.member_id = member.id")
    1.18    :join("issue", nil, "issue.id = delegating_interest_snapshot.issue_id")
    1.19    :add_where{ "delegating_interest_snapshot.issue_id = ?", issue.id }
    1.20 -  :add_where{ "delegating_interest_snapshot.event = ?", issue.latest_snapshot_event }
    1.21 +  :add_where{ "delegating_interest_snapshot.snapshot_id = ?", issue.latest_snapshot_id }
    1.22    :add_where{ "delegating_interest_snapshot.delegate_member_ids[1] = ?", member.id }
    1.23    :add_field{ "delegating_interest_snapshot.weight" }
    1.24  
    1.25 -execute.view{
    1.26 -  module = "issue", view = "_head", params = {
    1.27 -    issue = issue
    1.28 -  }
    1.29 -}
    1.30 +execute.view{ module = "issue", view = "_head", params = { issue = issue, link_issue = true } }
    1.31    
    1.32 -ui.section( function()
    1.33 -    
    1.34 -  ui.sectionHead( function()
    1.35 -    ui.heading{ level = 1, content = _("Incoming delegations for '#{member}'", { member = member.name }) }
    1.36 -  end)
    1.37 +
    1.38 +ui.grid{ content = function()
    1.39 +  
    1.40 +  ui.cell_main{ content = function()
    1.41  
    1.42 -  execute.view{
    1.43 -    module = "member",
    1.44 -    view = "_list",
    1.45 -    params = { 
    1.46 -      members_selector = members_selector,
    1.47 -      issue = issue,
    1.48 -      trustee = member
    1.49 +    ui.container { attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function()
    1.50 +      ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
    1.51 +        ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _("Incoming delegations for '#{member}'", { member = member.name }) }
    1.52 +      end }
    1.53 +      ui.container{ attr = { class = "mdl-card__content" }, content = function()
    1.54 +        execute.view{
    1.55 +          module = "member",
    1.56 +          view = "_list",
    1.57 +          params = { 
    1.58 +            members_selector = members_selector,
    1.59 +            issue = issue,
    1.60 +            trustee = member
    1.61 +          }
    1.62 +        }
    1.63 +      end }
    1.64 +    end }
    1.65 +  end }
    1.66 +  
    1.67 +  ui.cell_sidebar{ content = function()
    1.68 +    execute.view {
    1.69 +      module = "issue", view = "_sidebar", 
    1.70 +      params = {
    1.71 +        issue = issue,
    1.72 +        member = app.session.member
    1.73 +      }
    1.74      }
    1.75 -  }
    1.76  
    1.77 -end )
    1.78 \ No newline at end of file
    1.79 +    execute.view { 
    1.80 +      module = "issue", view = "_sidebar_members", params = {
    1.81 +        issue = issue
    1.82 +      }
    1.83 +    }
    1.84 +
    1.85 +  end }
    1.86 +
    1.87 +end }