# HG changeset patch
# User bsw
# Date 1612180697 -3600
# Node ID 7da942c0ed5da02700e05430f3c2736449a0f4b8
# Parent  d47d2b0cd7c2f8b68eb47466a35d6b02c4ab2bd3
Removed unused views

diff -r d47d2b0cd7c2 -r 7da942c0ed5d app/main/area/show.lua
--- a/app/main/area/show.lua	Sun Jan 31 22:12:27 2021 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-local area = Area:by_id(param.get_id())
-
-if not area then
-  execute.view { module = "index", view = "404" }
-  request.set_status("404 Not Found")
-  return
-end
-
-app.current_area = area
-
-
-area:load_delegation_info_once_for_member_id(app.session.member_id)
-
-app.html_title.title = area.name
-app.html_title.subtitle = _("Area")
-
-ui.container{ attr = { class = "mdl-grid" }, content = function()
-  ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function()
-    ui.heading{ content = area.unit.name .. " / " .. area.name }
-
-    execute.view {
-      module = "area", view = "_head", params = {
-        area = area, member = app.session.member
-      }
-    }
-
-    execute.view {
-      module = "area", view = "_sidebar_whatcanido", params = {
-        area = area
-      }
-    }
-
-    execute.view {
-      module = "area", view = "_sidebar_members", params = {
-        area = area
-      }
-    }
-
-    local function getOpenIssuesSelector()
-      return area:get_reference_selector("issues")
-        :add_order_by("coalesce(issue.fully_frozen + issue.voting_time, issue.half_frozen + issue.verification_time, issue.accepted + issue.discussion_time, issue.created + issue.max_admission_time) - now()")
-    end
-
-    local admission_selector = getOpenIssuesSelector()
-      :add_where("issue.state = 'admission'");
-
-    local discussion_selector = getOpenIssuesSelector()
-      :add_where("issue.state = 'discussion'");
-
-    local verification_selector = getOpenIssuesSelector()
-      :add_where("issue.state = 'verification'");
-
-    local voting_selector = getOpenIssuesSelector()
-      :add_where("issue.state = 'voting'");
-
-
-    local closed_selector = area:get_reference_selector("issues")
-      :add_where("issue.closed NOTNULL")
-      :add_order_by("issue.closed DESC")
-
-    local members_selector = area:get_reference_selector("members"):add_where("member.active")
-    local delegations_selector = area:get_reference_selector("delegations")
-      :join("member", "truster", "truster.id = delegation.truster_id AND truster.active")
-      :join("member", "trustee", "trustee.id = delegation.trustee_id AND trustee.active")
-
-
-    execute.view {
-      module = "issue",
-      view = "_list",
-      params = { for_area = area }
-    }
-  end }
-end }
diff -r d47d2b0cd7c2 -r 7da942c0ed5d app/main/issue/_head2.lua
--- a/app/main/issue/_head2.lua	Sun Jan 31 22:12:27 2021 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-local issue = param.get("issue", "table")
-local for_history = param.get("for_history", atom.boolean)
-
-ui.sectionHead( "issueInfo", function ()
-  ui.container { attr = { class = "left" }, content = function()
-    ui.heading { level = 1, content = issue.name }
-  end }
-  if app.session.member then
-    ui.container { attr = { class = "right" }, content = function ()
-      if issue.fully_frozen then
-        if issue.member_info.direct_voted then
-          ui.image { attr = { class = "icon48 right" }, static = "icons/48/voted_ok.png" }
-          ui.tag { content = _"You have voted" }
-          slot.put(" ")
-          if not issue.closed then
-            slot.put("<br />")
-            ui.link {
-              module = "vote", view = "list", 
-              params = { issue_id = issue.id },
-              text = _"change vote"
-            }
-          else
-            ui.link {
-              module = "vote", view = "list", 
-              params = { issue_id = issue.id },
-              text = _"show vote"
-            }
-          end
-          slot.put(" ")
-        elseif active_trustee_id then
-          ui.tag { content = _"You have voted via delegation" }
-          ui.link {
-            content = _"Show voting ballot",
-            module = "vote", view = "list", params = {
-              issue_id = issue.id, member_id = active_trustee_id
-            }
-          }
-        elseif not issue.closed then
-          ui.link {
-            attr = { class = "btn btn-default" },
-            module = "vote", view = "list", 
-            params = { issue_id = issue.id },
-            text = _"vote now"
-          }
-        end
-      elseif not issue.closed then
-        if issue.member_info.own_participation then
-          ui.image { attr = { class = "icon48 right" }, static = "icons/48/eye.png" }
-          ui.tag{ content = _"You are interested in this issue" }
-          slot.put("<br />")
-          ui.link {
-            module = "interest", action = "update", 
-            params = { issue_id = issue.id, delete = true },
-            routing = { default = {
-              mode = "redirect", module = "issue", view = "show", id = issue.id
-            } },
-            text = _"remove my interest"
-          }
-        else
-          ui.link {
-            attr = { class = "btn btn-default" },
-            module = "interest", action = "update", 
-            params = { issue_id = issue.id },
-            routing = { default = {
-              mode = "redirect", module = "issue", view = "show", id = issue.id
-            } },
-            text = _"add my interest"
-          }
-        end
-      end
-    end }
-  end
-end)
-  
-ui.container {
-  attr = { class = "ui_filter", style="clear: left; margin-top: 4px;" },
-  content = function ()
-    ui.container {
-      attr = { class = "ui_filter_head" },
-      content = function ()
-        
-        ui.link{
-          attr = { class = not for_history and "active" or nil },
-          text = _"Initiatives",
-          module = "issue", view = "show", id = issue.id
-        }
-        slot.put(" ")
-        ui.link{
-          attr = { class = for_history and "active" or nil },
-          text = _"History",
-          module = "issue", view = "history", id = issue.id
-        }
-      end
-    }
-  end
-}
diff -r d47d2b0cd7c2 -r 7da942c0ed5d app/main/issue/_list2.lua
--- a/app/main/issue/_list2.lua	Sun Jan 31 22:12:27 2021 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,376 +0,0 @@
-local for_member = param.get ( "for_member", "table" )
-local for_unit =   param.get ( "for_unit",   "table" )
-local for_area =   param.get ( "for_area",   "table" )
-local for_issue =  param.get ( "for_issue",  "table" )
-local for_initiative =  param.get ( "for_initiative",  "table" )
-local for_sidebar = param.get("for_sidebar", atom.boolean)
-local no_filter =  param.get ( "no_filter",  atom.boolean )
-local search =     param.get ( "search" )
-
-local limit = 25
-
-local mode = request.get_param{ name = "mode" } or "issue"
-
-if for_initiative or for_issue or for_member then
-  mode = "timeline"
-end
-
-local selector
-
-if search then
-
-  selector = Issue:get_search_selector(search)
-
-  
-elseif mode == "timeline" then
-
-  local event_max_id = request.get_param_strings()["event_max_id"]
-
-  selector = Event:new_selector()
-    :add_order_by("event.id DESC")
-    :join("issue", nil, "issue.id = event.issue_id")
-    :add_field("now() - event.occurrence", "time_ago")
-    :limit(limit + 1)
-    
-  if event_max_id then
-    selector:add_where{ "event.id < ?", event_max_id }
-  end
-
-  if for_member then
-    selector:add_where{ "event.member_id = ?", for_member.id }
-  end
-
-  if for_initiative then
-    selector:add_where{ "event.initiative_id = ?", for_initiative.id }
-  end
-
-  
-elseif mode == "issue" then
-  
-  selector = Issue:new_selector()
-
-end
-
-if for_unit then
-  selector:join("area", nil, "area.id = issue.area_id")
-  selector:add_where{ "area.unit_id = ?", for_unit.id }
-elseif for_area then
-  selector:add_where{ "issue.area_id = ?", for_area.id }
-elseif for_issue then
-  selector:add_where{ "issue.id = ?", for_issue.id }
-end
-  
-if not search and app.session.member_id then
-  selector
-    :left_join("interest", "_interest", { 
-      "_interest.issue_id = issue.id AND _interest.member_id = ?", app.session.member.id 
-    } )
-    :add_field("(_interest.member_id NOTNULL)", "is_interested")
-    :left_join("delegating_interest_snapshot", "_delegating_interest", { [[
-      _delegating_interest.issue_id = issue.id AND 
-      _delegating_interest.member_id = ? AND
-      _delegating_interest.event = issue.latest_snapshot_event
-    ]], app.session.member.id } )
-    :add_field("_delegating_interest.delegate_member_ids[1]", "is_interested_by_delegation_to_member_id")
-    :add_field("_delegating_interest.delegate_member_ids[array_upper(_delegating_interest.delegate_member_ids, 1)]", "is_interested_via_member_id")    
-    :add_field("array_length(_delegating_interest.delegate_member_ids, 1)", "delegation_chain_length")
-end
-
-local function doit()
-
-  local last_event_id
-
-  local items = selector:exec()
-
-  if #items < 1 then
-    ui.section( function()
-      ui.sectionRow( function()
-        ui.heading{ level = 2, content = _"No results for this selection" }
-      end )
-    end )
-    return
-  end
-  
-  local row_class = "sectionRow"
-  if for_sidebar then
-    row_class = "sidebarRow"
-  end
-  
-  if mode == "timeline" then
-    local issues = items:load ( "issue" )
-    local initiative = items:load ( "initiative" )
-    items:load ( "suggestion" )
-    items:load ( "member" )
-    issues:load_everything_for_member_id ( app.session.member_id )
-    initiative:load_everything_for_member_id ( app.session.member_id )
-  elseif mode == "issue" then
-    items:load_everything_for_member_id ( app.session.member_id )
-  end
-
-  local class = "section"
-  if mode == "timeline" then
-    class = class .. " events"
-  elseif mode == "issue" then
-    class = class .. " issues"
-  end
-  
-  ui.container{ attr = { class = class }, content = function()
-
-    local last_event_date
-    for i, item in ipairs(items) do
-      local event
-      local issue
-      if mode == "timeline" then
-        event = item
-        issue = item.issue
-      elseif mode == "issue" then
-        event = {}
-        issue = item
-      end
-      
-      last_event_id = event.id
-
-      local class = "event " .. row_class
-      if event.suggestion_id then
-        class = class .. " suggestion"
-      end
-      
-      ui.container{ attr = { class = class }, content = function()
-        local event_name 
-        local negative_event = false
-        
-        local days_ago_text
-  
-        if mode == "timeline" then
-          event_name = event.event_name
-                  
-            if event.event == "issue_state_changed" then
-              if event.state == "discussion" then
-                event_name = _"Discussion started"
-              elseif event.state == "verification" then
-                event_name = _"Verification started"
-              elseif event.state == "voting" then
-                event_name = _"Voting started"
-              elseif event.state == "finished_with_winner" then
-                event_name = event.state_name
-              elseif event.state == "finished_without_winner" then
-                event_name = event.state_name
-                negative_event = true
-              else
-                event_name = event.state_name
-                negative_event = true
-              end
-            elseif event.event == "initiative_revoked" then
-              negative_event = true
-            end
-
-          if event.time_ago == 0 then
-            days_ago_text = _("today at #{time}", { time = format.time(event.occurrence) })
-          elseif event.time_ago == 1 then
-            days_ago_text = _("yesterday at #{time}", { time = format.time(event.occurrence) })
-          else
-            days_ago_text = _("#{interval} ago", { interval = format.interval_text ( event.time_ago ) } )
-          end
-          
-        elseif mode == "issue" then
-          event_name = issue.state_name
-          if issue.state_time_left:sub(1,1) ~= "-" then
-            days_ago_text = _( "#{interval} left", {
-              interval = format.interval_text ( issue.state_time_left )
-            })
-          elseif issue.closed then
-            days_ago_text = _( "#{interval} ago", {
-              interval = format.interval_text ( issue.closed_ago )
-            })
-          else
-            days_ago_text = _"phase ends soon" 
-          end
-          if issue.closed and not issue.fully_frozen then
-            negative_event = true
-          end
-          if issue.state == "finished_without_winner" then
-            negative_event = true
-          end
-          if issue.state == "canceled_no_initiative_admitted" then
-            negative_event = true
-          end
-          if issue.state == "canceled_by_admin" then
-            negative_event = true
-          end
-        end
-
-        local class= "event_info"
-        
-        if negative_event then
-          class = class .. " negative"
-        end
-
-        if mode == "timeline" then
-          ui.container{ attr = { class = class }, content = function ()
-            ui.tag { content = event_name }
-            slot.put ( " " )
-            ui.tag{ attr = { class = "event_time" }, content = days_ago_text }
-          end }
-        end
-
-        if not for_issue and not for_initiative then
-          ui.container{ attr = { class = "issue_context" }, content = function()
-            ui.link{
-              module = "unit", view = "show", id = issue.area.unit_id,
-              attr = { class = "unit" }, text = issue.area.unit.name
-            }
-            slot.put ( " " )
-            ui.link{
-              module = "area", view = "show", id = issue.area_id,
-              attr = { class = "area" }, text = issue.area.name
-            }
-            slot.put ( " " )
-            execute.view{ 
-              module = "delegation", view = "_info", params = { 
-                issue = issue, member = for_member 
-              }
-            }
-          end }
-          ui.container{ attr = { class = "issue_info" }, content = function()
-            ui.link{
-              attr = { class = "issue" },
-              text = _("#{policy} ##{id}", { policy = issue.policy.name, id = issue.id }),
-              module = "issue",
-              view = "show",
-              id = issue.id
-            }
-
-          end }
-        end
-        
-        if mode ~= "timeline"
-            or event.state == "finished_with_winner"
-            or event.state == "finished_without_winner"
-        then
-          local initiative = issue.initiatives[1]
-          if initiative then
-            util.initiative_pie(initiative)
-          end
-        end
-        
-        if mode == "issue" then
-          ui.container{ attr = { class = class }, content = function ()
-            ui.tag { content = event_name }
-            slot.put ( " " )
-            ui.tag{ attr = { class = "event_time" }, content = days_ago_text }
-          end }
-        elseif mode == "timeline"
-          and not for_issue
-          and event.event ~= "issue_state_changed"
-        then
-          slot.put("<br />")
-        end
-
-        if event.suggestion_id then
-          ui.container{ attr = { class = "suggestion" }, content = function()
-            ui.link{
-              text = format.string(event.suggestion.name, {
-                truncate_at = 160, truncate_suffix = true
-              }),
-              module = "initiative", view = "show", id = event.initiative.id,
-              params = { suggestion_id = event.suggestion_id },
-              anchor = "s" .. event.suggestion_id
-            }
-          end }
-        end
-
-        if not for_initiative and (not for_issue or event.initiative_id) then
-          
-          ui.container{ attr = { class = "initiative_list" }, content = function()
-            if event.initiative_id then
-              local initiative = event.initiative
-                
-              execute.view{ module = "initiative", view = "_list", params = { 
-                issue = issue,
-                initiative = initiative,
-                for_event = mode == "timeline" and not (event.state == issue.state)
-
-              } }
-            else
-              local initiatives = issue.initiatives
-              execute.view{ module = "initiative", view = "_list", params = { 
-                issue = issue,
-                initiatives = initiatives,
-                for_event = mode == "timeline" and not (event.state == issue.state)
-              } }
-            end
-          end }
-        end
-        
-      end }
-    end
-    
-    if mode == "timeline" then
-      if for_sidebar then
-        ui.container { attr = { class = row_class }, content = function ()
-          ui.link{
-            attr = { class = "moreLink" },
-            text = _"Show full history",
-            module = "initiative", view = "history", id = for_initiative.id
-          }
-        end }
-      elseif #items > limit then
-        ui.container { attr = { class = row_class }, content = function ()
-          local params = request.get_param_strings()
-          ui.link{
-            attr = { class = "moreLink" },
-            text = _"Show older events",
-            module = request.get_module(),
-            view = request.get_view(),
-            id = for_unit and for_unit.id or for_area and for_area.id or for_issue and for_issue.id or for_member and for_member.id,
-            params = {
-              mode = "timeline",
-              event_max_id = last_event_id,
-              tab = params["tab"],
-              phase = params["phase"],
-              closed = params["closed"]
-            }
-          }
-        end }
-      elseif #items < 1 then
-        ui.container { attr = { class = row_class }, content = _"No more events available" }
-      end
-    end
-    
-  end }
-
-end
-
-
-local filters = {}
-
-if not for_initiative and not for_issue and not no_filter then
-  
-  filters = execute.chunk{
-    module = "issue", chunk = "_filters", params = {
-    for_events = mode == "timeline" and true or false,
-    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
-  }}
-end
-
-filters.opened = true
-filters.selector = selector
-
-if mode == "timeline" then
-  filters.content = doit
-else
-  filters.content = function()
-    ui.paginate{
-      selector = selector,
-      per_page = 25,
-      content = doit
-    }
-  end
-end
-
-ui.filters(filters)
-      
diff -r d47d2b0cd7c2 -r 7da942c0ed5d app/main/unit/show.lua
--- a/app/main/unit/show.lua	Sun Jan 31 22:12:27 2021 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-local unit_id = config.single_unit_id or param.get_id()
-
-local unit = Unit:by_id(unit_id)
-
-if not unit or unit.attr.hidden then
-  execute.view { module = "index", view = "404" }
-  request.set_status("404 Not Found")
-  return
-end
-
-app.current_unit = unit
-
-unit:load_delegation_info_once_for_member_id(app.session.member_id)
-
-local areas_selector = Area:build_selector{ active = true, unit_id = unit_id }
-areas_selector:add_order_by("member_weight DESC")
-
-local members_selector = Member:build_selector{
-  active = true,
-  voting_right_for_unit_id = unit.id
-}
-
-local delegations_selector = Delegation:new_selector()
-  :join("member", "truster", "truster.id = delegation.truster_id AND truster.active")
-  :join("privilege", "truster_privilege", "truster_privilege.member_id = truster.id AND truster_privilege.unit_id = delegation.unit_id AND truster_privilege.voting_right")
-  :join("member", "trustee", "trustee.id = delegation.trustee_id AND truster.active")
-  :join("privilege", "trustee_privilege", "trustee_privilege.member_id = trustee.id AND trustee_privilege.unit_id = delegation.unit_id AND trustee_privilege.voting_right")
-  :add_where{ "delegation.unit_id = ?", unit.id }
-
-local open_issues_selector = Issue:new_selector()
-  :join("area", nil, "area.id = issue.area_id")
-  :add_where{ "area.unit_id = ?", unit.id }
-  :add_where("issue.closed ISNULL")
-  :add_order_by("coalesce(issue.fully_frozen + issue.voting_time, issue.half_frozen + issue.verification_time, issue.accepted + issue.discussion_time, issue.created + issue.max_admission_time) - now()")
-
-local closed_issues_selector = Issue:new_selector()
-  :join("area", nil, "area.id = issue.area_id")
-  :add_where{ "area.unit_id = ?", unit.id }
-  :add_where("issue.closed NOTNULL")
-  :add_order_by("issue.closed DESC")
-
-  ui.container{ attr = { class = "mdl-grid" }, content = function()
-    ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function()
-        
-      ui.heading{ content = unit.name }
-
-      execute.view { module = "unit", view = "_head", params = { unit = unit } }
-
-      execute.view { 
-        module = "unit", view = "_sidebar", params = { 
-          unit = unit
-        }
-      }
-
-      execute.view { 
-        module = "unit", view = "_sidebar_whatcanido", params = { 
-          unit = unit
-        }
-      }
-
-      execute.view { 
-        module = "unit", view = "_sidebar_members", params = { 
-          unit = unit
-        }
-      }
-
-      execute.view {
-        module = "issue",
-        view = "_list",
-        params = { for_unit = unit, head = function ()
-          ui.heading { attr = { class = "left" }, level = 1, content = unit.name }
-        end }
-      }
-    end }
-  end }
-
---[[
-if app.session:has_access("all_pseudonymous") then
-  tabs[#tabs+1] = {
-    name = "eligible_voters",
-    label = _"Eligible voters",
-    module = "member",
-    view = "_list",
-    params = { members_selector = members_selector }
-  }
-
-  tabs[#tabs+1] = {
-    name = "delegations",
-    label = _"Delegations",
-    module = "delegation",
-    view = "_list",
-    params = { delegations_selector = delegations_selector }
-  }
-end
-
-ui.tabs(tabs)
-
---]]