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

Merge branch 'master' into 'master' 

Master

add update modules feature and fix error

See merge request !3
This commit is contained in:
wmcheng 2019-08-22 00:00:18 +08:00
parent daec017df3 df7a3934bb
commit b29a973f68
13 changed files with 242 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

279
app/controllers/personal_conferences_controller.rb
View File

@ -1,60 +1,54 @@
class PersonalConferencesController < ApplicationController 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 def index
params = OrbitHelper.params params = OrbitHelper.params
writing_conferences = WritingConference.where(:is_hidden=>false).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(OrbitHelper.page_data_count) page_data_count = OrbitHelper.page_data_count
page = Page.where(:page_id => params[:page_id]).first rescue nil writing_conferences = WritingConference.where(is_hidden: false).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(page_data_count)
if page.custom_string_field == "table" page = Page.where(page_id: params[:page_id]).first rescue nil
if page.custom_string_field == 'table'
fields_to_show = page.custom_array_field rescue [] fields_to_show = page.custom_array_field rescue []
fields_to_show = [ if fields_to_show.blank?
"authors", fields_to_show = %w[
"paper_title", authors
"conference_title", paper_title
"location", conference_title
"paper_types", location
"paper_levels" paper_types
] if fields_to_show.blank? paper_levels
]
end
else else
fields_to_show = [ fields_to_show = %w[
"year", year
"paper_title" paper_title
] ]
end end
if params[:selectbox] !=nil if !params[:selectbox].nil?
writing_conferences_temp = WritingConference.where(:is_hidden=>false).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] case params[:selectbox]
when "paper_title","default" when 'paper_title', 'default'
if page.custom_string_field == "table" if page.custom_string_field == 'table'
writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.paper_title, params[:keywords])} writing_conferences_show = writing_conferences_temp.select { |value| search_all_words(value.paper_title, params[:keywords]) }
else else
writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.create_link, params[:keywords])} writing_conferences_show = writing_conferences_temp.select { |value| search_all_words(value.create_link, params[:keywords]) }
end end
when "paper_levels" 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])} writing_conferences_show = writing_conferences_temp.select { |value| search_all_words(value.conference_paper_levels.collect(&:title).join(', ').to_s, params[:keywords]) }
when "paper_types" 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])} writing_conferences_show = writing_conferences_temp.select { |value| search_all_words(value.conference_paper_types.collect(&:title).join(', ').to_s, params[:keywords]) }
when "period" when 'period'
writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.duration, params[:keywords])} writing_conferences_show = writing_conferences_temp.select { |value| search_all_words(value.duration, params[:keywords]) }
when "publication_date" 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])} 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" 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])} writing_conferences_show = writing_conferences_temp.select { |value| search_all_words(value.conference_author_types.collect(&:title).join(', '), params[:keywords]) }
when "language" when 'language'
writing_conferences_show = writing_conferences_temp.select {|value| search_all_words((!value.language.nil? ? t("#{value.language}") : ""), params[:keywords])} writing_conferences_show = writing_conferences_temp.select { |value| search_all_words((!value.language.nil? ? t(value.language.to_s) : ''), params[:keywords]) }
else else
writing_conferences_show = writing_conferences_temp.select {|value| search_all_words(value.send(params[:selectbox]).to_s, params[:keywords])} writing_conferences_show = writing_conferences_temp.select { |value| search_all_words(value.send(params[:selectbox]).to_s, params[:keywords]) }
end end
if params[:page_no].nil? page_to_show = params[:page_no].nil? ? 1 : params[:page_no].to_i
page_to_show = 1 writing_conferences = writing_conferences_show[(page_to_show - 1) * page_data_count...page_to_show * page_data_count]
else writing_conferences_total_pages = (writing_conferences_show.length / page_data_count.to_f).ceil
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 else
writing_conferences_total_pages = writing_conferences.total_pages writing_conferences_total_pages = writing_conferences.total_pages
end end
@ -63,135 +57,142 @@ class PersonalConferencesController < ApplicationController
t = [] t = []
fields_to_show.each do |fs| fields_to_show.each do |fs|
case fs case fs
when "paper_title" when 'paper_title'
if page.custom_string_field == "table" if page.custom_string_field == 'table'
t << {"value" => "<a href='#{OrbitHelper.url_to_show(writing_conference.to_param)}'>#{writing_conference.paper_title}</a>"} t << { 'value' => "<a href='#{OrbitHelper.url_to_show(writing_conference.to_param)}'>#{writing_conference.paper_title}</a>" }
else else
t << {"value" => "<a href='#{OrbitHelper.url_to_show(writing_conference.to_param)}'>#{writing_conference.create_link}</a>"} t << { 'value' => "<a href='#{OrbitHelper.url_to_show(writing_conference.to_param)}'>#{writing_conference.create_link}</a>" }
end end
when "paper_levels" 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(&:title).join(', ')})" : nil) }
when "paper_types" when 'paper_types'
t << {"value" => ( !writing_conference.conference_paper_types.blank? ? "(#{writing_conference.conference_paper_types.collect{|x| x.title}.join(', ')})" : nil)} t << { 'value' => (!writing_conference.conference_paper_types.blank? ? "(#{writing_conference.conference_paper_types.collect(&:title).join(', ')})" : nil) }
when "publication_date" when 'publication_date'
t << {"value" => (writing_conference.send(fs).strftime("%Y/%m") rescue "")} t << { 'value' => (writing_conference.send(fs).strftime('%Y/%m') rescue '') }
when "author_type" when 'author_type'
t << {"value" => (writing_conference.conference_author_types.collect{|cat| cat.title}.join(", ") rescue "")} t << { 'value' => (writing_conference.conference_author_types.collect(&:title).join(', ') rescue '') }
when "period" when 'period'
t << {"value" => writing_conference.duration} t << { 'value' => writing_conference.duration }
when "language" when 'language'
t << {"value" => (!writing_conference.language.nil? ? t("#{writing_conference.language}") : "")} t << { 'value' => (!writing_conference.language.nil? ? t(writing_conference.language.to_s) : '') }
else else
t << {"value" => writing_conference.send(fs)} t << { 'value' => writing_conference.send(fs) }
end end
end end
writing_conference_list << {"cps" => t} writing_conference_list << { 'cps' => t }
end end
choice_show = [] choice_show = []
headers = [] headers = []
fields_to_show.each do |fs| fields_to_show.each do |fs|
col = 2 col = 2
col = 3 if fs == "paper_title" col = 3 if fs == 'paper_title'
headers << { headers << {
"head-title" => t("personal_conference.#{fs}"), 'head-title' => t("personal_conference.#{fs}"),
"col" => col 'col' => col
} }
choice_show << t("personal_conference.#{fs}") choice_show << t("personal_conference.#{fs}")
end end
choice_value = fields_to_show choice_value = fields_to_show
choice_value.unshift("default") choice_value.unshift('default')
choice_select=choice_value.map{|iter| iter==params[:selectbox] ? "selected" : ""} choice_select = choice_value.map { |iter| iter == params[:selectbox] ? 'selected' : '' }
choice_select=choice_select.map{|value| {"choice_select" => value}} choice_select = choice_select.map { |value| { 'choice_select' => value } }
choice_value=choice_value.map{|value| {"choice_value" => value}} choice_value = choice_value.map { |value| { 'choice_value' => value } }
choice_default = params[:locale]!='en' ? "——選取分類——" : "——select class——" choice_default = t('personal_conference.select_class')
choice_show.unshift(choice_default) choice_show.unshift(choice_default)
choice_show=choice_show.map{|value| {"choice_show" => value}} choice_show = choice_show.map { |value| { 'choice_show' => value } }
choice=choice_value.zip(choice_show,choice_select) choice = choice_value.zip(choice_show, choice_select)
choice=choice.map{|value| value.inject:merge} choice = choice.map { |value| value.inject :merge }
select_text = params[:locale]!='en' ? "搜尋類別:" : "search class:" select_text = t('personal_conference.search_class')
search_text = params[:locale]!='en' ? "關鍵字搜尋:" : "word to search:" search_text = t('personal_conference.word_to_search')
{ {
"writing_conferences" => writing_conference_list, '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], 'url' => '/' + params[:locale] + params[:url],
"select_text" => select_text, 'select_text' => select_text,
"search_text" => search_text, 'search_text' => search_text,
"search_value" => params[:keywords] }, 'search_value' => params[:keywords] },
"headers" => headers, 'headers' => headers,
"total_pages" => writing_conferences_total_pages, 'total_pages' => writing_conferences_total_pages,
"choice" => choice 'choice' => choice
} }
end end
def show def show
params = OrbitHelper.params params = OrbitHelper.params
plugin = WritingConference.where(:is_hidden=>false).find_by(uid: params[:uid]) plugin = WritingConference.where(is_hidden: false).find_by(uid: params[:uid])
fields_to_show = %w[
fields_to_show = [ year
"year", authors
"authors", paper_title
"paper_title", conference_title
"conference_title", location
"location", period_start_date
"period_start_date", period_end_date
"period_end_date", period
"period", paper_type
"paper_type", paper_level
"paper_level", sponsor
"sponsor", author_type
"author_type", number_of_authors
"number_of_authors", abstract
"abstract", url
"url", file
"file", publication_date
"publication_date", isbn
"isbn", isi_number
"isi_number" , language
"language"
] ]
{"plugin_datas"=>plugin.get_plugin_data(fields_to_show)} { 'plugin_datas' => plugin.get_plugin_data(fields_to_show) }
end end
def get_fields_for_index def get_fields_for_index
@page = Page.find(params[:page_id]) rescue nil @page = Page.find(params[:page_id]) rescue nil
@fields_to_show = [ @fields_to_show = %w[
"year", year
"authors", authors
"paper_title", paper_title
"conference_title", conference_title
"location", location
"period_start_date", period_start_date
"period_end_date", period_end_date
"period", period
"paper_type", paper_type
"paper_level", paper_level
"sponsor", sponsor
"author_type", author_type
"number_of_authors", number_of_authors
"abstract", abstract
"url", url
"publication_date", publication_date
"isbn", isbn
"isi_number" , isi_number
"language" 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 = [ @default_fields_to_show = %w[
"authors", authors
"paper_title", paper_title
"conference_title", conference_title
"location", location
"paper_types", paper_types
"paper_levels" paper_levels
] ]
render :layout => false render layout: false
end end
def save_index_fields def save_index_fields
page = Page.find(params[:page_id]) rescue nil page = Page.find(params[:page_id]) rescue nil
page.custom_array_field = params[:keys] page.custom_array_field = params[:keys]
page.save 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
end end

4
app/models/writing_conference.rb
View File

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

3
config/locales/en.yml
View File

@ -4,6 +4,9 @@ en:
personal_conference: Conference Paper personal_conference: Conference Paper
personal_conference: personal_conference:
select_class: "——select class——"
search_class: "search class:"
word_to_search: "word to search:"
year : "Year" year : "Year"
language : "Language" language : "Language"
paper_title : "Paper Title" paper_title : "Paper Title"

3
config/locales/zh_tw.yml
View File

@ -3,6 +3,9 @@ zh_tw:
module_name: module_name:
personal_conference: 研討會論文 personal_conference: 研討會論文
personal_conference: personal_conference:
select_class: "——選取分類——"
search_class: "搜尋類別:"
word_to_search: "關鍵字搜尋:"
year : "年度" year : "年度"
language : "語言" language : "語言"
paper_title : "論文名稱" paper_title : "論文名稱"

0
modules/.gitkeep Normal file
View File

0
modules/personal_conference/.gitkeep Normal file
View File

14
modules/personal_conference/index.html.erb Normal file
View File

@ -0,0 +1,14 @@
<table class="table table-hover table-striped projects-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="writing_conferences">
<tr data-level="1" data-list="cps">
<td>{{value}}</td>
</tr>
</tbody>
</table>
{{pagination_goes_here}}

37
modules/personal_conference/index_search1.html.erb Normal file
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 projects-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="writing_conferences">
<tr data-level="1" data-list="cps">
<td>{{value}}</td>
</tr>
</tbody>
</table>
{{pagination_goes_here}}

20
modules/personal_conference/info.json Normal file
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"
}
]
}

8
modules/personal_conference/show.html.erb Normal file
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>

0
modules/personal_conference/thumbs/.gitkeep Normal file
View File

BIN
modules/personal_conference/thumbs/thumb.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

15
personal_conference.gemspec
View File

@ -2,7 +2,20 @@ $:.push File.expand_path("../lib", __FILE__)
# Maintain your gem's version: # Maintain your gem's version:
require "personal_conference/version" require "personal_conference/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: # Describe your gem and declare its dependencies:
Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = "personal_conference" s.name = "personal_conference"