effective_cpd 1.7.0 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94c7c2fc57c5109c37e1ae0216f297eebb6556210e96db897e6592cd357b49e7
-  data.tar.gz: 2561bc3bae5ca830c72ad9b3499b0e303db66fa5121c685b2d15fb3a5743da85
+  metadata.gz: 75542716498f715da71c8a166b9a38c5477329c9a44516222eb0fc2dc45e00b2
+  data.tar.gz: 6a1d3fe6ebd4aa13e4780ee9602dd12c15673688355526668589ebadba0c449b
 SHA512:
-  metadata.gz: 750ffcaba4258184debafb988238cbe47774b19a74a494656d600dff4234fc1e94d057040f177f9c07348e81ad2f32258abe52f76b4d4e3a53fa163562586d97
-  data.tar.gz: 6571b2816b5616a2fd00928d3ebf142cf7ada391eccd5b7bfa9ca18e5ecc1708ba2d3728e5a67fe046b21879158d04ed2b45a5a3352faaae5dbcbfcc2bf28453
+  metadata.gz: d0a806c2098125510d69c5a13e4d89bf89e5b482f10bd776d9b597b19d1e35d98c153471d8cbef4804c5f1ddc2c5facfc050c9fc17303063a1d0ad061d0428d8
+  data.tar.gz: 0f1459d6954098fe7794118c28bd4f42333d2496f7ec884b676c72dd37ac528d75570a362777f13334787c6448d6f936aca7eb1f425cc17cda44606257018396

data/app/mailers/effective/cpd_mailer.rb

@@ -216,10 +216,14 @@ module Effective
           title: @cpd_audit.to_s,
           level: @cpd_audit.cpd_audit_level.to_s,
           determination: @cpd_audit.determination.to_s,
-          missing_info_reason: @cpd_audit.missing_info_reason.to_s
+          missing_info_reason: @cpd_audit.missing_info_reason.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
         }
       }
@@ -228,7 +232,8 @@ module Effective
         {
           review: {
             title: @cpd_audit_review.to_s,
-            recommendation: @cpd_audit_review.recommendation.to_s
+            recommendation: @cpd_audit_review.recommendation.to_s,
+            feedback: @cpd_audit_review.feedback.to_s,
           },
           reviewer: {
             name: @cpd_audit_review.name,

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
 
@@ -665,4 +666,8 @@ module EffectiveCpdAudit
     (current_user || user).class.send(EffectiveCpd.audit_reviewer_user_scope).sorted_by_in_progress_cpd_audit_reviews
   end
 
+  def feedback
+    (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,12 +2,16 @@
 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.
 
 The following determination was made: {{ audit.determination }}
 
+The following feedback was provided by the reviewer:
+
+{{ audit.feedback }}
+
 Please check below for any additional details
 
 {{ url }}

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '1.7.0'
+  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.0
+  version: 1.7.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-20 00:00:00.000000000 Z
+date: 2023-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -206,6 +206,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: Continuing professional development and audits rails engine
 email:
 - info@codeandeffect.com
@@ -483,7 +497,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Continuing professional development and audits rails engine