effective_committees 0.9.5 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d78fcecb80be8b05b2a3e02921358f8183575caccd4e259b27ca856d98abc869
-  data.tar.gz: '07478672b7ba0c0474d8928041e1d16ac32199110244bc50998cfd9b1b8e918a'
+  metadata.gz: b64f9b12ecd4b0b3b70dd361f5fbe9c25b37009f167c68c92b7d0a0501bdbb7d
+  data.tar.gz: b3e5bbcadbd792f9f98d0bc5cb65aad229ae24fea3bae2aa7a0063f8e1535295
 SHA512:
-  metadata.gz: 6ed635067e98101e0e8e33f7ef3ba0365cac457fc58d6fda4bc099c1043e4d20b690eea8bfb9068a0d9f8b1e6f99003c9c14ef206ba93f216adfee3c4bb7533c
-  data.tar.gz: b358afac722343b105466631e35ae62c49a34b1322d73c16ff58c551b35bc55326a75292f6268410f734091329424b14ee3f495a078722994e1a563783f53400
+  metadata.gz: 340c2c724dfab35ab4b3b901cd5035805496b4a7e6029abfaf3f490fbe957c1fdc99312c0fb72712577c2983083182baaf0c7a075baa08a5d9aae8c82b38a7fe
+  data.tar.gz: af0d65a2e6b320347dfd169ce5710712cda0eab4c33d80da5e386b8a2262e03b431d32ec922f8fa9a7579ab370a901811192bee4254c98e719856341b518e8b5

data/app/controllers/admin/committee_agenda_items_controller.rb

@@ -0,0 +1,16 @@
+module Admin
+  class CommitteeAgendaItemsController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_committees) }
+
+    include Effective::CrudController
+
+    private
+
+    def permitted_params
+      model = (params.key?(:effective_committee_agenda_item) ? :effective_committee_agenda_item : :committee_agenda_item)
+      params.require(model).permit!
+    end
+
+  end
+end

data/app/controllers/effective/committee_agenda_items_controller.rb

@@ -0,0 +1,11 @@
+module Effective
+  class CommitteeAgendaItemsController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+
+    include Effective::CrudController
+    log_page_views(if: -> { EffectiveCommittees.log_page_views? })
+
+    resource_scope -> { Effective::CommitteeAgendaItem.deep }
+
+  end
+end

data/app/controllers/effective/committee_folders_controller.rb

@@ -7,5 +7,10 @@ module Effective
 
     resource_scope -> { Effective::CommitteeFolder.deep }
 
+    def agenda
+      @committee_folder = resource_scope.find(params[:id])
+      EffectiveResources.authorize!(self, :agenda, @committee_folder)
+    end
+
   end
 end

data/app/datatables/admin/effective_committee_agenda_items_datatable.rb

@@ -0,0 +1,29 @@
+module Admin
+  class EffectiveCommitteeAgendaItemsDatatable < Effective::Datatable
+    datatable do
+      reorder :position
+
+      col :updated_at, visible: false
+      col :created_at, visible: false
+
+      col :id, visible: false
+
+      col :code, label: 'Code'
+      col :title
+      col :presenter
+      col :timed_at, label: 'Timed'
+
+      actions_col
+    end
+
+    collection do
+      scope = Effective::CommitteeAgendaItem.deep.sorted
+
+      if attributes[:committee_folder_id].present?
+        scope = scope.where(committee_folder_id: attributes[:committee_folder_id])
+      end
+
+      scope
+    end
+  end
+end

data/app/datatables/admin/effective_committee_folders_datatable.rb

@@ -10,8 +10,8 @@ module Admin
 
       col :committee
 
-      col :parents, label: "Folders" do |committee_folder|
-        admin_committees_parents(committee_folder)
+      col :title do |folder|
+        link_to(folder.title, effective_committees.edit_admin_committee_folder_path(folder))
       end
 
       col :slug, visible: false
@@ -24,18 +24,20 @@ module Admin
     end
 
     collection do
-      folders = Effective::CommitteeFolder.deep.sorted.all
+      folders = Effective::CommitteeFolder.deep.sorted
 
       if attributes[:committee_folder_id].present?
-        folders = folders.where(id: committee_folder.children)
+        folders = folders.where(committee_folder_id: attributes[:committee_folder_id])
+      elsif attributes[:committee_id].present?
+        folders = folders.where(
+          committee_id: attributes[:committee_id],
+          committee_type: attributes[:committee_type],
+          committee_folder_id: nil
+        )
       end
 
       folders
     end
 
-    def committee_folder
-      @committee_folder ||= Effective::CommitteeFolder.find_by_id(attributes[:committee_folder_id])
-    end
-
   end
 end

data/app/helpers/effective_committees_helper.rb

@@ -37,8 +37,18 @@ module EffectiveCommitteesHelper
   end
 
   def admin_committees_parents(resource)
-    parents = resource.parents + [resource]
+    parents = []
+    parents << resource.committee if resource.respond_to?(:committee) && resource.committee.present?
+    parents += resource.parents
+    parents << resource
+
     render(partial: 'admin/committees/parents', locals: { parents: parents }, formats: [:html])
   end
 
+  def committee_file_link(committee_file, label: nil)
+    label = label.presence || committee_file.to_s
+    return label unless committee_file.file.attached?
+    link_to(label, url_for(committee_file.file), target: '_blank')
+  end
+
 end

data/app/models/effective/committee.rb

@@ -18,6 +18,8 @@ module Effective
     has_many :committee_files, -> { Effective::CommitteeFile.sorted }, class_name: 'Effective::CommitteeFile', inverse_of: :committee, dependent: :delete_all
     accepts_nested_attributes_for :committee_files, allow_destroy: true
 
+    has_many :committee_agenda_items, -> { Effective::CommitteeAgendaItem.sorted }, class_name: 'Effective::CommitteeAgendaItem', inverse_of: :committee, dependent: :delete_all
+
     effective_resource do
       title                     :string
       slug                      :string
@@ -28,6 +30,8 @@ module Effective
       committee_folders_count   :integer # Counter Cache
       committee_files_count     :integer # Counter Cache
 
+      agenda_mode               :boolean
+
       timestamps
     end
 
@@ -48,11 +52,19 @@ module Effective
       title.presence || 'New Committee'
     end
 
+    # Returns the user's currently-active term on this committee, or nil.
+    # For the full history including expired terms, use committee_members_for(user:).
     def committee_member(user:)
-      committee_members.find { |member| member.user_id == user.id }
+      committee_members.find { |member| member.user_id == user.id && member.active? }
+    end
+
+    # All terms (active and expired) a user has served on this committee.
+    def committee_members_for(user:)
+      committee_members.select { |member| member.user_id == user.id }
     end
 
-    # Find or build
+    # Find-active-or-build-new. If the user has no active term, build a fresh row
+    # (expired terms are history and are not edited in place through this helper).
     def build_committee_member(user:)
       committee_member(user: user) || committee_members.build(user: user)
     end

data/app/models/effective/committee_agenda_item.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Effective
+  class CommitteeAgendaItem < ActiveRecord::Base
+    self.table_name = (EffectiveCommittees.committee_agenda_items_table_name || :committee_agenda_items).to_s
+
+    log_changes(to: :committee) if respond_to?(:log_changes)
+
+    belongs_to :committee, polymorphic: true
+    belongs_to :committee_folder
+
+    has_rich_text :body
+
+    effective_resource do
+      code        :string
+      title       :string
+      presenter   :string
+      timed_at    :string
+
+      position    :integer
+
+      timestamps
+    end
+
+    before_validation(if: -> { committee_folder.present? }) do
+      self.committee ||= committee_folder.committee
+      self.position  ||= (committee_folder.committee_agenda_items.maximum(:position) || -1) + 1
+    end
+
+    scope :sorted, -> { order(:position) }
+    scope :deep,   -> { includes(:rich_text_body) }
+
+    validates :title, presence: true, length: { maximum: 250 }
+    validates :position, presence: true
+    validates :code, length: { maximum: 50 }
+    validates :presenter, length: { maximum: 250 }
+    validates :timed_at, length: { maximum: 250 }
+
+    def to_s
+      [code, title].compact_blank.join(' ').presence || model_name.human
+    end
+  end
+end

data/app/models/effective/committee_folder.rb

@@ -14,6 +14,8 @@ module Effective
     has_many :committee_folders, -> { Effective::CommitteeFolder.sorted.deep }, dependent: :destroy, inverse_of: :committee_folder
     has_many :committee_files, -> { Effective::CommitteeFile.sorted.deep }, dependent: :destroy, inverse_of: :committee_folder
 
+    has_many :committee_agenda_items, -> { Effective::CommitteeAgendaItem.sorted }, dependent: :destroy, inverse_of: :committee_folder
+
     has_many_attached :files
 
     effective_resource do
@@ -23,6 +25,8 @@ module Effective
       position                :integer
       committee_files_count   :integer # Counter Cache
 
+      meeting_date    :datetime
+
       timestamps
     end
 
@@ -33,12 +37,52 @@ module Effective
     scope :deep, -> { includes(:rich_text_body, :committee, :committee_files) }
     scope :sorted, -> { order(:position) }
     scope :top_level, -> { where(committee_folder_id: nil) }
+    scope :upcoming_meetings, -> { where.not(meeting_date: nil).where('meeting_date >= ?', 1.week.ago.beginning_of_day).order(:meeting_date) }
+    scope :past_meetings,     -> { where.not(meeting_date: nil).where('meeting_date < ?',  1.week.ago.beginning_of_day).order(meeting_date: :desc) }
+
+    # Hierarchical alphabetical sort: roots A→Z, then each root's children A→Z, etc.
+    # Returns an Array so it can't be chained further; intended for select dropdowns.
+    scope :sorted_for_dropdowns, -> {
+      folders = order(:title).to_a
+      by_parent = folders.group_by(&:committee_folder_id)
+      visible_ids = folders.map(&:id).to_set
+
+      result = []
+      walk = ->(parent_id) {
+        Array(by_parent[parent_id]).each do |folder|
+          result << folder
+          walk.call(folder.id)
+        end
+      }
+      walk.call(nil)
+
+      # Any folders whose parent isn't in the current scope (e.g. the relation
+      # was filtered) should still appear, attached at the top in alphabetical order.
+      orphans = folders.reject { |folder| result.include?(folder) }
+                       .reject { |folder| visible_ids.include?(folder.committee_folder_id) }
+      orphans.each do |folder|
+        result << folder
+        walk.call(folder.id)
+      end
+
+      result
+    }
 
     validates :title, presence: true, length: { maximum: 250 },
-      uniqueness: { scope: [:committee_id], message: 'already exists for this committee'}
+      uniqueness: { scope: [:committee_id, :committee_folder_id], message: 'already exists in this folder' }
 
     validates :position, presence: true
 
+    validate(if: -> { meeting_date.present? }) do
+      if parents.any?(&:meeting?)
+        errors.add(:meeting_date, "can't be set — a parent folder is already an agenda")
+      end
+
+      if persisted? && committee_folders.any? { |child| child.meeting_date.present? || child.send(:any_descendant_meeting?) }
+        errors.add(:meeting_date, "can't be set — a child folder is already an agenda")
+      end
+    end
+
     def to_s
       (parents + [self]).map { |folder| (folder.title || 'folder') }.join(' / ')
     end
@@ -52,6 +96,14 @@ module Effective
       committee_folder.blank?
     end
 
+    def meeting?
+      meeting_date.present?
+    end
+
+    def agenda_section?
+      committee_folder&.meeting?
+    end
+
     def parent
       committee_folder || committee
     end
@@ -72,5 +124,11 @@ module Effective
       committee_folders.flat_map { |folder| [folder] + folder.children }
     end
 
+    protected
+
+    def any_descendant_meeting?
+      committee_folders.any? { |child| child.meeting_date.present? || child.any_descendant_meeting? }
+    end
+
   end
 end

data/app/views/admin/committee_agenda_items/_form.html.haml

@@ -0,0 +1,3 @@
+= tabs do
+  = tab 'Agenda Item' do
+    = render 'admin/committee_agenda_items/form_committee_agenda_item', committee_agenda_item: committee_agenda_item

data/app/views/admin/committee_agenda_items/_form_committee_agenda_item.html.haml

@@ -0,0 +1,37 @@
+= effective_form_with(model: [:admin, committee_agenda_item], engine: true) do |f|
+  - f.object.committee_type ||= Effective::Committee.name
+
+  = f.hidden_field :committee_type
+  = f.hidden_field :committee_id
+
+  - if inline_datatable? && inline_datatable.attributes[:committee_folder_id].present?
+    = f.hidden_field :committee_folder_id
+  - elsif f.object.persisted?
+    = f.static_field :committee
+    = f.select :committee_folder_id, Effective::CommitteeFolder.sorted.where(committee: f.object.committee), label: "Section"
+  - else
+    = f.select :committee_id, Effective::Committee.sorted.all,
+      'data-load-ajax-url': effective_committees.new_admin_committee_agenda_item_path,
+      'data-load-ajax-div': '#effective-committees-ajax'
+
+    #effective-committees-ajax
+      = f.select :committee_folder_id, Effective::CommitteeFolder.sorted.where(committee: f.object.committee), label: "Section"
+
+  .row
+    .col-md-3
+      = f.text_field :code, hint: "e.g. A-1"
+    .col-md-9
+      = f.text_field :title
+
+  .row
+    .col-md-6
+      = f.text_field :presenter
+    .col-md-6
+      = f.text_field :timed_at, label: "Time", hint: "e.g. 3:00pm"
+
+  - if defined?(EffectiveArticleEditor)
+    = f.article_editor :body
+  - else
+    = f.rich_text_area :body, hint: "Rich text shown under the item title."
+
+  = f.submit

data/app/views/admin/committee_folders/_form.html.haml

@@ -1,24 +1,34 @@
 - if committee_folder.persisted?
   %p= admin_committees_parents(committee_folder)
 
+- agenda_section = committee_folder.committee.agenda_mode? && committee_folder.agenda_section?
+
 = tabs do
   - if committee_folder.persisted?
     = tab 'Folder' do
-      %h3 Folders
-      %p.text-muted
-        %small Refresh the page after creating a new folder to move files to it.
+      - if agenda_section
+        %h3 Agenda Items
+        %p.text-muted
+          %small Structured items rendered on the agenda page. Drag the reorder handle to change position.
+
+        - datatable = Admin::EffectiveCommitteeAgendaItemsDatatable.new(committee_folder_id: committee_folder.id, committee_id: committee_folder.committee_id, committee_type: committee_folder.committee_type)
+        = render_datatable(datatable, inline: true)
+      - else
+        %h3 Folders
+        %p.text-muted
+          %small Refresh the page after creating a new folder to move files to it.
 
-      - datatable = Admin::EffectiveCommitteeFoldersDatatable.new(committee_folder: committee_folder, committee: committee_folder.committee)
-      = render_datatable(datatable, inline: true, simple: true)
+        - datatable = Admin::EffectiveCommitteeFoldersDatatable.new(committee_folder: committee_folder, committee: committee_folder.committee)
+        = render_datatable(datatable, inline: true, simple: true)
 
-      %h3 Files
-      %p.text-muted
-        %small Select the files, then use the Bulk Actions dropdown to move them to another folder
+        %h3 Files
+        %p.text-muted
+          %small Select the files, then use the Bulk Actions dropdown to move them to another folder
 
-      .mt-4= render('admin/committee_folders/form_bulk_upload', committee_folder: committee_folder)
+        .mt-4= render('admin/committee_folders/form_bulk_upload', committee_folder: committee_folder)
 
-      - datatable = Admin::EffectiveCommitteeFilesDatatable.new(committee_folder: committee_folder, committee: committee_folder.committee)
-      = render_datatable(datatable, inline: true)
+        - datatable = Admin::EffectiveCommitteeFilesDatatable.new(committee_folder: committee_folder, committee: committee_folder.committee)
+        = render_datatable(datatable, inline: true)
 
   = tab 'Folder Details' do
     = render 'admin/committee_folders/form_committee_folder', committee_folder: committee_folder

data/app/views/admin/committee_folders/_form_committee_folder.html.haml

@@ -8,22 +8,32 @@
     = f.hidden_field :committee_folder_id
   - elsif f.object.persisted?
     = f.static_field :committee
-    = f.select :committee_folder_id, Effective::CommitteeFolder.sorted.where(committee: f.object.committee), label: "Parent Folder", hint: "Leave blank to create a top-level folder"
+    = f.select :committee_folder_id, Effective::CommitteeFolder.where(committee: f.object.committee).sorted_for_dropdowns, label: "Parent Folder", hint: "Leave blank to create a top-level folder"
   - else
     = f.select :committee_id, Effective::Committee.sorted.all,
       'data-load-ajax-url': effective_committees.new_admin_committee_folder_path,
       'data-load-ajax-div': '#effective-committees-ajax'
 
     #effective-committees-ajax
-      = f.select :committee_folder_id, Effective::CommitteeFolder.sorted.where(committee: f.object.committee), label: "Parent Folder", hint: "Leave blank to create a top-level folder"
+      = f.select :committee_folder_id, Effective::CommitteeFolder.where(committee: f.object.committee).sorted_for_dropdowns, label: "Parent Folder", hint: "Leave blank to create a top-level folder"
 
   = f.text_field :title
 
   = acts_as_slugged_fields(f, url: (effective_committees.commitee_url(f.object) rescue nil))
 
+  - if f.object.committee&.agenda_mode?
+    - meeting_ancestor = f.object.parents.detect(&:meeting?)
+    - if meeting_ancestor.present?
+      .alert.alert-info.mb-3
+        This folder is inside the “#{meeting_ancestor.title}” agenda, so it can’t be turned into its own agenda. It should be treated as a section of the parent agenda.
+    - else
+      = f.datetime_field :meeting_date, label: "Meeting date & time",
+        hint: "Turns this folder into an agenda. Child folders become the agenda's sections (A, B, C, etc.), and within each section folder you can add agenda items. Details added to the Body below will appear at the top of the agenda page.".html_safe
+
   - if defined?(EffectiveArticleEditor)
     = f.article_editor :body, hint: "Displayed on the #{committee_folder_label} page"
   - else
     = f.rich_text_area :body, hint: "Displayed on the #{committee_folder_label} page"
 
+
   = f.submit

data/app/views/admin/committee_members/_form_committee_member.html.haml

@@ -25,6 +25,14 @@
     = f.static_field :committee
     = f.static_field :user, label: committee_member_label
 
+    - other_terms = f.object.committee.committee_members_for(user: f.object.user).reject { |m| m.id == f.object.id }
+    - if other_terms.any?
+      .mb-3
+        %strong Other terms for this user on this committee
+        %ul
+          - other_terms.each do |term|
+            %li= [term.start_on || '(open start)', term.end_on || '(open end)'].join(' to ')
+
   = f.text_field :category
 
   .row

data/app/views/admin/committees/_fields.html.haml

@@ -5,6 +5,9 @@
 = f.check_box :display_on_index, label: "Show on the member-only #{link_to "Volunteers and Committees", effective_committees.volunteers_and_committees_path, target: '_blank'} page"
 = f.check_box :display_on_dashboard, label: "Show on the #{link_to "My #{committee_label.pluralize}", effective_committees.committees_path, target: '_blank'} page".html_safe
 
+= f.check_box :agenda_mode, label: "Enable structured meeting agendas for this #{committee_label}",
+  hint: "When checked, any subfolder with a meeting date has the meeting agenda view enabled.".html_safe
+
 - if defined?(EffectiveArticleEditor)
   = f.article_editor :body, hint: "Shown on the #{committee_label} page."
 - else

data/app/views/effective/committee_agenda_items/_card.html.haml

@@ -0,0 +1,30 @@
+-# Renders a single agenda item's content (left column + right metadata column).
+-# Locals:
+-#   item: CommitteeAgendaItem
+-#   compact: true when rendered in the long agenda list (smaller heading)
+
+- compact = local_assigns.fetch(:compact, false)
+
+.row
+  .col-md-9
+    - if compact
+      %h4.mb-2
+        - if item.code.present?
+          %span.text-muted.me-2= item.code
+        = item.title
+    - else
+      %h1.card-title.mb-2
+        - if item.code.present?
+          %span.text-muted.me-2= item.code
+        = item.title
+
+    - if item.body.present?
+      .agenda-item-body= item.body.to_s
+
+  .col-md-3.text-md-end
+    - if item.presenter.present?
+      %p.mb-1
+        %strong= item.presenter
+    - if item.timed_at.present?
+      %p.mb-0.text-muted
+        %em= item.timed_at

data/app/views/effective/committee_agenda_items/_committee_agenda_item.html.haml

@@ -0,0 +1,14 @@
+- committee = committee_agenda_item.committee
+- section = committee_agenda_item.committee_folder
+
+- trail = section.parents.map { |parent| [parent.title, effective_committees.committee_committee_folder_path(committee, parent)] }
+- trail << [section.title, effective_committees.committee_committee_folder_path(committee, section)]
+= render 'effective/committee_folders/breadcrumb', committee: committee, trail: trail, current: committee_agenda_item.to_s
+
+.effective-committee-agenda-item
+  .card.mb-4
+    .card-body
+      = render 'effective/committee_agenda_items/card', item: committee_agenda_item
+
+  %p
+    = link_to "← Back", effective_committees.committee_committee_folder_path(committee, section), class: 'btn btn-link p-0'

data/app/views/effective/committee_agenda_items/show.html.haml

@@ -0,0 +1,10 @@
+- resource = (@_effective_resource || Effective::Resource.new(controller_path))
+- @resource = instance_variable_get('@' + resource.name) if resource.name
+
+- if @resource
+  .resource-buttons
+    = render_resource_buttons(@resource, show: false)
+
+  = render_resource_partial(@resource)
+
+.my-4

data/app/views/effective/committee_folders/_agenda.html.haml

@@ -0,0 +1,42 @@
+- committee = committee_folder.committee
+- sections = committee_folder.committee_folders.sorted.includes(:rich_text_body, committee_agenda_items: :rich_text_body)
+
+- trail = committee_folder.parents.map { |parent| [parent.title, effective_committees.committee_committee_folder_path(committee, parent)] }
+= render 'effective/committee_folders/breadcrumb', committee: committee, trail: trail, current: committee_folder.title
+
+.effective-committee-agenda
+  %h1.mb-1= committee.to_s
+  %h2.text-muted.mb-3= committee_folder.title
+
+  .card.mb-4
+    .card-body
+
+      - if committee_folder.meeting_date.present?
+        %p.mb-3
+          %strong Date:
+          = committee_folder.meeting_date.strftime('%A, %B %-d, %Y at %-l:%M %p')
+
+      - if committee_folder.rich_text_body.present?
+        = committee_folder.rich_text_body.to_s
+
+  - sections.each do |section|
+    %section.mb-5{id: "section-#{section.id}"}
+      %h2.mb-3= section.title
+      - if section.rich_text_body.present?
+        .mb-3= section.rich_text_body.to_s
+
+      - items = section.committee_agenda_items.sorted
+      - if items.any?
+        .card
+          .list-group.list-group-flush
+            - items.each do |item|
+              .list-group-item{id: "item-#{item.id}"}
+                = render 'effective/committee_agenda_items/card', item: item, compact: true
+
+  - meeting_files = committee_folder.committee_files.sorted
+  - if meeting_files.any?
+    %hr
+    %h3 Meeting Files
+    %ul
+      - meeting_files.each do |committee_file|
+        %li= committee_file_link(committee_file)

data/app/views/effective/committee_folders/_breadcrumb.html.haml

@@ -0,0 +1,13 @@
+-# Locals:
+-#   committee: the Committee
+-#   trail: [[title, path], ...] — non-active links between the committee and the active page
+-#   current: title string of the active leaf
+
+%nav{'aria-label': 'breadcrumb'}
+  %ol.breadcrumb
+    %li.breadcrumb-item= link_to("My Dashboard", return_to_dashboard_path)
+    %li.breadcrumb-item= link_to("My #{committees_label}", effective_committees.committees_path)
+    %li.breadcrumb-item= link_to(committee, effective_committees.committee_path(committee))
+    - trail.each do |title, path|
+      %li.breadcrumb-item= link_to(title, path)
+    %li.breadcrumb-item.active{'aria-current': 'page'}= current

data/app/views/effective/committee_folders/_committee_folder.html.haml

@@ -1,31 +1,54 @@
 = render('layout') do
   - committee = committee_folder.committee
 
-  %nav{'aria-label': 'breadcrumb'}
-    %ol.breadcrumb
-      %li.breadcrumb-item= link_to("My Dashboard", return_to_dashboard_path)
-      %li.breadcrumb-item= link_to("My #{committees_label}", effective_committees.committees_path)
-      %li.breadcrumb-item= link_to(committee, effective_committees.committee_path(committee))
-
-      - committee_folder.parents.each do |parent|
-        %li.breadcrumb-item= link_to(parent.title, effective_committees.committee_committee_folder_path(committee, parent))
-
-      %li.breadcrumb-item.active{'aria-current': 'page'}= committee_folder.title
+  - trail = committee_folder.parents.map { |parent| [parent.title, effective_committees.committee_committee_folder_path(committee, parent)] }
+  = render 'effective/committee_folders/breadcrumb', committee: committee, trail: trail, current: committee_folder.title
 
   .effective-committee-folder
-    %h1= committee_folder.title
+    .d-flex.justify-content-between.align-items-start.mb-3
+      %h1.mb-0= committee_folder.title
+      - if committee.agenda_mode? && committee_folder.meeting?
+        = link_to "View Agenda", effective_committees.agenda_committee_committee_folder_path(committee, committee_folder), class: 'btn btn-primary'
 
     - if committee_folder.rich_text_body.present?
       .mb-4= committee_folder.rich_text_body.to_s
 
     .my-4
 
+    - agenda_items = committee_folder.committee_agenda_items.sorted if committee.agenda_mode?
+
+    - if committee.agenda_mode? && agenda_items.present?
+      %h3 Agenda Items
+      .card.mb-4
+        .list-group.list-group-flush
+          - agenda_items.each do |agenda_item|
+            = link_to(effective_committees.committee_committee_folder_committee_agenda_item_path(committee, committee_folder, agenda_item), class: 'list-group-item list-group-action') do
+              .row
+                .col-md-9
+                  - if agenda_item.code.present?
+                    %span.text-muted.me-2= agenda_item.code
+                  = agenda_item.title
+                .col-md-3.text-md-end
+                  - if agenda_item.presenter.present?
+                    %small.text-muted= agenda_item.presenter
+                  - if agenda_item.timed_at.present?
+                    %small.text-muted.ms-2= agenda_item.timed_at
+
+    - meeting_children = committee_folder.committee_folders.select(&:meeting?) if committee.agenda_mode?
+
+    - if committee.agenda_mode? && meeting_children.present?
+      %h3 Agendas
+      .card.mb-4
+        .list-group.list-group-flush
+          - meeting_children.each do |meeting_folder|
+            = link_to(meeting_folder.title, effective_committees.agenda_committee_committee_folder_path(committee, meeting_folder), class: 'list-group-item list-group-action')
+
     - if committee_folder.committee_folders.present?
       %h3 Folders
-      .card
+      .card.mb-4
         .list-group.list-group-flush
-          - committee_folder.committee_folders.each do |committee_folder|
-            = link_to(committee_folder.title, effective_committees.committee_committee_folder_path(committee, committee_folder), class: 'list-group-item list-group-action')
+          - committee_folder.committee_folders.each do |child_folder|
+            = link_to(child_folder.title, effective_committees.committee_committee_folder_path(committee, child_folder), class: 'list-group-item list-group-action')
 
     %h3 Files
     .card
@@ -43,14 +66,13 @@
             - committee_folder.committee_files.each_with_index do |file, index|
               %tr
                 %td= index+1
-                %td
-                  - if file.file.attached?
-                    = link_to(file.to_s, url_for(file.file), target: '_blank')
-                  - else
-                    = file.to_s
-
+                %td= committee_file_link(file)
                 %td.d-none.d-lg-table-cell= file.created_at.strftime('%F')
                 %td.d-none.d-lg-table-cell= number_to_human_size(file.file.byte_size)
                 %td.d-none.d-lg-table-cell= file.notes
         - else
           %p No files.
+
+    - back_path = committee_folder.committee_folder.present? ? effective_committees.committee_committee_folder_path(committee, committee_folder.committee_folder) : effective_committees.committee_path(committee)
+    %p.mt-4
+      = link_to "← Back", back_path, class: 'btn btn-link p-0'

data/app/views/effective/committee_folders/agenda.html.haml

@@ -0,0 +1,2 @@
+= render('layout') do
+  = render 'effective/committee_folders/agenda', committee_folder: @committee_folder

data/app/views/effective/committee_folders/show.html.haml

@@ -3,7 +3,7 @@
 
 - if @resource
   .resource-buttons
-    = render_resource_buttons(@resource, show: false)
+    = render_resource_buttons(@resource, show: false, agenda: false)
 
   = render_resource_partial(@resource)
 

data/app/views/effective/committees/_dashboard_agendas.html.haml

@@ -0,0 +1,18 @@
+- agenda_committees = current_user.committees.select(&:agenda_mode?)
+- upcoming = agenda_committees.flat_map { |c| Effective::CommitteeFolder.where(committee: c).upcoming_meetings.limit(5) }.sort_by(&:meeting_date).first(5)
+
+- if upcoming.any? || recent.any?
+  %h3 Upcoming Meetings
+
+  - if upcoming.any?
+    .card
+      .list-group.list-group-flush
+        - upcoming.each do |meeting|
+          = link_to effective_committees.agenda_committee_committee_folder_path(meeting.committee, meeting), class: 'list-group-item list-group-action' do
+            %strong= meeting.committee.to_s
+            %br
+            = meeting.title
+  - else
+    %p.text-muted No upcoming meetings.
+
+  .mb-5

data/app/views/effective/committees/index.html.haml

@@ -33,4 +33,7 @@
                 %p No files or folders.
 
       .col-lg
+        - if current_user.committees.any?(&:agenda_mode?)
+          = render 'effective/committees/dashboard_agendas'
+
         = render 'effective/committees/dashboard_activity'

data/config/routes.rb

@@ -10,7 +10,10 @@ EffectiveCommittees::Engine.routes.draw do
     resources :committees, only: [:index, :show] do
       get 'activity', on: :collection
 
-      resources :committee_folders, only: [:show]
+      resources :committee_folders, only: [:show], path: 'folders' do
+        member { get :agenda }
+        resources :committee_agenda_items, only: [:show]
+      end
     end
 
     get 'volunteers-and-committees', to: 'committees#volunteers_and_committees', as: 'volunteers_and_committees'
@@ -26,6 +29,7 @@ EffectiveCommittees::Engine.routes.draw do
     resources :committee_files, except: [:show] do
       post :bulk_move, on: :collection
     end
+    resources :committee_agenda_items, except: [:show, :index]
   end
 
 end

data/db/migrate/101_create_effective_committees.rb

@@ -13,6 +13,8 @@ class CreateEffectiveCommittees < ActiveRecord::Migration[6.0]
       t.boolean :display_on_index, default: true
       t.boolean :display_on_dashboard, default: true
 
+      t.boolean :agenda_mode, default: false, null: false
+
       t.datetime :updated_at
       t.datetime :created_at
     end
@@ -57,6 +59,8 @@ class CreateEffectiveCommittees < ActiveRecord::Migration[6.0]
       t.integer :position
       t.integer :committee_files_count, default: 0
 
+      t.datetime :meeting_date
+
       t.datetime :updated_at
       t.datetime :created_at
     end
@@ -64,6 +68,7 @@ class CreateEffectiveCommittees < ActiveRecord::Migration[6.0]
     add_index :committee_folders, [:committee_id, :committee_type]
     add_index :committee_folders, [:position]
     add_index :committee_folders, :committee_id, if_not_exists: true
+    add_index :committee_folders, [:committee_id, :meeting_date]
 
     create_table :committee_files do |t|
       t.integer :committee_id
@@ -85,5 +90,25 @@ class CreateEffectiveCommittees < ActiveRecord::Migration[6.0]
 
     add_index :committee_files, :committee_id, if_not_exists: true
     add_index :committee_files, :title, if_not_exists: true
+
+    create_table :committee_agenda_items do |t|
+      t.integer :committee_id
+      t.string :committee_type
+
+      t.integer :committee_folder_id
+
+      t.string :code
+      t.string :title
+      t.string :presenter
+      t.string :timed_at
+
+      t.integer :position
+
+      t.datetime :updated_at
+      t.datetime :created_at
+    end
+
+    add_index :committee_agenda_items, :committee_folder_id
+    add_index :committee_agenda_items, [:committee_id, :committee_type]
   end
 end

data/lib/effective_committees/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCommittees
-  VERSION = '0.9.5'.freeze
+  VERSION = '0.10.0'.freeze
 end

data/lib/effective_committees.rb

@@ -9,6 +9,7 @@ module EffectiveCommittees
   def self.config_keys
     [
       :committees_table_name, :committee_members_table_name, :committee_folders_table_name, :committee_files_table_name,
+      :committee_agenda_items_table_name,
       :layout, :use_effective_roles, :log_page_views
     ]
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_committees
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.10.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-30 00:00:00.000000000 Z
+date: 2026-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -207,13 +207,16 @@ files:
 - app/assets/javascripts/effective_committees/base.js
 - app/assets/stylesheets/effective_committees.scss
 - app/assets/stylesheets/effective_committees/base.scss
+- app/controllers/admin/committee_agenda_items_controller.rb
 - app/controllers/admin/committee_files_controller.rb
 - app/controllers/admin/committee_folders_controller.rb
 - app/controllers/admin/committee_members_controller.rb
 - app/controllers/admin/committees_controller.rb
+- app/controllers/effective/committee_agenda_items_controller.rb
 - app/controllers/effective/committee_folders_controller.rb
 - app/controllers/effective/committee_members_controller.rb
 - app/controllers/effective/committees_controller.rb
+- app/datatables/admin/effective_committee_agenda_items_datatable.rb
 - app/datatables/admin/effective_committee_files_datatable.rb
 - app/datatables/admin/effective_committee_folders_datatable.rb
 - app/datatables/admin/effective_committee_members_datatable.rb
@@ -224,9 +227,12 @@ files:
 - app/helpers/effective_committees_helper.rb
 - app/models/concerns/effective_committees_user.rb
 - app/models/effective/committee.rb
+- app/models/effective/committee_agenda_item.rb
 - app/models/effective/committee_file.rb
 - app/models/effective/committee_folder.rb
 - app/models/effective/committee_member.rb
+- app/views/admin/committee_agenda_items/_form.html.haml
+- app/views/admin/committee_agenda_items/_form_committee_agenda_item.html.haml
 - app/views/admin/committee_files/_form.html.haml
 - app/views/admin/committee_files/_form_committee_file.html.haml
 - app/views/admin/committee_folders/_form.html.haml
@@ -239,14 +245,21 @@ files:
 - app/views/admin/committees/_form.html.haml
 - app/views/admin/committees/_form_committee.html.haml
 - app/views/admin/committees/_parents.html.haml
+- app/views/effective/committee_agenda_items/_card.html.haml
+- app/views/effective/committee_agenda_items/_committee_agenda_item.html.haml
+- app/views/effective/committee_agenda_items/show.html.haml
+- app/views/effective/committee_folders/_agenda.html.haml
+- app/views/effective/committee_folders/_breadcrumb.html.haml
 - app/views/effective/committee_folders/_committee_folder.html.haml
 - app/views/effective/committee_folders/_layout.html.haml
+- app/views/effective/committee_folders/agenda.html.haml
 - app/views/effective/committee_folders/show.html.haml
 - app/views/effective/committee_members/_form.html.haml
 - app/views/effective/committee_members/_user_fields.html.haml
 - app/views/effective/committees/_committee.html.haml
 - app/views/effective/committees/_dashboard.html.haml
 - app/views/effective/committees/_dashboard_activity.html.haml
+- app/views/effective/committees/_dashboard_agendas.html.haml
 - app/views/effective/committees/_fields.html.haml
 - app/views/effective/committees/_form.html.haml
 - app/views/effective/committees/_form_committee.html.haml