effective_cpd 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deb0da2dfd0958689944cea459a4e237ac5f765cecb2b5fc081e513b1b648f38
-  data.tar.gz: 913951e4a77ffa9fa00c22fb8c153702c7b05d3a9aefdeb4eaa90d3af0495a7d
+  metadata.gz: 00e8ed14d47f2bb89d1a33e12c76bf8e99b0470e65f7abcd282f23e0ec8b3a96
+  data.tar.gz: 835ab26687db053debee149640fe8b06d6e05ce518bc4601cd5e5e8a7d4e0bec
 SHA512:
-  metadata.gz: '08548deb0cbcbb5ad26f4f7d962b06ebda9d63e1e230ec7950c212f39ee83b97805bd133e1a9a807e77da7b8173e0e7443c60b3a19c86a93bb1bfa19c411c7ca'
-  data.tar.gz: 9180db8bd3c9cb84fbf13bc136cda24a4996822ff8217b0a3ddfd88501e646160209698ecde6734f32ab2a831aae1e11ec5cbacea96bdc43c973750c983f2c44
+  metadata.gz: 79844be2e538ec196567018344f52de6bb233ff0fe24d6a29ae19fe83c3f8dc6065a9cf1413a6c909ed0027a107c222d9eb531d516d256c3ac35b799efce9cc6
+  data.tar.gz: 248e3a12c2a0500fff24054b09b89fce3fb84ed7851edebecc14c613f4bc36f513cdbfffdef09afe14fb229f3921ee8d839a5a3641c291a00a38c6b18dd1e4b9

data/app/models/concerns/effective_cpd_audit.rb

@@ -68,6 +68,7 @@ module EffectiveCpdAudit
       start: 'Start',
       information: 'Information',
       instructions: 'Instructions',
+      demographics: 'Demographics',         # Individual only. Users fields.
 
       # These 4 steps are determined by audit_level settings
       conflict: 'Conflict of Interest',
@@ -90,7 +91,9 @@ module EffectiveCpdAudit
 
     # App scoped
     belongs_to :cpd_audit_level, polymorphic: true
+
     belongs_to :user, polymorphic: true  # The user being audited
+    accepts_nested_attributes_for :user
 
     has_many :cpd_audit_reviews, -> { order(:id) }, inverse_of: :cpd_audit, dependent: :destroy
     accepts_nested_attributes_for :cpd_audit_reviews, allow_destroy: true
@@ -238,7 +241,7 @@ module EffectiveCpdAudit
     end
 
     def required_steps
-      steps = [:start, :information, :instructions]
+      steps = [:start, :information, :instructions, :demographics]
 
       steps << :conflict if cpd_audit_level.conflict_of_interest?
 

data/app/models/concerns/effective_cpd_audit_level.rb

@@ -72,6 +72,9 @@ module EffectiveCpdAuditLevel
     scope :deep, -> { all }
     scope :sorted, -> { order(:title) }
 
+    # For the Admin new cpd audit form
+    scope :new_cpd_audit_level_collection, -> { sorted }
+
     validates :title, presence: true
     validates :determinations, presence: true
     validates :recommendations, presence: true

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

@@ -3,7 +3,7 @@
   %h2 Audit
   = f.hidden_field :cpd_audit_level_type, value: EffectiveCpd.CpdAuditLevel.name
 
-  = f.select :cpd_audit_level_id, EffectiveCpd.CpdAuditLevel.all.sorted, label: 'Audit level'
+  = f.select :cpd_audit_level_id, EffectiveCpd.CpdAuditLevel.new_cpd_audit_level_collection, label: 'Audit level'
 
   = f.date_field :notification_date, label: 'Date of notification', required: false,
     hint: "the starting date for any deadline calculations. leave blank for today's date"

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

@@ -1,5 +1,18 @@
 %h2 Continuing Professional Development
 
+- # In progress
+- cpd_audit = current_user.cpd_audits.in_progress.first
+
+- if cpd_audit.present? && cpd_audit.in_progress?
+  %p Your audit is in progress.
+
+  %p
+    Please
+    = link_to("Continue audit", effective_cpd.cpd_audit_build_path(cpd_audit, cpd_audit.next_step), 'data-turbolinks' => false, class: 'btn btn-primary')
+    to continue.
+
+    %hr
+
 - # Auditee datatables (4)
 - auditing = EffectiveCpdAvailableAuditsDatatable.new(self)
 - if auditing.present?

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

@@ -3,6 +3,7 @@
 
   - steps = cpd_audit.required_steps.select { |step| cpd_audit.has_completed_step?(step) }
   - blacklist = [:start, :information, :instructions, :waiting, :questionnaire, :submit, :submitted]
+  - blacklist += [:demographics] if cpd_audit.anonymous?
 
   - (steps - blacklist).each do |step|
     - cpd_audit.render_step = step

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

@@ -0,0 +1,3 @@
+= wizard_card(cpd_audit) do
+  - raise('demographics should not be displayed on anonymous audit') if cpd_audit.anonymous?
+  = render 'users/demographics', parent: cpd_audit, user: cpd_audit.user

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

@@ -0,0 +1,9 @@
+= render('layout') do
+
+  = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+    = f.hidden_field :current_step
+
+    = f.fields_for(:user, f.object.user) do |fu|
+      = render 'users/fields_demographics', f: fu, user: f.object.user, parent: resource
+
+    = f.save 'Save and Continue'

data/app/views/users/_demographics.html.haml

@@ -0,0 +1,61 @@
+-# This is a placeholder file that should be overriden by the main application
+
+%p Placeholder
+
+%table.table.table-sm
+  %tbody
+    %tr
+      %th Name
+      %td= user.to_s
+
+    %tr
+      %th Email
+      %td= mail_to user.email
+
+    - if user.respond_to?(:job_title)
+      %tr
+        %th Job Title:
+        %td= user.job_title.presence || '-'
+
+    - if user.respond_to?(:date_of_birth)
+      %tr
+        %th Date of Birth
+        %td= user.date_of_birth&.strftime('%F').presence || '-'
+
+    - if user.respond_to?(:phone)
+      %tr
+        %th Phone:
+        %td= user.phone.presence || '-'
+
+    - if user.respond_to?(:home_phone)
+      %tr
+        %th Home Phone:
+        %td= user.home_phone.presence || '-'
+
+    - if user.respond_to?(:cell_phone)
+      %tr
+        %th Cell Phone:
+        %td= user.cell_phone.presence || '-'
+
+    - if user.respond_to?(:fax)
+      %tr
+        %th Fax:
+        %td= user.fax.presence || '-'
+
+    - if user.respond_to?(:residential_address)
+      %tr
+        %th Residential Address:
+        %td
+          - if user.residential_address.present?
+            = user.residential_address.to_html
+          - else
+            = '-'
+
+    - if user.respond_to?(:billing_address)
+      %tr
+        %th Billing Address:
+        %td
+          - if user.billing_address.present?
+            = user.billing_address.to_html
+          - else
+            = '-'

data/app/views/users/_fields_demographics.html.haml

@@ -0,0 +1,31 @@
+-# This is a placeholder file that should be overriden by the main application
+
+%p Placeholder
+
+- if f.object.respond_to?(:first_name)
+  = f.text_field :first_name
+
+- if f.object.respond_to?(:last_name)
+  = f.text_field :last_name
+
+- if f.object.respond_to?(:job_title)
+  = f.text_field :job_title
+
+- if f.object.respond_to?(:date_of_birth)
+  = f.date_field :date_of_birth
+
+- if f.object.respond_to?(:phone)
+  = f.tel_field :phone
+
+- if f.object.respond_to?(:home_phone)
+  = f.tel_field :home_phone
+
+- if f.object.respond_to?(:cell_phone)
+  = f.tel_field :cell_phone
+
+- if f.object.respond_to?(:fax)
+  = f.tel_field :fax
+
+- if f.object.respond_to?(:billing_address)
+  %h2 Billing Address
+  = effective_address_fields(f, :billing_address)

data/lib/effective_cpd/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCpd
-  VERSION = '1.1.1'
+  VERSION = '1.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_cpd
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Code and Effect
@@ -349,6 +349,7 @@ files:
 - app/views/effective/cpd_audits/_cpd.html.haml
 - app/views/effective/cpd_audits/_cpd_audit.html.haml
 - app/views/effective/cpd_audits/_cpd_audit_level_section.html.haml
+- app/views/effective/cpd_audits/_demographics.html.haml
 - app/views/effective/cpd_audits/_exemption.html.haml
 - app/views/effective/cpd_audits/_extension.html.haml
 - app/views/effective/cpd_audits/_files.html.haml
@@ -360,6 +361,7 @@ files:
 - 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
+- app/views/effective/cpd_audits/demographics.html.haml
 - app/views/effective/cpd_audits/exemption.html.haml
 - app/views/effective/cpd_audits/extension.html.haml
 - app/views/effective/cpd_audits/files.html.haml
@@ -402,6 +404,8 @@ files:
 - app/views/effective/cpd_statements/complete.html.haml
 - app/views/effective/cpd_statements/start.html.haml
 - app/views/effective/cpd_statements/submit.html.haml
+- app/views/users/_demographics.html.haml
+- app/views/users/_fields_demographics.html.haml
 - config/effective_cpd.rb
 - config/routes.rb
 - db/migrate/01_create_effective_cpd.rb.erb