effective_memberships 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e562d7ef78e3298066d1051a02aee3f0e81515a5221f5210f0782403d4634a6
-  data.tar.gz: 7951880cdf0b2fd8f0a4dfbff341b58ef61853cab50d36da54ed31ee5f16f457
+  metadata.gz: 3e0fe5390c8126df8c148cf4d031bf4611cc202acf55414f3da855a07e89a60a
+  data.tar.gz: 8ce7268567f65358a1dd806f689e6f31eb323f6f26ca7f1c7e82a13506faab6f
 SHA512:
-  metadata.gz: 3a46a6e3b2117e117aef3dd3ee1d28e4f6cb9790ce22144193549c54cd6c96253f2268287e6f228083e7d526b14d6b1091cb196091caf1f7da7eec9df5f5ac65
-  data.tar.gz: 5cf7629541e967ce4ffd3c06a1e0953cc0d36fa2528e4fb85a4418ce1c5ff77e71f13ea172e77d1fea3d9f2f73623dc5b285079099e51be2df385ad0f572587b
+  metadata.gz: 9a658433b5659a0cd35c3f311bb6da56ff909ec0d3aa9a10e9aea337496e4b81935f9329bcdc87080d8ddbec6ae4d45eec8baa7b5e33568864b07b573ab3a5bb
+  data.tar.gz: 329b5687fe923fd2e8e1820c84623d74dbfcf2ce3e6b5b4cc99df14ae55d4c1bf26ef76b1ce027e7db203cbce1fd828d4955d262651c59ee449101d0df485a78

data/app/datatables/effective_applicant_endorsers_datatable.rb

@@ -0,0 +1,20 @@
+# For the Endorser's dashboard to display endorsements to complete
+class EffectiveApplicantEndorsersDatatable < Effective::Datatable
+
+  datatable do
+    length :all
+
+    col :created_at
+    col :applicant
+
+    actions_col do |applicant_endorsement|
+      dropdown_link_to 'Show', effective_memberships.applicant_endorsement_path(applicant_endorsement)
+    end
+
+  end
+
+  collection do
+    Effective::ApplicantEndorsement.deep.needs_endorser.where(endorser: current_user)
+  end
+
+end

data/app/models/concerns/effective_memberships_user.rb

@@ -28,6 +28,10 @@ module EffectiveMembershipsUser
 
     accepts_nested_attributes_for :representatives, allow_destroy: true
 
+    # I'm an endorser for these
+    has_many :applicant_endorsements, -> { Effective::ApplicantEndorsement.sorted },
+      class_name: 'Effective::ApplicantEndorsement', inverse_of: :endorser, as: :endorser, dependent: :nullify
+
     scope :membership_applying, -> {
       applicants = EffectiveMemberships.Applicant.all
       without_role(:member).where(id: applicants.select(:user_id))

data/app/models/effective/applicant_endorsement.rb

@@ -39,6 +39,9 @@ module Effective
     end
 
     scope :deep, -> { all }
+    scope :sorted, -> { order(:id) }
+
+    scope :needs_endorser, -> { where(status: :submitted).where(applicant_id: EffectiveMemberships.Applicant.not_draft) }
 
     # All step validations
     validates :applicant, presence: true

data/app/views/admin/categories/_form_applicant_content.html.haml

@@ -2,8 +2,10 @@
 
 = effective_form_with(model: [:admin, category], engine: true) do |f|
   = card("All Steps") do
-    = f.rich_text_area "rich_text_applicant_all_steps_content", label: false,
-      hint: "displayed on all steps"
+    - if defined?(EffectiveArticleEditor)
+      = f.article_editor "rich_text_applicant_all_steps_content", label: false, hint: "displayed on all steps"
+    - else
+      = f.rich_text_area "rich_text_applicant_all_steps_content", label: false, hint: "displayed on all steps"
 
   %hr
 
@@ -13,7 +15,9 @@
     - next unless enabled.include?(step)
 
     = card("#{title}") do
-      = f.rich_text_area "rich_text_applicant_#{step}_content", label: false,
-        hint: "displayed on the applicant #{step} wizard step only"
+      - if defined?(EffectiveArticleEditor)
+        = f.article_editor "rich_text_applicant_#{step}_content", label: false, hint: "displayed on the applicant #{step} wizard step only"
+      - else
+        = f.rich_text_area "rich_text_applicant_#{step}_content", label: false, hint: "displayed on the applicant #{step} wizard step only"
 
   = f.submit

data/app/views/admin/categories/_form_category.html.haml

@@ -7,7 +7,9 @@
   - if f.object.class.categories.present?
     = f.select :category, f.object.class.categories
 
-  = f.rich_text_area :rich_text_body, label: 'Body',
-    hint: 'A quick description of this category. It is displayed on the Application Select Category step.'
+  - if defined?(EffectiveArticleEditor)
+    = f.article_editor :rich_text_body, label: 'Body', hint: 'A quick description of this category. It is displayed on the Application Select Category step.'
+  - else
+    = f.rich_text_area :rich_text_body, label: 'Body', hint: 'A quick description of this category. It is displayed on the Application Select Category step.'
 
   = f.submit

data/app/views/admin/categories/_form_fee_payment_content.html.haml

@@ -2,8 +2,10 @@
 
 = effective_form_with(model: [:admin, category], engine: true) do |f|
   = card("All Steps") do
-    = f.rich_text_area "rich_text_fee_payment_all_steps_content", label: false,
-      hint: "displayed on all steps"
+    - if defined?(EffectiveArticleEditor)
+      = f.article_editor "rich_text_fee_payment_all_steps_content", label: false, hint: "displayed on all steps"
+    - else
+      = f.rich_text_area "rich_text_fee_payment_all_steps_content", label: false, hint: "displayed on all steps"
 
   %hr
 
@@ -13,7 +15,9 @@
     - next unless enabled.include?(step)
 
     = card("#{title}") do
-      = f.rich_text_area "rich_text_fee_payment_#{step}_content", label: false,
-        hint: "displayed on the fee payment #{step} wizard step only"
+      - if defined?(EffectiveArticleEditor)
+        = f.article_editor "rich_text_fee_payment_#{step}_content", label: false, hint: "displayed on the fee payment #{step} wizard step only"
+      - else
+        = f.rich_text_area "rich_text_fee_payment_#{step}_content", label: false, hint: "displayed on the fee payment #{step} wizard step only"
 
   = f.submit

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

@@ -0,0 +1,10 @@
+- datatable = EffectiveApplicantEndorsersDatatable.new(self, endorser: current_user)
+
+%h2 Endorsements
+
+- if datatable.present?
+  %p Your endorsement has been requested on the following applicants:
+  = render_simple_datatable(datatable)
+
+- else
+  %p There are no applicant endorsements to complete.

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.5.2'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-19 00:00:00.000000000 Z
+date: 2022-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -292,6 +292,7 @@ files:
 - app/datatables/effective_applicant_courses_datatable.rb
 - app/datatables/effective_applicant_educations_datatable.rb
 - app/datatables/effective_applicant_endorsements_datatable.rb
+- app/datatables/effective_applicant_endorsers_datatable.rb
 - app/datatables/effective_applicant_equivalences_datatable.rb
 - app/datatables/effective_applicant_experiences_datatable.rb
 - app/datatables/effective_applicant_references_datatable.rb
@@ -391,6 +392,7 @@ files:
 - app/views/effective/applicant_endorsements/_form_declaration.html.haml
 - app/views/effective/applicant_endorsements/complete.html.haml
 - app/views/effective/applicant_endorsements/edit.html.haml
+- app/views/effective/applicant_endorsers/_dashboard.html.haml
 - app/views/effective/applicant_references/_applicant_reference.html.haml
 - app/views/effective/applicant_references/_datatable_actions.html.haml
 - app/views/effective/applicant_references/_form.html.haml