diff --git a/app/controllers/surveys_controller.rb b/app/controllers/surveys_controller.rb index ef207a8..bacd32c 100644 --- a/app/controllers/surveys_controller.rb +++ b/app/controllers/surveys_controller.rb @@ -36,7 +36,7 @@ class SurveysController < ApplicationController "th_result" => t('survey.result') }, "total_pages" => questionnairesurveys.total_pages - } + } end def my_record @@ -86,7 +86,6 @@ class SurveysController < ApplicationController end def show - params = OrbitHelper.params survey = QuestionnaireSurvey.find_by(uid: params[:uid]) @@ -129,10 +128,9 @@ class SurveysController < ApplicationController end def update - uid = params[:id].split('-').last @survey = QuestionnaireSurvey.find_by(:uid=>uid) - + total = 0 individual_total = [] answer = params[:answer] @@ -236,7 +234,7 @@ class SurveysController < ApplicationController tmp['other'] = answer["#{qid}_#{oid}_custom_option"] end p = (opt.points.to_i * weight) rescue 0 - opt2_names = Array(answer["#{qid}_#{oid}"]).collect do |o2id| + opt2_names = Array(answer["#{qid}_#{oid}"]).collect do |o2id| opt2 = opt.level2.find(o2id) p += opt2.points.to_i * weight opt2.name_translations @@ -304,7 +302,7 @@ class SurveysController < ApplicationController show_page_url = show_page.get_url rescue show_page.url params[:url] = show_page_url OrbitHelper.set_params(params,current_user) - redirect_to OrbitHelper.url_to_show(@survey.to_param) + "?method=answer_success&ans=#{@answer_model.id.to_s}" + redirect_to "/#{params['locale']}#{params['show_page_url']}/#{params['id']}?method=answer_success&ans=#{@answer_model.id.to_s}" else @survey_answer_error = @answer_model.errors.full_messages.join('\n') render :answer_error @@ -312,7 +310,7 @@ class SurveysController < ApplicationController end def answer_success - + params = OrbitHelper.params survey = QuestionnaireSurvey.find_by(uid: params[:uid]) answer = SurveyAnswer.find(params[:ans]) @@ -332,7 +330,7 @@ class SurveysController < ApplicationController case survey.result_type when QuestionnaireSurvey::ResultChart begin - chart_data, survey_questions, survey_answers = survey.generate_chart_data + chart_data, survey_questions, survey_answers = survey.generate_chart_data rescue => e puts [e,e.backtrace] end @@ -347,4 +345,4 @@ class SurveysController < ApplicationController end -end \ No newline at end of file +end diff --git a/config/routes.rb b/config/routes.rb index 9409e9b..073cfcd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -71,7 +71,7 @@ Rails.application.routes.draw do end end end - + post "surveys/:id", to: "surveys#update" resources :surveys do collection do get ':slug_title-:uid', to: 'surveys#show' @@ -82,5 +82,5 @@ Rails.application.routes.draw do end end - + end