Skip to content

Commit

Permalink
Adds confirm deletion page
Browse files Browse the repository at this point in the history
  • Loading branch information
TheDancingClown committed Feb 22, 2024
1 parent f022c3a commit 220bae7
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 7 deletions.
4 changes: 4 additions & 0 deletions app/controllers/form/support_letters_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ def destroy
redirect_to form_form_answer_supporters_path(@form_answer)
end

def confirm_deletion

end

private

def support_letter_params
Expand Down
3 changes: 3 additions & 0 deletions app/controllers/users/support_letters_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ def destroy
end
end

def confirm_deletion
end

private

def support_letter_params
Expand Down
43 changes: 43 additions & 0 deletions app/views/form/support_letters/confirm_deletion.html.slim
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
- content_for :breadcrumbs do
li = link_to "Applications", dashboard_path
li = @form.title

header.page-header.group.page-header-over-sidebar
div
h1.govuk-heading-xl
= @form.title

.steps-progress-container
.steps-progress-content
= render 'qae_form/form_header', form: @form, current_step: "letters_of_support"

.article-container.article-container-wider.step-article.step-current
article.group role="article"
.inner
fieldset.govuk-fieldset.question-block
h2.govuk-heading-l = "C1. Letters of Support"

ul.list-add
li
div
p
| Are you sure?
br
= params.inspect
/ = simple_form_for :support_letter,
/ url: form_form_answer_support_letter_path(form_answer_id: @form_answer.id, id: supporter["support_letter_id"]),
/ html: { class: 'qae-form', method: :delete } do |f|
/ f.input
/ .row
/ .span-12
/ = f.submit "Delete", class: "button button-alt"
/ .clear
footer
nav.pagination.no-border aria-label="Pagination" role="navigation"
ul.group
li.previous.previous-alternate
= link_to edit_form_url(id: params[:form_answer_id], step: "letters_of_support"), rel: "prev", title: "Back to letters of support", role: "button" do
span.pagination-label Back

= render "qae_form/steps_progress_bar", current_step: "letters_of_support"
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ div role="group" id="q_#{question.key}" aria-labelledby="q_#{question.key}_label

- unless admin_in_read_only_mode?
- aria_title = ordinal(index + 1) + " subsidiary"

- if !subsidiary["name"].blank?
- aria_title = subsidiary["name"] + " subsidiary"

Expand Down Expand Up @@ -109,6 +109,6 @@ div role="group" id="q_#{question.key}" aria-labelledby="q_#{question.key}_label
' Specify the reason why you are including it.
textarea.govuk-textarea.award-textarea.js-char-count.js-trigger-autosave rows="2" name="#{question.input_name}[0][description]" autocomplete="off" data-word-max=question.details_words_max *possible_read_only_ops(question.step.opts[:id])



= link_to "+ Add subsidiary, associate or plant", new_form_form_answer_subsidiaries_url(@form_answer.id), class: "govuk-button govuk-button--secondary button-add js-button-add", "aria-label" => "Add subsidiary, associate or plant", "data-entity" => "subsidiary"
9 changes: 5 additions & 4 deletions app/views/qae_form/_supporter_fields.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,11 @@ li.js-add-example class="#{'read-only js-support-letter-received' if persisted}"
- if current_form_is_editable? && !current_lieutenant && !current_assessor
- if persisted
- if supporter["support_letter_id"].present? && @form_answer.support_letters.find_by_id(supporter["support_letter_id"])
- url = users_form_answer_support_letter_path(form_answer_id: @form_answer.id, id: supporter["support_letter_id"])
/ - url = users_form_answer_support_letter_path(form_answer_id: @form_answer.id, id: supporter["support_letter_id"])
- url = confirm_deletion_form_form_answer_support_letter_path(form_answer_id: @form_answer.id, id: supporter["support_letter_id"])
- else
- url = "#"
- url = confirm_deletion_form_form_answer_support_letter_path(form_answer_id: @form_answer.id, id: supporter["support_letter_id"])
- if current_user || policy(:support_letter).can_remove?
= link_to "Remove", url, class: "govuk-button govuk-button--warning remove-supporter remove-link js-remove-link", data: { url: url }, 'aria-label' => "Delete support letter from #{supporter["first_name"]} #{supporter["last_name"]}"
= link_to "Remove", url, class: "govuk-button govuk-button--warning", data: { url: url }, 'aria-label' => "Delete support letter from #{supporter["first_name"]} #{supporter["last_name"]}"
- else
= link_to "Remove", "#", class: "govuk-button govuk-button--warning remove-supporter remove-link js-remove-link govuk-!-display-none", data: { url: "#" }, 'aria-label' => "#"
= link_to "Remove", "#", class: "govuk-button govuk-button--warning govuk-!-display-none", data: { url: "#" }, 'aria-label' => "#"
6 changes: 5 additions & 1 deletion config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,11 @@
namespace :form do
resources :form_answers do
resources :supporters, only: [:new, :create, :index, :destroy]
resources :support_letters, only: [:new, :create, :destroy]
resources :support_letters, only: [:new, :create, :destroy] do
member do
get :confirm_deletion
end
end
resources :form_attachments, only: [:index, :new, :create, :destroy]
end
end
Expand Down

0 comments on commit 220bae7

Please sign in to comment.