effective_cpd 0.1.19 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe768cdc3715d62c09b0c829d6823db4ce8587fd603244dceb4243976006bb02
-  data.tar.gz: 0540bd3c67a6df4c5fbc2d612ccbc67f834ff46d96a605c2200ac8866f21dfbd
+  metadata.gz: 9940c548d939b8c1a285db0e19877bd4ed2147001fbebc947aaf6e02d548def6
+  data.tar.gz: 0547a9982f49587cbe07f2d3b65b6ab0da31be1728d7a55541cebd48cb560dde
 SHA512:
-  metadata.gz: 00701f9319d26d59b192bf831d7072441661798a2202ba728cdf474b798fc9cfc5e3a013b5b725a45d58f6861192d48684acb6b3aec7508a7787d2e3608433c4
-  data.tar.gz: a363248b7decc2a56fcc86d29748c3c29b97fe6ea256406a10f5a41af69064301158871851e8b3dbe2227e3bd40a8009e95a8f16601a4da8f629027d53e65470
+  metadata.gz: bc621cc69009ae0a6629d11f07b8fcabcbf9aafe011649b441d096e90754938104b24c5633b0b7374f298b005d4e558a2f6ebcdca1c19b2b442883d4a7e3e018
+  data.tar.gz: dca45ea584ab120514a7fb2d4231d2d19bcd373f84066e16ad57af2d05b46e605e7692d22e6e18c46913a3af233022dbac597672cacf337d7d350e80ae0b9030

data/app/controllers/effective/cpd_audits_controller.rb

@@ -32,6 +32,8 @@ module Effective
       when :extension
         params.require(:effective_cpd_audit)
           .permit(:current_step, :extension_request, :extension_request_date, :extension_request_reason)
+      when :cpd
+        params.require(:effective_cpd_audit).permit(:current_step)
       when :questionnaire
         params.require(:effective_cpd_audit).permit(:current_step)
       when :files

data/app/datatables/admin/effective_cpd_statements_datatable.rb

@@ -17,8 +17,14 @@ module Admin
       col :cpd_cycle, label: cpd_cycle_label.titleize
       col :user
       col :submitted_at, as: :date, label: 'Submitted'
-      col :score
-      col :carry_forward
+
+      col :score do |cpd_statement|
+        cpd_score(cpd_statement.score)
+      end
+
+      col :carry_forward do |cpd_statement|
+        cpd_score(cpd_statement.carry_forward)
+      end
 
       actions_col
     end

data/app/helpers/effective_cpd_helper.rb

@@ -44,4 +44,9 @@ module EffectiveCpdHelper
     @effective_cpd_categories ||= Effective::CpdCategory.deep.sorted
   end
 
+  def cpd_score(value)
+    raise('expected a BigDecimal') unless value.nil? || value.kind_of?(BigDecimal)
+    ("%.#{2}f" % value.to_d)
+  end
+
 end

data/app/mailers/effective/cpd_mailer.rb

@@ -1,122 +1,194 @@
 module Effective
   class CpdMailer < EffectiveCpd.parent_mailer_class
-    default from: -> { EffectiveCpd.mailer_sender }
-    layout -> { EffectiveCpd.mailer_layout || 'effective_cpd_mailer_layout' }
+
+    include EffectiveMailer
+    include EffectiveEmailTemplatesMailer if EffectiveCpd.use_effective_email_templates
 
     # CPD Audit
-    def cpd_audit_opened(cpd_audit, opts = {})
-      @assigns = effective_cpd_email_assigns(cpd_audit)
-      @assigns.merge!(url: effective_cpd.cpd_audit_url(cpd_audit))
+    def cpd_audit_opened(resource, opts = {})
+      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
+
+      @assigns = assigns_for(resource).merge(url: effective_cpd.cpd_audit_url(resource))
+      @cpd_audit = resource
+
+      subject = subject_for(__method__, 'CPD Audit Opened', resource, opts)
+      headers = headers_for(resource, opts)
 
-      mail(to: cpd_audit.user.email, **headers_for(cpd_audit, opts))
+      mail(to: resource.user.email, subject: subject, **headers)
     end
 
-    def cpd_audit_conflicted(cpd_audit, opts = {})
-      @assigns = effective_cpd_email_assigns(cpd_audit)
-      @assigns.merge!(url: effective_cpd.edit_admin_cpd_audit_url(cpd_audit))
+    def cpd_audit_conflicted(resource, opts = {})
+      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
+
+      @assigns = assigns_for(resource).merge(url: effective_cpd.edit_admin_cpd_audit_url(resource))
+      @cpd_audit = resource
+
+      subject = subject_for(__method__, 'CPD Audit Conflicted', resource, opts)
+      headers = headers_for(resource, opts)
 
-      mail(to: EffectiveCpd.mailer_admin, **headers_for(cpd_audit, opts))
+      mail(to: mailer_admin, subject: subject, **headers)
     end
 
-    def cpd_audit_conflict_resolved(cpd_audit, opts = {})
-      @assigns = effective_cpd_email_assigns(cpd_audit)
-      @assigns.merge!(url: effective_cpd.cpd_audit_url(cpd_audit))
+    def cpd_audit_conflict_resolved(resource, opts = {})
+      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
 
-      mail(to: cpd_audit.user.email, **headers_for(cpd_audit, opts))
+      @assigns = assigns_for(resource).merge(url: effective_cpd.cpd_audit_url(resource))
+      @cpd_audit = resource
+
+      subject = subject_for(__method__, 'CPD Audit Conflict Resolved', resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: resource.user.email, subject: subject, **headers)
     end
 
-    def cpd_audit_exemption_request(cpd_audit, opts = {})
-      @assigns = effective_cpd_email_assigns(cpd_audit)
-      @assigns.merge!(url: effective_cpd.edit_admin_cpd_audit_url(cpd_audit))
+    def cpd_audit_exemption_request(resource, opts = {})
+      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
+
+      @assigns = assigns_for(resource).merge(url: effective_cpd.edit_admin_cpd_audit_url(resource))
+      @cpd_audit = resource
+
+      subject = subject_for(__method__, 'CPD Audit Exemption Request', resource, opts)
+      headers = headers_for(resource, opts)
 
-      mail(to: EffectiveCpd.mailer_admin, **headers_for(cpd_audit, opts))
+      mail(to: mailer_admin, subject: subject, **headers)
     end
 
-    def cpd_audit_exemption_denied(cpd_audit, opts = {})
-      @assigns = effective_cpd_email_assigns(cpd_audit)
-      @assigns.merge!(url: effective_cpd.cpd_audit_url(cpd_audit))
+    def cpd_audit_exemption_denied(resource, opts = {})
+      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
 
-      mail(to: cpd_audit.user.email, **headers_for(cpd_audit, opts))
+      @assigns = assigns_for(resource).merge(url: effective_cpd.cpd_audit_url(resource))
+      @cpd_audit = resource
+
+      subject = subject_for(__method__, 'CPD Audit Exemption Denied', resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: resource.user.email, subject: subject, **headers)
     end
 
-    def cpd_audit_exemption_granted(cpd_audit, opts = {})
-      @assigns = effective_cpd_email_assigns(cpd_audit)
-      @assigns.merge!(url: effective_cpd.cpd_audit_url(cpd_audit))
+    def cpd_audit_exemption_granted(resource, opts = {})
+      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
+
+      @assigns = assigns_for(resource).merge(url: effective_cpd.cpd_audit_url(resource))
+      @cpd_audit = resource
+
+      subject = subject_for(__method__, 'CPD Audit Exemption Granted', resource, opts)
+      headers = headers_for(resource, opts)
 
-      mail(to: cpd_audit.user.email, **headers_for(cpd_audit, opts))
+      mail(to: resource.user.email, subject: subject, **headers)
     end
 
-    def cpd_audit_extension_request(cpd_audit, opts = {})
-      @assigns = effective_cpd_email_assigns(cpd_audit)
-      @assigns.merge!(url: effective_cpd.edit_admin_cpd_audit_url(cpd_audit))
+    def cpd_audit_extension_request(resource, opts = {})
+      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
 
-      mail(to: EffectiveCpd.mailer_admin, **headers_for(cpd_audit, opts))
+      @assigns = assigns_for(resource).merge(url: effective_cpd.edit_admin_cpd_audit_url(resource))
+      @cpd_audit = resource
+
+      subject = subject_for(__method__, 'CPD Audit Extension Request', resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: mailer_admin, subject: subject, **headers)
     end
 
-    def cpd_audit_extension_denied(cpd_audit, opts = {})
-      @assigns = effective_cpd_email_assigns(cpd_audit)
-      @assigns.merge!(url: effective_cpd.cpd_audit_url(cpd_audit))
+    def cpd_audit_extension_denied(resource, opts = {})
+      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
+
+      @assigns = assigns_for(resource).merge(url: effective_cpd.cpd_audit_url(resource))
+      @cpd_audit = resource
+
+      subject = subject_for(__method__, 'CPD Audit Extension Denied', resource, opts)
+      headers = headers_for(resource, opts)
 
-      mail(to: cpd_audit.user.email, **headers_for(cpd_audit, opts))
+      mail(to: resource.user.email, subject: subject, **headers)
     end
 
-    def cpd_audit_extension_granted(cpd_audit, opts = {})
-      @assigns = effective_cpd_email_assigns(cpd_audit)
-      @assigns.merge!(url: effective_cpd.cpd_audit_url(cpd_audit))
+    def cpd_audit_extension_granted(resource, opts = {})
+      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
 
-      mail(to: cpd_audit.user.email, **headers_for(cpd_audit, opts))
+      @assigns = assigns_for(resource).merge(url: effective_cpd.cpd_audit_url(resource))
+      @cpd_audit = resource
+
+      subject = subject_for(__method__, 'CPD Audit Extension Granted', resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: resource.user.email, subject: subject, **headers)
     end
 
-    def cpd_audit_submitted(cpd_audit, opts = {})
-      @assigns = effective_cpd_email_assigns(cpd_audit)
-      @assigns.merge!(url: effective_cpd.edit_admin_cpd_audit_url(cpd_audit))
+    def cpd_audit_submitted(resource, opts = {})
+      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
+
+      @assigns = assigns_for(resource).merge(url: effective_cpd.edit_admin_cpd_audit_url(resource))
+      @cpd_audit = resource
+
+      subject = subject_for(__method__, 'CPD Audit Submitted', resource, opts)
+      headers = headers_for(resource, opts)
 
-      mail(to: EffectiveCpd.mailer_admin, **headers_for(cpd_audit, opts))
+      mail(to: mailer_admin, subject: subject, **headers)
     end
 
-    def cpd_audit_reviewed(cpd_audit, opts = {})
-      @assigns = effective_cpd_email_assigns(cpd_audit)
-      @assigns.merge!(url: effective_cpd.edit_admin_cpd_audit_url(cpd_audit))
+    def cpd_audit_reviewed(resource, opts = {})
+      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
 
-      mail(to: EffectiveCpd.mailer_admin, **headers_for(cpd_audit, opts))
+      @assigns = assigns_for(resource).merge(url: effective_cpd.edit_admin_cpd_audit_url(resource))
+      @cpd_audit = resource
+
+      subject = subject_for(__method__, 'CPD Audit Reviewed', resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: mailer_admin, subject: subject, **headers)
     end
 
-    def cpd_audit_closed(cpd_audit, opts = {})
-      @assigns = effective_cpd_email_assigns(cpd_audit)
-      @assigns.merge!(url: effective_cpd.cpd_audit_url(cpd_audit))
+    def cpd_audit_closed(resource, opts = {})
+      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
+
+      @assigns = assigns_for(resource).merge(url: effective_cpd.cpd_audit_url(resource))
+      @cpd_audit = resource
+
+      subject = subject_for(__method__, 'CPD Audit Closed', resource, opts)
+      headers = headers_for(resource, opts)
 
-      mail(to: cpd_audit.user.email, **headers_for(cpd_audit, opts))
+      mail(to: resource.user.email, subject: subject, **headers)
     end
 
     # CPD Audit Review
-    def cpd_audit_review_opened(cpd_audit_review, opts = {})
-      @assigns = effective_cpd_email_assigns(cpd_audit_review)
-      @assigns.merge!(url: effective_cpd.cpd_audit_review_url(cpd_audit_review))
+    def cpd_audit_review_opened(resource, opts = {})
+      raise('expected an Effective::CpdAuditReview') unless resource.kind_of?(Effective::CpdAuditReview)
 
-      mail(to: cpd_audit_review.user.email, **headers_for(cpd_audit_review, opts))
-    end
+      @assigns = assigns_for(resource).merge(url: effective_cpd.cpd_audit_review_url(resource))
+      @cpd_audit_review = resource
 
-    def cpd_audit_review_ready(cpd_audit_review, opts = {})
-      @assigns = effective_cpd_email_assigns(cpd_audit_review)
-      @assigns.merge!(url: effective_cpd.cpd_audit_review_url(cpd_audit_review))
+      subject = subject_for(__method__, 'CPD Audit Review Opened', resource, opts)
+      headers = headers_for(resource, opts)
 
-      mail(to: cpd_audit_review.user.email, **headers_for(cpd_audit_review, opts))
+      mail(to: resource.user.email, subject: subject, **headers)
     end
 
-    def cpd_audit_review_submitted(cpd_audit_review, opts = {})
-      @assigns = effective_cpd_email_assigns(cpd_audit_review)
-      @assigns.merge!(url: effective_cpd.edit_admin_cpd_audit_url(cpd_audit_review.cpd_audit))
+    def cpd_audit_review_ready(resource, opts = {})
+      raise('expected an Effective::CpdAuditReview') unless resource.kind_of?(Effective::CpdAuditReview)
+
+      @assigns = assigns_for(resource).merge(url: effective_cpd.cpd_audit_review_url(resource))
+      @cpd_audit_review = resource
 
-      mail(to: EffectiveCpd.mailer_admin, **headers_for(cpd_audit_review, opts))
+      subject = subject_for(__method__, 'CPD Audit Review Ready', resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: resource.user.email, subject: subject, **headers)
     end
 
-    protected
+    def cpd_audit_review_submitted(resource, opts = {})
+      raise('expected an Effective::CpdAuditReview') unless resource.kind_of?(Effective::CpdAuditReview)
 
-    def headers_for(resource, opts = {})
-      resource.respond_to?(:log_changes_datatable) ? opts.merge(log: resource) : opts
+      @assigns = assigns_for(resource).merge(url: effective_cpd.edit_admin_cpd_audit_url(resource.cpd_audit))
+      @cpd_audit_review = resource
+
+      subject = subject_for(__method__, 'CPD Audit Review Submitted', resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: mailer_admin, subject: subject, **headers)
     end
 
-    def effective_cpd_email_assigns(resource)
+    protected
+
+    def assigns_for(resource)
       unless resource.kind_of?(Effective::CpdAudit) || resource.kind_of?(Effective::CpdAuditReview)
         raise('expected an Effective::CpdAudit or Effective::CpdAuditReview')
       end

data/app/models/concerns/effective_cpd_user.rb

@@ -22,6 +22,10 @@ module EffectiveCpdUser
     nil
   end
 
+  def cpd_audit_cpd_required?
+    true
+  end
+
   module ClassMethods
     def effective_cpd_user?; true; end
   end

data/app/models/effective/cpd_audit.rb

@@ -56,6 +56,7 @@ module Effective
       exemption: 'Request Exemption',
       extension: 'Request Extension',
       waiting: 'Waiting',
+      cpd: 'CPD',
 
       questionnaire: 'Questionnaire',
       # ... There will be one step per cpd_audit_level_sections here
@@ -129,6 +130,21 @@ 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
+      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
+      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
+      deadline = deadline_to_extension()
+      self.errors.add(:base, 'deadline to request extension has already passed') if deadline && deadline < Time.zone.now
+    end
+
     validate(if: -> { determination.present? }) do
       unless cpd_audit_level.determinations.include?(determination)
         self.errors.add(:determination, 'must exist in this audit level')
@@ -146,25 +162,6 @@ module Effective
       persisted? ? "#{cpd_audit_level} Audit of #{user}" : 'audit'
     end
 
-    acts_as_wizard(
-      start: 'Start',
-      information: 'Information',
-      instructions: 'Instructions',
-
-      # These 4 steps are determined by audit_level settings
-      conflict: 'Conflict of Interest',
-      exemption: 'Request Exemption',
-      extension: 'Request Extension',
-      waiting: 'Waiting on Request',
-
-      questionaire: 'Questionaire',
-      # ... There will be one step per cpd_audit_level_sections here
-      files: 'Upload Resume',
-
-      submit: 'Confirm & Submit',
-      complete: 'Complete'
-    )
-
     def dynamic_wizard_steps
       cpd_audit_level.cpd_audit_level_sections.each_with_object({}) do |section, h|
         h["section#{section.position+1}".to_sym] = section.title
@@ -195,7 +192,7 @@ module Effective
         steps += [:waiting]
       end
 
-      steps += [:questionnaire] + dynamic_wizard_steps.keys + [:files, :submit, :complete]
+      steps += [:cpd, :questionnaire] + dynamic_wizard_steps.keys + [:files, :submit, :complete]
 
       steps
     end
@@ -314,6 +311,24 @@ module Effective
       send_email(:cpd_audit_extension_denied)
     end
 
+    # Require CPD step
+    def user_cpd_required?
+      return false unless user.cpd_audit_cpd_required?
+      required_cpd_cycle.present?
+    end
+
+    def user_cpd_completed?
+      return true if required_cpd_cycle.blank?
+      user.cpd_statements.any? { |s| s.completed? && s.cpd_cycle_id == required_cpd_cycle.id }
+    end
+
+    def required_cpd_cycle
+      @required_cpd_cycle ||= begin
+        last_year = ((notification_date || created_at || Time.zone.now) - 1.year).all_year
+        Effective::CpdCycle.available.where(start_at: last_year).first
+      end
+    end
+
     # Auditee wizard action
     def submit!
       submitted!

data/app/models/effective/cpd_audit_review.rb

@@ -7,7 +7,7 @@ module Effective
     belongs_to :cpd_audit_level
     belongs_to :user, polymorphic: true    # Auditor
 
-    has_many :cpd_audit_review_items, -> { CpdAuditReviewItem.sorted }, inverse_of: :cpd_audit_review
+    has_many :cpd_audit_review_items, -> { CpdAuditReviewItem.sorted }, inverse_of: :cpd_audit_review, dependent: :destroy
     accepts_nested_attributes_for :cpd_audit_review_items, reject_if: :all_blank, allow_destroy: true
 
     if respond_to?(:log_changes)

data/app/models/effective/cpd_rule.rb

@@ -117,10 +117,12 @@ module Effective
     private
 
     def eval_equation(amount: nil, amount2: nil)
-      return 0 if formula.blank?
+      return BigDecimal(0) if formula.blank?
 
       equation = formula.gsub('amount2', amount2.to_s).gsub('amount', amount.to_s)
-      eval(equation).round.to_i
+
+      # Returns a BigDecimal
+      eval(equation).to_d
     end
 
   end

data/app/models/effective/cpd_scorer.rb

@@ -103,7 +103,7 @@ module Effective
         cpd_categories = special_rule.ruleables.select { |obj| obj.kind_of?(Effective::CpdCategory) }
 
         max_credits_per_cycle = special_rule.max_credits_per_cycle
-        raise('expected max credits per cycle to be present') unless max_credits_per_cycle.to_i > 0
+        raise('expected max credits per cycle to be present') unless (max_credits_per_cycle || 0) > 0
 
         activities = statement.cpd_statement_activities.select { |sa| cpd_categories.include?(sa.cpd_category) }
 

data/app/models/effective/cpd_statement.rb

@@ -97,17 +97,17 @@ module Effective
       required_by_cycle = cpd_cycle&.required_score
       required_by_user = user.cpd_statement_required_score(self) if user.respond_to?(:cpd_statement_required_score)
 
-      [required_by_cycle.to_i, required_by_user.to_i].max
+      [required_by_cycle.to_d, required_by_user.to_d].max
     end
 
     def carry_forward
-      cpd_statement_activities.sum { |activity| activity.carry_forward.to_i }
+      cpd_statement_activities.sum { |activity| activity.carry_forward || BigDecimal(0) }.to_d
     end
 
     # {category_id => 20, category_id => 15}
     def score_per_category
-      @score_per_category ||= Hash.new(0).tap do |scores|
-        cpd_statement_activities.each { |activity| scores[activity.cpd_category_id] += activity.score.to_i }
+      @score_per_category ||= Hash.new(BigDecimal(0)).tap do |scores|
+        cpd_statement_activities.each { |activity| scores[activity.cpd_category_id] += activity.score.to_d }
       end
     end
 

data/app/models/effective/cpd_statement_activity.rb

@@ -16,14 +16,14 @@ module Effective
     end
 
     effective_resource do
-      amount            :integer
-      amount2           :integer
+      amount            :decimal
+      amount2           :decimal
 
       description       :text
 
-      carry_over        :integer    # carry_over_from_last_cycle
-      score             :integer
-      carry_forward     :integer    # carry_forward_to_next_cycle
+      carry_over        :decimal    # carry_over_from_last_cycle
+      score             :decimal
+      carry_forward     :decimal    # carry_forward_to_next_cycle
 
       reduced_messages  :text
 
@@ -35,7 +35,7 @@ module Effective
     scope :deep, -> { includes(:cpd_statement, :cpd_category, :cpd_activity, :original) }
     scope :sorted, -> { order(:id) }
 
-    validates :original, presence: true, if: -> { carry_over.to_i > 0 }
+    validates :original, presence: true, if: -> { (carry_over || 0) > 0 }
     validates :description, presence: true
 
     validate(if: -> { new_record? && cpd_statement.present? }) do

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

@@ -0,0 +1,13 @@
+= card(cpd_audit.wizard_step_title(step)) do
+  - cpd_cycle = cpd_audit.required_cpd_cycle
+
+  %table.table
+    %tbody
+      %tr
+        %th CPD Requirements
+        %td
+          - if cpd_audit.user_cpd_required? == false
+            Not required
+
+          - if cpd_cycle.present?
+            = cpd_cycle

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

@@ -17,7 +17,7 @@
 
         %tr
           %td
-            %h4= last_3_scores.to_i
+            %h4= cpd_score(last_3_scores.to_d)
 
           %td #{cpd_credits_label} in last 3 #{cpd_cycles_label} (including this #{cpd_cycle_label})
 

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

@@ -5,7 +5,8 @@
     - resource.cpd_audit_reviews.each do |cpd_audit_review|
       %li #{cpd_audit_review.user} <#{mail_to(cpd_audit_review.user.email)}>
 
-  %p The deadline to declare a conflict of interest is: #{resource.deadline_to_conflict_of_interest.strftime('%F')}.
+  - if resource.deadline_to_conflict_of_interest.present?
+    %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|
     = f.hidden_field :current_step

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

@@ -0,0 +1,19 @@
+= render('layout') do
+  - cpd_cycle = resource.required_cpd_cycle
+
+  - if resource.user_cpd_required? == false
+    %p You are not required to submit a CPD statement at this time.
+  - elsif resource.user_cpd_completed?
+    %p Thank you! You have submitted a CPD statement for the required #{cpd_cycle} year.
+  - elsif cpd_cycle.present?
+    %p You must submit a CPD statement for the #{cpd_cycle} year before you may continue.
+
+  - if cpd_cycle.present?
+    %p= link_to("#{cpd_cycle} Statement", effective_cpd.cpd_cycle_cpd_statement_build_path(cpd_cycle, :new, :start), class: 'btn btn-primary', target: '_blank')
+
+  - if (resource.user_cpd_required? == false || resource.user_cpd_completed?)
+
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :current_step
+
+      = f.submit 'Save and Continue', center: true

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

@@ -2,7 +2,8 @@
   - if resource.was_exemption_requested?
     = render('effective/cpd_audits/exemption', cpd_audit: resource, step: :exemption)
 
-  %p The deadline to request an exemption is: #{resource.deadline_to_exemption.strftime('%F')}.
+  - if resource.deadline_to_exemption.present?
+    %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|
     = f.hidden_field :current_step

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

@@ -2,7 +2,8 @@
   - if resource.was_extension_requested?
     = render('effective/cpd_audits/extension', cpd_audit: resource, step: :extension)
 
-  %p The deadline to request an extension is: #{resource.deadline_to_extension.strftime('%F')}.
+  - if resource.deadline_to_extension.present?
+    %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|
     = f.hidden_field :current_step

data/app/views/effective/cpd_statement_activities/_cpd_statement_activity.html.haml

@@ -24,12 +24,12 @@
           .col
             %strong= cpd_activity.amount_label
             %br
-            = cpd_statement_activity.amount
+            = cpd_score(cpd_statement_activity.amount)
 
         - if cpd_activity.amount2_label.present?
           .col.text-center
             %strong= cpd_activity.amount2_label
-            = cpd_statement_activity.amount2
+            = cpd_score(cpd_statement_activity.amount2)
 
         - if cpd_activity.amount_static?
           .col
@@ -43,14 +43,14 @@
           %strong= cpd_credits_label.titleize
           %br
           - if cpd_statement_activity.reduced_messages.present?
-            %span{title: cpd_statement_activity.reduced_messages.values.join("\n\n")}= "#{cpd_statement_activity.score} *"
+            %span{title: cpd_statement_activity.reduced_messages.values.join("\n\n")}= "#{cpd_score(cpd_statement_activity.score)} *"
           - else
-            = cpd_statement_activity.score.to_i
+            = cpd_score(cpd_statement_activity.score)
 
         .col.text-center
           %strong Carry
           %br
-          = cpd_statement_activity.carry_forward.to_i
+          = cpd_score(cpd_statement_activity.carry_forward)
 
   - if cpd_statement_activity.files.present?
     %p

data/app/views/effective/cpd_statement_activities/_form.html.haml

@@ -28,23 +28,23 @@
         %strong= cpd_credits_label.titleize
         %br
         - if f.object.reduced_messages.present?
-          %span{title: f.object.reduced_messages.values.join("\n\n")}= "#{f.object.score} *"
+          %span{title: f.object.reduced_messages.values.join("\n\n")}= "#{cpd_score(f.object.score)} *"
         - else
-          = f.object.score.to_i
+          = cpd_score(f.object.score)
 
     .col-2.text-center
       - if f.object.persisted?
         %strong Carry Forward
         %br
-        = f.object.carry_forward.to_i
+        = cpd_score(f.object.carry_forward)
 
   .row
     .col
       - if activity.amount_label.present?
-        = f.number_field :amount, label: activity.amount_label, required: true
+        = f.float_field :amount, label: activity.amount_label, required: true
 
       - if activity.amount2_label.present?
-        = f.number_field :amount2, label: activity.amount2_label, required: true
+        = f.float_field :amount2, label: activity.amount2_label, required: true
 
       - if activity.amount_static?
         = f.hidden_field :amount, value: 1

data/app/views/effective/cpd_statements/_activities_new.html.haml

@@ -12,7 +12,7 @@
       %h3
         #{category}
         %small
-          = cpd_statement.score_per_category[category.id].to_i
+          = cpd_score(cpd_statement.score_per_category[category.id])
           - if rule.max_credits_per_cycle.present?
             = '/'
             = rule.max_credits_per_cycle

data/app/views/effective/cpd_statements/_activities_table.html.haml

@@ -16,7 +16,7 @@
       %h3
         #{category}
         %small
-          = cpd_statement.score_per_category[category.id].to_i
+          = cpd_score(cpd_statement.score_per_category[category.id])
           - if rule.max_credits_per_cycle.present?
             = '/'
             = rule.max_credits_per_cycle
@@ -41,12 +41,12 @@
 
             .col-2.score
               - if statement_activity.reduced_messages.present?
-                %span{title: statement_activity.reduced_messages.values.join("\n\n")}= "#{statement_activity.score} *"
+                %span{title: statement_activity.reduced_messages.values.join("\n\n")}= "#{cpd_score(statement_activity.score)} *"
               - else
-                = statement_activity.score.to_i
+                = cpd_score(statement_activity.score)
 
             .col-2.carry-forward
-              = statement_activity.carry_forward.to_i
+              = cpd_score(statement_activity.carry_forward)
 
           .statement-activity-form.row{style: 'display: none;'}
             .col
@@ -59,6 +59,6 @@
     .col-8
       %h4 Total #{cpd_credits_label} in statement
     .col-2.score
-      %h4= cpd_statement.score.to_i
+      %h4= cpd_score(cpd_statement.score)
     .col-2.carry-forward
-      %h4= cpd_statement.carry_forward.to_i
+      %h4= cpd_score(cpd_statement.carry_forward)

data/app/views/effective/cpd_statements/_layout.html.haml

@@ -19,14 +19,14 @@
 
         %tr
           %td
-            %h4= resource.score.to_i
+            %h4= cpd_score(resource.score.to_d)
 
           %td
-            #{cpd_credits_label} out of #{resource.required_score} required
+            #{cpd_credits_label} out of #{resource.required_score.to_i} required
 
         %tr
           %td
-            %h4= last_3_scores.to_i
+            %h4= cpd_score(last_3_scores.to_d)
 
           %td #{cpd_credits_label} in last 3 #{cpd_cycles_label} (including this #{cpd_cycle_label})
 

data/app/views/effective/cpd_statements/_summary.html.haml

@@ -24,8 +24,8 @@
 
       %tr
         %th Total #{cpd_credits_label.titleize}
-        %td= cpd_statement.score
+        %td= cpd_score(cpd_statement.score)
 
       %tr
         %th Carry Forward
-        %td= cpd_statement.carry_forward
+        %td= cpd_score(cpd_statement.carry_forward)

data/config/effective_cpd.rb

@@ -42,27 +42,21 @@ EffectiveCpd.setup do |config|
   # Audit Reviewer Scope Collection
   config.audit_reviewer_user_scope = :all
 
-  # Mailer Configuration
+  # Mailer Settings
+  # Please see config/initializers/effective_resources.rb for default effective_* gem mailer settings
+  #
   # Configure the class responsible to send e-mails.
-  # config.mailer = 'Effective::CpdMailer'
-
-  # Configure the parent class responsible to send e-mails.
-  # config.parent_mailer = 'ActionMailer::Base'
-
-  # Default deliver method
-  # config.deliver_method = :deliver_later
-
-  # Default layout
-  config.mailer_layout = 'effective_cpd_mailer_layout'
-
-  # Default From
-  config.mailer_sender = "no-reply@example.com"
-
-  # Send Admin correspondence To
-  config.mailer_admin = "admin@example.com"
-
-  # Will work with effective_email_templates gem:
-  # - The audit and audit review email content will be preopulated based off the template
-  # - Uses an EmailTemplatesMailer mailer instead of ActionMailer::Base for default parent_mailer
-  config.use_effective_email_templates = false
+  # config.mailer = 'Effective::EventsMailer'
+  #
+  # Override effective_resource mailer defaults
+  #
+  # config.parent_mailer = nil      # The parent class responsible for sending emails
+  # config.deliver_method = nil     # The deliver method, deliver_later or deliver_now
+  # config.mailer_layout = nil      # Default mailer layout
+  # config.mailer_sender = nil      # Default From value
+  # config.mailer_admin = nil       # Default To value for Admin correspondence
+  # config.mailer_subject = nil     # Proc.new method used to customize Subject
+
+  # Use effective email templates for event notifications
+  config.use_effective_email_templates = true
 end

data/config/routes.rb

@@ -41,7 +41,7 @@ EffectiveCpd::Engine.routes.draw do
     resources :cpd_audit_levels, except: [:show]
     resources :cpd_audit_level_questions, except: [:show]
 
-    resources :cpd_audits, except: [:show, :destroy]
+    resources :cpd_audits, except: [:show]
     resources :cpd_audit_reviews
   end
 

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

@@ -75,14 +75,14 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
       t.references :cpd_category
       t.references :original
 
-      t.integer :amount
-      t.integer :amount2
+      t.decimal :amount, precision: 10, scale: 2
+      t.decimal :amount2, precision: 10, scale: 2
 
       t.text :description
 
-      t.integer :carry_over
-      t.integer :score
-      t.integer :carry_forward
+      t.decimal :carry_over, precision: 10, scale: 2
+      t.decimal :score, precision: 10, scale: 2
+      t.decimal :carry_forward, precision: 10, scale: 2
 
       t.text :reduced_messages
 
@@ -98,7 +98,7 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
 
       t.string :token
 
-      t.integer :score
+      t.decimal :score, precision: 10, scale: 2
 
       t.boolean :confirm_read
       t.boolean :confirm_factual

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '0.1.19'
+  VERSION = '0.3.0'
 end

data/lib/effective_cpd.rb

@@ -15,43 +15,14 @@ module EffectiveCpd
       :cpd_audits_table_name, :cpd_audit_responses_table_name, :cpd_audit_response_options_table_name,
       :cpd_audit_reviews_table_name, :cpd_audit_review_items_table_name,
       :cycle_label, :credit_label, :layout, :auditee_user_scope, :audit_reviewer_user_scope,
-      :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :use_effective_email_templates
+      :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject, :use_effective_email_templates
     ]
   end
 
   include EffectiveGem
 
   def self.mailer_class
-    return mailer.constantize if mailer.present?
-    Effective::CpdMailer
-  end
-
-  def self.parent_mailer_class
-    return parent_mailer.constantize if parent_mailer.present?
-
-    if use_effective_email_templates
-      require 'effective_email_templates'
-      Effective::EmailTemplatesMailer
-    else
-      ActionMailer::Base
-    end
-  end
-
-  def self.send_email(email, *args)
-    raise('expected args to be an Array') unless args.kind_of?(Array)
-
-    if defined?(Tenant)
-      tenant = Tenant.current || raise('expected a current tenant')
-      args << { tenant: tenant }
-    end
-
-    deliver_method = EffectiveCpd.deliver_method || EffectiveResources.deliver_method
-
-    begin
-      EffectiveCpd.mailer_class.send(email, *args).send(deliver_method)
-    rescue => e
-      raise if Rails.env.development? || Rails.env.test?
-    end
+    mailer&.constantize || Effective::CpdMailer
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.3.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-17 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -311,6 +311,7 @@ files:
 - app/views/effective/cpd_audit_reviews/submit.html.haml
 - app/views/effective/cpd_audit_reviews/waiting.html.haml
 - app/views/effective/cpd_audits/_conflict.html.haml
+- app/views/effective/cpd_audits/_cpd.html.haml
 - app/views/effective/cpd_audits/_cpd_audit.html.haml
 - app/views/effective/cpd_audits/_cpd_audit_level_section.html.haml
 - app/views/effective/cpd_audits/_exemption.html.haml
@@ -321,6 +322,7 @@ files:
 - app/views/effective/cpd_audits/_waiting.html.haml
 - app/views/effective/cpd_audits/complete.html.haml
 - app/views/effective/cpd_audits/conflict.html.haml
+- app/views/effective/cpd_audits/cpd.html.haml
 - app/views/effective/cpd_audits/cpd_audit_level_section.html.haml
 - app/views/effective/cpd_audits/exemption.html.haml
 - app/views/effective/cpd_audits/extension.html.haml
@@ -362,7 +364,6 @@ files:
 - app/views/effective/cpd_statements/complete.html.haml
 - app/views/effective/cpd_statements/start.html.haml
 - app/views/effective/cpd_statements/submit.html.haml
-- app/views/layouts/effective_cpd_mailer_layout.html.haml
 - config/effective_cpd.rb
 - config/routes.rb
 - db/migrate/01_create_effective_cpd.rb.erb

data/app/views/layouts/effective_cpd_mailer_layout.html.haml

@@ -1,7 +0,0 @@
-!!!
-%html{style: 'background: #fff;'}
-  %head
-    %meta{:content => 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type'}
-
-  %body{style: 'background: #fff;'}
-    = yield