effective_cpd 1.4.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10907aa7ee22755cd4b27d3e0fba90d6297dce95948e18c43b6e7a24f60d5f03
-  data.tar.gz: f2f2c72a7d1ea65c420583d7e2749dec93793b0395f4a2a4253f440c6f862f05
+  metadata.gz: 3b0933a04c3fbbcd4f6aa4676848f9f2d3a707a97b199f25ee3439562d73049d
+  data.tar.gz: 3b8f990c0c13f8112ed97ea24133dcf2cf1cb5f66fc2464ec8b686c83dc81aa7
 SHA512:
-  metadata.gz: 1114387c7ae09280a38b2f446456c1ae76d51647fd50b945dcf0d830f8e27b6aee44a6187f3f113b484939f5d89b59d78e1482416f9c9ba37b92e8be35b907da
-  data.tar.gz: 93c2ce6aa6b583bc33517291b44145a80542ac8545f6012a38ff5ed92a85fb7876a3f110d507034965b55942065113fb47fe0aa1c0994c44daf63613badd2e45
+  metadata.gz: 5c4a5860719ddb9336610bca4d45d17c23756d46255f94cc18719d45853401275e1458e89ad0cb2b6f97e3b7db8f6cd3932ca869843f8da806d4fd07ddcf82fd
+  data.tar.gz: a513062879d048f4401040b1114fdbbb2e8622ea836d306824ec3f1aeec54846235a932283954821578ccb4aac79e0daba26da46cc0c91678f5dc22e8ae1106b

data/app/controllers/effective/cpd_statement_activities_controller.rb

@@ -14,7 +14,12 @@ module Effective
     # Redirect the remote form back to the activities page
     on :save, redirect: -> {
       statement = resource.cpd_statement
-      effective_cpd.cpd_cycle_cpd_statement_build_path(statement.cpd_cycle, statement, :activities)
+
+      if params[:commit] == 'Save and Add Another'
+        effective_cpd.cpd_cycle_cpd_statement_build_path(statement.cpd_cycle, statement, :activities, activities: :new)
+      else
+        effective_cpd.cpd_cycle_cpd_statement_build_path(statement.cpd_cycle, statement, :activities)
+      end
     }
 
     def permitted_params

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

@@ -62,11 +62,12 @@
 
     .mb-3
       = f.submit do
-        = f.save 'Save Activity'
+        = f.save "Save"
+        = f.save "Save and Add Another"
 
         %div{style: 'position: absolute; left: 0;'}
           - if f.object.new_record?
             = link_to('Back', '#', class: 'btn btn-secondary', 'data-cpd-back-activity': true)
           - else
             - url = effective_cpd.cpd_statement_cpd_statement_activity_path(statement, cpd_statement_activity)
-            = link_to('Delete', url, class: 'btn btn-danger', 'data-confirm': "Really delete?", 'data-method': :delete)
+            = link_to('Delete', url, class: 'btn btn-danger', 'data-confirm': "Really delete?", 'data-disable-with': 'Deleting...', 'data-method': :delete)

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

@@ -4,7 +4,9 @@
     .col-9
       %h1= resource.cpd_cycle
 
-  .activities-index
+  - activities = (params[:activities] == 'new' ? :new : :index)
+
+  .activities-index{style: ('display: none;' unless activities == :index)}
     = render('layout') do
       - if resource.cpd_cycle.all_steps_content.present?
         .mb-2= resource.cpd_cycle.all_steps_content.to_s
@@ -22,5 +24,5 @@
         = f.hidden_field :current_step
         = f.submit 'Save and Continue', center: true
 
-  .activities-new{style: 'display: none;'}
+  .activities-new{style: ('display: none;' unless activities == :new)}
     = render('activities_new', cpd_statement: resource)

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '1.4.0'
+  VERSION = '1.4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-02 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails