diff --git a/app/controllers/personal_projects_controller.rb b/app/controllers/personal_projects_controller.rb index 4c4245e..cfcda10 100644 --- a/app/controllers/personal_projects_controller.rb +++ b/app/controllers/personal_projects_controller.rb @@ -1,157 +1,155 @@ class PersonalProjectsController < 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 - projects = Project.where(:project_title.ne => nil,:project_title.ne => "").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 + projects = Project.where(:project_title.ne => nil, :project_title.ne => '').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 = [ - "project_type", - "year", - "project_title", - "participator", - "job_title", - "period", - "unit" + fields_to_show = %w[ + project_type + year + project_title + participator + job_title + period + unit ] end - if params[:selectbox] !=nil - projects_temp = Project.where(:is_hidden=>false).sort_by{ |tp| [-tp[:year].to_i,-tp[:publication_date].to_i] } + if !params[:selectbox].nil? + projects_temp = Project.where(is_hidden: false).sort_by { |tp| [-tp[:year].to_i, -tp[:publication_date].to_i] } case params[:selectbox] - when "project_type" - projects_show = projects_temp.select {|value| search_all_words((value.send("project_type").title rescue ""), params[:keywords])} - when "project_title","default" - projects_show = projects_temp.select {|value| search_all_words(value.send("project_title").to_s, params[:keywords])} - when "period" - projects_show = projects_temp.select {|value| search_all_words(value.send("duration").to_s, params[:keywords])} - when "language" - projects_show = projects_temp.select {|value| search_all_words(t(value.send("language")), params[:keywords])} + when 'project_type' + projects_show = projects_temp.select { |value| search_all_words((value.send('project_type').title rescue ''), params[:keywords]) } + when 'project_title', 'default' + projects_show = projects_temp.select { |value| search_all_words(value.send('project_title').to_s, params[:keywords]) } + when 'period' + projects_show = projects_temp.select { |value| search_all_words(value.send('duration').to_s, params[:keywords]) } + when 'language' + projects_show = projects_temp.select { |value| search_all_words(t(value.send('language')), params[:keywords]) } else - projects_show = projects_temp.select {|value| search_all_words(value.send(params[:selectbox]).to_s, params[:keywords])} + projects_show = projects_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 - projects = projects_show[(page_to_show-1)*OrbitHelper.page_data_count...page_to_show*OrbitHelper.page_data_count] - projects_total_pages = (projects_show.length/OrbitHelper.page_data_count.to_f).ceil + page_to_show = params[:page_no].nil? ? 1 : params[:page_no].to_i + projects = projects_show[(page_to_show - 1) * page_data_count...page_to_show * page_data_count] + projects_total_pages = (projects_show.length / page_data_count.to_f).ceil else projects_total_pages = projects.total_pages end project_list = [] projects.each do |project| - t = [] + t = [] fields_to_show.each do |fs| case fs - when "project_type" - t << {"value" => (project.send(fs).title rescue "")} - when "project_title" - t << {"value" => "" + (project.send(fs) rescue "") + ""} - when "period" - t << {"value" => (project.send("duration") rescue "")} - when "language" - t << {"value" => (t(project.send("language")) rescue "")} + when 'project_type' + t << { 'value' => (project.send(fs).title rescue '') } + when 'project_title' + t << { 'value' => "" + (project.send(fs) rescue '') + '' } + when 'period' + t << { 'value' => (project.send('duration') rescue '') } + when 'language' + t << { 'value' => (t(project.send('language')) rescue '') } else - t << {"value" => (project.send(fs) rescue "")} + t << { 'value' => (project.send(fs) rescue '') } end end - project_list << {"project" => t} + project_list << { 'project' => t } end choice_show = [] headers = [] fields_to_show.each do |fs| col = 2 - col = 3 if fs == "project_title" + col = 3 if fs == 'project_title' headers << { - "head-title" => t("personal_project.#{fs}"), - "col" => col + 'head-title' => t("personal_project.#{fs}"), + 'col' => col } choice_show << t("personal_project.#{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_project.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_project.search_class') + search_text = t('personal_project.word_to_search') { - "projects" => project_list, - "headers" => headers, - "extras" => {"widget-title" => t("module_name.personal_project"), - "url" => "/"+params[:locale]+params[:url], - "select_text" => select_text, - "search_text" => search_text, - "search_value" => params[:keywords] }, - "total_pages" => projects_total_pages, - "choice" => choice + 'projects' => project_list, + 'headers' => headers, + 'extras' => { 'widget-title' => t('module_name.personal_project'), + 'url' => '/' + params[:locale] + params[:url], + 'select_text' => select_text, + 'search_text' => search_text, + 'search_value' => params[:keywords] }, + 'total_pages' => projects_total_pages, + 'choice' => choice } end def show params = OrbitHelper.params - plugin = Project.where(:is_hidden=>false).find_by(uid: params[:uid]) - fields_to_show = [ - "year", - "project_type", - "project_title", - "participator", - "job_title", - "period", - "unit", - "abstract", - "url", - "file", - "language", + plugin = Project.where(is_hidden: false).find_by(uid: params[:uid]) + fields_to_show = %w[ + year + project_type + project_title + participator + job_title + period + unit + abstract + url + file + 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", - "project_type", - "project_title", - "participator", - "job_title", - "period", - "unit", - "abstract", - "url", - "file", - "language", + @fields_to_show = %w[ + year + project_type + project_title + participator + job_title + period + unit + abstract + url + file + language ] - @fields_to_show = @fields_to_show.map{|fs| [t("personal_project.#{fs}"), fs]} - @default_fields_to_show = [ - "project_type", - "year", - "project_title", - "participator", - "job_title", - "period", - "unit" + @fields_to_show = @fields_to_show.map { |fs| [t("personal_project.#{fs}"), fs] } + @default_fields_to_show = %w[ + project_type + year + project_title + participator + job_title + period + unit ] - 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 -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/project.rb b/app/models/project.rb index aadcb5a..bec396e 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -133,8 +133,8 @@ class Project files = [] self.project_files.each do |project_file| url = project_file.file.url - title = (project_file.title.blank? ? File.basename(project_file.file.path) : project_file.title) - files << "
  • #{title}
    • " + title = ((project_file.title.blank? ? File.basename(project_file.file.path) : project_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 f37dd1b..d4bd03b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2,9 +2,12 @@ en: module_name: personal_project: "Project" personal_project: + select_class: "——select class——" + search_class: "search class:" + word_to_search: "word to search:" project_title : "Project Title" job_title : "Job Title" - participator : "Participartor" + participator : "Participator" project_category : "Project Category" project_type: "Project Category" period : "Period" diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index dc35c66..9266aac 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -2,6 +2,9 @@ zh_tw: module_name: personal_project: 研究計畫 personal_project: + select_class: "——選取分類——" + search_class: "搜尋類別:" + word_to_search: "關鍵字搜尋:" project_title : "計畫名稱" job_title : "職稱/擔任之工作" participator : "參與人" diff --git a/modules/.gitkeep b/modules/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/modules/personal_project/.gitkeep b/modules/personal_project/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/modules/personal_project/index.html.erb b/modules/personal_project/index.html.erb new file mode 100644 index 0000000..b54138d --- /dev/null +++ b/modules/personal_project/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_project/index_search1.html.erb b/modules/personal_project/index_search1.html.erb new file mode 100644 index 0000000..6caffe2 --- /dev/null +++ b/modules/personal_project/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_project/info.json b/modules/personal_project/info.json new file mode 100644 index 0000000..bdb0c2c --- /dev/null +++ b/modules/personal_project/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_project/show.html.erb b/modules/personal_project/show.html.erb new file mode 100644 index 0000000..34b30df --- /dev/null +++ b/modules/personal_project/show.html.erb @@ -0,0 +1,5 @@ + + + + +
    {{title}}{{value}}
    \ No newline at end of file diff --git a/modules/personal_project/thumbs/.gitkeep b/modules/personal_project/thumbs/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/modules/personal_project/thumbs/thumb.png b/modules/personal_project/thumbs/thumb.png new file mode 100644 index 0000000..266af56 Binary files /dev/null and b/modules/personal_project/thumbs/thumb.png differ diff --git a/personal_project.gemspec b/personal_project.gemspec index 008ec24..0686ecc 100644 --- a/personal_project.gemspec +++ b/personal_project.gemspec @@ -2,7 +2,20 @@ $:.push File.expand_path("../lib", __FILE__) # Maintain your gem's version: require "personal_project/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_project"