effective_committees 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6806153b45de4da4f91304e9ec17c0ddd0d95c08b50e5146cb337ee5bff08da
-  data.tar.gz: 020324e85cf563846560aaf8fc3f687a4879af060e32d2dcec55a85f04692fdb
+  metadata.gz: '028cb7fc1b4194a805ffc494fc6d2c7e8429b87f3a6ea559481e467c33dc0ac6'
+  data.tar.gz: 07f3eca18fb18cd17e2cdea403b84d21fbcf1a2196a6d22d233cec4c48308224
 SHA512:
-  metadata.gz: 0d1b17f664da9c321f122671106b97dc0d6fb9e83d29fc33d6b4d88d66c2c1dbb1e23f7c5cd233a96504729e72a3d181e40e3eb7e58f5ce26603fc2fb55e617a
-  data.tar.gz: 13e80bc61b9abb5fa24774d3e34f88a2799189caf12b973e165a898c7254551a0a564122074dd0503a5f4b2f4647a37dbc4fd67f2ad94b4d75c977eb603faf2d
+  metadata.gz: caac2747b32561bc4dfb1e2c93e5a46b5be7c932d064ab30d4588de8a2d9530d0c2ef49cd3cac6ba78bdee9f67cecb15fa440016d9e8e914165fde0f7af93843
+  data.tar.gz: 74df738c96c21cbd8617e4b04ff5f1c9d3b29e90f799b035f1c07c5ea5b4b7fab6d21c515973f2fc15c0f796755d71f293c7950edbd7d5eee5bc9ed876fb17e0

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

@@ -18,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_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/db/migrate/101_create_effective_committees.rb

@@ -34,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.8.0'.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.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-11 00:00:00.000000000 Z
+date: 2026-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails