Merge branch 'master' into 'master'

Master

add update modules feature and fix error

See merge request !4
This commit is contained in:
wmcheng 2019-08-22 00:00:02 +08:00
commit 0e2ba7ab1b
13 changed files with 233 additions and 129 deletions

View File

@ -1,60 +1,56 @@
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)
page = Page.where(:page_id => params[:page_id]).first rescue nil
page_data_count = OrbitHelper.page_data_count
books = Book.where(is_hidden: false).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(page_data_count)
page = Page.where(page_id: params[:page_id]).first rescue nil
if page.custom_string_field == "table"
if page.custom_string_field == 'table'
fields_to_show = page.custom_array_field rescue []
fields_to_show = [
"authors",
"book_title",
"extracted_chapters",
"publisher",
"isbn",
"publish_date"
] if fields_to_show.blank?
if fields_to_show.blank?
fields_to_show = %w[
authors
book_title
extracted_chapters
publisher
isbn
publish_date
]
end
else
fields_to_show = [
"year",
"book_title"
fields_to_show = %w[
year
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] }
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"
when 'book_title', 'extracted_chapters', 'default'
search_temp = if params[:selectbox] == 'default'
'book_title'
else
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
search_temp = params[:selectbox]
books_show = books_temp.select { |value| search_all_words(value.create_link, params[:keywords]) }
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])}
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(&:title).join(', '), params[:keywords]) }
when 'book_paper_type'
books_show = books_temp.select { |value| search_all_words((value.book_type.title rescue ''), params[:keywords]) }
when 'language'
books_show = books_temp.select { |value| search_all_words((!value.language.nil? ? t(value.language.to_s) : ''), params[:keywords]) }
else
books_show = books_temp.select {|value| search_all_words(value.send(params[:selectbox]).to_s, params[:keywords])}
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
page_to_show = params[:page_no].nil? ? 1 : params[:page_no].to_i
books = books_show[(page_to_show - 1) * page_data_count...page_to_show * page_data_count]
books_total_pages = (books_show.length / page_data_count.to_f).ceil
else
books_total_pages = books.total_pages
end
@ -63,120 +59,130 @@ class PersonalBooksController < ApplicationController
t = []
fields_to_show.each do |fs|
case fs
when "book_title", "extracted_chapters"
if page.custom_string_field == "table"
t << {"value" => "<a href='#{OrbitHelper.url_to_show(book.to_param)}'>#{book.send(fs)}</a>"}
else
t << {"value" => "<a href='#{OrbitHelper.url_to_show(book.to_param)}'>#{book.create_link}</a>"}
end
when "publish_date", "publication_date"
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" => (!book.language.nil? ? t("#{book.language}") : "")}
when 'book_title', 'extracted_chapters'
t << if page.custom_string_field == 'table'
{ 'value' => "<a href='#{OrbitHelper.url_to_show(book.to_param)}'>#{book.send(fs)}</a>" }
else
{ 'value' => "<a href='#{OrbitHelper.url_to_show(book.to_param)}'>#{book.create_link}</a>" }
end
when 'publish_date', 'publication_date'
t << { 'value' => (!book.send(fs).nil? ? book.send(fs).strftime('%Y/%m') : '' rescue '') }
when 'author_type'
t << { 'value' => (book.book_author_types.collect(&:title).join(', ') rescue '') }
when 'language'
t << { 'value' => (!book.language.nil? ? t(book.language.to_s) : '') }
when 'book_paper_type'
t << { 'value' => (book.book_type.title rescue '') }
else
t << {"value" => book.send(fs)}
t << { 'value' => (book.send(fs) rescue '') }
end
end
book_list << {"books" => t}
book_list << { 'books' => t }
end
choice_show = []
headers = []
fields_to_show.each do |fs|
col = 2
col = 3 if fs == "paper_title"
col = 3 if fs == 'paper_title'
headers << {
"head-title" => t("personal_book.#{fs}"),
"col" => col
'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_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 = t('personal_book.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:"
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 = t('personal_book.search_class')
search_text = t('personal_book.word_to_search')
{
"book_list" => book_list,
"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,
"choice" => choice
'book_list' => book_list,
'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,
'choice' => choice
}
end
def show
params = OrbitHelper.params
plugin = Book.where(:is_hidden=>false).find_by(uid: params[:uid])
fields_to_show = [
"year",
"book_title",
"authors",
"book_paper_type",
"extracted_chapters",
"publisher",
"publish_date",
"pages",
"editor",
"author_type",
"number_of_authors",
"isbn",
"url",
"publication_date",
"language"
plugin = Book.where(is_hidden: false).find_by(uid: params[:uid])
fields_to_show = %w[
year
book_title
authors
book_paper_type
extracted_chapters
publisher
publish_date
pages
editor
author_type
number_of_authors
isbn
url
file
publication_date
language
]
{"plugin_datas"=>plugin.get_plugin_data(fields_to_show)}
{ 'plugin_datas' => plugin.get_plugin_data(fields_to_show) }
end
def get_fields_for_index
@page = Page.find(params[:page_id]) rescue nil
@fields_to_show = [
"year",
"book_title",
"authors",
"book_paper_type",
"extracted_chapters",
"publisher",
"publish_date",
"pages",
"editor",
"author_type",
"number_of_authors",
"isbn",
"url",
"file",
"publication_date",
"language"
@fields_to_show = %w[
year
book_title
authors
book_paper_type
extracted_chapters
publisher
publish_date
pages
editor
author_type
number_of_authors
isbn
url
publication_date
language
]
@fields_to_show = @fields_to_show.map{|fs| [t("personal_book.#{fs}"), fs]}
@default_fields_to_show = [
"authors",
"book_title",
"extracted_chapters",
"publisher",
"isbn",
"publish_date"
@fields_to_show = @fields_to_show.map { |fs| [t("personal_book.#{fs}"), fs] }
@default_fields_to_show = %w[
authors
book_title
extracted_chapters
publisher
isbn
publish_date
]
render :layout => false
render layout: false
end
def save_index_fields
page = Page.find(params[:page_id]) rescue nil
page.custom_array_field = params[:keys]
page.save
render :json => {"success" => true}.to_json
render json: { 'success' => true }.to_json
end
private
def search_all_words(target, word)
target = target.upcase
words = word.upcase.split(' ')
words.select { |value| target.include? value } == words
end
end

View File

@ -171,8 +171,8 @@ class Book
files = []
self.book_files.each do |book_file|
url = book_file.member_book_file.url
title = (book_file.title.blank? ? File.basename(book_file.member_book_file.path) : book_file.title)
files << "<li><a href='#{url}'' target='_blank'>#{title}</li>"
title = ((book_file.title.blank? ? File.basename(book_file.member_book_file.path) : book_file.title) rescue "")
files << (url.nil? ? "" : "<li><a href='#{url}'' target='_blank'>#{title}</li>")
end
value = files.join("")
else

View File

@ -4,6 +4,9 @@ en:
book_paper: "Book / Book Chapter"
personal_book: "Book / Book Chapter"
personal_book:
select_class: "——select class——"
search_class: "search class:"
word_to_search: "word to search:"
paper_title : "Paper Title"
book_title : "Book Title"
extracted_chapters : "Extracted Chapters"

View File

@ -4,6 +4,9 @@ zh_tw:
book_paper: "專書 / 專書章節"
personal_book : "專書 / 專書章節"
personal_book:
select_class: "——選取分類——"
search_class: "搜尋類別:"
word_to_search: "關鍵字搜尋:"
paper_title : "論文名稱"
book_title : "書名"
extracted_chapters : "部份章節"

0
modules/.gitkeep Normal file
View File

View File

View File

@ -0,0 +1,14 @@
<table class="table table-hover table-striped journal-papers-index">
<caption><h1>{{widget-title}}</h1></caption>
<thead>
<tr data-level="0" data-list="headers">
<th class="col-md-{{col}}">{{head-title}}</th>
</tr>
</thead>
<tbody data-level="0" data-list="book_list">
<tr data-level="1" data-list="books">
<td>{{value}}</td>
</tr>
</tbody>
</table>
{{pagination_goes_here}}

View File

@ -0,0 +1,37 @@
<script type="text/javascript">
$( ".selectbox" ).ready(function() {
var option_len = $(".search-widget option").length
for (var i=0;i<option_len;i++){
if($(".search-widget option").eq(i).data('selected')=="selected"){
$(".search-widget option").eq(i).attr('selected','selected')
}
}
});
</script>
<h3>{{widget-title}}</h3>
<div class="search-widget">
<form action="{{url}}" method="get">
{{select_text}}
<select class="selectbox" name="selectbox" data-level="0" data-list="choice">
<option value={{choice_value}} data-selected='{{choice_select}}' >
{{choice_show}}</option>
</select>
{{search_text}}
<input name="keywords" placeholder="Keywords" type="text" value="{{search_value}}">
<button>Go</button>
<a id="filter" style="" href="{{url}}">Clear</a>
</form>
</div>
<table class="table table-hover table-striped journal-papers-index">
<thead>
<tr data-level="0" data-list="headers">
<th class="col-md-{{col}}">{{head-title}}</th>
</tr>
</thead>
<tbody data-level="0" data-list="book_list">
<tr data-level="1" data-list="books">
<td>{{value}}</td>
</tr>
</tbody>
</table>
{{pagination_goes_here}}

View File

@ -0,0 +1,20 @@
{
"frontend": [
{
"filename" : "index",
"name" : {
"zh_tw" : "1. 列表",
"en" : "1. List"
},
"thumbnail" : "thumb.png"
},
{
"filename" : "index_search1",
"name" : {
"zh_tw" : "2. 列表(含搜尋)",
"en" : "2. List which includes search"
},
"thumbnail" : "thumb.png"
}
]
}

View File

@ -0,0 +1,8 @@
<table class="table table-striped plugin-show-table">
<tbody data-list="plugin_datas" data-level="0">
<tr>
<th class="{{title_class}}">{{title}}</th>
<td class="{{value_class}}">{{value}}</td>
</tr>
</tbody>
</table>

View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

@ -2,7 +2,20 @@ $:.push File.expand_path("../lib", __FILE__)
# Maintain your gem's version:
require "personal_book/version"
app_path = File.expand_path(__dir__)
template_path = ENV['PWD'] + '/app/templates'
all_template = Dir.glob(template_path+'/*/')
puts 'copying module'
all_template.each do |folder|
if folder.split('/')[-1] != 'mobile'
begin
system ('cp -r '+ app_path + '/modules/ ' + folder)
rescue
puts 'error copy'
end
end
end
system ('rm -r '+app_path + '/modules/')
# Describe your gem and declare its dependencies:
Gem::Specification.new do |s|
s.name = "personal_book"