effective_cpd 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf98009925976387ffeafade80664bc5b17f9790b7172d0be90b84ed0ee86707
-  data.tar.gz: 073aa23104da3dbbf673798f27a6ffe80ea999b34fdc6df9cd7d08b5765897ec
+  metadata.gz: e6bed34a47adc51ccbd8130374137416ce8c7eb58ad7d3594db16b4498ee889c
+  data.tar.gz: 8ef171411108e7e5d203c72733e12c597b99fed21ab7bb74f27097d6da4f797c
 SHA512:
-  metadata.gz: e0b842326dc273ea10fe3232bbaea3266dd3ca43f248e0798fb5cee1db386da08befaa56f8880fcc43b5558d039926a9823000ea293d2d71f06f2e4dee9fa978
-  data.tar.gz: efb3b2c91cbf7976156f8bc169fd7f483399f10894a335b0a936cfd75f0235350d6af3e79e846ee22f40c6b91ed3f3c891cefe931b7212057073c5fcec2d5055
+  metadata.gz: dda9b3ec1334ebe58aad35f13e47cca0a69c9711018046454a49aa0ae3d293b2813b871678681c360d2057923877103f2f9831ed02787e0dfadd66a93a435ae9
+  data.tar.gz: c7e0f49c69d1fc1c1513fc4bee4d5acd16ff4c28833c6d56179c805db928f5a0efe2bd4c35ee8af5f688c2a2a51745b62a2a967b5dbdab5bdb49a64a04257434

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 :available, label: 'In Progress'
       scope :completed
+      scope :available, label: 'In Progress'
     end
 
     datatable do
@@ -12,7 +12,14 @@ module Admin
       col :id, visible: false
 
       col :cpd_audit
+
+      col :auditee do |cpd_audit_review|
+        user = cpd_audit_review.cpd_audit.user
+        link_to(user, edit_admin_user_path(user))
+      end
+
       col :user, label: 'Audit Reviewer'
+
       col :due_date
       col :submitted_at, as: :date, label: 'Submitted'
       col :conflict_of_interest

data/app/datatables/admin/effective_cpd_audits_datatable.rb

@@ -47,6 +47,29 @@ module Admin
       col :due_date
 
       col :status
+
+      col(:cpd_audit_recommendations, label: 'Recommendation', visible: false) do |cpd_audit|
+        cpd_audit.cpd_audit_reviews.map(&:recommendation).map do |recommendation|
+          content_tag(:div, recommendation.to_s, class: 'col-resource_item')
+        end.join.html_safe
+      end
+
+      col(:cpd_audit_reveiw_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) }
+
+        reviews = ((recommendations + item_recommendations) - ['', nil]).uniq
+        reviews.to_sentence
+      end
+
+      col(:cpd_audit_comments, label: 'Reviewer 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|
+          content_tag(:div, simple_format(comments.to_s + item_comments), class: 'col-resource_item')
+        end.join.html_safe
+      end
+
       col :determination
 
       col(:auditee_cpd_statements, label: 'Auditee Statements', visible: false) do |cpd_audit|

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-08 00:00:00.000000000 Z
+date: 2022-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails