From 7f4e00f99105b2d64c715a7c3faaed450543b1b6 Mon Sep 17 00:00:00 2001 From: chiu Date: Tue, 20 Aug 2019 12:19:33 +0800 Subject: [PATCH] Update personal_patents_controller.rb fix coding style --- .../personal_patents_controller.rb | 257 +++++++++--------- 1 file changed, 129 insertions(+), 128 deletions(-) diff --git a/app/controllers/personal_patents_controller.rb b/app/controllers/personal_patents_controller.rb index a86a78c..4e76a79 100644 --- a/app/controllers/personal_patents_controller.rb +++ b/app/controllers/personal_patents_controller.rb @@ -2,40 +2,40 @@ class PersonalPatentsController < ApplicationController def index params = OrbitHelper.params 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 [] + 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)*page_data_count...page_to_show*page_data_count] - patents_total_pages = (patents_show.length/page_data_count.to_f).ceil + page_to_show = if params[:page_no].nil? + 1 + else + params[:page_no].to_i + end + 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 @@ -44,132 +44,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 = t("personal_patent.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 = t("personal_patent.search_class") - search_text = t("personal_patent.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(' ') - return words.select{|value| target.include? value}==words + + 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