effective_cpd 0.1.6 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b6ad81c90e8ba68f14d6975f449c71ebb20076f7b261f13548cd78eb57cab5b
-  data.tar.gz: 42bddd331a47d453bcad32a2fa904d7b5691040f4fb10790996b28c5a93ea73f
+  metadata.gz: 7ae72402afeab6ed8830a9951e48d0bf33494e0f5fc5133049aa652876aa367e
+  data.tar.gz: bbdad22b7cd86165bc476b0c9fc8615e42e4cea2cd6c7b0c9310927bac76b0d1
 SHA512:
-  metadata.gz: 0e9a580dc39ed60934e761b3b9103168307db5e90f1b3143cb90b89ffc3d945a81f993f090837a1153dcbc053c6ad71d342fe24549e684cf659a08dd4ed259d5
-  data.tar.gz: d92f8ab5424cc5b1c4ef7ee9c341707742985876324d0f0c88766b62acec2c83b61cf717d4a87105a34a352d2bfdd8c8de6385aaaabb14fb8266794ad6b074c1
+  metadata.gz: 51b58155d16e45298264fd9779a5b0ba3b3432261b4b8fabf88a04754182eef0d85975c3d853099eceb9e871eed13d03d4115d4bd1028f77891ca357b3801956
+  data.tar.gz: d2d7895e77c218b0a677d2601538e2b278b3518b25b0c60b0cfc3ed22a4462fb5e0a1ff634d5ff2d27fc75e1c36d116bcff0f5cfea6f826c061cc05e22fe883a

data/README.md

@@ -197,11 +197,13 @@ if user.admin?
   can :manage, Effective::CpdCycle
   can :manage, Effective::CpdRule
 
+  can([:index, :show], Effective::CpdStatement)
+  can(:unsubmit, Effective::CpdStatement) { |statement| statement.completed? }
+
   can :manage, Effective::CpdAuditLevel
   can :manage, Effective::CpdAuditLevelSection
   can :manage, Effective::CpdAuditLevelQuestion
 
-  can :manage, Effective::CpdStatement
   can :manage, Effective::CpdAudit
   can :manage, Effective::CpdAuditReview
 end

data/app/assets/javascripts/effective_cpd/activities.js

@@ -1,14 +1,8 @@
 const initialize_effective_cpd_activities = function() {
-  const $obj = $('.cpd-statement-activities:not(.initialized)')
+  const $obj = $('#cpd-statement-activities,.cpd-statement-activities')
 
   if($obj.length > 0) {
-    $(document).on('mousedown touchstart', function(event) { collapse_effective_cpd_activities() })
-
-    // When we click outside the New Activity or Edit Activity
-    $(document).on('mousedown touchstart', '.activities-new', function(event) { event.stopPropagation() });
-    $(document).on('mousedown touchstart', '.statement-activity', function(event) { event.stopPropagation() });
-
-    $obj.addClass('initialized')
+    $('body').addClass('effective-cpd-statement-activities')
   }
 };
 
@@ -50,6 +44,15 @@ $(document).on('click', '[data-cpd-collapse]', function(event) {
   collapse_effective_cpd_activities()
 });
 
+// Click outside the activities anywehre on body
+$(document).on('mousedown touchstart', 'body.effective-cpd-statement-activities', function(event) {
+  collapse_effective_cpd_activities()
+});
+
+// When we click outside the New Activity or Edit Activity
+$(document).on('mousedown touchstart', 'body.effective-cpd-statement-activities .activities-new', function(event) { event.stopPropagation() });
+$(document).on('mousedown touchstart', 'body.effective-cpd-statement-activities .statement-activity', function(event) { event.stopPropagation() });
+
 // Initializers
-$(document).ready(function() { initialize_effective_cpd_activities() });
-$(document).on('turbolinks:load', function() { initialize_effective_cpd_activities() });
+$(document).ready(initialize_effective_cpd_activities);
+$(document).on('turbolinks:load', initialize_effective_cpd_activities);

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

@@ -3,6 +3,8 @@
     .progress { height: 3px; }
   }
 
+  .cpd-statement-activity { padding: 0.5rem; }
+
   .statement-activity-content {
     a { color: inherit; }
   }

data/app/controllers/effective/cpd_statements_controller.rb

@@ -22,7 +22,7 @@ module Effective
         flash[:danger] = "You have already completed a statement for this #{cpd_cycle_label}."
         redirect_to(root_path)
       elsif existing.present?
-        flash[:success] = "You have been redirected to the #{resource_wizard_step_title(existing.next_step)} step."
+        flash[:success] = "You have been redirected to the #{resource_wizard_step_title(existing, existing.next_step)} step."
         redirect_to effective_cpd.cpd_cycle_cpd_statement_build_path(existing.cpd_cycle, existing, existing.next_step)
       end
     end

data/app/models/effective/cpd_rule.rb

@@ -13,8 +13,8 @@ module Effective
       log_changes(to: :cpd_cycle)
     end
 
-    # Only permit the words amount, amount2 and any charater 0-9 + - / * ( )
-    INVALID_FORMULA_CHARS = /[^0-9\+\-\/\*\(\)]/
+    # Only permit the words amount, amount2 and any charater 0-9 + - / * . ( )
+    INVALID_FORMULA_CHARS = /[^0-9\+\-\.\/\*\(\)]/
 
     effective_resource do
       # A plaintext description of the formula
@@ -55,7 +55,7 @@ module Effective
 
     validate(if: -> { formula.present? }) do
       if formula.gsub('amount2', '').gsub('amount', '').gsub(' ', '').match(INVALID_FORMULA_CHARS).present?
-        self.errors.add(:formula, "may only contain amount, amount2 and 0-9 + - / * ( ) characters")
+        self.errors.add(:formula, "may only contain amount, amount2 and 0-9 + - / * . ( ) characters")
       else
         begin
           eval_equation(amount: 0, amount2: 0)
@@ -118,7 +118,7 @@ module Effective
 
     def eval_equation(amount: nil, amount2: nil)
       equation = formula.gsub('amount2', amount2.to_s).gsub('amount', amount.to_s)
-      eval(equation).to_i
+      eval(equation).round.to_i
     end
 
   end

data/app/models/effective/cpd_statement.rb

@@ -79,6 +79,11 @@ module Effective
       update!(submitted_at: Time.zone.now)
     end
 
+    # Called by admin only. This is an exceptional action
+    def unsubmit!
+      update!(wizard_steps: {}, submitted_at: nil, confirm_readonly: nil)
+    end
+
     def in_progress?
       submitted_at.blank?
     end
@@ -86,6 +91,7 @@ module Effective
     def completed?
       submitted_at.present?
     end
+    alias_method :submitted?, :completed?
 
     def required_score
       required_by_cycle = cpd_cycle&.required_score

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

@@ -2,6 +2,7 @@
   - cpd_activity = cpd_statement_activity.cpd_activity
   - rule = cpd_statement_activity.cpd_statement.cpd_cycle.rule_for(cpd_activity)
 
+  .float-right= link_to icon('x', class: 'small-1'), '#', 'data-cpd-collapse': true
   %p
     = cpd_statement_activity
     %br
@@ -21,13 +22,13 @@
       .row
         - if cpd_activity.amount_label.present?
           .col
-            %strong #{cpd_activity.amount_label.titleize.pluralize}
+            %strong= cpd_activity.amount_label
             %br
             = cpd_statement_activity.amount
 
         - if cpd_activity.amount2_label.present?
           .col.text-center
-            %strong #{cpd_activity.amount2_label.to_s.titleize.pluralize} Articles written
+            %strong= cpd_activity.amount2_label
             = cpd_statement_activity.amount2
 
         - if cpd_activity.amount_static?

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

@@ -41,10 +41,10 @@
   .row
     .col
       - if activity.amount_label.present?
-        = f.number_field :amount, label: activity.amount_label.titleize.pluralize, required: true
+        = f.number_field :amount, label: activity.amount_label, required: true
 
       - if activity.amount2_label.present?
-        = f.number_field :amount2, label: activity.amount2_label.titleize.pluralize, required: true
+        = f.number_field :amount2, label: activity.amount2_label, required: true
 
       - if activity.amount_static?
         = f.hidden_field :amount, value: 1

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

@@ -1,5 +1,5 @@
 .cpd-statement-activities
-  .row{style: 'margin-top: -2rem'}
+  .row
     .col-8
     .col-2.score
       %strong= cpd_credits_label.titleize

data/config/routes.rb

@@ -34,7 +34,9 @@ EffectiveCpd::Engine.routes.draw do
     resources :cpd_rules, only: [:index]
     resources :cpd_special_rules, except: [:show]
 
-    resources :cpd_statements, only: [:index, :show]
+    resources :cpd_statements, only: [:index, :show] do
+      post :unsubmit, on: :member
+    end
 
     resources :cpd_audit_levels, except: [:show]
     resources :cpd_audit_level_questions, except: [:show]

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '0.1.6'
+  VERSION = '0.1.11'
 end

metadata

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