diff --git a/app/controllers/admin/books_controller.rb b/app/controllers/admin/books_controller.rb index 43303e8..63b1a7f 100644 --- a/app/controllers/admin/books_controller.rb +++ b/app/controllers/admin/books_controller.rb @@ -8,6 +8,44 @@ class Admin::BooksController < OrbitMemberController before_action :need_access_right before_action :allow_admin_only, :only => [:index, :setting] + def merge_process + params['book_id'].each do |book_id| + book_ids = book_id.split('/') + books = Book.find(book_ids) + member_ids = books.collect(&:member_profile_id).uniq + books.each_with_index do |book,index1| + if index1== 0 + book.member_profile_id = member_ids + book.save! + else + book.delete + end + end + end + redirect_to :action=> 'index' + end + def merge + @books=Book.order_by(:year=>'desc').map{|value| value}.group_by{|v| [v[:book_title],v[:isbn]]} + @books.each do |key,value| + if value.length<=1 + @books.delete key + end + end + if params['mode']!='simple' + @books.each do |key,value| + @books[key] = value.group_by{|v| [get_publisher(v),get_author_type(v),get_paper_type(v),get_publication_date(v)]} + @books[key].each do |key1,value1| + if value1.length<=1 + @books[key].delete key1 + end + end + if @books[key].length==0 + @books.delete key + end + end + + end + end def index @writing_books = Book.order_by(:year=>'desc').page(params[:page]).per(10) @@ -49,14 +87,15 @@ class Admin::BooksController < OrbitMemberController end def edit - @member = @book.member_profile + @member = get_member(@book) if params[:desktop] render :layout => false end end def update - @member = @book.member_profile + @member = get_member(@book) + book_params['member_profile_id'] = params[:author_members] @book.update_attributes(book_params) @book.save if params[:desktop] == "true" @@ -68,7 +107,7 @@ class Admin::BooksController < OrbitMemberController def new @book = Book.new - @member = MemberProfile.find_by(:uid=>params['uid']) rescue nil + @member = Array(MemberProfile.find_by(:uid=>params['uid'])) rescue nil if params[:desktop] render :layout => false end @@ -90,9 +129,9 @@ class Admin::BooksController < OrbitMemberController elsif !params[:author_members].blank? - params[:author_members].each do |author_member| + #params[:author_members].each do |author_member| - book_params['member_profile_id'] = author_member + book_params['member_profile_id'] = params[:author_members] @book = Book.new(book_params) @book.save @@ -100,7 +139,7 @@ class Admin::BooksController < OrbitMemberController render json: {"data" => get_paper_list}.to_json end - end + #end redirect_to params['referer_url'] diff --git a/app/controllers/personal_books_controller.rb b/app/controllers/personal_books_controller.rb index 11964ee..218d03a 100644 --- a/app/controllers/personal_books_controller.rb +++ b/app/controllers/personal_books_controller.rb @@ -1,4 +1,5 @@ class PersonalBooksController < ApplicationController + include Admin::PersonalBooksHelper def index params = OrbitHelper.params page_data_count = OrbitHelper.page_data_count @@ -45,6 +46,10 @@ class PersonalBooksController < ApplicationController books_show = books_temp.select { |value| search_all_words((value.book_type.title rescue ''), params[:keywords]) } when 'language' books_show = books_temp.select { |value| search_all_words((!value.language.nil? ? t(value.language.to_s) : ''), params[:keywords]) } + when 'authors' + books_show = books_temp.select { |value| search_all_words(get_authors_text(value), params[:keywords]) } + when 'note' + books_show = books_temp.select { |value| search_all_words(Nokogiri::HTML(value.note).text, params[:keywords]) } else books_show = books_temp.select { |value| search_all_words(value.send(params[:selectbox]).to_s, params[:keywords]) } end @@ -73,6 +78,10 @@ class PersonalBooksController < ApplicationController t << { 'value' => (!book.language.nil? ? t(book.language.to_s) : '') } when 'book_paper_type' t << { 'value' => (book.book_type.title rescue '') } + when 'url' + t << { 'value' => book.url.to_s.blank? ? "" : "#{book.url}"} + when 'authors' + t << { 'value' => get_authors_show(book) } else t << { 'value' => (book.send(fs) rescue '') } end @@ -135,6 +144,7 @@ class PersonalBooksController < ApplicationController file publication_date language + note ] { 'plugin_datas' => plugin.get_plugin_data(fields_to_show) } @@ -158,6 +168,7 @@ class PersonalBooksController < ApplicationController url publication_date language + note ] @fields_to_show = @fields_to_show.map { |fs| [t("personal_book.#{fs}"), fs] } @default_fields_to_show = %w[ diff --git a/app/helpers/admin/personal_books_helper.rb b/app/helpers/admin/personal_books_helper.rb index c51cc41..87e6daa 100644 --- a/app/helpers/admin/personal_books_helper.rb +++ b/app/helpers/admin/personal_books_helper.rb @@ -1,5 +1,25 @@ module Admin::PersonalBooksHelper - + def get_authors_text(book) + (book.authors.to_s.blank? ? get_member(book).collect(&:name).join('/') : Nokogiri::HTML(book.authors.to_s).text rescue '') + end + def get_authors_show(book) + (book.authors.to_s.blank? ? get_member(book).collect{|member| "#{member.name}"}.join('/') : book.authors.to_s rescue '') + end + def get_member(book) + Array(MemberProfile.find(Array(book).collect(&:member_profile_id))) + end + def get_publisher(book) + book.publisher + end + def get_author_type(book) + book.book_author_types.collect(&:title).join(', ') rescue '' + end + def get_paper_type(book) + !book.book_type.blank? ? book.book_type.title : nil + end + def get_publication_date(book) + book.publication_date.strftime('%Y/%m/%d') rescue '' + end def get_paper_list user = current_user.nil? ? OrbitHelper.current_user : current_user user_profile = user.member_profile diff --git a/app/models/book.rb b/app/models/book.rb index b871f30..03b559c 100644 --- a/app/models/book.rb +++ b/app/models/book.rb @@ -2,7 +2,7 @@ class Book include Mongoid::Document include Mongoid::Timestamps include Mongoid::Attributes::Dynamic - + include Admin::PersonalBooksHelper include OrbitModel::Status include MemberHelper include Slug @@ -175,6 +175,10 @@ class Book files << (url.nil? ? "" : "
  • #{title}
    • ") end value = files.join("") + when "url" + value = self.url.to_s.blank? ? "" : "#{self.url}" + when "authors" + value = get_authors_show(self) else value = self.send(field) rescue "" end diff --git a/app/views/admin/books/_form.html.erb b/app/views/admin/books/_form.html.erb index 4ec80b8..9b10d38 100644 --- a/app/views/admin/books/_form.html.erb +++ b/app/views/admin/books/_form.html.erb @@ -87,7 +87,7 @@
    <%= f.fields_for :authors_translations do |f| %> - <%= f.text_area locale, class: "input-block-level", placeholder: t("personal_book.authors"), value: (@book.authors_translations[locale] rescue nil) %> + <%= f.text_area locale, class: "ckeditor input-block-level", placeholder: t("personal_book.authors"), value: (@book.authors_translations[locale] rescue nil) %> <% end %>
    @@ -141,26 +141,17 @@
    - <% if !@member.nil? %> -
    - <%= @member.name rescue ''%> - <%= f.hidden_field :member_profile_id, :value => @member.id %> -
    -
    - - <% else %> - -
    - -
    - <%= render partial: 'admin/member_selects/email_selection_box', locals: {field: 'author_members[]', email_members:[]} %> + <% if !@member.nil? %> + <%= render partial: 'admin/member_selects/email_selection_box', locals: {field: 'author_members[]', email_members:@member} %> + <% else %> + <%= render partial: 'admin/member_selects/email_selection_box', locals: {field: 'author_members[]', email_members:[]} %> + <% end %>
    - <% end %>
    @@ -263,7 +254,7 @@
    - <%= f.text_area :note, rows: 2, class: "input-block-level" %> + <%= f.text_area :note, rows: 2, class: "ckeditor input-block-level" %>
    diff --git a/app/views/admin/books/_writing_book.html.erb b/app/views/admin/books/_writing_book.html.erb index 53140f2..47dcd36 100644 --- a/app/views/admin/books/_writing_book.html.erb +++ b/app/views/admin/books/_writing_book.html.erb @@ -2,7 +2,7 @@ <%= writing_book.year %> - <%= link_to writing_book.create_link, OrbitHelper.url_to_plugin_show(writing_book.to_param,'personal_book'), target: "blank" %> + <%= link_to Nokogiri::HTML(writing_book.create_link).text, OrbitHelper.url_to_plugin_show(writing_book.to_param,'personal_book'), target: "blank" %>
      <% if current_user.is_admin? %> diff --git a/app/views/admin/books/index.html.erb b/app/views/admin/books/index.html.erb index b2274c1..9ef1ffe 100644 --- a/app/views/admin/books/index.html.erb +++ b/app/views/admin/books/index.html.erb @@ -1,3 +1,19 @@ + + @@ -14,8 +30,12 @@
      +
      diff --git a/app/views/admin/books/merge.html.erb b/app/views/admin/books/merge.html.erb new file mode 100644 index 0000000..4b130c1 --- /dev/null +++ b/app/views/admin/books/merge.html.erb @@ -0,0 +1,118 @@ +<%= csrf_meta_tags %> +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/main-forms" %> + <%= stylesheet_link_tag "lib/fileupload" %> + <%= stylesheet_link_tag "lib/main-list" %> + <%= stylesheet_link_tag "lib/main-form-col2" %> + +<% end %> + + +
      + <%= t('strict_compare_mode') +':' %> + + <% if params['mode']!='simple' %> + <%= t('yes_') %> + <% else %> + <%= t('no_') %> + <% end %> + + +       +
      +<%= token_tag(nil) %> +
      + + + + +<% if params['mode']!='simple' %> + + + + +<% end %> + + + + + +<% @books.each do |key,books| %> + + <% if params['mode']=='simple' + len = books.length + else + len = books.values.reduce(0){|sum,num| sum+num.length} + end + %> + + + <% if params['mode']=='simple' %> + + <% books.each_with_index do |book,i| %> + + <% if len!=(i+1) %> + + + <% end %> + <% end %> + <% else %> + <% i=0 %> + <% books.each do |k,v| %> + <% len1 = v.length %> + <% k.each do |keychild| %> + + <% end %> + + <% v.each_with_index do |book_child,index1| %> + + <% if len1!=index1 %> + + + <% end %> + <% end %> + <% if len1!=(i+1) %> + + + <% end %> + <% i =i+1 %> + <% end %> + <% end %> + +<% end %> + +
      <%= t('personal_book.book_title') %><%= t('personal_book.isbn') %><%= t('personal_book.publisher') %><%= t('personal_book.author_type') %><%= t('personal_book.book_paper_type') %><%= t('personal_book.publication_date') %><%= t("personal_book.merge") %><%= t("personal_book.author") %>
      + <%= key[0].values.map{|v| v=="" ? t('personal_book.no_input') : v}.join('/') %> + + <%= key[1] %> + + + + + <%= get_member(book).collect(&:name).join(' / ') rescue t('personal_book.no_input') %> + +
      + <%= keychild.to_s.blank? ? t('personal_book.no_input') : keychild %> + + + + + <%= get_member(book_child).collect(&:name).join(' / ') rescue t('personal_book.no_input') %> + +
      + \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 17cc397..e40f7e8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -4,6 +4,9 @@ en: book_paper: "Book / Book Chapter" personal_book: "Book / Book Chapter" personal_book: + merge: Merge + upload: Upload + no_input: No Input select_class: "——select class——" search_class: "search class:" word_to_search: "word to search:" @@ -43,7 +46,7 @@ en: graph_by : "Graph By" frontend: writing_books: "Book Front－end" - + strict_compare_mode: Strict Compare mode create_success : "Successfully Create" update_success : "Successfully Update" delete_success : "Successfully Delete" diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index c51ef1a..f1418cf 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -4,6 +4,9 @@ zh_tw: book_paper: "專書 / 專書章節" personal_book : "專書 / 專書章節" personal_book: + merge: "合併" + upload: "上傳" + no_input: "未輸入" select_class: "——選取分類——" search_class: "搜尋類別:" word_to_search: "關鍵字搜尋:" @@ -43,7 +46,7 @@ zh_tw: graph_by : "Graph By" frontend: writing_books: "專書前台" - + strict_compare_mode: "嚴格比較模式" create_success : "新增完成!!" update_success : "更新完成!!" delete_success : "刪除成功!!" diff --git a/config/routes.rb b/config/routes.rb index fdd0070..ef2b3f8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,6 +8,8 @@ Rails.application.routes.draw do resources :books do collection do + post 'merge_process' => 'books#merge_process' + get 'merge' => 'books#merge' get 'toggle_hide' => 'books#toggle_hide' get 'analysis' get 'analysis_report'