effective_committees 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: effc4579e15d6bbbf45ffb1113ebb129a0d809b9e600da98c3b10c5a70e2d385
-  data.tar.gz: 25ffa06fe7742f83f08fbac7c79521aa3b2155deb2639fa36559164bfc243c14
+  metadata.gz: 687b287a684219a3c2f0214c4639db991e8a5cb02566179c555326f4436e5a3d
+  data.tar.gz: 28fb6cf8554ada01a148d4ceac2bb2abc453f8a20c8122ba2aee226f95b7c479
 SHA512:
-  metadata.gz: 1593abb4700a2d23026405da7a7acfb82e042eac5a856bb84efb37afcbb7592817bcb53ab0f5870a10965258d905f9d06deaecd2af976adac4c244e6736417f5
-  data.tar.gz: 9bc7a3f7dc8aed23178a8e8d11704e09b470bd782e13a947de3bf2f6f13f1530ec71d6e636499bf4f07b71b7c3a9d97a01ec49f195a39b3726e7303100013540
+  metadata.gz: d9614f730cfc7c9bf4aa56ceb4363235e8082016273bee4c3623fac416d1ec8cdd9790f3e230bef4b20491c817ad960ff7c38c3341780dbb7136f36721f4fa0a
+  data.tar.gz: 55379c626f837d6ed6f69698c2c7cac186af00d12021c6e1e800dd3caedb39286d66f0896f3f32db6d18e0ec923293693dd7bf0b9cf87c0fbfe6302a1750138f

data/app/datatables/admin/effective_committee_files_datatable.rb

@@ -1,6 +1,8 @@
 module Admin
   class EffectiveCommitteeFilesDatatable < Effective::Datatable
     datatable do
+      reorder :position
+
       col :updated_at, visible: false
       col :created_at, visible: false
 

data/app/models/effective/committee_file.rb

@@ -18,11 +18,14 @@ module Effective
       file_id          :integer
       file_created_at  :datetime
 
+      position        :integer
+
       timestamps
     end
 
-    before_validation do
-      self.committee ||= committee_folder&.committee
+    before_validation(if: -> { committee_folder.present? }) do
+      self.committee ||= committee_folder.committee
+      self.position ||= (committee_folder.committee_files.map { |obj| obj.position }.compact.max || -1) + 1
     end
 
     before_validation(if: -> { file.attached? }) do
@@ -30,10 +33,11 @@ module Effective
     end
 
     scope :deep, -> { with_attached_file.includes(:committee, :committee_folder) }
-    scope :sorted, -> { order(:title) }
+    scope :sorted, -> { order(:position) }
 
     validates :title, presence: true
     validates :file, presence: true
+    validates :position, presence: true, if: -> { committee_folder.present? }
 
     def to_s
       title.presence || 'file'

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

@@ -15,7 +15,7 @@
       = f.select :user_ids, current_user.class.all, label: 'Select user(s)', required: true, ajax_url: ajax_url
 
     - if inline_datatable? && inline_datatable.attributes[:user_id].present?
-      = f.select :committee_ids, Effective::Committee.sorted.all, label: "Select #{commitee_label}(s)"
+      = f.select :committee_ids, Effective::Committee.sorted.all, label: "Select #{committee_label}(s)"
 
     - unless inline_datatable?
       = f.select :committee_id, Effective::Committee.sorted.all
@@ -29,7 +29,7 @@
 
   .row
     .col= f.date_field :start_on
-    .col= f.date_field :end_on, hint: 'End dating will remove access'
+    .col= f.date_field :end_on, hint: 'End dating will remove access', date_linked: false
 
   - if EffectiveCommittees.use_effective_roles
     = f.checks :roles, EffectiveRoles.roles_collection(f.object, skip_disabled: true)

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

@@ -11,15 +11,14 @@
       - committee_folder = log.associated.try(:committee_folder) || log.associated
       - link_to_committee_folder = link_to(committee_folder, effective_committees.committee_committee_folder_path(committee, committee_folder))
 
-      -# TODO - this errors out if it isn't on the dashboard
-      -# link_to_file = link_to(log.associated, main_app.url_for(log.associated.try(:file)))
+      - committee_file = log.associated.try(:file).try(:blob)
+      - link_to_file = link_to(log.associated, (committee_file ? url_for(committee_file) : '#'))
 
       - if logs.length == 1 && log.associated_type == 'Effective::CommitteeFolder'
         %li Folder #{link_to_committee_folder} was added to #{link_to_committee}.
 
       - elsif logs.length == 1 && log.associated_type == 'Effective::CommitteeFile'
-        %li File {filename} was added to #{link_to_committee} → #{link_to_committee_folder}.
-        -# %li File #{link_to_file} was added to #{link_to_committee} → #{link_to_committee_folder}.
+        %li File #{link_to_file} was added to #{link_to_committee} → #{link_to_committee_folder}.
 
       - elsif logs.length > 1 && logs.all? { |log| log.associated_type == 'Effective::CommitteeFile' }
         %li #{logs.length} files were added to #{link_to_committee} → #{link_to_committee_folder}.

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

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

data/db/migrate/101_create_effective_committees.rb

@@ -72,6 +72,8 @@ class CreateEffectiveCommittees < ActiveRecord::Migration[6.0]
       t.string :title
       t.text :notes
 
+      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.5.1'.freeze
+  VERSION = '0.6.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_committees
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Code and Effect