effective_cpd 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11af477a097aa90f61b028c9cbcabc827735acb2dc3192b6c915fa5a251421bb
-  data.tar.gz: ad2b6f62f0b13062541405298a2a2e4f23505956ffd691b636046bc9aa49ccba
+  metadata.gz: '007309633bd01dfa4ad2731f7c36f6d576c471c6de1f8ec21f355da5615a2b0d'
+  data.tar.gz: f1a0b42227c58dea846ad8e288bccec8472ce05a747b790ef4a6b83ee8ab0539
 SHA512:
-  metadata.gz: a5440290e1d0f2001235f7de576210bf7ca5362010ea82b1d092aae3eb36dd304d449c60598fc5d8f3b2a09687289a98cb2b70086949b9379ba33968c335d774
-  data.tar.gz: 8e1fcee7bf7ff52437817fa535e265b92a418a9971599992c281368065c99a7d28df396c63026e3d14f4f00797492770f5281c9d7c441e46781bd796806dff1c
+  metadata.gz: 99d7615012e34a640bd5e3009559a431638880894f819910cbc3d6df770316c6e4329bebb2dfdd28cf44d7c39abf2f63f1682205232f5a8bea5f43c9e7b25c73
+  data.tar.gz: 99e4617ac625fa40c15e60cbe535824be383edf62306ebd3337b01204c5a03d9f3b89c7c441045848f932fcdb1c21c564aa349c3334eddb2c2eee9c73a54631e

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, reject_if: proc { |atts| atts['score'].blank? && atts['required_to_submit'].blank? }
+    accepts_nested_attributes_for :cpd_targets, reject_if: :reject_cpd_target_attributes, allow_destroy: true
 
     # These two should not be sorted
     scope :cpd_audit_auditees, -> { without_role(:cpd_audit_reviewer).without_role(:admin) }
@@ -43,7 +43,7 @@ module EffectiveCpdUser
     }
   end
 
-  # Requires for this user
+  # The required or targeted number of credits for this user in this cycle
   def cpd_target_score(cpd_cycle:)
     target = cpd_target(cpd_cycle: cpd_cycle)
     return target.score if target&.score.present?
@@ -51,8 +51,15 @@ module EffectiveCpdUser
     default_cpd_target_score(cpd_cycle: cpd_cycle)
   end
 
-  # Required for this user category without the targets
-  # Otherwise calculate default by membership category
+  # Whether the user can submit a statement without the required number of credits
+  def cpd_target_score_required_to_submit?(cpd_cycle:)
+    target = cpd_target(cpd_cycle: cpd_cycle)
+    return target.required_to_submit? unless target&.required_to_submit.nil?
+
+    default_cpd_target_score_required_to_submit?(cpd_cycle: cpd_cycle)
+  end
+
+  # Required for this user category without the targets. Used to display defaults on admin form.
   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?
@@ -63,10 +70,8 @@ module EffectiveCpdUser
     end
   end
 
-  def cpd_target_score_required_to_submit?(cpd_cycle:)
-    target = cpd_target(cpd_cycle: cpd_cycle)
-    return target.required_to_submit? unless target&.required_to_submit.nil?
-
+  # Required for this user category without the targets. Used to display defaults on admin form.
+  def default_cpd_target_score_required_to_submit?(cpd_cycle:)
     cpd_cycle.required_to_submit?
   end
 
@@ -103,10 +108,23 @@ module EffectiveCpdUser
 
   # For the form
   def build_cpd_targets
-    Effective::CpdCycle.sorted.all.each do |cpd_cycle|
+    Effective::CpdCycle.sorted.all.map do |cpd_cycle|
       cpd_target(cpd_cycle: cpd_cycle) || cpd_targets.new(cpd_cycle: cpd_cycle)
+    end.sort_by(&:cpd_cycle_id).reverse
+  end
+
+  private
+
+  def reject_cpd_target_attributes(atts)
+    # Reject if new record and blank
+    return true if (atts['id'].blank? && atts['score'].blank? && atts['required_to_submit'].blank?)
+
+    # Delete when ID present and score and required to submit blank
+    if (atts['id'].present? && atts['score'].blank? && atts['required_to_submit'].blank?)
+      atts.merge!({:_destroy => 1})
     end
-    cpd_targets.sort_by(&:cpd_cycle_id).reverse
+
+    false
   end
 
 end

data/app/models/effective/cpd_target.rb

@@ -20,7 +20,7 @@ module Effective
     scope :deep, -> { includes(:user, :cpd_cycle) }
     scope :sorted, -> { order(:cpd_cycle_id) }
 
-    validates :score, numericality: { greater_than_or_equal_to: 0 }
+    validates :score, presence: true, 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' }

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

@@ -1,12 +1,14 @@
 = effective_form_with model: [:admin, user] do |f|
   = f.hidden_field :id
 
-  %p The default values are displayed as placeholders.
+  %p
+    #{cpd_targets_label} set the requirements checked when submitting a #{cpd_statement_label}
 
   %table.table
     %thead
       %th= cpd_cycle_label
-      %th Target or Required #{cpd_credits_label}
+      %th Default Requirements
+      %th Requirements for #{f.object}
 
     %tbody
       = f.fields_for :cpd_targets, f.object.build_cpd_targets do |ctf|
@@ -17,18 +19,27 @@
 
         - 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
+
+        - default_target = f.object.default_cpd_target_score(cpd_cycle: cpd_cycle) || 0
+        - default_required_to_submit = f.object.default_cpd_target_score_required_to_submit?(cpd_cycle: cpd_cycle)
 
         %tr
           %td= link_to(cpd_cycle, effective_cpd.edit_admin_cpd_cycle_path(cpd_cycle), target: '_blank')
+          %td
+            %p
+              = pluralize(default_target, cpd_credit_label.downcase)
+              = default_required_to_submit ? 'required' : 'targeted'
+              and
+              = collection.find { |value| value.last == default_required_to_submit }.first.downcase
+
           %td
             .row
               .col
-                = ctf.number_field :score, label: false, required: false, placeholder: target_placeholder.to_s
+                = ctf.number_field :score, required: false, label: false
               .col
-                = ctf.select :required_to_submit, Effective::CpdTarget::REQUIRED_TO_SUBMIT, label: false, required: false, placeholder: required_to_submit_placeholder.to_s
+                = ctf.select :required_to_submit, Effective::CpdTarget::REQUIRED_TO_SUBMIT, required: false, label: false
 
   = 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.5.0'
+  VERSION = '1.5.1'
 end

metadata

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