effective_cpd 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80e098e09ddea7dbc4d43707500e647e1795dd750b63f6e21ac44512a430fbcb
-  data.tar.gz: 72590ba94aa5535c8431afb6bcd4a4ef1b4a90be5f21f120914c94dbcfbe4cd0
+  metadata.gz: 814bc46856da481c1463852a7bcf2070e48fb494fd107f28e11385b8e4c6a4a5
+  data.tar.gz: e304434f2182696dcd63a7ccefb8f06191230ec023988950c3efca2f74ccf23d
 SHA512:
-  metadata.gz: b3b459b4701245f5953e2ce0d01135dbc19e8d5587ba0a7e1b2e9de94897ae7c59e940b7bd8b3ad364e2bd1c8b78c617f83da2ffa075cb8e4fc19670d6b94f18
-  data.tar.gz: 238cc81c30a48006ca4e4886cdd654add4b322dd3bd612e5186e0b6fb15bb50a24639fa434639ca32d86506ef165a369ab22435f60d17c7a2e255f643975e42e
+  metadata.gz: d691015664b852d423d7dffe069b3ce96a3ad966918034cb1313325bcc0665a4a05b3bef44d205beccf0223cbc25429f0b806109f65579d62b13feddeed7c165
+  data.tar.gz: 732028a6c199f87be5e9cb3934ae9ba87b1d8a56b142ea2adddbec68f29b914535d79fe2a84e5603f402976dc4877dd46b0b5eecb5f56ccefc9cf735388907ba

data/app/controllers/effective/cpd_audits_controller.rb

@@ -32,6 +32,8 @@ module Effective
       when :extension
         params.require(:effective_cpd_audit)
           .permit(:current_step, :extension_request, :extension_request_date, :extension_request_reason)
+      when :cpd
+        params.require(:effective_cpd_audit).permit(:current_step)
       when :questionnaire
         params.require(:effective_cpd_audit).permit(:current_step)
       when :files

data/app/models/concerns/effective_cpd_user.rb

@@ -22,6 +22,10 @@ module EffectiveCpdUser
     nil
   end
 
+  def cpd_audit_cpd_required?
+    true
+  end
+
   module ClassMethods
     def effective_cpd_user?; true; end
   end

data/app/models/effective/cpd_audit.rb

@@ -56,6 +56,7 @@ module Effective
       exemption: 'Request Exemption',
       extension: 'Request Extension',
       waiting: 'Waiting',
+      cpd: 'CPD',
 
       questionnaire: 'Questionnaire',
       # ... There will be one step per cpd_audit_level_sections here
@@ -129,6 +130,21 @@ 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
+      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
+      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
+      deadline = deadline_to_extension()
+      self.errors.add(:base, 'deadline to request extension has already passed') if deadline && deadline < Time.zone.now
+    end
+
     validate(if: -> { determination.present? }) do
       unless cpd_audit_level.determinations.include?(determination)
         self.errors.add(:determination, 'must exist in this audit level')
@@ -146,25 +162,6 @@ module Effective
       persisted? ? "#{cpd_audit_level} Audit of #{user}" : 'audit'
     end
 
-    acts_as_wizard(
-      start: 'Start',
-      information: 'Information',
-      instructions: 'Instructions',
-
-      # These 4 steps are determined by audit_level settings
-      conflict: 'Conflict of Interest',
-      exemption: 'Request Exemption',
-      extension: 'Request Extension',
-      waiting: 'Waiting on Request',
-
-      questionaire: 'Questionaire',
-      # ... There will be one step per cpd_audit_level_sections here
-      files: 'Upload Resume',
-
-      submit: 'Confirm & Submit',
-      complete: 'Complete'
-    )
-
     def dynamic_wizard_steps
       cpd_audit_level.cpd_audit_level_sections.each_with_object({}) do |section, h|
         h["section#{section.position+1}".to_sym] = section.title
@@ -195,7 +192,7 @@ module Effective
         steps += [:waiting]
       end
 
-      steps += [:questionnaire] + dynamic_wizard_steps.keys + [:files, :submit, :complete]
+      steps += [:cpd, :questionnaire] + dynamic_wizard_steps.keys + [:files, :submit, :complete]
 
       steps
     end
@@ -314,6 +311,24 @@ module Effective
       send_email(:cpd_audit_extension_denied)
     end
 
+    # Require CPD step
+    def user_cpd_required?
+      return false unless user.cpd_audit_cpd_required?
+      required_cpd_cycle.present?
+    end
+
+    def user_cpd_completed?
+      return true if required_cpd_cycle.blank?
+      user.cpd_statements.any? { |s| s.completed? && s.cpd_cycle_id == required_cpd_cycle.id }
+    end
+
+    def required_cpd_cycle
+      @required_cpd_cycle ||= begin
+        last_year = ((notification_date || created_at || Time.zone.now) - 1.year).all_year
+        Effective::CpdCycle.available.where(start_at: last_year).first
+      end
+    end
+
     # Auditee wizard action
     def submit!
       submitted!

data/app/models/effective/cpd_audit_review.rb

@@ -7,7 +7,7 @@ module Effective
     belongs_to :cpd_audit_level
     belongs_to :user, polymorphic: true    # Auditor
 
-    has_many :cpd_audit_review_items, -> { CpdAuditReviewItem.sorted }, inverse_of: :cpd_audit_review
+    has_many :cpd_audit_review_items, -> { CpdAuditReviewItem.sorted }, inverse_of: :cpd_audit_review, dependent: :destroy
     accepts_nested_attributes_for :cpd_audit_review_items, reject_if: :all_blank, allow_destroy: true
 
     if respond_to?(:log_changes)

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

@@ -0,0 +1,13 @@
+= card(cpd_audit.wizard_step_title(step)) do
+  - cpd_cycle = cpd_audit.required_cpd_cycle
+
+  %table.table
+    %tbody
+      %tr
+        %th CPD Requirements
+        %td
+          - if cpd_audit.user_cpd_required? == false
+            Not required
+
+          - if cpd_cycle.present?
+            = cpd_cycle

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

@@ -5,7 +5,8 @@
     - resource.cpd_audit_reviews.each do |cpd_audit_review|
       %li #{cpd_audit_review.user} <#{mail_to(cpd_audit_review.user.email)}>
 
-  %p The deadline to declare a conflict of interest is: #{resource.deadline_to_conflict_of_interest.strftime('%F')}.
+  - if resource.deadline_to_conflict_of_interest.present?
+    %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|
     = f.hidden_field :current_step

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

@@ -0,0 +1,19 @@
+= render('layout') do
+  - cpd_cycle = resource.required_cpd_cycle
+
+  - if resource.user_cpd_required? == false
+    %p You are not required to submit a CPD statement at this time.
+  - elsif resource.user_cpd_completed?
+    %p Thank you! You have submitted a CPD statement for the required #{cpd_cycle} year.
+  - elsif cpd_cycle.present?
+    %p You must submit a CPD statement for the #{cpd_cycle} year before you may continue.
+
+  - if cpd_cycle.present?
+    %p= link_to("#{cpd_cycle} Statement", effective_cpd.cpd_cycle_cpd_statement_build_path(cpd_cycle, :new, :start), class: 'btn btn-primary', target: '_blank')
+
+  - if (resource.user_cpd_required? == false || resource.user_cpd_completed?)
+
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :current_step
+
+      = f.submit 'Save and Continue', center: true

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

@@ -2,7 +2,8 @@
   - if resource.was_exemption_requested?
     = render('effective/cpd_audits/exemption', cpd_audit: resource, step: :exemption)
 
-  %p The deadline to request an exemption is: #{resource.deadline_to_exemption.strftime('%F')}.
+  - if resource.deadline_to_exemption.present?
+    %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|
     = f.hidden_field :current_step

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

@@ -2,7 +2,8 @@
   - if resource.was_extension_requested?
     = render('effective/cpd_audits/extension', cpd_audit: resource, step: :extension)
 
-  %p The deadline to request an extension is: #{resource.deadline_to_extension.strftime('%F')}.
+  - if resource.deadline_to_extension.present?
+    %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|
     = f.hidden_field :current_step

data/config/routes.rb

@@ -41,7 +41,7 @@ EffectiveCpd::Engine.routes.draw do
     resources :cpd_audit_levels, except: [:show]
     resources :cpd_audit_level_questions, except: [:show]
 
-    resources :cpd_audits, except: [:show, :destroy]
+    resources :cpd_audits, except: [:show]
     resources :cpd_audit_reviews
   end
 

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-05 00:00:00.000000000 Z
+date: 2022-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -311,6 +311,7 @@ files:
 - app/views/effective/cpd_audit_reviews/submit.html.haml
 - app/views/effective/cpd_audit_reviews/waiting.html.haml
 - app/views/effective/cpd_audits/_conflict.html.haml
+- app/views/effective/cpd_audits/_cpd.html.haml
 - app/views/effective/cpd_audits/_cpd_audit.html.haml
 - app/views/effective/cpd_audits/_cpd_audit_level_section.html.haml
 - app/views/effective/cpd_audits/_exemption.html.haml
@@ -321,6 +322,7 @@ files:
 - app/views/effective/cpd_audits/_waiting.html.haml
 - app/views/effective/cpd_audits/complete.html.haml
 - app/views/effective/cpd_audits/conflict.html.haml
+- app/views/effective/cpd_audits/cpd.html.haml
 - app/views/effective/cpd_audits/cpd_audit_level_section.html.haml
 - app/views/effective/cpd_audits/exemption.html.haml
 - app/views/effective/cpd_audits/extension.html.haml