saurabh
/
personal-conference
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master' 

Master

I add search function and fix some translation error

See merge request !2
This commit is contained in:
wmcheng 2019-08-16 12:51:46 +08:00
parent aa83eaf309 3c62527929
commit daec017df3
3 changed files with 67 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
app/controllers/personal_conferences_controller.rb
View File

@ -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)
@ -19,7 +24,40 @@ class PersonalConferencesController < ApplicationController
"paper_title"
]
end
if params[:selectbox] !=nil
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"
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| search_all_words(value.create_link, params[:keywords])}
end
when "paper_levels"
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| 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, params[:keywords])}
when "publication_date"
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"
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| 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
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
end
writing_conference_list = []
writing_conferences.each do |writing_conference|
t = []
@ -32,22 +70,24 @@ 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_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"
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
end
writing_conference_list << {"cps" => t}
end
choice_show = []
headers = []
fields_to_show.each do |fs|
col = 2
@ -56,13 +96,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
@ -119,7 +176,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("personal_conference.#{fs}"), fs] }
@default_fields_to_show = [
"authors",
"paper_title",

1
config/locales/en.yml
View File

@ -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"

1
config/locales/zh_tw.yml
View File

@ -12,6 +12,7 @@ zh_tw:
paper_levels: "論文等級"
conference_title : "會議名稱"
conference_time: "會議時間"
period : "會議期間"
period_start_date : "會議開始時間"
period_end_date : "會議結束時間"
duration: "期間"