effective_committees 0.7.5 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88699e598899856a5e8ae15e693d7fc08516882f4f7cce171fb9b6cb8ef378a6
-  data.tar.gz: 2cf89c73550ec570c80e60ebe46dde173b3af8f7d8b558566e96a6e747c7f5d2
+  metadata.gz: '028cb7fc1b4194a805ffc494fc6d2c7e8429b87f3a6ea559481e467c33dc0ac6'
+  data.tar.gz: 07f3eca18fb18cd17e2cdea403b84d21fbcf1a2196a6d22d233cec4c48308224
 SHA512:
-  metadata.gz: b5b426c3d662e6d195a47e3d6a0543d161ef1d8cbf02ecf475ce89a4c01a283fd7fcb6d233fae69654defe300dda54da89cfc760c1a19bd85f4de70496222707
-  data.tar.gz: 90fcfdb34ad42faf64387bd98d9f35d14883b0a28748dae82d4134c33152b3d72c43d98eb1fbb0ac8001b6fd797645e47c21d1b3fea7029ecff8ca2ca8f7ad9e
+  metadata.gz: caac2747b32561bc4dfb1e2c93e5a46b5be7c932d064ab30d4588de8a2d9530d0c2ef49cd3cac6ba78bdee9f67cecb15fa440016d9e8e914165fde0f7af93843
+  data.tar.gz: 74df738c96c21cbd8617e4b04ff5f1c9d3b29e90f799b035f1c07c5ea5b4b7fab6d21c515973f2fc15c0f796755d71f293c7950edbd7d5eee5bc9ed876fb17e0

data/app/controllers/effective/committees_controller.rb

@@ -9,7 +9,7 @@ module Effective
     page_title "More Activity", only: [:activity]
 
     def index
-      @committees = resource_scope.for_dashboard
+      @committees = resource_scope.for_dashboard.sorted
       @page_title = "My #{EffectiveResources.et('effective_committees.name')}"
 
       EffectiveResources.authorize!(self, :index, Effective::Committee)
@@ -18,7 +18,7 @@ module Effective
     end
 
     def volunteers_and_committees
-      @committees = resource_scope.for_index
+      @committees = resource_scope.for_index.sorted
       @page_title = "Volunteers and Committees"
 
       EffectiveResources.authorize!(self, :index, Effective::Committee)

data/app/datatables/admin/effective_committee_members_datatable.rb

@@ -1,10 +1,12 @@
 module Admin
   class EffectiveCommitteeMembersDatatable < Effective::Datatable
     datatable do
+      reorder :position if attributes[:committee]
       length 100
 
       col :id, visible: false
       col :user_id, visible: false
+      col :position, visible: false
 
       col :committee
       col :user

data/app/datatables/admin/effective_committees_datatable.rb

@@ -1,13 +1,14 @@
 module Admin
   class EffectiveCommitteesDatatable < Effective::Datatable
     datatable do
+      reorder :position
       length 100
-      order :title
 
       col :updated_at, visible: false
       col :created_at, visible: false
 
       col :id, visible: false
+      col :position, visible: false
 
       col :title, label: committee_label
       col :slug, visible: false
@@ -17,7 +18,7 @@ module Admin
       col :display_on_dashboard
 
       col(:committee_members, label: committee_members_label, visible: false) do |committee|
-        committee.committee_members.select(&:active?).sort_by(&:to_s).map do |member|
+        committee.committee_members.select(&:active?).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?

data/app/models/effective/committee.rb

@@ -22,6 +22,8 @@ module Effective
       title                     :string
       slug                      :string
 
+      position                  :integer
+
       committee_members_count   :integer # Counter Cache
       committee_folders_count   :integer # Counter Cache
       committee_files_count     :integer # Counter Cache
@@ -29,13 +31,18 @@ module Effective
       timestamps
     end
 
-    scope :sorted, -> { order(:title) }
+    scope :sorted, -> { order(:position) }
     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) }
 
+    before_validation do
+      self.position ||= (self.class.maximum(:position) || -1) + 1
+    end
+
     validates :title, presence: true, uniqueness: true, length: { maximum: 255 }
+    validates :position, presence: true
 
     def to_s
       title.presence || 'New Committee'

data/app/models/effective/committee_member.rb

@@ -23,10 +23,12 @@ module Effective
       start_on      :date
       end_on        :date
 
+      position      :integer
+
       timestamps
     end
 
-    scope :sorted, -> { order(:id) }
+    scope :sorted, -> { order(:position) }
     scope :deep, -> { includes(:user, :committee) }
 
     before_validation(if: -> { user_ids.present? }) do
@@ -39,18 +41,25 @@ module Effective
 
     after_commit(if: -> { user_ids.present? }) do
       additional = (user_ids - CommitteeMember.where(committee_id: committee_id, user_id: user_ids).pluck(:user_id))
-      additional = additional.map { |user_id| {committee_id: committee_id, committee_type: committee_type, user_id: user_id, user_type: user_type, roles_mask: roles_mask, start_on: start_on, end_on: end_on} }
+      max_position = CommitteeMember.where(committee_id: committee_id, committee_type: committee_type).maximum(:position) || -1
+      additional = additional.each_with_index.map { |user_id, index| {committee_id: committee_id, committee_type: committee_type, user_id: user_id, user_type: user_type, roles_mask: roles_mask, start_on: start_on, end_on: end_on, position: max_position + index + 1} }
       CommitteeMember.insert_all(additional)
     end
 
     after_commit(if: -> { committee_ids.present? }) do
       additional = (committee_ids - CommitteeMember.where(user_id: user_id, committee_id: committee_ids).pluck(:committee_id))
-      additional = additional.map { |committee_id| {committee_id: committee_id, committee_type: committee_type, user_id: user_id, user_type: user_type, roles_mask: roles_mask, start_on: start_on, end_on: end_on} }
+      max_positions = CommitteeMember.where(committee_id: additional, committee_type: committee_type).group(:committee_id).maximum(:position)
+      additional = additional.map { |committee_id| {committee_id: committee_id, committee_type: committee_type, user_id: user_id, user_type: user_type, roles_mask: roles_mask, start_on: start_on, end_on: end_on, position: (max_positions[committee_id] || -1) + 1} }
       CommitteeMember.insert_all(additional)
     end
 
+    before_validation do
+      self.position ||= (self.class.where(committee_id: committee_id, committee_type: committee_type).maximum(:position) || -1) + 1
+    end
+
     validates :committee, presence: true
     validates :user, presence: true
+    validates :position, presence: true
 
     validates :user_id, if: -> { user_id && user_type && committee_id && committee_type },
       uniqueness: { scope: [:committee_id, :committee_type], message: 'already belongs to this committee' }

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

@@ -28,7 +28,7 @@
       .col-lg
         %h3= committee_members_label
 
-        - members = committee.committee_members.select(&:active?).sort_by(&:to_s)
+        - members = committee.committee_members.select(&:active?)
 
         %ul
           - members.each do |member|

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

@@ -1,6 +1,7 @@
 = render('layout') do
   - @committees.each do |committee|
     %h3= committee
+    = committee.body.to_s
 
     - members = committee.committee_members.select(&:active?).sort_by(&:to_s)
     %ul

data/db/migrate/101_create_effective_committees.rb

@@ -4,6 +4,7 @@ class CreateEffectiveCommittees < ActiveRecord::Migration[6.0]
     create_table :committees do |t|
       t.string :title
       t.string :slug
+      t.integer :position, default: 0
 
       t.integer :committee_members_count, default: 0
       t.integer :committee_folders_count, default: 0
@@ -33,6 +34,8 @@ class CreateEffectiveCommittees < ActiveRecord::Migration[6.0]
       t.date :start_on
       t.date :end_on
 
+      t.integer :position
+
       t.datetime :updated_at
       t.datetime :created_at
     end

data/lib/effective_committees/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCommittees
-  VERSION = '0.7.5'.freeze
+  VERSION = '0.9.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_committees
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.9.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-13 00:00:00.000000000 Z
+date: 2026-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: haml
+  name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -136,6 +136,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: wicked
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: effective_logging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: effective_test_bot
   requirement: !ruby/object:Gem::Requirement
@@ -257,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Committees are groups of users that can all share files.