effective_committees 0.3.13 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 514536a74523036c232572b6ba134e8266e351da77d29ce03968c8ad7c35b10b
-  data.tar.gz: 0fdbc2739fb43d5c8afac621ee1f38e7d4a1897479b43b00859c40ffa400d65a
+  metadata.gz: d8a33f8d6be9ba291dc023ec6e8446f7c4ca40cf66177622cfb85800f766d350
+  data.tar.gz: 3a1b0d3a1935cbc0eda280459ebe6438fc4e720ca3b1c71567a6c31d73edfd8c
 SHA512:
-  metadata.gz: d97271ef86b32abf000fe80f6a89b32448332ffab1230d148bed953ec530a78f72d970dd1198b650cded26ddfba13ea00203d10e2098e049ce83bd6f783c14da
-  data.tar.gz: 265815fa3980cc47ee5ffc2a602f7d5388dde9366a4fd2a849084a36481d03fa43b2cccad3c9c4714b4effc4fcb9bd1ebce0724a2a64d54717060795c16554e5
+  metadata.gz: cd7e918cfc94e6002b680f6214e4ee1c6b299a472c7ea140ccb9ac6ea4875e8fabb11d9192d8c30b9dc8897c097b10bcdb55815911bbb7a5a5ae67c956e84bbd
+  data.tar.gz: 71c6f864296103d659ad309605b28ca71aeb53b9e12087c3f2013569419ddd8bfc5ecf52a030737e36aec42221a9efc241d5526531d8e5799428aa85bbd7228a

data/app/controllers/effective/committees_controller.rb

@@ -6,6 +6,15 @@ module Effective
 
     resource_scope -> { Effective::Committee.all.deep }
 
+    def index
+      @committees = resource_scope.for_index
+      @page_title = EffectiveResources.et('effective_committees.name')
+
+      EffectiveResources.authorize!(self, :index, Effective::Committee)
+
+      render 'index'
+    end
+
     private
 
     def permitted_params

data/app/datatables/admin/effective_committee_files_datatable.rb

@@ -7,8 +7,7 @@ module Admin
       col :id, visible: false
 
       col :committee
-      col :committee_folder, label: 'Folder'
-
+      col :committee_folder
       col :file
       col :title
       col :notes

data/app/datatables/admin/effective_committee_members_datatable.rb

@@ -22,6 +22,7 @@ module Admin
         end
       end
 
+      col :category
       col :start_on
       col :end_on
 

data/app/datatables/admin/effective_committees_datatable.rb

@@ -1,18 +1,30 @@
 module Admin
   class EffectiveCommitteesDatatable < Effective::Datatable
     datatable do
-
       col :updated_at, visible: false
       col :created_at, visible: false
 
       col :id, visible: false
 
-      col :title, label: 'Committee'
+      col :title, label: committee_label
       col :slug, visible: false
       col :body, visible: false
 
-      col :committee_members, label: 'Members'
-      col :committee_members_count, label: 'Members Count', visible: false
+      col :display_on_index, label: "Display on #{committees_name_label} page"
+      col :display_on_dashboard
+
+      col(:committee_members, label: committee_members_label) do |committee|
+        committee.committee_members.select(&:active?).sort_by(&:to_s).map do |member|
+          content_tag(:div, class: 'col-resource_item') do
+            label = link_to(member.to_s, "/admin/users/#{member.user_id}/edit")
+            badge = badge(member.category) if member.category.present?
+
+            [label, badge].compact.join(' ').html_safe
+          end
+        end.join.html_safe
+      end
+
+      col :committee_members_count, label: "#{committee_members_label} Count", visible: false
 
       col :committee_folders, label: 'Folders', visible: false
       col :committee_folders_count, label: 'Folders Count', visible: false
@@ -21,7 +33,7 @@ module Admin
       col :committee_files_count, label: 'Files Count', visible: false
 
       actions_col do |committee|
-        dropdown_link_to('View Committee', effective_committees.committee_path(committee), target: '_blank')
+        dropdown_link_to("View #{committee_label}", effective_committees.committee_path(committee), target: '_blank')
       end
 
     end

data/app/datatables/effective_committee_members_datatable.rb

@@ -11,6 +11,7 @@ class EffectiveCommitteeMembersDatatable < Effective::Datatable
       end
     end
 
+    col :category
     col :start_on
     col :end_on
 

data/app/datatables/effective_committees_datatable.rb

@@ -5,23 +5,32 @@ class EffectiveCommitteesDatatable < Effective::Datatable
 
     col :id, visible: false
 
-    col :title, label: 'Committee'
+    col :title, label: committee_label
 
-    col :committee_members, label: 'Members', visible: false
+    col(:committee_members, label: committee_members_label, visible: false) do |committee|
+      committee.committee_members.select(&:active?).sort_by(&:to_s).map do |member|
+        content_tag(:div, class: 'col-resource_item') do
+          label = link_to(member.to_s, "/admin/users/#{member.user_id}/edit")
+          badge = badge(member.category) if member.category.present?
 
-    col :committee_members_count, label: 'Members' do |committee|
-      pluralize(committee.committee_members_count, 'members')
+          [label, badge].compact.join(' ').html_safe
+        end
+      end.join.html_safe
+    end
+
+    col :committee_members_count, as: :string, label: committee_members_label do |committee|
+      pluralize(committee.committee_members.select(&:active?).length, committee_member_label.downcase)
     end
 
     col :committee_folders, label: 'Folders'
 
-    col :committee_folders_count, label: 'Folders', visible: false do |committee|
+    col :committee_folders_count, as: :string, label: 'Folders', visible: false do |committee|
       pluralize(committee.committee_folders_count, 'folders')
     end
 
     col :committee_files, label: 'Files', visible: false
 
-    col :committee_files_count, label: 'Files' do |committee|
+    col :committee_files_count, as: :string, label: 'Files' do |committee|
       pluralize(committee.committee_files_count, 'files')
     end
 
@@ -29,8 +38,8 @@ class EffectiveCommitteesDatatable < Effective::Datatable
   end
 
   collection do
-    # This only displays active committees
-    Effective::Committee.deep.where(id: current_user.committees)
+    # This only displays committees published to the dashboard that the committee_member has active? access to
+    Effective::Committee.deep.for_dashboard.where(id: current_user.committees)
   end
 
 end

data/app/helpers/effective_committees_helper.rb

@@ -1,3 +1,38 @@
 module EffectiveCommitteesHelper
 
+  def committees_name_label
+    et('effective_committees.name')
+  end
+
+  def committee_label
+    et(Effective::Committee)
+  end
+
+  def committees_label
+    ets(Effective::Committee)
+  end
+
+  def committee_member_label
+    et(Effective::CommitteeMember)
+  end
+
+  def committee_members_label
+    ets(Effective::CommitteeMember)
+  end
+
+  def committee_folder_label
+    et(Effective::CommitteeFolder)
+  end
+
+  def committee_folders_label
+    ets(Effective::CommitteeFolder)
+  end
+
+  def committee_file_label
+    et(Effective::CommitteeFile)
+  end
+
+  def committee_files_label
+    ets(Effective::CommitteeFile)
+  end
 end

data/app/models/effective/committee.rb

@@ -32,6 +32,9 @@ module Effective
     scope :sorted, -> { order(:title) }
     scope :deep, -> { with_rich_text_body.includes(committee_members: [:user], committee_folders: [:committee_files, :rich_text_body]) }
 
+    scope :for_dashboard, -> { where(display_on_dashboard: true) }
+    scope :for_index, -> { where(display_on_index: true) }
+
     validates :title, presence: true, uniqueness: true, length: { maximum: 255 }
 
     def to_s

data/app/models/effective/committee_folder.rb

@@ -10,7 +10,7 @@ module Effective
     belongs_to :committee, polymorphic: true, counter_cache: true
 
     has_rich_text :body
-    has_many :committee_files, -> { Effective::CommitteeFile.sorted.deep }, dependent: :destroy, inverse_of: :committee
+    has_many :committee_files, -> { Effective::CommitteeFile.sorted.deep }, dependent: :destroy, inverse_of: :committee_folder
 
     effective_resource do
       title         :string

data/app/models/effective/committee_member.rb

@@ -18,6 +18,8 @@ module Effective
     effective_resource do
       roles_mask    :integer
 
+      category      :string
+
       start_on      :date
       end_on        :date
 

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

@@ -3,18 +3,16 @@
     = f.hidden_field :committee_id
     = f.hidden_field :committee_type
   - else
-    = f.select :committee, { 'Committees' => Effective::Committee.sorted }, polymorphic: true
+    = f.select :committee, { committees_label => Effective::Committee.sorted }, polymorphic: true
 
   = f.text_field :title
 
-  - if f.object.persisted? || f.object.errors.include?(:slug)
-    - current_url = (effective_committees.commitee_url(f.object) rescue nil)
-    = f.text_field :slug, hint: "The slug controls this committee's internet address. Be careful, changing the slug will break links that other websites may have to the old address.<br>#{('This folder is currently reachable via ' + link_to(current_url.gsub(f.object.slug, '<strong>' + f.object.slug + '</strong>').html_safe, current_url)) if current_url }".html_safe
+  = acts_as_slugged_fields(f, url: (effective_committees.commitee_url(f.object) rescue nil))
 
   - if defined?(EffectiveArticleEditor)
-    = f.article_editor :body, hint: 'Displayed on the folder page'
+    = f.article_editor :body, hint: "Displayed on the #{committee_folder_label} page"
   - else
-    = f.rich_text_area :body, hint: 'Displayed on the folder page'
+    = f.rich_text_area :body, hint: "Displayed on the #{commitee_fodler_label} page"
 
   = f.submit
 

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

@@ -12,18 +12,20 @@
 
   - if f.object.new_record?
     - if inline_datatable? && inline_datatable.attributes[:committee_id].present?
-      = f.select :user_ids, current_user.class.all, label: 'Add user(s)', required: true, ajax_url: ajax_url, hint: 'Add one or more users'
+      = f.select :user_ids, current_user.class.all, label: 'Add user(s)', required: true, ajax_url: ajax_url, hint: "Add one or more #{committee_member_label.downcase}"
 
     - if inline_datatable? && inline_datatable.attributes[:user_id].present?
-      = f.select :committee_ids, Effective::Committee.sorted.all, label: 'Add committee(s)', hint: 'Add one or more committees'
+      = f.select :committee_ids, Effective::Committee.sorted.all, label: "Add #{commitee_label}(s)", hint: "Add one or more #{commitees_label.downcase}"
 
     - unless inline_datatable?
-      = f.select :committee_id, Effective::Committee.sorted.all, label: 'Committee'
-      = f.select :user_ids, current_user.class.sorted, label: 'User(s)', required: true, ajax_url: ajax_url, hint: 'Add one or more user at a time'
+      = f.select :committee_id, Effective::Committee.sorted.all
+      = f.select :user_ids, current_user.class.sorted, label: 'User(s)', required: true, ajax_url: ajax_url, hint: "Add one or more #{committee_member_label.downcase}"
 
   - if f.object.persisted?
     = f.static_field :committee
-    = f.static_field :user, label: 'Committee Member'
+    = f.static_field :user, label: committee_member_label
+
+  = f.text_field :category
 
   .row
     .col= f.date_field :start_on, hint: 'optional start date'

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

@@ -1,10 +1,11 @@
 = f.text_field :title
 
-- if f.object.persisted? || f.object.errors.include?(:slug)
-  - current_url = (effective_committees.committee_url(f.object) rescue nil)
-  = f.text_field :slug, hint: "The slug controls this committee's internet address. Be careful, changing the slug will break links that other websites may have to the old address.<br>#{('This committee is currently reachable via ' + link_to(current_url.gsub(f.object.slug, '<strong>' + f.object.slug + '</strong>').html_safe, current_url)) if current_url }".html_safe
+= acts_as_slugged_fields(f, url: (effective_committees.committee_url(f.object) rescue nil))
+
+= f.check_box :display_on_index, label: "Display on the #{committees_name_label} page"
+= f.check_box :display_on_dashboard, label: "Display to #{committee_members_label.downcase} on their dashboard"
 
 - if defined?(EffectiveArticleEditor)
-  = f.article_editor :body, hint: 'Displayed on the committee page'
+  = f.article_editor :body, hint: "Displayed on the #{committee_label} page"
 - else
-  = f.rich_text_area :body, hint: 'Displayed on the committee page'
+  = f.rich_text_area :body, hint: "Displayed on the #{committee_label} page"

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

@@ -1,9 +1,9 @@
 = tabs do
-  = tab 'Committee' do
+  = tab(committee_label) do
     = render 'admin/committees/form_committee', committee: committee
 
   - if committee.persisted?
-    = tab 'Members' do
+    = tab(Effective::CommitteeMember) do
       - datatable = Admin::EffectiveCommitteeMembersDatatable.new(committee: committee)
       = render_inline_datatable(datatable)
 

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

@@ -1,6 +1,12 @@
 %nav{'aria-label': 'breadcrumb'}
   %ol.breadcrumb
-    %li.breadcrumb-item= link_to('All Committees', effective_committees.committees_path)
+    - if EffectiveResources.authorized?(self, :index, Effective::Committee)
+      %li.breadcrumb-item= link_to("All #{committees_label}", effective_committees.committees_path)
+    - elsif EffectiveResources.authorized?(self, :my_committees, Effective::Committee)
+      %li.breadcrumb-item= link_to("My #{committees_label}", effective_committees.my_committees_path)
+    - else
+      %li.breadcrumb-item= link_to("Home", root_path)
+
     %li.breadcrumb-item= link_to(committee_folder.committee, effective_committees.committee_path(committee_folder.committee))
     %li.breadcrumb-item.active{'aria-current': 'page'}= committee_folder
 
@@ -19,7 +25,7 @@
       %tr
         %td
           - if file.file.attached?
-            = link_to(icon('download') + file.to_s, url_for(file.file), target: '_blank')
+            = link_to(icon('download') + ' ' + file.to_s, url_for(file.file), target: '_blank')
           - else
             = file.to_s
 

data/app/views/effective/committee_members/_form.html.haml

@@ -8,7 +8,7 @@
 
   - if f.object.new_record?
     - unless inline_datatable? && inline_datatable.attributes[:committee_id].present?
-      = f.select :committee, { 'Committees' => Effective::Committee.sorted }, polymorphic: true
+      = f.select :committee, { committees_label => Effective::Committee.sorted }, polymorphic: true
 
     .row
       .col= f.date_field :start_on, hint: 'optional start date'
@@ -30,6 +30,8 @@
     - unless inline_datatable? && inline_datatable.attributes[:user_id].present?
       = f.static_field :user
 
+    = f.text_field :category
+
     .row
       .col= f.date_field :start_on, hint: 'optional start date'
       .col= f.date_field :end_on, hint: 'optional end date'

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

@@ -1,12 +1,31 @@
 %nav{'aria-label': 'breadcrumb'}
   %ol.breadcrumb
-    %li.breadcrumb-item= link_to('All Committees', effective_committees.committees_path)
+    - if EffectiveResources.authorized?(self, :index, Effective::Committee)
+      %li.breadcrumb-item= link_to("All #{committees_label}", effective_committees.committees_path)
+    - elsif EffectiveResources.authorized?(self, :my_committees, Effective::Committee)
+      %li.breadcrumb-item= link_to("My #{committees_label}", effective_committees.my_committees_path)
+    - else
+      %li.breadcrumb-item= link_to("Home", root_path)
+
     %li.breadcrumb-item.active{'aria-current': 'page'}= committee
 
 .effective-committee
   - if committee.rich_text_body.present?
     .mb-4= committee.rich_text_body.to_s
 
+  .mb-4
+    = collapse("Show #{committee_members_label.downcase}") do
+      - members = committee.committee_members.select(&:active?).sort_by(&:to_s)
+
+      %p= pluralize(members.length, committee_member_label.downcase)
+
+      %ul
+        - members.each do |member|
+          %li
+            = member.user.to_s
+            - if member.category.present?
+              = badge(member.category)
+
   %table.table.table-striped
     %thead
       %tr
@@ -16,7 +35,7 @@
 
     - committee.committee_folders.each do |folder|
       %tr
-        %td= link_to(icon('folder') + folder.to_s, effective_committees.committee_committee_folder_path(committee, folder))
+        %td= link_to(icon('folder') + ' ' + folder.to_s, effective_committees.committee_committee_folder_path(committee, folder))
         %td= pluralize(folder.committee_files.length, 'file')
         %td= folder.body.to_s
 

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

@@ -1,8 +1,20 @@
-%h2 Committees
+%h2= committees_label
 
 - if current_user.committees.present?
+  %p 
+    You have access to #{pluralize(current_user.committees.length, committee_label.downcase)}.
+
+    - if EffectiveResources.authorized?(self, :index, Effective::Committee)
+      Please
+      = link_to('click here', effective_committees.committees_path)
+      to view all #{committees_label.downcase}.
+    - elsif EffectiveResources.authorized?(self, :my_committees, Effective::Committee)
+      Please
+      = link_to('click here', effective_committees.my_committees_path)
+      to view your #{committees_label.downcase}.
+
   - datatable = EffectiveResources.best('EffectiveCommitteesDatatable').new(self, namespace: :effective)
   = render_datatable(datatable, simple: true)
 
 - else
-  %p You aren't assigned to any committees. When you are, we'll show them here.
+  %p You aren't assigned to any #{committees_label.downcase}. When you are, we'll show them here.

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

@@ -1,5 +1,5 @@
 = tabs do
-  = tab 'Committee' do
+  = tab(commitee_label) do
     = render 'effective/committees/form_committee', committee: committee
 
   - if committee.persisted?

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

@@ -6,6 +6,6 @@
   = f.submit
 
 - if committee.persisted?
-  %h2 Committee Members
+  %h2= committee_members_label
   - datatable = EffectiveCommitteeMembersDatatable.new(committee: committee)
   = render_inline_datatable(datatable)

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

@@ -1,21 +1,36 @@
-- committees = @committees.where(id: current_user.committees)
-
-%p
-  You have access to files for #{pluralize(committees.length, 'committee')}:
-  = committees.to_sentence
+- committees = @committees.sorted
 
 %nav{'aria-label': 'breadcrumb'}
   %ol.breadcrumb
-    %li.breadcrumb-item.active{'aria-current': 'page'} All Committees
+    %li.breadcrumb-item= link_to("Home", root_path)
+    %li.breadcrumb-item.active{'aria-current': 'page'}= @page_title
+
+%h1= @page_title
+
+- if committees.blank?
+  %p There are no #{committees_label.downcase} to display.
+- else
+  %p 
+    = succeed('.') do
+      There are #{pluralize(committees.length, committee_label.downcase)} and 
+      = pluralize(Effective::CommitteeMember.pluck(:user_id).uniq.length, committee_member_label.downcase)
 
 .effective-committees
   - committees.each do |committee|
-    = card do
-      = link_to(icon('folder') + committee.to_s, effective_committees.committee_path(committee))
-
-      %table.table.table-striped.mt-3.ml-4
-        - committee.committee_folders.each do |folder|
-          %tr
-            %td= link_to(icon('folder') + folder.to_s, effective_committees.committee_committee_folder_path(committee, folder))
-            %td= pluralize(folder.committee_files.length, 'file')
-            %td= folder.body
+    %h3= committee
+
+    - members = committee.committee_members.select(&:active?).sort_by(&:to_s)
+    %ul
+      - members.each do |member|
+        %li
+          = member.user.to_s
+          - if member.category.present?
+            = badge(member.category)
+
+      - if members.blank?
+        %li No #{committee_members_label.downcase}
+
+.my-4
+
+.form-actions
+  = link_to 'Continue', return_to_dashboard_path, class: 'btn btn-primary mb-4'

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

@@ -0,0 +1,46 @@
+- committees = @committees.sorted.where(id: current_user.committees)
+
+%nav{'aria-label': 'breadcrumb'}
+  %ol.breadcrumb
+    - if EffectiveResources.authorized?(self, :index, Effective::Committee)
+      %li.breadcrumb-item= link_to("All #{committees_label}", effective_committees.committees_path)
+    - else
+      %li.breadcrumb-item= link_to("Home", root_path)
+
+    %li.breadcrumb-item.active{'aria-current': 'page'} My #{committees_label}
+
+- if committees.blank?
+  %p There are no #{committees_label.downcase} to display.
+
+- if committees.present?
+  %p You have access to #{pluralize(committees.length, committee_label.downcase)}: #{committees.to_sentence}
+
+.effective-committees
+  - committees.each do |committee|
+    .card
+      .card-body
+        = link_to(icon('folder') + ' ' + committee.to_s, effective_committees.committee_path(committee))
+
+        = collapse("Show #{committee_members_label.downcase}", card_class: 'card card-body mt-4 mx-4', link_class: 'btn btn-link float-right') do
+          - members = committee.committee_members.select(&:active?).sort_by(&:to_s)
+
+          %p= pluralize(members.length, committee_member_label.downcase)
+
+          %ul
+            - members.each do |member|
+              %li
+                = member.user.to_s
+                - if member.category.present?
+                  = badge(member.category)
+
+        %table.table.table-striped.mt-3.ml-4
+          - committee.committee_folders.each do |folder|
+            %tr
+              %td= link_to(icon('folder') + ' ' + folder.to_s, effective_committees.committee_committee_folder_path(committee, folder))
+              %td= pluralize(folder.committee_files.length, 'file')
+              %td= folder.body
+
+.my-4
+
+.form-actions
+  = link_to 'Continue', return_to_dashboard_path, class: 'btn btn-primary mb-4'

data/config/routes.rb

@@ -11,6 +11,8 @@ EffectiveCommittees::Engine.routes.draw do
       resources :committee_folders, only: [:show]
     end
 
+    get 'my-committees', to: 'committees#my_committees'
+
     resources :committee_members, except: [:show]
   end
 

data/db/migrate/101_create_effective_committees.rb

@@ -9,6 +9,9 @@ class CreateEffectiveCommittees < ActiveRecord::Migration[6.0]
       t.integer :committee_folders_count, default: 0
       t.integer :committee_files_count, default: 0
 
+      t.boolean :display_on_index, default: true
+      t.boolean :display_on_dashboard, default: true
+
       t.datetime :updated_at
       t.datetime :created_at
     end
@@ -25,6 +28,7 @@ class CreateEffectiveCommittees < ActiveRecord::Migration[6.0]
       t.string :user_type
 
       t.integer :roles_mask
+      t.string :category
 
       t.date :start_on
       t.date :end_on

data/lib/effective_committees/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCommittees
-  VERSION = '0.3.13'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_committees
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.4.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-09 00:00:00.000000000 Z
+date: 2025-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -214,6 +214,7 @@ files:
 - app/views/effective/committees/_form.html.haml
 - app/views/effective/committees/_form_committee.html.haml
 - app/views/effective/committees/index.html.haml
+- app/views/effective/committees/my_committees.html.haml
 - config/effective_committees.rb
 - config/locales/effective_committees.en.yml
 - config/routes.rb