effective_cpd 1.0.0 → 1.1.0

data/app/models/concerns/effective_cpd_audit_review.rb

@@ -32,6 +32,8 @@ module EffectiveCpdAuditReview
 
       waiting: 'Waiting on Auditee Submission',
 
+      files: 'Review Files',
+
       statements: 'Review CPD Statements',
       # ... There will be one step per cpd_statement here. "statement1"
 
@@ -39,8 +41,8 @@ module EffectiveCpdAuditReview
       # ... There will be one step per cpd_audit_level_sections here
 
       recommendation: 'Recommendation',
-      submit: 'Confirm & Submit',
-      complete: 'Complete'
+      submit: 'Submit',
+      submitted: 'Submitted'
     )
 
     attr_accessor :current_user
@@ -57,29 +59,38 @@ module EffectiveCpdAuditReview
     accepts_nested_attributes_for :cpd_audit_review_items, reject_if: :all_blank, allow_destroy: true
 
     effective_resource do
-      token                     :string
-      due_date                  :date
+      due_date                  :date, permitted: false
+
+      # Anonymous Name Mode
+      anonymous_name           :string, permitted: false   # Required when cpd_audit_level.anonymous?
+      anonymous_number         :integer, permitted: false  # A unique value
 
       # Auditor response
       conflict_of_interest          :boolean
       conflict_of_interest_reason   :text
 
-      # Rolling comments
+      # Rolling comments - internal, reviewer/admin only
       comments                  :text
 
+      # Comments for the auditee to see
+      feedback                  :text
+
       # Recommendation Step
       recommendation            :string
 
       # Status Dates
-      submitted_at              :datetime
+      submitted_at              :datetime, permitted: false
 
       # acts_as_statused
       # I'm not using acts_as_statused yet, but I probably will later
-      status                  :string
-      status_steps            :text
+      status                  :string, permitted: false
+      status_steps            :text, permitted: false
+
+      # Acts as tokyyened
+      token                   :string, permitted: false
 
       # Wizard Progress
-      wizard_steps              :text
+      wizard_steps              :text, permitted: false
 
       timestamps
     end
@@ -89,10 +100,11 @@ module EffectiveCpdAuditReview
 
     scope :available, -> { where(submitted_at: nil) }
     scope :completed, -> { where.not(submitted_at: nil) }
+    scope :done, -> { where.not(submitted_at: nil) }
 
     # effective_reports
     def reportable_scopes
-      { available: nil, completed: nil }
+      { available: nil, done: nil }
     end
 
     before_validation(if: -> { new_record? }) do
@@ -106,40 +118,72 @@ module EffectiveCpdAuditReview
       end
     end
 
+    with_options(if: -> { cpd_audit_level&.anonymous? }) do
+      before_validation { assign_anonymous_name_and_number }
+
+      validates :anonymous_name, presence: true
+      validates :anonymous_number, presence: true
+    end
+
     after_commit(on: :create) { send_email(:cpd_audit_review_opened) }
-    after_commit(on: :destroy) { cpd_audit.review! }
-  end
+    after_commit(on: :destroy) { cpd_audit.try_review! }
 
-  def to_s
-    persisted? ? "#{cpd_audit_level} Audit Review by #{user}" : 'audit review'
-  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
 
-  # 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")
+    def dynamic_wizard_questionnaire_steps
+      @questionnaire_steps ||= cpd_audit_level.cpd_audit_level_sections.reject(&:skip_review?).each_with_object({}) do |section, h|
+        h["section#{section.position+1}".to_sym] = section.title
+      end
     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
+    def dynamic_wizard_steps
+      dynamic_wizard_statement_steps.merge(dynamic_wizard_questionnaire_steps)
+    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)
+    def wizard_step_title(step)
+      self.class::WIZARD_STEPS[step] || dynamic_wizard_steps.fetch(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, :submitted]
+      end
+
+      steps += [:waiting] unless ready?
+
+      steps += [:files]
+      steps += [:statements] + dynamic_wizard_statement_steps.keys
+      steps += [:questionnaire] + dynamic_wizard_questionnaire_steps.keys
+      steps += [:recommendation, :submit, :submitted]
+
+      steps
     end
+
+    def can_visit_step?(step)
+      return (step == :submitted) if completed?  # Can only view complete step once submitted
+      can_revisit_completed_steps(step)
+    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 }
+  def to_s
+    persisted? ? "#{cpd_audit_level} Audit Review by #{name}" : 'audit review'
   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
+  def name
+    anonymous_name.presence || user.to_s
+  end
+
+  def anonymous?
+    cpd_audit_level&.anonymous?
   end
 
   # The dynamic CPD Audit Level Sections steps
@@ -148,41 +192,26 @@ module EffectiveCpdAuditReview
     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
+  # Find or build
+  def cpd_audit_review_item(item)
+    unless item.kind_of?(Effective::CpdAuditResponse) || item.kind_of?(Effective::CpdStatementActivity)
+      raise("expected a cpd_audit_response or cpd_statement_activity")
     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)
+    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
 
-  def required_steps
-    steps = [:start, :information, :instructions]
-
-    steps << :conflict if cpd_audit_level.conflict_of_interest?
-
-    if conflict_of_interest?
-      return steps + [:submit, :complete]
+  # 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
-
-    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)
+  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
 
   # Called by CpdAudit.extension_granted
@@ -198,14 +227,18 @@ module EffectiveCpdAuditReview
   # Called by review wizard submit step
   def submit!
     update!(submitted_at: Time.zone.now)
-    cpd_audit.review! # maybe go from submitted->removed
+    cpd_audit.try_review! # audit might go from completed->reviewed
 
     send_email(:cpd_audit_review_submitted)
   end
 
   # When ready, the applicant review wizard hides the waiting step
   def ready?
-    cpd_audit&.was_submitted?
+    cpd_audit&.ready_to_review?
+  end
+
+  def draft?
+    submitted_at.blank?
   end
 
   def in_progress?
@@ -216,6 +249,10 @@ module EffectiveCpdAuditReview
     submitted_at.present?
   end
 
+  def done?
+    submitted_at.present?
+  end
+
   def email_form_defaults(action)
     { from: EffectiveCpd.mailer_sender }
   end
@@ -226,16 +263,35 @@ module EffectiveCpdAuditReview
   end
 
   def deadline_to_conflict_of_interest
-    cpd_audit.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
+    date = cpd_audit&.deadline_to_submit
     return nil unless date.present?
 
     EffectiveResources.advance_date(date, business_days: cpd_audit_level.days_to_review)
   end
 
+  # The name pattern is A23XXX where XXX is an autoincrement
+  def assign_anonymous_name_and_number
+    return if anonymous_name.present? || anonymous_number.present?
+    return if cpd_audit_level.blank?
+
+    prefix = cpd_audit_level.anonymous_audit_reviews_prefix
+    raise('expected cpd audit level to have an anonymous audit review prefix') unless prefix.present?
+
+    # Where starts with prefix
+    number = cpd_audit.cpd_audit_reviews.map { |ar| ar.anonymous_number }.compact.max if cpd_audit.new_record?
+    number ||= (self.class.all.where('anonymous_name LIKE ?', "#{prefix}%").maximum('anonymous_number') || 0)
+    number = number + 1 # The next number
+
+    # Apply prefix and pad number to 3 digits
+    name = prefix + number.to_s.rjust(3, '0')
+
+    assign_attributes(anonymous_number: number, anonymous_name: name)
+  end
+
 end

data/app/models/concerns/effective_cpd_user.rb

@@ -18,13 +18,14 @@ module EffectiveCpdUser
 
   included do
     # App Scoped
-    has_many :cpd_statements, -> { order(:cpd_cycle_id) }, inverse_of: :user
+    has_many :cpd_statements, -> { order(:cpd_cycle_id) }, inverse_of: :user, dependent: :destroy
+    accepts_nested_attributes_for :cpd_statements, allow_destroy: true
 
-    # Effective
-    has_many :cpd_audits, -> { Effective::CpdAudit.sorted }, inverse_of: :user, class_name: 'Effective::CpdAudit'
-    has_many :cpd_audit_reviews, -> { Effective::CpdAuditReview.sorted }, inverse_of: :user, class_name: 'Effective::CpdAuditReview'
+    has_many :cpd_audits, -> { order(:id) }, inverse_of: :user
+    has_many :cpd_audit_reviews, -> { order(:id) }, inverse_of: :user
 
-    accepts_nested_attributes_for :cpd_statements
+    scope :cpd_audit_auditees, -> { without_role(:cpd_audit_reviewer) }
+    scope :cpd_audit_reviewers, -> { with_role(:cpd_audit_reviewer) }
   end
 
   # This one will actually be enforced or displayed first
@@ -42,6 +43,10 @@ module EffectiveCpdUser
     true
   end
 
+  def cpd_audit_reviewer?
+    roles.include?(:cpd_audit_reviewer)
+  end
+
   def cpd_statement(cpd_cycle:)
     raise('expected an CpdCycle') unless cpd_cycle.class.respond_to?(:effective_cpd_cycle?)
     cpd_statements.find { |cpd_statement| cpd_statement.cpd_cycle_id == cpd_cycle.id }

data/app/models/effective/cpd_audit_level_question.rb

@@ -1,6 +1,6 @@
 module Effective
   class CpdAuditLevelQuestion < ActiveRecord::Base
-    belongs_to :cpd_audit_level
+    belongs_to :cpd_audit_level, polymorphic: true
     belongs_to :cpd_audit_level_section
 
     has_many :cpd_audit_level_question_options, -> { CpdAuditLevelQuestionOption.sorted }, inverse_of: :cpd_audit_level_question, dependent: :delete_all

data/app/models/effective/cpd_audit_level_section.rb

@@ -1,6 +1,6 @@
 module Effective
   class CpdAuditLevelSection < ActiveRecord::Base
-    belongs_to :cpd_audit_level
+    belongs_to :cpd_audit_level, polymorphic: true
 
     has_rich_text :top_content
     has_rich_text :bottom_content
@@ -15,8 +15,9 @@ module Effective
     end
 
     effective_resource do
-      title     :string
-      position  :integer
+      title       :string
+      position    :integer
+      skip_review :boolean      # Do not display this section to reviewer
 
       timestamps
     end

data/app/models/effective/cpd_audit_response.rb

@@ -1,6 +1,7 @@
 module Effective
   class CpdAuditResponse < ActiveRecord::Base
-    belongs_to :cpd_audit
+    belongs_to :cpd_audit, polymorphic: true
+
     belongs_to :cpd_audit_level_section
     belongs_to :cpd_audit_level_question
 
@@ -24,7 +25,7 @@ module Effective
       timestamps
     end
 
-    scope :submitted, -> { where(cpd_audit: Effective::CpdAudit.where.not(submitted_at: nil)) }
+    scope :submitted, -> { where(cpd_audit: EffectiveCpd.CpdAudit.where.not(submitted_at: nil)) }
     scope :sorted, -> { order(:id) }
     scope :deep, -> { includes(:cpd_audit, :cpd_audit_level_question) }
 

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"