effective_cpd 0.3.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9940c548d939b8c1a285db0e19877bd4ed2147001fbebc947aaf6e02d548def6
-  data.tar.gz: 0547a9982f49587cbe07f2d3b65b6ab0da31be1728d7a55541cebd48cb560dde
+  metadata.gz: e6bed34a47adc51ccbd8130374137416ce8c7eb58ad7d3594db16b4498ee889c
+  data.tar.gz: 8ef171411108e7e5d203c72733e12c597b99fed21ab7bb74f27097d6da4f797c
 SHA512:
-  metadata.gz: bc621cc69009ae0a6629d11f07b8fcabcbf9aafe011649b441d096e90754938104b24c5633b0b7374f298b005d4e558a2f6ebcdca1c19b2b442883d4a7e3e018
-  data.tar.gz: dca45ea584ab120514a7fb2d4231d2d19bcd373f84066e16ad57af2d05b46e605e7692d22e6e18c46913a3af233022dbac597672cacf337d7d350e80ae0b9030
+  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/app/models/effective/cpd_audit.rb

@@ -76,6 +76,9 @@ module Effective
       # Final determination
       determination            :string
 
+      # Override Deadlines
+      ignore_deadlines         :boolean
+
       # Auditee response
       conflict_of_interest          :boolean
       conflict_of_interest_reason   :text
@@ -130,17 +133,17 @@ module Effective
     validates :extension_request_date, presence: true, if: -> { extension_request? }
     validates :extension_request_reason, presence: true, if: -> { extension_request? }
 
-    validate(if: -> { current_step == :conflict && conflict_of_interest? }) do
+    validate(if: -> { current_step == :conflict && conflict_of_interest? && !ignore_deadlines? }) do
       deadline = deadline_to_conflict_of_interest()
       self.errors.add(:base, 'deadline to declare conflict of interest has already passed') if deadline && deadline < Time.zone.now
     end
 
-    validate(if: -> { current_step == :exemption && exemption_request? }) do
+    validate(if: -> { current_step == :exemption && exemption_request? && !ignore_deadlines? }) do
       deadline = deadline_to_exemption()
       self.errors.add(:base, 'deadline to request exemption has already passed') if deadline && deadline < Time.zone.now
     end
 
-    validate(if: -> { current_step == :extension && extension_request? }) do
+    validate(if: -> { current_step == :extension && extension_request? && !ignore_deadlines? }) do
       deadline = deadline_to_extension()
       self.errors.add(:base, 'deadline to request extension has already passed') if deadline && deadline < Time.zone.now
     end

data/app/views/admin/cpd_audits/_form.html.haml

@@ -17,6 +17,9 @@
       = tab 'Audit' do
         = render 'effective/cpd_audits/cpd_audit', cpd_audit: cpd_audit
 
+    = tab 'Deadlines' do
+      = render 'admin/cpd_audits/form_deadlines', cpd_audit: cpd_audit
+
     = tab 'Statements' do
       - datatable = Admin::EffectiveCpdStatementsDatatable.new(user_id: cpd_audit.user.id, user_type: cpd_audit.user.class.name)
       = render_datatable(datatable, inline: true, simple: true)

data/app/views/admin/cpd_audits/_form_deadlines.html.haml

@@ -0,0 +1,12 @@
+= card('Deadlines') do
+  = effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
+    %p The audittee has the following deadlines:
+
+    %ul
+      %li To declare conflict of interest: #{f.object.deadline_to_conflict_of_interest}
+      %li To request exemption: #{f.object.deadline_to_exemption}
+      %li To request extension: #{f.object.deadline_to_extension}
+
+    = f.check_box :ignore_deadlines, label: 'Yes, ignore audittee deadlines and allow these actions to be performed'
+
+    = f.submit 'Save', center: true

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

@@ -1,22 +1,23 @@
 = render('layout') do
-  - raise('expected a submitted cpd_audit') unless resource.was_submitted?
+  - raise('expected a submitted cpd_audit') unless resource.was_submitted? || resource.closed?
 
-  .text-center
-    .row
-      .col-2
-      .col-8
-        .alert.alert-success Audit Submitted!
+  - if resource.was_submitted?
+    .text-center
+      .row
+        .col-2
+        .col-8
+          .alert.alert-success Audit Submitted!
 
-  %p
-    The following audit was successfully submitted at
-    = succeed('.') do
-      = resource.submitted_at.strftime('%F')
+    %p
+      The following audit was successfully submitted at
+      = succeed('.') do
+        = resource.submitted_at.strftime('%F')
 
-    - unless resource.determination.present?
-      Your audit must be reviewed and a final determination made.
-      We will send
-      %strong= resource.user.email
-      an email notifying you of the determination.
+      - unless resource.determination.present?
+        Your audit must be reviewed and a final determination made.
+        We will send
+        %strong= resource.user.email
+        an email notifying you of the determination.
 
   .mb-4= render(resource)
 

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

@@ -5,7 +5,7 @@
     - resource.cpd_audit_reviews.each do |cpd_audit_review|
       %li #{cpd_audit_review.user} <#{mail_to(cpd_audit_review.user.email)}>
 
-  - if resource.deadline_to_conflict_of_interest.present?
+  - 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')}.
 
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|

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

@@ -2,7 +2,7 @@
   - if resource.was_exemption_requested?
     = render('effective/cpd_audits/exemption', cpd_audit: resource, step: :exemption)
 
-  - if resource.deadline_to_exemption.present?
+  - if resource.deadline_to_exemption.present? && !resource.ignore_deadlines?
     %p The deadline to request an exemption is: #{resource.deadline_to_exemption.strftime('%F')}.
 
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|

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

@@ -2,7 +2,7 @@
   - if resource.was_extension_requested?
     = render('effective/cpd_audits/extension', cpd_audit: resource, step: :extension)
 
-  - if resource.deadline_to_extension.present?
+  - if resource.deadline_to_extension.present? && !resource.ignore_deadlines?
     %p The deadline to request an extension is: #{resource.deadline_to_extension.strftime('%F')}.
 
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|

data/db/migrate/01_create_effective_cpd.rb.erb

@@ -176,6 +176,8 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
       t.date :notification_date
       t.date :extension_date
 
+      t.boolean :ignore_deadlines, default: false
+
       t.string :determination
 
       t.boolean :conflict_of_interest

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '0.3.0'
+  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.0
+  version: 0.3.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-07 00:00:00.000000000 Z
+date: 2022-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -246,6 +246,7 @@ files:
 - app/views/admin/cpd_audits/_auditee_fields.html.haml
 - app/views/admin/cpd_audits/_form.html.haml
 - app/views/admin/cpd_audits/_form_conflict.html.haml
+- app/views/admin/cpd_audits/_form_deadlines.html.haml
 - app/views/admin/cpd_audits/_form_determination.html.haml
 - app/views/admin/cpd_audits/_form_exemption.html.haml
 - app/views/admin/cpd_audits/_form_extension.html.haml