effective_cpd 0.6.8 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad66762dab7f12d782284fec08de4d8346ce61a8ef4404ef3dc5500b4a8fca1f
-  data.tar.gz: d5b215d2d01940ed502ecf6cce06ff829f94defedb0ba55a8108c9525dcd01b3
+  metadata.gz: ce8f5f1c83904eecbd1cc49e84720ec7ed6d51aa39773354666b0e07e9bda56a
+  data.tar.gz: 3a69c509409f5d33427f19c223a4803d8b1a8a49aa1d8e9addc03ee4f16cefce
 SHA512:
-  metadata.gz: 39749020879a1a6cb8b79860dd59658541d967968d115bc80d8074d85e269e7d915807eaaf89c31c207b40b6b5337153581296badf6c3722315d19383bc2e5e9
-  data.tar.gz: 561847197e10cc191b670d13564539b21c5b152e51c005843e6c41723da3b737cf639c320608a15c7735168b2b409d5a5c69cb4a81f870c0338d3b510639609a
+  metadata.gz: 0dfbe56c0a27a8743663d3ae374a62c1f0c674d46b189a2636b144d8f3bfe12c1ccc19fd8163e63d0b92010aeedc8b62856a5f87558ce231842093279b2404d3
+  data.tar.gz: '0864c315be7007b31a19dc76b934618ffd6bf678f547a063d9e6bdd0c62b491b13fccf62b264a69dadb7652cd527bdc27e3a1832bc0aa6fd798a2105feef7bbf'

data/app/controllers/admin/cpd_audit_levels_controller.rb

@@ -5,8 +5,14 @@ module Admin
 
     include Effective::CrudController
 
+    resource_scope -> { EffectiveCpd.CpdAuditLevel.deep.all }
+    datatable -> { EffectiveResources.best('Admin::EffectiveCpdAuditLevelsDatatable').new }
+
+    private
+
     def permitted_params
-      params.require(:effective_cpd_audit_level).permit!
+      model = (params.key?(:effective_cpd_audit_level) ? :effective_cpd_audit_level : :cpd_audit_level)
+      params.require(model).permit!
     end
 
   end

data/app/controllers/admin/cpd_audit_reviews_controller.rb

@@ -5,8 +5,14 @@ module Admin
 
     include Effective::CrudController
 
+    resource_scope -> { EffectiveCpd.CpdAuditReview.deep.all }
+    datatable -> { EffectiveResources.best('Admin::EffectiveCpdAuditReviewsDatatable').new }
+
+    private
+
     def permitted_params
-      params.require(:effective_cpd_audit_review).permit!
+      model = (params.key?(:effective_cpd_audit_review) ? :effective_cpd_audit_review : :cpd_audit_review)
+      params.require(model).permit!
     end
 
   end

data/app/controllers/admin/cpd_audits_controller.rb

@@ -5,6 +5,9 @@ module Admin
 
     include Effective::CrudController
 
+    resource_scope -> { EffectiveCpd.CpdAudit.deep.all }
+    datatable -> { EffectiveResources.best('Admin::EffectiveCpdAuditsDatatable').new }
+
     submit :resolve_conflict, 'Resolve Conflict of Interest', success: -> {
       [
         "Successfully resolved #{resource}",
@@ -33,8 +36,25 @@ module Admin
       ].compact.join(' ')
     }
 
+    submit :complete, 'Complete Audit', success: -> {
+      [
+        "Successfully completed #{resource}",
+        ("and sent reviewers an audit ready notification" unless resource.email_form_skip)
+      ].compact.join(' ')
+    }
+
+    submit :missing, 'Missing Info', success: -> {
+      [
+        "Successfully marked #{resource} as missing info",
+        ("and sent #{resource.user.email} a notification" unless resource.email_form_skip)
+      ].compact.join(' ')
+    }
+
+    private
+
     def permitted_params
-      params.require(:effective_cpd_audit).permit!
+      model = (params.key?(:effective_cpd_audit) ? :effective_cpd_audit : :cpd_audit)
+      params.require(model).permit!
     end
 
   end

data/app/controllers/admin/cpd_statements_controller.rb

@@ -6,7 +6,7 @@ module Admin
     include Effective::CrudController
 
     resource_scope -> { EffectiveCpd.CpdStatement.deep.all }
-    datatable -> { Admin::EffectiveCpdStatementsDatatable.new }
+    datatable -> { EffectiveResources.best('Admin::EffectiveCpdStatementsDatatable').new }
 
     page_title(only: :index) { "#{EffectiveCpd.program_label} Statements" }
 

data/app/controllers/effective/cpd_audit_reviews_controller.rb

@@ -5,56 +5,20 @@ module Effective
     include Effective::WizardController
 
     resource_scope do
-      Effective::CpdAuditReview.deep.where(user: current_user)
+      EffectiveCpd.CpdAuditReview.deep.where(user: current_user)
     end
 
     # Reuse the same view for all cpd_audit_level_section steps
     # https://github.com/zombocom/wicked/blob/v1.3.4/lib/wicked/controller/concerns/render_redirect.rb#L32
     def render_step(the_step, options = {}, params = {})
       if resource.dynamic_wizard_statement_steps.keys.include?(the_step)
-        render('cpd_statement', options)
+        render('effective/cpd_audit_reviews/cpd_statement', options)
       elsif resource.dynamic_wizard_questionnaire_steps.keys.include?(the_step)
-        render('cpd_audit_level_section', options)
+        render('effective/cpd_audit_reviews/cpd_audit_level_section', options)
       else
         super
       end
     end
 
-    def permitted_params
-      case step
-      when :start
-        params.require(:effective_cpd_audit_review).permit(:current_step, :comments)
-      when :information
-        params.require(:effective_cpd_audit_review).permit(:current_step, :comments)
-      when :instructions
-        params.require(:effective_cpd_audit_review).permit(:current_step, :comments)
-      when :conflict
-        params.require(:effective_cpd_audit_review)
-          .permit(:current_step, :comments, :conflict_of_interest, :conflict_of_interest_reason)
-      when :statements
-        params.require(:effective_cpd_audit_review).permit(:current_step, :comments)
-      when :questionnaire
-        params.require(:effective_cpd_audit_review).permit(:current_step, :comments)
-      when :recommendation
-        params.require(:effective_cpd_audit_review).permit(:current_step, :comments, :recommendation)
-      when :submit
-        params.require(:effective_cpd_audit_review).permit(:current_step)
-      when :complete
-        raise('unexpected post to complete')
-      else
-        if step.to_s.start_with?('statement')
-          params.require(:effective_cpd_audit_review).permit(:current_step, :comments,
-            cpd_audit_review_items_attributes: [:id, :item_id, :item_type, :recommendation, :comments]
-          )
-        elsif step.to_s.start_with?('section')
-          params.require(:effective_cpd_audit_review).permit(:current_step, :comments,
-            cpd_audit_review_items_attributes: [:id, :item_id, :item_type, :recommendation, :comments]
-          )
-        else
-          raise('unexpected step')
-        end
-      end
-    end
-
   end
 end

data/app/controllers/effective/cpd_audits_controller.rb

@@ -4,9 +4,9 @@ module Effective
 
     include Effective::WizardController
 
-    resource_scope do
-      Effective::CpdAudit.deep.where(user: current_user)
-    end
+    resource_scope -> { EffectiveCpd.CpdAudit.deep.where(user: current_user) }
+
+    submit :resubmit, 'Resubmit Audit'
 
     # Reuse the same view for all cpd_audit_level_section steps
     # https://github.com/zombocom/wicked/blob/v1.3.4/lib/wicked/controller/concerns/render_redirect.rb#L32
@@ -15,43 +15,5 @@ module Effective
       render('cpd_audit_level_section', options)
     end
 
-    def permitted_params
-      case step
-      when :start
-        params.require(:effective_cpd_audit).permit(:current_step)
-      when :information
-        params.require(:effective_cpd_audit).permit(:current_step)
-      when :instructions
-        params.require(:effective_cpd_audit).permit(:current_step)
-      when :conflict
-        params.require(:effective_cpd_audit)
-          .permit(:current_step, :conflict_of_interest, :conflict_of_interest_reason)
-      when :exemption
-        params.require(:effective_cpd_audit)
-          .permit(:current_step, :exemption_request, :exemption_request_reason)
-      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
-        params.require(:effective_cpd_audit).permit(:current_step, files: [])
-      when :submit
-        params.require(:effective_cpd_audit).permit(:current_step)
-      when :complete
-        raise('unexpected post to complete')
-      else
-        raise('unexpected step') unless step.to_s.start_with?('section')
-
-        params.require(:effective_cpd_audit).permit(:current_step,
-          cpd_audit_responses_attributes: [
-            :id, :cpd_audit_id, :cpd_audit_level_question_id, :date, :email, :number, :long_answer, :short_answer, :upload_file, cpd_audit_level_question_option_ids: []
-          ]
-        )
-      end
-    end
-
   end
 end

data/app/datatables/admin/effective_cpd_audit_levels_datatable.rb

@@ -28,7 +28,7 @@ module Admin
     end
 
     collection do
-      Effective::CpdAuditLevel.all.deep
+      EffectiveCpd.CpdAuditLevel.all.deep
     end
   end
 end

data/app/datatables/admin/effective_cpd_audit_reviews_datatable.rb

@@ -12,10 +12,12 @@ module Admin
       col :id, visible: false
 
       col :cpd_audit
+      col :cpd_audit_level, search: EffectiveCpd.CpdAuditLevel.all.sorted
 
       col :auditee do |cpd_audit_review|
         user = cpd_audit_review.cpd_audit.user
-        link_to(user, edit_admin_user_path(user))
+        url = "/admin/users/#{user.to_param}/edit"
+        link_to(user, url)
       end
 
       col :user, label: 'Audit Reviewer'
@@ -30,7 +32,7 @@ module Admin
     end
 
     collection do
-      Effective::CpdAuditReview.all.deep
+      EffectiveCpd.CpdAuditReview.all.deep
     end
   end
 end

data/app/datatables/admin/effective_cpd_audits_datatable.rb

@@ -1,41 +1,41 @@
 module Admin
   class EffectiveCpdAuditsDatatable < Effective::Datatable
+
     filters do
       scope :all
       scope :available, label: 'In Progress'
-      scope :completed
+      scope :done
       scope :waiting_on_admin
       scope :waiting_on_auditee
       scope :waiting_on_reviewers
     end
 
     datatable do
+      order :updated_at
+
       col :id, visible: false
       col :created_at, visible: false
       col :updated_at, visible: false
 
       col :token, visible: false
 
-      col :cpd_audit_level, label: 'Audit Level'
+      col :cpd_audit_level, label: 'Audit Level', search: EffectiveCpd.CpdAuditLevel.sorted.all
 
       col :user, search: :string, label: 'Auditee'
 
       col(:cpd_audit_reviews, label: 'Auditor Reviewers', search: :string) do |cpd_audit|
         cpd_audit.cpd_audit_reviews.map(&:user).map do |user|
           content_tag(:div, class: 'col-resource_item') do
-            if view.respond_to?(:edit_admin_user_path)
-              link_to(user.to_s, edit_admin_user_path(user))
-            else
-              user.to_s
-            end
+            url = view.respond_to?(:edit_admin_user_path) ? edit_admin_user_path(user) : "/admin/users/#{user.to_param}/edit"
+            link_to(user.to_s, url)
           end
         end.join.html_safe
       end.search do |collection, term, column, sql_column|
-        user_klass = Effective::CpdAudit.first.user&.class
+        user_klass = EffectiveCpd.CpdAudit.first.user&.class
 
         if user_klass.present?
           users = Effective::Resource.new(user_klass).search_any(term)
-          cpd_audit_reviews = Effective::CpdAuditReview.where(user_id: users)
+          cpd_audit_reviews = EffectiveCpd.CpdAuditReview.where(user_id: users)
           collection.where(id: cpd_audit_reviews.select('cpd_audit_id AS id'))
         else
           collection.where(id: nil)
@@ -90,11 +90,13 @@ module Admin
       col :extension_request_date, visible: false
       col :extension_request_reason, visible: false
 
+      col :files, visible: false
+
       actions_col
     end
 
     collection do
-      Effective::CpdAudit.all.deep
+      EffectiveCpd.CpdAudit.all.deep
     end
   end
 end

data/app/datatables/effective_cpd_available_audit_reviews_datatable.rb

@@ -8,10 +8,10 @@ class EffectiveCpdAvailableAuditReviewsDatatable < Effective::Datatable
 
     col :cpd_audit_level, label: 'Audit'
     col :due_date
-    col :user, label: 'Auditee', action: false
+    col :name, label: 'Auditee', action: false
 
     col :ready_to_review do |cpd_audit|
-      cpd_audit.was_submitted? ? 'Yes' : 'No'
+      cpd_audit.ready_to_review? ? 'Yes' : 'No'
     end
 
     actions_col(actions: []) do |cpd_audit|
@@ -28,9 +28,9 @@ class EffectiveCpdAvailableAuditReviewsDatatable < Effective::Datatable
   collection do
     raise('expected a current_user') unless current_user.present?
 
-    reviews = Effective::CpdAuditReview.available.where(user: current_user)
+    reviews = EffectiveCpd.CpdAuditReview.available.where(user: current_user)
 
-    Effective::CpdAudit.available.includes(:cpd_audit_reviews)
+    EffectiveCpd.CpdAudit.available.includes(:cpd_audit_reviews)
       .where(id: reviews.select('cpd_audit_id as id'))
   end
 

data/app/datatables/effective_cpd_available_audits_datatable.rb

@@ -24,7 +24,7 @@ class EffectiveCpdAvailableAuditsDatatable < Effective::Datatable
 
   collection do
     raise('expected a current_user') unless current_user.present?
-    Effective::CpdAudit.available.where(user: current_user)
+    EffectiveCpd.CpdAudit.available.where(user: current_user)
   end
 
 end

data/app/datatables/effective_cpd_completed_audit_reviews_datatable.rb

@@ -8,7 +8,7 @@ class EffectiveCpdCompletedAuditReviewsDatatable < Effective::Datatable
 
     col :cpd_audit_level, label: 'Audit'
     col :notification_date, label: 'Date of Notification'
-    col :user, label: 'Auditee', action: false
+    col :name, label: 'Auditee', action: false
 
     col :recommendation do |cpd_audit|
       cpd_audit.cpd_audit_reviews.find { |r| r.user_id == current_user.id }.recommendation
@@ -23,9 +23,9 @@ class EffectiveCpdCompletedAuditReviewsDatatable < Effective::Datatable
   collection do
     raise('expected a current_user') unless current_user.present?
 
-    reviews = Effective::CpdAuditReview.completed.where(user: current_user)
+    reviews = EffectiveCpd.CpdAuditReview.completed.where(user: current_user)
 
-    Effective::CpdAudit.includes(:cpd_audit_reviews)
+    EffectiveCpd.CpdAudit.includes(:cpd_audit_reviews)
       .where(id: reviews.select('cpd_audit_id as id'))
   end
 

data/app/datatables/effective_cpd_completed_audits_datatable.rb

@@ -12,13 +12,13 @@ class EffectiveCpdCompletedAuditsDatatable < Effective::Datatable
     col :determination
 
     actions_col(actions: []) do |cpd_audit|
-      dropdown_link_to('Show', effective_cpd.cpd_audit_build_path(cpd_audit, cpd_audit.last_completed_step))
+      dropdown_link_to('Show', effective_cpd.cpd_audit_build_path(cpd_audit, cpd_audit.last_completed_step || :start))
     end
   end
 
   collection do
     raise('expected a current_user') unless current_user.present?
-    Effective::CpdAudit.completed.where(user: current_user)
+    EffectiveCpd.CpdAudit.completed.where(user: current_user)
   end
 
 end

data/app/helpers/effective_cpd_audits_helper.rb

@@ -12,37 +12,5 @@ module EffectiveCpdAuditsHelper
     [['Yes, I would like to request an extension', true], ['No extension request', false]]
   end
 
-  def cpd_audit_summary_text(cpd_audit)
-    case cpd_audit.status
-    when 'opened'
-      "The audit has been opened. The auditee and audit reviewers have been notified. Waiting for the auditee to submit their audit questionnaire."
-    when 'started'
-      "The auditee has begun their audit questionnaire. Waiting for the auditee to submit their audit questionnaire."
-    when 'conflicted'
-      "The auditee has declared a conflict of interest. Waiting for a new reviewer to be assigned or otherwise resolved."
-    when 'conflicted_resolved'
-      "The auditee had declared a conflict of interest. This has been resolved. Waiting for the auditee to submit their audit questionnaire."
-    when 'exemption_requested'
-      "The auditee has requested an exemption. Waiting for request to be granted or denied."
-    when 'exemption_granted'
-      "The exemption request has been granted. This audit may now be closed."
-    when 'exemption_denied'
-      "The exemption request has been denied. The audit will continue. Waiting for the auditee to submit their audit questionnaire."
-    when 'extension_requested'
-      "The auditee has requested an extension. Waiting for request to be granted or denied."
-    when 'extension_granted'
-      "The extension request has been granted. There is a new deadline. Waiting for the auditee to submit their audit questionnaire."
-    when 'extension_denied'
-      "The extension request has been denied. The deadline remains. Waiting for the auditee to submit their audit questionnaire."
-    when 'submitted'
-      "The auditee has submitted their audit questionnaire. Waiting on review."
-    when 'reviewed'
-      "The audit has been reviewed and is ready for the final determination to be made."
-    when 'closed'
-      "This audit has been closed with a final determination. All done."
-    else
-      raise("unexpected cpd audit status: #{cpd_audit.status}")
-    end
-  end
 
 end

data/app/mailers/effective/cpd_mailer.rb

@@ -6,7 +6,7 @@ module Effective
 
     # CPD Audit
     def cpd_audit_opened(resource, opts = {})
-      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
+      raise('expected an EffectiveCpd.CpdAudit') unless resource.kind_of?(EffectiveCpd.CpdAudit)
 
       @assigns = assigns_for(resource).merge(url: effective_cpd.cpd_audit_url(resource))
       @cpd_audit = resource
@@ -18,7 +18,7 @@ module Effective
     end
 
     def cpd_audit_conflicted(resource, opts = {})
-      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
+      raise('expected an EffectiveCpd.CpdAudit') unless resource.kind_of?(EffectiveCpd.CpdAudit)
 
       @assigns = assigns_for(resource).merge(url: effective_cpd.edit_admin_cpd_audit_url(resource))
       @cpd_audit = resource
@@ -30,7 +30,7 @@ module Effective
     end
 
     def cpd_audit_conflict_resolved(resource, opts = {})
-      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
+      raise('expected an EffectiveCpd.CpdAudit') unless resource.kind_of?(EffectiveCpd.CpdAudit)
 
       @assigns = assigns_for(resource).merge(url: effective_cpd.cpd_audit_url(resource))
       @cpd_audit = resource
@@ -42,7 +42,7 @@ module Effective
     end
 
     def cpd_audit_exemption_request(resource, opts = {})
-      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
+      raise('expected an EffectiveCpd.CpdAudit') unless resource.kind_of?(EffectiveCpd.CpdAudit)
 
       @assigns = assigns_for(resource).merge(url: effective_cpd.edit_admin_cpd_audit_url(resource))
       @cpd_audit = resource
@@ -54,7 +54,7 @@ module Effective
     end
 
     def cpd_audit_exemption_denied(resource, opts = {})
-      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
+      raise('expected an EffectiveCpd.CpdAudit') unless resource.kind_of?(EffectiveCpd.CpdAudit)
 
       @assigns = assigns_for(resource).merge(url: effective_cpd.cpd_audit_url(resource))
       @cpd_audit = resource
@@ -66,7 +66,7 @@ module Effective
     end
 
     def cpd_audit_exemption_granted(resource, opts = {})
-      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
+      raise('expected an EffectiveCpd.CpdAudit') unless resource.kind_of?(EffectiveCpd.CpdAudit)
 
       @assigns = assigns_for(resource).merge(url: effective_cpd.cpd_audit_url(resource))
       @cpd_audit = resource
@@ -78,7 +78,7 @@ module Effective
     end
 
     def cpd_audit_extension_request(resource, opts = {})
-      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
+      raise('expected an EffectiveCpd.CpdAudit') unless resource.kind_of?(EffectiveCpd.CpdAudit)
 
       @assigns = assigns_for(resource).merge(url: effective_cpd.edit_admin_cpd_audit_url(resource))
       @cpd_audit = resource
@@ -90,7 +90,7 @@ module Effective
     end
 
     def cpd_audit_extension_denied(resource, opts = {})
-      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
+      raise('expected an EffectiveCpd.CpdAudit') unless resource.kind_of?(EffectiveCpd.CpdAudit)
 
       @assigns = assigns_for(resource).merge(url: effective_cpd.cpd_audit_url(resource))
       @cpd_audit = resource
@@ -102,7 +102,7 @@ module Effective
     end
 
     def cpd_audit_extension_granted(resource, opts = {})
-      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
+      raise('expected an EffectiveCpd.CpdAudit') unless resource.kind_of?(EffectiveCpd.CpdAudit)
 
       @assigns = assigns_for(resource).merge(url: effective_cpd.cpd_audit_url(resource))
       @cpd_audit = resource
@@ -114,7 +114,7 @@ module Effective
     end
 
     def cpd_audit_submitted(resource, opts = {})
-      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
+      raise('expected an EffectiveCpd.CpdAudit') unless resource.kind_of?(EffectiveCpd.CpdAudit)
 
       @assigns = assigns_for(resource).merge(url: effective_cpd.edit_admin_cpd_audit_url(resource))
       @cpd_audit = resource
@@ -125,8 +125,20 @@ module Effective
       mail(to: mailer_admin, subject: subject, **headers)
     end
 
+    def cpd_audit_missing_info(resource, opts = {})
+      raise('expected an EffectiveCpd.CpdAudit') unless resource.kind_of?(EffectiveCpd.CpdAudit)
+
+      @assigns = assigns_for(resource).merge(url: effective_cpd.cpd_audit_url(resource))
+      @cpd_audit = resource
+
+      subject = subject_for(__method__, 'CPD Audit Missing Info', resource, opts)
+      headers = headers_for(resource, opts)
+
+      mail(to: resource.user.email, subject: subject, **headers)
+    end
+
     def cpd_audit_reviewed(resource, opts = {})
-      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
+      raise('expected an EffectiveCpd.CpdAudit') unless resource.kind_of?(EffectiveCpd.CpdAudit)
 
       @assigns = assigns_for(resource).merge(url: effective_cpd.edit_admin_cpd_audit_url(resource))
       @cpd_audit = resource
@@ -138,7 +150,7 @@ module Effective
     end
 
     def cpd_audit_closed(resource, opts = {})
-      raise('expected an Effective::CpdAudit') unless resource.kind_of?(Effective::CpdAudit)
+      raise('expected an EffectiveCpd.CpdAudit') unless resource.kind_of?(EffectiveCpd.CpdAudit)
 
       @assigns = assigns_for(resource).merge(url: effective_cpd.cpd_audit_url(resource))
       @cpd_audit = resource
@@ -151,7 +163,7 @@ module Effective
 
     # CPD Audit Review
     def cpd_audit_review_opened(resource, opts = {})
-      raise('expected an Effective::CpdAuditReview') unless resource.kind_of?(Effective::CpdAuditReview)
+      raise('expected an EffectiveCpd.CpdAuditReview') unless resource.kind_of?(EffectiveCpd.CpdAuditReview)
 
       @assigns = assigns_for(resource).merge(url: effective_cpd.cpd_audit_review_url(resource))
       @cpd_audit_review = resource
@@ -163,7 +175,7 @@ module Effective
     end
 
     def cpd_audit_review_ready(resource, opts = {})
-      raise('expected an Effective::CpdAuditReview') unless resource.kind_of?(Effective::CpdAuditReview)
+      raise('expected an EffectiveCpd.CpdAuditReview') unless resource.kind_of?(EffectiveCpd.CpdAuditReview)
 
       @assigns = assigns_for(resource).merge(url: effective_cpd.cpd_audit_review_url(resource))
       @cpd_audit_review = resource
@@ -175,7 +187,7 @@ module Effective
     end
 
     def cpd_audit_review_submitted(resource, opts = {})
-      raise('expected an Effective::CpdAuditReview') unless resource.kind_of?(Effective::CpdAuditReview)
+      raise('expected an EffectiveCpd.CpdAuditReview') unless resource.kind_of?(EffectiveCpd.CpdAuditReview)
 
       @assigns = assigns_for(resource).merge(url: effective_cpd.edit_admin_cpd_audit_url(resource.cpd_audit))
       @cpd_audit_review = resource
@@ -189,12 +201,12 @@ module Effective
     protected
 
     def assigns_for(resource)
-      unless resource.kind_of?(Effective::CpdAudit) || resource.kind_of?(Effective::CpdAuditReview)
-        raise('expected an Effective::CpdAudit or Effective::CpdAuditReview')
+      unless resource.kind_of?(EffectiveCpd.CpdAudit) || resource.kind_of?(EffectiveCpd.CpdAuditReview)
+        raise('expected an EffectiveCpd.CpdAudit or EffectiveCpd.CpdAuditReview')
       end
 
-      @cpd_audit = (resource.kind_of?(Effective::CpdAudit) ? resource : resource.cpd_audit)
-      @cpd_audit_review = (resource if resource.kind_of?(Effective::CpdAuditReview))
+      @cpd_audit = (resource.kind_of?(EffectiveCpd.CpdAudit) ? resource : resource.cpd_audit)
+      @cpd_audit_review = (resource if resource.kind_of?(EffectiveCpd.CpdAuditReview))
 
       @auditee = @cpd_audit.user
       @reviewer = @cpd_audit_review.user if @cpd_audit_review.present?
@@ -203,11 +215,12 @@ module Effective
         audit: {
           title: @cpd_audit.to_s,
           level: @cpd_audit.cpd_audit_level.to_s,
-          determination: @cpd_audit.determination.to_s
+          determination: @cpd_audit.determination.to_s,
+          missing_info_reason: @cpd_audit.missing_info_reason.to_s
         },
         auditee: {
-          name: @auditee.to_s,
-          email: @auditee.email
+          name: @cpd_audit.name,
+          email: (@cpd_audit.user.email unless @cpd_audit.anonymous?).to_s
         }
       }
 
@@ -218,8 +231,8 @@ module Effective
             recommendation: @cpd_audit_review.recommendation.to_s
           },
           reviewer: {
-            name: @reviewer.to_s,
-            email: @reviewer.email
+            name: @cpd_audit_review.name,
+            email: (@cpd_audit_review.user.email unless @cpd_audit_review.anonymous?).to_s
           }
         }
       end