effective_cpd 1.3.7 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baf69685d3c7825c972b471700fbd6101891fbd0c5ea4c3d45864f56d6c4f5b4
-  data.tar.gz: f8b52a21ec9077c29a5167d0b1fc482905fd35a6a1dd5188ee94d9dc442bbc06
+  metadata.gz: 15a9526456ab27ed3cc2dca6c6c368afe97e478282d66083cfb45e10250071c8
+  data.tar.gz: 4394265758150e1a979fa5cb000f22f5153c7c7a5be772e4b90d2795376697f4
 SHA512:
-  metadata.gz: eb2211dbb1cc889c105a0040b3bdc5132cf2efe7c9f1566b4d107c3b4802c19fb0be169c2e3792d6c6f7987fdbed7938facf82b7326ed69efdda31ac86c8098b
-  data.tar.gz: 26e17fa4c968667414ff73f6a5b203c4e9e2cecf35d8f716abe958cb6c8acd5551ef3298d6a8b20f8667ae335d80e934f98a36dfb4b7a88893a63080300fe84e
+  metadata.gz: bffcf39a42c4481b6e51425e0ff373b9a6670c2e9c01027099d4f3abe299fdf428ba601123e38f17f136abdd5f95cec8a35560839524dcd29c69bf3cdb653d9b
+  data.tar.gz: e427677d3c6ec195b01b0b22c9022ce4eac3c40fa04eeeb873da3a7573e2b8a68e076cc8151f684f9a0b0c11fe1804cc63ce77c9554d50823dfb54b9ed9e1614

data/app/controllers/admin/cpd_targets_controller.rb

@@ -0,0 +1,15 @@
+module Admin
+  class CpdTargetsController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_cpd) }
+
+    include Effective::CrudController
+
+    private
+
+    def permitted_params
+      params.require(:effective_cpd_target).permit!
+    end
+
+  end
+end

data/app/controllers/effective/cpd_statement_activities_controller.rb

@@ -14,7 +14,12 @@ module Effective
     # Redirect the remote form back to the activities page
     on :save, redirect: -> {
       statement = resource.cpd_statement
-      effective_cpd.cpd_cycle_cpd_statement_build_path(statement.cpd_cycle, statement, :activities)
+
+      if params[:commit] == 'Save and Add Another'
+        effective_cpd.cpd_cycle_cpd_statement_build_path(statement.cpd_cycle, statement, :activities, activities: :new)
+      else
+        effective_cpd.cpd_cycle_cpd_statement_build_path(statement.cpd_cycle, statement, :activities)
+      end
     }
 
     def permitted_params

data/app/datatables/admin/effective_cpd_cycles_datatable.rb

@@ -10,7 +10,7 @@ module Admin
       col :title
       col :start_at
       col :end_at
-      col :required_score, label: 'Required'
+      col :required_to_submit, label: "Minimum score required to submit"
 
       actions_col
     end

data/app/datatables/admin/effective_cpd_special_rules_datatable.rb

@@ -5,9 +5,8 @@ module Admin
       col :created_at, visible: false
       col :updated_at, visible: false
 
-      col :cpd_cycle
-
-      col :cpd_rules
+      col :cpd_cycle, label: cpd_cycle_label
+      col :cpd_rules, label: 'Rules'
 
       col :category
       col :max_credits_per_cycle, label: 'Max ' + cpd_credits_label

data/app/datatables/admin/effective_cpd_statements_datatable.rb

@@ -22,10 +22,8 @@ module Admin
         cpd_score(cpd_statement.score)
       end
 
-      if attributes[:user_id].present?
-        col :required_score, label: 'Required' do |cpd_statement|
-          cpd_score(cpd_statement.required_score || cpd_statement.targeted_score)
-        end
+      col :target_score, label: "Required " + cpd_credits_label.capitalize, as: :decimal do |cpd_statement|
+        cpd_score(cpd_statement.target_score)
       end
 
       col :carry_forward do |cpd_statement|

data/app/datatables/admin/effective_cpd_targets_datatable.rb

@@ -0,0 +1,23 @@
+module Admin
+  class EffectiveCpdTargetsDatatable < Effective::Datatable
+    datatable do
+      order :updated_at
+
+      col :updated_at, visible: false
+      col :created_at, visible: false
+      col :id, visible: false
+
+      col :user
+      col :cpd_cycle, search: Effective::CpdCycle.sorted, label: cpd_cycle_label
+
+      col :score, label: "Target or Required " + cpd_credits_label
+      col :required_to_submit
+
+      actions_col
+    end
+
+    collection do
+      Effective::CpdTarget.deep.all
+    end
+  end
+end

data/app/datatables/effective_cpd_available_cycles_datatable.rb

@@ -7,11 +7,10 @@ class EffectiveCpdAvailableCyclesDatatable < Effective::Datatable
     col :start_at, visible: false
 
     col(:title, label: cpd_cycle_label)
-    col :available_date, label: 'Available'
+    col :available_date
 
-    col :required_score, label: 'Required' do |cpd_cycle|
-      cpd_statement = EffectiveCpd.CpdStatement.new(cpd_cycle: cpd_cycle, user: current_user)
-      cpd_score(cpd_statement.required_score || cpd_statement.targeted_score)
+    col :target_score, label: "Required #{cpd_credits_label}" do |cpd_cycle|
+      cpd_score(current_user.cpd_target_score(cpd_cycle: cpd_cycle))
     end
 
     actions_col(actions: []) do |cpd_cycle|

data/app/datatables/effective_cpd_completed_statements_datatable.rb

@@ -8,14 +8,15 @@ class EffectiveCpdCompletedStatementsDatatable < Effective::Datatable
       statement.cpd_cycle.to_s
     end
 
-    col :submitted_at
-    col :score, label: cpd_credits_label
+    col :submitted_at, as: :date, label: 'Submitted'
 
-    col :required_score, label: 'Required' do |cpd_statement|
-      cpd_score(cpd_statement.required_score || cpd_statement.targeted_score)
+    col :score, label: cpd_credits_label do |cpd_statement|
+      cpd_score(cpd_statement.score, cpd_statement.target_score)
     end
 
-    col :carry_forward
+    col :carry_forward do |cpd_statement|
+      cpd_score(cpd_statement.carry_forward)
+    end
 
     unless attributes[:actions] == false
       actions_col(actions: []) do |cpd_statement|

data/app/helpers/effective_cpd_helper.rb

@@ -68,6 +68,14 @@ module EffectiveCpdHelper
     ets(EffectiveCpd.CpdAuditLevel)
   end
 
+  def cpd_target_label
+    et(Effective::CpdTarget)
+  end
+
+  def cpd_targets_label
+    ets(Effective::CpdTarget)
+  end
+
   def cpd_rule_formula_hint(cpd_activity)
     raise('expected a CPDActivity') unless cpd_activity.kind_of?(Effective::CpdActivity)
 
@@ -96,8 +104,11 @@ module EffectiveCpdHelper
     @effective_cpd_categories ||= Effective::CpdCategory.deep.sorted
   end
 
-  def cpd_score(value)
-    ("%.#{2}f" % value.to_d)
+  def cpd_score(value, value2 = nil)
+    score1 = ("%.#{2}f" % value.to_d)
+    score2 = ("%.#{2}f" % value2.to_d)
+
+    (value.present? && value2.present?) ? "#{score1} / #{score2}" : score1
   end
 
 end

data/app/models/concerns/effective_cpd_audit_review.rb

@@ -118,6 +118,10 @@ module EffectiveCpdAuditReview
       end
     end
 
+    with_options(if: -> { current_step == :recommendation }) do
+      validates :recommendation, presence: true
+    end
+
     with_options(if: -> { cpd_audit_level&.anonymous? }) do
       before_validation { assign_anonymous_name_and_number }
 

data/app/models/concerns/effective_cpd_statement.rb

@@ -46,7 +46,7 @@ module EffectiveCpdStatement
     accepts_nested_attributes_for :cpd_statement_activities
 
     effective_resource do
-      score                   :integer
+      score                   :decimal
 
       confirm_read            :boolean
       confirm_factual         :boolean
@@ -63,7 +63,7 @@ module EffectiveCpdStatement
       timestamps
     end
 
-    scope :deep, -> { includes(:cpd_cycle, :user, cpd_statement_activities: [:files_attachments, :cpd_category, :original, cpd_activity: [:rich_text_body]]) }
+    scope :deep, -> { includes(:cpd_cycle, user: [:cpd_targets], cpd_statement_activities: [:files_attachments, :cpd_category, :original, cpd_activity: [:rich_text_body]]) }
     scope :sorted, -> { order(:cpd_cycle_id) }
 
     scope :draft, -> { where(submitted_at: nil) }
@@ -80,8 +80,8 @@ module EffectiveCpdStatement
       self.score ||= 0
     end
 
-    validate(if: -> { completed? }) do
-      min = required_score() || 0.0
+    validate(if: -> { completed? && target_score_required_to_submit? }) do
+      min = target_score() || 0.0
       self.errors.add(:score, "must be #{min} or greater to submit a statement") if score < min
     end
 
@@ -130,18 +130,12 @@ module EffectiveCpdStatement
   end
   alias_method :submitted?, :completed?
 
-  def required_score
-    required_by_cycle = cpd_cycle&.required_score
-    required_by_user = user.cpd_statement_required_score(self) if user.respond_to?(:cpd_statement_required_score)
-
-    [required_by_cycle, required_by_user].compact.max
+  def target_score
+    user.cpd_target_score(cpd_cycle: cpd_cycle)
   end
 
-  def targeted_score
-    targeted_by_cycle = cpd_cycle&.targeted_score
-    targeted_by_user = user.cpd_statement_targeted_score(self) if user.respond_to?(:cpd_statement_targeted_score)
-
-    [targeted_by_cycle, targeted_by_user].compact.max
+  def target_score_required_to_submit?
+    user.cpd_target_score_required_to_submit?(cpd_cycle: cpd_cycle)
   end
 
   def carry_forward

data/app/models/concerns/effective_cpd_user.rb

@@ -24,6 +24,10 @@ module EffectiveCpdUser
     has_many :cpd_audits, -> { order(:id) }, inverse_of: :user
     has_many :cpd_audit_reviews, -> { order(:id) }, inverse_of: :user
 
+    # 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
+
     # These two should not be sorted
     scope :cpd_audit_auditees, -> { without_role(:cpd_audit_reviewer).without_role(:admin) }
     scope :cpd_audit_reviewers, -> { with_role(:cpd_audit_reviewer) }
@@ -39,15 +43,25 @@ module EffectiveCpdUser
     }
   end
 
-  # This one will actually be enforced or displayed first
-  def cpd_statement_required_score(cpd_statement)
-    nil
+  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
+    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?
+      category ||= membership&.categories&.first
+
+      category&.cpd_target_score(cpd_cycle: cpd_cycle)
+    end
   end
 
-  # This one will be displayed on the sidebar if first one is nil
-  # Won't actually block the submission
-  def cpd_statement_targeted_score(cpd_statement)
-    nil
+  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?
+
+    cpd_cycle.required_to_submit?
   end
 
   def cpd_audit_cpd_required?
@@ -69,4 +83,21 @@ module EffectiveCpdUser
     cpd_statement(cpd_cycle: cpd_cycle) || cpd_statements.build(cpd_cycle: cpd_cycle)
   end
 
+  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 }
+  end
+
+  # Find or build
+  def build_cpd_target(cpd_cycle:)
+    raise('expected an CpdCycle') unless cpd_cycle.class.respond_to?(:effective_cpd_cpd_cycle?)
+    cpd_target(cpd_cycle: cpd_cycle) || cpd_targets.build(cpd_cycle: cpd_cycle)
+  end
+
+  # For the form
+  def build_cpd_targets
+    Effective::CpdCycle.sorted.all.each { |cpd_cycle| build_cpd_target(cpd_cycle: cpd_cycle) }
+    cpd_targets.sort_by(&:cpd_cycle_id).reverse
+  end
+
 end

data/app/models/effective/cpd_cycle.rb

@@ -26,7 +26,7 @@ module Effective
       start_at              :datetime
       end_at                :datetime
 
-      required_score        :integer  # If set, a user must fill out this many activities to finish a statement
+      required_to_submit    :boolean
 
       timestamps
     end
@@ -54,7 +54,6 @@ module Effective
 
     validates :title, presence: true
     validates :start_at, presence: true
-    validates :required_score, numericality: { greater_than: 0, allow_nil: true }
 
     validate(if: -> { start_at.present? && end_at.present? }) do
       self.errors.add(:end_at, 'must be after the start date') unless end_at > start_at
@@ -78,11 +77,6 @@ module Effective
       title.presence || model_name.human
     end
 
-    # Todo, implement a cpd cycle targeted score entirely
-    def targeted_score
-      nil
-    end
-
     def build_from_cycle(cycle:)
       raise('expected a CpdCycle') unless cycle.kind_of?(CpdCycle)
 

data/app/models/effective/cpd_target.rb

@@ -0,0 +1,31 @@
+module Effective
+  class CpdTarget < ActiveRecord::Base
+    # App scoped
+    belongs_to :user, polymorphic: true
+
+    # Effective Namespace
+    belongs_to :cpd_cycle, class_name: 'Effective::CpdCycle'
+
+    log_changes(to: :user) if respond_to?(:log_changes)
+
+    REQUIRED_TO_SUBMIT = [["A minimum score is required to submit", true], ["Can submit with any score", false]]
+
+    effective_resource do
+      score               :decimal
+      required_to_submit  :boolean
+
+      timestamps
+    end
+
+    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? }
+
+    def to_s
+      score&.to_s || model_name.human
+    end
+
+  end
+end

data/app/views/admin/cpd_cycles/_form.html.haml

@@ -1,8 +1,11 @@
 = tabs do
-  = tab 'Cycle' do
+  = tab(Effective::CpdCycle) do
     = render 'admin/cpd_cycles/form_cpd_cycle', cpd_cycle: cpd_cycle
 
   - if cpd_cycle.persisted?
+    = tab(ets(Effective::CpdTarget)) do
+      = render 'admin/cpd_cycles/form_cpd_targets', cpd_cycle: cpd_cycle
+
     = tab 'Special Rules' do
       = render 'admin/cpd_cycles/form_cpd_special_rules', cpd_cycle: cpd_cycle
 

data/app/views/admin/cpd_cycles/_form_cpd_cycle.html.haml

@@ -8,9 +8,6 @@
   = f.date_field :end_at, date_linked: false,
     hint: "The last date a #{cpd_statement_label} may be created for this #{cpd_cycle_label}. leave blank for no end date."
 
-  = f.number_field :required_score,
-    hint: "The minimum required #{cpd_credits_label} to submit a #{cpd_statement_label} for this #{cpd_cycle_label}. leave blank to submit any amount."
-
   - if f.object.new_record?
     - latest_cycle = Effective::CpdCycle.latest_cycle
 

data/app/views/admin/cpd_cycles/_form_cpd_special_rules.html.haml

@@ -1,4 +1,4 @@
 %p Special rules operate on more than one category at a time.
 
-- datatable = Admin::EffectiveCpdSpecialRulesDatatable.new(cpd_cycle_id: cpd_cycle.id)
+- datatable = Admin::EffectiveCpdSpecialRulesDatatable.new(cpd_cycle: cpd_cycle)
 = render_datatable(datatable, inline: true)

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

@@ -0,0 +1,18 @@
+= effective_form_with(model: [:admin, cpd_cycle], engine: true) do |f|
+  %p The minimum number of #{cpd_credits_label} to submit a #{cpd_statement_label} in this #{cpd_cycle_label} is configured per user.
+  %p Visit a user page to better view their specific #{cpd_credits_label} requirements.
+
+  %p By default, the following behaviour will be applied to #{cpd_statements_label}:
+
+  .row
+    .col-lg-6
+      = f.select :required_to_submit, Effective::CpdTarget::REQUIRED_TO_SUBMIT
+
+  = f.save
+
+%hr
+
+.mt-4
+  %p The ability to submit a #{cpd_statement_label} in this #{cpd_cycle_label} has been individualized for the following:
+  - datatable = Admin::EffectiveCpdTargetsDatatable.new(cpd_cycle: cpd_cycle)
+  = render_datatable(datatable, inline: true)

data/app/views/admin/cpd_targets/_form.html.haml

@@ -0,0 +1,18 @@
+= effective_form_with(model: [:admin, cpd_target], engine: true) do |f|
+  = f.hidden_field :user_type, value: current_user.class.name
+
+  - if inline_datatable? && inline_datatable.attributes[:user_id].present?
+    = f.hidden_field :user_id
+  - else
+    - ajax_url = (@select2_ajax_path || effective_resources.users_admin_select2_ajax_index_path) unless Rails.env.test?
+    = f.select :user_id, current_user.class.all, ajax_url: ajax_url
+
+  - if inline_datatable? && inline_datatable.attributes[:cpd_cycle_id].present?
+    = f.hidden_field :cpd_cycle_id
+  - else
+    = f.select :cpd_cycle_id, Effective::CpdCycle.sorted.all, label: cpd_cycle_label
+
+  = f.number_field :score
+  = f.check_box :required_to_submit, label: 'A minimum score is required to submit'
+
+  = effective_submit(f)

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

@@ -1,9 +1,13 @@
-%h2 Statements
+%h2 #{cpd_statements_label}
 - datatable = Admin::EffectiveCpdStatementsDatatable.new(user: user)
 = render_datatable(datatable, inline: true)
 
 %hr
 
+%h2 #{cpd_targets_label}
+= render 'admin/users/form_cpd_targets', user: user
+%hr
+
 %h2 Activities
 - datatable = Admin::EffectiveCpdStatementActivitiesDatatable.new(user: user)
 = render_datatable(datatable, inline: true)

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

@@ -0,0 +1,34 @@
+= effective_form_with model: [:admin, user] do |f|
+  = f.hidden_field :id
+
+  %p The default values are displayed as placeholders.
+
+  %table.table
+    %thead
+      %th= cpd_cycle_label
+      %th Target or Required #{cpd_credits_label}
+
+    %tbody
+      = f.fields_for :cpd_targets, f.object.build_cpd_targets do |ctf|
+        = ctf.hidden_field :id
+        = ctf.hidden_field :cpd_cycle_id
+        = ctf.hidden_field :user_type
+        = ctf.hidden_field :user_id
+
+        - collection = Effective::CpdTarget::REQUIRED_TO_SUBMIT
+        - cpd_cycle = ctf.object.cpd_cycle
+        - target = f.object.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
+              .col
+                = ctf.select :required_to_submit, Effective::CpdTarget::REQUIRED_TO_SUBMIT, label: false, placeholder: required_to_submit_placeholder.to_s
+
+  = f.save "Save #{cpd_targets_label}", 'data-confirm': "Really Save #{cpd_targets_label} for #{user}?"

data/app/views/effective/cpd_statement_activities/_form.html.haml

@@ -62,7 +62,8 @@
 
     .mb-3
       = f.submit do
-        = f.save 'Save Activity'
+        = f.save "Save"
+        = f.save "Save and Add Another"
 
         %div{style: 'position: absolute; left: 0;'}
           - if f.object.new_record?

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

@@ -35,6 +35,9 @@
               = link_to('#', 'data-cpd-edit-activity': true) do
                 = icon('plus-circle', class: 'small-1')
                 = statement_activity.cpd_activity
+                = '-'
+                = statement_activity.description
+
                 - if statement_activity.is_carry_over?
                   %br
                   %small carried forward from #{statement_activity.original_cycle}

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

@@ -19,18 +19,20 @@
 
         %tr
           %td
-            %h4= cpd_score(resource.score.to_d)
+            %h4= cpd_score(resource.score)
 
           %td
-            #{cpd_credits_label} out of #{(resource.required_score || resource.targeted_score).to_d} required
+            #{cpd_credits_label} out of #{cpd_score(resource.target_score)}
+            - if resource.target_score_required_to_submit?
+              required
 
         %tr
           %td
-            %h4= cpd_score(last_3_scores.to_d)
+            %h4= cpd_score(last_3_scores)
 
           %td #{cpd_credits_label} in last 3 #{cpd_cycles_label} (including this #{cpd_cycle_label})
 
     = cpd_cycle.sidebar_content.to_s
 
   .col-9
-    = yield
+    .mb-3= yield

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

@@ -26,8 +26,9 @@
 
       %tr
         %th Total #{cpd_credits_label}
-        %td= cpd_score(cpd_statement.score)
+        %td= cpd_score(cpd_statement.score, cpd_statement.target_score)
 
-      %tr.carry-forward
-        %th Carry Forward
-        %td= cpd_score(cpd_statement.carry_forward)
+      - if cpd_statement.carry_forward.to_d > 0.0
+        %tr.carry-forward
+          %th Carry Forward
+          %td= cpd_score(cpd_statement.carry_forward)

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

@@ -4,7 +4,9 @@
     .col-9
       %h1= resource.cpd_cycle
 
-  .activities-index
+  - activities = (params[:activities] == 'new' ? :new : :index)
+
+  .activities-index{style: ('display: none;' unless activities == :index)}
     = render('layout') do
       - if resource.cpd_cycle.all_steps_content.present?
         .mb-2= resource.cpd_cycle.all_steps_content.to_s
@@ -22,5 +24,5 @@
         = f.hidden_field :current_step
         = f.submit 'Save and Continue', center: true
 
-  .activities-new{style: 'display: none;'}
+  .activities-new{style: ('display: none;' unless activities == :new)}
     = render('activities_new', cpd_statement: resource)

data/config/effective_cpd.rb

@@ -23,6 +23,7 @@ EffectiveCpd.setup do |config|
   config.cpd_audit_review_items_table_name = :cpd_audit_review_items
 
   config.cpd_bulk_audits_table_name = :cpd_bulk_audits
+  config.cpd_targets_table_name = :cpd_targets
 
   # Layout Settings
   # Configure the Layout per controller, or all at once

data/config/locales/effective_cpd.en.yml

@@ -18,6 +18,7 @@ en:
       effective/cpd_cycle: 'CPD Period'
       effective/cpd_statement_activity: 'CPD Statement Activity'
       effective/cpd_category: 'CPD Category'
+      effective/cpd_target: 'CPD Target'
 
     attributes:
       # These ones might be app level

data/config/routes.rb

@@ -36,6 +36,7 @@ EffectiveCpd::Engine.routes.draw do
     resources :cpd_cycles, except: [:show]
     resources :cpd_rules, only: [:index]
     resources :cpd_special_rules, except: [:show]
+    resources :cpd_targets, except: [:show]
 
     resources :cpd_statements, only: [:index, :show] do
       post :unsubmit, on: :member

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

@@ -6,7 +6,7 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
       t.datetime :start_at
       t.datetime :end_at
 
-      t.integer :required_score
+      t.boolean :required_to_submit, default: false
 
       t.datetime :updated_at
       t.datetime :created_at
@@ -324,5 +324,17 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
+    create_table <%= @cpd_targets_table_name %>  do |t|
+      t.integer :user_id
+      t.string :user_type
+
+      t.integer :cpd_cycle_id
+
+      t.decimal :score
+      t.boolean :required_to_submit
+
+      t.timestamps
+    end
+
   end
 end

data/db/seeds.rb

@@ -18,7 +18,6 @@ cycle = Effective::CpdCycle.create!(
   title: "#{now.year} Continuing Professional Development",
   start_at: now.beginning_of_year,
   end_at: now.end_of_year,
-  required_score: 100,
   all_steps_content: "All Steps Content",
   start_content: "Start Content",
   activities_content: "Activities Content",

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '1.3.7'
+  VERSION = '1.4.1'
 end

data/lib/effective_cpd.rb

@@ -14,6 +14,8 @@ module EffectiveCpd
       :cpd_audit_level_questions_table_name, :cpd_audit_level_question_options_table_name,
       :cpd_audits_table_name, :cpd_audit_responses_table_name, :cpd_audit_response_options_table_name,
       :cpd_audit_reviews_table_name, :cpd_audit_review_items_table_name, :cpd_bulk_audits_table_name,
+      :cpd_targets_table_name,
+
       :layout, :auditee_user_scope, :audit_reviewer_user_scope,
       :use_effective_messaging,
       :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject, :use_effective_email_templates,

data/lib/generators/effective_cpd/install_generator.rb

@@ -48,6 +48,7 @@ module EffectiveCpd
         @cpd_audit_review_items_table_name = ':' + EffectiveCpd.cpd_audit_review_items_table_name.to_s
 
         @cpd_bulk_audits_table_name = ':' + EffectiveCpd.cpd_bulk_audits_table_name.to_s
+        @cpd_targets_table_name = ':' + EffectiveCpd.cpd_targets_table_name.to_s
 
         migration_template ('../' * 3) + 'db/migrate/01_create_effective_cpd.rb.erb', 'db/migrate/create_effective_cpd.rb'
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.4.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-23 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -234,6 +234,7 @@ files:
 - app/controllers/admin/cpd_special_rules_controller.rb
 - app/controllers/admin/cpd_statement_activities_controller.rb
 - app/controllers/admin/cpd_statements_controller.rb
+- app/controllers/admin/cpd_targets_controller.rb
 - app/controllers/effective/cpd_audit_reviews_controller.rb
 - app/controllers/effective/cpd_audits_controller.rb
 - app/controllers/effective/cpd_cycles_controller.rb
@@ -253,6 +254,7 @@ files:
 - app/datatables/admin/effective_cpd_special_rules_datatable.rb
 - app/datatables/admin/effective_cpd_statement_activities_datatable.rb
 - app/datatables/admin/effective_cpd_statements_datatable.rb
+- app/datatables/admin/effective_cpd_targets_datatable.rb
 - app/datatables/effective_cpd_available_audit_reviews_datatable.rb
 - app/datatables/effective_cpd_available_audits_datatable.rb
 - app/datatables/effective_cpd_available_cycles_datatable.rb
@@ -288,6 +290,7 @@ files:
 - app/models/effective/cpd_special_rule_mate.rb
 - app/models/effective/cpd_statement.rb
 - app/models/effective/cpd_statement_activity.rb
+- app/models/effective/cpd_target.rb
 - app/views/admin/cpd_activities/_form.html.haml
 - app/views/admin/cpd_audit_level_questions/_form.html.haml
 - app/views/admin/cpd_audit_levels/_form.html.haml
@@ -324,10 +327,13 @@ files:
 - app/views/admin/cpd_cycles/_form_cpd_cycle.html.haml
 - app/views/admin/cpd_cycles/_form_cpd_rules.html.haml
 - app/views/admin/cpd_cycles/_form_cpd_special_rules.html.haml
+- app/views/admin/cpd_cycles/_form_cpd_targets.html.haml
 - app/views/admin/cpd_special_rules/_form.html.haml
 - app/views/admin/cpd_statements/_cpd_statement.html.haml
+- app/views/admin/cpd_targets/_form.html.haml
 - app/views/admin/users/_form_cpd.html.haml
 - app/views/admin/users/_form_cpd_audits.html.haml
+- app/views/admin/users/_form_cpd_targets.html.haml
 - app/views/effective/cpd/_dashboard.html.haml
 - app/views/effective/cpd_audit_level_questions/_cpd_audit_level_question.html.haml
 - app/views/effective/cpd_audit_responses/_cpd_audit_response.html.haml