effective_cpd 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c655d5b1c2e948affbfee9558e51b7e66ca5cfd0e43fbf2a58fecc7a3b2d885f
-  data.tar.gz: 06fe0a9add6534d48e5b51055343018c75723fa288f9051666fd29767fab0f86
+  metadata.gz: 5b6ad81c90e8ba68f14d6975f449c71ebb20076f7b261f13548cd78eb57cab5b
+  data.tar.gz: 42bddd331a47d453bcad32a2fa904d7b5691040f4fb10790996b28c5a93ea73f
 SHA512:
-  metadata.gz: bd95fa02fad56e41914ac568da4cdaf0b2413297a35fbccf4d8c32659d1e2e30c0e474871d33f124a03f7c962372a9136149cd587a520c6c41447e269692901a
-  data.tar.gz: 212aaa715dcee4635d708a579fad03e18bdfd8b253515d2a3b3b2dcaf1419eb7237766c68260d83992c6520d802fc128ebd355537b820578ea823b9362101661
+  metadata.gz: 0e9a580dc39ed60934e761b3b9103168307db5e90f1b3143cb90b89ffc3d945a81f993f090837a1153dcbc053c6ad71d342fe24549e684cf659a08dd4ed259d5
+  data.tar.gz: d92f8ab5424cc5b1c4ef7ee9c341707742985876324d0f0c88766b62acec2c83b61cf717d4a87105a34a352d2bfdd8c8de6385aaaabb14fb8266794ad6b074c1

data/app/models/effective/cpd_cycle.rb

@@ -81,7 +81,7 @@ module Effective
       attributes = cycle.dup.attributes.except('title', 'token', 'start_at', 'end_at')
       assign_attributes(attributes)
 
-      [:all_steps_content, :sidebar_content, :start_content, :activities_content, :submit_content, :complete_content].each do |rich_text|
+      [:all_steps_content, :sidebar_content, :start_content, :activities_content, :agreements_content, :submit_content, :complete_content].each do |rich_text|
         self.send("#{rich_text}=", cycle.send(rich_text))
       end
 

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

@@ -1,4 +1,5 @@
 - edit_path = effective_cpd.edit_admin_cpd_category_path(cpd_category)
+- cpd_rule = cpd_cycle.rule_for(cpd_category)
 
 = effective_form_with(model: [:admin, cpd_cycle], engine: true) do |f|
   %h2= cpd_category
@@ -22,40 +23,42 @@
 
   = f.submit
 
-= effective_form_with(model: [:admin, cpd_cycle], engine: true) do |f|
-  %h2 Activities
-  - rules = cpd_category.cpd_activities.map { |activity| cpd_cycle.rule_for(activity) }
+- unless cpd_rule.unavailable?
 
-  = f.fields_for :cpd_rules, rules do |fa|
-    - activity = fa.object.ruleable
+  = effective_form_with(model: [:admin, cpd_cycle], engine: true) do |f|
+    %h2 Activities
+    - rules = cpd_category.cpd_activities.map { |activity| cpd_cycle.rule_for(activity) }
 
-    = card do
-      .row
-        .col
-          %h5.card-title= activity
-          - if activity.body.present?
-            %p= activity.body
+    = f.fields_for :cpd_rules, rules do |fa|
+      - activity = fa.object.ruleable
 
-          %p= link_to 'Edit Activity', edit_path, target: '_blank'
+      = card do
+        .row
+          .col
+            %h5.card-title= activity
+            - if activity.body.present?
+              %p= activity.body
 
-          = f.static_field :amount_label, value: activity.amount_label.presence || '-'
-          = f.static_field :amount2_label, value: activity.amount2_label.presence || '-'
-          = f.static_field :requires_upload_file, value: (activity.requires_upload_file ? 'Yes' : '-')
+            %p= link_to 'Edit Activity', edit_path, target: '_blank'
 
-        .col
-          = fa.text_field :formula, hint: cpd_rule_formula_hint(activity)
+            = f.static_field :amount_label, value: activity.amount_label.presence || '-'
+            = f.static_field :amount2_label, value: activity.amount2_label.presence || '-'
+            = f.static_field :requires_upload_file, value: (activity.requires_upload_file ? 'Yes' : '-')
 
-          = fa.text_field :credit_description, label: "#{cpd_credits_label.titleize} description",
-            hint: "A simple description of the formula and its #{cpd_credits_label} calculation"
+          .col
+            = fa.text_field :formula, hint: cpd_rule_formula_hint(activity)
 
-          = fa.number_field :max_credits_per_cycle,
-            label: "Max #{cpd_credits_label} per #{cpd_cycle_label}",
-            hint: 'leave blank for no limit'
+            = fa.text_field :credit_description, label: "#{cpd_credits_label.titleize} description",
+              hint: "A simple description of the formula and its #{cpd_credits_label} calculation"
 
-          = fa.number_field :max_cycles_can_carry_forward,
-            label: "Max #{cpd_cycles_label} can carry forward",
-            hint: "leave blank for no limit. enter zero for no carry forward."
+            = fa.number_field :max_credits_per_cycle,
+              label: "Max #{cpd_credits_label} per #{cpd_cycle_label}",
+              hint: 'leave blank for no limit'
 
-          = fa.check_box :unavailable, label: "Unavailable in this #{cpd_cycle_label}"
+            = fa.number_field :max_cycles_can_carry_forward,
+              label: "Max #{cpd_cycles_label} can carry forward",
+              hint: "leave blank for no limit. enter zero for no carry forward."
 
-  = f.submit
+            = fa.check_box :unavailable, label: "Unavailable in this #{cpd_cycle_label}"
+
+    = f.submit

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

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