effective_cpd 0.3.3 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6bed34a47adc51ccbd8130374137416ce8c7eb58ad7d3594db16b4498ee889c
-  data.tar.gz: 8ef171411108e7e5d203c72733e12c597b99fed21ab7bb74f27097d6da4f797c
+  metadata.gz: 9945aa741b29b6997f437ba5eb0b7d9fc4d838c5f1c5c45f23d7588e13d28dfe
+  data.tar.gz: 503cf57539255dc4b2af5e3ef8b0cd590ca06dc1e12d651eeadbc3a3746e9600
 SHA512:
-  metadata.gz: dda9b3ec1334ebe58aad35f13e47cca0a69c9711018046454a49aa0ae3d293b2813b871678681c360d2057923877103f2f9831ed02787e0dfadd66a93a435ae9
-  data.tar.gz: c7e0f49c69d1fc1c1513fc4bee4d5acd16ff4c28833c6d56179c805db928f5a0efe2bd4c35ee8af5f688c2a2a51745b62a2a967b5dbdab5bdb49a64a04257434
+  metadata.gz: 1d37582e54373eaaba6ffd9a35145a896fd85d25e7fcd44fb493f9979ce8ac82e5de7d2ee85e72f9dd95f4ff0995c949ea551704fb5413d1446b482b12ba49a5
+  data.tar.gz: 30ea4652b91215b6ff969d17fe0316771b75ebe8fd0f1dcd5800e686fb47013de4d21b77f63cca5dfdbb19ffe57218e8a3482b3d39664e45c0bcbd72530c716b

data/app/models/concerns/effective_cpd_user.rb

@@ -13,9 +13,11 @@ module EffectiveCpdUser
   end
 
   included do
-    has_many :cpd_statements, -> { Effective::CpdStatement.sorted }, class_name: 'Effective::CpdStatement'
+    has_many :cpd_statements, -> { Effective::CpdStatement.sorted }, inverse_of: :user, class_name: 'Effective::CpdStatement'
     has_many :cpd_audits, -> { Effective::CpdAudit.sorted }, inverse_of: :user, class_name: 'Effective::CpdAudit'
     has_many :cpd_audit_reviews, -> { Effective::CpdAuditReview.sorted }, inverse_of: :user, class_name: 'Effective::CpdAuditReview'
+
+    accepts_nested_attributes_for :cpd_statements
   end
 
   def cpd_statement_required_score(cpd_statement)
@@ -26,6 +28,18 @@ module EffectiveCpdUser
     true
   end
 
+  def cpd_statement(cpd_cycle:)
+    raise('expected an Effective::CpdCycle') unless cpd_cycle.kind_of?(Effective::CpdCycle)
+    cpd_statements.find { |cpd_statement| cpd_statement.cpd_cycle_id == cpd_cycle.id }
+  end
+
+  # Find or build
+  def build_cpd_statement(cpd_cycle:)
+    raise('expected an Effective::CpdCycle') unless cpd_cycle.kind_of?(Effective::CpdCycle)
+
+    cpd_statement(cpd_cycle: cpd_cycle) || cpd_statements.build(cpd_cycle: cpd_cycle)
+  end
+
   module ClassMethods
     def effective_cpd_user?; true; end
   end

data/app/models/effective/cpd_statement.rb

@@ -72,6 +72,16 @@ module Effective
       cpd_cycle.present? ? "#{cpd_cycle} Statement" : 'statement'
     end
 
+    def import!(date: nil)
+      date ||= Time.zone.now
+
+      wizard_steps[:start] ||= date
+      wizard_steps[:activities] ||= date
+      cpd_statement_activities.each { |activity| activity.importing = true }
+
+      save!
+    end
+
     # This is the review step where they click Submit Ballot
     def submit!
       wizard_steps[:complete] ||= Time.zone.now

data/app/models/effective/cpd_statement_activity.rb

@@ -1,6 +1,7 @@
 module Effective
   class CpdStatementActivity < ActiveRecord::Base
     attr_accessor :max_score
+    attr_accessor :importing
 
     belongs_to :cpd_statement
     belongs_to :cpd_category
@@ -38,7 +39,7 @@ module Effective
     validates :original, presence: true, if: -> { (carry_over || 0) > 0 }
     validates :description, presence: true
 
-    validate(if: -> { new_record? && cpd_statement.present? }) do
+    validate(if: -> { new_record? && cpd_statement.present? }, unless: -> { importing }) do
       self.errors.add(:base, "statement has already been completed") if cpd_statement.completed?
       self.errors.add(:base, "cycle is unavailable") unless cpd_statement.cpd_cycle.available?
     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_audit_levels/_form_cpd_audit_level_section.html.haml

@@ -1,7 +1,11 @@
 = effective_form_with(model: [:admin, cpd_audit_level], engine: true) do |f|
   = f.fields_for :cpd_audit_level_sections, cpd_audit_level_section do |fas|
-    = fas.rich_text_area :top_content
-    = fas.rich_text_area :bottom_content
+    - if defined?(EffectiveArticleEditor)
+      = fas.article_editor :top_content
+      = fas.article_editor :bottom_content
+    - else
+      = fas.rich_text_area :top_content
+      = fas.rich_text_area :bottom_content
 
   = 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/admin/cpd_cycles/_form_cpd_rules.html.haml

@@ -16,8 +16,10 @@
         = fc.select :cpd_special_rule_ids, cpd_cycle.cpd_special_rules, multiple: true,
           label: 'Special Rules', hint: "Special rules operate on more than one category at a time"
 
-    = fc.rich_text_area :category_credit_description,
-      hint: "A description of the maximum #{cpd_credits_label} and carry forward policy of activities for this category"
+    - if defined?(EffectiveArticleEditor)
+      = fc.article_editor :category_credit_description, hint: "A description of the maximum #{cpd_credits_label} and carry forward policy of activities for this category"
+    - else
+      = fc.rich_text_area :category_credit_description, hint: "A description of the maximum #{cpd_credits_label} and carry forward policy of activities for this category"
 
     = fc.check_box :unavailable, label: "Unavailable in this #{cpd_cycle_label}"
 

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.3'
+  VERSION = '0.4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-17 00:00:00.000000000 Z
+date: 2022-09-08 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