chiu
/
personal-patent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master' 

Master

add update modules feature

See merge request !2
This commit is contained in:
wmcheng 2019-08-22 00:00:44 +08:00
parent 737c8a1501 e74174d631
commit 741fa0a136
13 changed files with 225 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

253
app/controllers/personal_patents_controller.rb
View File

@ -1,45 +1,37 @@
class PersonalPatentsController < ApplicationController class PersonalPatentsController < 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
patents = Patent.where(:is_hidden=>false).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(OrbitHelper.page_data_count) page_data_count = OrbitHelper.page_data_count
fields_to_show = Page.where(:page_id => params[:page_id]).first.custom_array_field rescue [] patents = Patent.where(is_hidden: false).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(page_data_count)
fields_to_show = Page.where(page_id: params[:page_id]).first.custom_array_field rescue []
if fields_to_show.blank? if fields_to_show.blank?
fields_to_show = [ fields_to_show = %w[
"publish_date", publish_date
"patent_title", patent_title
"patent_no", patent_no
"patent_country", patent_country
"authors" authors
] ]
end end
if params[:selectbox] !=nil if !params[:selectbox].nil?
patents_temp = Patent.where(:is_hidden=>false).sort_by{ |tp| [-tp[:year].to_i,-tp[:publication_date].to_i] } patents_temp = Patent.where(is_hidden: false).sort_by { |tp| [-tp[:year].to_i, -tp[:publication_date].to_i] }
case params[:selectbox] case params[:selectbox]
when "patent_title","default" when 'patent_title', 'default'
patents_show = patents_temp.select {|value| search_all_words((value.patent_title rescue ""), params[:keywords])} patents_show = patents_temp.select { |value| search_all_words((value.patent_title rescue ''), params[:keywords]) }
when "publish_date", "application_date", "end_date" when 'publish_date', 'application_date', 'end_date'
patents_show = patents_temp.select {|value| search_all_words((value.send(params[:selectbox]).strftime("%Y/%m/%d") rescue ""), params[:keywords])} patents_show = patents_temp.select { |value| search_all_words((value.send(params[:selectbox]).strftime('%Y/%m/%d') rescue ''), params[:keywords]) }
when "patent_category" when 'patent_category'
patents_show = patents_temp.select {|value| search_all_words((value.patent_types.collect{|pt| pt.title}.join(", ").to_s rescue ""), params[:keywords])} patents_show = patents_temp.select { |value| search_all_words((value.patent_types.collect(&:title).join(', ').to_s rescue ''), params[:keywords]) }
when "author_type" when 'author_type'
patents_show = patents_temp.select {|value| search_all_words(value.patent_author_types.collect{|pt| pt.title}.join(", "), params[:keywords])} patents_show = patents_temp.select { |value| search_all_words(value.patent_author_types.collect(&:title).join(', '), params[:keywords]) }
when "language" when 'language'
patents_show = patents_temp.select {|value| search_all_words((!value.language.nil? ? t("#{value.language}") : ""), params[:keywords])} patents_show = patents_temp.select { |value| search_all_words((!value.language.nil? ? t(value.language.to_s) : ''), params[:keywords]) }
else else
patents_show = patents_temp.select {|value| search_all_words((value.send(params[:selectbox]).to_s rescue ""), params[:keywords])} patents_show = patents_temp.select { |value| search_all_words((value.send(params[:selectbox]).to_s rescue ''), 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 patents = patents_show[(page_to_show - 1) * page_data_count...page_to_show * page_data_count]
else patents_total_pages = (patents_show.length / page_data_count.to_f).ceil
page_to_show = params[:page_no].to_i
end
patents = patents_show[(page_to_show-1)*OrbitHelper.page_data_count...page_to_show*OrbitHelper.page_data_count]
patents_total_pages = (patents_show.length/OrbitHelper.page_data_count.to_f).ceil
else else
patents_total_pages = patents.total_pages patents_total_pages = patents.total_pages
end end
@ -48,126 +40,133 @@ class PersonalPatentsController < ApplicationController
t = [] t = []
fields_to_show.each do |fs| fields_to_show.each do |fs|
case fs case fs
when "patent_title" when 'patent_title'
t << {"value" => "<a href='#{OrbitHelper.url_to_show(patent.to_param)}' target='_blank'>" + (patent.send(fs) rescue "") + "</a>"} t << { 'value' => "<a href='#{OrbitHelper.url_to_show(patent.to_param)}' target='_blank'>" + (patent.send(fs) rescue '') + '</a>' }
when "publish_date" when 'publish_date'
t << {"value" => (patent.publish_date.strftime("%Y/%m/%d") rescue "")} t << { 'value' => (patent.publish_date.strftime('%Y/%m/%d') rescue '') }
when "application_date" when 'application_date'
t << {"value" => (patent.application_date.strftime("%Y/%m/%d") rescue "")} t << { 'value' => (patent.application_date.strftime('%Y/%m/%d') rescue '') }
when "end_date" when 'end_date'
t << {"value" => (patent.end_date.strftime("%Y/%m/%d") rescue "")} t << { 'value' => (patent.end_date.strftime('%Y/%m/%d') rescue '') }
when "patent_category" when 'patent_category'
t << {"value" => (patent.patent_types.collect{|pt| pt.title}.join(", ") rescue "")} t << { 'value' => (patent.patent_types.collect(&:title).join(', ') rescue '') }
when "author_type" when 'author_type'
t << {"value" => (patent.patent_author_types.collect{|pt| pt.title}.join(", ") rescue "")} t << { 'value' => (patent.patent_author_types.collect(&:title).join(', ') rescue '') }
when "language" when 'language'
t << {"value" => (!patent.language.nil? ? t("#{patent.language}") : "")} t << { 'value' => (!patent.language.nil? ? t(patent.language.to_s) : '') }
else else
t << {"value" => patent.send(fs)} t << { 'value' => patent.send(fs) }
end end
end end
patent_list << {"patent_list" => t} patent_list << { 'patent_list' => 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 == "patent_title" col = 3 if fs == 'patent_title'
header = fs == "authors" ? t("users.name") : t("personal_patent.#{fs}") header = fs == 'authors' ? t('users.name') : t("personal_patent.#{fs}")
headers << { headers << {
"head-title" => header, 'head-title' => header,
"col" => col 'col' => col
} }
choice_show << header choice_show << header
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_patent.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_patent.search_class')
search_text = params[:locale]!='en' ? "關鍵字搜尋:" : "word to search:" search_text = t('personal_patent.word_to_search')
{ {
"patents" => patent_list, 'patents' => patent_list,
"extras" => { "widget-title" => t("module_name.personal_patent"), 'extras' => { 'widget-title' => t('module_name.personal_patent'),
"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" => patents_total_pages, 'total_pages' => patents_total_pages,
"choice" => choice 'choice' => choice
} }
end end
def show def show
params = OrbitHelper.params params = OrbitHelper.params
plugin = Patent.where(:is_hidden=>false).find_by(uid: params[:uid]) plugin = Patent.where(is_hidden: false).find_by(uid: params[:uid])
fields_to_show = [ fields_to_show = %w[
"patent_title", patent_title
"patent_no", patent_no
"patent_category", patent_category
"patent_country", patent_country
"progress_status", progress_status
"author_type", author_type
"application_date", application_date
"publish_date", publish_date
"end_date", end_date
"patent_organization", patent_organization
"year", year
"authors", authors
"url", url
"language", language
"keywords", keywords
"note", note
"file" file
] ]
{"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[
"patent_category", patent_category
"year", year
"publish_date", publish_date
"patent_title", patent_title
"patent_no", patent_no
"patent_organization", patent_organization
"progress_status", progress_status
"application_date", application_date
"end_date", end_date
"publish_date", publish_date
"author_type", author_type
"patent_country", patent_country
"authors", authors
"url", url
"language", language
"keywords", keywords
"note" note
] ]
@fields_to_show = @fields_to_show.map{|fs| [(fs == "authors" ? t("users.name") : t("personal_patent.#{fs}")), fs]} @fields_to_show = @fields_to_show.map { |fs| [(fs == 'authors' ? t('users.name') : t("personal_patent.#{fs}")), fs] }
@default_fields_to_show = [ @default_fields_to_show = %w[
"publish_date", publish_date
"patent_title", patent_title
"patent_no", patent_no
"patent_country", patent_country
"authors" authors
] ]
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/patent.rb
View File

@ -132,8 +132,8 @@ class Patent
files = [] files = []
self.patent_files.each do |patent_file| self.patent_files.each do |patent_file|
url = patent_file.file.url url = patent_file.file.url
title = (patent_file.title.blank? ? File.basename(patent_file.file.path) : patent_file.title) title = ((patent_file.title.blank? ? File.basename(patent_file.file.path) : patent_file.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

@ -2,6 +2,9 @@ en:
module_name: module_name:
personal_patent: Patent personal_patent: Patent
personal_patent: personal_patent:
select_class: "——select class——"
search_class: "search class:"
word_to_search: "word to search:"
patent_title : "Patent Title" patent_title : "Patent Title"
book_title : "Book Title" book_title : "Book Title"
extracted_chapters : "Extracted Chapters" extracted_chapters : "Extracted Chapters"

3
config/locales/zh_tw.yml
View File

@ -2,6 +2,9 @@ zh_tw:
module_name: module_name:
personal_patent: 專利 personal_patent: 專利
personal_patent: personal_patent:
select_class: "——選取分類——"
search_class: "搜尋類別:"
word_to_search: "關鍵字搜尋:"
patent_title : "專利名稱" patent_title : "專利名稱"
book_title : "期刊名稱" book_title : "期刊名稱"
extracted_chapters : "Extracted Chapters" extracted_chapters : "Extracted Chapters"

0
modules/.gitkeep Normal file
View File

0
modules/personal_patent/.gitkeep Normal file
View File

14
modules/personal_patent/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="patents">
<tr data-level="1" data-list="patent_list">
<td>{{value}}</td>
</tr>
</tbody>
</table>
{{pagination_goes_here}}

37
modules/personal_patent/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="patents">
<tr data-level="1" data-list="patent_list">
<td>{{value}}</td>
</tr>
</tbody>
</table>
{{pagination_goes_here}}

20
modules/personal_patent/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"
}
]
}

5
modules/personal_patent/show.html.erb Normal file
View File

@ -0,0 +1,5 @@
<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_patent/thumbs/.gitkeep Normal file
View File

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

15
personal_patent.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_patent/version" require "personal_patent/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_patent" s.name = "personal_patent"