effective_cpd 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 502981a987e34f6022514dacb5bc5bbcc9f07a3290b607932c97f057a9a73ed0
-  data.tar.gz: 47d5f95962bdede3f7590d956c48fc5bded7fd1db9e3f2127400cf049f8f47d7
+  metadata.gz: 75542716498f715da71c8a166b9a38c5477329c9a44516222eb0fc2dc45e00b2
+  data.tar.gz: 6a1d3fe6ebd4aa13e4780ee9602dd12c15673688355526668589ebadba0c449b
 SHA512:
-  metadata.gz: 8368077022f74fd35ea5d2a33daa93f88315bbf7400f42ff4c9ff93144c361ac6f827740e6a7ef232520b1daae9fe3c00d5622d7779b22da10be26cade9c0577
-  data.tar.gz: 1ae3852f5a4cce0e49744e464f1fa912602496b440fcb8f3aaec8173fc768df1e85c85a81c3058ff41c26c044d3c0ada2d844970cc94ebe018e7b62787578f26
+  metadata.gz: d0a806c2098125510d69c5a13e4d89bf89e5b482f10bd776d9b597b19d1e35d98c153471d8cbef4804c5f1ddc2c5facfc050c9fc17303063a1d0ad061d0428d8
+  data.tar.gz: 0f1459d6954098fe7794118c28bd4f42333d2496f7ec884b676c72dd37ac528d75570a362777f13334787c6448d6f936aca7eb1f425cc17cda44606257018396

data/app/mailers/effective/cpd_mailer.rb

@@ -217,10 +217,13 @@ module Effective
           level: @cpd_audit.cpd_audit_level.to_s,
           determination: @cpd_audit.determination.to_s,
           missing_info_reason: @cpd_audit.missing_info_reason.to_s,
-          feedback: @cpd_audit.feedback.to_s,
+          feedback: (@cpd_audit.feedback.presence || 'No feedback was provided'),
         },
         auditee: {
           name: @cpd_audit.name,
+          real_name: @cpd_audit.user.to_s,
+          real_first_name: @cpd_audit.user.first_name,
+          real_last_name: @cpd_audit.user.last_name,
           email: (@cpd_audit.user.email unless @cpd_audit.anonymous?).to_s
         }
       }

data/app/models/concerns/effective_cpd_audit.rb

@@ -248,6 +248,7 @@ module EffectiveCpdAudit
     end
 
     def wizard_step_title(step)
+      return 'Closed' if step == :submitted && closed?
       self.class::WIZARD_STEPS[step] || dynamic_wizard_steps.fetch(step)
     end
 
@@ -666,7 +667,7 @@ module EffectiveCpdAudit
   end
 
   def feedback
-    cpd_audit_reviews.map(&:feedback).join('\n')
+    (cpd_audit_reviews.map(&:feedback) - [nil, '', ' ']).join("\n")
   end
 
 end

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

@@ -67,6 +67,13 @@
         %th Determination
         %td= cpd_audit.determination.presence || '-'
 
+      - if cpd_audit.closed?
+        %tr
+          %th Feedback
+          %td 
+            - feedback = cpd_audit.feedback.presence || 'No feedback was provided'
+            = simple_format(feedback)
+
       %tr
         %th Summary
         %td= cpd_audit.summary

data/app/views/effective/cpd_audits/submitted.haml

@@ -1,9 +1,9 @@
 = render('layout') do
   - raise('expected a submitted or conflicted cpd_audit') unless (resource.was_submitted? || resource.was_conflicted? || resource.closed?)
 
-  - if resource.was_submitted?
+  - if resource.closed?
     .alert.alert-success.mb-4
-      This #{cpd_audit_label} was submitted on #{resource.submitted_at.strftime('%F')}
+      This #{cpd_audit_label} was closed on #{resource.closed_at.strftime('%F')}
 
   - if resource.missing_info?
     = card do

data/app/views/effective/cpd_mailer/cpd_audit_closed.liquid

@@ -2,7 +2,7 @@
 subject: 'Your CPD Audit has been closed with a determination'
 from: 'admin@example.com'
 ---
-Hello {{ auditee.name }},
+Hello {{ auditee.real_first_name }},
 
 Your {{ audit.title }} has been closed.
 

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '1.7.1'
+  VERSION = '1.7.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2023-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails