effective_cpd 1.0.0 → 1.1.0

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

@@ -1,9 +1,15 @@
 = render('layout') do
-  %p You have been selected for #{resource.cpd_audit_level} audit and matched with:
+  %p You have been selected for #{resource.cpd_audit_level} audit.
 
-  %ul
-    - resource.cpd_audit_reviews.each do |cpd_audit_review|
-      %li #{cpd_audit_review.user} <#{mail_to(cpd_audit_review.user.email)}>
+  - if resource.cpd_audit_level.anonymous?
+    %p This is an anonymous audit, and you have been assigned the name #{resource.name}
+
+  - if resource.cpd_audit_level.anonymous? == false
+    %p You have been matched with:
+
+    %ul
+      - resource.cpd_audit_reviews.each do |cpd_audit_review|
+        %li #{cpd_audit_review.user} <#{mail_to(cpd_audit_review.user.email)}>
 
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :current_step

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

@@ -7,9 +7,12 @@
     %strong will not
     be able to change your submission
 
-  .mb-4= render(resource)
+  .mb-4= render('effective/cpd_audits/cpd_audit', cpd_audit: resource)
 
   = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
     = f.hidden_field :current_step
 
-    = f.submit 'Submit Audit', center: true
+    - if EffectiveResources.authorized?(self, :resubmit, resource)
+      = f.submit 'Resubmit Audit', center: true
+    - else
+      = f.submit 'Submit Audit', center: true

data/app/views/effective/cpd_audits/{complete.html.haml → submitted.haml}

@@ -2,12 +2,14 @@
   - raise('expected a submitted or conflicted cpd_audit') unless (resource.was_submitted? || resource.was_conflicted? || resource.closed?)
 
   - if resource.was_submitted?
-    .text-center
-      .row
-        .col-2
-        .col-8
-          .alert.alert-success Audit Submitted!
+    .alert.alert-success.mb-4
+      This audit was submitted on #{resource.submitted_at.strftime('%F')}
 
+  - if resource.missing_info?
+    = card do
+      = render 'effective/cpd_audits/missing_info', cpd_audit: resource
+
+  - if resource.was_submitted?
     %p
       The following audit was successfully submitted at
       = succeed('.') do
@@ -19,7 +21,10 @@
         %strong= resource.user.email
         an email notifying you of the determination.
 
-  .mb-4= render(resource)
+  = render 'effective/cpd_audits/summary', cpd_audit: resource
+
+  .mb-4
+    = collapse('Show audit...', card_class: 'my-2') do
+      = render 'effective/cpd_audits/cpd_audit', cpd_audit: resource
 
-  %br
-  .text-center= link_to 'Home', root_path, class: 'btn btn-primary'
+  = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'

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

@@ -20,5 +20,5 @@
     = render("effective/cpd_audits/extension", cpd_audit: resource, step: :extension)
 
   %h2 Next Step
-  %p= cpd_audit_summary_text(resource)
+  %p= resource.summary
   %p You may not continue at this time. Please wait for an email with further instructions. Thank you.

data/app/views/effective/cpd_mailer/cpd_audit_missing_info.liquid

@@ -0,0 +1,15 @@
+---
+subject: 'Your audit is missing information'
+from: 'admin@example.com'
+---
+Hello {{ auditee.name }},
+
+Your audit is missing information:
+
+{{ audit.missing_info_reason }}
+
+Please update your audit with this info.
+
+{{ url }}
+
+Thank you

data/app/views/effective/cpd_mailer/cpd_audit_review_ready.liquid

@@ -4,7 +4,7 @@ from: 'admin@example.com'
 ---
 Hello {{ reviewer.name }},
 
-The auditee {{ auditee.name }} has submitted their audit questionnaire.
+The auditee {{ auditee.name }} has completed their audit questionnaire.
 
 It is now ready for you to review.
 

data/app/views/effective/cpd_mailer/cpd_audit_submitted.liquid

@@ -6,7 +6,9 @@ Hello Admin,
 
 The auditee {{ auditee.name }} has submitted their audit statement.
 
-The audit reviewers have been notified and may now begin their reviews.
+Please review the audit and mark it complete or missing information.
+
+Once marked complete, the audit reviewers will be notified and their review may begin.
 
 {{ url }}
 

data/config/effective_cpd.rb

@@ -45,10 +45,10 @@ EffectiveCpd.setup do |config|
   #
   # When creating a new audit, these are used to select the auditee
   # The User model must respond to these
-  config.auditee_user_scope = :all
+  config.auditee_user_scope = :cpd_audit_auditees
 
   # Audit Reviewer Scope Collection
-  config.audit_reviewer_user_scope = :all
+  config.audit_reviewer_user_scope = :cpd_audit_reviewers
 
   # Mailer Settings
   # Please see config/initializers/effective_resources.rb for default effective_* gem mailer settings

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

@@ -120,7 +120,10 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
 
     create_table <%= @cpd_audit_levels_table_name %> do |t|
       t.string :title
+
       t.boolean :anonymous, default: false
+      t.string :anonymous_audits_prefix
+      t.string :anonymous_audit_reviews_prefix
 
       t.text   :determinations
       t.text   :recommendations
@@ -140,9 +143,11 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
     end
 
     create_table <%= @cpd_audit_level_sections_table_name %> do |t|
-      t.references :cpd_audit_level
+      t.integer :cpd_audit_level_id
+      t.string :cpd_audit_level_type
 
       t.string :title
+      t.boolean :skip_review, default: false
       t.integer :position
 
       t.datetime :updated_at
@@ -150,7 +155,9 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
     end
 
     create_table <%= @cpd_audit_level_questions_table_name %> do |t|
-      t.references :cpd_audit_level
+      t.integer :cpd_audit_level_id
+      t.string :cpd_audit_level_type
+
       t.references :cpd_audit_level_section
 
       t.text      :title
@@ -174,7 +181,7 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
     end
 
     create_table <%= @cpd_audits_table_name %> do |t|
-      t.intger :cpd_audit_level_id
+      t.integer :cpd_audit_level_id
       t.string :cpd_audit_level_type
 
       t.integer :user_id
@@ -183,10 +190,13 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
       t.date :due_date
 
       t.string :anonymous_name
-      t.string :selection
-      t.string :region
+      t.integer :anonymous_number
+
       t.text :notes
 
+      t.datetime :missing_info_at
+      t.text :missing_info_reason
+
       t.date :notification_date
       t.date :extension_date
 
@@ -206,6 +216,7 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
 
       t.datetime :started_at
       t.datetime :submitted_at
+      t.datetime :completed_at
       t.datetime :reviewed_at
       t.datetime :closed_at
 
@@ -232,7 +243,11 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
 
       t.date :due_date
 
+      t.string :anonymous_name
+      t.integer :anonymous_number
+
       t.text    :comments
+      t.text    :feedback
       t.string  :recommendation
 
       t.boolean :conflict_of_interest
@@ -252,7 +267,8 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
     end
 
     create_table <%= @cpd_audit_review_items_table_name %> do |t|
-      t.references :cpd_audit_review
+      t.integer :cpd_audit_review_id
+      t.string :cpd_audit_review_type
 
       t.integer :item_id
       t.string :item_type
@@ -265,7 +281,9 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
     end
 
     create_table <%= @cpd_audit_responses_table_name %> do |t|
-      t.references :cpd_audit
+      t.integer :cpd_audit_id
+      t.string :cpd_audit_type
+
       t.references :cpd_audit_level_question
       t.references :cpd_audit_level_section
 

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-12 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -251,12 +251,17 @@ files:
 - app/views/admin/cpd_audits/_audit_reviewer_fields.html.haml
 - app/views/admin/cpd_audits/_auditee_fields.html.haml
 - app/views/admin/cpd_audits/_form.html.haml
+- app/views/admin/cpd_audits/_form_close.html.haml
+- app/views/admin/cpd_audits/_form_complete.html.haml
 - app/views/admin/cpd_audits/_form_conflict.html.haml
+- app/views/admin/cpd_audits/_form_cpd_audit.html.haml
 - app/views/admin/cpd_audits/_form_deadlines.html.haml
-- app/views/admin/cpd_audits/_form_determination.html.haml
 - app/views/admin/cpd_audits/_form_exemption.html.haml
 - app/views/admin/cpd_audits/_form_extension.html.haml
+- app/views/admin/cpd_audits/_form_files.html.haml
+- app/views/admin/cpd_audits/_form_missing_info.html.haml
 - app/views/admin/cpd_audits/_form_new.html.haml
+- app/views/admin/cpd_audits/_form_process.html.haml
 - app/views/admin/cpd_audits/_status.html.haml
 - app/views/admin/cpd_categories/_form.html.haml
 - app/views/admin/cpd_categories/_form_cpd_category.html.haml
@@ -304,13 +309,16 @@ files:
 - app/views/effective/cpd_audit_reviews/_cpd_audit_level_section.html.haml
 - app/views/effective/cpd_audit_reviews/_cpd_audit_review.html.haml
 - app/views/effective/cpd_audit_reviews/_cpd_statement.html.haml
+- app/views/effective/cpd_audit_reviews/_feedback.html.haml
+- app/views/effective/cpd_audit_reviews/_files.html.haml
 - app/views/effective/cpd_audit_reviews/_layout.html.haml
 - app/views/effective/cpd_audit_reviews/_recommendation.html.haml
 - app/views/effective/cpd_audit_reviews/_summary.html.haml
-- app/views/effective/cpd_audit_reviews/complete.html.haml
 - app/views/effective/cpd_audit_reviews/conflict.html.haml
 - app/views/effective/cpd_audit_reviews/cpd_audit_level_section.html.haml
 - app/views/effective/cpd_audit_reviews/cpd_statement.html.haml
+- app/views/effective/cpd_audit_reviews/feedback.html.haml
+- app/views/effective/cpd_audit_reviews/files.html.haml
 - app/views/effective/cpd_audit_reviews/information.html.haml
 - app/views/effective/cpd_audit_reviews/instructions.html.haml
 - app/views/effective/cpd_audit_reviews/questionnaire.html.haml
@@ -318,6 +326,7 @@ files:
 - app/views/effective/cpd_audit_reviews/start.html.haml
 - app/views/effective/cpd_audit_reviews/statements.html.haml
 - app/views/effective/cpd_audit_reviews/submit.html.haml
+- app/views/effective/cpd_audit_reviews/submitted.html.haml
 - app/views/effective/cpd_audit_reviews/waiting.html.haml
 - app/views/effective/cpd_audits/_conflict.html.haml
 - app/views/effective/cpd_audits/_cpd.html.haml
@@ -327,9 +336,9 @@ files:
 - app/views/effective/cpd_audits/_extension.html.haml
 - app/views/effective/cpd_audits/_files.html.haml
 - app/views/effective/cpd_audits/_layout.html.haml
+- app/views/effective/cpd_audits/_missing_info.html.haml
 - app/views/effective/cpd_audits/_summary.html.haml
 - app/views/effective/cpd_audits/_waiting.html.haml
-- app/views/effective/cpd_audits/complete.html.haml
 - app/views/effective/cpd_audits/conflict.html.haml
 - app/views/effective/cpd_audits/cpd.html.haml
 - app/views/effective/cpd_audits/cpd_audit_level_section.html.haml
@@ -341,6 +350,7 @@ files:
 - app/views/effective/cpd_audits/questionnaire.html.haml
 - app/views/effective/cpd_audits/start.html.haml
 - app/views/effective/cpd_audits/submit.html.haml
+- app/views/effective/cpd_audits/submitted.haml
 - app/views/effective/cpd_audits/waiting.html.haml
 - app/views/effective/cpd_mailer/README.md
 - app/views/effective/cpd_mailer/cpd_audit_closed.liquid
@@ -352,6 +362,7 @@ files:
 - app/views/effective/cpd_mailer/cpd_audit_extension_denied.liquid
 - app/views/effective/cpd_mailer/cpd_audit_extension_granted.liquid
 - app/views/effective/cpd_mailer/cpd_audit_extension_request.liquid
+- app/views/effective/cpd_mailer/cpd_audit_missing_info.liquid
 - app/views/effective/cpd_mailer/cpd_audit_opened.liquid
 - app/views/effective/cpd_mailer/cpd_audit_review_opened.liquid
 - app/views/effective/cpd_mailer/cpd_audit_review_ready.liquid

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

@@ -1,20 +0,0 @@
-= render('layout') do
-  - raise('expected a completed cpd_audit_review') unless resource.completed?
-
-  .text-center
-    .row
-      .col-2
-      .col-8
-        .alert.alert-success Audit Review Submitted!
-
-  %p
-    The following audit review was successfully submitted at
-    = succeed('.') do
-      = resource.submitted_at.strftime('%F')
-
-  %p Thank you for your review.
-
-  .mb-4= render(resource)
-
-  %br
-  .text-center= link_to 'Home', root_path, class: 'btn btn-primary'