effective_committees 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef9838f8461539b97096dc72613ac01253875dc41511773d0dbeb882545243c1
-  data.tar.gz: 362122b9df304bd2c8fcc762dae5c769736002283199ed268bd77201cbc3fccb
+  metadata.gz: df8c75f5e33b7cfb2d7776ba54655cdbdd88a307eaf8b0d817685743b6bd3a0f
+  data.tar.gz: 22e99e41a9473983068db1b470621a97fcde2cdf0106e0b9de0621e878c7016f
 SHA512:
-  metadata.gz: efe535f511f6f965735afdf8e9ae696422ee9fbfbcbf22a6fe5d7446e50f384d441d9489d3e6a113f7c9315d00bf2588d17935235d9de065a2175e005e87c4d5
-  data.tar.gz: 8163275c582aa675ef646154931930f497fb5246ffa57f8b29115d7839902b7abfa8489df8bc56d3e904b0b290af4a2532384d6d2b88237d08f5b1e2de16e819
+  metadata.gz: ce05c9720c80bd99d4bce72f8e99143a12d625afea0feedc702179606cb49ef44908275c8cd6778a100045a4bb158d4124c06744a04a0c602afb8eec7cd11da6
+  data.tar.gz: f6ab66c124d105d761a83c0623ac24cd6792607efc3f4375669657c021640055bda8cfbb2ac1c59c59a2ef5b64d136a243c0e99bae5ba081e0e35362ca7b15b4

data/app/datatables/admin/effective_committee_members_datatable.rb

@@ -13,6 +13,13 @@ module Admin
         end
       end
 
+      col :start_on
+      col :end_on
+
+      col :expired do |committee_member|
+        badge('expired') if committee_member.expired?
+      end
+
       if EffectiveCommittees.use_effective_roles
         col :roles, search: roles_collection
       end

data/app/datatables/effective_committee_members_datatable.rb

@@ -11,6 +11,9 @@ class EffectiveCommitteeMembersDatatable < Effective::Datatable
       end
     end
 
+    col :start_on
+    col :end_on
+
     if EffectiveCommittees.use_effective_roles
       col :roles, search: roles_collection
     end

data/app/datatables/effective_committees_datatable.rb

@@ -25,6 +25,7 @@ class EffectiveCommitteesDatatable < Effective::Datatable
   end
 
   collection do
+    # This only displays active committees
     Effective::Committee.deep.where(id: current_user.committees)
   end
 

data/app/models/concerns/effective_committees_user.rb

@@ -34,7 +34,7 @@ module EffectiveCommitteesUser
   end
 
   def committees
-    committee_members.reject(&:marked_for_destruction?).map(&:committee)
+    committee_members.select { |cm| cm.active? && !cm.marked_for_destruction? }.map { |cm| cm.committee }
   end
 
 end

data/app/models/effective/committee_member.rb

@@ -18,6 +18,9 @@ module Effective
     effective_resource do
       roles_mask    :integer
 
+      start_on      :date
+      end_on        :date
+
       timestamps
     end
 
@@ -34,13 +37,13 @@ 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} }
+      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} }
       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} }
+      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} }
       CommitteeMember.insert_all(additional)
     end
 
@@ -50,10 +53,27 @@ module Effective
     validates :user_id, if: -> { user_id && user_type && committee_id && committee_type },
       uniqueness: { scope: [:committee_id, :committee_type], message: 'already belongs to this committee' }
 
+    validate(if: -> { start_on && end_on }) do
+      self.errors.add(:end_on, 'must be after start date') unless end_on > start_on
+    end
+
     def to_s
       user.to_s
     end
 
+    def active?(date: nil)
+      return true if start_on.blank? && end_on.blank?
+
+      date ||= Time.zone.now
+      date = date.to_date if date.respond_to?(:to_date)
+
+      (start_on..end_on).cover?(date)  # Endless ranges
+    end
+
+    def expired?(date: nil)
+      active?(date: date) == false
+    end
+
     def user_ids
       Array(@user_ids) - [nil, '']
     end

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

@@ -10,21 +10,28 @@
   = f.hidden_field :committee_type
   = f.hidden_field :committee_id
 
+  - ajax_url = (@select2_ajax_path || effective_resources.users_admin_select2_ajax_index_path) unless Rails.env.test?
+
   - if f.object.new_record?
     - if inline_datatable? && inline_datatable.attributes[:committee_id].present?
-      = f.select :user_ids, current_user.class.sorted, label: 'Add user(s)', hint: 'Add one or more users'
+      = f.select :user_ids, current_user.class.sorted, label: 'Add user(s)', required: true, ajax_url: ajax_url, hint: 'Add one or more users'
 
     - if inline_datatable? && inline_datatable.attributes[:user_id].present?
       = f.select :committee_ids, committees, label: 'Add committee(s)', hint: 'Add one or more committees'
 
     - unless inline_datatable?
       = f.select :committee_id, committees, label: 'Committee'
-      = f.select :user_ids, current_user.class.sorted, label: 'User(s)', hint: 'Add one or more user at a time'
+
+      = 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'
 
   - if f.object.persisted?
     = f.static_field :committee
     = f.static_field :user, label: 'Committee Member'
 
+  .row
+    .col= f.date_field :start_on, hint: 'optional start date'
+    .col= f.date_field :end_on, hint: 'optional end date'
+
   - if EffectiveCommittees.use_effective_roles
     = f.checks :roles, EffectiveRoles.roles_collection(f.object, skip_disabled: true)
 

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

@@ -6,7 +6,7 @@
 
 .effective-committee-folder
   - if committee_folder.rich_text_body.present?
-    .mb-4= committee_folder.rich_text_body
+    .mb-4= committee_folder.rich_text_body.to_s
 
   %table.table.table-striped
     %thead

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

@@ -10,6 +10,10 @@
     - unless inline_datatable? && inline_datatable.attributes[:committee_id].present?
       = f.select :committee, { 'Committees' => Effective::Committee.sorted }, polymorphic: true
 
+    .row
+      .col= f.date_field :start_on, hint: 'optional start date'
+      .col= f.date_field :end_on, hint: 'optional end date'
+
     - if EffectiveCommittees.use_effective_roles
       = f.checks :roles, EffectiveRoles.roles_collection(f.object, skip_disabled: true)
 
@@ -26,6 +30,10 @@
     - unless inline_datatable? && inline_datatable.attributes[:user_id].present?
       = f.static_field :user
 
+    .row
+      .col= f.date_field :start_on, hint: 'optional start date'
+      .col= f.date_field :end_on, hint: 'optional end date'
+
     - if EffectiveCommittees.use_effective_roles
       = f.checks :roles, EffectiveRoles.roles_collection(f.object, skip_disabled: true)
 

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

@@ -5,7 +5,7 @@
 
 .effective-committee
   - if committee.rich_text_body.present?
-    .mb-4= committee.rich_text_body
+    .mb-4= committee.rich_text_body.to_s
 
   %table.table.table-striped
     %thead
@@ -18,6 +18,6 @@
       %tr
         %td= link_to(icon('folder') + folder, effective_committees.committee_committee_folder_path(committee, folder))
         %td= pluralize(folder.committee_files.length, 'file')
-        %td= folder.body
+        %td= folder.body.to_s
 
   %p Displaying #{pluralize(committee.committee_folders.length, 'folder')}

data/db/migrate/01_create_effective_committees.rb.erb

@@ -26,6 +26,9 @@ class CreateEffectiveCommittees < ActiveRecord::Migration[6.1]
 
       t.integer :roles_mask
 
+      t.date :start_on
+      t.date :end_on
+
       t.datetime :updated_at
       t.datetime :created_at
     end

data/lib/effective_committees/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCommittees
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_committees
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2022-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails