effective_cpd 1.2.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b7b747aec6776c9ea09dc1e36517084133694dca965f7d32ec8a20d66a9596d
-  data.tar.gz: c21e47933d6026f612f79f0f63b52895d7319b2db744eb53b68e7881c280f497
+  metadata.gz: c0c18c1af80311c6e645ea9f7846924dd85a35e4ed11605f0791d1f9c7e73511
+  data.tar.gz: a216123cafd45efafcd9f85e53230799cb6a051006e7307dd7a629091cfa6082
 SHA512:
-  metadata.gz: ec38bd12ba35145518b3285534b32e006a86fa6e29ed39da8fae6d6554ac554b0ffb676aaa32fc592920a3d4c2e8181c9138c9a5338edcfabd789d612af930be
-  data.tar.gz: 6859e61d222b1fdcea05e91188f0b783de4ed76dd4f10dc8ce50dc0773ae4b4f5f39c90d2bb5ff188928bf2401ad7cd1e40b3ec4f1a2a2a7efd8e05063d0adb6
+  metadata.gz: 62f18ca3ad8b0b07cd5a60aa1435e047f6ec9c80d03f361c23024753202cecb1720cf773af88b1232732ea1f5b2c814554ce0104ff39a818746e7ff6399113f8
+  data.tar.gz: 2347e808fc551c592bd09c902d5e73bf4c2f1accb2c2ad66a0fc4f6b4cdec0671ef316931d0072259e9d7a584ae5a9e1b2302a73c13616569f5f7f48d71d19d1

data/README.md

@@ -167,6 +167,14 @@ def cpd_statement_required_score(cpd_statement)
 end
 ```
 
+## Rake Tasks
+
+You can use
+
+`bundle exec rake effective_cpd:notify_auditees`
+
+to send the cpd_audit_opened notification to all opened (but not yet started) auditees.
+
 ## Authorization
 
 All authorization checks are handled via the effective_resources gem found in the `config/initializers/effective_resources.rb` file.

data/app/models/concerns/effective_cpd_audit.rb

@@ -36,6 +36,10 @@ module EffectiveCpdAudit
       [:opened, :started, :conflicted_resolved, :exemption_denied, :extension_granted, :extension_denied]
     end
 
+    def chat_permissions
+      ['Can send messages until closed', 'Always send messages', 'Never send messages']
+    end
+
   end
 
   included do
@@ -150,6 +154,9 @@ module EffectiveCpdAudit
       reviewed_at             :datetime, permitted: false
       closed_at               :datetime, permitted: false
 
+      # To control permission of sending messages
+      chat_permission         :string, permitted: false
+
       # Acts as tokyyened
       token                   :string, permitted: false
 
@@ -181,6 +188,7 @@ module EffectiveCpdAudit
     before_validation(if: -> { new_record? }) do
       self.notification_date ||= Time.zone.now
       self.due_date ||= deadline_to_submit()
+      self.chat_permission ||= self.class.chat_permissions.first
     end
 
     with_options(if: -> { cpd_audit_level&.anonymous? }) do
@@ -222,13 +230,17 @@ module EffectiveCpdAudit
       end
     end
 
+    validate(if: -> { chat_permission.present? }) do
+      unless self.class.chat_permissions.include?(chat_permission)
+        self.errors.add(:chat_permission, 'is invalid')
+      end
+    end
+
     # If we're submitted. Check if we can go into reviewed?
     before_save(if: -> { submitted? }) { try_complete! }
     before_save(if: -> { completed? }) { try_review! }
 
-    after_commit(on: :create) do
-      send_email(:cpd_audit_opened)
-    end
+    after_commit(on: :create) { notify! }
 
     def dynamic_wizard_steps
       cpd_audit_level.cpd_audit_level_sections.each_with_object({}) do |section, h|
@@ -289,6 +301,14 @@ module EffectiveCpdAudit
       chat
     end
 
+    def chat_url(chat:, user:, root_url:)
+      resource = if user.try(:cpd_audit_reviewer?)
+        cpd_audit_reviews.find { |review| review.user == user } || raise('expected to find existing reviewer')
+      end || self
+
+      [root_url.chomp('/'), resource.class.table_name, resource.to_param, 'chat'].join('/')
+    end
+
   end
 
   def to_s
@@ -323,6 +343,18 @@ module EffectiveCpdAudit
     was_completed?
   end
 
+  def chat_until_closed?
+    chat_permission == 'Can send messages until closed'
+  end
+
+  def chat_always?
+    chat_permission == 'Always send messages'
+  end
+
+  def chat_never?
+    chat_permission == 'Never send messages'
+  end
+
   def status_label
     (status_was || status).to_s.gsub('_', ' ')
   end
@@ -379,6 +411,11 @@ module EffectiveCpdAudit
     cpd_audit_response ||= cpd_audit_responses.build(cpd_audit: self, cpd_audit_level_question: cpd_audit_level_question)
   end
 
+  def notify!
+    send_email(:cpd_audit_opened)
+    true
+  end
+
   # Auditee wizard action
   def start!
     started!

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

@@ -1,3 +1,12 @@
+= card('Chat Permission') do
+  = effective_form_with(model: [:admin, cpd_audit], engine: true) do |f|
+    %p By default, auditees and reviewers can send messages until the audit is closed.
+
+    .row
+      .col-sm-6
+        = f.select :chat_permission, cpd_audit.class.chat_permissions, label: false
+        = f.submit 'Save', center: true, border: false
+
 - if cpd_audit.chat.present?
   = render('effective/chats/chat', chat: cpd_audit.chat)
 - else

data/app/views/effective/cpd/_dashboard.html.haml

@@ -40,6 +40,10 @@
     %p You have completed these past statements:
     = render_datatable(completed, simple: true)
 
+- unless current_user.try(:cpd_audit_reviewer?)
+  - if auditing.blank? && audited.blank? && available.blank? && completed.blank?
+    %p There are no activities available right now. When there are, we'll show them here.
+
 - if current_user.try(:cpd_audit_reviewer?)
   - # Auditor / Audit reviewer datatables (2)
   - reviewing = EffectiveCpdAvailableAuditReviewsDatatable.new(self)

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

@@ -2,7 +2,7 @@
   %table.table
     %tbody
       %tr
-        %td{colspan: 2}
+        %td
           - if cpd_audit_review.feedback.present?
             = simple_format(cpd_audit_review.feedback)
           - else

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

@@ -75,4 +75,4 @@
           - if cpd_audit_review.comments.present?
             = simple_format(cpd_audit_review.comments)
           - else
-            None
+            = '-'

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

@@ -227,6 +227,8 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
 
       t.string :token
 
+      t.string :chat_permission
+
       t.datetime :updated_at
       t.datetime :created_at
     end

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '1.2.2'
+  VERSION = '1.2.4'
 end

data/lib/tasks/effective_cpd_tasks.rake

@@ -1,6 +1,28 @@
-# bundle exec rake effective_cpd:seed
 namespace :effective_cpd do
+
+  # bundle exec rake effective_cpd:seed
   task seed: :environment do
     load "#{__dir__}/../../db/seeds.rb"
   end
+
+  # bundle exec rake effective_cpd:notify_auditees
+  desc 'Send cpd_audit_opened email notifications for effective cpd'
+  task notify_auditees: :environment do
+    audits = EffectiveCpd.CpdAudit.opened.sorted
+
+    audits.find_each do |audit|
+      begin
+        audit.notify!
+        puts "Sent #{audit} notification to #{audit.user.email}"
+      rescue => e
+        if defined?(ExceptionNotifier)
+          ExceptionNotifier.notify_exception(e, data: { audit_id: audit.id })
+        end
+
+        puts "Error with audit #{auditee.id}: #{e.errors.inspect}"
+      end
+    end
+
+    puts 'All done'
+  end
 end

metadata

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