diff --git a/app/controllers/personal_patents_controller.rb b/app/controllers/personal_patents_controller.rb index 4aab49a..7f9a3bc 100644 --- a/app/controllers/personal_patents_controller.rb +++ b/app/controllers/personal_patents_controller.rb @@ -1,45 +1,37 @@ 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 params = OrbitHelper.params - patents = Patent.where(:is_hidden=>false).sort_for_frontend.page(OrbitHelper.params[:page_no]).per(OrbitHelper.page_data_count) - fields_to_show = Page.where(:page_id => params[:page_id]).first.custom_array_field rescue [] + page_data_count = OrbitHelper.page_data_count + 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? - fields_to_show = [ - "publish_date", - "patent_title", - "patent_no", - "patent_country", - "authors" + fields_to_show = %w[ + publish_date + patent_title + patent_no + patent_country + authors ] - end - if params[:selectbox] !=nil - patents_temp = Patent.where(:is_hidden=>false).sort_by{ |tp| [-tp[:year].to_i,-tp[:publication_date].to_i] } + end + if !params[:selectbox].nil? + patents_temp = Patent.where(is_hidden: false).sort_by { |tp| [-tp[:year].to_i, -tp[:publication_date].to_i] } case params[:selectbox] - when "patent_title","default" - patents_show = patents_temp.select {|value| search_all_words((value.patent_title rescue ""), params[:keywords])} - 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])} - 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])} - when "author_type" - patents_show = patents_temp.select {|value| search_all_words(value.patent_author_types.collect{|pt| pt.title}.join(", "), params[:keywords])} - when "language" - patents_show = patents_temp.select {|value| search_all_words((!value.language.nil? ? t("#{value.language}") : ""), params[:keywords])} + when 'patent_title', 'default' + patents_show = patents_temp.select { |value| search_all_words((value.patent_title rescue ''), params[:keywords]) } + 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]) } + when 'patent_category' + patents_show = patents_temp.select { |value| search_all_words((value.patent_types.collect(&:title).join(', ').to_s rescue ''), params[:keywords]) } + when 'author_type' + patents_show = patents_temp.select { |value| search_all_words(value.patent_author_types.collect(&:title).join(', '), params[:keywords]) } + when 'language' + patents_show = patents_temp.select { |value| search_all_words((!value.language.nil? ? t(value.language.to_s) : ''), params[:keywords]) } 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 - if params[:page_no].nil? - page_to_show = 1 - else - 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 + page_to_show = params[:page_no].nil? ? 1 : params[:page_no].to_i + patents = patents_show[(page_to_show - 1) * page_data_count...page_to_show * page_data_count] + patents_total_pages = (patents_show.length / page_data_count.to_f).ceil else patents_total_pages = patents.total_pages end @@ -48,126 +40,133 @@ class PersonalPatentsController < ApplicationController t = [] fields_to_show.each do |fs| case fs - when "patent_title" - t << {"value" => "" + (patent.send(fs) rescue "") + ""} - when "publish_date" - t << {"value" => (patent.publish_date.strftime("%Y/%m/%d") rescue "")} - when "application_date" - t << {"value" => (patent.application_date.strftime("%Y/%m/%d") rescue "")} - when "end_date" - t << {"value" => (patent.end_date.strftime("%Y/%m/%d") rescue "")} - when "patent_category" - t << {"value" => (patent.patent_types.collect{|pt| pt.title}.join(", ") rescue "")} - when "author_type" - t << {"value" => (patent.patent_author_types.collect{|pt| pt.title}.join(", ") rescue "")} - when "language" - t << {"value" => (!patent.language.nil? ? t("#{patent.language}") : "")} - else - t << {"value" => patent.send(fs)} + when 'patent_title' + t << { 'value' => "" + (patent.send(fs) rescue '') + '' } + when 'publish_date' + t << { 'value' => (patent.publish_date.strftime('%Y/%m/%d') rescue '') } + when 'application_date' + t << { 'value' => (patent.application_date.strftime('%Y/%m/%d') rescue '') } + when 'end_date' + t << { 'value' => (patent.end_date.strftime('%Y/%m/%d') rescue '') } + when 'patent_category' + t << { 'value' => (patent.patent_types.collect(&:title).join(', ') rescue '') } + when 'author_type' + t << { 'value' => (patent.patent_author_types.collect(&:title).join(', ') rescue '') } + when 'language' + t << { 'value' => (!patent.language.nil? ? t(patent.language.to_s) : '') } + else + t << { 'value' => patent.send(fs) } end end - patent_list << {"patent_list" => t} + patent_list << { 'patent_list' => t } end choice_show = [] headers = [] fields_to_show.each do |fs| col = 2 - col = 3 if fs == "patent_title" - header = fs == "authors" ? t("users.name") : t("personal_patent.#{fs}") + col = 3 if fs == 'patent_title' + header = fs == 'authors' ? t('users.name') : t("personal_patent.#{fs}") headers << { - "head-title" => header, - "col" => col + 'head-title' => header, + 'col' => col } choice_show << header 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_patent.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_patent.search_class') + search_text = t('personal_patent.word_to_search') { - "patents" => patent_list, - "extras" => { "widget-title" => t("module_name.personal_patent"), - "url" => "/"+params[:locale]+params[:url], - "select_text" => select_text, - "search_text" => search_text, - "search_value" => params[:keywords] }, - "headers" => headers, - "total_pages" => patents_total_pages, - "choice" => choice + 'patents' => patent_list, + 'extras' => { 'widget-title' => t('module_name.personal_patent'), + 'url' => '/' + params[:locale] + params[:url], + 'select_text' => select_text, + 'search_text' => search_text, + 'search_value' => params[:keywords] }, + 'headers' => headers, + 'total_pages' => patents_total_pages, + 'choice' => choice } end def show params = OrbitHelper.params - plugin = Patent.where(:is_hidden=>false).find_by(uid: params[:uid]) - fields_to_show = [ - "patent_title", - "patent_no", - "patent_category", - "patent_country", - "progress_status", - "author_type", - "application_date", - "publish_date", - "end_date", - "patent_organization", - "year", - "authors", - "url", - "language", - "keywords", - "note", - "file" + plugin = Patent.where(is_hidden: false).find_by(uid: params[:uid]) + fields_to_show = %w[ + patent_title + patent_no + patent_category + patent_country + progress_status + author_type + application_date + publish_date + end_date + patent_organization + year + authors + url + language + keywords + note + file ] - {"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 = [ - "patent_category", - "year", - "publish_date", - "patent_title", - "patent_no", - "patent_organization", - "progress_status", - "application_date", - "end_date", - "publish_date", - "author_type", - "patent_country", - "authors", - "url", - "language", - "keywords", - "note" - ] - @fields_to_show = @fields_to_show.map{|fs| [(fs == "authors" ? t("users.name") : t("personal_patent.#{fs}")), fs]} - @default_fields_to_show = [ - "publish_date", - "patent_title", - "patent_no", - "patent_country", - "authors" - ] - render :layout => false + @page = Page.find(params[:page_id]) rescue nil + @fields_to_show = %w[ + patent_category + year + publish_date + patent_title + patent_no + patent_organization + progress_status + application_date + end_date + publish_date + author_type + patent_country + authors + url + language + keywords + note + ] + @fields_to_show = @fields_to_show.map { |fs| [(fs == 'authors' ? t('users.name') : t("personal_patent.#{fs}")), fs] } + @default_fields_to_show = %w[ + publish_date + patent_title + patent_no + patent_country + authors + ] + 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 + page = Page.find(params[:page_id]) rescue nil + page.custom_array_field = params[:keys] + page.save + 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 \ No newline at end of file diff --git a/app/models/patent.rb b/app/models/patent.rb index c4a4f0e..dc807ef 100644 --- a/app/models/patent.rb +++ b/app/models/patent.rb @@ -132,8 +132,8 @@ class Patent files = [] self.patent_files.each do |patent_file| url = patent_file.file.url - title = (patent_file.title.blank? ? File.basename(patent_file.file.path) : patent_file.title) - files << "
  • #{title}
    • " + title = ((patent_file.title.blank? ? File.basename(patent_file.file.path) : patent_file.title) rescue "") + files << (url.nil? ? "" : "
  • #{title}
    • ") end value = files.join("") else diff --git a/config/locales/en.yml b/config/locales/en.yml index 2d2a7fb..57f2e6b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2,6 +2,9 @@ en: module_name: personal_patent: Patent personal_patent: + select_class: "——select class——" + search_class: "search class:" + word_to_search: "word to search:" patent_title : "Patent Title" book_title : "Book Title" extracted_chapters : "Extracted Chapters" diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 74000c1..15e5f3c 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -2,6 +2,9 @@ zh_tw: module_name: personal_patent: 專利 personal_patent: + select_class: "——選取分類——" + search_class: "搜尋類別:" + word_to_search: "關鍵字搜尋:" patent_title : "專利名稱" book_title : "期刊名稱" extracted_chapters : "Extracted Chapters" diff --git a/modules/.gitkeep b/modules/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/modules/personal_patent/.gitkeep b/modules/personal_patent/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/modules/personal_patent/index.html.erb b/modules/personal_patent/index.html.erb new file mode 100644 index 0000000..86ec3bc --- /dev/null +++ b/modules/personal_patent/index.html.erb @@ -0,0 +1,14 @@ + + + + + + + + + + + + +

    {{widget-title}}

    {{head-title}}
    {{value}}
    +{{pagination_goes_here}} \ No newline at end of file diff --git a/modules/personal_patent/index_search1.html.erb b/modules/personal_patent/index_search1.html.erb new file mode 100644 index 0000000..82f45a1 --- /dev/null +++ b/modules/personal_patent/index_search1.html.erb @@ -0,0 +1,37 @@ + +

    {{widget-title}}

    +
    +
    + {{select_text}} + + {{search_text}} + + + Clear +
    +
    + + + + + + + + + + + +
    {{head-title}}
    {{value}}
    +{{pagination_goes_here}} \ No newline at end of file diff --git a/modules/personal_patent/info.json b/modules/personal_patent/info.json new file mode 100644 index 0000000..bdb0c2c --- /dev/null +++ b/modules/personal_patent/info.json @@ -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" + } + ] +} \ No newline at end of file diff --git a/modules/personal_patent/show.html.erb b/modules/personal_patent/show.html.erb new file mode 100644 index 0000000..34b30df --- /dev/null +++ b/modules/personal_patent/show.html.erb @@ -0,0 +1,5 @@ + + + + +
    {{title}}{{value}}
    \ No newline at end of file diff --git a/modules/personal_patent/thumbs/.gitkeep b/modules/personal_patent/thumbs/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/modules/personal_patent/thumbs/thumb.png b/modules/personal_patent/thumbs/thumb.png new file mode 100644 index 0000000..266af56 Binary files /dev/null and b/modules/personal_patent/thumbs/thumb.png differ diff --git a/personal_patent.gemspec b/personal_patent.gemspec index 8c608a5..2c9d52e 100644 --- a/personal_patent.gemspec +++ b/personal_patent.gemspec @@ -2,7 +2,20 @@ $:.push File.expand_path("../lib", __FILE__) # Maintain your gem's 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: Gem::Specification.new do |s| s.name = "personal_patent"