effective_cpd 1.4.8 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3d7a598e697af490599b28a4a41ed90dbd14dbcca2536f0338bd5719ac7d61d
-  data.tar.gz: 5caeef24e8a9e7f7714e804b802bdeae0bbd279b06c0014339c11ad834706fed
+  metadata.gz: '007309633bd01dfa4ad2731f7c36f6d576c471c6de1f8ec21f355da5615a2b0d'
+  data.tar.gz: f1a0b42227c58dea846ad8e288bccec8472ce05a747b790ef4a6b83ee8ab0539
 SHA512:
-  metadata.gz: 1cb5eccf8a74482a2b4042fbc02e22807114ff263ca265fd9c287c160a0f9325375ef5cf92c65a09ab64846b2e696b14bcb9481a7049db12de7974c15be4dd5f
-  data.tar.gz: 54ea80bfe7a910fd76b0532de17d69214def0d86f22dcb7fc6a278c53731546d9733b09b0d8fab4b681de98f5b55b1624950b50a33b4969a2e534e83383e3c6c
+  metadata.gz: 99d7615012e34a640bd5e3009559a431638880894f819910cbc3d6df770316c6e4329bebb2dfdd28cf44d7c39abf2f63f1682205232f5a8bea5f43c9e7b25c73
+  data.tar.gz: 99e4617ac625fa40c15e60cbe535824be383edf62306ebd3337b01204c5a03d9f3b89c7c441045848f932fcdb1c21c564aa349c3334eddb2c2eee9c73a54631e

data/app/assets/stylesheets/effective_cpd/_activities.scss

@@ -19,3 +19,9 @@
   }
 
 }
+
+.table-cpd-audit-review-statements {
+  .cpd-statement-activity {
+    .float-right { display: none; }
+  }
+}

data/app/models/concerns/effective_cpd_audit.rb

@@ -582,6 +582,7 @@ module EffectiveCpdAudit
     return false unless was_submitted?
     return false unless completed?
     return false unless cpd_audit_reviews.present? && cpd_audit_reviews.all?(&:completed?)
+    return false if was_missing_info?
 
     review!
   end

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/cpd_audits/_form_close.html.haml

@@ -1,10 +1,9 @@
-= card('Determination') do
-  = effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
-    %p This action will <strong>close</strong> this #{cpd_audit_label} with the following determination:
+= effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
+  %p This action will <strong>close</strong> this #{cpd_audit_label} with the following determination:
 
-    = f.select :determination, cpd_audit.cpd_audit_level.determinations
+  = f.select :determination, cpd_audit.cpd_audit_level.determinations
 
-    %h2 Email to Send
-    = email_form_fields(f, :cpd_audit_closed)
+  %h2 Email to Send
+  = email_form_fields(f, :cpd_audit_closed)
 
-    = f.submit 'Close', center: true, 'data-confirm': "Really close #{cpd_audit}?"
+  = f.submit 'Close', center: true, 'data-confirm': "Really close #{cpd_audit}?"

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

@@ -43,7 +43,7 @@
       = render 'admin/cpd_audits/form_files', cpd_audit: cpd_audit
 
     - if cpd_audit.user_cpd_required?
-      = tab(cpd_audit.cpd_audit_reviews) do
+      = tab(cpd_audit.user.cpd_statements) do
         - datatable = Admin::EffectiveCpdStatementsDatatable.new(user: cpd_audit.user)
         = render_datatable(datatable, inline: true, simple: true)
 
@@ -55,6 +55,6 @@
       = tab(cpd_audit.chats) do
         = render 'admin/cpd_audits/form_chat', cpd_audit: cpd_audit
 
-    - if cpd_audit.respond_to?(:log_changes_datatable)
+    - if cpd_audit.respond_to?(:logs_datatable)
       = tab 'Logs' do
-        = render_inline_datatable(cpd_audit.log_changes_datatable)
+        = render_inline_datatable(cpd_audit.logs_datatable)

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/app/views/effective/cpd_audit_reviews/_cpd_statement.html.haml

@@ -1,5 +1,5 @@
 = wizard_card(cpd_audit_review) do
-  %table.table.table-hover
+  %table.table.table-hover.table-cpd-audit-review-statements
     %thead
       %th #{cpd_audit_review.cpd_audit.name}'s #{cpd_statement}
       %th #{cpd_audit_review.name}'s Review

data/app/views/effective/cpd_audit_reviews/_summary.html.haml

@@ -21,8 +21,7 @@
               = link_to(cpd_audit_review.user, url)
               %br
               %small= mail_to cpd_audit_review.user.email
-
-          - if cpd_audit_review.anonymous? == false
+          - elsif cpd_audit_review.anonymous? == false
             %p
               = cpd_audit_review.user
               %br
@@ -40,8 +39,7 @@
               = link_to(cpd_audit.user, url)
               %br
               %small= mail_to cpd_audit.user.email
-
-          - if cpd_audit.anonymous? == false
+          - elsif cpd_audit.anonymous? == false
             %p
               = cpd_audit.user
               %br

data/app/views/effective/cpd_audit_reviews/cpd_statement.html.haml

@@ -13,7 +13,7 @@
     %h2 Review Activities
     %p Please review the following activities:
 
-    %table.table.table-hover
+    %table.table.table-hover.table-cpd-audit-review-statements
       %thead
         %th #{resource.cpd_audit.user}'s #{cpd_statement}
         %th #{resource.user}'s Review

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

@@ -13,8 +13,7 @@
               = link_to(cpd_audit.user, url)
               %br
               %small= mail_to cpd_audit.user.email
-
-          - if cpd_audit.anonymous? == false
+          - elsif cpd_audit.anonymous? == false
             %p
               = cpd_audit.user
               %br
@@ -33,8 +32,7 @@
                 = link_to(cpd_audit_review.user, url)
                 %br
                 %small= mail_to cpd_audit_review.user.email
-
-            - if cpd_audit_review.anonymous? == false
+            - elsif cpd_audit_review.anonymous? == false
               %p
                 = cpd_audit_review.user
                 %br

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

@@ -3,7 +3,7 @@
 
   - raise('expected a submitted cpd_statement') unless resource.submitted_at.present?
 
-  .alert.alert-warning.mb-4
+  .alert.alert-success.mb-4
     Successfully submitted on #{resource.submitted_at.strftime('%F')}.
 
   - if resource.cpd_cycle.all_steps_content.present?

data/config/locales/effective_cpd.en.yml

@@ -9,11 +9,11 @@ en:
   activerecord:
     models:
       # These ones might be app level
-      app/cpd_audit: 'CPD Audit'
-      app/cpd_audit_level: 'CPD Audit Level'
-      app/cpd_audit_review: 'CPD Audit Review'
-      app/cpd_bulk_audit: 'Bulk Create CPD Audit Review'
-      app/cpd_statement: 'CPD Statement'
+      cpd_audit: 'CPD Audit'
+      cpd_audit_level: 'CPD Audit Level'
+      cpd_audit_review: 'CPD Audit Review'
+      cpd_bulk_audit: 'Bulk Create CPD Audit Review'
+      cpd_statement: 'CPD Statement'
 
       # These ones should stay effective
       effective/cpd_cycle: 'CPD Period'
@@ -23,10 +23,10 @@ en:
 
     attributes:
       # These ones might be app level
-      app/cpd_audit:
+      cpd_audit:
         user: 'Auditee'
         cpd_audit_comments: 'Reviewer Notes'
 
-      app/cpd_audit_review:
+      cpd_audit_review:
         user: 'Reviewer'
         comments: 'Reviewer Notes'

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

@@ -21,7 +21,7 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
     end
 
     create_table <%= @cpd_activities_table_name %> do |t|
-      t.references :cpd_category
+      t.integer :cpd_category_id
 
       t.string :title
       t.integer :position
@@ -37,7 +37,8 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
     end
 
     create_table <%= @cpd_rules_table_name %> do |t|
-      t.references :cpd_cycle
+      t.integer :cpd_cycle_id
+
       t.integer :ruleable_id
       t.string :ruleable_type
 
@@ -53,7 +54,7 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
     end
 
     create_table <%= @cpd_special_rules_table_name %> do |t|
-      t.references :cpd_cycle
+      t.integer :cpd_cycle_id
 
       t.decimal :max_credits_per_cycle
       t.string :category
@@ -63,20 +64,22 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
     end
 
     create_table <%= @cpd_special_rule_mates_table_name %> do |t|
-      t.references :cpd_rule
-      t.references :cpd_special_rule
+      t.integer :cpd_rule_id
+      t.integer :cpd_special_rule_id
 
       t.datetime :updated_at
       t.datetime :created_at
     end
 
     create_table <%= @cpd_statement_activities_table_name %> do |t|
-      t.references :cpd_statement
-      t.references :cpd_activity
-      t.references :cpd_category
-      t.references :original
+      t.integer :cpd_statement_id
+      t.string :cpd_statement_type
+
+      t.integer :cpd_activity_id
+      t.integer :cpd_category_id
+      t.integer :original_id
+      t.integer :cpd_cycle_id
 
-      t.references :cpd_cycle
       t.integer :user_id
       t.string :user_type
 
@@ -97,7 +100,7 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
     end
 
     create_table <%= @cpd_statements_table_name %> do |t|
-      t.references :cpd_cycle
+      t.integer :cpd_cycle_id
 
       t.integer :user_id
       t.string :user_type
@@ -158,7 +161,7 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
       t.integer :cpd_audit_level_id
       t.string :cpd_audit_level_type
 
-      t.references :cpd_audit_level_section
+      t.integer :cpd_audit_level_section_id
 
       t.text      :title
       t.string    :category
@@ -171,7 +174,7 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
     end
 
     create_table <%= @cpd_audit_level_question_options_table_name %> do |t|
-      t.references :cpd_audit_level_question, index: false
+      t.integer :cpd_audit_level_question_id
 
       t.text      :title
       t.integer   :position
@@ -286,8 +289,8 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
       t.integer :cpd_audit_id
       t.string :cpd_audit_type
 
-      t.references :cpd_audit_level_question
-      t.references :cpd_audit_level_section
+      t.integer :cpd_audit_level_question_id
+      t.integer :cpd_audit_level_section_id
 
       t.date :date
       t.string :email
@@ -300,8 +303,8 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
     end
 
     create_table <%= @cpd_audit_response_options_table_name %> do |t|
-      t.references :cpd_audit_response
-      t.references :cpd_audit_level_question_option, index: false
+      t.integer :cpd_audit_response_id
+      t.integer :cpd_audit_level_question_option_id
 
       t.datetime :updated_at
       t.datetime :created_at

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '1.4.8'
+  VERSION = '1.5.1'
 end

metadata

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