effective_cpd 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86cc744bca079efc7c8980e61f35d8200c4b01efbc309481ad50bf9ffa8d885c
-  data.tar.gz: bd79c194bc5b49fa01777fd43e7cd6a9efd029b17ca70793ce54059a26656ac1
+  metadata.gz: f290e98f25e51c9ebc4497830cd628ac7921a01c2a2be09b1a335af28bc6c003
+  data.tar.gz: fe7d20bb2bbdada0b0a30f53801ad877f51e5a01d8d56d3af4b225c820ec402e
 SHA512:
-  metadata.gz: b014a09d8642a8e61c82887ffd511883203b2c5bc06db5eaefd60765c17b2275b944e1d591dce8d0db2197c568f7f9ee4f276bcc7f175c99a0ced075542b07d7
-  data.tar.gz: bfd0c5a9a54df1b62de4c9345da508a9126ca2271480677bb8304b32b5d79085eca22a0c0502d8d56e496b7c88b845c00b59f287a378a2940c1208a1cc6cdc05
+  metadata.gz: b7bbf3b41e25cdd4b5ebe86d0f186c531450e614ef454367a08623f6868aa93e9ba5e37f35e7ad7f867a04e04f6a8c458acec9dd69cf2e98aca6329a1d21580e
+  data.tar.gz: 4050c510065598ca04809542bd50a16e54e93c9284610dc610693a06212cd9c897ef40e39508cc5f14e0d2f2e1239492bb42deb71fe257a3a51aadd8a7276843

data/app/datatables/admin/effective_cpd_audit_reviews_datatable.rb

@@ -2,8 +2,8 @@ module Admin
   class EffectiveCpdAuditReviewsDatatable < Effective::Datatable
     filters do
       scope :all
-      scope :available, label: 'In Progress'
       scope :completed
+      scope :available, label: 'In Progress'
     end
 
     datatable do
@@ -12,7 +12,14 @@ module Admin
       col :id, visible: false
 
       col :cpd_audit
+
+      col :auditee do |cpd_audit_review|
+        user = cpd_audit_review.cpd_audit.user
+        link_to(user, edit_admin_user_path(user))
+      end
+
       col :user, label: 'Audit Reviewer'
+
       col :due_date
       col :submitted_at, as: :date, label: 'Submitted'
       col :conflict_of_interest

data/app/datatables/admin/effective_cpd_audits_datatable.rb

@@ -47,6 +47,29 @@ module Admin
       col :due_date
 
       col :status
+
+      col(:cpd_audit_recommendations, label: 'Recommendation', visible: false) do |cpd_audit|
+        cpd_audit.cpd_audit_reviews.map(&:recommendation).map do |recommendation|
+          content_tag(:div, recommendation.to_s, class: 'col-resource_item')
+        end.join.html_safe
+      end
+
+      col(:cpd_audit_reveiw_item_recommendations, label: 'Item Recommendations', search: :string, visible: false) do |cpd_audit|
+        recommendations = cpd_audit.cpd_audit_reviews.map(&:recommendation)
+        item_recommendations = cpd_audit.cpd_audit_reviews.flat_map { |r| r.cpd_audit_review_items.map(&:recommendation) }
+
+        reviews = ((recommendations + item_recommendations) - ['', nil]).uniq
+        reviews.to_sentence
+      end
+
+      col(:cpd_audit_comments, label: 'Reviewer Comments', search: :string, visible: false) do |cpd_audit|
+        item_comments = cpd_audit.cpd_audit_reviews.flat_map { |r| r.cpd_audit_review_items.map(&:comments) }.join
+
+        cpd_audit.cpd_audit_reviews.map(&:comments).map do |comments|
+          content_tag(:div, simple_format(comments.to_s + item_comments), class: 'col-resource_item')
+        end.join.html_safe
+      end
+
       col :determination
 
       col(:auditee_cpd_statements, label: 'Auditee Statements', visible: false) do |cpd_audit|

data/app/models/effective/cpd_audit.rb

@@ -76,6 +76,9 @@ module Effective
       # Final determination
       determination            :string
 
+      # Override Deadlines
+      ignore_deadlines         :boolean
+
       # Auditee response
       conflict_of_interest          :boolean
       conflict_of_interest_reason   :text
@@ -130,17 +133,17 @@ module Effective
     validates :extension_request_date, presence: true, if: -> { extension_request? }
     validates :extension_request_reason, presence: true, if: -> { extension_request? }
 
-    validate(if: -> { current_step == :conflict && conflict_of_interest? }) do
+    validate(if: -> { current_step == :conflict && conflict_of_interest? && !ignore_deadlines? }) do
       deadline = deadline_to_conflict_of_interest()
       self.errors.add(:base, 'deadline to declare conflict of interest has already passed') if deadline && deadline < Time.zone.now
     end
 
-    validate(if: -> { current_step == :exemption && exemption_request? }) do
+    validate(if: -> { current_step == :exemption && exemption_request? && !ignore_deadlines? }) do
       deadline = deadline_to_exemption()
       self.errors.add(:base, 'deadline to request exemption has already passed') if deadline && deadline < Time.zone.now
     end
 
-    validate(if: -> { current_step == :extension && extension_request? }) do
+    validate(if: -> { current_step == :extension && extension_request? && !ignore_deadlines? }) do
       deadline = deadline_to_extension()
       self.errors.add(:base, 'deadline to request extension has already passed') if deadline && deadline < Time.zone.now
     end

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

@@ -7,7 +7,12 @@
   .row
     .col
       = f.text_field :title, label: 'Title'
-      = f.rich_text_area :body, label: 'Body (optional)'
+
+      - if defined?(EffectiveArticleEditor)
+        = f.article_editor :body, label: 'Body (optional)'
+      - else
+        = f.rich_text_area :body, label: 'Body (optional)'
+
     .col
       = f.text_field :amount_label,
         hint: 'hours of work, papers written, courses attended'

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

@@ -5,7 +5,11 @@
     = f.select :cpd_audit_level_section_id, Effective::CpdAuditLevelSection.sorted.all
 
   = f.text_field :title, label: 'Question Title'
-  = f.rich_text_area :body, label: 'Body (optional)'
+
+  - if defined?(EffectiveArticleEditor)
+    = f.article_editor :body, label: 'Body (optional)'
+  - else
+    = f.rich_text_area :body, label: 'Body (optional)'
 
   = f.check_box :required, hint: 'A response to this question will be required'
   = f.select :category, Effective::CpdAuditLevelQuestion::CATEGORIES

data/app/views/admin/cpd_audit_levels/_form_content_audit.html.haml

@@ -2,14 +2,18 @@
 
 = effective_form_with(model: [:admin, cpd_audit_level], engine: true) do |f|
   = card("All Steps Content") do
-    = f.rich_text_area "rich_text_all_steps_audit_content", label: false,
-      hint: "displayed on all steps"
+    - if defined?(EffectiveArticleEditor)
+      = f.article_editor "rich_text_all_steps_audit_content", label: false, hint: "displayed on all steps"
+    - else
+      = f.rich_text_area "rich_text_all_steps_audit_content", label: false, hint: "displayed on all steps"
 
   %hr
 
   - Effective::CpdAudit::WIZARD_STEPS.each do |step, title|
     = card("#{title} Content") do
-      = f.rich_text_area "rich_text_#{step}_audit_content", label: false,
-        hint: "displayed on the auditee wizard #{step} wizard step only"
+      - if defined?(EffectiveArticleEditor)
+        = f.article_editor "rich_text_#{step}_audit_content", label: false, hint: "displayed on the auditee wizard #{step} wizard step only"
+      - else
+        = f.rich_text_area "rich_text_#{step}_audit_content", label: false, hint: "displayed on the auditee wizard #{step} wizard step only"
 
   = f.submit

data/app/views/admin/cpd_audit_levels/_form_content_audit_review.html.haml

@@ -2,14 +2,18 @@
 
 = effective_form_with(model: [:admin, cpd_audit_level], engine: true) do |f|
   = card("All Steps Content") do
-    = f.rich_text_area "rich_text_all_steps_audit_review_content", label: false,
-      hint: "displayed on all steps"
+    - if defined?(EffectiveArticleEditor)
+      = f.article_editor "rich_text_all_steps_audit_review_content", label: false, hint: "displayed on all steps"
+    - else
+      = f.rich_text_area "rich_text_all_steps_audit_review_content", label: false, hint: "displayed on all steps"
 
   %hr
 
   - Effective::CpdAuditReview::WIZARD_STEPS.each do |step, title|
     = card("#{title} Content") do
-      = f.rich_text_area "rich_text_#{step}_audit_review_content", label: false,
-        hint: "displayed on the audit reviewer #{step} wizard step only"
+      - if defined?(EffectiveArticleEditor)
+        = f.article_editor "rich_text_#{step}_audit_review_content", label: false, hint: "displayed on the audit reviewer #{step} wizard step only"
+      - else
+        = f.rich_text_area "rich_text_#{step}_audit_review_content", label: false, hint: "displayed on the audit reviewer #{step} wizard step only"
 
   = f.submit

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

@@ -17,6 +17,9 @@
       = tab 'Audit' do
         = render 'effective/cpd_audits/cpd_audit', cpd_audit: cpd_audit
 
+    = tab 'Deadlines' do
+      = render 'admin/cpd_audits/form_deadlines', cpd_audit: cpd_audit
+
     = tab 'Statements' do
       - datatable = Admin::EffectiveCpdStatementsDatatable.new(user_id: cpd_audit.user.id, user_type: cpd_audit.user.class.name)
       = render_datatable(datatable, inline: true, simple: true)

data/app/views/admin/cpd_audits/_form_deadlines.html.haml

@@ -0,0 +1,12 @@
+= card('Deadlines') do
+  = effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
+    %p The audittee has the following deadlines:
+
+    %ul
+      %li To declare conflict of interest: #{f.object.deadline_to_conflict_of_interest}
+      %li To request exemption: #{f.object.deadline_to_exemption}
+      %li To request extension: #{f.object.deadline_to_extension}
+
+    = f.check_box :ignore_deadlines, label: 'Yes, ignore audittee deadlines and allow these actions to be performed'
+
+    = f.submit 'Save', center: true

data/app/views/admin/cpd_categories/_form_cpd_category.html.haml

@@ -1,5 +1,9 @@
 = effective_form_with(model: [:admin, cpd_category], engine: true) do |f|
   = f.text_field :title
-  = f.rich_text_area :body
+
+  - if defined?(EffectiveArticleEditor)
+    = f.article_editor :body
+  - else
+    = f.rich_text_area :body
 
   = effective_submit(f)

data/app/views/admin/cpd_cycles/_form_content.html.haml

@@ -4,37 +4,58 @@
   .card.mb-4
     .card-body
       %h5.card-title All Steps Content
-      = f.rich_text_area :all_steps_content, label: false, hint: 'displayed on all statement steps'
+      - if defined?(EffectiveArticleEditor)
+        = f.article_editor :all_steps_content, label: false, hint: 'displayed on all statement steps'
+      - else
+        = f.rich_text_area :all_steps_content, label: false, hint: 'displayed on all statement steps'
 
   .card.mb-4
     .card-body
       %h5.card-title Sidebar Content
-      = f.rich_text_area :sidebar_content, label: false, hint: 'displayed on the sidebar on all statement steps'
+      - if defined?(EffectiveArticleEditor)
+        = f.article_editor :sidebar_content, label: false, hint: 'displayed on the sidebar on all statement steps'
+      - else
+        = f.rich_text_area :sidebar_content, label: false, hint: 'displayed on the sidebar on all statement steps'
 
   %h2 Individual Steps Content
   .card.mb-4
     .card-body
       %h5.card-title Start Step
-      = f.rich_text_area :start_content, label: false, hint: 'displayed on the start step only'
+      - if defined?(EffectiveArticleEditor)
+        = f.article_editor :start_content, label: false, hint: 'displayed on the start step only'
+      - else
+        = f.rich_text_area :start_content, label: false, hint: 'displayed on the start step only'
 
   .card.mb-4
     .card-body
       %h5.card-title Activities Step
-      = f.rich_text_area :activities_content, label: false, hint: 'displayed on the activities step only'
+      - if defined?(EffectiveArticleEditor)
+        = f.article_editor :activities_content, label: false, hint: 'displayed on the activities step only'
+      - else
+        = f.rich_text_area :activities_content, label: false, hint: 'displayed on the activities step only'
 
   .card.mb-4
     .card-body
       %h5.card-title Agreements Step
-      = f.rich_text_area :agreements_content, label: false, hint: 'displayed on the agreements step only'
+      - if defined?(EffectiveArticleEditor)
+        = f.article_editor :agreements_content, label: false, hint: 'displayed on the agreements step only'
+      - else
+        = f.rich_text_area :agreements_content, label: false, hint: 'displayed on the agreements step only'
 
   .card.mb-4
     .card-body
       %h5.card-title Submit Step
-      = f.rich_text_area :submit_content, label: false, hint: 'displayed on the submit step only'
+      - if defined?(EffectiveArticleEditor)
+        = f.article_editor :submit_content, label: false, hint: 'displayed on the submit step only'
+      - else
+        = f.rich_text_area :submit_content, label: false, hint: 'displayed on the submit step only'
 
   .card.mb-4
     .card-body
       %h5.card-title Complete Step
-      = f.rich_text_area :complete_content, label: false, hint: 'displayed on the complete step only'
+      - if defined?(EffectiveArticleEditor)
+        = f.article_editor :complete_content, label: false, hint: 'displayed on the complete step only'
+      - else
+        = f.rich_text_area :complete_content, label: false, hint: 'displayed on the complete step only'
 
   = f.submit

data/app/views/effective/cpd_audits/conflict.html.haml

@@ -5,7 +5,7 @@
     - resource.cpd_audit_reviews.each do |cpd_audit_review|
       %li #{cpd_audit_review.user} <#{mail_to(cpd_audit_review.user.email)}>
 
-  - if resource.deadline_to_conflict_of_interest.present?
+  - if resource.deadline_to_conflict_of_interest.present? && !resource.ignore_deadlines?
     %p The deadline to declare a conflict of interest is: #{resource.deadline_to_conflict_of_interest.strftime('%F')}.
 
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|

data/app/views/effective/cpd_audits/exemption.html.haml

@@ -2,7 +2,7 @@
   - if resource.was_exemption_requested?
     = render('effective/cpd_audits/exemption', cpd_audit: resource, step: :exemption)
 
-  - if resource.deadline_to_exemption.present?
+  - if resource.deadline_to_exemption.present? && !resource.ignore_deadlines?
     %p The deadline to request an exemption is: #{resource.deadline_to_exemption.strftime('%F')}.
 
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|

data/app/views/effective/cpd_audits/extension.html.haml

@@ -2,7 +2,7 @@
   - if resource.was_extension_requested?
     = render('effective/cpd_audits/extension', cpd_audit: resource, step: :extension)
 
-  - if resource.deadline_to_extension.present?
+  - if resource.deadline_to_extension.present? && !resource.ignore_deadlines?
     %p The deadline to request an extension is: #{resource.deadline_to_extension.strftime('%F')}.
 
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|

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

@@ -176,6 +176,8 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
       t.date :notification_date
       t.date :extension_date
 
+      t.boolean :ignore_deadlines, default: false
+
       t.string :determination
 
       t.boolean :conflict_of_interest

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-07 00:00:00.000000000 Z
+date: 2022-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -246,6 +246,7 @@ files:
 - app/views/admin/cpd_audits/_auditee_fields.html.haml
 - app/views/admin/cpd_audits/_form.html.haml
 - app/views/admin/cpd_audits/_form_conflict.html.haml
+- app/views/admin/cpd_audits/_form_deadlines.html.haml
 - app/views/admin/cpd_audits/_form_determination.html.haml
 - app/views/admin/cpd_audits/_form_exemption.html.haml
 - app/views/admin/cpd_audits/_form_extension.html.haml