effective_cpd 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86cc744bca079efc7c8980e61f35d8200c4b01efbc309481ad50bf9ffa8d885c
-  data.tar.gz: bd79c194bc5b49fa01777fd43e7cd6a9efd029b17ca70793ce54059a26656ac1
+  metadata.gz: cf98009925976387ffeafade80664bc5b17f9790b7172d0be90b84ed0ee86707
+  data.tar.gz: 073aa23104da3dbbf673798f27a6ffe80ea999b34fdc6df9cd7d08b5765897ec
 SHA512:
-  metadata.gz: b014a09d8642a8e61c82887ffd511883203b2c5bc06db5eaefd60765c17b2275b944e1d591dce8d0db2197c568f7f9ee4f276bcc7f175c99a0ced075542b07d7
-  data.tar.gz: bfd0c5a9a54df1b62de4c9345da508a9126ca2271480677bb8304b32b5d79085eca22a0c0502d8d56e496b7c88b845c00b59f287a378a2940c1208a1cc6cdc05
+  metadata.gz: e0b842326dc273ea10fe3232bbaea3266dd3ca43f248e0798fb5cee1db386da08befaa56f8880fcc43b5558d039926a9823000ea293d2d71f06f2e4dee9fa978
+  data.tar.gz: efb3b2c91cbf7976156f8bc169fd7f483399f10894a335b0a936cfd75f0235350d6af3e79e846ee22f40c6b91ed3f3c891cefe931b7212057073c5fcec2d5055

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/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.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-07 00:00:00.000000000 Z
+date: 2022-03-08 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