effective_cpd 0.4.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f290e98f25e51c9ebc4497830cd628ac7921a01c2a2be09b1a335af28bc6c003
-  data.tar.gz: fe7d20bb2bbdada0b0a30f53801ad877f51e5a01d8d56d3af4b225c820ec402e
+  metadata.gz: 7a4a0dc542b4aab7be7e662920d7d9c8c01b365debd9ba594bb6ffe92f4f3ccc
+  data.tar.gz: cd1039d075de6ca26ee36fc38c5790599e1d6761aa1fe0e5fc9791e4294709cb
 SHA512:
-  metadata.gz: b7bbf3b41e25cdd4b5ebe86d0f186c531450e614ef454367a08623f6868aa93e9ba5e37f35e7ad7f867a04e04f6a8c458acec9dd69cf2e98aca6329a1d21580e
-  data.tar.gz: 4050c510065598ca04809542bd50a16e54e93c9284610dc610693a06212cd9c897ef40e39508cc5f14e0d2f2e1239492bb42deb71fe257a3a51aadd8a7276843
+  metadata.gz: 9fb17b6984b76cc262edf4f85f898dd1b09e3338b388e178edb12068bc8eede3501b6314186a97fa28ecfbc81380df81d6316865321fe93ccf5d068ecbf7b5dd
+  data.tar.gz: 0c514c94d8ff831ebdbd7431d00bd07e7f7b452721c0cbb17958381ace13e2e5426c3c8c73ba797d47e4c8c7fc2d69ad23061ff28d01da4c471ecfbc54cded6d

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,17 @@ module EffectiveCpdUser
     true
   end
 
+  def cpd_statement(cpd_cycle:)
+    raise('expected an Effective::CpdCycle') unless cpd_cycle.class.respond_to?(:effective_cpd_cpd_cycle?)
+    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.class.respond_to?(:effective_cpd_cpd_cycle?)
+    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_cycle.rb

@@ -66,6 +66,10 @@ module Effective
       end
     end
 
+    def self.effective_cpd_cpd_cycle?
+      true
+    end
+
     def self.latest_cycle
       order(id: :desc).first
     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_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_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.4.0'
+  VERSION = '0.4.3'
 end

metadata

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