effective_cpd 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df7d2dbe808caefa87a85d090eba1d4b965b70bf968aa9531871b0d516d789a8
-  data.tar.gz: a216335a0dd7f11b9401e62fba037e6ddca712f6d783ef23b255de0262e4971d
+  metadata.gz: 9945aa741b29b6997f437ba5eb0b7d9fc4d838c5f1c5c45f23d7588e13d28dfe
+  data.tar.gz: 503cf57539255dc4b2af5e3ef8b0cd590ca06dc1e12d651eeadbc3a3746e9600
 SHA512:
-  metadata.gz: b89ca9e4f87072ce55077b1a5ba3549a9c14d55d382b1061bd1bb766ef4bcbce941294f257715381e651efd87d05e6caa310dd0bb39ee655968d872127b8d565
-  data.tar.gz: 4f9d6bc3fb1079f9799eb0c5ad25a7c301ea3cccfe281878cd795de4b3bd748365268d8b06e683d52b3dd24f431e914c904da4c9b733bc11745a58b7de822e79
+  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_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/lib/effective_cpd/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-07 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails