effective_cpd 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10907aa7ee22755cd4b27d3e0fba90d6297dce95948e18c43b6e7a24f60d5f03
-  data.tar.gz: f2f2c72a7d1ea65c420583d7e2749dec93793b0395f4a2a4253f440c6f862f05
+  metadata.gz: 15a9526456ab27ed3cc2dca6c6c368afe97e478282d66083cfb45e10250071c8
+  data.tar.gz: 4394265758150e1a979fa5cb000f22f5153c7c7a5be772e4b90d2795376697f4
 SHA512:
-  metadata.gz: 1114387c7ae09280a38b2f446456c1ae76d51647fd50b945dcf0d830f8e27b6aee44a6187f3f113b484939f5d89b59d78e1482416f9c9ba37b92e8be35b907da
-  data.tar.gz: 93c2ce6aa6b583bc33517291b44145a80542ac8545f6012a38ff5ed92a85fb7876a3f110d507034965b55942065113fb47fe0aa1c0994c44daf63613badd2e45
+  metadata.gz: bffcf39a42c4481b6e51425e0ff373b9a6670c2e9c01027099d4f3abe299fdf428ba601123e38f17f136abdd5f95cec8a35560839524dcd29c69bf3cdb653d9b
+  data.tar.gz: e427677d3c6ec195b01b0b22c9022ce4eac3c40fa04eeeb873da3a7573e2b8a68e076cc8151f684f9a0b0c11fe1804cc63ce77c9554d50823dfb54b9ed9e1614

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,7 +62,8 @@
 
     .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?

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.1'
 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.1
 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