Merge branch 'master' of github.com:Rulingcom/orbit into openness
This commit is contained in:
Matthew K. Fu JuYuan committed
commit
fda7c43efc
726 files changed
+2078
-1903
No files matched your search
@@ -0,0 +1,136 @@
|
||||
class Desktop::JournalPagesController < ApplicationController
|
||||
|
||||
def index
|
||||
@writing_journal = WritingJournal.where(create_user_id: current_user.id)
|
||||
@level_types = JournalLevelType.all
|
||||
|
||||
respond_to do |format|
|
||||
format.html { render :layout => false}
|
||||
end
|
||||
end
|
||||
|
||||
def show
|
||||
end
|
||||
|
||||
def new
|
||||
@writing_journal = WritingJournal.new
|
||||
@level_types = JournalLevelType.all
|
||||
@author_types = JournalAuthorType.all
|
||||
@paper_types= JournalPaperType.all
|
||||
|
||||
respond_to do |format|
|
||||
format.html { render :layout => false}
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
def edit
|
||||
@writing_journal= WritingJournal.find(params[:id])
|
||||
@level_types = JournalLevelType.all
|
||||
@author_types = JournalAuthorType.all
|
||||
@paper_types= JournalPaperType.all
|
||||
respond_to do |format|
|
||||
format.html { render :layout => false}
|
||||
end
|
||||
end
|
||||
|
||||
def create
|
||||
if params[:commit].eql?"Save"
|
||||
if not params[:writing_journal][:publication_date].nil?
|
||||
params[:writing_journal][:publication_date] = \
|
||||
Date.new *(params[:writing_journal][:publication_date].split("/").map{|s| s.to_i})
|
||||
end
|
||||
|
||||
params[:writing_journal][:create_user_id] = current_user.id
|
||||
|
||||
@writing_journal = WritingJournal.new(params[:writing_journal])
|
||||
if @writing_journal.save
|
||||
# respond_to do |format|
|
||||
# format.html { redirect_to desktop_journal_pages_url, :layout => false, notice: 'User was successfully created.'}
|
||||
# # format.json { render json: @writing_journal, status: :created, location: @writing_journal}
|
||||
# # format.js
|
||||
# end
|
||||
render :json => {"success"=>true,"msg"=>"Paper successfully saved!"}.to_json
|
||||
else
|
||||
render :json => {"success"=>false,"msg"=>"Saving failed!"}
|
||||
end
|
||||
|
||||
end
|
||||
render :json => {"success"=>true,"msg"=>"Paper successfully saved!"}.to_json
|
||||
|
||||
end
|
||||
|
||||
def update
|
||||
if params[:commit].eql?"Save"
|
||||
@writing_journal= WritingJournal.find(params[:id])
|
||||
end
|
||||
|
||||
if not params[:writing_journal][:publication_date].nil?
|
||||
params[:writing_journal][:publication_date] = \
|
||||
Date.new *(params[:writing_journal][:publication_date].split("/").map{|s| s.to_i})
|
||||
end
|
||||
|
||||
respond_to do |format|
|
||||
if @writing_journal.update_attributes(params[:writing_journal])
|
||||
format.html { redirect_to desktop_journal_pages_url, :layout => false, notice: 'User was successfully updated.'}
|
||||
format.json { head :no_content }
|
||||
else
|
||||
format.html { render action: "edit" }
|
||||
format.json { render json: @user.errors, status: :unprocessable_entity }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def check_file_type file
|
||||
if not file.nil?
|
||||
file_type = MIME::Types.type_for(file).first.to_s.split("/")[1]
|
||||
|
||||
# case file_type
|
||||
# when "jpg", "jpeg"
|
||||
# type = "jpg"
|
||||
# when "text", "txt"
|
||||
# type = "txt"
|
||||
# when "pdf"
|
||||
# type = "pdf"
|
||||
# when "png"
|
||||
# type = "png"
|
||||
# else "readme"
|
||||
# end
|
||||
|
||||
file_type = "/assets/ft-icons/#{file_type}/#{file_type}-48_32.png"
|
||||
else
|
||||
file_type = ""
|
||||
end
|
||||
end
|
||||
|
||||
def get_journals_json
|
||||
publications = WritingJournal.where(create_user_id: current_user.id)
|
||||
|
||||
sort_publications= Hash.new
|
||||
data = Array.new
|
||||
|
||||
publications.each do |publication|
|
||||
if sort_publications[publication.journal_title].nil?
|
||||
sort_publications[publication.journal_title] = Array.new
|
||||
end
|
||||
sort_publications[publication.journal_title] <<
|
||||
{ title: publication.paper_title,
|
||||
keywords: publication.keywords,
|
||||
abstract: publication.abstract,
|
||||
level: publication.journal_paper_type_id,
|
||||
coauthors: publication.authors,
|
||||
year: publication.year,
|
||||
url_edit: edit_desktop_journal_page_path(publication),
|
||||
files: publication.writing_journal_files.collect{|file|
|
||||
{title: file.title, url: file.file.url, icon: check_file_type(file.file.url)}
|
||||
}
|
||||
}
|
||||
end
|
||||
|
||||
sort_publications.each do |journal, papers|
|
||||
data << {title: journal, papers: papers}
|
||||
end
|
||||
|
||||
render json: JSON.pretty_generate(data)
|
||||
end
|
||||
end
|
||||
@@ -1,74 +1,59 @@
|
||||
require 'mime/types'
|
||||
|
||||
class DesktopPublicationsController< ApplicationController
|
||||
def journal_p
|
||||
render "desktop/journal_p", :layout => false
|
||||
end
|
||||
|
||||
def journal_p_list
|
||||
render "desktop/journal_pages/list", :layout => false
|
||||
end
|
||||
|
||||
def journal_p_add
|
||||
render "desktop/journal_pages/add", :layout => false
|
||||
end
|
||||
def journal_p
|
||||
render "desktop/journal_p", :layout => false
|
||||
end
|
||||
|
||||
def books
|
||||
render "desktop/books", :layout => false
|
||||
end
|
||||
def books
|
||||
render "desktop/books", :layout => false
|
||||
end
|
||||
|
||||
def books_list
|
||||
render "desktop/books/list", :layout => false
|
||||
end
|
||||
def books_list
|
||||
render "desktop/books/list", :layout => false
|
||||
end
|
||||
|
||||
def books_add
|
||||
render "desktop/books/add", :layout => false
|
||||
end
|
||||
def books_add
|
||||
render "desktop/books/add", :layout => false
|
||||
end
|
||||
|
||||
def seminar_p
|
||||
render "desktop/seminar_p", :layout => false
|
||||
end
|
||||
def seminar_p
|
||||
render "desktop/seminar_p", :layout => false
|
||||
end
|
||||
|
||||
def seminar_p_list
|
||||
render "desktop/seminar_pages/list", :layout => false
|
||||
end
|
||||
def seminar_p_list
|
||||
render "desktop/seminar_pages/list", :layout => false
|
||||
end
|
||||
|
||||
def seminar_p_add
|
||||
render "desktop/seminar_pages/add", :layout => false
|
||||
end
|
||||
def seminar_p_add
|
||||
render "desktop/seminar_pages/add", :layout => false
|
||||
end
|
||||
|
||||
def create_journal
|
||||
Journal.create(user_id: current_user.id, title: "Ice Cream Sandwich")
|
||||
b = Array.new
|
||||
b << {"success"=>"true"}
|
||||
render :json=>b.to_json
|
||||
end
|
||||
|
||||
def getjournals
|
||||
@journals = current_user.journals
|
||||
data = Array.new
|
||||
@journals.each do |journal|
|
||||
@papers = journal.papers.all
|
||||
data << {"title" => journal.title, "papers" => @papers}
|
||||
end
|
||||
render :json=>data.to_json
|
||||
end
|
||||
|
||||
def delete_journal
|
||||
@journals = Journal.find("")
|
||||
@journals.delete
|
||||
b = Array.new
|
||||
b << {"success"=>"true"}
|
||||
render :json=>b.to_json
|
||||
end
|
||||
|
||||
def update_journal
|
||||
@journal = Journal.find("4ff2d6ebbd98eb02b9000017")
|
||||
@papers = @journal.papers
|
||||
@papers.each do |paper|
|
||||
paper.update_attributes(:user_id => current_user.id)
|
||||
end
|
||||
b = Array.new
|
||||
|
||||
b << {"success"=>"true"}
|
||||
render :json=>b.to_json
|
||||
end
|
||||
# def create_journal
|
||||
# Journal.create(user_id: current_user.id, title: "Ice Cream Sandwich")
|
||||
# b = Array.new
|
||||
# b << {"success"=>"true"}
|
||||
# render :json=>b.to_json
|
||||
# end
|
||||
#
|
||||
#
|
||||
# def delete_journal
|
||||
# @journals = Journal.find("")
|
||||
# @journals.delete
|
||||
# b = Array.new
|
||||
# b << {"success"=>"true"}
|
||||
# render :json=>b.to_json
|
||||
# end
|
||||
#
|
||||
# def update_journal
|
||||
# @journal = Journal.find("4ff2d6ebbd98eb02b9000017")
|
||||
# @papers = @journal.papers
|
||||
# @papers.each do |paper|
|
||||
# paper.update_attributes(:user_id => current_user.id)
|
||||
# end
|
||||
# b = Array.new
|
||||
#
|
||||
# b << {"success"=>"true"}
|
||||
# render :json=>b.to_json
|
||||
# end
|
||||
end
|
||||
Reference in new issue
Block a user