effective_cpd 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42fb9cbcba6674433f77a1b274d2855000a94724aa34fe8ded25177eb9171046
-  data.tar.gz: 7c3fa8934b17b16a67b4fccbc2f29eba4b3af1beb66fb82b07706526dca8c60b
+  metadata.gz: 7ae72402afeab6ed8830a9951e48d0bf33494e0f5fc5133049aa652876aa367e
+  data.tar.gz: bbdad22b7cd86165bc476b0c9fc8615e42e4cea2cd6c7b0c9310927bac76b0d1
 SHA512:
-  metadata.gz: 82101c275e55d097ced7a9f214758ae33886e319d38649be8997dae6cb62512239f78621ca3ab4e4be27738adc2c2ad2982b5f21a0fffed16a936526bb1aa9de
-  data.tar.gz: a22f3d126c721f109e0e2fb3e32a5b9bec21caa6e8bd3f9196c010088d0be3e4534e7a47ecaa707df1547c2393ba4503b4f0f39ce47458a4ca77714c2219f120
+  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/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

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.10'
+  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.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2021-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails