effective_cpd 0.6.8 → 1.1.0

data/app/models/effective/cpd_audit_review.rb

@@ -1,228 +1,5 @@
 module Effective
   class CpdAuditReview < ActiveRecord::Base
-    attr_accessor :current_user
-    attr_accessor :current_step
-
-    belongs_to :cpd_audit
-    belongs_to :cpd_audit_level
-    belongs_to :user, polymorphic: true    # Auditor
-
-    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)
-      log_changes(to: :cpd_audit, except: :wizard_steps)
-    end
-
-    acts_as_email_form
-    acts_as_tokened
-    acts_as_reportable if respond_to?(:acts_as_reportable)
-
-    acts_as_wizard(
-      start: 'Start',
-      information: 'Information',
-      instructions: 'Instructions',
-
-      # Optional based on cpd_audit_level options
-      conflict: 'Conflict of Interest',
-
-      waiting: 'Waiting on Auditee Submission',
-
-      statements: 'Review CPD Statements',
-      # ... There will be one step per cpd_statement here. "statement1"
-
-      questionnaire: 'Review Questionnaire Responses',
-      # ... There will be one step per cpd_audit_level_sections here
-
-      recommendation: 'Recommendation',
-      submit: 'Confirm & Submit',
-      complete: 'Complete'
-    )
-
-    effective_resource do
-      token                     :string
-      due_date                  :date
-
-      # Auditor response
-      conflict_of_interest          :boolean
-      conflict_of_interest_reason   :text
-
-      # Rolling comments
-      comments                  :text
-
-      # Recommendation Step
-      recommendation            :string
-
-      # Status Dates
-      submitted_at              :datetime
-
-      # acts_as_statused
-      # I'm not using acts_as_statused yet, but I probably will later
-      status                  :string
-      status_steps            :text
-
-      # Wizard Progress
-      wizard_steps              :text
-
-      timestamps
-    end
-
-    scope :deep, -> { includes(:cpd_audit, :cpd_audit_level, :user) }
-    scope :sorted, -> { order(:id) }
-
-    scope :available, -> { where(submitted_at: nil) }
-    scope :completed, -> { where.not(submitted_at: nil) }
-
-    # effective_reports
-    def reportable_scopes
-      { available: nil, completed: nil }
-    end
-
-    before_validation(if: -> { new_record? }) do
-      self.cpd_audit_level ||= cpd_audit&.cpd_audit_level
-      self.due_date ||= deadline_to_review()
-    end
-
-    validate(if: -> { recommendation.present? }) do
-      unless cpd_audit_level.recommendations.include?(recommendation)
-        self.errors.add(:recommendation, 'must exist in this audit level')
-      end
-    end
-
-    after_commit(on: :create) { send_email(:cpd_audit_review_opened) }
-    after_commit(on: :destroy) { cpd_audit.review! }
-
-    def to_s
-      'audit review'
-    end
-
-    def to_s
-      persisted? ? "#{cpd_audit_level} Audit Review by #{user}" : 'audit review'
-    end
-
-    # Find or build
-    def cpd_audit_review_item(item)
-      unless item.kind_of?(CpdAuditResponse) || item.kind_of?(CpdStatementActivity)
-        raise("expected a cpd_audit_response or cpd_statement_activity")
-      end
-
-      cpd_audit_review_item = cpd_audit_review_items.find { |cari| cari.item == item }
-      cpd_audit_review_item ||= cpd_audit_review_items.build(item: item)
-    end
-
-    # The dynamic CPD Statement review steps
-    def auditee_cpd_statements
-      cpd_audit.user.cpd_statements.select do |cpd_statement|
-        cpd_statement.completed? && (submitted_at.blank? || cpd_statement.submitted_at < submitted_at)
-      end
-    end
-
-    def cpd_statement(wizard_step)
-      cpd_cycle_id = (wizard_step.to_s.split('statement').last.to_i rescue false)
-      auditee_cpd_statements.find { |cpd_statement| cpd_statement.cpd_cycle_id == cpd_cycle_id }
-    end
-
-    def dynamic_wizard_statement_steps
-      @statement_steps ||= auditee_cpd_statements.each_with_object({}) do |cpd_statement, h|
-        h["statement#{cpd_statement.cpd_cycle_id}".to_sym] = "#{cpd_statement.cpd_cycle.to_s} Activities"
-      end
-    end
-
-    # The dynamic CPD Audit Level Sections steps
-    def cpd_audit_level_section(wizard_step)
-      position = (wizard_step.to_s.split('section').last.to_i rescue false)
-      cpd_audit_level.cpd_audit_level_sections.find { |section| (section.position + 1) == position }
-    end
-
-    def dynamic_wizard_questionnaire_steps
-      @questionnaire_steps ||= cpd_audit_level.cpd_audit_level_sections.each_with_object({}) do |section, h|
-        h["section#{section.position+1}".to_sym] = section.title
-      end
-    end
-
-    def dynamic_wizard_steps
-      dynamic_wizard_statement_steps.merge(dynamic_wizard_questionnaire_steps)
-    end
-
-    def can_visit_step?(step)
-      return (step == :complete) if completed?  # Can only view complete step once submitted
-      can_revisit_completed_steps(step)
-    end
-
-    def required_steps
-      steps = [:start, :information, :instructions]
-
-      steps << :conflict if cpd_audit_level.conflict_of_interest?
-
-      if conflict_of_interest?
-        return steps + [:submit, :complete]
-      end
-
-      steps += [:waiting] unless ready?
-
-      steps += [:statements] + dynamic_wizard_statement_steps.keys
-      steps += [:questionnaire] + dynamic_wizard_questionnaire_steps.keys
-      steps += [:recommendation, :submit, :complete]
-
-      steps
-    end
-
-    def wizard_step_title(step)
-      WIZARD_STEPS[step] || dynamic_wizard_steps.fetch(step)
-    end
-
-    # Called by CpdAudit.extension_granted
-    def extension_granted!
-      self.due_date = deadline_to_review()
-    end
-
-    # Called by CpdAudit.submit!
-    def ready!
-      send_email(:cpd_audit_review_ready)
-    end
-
-    # Called by review wizard submit step
-    def submit!
-      update!(submitted_at: Time.zone.now)
-      cpd_audit.review! # maybe go from submitted->removed
-
-      send_email(:cpd_audit_review_submitted)
-    end
-
-    # When ready, the applicant review wizard hides the waiting step
-    def ready?
-      cpd_audit&.was_submitted?
-    end
-
-    def in_progress?
-      submitted_at.blank?
-    end
-
-    def completed?
-      submitted_at.present?
-    end
-
-    def email_form_defaults(action)
-      { from: EffectiveCpd.mailer_sender }
-    end
-
-    def send_email(email)
-      EffectiveCpd.send_email(email, self, email_form_params) unless email_form_skip?
-      true
-    end
-
-    def deadline_to_conflict_of_interest
-      cpd_audit.deadline_to_conflict_of_interest
-    end
-
-    def deadline_to_review
-      return nil unless cpd_audit_level&.days_to_review.present?
-
-      date = cpd_audit.deadline_to_submit
-      return nil unless date.present?
-
-      EffectiveResources.advance_date(date, business_days: cpd_audit_level.days_to_review)
-    end
-
+    effective_cpd_audit_review
   end
 end

data/app/models/effective/cpd_audit_review_item.rb

@@ -1,6 +1,6 @@
 module Effective
   class CpdAuditReviewItem < ActiveRecord::Base
-    belongs_to :cpd_audit_review
+    belongs_to :cpd_audit_review, polymorphic: true
     belongs_to :item, polymorphic: true # CpdAuditResponse or CpdStatementActivity
 
     if respond_to?(:log_changes)

data/app/views/admin/cpd_audit_levels/_form_content_audit.html.haml

@@ -9,7 +9,7 @@
 
   %hr
 
-  - Effective::CpdAudit::WIZARD_STEPS.each do |step, title|
+  - EffectiveCpd.CpdAudit::WIZARD_STEPS.each do |step, title|
     = card("#{title} Content") do
       - if defined?(EffectiveArticleEditor)
         = f.article_editor "rich_text_#{step}_audit_content", label: false, hint: "displayed on the auditee wizard #{step} wizard step only"

data/app/views/admin/cpd_audit_levels/_form_content_audit_review.html.haml

@@ -9,7 +9,7 @@
 
   %hr
 
-  - Effective::CpdAuditReview::WIZARD_STEPS.each do |step, title|
+  - EffectiveCpd.CpdAuditReview::WIZARD_STEPS.each do |step, title|
     = card("#{title} Content") do
       - if defined?(EffectiveArticleEditor)
         = f.article_editor "rich_text_#{step}_audit_review_content", label: false, hint: "displayed on the audit reviewer #{step} wizard step only"

data/app/views/admin/cpd_audit_levels/_form_cpd_audit_level.html.haml

@@ -1,11 +1,17 @@
 = effective_form_with(model: [:admin, cpd_audit_level], engine: true) do |f|
   = f.text_field :title, hint: 'A title for this kind of audit'
 
+  = f.check_box :anonymous, label: 'Yes, this is an anonymous audit'
+
+  = f.show_if(:anonymous, true) do
+    .row
+      .col= f.text_field :anonymous_audits_prefix, hint: 'Used to prefix audits. Something like A23'
+      .col= f.text_field :anonymous_audit_reviews_prefix, hint: 'Used to prefix audit reviewers. Something like R23'
+
   = f.select :recommendations, f.object.recommendations,
     label: 'Audit Review recommendation choices', tags: true, placeholder: 'Type to add item...',
     hint: 'The recommendation made by an audit reviewer when reviewing an audit. Begin typing and then press enter to add a choice'
 
-
   = f.select :determinations, f.object.determinations,
     label: 'Audit determination choices', tags: true, placeholder: 'Type to add item...',
     hint: 'The final determination made by the auditor when closing an audit. Begin typing and then press enter to add a choice.'

data/app/views/admin/cpd_audit_levels/_form_cpd_audit_level_section.html.haml

@@ -7,6 +7,8 @@
       = fas.rich_text_area :top_content
       = fas.rich_text_area :bottom_content
 
+    = fas.check_box :skip_review, label: 'Do not display this section to audit reviewers'
+
   = f.submit
 
 %h2 Questions

data/app/views/admin/cpd_audit_reviews/_form.html.haml

@@ -1,9 +1,12 @@
 = effective_form_with(model: [:admin, cpd_audit_review], engine: true) do |f|
   - if inline_datatable?
     = f.hidden_field :cpd_audit_id
+    = f.hidden_field :cpd_audit_type
+
     = f.static_field :cpd_audit, label: 'CPD Audit'
   - else
-    = f.select :cpd_audit_id, Effective::CpdAudit.available.sorted.all
+    = f.hidden_field :cpd_audit_type, value: EffectiveCpd.CpdAudit.class.name
+    = f.select :cpd_audit_id, EffectiveCpd.CpdAudit.available.sorted.all
 
   = render('admin/cpd_audits/audit_reviewer_fields', f: f)
 

data/app/views/admin/cpd_audits/_form.html.haml

@@ -1,49 +1 @@
-= tabs do
-  - if cpd_audit.new_record?
-    = tab 'New Audit' do
-      = render 'admin/cpd_audits/form_new', cpd_audit: cpd_audit
-
-  - if cpd_audit.persisted?
-    - if cpd_audit.completed?
-      = tab 'Audit' do
-        = render 'effective/cpd_audits/cpd_audit', cpd_audit: cpd_audit
-
-      = tab 'Status' do
-        = render 'admin/cpd_audits/status', cpd_audit: cpd_audit
-    - else
-      = tab 'Status' do
-        = render 'admin/cpd_audits/status', cpd_audit: cpd_audit
-
-      = tab 'Audit' do
-        = render 'effective/cpd_audits/cpd_audit', cpd_audit: cpd_audit
-
-    = tab 'Deadlines' do
-      = render 'admin/cpd_audits/form_deadlines', cpd_audit: cpd_audit
-
-    = tab 'Statements' do
-      - datatable = Admin::EffectiveCpdStatementsDatatable.new(user_id: cpd_audit.user.id, user_type: cpd_audit.user.class.name)
-      = render_datatable(datatable, inline: true, simple: true)
-
-    = tab 'Audit Reviews' do
-      - datatable = Admin::EffectiveCpdAuditReviewsDatatable.new(cpd_audit_id: cpd_audit.id)
-      = render_datatable(datatable, inline: true, simple: true)
-
-    - unless cpd_audit.closed?
-      = tab 'Determination' do
-        = render 'admin/cpd_audits/form_determination', cpd_audit: cpd_audit
-
-    - if cpd_audit.conflicted?
-      = tab 'Process Conflict of Interest' do
-        = render 'admin/cpd_audits/form_conflict', cpd_audit: cpd_audit
-
-    - if cpd_audit.exemption_requested?
-      = tab 'Process Exemption Request' do
-        = render 'admin/cpd_audits/form_exemption', cpd_audit: cpd_audit
-
-    - if cpd_audit.extension_requested?
-      = tab 'Process Extension Request' do
-        = render 'admin/cpd_audits/form_extension', cpd_audit: cpd_audit
-
-    - if cpd_audit.respond_to?(:log_changes_datatable)
-      = tab 'Logs' do
-        = render_inline_datatable(cpd_audit.log_changes_datatable)
+= render('admin/cpd_audits/form_cpd_audit', cpd_audit: cpd_audit)

data/app/views/admin/cpd_audits/{_form_determination.html.haml → _form_close.html.haml}

@@ -1,6 +1,6 @@
 = card('Determination') do
   = effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
-    %p This action will complete this audit and mark it as closed.
+    %p This action will close this audit with the following determination:
 
     = f.select :determination, cpd_audit.cpd_audit_level.determinations
 

data/app/views/admin/cpd_audits/_form_complete.html.haml

@@ -0,0 +1,17 @@
+= effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
+  = f.hidden_field :id
+
+  %p The #{cpd_audit} will be marked <strong>completed</strong>. All deliverables have been received and all requirements completed.
+
+  %p The audit reviewer(s) will be notified that this audit is ready to review.
+
+  %h3 Email to send
+  %p
+
+    An
+    - email = Effective::EmailTemplate.where(template_name: :cpd_audit_review_ready).first!
+    = link_to('cpd_audit_review_ready email', effective_email_templates.edit_admin_email_template_path(email))
+
+    email will be sent to each reviewer.
+
+  = f.submit 'Complete Audit', border: false, center: true, 'data-confirm': "Complete #{f.object}?"

data/app/views/admin/cpd_audits/_form_cpd_audit.html.haml

@@ -0,0 +1,56 @@
+= tabs do
+  - if cpd_audit.new_record?
+    = tab 'New Audit' do
+      = render 'admin/cpd_audits/form_new', cpd_audit: cpd_audit
+
+  - if cpd_audit.persisted?
+    - if cpd_audit.completed?
+      = tab 'Audit' do
+        = render 'effective/cpd_audits/cpd_audit', cpd_audit: cpd_audit
+
+      = tab 'Status' do
+        = render 'admin/cpd_audits/status', cpd_audit: cpd_audit
+    - else
+      = tab 'Status' do
+        = render 'admin/cpd_audits/status', cpd_audit: cpd_audit
+
+      = tab 'Audit' do
+        = render 'effective/cpd_audits/cpd_audit', cpd_audit: cpd_audit
+
+    - if cpd_audit.conflicted?
+      = tab 'Process Conflict of Interest' do
+        = render 'admin/cpd_audits/form_conflict', cpd_audit: cpd_audit
+
+    - if cpd_audit.exemption_requested?
+      = tab 'Process Exemption Request' do
+        = render 'admin/cpd_audits/form_exemption', cpd_audit: cpd_audit
+
+    - if cpd_audit.extension_requested?
+      = tab 'Process Extension Request' do
+        = render 'admin/cpd_audits/form_extension', cpd_audit: cpd_audit
+
+    - if cpd_audit.was_submitted? == false
+      = tab 'Deadlines' do
+        = render 'admin/cpd_audits/form_deadlines', cpd_audit: cpd_audit
+
+    - if cpd_audit.was_submitted? && !cpd_audit.closed?
+      = tab 'Process' do
+        = render 'admin/cpd_audits/form_process', cpd_audit: cpd_audit
+
+    = yield
+
+    = tab 'Files' do
+      = render 'admin/cpd_audits/form_files', cpd_audit: cpd_audit
+
+    - if cpd_audit.user_cpd_required?
+      = tab 'Statements' do
+        - datatable = Admin::EffectiveCpdStatementsDatatable.new(user: cpd_audit.user)
+        = render_datatable(datatable, inline: true, simple: true)
+
+    = tab 'Audit Reviews' do
+      - datatable = EffectiveResources.best('Admin::EffectiveCpdAuditReviewsDatatable').new(cpd_audit: cpd_audit)
+      = render_datatable(datatable, inline: true, simple: true)
+
+    - if cpd_audit.respond_to?(:log_changes_datatable)
+      = tab 'Logs' do
+        = render_inline_datatable(cpd_audit.log_changes_datatable)

data/app/views/admin/cpd_audits/_form_deadlines.html.haml

@@ -1,12 +1,11 @@
-= card('Deadlines') do
-  = effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
-    %p The audittee has the following deadlines:
+= effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
+  %p The audittee has the following deadlines:
 
-    %ul
-      %li To declare conflict of interest: #{f.object.deadline_to_conflict_of_interest}
-      %li To request exemption: #{f.object.deadline_to_exemption}
-      %li To request extension: #{f.object.deadline_to_extension}
+  %ul
+    %li To declare conflict of interest: #{f.object.deadline_to_conflict_of_interest}
+    %li To request exemption: #{f.object.deadline_to_exemption}
+    %li To request extension: #{f.object.deadline_to_extension}
 
-    = f.check_box :ignore_deadlines, label: 'Yes, ignore audittee deadlines and allow these actions to be performed'
+  = f.check_box :ignore_deadlines, label: 'Yes, ignore audittee deadlines and allow these actions to be performed'
 
-    = f.submit 'Save', center: true
+  = f.submit 'Save', center: true

data/app/views/admin/cpd_audits/_form_exemption.html.haml

@@ -11,7 +11,7 @@
   %p The exemption request shall be
 
   = effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
-    = f.radios :admin_process_request, Effective::CpdAudit::ADMIN_PROCESS_REQUEST_OPTIONS, label: false, buttons: true, required: true
+    = f.radios :admin_process_request, EffectiveCpd.CpdAudit.admin_process_request_options, label: false, buttons: true, required: true
 
     = f.show_if :admin_process_request, 'Granted' do
       %p Send email

data/app/views/admin/cpd_audits/_form_extension.html.haml

@@ -11,7 +11,7 @@
   %p The extension request shall be
 
   = effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
-    = f.radios :admin_process_request, Effective::CpdAudit::ADMIN_PROCESS_REQUEST_OPTIONS, label: false, buttons: true, required: true
+    = f.radios :admin_process_request, EffectiveCpd.CpdAudit.admin_process_request_options, label: false, buttons: true, required: true
 
     = f.show_if :admin_process_request, 'Granted' do
       %p Send email

data/app/views/admin/cpd_audits/_form_files.html.haml

@@ -0,0 +1,6 @@
+= effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
+  %p The auditee has attached the following:
+
+  = f.file_field :files
+
+  = f.submit 'Save', center: true

data/app/views/admin/cpd_audits/_form_missing_info.html.haml

@@ -0,0 +1,11 @@
+= effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
+  %p This audit will be marked as <strong>missing information</strong> with the following:
+
+  = f.text_field :missing_info_reason, required: true, label: 'Explanation of missing info'
+
+  %h3 Email to send
+
+  %p The following email will be sent:
+  = email_form_fields(f, :cpd_audit_missing_info)
+
+  = f.submit 'Missing Info', border: false, center: true, 'data-confirm': "Missing Info #{f.object}?"

data/app/views/admin/cpd_audits/_form_new.html.haml

@@ -1,7 +1,9 @@
 = effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
 
   %h2 Audit
-  = f.select :cpd_audit_level_id, Effective::CpdAuditLevel.all.sorted, label: 'Audit level'
+  = f.hidden_field :cpd_audit_level_type, value: EffectiveCpd.CpdAuditLevel.name
+
+  = f.select :cpd_audit_level_id, EffectiveCpd.CpdAuditLevel.all.sorted, label: 'Audit level'
 
   = f.date_field :notification_date, label: 'Date of notification', required: false,
     hint: "the starting date for any deadline calculations. leave blank for today's date"

data/app/views/admin/cpd_audits/_form_process.html.haml

@@ -0,0 +1,18 @@
+%p
+  %span.badge.badge-secondary= cpd_audit.status_label
+  = cpd_audit.summary
+
+%p Process audit:
+
+= accordion do
+  - if EffectiveResources.authorized?(self, :complete, cpd_audit)
+    = collapse 'Complete this Audit' do
+      = render('admin/cpd_audits/form_complete', cpd_audit: cpd_audit)
+
+  - if EffectiveResources.authorized?(self, :missing, cpd_audit)
+    = collapse 'Missing Information' do
+      = render('admin/cpd_audits/form_missing_info', cpd_audit: cpd_audit)
+
+  - if EffectiveResources.authorized?(self, :close, cpd_audit)
+    = collapse 'Close Audit with Determination' do
+      = render('admin/cpd_audits/form_close', cpd_audit: cpd_audit)

data/app/views/admin/cpd_audits/_status.html.haml

@@ -1,4 +1,4 @@
-%p= cpd_audit_summary_text(cpd_audit)
+%p= cpd_audit.summary
 
 %table.table.table-striped
   %thead
@@ -95,6 +95,42 @@
           Done
       %td
 
+    - # Waiting to Complete
+    - unless cpd_audit.was_completed?
+      %tr
+        %td Waiting to Complete
+        %td= cpd_audit.submitted_at&.strftime('%F') || '-'
+        %td
+          - cpd_audit.completed_requirements.each do |requirement, completed|
+            %p
+              = icon((completed ? 'check' : 'x'), class: 'small-1')
+              = requirement
+
+        %td
+          - if cpd_audit.submitted?
+            = link_to 'Complete Audit', '#process', 'data-click-tab': true, class: 'btn btn-sm btn-primary'
+
+    - # Missing Information
+    %tr
+      %td Missing Information
+      %td= cpd_audit.missing_info_at&.strftime('%F') || '-'
+      %td
+        = cpd_audit.missing_info_reason
+
+        - if cpd_audit.was_missing_info? && cpd_audit.missing_info_reason.blank?
+          = icon('check', class: 'small-1')
+          Done
+      %td
+
+    %tr
+      %td Complete
+      %td= cpd_audit.completed_at&.strftime('%F') || '-'
+      %td
+        - if cpd_audit.was_completed?
+          = icon('check', class: 'small-1')
+          Done
+      %td
+
     %tr
       %td Reviewed
       %td= cpd_audit.reviewed_at&.strftime('%F') || '-'
@@ -106,16 +142,22 @@
         Reviews Completed
 
       %td
-        - if cpd_audit.was_submitted? && !cpd_audit.was_reviewed?
+        - if cpd_audit.was_submitted? && !cpd_audit.was_reviewed? && !cpd_audit.closed?
           = link_to 'Audit Reviews', '#audit-reviews', 'data-click-tab': true, class: 'btn btn-sm btn-primary'
 
+    - unless cpd_audit.closed?
+      %tr
+        %td Waiting to Close
+        %td= cpd_audit.reviewed_at&.strftime('%F') || '-'
+        %td
+        %td
+          - if cpd_audit.was_reviewed?
+            = link_to 'Close Audit with Determination', '#process', 'data-click-tab': true, class: 'btn btn-sm btn-primary'
+
     %tr
       %td Closed
       %td= cpd_audit.closed_at&.strftime('%F') || '-'
       %td
-        - if cpd_audit.completed?
+        - if cpd_audit.done?
           = cpd_audit.determination
-
       %td
-        - if cpd_audit.reviewed? && !cpd_audit.completed?
-          = link_to 'Determination', '#determination', 'data-click-tab': true, class: 'btn btn-sm btn-primary'

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

@@ -18,7 +18,7 @@
   .mt-4
     %p Please submit a CPD statement for the following available #{cpd_cycles_label}:
     = render_datatable(available, simple: true)
-- else
+- elsif current_user.try(:cpd_audit_cpd_required?)
   %p There are no #{cpd_cycles_label} available to submit. When there are, we'll show them here.
 
 - completed = EffectiveCpdCompletedStatementsDatatable.new(self)
@@ -27,15 +27,18 @@
     %p You have completed these past statements:
     = render_datatable(completed, simple: true)
 
-- # Auditor / Audit reviewer datatables (2)
-- reviewing = EffectiveCpdAvailableAuditReviewsDatatable.new(self)
-- if reviewing.present?
-  .mt-4
-    %p You have been selected to assess the following audits:
-    = render_datatable(reviewing, simple: true)
+- if current_user.try(:cpd_audit_reviewer?)
+  - # Auditor / Audit reviewer datatables (2)
+  - reviewing = EffectiveCpdAvailableAuditReviewsDatatable.new(self)
+  - if reviewing.present?
+    .mt-4
+      %p You have been selected to assess the following audits:
+      = render_datatable(reviewing, simple: true)
+  - else
+    %p There are no audits available to review. When there are, we'll show them here.
 
-- reviewed = EffectiveCpdCompletedAuditReviewsDatatable.new(self)
-- if reviewed.present?
-  .mt-4
-    %p You have completed these past audit assessments:
-    = render_datatable(reviewed, simple: true)
+  - reviewed = EffectiveCpdCompletedAuditReviewsDatatable.new(self)
+  - if reviewed.present?
+    .mt-4
+      %p You have completed these past audit assessments:
+      = render_datatable(reviewed, simple: true)

data/app/views/effective/cpd_audit_level_questions/_cpd_audit_level_question.html.haml

@@ -1,5 +1,6 @@
 .cpd-audit-level-question
+  Question ##{cpd_audit_level_question.position + 1}:
   = cpd_audit_level_question
 
   - if cpd_audit_level_question.body.present?
-    = cpd_audit_level_question.body.to_s
+    .mt-4= cpd_audit_level_question.body.to_s

data/app/views/effective/cpd_audit_reviews/_conflict.html.haml

@@ -1,4 +1,4 @@
-= card(cpd_audit_review.wizard_step_title(step)) do
+= wizard_card(cpd_audit_review) do
   %table.table
     %tbody
       %tr