Browse Source

does not let the user navigate to questions for previous collection year logs

pull/1044/head
Kat 4 years ago
parent
commit
8e996ca5df
  1. 2
      app/components/check_answers_summary_list_card_component.html.erb
  2. 2
      app/controllers/form_controller.rb
  3. 2
      app/helpers/tasklist_helper.rb
  4. 4
      app/models/log.rb
  5. 2
      app/views/form/_check_answers_summary_list.html.erb
  6. 5
      spec/requests/lettings_logs_controller_spec.rb

2
app/components/check_answers_summary_list_card_component.html.erb

@ -25,7 +25,7 @@
<span class="govuk-!-font-weight-regular app-!-colour-muted"><%= inferred_answer %></span> <span class="govuk-!-font-weight-regular app-!-colour-muted"><%= inferred_answer %></span>
<% end %> <% end %>
<% end %> <% end %>
<% if @log.form.end_date > Time.zone.today %> <% if @log.collection_period_open? %>
<% row.action( <% row.action(
text: question.action_text(log), text: question.action_text(log),
href: question.action_href(log, question.page.id), href: question.action_href(log, question.page.id),

2
app/controllers/form_controller.rb

@ -50,7 +50,7 @@ class FormController < ApplicationController
page_id = request.path.split("/")[-1].underscore page_id = request.path.split("/")[-1].underscore
@page = @log.form.get_page(page_id) @page = @log.form.get_page(page_id)
@subsection = @log.form.subsection_for_page(@page) @subsection = @log.form.subsection_for_page(@page)
if @page.routed_to?(@log, current_user) if @page.routed_to?(@log, current_user) && @log.collection_period_open?
render "form/page" render "form/page"
else else
redirect_to lettings_log_path(@log) redirect_to lettings_log_path(@log)

2
app/helpers/tasklist_helper.rb

@ -38,7 +38,7 @@ module TasklistHelper
end end
def review_log_text(log) def review_log_text(log)
if log.form.end_date > Time.zone.today if log.collection_period_open?
"You can #{govuk_link_to 'review and make changes to this log', "/lettings-logs/#{log.id}/review"} until #{(log.form.end_date + 1.day).to_formatted_s(:govuk_date)}.".html_safe "You can #{govuk_link_to 'review and make changes to this log', "/lettings-logs/#{log.id}/review"} until #{(log.form.end_date + 1.day).to_formatted_s(:govuk_date)}.".html_safe
else else
"This log is from the #{log.form.start_date.year}/#{log.form.start_date.year + 1} collection window, which is now closed." "This log is from the #{log.form.start_date.year}/#{log.form.start_date.year + 1} collection window, which is now closed."

4
app/models/log.rb

@ -44,6 +44,10 @@ class Log < ApplicationRecord
managing_organisation&.provider_type managing_organisation&.provider_type
end end
def collection_period_open?
form.end_date > Time.zone.today
end
private private
def update_status! def update_status!

2
app/views/form/_check_answers_summary_list.html.erb

@ -13,7 +13,7 @@
<span class="govuk-!-font-weight-regular app-!-colour-muted"><%= inferred_answer %></span> <span class="govuk-!-font-weight-regular app-!-colour-muted"><%= inferred_answer %></span>
<% end %> <% end %>
<% end %> <% end %>
<% if @log.form.end_date > Time.zone.today %> <% if @log.collection_period_open? %>
<% row.action( <% row.action(
text: question.action_text(@log), text: question.action_text(@log),
href: question.action_href(@log, question.page.id), href: question.action_href(@log, question.page.id),

5
spec/requests/lettings_logs_controller_spec.rb

@ -782,6 +782,11 @@ RSpec.describe LettingsLogsController, type: :request do
expect(page).not_to have_link("Change") expect(page).not_to have_link("Change")
expect(page).not_to have_link("Answer") expect(page).not_to have_link("Answer")
end end
it "does not let the user navigate to questions for previous collection year logs" do
get "/lettings-logs/#{completed_lettings_log.id}/needs-type", headers: { "Accept" => "text/html" }, params: {}
expect(response).to redirect_to("/lettings-logs/#{completed_lettings_log.id}")
end
end end
context "when requesting CSV download" do context "when requesting CSV download" do

Loading…
Cancel
Save