Browse Source

refactor

pull/1018/head
Kat 4 years ago
parent
commit
23a7e4db78
  1. 3
      app/controllers/locations_controller.rb
  2. 3
      app/controllers/schemes_controller.rb
  3. 2
      app/views/locations/deactivate_confirm.html.erb
  4. 2
      app/views/schemes/deactivate_confirm.html.erb

3
app/controllers/locations_controller.rb

@ -38,7 +38,8 @@ class LocationsController < ApplicationController
end end
def deactivate_confirm def deactivate_confirm
if @location.lettings_logs.filter_by_before_startdate(params[:deactivation_date]).count.zero? @affected_logs = @location.lettings_logs.filter_by_before_startdate(params[:deactivation_date])
if @affected_logs.count.zero?
deactivate deactivate
else else
@deactivation_date = params[:deactivation_date] @deactivation_date = params[:deactivation_date]

3
app/controllers/schemes_controller.rb

@ -39,7 +39,8 @@ class SchemesController < ApplicationController
end end
def deactivate_confirm def deactivate_confirm
if @scheme.lettings_logs.filter_by_before_startdate(params[:deactivation_date]).count.zero? @affected_logs = @scheme.lettings_logs.filter_by_before_startdate(params[:deactivation_date])
if @affected_logs.count.zero?
deactivate deactivate
else else
@deactivation_date = params[:deactivation_date] @deactivation_date = params[:deactivation_date]

2
app/views/locations/deactivate_confirm.html.erb

@ -4,7 +4,7 @@
<% end %> <% end %>
<h1 class="govuk-heading-l"> <h1 class="govuk-heading-l">
<span class="govuk-caption-l"><%= @location.postcode %></span> <span class="govuk-caption-l"><%= @location.postcode %></span>
This change will affect <%= @location.lettings_logs.filter_by_before_startdate(@deactivation_date).count %> logs This change will affect <%= @affected_logs.count %> logs
</h1> </h1>
<%= govuk_warning_text text: I18n.t("warnings.location.deactivate.review_logs") %> <%= govuk_warning_text text: I18n.t("warnings.location.deactivate.review_logs") %>
<%= f.hidden_field :confirm, value: true %> <%= f.hidden_field :confirm, value: true %>

2
app/views/schemes/deactivate_confirm.html.erb

@ -6,7 +6,7 @@
<% end %> <% end %>
<h1 class="govuk-heading-l"> <h1 class="govuk-heading-l">
<span class="govuk-caption-l"><%= @scheme.service_name %></span> <span class="govuk-caption-l"><%= @scheme.service_name %></span>
This change will affect <%= @scheme.lettings_logs.filter_by_before_startdate(@deactivation_date).count %> logs This change will affect <%= @affected_logs.count %> logs
</h1> </h1>
<%= govuk_warning_text text: I18n.t("warnings.scheme.deactivation.review_logs") %> <%= govuk_warning_text text: I18n.t("warnings.scheme.deactivation.review_logs") %>
<%= f.hidden_field :confirm, value: true %> <%= f.hidden_field :confirm, value: true %>

Loading…
Cancel
Save