effective_cpd 1.4.4 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b3ab431275c110356affc6c6a2f7fd4291b974f1f5ac5d2ab289cc5a6426b1e
-  data.tar.gz: 78eca26e37a10c4b1d832738ea92cccbe43c20c157deba577b1a4509e0786294
+  metadata.gz: 41c07110b8b5814d4ff968ffb44dc82d102ad50234907afb644ea887222a1992
+  data.tar.gz: 61546891dc6371599ade1e82e7ff75badab344d4eda831b96244131cf6347f88
 SHA512:
-  metadata.gz: 9be8da936ad87f771a1c3deed17301140e4d15a60d0d15ba14353b60d69f53b39683efe05351bfb147a7f6ccdfcb5fdb74163bd55628f30a0c7cfd6d98326061
-  data.tar.gz: a6e902aaa8115ec5b0e9dfdc246884207fc941597ab38fc0fc49e56cfcb68b6ca0e3c02fb083991183c529375dbce4750898205f36a063036c2094a542160260
+  metadata.gz: c21fc17a84dab2f37c2c5429109e2a723525f7624236b60210360132c854365038e49a78b9fa57fb2737f5fa2e3b6bb9adc03d50c1fa1e7635157d23ae1956c1
+  data.tar.gz: 9da9b7474edd7e464f369b9e2c03517dc25f9b8bdeb5b6c986f018ba3387b7fc3f10d713828db62b0774270b390448c9fa5690689e5e40b48a0731e61af6e9c0

data/app/datatables/effective_cpd_available_cycles_datatable.rb

@@ -14,7 +14,7 @@ class EffectiveCpdAvailableCyclesDatatable < Effective::Datatable
     end
 
     actions_col(actions: []) do |cpd_cycle|
-      statement = cpd_cycle.cpd_statements.where(user: current_user).first
+      statement = current_user.cpd_statement(cpd_cycle: cpd_cycle)
 
       if statement.blank?
         dropdown_link_to('Start', effective_cpd.cpd_cycle_cpd_statement_build_path(cpd_cycle, :new, :start))

data/app/models/concerns/effective_cpd_user.rb

@@ -26,7 +26,7 @@ module EffectiveCpdUser
 
     # Effective scoped
     has_many :cpd_targets, -> { order(:cpd_cycle_id) }, inverse_of: :user, class_name: 'Effective::CpdTarget', dependent: :delete_all
-    accepts_nested_attributes_for :cpd_targets
+    accepts_nested_attributes_for :cpd_targets, reject_if: proc { |atts| atts['score'].blank? && atts['required_to_submit'].blank? }
 
     # These two should not be sorted
     scope :cpd_audit_auditees, -> { without_role(:cpd_audit_reviewer).without_role(:admin) }
@@ -43,11 +43,17 @@ module EffectiveCpdUser
     }
   end
 
+  # Requires for this user
   def cpd_target_score(cpd_cycle:)
     target = cpd_target(cpd_cycle: cpd_cycle)
     return target.score if target&.score.present?
 
-    # Otherwise calculate default by membership category
+    default_cpd_target_score(cpd_cycle: cpd_cycle)
+  end
+
+  # Required for this user category without the targets
+  # Otherwise calculate default by membership category
+  def default_cpd_target_score(cpd_cycle:)
     if self.class.try(:effective_memberships_user?)
       category = membership_categories_on(cpd_cycle.start_at)&.first if cpd_cycle.start_at.present?
       category ||= membership_categories_on(cpd_cycle.end_at)&.first if cpd_cycle.end_at.present?
@@ -73,19 +79,20 @@ module EffectiveCpdUser
   end
 
   def cpd_statement(cpd_cycle:)
-    raise('expected an CpdCycle') unless cpd_cycle.class.respond_to?(:effective_cpd_cycle?)
+    raise('expected an CpdCycle') unless cpd_cycle.class.respond_to?(:effective_cpd_cpd_cycle?)
     cpd_statements.find { |cpd_statement| cpd_statement.cpd_cycle_id == cpd_cycle.id }
   end
 
   # Find or build
   def build_cpd_statement(cpd_cycle:)
-    raise('expected an CpdCycle') unless cpd_cycle.class.respond_to?(:effective_cpd_cycle?)
+    raise('expected an CpdCycle') unless cpd_cycle.class.respond_to?(:effective_cpd_cpd_cycle?)
     cpd_statement(cpd_cycle: cpd_cycle) || cpd_statements.build(cpd_cycle: cpd_cycle)
   end
 
+  # Dont use IDs here
   def cpd_target(cpd_cycle:)
     raise('expected an CpdCycle') unless cpd_cycle.class.respond_to?(:effective_cpd_cpd_cycle?)
-    cpd_targets.find { |cpd_target| cpd_target.cpd_cycle_id == cpd_cycle.id }
+    cpd_targets.find { |cpd_target| cpd_target.cpd_cycle == cpd_cycle }
   end
 
   # Find or build
@@ -96,7 +103,9 @@ module EffectiveCpdUser
 
   # For the form
   def build_cpd_targets
-    Effective::CpdCycle.sorted.all.each { |cpd_cycle| build_cpd_target(cpd_cycle: cpd_cycle) }
+    Effective::CpdCycle.sorted.all.each do |cpd_cycle|
+      cpd_target(cpd_cycle: cpd_cycle) || cpd_targets.new(cpd_cycle: cpd_cycle)
+    end
     cpd_targets.sort_by(&:cpd_cycle_id).reverse
   end
 

data/app/models/effective/cpd_target.rb

@@ -20,8 +20,10 @@ module Effective
     scope :deep, -> { includes(:user, :cpd_cycle) }
     scope :sorted, -> { order(:cpd_cycle_id) }
 
-    validates :score, numericality: { greater_than_or_equal_to: 0, allow_nil: true }
-    validates :score, presence: true, if: -> { required_to_submit? }
+    validates :score, numericality: { greater_than_or_equal_to: 0 }
+    validates :required_to_submit, inclusion: { in: [true, false], message: "can't be blank" }
+
+    validates :cpd_cycle_id, uniqueness: { scope: [:user_id, :user_type], message: 'target already exists' }
 
     def to_s
       score&.to_s || model_name.human

data/app/views/admin/users/_form_cpd_targets.html.haml

@@ -18,17 +18,17 @@
         - collection = Effective::CpdTarget::REQUIRED_TO_SUBMIT
         - cpd_cycle = ctf.object.cpd_cycle
         - target = f.object.cpd_target_score(cpd_cycle: cpd_cycle)
+        - target_placeholder = f.object.default_cpd_target_score(cpd_cycle: cpd_cycle) || '-'
         - required_to_submit = f.object.cpd_target_score_required_to_submit?(cpd_cycle: cpd_cycle)
         - required_to_submit_placeholder = collection.find { |label, value| value == required_to_submit }.first
 
         %tr
           %td= link_to(cpd_cycle, effective_cpd.edit_admin_cpd_cycle_path(cpd_cycle), target: '_blank')
-
           %td
             .row
               .col
-                = ctf.number_field :score, label: false, required: false, placeholder: target.to_s
+                = ctf.number_field :score, label: false, required: false, placeholder: target_placeholder.to_s
               .col
-                = ctf.select :required_to_submit, Effective::CpdTarget::REQUIRED_TO_SUBMIT, label: false, placeholder: required_to_submit_placeholder.to_s
+                = ctf.select :required_to_submit, Effective::CpdTarget::REQUIRED_TO_SUBMIT, label: false, required: false, placeholder: required_to_submit_placeholder.to_s
 
   = f.save "Save #{cpd_targets_label}", 'data-confirm': "Really Save #{cpd_targets_label} for #{user}?"

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '1.4.4'
+  VERSION = '1.4.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-14 00:00:00.000000000 Z
+date: 2023-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails