effective_cpd 0.6.7 → 1.0.0

data/app/models/effective/cpd_audit_level.rb

@@ -1,87 +1,5 @@
 module Effective
   class CpdAuditLevel < ActiveRecord::Base
-    has_many_rich_texts
-
-    # For each cpd audit and cpd audit review wizard step
-    # rich_text_all_steps_audit_content
-    # rich_text_step_audit_content
-
-    # rich_text_all_steps_audit_review_content
-    # rich_text_step_audit_review_content
-
-    has_many :cpd_audit_level_sections, -> { CpdAuditLevelSection.sorted }, inverse_of: :cpd_audit_level, dependent: :destroy
-    accepts_nested_attributes_for :cpd_audit_level_sections, allow_destroy: true
-
-    has_many :cpd_audit_level_questions, -> { CpdAuditLevelQuestion.sorted }, through: :cpd_audit_level_sections
-
-    has_many :cpd_audit_reviews, -> { CpdAuditReview.sorted }, inverse_of: :cpd_audit_level, dependent: :destroy
-    accepts_nested_attributes_for :cpd_audit_reviews, allow_destroy: true
-
-    has_many :cpd_audits
-
-    if respond_to?(:log_changes)
-      log_changes(except: [:cpd_audits, :cpd_audit_reviews, :cpd_audit_level_sections, :cpd_audit_level_questions])
-    end
-
-    effective_resource do
-      title                         :string
-
-      determinations                :text     # Final determination by auditor
-      recommendations               :text     # Recommendations by audit reviewers
-
-      days_to_submit                :integer  # For auditee to submit statement
-      days_to_review                :integer  # For auditor/audit_review to be completed
-
-      conflict_of_interest          :boolean      # Feature flags
-      can_request_exemption         :boolean
-      can_request_extension         :boolean
-
-      days_to_declare_conflict      :integer
-      days_to_request_exemption     :integer
-      days_to_request_extension     :integer
-
-      timestamps
-    end
-
-    serialize :determinations, Array
-    serialize :recommendations, Array
-
-    scope :deep, -> { all }
-    scope :sorted, -> { order(:title) }
-
-    validates :title, presence: true
-    validates :determinations, presence: true
-    validates :recommendations, presence: true
-
-    validates :days_to_submit, numericality: { greater_than: 0, allow_nil: true }
-    validates :days_to_review, numericality: { greater_than: 0, allow_nil: true }
-
-    validates :days_to_declare_conflict, presence: true, if: -> { conflict_of_interest? }
-    validates :days_to_declare_conflict, numericality: { greater_than: 0, allow_nil: true }
-
-    validates :days_to_request_exemption, presence: true, if: -> { can_request_exemption? }
-    validates :days_to_request_exemption, numericality: { greater_than: 0, allow_nil: true }
-
-    validates :days_to_request_extension, presence: true, if: -> { can_request_extension? }
-    validates :days_to_request_extension, numericality: { greater_than: 0, allow_nil: true }
-
-    before_destroy do
-      if (count = cpd_audits.length) > 0
-        raise("#{count} audits belong to this audit level")
-      end
-    end
-
-    def to_s
-      title.presence || 'audit level'
-    end
-
-    def determinations
-      Array(self[:determinations]) - [nil, '']
-    end
-
-    def recommendations
-      Array(self[:recommendations]) - [nil, '']
-    end
-
+    effective_cpd_audit_level
   end
 end

data/app/models/effective/cpd_audit_response.rb

@@ -25,6 +25,7 @@ module Effective
     end
 
     scope :submitted, -> { where(cpd_audit: Effective::CpdAudit.where.not(submitted_at: nil)) }
+    scope :sorted, -> { order(:id) }
     scope :deep, -> { includes(:cpd_audit, :cpd_audit_level_question) }
 
     before_validation(if: -> { cpd_audit_level_question.present? }) do

data/app/models/effective/cpd_audit_review.rb

@@ -1,228 +1,5 @@
 module Effective
   class CpdAuditReview < ActiveRecord::Base
-    attr_accessor :current_user
-    attr_accessor :current_step
-
-    belongs_to :cpd_audit
-    belongs_to :cpd_audit_level
-    belongs_to :user, polymorphic: true    # Auditor
-
-    has_many :cpd_audit_review_items, -> { CpdAuditReviewItem.sorted }, inverse_of: :cpd_audit_review, dependent: :destroy
-    accepts_nested_attributes_for :cpd_audit_review_items, reject_if: :all_blank, allow_destroy: true
-
-    if respond_to?(:log_changes)
-      log_changes(to: :cpd_audit, except: :wizard_steps)
-    end
-
-    acts_as_email_form
-    acts_as_tokened
-    acts_as_reportable if respond_to?(:acts_as_reportable)
-
-    acts_as_wizard(
-      start: 'Start',
-      information: 'Information',
-      instructions: 'Instructions',
-
-      # Optional based on cpd_audit_level options
-      conflict: 'Conflict of Interest',
-
-      waiting: 'Waiting on Auditee Submission',
-
-      statements: 'Review CPD Statements',
-      # ... There will be one step per cpd_statement here. "statement1"
-
-      questionnaire: 'Review Questionnaire Responses',
-      # ... There will be one step per cpd_audit_level_sections here
-
-      recommendation: 'Recommendation',
-      submit: 'Confirm & Submit',
-      complete: 'Complete'
-    )
-
-    effective_resource do
-      token                     :string
-      due_date                  :date
-
-      # Auditor response
-      conflict_of_interest          :boolean
-      conflict_of_interest_reason   :text
-
-      # Rolling comments
-      comments                  :text
-
-      # Recommendation Step
-      recommendation            :string
-
-      # Status Dates
-      submitted_at              :datetime
-
-      # acts_as_statused
-      # I'm not using acts_as_statused yet, but I probably will later
-      status                  :string
-      status_steps            :text
-
-      # Wizard Progress
-      wizard_steps              :text
-
-      timestamps
-    end
-
-    scope :deep, -> { includes(:cpd_audit, :cpd_audit_level, :user) }
-    scope :sorted, -> { order(:id) }
-
-    scope :available, -> { where(submitted_at: nil) }
-    scope :completed, -> { where.not(submitted_at: nil) }
-
-    # effective_reports
-    def reportable_scopes
-      { available: nil, completed: nil }
-    end
-
-    before_validation(if: -> { new_record? }) do
-      self.cpd_audit_level ||= cpd_audit&.cpd_audit_level
-      self.due_date ||= deadline_to_review()
-    end
-
-    validate(if: -> { recommendation.present? }) do
-      unless cpd_audit_level.recommendations.include?(recommendation)
-        self.errors.add(:recommendation, 'must exist in this audit level')
-      end
-    end
-
-    after_commit(on: :create) { send_email(:cpd_audit_review_opened) }
-    after_commit(on: :destroy) { cpd_audit.review! }
-
-    def to_s
-      'audit review'
-    end
-
-    def to_s
-      persisted? ? "#{cpd_audit_level} Audit Review by #{user}" : 'audit review'
-    end
-
-    # Find or build
-    def cpd_audit_review_item(item)
-      unless item.kind_of?(CpdAuditResponse) || item.kind_of?(CpdStatementActivity)
-        raise("expected a cpd_audit_response or cpd_statement_activity")
-      end
-
-      cpd_audit_review_item = cpd_audit_review_items.find { |cari| cari.item == item }
-      cpd_audit_review_item ||= cpd_audit_review_items.build(item: item)
-    end
-
-    # The dynamic CPD Statement review steps
-    def auditee_cpd_statements
-      cpd_audit.user.cpd_statements.select do |cpd_statement|
-        cpd_statement.completed? && (submitted_at.blank? || cpd_statement.submitted_at < submitted_at)
-      end
-    end
-
-    def cpd_statement(wizard_step)
-      cpd_cycle_id = (wizard_step.to_s.split('statement').last.to_i rescue false)
-      auditee_cpd_statements.find { |cpd_statement| cpd_statement.cpd_cycle_id == cpd_cycle_id }
-    end
-
-    def dynamic_wizard_statement_steps
-      @statement_steps ||= auditee_cpd_statements.each_with_object({}) do |cpd_statement, h|
-        h["statement#{cpd_statement.cpd_cycle_id}".to_sym] = "#{cpd_statement.cpd_cycle.to_s} Activities"
-      end
-    end
-
-    # The dynamic CPD Audit Level Sections steps
-    def cpd_audit_level_section(wizard_step)
-      position = (wizard_step.to_s.split('section').last.to_i rescue false)
-      cpd_audit_level.cpd_audit_level_sections.find { |section| (section.position + 1) == position }
-    end
-
-    def dynamic_wizard_questionnaire_steps
-      @questionnaire_steps ||= cpd_audit_level.cpd_audit_level_sections.each_with_object({}) do |section, h|
-        h["section#{section.position+1}".to_sym] = section.title
-      end
-    end
-
-    def dynamic_wizard_steps
-      dynamic_wizard_statement_steps.merge(dynamic_wizard_questionnaire_steps)
-    end
-
-    def can_visit_step?(step)
-      return (step == :complete) if completed?  # Can only view complete step once submitted
-      can_revisit_completed_steps(step)
-    end
-
-    def required_steps
-      steps = [:start, :information, :instructions]
-
-      steps << :conflict if cpd_audit_level.conflict_of_interest?
-
-      if conflict_of_interest?
-        return steps + [:submit, :complete]
-      end
-
-      steps += [:waiting] unless ready?
-
-      steps += [:statements] + dynamic_wizard_statement_steps.keys
-      steps += [:questionnaire] + dynamic_wizard_questionnaire_steps.keys
-      steps += [:recommendation, :submit, :complete]
-
-      steps
-    end
-
-    def wizard_step_title(step)
-      WIZARD_STEPS[step] || dynamic_wizard_steps.fetch(step)
-    end
-
-    # Called by CpdAudit.extension_granted
-    def extension_granted!
-      self.due_date = deadline_to_review()
-    end
-
-    # Called by CpdAudit.submit!
-    def ready!
-      send_email(:cpd_audit_review_ready)
-    end
-
-    # Called by review wizard submit step
-    def submit!
-      update!(submitted_at: Time.zone.now)
-      cpd_audit.review! # maybe go from submitted->removed
-
-      send_email(:cpd_audit_review_submitted)
-    end
-
-    # When ready, the applicant review wizard hides the waiting step
-    def ready?
-      cpd_audit&.was_submitted?
-    end
-
-    def in_progress?
-      submitted_at.blank?
-    end
-
-    def completed?
-      submitted_at.present?
-    end
-
-    def email_form_defaults(action)
-      { from: EffectiveCpd.mailer_sender }
-    end
-
-    def send_email(email)
-      EffectiveCpd.send_email(email, self, email_form_params) unless email_form_skip?
-      true
-    end
-
-    def deadline_to_conflict_of_interest
-      cpd_audit.deadline_to_conflict_of_interest
-    end
-
-    def deadline_to_review
-      return nil unless cpd_audit_level&.days_to_review.present?
-
-      date = cpd_audit.deadline_to_submit
-      return nil unless date.present?
-
-      EffectiveResources.advance_date(date, business_days: cpd_audit_level.days_to_review)
-    end
-
+    effective_cpd_audit_review
   end
 end

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

@@ -5,7 +5,7 @@
   = f.date_field :start_at,
     hint: "The first date statements may be submited for this #{cpd_cycle_label}"
 
-  = f.date_field :end_at,
+  = f.date_field :end_at, date_linked: false,
     hint: "The last date statements may be created for this #{cpd_cycle_label}. leave blank for no end date."
 
   = f.number_field :required_score,

data/app/views/admin/users/_form_cpd.html.haml

@@ -0,0 +1,15 @@
+%h2 Statements
+- datatable = Admin::EffectiveCpdStatementsDatatable.new(user: user)
+= render_datatable(datatable, inline: true)
+
+%hr
+
+%h2 Activities
+- datatable = Admin::EffectiveCpdStatementActivitiesDatatable.new(user: user)
+= render_datatable(datatable, inline: true)
+
+%hr
+
+%h2 Audits
+- datatable = Admin::EffectiveCpdAuditsDatatable.new(user: user)
+= render_datatable(datatable)

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

@@ -18,6 +18,8 @@
   .mt-4
     %p Please submit a CPD statement for the following available #{cpd_cycles_label}:
     = render_datatable(available, simple: true)
+- else
+  %p There are no #{cpd_cycles_label} available to submit. When there are, we'll show them here.
 
 - completed = EffectiveCpdCompletedStatementsDatatable.new(self)
 - if completed.present?

data/config/effective_cpd.rb

@@ -32,6 +32,9 @@ EffectiveCpd.setup do |config|
   # CPD Class Settings
   # Configure the class responsible for the cpd statements.
   # config.cpd_statement_class_name = 'Effective::CpdStatement'
+  # config.cpd_audit_class_name = 'Effective::CpdAudit'
+  # config.cpd_audit_level_class_name = 'Effective::CpdAuditLevel'
+  # config.cpd_audit_review_class_name = 'Effective::CpdAuditReview'
 
   # Program label settings
   config.program_label = 'CPD'      # CPD or MCE

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

@@ -120,6 +120,8 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
 
     create_table <%= @cpd_audit_levels_table_name %> do |t|
       t.string :title
+      t.boolean :anonymous, default: false
+
       t.text   :determinations
       t.text   :recommendations
 
@@ -172,13 +174,19 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
     end
 
     create_table <%= @cpd_audits_table_name %> do |t|
-      t.references :cpd_audit_level
+      t.intger :cpd_audit_level_id
+      t.string :cpd_audit_level_type
 
       t.integer :user_id
       t.string :user_type
 
       t.date :due_date
 
+      t.string :anonymous_name
+      t.string :selection
+      t.string :region
+      t.text :notes
+
       t.date :notification_date
       t.date :extension_date
 
@@ -213,8 +221,11 @@ class CreateEffectiveCpd < ActiveRecord::Migration[6.0]
     end
 
     create_table <%= @cpd_audit_reviews_table_name %> do |t|
-      t.references :cpd_audit_level
-      t.references :cpd_audit
+      t.integer :cpd_audit_level_id
+      t.string :cpd_audit_level_type
+
+      t.integer :cpd_audit_id
+      t.string :cpd_audit_type
 
       t.integer :user_id
       t.string  :user_type

data/lib/effective_cpd/engine.rb

@@ -11,7 +11,11 @@ module EffectiveCpd
     initializer 'effective_cpd.active_record' do |app|
       ActiveSupport.on_load :active_record do
         ActiveRecord::Base.extend(EffectiveCpdUser::Base)
+        #ActiveRecord::Base.extend(EffectiveCpdCycle::Base)
         ActiveRecord::Base.extend(EffectiveCpdStatement::Base)
+        ActiveRecord::Base.extend(EffectiveCpdAudit::Base)
+        ActiveRecord::Base.extend(EffectiveCpdAuditLevel::Base)
+        ActiveRecord::Base.extend(EffectiveCpdAuditReview::Base)
       end
     end
 

data/lib/effective_cpd/version.rb

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

data/lib/effective_cpd.rb

@@ -16,7 +16,7 @@ module EffectiveCpd
       :cpd_audit_reviews_table_name, :cpd_audit_review_items_table_name,
       :program_label, :cycle_label, :credit_label, :layout, :auditee_user_scope, :audit_reviewer_user_scope,
       :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject, :use_effective_email_templates,
-      :cpd_statement_class_name
+      :cpd_statement_class_name, :cpd_audit_class_name, :cpd_audit_level_class_name, :cpd_audit_review_class_name
     ]
   end
 
@@ -30,4 +30,16 @@ module EffectiveCpd
     cpd_statement_class_name&.constantize || Effective::CpdStatement
   end
 
+  def self.CpdAudit
+    cpd_audit_class_name&.constantize || Effective::CpdAudit
+  end
+
+  def self.CpdAuditLevel
+    cpd_audit_level_class_name&.constantize || Effective::CpdAuditLevel
+  end
+
+  def self.CpdAuditReview
+    cpd_audit_review_class_name&.constantize || Effective::CpdAuditReview
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 1.0.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-05 00:00:00.000000000 Z
+date: 2023-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -216,6 +216,9 @@ files:
 - app/helpers/effective_cpd_audits_helper.rb
 - app/helpers/effective_cpd_helper.rb
 - app/mailers/effective/cpd_mailer.rb
+- app/models/concerns/effective_cpd_audit.rb
+- app/models/concerns/effective_cpd_audit_level.rb
+- app/models/concerns/effective_cpd_audit_review.rb
 - app/models/concerns/effective_cpd_statement.rb
 - app/models/concerns/effective_cpd_user.rb
 - app/models/effective/cpd_activity.rb
@@ -264,6 +267,7 @@ files:
 - app/views/admin/cpd_cycles/_form_cpd_special_rules.html.haml
 - app/views/admin/cpd_special_rules/_form.html.haml
 - app/views/admin/cpd_statements/_cpd_statement.html.haml
+- app/views/admin/users/_form_cpd.html.haml
 - app/views/effective/cpd/_dashboard.html.haml
 - app/views/effective/cpd_audit_level_questions/_cpd_audit_level_question.html.haml
 - app/views/effective/cpd_audit_responses/_cpd_audit_response.html.haml