Add port to test

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/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,74 @@ 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_path = "/panel/ask/back_end/ask_requests/transfer_request"
     uri = URI.parse("http://" + dep_dns + uri_path)
-
-    body = {
-      'auth_token' => '3kjlfksjDFJ'
-    }
-
     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,
-      }
+    body = {
+    # '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,
+    }
+    #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,28 @@
 <script type="text/javascript">
 
+var local_host = "<%= request.host %>:<%= request.port %>";
+
+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,8 +80,12 @@ $(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}, 'ntu_ga_test_p.tp.rulingcom.com:80', nil) %><%= label_tag("ntu_ga_test_p.tp.rulingcom.com:80", "測試站總務處 (ntu_ga_test_p)") %>
+          <%= check_box("school", "depts", {:multiple => true}, 'ntu_ga_test.tp.rulingcom.com:80', nil) %><%= label_tag("ntu_ga_test.tp.rulingcom.com:80", "測試站總務處經管組 (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}, "", nil) %><%= label_tag(:dep1, "總務長室暨總務處秘書室") %>
+          <%= check_box("school", "depts", {:multiple => true}, "文書組", nil) %><%= label_tag(:dep2, "文書組") %>
           <%= 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, "營繕組") %>

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/init.rb

@@ -22,7 +22,8 @@ module Faq
       default_widget do
         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 :time_range
         field :write
         field :result