harrybomrah
/
personal-journal
forked from saurabh/personal-journal
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 !2
This commit is contained in:
wmcheng 2019-08-21 23:59:14 +08:00
parent d910320806 e1293a4e7e
commit 710b9e862c
20 changed files with 248 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -5,4 +5,4 @@ test/dummy/db/*.sqlite3
test/dummy/db/*.sqlite3-journal test/dummy/db/*.sqlite3-journal
test/dummy/log/*.log test/dummy/log/*.log
test/dummy/tmp/ test/dummy/tmp/
test/dummy/.sass-cache test/dummy/.sass-cache

1
Gemfile
View File

@ -9,6 +9,5 @@ gemspec
# your gemspec. These might include edge Rails or gems from your path or # your gemspec. These might include edge Rails or gems from your path or
# Git. Remember to move these dependencies to your gemspec before releasing # Git. Remember to move these dependencies to your gemspec before releasing
# your gem to rubygems.org. # your gem to rubygems.org.
# To use debugger # To use debugger
# gem 'debugger' # gem 'debugger'

2
Rakefile
View File

@ -5,7 +5,6 @@ rescue LoadError
end end
require 'rdoc/task' require 'rdoc/task'
RDoc::Task.new(:rdoc) do |rdoc| RDoc::Task.new(:rdoc) do |rdoc|
rdoc.rdoc_dir = 'rdoc' rdoc.rdoc_dir = 'rdoc'
rdoc.title = 'PersonalJournal' rdoc.title = 'PersonalJournal'
@ -16,7 +15,6 @@ end
Bundler::GemHelper.install_tasks Bundler::GemHelper.install_tasks
require 'rake/testtask' require 'rake/testtask'

2
app/controllers/admin/journal_papers_controller.rb
View File

@ -116,7 +116,7 @@ class Admin::JournalPapersController < OrbitMemberController
def destroy def destroy
@journal_paper.destroy @journal_paper.destroy
respond_to do |format| respond_to do |format|
format.html { redirect_to(admin_journal_paper_url) } format.html { redirect_to(admin_journal_papers_url) }
# format.xml { head :ok } # format.xml { head :ok }
format.js format.js
format.json {render json: {"success" => true}} format.json {render json: {"success" => true}}

266
app/controllers/personal_journals_controller.rb
View File

@ -1,57 +1,53 @@
class PersonalJournalsController < ApplicationController class PersonalJournalsController < 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
journal_papers = JournalPaper.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 journal_papers = JournalPaper.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?
"paper_title", fields_to_show = %w[
"journal_title", paper_title
"authors", journal_title
"year", authors
"issue_no", year
"vol_no", issue_no
"level_type" vol_no
] if fields_to_show.blank? level_type
]
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?
journal_papers_temp = JournalPaper.where(:is_hidden=>false).sort_by{ |tp| [-tp[:year].to_i,-tp[:publication_date].to_i] } journal_papers_temp = JournalPaper.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'
journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.paper_title, params[:keywords])} journal_papers_show = journal_papers_temp.select { |value| search_all_words(value.paper_title, params[:keywords]) }
else else
journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.create_link, params[:keywords])} journal_papers_show = journal_papers_temp.select { |value| search_all_words(value.create_link, params[:keywords]) }
end end
when "level_type" when 'level_type'
journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_levels.collect{|x| x.title}.join(', ').to_s, params[:keywords])} journal_papers_show = journal_papers_temp.select { |value| search_all_words(value.journal_levels.collect(&:title).join(', ').to_s, params[:keywords]) }
when "publication_date" when 'publication_date'
journal_papers_show = journal_papers_temp.select {|value| search_all_words((value.send("publication_date").strftime("%Y/%m/%d") rescue ""), params[:keywords])} journal_papers_show = journal_papers_temp.select { |value| search_all_words((value.send('publication_date').strftime('%Y/%m/%d') rescue ''), params[:keywords]) }
when "author_type" when 'author_type'
journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_author_types.collect{|jat| jat.title}.join(", "), params[:keywords])} journal_papers_show = journal_papers_temp.select { |value| search_all_words(value.journal_paper_author_types.collect(&:title).join(', '), params[:keywords]) }
when "language" when 'paper_type'
journal_papers_show = journal_papers_temp.select {|value| search_all_words((!value.language.nil? ? t("#{value.language}") : ""), params[:keywords])} journal_papers_show = journal_papers_temp.select { |value| search_all_words((value.journal_paper_type.title rescue ''), params[:keywords]) }
when 'language'
journal_papers_show = journal_papers_temp.select { |value| search_all_words((!value.language.nil? ? t(value.language.to_s) : ''), params[:keywords]) }
else else
journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.send(params[:selectbox]).to_s, params[:keywords])} journal_papers_show = journal_papers_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 journal_papers = journal_papers_show[(page_to_show - 1) * page_data_count...page_to_show * page_data_count]
else journal_papers_total_pages = (journal_papers_show.length / page_data_count.to_f).ceil
page_to_show = params[:page_no].to_i
end
journal_papers = journal_papers_show[(page_to_show-1)*OrbitHelper.page_data_count...page_to_show*OrbitHelper.page_data_count]
journal_papers_total_pages = (journal_papers_show.length/OrbitHelper.page_data_count.to_f).ceil
else else
journal_papers_total_pages = journal_papers.total_pages journal_papers_total_pages = journal_papers.total_pages
end end
@ -60,127 +56,137 @@ class PersonalJournalsController < 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(journal_paper.to_param)}'>#{journal_paper.paper_title}</a>"} t << { 'value' => "<a href='#{OrbitHelper.url_to_show(journal_paper.to_param)}'>#{journal_paper.paper_title}</a>" }
else else
t << {"value" => "<a href='#{OrbitHelper.url_to_show(journal_paper.to_param)}'>#{journal_paper.create_link}</a>"} t << { 'value' => "<a href='#{OrbitHelper.url_to_show(journal_paper.to_param)}'>#{journal_paper.create_link}</a>" }
end end
when "level_type" when 'level_type'
t << {"value" => ( !journal_paper.journal_levels.blank? ? "(#{journal_paper.journal_levels.collect{|x| x.title}.join(', ')})" : nil)} t << { 'value' => (!journal_paper.journal_levels.blank? ? "(#{journal_paper.journal_levels.collect(&:title).join(', ')})" : nil) }
when "publication_date" when 'publication_date'
t << {"value" => (journal_paper.send(fs).strftime("%Y/%m") rescue "")} t << { 'value' => (journal_paper.send(fs).strftime('%Y/%m') rescue '') }
when "author_type" when 'author_type'
t << {"value" => (journal_paper.journal_paper_author_types.collect{|jat| jat.title}.join(", ") rescue "")} t << { 'value' => (journal_paper.journal_paper_author_types.collect(&:title).join(', ') rescue '') }
when "language" when 'paper_type'
t << {"value" => (!journal_paper.language.nil? ? t("#{journal_paper.language}") : "")} t << { 'value' => (journal_paper.journal_paper_type.title rescue '') }
when 'language'
t << { 'value' => (!journal_paper.language.nil? ? t(journal_paper.language.to_s) : '') }
else else
t << {"value" => journal_paper.send(fs)} t << { 'value' => (journal_paper.send(fs) rescue '') }
end end
end end
journal_paper_list << {"jps" => t} journal_paper_list << { 'jps' => t }
end end
headers = [] headers = []
choice_show = [] choice_show = []
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_journal.#{fs}"), 'head-title' => t("personal_journal.#{fs}"),
"col" => col 'col' => col
} }
choice_show << t("personal_journal.#{fs}") choice_show << t("personal_journal.#{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_journal.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_journal.search_class')
search_text = params[:locale]!='en' ? "關鍵字搜尋:" : "word to search:" search_text = t('personal_journal.word_to_search')
{ {
"journal_papers" => journal_paper_list, 'journal_papers' => journal_paper_list,
"headers" => headers, 'headers' => headers,
"extras" => {"widget-title" => t("module_name.journal_paper"), 'extras' => { 'widget-title' => t('module_name.journal_paper'),
"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] },
"total_pages" => journal_papers_total_pages, 'total_pages' => journal_papers_total_pages,
"choice" => choice 'choice' => choice
} }
end end
def show def show
params = OrbitHelper.params params = OrbitHelper.params
plugin = JournalPaper.where(:is_hidden=>false).find_by(uid: params[:uid]) plugin = JournalPaper.where(is_hidden: false).find_by(uid: params[:uid])
fields_to_show = [ fields_to_show = %w[
"year", year
"authors", authors
"author_type", author_type
"paper_title", paper_title
"journal_title", journal_title
"vol_no", vol_no
"issue_no", issue_no
"form_to_start", form_to_start
"form_to_end", form_to_end
"level_type", level_type
"paper_type", paper_type
"total_pages", total_pages
"publication_date", publication_date
"isbn", isbn
"abstract", abstract
"language", language
"url", url
"associated_project", associated_project
"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[
"year", year
"authors", authors
"author_type", author_type
"paper_title", paper_title
"journal_title", journal_title
"vol_no", vol_no
"issue_no", issue_no
"form_to_start", form_to_start
"form_to_end", form_to_end
"level_type", level_type
"paper_type", paper_type
"total_pages", total_pages
"publication_date", publication_date
"isbn", isbn
"abstract", abstract
"language", language
"url" url
] ]
@fields_to_show = @fields_to_show.map{|fs| [t("personal_journal.#{fs}"), fs]} @fields_to_show = @fields_to_show.map { |fs| [t("personal_journal.#{fs}"), fs] }
@default_fields_to_show = [ @default_fields_to_show = %w[
"paper_title", paper_title
"journal_title", journal_title
"authors", authors
"year", year
"issue_no", issue_no
"vol_no", vol_no
"level_type" level_type
] ]
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

16
app/models/journal_paper.rb
View File

@ -36,7 +36,7 @@ class JournalPaper
has_and_belongs_to_many :journal_levels has_and_belongs_to_many :journal_levels
has_many :journal_paper_files, autosave: true, dependent: :destroy has_many :journal_paper_files, autosave: true, dependent: :destroy
accepts_nested_attributes_for :journal_paper_files accepts_nested_attributes_for :journal_paper_files, :allow_destroy => true
# has_and_belongs_to_many :journal_paper_authors, dependent: :destroy # has_and_belongs_to_many :journal_paper_authors, dependent: :destroy
# accepts_nested_attributes_for :journal_paper_authors # accepts_nested_attributes_for :journal_paper_authors
@ -160,11 +160,11 @@ class JournalPaper
# end # end
# def save_journal_paper_files # def save_journal_paper_files
# self.journal_paper_files.each do |t| # self.journal_paper_files.each do |t|
# if t.should_destroy # if t.should_destroy
# t.destroy # t.destroy
# end # end
# end # end
# end # end
# def save_journal_paper_authors # def save_journal_paper_authors
@ -211,8 +211,8 @@ class JournalPaper
files = [] files = []
self.journal_paper_files.each do |file| self.journal_paper_files.each do |file|
url = file.journal_file.url url = file.journal_file.url
title = (file.title.blank? ? File.basename(file.journal_file.path) : file.title) title = ((file.title.blank? ? File.basename(file.journal_file.path) : 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

2
app/views/admin/journal_papers/_form_file.html.erb
View File

@ -38,7 +38,7 @@
<span class="remove_existing_record add-on btn" title="<%= t(:remove) %>"> <span class="remove_existing_record add-on btn" title="<%= t(:remove) %>">
<%= f.hidden_field :id %> <%= f.hidden_field :id %>
<a class="icon-remove"></a> <a class="icon-remove"></a>
<%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %>
</span> </span>
<% end %> <% end %>
</div> </div>

2
app/views/admin/journal_papers/_writing_journal.html.erb
View File

@ -2,7 +2,7 @@
<tr id="<%= dom_id writing_journal %>" class="with_action"> <tr id="<%= dom_id writing_journal %>" class="with_action">
<td class="span1"><%= writing_journal.year %></td> <td class="span1"><%= writing_journal.year %></td>
<td class="span1"> <td class="span1">
<%= link_to writing_journal.create_link, page_for_journal_paper(writing_journal), target: "blank"%> <%= link_to writing_journal.create_link, OrbitHelper.url_to_plugin_show(writing_journal.to_param,'personal_journal').to_s, target: "blank"%>
<div class="quick-edit"> <div class="quick-edit">
<ul class="nav nav-pills hide"> <ul class="nav nav-pills hide">
<li><%= link_to t('edit'), edit_admin_journal_paper_path(writing_journal) %></li> <li><%= link_to t('edit'), edit_admin_journal_paper_path(writing_journal) %></li>

3
config/locales/en.yml
View File

@ -3,6 +3,9 @@ en:
personal_journal: Journal Paper personal_journal: Journal Paper
journal_paper: Journal Paper journal_paper: Journal Paper
personal_journal: personal_journal:
select_class: "——select class——"
search_class: "search class:"
word_to_search: "word to search:"
paper_title : "Paper Title" paper_title : "Paper Title"
associated_project: Associated Project associated_project: Associated Project
paper_type : "Paper Type" paper_type : "Paper Type"

3
config/locales/zh_tw.yml
View File

@ -3,6 +3,9 @@ zh_tw:
personal_journal: 期刊論文 personal_journal: 期刊論文
journal_paper: 期刊論文 journal_paper: 期刊論文
personal_journal: personal_journal:
select_class: "——選取分類——"
search_class: "搜尋類別:"
word_to_search: "關鍵字搜尋:"
associated_project: "所屬計畫案" associated_project: "所屬計畫案"
number_of_authors: "著作人數" number_of_authors: "著作人數"
paper_title : "論文名稱" paper_title : "論文名稱"

1
get_rail_path.rb Normal file
View File

@ -0,0 +1 @@
puts Rails.root

0
modules/.gitkeep Normal file
View File

0
modules/personal_journal/.gitkeep Normal file
View File

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

@ -0,0 +1,14 @@
<table class="table table-hover table-striped projects-index">
<caption><h3>{{widget-title}}</h3></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="journal_papers">
<tr data-level="1" data-list="jps">
<td>{{value}}</td>
</tr>
</tbody>
</table>
{{pagination_goes_here}}

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

20
modules/personal_journal/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_journal/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_journal/thumbs/.gitkeep Normal file
View File

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

15
personal_journal.gemspec
View File

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