effective_cpd 1.0.0 → 1.1.0

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

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

@@ -1,8 +1,8 @@
-= card(cpd_audit_review.wizard_step_title(step)) do
+= wizard_card(cpd_audit_review) do
   %table.table.table-hover
     %thead
-      %th Question and #{cpd_audit_review.cpd_audit.user}'s Response
-      %th #{cpd_audit_review.user}'s Review
+      %th Responses submitted by #{cpd_audit_review.cpd_audit.name}
+      %th Review by #{cpd_audit_review.name}
     %tbody
       - cpd_audit_level_section.cpd_audit_level_questions.each_with_index do |cpd_audit_level_question, index|
         - cpd_audit_response = cpd_audit_review.cpd_audit.cpd_audit_response(cpd_audit_level_question)

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

@@ -2,9 +2,11 @@
   = render('effective/cpd_audit_reviews/summary', cpd_audit_review: cpd_audit_review)
 
   - steps = cpd_audit_review.required_steps.select { |step| cpd_audit_review.has_completed_step?(step) }
-  - blacklist = [:start, :information, :instructions, :waiting, :statements, :questionnaire, :submit, :complete]
+  - blacklist = [:start, :information, :instructions, :waiting, :statements, :questionnaire, :submit, :submitted]
 
   - (steps - blacklist).each do |step|
+    - cpd_audit_review.render_step = step
+
     - if cpd_audit_review.dynamic_wizard_questionnaire_steps.keys.include?(step)
       - cpd_audit_level_section = cpd_audit_review.cpd_audit_level_section(step) || raise("no cpd audit section for #{step}")
       = render("effective/cpd_audit_reviews/cpd_audit_level_section", cpd_audit_review: cpd_audit_review, step: step, cpd_audit_level_section: cpd_audit_level_section)

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

@@ -1,8 +1,8 @@
-= card(cpd_audit_review.wizard_step_title(step)) do
+= wizard_card(cpd_audit_review) do
   %table.table.table-hover
     %thead
-      %th #{cpd_audit_review.cpd_audit.user}'s #{cpd_statement}
-      %th #{cpd_audit_review.user}'s Review
+      %th #{cpd_audit_review.cpd_audit.name}'s #{cpd_statement}
+      %th #{cpd_audit_review.name}'s Review
 
     %tbody
       - cpd_statement.cpd_statement_activities.each do |cpd_statement_activity|

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

@@ -0,0 +1,9 @@
+= wizard_card(cpd_audit_review) do
+  %table.table
+    %tbody
+      %tr
+        %td{colspan: 2}
+          - if cpd_audit_review.feedback.present?
+            = simple_format(cpd_audit_review.feedback)
+          - else
+            No feedback

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

@@ -0,0 +1,12 @@
+= wizard_card(cpd_audit_review) do
+  %table.table
+    %tbody
+      %tr
+        %th Files
+        %td
+          - if cpd_audit_review.cpd_audit.files.blank?
+            None
+          - else
+            %ul
+              - cpd_audit_review.cpd_audit.files.each do |file|
+                %li= link_to(file.filename, url_for(file), target: '_blank')

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

@@ -11,6 +11,9 @@
 
             %td
               = (Time.zone.now > resource.due_date) ? 'days overdue' : 'days left to review'
+          %tr
+            %td
+            %td
 
   .col-9
     %h1= @page_title

data/app/views/effective/cpd_audit_reviews/_recommendation.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
@@ -6,4 +6,8 @@
         %td= cpd_audit_review.recommendation
 
       %tr
-        %td{colspan: 2}= cpd_audit_review.comments.presence || 'No comments'
+        %td{colspan: 2}
+          - if cpd_audit_review.comments.present?
+            = simple_format(cpd_audit_review.comments)
+          - else
+            No comments

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

@@ -1,28 +1,55 @@
 = card(cpd_audit_review) do
+  - cpd_audit = cpd_audit_review.cpd_audit
+
   %table.table
     %tbody
+      - if request.path.start_with?('/admin')
+        %tr
+          %th Audit
+          %td
+            = link_to(cpd_audit, effective_cpd.edit_admin_cpd_audit_path(cpd_audit), target: '_blank')
+
       %tr
         %th Audit Reviewer
         %td
-          = cpd_audit_review.user
-          %br
-          %small= mail_to cpd_audit_review.user.email
+          - if cpd_audit_review.anonymous?
+            %p= cpd_audit_review.anonymous_name
 
-      - if request.path.start_with?('/admin') && respond_to?(:edit_admin_user_path)
-        %tr
-          %th User
-          %td= link_to(cpd_audit_review.user, edit_admin_user_path(cpd_audit_review.user))
+          - if request.path.start_with?('/admin')
+            - url = (polymorphic_admin_path(cpd_audit_review.user) rescue "/admin/users/#{cpd_audit_review.user.to_param}/edit")
+            %p
+              = link_to(cpd_audit_review.user, url)
+              %br
+              %small= mail_to cpd_audit_review.user.email
+
+          - if cpd_audit_review.anonymous? == false
+            %p
+              = cpd_audit_review.user
+              %br
+              %small= mail_to cpd_audit_review.user.email
 
       %tr
         %th Auditee
         %td
-          = cpd_audit_review.cpd_audit.user
-          %br
-          %small= mail_to cpd_audit_review.cpd_audit.user.email
+          - if cpd_audit.anonymous?
+            %p= cpd_audit.anonymous_name
+
+          - if request.path.start_with?('/admin')
+            - url = (polymorphic_admin_path(cpd_audit.user) rescue "/admin/users/#{cpd_audit.user.to_param}/edit")
+            %p
+              = link_to(cpd_audit.user, url)
+              %br
+              %small= mail_to cpd_audit.user.email
+
+          - if cpd_audit.anonymous? == false
+            %p
+              = cpd_audit.user
+              %br
+              %small= mail_to cpd_audit.user.email
 
       %tr
         %th Date of notification
-        %td= cpd_audit_review.cpd_audit.notification_date.strftime('%F')
+        %td= cpd_audit.notification_date.strftime('%F')
 
       %tr
         %th Due date
@@ -42,6 +69,6 @@
         %th Recommendation
         %td= cpd_audit_review.recommendation.presence || '-'
 
-        %tr
-          %th Summary
-          %td= cpd_audit_summary_text(cpd_audit_review.cpd_audit)
+      %tr
+        %th Reviewer Comments
+        %td= cpd_audit_review.comments.presence || 'No comments'

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

@@ -2,7 +2,11 @@
   %p You have been selected to conduct a #{resource.cpd_audit.cpd_audit_level} audit with the following auditee:
 
   %ul
-    %li #{resource.cpd_audit.user} <#{mail_to(resource.cpd_audit.user.email)}>
+    %li
+      - if resource.anonymous?
+        = resource.cpd_audit.name
+      - else
+        #{resource.cpd_audit.user} <#{mail_to(resource.cpd_audit.user.email)}>
 
   %p The deadline to declare a conflict of interest is: #{resource.deadline_to_conflict_of_interest.strftime('%F')}.
 

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

@@ -13,8 +13,8 @@
 
     %table.table.table-hover
       %thead
-        %th Question and #{resource.cpd_audit.user}'s Response
-        %th #{resource.user}'s Review
+        %th Responses submitted by #{resource.cpd_audit.name}
+        %th Review by #{resource.name}
       %tbody
         - cpd_audit_level_section.cpd_audit_level_questions.each_with_index do |cpd_audit_level_question, index|
           - cpd_audit_response = resource.cpd_audit.cpd_audit_response(cpd_audit_level_question)

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

@@ -0,0 +1,16 @@
+= render('layout') do
+  .mb-3
+    = collapse('Show audit...', card_class: '') do
+      .mt-4= render('effective/cpd_audits/cpd_audit', cpd_audit: resource.cpd_audit)
+
+  %p Please provide any feedback for #{resource.cpd_audit.name}:
+
+  = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+    = f.hidden_field :current_step
+
+    = f.text_area :feedback, label: 'Feedback for the auditee'
+
+    %hr
+    = f.text_area :comments, label: 'Reviewer comments'
+
+    = f.submit 'Save and Continue', center: true

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

@@ -0,0 +1,17 @@
+= render('layout') do
+  = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+    = f.hidden_field :current_step
+
+    %p
+      The auditee attached the following files:
+      - if resource.cpd_audit.files.blank?
+        None
+
+    %ul
+      - resource.cpd_audit.files.each do |file|
+        %li= link_to(file.filename, url_for(file), target: '_blank')
+
+    %hr
+    = f.text_area :comments, label: 'Reviewer comments'
+
+    = f.submit 'Save and Continue', center: true

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

@@ -1,13 +1,15 @@
 = render('layout') do
   .mb-3
-    = collapse('Show / hide audit review...', card_class: '') do
-      = render(resource)
+    = collapse('Show audit...', card_class: '') do
+      .mt-4= render('effective/cpd_audits/cpd_audit', cpd_audit: resource.cpd_audit)
 
-  %p Please provide your final recommendation on #{resource.cpd_audit.user}:
+  %p Please provide your final recommendation on #{resource.cpd_audit.name}:
 
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :current_step
 
+    = f.text_area :feedback, label: 'Feedback for the auditee'
+
     - recommendations = resource.cpd_audit_level.recommendations
 
     - if recommendations.length > 3

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

@@ -1,8 +1,15 @@
 = render('layout') do
-  %p You have been selected to conduct a #{resource.cpd_audit.cpd_audit_level} audit with the following auditee:
+  %p You have been selected to conduct a #{resource.cpd_audit.cpd_audit_level} audit.
 
-  %ul
-    %li #{resource.cpd_audit.user} <#{mail_to(resource.cpd_audit.user.email)}>
+  - if resource.cpd_audit_level.anonymous?
+    %p This is an anonymous audit, and you have been assigned the name #{resource.name}.
+    %p You have been matched with the auditee, #{resource.cpd_audit.name}.
+
+  - else
+    %p You have been matched with the auditee:
+
+    %ul
+      %li #{resource.cpd_audit.user} <#{mail_to(resource.cpd_audit.user.email)}>
 
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :current_step

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

@@ -1,14 +1,13 @@
 = render('layout') do
-  - auditee = resource.cpd_audit.user
+  - cpd_audit = resource.cpd_audit
 
-  %h2 Review Statements
-  %p #{auditee} has submitted the following statements:
+  %p #{cpd_audit.name} has submitted the following statements:
 
-  - datatable = EffectiveCpdCompletedStatementsDatatable.new(user_id: auditee.id, actions: false)
+  - datatable = EffectiveCpdCompletedStatementsDatatable.new(user: cpd_audit.user, actions: false)
 
   - if datatable.blank?(self)
     %p
-      %strong There are no completed CPD statements from #{auditee}.
+      %strong There are no completed CPD statements from #{cpd_audit.name}.
   - else
     = render_datatable(datatable, simple: true)
 

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

@@ -6,7 +6,7 @@
     %strong will not
     be able to change your recommendation.
 
-  .mb-4= render(resource)
+  .mb-4= render('effective/cpd_audit_reviews/cpd_audit_review', cpd_audit_review: resource)
 
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :current_step

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

@@ -0,0 +1,20 @@
+= render('layout') do
+  - raise('expected a completed cpd_audit_review') unless resource.completed?
+
+  - if resource.completed?
+    .alert.alert-success.mb-4
+      This audit review was submitted on #{resource.submitted_at.strftime('%F')}
+
+  %p Thank you for your review.
+
+  = render 'effective/cpd_audit_reviews/summary', cpd_audit_review: resource
+
+  .mb-4
+    = collapse('Show audit review...', card_class: 'my-2') do
+      = render('effective/cpd_audit_reviews/cpd_audit_review', cpd_audit_review: resource)
+
+  .mb-4
+    = collapse('Show audit...', card_class: 'my-2') do
+      = render 'effective/cpd_audits/cpd_audit', cpd_audit: resource.cpd_audit
+
+  = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'

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

@@ -1,6 +1,6 @@
 = render('layout') do
   %h2 Next Step
-  %p= cpd_audit_summary_text(resource.cpd_audit)
+  %p= resource.cpd_audit.summary
 
   %p
     You may not continue at this time.

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

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

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

@@ -1,4 +1,4 @@
-= card(cpd_audit.wizard_step_title(step)) do
+= wizard_card(cpd_audit) do
   - cpd_cycle = cpd_audit.required_cpd_cycle
 
   %table.table

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

@@ -2,9 +2,11 @@
   = render('effective/cpd_audits/summary', cpd_audit: cpd_audit)
 
   - steps = cpd_audit.required_steps.select { |step| cpd_audit.has_completed_step?(step) }
-  - blacklist = [:start, :information, :instructions, :waiting, :questionnaire, :submit, :complete]
+  - blacklist = [:start, :information, :instructions, :waiting, :questionnaire, :submit, :submitted]
 
   - (steps - blacklist).each do |step|
+    - cpd_audit.render_step = step
+
     - if cpd_audit.dynamic_wizard_steps.keys.include?(step)
       - cpd_audit_level_section = cpd_audit.cpd_audit_level_section(step) || raise("no cpd audit section for #{step}")
       = render("effective/cpd_audits/cpd_audit_level_section", cpd_audit: cpd_audit, step: step, cpd_audit_level_section: cpd_audit_level_section)

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

@@ -1,4 +1,4 @@
-= card(cpd_audit.wizard_step_title(step)) do
+= wizard_card(cpd_audit) do
   %table.table.table-hover
     %thead
       %tr

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

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

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

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

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

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

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

@@ -0,0 +1,19 @@
+%h3 Missing Information
+%p The following information is missing:
+%ul
+  %li= resource.missing_info_reason
+
+%p
+  Please revisit each wizard step and
+  = link_to 'Complete all missing information', wizard_path(:information), class: 'btn btn-primary'
+  for this audit.
+
+%p
+  Once you're ready, click below to re-submit your audit with the updated information.
+
+%p
+  = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+    = f.hidden_field :id
+
+    - # If you change this label, update EffectiveMemberships ApplicantsController
+    = f.save 'Resubmit Audit', 'data-confirm': "Really re-submit?", class: 'btn-sm'

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

@@ -4,23 +4,41 @@
       %tr
         %th Auditee
         %td
-          = cpd_audit.user
-          %br
-          %small= mail_to cpd_audit.user.email
+          - if cpd_audit.anonymous?
+            %p= cpd_audit.anonymous_name
 
-      - if request.path.start_with?('/admin') && respond_to?(:edit_admin_user_path)
-        %tr
-          %th User
-          %td= link_to(cpd_audit.user, edit_admin_user_path(cpd_audit.user))
+          - if request.path.start_with?('/admin')
+            - url = (polymorphic_admin_path(cpd_audit.user) rescue "/admin/users/#{cpd_audit.user.to_param}/edit")
+            %p
+              = link_to(cpd_audit.user, url)
+              %br
+              %small= mail_to cpd_audit.user.email
+
+          - if cpd_audit.anonymous? == false
+            %p
+              = cpd_audit.user
+              %br
+              %small= mail_to cpd_audit.user.email
 
       %tr
         %th Audit Reviewer
         %td
           - cpd_audit.cpd_audit_reviews.each do |cpd_audit_review|
-            %p
-              = cpd_audit_review.user
-              %br
-              %small= mail_to cpd_audit_review.user.email
+            - if cpd_audit_review.anonymous?
+              %p= cpd_audit_review.anonymous_name
+
+            - if request.path.start_with?('/admin')
+              - url = (polymorphic_admin_path(cpd_audit_review.user) rescue "/admin/users/#{cpd_audit_review.user.to_param}/edit")
+              %p
+                = link_to(cpd_audit_review.user, url)
+                %br
+                %small= mail_to cpd_audit_review.user.email
+
+            - if cpd_audit_review.anonymous? == false
+              %p
+                = cpd_audit_review.user
+                %br
+                %small= mail_to cpd_audit_review.user.email
 
       %tr
         %th Date of notification
@@ -51,4 +69,4 @@
 
       %tr
         %th Summary
-        %td= cpd_audit_summary_text(cpd_audit)
+        %td= cpd_audit.summary

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

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

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

@@ -3,7 +3,11 @@
 
   %ul
     - resource.cpd_audit_reviews.each do |cpd_audit_review|
-      %li #{cpd_audit_review.user} <#{mail_to(cpd_audit_review.user.email)}>
+      %li
+        - if cpd_audit_review.anonymous?
+          = cpd_audit_review.name
+        - else
+          #{cpd_audit_review.user} <#{mail_to(cpd_audit_review.user.email)}>
 
   - if resource.deadline_to_conflict_of_interest.present? && !resource.ignore_deadlines?
     %p The deadline to declare a conflict of interest is: #{resource.deadline_to_conflict_of_interest.strftime('%F')}.

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

@@ -12,6 +12,7 @@
       - cpd_audit_response = resource.cpd_audit_response(cpd_audit_level_question)
 
       = f.fields_for :cpd_audit_responses, cpd_audit_response do |fcar|
+        %hr
         .mt-2= render('/effective/cpd_audit_responses/fields', f: fcar, cpd_audit_level_question: cpd_audit_level_question)
 
     - if cpd_audit_level_section.bottom_content.present?