1.1 --- a/app/main/_filter_view/30_navigation.lua	Thu Aug 30 10:46:36 2018 +0200
     1.2 +++ b/app/main/_filter_view/30_navigation.lua	Thu Aug 30 10:57:39 2018 +0200
     1.3 @@ -188,7 +188,3 @@
     1.4  if app.current_area then
     1.5    app.current_unit = app.current_area.unit
     1.6  end
     1.7 -
     1.8 -if not for_meta_navigation then
     1.9 -  execute.view{ module = "index", view = "_drawer" }
    1.10 -end

     2.1 --- a/app/main/index/_drawer.lua	Thu Aug 30 10:46:36 2018 +0200
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,141 +0,0 @@
     2.4 -local member = app.session.member
     2.5 -local units
     2.6 -if member then
     2.7 -  units = member:get_reference_selector("units"):add_order_by("name"):exec()
     2.8 -  units:load_delegation_info_once_for_member_id(member.id)
     2.9 -else
    2.10 -  units = Unit:new_selector():add_where("active"):add_order_by("name"):exec()
    2.11 -end
    2.12 -
    2.13 -slot.select("drawer", function()
    2.14 -  ui.container{ attr = { class = "mdl-layout__drawer" }, content = function()
    2.15 -    ui.tag{ tag = "nav", attr = { class = "mdl-navigation" }, content = function ()
    2.16 -      ui.link{ content = config.instance_name, attr = { class = "mdl-navigation__link mdl-menu__item--full-bleed-divider mdl-navigation__head" }, module = "index", view = "index" }
    2.17 -
    2.18 -      if #units > 0 then
    2.19 -        for i, unit in ipairs(units) do
    2.20 -          local class = "mdl-navigation__link mdl-navigation__head" 
    2.21 -          if i == #units then
    2.22 -            class = class .. " mdl-menu__item--full-bleed-divider"
    2.23 -          end
    2.24 -          ui.link{ attr = { class = class }, content = unit.name, module = "unit", view = "show", id = unit.id }
    2.25 -          local areas = unit.areas
    2.26 -          for i, area in ipairs(areas) do
    2.27 -            local class = "mdl-navigation__link mdl-menu__item--small" 
    2.28 -            if i == #areas then
    2.29 -              class = class .. " mdl-menu__item--full-bleed-divider"
    2.30 -            end
    2.31 -            ui.link{ attr = { class = class }, module = "area", view = "show", id = area.id, content = function()
    2.32 -              ui.tag{ content = "⤷" }
    2.33 -              slot.put(" ")
    2.34 -              ui.tag{ content = area.name }
    2.35 -            end }
    2.36 -          end
    2.37 -        end
    2.38 -      end
    2.39 -
    2.40 -      ui.link{ attr = { class = "mdl-navigation__link mdl-menu__item--full-bleed-divider" }, content = _"Member list", module = "member", view = "list" }
    2.41 -      ui.link{ attr = { class = "mdl-navigation__link" }, content = _"Quick guide", module = "help", view = "introduction" }
    2.42 -
    2.43 -      if app.session.member_id and app.session.member.admin then
    2.44 -        ui.link{ attr = { class = "mdl-navigation__link mdl-menu__item--full-bleed-divider" }, content = _"System settings", module = "admin", view = "index" }
    2.45 -      end
    2.46 -      
    2.47 -    end }
    2.48 -  end }
    2.49 -end)
    2.50 -
    2.51 -if true then
    2.52 -  return
    2.53 -end
    2.54 -
    2.55 -for i, unit in ipairs(units) do
    2.56 -
    2.57 -  ui.sidebar ( "tab-whatcanido units", function ()
    2.58 -
    2.59 -    local areas_selector = Area:new_selector()
    2.60 -      :reset_fields()
    2.61 -      :add_field("area.id", nil, { "grouped" })
    2.62 -      :add_field("area.unit_id", nil, { "grouped" })
    2.63 -      :add_field("area.name", nil, { "grouped" })
    2.64 -      :add_where{ "area.unit_id = ?", unit.id }
    2.65 -      :add_where{ "area.active" }
    2.66 -      :add_order_by("area.name")
    2.67 -
    2.68 -    local areas = areas_selector:exec()
    2.69 -    if member then
    2.70 -      areas:load_delegation_info_once_for_member_id(member.id)
    2.71 -    end
    2.72 -    
    2.73 -    if #areas > 0 then
    2.74 -
    2.75 -      ui.container {
    2.76 -        attr = { class = "sidebarHead" },
    2.77 -        content = function ()
    2.78 -          ui.heading { level = 2, content = function ()
    2.79 -            ui.link {
    2.80 -              attr = { class = "unit" },
    2.81 -              module = "unit", view = "show", id = unit.id,
    2.82 -              content = unit.name
    2.83 -            }
    2.84 -          
    2.85 -            if member then
    2.86 -              local delegation = Delegation:by_pk(member.id, unit.id, nil, nil)
    2.87 -              
    2.88 -              if delegation then
    2.89 -                ui.link { 
    2.90 -                  module = "delegation", view = "show", params = {
    2.91 -                    unit_id = unit.id
    2.92 -                  },
    2.93 -                  attr = { class = "delegation_info" }, 
    2.94 -                  content = function ()
    2.95 -                    ui.delegation(delegation.trustee_id, delegation.trustee.name)
    2.96 -                  end
    2.97 -                }
    2.98 -              end
    2.99 -            end
   2.100 -          end }
   2.101 -          
   2.102 -        end
   2.103 -      }
   2.104 -      
   2.105 -      
   2.106 -      ui.tag { tag = "div", attr = { class = "areas areas-" .. unit.id }, content = function ()
   2.107 -      
   2.108 -        for i, area in ipairs(areas) do
   2.109 -
   2.110 -          ui.tag { tag = "div", attr = { class = "sidebarRow" }, content = function ()
   2.111 -            
   2.112 -            if member then
   2.113 -              local delegation = Delegation:by_pk(member.id, nil, area.id, nil)
   2.114 -        
   2.115 -              if delegation then
   2.116 -                ui.link { 
   2.117 -                  module = "delegation", view = "show", params = {
   2.118 -                    area_id = area.id
   2.119 -                  },
   2.120 -                  attr = { class = "delegation_info" }, 
   2.121 -                  content = function ()
   2.122 -                    ui.delegation(delegation.trustee_id, delegation.trustee_id and delegation.trustee.name)
   2.123 -                  end
   2.124 -                }
   2.125 -              end
   2.126 -            end
   2.127 -      
   2.128 -            slot.put ( " " )
   2.129 -            
   2.130 -            ui.link {
   2.131 -              attr = { class = "area" },
   2.132 -              module = "area", view = "show", id = area.id,
   2.133 -              content = area.name
   2.134 -            }
   2.135 -            
   2.136 -            
   2.137 -          end }
   2.138 -        end
   2.139 -      end }
   2.140 -    end 
   2.141 -  end )
   2.142 -end
   2.143 -
   2.144 -