Merge pull request #718 from bitzesty/main

Staging release

app/assets/javascripts/frontend/custom_questions/support_letters.js.coffee

@@ -5,6 +5,10 @@ window.SupportLetters =
 
     $(document).on 'change', '.js-trigger-autosave', debounce(SupportLetters.submit, 1000)
 
+    $(document).on 'click', '.js-remove-support-letter-attachment', (e) ->
+      e.preventDefault()
+      SupportLetters.removeFile($(this).closest('.govuk-form-group').find('input:first'), e)
+
   new_item_init: (el) ->
     SupportLetters.clean_up_system_tags(el)
     SupportLetters.enable_item_fields_and_controls(el)
@@ -25,12 +29,14 @@ window.SupportLetters =
 
       parent.find('.govuk-error-message').html('')
       parent.find('.govuk-error-message').closest('.govuk-form-group').removeClass('govuk-form-group--error')
-
-      label = $('<p class="govuk-body support-letter-attachment-filename">' + filename + '</p>')
+
+      textContainer = parent.find('.support-letter-attachment-container')
+      textContainer.removeClass('govuk-!-display-none')
+      scanningText = '<p class="govuk-hint">(File uploaded and is being scanned for viruses. Preview available once the scan is complete.)</p>'
+      textContainer.prepend('<div class="support-letter-attachment-filename"><p class="govuk-body">' + filename + '</p>' + scanningText + '</div>')
       hiddenInput = $("<input class='js-support-letter-attachment-id' type='hidden' name='#{$el.attr("name")}' value='#{data.result['id']}' />")
-
-      parent.append(label)
       parent.append(hiddenInput)
+      parent.find('.js-support-letter-attachment').addClass('govuk-!-display-none')
       SupportLetters.autosave()
       SupportLetters.submit(e)
 
@@ -61,6 +67,15 @@ window.SupportLetters =
     parent.find('input[type="hidden"]').remove()
     parent.find('.support-letter-attachment-filename').remove()
 
+  removeFile: (el, e) ->
+    $el = $(el)
+    $el.val('')
+    $el.siblings('.js-support-letter-attachment-id').first().val('')
+    $el.siblings('.support-letter-attachment-container').addClass('govuk-!-display-none')
+    $el.removeClass('govuk-!-display-none')
+    SupportLetters.autosave()
+    SupportLetters.submit(e)
+
   enable_item_fields_and_controls: (parent) ->
     parent.find('.govuk-error-message').html('')
     prefixed = parent.find('.js-system-tag').data('new-hidden-input-name')

app/assets/javascripts/frontend/form-validation.js.coffee

@@ -12,7 +12,7 @@ window.FormValidation =
   clearErrors: (container) ->
     if container.closest(".question-financial").length > 0
       container.closest("label").find(".govuk-error-message").empty()
-    else if container.closest('.question-block').data('answer').indexOf('address') > -1
+    else if container.closest('.question-block').data('answer') && container.closest('.question-block').data('answer').indexOf('address') > -1
       container.closest(".govuk-form-group").find(".govuk-error-message").empty()
     else
       container.closest(".question-block").find(".govuk-error-message").empty()
@@ -56,6 +56,9 @@ window.FormValidation =
   isCheckboxQuestion: (question) ->
     question.find("input[type='checkbox']").length
 
+  isSupportLetterAttachment: (question) ->
+    question.find(".js-support-letter-attachment").length
+
   toDate: (str) ->
     moment(str, "DD/MM/YYYY")
 
@@ -81,6 +84,9 @@ window.FormValidation =
       if @isCheckboxQuestion(question)
         return question.find("input[type='checkbox']").filter(":checked").length
 
+      if @isSupportLetterAttachment(question)
+        return (question.find(".js-support-letter-attachment-id").val() || '').toString().trim().length
+
   validateRequiredQuestion: (question) ->
     # if it's a conditional question, but condition was not satisfied
     conditional = true
@@ -352,13 +358,6 @@ window.FormValidation =
       @addErrorMessage(question, errorMessage)
       return
 
-  validateSupportLetters: (question) ->
-    lettersReceived = $(".js-support-letter-received").length
-    if lettersReceived < 2
-      @logThis(question, "validateSupportLetters", "Upload two letters of support")
-      @appendMessage(question, "Upload two letters of support")
-      @addErrorClass(question)
-
   validateSelectionLimit: (question) ->
     selection_limit = question.data("selection-limit")
     current_selection_count = question.find("input[type=checkbox]:checked").length
@@ -455,11 +454,6 @@ window.FormValidation =
       # console.log "validateDropBlockCondition"
       @validateDropBlockCondition(question)
 
-    if question.hasClass("question-support-requests") ||
-       question.hasClass("question-support-uploads")
-      # console.log "validateSupportLetters"
-      @validateSupportLetters(question)
-
     if question.hasClass("question-limited-selections")
       @validateSelectionLimit(question)
 
@@ -489,7 +483,6 @@ window.FormValidation =
     stepContainer.find(".govuk-form-group--error").removeClass("govuk-form-group--error")
     stepContainer.find(".govuk-error-message").empty()
     $(".steps-progress-bar .js-step-link[data-step='" + currentStep + "']").removeClass("step-errors")
-
     for question in stepContainer.find(".question-block")
       question = $(question)
       @validateIndividualQuestion(question)

app/assets/stylesheets/admin/tables.scss

@@ -5,3 +5,44 @@
 [role="region"][aria-labelledby][tabindex]:focus {
   outline: .1em solid rgba(0,0,0,.1);
 }
+
+.kavs-table {
+  border-top: 1px solid #b1b4b6;
+  border-bottom: 1px solid #b1b4b6;
+  width: max-content;
+
+  .text-center {
+    text-align: center;
+  }
+
+  thead {
+    background-color: #f2f2f2;
+
+    .govuk-table__header:last-child, 
+    .govuk-table__cell:last-child,
+    .govuk-table__footer:last-child {
+      padding-right: 10px;
+    }
+  }
+
+  tfoot {
+    &.govuk-table__footer {
+      background-color: #f2f2f2;
+      font-weight: 700;
+      text-align: left;
+    }
+  }
+}
+
+.kavs-table__header--dense,
+.kavs-table__cell--dense,
+.kavs-table__footer--dense {
+  font-size: 1rem;
+  padding: 10px
+}
+
+.kavs-table__header--border-right,
+.kavs-table__cell--border-right,
+.kavs-table__footer--border-right {
+  border-right: 1px solid #b1b4b6;
+}

app/assets/stylesheets/frontend/forms.scss

@@ -660,6 +660,11 @@ input[type="file"] {
     padding: 20px !important;
     border: 2px solid #000 !important;
 
+    &.borderless {
+      border: 0 !important;
+      padding: 0 !important;
+    }
+
     .lte-ie7 & {
       display: inline;
       width: 100%;

app/assets/stylesheets/frontend/views/award_form.scss

@@ -151,15 +151,28 @@
   margin: 0.75em 0;
 }
 
-.support-letter-attachment-filename,
 label > .visible-read-only,
 .view-value {
   margin-bottom: 10px;
   font-weight: normal;
 }
 
-.support-letter-attachment-filename {
-  display: block;
+.support-letter-attachment-container {
+  padding: 15px;
+  display: flex;
+  justify-content: space-between;
+  align-items: start;
+  background: $govuk-light-grey;
+
+  .js-remove-support-letter-attachment{
+    color: $govuk-red;
+    word-break: keep-all;
+    margin-top: 0 !important;
+  }
+
+  .non-js-remove-support-letter-attachment {
+    color: $govuk-red;
+  }
 }
 
 .view-only,

app/controllers/admin/protected_files_controller.rb

@@ -0,0 +1,3 @@
+class Admin::ProtectedFilesController < Admin::BaseController
+  include ProtectedFileMixin
+end

app/controllers/admin/statistics/nominations_controller.rb

@@ -0,0 +1,101 @@
+class Admin::Statistics::NominationsController < Admin::BaseController
+  def index
+    authorize :statistics, :index?
+
+    @search = NominationStatsSearch.new(FormAnswer.all).search(permitted_params)
+  end
+
+  def create
+    authorize :statistics, :send?
+
+    @search = NominationStatsSearch.new(FormAnswer.all).search(permitted_params)
+
+    data = generate_csv(@search.results)
+    file = current_admin.protected_files.create_from_raw_data(data, "nomination-statistics-export.csv")
+
+    Admin::Statistics::NominationMailer.notify(current_admin.id, file.id).deliver_now
+
+    redirect_to admin_statistics_nominations_path(search: permitted_params), success: "CSV with nomination statistics has been sent to #{current_admin.email}."
+  end
+
+  private
+
+  def permitted_params
+    params.fetch(:search, NominationStatsSearch.default_search).permit!
+  end
+
+  def generate_csv(data)
+    CSV.generate(encoding: "UTF-8", force_quotes: true) do |csv|
+      csv << csv_mapping.map { |m| m[:label] }
+      data.each do |row|
+        csv << csv_mapping.map do |m|
+          func = m[:method]
+          row[func]
+        end
+      end
+
+      csv << csv_mapping.map do |m|
+        func = m[:method]
+
+        if func == :ceremonial_county_name
+          "Total"
+        else
+          data.sum(&func)
+        end
+      end
+    end
+  end
+
+  def csv_mapping
+    [
+      {
+        label: "Lieutenancy",
+        method: :ceremonial_county_name
+      },
+      {
+        label: "Nominations submitted",
+        method: :submitted_count
+      },
+      {
+        label: "Eligiblity - Admin eligible",
+        method: :admin_eligible_count
+      },
+      {
+        label: "Eligiblity - Not eligible nominator",
+        method: :admin_not_eligible_nominator_count
+      },
+      {
+        label: "Eligiblity - Not eligible group",
+        method: :admin_not_eligible_group_count
+      },
+      {
+        label: "Eligiblity - Withdrawn",
+        method: :withdrawn_count
+      },
+      {
+        label: "Local Assessment - Not recommended",
+        method: :local_assessment_not_recommended_count
+      },
+      {
+        label: "Local Assessment - Recommended",
+        method: :local_assessment_recommended_count
+      },
+      {
+        label: "National Assessment - Not recommended",
+        method: :not_recommended_count
+      },
+      {
+        label: "National Assessment - Recommended",
+        method: :shortlisted_count
+      },
+      {
+        label: "Royal Approval - Awarded",
+        method: :awarded_count
+      },
+      {
+        label: "Total",
+        method: :total_count
+      }
+    ]
+  end
+end

app/controllers/concerns/protected_file_mixin.rb

@@ -0,0 +1,13 @@
+module ProtectedFileMixin
+  extend ActiveSupport::Concern
+
+  def self.included(base)
+    base.skip_after_action :verify_authorized
+  end
+
+  def show
+    file = current_subject.protected_files.find(params[:id])
+    file.mark_as_downloaded!
+    redirect_to file.file.url, allow_other_host: true
+  end
+end

app/controllers/form/support_letter_attachments_controller.rb

@@ -0,0 +1,29 @@
+class Form::SupportLetterAttachmentsController < Form::BaseController
+  include FormAnswerSubmissionMixin
+  before_action :set_support_letter
+
+  def show; end
+
+  def destroy
+    attachment = SupportLetterAttachment.find(params[:id])
+    form_answer = attachment.form_answer
+
+    if attachment.destroy
+      updated_list = form_answer.document['supporter_letters_list'].reject { |letter| letter['letter_of_support'] == attachment.id }
+      form_answer.update(document: form_answer.document.merge(supporter_letters_list: updated_list))
+
+      flash[:notice] = 'Attachment successfully deleted.'
+    else
+      flash[:alert] = 'Failed to delete attachment.'
+    end
+
+    redirect_to form_form_answer_supporters_path(form_answer)
+  end
+
+  private
+
+  def set_support_letter
+    @support_letter = SupportLetter.find(params[:support_letter_id])
+    @form_answer = @support_letter.form_answer
+  end
+end

app/controllers/form/support_letters_controller.rb

@@ -49,7 +49,7 @@ def add_support_letters_to_document!
         h[:first_name] = support_letter.first_name
         h[:last_name] = support_letter.last_name
         h[:relationship_to_nominee] = support_letter.relationship_to_nominee
-        h[:letter_of_support] = support_letter.support_letter_attachment.id
+        h[:letter_of_support] = support_letter.support_letter_attachment&.id
       end
     end
 

app/mailers/admin/statistics/nomination_mailer.rb

@@ -0,0 +1,12 @@
+class Admin::Statistics::NominationMailer < ApplicationMailer
+  layout "mailer"
+
+  def notify(identifier, file_identifier)
+    @admin = Admin.find(identifier)
+    @file = @admin.protected_files.find(file_identifier)
+
+    subject = "Nomination statistics export - King's Award for Voluntary Service"
+
+    view_mail ENV["GOV_UK_NOTIFY_API_TEMPLATE_ID"], to: @admin.email, subject: subject_with_env_prefix(subject)
+  end
+end

app/models/admin.rb

@@ -12,6 +12,7 @@ class Admin < ApplicationRecord
   validates :first_name, :last_name, presence: true
 
   has_many :form_answer_attachments, as: :attachable
+  has_many :protected_files, as: :entity, dependent: :destroy
 
   pg_search_scope :basic_search,
                   against: [

app/models/assessor.rb

@@ -22,6 +22,8 @@ class Assessor < ApplicationRecord
            foreign_key: :sub_group,
            primary_key: :sub_group
 
+  has_many :protected_files, as: :entity, dependent: :destroy
+
   pg_search_scope :basic_search,
                   against: [
                     :first_name,

app/models/group_leader.rb

@@ -23,6 +23,8 @@ class GroupLeader < ApplicationRecord
 
   belongs_to :form_answer, optional: true
 
+  has_many :protected_files, as: :entity, dependent: :destroy
+
   scope :by_email, -> { order(:email) }
   scope :confirmed, -> { where.not(confirmed_at: nil) }