Browse Source

Update method name

pull/2403/head
Kat 2 years ago committed by kosiakkatrina
parent
commit
bec3c92b4c
  1. 4
      app/controllers/lettings_logs_filters_controller.rb
  2. 10
      app/helpers/filters_helper.rb

4
app/controllers/lettings_logs_filters_controller.rb

@ -36,9 +36,7 @@ def filter_form_params
end end
def session_filters def session_filters
params["forms_filter_form"].each do |key, value| params["forms_filter_form"].each { |key, value| params[key] = value } if params["forms_filter_form"].present?
params[key] = value
end
params["years"] = [params["years"]] if params["years"].present? params["years"] = [params["years"]] if params["years"].present?
filter_manager.session_filters filter_manager.session_filters
end end

10
app/helpers/filters_helper.rb

@ -205,25 +205,25 @@ private
end end
def formatted_years_filter(session_filters) def formatted_years_filter(session_filters)
return unanswered_value if session_filters["years"].blank? return unanswered_filter_value if session_filters["years"].blank?
session_filters["years"].map { |year| year_combo(year.to_i) }.to_sentence session_filters["years"].map { |year| year_combo(year.to_i) }.to_sentence
end end
def formatted_status_filter(session_filters) def formatted_status_filter(session_filters)
return unanswered_value if session_filters["status"].blank? return unanswered_filter_value if session_filters["status"].blank?
session_filters["status"].map { |status| status_filters[status] }.to_sentence session_filters["status"].map { |status| status_filters[status] }.to_sentence
end end
def formatted_needstype_filter(session_filters) def formatted_needstype_filter(session_filters)
return unanswered_value if session_filters["needstypes"].blank? return unanswered_filter_value if session_filters["needstypes"].blank?
session_filters["needstypes"].map { |needstype| needstype_filters[needstype] }.to_sentence session_filters["needstypes"].map { |needstype| needstype_filters[needstype] }.to_sentence
end end
def formatted_assigned_to_filter(session_filters) def formatted_assigned_to_filter(session_filters)
return unanswered_value if session_filters["assigned_to"].blank? return unanswered_filter_value if session_filters["assigned_to"].blank?
return "All" if session_filters["assigned_to"].include?("all") return "All" if session_filters["assigned_to"].include?("all")
return "You" if session_filters["assigned_to"].include?("you") return "You" if session_filters["assigned_to"].include?("you")
@ -243,7 +243,7 @@ private
Organisation.find(session_filters["managing_organisation"].first)&.name Organisation.find(session_filters["managing_organisation"].first)&.name
end end
def unanswered_value def unanswered_filter_value
"<span class=\"app-!-colour-muted\">You didn’t answer this question</span>".html_safe "<span class=\"app-!-colour-muted\">You didn’t answer this question</span>".html_safe
end end
end end

Loading…
Cancel
Save