effective_cpd 0.1.7 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa00b7ca9d6039709adb5c4948137632b28eeb8d8c551b5b489d9c4070722b51
-  data.tar.gz: b53448836a6adc80ad1430ad3c569b5ee4f19cb1bc10339dbc222b44998dd97c
+  metadata.gz: cde9eaf26a9942cdb7c819292ccd1613563d5dad01bd0f15c751e92b9779a90f
+  data.tar.gz: 4871cc82d92fbd1280fabc31a914a0e92d5c07f66e98bfae183da5de203deeed
 SHA512:
-  metadata.gz: 9bbc1c8162e0c595d1c51ea8148caa59de3654993b5764a177a5c66eda39ed7f29554a2bb1cf2f31f3b1f2d8eeaf6373866e64bbbdcf00e3bf6f796b8e918ddb
-  data.tar.gz: 3f1cfa5651851f517a697f9cf540d3319b0f17583557d0e5dcf0d2a1e32c9de49a96b421c82b458677191650f7e722bd5468e133a610844f55a5474313324e12
+  metadata.gz: 588c74b697e23bd1172f7ea9001a04771ea9c0a609fd90d43c4f446b7986d0d229e0d558b7154e0d8ccd7c7ec1492abb3389346725955b073ab3765523dbb038
+  data.tar.gz: 7310fd2ca81076bd23eddd5d9f276f685b6d479857123fd7799cd16719d30170b659578eb4cc681caf659bef8435bc1f07b2dfe1d5b837a0f23673183ed1a746

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_audit.rb

@@ -94,7 +94,7 @@ module Effective
       started_at              :datetime
       submitted_at            :datetime
       reviewed_at             :datetime
-      audited_at              :datetime       # TODO: CHange to closed_at
+      closed_at               :datetime
 
       # Acts as tokened
       token                   :string

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

@@ -10,7 +10,7 @@
   %tbody
     %tr
       %td Opened
-      %td= cpd_audit.opened_at.strftime('%F') || '-'
+      %td= cpd_audit.opened_at&.strftime('%F') || '-'
       %td #{icon('check', class: 'small-1')} Done
       %td
 

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

@@ -38,7 +38,7 @@
       - if cpd_audit.completed?
         %tr
           %th Submitted on
-          %td= cpd_audit.submitted_at.strftime('%F')
+          %td= cpd_audit.submitted_at&.strftime('%F') || '-'
 
       %tr
         %th Status

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.7'
+  VERSION = '0.1.12'
 end

metadata

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