fix ntu ga survey export

Conflicts:

	Gemfile
	vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb

Gemfile

@@ -29,6 +29,9 @@ gem 'mongoid-tree', :require => 'mongoid/tree'
 gem "mongo_session_store-rails3", '3.0.6'
 gem 'nokogiri'
 
+# import csv
+gem 'roo'
+
 gem 'fb_graph'
 gem 'rack-gridfs'
 gem 'radius'

config/mongoid.yml

@@ -12,7 +12,6 @@ development:
 test:
   <<: *defaults
   database: test_site
-
 # set these environment variables on your prod server
 production:
   # host: <%= ENV['MONGOID_HOST'] %>
@@ -21,4 +20,4 @@ production:
   # password: <%= ENV['MONGOID_PASSWORD'] %>
   # database: <%= ENV['MONGOID_DATABASE'] %>
   <<: *defaults
-  database: test_site
+  database: production_8

vendor/built_in_modules/announcement/init.rb

@@ -29,8 +29,8 @@ module Announcement
 
     widgets do
       default_widget do
-	  sorting 'desc(:postdate)'
-        query 'Bulletin.available_for_lang(I18n.locale).any_of( {deadline: nil,:postdate.lte => Time.now} , {:deadline.gte => Time.now,:postdate.lte => Time.now} )'
+        sorting 'desc(:is_top, :postdate)'
+        query 'Bulletin.can_display.available_for_lang(I18n.locale).any_of( {deadline: nil,:postdate.lte => Time.now} , {:deadline.gte => Time.now,:postdate.lte => Time.now} )'
         enable ["typeA","typeB_style3","typeC"]
         image :image
         field :postdate

vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb

@@ -31,18 +31,29 @@ class Panel::Archive::FrontEnd::ArchiveFilesController < OrbitWidgetController
     @archive_file_categorys = ArchiveFileCategory.all
     # @archive_files = ArchiveFile.where( :is_hidden => false ).desc(:is_top).page(params[:page]).per(@page_num)
 
+    # if !params[:category_id].blank? && !params[:tag_id].blank?
+    #   @archive_files = @archive_files.default_sort(params[:sort]).can_display.where(:archive_file_category_id.in => params[:category_id], :tagged_ids.in => params[:tag_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+
+    #     @current_category = ArchiveFileCategory.from_id(params[:category_id]) rescue nil
+
+    # elsif !params[:category_id].blank?
+    #   @archive_files = ArchiveFile.default_sort(params[:sort]).can_display.where(:archive_file_category_id.in => params[:category_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+    #   @current_category = ArchiveFileCategory.from_id(params[:category_id]) rescue nil
+    # elsif !params[:tag_id].blank?
+    #   @archive_files = ArchiveFile.default_sort(params[:sort]).can_display.where(:tagged_ids.in => params[:tag_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+    # else
+    #   @archive_files = ArchiveFile.default_sort(params[:sort]).can_display.desc( :is_top ).page( params[:page_main] ).per(@page_num)
+    # end
     if !params[:category_id].blank? && !params[:tag_id].blank?
-      @archive_files = @archive_files.default_sort(params[:sort]).can_display.where(:archive_file_category_id.in => params[:category_id], :tagged_ids.in => params[:tag_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num)
-
-        @current_category = ArchiveFileCategory.from_id(params[:category_id]) rescue nil
-
-    elsif !params[:category_id].blank?
-      @archive_files = ArchiveFile.default_sort(params[:sort]).can_display.where(:archive_file_category_id.in => params[:category_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num)
-      @current_category = ArchiveFileCategory.from_id(params[:category_id]) rescue nil
+      @archive_files = ArchiveFile.default_sort(params[:sort]).all.can_display.where(:tagged_ids.in => params[:tag_id]).any_in(:archive_file_category_id => params[:category_id]).merge(ArchiveFileCategory.excludes('disable' => true)).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+      @current_category = ArchiveFileCategory.any_in(:_id => params[:category_id]).excludes('disable' => true)
+    elsif !params[:category_id].blank? 
+      @archive_files = ArchiveFile.default_sort(params[:sort]).all.can_display.any_in(:archive_file_category_id => params[:category_id]).merge(ArchiveFileCategory.excludes('disable' => true)).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+      @current_category = ArchiveFileCategory.any_in(:_id => params[:category_id]).excludes('disable' => true)
     elsif !params[:tag_id].blank?
-      @archive_files = ArchiveFile.default_sort(params[:sort]).can_display.where(:tagged_ids.in => params[:tag_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+      @archive_files = ArchiveFile.default_sort(params[:sort]).all.can_display.any_in(:tagged_ids => params[:tag_id]).merge(ArchiveFileCategory.excludes('disable' => true)).desc( :is_top ).page( params[:page_main] ).per(@page_num)
     else
-      @archive_files = ArchiveFile.default_sort(params[:sort]).can_display.desc( :is_top ).page( params[:page_main] ).per(@page_num)
+      @archive_files = ArchiveFile.default_sort(params[:sort]).all.can_display.merge(ArchiveFileCategory.excludes('disable' => true)).desc( :is_top).page( params[:page_main] ).per(@page_num)
     end
       
 

vendor/built_in_modules/archive/app/controllers/panel/archive/widget/archive_files_controller.rb

@@ -27,8 +27,10 @@ class Panel::Archive::Widget::ArchiveFilesController < OrbitWidgetController
 	  @category_id = @part.category
 
     date_now = Time.now
-
-    if !params[:category_id].blank?
+    if !params[:category_id].blank? && !params[:tag_id].blank?
+      @archive_files = ArchiveFile.default_sort(params[:sort]).all.can_display.where(:tagged_ids.in => params[:tag_id]).any_in(:archive_file_category_id => params[:category_id]).merge(ArchiveFileCategory.excludes('disable' => true)).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+      @archive_file_categorys = ArchiveFileCategory.any_in(:_id => params[:category_id]).excludes('disable' => true)
+    elsif !params[:category_id].blank? 
       @archive_files = ArchiveFile.default_sort(params[:sort]).all.can_display.any_in(:archive_file_category_id => params[:category_id]).merge(ArchiveFileCategory.excludes('disable' => true)).desc( :is_top ).page( params[:page_main] ).per(@page_num)
       @archive_file_categorys = ArchiveFileCategory.any_in(:_id => params[:category_id]).excludes('disable' => true)
     elsif !params[:tag_id].blank?

vendor/built_in_modules/ask_new/app/controllers/panel/ask/back_end/ask_coordinations_controller.rb

@@ -0,0 +1,15 @@
+class Panel::Ask::BackEnd::AskCoordinationsController < OrbitWidgetController
+
+  include AdminHelper
+  include OrbitControllerLib::DivisionForDisable
+
+  before_filter :for_app_manager
+
+  def initialize
+    super
+    @app_title = 'ask_coordinations'
+  end
+
+  def index
+  end
+end

vendor/built_in_modules/ask_new/app/controllers/panel/ask/back_end/ask_replies_controller.rb

@@ -13,10 +13,41 @@ class Panel::Ask::BackEnd::AskRepliesController < OrbitBackendController
   def create
     @ask_question = AskQuestion.find(params[:ask_question_id])
     @ask_question.ask_reply = AskReply.new(params[:ask_reply])
+    @ask_reply = @ask_question.ask_reply
     @ask_question.save
     if @ask_question.ask_reply.send_email?
       Resque.enqueue(SendAskReplyMail, @ask_reply.ask_question.id)
     end
+    
+    status_stack = []
+    new_status = ""
+    params[:school][:depts].each do |dns|
+      begin
+        status_stack << send_request(dns, @ask_question, @ask_reply)
+      rescue
+        status_stack << "fail"
+      end
+    end unless params[:school].nil?
+
+    success_count   = status_stack.count("success")
+    failed_count    = status_stack.count("fail")
+
+    if failed_count == 0 && success_count > 0
+      new_status = "轉介其他單位"
+    elsif failed_count > 0 && success_count > 0
+      new_status = "部份轉介失敗"
+    elsif failed_count > 0 && success_count == 0
+      new_status = "轉介失敗"
+    elsif failed_count == 0 && success_count == 0 &&  @ask_reply.status == "待處理"
+      new_status = "待處理"
+    elsif failed_count == 0 && success_count == 0 &&  @ask_reply.status == "已處理"
+      new_status = "已處理"
+    elsif failed_count == 0 && success_count == 0 &&  @ask_reply.status == "轉介其他單位"
+      new_status = "轉介失敗"
+    end
+    
+    @ask_reply.update_attributes(status: new_status)
+
     redirect_to panel_ask_back_end_ask_questions_path, notice: t('ask.reply_success')
   end
 
@@ -28,58 +59,73 @@ class Panel::Ask::BackEnd::AskRepliesController < OrbitBackendController
       Resque.enqueue(SendAskReplyMail, @ask_reply.ask_question.id)
     end
 
+    status_stack = []
+    new_status = ""
     params[:school][:depts].each do |dns|
-      send_request(dns, @ask_question, @ask_reply) 
+      begin
+        status_stack << send_request(dns, @ask_question, @ask_reply)
+      rescue
+        status_stack << "fail"
+      end
     end unless params[:school].nil?
 
+    success_count   = status_stack.count("success")
+    failed_count    = status_stack.count("fail")
+
+    if failed_count == 0 && success_count > 0
+      new_status = "轉介其他單位"
+    elsif failed_count > 0 && success_count > 0
+      new_status = "部份轉介失敗"
+    elsif failed_count > 0 && success_count == 0
+      new_status = "轉介失敗"
+    elsif failed_count == 0 && success_count == 0 &&  @ask_reply.status == "待處理"
+      new_status = "待處理"
+    elsif failed_count == 0 && success_count == 0 &&  @ask_reply.status == "已處理"
+      new_status = "已處理"
+    elsif failed_count == 0 && success_count == 0 &&  @ask_reply.status == "轉介其他單位"
+      new_status = "轉介失敗"
+    end
+
+    @ask_reply.update_attributes(status: new_status)
     redirect_to panel_ask_back_end_ask_questions_path, notice: t('ask.reply_success')
   end
-
+ 
   def send_request(dep_dns, current_question, current_reply)
     require 'net/http'
     require 'uri'
     require 'json'
-    
-    uri_path = "/panel/ask/back_end/ask_requests/auth_request"
-    uri = URI.parse("http://" + dep_dns + uri_path)
+
+    uri_path = "/panel/ask/back_end/ask_requests/transfer_request"
+    http = Net::HTTP.new(dep_dns,80)
+    request = Net::HTTP::Post.new(uri_path)
 
     body = {
-      'auth_token' => '3kjlfksjDFJ'
+    # 'auth_token' => '3kjlfksjDFJ',
+      'name' => current_question.name,
+      'title' => current_question.title,
+      'identity' => current_question.identity,
+      'email' => current_question.email,
+      'phone' => current_question.phone,
+      'tax' => current_question.tax,
+      'content' => current_question.content,
     }
-
-    http = Net::HTTP.new(uri.host, uri.port)
-    request = Net::HTTP::Post.new(uri.request_uri)
-    request.set_form_data(body)
-    response = http.request(request)
-    puts "Response #{response.code} #{response.message}: #{response.body}"
-
-    if response.code == "200"
-      uri_path = "/panel/ask/back_end/ask_requests/transfer_request"
-      uri = URI.parse("http://" + dep_dns + uri_path)
-      http = Net::HTTP.new(uri.host, uri.port)
-      request = Net::HTTP::Post.new(uri.request_uri)
-      body = {
-        'name' => current_question.name,
-        'title' => current_question.title,
-        'identity' => current_question.identity,
-        'email' => current_question.email,
-        'phone' => current_question.phone,
-        'tax' => current_question.tax,
-        'content' => current_question.content,
-      }
+    #binding.pry
+    status = ""
+    3.times do
       request.set_form_data(body)
+      request.add_field 'X-Auth-Token', '3kjlfksjDFJ'
       response = http.request(request)
 
-      if response.code != "200"
-        new_status = "轉介其他單位" + "(" + response.code + ")"
-        current_reply.update_attributes(status: new_status)
+      if response.code == "200" 
+        status = "success" 
+        break
       else
-        new_status = "轉介其他單位" + "(" + "success!" + ")"
-        current_reply.update_attributes(status: new_status)
-      end  
+        status = "fail"
+      end 
     end
-      
-    puts "Response #{response.code} #{response.message}: #{response.body}"
+
+    return status
+    # puts "Response #{response.code} #{response.message}: #{response.body}"
     # flash[:notice] = response.body
     # flash[:notice] = "Response #{response.code} #{response.message}: #{response.body}"
   end

vendor/built_in_modules/ask_new/app/controllers/panel/ask/back_end/ask_requests_controller.rb

@@ -1,35 +1,38 @@
 # encoding: utf-8
 class Panel::Ask::BackEnd::AskRequestsController < OrbitBackendController
-
   include AdminHelper
   include OrbitControllerLib::DivisionForDisable
-   
-  def auth_request
-    render :json => "#{params}"
-  end
-  
+  skip_before_filter :verify_authenticity_token
+
   def transfer_request
+    
+    if request.headers["HTTP_X_AUTH_TOKEN"] == '3kjlfksjDFJ' 
+      if !AskCategory.where(key: "transferred_question").any?
+        @ask_category = AskCategory.new(key: "transferred_question")
+        @ask_category.name_translations = { "zh_tw" => "轉介的問題", "en" => "Transferred Question" }
+        @ask_category.save!
+      end
 
-    if !AskCategory.where(key: "transfered_question").any?
-      @ask_category = AskCategory.new(name: "transfered_question", key: "transfered_question")
-      @ask_category.save!
+      category = AskCategory.where(key: "transferred_question")
+
+      @transfered_question = AskQuestion.new(
+        name:     params['name'],
+        identity: params['identity'],
+        email:    params['email'],
+        phone:    params['phone'],
+        tax:      params['tax'],
+        title:    params['title'],
+        content:  params['content'],
+        ask_category_id: category.first.id)
+
+      @transfered_question.ask_reply = AskReply.new
+      @transfered_question.ask_reply.update_attributes(status: "待處理 (轉)")
+      @transfered_question.save
+
+      render :nothing => true    
+    else
+      render :status => 500 
     end
-    category = AskCategory.where(key: "transfered_question")
-
-    @transfered_question = AskQuestion.new(
-      name: params['name'],
-      identity: params['identity'],
-      email: params['email'],
-      phone: params['phone'],
-      tax: params['tax'],
-      title: params['title'],
-      content: params['content'],
-      ask_category_id: category.first.id)
-    @transfered_question.ask_reply = AskReply.new
-    @transfered_question.ask_reply.update_attributes(status: "待處理(轉)")
-    @transfered_question.save
-
-    render :json => "#{params}"
   end
 
 end

vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb

@@ -14,18 +14,22 @@ class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController
   def create
     @ask_question = AskQuestion.new(params[:ask_question])
     if gotcha_valid? && @ask_question.save
-     @acknowledgement = AskAcknowledgement.last
+      @acknowledgement = AskAcknowledgement.last
       @ask_acknowledgement = AskAcknowledgement.first || AskAcknowlegement.new
-      #@ask_question.save
-      redirect_to root_path
+
       AskAdmin.all.each do |ask_admin|
         AskMailer.notice(ask_admin, @ask_question).deliver
         Resque.enqueue(SendAskNoticeMail, ask_admin.id, @ask_question.id)
       end
- #      redirect_to panel_ask_front_end_thank_you_path
+
+      # Render to create.js.erb
       respond_to do |format|
         format.js
-       # format.js { render :thank_you, notice: 'Your question has been successfully sent.' }
+      end
+    else
+      # Render to index.js.erb
+      respond_to do |format| 
+        format.js { render :index }
       end
     end
   end
@@ -43,4 +47,7 @@ class Panel::Ask::FrontEnd::AskQuestionsController < OrbitWidgetController
     end
     @item = Page.find(params[:page_id]) rescue nil
   end
+
+  def sorry
+  end
 end

vendor/built_in_modules/ask_new/app/views/panel/ask/back_end/ask_questions/edit.html.erb

@@ -1,18 +1,31 @@
 <script type="text/javascript">
 
+var local_host = "<%= request.host %>";
+if (local_host[0] == "g" && local_host[1] == "a") {
+    local_host = "www." + local_host;
+}
+
+function hide_current_host_name(localhost) {
+  $('input[type=checkbox]').each(function() {
+    if ($(this).val() == local_host) {
+      $(this).addClass("hide");
+      $(this).next().addClass("hide");
+    }
+  });
+}
+
 $(document).ready(function() {
-  if ($("#ask_reply_status").val() == '轉介其他單位') { $('.dept_options').show(); }
+
+  if ($("#ask_reply_status").val() == '轉介其他單位') {
+
+    hide_current_host_name(local_host);
+
+    $('.dept_options').show();
+  }
 
   $("#ask_reply_status").change(function() {
 
-    var local_host = "<%= request.host %>:<%= request.port %>";
-
-    $('input[type=checkbox]').each(function() {
-      if ($(this).val() == local_host) {
-        $(this).addClass("hide");
-        $(this).next().addClass("hide");
-      }
-    });
+    hide_current_host_name(local_host);
 
     $('.dept_options').slideUp();
     if ($(this).find('option:selected').attr('value') == '轉介其他單位') {
@@ -70,17 +83,22 @@ $(document).ready(function() {
       <tr>
         <td colspan="5" class="dept_options">
           <div class="dept_options">
-          <%= check_box("school", "depts", {:multiple => true}, "localhost:3000", nil) %><%= label_tag("localhost:3000", "總務長室暨總務處秘書室") %>
-          <%= check_box("school", "depts", {:multiple => true}, "localhost:4000", nil) %><%= label_tag("localhost:4000", "文書組") %>
-          <%= check_box("school", "depts", {:multiple => true}, "事務組", nil) %><%= label_tag(:dep3, "事務組") %>
-          <%= check_box("school", "depts", {:multiple => true}, "保管組", nil) %><%= label_tag(:dep4, "保管組") %>
-          <%= check_box("school", "depts", {:multiple => true}, "營繕組", nil) %><%= label_tag(:dep5, "營繕組") %>
-          <%= check_box("school", "depts", {:multiple => true}, "出納組", nil) %><%= label_tag(:dep6, "出納組") %>
-          <%= check_box("school", "depts", {:multiple => true}, "採購組", nil) %><%= label_tag(:dep7, "採購組") %>
-          <%= check_box("school", "depts", {:multiple => true}, "經營管理組", nil) %><%= label_tag(:dep8, "經營管理組") %>
-          <%= check_box("school", "depts", {:multiple => true}, "駐警隊", nil) %><%= label_tag(:dep9, "駐警隊") %>
-          <%= check_box("school", "depts", {:multiple => true}, "社科院總務分處", nil) %><%= label_tag(:dep10, "社科院總務分處") %>
-          <%= check_box("school", "depts", {:multiple => true}, "醫學院總務分處", nil) %><%= label_tag(:dep11, "醫學院總務分處") %>
+<!-- Example <%= check_box("school", "depts", {:multiple => true}, 'ntu_ga_test_p.tp.rulingcom.com', nil) %><%= label_tag("ntu_ga_test_p.tp.rulingcom.com", "測試站總務處 (ntu_ga_test_p)") %>
+          <%= check_box("school", "depts", {:multiple => true}, 'ntu_ga_test.tp.rulingcom.com', nil) %><%= label_tag("ntu_ga_test.tp.rulingcom.com", "測試站總務處經管組 (ntu_ga_test)") %> -->
+<!--      <%= check_box("school", "depts", {:multiple => true}, (request.host + ":3000"), nil) %><%= label_tag((request.host + ":3000"), "測試站3000") %>
+          <%= check_box("school", "depts", {:multiple => true}, (request.host + ":4000"), nil) %><%= label_tag((request.host + ":4000"), "測試站4000") %> -->
+          <%= check_box("school", "depts", {:multiple => true}, "www.ga.ntu.edu.tw", nil) %><%= label_tag("www.ga.ntu.edu.tw", "總務處") %>
+          <%= check_box("school", "depts", {:multiple => true}, "sec.ga.ntu.edu.tw", nil) %><%= label_tag("sec.ga.ntu.edu.tw", "總務長室暨總務處秘書室") %>
+          <%= check_box("school", "depts", {:multiple => true}, "doc.ga.ntu.edu.tw", nil) %><%= label_tag("doc.ga.ntu.edu.tw", "文書組") %>
+          <%= check_box("school", "depts", {:multiple => true}, "general.ga.ntu.edu.tw", nil) %><%= label_tag("general.ga.ntu.edu.tw", "事務組") %>
+          <%= check_box("school", "depts", {:multiple => true}, "property.ga.ntu.edu.tw", nil) %><%= label_tag("property.ga.ntu.edu.tw", "保管組") %>
+          <%= check_box("school", "depts", {:multiple => true}, "construction.ga.ntu.edu.tw", nil) %><%= label_tag("construction.ga.ntu.edu.tw", "營繕組") %>
+          <%= check_box("school", "depts", {:multiple => true}, "cashier.ga.ntu.edu.tw", nil) %><%= label_tag("cashier.ga.ntu.edu.tw", "出納組") %>
+          <%= check_box("school", "depts", {:multiple => true}, "procurement.ga.ntu.edu.tw", nil) %><%= label_tag("procurement.ga.ntu.edu.tw", "採購組") %>
+          <%= check_box("school", "depts", {:multiple => true}, "fss.ga.ntu.edu.tw", nil) %><%= label_tag("fss.ga.ntu.edu.tw", "經營管理組") %>
+          <%= check_box("school", "depts", {:multiple => true}, "police.ga.ntu.edu.tw", nil) %><%= label_tag("police.ga.ntu.edu.tw", "駐警隊") %>
+          <%= check_box("school", "depts", {:multiple => true}, "social.ga.ntu.edu.tw", nil) %><%= label_tag("social.ga.ntu.edu.tw", "社科院總務分處") %>
+          <%= check_box("school", "depts", {:multiple => true}, "medicine.ga.ntu.edu.tw", nil) %><%= label_tag("medicine.ga.ntu.edu.tw", "醫學院總務分處") %>
           </div>
         </td>
       </tr>  

vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/create.js.erb

@@ -1 +1 @@
-window.location.href= "<%= panel_ask_front_end_thank_you_path %>"
+window.location.href = "<%= panel_ask_front_end_thank_you_path %>";

vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/index.html.erb

@@ -21,9 +21,9 @@ $(document).ready(function(){
         $(this).hide();
     }).bind("ajaxError", function() {
         $(this).hide();
+        // window.location.href = "<%= panel_ask_front_end_thank_you_path %>";
     });
- 
-     });
+});
 </script>
 
 <div id="spinner" class="spinner" style="display:none;">
@@ -31,11 +31,11 @@ $(document).ready(function(){
 </div>
 <div id="new-ask-question" class="ask-question">
   <div id="acknowledgement"></div>
-  <%= form_for @ask_question, url: panel_ask_front_end_ask_questions_path(standalone: true), html: {class: 'form-horizontal'} do |f| %>
+  <%= form_for @ask_question, url: panel_ask_front_end_ask_questions_path(standalone: true), html: {class: 'form-horizontal'}, method: :post do |f| %>
     <div class="control-group">
       <%= f.label :ask_category_id, class: 'control-label required' %>
       <div class="controls">
-        <%= f.collection_select :ask_category_id, AskCategory.all.select { |c| c.key != 'transfered_question' }, :id, :name  %>
+        <%= f.collection_select :ask_category_id, AskCategory.all.select { |c| c.key != 'transferred_question' }, :id, :name  %>
       </div>
     </div>
     <div class="control-group">

vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/index.js.erb

@@ -0,0 +1 @@
+window.location.href = "<%= panel_ask_front_end_sorry_path %>";

vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/sorry.html.erb

@@ -0,0 +1 @@
+<h3><%= t(:ask_fail, :scope => :ask) %> !</h3>

vendor/built_in_modules/ask_new/config/locales/en.yml

@@ -1,5 +1,6 @@
 en:
   ask:
+    ask_fail: Something went wrong
     ask: Ask
     export: Export
     reply: Reply

vendor/built_in_modules/ask_new/config/locales/zh_tw.yml

@@ -3,6 +3,7 @@ zh_tw:
     errors:
       verification_failed: 驗證碼錯誤
   ask:
+    ask_fail: 寄送失敗
     ask: 發問
     export: 匯出
     reply: 回覆

vendor/built_in_modules/ask_new/config/routes.rb

@@ -22,6 +22,7 @@ Rails.application.routes.draw do
 
       namespace :front_end do
         match "ask_questions/thank_you" => "ask_questions#thank_you", :as => 'thank_you'
+        match "ask_questions/sorry" => "ask_questions#sorry", :as => 'sorry' 
         resources :ask_questions
       end
     end

vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb

@@ -1,4 +1,8 @@
 require 'csv'
+require 'iconv'
+require 'roo'
+
+# encoding: UTF-8
 
 class Panel::Survey::BackEnd::SurveysController < OrbitBackendController
 
@@ -85,11 +89,152 @@ 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
+    @survey = ::Survey.find(params[:id])
+    @chart_data, @survey_questions, @survey_answers = @survey.generate_chart_data
+    @file = params[:file]
+
+    case File.extname(@file.original_filename)
+      when ".csv" then @spreadsheet = Roo::CSV.new(@file.path, csv_options: {encoding: Encoding::Big5})
+      # when ".xls" then Excel.new(file.path, nil, :ignore)
+      # when ".xlsx" then Excelx.new(file.path, nil, :ignore)
+      else raise "Unknown file type: #{file.original_filename}"
+    end
+
+    # Modify titles if changed
+    titles = @spreadsheet.row(1) - [" "]
+    @survey_questions.each_with_index do |question, index|
+      question.update_attributes(title: titles[index])
+    end
+    
+    @survey_answers.destroy
+    
+    # Start and end of speadsheet
+    @end_row = @spreadsheet.count
+
+    @max_row_start = 0
+    @survey_questions.each do |question|
+      case question.type
+      when ::SurveyQuestion::Radio, ::SurveyQuestion::Select, ::SurveyQuestion::Check
+        if question.survey_question_options.count > @max_row_start
+          @max_row_start = question.survey_question_options.count
+        end  
+      when ::SurveyQuestion::Radiogroup
+        if question.survey_question_options.count * question.survey_question_radiogroups.count > @max_row_start
+          @max_row_start = question.survey_question_options.count * question.survey_question_radiogroups.count
+        end
+      end  
+    end  
+    @start_row = @max_row_start + 2
+
+    # Modify multiline options if changed
+    (@start_row..@end_row).each do |row|
+      @answer_model = @survey.survey_answers.new
+      @survey_questions.each_with_index do |question, index|
+        case question.type
+
+        when ::SurveyQuestion::Oneline, ::SurveyQuestion::Multiline
+          @answer_model[question.id.to_s] = @spreadsheet.row(row)[index * 2]
+
+        when ::SurveyQuestion::Radio, ::SurveyQuestion::Select
+          if !@spreadsheet.row(row)[index*2].nil? && @spreadsheet.row(row)[index*2] != " " 
+            @answer_model[question.id.to_s] = @spreadsheet.row(row)[index*2]
+          end
+
+        when ::SurveyQuestion::Check
+          if !@spreadsheet.row(row)[index*2].nil? && @spreadsheet.row(row)[index*2] != " " 
+            @answer_model[question.id.to_s] = @spreadsheet.row(row)[index*2].split("\"").select.each_with_index { |str, i| i.odd? }
+          end
+
+        when ::SurveyQuestion::Radiogroup
+          radio_groups = []
+          spreadsheet_radiogroups_lines = 
+            question.survey_question_options.count * question.survey_question_radiogroups.count + 2
+          
+          # Grab each radiogroups line for update
+          (2...spreadsheet_radiogroups_lines).each do |line|
+            radio_groups << @spreadsheet.row(line)[index * 2]
+          end
+
+          # Grab answers info
+          answers = []
+          if not @spreadsheet.row(row)[index * 2].blank?
+            answers << eval(@spreadsheet.row(row)[index * 2])
+          end
+
+          # Save the answers
+          answers.each do |answer|
+            options = Hash[question.survey_question_options.collect { |o| [ o.id.to_s, o.name ] }]
+            # @answer_model = @survey.survey_answers.new
+            @answer_model[question.id.to_s] = {}
+
+            answer.each do |option, value|
+              @answer_model[question.id.to_s][options.invert[option]] = value
+            end
+
+            # @answer_model.save!
+          end
+
+          # Parse the needed info in the array
+          radio_titles = []
+          radio_options = []
+          radio_groups.each do |group|
+            option_with_radio = group.split(' - ')
+            radio_titles << option_with_radio[0]
+            radio_options << option_with_radio[1]
+          end
+
+          # Update the spreadsheet info to the DB
+          groups_of_options = []
+          groups_of_radios  = []
+          radio_titles.each_slice(question.survey_question_radiogroups.count) do |options|
+            groups_of_options << options
+          end
+
+          radio_options.each_slice(question.survey_question_radiogroups.count) do |options|
+            groups_of_radios << options
+          end
+
+          # Update option names
+          question.survey_question_options.each_with_index do |option, index|
+            groups_of_options[index].each do |modified_option|
+              if option.name_translations["zh_tw"] != modified_option
+                option.update_attributes(name: modified_option)
+                break
+              end
+            end
+          end
+
+          # Update radio names
+          question.survey_question_radiogroups.each_with_index do |option, index|
+            groups_of_radios.each do |radios|
+              if radios[index] != option.name_translations["zh_tw"]
+                option.update_attributes(name: radios[index])
+                break
+              end
+            end
+          end        
+        end
+      end
+      
+      @answer_model.save!
+
+    end #end row 
+
+    redirect_to panel_survey_back_end_surveys_url, :notice => :success
+  end
+
   def export
     @survey = ::Survey.find(params[:id])
     @chart_data, @survey_questions, @survey_answers = @survey.generate_chart_data
 
-    csv = CSV.generate do |csv|
+    head = 'EF BB BF'.split(' ').map{|a|a.hex.chr}.join()
+
+    csv = CSV.generate(csv = head) do |csv|
       row = []
       @survey_questions.each do |question|
         row << question.title
@@ -134,7 +279,7 @@ class Panel::Survey::BackEnd::SurveysController < OrbitBackendController
         @survey_questions.each do |question|
           if question.type == ::SurveyQuestion::Radiogroup
             options = Hash[question.survey_question_options.collect{|o| [ o.id.to_s, o.name ] }]
-            row << Hash[answer[question.id.to_s].map {|o, g| [options[o], g]}]
+            row << Hash[answer[question.id.to_s].map {|o, g| [options[o], g]}] if !answer[question.id.to_s].blank?
           else
             row << answer[question.id.to_s]
           end
@@ -146,11 +291,16 @@ class Panel::Survey::BackEnd::SurveysController < OrbitBackendController
     end
 
     respond_to do |format|
-      format.csv do
-        response.headers["Content-Type"] = "text/csv; charset=big5"
-        render :text => csv.encode('Big5')
-      end
+      format.html
+      format.csv { send_data csv }
     end
+
+    # respond_to do |format|
+    #   format.csv do
+    #     response.headers["Content-Type"] = "text/csv; charset=big5"
+    #     render :text => csv.encode('Big5')
+    #   end
+    # end
   end
 
   def set_answers

vendor/built_in_modules/survey/app/controllers/panel/survey/front_end/surveys_controller.rb

@@ -110,4 +110,10 @@ class Panel::Survey::FrontEnd::SurveysController < OrbitWidgetController
     end
   end
 
+  def info
+    redirect_standalone result_panel_survey_front_end_survey_path(params[:id], :standalone => 'true') do
+      @survey = ::Survey.find params[:id]
+    end
+  end
+
 end

vendor/built_in_modules/survey/app/models/survey.rb

@@ -41,6 +41,16 @@ class Survey
 
   before_save :check_deadline, :update_avliable_language
 
+  def topic
+    unless self.deadline && Time.now > self.deadline
+      ('<a target="_blank" href="' + Rails.application.routes
+                                          .url_helpers.panel_survey_front_end_survey_path(self, :standalone => true) + '">' + self.title + '</a>').html_safe
+    else
+     ('<a target="_blank" href="' + Rails.application.routes
+                                          .url_helpers.info_panel_survey_front_end_survey_path(self, :standalone => true) + '">' + self.title + '</a>').html_safe
+    end
+  end
+
   def time_range
     r = "#{self.postdate.to_date}"
     r += "- #{self.deadline.to_date}" if self.deadline

vendor/built_in_modules/survey/app/models/survey_question.rb

@@ -44,5 +44,4 @@ class SurveyQuestion
   def get_jump_tos
     Hash[survey_question_options.select{ |o| !o.jump_to.blank? }.collect{ |o| [o.id.to_s, o.jump_to] }]
   end
-
 end

vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_survey.html.erb

@@ -14,6 +14,7 @@
           <li><%= link_to t('survey.jump'), jump_panel_survey_back_end_survey_path(survey, :page => params[:page]) %></li>
           <li><%= link_to t('survey.set_answers'), set_answers_panel_survey_back_end_survey_path(survey, :page => params[:page]) %></li>
           <li><%= link_to t('survey.export_csv'), export_panel_survey_back_end_survey_path(survey, :format => :csv), :target => '_blank' %></li>
+          <li><%= link_to t('survey.import_csv'), set_import_panel_survey_back_end_survey_path(survey), :target => '_blank' %></li>
           <li><%= link_to t('survey.chart'), result_panel_survey_front_end_survey_path(survey, :force_chart => true, :standalone => true), :target => '_blank' %></li>
           <li><%= link_to t(:delete_), panel_survey_back_end_survey_path(survey), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
         <% end -%>

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 %>
+<table class="table main-list">
+  <thead>
+    <tr>
+      <th class="span2"><%= t('survey.import.title') %></th>
+      <th class="span2"><%= t('survey.import.description') %></th>
+      <th class="span2"></th>
+    </tr>
+  </thead>
+  <tbody id="tbody_surveys" class="sort-holder">
+    <tr>
+      <td><%= @survey.title %></td>
+      <td><%= file_field_tag :file %></td>
+      <td><%= submit_tag t("survey.import_csv"), :class => 'btn' %></td>
+    </tr>
+  </tbody>
+</table>
+<% end %>

vendor/built_in_modules/survey/app/views/panel/survey/front_end/surveys/info.html.erb

@@ -0,0 +1,16 @@
+<h3>問卷已結束！感謝您的參與！</h3>
+
+<table class="table">
+<tr>
+<th>問卷標題</th>
+<th>問卷說明</th>
+<th>開始期間</th>
+<th>結束期間</th>
+</tr>
+<tr>
+<td><%= @survey.title %></td>
+<td><%= truncate(@survey.description, to: 40) %></td>
+<td><%= @survey.postdate.to_date %></td>
+<td><%= @survey.deadline.to_date %></td>
+</tr>
+</table>

vendor/built_in_modules/survey/config/locales/en.yml

@@ -23,6 +23,13 @@ en:
 
     answers_list: Answers List
     export_csv: Export CSV
+
+    import_csv: Import CSV
+
+    import:
+        title: Imported Survey
+        description: Choose the Modified Exported File According to this Survey
+
     chart: Chart
     set_answers: Set Answers
     duplicate_it: Duplicate It
@@ -46,6 +53,7 @@ en:
       title: Title
       time_range: Date Range
       result: Result
+      topic: Title
 
     frontend:
         survey: Survey Frontend

vendor/built_in_modules/survey/config/locales/zh_tw.yml

@@ -24,6 +24,13 @@ zh_tw:
 
     answers_list: 結果清單
     export_csv: 匯出CSV
+
+    import_csv: 匯入CSV
+    
+    import:
+        title: 匯入的問卷
+        description: 選擇根據此問卷所修改的匯出檔案
+
     chart: 結果圖表
     set_answers: 設定結果
     duplicate_it: 複製問卷
@@ -48,6 +55,7 @@ zh_tw:
       time_range: 問卷期間
       write: 填問卷
       result: 結果
+      topic: 問卷標題
 
     frontend:
         survey: 問卷調查前台

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'
@@ -24,6 +26,7 @@ Rails.application.routes.draw do
         resources :surveys do
           member do
             get 'result'
+            get 'info'
           end
         end
       end

vendor/built_in_modules/survey/init.rb

@@ -20,9 +20,12 @@ module Faq
 
     widgets do
       default_widget do
+        sorting 'desc(:postdate)'
         enable ["typeA"]
         query 'Survey.any_of( {:postdate.lte => Time.now} )'
-        link_field :title, {:method => 'panel_survey_front_end_survey_path',:args=>:self}
+        # link_field :title, {:method => 'panel_survey_front_end_survey_path',:args=>:self}
+        # field :title
+        field :topic
         field :time_range
         field :write
         field :result