From 51eb98dc23c71176fc9b4574cb4bebeacf42a1b9 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 14 Aug 2019 13:12:48 +0800
Subject: [PATCH 01/25] Update personal_conferences_controller.rb

---
 .../personal_conferences_controller.rb        | 59 +++++++++++++++++--
 1 file changed, 55 insertions(+), 4 deletions(-)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index a3c2dc2..c214e7b 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -19,7 +19,41 @@ class PersonalConferencesController < ApplicationController
         "paper_title"
       ]
     end
-    
+    if params[:selectbox] !=nil
+      writing_conferences = WritingConference.where(:is_hidden=>false)
+      writing_conferences_count = writing_conferences.count
+      writing_conferences_temp = writing_conferences.take(writing_conferences_count).sort_by{ |tp| [-tp[:year].to_i,-tp[:publication_date].to_i] }
+      case params[:selectbox]
+      when "paper_title","default"
+        if  page.custom_string_field == "table"
+         writing_conferences_show = writing_conferences_temp.select {|value| value.paper_title.include? params[:keywords]}
+        else
+         writing_conferences_show = writing_conferences_temp.select {|value| value.create_link.include? params[:keywords]}
+        end
+      when "paper_levels"
+          writing_conferences_show = writing_conferences_temp.select {|value| value.conference_paper_levels.collect{|x| x.title}.join(', ').to_s.include? params[:keywords]}
+      when "paper_types"
+          writing_conferences_show = writing_conferences_temp.select {|value| value.conference_paper_levels.collect{|x| x.title}.join(', ').to_s.include? params[:keywords]}
+      when "period"
+          writing_conferences_show = writing_conferences_temp.select {|value| value.duration.include? params[:keywords]}
+      when "publication_date"
+          writing_conferences_show = writing_conferences_temp.select {|value| value.send("publication_date").strftime("%Y/%m").collect{|x| x.title}.join(', ').include? params[:keywords]}
+      when "author_type"
+          writing_conferences_show = writing_conferences_temp.select {|value| value.journal_paper_author_types.collect{|cat| cat.title}.join(", ").include? params[:keywords]}
+      else
+          writing_conferences_show = writing_conferences_temp.select {|value| value.send(params[:selectbox]).to_s.include? params[:keywords]}
+      end
+      if params[:page_no].nil?
+          page_to_show = 1
+      else
+          page_to_show = params[:page_no].to_i
+      end
+      writing_conferences_show_last = writing_conferences_show[(page_to_show-1)*OrbitHelper.page_data_count...page_to_show*OrbitHelper.page_data_count]
+      writing_conferences = writing_conferences_show_last
+      writing_conferences_total_pages = (writing_conferences_show.length/OrbitHelper.page_data_count.to_f).ceil
+    else
+      writing_conferences_total_pages = writing_conferences.total_pages
+    end
     writing_conference_list = []
     writing_conferences.each do |writing_conference|
       t = []
@@ -56,13 +90,30 @@ class PersonalConferencesController < ApplicationController
         "head-title" => t("personal_conference.#{fs}"),
         "col" => col
       }
+      choice_show << t("personal_conference.#{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:"
     {
       "writing_conferences" => writing_conference_list,
-      "extras" => { "widget-title" => t("module_name.personal_conference") },
+      "extras" => { "widget-title" => t("module_name.personal_conference"), 
+                    "url" => "/"+params[:locale]+params[:url], 
+                    "select_text" => select_text, 
+                    "search_text" => search_text,
+                    "search_value" => params[:keywords] },
       "headers" => headers,
-      "total_pages" => writing_conferences.total_pages
+      "total_pages" => writing_conferences_total_pages,
+      "choice" => choice
     }
   end
 

From c231e1b2d5deac31bd57c61f9dbe9ac70009d6d8 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 14 Aug 2019 13:22:39 +0800
Subject: [PATCH 02/25] Update personal_conferences_controller.rb

---
 app/controllers/personal_conferences_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index c214e7b..e6569ad 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -39,7 +39,7 @@ class PersonalConferencesController < ApplicationController
       when "publication_date"
           writing_conferences_show = writing_conferences_temp.select {|value| value.send("publication_date").strftime("%Y/%m").collect{|x| x.title}.join(', ').include? params[:keywords]}
       when "author_type"
-          writing_conferences_show = writing_conferences_temp.select {|value| value.journal_paper_author_types.collect{|cat| cat.title}.join(", ").include? params[:keywords]}
+          writing_conferences_show = writing_conferences_temp.select {|value| value.conference_author_types.collect{|cat| cat.title}.join(", ").include? params[:keywords]}
       else
           writing_conferences_show = writing_conferences_temp.select {|value| value.send(params[:selectbox]).to_s.include? params[:keywords]}
       end
@@ -81,7 +81,7 @@ class PersonalConferencesController < ApplicationController
       end
       writing_conference_list << {"cps" => t}
     end
-
+    choice_show = []
     headers = []
     fields_to_show.each do |fs|
       col = 2

From 87a65a93fa630a470675a6cf509169222de5a4ab Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 14 Aug 2019 14:14:53 +0800
Subject: [PATCH 03/25] Update personal_conferences_controller.rb

---
 app/controllers/personal_conferences_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index e6569ad..769f429 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -33,7 +33,7 @@ class PersonalConferencesController < ApplicationController
       when "paper_levels"
           writing_conferences_show = writing_conferences_temp.select {|value| value.conference_paper_levels.collect{|x| x.title}.join(', ').to_s.include? params[:keywords]}
       when "paper_types"
-          writing_conferences_show = writing_conferences_temp.select {|value| value.conference_paper_levels.collect{|x| x.title}.join(', ').to_s.include? params[:keywords]}
+          writing_conferences_show = writing_conferences_temp.select {|value| value.conference_paper_types.collect{|x| x.title}.join(', ').to_s.include? params[:keywords]}
       when "period"
           writing_conferences_show = writing_conferences_temp.select {|value| value.duration.include? params[:keywords]}
       when "publication_date"
@@ -68,7 +68,7 @@ class PersonalConferencesController < ApplicationController
         when "paper_levels"
           t << {"value" => ( !writing_conference.conference_paper_levels.blank? ? "(#{writing_conference.conference_paper_levels.collect{|x| x.title}.join(', ')})" : nil)} 
         when "paper_types"
-          t << {"value" => ( !writing_conference.conference_paper_levels.blank? ? "(#{writing_conference.conference_paper_levels.collect{|x| x.title}.join(', ')})" : nil)} 
+          t << {"value" => ( !writing_conference.conference_paper_types.blank? ? "(#{writing_conference.conference_paper_types.collect{|x| x.title}.join(', ')})" : nil)} 
         when "publication_date"
           t << {"value" => (writing_conference.send(fs).strftime("%Y/%m") rescue "")}
         when "author_type"

From e3c84bf11a93eeb854d0c1647cbc3f9bd5dfe6c1 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 14 Aug 2019 14:17:48 +0800
Subject: [PATCH 04/25] Update personal_conferences_controller.rb

---
 app/controllers/personal_conferences_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index 769f429..c4756bd 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -66,7 +66,7 @@ class PersonalConferencesController < ApplicationController
            t << {"value" => "<a href='#{OrbitHelper.url_to_show(writing_conference.to_param)}'>#{writing_conference.create_link}</a>"}
           end
         when "paper_levels"
-          t << {"value" => ( !writing_conference.conference_paper_levels.blank? ? "(#{writing_conference.conference_paper_levels.collect{|x| x.title}.join(', ')})" : nil)} 
+          t << {"value" =>  "(#{writing_conference.conference_paper_levels.collect{|x| x.title}.join(', ')})"} 
         when "paper_types"
           t << {"value" => ( !writing_conference.conference_paper_types.blank? ? "(#{writing_conference.conference_paper_types.collect{|x| x.title}.join(', ')})" : nil)} 
         when "publication_date"

From 8f03e0aef1df902fd2fb119352607fd8bac3e5c8 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 14 Aug 2019 14:19:50 +0800
Subject: [PATCH 05/25] Update personal_conferences_controller.rb

---
 app/controllers/personal_conferences_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index c4756bd..c670431 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -66,7 +66,7 @@ class PersonalConferencesController < ApplicationController
            t << {"value" => "<a href='#{OrbitHelper.url_to_show(writing_conference.to_param)}'>#{writing_conference.create_link}</a>"}
           end
         when "paper_levels"
-          t << {"value" =>  "(#{writing_conference.conference_paper_levels.collect{|x| x.title}.join(', ')})"} 
+          t << {"value" => ( !writing_conference.conference_paper_levels.blank? ? "(#{writing_conference.conference_paper_levels.collect{|x| x.title}.join(', ')})" : nil)
         when "paper_types"
           t << {"value" => ( !writing_conference.conference_paper_types.blank? ? "(#{writing_conference.conference_paper_types.collect{|x| x.title}.join(', ')})" : nil)} 
         when "publication_date"

From 62517a8ef957b8126cdb5ef7b99b7b7373f1a9d5 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 14 Aug 2019 14:21:31 +0800
Subject: [PATCH 06/25] Update personal_conferences_controller.rb

---
 app/controllers/personal_conferences_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index c670431..45efb52 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -66,7 +66,7 @@ class PersonalConferencesController < ApplicationController
            t << {"value" => "<a href='#{OrbitHelper.url_to_show(writing_conference.to_param)}'>#{writing_conference.create_link}</a>"}
           end
         when "paper_levels"
-          t << {"value" => ( !writing_conference.conference_paper_levels.blank? ? "(#{writing_conference.conference_paper_levels.collect{|x| x.title}.join(', ')})" : nil)
+          t << {"value" => ( !writing_conference.conference_paper_levels.blank? ? "(#{writing_conference.conference_paper_levels.collect{|x| x.title}.join(', ')})" : nil)}
         when "paper_types"
           t << {"value" => ( !writing_conference.conference_paper_types.blank? ? "(#{writing_conference.conference_paper_types.collect{|x| x.title}.join(', ')})" : nil)} 
         when "publication_date"

From c4b89ae9c90e0cec73e66808c74b192b539c7cb3 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 14 Aug 2019 16:29:08 +0800
Subject: [PATCH 07/25] Update personal_conferences_controller.rb add language
 translation

---
 app/controllers/personal_conferences_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index 45efb52..a8ea973 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -75,6 +75,8 @@ class PersonalConferencesController < ApplicationController
           t << {"value" => (writing_conference.conference_author_types.collect{|cat| cat.title}.join(", ") rescue "")}
         when "period"
           t << {"value" => writing_conference.duration}
+        when "language"
+          t << {"value" => (!writing_conference.language.nil? ? t("#{writing_conference.language}") : "")}
         else
           t << {"value" => writing_conference.send(fs)}
         end

From 9c4580410f2abc4301f45db6bd2088e8fbd4bcb4 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 14 Aug 2019 16:30:01 +0800
Subject: [PATCH 08/25] Update personal_conferences_controller.rb

---
 app/controllers/personal_conferences_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index a8ea973..c32d2b8 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -40,6 +40,8 @@ class PersonalConferencesController < ApplicationController
           writing_conferences_show = writing_conferences_temp.select {|value| value.send("publication_date").strftime("%Y/%m").collect{|x| x.title}.join(', ').include? params[:keywords]}
       when "author_type"
           writing_conferences_show = writing_conferences_temp.select {|value| value.conference_author_types.collect{|cat| cat.title}.join(", ").include? params[:keywords]}
+      when "language"
+          writing_conferences_show = writing_conferences_temp.select {|value| (!value.language.nil? ? t("#{value.language}") : "").include? params[:keywords]}
       else
           writing_conferences_show = writing_conferences_temp.select {|value| value.send(params[:selectbox]).to_s.include? params[:keywords]}
       end

From a3edee4270dd6054045bc4d7ad3cacbcb3b9ad76 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 14 Aug 2019 17:19:44 +0800
Subject: [PATCH 09/25] Update personal_conferences_controller.rb remove
 personal_conference.

---
 app/controllers/personal_conferences_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index c32d2b8..9cf82f1 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -174,7 +174,7 @@ class PersonalConferencesController < ApplicationController
       "isi_number" ,
       "language" 
     ]
-    @fields_to_show = @fields_to_show.map{|fs| [t("personal_conference.#{fs}"), fs]}
+    @fields_to_show = @fields_to_show.map{|fs| [t("#{fs}"), fs]}
     @default_fields_to_show = [
       "authors",
       "paper_title",

From 3238a8a723c3c0185fa049fb456fabe84d983f34 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 14 Aug 2019 17:22:25 +0800
Subject: [PATCH 10/25] Update personal_conferences_controller.rb

---
 app/controllers/personal_conferences_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index 9cf82f1..4e92345 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -174,7 +174,7 @@ class PersonalConferencesController < ApplicationController
       "isi_number" ,
       "language" 
     ]
-    @fields_to_show = @fields_to_show.map{|fs| [t("#{fs}"), fs]}
+    @fields_to_show = @fields_to_show.map{|fs| fs!="period" ? [t(personal_conference."#{fs}"), fs] : [t("#{fs}"), fs]}
     @default_fields_to_show = [
       "authors",
       "paper_title",

From c9c573fa55175d077bf5ca1d9f4cb0886d8e668c Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 14 Aug 2019 17:24:01 +0800
Subject: [PATCH 11/25] Update personal_conferences_controller.rb

---
 app/controllers/personal_conferences_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index 4e92345..23b56cc 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -174,7 +174,7 @@ class PersonalConferencesController < ApplicationController
       "isi_number" ,
       "language" 
     ]
-    @fields_to_show = @fields_to_show.map{|fs| fs!="period" ? [t(personal_conference."#{fs}"), fs] : [t("#{fs}"), fs]}
+    @fields_to_show = @fields_to_show.map{|fs| (fs!="period" ? [t(personal_conference."#{fs}"), fs] : [t("#{fs}"), fs])}
     @default_fields_to_show = [
       "authors",
       "paper_title",

From 1744cc7cb1eb9376be3f70e3fe9ba052083b1c25 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 14 Aug 2019 17:29:13 +0800
Subject: [PATCH 12/25] Update personal_conferences_controller.rb

---
 app/controllers/personal_conferences_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index 23b56cc..610f56e 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -174,7 +174,7 @@ class PersonalConferencesController < ApplicationController
       "isi_number" ,
       "language" 
     ]
-    @fields_to_show = @fields_to_show.map{|fs| (fs!="period" ? [t(personal_conference."#{fs}"), fs] : [t("#{fs}"), fs])}
+    @fields_to_show = @fields_to_show.map{|fs| (fs!="period" ? [t(personal_conference."#{fs}"), fs] : [I18n.t(fs), fs])}
     @default_fields_to_show = [
       "authors",
       "paper_title",

From 017652eb6a4125381852f8756fa07a155fe389d2 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 14 Aug 2019 17:30:44 +0800
Subject: [PATCH 13/25] Update personal_conferences_controller.rb

---
 app/controllers/personal_conferences_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index 610f56e..f1c8280 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -174,7 +174,7 @@ class PersonalConferencesController < ApplicationController
       "isi_number" ,
       "language" 
     ]
-    @fields_to_show = @fields_to_show.map{|fs| (fs!="period" ? [t(personal_conference."#{fs}"), fs] : [I18n.t(fs), fs])}
+    @fields_to_show = @fields_to_show.map{|fs| (fs!="period" ? [t(personal_conference."#{fs}"), fs] : ["peroid", fs])}
     @default_fields_to_show = [
       "authors",
       "paper_title",

From 413aea01a49359b0bac5c10a69ebd58ffaf37787 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 14 Aug 2019 17:32:39 +0800
Subject: [PATCH 14/25] Update personal_conferences_controller.rb

---
 app/controllers/personal_conferences_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index f1c8280..216556e 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -174,7 +174,7 @@ class PersonalConferencesController < ApplicationController
       "isi_number" ,
       "language" 
     ]
-    @fields_to_show = @fields_to_show.map{|fs| (fs!="period" ? [t(personal_conference."#{fs}"), fs] : ["peroid", fs])}
+    @fields_to_show = @fields_to_show.map{|fs| (fs.to_s!="period" ? [t(personal_conference."#{fs}"), fs] : ["peroid", fs])}
     @default_fields_to_show = [
       "authors",
       "paper_title",

From dd13f85011a58bf70b910a24683531a699659291 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 14 Aug 2019 17:34:26 +0800
Subject: [PATCH 15/25] Update personal_conferences_controller.rb

---
 app/controllers/personal_conferences_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index 216556e..e18380c 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -174,7 +174,7 @@ class PersonalConferencesController < ApplicationController
       "isi_number" ,
       "language" 
     ]
-    @fields_to_show = @fields_to_show.map{|fs| (fs.to_s!="period" ? [t(personal_conference."#{fs}"), fs] : ["peroid", fs])}
+    @fields_to_show = @fields_to_show.map{|fs| [t(personal_conference."#{fs}"), fs] }
     @default_fields_to_show = [
       "authors",
       "paper_title",

From df5f0f702cd77cbad216e04314362ea2b4d48b69 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 14 Aug 2019 17:35:56 +0800
Subject: [PATCH 16/25] Update personal_conferences_controller.rb

---
 app/controllers/personal_conferences_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index e18380c..c283f41 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -174,7 +174,7 @@ class PersonalConferencesController < ApplicationController
       "isi_number" ,
       "language" 
     ]
-    @fields_to_show = @fields_to_show.map{|fs| [t(personal_conference."#{fs}"), fs] }
+    @fields_to_show = @fields_to_show.map{|fs| (fs.to_s!="period" ? [t("personal_conference.#{fs}"), fs] : [t(fs), fs]) }
     @default_fields_to_show = [
       "authors",
       "paper_title",

From 0eaaabaf64ecd63ef88e2efdf80cf4d8a5525432 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 14 Aug 2019 17:50:27 +0800
Subject: [PATCH 17/25] Update en.yml add period translation

---
 config/locales/en.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index cdc5133..196285b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -13,6 +13,7 @@ en:
     paper_levels : "Paper Level"
     conference_title : "Conference Name"
     conference_time: "Conference Time"
+    period : "Peroid"
     period_start_date : "Start Date"
     period_end_date : "End Date"
     duration: "Duration"

From c7eb3a2a931bf7bcf64ac06d5da4887bec62b17b Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 14 Aug 2019 17:51:30 +0800
Subject: [PATCH 18/25] Update zh_tw.yml

---
 config/locales/zh_tw.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 8c45d0b..f2cd7c4 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -12,6 +12,7 @@ zh_tw:
     paper_levels: "論文等級"
     conference_title : "會議名稱"
     conference_time: "會議時間"
+    period : "期間"
     period_start_date : "會議開始時間"
     period_end_date : "會議結束時間"
     duration: "期間"

From 84cede56c39b40af6a9883873345284d907bd552 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 14 Aug 2019 17:52:07 +0800
Subject: [PATCH 19/25] Update personal_conferences_controller.rb

---
 app/controllers/personal_conferences_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index c283f41..d086133 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -174,7 +174,7 @@ class PersonalConferencesController < ApplicationController
       "isi_number" ,
       "language" 
     ]
-    @fields_to_show = @fields_to_show.map{|fs| (fs.to_s!="period" ? [t("personal_conference.#{fs}"), fs] : [t(fs), fs]) }
+    @fields_to_show = @fields_to_show.map{|fs| [t("personal_conference.#{fs}"), fs] }
     @default_fields_to_show = [
       "authors",
       "paper_title",

From fbf64330369c8687db0addaed03849ff5b7b18f0 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Wed, 14 Aug 2019 17:58:58 +0800
Subject: [PATCH 20/25] Update zh_tw.yml

---
 config/locales/zh_tw.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index f2cd7c4..9a1e340 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -12,7 +12,7 @@ zh_tw:
     paper_levels: "論文等級"
     conference_title : "會議名稱"
     conference_time: "會議時間"
-    period : "期間"
+    period : "會議期間"
     period_start_date : "會議開始時間"
     period_end_date : "會議結束時間"
     duration: "期間"

From 609a1c83ba93bb4570f1db1a35a31a1006de914b Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Thu, 15 Aug 2019 09:47:16 +0800
Subject: [PATCH 21/25] Update personal_conferences_controller.rb

---
 .../personal_conferences_controller.rb        | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index d086133..50536be 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -1,4 +1,9 @@
 class PersonalConferencesController < 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
     writing_conferences = WritingConference.where(:is_hidden=>false).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(OrbitHelper.page_data_count)
@@ -26,24 +31,24 @@ class PersonalConferencesController < ApplicationController
       case params[:selectbox]
       when "paper_title","default"
         if  page.custom_string_field == "table"
-         writing_conferences_show = writing_conferences_temp.select {|value| value.paper_title.include? params[:keywords]}
+         writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.paper_title, params[:keywords])}
         else
-         writing_conferences_show = writing_conferences_temp.select {|value| value.create_link.include? params[:keywords]}
+         writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.create_link, params[:keywords])}
         end
       when "paper_levels"
-          writing_conferences_show = writing_conferences_temp.select {|value| value.conference_paper_levels.collect{|x| x.title}.join(', ').to_s.include? params[:keywords]}
+          writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.conference_paper_levels.collect{|x| x.title}.join(', ').to_s, params[:keywords])}
       when "paper_types"
-          writing_conferences_show = writing_conferences_temp.select {|value| value.conference_paper_types.collect{|x| x.title}.join(', ').to_s.include? params[:keywords]}
+          writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.conference_paper_types.collect{|x| x.title}.join(', ').to_s, params[:keywords])}
       when "period"
-          writing_conferences_show = writing_conferences_temp.select {|value| value.duration.include? params[:keywords]}
+          writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.duration.include? params[:keywords]}
       when "publication_date"
-          writing_conferences_show = writing_conferences_temp.select {|value| value.send("publication_date").strftime("%Y/%m").collect{|x| x.title}.join(', ').include? params[:keywords]}
+          writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.send("publication_date").strftime("%Y/%m").collect{|x| x.title}.join(', '), params[:keywords])}
       when "author_type"
-          writing_conferences_show = writing_conferences_temp.select {|value| value.conference_author_types.collect{|cat| cat.title}.join(", ").include? params[:keywords]}
+          writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.conference_author_types.collect{|cat| cat.title}.join(", "), params[:keywords])}
       when "language"
-          writing_conferences_show = writing_conferences_temp.select {|value| (!value.language.nil? ? t("#{value.language}") : "").include? params[:keywords]}
+          writing_conferences_show = writing_conferences_temp.select {|value| search_all_words((!value.language.nil? ? t("#{value.language}") : ""), params[:keywords])}
       else
-          writing_conferences_show = writing_conferences_temp.select {|value| value.send(params[:selectbox]).to_s.include? params[:keywords]}
+          writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.send(params[:selectbox]).to_s, params[:keywords])}
       end
       if params[:page_no].nil?
           page_to_show = 1

From 7b52a160a2d3328c391ac201314d7e9bdde4bd42 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Thu, 15 Aug 2019 09:50:35 +0800
Subject: [PATCH 22/25] =?UTF-8?q?Update=20personal=5Fconferences=5Fcontrol?=
 =?UTF-8?q?ler.rb=20=E6=90=9C=E5=B0=8B=E5=8A=9F=E8=83=BD=E6=94=B9=E7=82=BA?=
 =?UTF-8?q?=E5=8F=AF=E7=94=A8=E7=A9=BA=E6=A0=BC=E5=8D=80=E5=88=86=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8C=E8=A6=81=E6=90=9C=E5=B0=8B=E7=9A=84=E5=AD=97=E4=B8=94?=
 =?UTF-8?q?=E4=B8=8D=E5=88=86=E5=A4=A7=E5=B0=8F=E5=AF=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/personal_conferences_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index 50536be..2043c41 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -40,7 +40,7 @@ class PersonalConferencesController < ApplicationController
       when "paper_types"
           writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.conference_paper_types.collect{|x| x.title}.join(', ').to_s, params[:keywords])}
       when "period"
-          writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.duration.include? params[:keywords]}
+          writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.duration, params[:keywords])}
       when "publication_date"
           writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.send("publication_date").strftime("%Y/%m").collect{|x| x.title}.join(', '), params[:keywords])}
       when "author_type"

From 1d60d68aed4e609af7d51c73aaf408b22e4c73ed Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Thu, 15 Aug 2019 10:25:06 +0800
Subject: [PATCH 23/25] =?UTF-8?q?Update=20personal=5Fconferences=5Fcontrol?=
 =?UTF-8?q?ler.rb=20=E5=88=AA=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/personal_conferences_controller.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index 2043c41..bae5aa4 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -25,9 +25,7 @@ class PersonalConferencesController < ApplicationController
       ]
     end
     if params[:selectbox] !=nil
-      writing_conferences = WritingConference.where(:is_hidden=>false)
-      writing_conferences_count = writing_conferences.count
-      writing_conferences_temp = writing_conferences.take(writing_conferences_count).sort_by{ |tp| [-tp[:year].to_i,-tp[:publication_date].to_i] }
+      writing_conferences_temp = WritingConference.where(:is_hidden=>false).sort_by{ |tp| [-tp[:year].to_i,-tp[:publication_date].to_i] }
       case params[:selectbox]
       when "paper_title","default"
         if  page.custom_string_field == "table"
@@ -42,7 +40,7 @@ class PersonalConferencesController < ApplicationController
       when "period"
           writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.duration, params[:keywords])}
       when "publication_date"
-          writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.send("publication_date").strftime("%Y/%m").collect{|x| x.title}.join(', '), params[:keywords])}
+          writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.send("publication_date").strftime("%Y/%m/%d").collect{|x| x.title}.join(', '), params[:keywords])}
       when "author_type"
           writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.conference_author_types.collect{|cat| cat.title}.join(", "), params[:keywords])}
       when "language"
@@ -55,8 +53,7 @@ class PersonalConferencesController < ApplicationController
       else
           page_to_show = params[:page_no].to_i
       end
-      writing_conferences_show_last = writing_conferences_show[(page_to_show-1)*OrbitHelper.page_data_count...page_to_show*OrbitHelper.page_data_count]
-      writing_conferences = writing_conferences_show_last
+      writing_conferences = writing_conferences_show[(page_to_show-1)*OrbitHelper.page_data_count...page_to_show*OrbitHelper.page_data_count]
       writing_conferences_total_pages = (writing_conferences_show.length/OrbitHelper.page_data_count.to_f).ceil
     else
       writing_conferences_total_pages = writing_conferences.total_pages

From 8b0a5eda8bbebbe2dae718917dfda97d5cfe865e Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Thu, 15 Aug 2019 10:33:32 +0800
Subject: [PATCH 24/25] Update personal_conferences_controller.rb

---
 app/controllers/personal_conferences_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index bae5aa4..f175f13 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -40,7 +40,7 @@ class PersonalConferencesController < ApplicationController
       when "period"
           writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.duration, params[:keywords])}
       when "publication_date"
-          writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.send("publication_date").strftime("%Y/%m/%d").collect{|x| x.title}.join(', '), params[:keywords])}
+          writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.send("publication_date").strftime("%Y/%m/%d"), params[:keywords])}
       when "author_type"
           writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.conference_author_types.collect{|cat| cat.title}.join(", "), params[:keywords])}
       when "language"

From 3c625279291331887c2c05e36e3d3809f1a734f4 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Thu, 15 Aug 2019 10:46:07 +0800
Subject: [PATCH 25/25] Update personal_conferences_controller.rb

---
 app/controllers/personal_conferences_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/personal_conferences_controller.rb b/app/controllers/personal_conferences_controller.rb
index f175f13..362dacd 100644
--- a/app/controllers/personal_conferences_controller.rb
+++ b/app/controllers/personal_conferences_controller.rb
@@ -40,7 +40,7 @@ class PersonalConferencesController < ApplicationController
       when "period"
           writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.duration, params[:keywords])}
       when "publication_date"
-          writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.send("publication_date").strftime("%Y/%m/%d"), params[:keywords])}
+          writing_conferences_show = writing_conferences_temp.select {|value| search_all_words((value.send("publication_date").strftime("%Y/%m/%d") rescue ""), params[:keywords])}
       when "author_type"
           writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.conference_author_types.collect{|cat| cat.title}.join(", "), params[:keywords])}
       when "language"