chiu
/
personal-book
1
0
Fork 0
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 !3
This commit is contained in:
Allen Cheng 2019-08-16 13:04:03 +08:00
parent 91f2c9c9fd 3d6f57086b
commit 44449e9188
2 changed files with 64 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
app/controllers/personal_books_controller.rb
View File

@ -1,4 +1,9 @@
class PersonalBooksController < 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
books = Book.where(:is_hidden=>false).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(OrbitHelper.page_data_count)
@ -20,7 +25,39 @@ class PersonalBooksController < ApplicationController
"book_title"
]
end
if params[:selectbox] !=nil
books_temp = Book.where(:is_hidden=>false).sort_by{ |tp| [-tp[:year].to_i,-tp[:publication_date].to_i] }
case params[:selectbox]
when "book_title", "extracted_chapters", "default"
if params[:selectbox] == "default"
search_temp = "book_title"
else
search_temp = params[:selectbox]
end
if page.custom_string_field == "table"
books_show = books_temp.select {|value| search_all_words(value.send(search_temp), params[:keywords])}
else
books_show = books_temp.select {|value| search_all_words(value.create_link, params[:keywords])}
end
when "publish_date", "publication_date"
books_show = books_temp.select {|value| search_all_words((value.send(params[:selectbox]).strftime("%Y/%m/%d") rescue ""), params[:keywords])}
when "author_type"
books_show = books_temp.select {|value| search_all_words(value.book_author_types.collect{|bat| bat.title}.join(", "), params[:keywords])}
when "language"
books_show = books_temp.select {|value| search_all_words((!value.language.nil? ? t("#{value.language}") : ""), params[:keywords])}
else
books_show = books_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
books = books_show[(page_to_show-1)*OrbitHelper.page_data_count...page_to_show*OrbitHelper.page_data_count]
books_total_pages = (books_show.length/OrbitHelper.page_data_count.to_f).ceil
else
books_total_pages = books.total_pages
end
book_list = []
books.each do |book|
t = []
@ -33,23 +70,18 @@ class PersonalBooksController < ApplicationController
t << {"value" => "<a href='#{OrbitHelper.url_to_show(book.to_param)}'>#{book.create_link}</a>"}
end
when "publish_date", "publication_date"
pd = ""
if !book.publication_date.nil?
pd = book.publication_date.strftime("%Y-%m-%d").split('-')
pd = pd[0]+"/"+pd[1]
end
t << {"value" => pd}
t << {"value" => (!book.send(fs).nil? ? book.send(fs).strftime('%Y/%m') : "" rescue "")}
when "author_type"
t << {"value" => (book.book_author_types.collect{|bat| bat.title}.join(", ") rescue "")}
when "language"
t << {"value" => (I18n.t("personal_book.#{book.language}") if !book.language.nil? rescue "")}
t << {"value" => (!book.language.nil? ? t("#{book.language}") : "")}
else
t << {"value" => book.send(fs)}
end
end
book_list << {"books" => t}
end
choice_show = []
headers = []
fields_to_show.each do |fs|
col = 2
@ -58,12 +90,30 @@ class PersonalBooksController < ApplicationController
"head-title" => t("personal_book.#{fs}"),
"col" => col
}
choice_show << t("personal_book.#{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:"
{
"book_list" => book_list,
"extras" => {"widget-title" => t("module_name.book")},
"extras" => {"widget-title" => t("module_name.book"),
"url" => "/"+params[:locale]+params[:url],
"select_text" => select_text,
"search_text" => search_text,
"search_value" => params[:keywords] },
"headers" => headers,
"total_pages" => books.total_pages
"total_pages" => books_total_pages,
"choice" => choice
}
end

5
app/models/book.rb
View File

@ -118,7 +118,7 @@ class Book
when "author_type"
pd_data << {"data_title" => (p.book_author_types.collect{|bat| bat.title}.join(", ") rescue "")}
when "language"
pd_data << {"data_title" => (I18n.t("personal_book.#{p.language}") if !p.language.nil? rescue "")}
pd_data << {"data_title" => (I18n.t("#{p.language}") if !p.language.nil? rescue "")}
else
pd_data << { "data_title" => p.send(t) }
end
@ -164,8 +164,7 @@ class Book
end
value = value.join(" / ")
when "language"
value = I18n.t(self.language) if !self.language.nil? rescue ""
# value = I18n.t("personal_book.#{self.language}") if !self.language.nil? rescue ""
value = I18n.t("#{self.language}") if !self.language.nil? rescue ""
when "publish_date", "publication_date"
value = self.send(field).to_date.strftime("%Y-%m-%d") rescue nil
when "file"