effective_memberships 0.17.10 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ce6118d2ee3305019612e18f63990abffeca7345b0f55b420a500b76f3fcb1c
-  data.tar.gz: cc0dd908ae8d05fd5f53038b67be0744cf045edf76f613fccc5f5d4d889db44f
+  metadata.gz: 72aa9c8faab61b20bcd7adfb56cae17f511d168c16707543ae3532be0a0f96e3
+  data.tar.gz: 87eea10d0571781ce2175bfbbd38a8cb8c175282ed7f85f5adbb154f20940c8b
 SHA512:
-  metadata.gz: 889c672b4c30ff42b47faa11f0dbe5bd1e1c4e816eeaa100798482f01fca5f06dc3565ef63fed7c86a26bf4f929d4e5895865c5f4b0f76646fa20e0cec4ea3f3
-  data.tar.gz: bfc6d2f12222988da2b3017ca52315da6580279da29ff1a02d887e2b0b55a270c1928d43a4e7dbd84dd037dc3670c2766b2b37bd1847ef7666c4f6f4b83cd48a
+  metadata.gz: e7e08dc7b8577ccee1602aa0a608c5a9daed8296d77a901c619ef8e2e94d12fb2de21fbf94b26c18934420491e86c413fa28c1de23a7372b32be68398b291d48
+  data.tar.gz: 6e49dc33467cda697043851ed8c9d7e67bfc9ad586a90c880efa5ff4c0142fb5cffce6f8b0f58d8c6b825a0e135f81f9b0811a8c12d241eb139c4306a6000ea4

data/README.md

@@ -52,7 +52,7 @@ Use the following datatables to display to your user their applicants dues:
 
 ```haml
 %h2 Applications to Join
-- datatable = EffectiveMembershipsApplicantssDatatable.new(self)
+- datatable = EffectiveMembershipsApplicantsDatatable.new(self)
 ```
 
 and
@@ -77,7 +77,7 @@ All authorization checks are handled via the effective_resources gem found in th
 
 ## Permissions
 
-The permissions you actually want to define are as follows (using CanCan):
+The permissions you actually want to define are as follows (using CanCanCan):
 
 ```ruby
 # Regular signed up user. Guest users not supported.
@@ -92,6 +92,11 @@ if user.admin?
 end
 ```
 
+## Custom Greetings
+
+It's possible to change how the owner and reviewer names are displayed in emails by adding a `email_to_s` method or overriding the `to_s` method in the resource - your `User` model.
+
+
 ## License
 
 MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)

data/app/controllers/admin/applicants_controller.rb

@@ -36,6 +36,18 @@ module Admin
       ].compact.join(' ')
     }
 
+    submit :flag, 'Flag Applicant', success: -> {
+      [
+        "Successfully marked #{resource.owner} #{resource} as flagged"
+      ].compact.join(' ')
+    }
+
+    submit :unflag, 'Unflag Applicant', success: -> {
+      [
+        "Successfully marked #{resource.owner} #{resource} as unflagged"
+      ].compact.join(' ')
+    }
+
     private
 
     def permitted_params

data/app/datatables/admin/effective_applicants_datatable.rb

@@ -13,6 +13,9 @@ module Admin
       col :id, visible: false
 
       col :status, search: effective_memberships_status_collection()
+      col :flagged
+      col :flagged_at, visible: false
+      col :flagged_reason, visible: false
 
       col :created_at, label: 'Created', as: :date, visible: false
       col :updated_at, label: 'Updated', visible: false
@@ -31,10 +34,10 @@ module Admin
       col :organization, visible: false
 
       col :applicant_type, search: EffectiveMemberships.Applicant.categories
-      col :category, label: 'Applicant Category', search: { collection: EffectiveMemberships.Category.all, polymorphic: false }
-      col :stream
       col :from_category, search: { collection: EffectiveMemberships.Category.all, polymorphic: false }
       col :from_status, search: { collection: EffectiveMemberships.Status.all, polymorphic: false }
+      col :category, label: 'Applicant Category', search: { collection: EffectiveMemberships.Category.all, polymorphic: false }
+      col :stream
 
       col :applicant_reviews, visible: false
       col :orders, visible: false

data/app/datatables/effective_available_applicant_reviews_datatable.rb

@@ -15,6 +15,10 @@ class EffectiveAvailableApplicantReviewsDatatable < Effective::Datatable
     col :category, label: 'Category'
     col :to_status, label: 'Status'
 
+    col :flagged
+    col :flagged_at, visible: false
+    col :flagged_reason, visible: false
+
     col :reviews do |applicant|
       pluralize(applicant.applicant_reviews.count { |review| review.submitted? }, 'review')
     end

data/app/mailers/effective/memberships_mailer.rb

@@ -184,7 +184,7 @@ module Effective
       raise('expected a owner') unless owner.class.respond_to?(:effective_memberships_owner?)
 
       values = {
-        name: owner.to_s,
+        name: owner.try(:email_to_s) || owner.to_s,
         email: owner.email
       }
 
@@ -195,7 +195,7 @@ module Effective
       raise('expected a owner') unless owner.class.respond_to?(:effective_memberships_owner?)
 
       values = {
-        name: owner.to_s,
+        name: owner.try(:email_to_s) || owner.to_s,
         email: owner.email
       }
 

data/app/models/concerns/effective_memberships_applicant.rb

@@ -169,6 +169,11 @@ module EffectiveMembershipsApplicant
       missing_info_at        :datetime
       missing_info_reason    :text
 
+      # Flagged
+      flagged           :boolean
+      flagged_at        :datetime
+      flagged_reason    :text
+
       # Applicant Educations
       applicant_educations_details    :text
 
@@ -303,7 +308,7 @@ module EffectiveMembershipsApplicant
             x.errors.add(:end_on, "can't overlap when full time")
             y.errors.add(:start_on, "can't overlap when full time")
             y.errors.add(:end_on, "can't overlap when full time")
-            self.errors.add(:applicant_experiences, "can't have overlaping dates for full time experiences")
+            self.errors.add(:applicant_experiences, "can't have overlapping dates for full time experiences")
           end
         end
       end
@@ -420,6 +425,13 @@ module EffectiveMembershipsApplicant
     # Admin Missing Info
     validates :missing_info_reason, presence: true, if: -> { missing_info? }
 
+    # Admin Flagged
+    validates :flagged_at, presence: true, if: -> { flagged? }
+    validates :flagged_reason, presence: true, if: -> { flagged? }
+
+    # Admin Unflagged
+    validates :flagged_at, absence: true, if: -> { !flagged? }
+
     # These two try completed and try reviewed
     # before_save(if: -> { submitted? }) { try_completed! }
     # before_save(if: -> { completed? }) { try_reviewed! }
@@ -832,7 +844,7 @@ module EffectiveMembershipsApplicant
       requirements['Transcripts'] = ('Not Required' unless transcripts_required?) || transcripts_received?
     end
 
-    if all_steps.include?(:ensorsements) || applicant_endorsements_required?
+    if all_steps.include?(:endorsements) || applicant_endorsements_required?
       requirements['Endorsements'] = ('Not Required' unless applicant_endorsements_required?) || (applicant_endorsements.count(&:completed?) >= min_applicant_endorsements)
     end
 
@@ -1014,6 +1026,14 @@ module EffectiveMembershipsApplicant
     true
   end
 
+  def flag!
+    update!(flagged: true, flagged_at: Time.zone.now)
+  end
+
+  def unflag!
+    update!(flagged: false, flagged_at: nil)
+  end
+
   private
 
   def assign_applicant_experiences_months!

data/app/models/concerns/effective_memberships_applicant_review.rb

@@ -49,6 +49,8 @@ module EffectiveMembershipsApplicantReview
     scope :done, -> { where(status: :submitted) }
 
     belongs_to :applicant
+    accepts_nested_attributes_for :applicant
+
     belongs_to :reviewer, polymorphic: true
 
     effective_resource do

data/app/views/admin/applicants/_form_flag.html.haml

@@ -0,0 +1,7 @@
+= effective_form_with(model: [:admin, applicant], engine: true) do |f|
+  %p This applicant will be marked as <strong>flagged</strong> with the following:
+
+  = f.hidden_field :flagged_at, value: Time.zone.now
+  = f.text_field :flagged_reason, required: true, label: 'Reason for flagging'
+
+  = f.submit 'Flag Applicant', border: false, center: true, 'data-confirm': "Flag #{f.object.owner}?"

data/app/views/admin/applicants/_form_process.html.haml

@@ -1,9 +1,9 @@
+%h5 Process applicant
+
 %p
   %span.badge.badge-secondary= applicant.status_label
   = applicant.summary
 
-%p Process applicant:
-
 = accordion do
   - if EffectiveResources.authorized?(self, :complete, applicant)
     = collapse 'Complete this Applicant' do
@@ -20,3 +20,23 @@
   - if EffectiveResources.authorized?(self, :decline, applicant)
     = collapse 'Decline this Applicant' do
       = render('admin/applicants/form_decline', applicant: applicant)
+
+%h5.mt-3 Flag applicant
+
+%p
+  - if applicant.flagged?
+    %small.text-muted This applicant was flagged at #{applicant.flagged_at.strftime('%B %d, %Y')} (#{time_ago_in_words(applicant.flagged_at)} ago) with reason: #{applicant.flagged_reason}
+  - else
+    %small.text-muted
+      This applicant is not currently flagged.
+      - if applicant.flagged_reason.present?
+        This applicant was previously flagged with reason: #{applicant.flagged_reason}
+
+= accordion do
+  - if EffectiveResources.authorized?(self, :flag, applicant) && !applicant.flagged?
+    = collapse 'Flag this Applicant' do
+      = render('admin/applicants/form_flag', applicant: applicant)
+
+  - if EffectiveResources.authorized?(self, :unflag, applicant) && applicant.flagged?
+    = collapse 'Unflag this Applicant' do
+      = render('admin/applicants/form_unflag', applicant: applicant)

data/app/views/admin/applicants/_form_unflag.html.haml

@@ -0,0 +1,7 @@
+= effective_form_with(model: [:admin, applicant], engine: true) do |f|
+  %p This applicant will be marked as <strong>unflagged</strong>.
+
+  = f.hidden_field :flagged, value: false
+  = f.hidden_field :flagged_at, value: nil
+
+  = f.submit 'Unflag Applicant', border: false, center: true, 'data-confirm': "Unflag #{f.object.owner}?"

data/app/views/effective/applicant_reviews/recommendation.html.haml

@@ -19,4 +19,12 @@
       = f.radios :recommendation, EffectiveMemberships.ApplicantReview.recommendations, label: false
       = f.text_area :comments, label: 'Reviewer comments'
 
+      - if EffectiveResources.authorized?(self, :flag, f.object.applicant)
+        = f.fields_for :applicant do |a|
+          = a.check_box :flagged, label: 'Flag this application'
+
+          = a.show_if :flagged, true do
+            = a.hidden_field :flagged_at, value: Time.zone.now
+            = a.text_area :flagged_reason, label: 'Reason for flagging'
+
       = f.save 'Submit Recommendation'

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

@@ -253,6 +253,11 @@ class CreateEffectiveMemberships < ActiveRecord::Migration[6.0]
       # Additional Information
       t.text :additional_information
 
+      # Flagged
+      t.boolean :flagged, default: false
+      t.datetime :flagged_at
+      t.text :flagged_reason
+
       t.datetime :updated_at
       t.datetime :created_at
     end

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.17.10'
+  VERSION = '0.18.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.17.10
+  version: 0.18.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-20 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: haml-rails
+  name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -234,6 +234,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: Manage your professional association online. Membership categories, applications
   to join and reclassify, annual dues payments and more.
 email:
@@ -361,9 +375,11 @@ files:
 - app/views/admin/applicants/_form_approve.html.haml
 - app/views/admin/applicants/_form_complete.html.haml
 - app/views/admin/applicants/_form_decline.html.haml
+- app/views/admin/applicants/_form_flag.html.haml
 - app/views/admin/applicants/_form_missing_info.html.haml
 - app/views/admin/applicants/_form_process.html.haml
 - app/views/admin/applicants/_form_transcripts.html.haml
+- app/views/admin/applicants/_form_unflag.html.haml
 - app/views/admin/applicants/_status.html.haml
 - app/views/admin/categories/_fees_additional.html.haml
 - app/views/admin/categories/_fees_applicant.html.haml
@@ -577,7 +593,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Manage your professional association online. Membership categories, applications