effective_cpd 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de3c5aff3c8b80fd7399e397e1c4968bb8b0bfe59c393e7163f6ac122a6060ba
-  data.tar.gz: fe0ac220660ae96ed5ec5ef3323cb999232ba5dfddbe9e0189e6e977f197d0ae
+  metadata.gz: 789dc178c0c706f7d63d166f48e512b36b3f905eb6e70abd242f98924773a679
+  data.tar.gz: 86e4bb9b95b8a53dd810316b3d4ea9ca2031c8063155cc57d1e192f29b3a84b5
 SHA512:
-  metadata.gz: 712935d335c2873f55782a8cef4d2f3ba88bb84478dd856294a563c325d25eccd52fef3a07310c49f87b64d7e55eaa26500653fee4d0c307bc442e6682261846
-  data.tar.gz: 5dfdad26cf708b8ff43c9b03a66e7a45e82fd1d3c4c9510958a056548c64068b908fd7b984ea9350f745aa477c803fd88e132706cecd61e5b6ac4c8aa3f31ee6
+  metadata.gz: d96d0a42c29587ab1ead57f7b6707f3acc9e607f0eb9fdf9c05336242491351833a2e14ddb81b883c1f8b811ca3a8712a8814ba97fec679ebc0d5b635b04f69a
+  data.tar.gz: e9d5453a4816d34b7668027b96c82a3a2208d7158a656ebaf02fff1776f5dc03e642b2e3b9d34272dcd28d94d6ced94310470d85fdd532c51eb4628ab9ba6f97

data/README.md

@@ -134,6 +134,31 @@ As an admin, visit the CPD Categories, then CPD Cycles, and CPD Audit levels.
 
 Once all these 3 areas have been configured, users can submit statements and audits can be performed.
 
+## Required Score
+
+You can specify the required score in the CPD Cycle.
+
+You can also programatically do it. Add the following to your user class.
+
+```
+# This is an ActiveRecord concern to add the has_many :cpd_statements
+effective_cpd_user
+
+# Just this one magic method. Chcked when submitting the passed cpd_Statement
+# Must be 100 points in the last 3 years. Can submit 0 0 100 or 33 33 34
+def cpd_statement_required_score(cpd_statement)
+  # All completed cpd statements before this cpd_statement
+  existing = cpd_statements.select { |s| s.completed? && s.cpd_cycle_id < cpd_statement.cpd_cycle_id }
+  return 0 if existing.length < 2
+
+  existing_score = others.last(2).map { |statement| statement.score }.sum
+  raise('expected existing to be >= 0') if existing < 0
+  return 0 if existing >= 100
+
+  (100 - existing)
+end
+```
+
 ## Authorization
 
 All authorization checks are handled via the effective_resources gem found in the `config/initializers/effective_resources.rb` file.

data/app/models/concerns/effective_cpd_user.rb

@@ -0,0 +1,29 @@
+# EffectiveCpdUser
+#
+# Mark your user model with effective_cpd_user to get a few helpers
+# And user specific point required scores
+
+module EffectiveCpdUser
+  extend ActiveSupport::Concern
+
+  module Base
+    def effective_cpd_user
+      include ::EffectiveCpdUser
+    end
+  end
+
+  included do
+    has_many :cpd_statements, -> { Effective::CpdStatement.sorted }, class_name: 'Effective::CpdStatement'
+    has_many :cpd_audits, -> { Effective::CpdAudit.sorted }, inverse_of: :user, class_name: 'Effective::CpdAudit'
+    has_many :cpd_audit_reviews, -> { Effective::CpdAuditReview.sorted }, inverse_of: :user, class_name: 'Effective::CpdAuditReview'
+  end
+
+  def cpd_statement_required_score(cpd_statement)
+    nil
+  end
+
+  module ClassMethods
+    def effective_cpd_user?; true; end
+  end
+
+end

data/app/models/effective/cpd_statement.rb

@@ -54,9 +54,9 @@ module Effective
       self.score ||= 0
     end
 
-    validate(if: -> { completed? && cpd_cycle.required_score.present? }) do
-      min = cpd_cycle.required_score
-      self.errors.add(:score, "must be #{min} or greater to submit statement") if score < min
+    validate(if: -> { completed? }) do
+      min = required_score()
+      self.errors.add(:score, "must be #{min} or greater to submit a statement") if score < min
     end
 
     with_options(if: -> { current_step == :agreements }) do
@@ -87,6 +87,13 @@ module Effective
       submitted_at.present?
     end
 
+    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.to_i, required_by_user.to_i].max
+    end
+
     def carry_forward
       cpd_statement_activities.sum { |activity| activity.carry_forward.to_i }
     end

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

@@ -22,10 +22,7 @@
             %h4= resource.score.to_i
 
           %td
-            - if cpd_cycle.required_score.to_i > 0
-              #{cpd_credits_label} out of #{cpd_cycle.required_score} required
-            - else
-              #{cpd_credits_label} in current #{cpd_cycle_label}
+            #{cpd_credits_label} out of #{resource.required_score} required
 
         %tr
           %td

data/lib/effective_cpd/engine.rb

@@ -7,5 +7,12 @@ module EffectiveCpd
       eval File.read("#{config.root}/config/effective_cpd.rb")
     end
 
+    # Include acts_as_addressable concern and allow any ActiveRecord object to call it
+    initializer 'effective_cpd.active_record' do |app|
+      ActiveSupport.on_load :active_record do
+        ActiveRecord::Base.extend(EffectiveCpdUser::Base)
+      end
+    end
+
   end
 end

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-03 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -212,6 +212,7 @@ files:
 - app/helpers/effective_cpd_audits_helper.rb
 - app/helpers/effective_cpd_helper.rb
 - app/mailers/effective/cpd_mailer.rb
+- app/models/concerns/effective_cpd_user.rb
 - app/models/effective/cpd_activity.rb
 - app/models/effective/cpd_audit.rb
 - app/models/effective/cpd_audit_level.rb