effective_cpd 1.4.7 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9543132d5f9889e73a0bd2955ea38fef007d229503aa25229721e6b8e7a14907
-  data.tar.gz: 30940ca9dc3eac1898b3293eacad456cfc490895d2e21edd7a47a9e9a0adc3ce
+  metadata.gz: 11af477a097aa90f61b028c9cbcabc827735acb2dc3192b6c915fa5a251421bb
+  data.tar.gz: ad2b6f62f0b13062541405298a2a2e4f23505956ffd691b636046bc9aa49ccba
 SHA512:
-  metadata.gz: c3761c3654663e4fe88124f03fc5d01c12039013b47a44f5b30290798c78ade7d1efbd0fa4b1be4badac1d01680c255fc8f160b31964e0bd124664201d98de8d
-  data.tar.gz: 56e597a9beffaafd3adb6d553c083beceb83fa4cf11e194c622e3612566f85b2c4602317efd7e9150783d7879d8a1b227293b31f4c624371f9131f1b671c657a
+  metadata.gz: a5440290e1d0f2001235f7de576210bf7ca5362010ea82b1d092aae3eb36dd304d449c60598fc5d8f3b2a09687289a98cb2b70086949b9379ba33968c335d774
+  data.tar.gz: 8e1fcee7bf7ff52437817fa535e265b92a418a9971599992c281368065c99a7d28df396c63026e3d14f4f00797492770f5281c9d7c441e46781bd796806dff1c

data/app/assets/stylesheets/effective_cpd/_activities.scss

@@ -19,3 +19,9 @@
   }
 
 }
+
+.table-cpd-audit-review-statements {
+  .cpd-statement-activity {
+    .float-right { display: none; }
+  }
+}

data/app/models/concerns/effective_cpd_audit.rb

@@ -582,6 +582,7 @@ module EffectiveCpdAudit
     return false unless was_submitted?
     return false unless completed?
     return false unless cpd_audit_reviews.present? && cpd_audit_reviews.all?(&:completed?)
+    return false if was_missing_info?
 
     review!
   end
@@ -636,9 +637,11 @@ module EffectiveCpdAudit
   end
 
   def deadline_to_submit
+    return extension_date if extension_date.present?
+
     return nil unless cpd_audit_level&.days_to_submit.present?
 
-    date = (extension_date || notification_date || created_at || Time.zone.now)
+    date = (notification_date || created_at || Time.zone.now)
     EffectiveResources.advance_date(date, business_days: cpd_audit_level.days_to_submit)
   end
 

data/app/views/admin/cpd_audits/_form_close.html.haml

@@ -1,10 +1,9 @@
-= card('Determination') do
-  = effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
-    %p This action will <strong>close</strong> this #{cpd_audit_label} with the following determination:
+= effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
+  %p This action will <strong>close</strong> this #{cpd_audit_label} with the following determination:
 
-    = f.select :determination, cpd_audit.cpd_audit_level.determinations
+  = f.select :determination, cpd_audit.cpd_audit_level.determinations
 
-    %h2 Email to Send
-    = email_form_fields(f, :cpd_audit_closed)
+  %h2 Email to Send
+  = email_form_fields(f, :cpd_audit_closed)
 
-    = f.submit 'Close', center: true, 'data-confirm': "Really close #{cpd_audit}?"
+  = f.submit 'Close', center: true, 'data-confirm': "Really close #{cpd_audit}?"

data/app/views/admin/cpd_audits/_form_cpd_audit.html.haml

@@ -43,7 +43,7 @@
       = render 'admin/cpd_audits/form_files', cpd_audit: cpd_audit
 
     - if cpd_audit.user_cpd_required?
-      = tab(cpd_audit.cpd_audit_reviews) do
+      = tab(cpd_audit.user.cpd_statements) do
         - datatable = Admin::EffectiveCpdStatementsDatatable.new(user: cpd_audit.user)
         = render_datatable(datatable, inline: true, simple: true)
 
@@ -55,6 +55,6 @@
       = tab(cpd_audit.chats) do
         = render 'admin/cpd_audits/form_chat', cpd_audit: cpd_audit
 
-    - if cpd_audit.respond_to?(:log_changes_datatable)
+    - if cpd_audit.respond_to?(:logs_datatable)
       = tab 'Logs' do
-        = render_inline_datatable(cpd_audit.log_changes_datatable)
+        = render_inline_datatable(cpd_audit.logs_datatable)

data/app/views/effective/cpd_audit_reviews/_cpd_statement.html.haml

@@ -1,5 +1,5 @@
 = wizard_card(cpd_audit_review) do
-  %table.table.table-hover
+  %table.table.table-hover.table-cpd-audit-review-statements
     %thead
       %th #{cpd_audit_review.cpd_audit.name}'s #{cpd_statement}
       %th #{cpd_audit_review.name}'s Review

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

@@ -21,8 +21,7 @@
               = link_to(cpd_audit_review.user, url)
               %br
               %small= mail_to cpd_audit_review.user.email
-
-          - if cpd_audit_review.anonymous? == false
+          - elsif cpd_audit_review.anonymous? == false
             %p
               = cpd_audit_review.user
               %br
@@ -40,8 +39,7 @@
               = link_to(cpd_audit.user, url)
               %br
               %small= mail_to cpd_audit.user.email
-
-          - if cpd_audit.anonymous? == false
+          - elsif cpd_audit.anonymous? == false
             %p
               = cpd_audit.user
               %br

data/app/views/effective/cpd_audit_reviews/cpd_statement.html.haml

@@ -13,7 +13,7 @@
     %h2 Review Activities
     %p Please review the following activities:
 
-    %table.table.table-hover
+    %table.table.table-hover.table-cpd-audit-review-statements
       %thead
         %th #{resource.cpd_audit.user}'s #{cpd_statement}
         %th #{resource.user}'s Review

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

@@ -13,8 +13,7 @@
               = link_to(cpd_audit.user, url)
               %br
               %small= mail_to cpd_audit.user.email
-
-          - if cpd_audit.anonymous? == false
+          - elsif cpd_audit.anonymous? == false
             %p
               = cpd_audit.user
               %br
@@ -33,8 +32,7 @@
                 = link_to(cpd_audit_review.user, url)
                 %br
                 %small= mail_to cpd_audit_review.user.email
-
-            - if cpd_audit_review.anonymous? == false
+            - elsif cpd_audit_review.anonymous? == false
               %p
                 = cpd_audit_review.user
                 %br

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

@@ -3,7 +3,7 @@
 
   - raise('expected a submitted cpd_statement') unless resource.submitted_at.present?
 
-  .alert.alert-warning.mb-4
+  .alert.alert-success.mb-4
     Successfully submitted on #{resource.submitted_at.strftime('%F')}.
 
   - if resource.cpd_cycle.all_steps_content.present?

data/config/locales/effective_cpd.en.yml

@@ -9,11 +9,11 @@ en:
   activerecord:
     models:
       # These ones might be app level
-      app/cpd_audit: 'CPD Audit'
-      app/cpd_audit_level: 'CPD Audit Level'
-      app/cpd_audit_review: 'CPD Audit Review'
-      app/cpd_bulk_audit: 'Bulk Create CPD Audit Review'
-      app/cpd_statement: 'CPD Statement'
+      cpd_audit: 'CPD Audit'
+      cpd_audit_level: 'CPD Audit Level'
+      cpd_audit_review: 'CPD Audit Review'
+      cpd_bulk_audit: 'Bulk Create CPD Audit Review'
+      cpd_statement: 'CPD Statement'
 
       # These ones should stay effective
       effective/cpd_cycle: 'CPD Period'
@@ -23,10 +23,10 @@ en:
 
     attributes:
       # These ones might be app level
-      app/cpd_audit:
+      cpd_audit:
         user: 'Auditee'
         cpd_audit_comments: 'Reviewer Notes'
 
-      app/cpd_audit_review:
+      cpd_audit_review:
         user: 'Reviewer'
         comments: 'Reviewer Notes'

data/db/migrate/01_create_effective_cpd.rb.erb

@@ -21,7 +21,7 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
     end
 
     create_table <%= @cpd_activities_table_name %> do |t|
-      t.references :cpd_category
+      t.integer :cpd_category_id
 
       t.string :title
       t.integer :position
@@ -37,7 +37,8 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
     end
 
     create_table <%= @cpd_rules_table_name %> do |t|
-      t.references :cpd_cycle
+      t.integer :cpd_cycle_id
+
       t.integer :ruleable_id
       t.string :ruleable_type
 
@@ -53,7 +54,7 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
     end
 
     create_table <%= @cpd_special_rules_table_name %> do |t|
-      t.references :cpd_cycle
+      t.integer :cpd_cycle_id
 
       t.decimal :max_credits_per_cycle
       t.string :category
@@ -63,20 +64,22 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
     end
 
     create_table <%= @cpd_special_rule_mates_table_name %> do |t|
-      t.references :cpd_rule
-      t.references :cpd_special_rule
+      t.integer :cpd_rule_id
+      t.integer :cpd_special_rule_id
 
       t.datetime :updated_at
       t.datetime :created_at
     end
 
     create_table <%= @cpd_statement_activities_table_name %> do |t|
-      t.references :cpd_statement
-      t.references :cpd_activity
-      t.references :cpd_category
-      t.references :original
+      t.integer :cpd_statement_id
+      t.string :cpd_statement_type
+
+      t.integer :cpd_activity_id
+      t.integer :cpd_category_id
+      t.integer :original_id
+      t.integer :cpd_cycle_id
 
-      t.references :cpd_cycle
       t.integer :user_id
       t.string :user_type
 
@@ -97,7 +100,7 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
     end
 
     create_table <%= @cpd_statements_table_name %> do |t|
-      t.references :cpd_cycle
+      t.integer :cpd_cycle_id
 
       t.integer :user_id
       t.string :user_type
@@ -158,7 +161,7 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
       t.integer :cpd_audit_level_id
       t.string :cpd_audit_level_type
 
-      t.references :cpd_audit_level_section
+      t.integer :cpd_audit_level_section_id
 
       t.text      :title
       t.string    :category
@@ -171,7 +174,7 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
     end
 
     create_table <%= @cpd_audit_level_question_options_table_name %> do |t|
-      t.references :cpd_audit_level_question, index: false
+      t.integer :cpd_audit_level_question_id
 
       t.text      :title
       t.integer   :position
@@ -286,8 +289,8 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
       t.integer :cpd_audit_id
       t.string :cpd_audit_type
 
-      t.references :cpd_audit_level_question
-      t.references :cpd_audit_level_section
+      t.integer :cpd_audit_level_question_id
+      t.integer :cpd_audit_level_section_id
 
       t.date :date
       t.string :email
@@ -300,8 +303,8 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
     end
 
     create_table <%= @cpd_audit_response_options_table_name %> do |t|
-      t.references :cpd_audit_response
-      t.references :cpd_audit_level_question_option, index: false
+      t.integer :cpd_audit_response_id
+      t.integer :cpd_audit_level_question_option_id
 
       t.datetime :updated_at
       t.datetime :created_at

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '1.4.7'
+  VERSION = '1.5.0'
 end

metadata

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