effective_cpd 0.6.7 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f8ab2919547d6a9f2385feb05cd00366bfdf1d4bc8749be2714f2d789249164
-  data.tar.gz: 02f0a5a137070f384f19a604b1ff7df6af74e2c420c589306072c5e02a289969
+  metadata.gz: 9fc9c5614b8c87479aef3067320ae4f432255f4214f65d5fb6558cb389c557aa
+  data.tar.gz: 6196e732aaa80aeaf16c8be346d2b28e3fba2251f749bc7038319954cc97d494
 SHA512:
-  metadata.gz: fdb6eb4fea328ded00578d5c16d1e4ed9d46f1560a28c5af53d9fdd3a7ad8675bfe3deb9a8266b0de2a13f37109f22f2fc814850985bf2abaac39070e5b3c592
-  data.tar.gz: fd01df0b6f085280c1fc4c8065ba321de5644f765655de4bb0d11b5927c8caf81117a4d1ca50d87338ba0e075669c68a068b23374152ede1536afab78231ddee
+  metadata.gz: 30b45d45efa81a63adeab41b0da5ce2811e718eb447b77b3419aadddb04b47d01aa9c55d3a71c9615ee56dd19f8a8bfe19b477dd31cc02e2ade811cdbd32038f
+  data.tar.gz: 7af185b1632ff2928c814efca3e8262a4e1c3b366fdbc511cedfecf93e07cadcea7a8da999d4b8d6a18995bffb75f95af0669f5fa384f5d458e4b0ded953b753

data/app/controllers/effective/cpd_statements_controller.rb

@@ -14,15 +14,6 @@ module Effective
       CpdScorer.new(user: resource.user).score!
     end
 
-    # Enforce one statement per user per cycle. Redirect them to an existing statement for this cycle.
-    before_action(only: [:new, :show]) do
-      existing = resource_scope.where.not(id: resource).first
-
-      if existing.present?
-        redirect_to effective_cpd.cpd_cycle_cpd_statement_build_path(existing.cpd_cycle, existing, existing.next_step)
-      end
-    end
-
     # Enforce cycle availability
     before_action(only: [:show, :update]) do
       cycle = resource.cpd_cycle

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

@@ -5,7 +5,7 @@
   = f.date_field :start_at,
     hint: "The first date statements may be submited for this #{cpd_cycle_label}"
 
-  = f.date_field :end_at,
+  = f.date_field :end_at, date_linked: false,
     hint: "The last date statements may be created for this #{cpd_cycle_label}. leave blank for no end date."
 
   = f.number_field :required_score,

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

@@ -0,0 +1,15 @@
+%h2 Statements
+- datatable = Admin::EffectiveCpdStatementsDatatable.new(user: user)
+= render_datatable(datatable, inline: true)
+
+%hr
+
+%h2 Activities
+- datatable = Admin::EffectiveCpdStatementActivitiesDatatable.new(user: user)
+= render_datatable(datatable, inline: true)
+
+%hr
+
+%h2 Audits
+- datatable = Admin::EffectiveCpdAuditsDatatable.new(user: user)
+= render_datatable(datatable)

data/app/views/effective/cpd/_dashboard.html.haml

@@ -18,6 +18,8 @@
   .mt-4
     %p Please submit a CPD statement for the following available #{cpd_cycles_label}:
     = render_datatable(available, simple: true)
+- else
+  %p There are no #{cpd_cycles_label} available to submit. When there are, we'll show them here.
 
 - completed = EffectiveCpdCompletedStatementsDatatable.new(self)
 - if completed.present?

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '0.6.7'
+  VERSION = '0.6.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-05 00:00:00.000000000 Z
+date: 2023-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -264,6 +264,7 @@ files:
 - app/views/admin/cpd_cycles/_form_cpd_special_rules.html.haml
 - app/views/admin/cpd_special_rules/_form.html.haml
 - app/views/admin/cpd_statements/_cpd_statement.html.haml
+- app/views/admin/users/_form_cpd.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