effective_cpd 0.0.1 → 0.1

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

@@ -0,0 +1,13 @@
+---
+subject: 'CPD Audit exemption request from {{ auditee.name }}'
+from: 'admin@example.com'
+---
+Hello Admin,
+
+The auditee {{ auditee.name }} has requested an exemption.
+
+Please process this exemption request.
+
+{{ url }}
+
+Thank you

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

@@ -0,0 +1,13 @@
+---
+subject: 'Your CPD Audit extension request was denied'
+from: 'admin@example.com'
+---
+Hello {{ auditee.name }},
+
+Your CPD Audit extension request has been denied.
+
+The deadline remains.
+
+{{ url }}
+
+Thank you

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

@@ -0,0 +1,13 @@
+---
+subject: 'Your CPD Audit extension request was granted'
+from: 'admin@example.com'
+---
+Hello {{ auditee.name }},
+
+Your CPD Audit extension request has been granted.
+
+Your deadline has been updated.
+
+{{ url }}
+
+Thank you

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

@@ -0,0 +1,13 @@
+---
+subject: 'CPD Audit extension request from {{ auditee.name }}'
+from: 'admin@example.com'
+---
+Hello Admin,
+
+The auditee {{ auditee.name }} has requested an extension.
+
+Please process this extension request.
+
+{{ url }}
+
+Thank you

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

@@ -0,0 +1,13 @@
+---
+subject: 'You have been selected for CPD Audit'
+from: 'admin@example.com'
+---
+Hello {{ auditee.name }},
+
+You have been selected for CPD audit.
+
+Please begin here.
+
+{{ url }}
+
+Thank you

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

@@ -0,0 +1,15 @@
+---
+subject: 'You have been selected to CPD Audit Review {{ auditee.name }}'
+from: 'admin@example.com'
+---
+Hello {{ reviewer.name }},
+
+You have been selected to to perform a CPD Audit review of {{ auditee.name }}.
+
+The auditee needs time to complete their audit questionnaire, so there is nothing to review just yet.
+
+You will receive another email after the auditee has submitted their audit questionnaire.
+
+{{ url }}
+
+Thank you

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

@@ -0,0 +1,13 @@
+---
+subject: 'Your CPD Audit Review of {{ auditee.name }} is ready to review'
+from: 'admin@example.com'
+---
+Hello {{ reviewer.name }},
+
+The auditee {{ auditee.name }} has submitted their audit questionnaire.
+
+It is now ready for you to review.
+
+{{ url }}
+
+Thank you

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

@@ -0,0 +1,11 @@
+---
+subject: 'A CPD Audit Review of {{ auditee.name }} has been submitted'
+from: 'admin@example.com'
+---
+Hello Admin,
+
+The reviewer {{ reviewer.name }} has submitted their review of {{ auditee.name }}.
+
+{{ url }}
+
+Thank you

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

@@ -0,0 +1,13 @@
+---
+subject: 'The CPD Audit {{ auditee.name }} has been reviewed'
+from: 'admin@example.com'
+---
+Hello Admin,
+
+The auditee {{ auditee.name }} has been reviewed by all audit reviewers.
+
+It's ready for your determination.
+
+{{ url }}
+
+Thank you

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

@@ -0,0 +1,13 @@
+---
+subject: 'A CPD Audit questionnaire has been submitted and review can begin'
+from: 'admin@example.com'
+---
+Hello Admin,
+
+The auditee {{ auditee.name }} has submitted their audit statement.
+
+The audit reviewers have been notified and may now begin their reviews.
+
+{{ url }}
+
+Thank you

data/app/views/effective/cpd_statement_activities/_cpd_statement_activity.html.haml

@@ -0,0 +1,65 @@
+.cpd-statement-activity
+  - cpd_activity = cpd_statement_activity.cpd_activity
+  - rule = cpd_statement_activity.cpd_statement.cpd_cycle.rule_for(cpd_activity)
+
+  %p
+    = cpd_statement_activity
+    %br
+    %small.text-muted= rule.credit_description
+
+  - if cpd_activity.body.present?
+    .mb-3= cpd_activity.body
+
+  - if cpd_statement_activity.is_carry_over?
+    %p
+      %strong Carried Forward From
+      %br
+      = cpd_statement_activity.original.cpd_statement.cpd_cycle
+
+  .row.mb-3
+    .col-sm-8
+      .row
+        - if cpd_activity.amount_label.present?
+          .col
+            %strong #{cpd_activity.amount_label.titleize.pluralize}
+            %br
+            = cpd_statement_activity.amount
+
+        - if cpd_activity.amount2_label.present?
+          .col.text-center
+            %strong #{cpd_activity.amount2_label.to_s.titleize.pluralize} Articles written
+            = cpd_statement_activity.amount2
+
+        - if cpd_activity.amount_static?
+          .col
+            %strong One (1) #{cpd_activity}:
+            %br
+            1
+
+    .col-sm-4
+      .row
+        .col.text-center
+          %strong= cpd_credits_label.titleize
+          %br
+          - if cpd_statement_activity.reduced_messages.present?
+            %span{title: cpd_statement_activity.reduced_messages.values.join("\n\n")}= "#{cpd_statement_activity.score} *"
+          - else
+            = cpd_statement_activity.score.to_i
+
+        .col.text-center
+          %strong Carry
+          %br
+          = cpd_statement_activity.carry_forward.to_i
+
+  - if cpd_statement_activity.files.present?
+    %p
+      %strong Supporting Documents
+
+    %ul
+      - cpd_statement_activity.files.each do |file|
+        = link_to(file.filename, url_for(file), target: '_blank')
+
+  %p
+    %strong Description
+    %br
+    = cpd_statement_activity.description

data/app/views/effective/cpd_statement_activities/_form.html.haml

@@ -1,7 +1,7 @@
 - url = (cpd_statement_activity.persisted? ? effective_cpd.cpd_statement_cpd_statement_activity_path(cpd_statement_activity.cpd_statement, cpd_statement_activity) : effective_cpd.cpd_statement_cpd_statement_activities_path(cpd_statement_activity.cpd_statement))
-- readonly = cpd_statement_activity.locked? || local_assigns[:readonly]
+- locked = cpd_statement_activity.locked?
 
-= effective_form_with(model: cpd_statement_activity, url: (readonly ? '#' : url), remote: true, class: 'cpd-statement-activity-form') do |f|
+= effective_form_with(model: cpd_statement_activity, url: (locked ? '#' : url), remote: true, class: 'cpd-statement-activity-form', readonly: locked, disabled: locked) do |f|
   - statement = cpd_statement_activity.cpd_statement
   - activity = cpd_statement_activity.cpd_activity
   - rule = statement.cpd_cycle.rule_for(activity)
@@ -11,7 +11,7 @@
   - if activity.body.present?
     = activity.body
 
-  - if cpd_statement_activity.is_carry_over? && (current_user.id == cpd_statement_activity.cpd_statement.user_id)
+  - if cpd_statement_activity.is_carry_over?
     .alert.alert-warning
       This activity is read-only because it was carried forward from
       = cpd_statement_activity.original.cpd_statement.cpd_cycle
@@ -40,22 +40,21 @@
   .row
     .col
       - if activity.amount_label.present?
-        = f.number_field :amount, label: activity.amount_label.titleize, required: true, readonly: readonly, disabled: readonly
+        = f.number_field :amount, label: activity.amount_label.titleize.pluralize, required: true
 
       - if activity.amount2_label.present?
-        = f.number_field :amount2, label: activity.amount2_label.titleize, required: true, readonly: readonly, disabled: readonly
+        = f.number_field :amount2, label: activity.amount2_label.titleize.pluralize, required: true
 
-      - if activity.amount_label.blank? && activity.amount2_label.blank?
+      - if activity.amount_static?
         = f.hidden_field :amount, value: 1
         %p One (1) #{activity}
 
-      - unless readonly && f.object.files.blank?
-        = f.file_field :files, label: 'Supporting Documents', required: activity.requires_upload_file?, disabled: readonly
+      = f.file_field :files, label: 'Supporting Documents', required: activity.requires_upload_file?
 
     .col
-      = f.text_area :description, placeholder: 'Please provide any additional information about this activity', readonly: readonly, disabled: readonly
+      = f.text_area :description, placeholder: 'Please provide any additional information about this activity'
 
-  - unless readonly
+  - unless locked
     = f.hidden_field :cpd_category_id
     = f.hidden_field :cpd_activity_id
 

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

@@ -1,64 +1,3 @@
-.cpd-statement-activities
-  .row
-    .col-8
-    .col-2.score
-      %strong= cpd_credits_label.titleize
-    .col-2.carry-forward
-      %strong Carry Forward
-
-  - effective_cpd_categories.each do |category|
-    - statement_activities = cpd_statement.cpd_statement_activities.select { |a| a.cpd_category_id == category.id }
-    - next if statement_activities.blank?
-
-    - rule = cpd_statement.cpd_cycle.rule_for(category)
-
-    .statement-activity-category
-      %h3
-        #{category}
-        %small
-          = cpd_statement.score_per_category[category.id].to_i
-          - if rule.max_credits_per_cycle.present?
-            = '/'
-            = rule.max_credits_per_cycle
-
-      .progress.my-2
-        - valuenow = cpd_statement.score_per_category[category.id]
-        - valuemax = (rule.max_credits_per_cycle || 1)
-        - width = ((valuenow * 100.0) / valuemax)
-
-        .progress-bar{role: 'progressbar', style: "width: #{width}%", 'aria-valuenow': valuenow, 'aria-valuemin': 0, 'aria-valuemax': valuemax}
-
-      - statement_activities.each do |statement_activity|
-        .statement-activity.mb-3
-          .statement-activity-content.row
-            .col-8
-              = link_to('#', 'data-cpd-edit-activity': true) do
-                = icon('plus-circle', class: 'small-1')
-                = statement_activity.cpd_activity
-                - if statement_activity.is_carry_over?
-                  %br
-                  %small carried forward from #{statement_activity.original_cycle}
-
-            .col-2.score
-              - if statement_activity.reduced_messages.present?
-                %span{title: statement_activity.reduced_messages.values.join("\n\n")}= "#{statement_activity.score} *"
-              - else
-                = statement_activity.score.to_i
-
-            .col-2.carry-forward
-              = statement_activity.carry_forward.to_i
-
-          .statement-activity-form.row{style: 'display: none;'}
-            .col
-              .border.px-3
-                = render('effective/cpd_statement_activities/form', cpd_statement_activity: statement_activity, readonly: local_assigns[:readonly])
-
-  %hr
-
-  .row
-    .col-8
-      %h4 Total #{cpd_credits_label} in statement
-    .col-2.score
-      %h4= cpd_statement.score.to_i
-    .col-2.carry-forward
-      %h4= cpd_statement.carry_forward.to_i
+= card('Activities') do
+  = render('effective/cpd_statements/activities_table', cpd_statement: cpd_statement) do |cpd_statement_activity|
+    = render('effective/cpd_statement_activities/cpd_statement_activity', cpd_statement_activity: cpd_statement_activity)

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

@@ -0,0 +1,2 @@
+= render('effective/cpd_statements/activities_table', cpd_statement: cpd_statement) do |cpd_statement_activity|
+  = render('effective/cpd_statement_activities/form', cpd_statement_activity: cpd_statement_activity)

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

@@ -0,0 +1,64 @@
+.cpd-statement-activities
+  .row{style: 'margin-top: -2rem'}
+    .col-8
+    .col-2.score
+      %strong= cpd_credits_label.titleize
+    .col-2.carry-forward
+      %strong Carry Forward
+
+  - effective_cpd_categories.each do |category|
+    - statement_activities = cpd_statement.cpd_statement_activities.select { |a| a.cpd_category_id == category.id }
+    - next if statement_activities.blank?
+
+    - rule = cpd_statement.cpd_cycle.rule_for(category)
+
+    .statement-activity-category
+      %h3
+        #{category}
+        %small
+          = cpd_statement.score_per_category[category.id].to_i
+          - if rule.max_credits_per_cycle.present?
+            = '/'
+            = rule.max_credits_per_cycle
+
+      .progress.my-2
+        - valuenow = cpd_statement.score_per_category[category.id]
+        - valuemax = (rule.max_credits_per_cycle || 1)
+        - width = ((valuenow * 100.0) / valuemax)
+
+        .progress-bar{role: 'progressbar', style: "width: #{width}%", 'aria-valuenow': valuenow, 'aria-valuemin': 0, 'aria-valuemax': valuemax}
+
+      - statement_activities.each do |statement_activity|
+        .statement-activity.mb-3
+          .statement-activity-content.row
+            .col-8
+              = link_to('#', 'data-cpd-edit-activity': true) do
+                = icon('plus-circle', class: 'small-1')
+                = statement_activity.cpd_activity
+                - if statement_activity.is_carry_over?
+                  %br
+                  %small carried forward from #{statement_activity.original_cycle}
+
+            .col-2.score
+              - if statement_activity.reduced_messages.present?
+                %span{title: statement_activity.reduced_messages.values.join("\n\n")}= "#{statement_activity.score} *"
+              - else
+                = statement_activity.score.to_i
+
+            .col-2.carry-forward
+              = statement_activity.carry_forward.to_i
+
+          .statement-activity-form.row{style: 'display: none;'}
+            .col
+              .border.p-3
+                = yield(statement_activity)
+
+  %hr
+
+  .row
+    .col-8
+      %h4 Total #{cpd_credits_label} in statement
+    .col-2.score
+      %h4= cpd_statement.score.to_i
+    .col-2.carry-forward
+      %h4= cpd_statement.carry_forward.to_i

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

@@ -1,6 +1,20 @@
-%h2 Agreements
-= f.check_box :confirm_read, label: "Yes, I have read the above content and agreements"
-= f.check_box :confirm_factual, label: "Yes, I declare all provided information to be factual and complete"
+= card('Agreements') do
+  %table.table
+    %tbody
+      %tr
+        %th Read all contents and agreements
+        %td= cpd_statement.confirm_read ? 'Yes' : 'No'
 
-%h2 Resume
-= f.file_field :files, label: 'Attach resume', hint: 'Please attach your resume or other CPD related documents'
+      %tr
+        %th Declared all information factual
+        %td= cpd_statement.confirm_factual ? 'Yes' : 'No'
+
+      %tr
+        %th Attachments
+        %td
+          - if cpd_statement.files.blank?
+            None
+          - else
+            %ul
+              - cpd_statement.files.each do |file|
+                = link_to(file.filename, url_for(file), target: '_blank')

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

@@ -1,5 +1,8 @@
-= card(cpd_statement.cpd_cycle.to_s + ' Statement') do
+.effective-cpd-statement
   = render('effective/cpd_statements/summary', cpd_statement: cpd_statement)
 
-= card('Activities') do
-  = render('effective/cpd_statements/activities', cpd_statement: cpd_statement, readonly: true)
+  - steps = cpd_statement.required_steps.select { |step| cpd_statement.has_completed_step?(step) }
+  - blacklist = [:start, :submit, :complete]
+
+  - (steps - blacklist).each do |step|
+    = render("effective/cpd_statements/#{step}", cpd_statement: cpd_statement, step: step)

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

@@ -1,36 +1,31 @@
-%table.table
-  %tbody
-    %tr
-      %th Name
-      %td
-        = cpd_statement.user
-        %br
-        %small= mail_to cpd_statement.user.email
+= card(cpd_statement) do
+  %table.table
+    %tbody
+      %tr
+        %th Name
+        %td
+          = cpd_statement.user
+          %br
+          %small= mail_to cpd_statement.user.email
+
+        - if request.path.start_with?('/admin') && respond_to?(:edit_admin_user_path)
+          %tr
+            %th User
+            %td= link_to(cpd_statement.user, edit_admin_user_path(cpd_statement.user))
 
-      - if request.path.start_with?('/admin') && respond_to?(:edit_admin_user_path)
+      - if cpd_statement.completed?
         %tr
-          %th User
-          %td= link_to(cpd_statement.user, edit_admin_user_path(cpd_statement.user))
+          %th Completed
+          %td= cpd_statement.submitted_at.strftime('%F %H:%M')
 
-    - if cpd_statement.completed?
       %tr
-        %th Completed
-        %td= cpd_statement.completed_at.strftime('%F %H:%M')
+        %th= cpd_cycle_label.titleize
+        %td= cpd_statement.cpd_cycle
 
-    %tr
-      %th= cpd_cycle_label.titleize
-      %td= cpd_statement.cpd_cycle
-    %tr
-      %th Total #{cpd_credits_label.titleize}
-      %td= cpd_statement.score
-    %tr
-      %th Carry Forward
-      %td= cpd_statement.carry_forward
-    %tr
-      %th Attachments
-      %td
-        - if cpd_statement.files.blank?
-          None
-        - else
-          - cpd_statement.files.each do |file|
-            %div= link_to(file.filename, url_for(file), target: '_blank')
+      %tr
+        %th Total #{cpd_credits_label.titleize}
+        %td= cpd_statement.score
+
+      %tr
+        %th Carry Forward
+        %td= cpd_statement.carry_forward