effective_committees 0.5.1 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: effc4579e15d6bbbf45ffb1113ebb129a0d809b9e600da98c3b10c5a70e2d385
-  data.tar.gz: 25ffa06fe7742f83f08fbac7c79521aa3b2155deb2639fa36559164bfc243c14
+  metadata.gz: 4a528b08eb7dc0d58d450aaa85a537a2795b1eee6f2786d98c76f32fd1570fa8
+  data.tar.gz: f2d84ed3da7694d91d49035852da6a9a2da0c036fb0343845426032d178068fe
 SHA512:
-  metadata.gz: 1593abb4700a2d23026405da7a7acfb82e042eac5a856bb84efb37afcbb7592817bcb53ab0f5870a10965258d905f9d06deaecd2af976adac4c244e6736417f5
-  data.tar.gz: 9bc7a3f7dc8aed23178a8e8d11704e09b470bd782e13a947de3bf2f6f13f1530ec71d6e636499bf4f07b71b7c3a9d97a01ec49f195a39b3726e7303100013540
+  metadata.gz: 0f66144da2d5716c7a0bd7e0be84f7da454200f3b9933bfb574924b67e73cf40d12f48f6b3e2f3cb6c09253a97d437c41def61cc53a64bb79ea280cbd4fb2051
+  data.tar.gz: 7ca4214b46b4ac71deaf33e9725fd7b798ba7b511781ca99d4a999bef28f063119a8f10d776f77044763ede1b4f5b9db6d7ee2570defd98464816f00c1aa8d93

data/app/controllers/admin/committee_folders_controller.rb

@@ -5,6 +5,8 @@ module Admin
 
     include Effective::CrudController
 
+    submit :bulk_upload, 'Bulk upload'
+
     private
 
     def permitted_params

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/models/effective/committee_folder.rb

@@ -12,6 +12,8 @@ module Effective
     has_rich_text :body
     has_many :committee_files, -> { Effective::CommitteeFile.sorted.deep }, dependent: :destroy, inverse_of: :committee_folder
 
+    has_many_attached :files
+
     effective_resource do
       title         :string
       slug          :string
@@ -38,5 +40,9 @@ module Effective
       title.presence || 'folder'
     end
 
+    def bulk_upload!
+      files.each { |file| committee_files.create(file: file.blob) }
+      true
+    end
   end
 end

data/app/views/admin/committee_files/_form_committee_file.html.haml

@@ -6,11 +6,16 @@
 
   - if inline_datatable? && inline_datatable.attributes[:committee_folder_id].present?
     = f.hidden_field :committee_folder_id
-  - elsif inline_datatable?
-    = f.select :committee_folder_id, Effective::CommitteeFolder.deep.where(committee: committee_file.committee_id), label: "Folder"
+  - elsif f.object.persisted?
+    = f.static_field :committee
+    = f.select :committee_folder_id, Effective::CommitteeFolder.where(committee: f.object.committee), label: "Folder"
   - else
-    = f.select :committee_id, Effective::Committee.sorted.all
-    = f.select :committee_folder_id, Effective::CommitteeFolder.sorted.all, label: "Folder"
+    = f.select :committee_id, Effective::Committee.sorted.all,
+      'data-load-ajax-url': effective_committees.new_admin_committee_file_path,
+      'data-load-ajax-div': '#effective-committees-ajax'
+
+    #effective-committees-ajax
+      = f.select :committee_folder_id, Effective::CommitteeFolder.where(committee: f.object.committee), label: "Folder"
 
   = f.file_field :file
   = f.text_area :notes

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

@@ -1,6 +1,8 @@
 = tabs do
   - if committee_folder.persisted?
     = tab 'Folder Files' do
+      = render('admin/committee_folders/form_bulk_upload', committee_folder: committee_folder)
+
       - datatable = Admin::EffectiveCommitteeFilesDatatable.new(committee_folder: committee_folder, committee: committee_folder.committee)
       = render_inline_datatable(datatable)
 

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

@@ -0,0 +1,3 @@
+= effective_form_with(model: [:admin, committee_folder], engine: true, autosave: true) do |f|
+  = f.file_field :files, multiple: true, label: 'Bulk upload', hint: 'Select or drag and drop multiple files to upload'
+  %div{style: 'display: none;'}= f.save 'Bulk upload'

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

@@ -1,7 +1,7 @@
 = effective_form_with(model: [:admin, committee_folder], engine: true) do |f|
   - if inline_datatable?
-    = f.hidden_field :committee_id
     = f.hidden_field :committee_type
+    = f.hidden_field :committee_id
   - else
     = f.select :committee, { committees_label => Effective::Committee.sorted }, polymorphic: true
 
@@ -14,4 +14,4 @@
   - else
     = f.rich_text_area :body, hint: "Displayed on the #{committee_folder_label} page"
 
-  = effective_submit(f)
+  = f.submit

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/admin/committees/_fields.html.haml

@@ -2,8 +2,8 @@
 
 = acts_as_slugged_fields(f, url: (effective_committees.committee_url(f.object) rescue nil))
 
-= f.check_box :display_on_index, label: "Show on the member-only #{link_to "Volunteers and Committees", effective_committees.volunteers_and_committees_path} page"
-= f.check_box :display_on_dashboard, label: "Show on the <a href='/committees'>My #{committee_label.pluralize}</a> page".html_safe
+= f.check_box :display_on_index, label: "Show on the member-only #{link_to "Volunteers and Committees", effective_committees.volunteers_and_committees_path, target: '_blank'} page"
+= f.check_box :display_on_dashboard, label: "Show on the #{link_to "My #{committee_label.pluralize}", effective_committees.committees_path, target: '_blank'} page".html_safe
 
 - if defined?(EffectiveArticleEditor)
   = f.article_editor :body, hint: "Shown on the #{committee_label} page."

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.1'.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.1
 platform: ruby
 authors:
 - Code and Effect
@@ -202,6 +202,7 @@ files:
 - app/views/admin/committee_files/_form.html.haml
 - app/views/admin/committee_files/_form_committee_file.html.haml
 - app/views/admin/committee_folders/_form.html.haml
+- app/views/admin/committee_folders/_form_bulk_upload.html.haml
 - app/views/admin/committee_folders/_form_committee_folder.html.haml
 - app/views/admin/committee_members/_form.html.haml
 - app/views/admin/committee_members/_form_committee_member.html.haml