From 1e5fbfed5f4a936fa7f35bce5d082f8142d1311b Mon Sep 17 00:00:00 2001 From: Bernie Chiu Date: Wed, 16 Oct 2013 17:03:18 +0800 Subject: [PATCH] Add routing and links for import --- .../survey/back_end/surveys_controller.rb | 7 +++++++ .../survey/back_end/surveys/_survey.html.erb | 1 + .../back_end/surveys/set_import.html.erb | 18 ++++++++++++++++++ .../survey/config/locales/en.yml | 1 + .../survey/config/locales/zh_tw.yml | 1 + .../built_in_modules/survey/config/routes.rb | 2 ++ 6 files changed, 30 insertions(+) create mode 100644 vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/set_import.html.erb diff --git a/vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb b/vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb index ba4c2a76d..621efcb39 100644 --- a/vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb +++ b/vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb @@ -85,6 +85,13 @@ class Panel::Survey::BackEnd::SurveysController < OrbitBackendController redirect_to panel_survey_back_end_surveys_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]) end + def set_import + @survey = ::Survey.find(params[:id]) + end + + def import + end + def export @survey = ::Survey.find(params[:id]) @chart_data, @survey_questions, @survey_answers = @survey.generate_chart_data diff --git a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_survey.html.erb b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_survey.html.erb index 1383bc078..e409d01cc 100644 --- a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_survey.html.erb +++ b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_survey.html.erb @@ -14,6 +14,7 @@
  • <%= link_to t('survey.jump'), jump_panel_survey_back_end_survey_path(survey, :page => params[:page]) %>
  • <%= link_to t('survey.set_answers'), set_answers_panel_survey_back_end_survey_path(survey, :page => params[:page]) %>
  • <%= link_to t('survey.export_csv'), export_panel_survey_back_end_survey_path(survey, :format => :csv), :target => '_blank' %>
  • +
  • <%= link_to t('survey.import_csv'), set_import_panel_survey_back_end_survey_path(survey), :target => '_blank' %>
  • <%= link_to t('survey.chart'), result_panel_survey_front_end_survey_path(survey, :force_chart => true, :standalone => true), :target => '_blank' %>
  • <%= link_to t(:delete_), panel_survey_back_end_survey_path(survey), :confirm => t('sure?'), :method => :delete, :remote => true %>
  • <% end -%> diff --git a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/set_import.html.erb b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/set_import.html.erb new file mode 100644 index 000000000..8c1855a0b --- /dev/null +++ b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/set_import.html.erb @@ -0,0 +1,18 @@ +<%= form_tag import_panel_survey_back_end_survey_path(@survey), multipart: true do %> + + + + + + + + + + + + + + + +
    匯入的問卷原始匯出檔案
    <%= @survey.title %><%= file_field_tag :file %><%= submit_tag t("survey.import_csv"), :class => 'btn' %>
    +<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/survey/config/locales/en.yml b/vendor/built_in_modules/survey/config/locales/en.yml index 7847c4a9c..d1a1771e1 100644 --- a/vendor/built_in_modules/survey/config/locales/en.yml +++ b/vendor/built_in_modules/survey/config/locales/en.yml @@ -23,6 +23,7 @@ en: answers_list: Answers List export_csv: Export CSV + import_csv: Import CSV chart: Chart set_answers: Set Answers duplicate_it: Duplicate It diff --git a/vendor/built_in_modules/survey/config/locales/zh_tw.yml b/vendor/built_in_modules/survey/config/locales/zh_tw.yml index 654262e30..b519908c3 100644 --- a/vendor/built_in_modules/survey/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/survey/config/locales/zh_tw.yml @@ -24,6 +24,7 @@ zh_tw: answers_list: 結果清單 export_csv: 匯出CSV + import_csv: 匯入CSV chart: 結果圖表 set_answers: 設定結果 duplicate_it: 複製問卷 diff --git a/vendor/built_in_modules/survey/config/routes.rb b/vendor/built_in_modules/survey/config/routes.rb index 6c2ba6162..4d111c4c5 100644 --- a/vendor/built_in_modules/survey/config/routes.rb +++ b/vendor/built_in_modules/survey/config/routes.rb @@ -9,6 +9,8 @@ Rails.application.routes.draw do end member do get 'export' + get 'set_import' + post 'import' get 'set_answers' get 'jump' get 'duplicate_it'