Merge branch 'master' into 'master'

Master

I add search function and fix some translation error

See merge request !2

app/controllers/personal_projects_controller.rb

@@ -1,4 +1,9 @@
 class PersonalProjectsController < ApplicationController
+  def search_all_words(target,word)
+    target=target.upcase
+    words=word.upcase.split(' ')
+    return words.select{|value| target.include? value}==words
+  end
   def index
     params = OrbitHelper.params
     projects = Project.where(:project_title.ne => nil,:project_title.ne => "").sort_for_frontend.page(OrbitHelper.params[:page_no]).per(OrbitHelper.page_data_count)
@@ -14,7 +19,30 @@ class PersonalProjectsController < ApplicationController
         "unit"
       ]
     end
-    
+    if params[:selectbox] !=nil
+      projects_temp = Project.where(:is_hidden=>false).sort_by{ |tp| [-tp[:year].to_i,-tp[:publication_date].to_i] }
+      case params[:selectbox]
+      when "project_type"
+          projects_show = projects_temp.select {|value| search_all_words((value.send("project_type").title rescue ""), params[:keywords])}
+      when "project_title","default"
+          projects_show = projects_temp.select {|value| search_all_words(value.send("project_title").to_s, params[:keywords])}
+      when "period"
+          projects_show = projects_temp.select {|value| search_all_words(value.send("duration").to_s, params[:keywords])}
+      when "language"
+          projects_show = projects_temp.select {|value| search_all_words(t(value.send("language")), params[:keywords])}
+      else
+          projects_show = projects_temp.select {|value| search_all_words(value.send(params[:selectbox]).to_s, params[:keywords])}
+      end
+      if params[:page_no].nil?
+          page_to_show = 1
+      else
+          page_to_show = params[:page_no].to_i
+      end
+      projects = projects_show[(page_to_show-1)*OrbitHelper.page_data_count...page_to_show*OrbitHelper.page_data_count]
+      projects_total_pages = (projects_show.length/OrbitHelper.page_data_count.to_f).ceil
+    else
+      projects_total_pages = projects.total_pages
+    end
     project_list = []
     projects.each do |project|
        t = []
@@ -26,13 +54,15 @@ class PersonalProjectsController < ApplicationController
           t << {"value" => "<a href='#{OrbitHelper.url_to_show(project.to_param)}'>" + (project.send(fs) rescue "") + "</a>"}
         when "period"
           t << {"value" => (project.send("duration") rescue "")}
+        when "language"
+          t << {"value" => (t(project.send("language")) rescue "")}
         else
           t << {"value" => (project.send(fs) rescue "")}
         end
       end
       project_list << {"project" => t}
     end
-
+    choice_show = []
     headers = []
     fields_to_show.each do |fs|
       col = 2
@@ -41,12 +71,30 @@ class PersonalProjectsController < ApplicationController
         "head-title" => t("personal_project.#{fs}"),
         "col" => col
       }
+      choice_show << t("personal_project.#{fs}")
     end
+    choice_value = fields_to_show
+    choice_value.unshift("default")
+    choice_select=choice_value.map{|iter| iter==params[:selectbox] ? "selected" : ""}
+    choice_select=choice_select.map{|value| {"choice_select" => value}}
+    choice_value=choice_value.map{|value| {"choice_value" => value}}
+    choice_default = params[:locale]!='en' ? "——選取分類——" : "——select class——"
+    choice_show.unshift(choice_default)
+    choice_show=choice_show.map{|value| {"choice_show" => value}}
+    choice=choice_value.zip(choice_show,choice_select)
+    choice=choice.map{|value| value.inject:merge}
+    select_text = params[:locale]!='en' ? "搜尋類別:" : "search class:"
+    search_text = params[:locale]!='en' ? "關鍵字搜尋:" : "word to search:"
     {
       "projects" => project_list,
       "headers" => headers,
-      "extras" => {"widget-title" => t("module_name.personal_project")},
+      "extras" => {"widget-title" => t("module_name.personal_project"), 
-      "total_pages" => projects.total_pages
+                    "url" => "/"+params[:locale]+params[:url], 
+                    "select_text" => select_text, 
+                    "search_text" => search_text,
+                    "search_value" => params[:keywords] },
+      "total_pages" => projects_total_pages,
+      "choice" => choice
     }
   end