effective_cpd 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80e098e09ddea7dbc4d43707500e647e1795dd750b63f6e21ac44512a430fbcb
-  data.tar.gz: 72590ba94aa5535c8431afb6bcd4a4ef1b4a90be5f21f120914c94dbcfbe4cd0
+  metadata.gz: 86cc744bca079efc7c8980e61f35d8200c4b01efbc309481ad50bf9ffa8d885c
+  data.tar.gz: bd79c194bc5b49fa01777fd43e7cd6a9efd029b17ca70793ce54059a26656ac1
 SHA512:
-  metadata.gz: b3b459b4701245f5953e2ce0d01135dbc19e8d5587ba0a7e1b2e9de94897ae7c59e940b7bd8b3ad364e2bd1c8b78c617f83da2ffa075cb8e4fc19670d6b94f18
-  data.tar.gz: 238cc81c30a48006ca4e4886cdd654add4b322dd3bd612e5186e0b6fb15bb50a24639fa434639ca32d86506ef165a369ab22435f60d17c7a2e255f643975e42e
+  metadata.gz: b014a09d8642a8e61c82887ffd511883203b2c5bc06db5eaefd60765c17b2275b944e1d591dce8d0db2197c568f7f9ee4f276bcc7f175c99a0ced075542b07d7
+  data.tar.gz: bfd0c5a9a54df1b62de4c9345da508a9126ca2271480677bb8304b32b5d79085eca22a0c0502d8d56e496b7c88b845c00b59f287a378a2940c1208a1cc6cdc05

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

@@ -1,22 +1,23 @@
 = render('layout') do
-  - raise('expected a submitted cpd_audit') unless resource.was_submitted?
+  - raise('expected a submitted cpd_audit') unless resource.was_submitted? || resource.closed?
 
-  .text-center
-    .row
-      .col-2
-      .col-8
-        .alert.alert-success Audit Submitted!
+  - if resource.was_submitted?
+    .text-center
+      .row
+        .col-2
+        .col-8
+          .alert.alert-success Audit Submitted!
 
-  %p
-    The following audit was successfully submitted at
-    = succeed('.') do
-      = resource.submitted_at.strftime('%F')
+    %p
+      The following audit was successfully submitted at
+      = succeed('.') do
+        = resource.submitted_at.strftime('%F')
 
-    - unless resource.determination.present?
-      Your audit must be reviewed and a final determination made.
-      We will send
-      %strong= resource.user.email
-      an email notifying you of the determination.
+      - unless resource.determination.present?
+        Your audit must be reviewed and a final determination made.
+        We will send
+        %strong= resource.user.email
+        an email notifying you of the determination.
 
   .mb-4= render(resource)
 

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/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/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '0.2.0'
+  VERSION = '0.3.1'
 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.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-05 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