effective_cpd 0.3.2 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf98009925976387ffeafade80664bc5b17f9790b7172d0be90b84ed0ee86707
-  data.tar.gz: 073aa23104da3dbbf673798f27a6ffe80ea999b34fdc6df9cd7d08b5765897ec
+  metadata.gz: df7d2dbe808caefa87a85d090eba1d4b965b70bf968aa9531871b0d516d789a8
+  data.tar.gz: a216335a0dd7f11b9401e62fba037e6ddca712f6d783ef23b255de0262e4971d
 SHA512:
-  metadata.gz: e0b842326dc273ea10fe3232bbaea3266dd3ca43f248e0798fb5cee1db386da08befaa56f8880fcc43b5558d039926a9823000ea293d2d71f06f2e4dee9fa978
-  data.tar.gz: efb3b2c91cbf7976156f8bc169fd7f483399f10894a335b0a936cfd75f0235350d6af3e79e846ee22f40c6b91ed3f3c891cefe931b7212057073c5fcec2d5055
+  metadata.gz: b89ca9e4f87072ce55077b1a5ba3549a9c14d55d382b1061bd1bb766ef4bcbce941294f257715381e651efd87d05e6caa310dd0bb39ee655968d872127b8d565
+  data.tar.gz: 4f9d6bc3fb1079f9799eb0c5ad25a7c301ea3cccfe281878cd795de4b3bd748365268d8b06e683d52b3dd24f431e914c904da4c9b733bc11745a58b7de822e79

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/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_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/_dashboard.html.haml

@@ -0,0 +1,39 @@
+%h2 Continuing Professional Development
+
+- # Auditee datatables (4)
+- auditing = EffectiveCpdAvailableAuditsDatatable.new(self)
+- if auditing.present?
+  .mt-4
+    %p You have been selected for audit:
+    = render_datatable(auditing, simple: true)
+
+- audited = EffectiveCpdCompletedAuditsDatatable.new(self)
+- if audited.present?
+  .mt-4
+    %p You have completed these past audits:
+    = render_datatable(audited, simple: true)
+
+- available = EffectiveCpdAvailableCyclesDatatable.new(self)
+- if available.present?
+  .mt-4
+    %p Please submit a CPD statement for the following available #{cpd_cycles_label}:
+    = render_datatable(available, simple: true)
+
+- completed = EffectiveCpdCompletedStatementsDatatable.new(self)
+- if completed.present?
+  .mt-4
+    %p You have completed these past statements:
+    = render_datatable(completed, simple: true)
+
+- # Auditor / Audit reviewer datatables (2)
+- reviewing = EffectiveCpdAvailableAuditReviewsDatatable.new(self)
+- if reviewing.present?
+  .mt-4
+    %p You have been selected to assess the following audits:
+    = render_datatable(reviewing, simple: true)
+
+- reviewed = EffectiveCpdCompletedAuditReviewsDatatable.new(self)
+- if reviewed.present?
+  .mt-4
+    %p You have completed these past audit assessments:
+    = render_datatable(reviewed, simple: true)

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '0.3.2'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-08 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -261,6 +261,7 @@ files:
 - app/views/admin/cpd_cycles/_form_cpd_special_rules.html.haml
 - app/views/admin/cpd_special_rules/_form.html.haml
 - app/views/admin/cpd_statements/_cpd_statement.html.haml
+- app/views/effective/cpd/_dashboard.html.haml
 - app/views/effective/cpd_audit_level_questions/_cpd_audit_level_question.html.haml
 - app/views/effective/cpd_audit_responses/_cpd_audit_response.html.haml
 - app/views/effective/cpd_audit_responses/_fields.html.haml