effective_cpd 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eed65d1a331a6a09e8f5435d1f200f646680773b271d0000358438c09122d29e
-  data.tar.gz: 117455812ab24c1d74a19ba95ca4eccfebc3d2085094c394b272c47464ca9907
+  metadata.gz: 68280b10b19be0a77c79173eb4428f429b8905cfeb252ceac7e1d72279da36a0
+  data.tar.gz: ca76a95fadc2e71549f943069e8403d6d3f70c349f5c22847ee48396e371e48d
 SHA512:
-  metadata.gz: fa0036e716e1c6b8871d4f149eb8e3f5c372d32888e8c4fd21c5bcda4763adb2eb069e4eaa77ff210172d4dcfff3c746fcc86c5e8720f83a133aa238a4481eb7
-  data.tar.gz: baca0a12db533c7f1fc5dbb1ba9f1ae180b44aa18f30aa0bd360cff51898a4d1e24028f5f30a763e1cd01448bcabff2c3a5a533f6410dbfd0b6eece12ab32f40
+  metadata.gz: 4ca2c3fa8c4af2d901fedbcb5859dc2b09be5f99783cbaaf18d4bf2b858830116fe91e9caf51f741b4597283212685125237b6f10b62278d6103498908d3bb50
+  data.tar.gz: 21b70b0f7f7e22169059c0df7e3b8cd098e4ac117e7580c42329b2cd2c7c4b04c0c4c6dda76f0e9762a9510318e17f19671a94c1f87d6171f93799d7019af81b

data/README.md

@@ -167,6 +167,14 @@ def cpd_statement_required_score(cpd_statement)
 end
 ```
 
+## Rake Tasks
+
+You can use
+
+`bundle exec rake effective_cpd:notify_auditees`
+
+to send the cpd_audit_opened notification to all opened (but not yet started) auditees.
+
 ## Authorization
 
 All authorization checks are handled via the effective_resources gem found in the `config/initializers/effective_resources.rb` file.

data/app/controllers/admin/cpd_audits_controller.rb

@@ -15,7 +15,7 @@ module Admin
       ].compact.join(' ')
     }
 
-    submit :close, 'Close Audit', success: -> {
+    submit :close, 'Close', success: -> {
       [
         "Successfully closed #{resource}",
         ("and sent #{resource.user.email} a notification" unless resource.email_form_skip?)
@@ -36,17 +36,17 @@ module Admin
       ].compact.join(' ')
     }
 
-    submit :complete, 'Complete Audit', success: -> {
+    submit :complete, 'Complete', success: -> {
       [
         "Successfully completed #{resource}",
-        ("and sent reviewers an audit ready notification" unless resource.email_form_skip)
+        ("and sent notifications" unless resource.email_form_skip)
       ].compact.join(' ')
     }
 
     submit :complete, 'Ready to Review', success: -> {
       [
         "Successfully completed #{resource}",
-        ("and sent reviewers an audit ready notification" unless resource.email_form_skip)
+        ("and sent notifications" unless resource.email_form_skip)
       ].compact.join(' ')
     }
 

data/app/controllers/admin/cpd_statement_activities_controller.rb

@@ -5,11 +5,9 @@ module Admin
 
     include Effective::CrudController
 
-    page_title(only: :index) { "#{EffectiveCpd.program_label} Statement Activities" }
-
-    # def permitted_params
-    #   params.require(:effective_cpd_statement).permit!
-    # end
+    def permitted_params
+      params.require(:effective_cpd_statement_activity).permit!
+    end
 
   end
 end

data/app/controllers/admin/cpd_statements_controller.rb

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

data/app/controllers/effective/cpd_audits_controller.rb

@@ -6,7 +6,7 @@ module Effective
 
     resource_scope -> { EffectiveCpd.CpdAudit.deep.where(user: current_user) }
 
-    submit :resubmit, 'Resubmit Audit'
+    submit :resubmit, 'Resubmit'
 
     page_title 'Chat', only: [:chat]
 

data/app/datatables/admin/effective_cpd_audit_reviews_datatable.rb

@@ -2,8 +2,8 @@ module Admin
   class EffectiveCpdAuditReviewsDatatable < Effective::Datatable
     filters do
       scope :all
-      scope :completed
       scope :available, label: 'In Progress'
+      scope :completed
     end
 
     datatable do
@@ -11,22 +11,22 @@ module Admin
       col :updated_at, visible: false
       col :id, visible: false
 
-      col :cpd_audit
-      col :cpd_audit_level, search: EffectiveCpd.CpdAuditLevel.all.sorted
+      col :cpd_audit, label: cpd_audit_label
+      col :cpd_audit_level, label: cpd_audit_level_label, search: EffectiveCpd.CpdAuditLevel.all.sorted
 
-      col :auditee do |cpd_audit_review|
+      col :auditee, label: cpd_auditee_label do |cpd_audit_review|
         user = cpd_audit_review.cpd_audit.user
         url = "/admin/users/#{user.to_param}/edit"
         link_to(user, url)
       end
 
-      col :user, label: 'Audit Reviewer'
+      col :user, label: cpd_reviewer_label
 
       col :due_date
       col :submitted_at, as: :date, label: 'Submitted'
       col :conflict_of_interest
       col :recommendation
-      col :comments, label: 'Reviewer notes'
+      col :comments
 
       actions_col(edit: false)
     end

data/app/datatables/admin/effective_cpd_audits_datatable.rb

@@ -6,8 +6,8 @@ module Admin
       scope :available, label: 'In Progress'
       scope :done
       scope :waiting_on_admin
-      scope :waiting_on_auditee
-      scope :waiting_on_reviewers
+      scope :waiting_on_auditee, label: "Waiting on #{cpd_auditee_label}"
+      scope :waiting_on_reviewers, label: "Waiting on #{cpd_reviewers_label}"
     end
 
     datatable do
@@ -19,11 +19,11 @@ module Admin
 
       col :token, visible: false
 
-      col :cpd_audit_level, label: 'Audit Level', search: EffectiveCpd.CpdAuditLevel.sorted.all
+      col :cpd_audit_level, label: cpd_audit_level_label, search: EffectiveCpd.CpdAuditLevel.sorted.all
 
-      col :user, search: :string, label: 'Auditee'
+      col :user, search: :string
 
-      col(:cpd_audit_reviews, label: 'Auditor Reviewers', search: :string) do |cpd_audit|
+      col(:cpd_audit_reviews, search: :string) do |cpd_audit|
         cpd_audit.cpd_audit_reviews.map(&:user).map do |user|
           content_tag(:div, class: 'col-resource_item') do
             url = view.respond_to?(:edit_admin_user_path) ? edit_admin_user_path(user) : "/admin/users/#{user.to_param}/edit"
@@ -42,8 +42,8 @@ module Admin
         end
       end
 
-      col :notification_date, label: 'Date of Notification'
-      col :extension_date, label: 'Approved Extension Date', visible: false
+      col :notification_date
+      col :extension_date, visible: false
       col :due_date
 
       col :status
@@ -54,7 +54,7 @@ module Admin
         end.join.html_safe
       end
 
-      col(:cpd_audit_reveiw_item_recommendations, label: 'Item Recommendations', search: :string, visible: false) do |cpd_audit|
+      col(:cpd_audit_review_item_recommendations, label: 'Item Recommendations', search: :string, visible: false) do |cpd_audit|
         recommendations = cpd_audit.cpd_audit_reviews.map(&:recommendation)
         item_recommendations = cpd_audit.cpd_audit_reviews.flat_map { |r| r.cpd_audit_review_items.map(&:recommendation) }
 
@@ -62,7 +62,7 @@ module Admin
         reviews.to_sentence
       end
 
-      col(:cpd_audit_comments, label: 'Reviewer Comments', search: :string, visible: false) do |cpd_audit|
+      col(:cpd_audit_comments, search: :string, visible: false) do |cpd_audit|
         item_comments = cpd_audit.cpd_audit_reviews.flat_map { |r| r.cpd_audit_review_items.map(&:comments) }.join
 
         cpd_audit.cpd_audit_reviews.map(&:comments).map do |comments|
@@ -72,7 +72,7 @@ module Admin
 
       col :determination
 
-      col(:auditee_cpd_statements, label: 'Auditee Statements', visible: false) do |cpd_audit|
+      col(:auditee_cpd_statements, visible: false) do |cpd_audit|
         cpd_audit.user.cpd_statements.map do |cpd_statement|
           content_tag(:div, class: 'col-resource_item') do
             link_to(cpd_statement.to_s, effective_cpd.admin_cpd_statement_path(cpd_statement))

data/app/datatables/admin/effective_cpd_bulk_audits_datatable.rb

@@ -8,11 +8,10 @@ module Admin
       col :updated_at, label: 'Updated', visible: false
       col :created_at, label: 'Created'
 
-      col :cpd_audit_level
-      col :audits
-      col :audit_reviewers_per_audit
+      col :cpd_audit_level, label: cpd_audit_level_label
+      col :audits, label: cpd_audits_label
+      col :audit_reviewers_per_audit, label: "#{cpd_reviewers_label} per #{cpd_audit_label}"
       col :notification_date
-      col :email_form_skip
 
       actions_col
     end

data/app/datatables/admin/effective_cpd_rules_datatable.rb

@@ -12,7 +12,7 @@ module Admin
       col :created_at, visible: false
       col :updated_at, visible: false
 
-      col :cpd_cycle,label: cpd_cycle_label.titleize
+      col :cpd_cycle
 
       col :ruleable, label: 'Category or Activity', search: {
         collection: {
@@ -26,10 +26,10 @@ module Admin
         content_tag(:div, cpd_activity.formula, style: 'white-space: nowrap;')
       end
 
-      col :credit_description
+      col :credit_description, label: "#{cpd_credit_label} Description"
 
-      col :max_credits_per_cycle, label: 'Max ' + cpd_credits_label.titleize
-      col :max_cycles_can_carry_forward, label: 'Max ' + cpd_cycles_label.titleize
+      col :max_credits_per_cycle, label: 'Max ' + cpd_credits_label
+      col :max_cycles_can_carry_forward, label: 'Max ' + cpd_cycles_label
 
       col :unavailable
 

data/app/datatables/admin/effective_cpd_special_rules_datatable.rb

@@ -5,12 +5,12 @@ module Admin
       col :created_at, visible: false
       col :updated_at, visible: false
 
-      col :cpd_cycle, label: cpd_cycle_label.titleize
+      col :cpd_cycle
 
       col :cpd_rules
 
       col :category
-      col :max_credits_per_cycle, label: 'Max ' + cpd_credits_label.titleize
+      col :max_credits_per_cycle, label: 'Max ' + cpd_credits_label
 
       actions_col
     end

data/app/datatables/admin/effective_cpd_statement_activities_datatable.rb

@@ -13,15 +13,15 @@ module Admin
       col :created_at, visible: false
       col :updated_at, visible: false
 
-      col :cpd_cycle, label: cpd_cycle_label.capitalize, search: Effective::CpdCycle.sorted
-      col :cpd_statement, visible: false
+      col :cpd_cycle, search: Effective::CpdCycle.sorted
+      col :cpd_statement, label: cpd_statement_label, visible: false
 
       col :user
 
       col :date
       col :description
 
-      col :score, label: cpd_credits_label.capitalize do |csa|
+      col :score, label: cpd_credits_label do |csa|
         cpd_score(csa.score)
       end
 

data/app/datatables/admin/effective_cpd_statements_datatable.rb

@@ -14,7 +14,7 @@ module Admin
       col :created_at, visible: false
       col :updated_at, visible: false
 
-      col :cpd_cycle, label: cpd_cycle_label.capitalize, search: Effective::CpdCycle.sorted
+      col :cpd_cycle, search: Effective::CpdCycle.sorted
       col :user
       col :submitted_at, as: :date, label: 'Submitted on'
 

data/app/datatables/effective_cpd_available_audit_reviews_datatable.rb

@@ -6,9 +6,9 @@ class EffectiveCpdAvailableAuditReviewsDatatable < Effective::Datatable
 
     col :token, visible: false
 
-    col :cpd_audit_level, label: 'Audit'
+    col :cpd_audit_level, label: cpd_audit_level_label
     col :due_date
-    col :name, label: 'Auditee', action: false
+    col :name, label: cpd_auditee_label, action: false
 
     col :ready_to_review do |cpd_audit|
       cpd_audit.ready_to_review? ? 'Yes' : 'No'

data/app/datatables/effective_cpd_available_audits_datatable.rb

@@ -6,7 +6,7 @@ class EffectiveCpdAvailableAuditsDatatable < Effective::Datatable
 
     col :token, visible: false
 
-    col :cpd_audit_level, label: 'Audit'
+    col :cpd_audit_level, label: cpd_audit_level_label
     col :due_date
     col :status
     col :determination

data/app/datatables/effective_cpd_available_cycles_datatable.rb

@@ -6,7 +6,7 @@ class EffectiveCpdAvailableCyclesDatatable < Effective::Datatable
 
     col :start_at, visible: false
 
-    col(:title, label: cpd_cycle_label.titleize)
+    col(:title, label: cpd_cycle_label)
     col :available_date, label: 'Available'
 
     col :required_score, label: 'Required' do |cpd_cycle|

data/app/datatables/effective_cpd_completed_audit_reviews_datatable.rb

@@ -6,9 +6,9 @@ class EffectiveCpdCompletedAuditReviewsDatatable < Effective::Datatable
 
     col :token, visible: false
 
-    col :cpd_audit_level, label: 'Audit'
-    col :notification_date, label: 'Date of Notification'
-    col :name, label: 'Auditee', action: false
+    col :cpd_audit_level, label: cpd_audit_level_label
+    col :notification_date
+    col :name, label: cpd_auditee_label, action: false
 
     col :recommendation do |cpd_audit|
       cpd_audit.cpd_audit_reviews.find { |r| r.user_id == current_user.id }.recommendation

data/app/datatables/effective_cpd_completed_audits_datatable.rb

@@ -6,8 +6,8 @@ class EffectiveCpdCompletedAuditsDatatable < Effective::Datatable
 
     col :token, visible: false
 
-    col :cpd_audit_level, label: 'Audit'
-    col :notification_date, label: 'Date of Notification'
+    col :cpd_audit_level, label: cpd_audit_level_label
+    col :notification_date
     col :status
     col :determination
 

data/app/datatables/effective_cpd_completed_statements_datatable.rb

@@ -4,12 +4,12 @@ class EffectiveCpdCompletedStatementsDatatable < Effective::Datatable
   datatable do
     order :cpd_cycle_id
 
-    col(:cpd_cycle_id, label: 'Statement') do |statement|
+    col(:cpd_cycle_id, label: cpd_statement_label) do |statement|
       statement.cpd_cycle.to_s
     end
 
-    col :submitted_at, as: :date, label: 'Submitted'
-    col :score, label: cpd_credits_label.capitalize
+    col :submitted_at
+    col :score, label: cpd_credits_label
 
     col :required_score, label: 'Required' do |cpd_statement|
       cpd_score(cpd_statement.required_score || cpd_statement.targeted_score)

data/app/helpers/effective_cpd_audits_helper.rb

@@ -21,8 +21,7 @@ module EffectiveCpdAuditsHelper
 
     users.map do |user|
       in_progress = content_tag(:span, class: 'badge badge-info') do
-        reviews = user.cpd_audit_reviews.count { |review| review.in_progress? }
-        "#{pluralize(reviews, 'review')} in progress"
+        user.cpd_audit_reviews.count { |review| review.in_progress? }.to_s + ' in progress'
       end
 
       html = content_tag(:div, "#{user} #{in_progress}")

data/app/helpers/effective_cpd_helper.rb

@@ -1,19 +1,71 @@
 module EffectiveCpdHelper
 
+  def cpd_name_label
+    et('effective_cpd.name')
+  end
+
+  def cpd_credit_label
+    et('effective_cpd.credit')
+  end
+
+  def cpd_credits_label
+    ets('effective_cpd.credit')
+  end
+
   def cpd_cycle_label
-    (EffectiveCpd.cycle_label || '').to_s.html_safe
+    et(Effective::CpdCycle)
   end
 
   def cpd_cycles_label
-    (EffectiveCpd.cycle_label || '').to_s.pluralize.html_safe
+    ets(Effective::CpdCycle)
   end
 
-  def cpd_credit_label
-    (EffectiveCpd.credit_label || '').to_s.html_safe
+  def cpd_statement_label
+    et(EffectiveCpd.CpdStatement)
   end
 
-  def cpd_credits_label
-    (EffectiveCpd.credit_label || '').to_s.pluralize.html_safe
+  def cpd_statements_label
+    ets(EffectiveCpd.CpdStatement)
+  end
+
+  def cpd_audit_label
+    et(EffectiveCpd.CpdAudit)
+  end
+
+  def cpd_audits_label
+    ets(EffectiveCpd.CpdAudit)
+  end
+
+  def cpd_audit_review_label
+    et(EffectiveCpd.CpdAuditReview)
+  end
+
+  def cpd_audit_reviews_label
+    ets(EffectiveCpd.CpdAuditReview)
+  end
+
+  def cpd_auditee_label
+    et(EffectiveCpd.CpdAudit, :user)
+  end
+
+  def cpd_auditees_label
+    ets(EffectiveCpd.CpdAudit, :user)
+  end
+
+  def cpd_reviewer_label
+    et(EffectiveCpd.CpdAuditReview, :user)
+  end
+
+  def cpd_reviewers_label
+    ets(EffectiveCpd.CpdAuditReview, :user)
+  end
+
+  def cpd_audit_level_label
+    et(EffectiveCpd.CpdAuditLevel)
+  end
+
+  def cpd_audit_levels_label
+    ets(EffectiveCpd.CpdAuditLevel)
   end
 
   def cpd_rule_formula_hint(cpd_activity)

data/app/models/concerns/effective_cpd_audit.rb

@@ -226,7 +226,7 @@ module EffectiveCpdAudit
 
     validate(if: -> { determination.present? }) do
       unless cpd_audit_level.determinations.include?(determination)
-        self.errors.add(:determination, 'must exist in this audit level')
+        self.errors.add(:determination, 'is not included')
       end
     end
 
@@ -240,9 +240,7 @@ module EffectiveCpdAudit
     before_save(if: -> { submitted? }) { try_complete! }
     before_save(if: -> { completed? }) { try_review! }
 
-    after_commit(on: :create) do
-      send_email(:cpd_audit_opened)
-    end
+    after_commit(on: :create) { notify! }
 
     def dynamic_wizard_steps
       cpd_audit_level.cpd_audit_level_sections.each_with_object({}) do |section, h|
@@ -314,7 +312,7 @@ module EffectiveCpdAudit
   end
 
   def to_s
-    (cpd_audit_level.present? && name.present?) ? "#{cpd_audit_level} Audit of #{name}" : 'audit'
+    (cpd_audit_level.present? && name.present?) ? "#{cpd_audit_level} #{model_name.human} of #{name}" : model_name.human
   end
 
   def name
@@ -362,41 +360,46 @@ module EffectiveCpdAudit
   end
 
   def summary
+    audit = model_name.human
+    auditee = EffectiveCpd.CpdAudit.human_attribute_name(:user)
+    reviewer = EffectiveCpd.CpdAuditReview.human_attribute_name(:user)
+    reviewers = EffectiveCpd.CpdAuditReview.human_attribute_name(:user).pluralize
+
     case status_was
     when 'opened'
-      "The audit has been opened. The auditee and audit reviewers have been notified. Waiting for the auditee to submit their audit questionnaire."
+      "The #{audit} has been opened. The #{auditee} and #{reviewers} have been notified. Waiting for the #{auditee} to submit."
     when 'started'
-      "The auditee has begun their audit questionnaire. Waiting for the auditee to submit their audit questionnaire."
+      "The #{auditee} has started their #{audit}. Waiting for the #{auditee} to submit."
     when 'conflicted'
-      "The auditee has declared a conflict of interest. A new reviewer will be assigned."
+      "The #{auditee} has declared a conflict of interest. A new #{reviewer} will be assigned."
     when 'conflicted_resolved'
-      "The auditee had declared a conflict of interest. This has been resolved. Waiting for the auditee to submit their audit questionnaire."
+      "The #{auditee} had declared a conflict of interest. This has been resolved. Waiting for the #{auditee} to submit."
     when 'exemption_requested'
-      "The auditee has requested an exemption. Waiting for request to be granted or denied."
+      "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."
+      "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."
+      "The exemption request has been denied. The #{audit} will continue. Waiting for the #{auditee} to submit."
     when 'extension_requested'
-      "The auditee has requested an extension. Waiting for request to be granted or denied."
+      "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."
+      "The extension request has been granted. There is a new deadline. Waiting for the #{auditee} to submit."
     when 'extension_denied'
-      "The extension request has been denied. The deadline remains. Waiting for the auditee to submit their audit questionnaire."
+      "The extension request has been denied. The deadline remains. Waiting for the #{auditee} to submit."
     when 'submitted'
-      summary = "Auditee has submitted their audit wizard."
+      summary = "#{auditee} has submitted their #{audit} wizard."
       tasks = "The following tasks remain before it can be completed:"
       approval = "Waiting on completeness check, review and determination."
       items = completed_requirements.map { |item, done| "<li>#{item}: #{done ? 'Complete' : 'Incomplete'}</li>" }.join
       completed_requirements.present? ? "<p>#{summary} #{tasks}</p><ul>#{items}</ul>" : "#{summary} #{approval}"
     when 'completed'
-      "All required materials have been provided. Ready to review. This audit will transition to 'reviewed' after all reviewers have finished."
+      "All required materials have been provided. Ready to review. This #{audit} will transition to 'reviewed' after all #{reviewers} have submitted."
     when 'missing_info'
       "Missing the following information: <ul><li>#{missing_info_reason}</li></ul>"
     when 'reviewed'
-      "The audit has been reviewed and is ready for the final determination to be made."
+      "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 #{determination}. All done."
+      "This #{audit} has been closed with a final determination #{determination}. All done."
     else
       raise("unexpected status #{status}")
     end.html_safe
@@ -413,6 +416,11 @@ module EffectiveCpdAudit
     cpd_audit_response ||= cpd_audit_responses.build(cpd_audit: self, cpd_audit_level_question: cpd_audit_level_question)
   end
 
+  def notify!
+    send_email(:cpd_audit_opened)
+    true
+  end
+
   # Auditee wizard action
   def start!
     started!

data/app/models/concerns/effective_cpd_audit_level.rb

@@ -100,7 +100,7 @@ module EffectiveCpdAuditLevel
   end
 
   def to_s
-    title.presence || 'audit level'
+    title.presence || model_name.human
   end
 
   def determinations

data/app/models/concerns/effective_cpd_audit_review.rb

@@ -178,7 +178,7 @@ module EffectiveCpdAuditReview
   end
 
   def to_s
-    persisted? ? "#{cpd_audit_level} Audit Review by #{name}" : 'audit review'
+    persisted? ? "#{cpd_audit_level} #{model_name.human} by #{name}" : model_name.human
   end
 
   def name

data/app/models/concerns/effective_cpd_bulk_audit.rb

@@ -80,7 +80,7 @@ module EffectiveCpdBulkAudit
   end
 
   def to_s
-    'bulk audit'
+    model_name.human
   end
 
   def cpd_user_scope

data/app/models/concerns/effective_cpd_statement.rb

@@ -96,7 +96,7 @@ module EffectiveCpdStatement
   end
 
   def to_s
-    cpd_cycle.present? ? "#{cpd_cycle} Statement" : 'statement'
+    cpd_cycle.present? ? "#{cpd_cycle} #{model_name.human}" : model_name.human
   end
 
   def import!(date: nil)

data/app/models/effective/cpd_activity.rb

@@ -44,7 +44,7 @@ module Effective
     end
 
     def to_s
-      title.presence || 'activity'
+      title.presence || model_name.human
     end
 
     def amount_static?

data/app/models/effective/cpd_audit_level_question.rb

@@ -84,7 +84,7 @@ module Effective
     end
 
     def to_s
-      title.presence || 'audit question'
+      title.presence || model_name.human
     end
 
   end

data/app/models/effective/cpd_audit_level_question_option.rb

@@ -27,7 +27,7 @@ module Effective
     end
 
     def to_s
-      title.presence || 'New Audit Question Option'
+      title.presence || model_name.human
     end
 
   end

data/app/models/effective/cpd_audit_level_section.rb

@@ -44,7 +44,7 @@ module Effective
     end
 
     def to_s
-      title.presence || 'audit section'
+      title.presence || "New Section" # Don't humanize this one
     end
 
   end

data/app/models/effective/cpd_audit_response.rb

@@ -60,7 +60,7 @@ module Effective
       length: { maximum: 5, message: 'please select 5 options or fewer' }
 
     def to_s
-      'audit response'
+      model_name.human
     end
 
     def response

data/app/models/effective/cpd_audit_review_item.rb

@@ -27,7 +27,7 @@ module Effective
     end
 
     def to_s
-      recommendation.presence || 'cpd audit review item'
+      recommendation.presence || model_name.human
     end
 
   end