Browse Source

Use form helper method

pull/1215/head
Jack S 4 years ago
parent
commit
3997334336
  1. 10
      app/controllers/form_controller.rb

10
app/controllers/form_controller.rb

@ -6,7 +6,7 @@ class FormController < ApplicationController
def submit_form def submit_form
if @log if @log
@page = @log.form.get_page(params[@log.model_name.param_key][:page]) @page = form.get_page(params[@log.model_name.param_key][:page])
responses_for_page = responses_for_page(@page) responses_for_page = responses_for_page(@page)
mandatory_questions_with_no_response = mandatory_questions_with_no_response(responses_for_page) mandatory_questions_with_no_response = mandatory_questions_with_no_response(responses_for_page)
@ -30,7 +30,7 @@ class FormController < ApplicationController
def check_answers def check_answers
if @log if @log
current_url = request.env["PATH_INFO"] current_url = request.env["PATH_INFO"]
subsection = @log.form.get_subsection(current_url.split("/")[-2]) subsection = form.get_subsection(current_url.split("/")[-2])
render "form/check_answers", locals: { subsection:, current_user: } render "form/check_answers", locals: { subsection:, current_user: }
else else
render_not_found render_not_found
@ -49,8 +49,8 @@ class FormController < ApplicationController
if @log if @log
restore_error_field_values restore_error_field_values
page_id = request.path.split("/")[-1].underscore page_id = request.path.split("/")[-1].underscore
@page = @log.form.get_page(page_id) @page = form.get_page(page_id)
@subsection = @log.form.subsection_for_page(@page) @subsection = form.subsection_for_page(@page)
if @page.routed_to?(@log, current_user) if @page.routed_to?(@log, current_user)
render "form/page" render "form/page"
else else
@ -71,7 +71,7 @@ private
end end
if session["fields"] if session["fields"]
session["fields"].each do |field, value| session["fields"].each do |field, value|
if @log.form.get_question(field, @log)&.type != "date" && @log.respond_to?(field) if form.get_question(field, @log)&.type != "date" && @log.respond_to?(field)
@log[field] = value @log[field] = value
end end
end end

Loading…
Cancel
Save