From b06bd513474f0869713c8138b2f810303ee80c7d Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 31 Dec 2015 17:06:49 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=BA=93=E6=9B=B4=E6=96=B0=E8=B5=84=E6=BA=90=E5=85=AC=E5=BC=80?= =?UTF-8?q?=E7=A7=81=E6=9C=89=E5=B1=9E=E6=80=A7=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=20=E9=9C=80=E8=A6=81=E5=8C=BA=E5=88=86=20=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/attachments/update_file_dense.js.erb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/views/attachments/update_file_dense.js.erb b/app/views/attachments/update_file_dense.js.erb index 110d3fc7c..747024dec 100644 --- a/app/views/attachments/update_file_dense.js.erb +++ b/app/views/attachments/update_file_dense.js.erb @@ -1,5 +1,10 @@ +<% if @attachment.container_type == 'Course' %> $("#is_public_<%= @attachment.id %>").html("<%= escape_javascript(link_to (@attachment.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>@attachment.id,:newtype=>(@attachment.is_public? ? 0:1)), :remote=>true,:class=>"postOptionLink",:method => :post) %>"); +<%else%> +$("#is_public_<%= @attachment.id %>").html("<%= escape_javascript(link_to (@attachment.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>@attachment.id,:newtype=>(@attachment.is_public? ? 0:1)), + :remote=>true,:class=>"f_l re_open",:method => :post) %>"); +<%end %> <%if @attachment.is_public? %> $("#image_private_<%= @attachment.id%>").html('') <%else%> From 3dac8d29440de6e53010a0c250109671bb4e4bde Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 31 Dec 2015 17:53:05 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E8=AF=BE=E7=A8=8B/=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=B8=96=E5=AD=90=E7=9A=84=E7=BC=96=E8=BE=91/=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E8=B7=B3=E8=BD=AC=20=20=E6=89=80=E6=9C=89=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=83=BD=E6=9C=89=E5=8F=91=E9=80=81=E5=B8=96=E5=AD=90?= =?UTF-8?q?=E7=9A=84=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/messages_controller.rb | 83 ++++++++++--------- app/views/boards/_course_show_detail.html.erb | 2 +- .../boards/_project_show_detail.html.erb | 2 +- app/views/courses/_course_activity.html.erb | 2 +- app/views/messages/edit.html.erb | 4 +- app/views/messages/reply.js.erb | 4 +- .../projects/_project_activities.html.erb | 2 +- app/views/users/_course_message.html.erb | 28 ++++--- app/views/users/_project_message.html.erb | 25 +++--- app/views/users/_user_activities.html.erb | 4 +- 10 files changed, 86 insertions(+), 70 deletions(-) diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index ae13b7e78..304eada37 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -211,6 +211,8 @@ class MessagesController < ApplicationController end if params[:user_activity_id] @user_activity_id = params[:user_activity_id] + @is_course = params[:is_course] + @is_board = params[:is_board] respond_to do |format| format.js end @@ -239,38 +241,42 @@ class MessagesController < ApplicationController if request.post? && @message.save attachments = Attachment.attach_files(@message, params[:attachments]) render_attachment_warning_if_needed(@message) - flash[:notice] = l(:notice_successful_update) + #flash[:notice] = l(:notice_successful_update) @message.reload - if params[:is_board] + if params[:is_course] && params[:is_course].to_i == 0 + redirect_to user_activities_path(User.current.id) + elsif params[:is_course] && params[:is_course].to_i == 1 && params[:is_board] && params[:is_board].to_i == 0 if @project - redirect_to project_boards_path(@project) + redirect_to project_path(@project) elsif @course - redirect_to course_boards_path(@course) + redirect_to course_activity_path(@course) end - else - redirect_to board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id)) - end - elsif request.get? || request.post? - if params[:is_board] + elsif params[:is_course] && params[:is_course].to_i == 1 && params[:is_board] && params[:is_board].to_i == 1 if @project redirect_to project_boards_path(@project) elsif @course redirect_to course_boards_path(@course) end else - respond_to do |format| - format.html { - if @project - layout_file = 'base_projects' - elsif @course - layout_file = 'base_courses' - elsif @org_subfield - @organization = @org_subfield.organization - layout_file = 'base_org' - end - render :layout => layout_file - } - end + redirect_to board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id)) + end + elsif request.get? || request.post? + if params[:is_course] && params[:is_board] + @is_course = params[:is_course] + @is_board = params[:is_board] + end + respond_to do |format| + format.html { + if @project + layout_file = 'base_projects' + elsif @course + layout_file = 'base_courses' + elsif @org_subfield + @organization = @org_subfield.organization + layout_file = 'base_org' + end + render :layout => layout_file + } end end end @@ -286,25 +292,28 @@ class MessagesController < ApplicationController @message.destroy # modify by nwb if @project - if params[:is_board] - redirect_to project_boards_url(@project) + if params[:is_course] && params[:is_course].to_i == 0 + redirect_to user_activities_path(User.current.id) + elsif params[:is_course] && params[:is_course].to_i == 1 && params[:is_board] && params[:is_board].to_i == 0 + redirect_to project_path(@project) + elsif params[:is_course] && params[:is_course].to_i == 1 && params[:is_board] && params[:is_board].to_i == 1 + redirect_to project_boards_path(@project) + elsif @message.parent + redirect_to board_message_url(@board, @message.parent, :r => r) else - if @message.parent - redirect_to board_message_url(@board, @message.parent, :r => r) - else - redirect_to project_board_url(@project, @board) - end - # redirect_to board_message_url(@board, @topic, :r => @reply) + redirect_to project_board_url(@project, @board) end elsif @course - if params[:is_board] - redirect_to course_boards_url(@course) + if params[:is_course] && params[:is_course].to_i == 0 + redirect_to user_activities_path(User.current.id) + elsif params[:is_course] && params[:is_course].to_i == 1 && params[:is_board] && params[:is_board].to_i == 0 + redirect_to course_activity_path(@course) + elsif params[:is_course] && params[:is_course].to_i == 1 && params[:is_board] && params[:is_board].to_i == 1 + redirect_to course_boards_path(@course) + elsif @message.parent + redirect_to board_message_url(@board, @message.parent, :r => r) else - if @message.parent - redirect_to board_message_url(@board, @message.parent, :r => r) - else - redirect_to course_board_url(@course, @board) - end + redirect_to course_boards_path(@course) end elsif @org_subfield if params[:is_board] diff --git a/app/views/boards/_course_show_detail.html.erb b/app/views/boards/_course_show_detail.html.erb index 7b96c4f9a..75ee516c4 100644 --- a/app/views/boards/_course_show_detail.html.erb +++ b/app/views/boards/_course_show_detail.html.erb @@ -54,7 +54,7 @@ }); <% if topic %> - <%= render :partial => 'users/course_message', :locals => {:activity => topic, :user_activity_id => topic.id} %> + <%= render :partial => 'users/course_message', :locals => {:activity => topic, :user_activity_id => topic.id,:is_course=>1,:is_board=>1} %> <% end %> <% end %> diff --git a/app/views/boards/_project_show_detail.html.erb b/app/views/boards/_project_show_detail.html.erb index 8fb663aff..166978ee0 100644 --- a/app/views/boards/_project_show_detail.html.erb +++ b/app/views/boards/_project_show_detail.html.erb @@ -53,7 +53,7 @@ }); <% if topic %> - <%= render :partial => 'users/project_message', :locals => {:activity => topic, :user_activity_id => topic.id} %> + <%= render :partial => 'users/project_message', :locals => {:activity => topic, :user_activity_id => topic.id,:is_course=>1,:is_board=>1} %> <% end %> <% end %> diff --git a/app/views/courses/_course_activity.html.erb b/app/views/courses/_course_activity.html.erb index 2f2622f3c..ea41787d5 100644 --- a/app/views/courses/_course_activity.html.erb +++ b/app/views/courses/_course_activity.html.erb @@ -99,7 +99,7 @@ <% when 'News' %> <%= render :partial => 'users/course_news', :locals => {:activity => act, :user_activity_id => activity.id} %> <% when 'Message' %> - <%= render :partial => 'users/course_message', :locals => {:activity => act, :user_activity_id => activity.id} %> + <%= render :partial => 'users/course_message', :locals => {:activity => act, :user_activity_id => activity.id,:is_course=>1,:is_board=>0} %> <% when 'Poll' %> <%= render :partial => 'users/course_poll', :locals => {:activity => act, :user_activity_id => activity.id} %> <% when 'JournalsForMessage' %> diff --git a/app/views/messages/edit.html.erb b/app/views/messages/edit.html.erb index 6e54a88e1..89fe71c65 100644 --- a/app/views/messages/edit.html.erb +++ b/app/views/messages/edit.html.erb @@ -1,6 +1,6 @@ <% if @message.project %> <%= form_for @message, {:as => :message, - :url => {:action => 'edit'}, + :url => {:action => 'edit',:is_course=>@is_course,:is_board=>@is_board}, :html => {:multipart => true, :id => 'message-form', :method => :post} @@ -14,7 +14,7 @@ <% elsif @message.course %> <%= form_for @message, { :as => :message, - :url => {:action => 'edit'}, + :url => {:action => 'edit',:is_course=>@is_course,:is_board=>@is_board}, :html => {:multipart => true, :id => 'message-form', :method => :post} diff --git a/app/views/messages/reply.js.erb b/app/views/messages/reply.js.erb index c0da5ab9b..f33986c59 100644 --- a/app/views/messages/reply.js.erb +++ b/app/views/messages/reply.js.erb @@ -1,7 +1,7 @@ <%if @project%> - $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>"); + $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:is_course=>@is_course,:is_board=>@is_board}) %>"); <%elsif @course%> - $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>"); + $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:is_course=>@is_course,:is_board=>@is_board}) %>"); <% elsif @org_subfield %> $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_subfield_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>"); <%end%> diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb index b46522fa1..b3ae89cf2 100644 --- a/app/views/projects/_project_activities.html.erb +++ b/app/views/projects/_project_activities.html.erb @@ -61,7 +61,7 @@ <% when "Message" %> - <%= render :partial => 'users/project_message', :locals => {:activity => activity.forge_act,:user_activity_id =>activity.id} %> + <%= render :partial => 'users/project_message', :locals => {:activity => activity.forge_act,:user_activity_id =>activity.id,:is_course=>1,:is_board=>0} %> <% when "News" %> <% if !activity.forge_act.nil? and activity.forge_act.project %> diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index 3633b2134..22a4bcf57 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -44,33 +44,37 @@
- <% if activity.author.id == User.current.id%> - +
@@ -137,7 +141,7 @@
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %>
- <%= form_for('new_form',:url => {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%> + <%= form_for('new_form',:url => {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => is_board,is_course=>is_course},:method => "post", :remote => true) do |f|%> diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index c31e4ac2e..8017081c6 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -44,33 +44,36 @@
- <% if activity.author.id == User.current.id%> -
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index 5cadcddd6..bb1a42f58 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -69,7 +69,7 @@ <% when 'News' %> <%= render :partial => 'course_news', :locals => {:activity => act,:user_activity_id =>user_activity.id} %> <% when 'Message'%> - <%= render :partial => 'course_message', :locals => {:activity => act,:user_activity_id =>user_activity.id} %> + <%= render :partial => 'course_message', :locals => {:activity => act,:user_activity_id =>user_activity.id,:is_course=>0,:is_board=>0} %> <% when 'Poll' %> <%= render :partial => 'course_poll', :locals => {:activity => act, :user_activity_id => user_activity.id} %> <% when 'Course'%> @@ -82,7 +82,7 @@ <% when 'Issue' %> <%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity_id =>user_activity.id} %> <% when 'Message' %> - <%= render :partial => 'project_message', :locals => {:activity => act,:user_activity_id =>user_activity.id} %> + <%= render :partial => 'project_message', :locals => {:activity => act,:user_activity_id =>user_activity.id,:is_course=>0,:is_board=>0} %> <% when 'ProjectCreateInfo'%> <%= render :partial => 'project_create', :locals => {:activity => act,:user_activity_id =>user_activity.id} %> <% end %> From 11444f43f0f43546fa02966e278a641a5e7e0afb Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 31 Dec 2015 17:55:48 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3issue=E5=A4=9A=E9=99=84?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=88=A0=E9=99=A4=E4=B8=80=E4=B8=AA=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E5=90=8E=EF=BC=8C=E6=8F=90=E4=BA=A4=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E7=99=BD=E8=89=B2=E6=A1=86=E6=A1=86=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/attachments_controller.rb | 12 +- db/schema.rb | 272 ++++++++++++++++++---- 2 files changed, 234 insertions(+), 50 deletions(-) diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 36093f33b..fd43977ee 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -229,7 +229,11 @@ class AttachmentsController < ApplicationController @attachment.container.init_journal(User.current) end if @attachment.container - @attachment.container.attachments.delete(@attachment) + if @attachment.container_type == "Issue" + @attachment.destroy + else + @attachment.container.attachments.delete(@attachment) + end else @attachment.destroy end @@ -281,7 +285,7 @@ class AttachmentsController < ApplicationController format.js end end - + def delete_homework @bid = @attachment.container.bid # Make sure association callbacks are called @@ -344,13 +348,13 @@ class AttachmentsController < ApplicationController end respond_to do |format| - format.js + format.js end rescue NoMethodError @save_flag = false @save_message = [] << l(:error_attachment_empty) respond_to do |format| - format.js + format.js end end diff --git a/db/schema.rb b/db/schema.rb index 8dbd9813c..3728e8da0 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,8 +11,7 @@ # # It's strongly recommended to check this file into your version control system. - -ActiveRecord::Schema.define(:version => 20151102090519) do +ActiveRecord::Schema.define(:version => 20151231023610) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -67,6 +66,41 @@ ActiveRecord::Schema.define(:version => 20151102090519) do t.datetime "updated_at", :null => false end + create_table "at_messages", :force => true do |t| + t.integer "user_id" + t.integer "at_message_id" + t.string "at_message_type" + t.boolean "viewed", :default => false + t.string "container_type" + t.integer "container_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "sender_id" + end + + add_index "at_messages", ["user_id"], :name => "index_at_messages_on_user_id" + + create_table "attachment_histories", :force => true do |t| + t.integer "container_id" + t.string "container_type" + t.string "filename", :default => "" + t.string "disk_filename", :default => "" + t.integer "filesize", :default => 0 + t.string "content_type", :default => "" + t.string "digest", :limit => 40, :default => "" + t.integer "downloads", :default => 0 + t.integer "author_id" + t.datetime "created_on" + t.string "description" + t.string "disk_directory" + t.integer "attachtype" + t.integer "is_public" + t.integer "copy_from" + t.integer "quotes" + t.integer "version" + t.integer "attachment_id" + end + create_table "attachments", :force => true do |t| t.integer "container_id" t.string "container_type", :limit => 30 @@ -384,6 +418,20 @@ ActiveRecord::Schema.define(:version => 20151102090519) do t.integer "container_id", :default => 0 end + create_table "course_contributor_scores", :force => true do |t| + t.integer "course_id" + t.integer "user_id" + t.integer "message_num" + t.integer "message_reply_num" + t.integer "news_reply_num" + t.integer "resource_num" + t.integer "journal_num" + t.integer "journal_reply_num" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "total_score" + end + create_table "course_groups", :force => true do |t| t.string "name" t.integer "course_id" @@ -427,8 +475,8 @@ ActiveRecord::Schema.define(:version => 20151102090519) do t.string "code" t.integer "time" t.string "extra" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.string "location" t.string "term" t.string "string" @@ -438,14 +486,16 @@ ActiveRecord::Schema.define(:version => 20151102090519) do t.string "class_period" t.integer "school_id" t.text "description" - t.integer "status", :default => 1 - t.integer "attachmenttype", :default => 2 + t.integer "status", :default => 1 + t.integer "attachmenttype", :default => 2 t.integer "lft" t.integer "rgt" - t.integer "is_public", :limit => 1, :default => 1 - t.integer "inherit_members", :limit => 1, :default => 1 - t.integer "open_student", :default => 0 - t.integer "outline", :default => 0 + t.integer "is_public", :limit => 1, :default => 1 + t.integer "inherit_members", :limit => 1, :default => 1 + t.integer "open_student", :default => 0 + t.integer "outline", :default => 0 + t.integer "publish_resource", :default => 0 + t.integer "is_delete", :default => 0 t.integer "end_time" t.string "end_term" end @@ -532,23 +582,32 @@ ActiveRecord::Schema.define(:version => 20151102090519) do add_index "documents", ["created_on"], :name => "index_documents_on_created_on" add_index "documents", ["project_id"], :name => "documents_project_id" - create_table "dts", :force => true do |t| - t.string "IPLineCode" - t.string "Description" - t.string "Num" - t.string "Variable" - t.string "TraceInfo" - t.string "Method" + create_table "dts", :primary_key => "Num", :force => true do |t| + t.string "Defect", :limit => 50 + t.string "Category", :limit => 50 t.string "File" - t.string "IPLine" - t.string "Review" - t.string "Category" - t.string "Defect" - t.string "PreConditions" - t.string "StartLine" + t.string "Method" + t.string "Module", :limit => 20 + t.string "Variable", :limit => 50 + t.integer "StartLine" + t.integer "IPLine" + t.string "IPLineCode", :limit => 200 + t.string "Judge", :limit => 15 + t.integer "Review", :limit => 1 + t.string "Description" + t.text "PreConditions", :limit => 2147483647 + t.text "TraceInfo", :limit => 2147483647 + t.text "Code", :limit => 2147483647 t.integer "project_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" + t.integer "id", :null => false + end + + create_table "editor_of_documents", :force => true do |t| + t.integer "editor_id" + t.integer "org_document_comment_id" + t.datetime "created_at" end create_table "enabled_modules", :force => true do |t| @@ -573,6 +632,66 @@ ActiveRecord::Schema.define(:version => 20151102090519) do add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type" add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id" + create_table "exercise_answers", :force => true do |t| + t.integer "user_id" + t.integer "exercise_question_id" + t.integer "exercise_choice_id" + t.text "answer_text" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "exercise_choices", :force => true do |t| + t.integer "exercise_question_id" + t.text "choice_text" + t.integer "choice_position" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "exercise_questions", :force => true do |t| + t.text "question_title" + t.integer "question_type" + t.integer "question_number" + t.integer "exercise_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.integer "question_score" + end + + create_table "exercise_standard_answers", :force => true do |t| + t.integer "exercise_question_id" + t.integer "exercise_choice_id" + t.text "answer_text" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "exercise_users", :force => true do |t| + t.integer "user_id" + t.integer "exercise_id" + t.integer "score" + t.datetime "start_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.datetime "end_at" + t.integer "status" + end + + create_table "exercises", :force => true do |t| + t.text "exercise_name" + t.text "exercise_description" + t.integer "course_id" + t.integer "exercise_status" + t.integer "user_id" + t.integer "time" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.datetime "publish_time" + t.datetime "end_time" + t.integer "show_result" + end + create_table "first_pages", :force => true do |t| t.string "web_title" t.string "title" @@ -662,6 +781,19 @@ ActiveRecord::Schema.define(:version => 20151102090519) do t.integer "anonymous_comment", :default => 0 end + add_index "homework_commons", ["course_id", "id"], :name => "index_homework_commons_on_course_id_and_id" + + create_table "homework_detail_groups", :force => true do |t| + t.integer "homework_common_id" + t.integer "min_num" + t.integer "max_num" + t.integer "base_on_project" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + add_index "homework_detail_groups", ["homework_common_id"], :name => "index_homework_detail_groups_on_homework_common_id" + create_table "homework_detail_manuals", :force => true do |t| t.float "ta_proportion" t.integer "comment_status" @@ -818,16 +950,6 @@ ActiveRecord::Schema.define(:version => 20151102090519) do add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id" - create_table "journal_details_copy", :force => true do |t| - t.integer "journal_id", :default => 0, :null => false - t.string "property", :limit => 30, :default => "", :null => false - t.string "prop_key", :limit => 30, :default => "", :null => false - t.text "old_value" - t.text "value" - end - - add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id" - create_table "journal_replies", :id => false, :force => true do |t| t.integer "journal_id" t.integer "user_id" @@ -947,6 +1069,7 @@ ActiveRecord::Schema.define(:version => 20151102090519) do t.boolean "locked", :default => false t.integer "sticky", :default => 0 t.integer "reply_id" + t.integer "quotes" end add_index "messages", ["author_id"], :name => "index_messages_on_author_id" @@ -964,6 +1087,7 @@ ActiveRecord::Schema.define(:version => 20151102090519) do t.datetime "created_on" t.integer "comments_count", :default => 0, :null => false t.integer "course_id" + t.integer "sticky", :default => 0 end add_index "news", ["author_id"], :name => "index_news_on_author_id" @@ -1049,10 +1173,46 @@ ActiveRecord::Schema.define(:version => 20151102090519) do t.integer "project_id" end + create_table "org_activities", :force => true do |t| + t.integer "user_id" + t.integer "org_act_id" + t.string "org_act_type" + t.integer "container_id" + t.string "container_type" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + create_table "org_courses", :force => true do |t| + t.integer "organization_id" + t.integer "course_id" + t.datetime "created_at" + end + + create_table "org_document_comments", :force => true do |t| + t.text "title" + t.text "content" + t.integer "organization_id" + t.integer "creator_id" + t.integer "parent_id" + t.integer "reply_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.boolean "locked", :default => false + t.integer "sticky", :default => 0 + t.integer "org_subfield_id" + end + + create_table "org_member_roles", :force => true do |t| + t.integer "org_member_id" + t.integer "role_id" + end + create_table "org_members", :force => true do |t| - t.integer "user_id" - t.integer "organization_id" - t.string "role" + t.integer "user_id" + t.integer "organization_id" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "org_projects", :force => true do |t| @@ -1212,27 +1372,30 @@ ActiveRecord::Schema.define(:version => 20151102090519) do end create_table "projects", :force => true do |t| - t.string "name", :default => "", :null => false + t.string "name", :default => "", :null => false t.text "description" - t.string "homepage", :default => "" - t.boolean "is_public", :default => true, :null => false + t.string "homepage", :default => "" + t.boolean "is_public", :default => true, :null => false t.integer "parent_id" t.datetime "created_on" t.datetime "updated_on" t.string "identifier" - t.integer "status", :default => 1, :null => false + t.integer "status", :default => 1, :null => false t.integer "lft" t.integer "rgt" - t.boolean "inherit_members", :default => false, :null => false + t.boolean "inherit_members", :default => false, :null => false t.integer "project_type" - t.boolean "hidden_repo", :default => false, :null => false - t.integer "attachmenttype", :default => 1 + t.boolean "hidden_repo", :default => false, :null => false + t.integer "attachmenttype", :default => 1 t.integer "user_id" - t.integer "dts_test", :default => 0 + t.integer "dts_test", :default => 0 t.string "enterprise_name" t.integer "organization_id" t.integer "project_new_type" t.integer "gpid" + t.integer "forked_from_project_id" + t.integer "forked_count" + t.integer "commits_count", :default => 0 end add_index "projects", ["lft"], :name => "index_projects_on_lft" @@ -1397,6 +1560,21 @@ ActiveRecord::Schema.define(:version => 20151102090519) do t.integer "project_id" end + create_table "student_work_projects", :force => true do |t| + t.integer "homework_common_id" + t.integer "student_work_id" + t.integer "project_id" + t.integer "user_id" + t.integer "is_leader" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + + add_index "student_work_projects", ["homework_common_id"], :name => "index_student_work_projects_on_homework_common_id" + add_index "student_work_projects", ["project_id"], :name => "index_student_work_projects_on_project_id" + add_index "student_work_projects", ["student_work_id"], :name => "index_student_work_projects_on_student_work_id" + add_index "student_work_projects", ["user_id"], :name => "index_student_work_projects_on_user_id" + create_table "student_work_tests", :force => true do |t| t.integer "student_work_id" t.datetime "created_at", :null => false @@ -1424,6 +1602,8 @@ ActiveRecord::Schema.define(:version => 20151102090519) do t.boolean "is_test", :default => false end + add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id" + create_table "student_works_evaluation_distributions", :force => true do |t| t.integer "student_work_id" t.integer "user_id" From a4a29b0ee9b542ed9b3551fd7b4d25ce642bfe76 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 4 Jan 2016 11:26:42 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=9A=84=E6=96=87=E5=AD=97=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/courses.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 2e8133172..a13c63fbc 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1220,6 +1220,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;} .hworkPrName {width:110px; max-width:110px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;} .mr150 {margin-right:150px;} .relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;} +.captainName {max-width:40px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;} /*上传资源弹窗*/ .resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;} From 3ddbeae100d74011e7fd1e24a38457e60690413a Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 4 Jan 2016 11:32:48 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9A=84=E2=80=9C?= =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E2=80=9D=E6=A8=A1=E5=BC=8F=E7=9A=84=E6=96=87?= =?UTF-8?q?=E5=AD=97=E4=B8=8D=E7=94=A8=E7=B2=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_tool_expand.html.erb | 14 +++++++------- public/stylesheets/courses.css | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/views/courses/_tool_expand.html.erb b/app/views/courses/_tool_expand.html.erb index e032496ea..50854cf23 100644 --- a/app/views/courses/_tool_expand.html.erb +++ b/app/views/courses/_tool_expand.html.erb @@ -2,19 +2,19 @@ <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %> <% if show_nav?(@course.homework_commons.count) %>
- <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02 ml10"%> + <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02 ml10 fn"%> <%= link_to( "", homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_course_homework_new)}") if is_teacher %>
<% end %> <% if show_nav?(@course.news.count) %>
- <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02 ml10" %> + <%= link_to l(:label_course_news), course_news_index_path(@course), :class => "f14 c_blue02 ml10 fn" %> <%= link_to( "", new_course_news_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_course_news_new)}") if is_teacher %>
<% end %> <% if show_nav?(course_file_num) %>
- <%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02 ml10" %> + <%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02 ml10 fn" %> <% if is_teacher || (@course.publish_resource == 1 && User.current.member_of_course?(@course)) %> @@ -23,25 +23,25 @@ <% end %> <% if show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %>
- <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02 ml10" %> + <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02 ml10 fn" %> <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") if User.current.member_of_course?(@course) && @course.boards.first %>
<% end %> <% if show_nav?(course_feedback_count) %>
- <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02 ml10" %> + <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02 ml10 fn" %> <%= link_to "", course_feedback_path(@course), :class => 'courseMenuSetting', :title =>"#{l(:label_course_feedback)}", :id => "course_jour_count"%>
<% end %> <% if show_nav?(course_poll_count) %>
- <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => " f14 c_blue02 ml10"%> + <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => " f14 c_blue02 ml10 fn"%> <%= link_to( "", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'courseMenuSetting', :title =>"#{l(:label_new_poll)}") if is_teacher %>
<% end %> <% if show_nav?(User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status=2").count) %>
- <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f14 c_blue02 ml10"%> + <%= link_to "在线测验", exercise_index_path(:course_id => @course.id), :class => " f14 c_blue02 ml10 fn"%> <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'courseMenuSetting', :title =>"新建试卷") if is_teacher %>
<% end %> \ No newline at end of file diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index a13c63fbc..1b94a0c50 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1260,3 +1260,5 @@ div.disable_link {background-color: #c1c1c1 !important;} .fileTagWrap{ width:710px;} .boxShadow {box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);} + +.fn {font-weight:normal} From 8ea943031849591fc100961876df980d72df05a4 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Mon, 4 Jan 2016 15:51:24 +0800 Subject: [PATCH 6/9] =?UTF-8?q?at=E9=93=BE=E6=8E=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/kindeditor/at/config.js | 2 +- public/assets/kindeditor/at/jquery.atwho.css | 3 ++- public/assets/kindeditor/plugins/code/previewcode.css | 3 ++- public/javascripts/application.js | 11 ----------- public/stylesheets/new_user.css | 1 + public/stylesheets/public.css | 1 + 6 files changed, 7 insertions(+), 14 deletions(-) diff --git a/public/assets/kindeditor/at/config.js b/public/assets/kindeditor/at/config.js index 2bab7eb67..651f33464 100644 --- a/public/assets/kindeditor/at/config.js +++ b/public/assets/kindeditor/at/config.js @@ -35,7 +35,7 @@ var enableAt = function(_editor) { var at_config = { at: "@", data: names, - insertTpl: '@${name}(${login})', + insertTpl: '@${name}(${login})', displayTpl: "
  • ${name} ${login}
    • ", searchKey: 'searchKey', limit: 200 diff --git a/public/assets/kindeditor/at/jquery.atwho.css b/public/assets/kindeditor/at/jquery.atwho.css index df3ff9d94..13ca0265a 100644 --- a/public/assets/kindeditor/at/jquery.atwho.css +++ b/public/assets/kindeditor/at/jquery.atwho.css @@ -49,4 +49,5 @@ } /* @功能 定义 */ -span.at {color:#269ac9;} \ No newline at end of file +span.at {color:#269ac9;} +span.at a{color:#269ac9;text-decoration: none;} \ No newline at end of file diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css index c106a72f3..c8e5df4e1 100644 --- a/public/assets/kindeditor/plugins/code/previewcode.css +++ b/public/assets/kindeditor/plugins/code/previewcode.css @@ -45,4 +45,5 @@ .ke-content blockquote {margin:15px 10px;border:2px solid #eee;padding:5px 5px 5px 35px;background:#f4f5f7 url('../img/blockquote.gif') no-repeat left top;color:#060;font-size:9pt;} -span.at {color:#269ac9;} \ No newline at end of file +span.at {color:#269ac9;} +span.at a{color:#269ac9;text-decoration: none;} \ No newline at end of file diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 3d9fba942..84186a0b2 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -991,14 +991,3 @@ function showNormalImage(id) { } } - -$(function(){ - //at 加链接 - $("span.at").hover(function(){ - $(this).css('cursor', 'pointer'); - }); - $("span.at").live('click', function(){ - var userId = $(this).attr('data-user-id'); - $(window.location).attr('href', '/users/'+userId); - }); -}); \ No newline at end of file diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 775ade128..fbd2bc7c5 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1387,6 +1387,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;} /* @功能 定义 */ span.at {color:#269ac9;} +span.at a{color:#269ac9;text-decoration: none;} .relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;} /*问题状态图片*/ diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 51f0be25d..a736ef777 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -918,6 +918,7 @@ a.resourcesTypeUser {background:url(images/homepage_icon.png) -178px -453px no-r /* @功能 定义 */ span.at {color:#269ac9;} +span.at a{color:#269ac9;text-decoration: none;} .del_line{text-decoration:line-through !important;} /*转发样式*/ .shareDP {width:415px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; z-index:1000;} From f52dc37a76a3dae2112cf6cf7ee521a364eee167 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 5 Jan 2016 11:29:30 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BD=9C=E5=93=81=E8=AF=84=E9=98=85=E5=92=8C?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=8F=90=E4=BA=A4=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/api_helper.rb | 2 +- .../_org_course_homework.html.erb | 110 +++++++++++++++++- app/views/users/_course_homework.html.erb | 20 +++- .../users/_user_homework_detail.html.erb | 18 +++ public/stylesheets/org.css | 6 +- 5 files changed, 151 insertions(+), 5 deletions(-) diff --git a/app/helpers/api_helper.rb b/app/helpers/api_helper.rb index f73cc87e6..8324951f9 100644 --- a/app/helpers/api_helper.rb +++ b/app/helpers/api_helper.rb @@ -180,7 +180,7 @@ module ApiHelper if timePassed < 0 updateAtValue = "时间有问题" elsif timePassed < ONE_MINUTE - updateAtValue = "一分钟前" + updateAtValue = "1分钟前" elsif timePassed < ONE_HOUR timeIntoFormat = timePassed / ONE_MINUTE updateAtValue = timeIntoFormat.to_s + "分钟前" diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb index 9699eff5f..4039059a4 100644 --- a/app/views/organizations/_org_course_homework.html.erb +++ b/app/views/organizations/_org_course_homework.html.erb @@ -44,7 +44,27 @@ 教师评阅中 <% end%> <% end%> +
    + <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1%> + 系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"c_red",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！ + <% elsif activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 0%> + 系统提示：该作业要求各组长提交作品，提交作品时请添加组成员。谢谢配合！ + <% end %>
    + <% if activity.homework_type == 3 && !is_teacher && activity.homework_detail_group.base_on_project == 1 && User.current.member_of_course?(activity.course)%> + <% projects = cur_user_projects_for_homework activity %> + <% works = cur_user_works_for_homework activity %> + <% if works.nil? && projects.nil? %> +
    + <%=link_to "关联项目",new_student_work_project_student_work_index_path(:homework => activity.id,:is_in_course=>-1,:user_activity_id=>user_activity_id,:course_activity=>course_activity),remote: true,:class=> 'c_blue', :title=> '请各组长关联作业项目' %> + <%#= relate_project(activity,is_teacher,-1,user_activity_id,course_activity) %> +
    + <% elsif works.nil? %> +
    + <%=link_to "取消关联",cancel_relate_project_student_work_index_path(:homework => activity.id,:is_in_course=>-1,:user_activity_id=>user_activity_id,:course_activity=>course_activity), :confirm => "您确定要取消关联吗？", remote: true,:class => "c_blue", :title=> '取消关联项目' %> +
    + <% end %> + <% end %>
    <% is_teacher = User.current.allowed_to?(:as_teacher,activity.course) %> <%= user_for_homework_common activity,is_teacher %> @@ -61,8 +81,16 @@ <%= activity.language_name%>
    <% end %> - -
    截止时间：<%= activity.end_time.to_s %> 23:59
    + <% if activity.homework_type == 3 && activity.homework_detail_group%> +
    + 分组人数：<%=activity.homework_detail_group.min_num %>-<%=activity.homework_detail_group.max_num %> 人 +
    + <% end %> + <% if activity.homework_detail_manual && activity.homework_detail_manual.comment_status < 2 %> +
    提交截止时间：<%= activity.end_time.to_s %> 23:59
    + <% elsif activity.homework_detail_manual && activity.homework_detail_manual.comment_status >= 2 %> +
    匿评截止时间：<%= activity.homework_detail_manual.evaluation_end.to_s %> 23:59
    + <% end %>
    @@ -73,10 +101,88 @@
    +
    +
    + 迟交扣分：<%= activity.late_penalty%>分 +
    + <% if activity.anonymous_comment == 0%> +
    + 匿评开启时间：<%= activity.homework_detail_manual.evaluation_start%> 00:00 +
    + <% end %> +
    +
    +
    +
    + 缺评扣分：<%= activity.homework_detail_manual.absence_penalty%>分/作品 +
    + <% if activity.anonymous_comment == 0%> +
    + 匿评关闭时间：<%= activity.homework_detail_manual.evaluation_end%> 23:59 +
    + <% end %> +
    +
    + <% if activity.student_works.count != 0 %> + <% sw = activity.student_works.reorder("created_at desc").first %> +
    + <%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品 +
    + <% end %> +
    + <% if activity.student_works.count != 0 %> + <% sw_id = "("+activity.student_works.map{|sw| sw.id}.join(",")+")" %> + <% student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %> + <% unless student_work_scores.empty? %> + <% last_score = student_work_scores.first %> +
    + <%=time_from_now last_score.created_at %><%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品 +
    + <% end %> + <% end %> +
    <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => activity.attachments} %>
    + <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %> +
    + <% projects = activity.student_work_projects.where("is_leader = 1") %> +
    + 已关联项目：<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %> +
    + <% projects.each do |pro| %> + <% project = Project.find pro.project_id %> + + +
    + <% if project.is_public || User.current.member_of?(project) || User.current.admin? %> + <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像" %> + <% else %> + <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像") %> + <% end %> + <% time=project.updated_on %> + <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %> +

    <%=(User.find project.user_id).show_name %>(组长)

    +

    <%=time_from_now time %>

    +
    + 项目名称：<%=project.name %>
    + 创建者：<%=(User.find project.user_id).show_name %>(组长)
    + 更新时间：<%=time_from_now time %> +
    +
    + <% end %> +
    + <% end %> +
    <% if is_teacher%> <% comment_status = activity.homework_detail_manual.comment_status %>
    diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index a0ce84795..cd1ffd7ae 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -124,6 +124,24 @@ <% end %>
    + <% if activity.student_works.count != 0 %> + <% sw = activity.student_works.reorder("created_at desc").first %> +
    + <%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品 +
    + <% end %> +
    + <% if activity.student_works.count != 0 %> + <% sw_id = "("+activity.student_works.map{|sw| sw.id}.join(",")+")" %> + <% student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %> + <% unless student_work_scores.empty? %> + <% last_score = student_work_scores.first %> +
    + <%=time_from_now last_score.created_at %><%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品 +
    + <% end %> + <% end %> +
    <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => activity.attachments} %>
    @@ -131,7 +149,7 @@ <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %>
    <% projects = activity.student_work_projects.where("is_leader = 1") %> -
    +
    已关联项目：<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %>
    <% projects.each do |pro| %> diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index 0472613e4..7a91827a6 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -127,6 +127,24 @@ <% end %>
    + <% if homework_common.student_works.count != 0 %> + <% sw = homework_common.student_works.reorder("created_at desc").first %> +
    + <%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品 +
    + <% end %> +
    + <% if homework_common.student_works.count != 0 %> + <% sw_id = "("+homework_common.student_works.map{|sw| sw.id}.join(",")+")" %> + <% student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %> + <% unless student_work_scores.empty? %> + <% last_score = student_work_scores.first %> +
    + <%=time_from_now last_score.created_at %><%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品 +
    + <% end %> + <% end %> +
    <%= render :partial => 'student_work/work_attachments', :locals => {:attachments => homework_common.attachments} %>
    diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index b37a38da0..2279f0fe5 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -103,4 +103,8 @@ ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; } .sectionContent span {width:175px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; display:inline-block; height:18px; vertical-align:middle;}.popbox_polls{width:300px;height:100px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;} .org_login_list a {color:#269ac9;} -div.flash {margin-top :0px !important} \ No newline at end of file +div.flash {margin-top :0px !important} + +.w80{ width:80px;} +.relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;} +.captainName {max-width:40px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;} \ No newline at end of file From 1b177a849840cca95119e5677b92f25b802fc763 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Tue, 5 Jan 2016 11:55:30 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/rails_kindeditor/lib/rails_kindeditor/helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb index a2fef6174..50fc50b38 100644 --- a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb +++ b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb @@ -14,7 +14,7 @@ module RailsKindeditor output = ActiveSupport::SafeBuffer.new output << text_area_tag(name, content, input_html) output << javascript_tag(js_replace(id, options.merge(window_onload: 'true', - :autoHeightMode=>true, + :autoHeightMode=>false, afterCreate: eval_str(at_id, at_type), emotionsBasePath: 'http://' + Setting.host_name ))) @@ -29,7 +29,7 @@ module RailsKindeditor output_buffer = ActiveSupport::SafeBuffer.new output_buffer << build_text_area_tag(name, method, self, options, input_html) output_buffer << javascript_tag(js_replace(input_html['id'],options.merge(window_onload: 'true', - :autoHeightMode=>true, + :autoHeightMode=>false, afterCreate: eval_str(at_id, at_type), emotionsBasePath: 'http://' + Setting.host_name ))) From 0a2d2a539f2f85cf9b6959733cc1a6174e6be7bb Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 5 Jan 2016 15:46:41 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=9A=84=E7=BB=84=E9=95=BF=E5=90=8D=E5=AD=97=E5=8A=A0=E4=B8=AA?= =?UTF-8?q?title?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_org_course_homework.html.erb | 2 +- app/views/users/_course_homework.html.erb | 2 +- app/views/users/_user_homework_detail.html.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb index 4039059a4..8cf5f7183 100644 --- a/app/views/organizations/_org_course_homework.html.erb +++ b/app/views/organizations/_org_course_homework.html.erb @@ -171,7 +171,7 @@ <% end %> <% time=project.updated_on %> <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %> -

    <%=(User.find project.user_id).show_name %>(组长)

    +

    <%=(User.find project.user_id).show_name %>(组长)

    <%=time_from_now time %>

    项目名称：<%=project.name %>
    diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index cd1ffd7ae..e443a54b4 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -172,7 +172,7 @@ <% end %> <% time=project.updated_on %> <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %> -

    <%=(User.find project.user_id).show_name %>(组长)

    +

    <%=(User.find project.user_id).show_name %>(组长)

    <%=time_from_now time %>

    项目名称：<%=project.name %>
    diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index 7a91827a6..529dd852c 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -174,7 +174,7 @@ <% end %> <% time=project.updated_on %> <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %> -

    <%=(User.find project.user_id).show_name %>(组长)

    +

    <%=(User.find project.user_id).show_name %>(组长)

    <%=time_from_now time %>

    项目名称：<%=project.name %>