effective_memberships 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 978c99bc1bc8f0106fac7867dc8a07acea70bd94456d248e20cbb2e57c633b76
-  data.tar.gz: af1183a241f5b564c7b3ca4aa1ded0768dfde262d3b75da1933ddd177e430ede
+  metadata.gz: ab9a748ab11ca8d852d0b69ed6f5d05e40e0e67b966e1c85f6cf98592db2dc32
+  data.tar.gz: b048158b7cea70c82fa04ab13cc91a37fcc20edcd5b6356b0ff6d9efbb967314
 SHA512:
-  metadata.gz: caa13055dda3360d3d1426710a39923cc79fcf99cf0af710acead650e3f56089d068e4d30fde0072ba2708cc144515a948a4a265624f0726e6afee4e1457861d
-  data.tar.gz: 5f8241aba4c6d6ca7757346ae74520993d48d4d04af8c5bdf486337ec2e939da8f2d7641fe746319d8c284190c07594b0be1b675240e996beee98815bb124c74
+  metadata.gz: 0603ffd2a17a89df9de2e7325f0d2c4a0d03583da2d3f431425f2e69edbadb201878582a60086ff48c9313dfd218c6d7b173a876a17e35737ebb98e3ebecd7ef
+  data.tar.gz: dbe77a3674d19fa2fed6be7bc23a09f1a66b7b7c2dfe7908516193c99f378b81e3a522d2a7ceaf2e105fd59d2247a2c1f87097451deadf9d29e0d22b92d6ff98

data/app/controllers/admin/documents_controller.rb

@@ -0,0 +1,15 @@
+module Admin
+  class DocumentsController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_memberships) }
+
+    include Effective::CrudController
+
+    private
+
+    def permitted_params
+      params.require(:effective_document).permit!
+    end
+
+  end
+end

data/app/datatables/admin/effective_documents_datatable.rb

@@ -0,0 +1,28 @@
+module Admin
+  class EffectiveDocumentsDatatable < Effective::Datatable
+    datatable do
+      order :updated_at
+
+      col :updated_at, visible: false
+      col :created_at, visible: false
+      col :id, visible: false
+
+      col :file
+      col :owner, label: 'User'
+      col :display_to_owner, label: 'Display to user'
+
+      if (categories = Array(EffectiveMemberships.document_categories)).present?
+        col :category, search: categories
+      end
+
+      col :title, visible: false
+      col :notes
+
+      actions_col
+    end
+
+    collection do
+      Effective::Document.deep.all
+    end
+  end
+end

data/app/datatables/effective_documents_datatable.rb

@@ -0,0 +1,31 @@
+# Dashboard Documents
+class EffectiveDocumentsDatatable < Effective::Datatable
+  datatable do
+    order :updated_at
+
+    col :updated_at, visible: false
+    col :created_at, visible: false
+    col :id, visible: false
+
+    col :owner, label: 'User or Organization'
+
+    if (categories = Array(EffectiveMemberships.document_categories)).present?
+      col :category, search: categories
+    end
+
+    col :file
+
+    col :title, visible: false
+    col :notes
+
+    actions_col do |document|
+      dropdown_link_to('Download', url_for(document.file)) if document.file.attached?
+    end
+
+  end
+
+  collection(apply_belongs_to: false) do
+    Effective::Document.deep.for(current_user).display_to_owner
+  end
+
+end

data/app/models/concerns/effective_memberships_owner.rb

@@ -267,8 +267,25 @@ module EffectiveMembershipsOwner
     # Build the renewal fee
     fee ||= fees.build()
 
-    late_on ||= EffectiveMemberships.Registrar.late_fee_date(period: period) if category.create_late_fees?
-    not_in_good_standing_on ||= EffectiveMemberships.Registrar.not_in_good_standing_date(period: period) if category.create_not_in_good_standing?
+    # Late on this period's late date, or 60 days, whichever is later
+    late_on ||= if category.create_late_fees?
+      late_date = EffectiveMemberships.Registrar.late_fee_date(period: period)
+
+      duration = EffectiveMemberships.Registrar.min_late_duration
+      min_date = ((fee.created_at || Time.zone.now) + duration) if duration.present?
+
+      [late_date, min_date].compact.max
+    end
+
+    # NIGS on this period's late date, or 60 days, whichever is later
+    not_in_good_standing_on ||= if category.create_not_in_good_standing?
+      nigs_date = EffectiveMemberships.Registrar.not_in_good_standing_date(period: period)
+
+      duration = EffectiveMemberships.Registrar.min_not_in_good_standing_duration
+      min_date = ((fee.created_at || Time.zone.now) + duration) if duration.present?
+
+      [nigs_date, min_date].compact.max
+    end
 
     fee.assign_attributes(
       fee_type: 'Renewal',

data/app/models/concerns/effective_memberships_registrar.rb

@@ -33,6 +33,18 @@ module EffectiveMembershipsRegistrar
     raise('to be implemented by app registrar')
   end
 
+  # A renewal fee must be at least this old to be considered late?
+  # Must be less than (late_fee_date - renewal_fee_date) but this is not enforced
+  def min_late_duration
+    60.days
+  end
+
+  # A renewal fee must be at least this old to be considered nigs?
+  # Must be less than (nigs_date - renewal_fee_date) but this is not enforced
+  def min_not_in_good_standing_duration
+    60.days
+  end
+
   # scope
   def not_in_good_standing_status
     EffectiveMemberships.Status.where(title: 'Not In Good Standing')

data/app/models/effective/document.rb

@@ -0,0 +1,50 @@
+module Effective
+  class Document < ActiveRecord::Base
+    self.table_name = EffectiveMemberships.documents_table_name.to_s
+
+    log_changes(to: :owner) if respond_to?(:log_changes)
+
+    # This fee may belong to an user, organization or other parent model
+    belongs_to :owner, polymorphic: true, optional: true
+
+    has_one_attached :file
+
+    effective_resource do
+      title             :string
+      category          :string
+      display_to_owner  :boolean    # Display on dashbaord
+
+      notes             :text
+
+      timestamps
+    end
+
+    scope :sorted, -> { order(:id) }
+    scope :deep, -> { with_attached_file }
+    scope :display_to_owner, -> { where(display_to_owner: true) }
+
+    scope :for, -> (user) {
+      raise('expected a effective memberships user') unless user.class.try(:effective_memberships_user?)
+      where(owner: user).or(where(owner: user.organizations))
+    }
+
+    before_validation(if: -> { file.attached? && title.blank? }) do
+      assign_attributes(title: file.filename.to_s)
+    end
+
+    validates :title, presence: true
+    validates :file, presence: true
+
+    validate do
+      if (categories = Array(EffectiveMemberships.document_categories)).present?
+        self.errors.add(:category, "can't be blank") if category.blank?
+        self.errors.add(:category, "is invalid") unless categories.include?(category)
+      end
+    end
+
+    def to_s
+      title.presence || model_name.human
+    end
+
+  end
+end

data/app/models/effective/fee.rb

@@ -87,14 +87,26 @@ module Effective
       return false if late_on.blank?
       return false if purchased?
 
-      late_on <= Time.zone.now.to_date
+      now = Time.zone.now
+
+      if(duration = EffectiveMemberships.Registrar.min_late_duration).present?
+        return false if ((created_at || now) + duration > now)
+      end
+
+      late_on <= now.to_date
     end
 
     def not_in_good_standing?
       return false if not_in_good_standing_on.blank?
       return false if purchased?
 
-      not_in_good_standing_on <= Time.zone.now.to_date
+      now = Time.zone.now
+
+      if(duration = EffectiveMemberships.Registrar.min_not_in_good_standing_duration).present?
+        return false if ((created_at || now) + duration > now)
+      end
+
+      not_in_good_standing_on <= now.to_date
     end
 
     # Used by applicant.applicant_submit_fees

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

@@ -0,0 +1,19 @@
+= effective_form_with(model: [:admin, document], engine: true) do |f|
+  - if inline_datatable?
+    = f.hidden_field :owner_id
+    = f.hidden_field :owner_type
+  - else
+    = f.hidden_field :owner_type, value: current_user.class.name
+
+    - ajax_url = (@select2_ajax_path || effective_resources.users_admin_select2_ajax_index_path) unless Rails.env.test?
+    = f.select :owner_id, current_user.class.all, label: 'User', ajax_url: ajax_url
+
+  - if (categories = Array(EffectiveMemberships.document_categories)).present?
+    - f.object.category ||= categories.first
+    = f.select :category, categories, required: true
+
+  = f.file_field :file
+  = f.text_area :notes
+  = f.check_box :display_to_owner, label: "Yes, display this document on the user dashboard"
+
+  = effective_submit(f)

data/app/views/effective/documents/_dashboard.html.haml

@@ -0,0 +1,8 @@
+- datatable = EffectiveResources.best('EffectiveDocumentsDatatable').new(self, namespace: :effective)
+
+%h2 Documents
+
+- if datatable.present?
+  = render_simple_datatable(datatable)
+- else
+  %p You have not been shared any documents. When you do, we'll show them here.

data/config/effective_memberships.rb

@@ -2,6 +2,7 @@ EffectiveMemberships.setup do |config|
   config.categories_table_name = :categories
   config.applicants_table_name = :applicants
   config.applicant_reviews_table_name = :applicant_reviews
+  config.documents_table_name = :documents
   config.fee_payments_table_name = :fee_payments
   config.organizations_table_name = :organizations
   config.representatives_table_name = :representatives
@@ -37,6 +38,10 @@ EffectiveMemberships.setup do |config|
   # When false, hide the reviewed state entirely
   # config.applicant_reviews = false
 
+  # Documents
+  # Documents will require a category when present
+  # config.document_categories = ['Documents']
+
   # Mailer Settings
   # Please see config/initializers/effective_resources.rb for default effective_* gem mailer settings
   #

data/config/routes.rb

@@ -52,6 +52,7 @@ EffectiveMemberships::Engine.routes.draw do
 
     resources :applicant_reviews, only: [:index, :show]
 
+    resources :documents, except: [:show]
     resources :fees, except: [:show]
     resources :categories, only: [:index, :edit, :update]
 

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

@@ -529,5 +529,19 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
     add_index :fee_payments, :status
     add_index :fee_payments, :token
 
+    # Documents
+    create_table :documents do |t|
+      t.integer :owner_id
+      t.string :owner_type
+
+      t.string :title
+      t.string :category
+      t.boolean :display_to_owner
+
+      t.text :notes
+
+      t.timestamps
+    end
+
   end
 end

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

data/lib/effective_memberships.rb

@@ -6,9 +6,9 @@ module EffectiveMemberships
 
   def self.config_keys
     [
-      :categories_table_name, :applicants_table_name, :applicant_reviews_table_name, :fee_payments_table_name, :organizations_table_name, :representatives_table_name, :statuses_table_name,
+      :documents_table_name, :categories_table_name, :applicants_table_name, :applicant_reviews_table_name, :fee_payments_table_name, :organizations_table_name, :representatives_table_name, :statuses_table_name,
       :category_class_name, :organization_class_name, :applicant_class_name, :applicant_review_class_name, :fee_payment_class_name, :registrar_class_name, :membership_card_class_name, :membership_directory_class_name, :status_class_name,
-      :additional_fee_types, :applicant_reviews, :applicant_endorsements_endorser_collection,
+      :additional_fee_types, :applicant_reviews, :applicant_endorsements_endorser_collection, :document_categories,
       :layout,
       :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject, :use_effective_email_templates
     ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-31 00:00:00.000000000 Z
+date: 2023-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -261,6 +261,7 @@ files:
 - app/controllers/admin/applicant_reviews_controller.rb
 - app/controllers/admin/applicants_controller.rb
 - app/controllers/admin/categories_controller.rb
+- app/controllers/admin/documents_controller.rb
 - app/controllers/admin/fee_payments_controller.rb
 - app/controllers/admin/fees_controller.rb
 - app/controllers/admin/membership_histories_controller.rb
@@ -285,6 +286,7 @@ files:
 - app/datatables/admin/effective_applicant_reviews_datatable.rb
 - app/datatables/admin/effective_applicants_datatable.rb
 - app/datatables/admin/effective_categories_datatable.rb
+- app/datatables/admin/effective_documents_datatable.rb
 - app/datatables/admin/effective_fee_payments_datatable.rb
 - app/datatables/admin/effective_fees_datatable.rb
 - app/datatables/admin/effective_membership_histories_datatable.rb
@@ -302,6 +304,7 @@ files:
 - app/datatables/effective_applicant_reviews_datatable.rb
 - app/datatables/effective_applicants_datatable.rb
 - app/datatables/effective_available_applicant_reviews_datatable.rb
+- app/datatables/effective_documents_datatable.rb
 - app/datatables/effective_fee_payments_datatable.rb
 - app/datatables/effective_memberships_directory_datatable.rb
 - app/datatables/effective_organizations_datatable.rb
@@ -330,6 +333,7 @@ files:
 - app/models/effective/applicant_reference.rb
 - app/models/effective/applicant_review.rb
 - app/models/effective/category.rb
+- app/models/effective/document.rb
 - app/models/effective/fee.rb
 - app/models/effective/fee_payment.rb
 - app/models/effective/membership.rb
@@ -366,6 +370,7 @@ files:
 - app/views/admin/categories/_form_fee_payment_content.html.haml
 - app/views/admin/categories/_form_fee_payment_steps.html.haml
 - app/views/admin/categories/_form_fees.html.haml
+- app/views/admin/documents/_form.html.haml
 - app/views/admin/fee_payments/_fee_payment.html.haml
 - app/views/admin/fees/_fee.html.haml
 - app/views/admin/fees/_form.html.haml
@@ -461,6 +466,7 @@ files:
 - app/views/effective/applicants/submitted.html.haml
 - app/views/effective/applicants/summary.html.haml
 - app/views/effective/applicants/transcripts.html.haml
+- app/views/effective/documents/_dashboard.html.haml
 - app/views/effective/fee_payments/_content.html.haml
 - app/views/effective/fee_payments/_dashboard.html.haml
 - app/views/effective/fee_payments/_declarations.html.haml