add ntu_ga survey init sorting

Conflicts:

	vendor/built_in_modules/announcement/init.rb

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/ask_new/app/controllers/panel/ask/back_end/ask_replies_controller.rb

@@ -96,9 +96,8 @@ class Panel::Ask::BackEnd::AskRepliesController < OrbitBackendController
     require 'json'
 
     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)
+    http = Net::HTTP.new(dep_dns,80)
+    request = Net::HTTP::Post.new(uri_path)
 
     body = {
     # 'auth_token' => '3kjlfksjDFJ',

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

@@ -1,6 +1,6 @@
 <script type="text/javascript">
 
-var local_host = "<%= request.host %>:<%= request.port %>";
+var local_host = "<%= request.host %>";
 
 function hide_current_host_name(localhost) {
   $('input[type=checkbox]').each(function() {
@@ -80,8 +80,8 @@ $(document).ready(function() {
       <tr>
         <td colspan="5" class="dept_options">
           <div class="dept_options">
-          <%= 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}, '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}, "", nil) %><%= label_tag(:dep1, "總務長室暨總務處秘書室") %>

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

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/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,10 +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}
-        field :title
+        # field :title
+        field :topic
         field :time_range
         field :write
         field :result