From e77a891bc618b152ec52c97fe1218038ff08e561 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 21 Mar 2016 16:36:25 +0800 Subject: [PATCH 01/37] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5=E4=BC=98=E5=8C=96=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 29 +++++++++---------- ...0160321071740_add_index_to_message_alls.rb | 5 ++++ ...0321073042_add_index_to_course_messages.rb | 5 ++++ ...160321073107_add_index_to_memo_messages.rb | 5 ++++ ...227_add_index_to_user_feedback_messages.rb | 5 ++++ ...60321075815_add_index_to_forge_messages.rb | 5 ++++ ...1080116_add_forgetype_to_forge_messages.rb | 5 ++++ ..._add_usertype_to_user_feedback_messages.rb | 5 ++++ ...321080412_add_memotype_to_memo_messages.rb | 5 ++++ ...0825_add_feed_to_user_feedback_messages.rb | 5 ++++ db/schema.rb | 17 ++++++++++- 11 files changed, 74 insertions(+), 17 deletions(-) create mode 100644 db/migrate/20160321071740_add_index_to_message_alls.rb create mode 100644 db/migrate/20160321073042_add_index_to_course_messages.rb create mode 100644 db/migrate/20160321073107_add_index_to_memo_messages.rb create mode 100644 db/migrate/20160321073227_add_index_to_user_feedback_messages.rb create mode 100644 db/migrate/20160321075815_add_index_to_forge_messages.rb create mode 100644 db/migrate/20160321080116_add_forgetype_to_forge_messages.rb create mode 100644 db/migrate/20160321080336_add_usertype_to_user_feedback_messages.rb create mode 100644 db/migrate/20160321080412_add_memotype_to_memo_messages.rb create mode 100644 db/migrate/20160321080825_add_feed_to_user_feedback_messages.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 38f1ad152..d85778e73 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -119,49 +119,46 @@ class UsersController < ApplicationController # @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count case params[:type] when nil + # 系统消息为管理员发送，我的消息中包含有系统消息 @message_alls = [] - messages = MessageAll.where("(user_id =? and message_type !=?) or message_type =?" ,@user, "SystemMessage", "SystemMessage").order("created_at desc") + messages = MessageAll.where("(user_id =? and message_type !=?) or message_type =?" ,@user.id, "SystemMessage", "SystemMessage").includes(:message).order("created_at desc") messages.each do |message_all| @message_alls << message_all.message end when 'unviewed' @message_alls = [] - messages = MessageAll.where("user_id =?", @user).order("created_at desc") + messages = MessageAll.where("user_id =?", @user.id).includes(:message).order("created_at desc") messages.each do |message_all| # 在点击或者刷新消息列表后未读的消息存放在数组 if message_all.message_type != "SystemMessage"&& !message_all.message.nil? && message_all.message.viewed == 0 @message_alls << message_all.message end end - #课程相关消息 when 'homework' - @message_alls = CourseMessage.where("course_message_type in ('HomeworkCommon','StudentWorksScore','JournalsForMessage','StudentWork','Exercise') and user_id =?", @user).order("created_at desc") + @message_alls = CourseMessage.where("course_message_type in ('HomeworkCommon','StudentWorksScore','JournalsForMessage','StudentWork','Exercise') and user_id =?", @user.id).order("created_at desc") when 'course_message' - @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user).order("created_at desc") + @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user.id).order("created_at desc") when 'course_news' # 课程通知包含发布的通知和回复的通知 - @message_alls = CourseMessage.where("course_message_type in (?, ? ,?)", "News", "Comment", "Course").where("user_id =?", @user).order("created_at desc") + @message_alls = CourseMessage.where("course_message_type in ('News', 'Comment') and user_id =?", @user.id).order("created_at desc") when 'poll' - @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user).order("created_at desc") - + @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user.id).order("created_at desc") #项目相关消息 when 'issue' - @message_alls = ForgeMessage.where("forge_message_type =? or forge_message_type =?" , "Issue", "Journal").where("user_id=?", @user).order("created_at desc") + @message_alls = ForgeMessage.where("forge_message_type in ('Issue', 'Journal') and user_id =?" , @user.id).order("created_at desc") when 'forge_message' - @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Message", @user).order("created_at desc") + @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Message", @user.id).order("created_at desc") when 'forge_news' - @message_alls = ForgeMessage.where("forge_message_type in (?,?) and user_id =?", "News", "Comment", @user).order("created_at desc") + @message_alls = ForgeMessage.where("forge_message_type in (?,?) and user_id =?", "News", "Comment", @user.id).order("created_at desc") when 'apply' - @message_alls = ForgeMessage.where("forge_message_type in ('ProjectInvite', 'AppliedProject', 'JoinProject', 'RemoveFromProject') and user_id =?", @user).order("created_at desc") - + @message_alls = ForgeMessage.where("forge_message_type in ('ProjectInvite', 'AppliedProject', 'JoinProject', 'RemoveFromProject') and user_id =?", @user.id).order("created_at desc") #贴吧消息 when 'forum' - @message_alls = MemoMessage.where("memo_type =? and user_id =?", "Memo", @user).order("created_at desc") - + @message_alls = MemoMessage.where("memo_type =? and user_id =?", "Memo", @user.id).order("created_at desc") #用户留言 when 'user_feedback' - @message_alls = UserFeedbackMessage.where("journals_for_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc") + @message_alls = UserFeedbackMessage.where("journals_for_message_type =? and user_id =?", "JournalsForMessage", @user.id).order("created_at desc") else render_404 return diff --git a/db/migrate/20160321071740_add_index_to_message_alls.rb b/db/migrate/20160321071740_add_index_to_message_alls.rb new file mode 100644 index 000000000..cb204d809 --- /dev/null +++ b/db/migrate/20160321071740_add_index_to_message_alls.rb @@ -0,0 +1,5 @@ +class AddIndexToMessageAlls < ActiveRecord::Migration + def change + add_index :message_alls, [:user_id, :message_id, :message_type, :created_at] + end +end diff --git a/db/migrate/20160321073042_add_index_to_course_messages.rb b/db/migrate/20160321073042_add_index_to_course_messages.rb new file mode 100644 index 000000000..ede54779b --- /dev/null +++ b/db/migrate/20160321073042_add_index_to_course_messages.rb @@ -0,0 +1,5 @@ +class AddIndexToCourseMessages < ActiveRecord::Migration + def change + add_index :course_messages, [:user_id, :course_id, :created_at] + end +end diff --git a/db/migrate/20160321073107_add_index_to_memo_messages.rb b/db/migrate/20160321073107_add_index_to_memo_messages.rb new file mode 100644 index 000000000..59bf69fb5 --- /dev/null +++ b/db/migrate/20160321073107_add_index_to_memo_messages.rb @@ -0,0 +1,5 @@ +class AddIndexToMemoMessages < ActiveRecord::Migration + def change + add_index :memo_messages, [:user_id, :forum_id, :created_at] + end +end diff --git a/db/migrate/20160321073227_add_index_to_user_feedback_messages.rb b/db/migrate/20160321073227_add_index_to_user_feedback_messages.rb new file mode 100644 index 000000000..c067f58d8 --- /dev/null +++ b/db/migrate/20160321073227_add_index_to_user_feedback_messages.rb @@ -0,0 +1,5 @@ +class AddIndexToUserFeedbackMessages < ActiveRecord::Migration + def change + add_index :user_feedback_messages, [:user_id, :created_at] + end +end diff --git a/db/migrate/20160321075815_add_index_to_forge_messages.rb b/db/migrate/20160321075815_add_index_to_forge_messages.rb new file mode 100644 index 000000000..ada345501 --- /dev/null +++ b/db/migrate/20160321075815_add_index_to_forge_messages.rb @@ -0,0 +1,5 @@ +class AddIndexToForgeMessages < ActiveRecord::Migration + def change + add_index :forge_messages, [:user_id, :project_id, :created_at] + end +end diff --git a/db/migrate/20160321080116_add_forgetype_to_forge_messages.rb b/db/migrate/20160321080116_add_forgetype_to_forge_messages.rb new file mode 100644 index 000000000..5dbd96340 --- /dev/null +++ b/db/migrate/20160321080116_add_forgetype_to_forge_messages.rb @@ -0,0 +1,5 @@ +class AddForgetypeToForgeMessages < ActiveRecord::Migration + def change + add_index :forge_messages, [:forge_message_id, :forge_message_type] + end +end diff --git a/db/migrate/20160321080336_add_usertype_to_user_feedback_messages.rb b/db/migrate/20160321080336_add_usertype_to_user_feedback_messages.rb new file mode 100644 index 000000000..6a40ad444 --- /dev/null +++ b/db/migrate/20160321080336_add_usertype_to_user_feedback_messages.rb @@ -0,0 +1,5 @@ +class AddUsertypeToUserFeedbackMessages < ActiveRecord::Migration + def change + add_index :user_feedback_messages, [:journals_for_message_id] + end +end diff --git a/db/migrate/20160321080412_add_memotype_to_memo_messages.rb b/db/migrate/20160321080412_add_memotype_to_memo_messages.rb new file mode 100644 index 000000000..0e79cd8f6 --- /dev/null +++ b/db/migrate/20160321080412_add_memotype_to_memo_messages.rb @@ -0,0 +1,5 @@ +class AddMemotypeToMemoMessages < ActiveRecord::Migration + def change + add_index :memo_messages, [:memo_id, :memo_type] + end +end diff --git a/db/migrate/20160321080825_add_feed_to_user_feedback_messages.rb b/db/migrate/20160321080825_add_feed_to_user_feedback_messages.rb new file mode 100644 index 000000000..98a3e2c3e --- /dev/null +++ b/db/migrate/20160321080825_add_feed_to_user_feedback_messages.rb @@ -0,0 +1,5 @@ +class AddFeedToUserFeedbackMessages < ActiveRecord::Migration + def change + add_index :course_messages, [:course_message_type] + end +end diff --git a/db/schema.rb b/db/schema.rb index 2c55aad61..5eb9edd36 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20160317090350) do +ActiveRecord::Schema.define(:version => 20160321080825) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -465,6 +465,10 @@ ActiveRecord::Schema.define(:version => 20160317090350) do t.integer "status" end + add_index "course_messages", ["course_message_id"], :name => "index_course_messages_on_course_message_id" + add_index "course_messages", ["course_message_type"], :name => "index_course_messages_on_course_message_type" + add_index "course_messages", ["user_id", "course_id", "created_at"], :name => "index_course_messages_on_user_id_and_course_id_and_created_at" + create_table "course_statuses", :force => true do |t| t.integer "changesets_count" t.integer "watchers_count" @@ -741,6 +745,9 @@ ActiveRecord::Schema.define(:version => 20160317090350) do t.integer "status" end + add_index "forge_messages", ["forge_message_id", "forge_message_type"], :name => "index_forge_messages_on_forge_message_id_and_forge_message_type" + add_index "forge_messages", ["user_id", "project_id", "created_at"], :name => "index_forge_messages_on_user_id_and_project_id_and_created_at" + create_table "forums", :force => true do |t| t.string "name", :null => false t.text "description" @@ -1055,6 +1062,9 @@ ActiveRecord::Schema.define(:version => 20160317090350) do t.datetime "updated_at", :null => false end + add_index "memo_messages", ["memo_id", "memo_type"], :name => "index_memo_messages_on_memo_id_and_memo_type" + add_index "memo_messages", ["user_id", "forum_id", "created_at"], :name => "index_memo_messages_on_user_id_and_forum_id_and_created_at" + create_table "memos", :force => true do |t| t.integer "forum_id", :null => false t.integer "parent_id" @@ -1078,6 +1088,8 @@ ActiveRecord::Schema.define(:version => 20160317090350) do t.datetime "updated_at", :null => false end + add_index "message_alls", ["message_id", "message_type", "created_at"], :name => "index_message_alls_on_message_id_and_message_type_and_created_at" + create_table "messages", :force => true do |t| t.integer "board_id", :null => false t.integer "parent_id" @@ -1830,6 +1842,9 @@ ActiveRecord::Schema.define(:version => 20160317090350) do t.datetime "updated_at", :null => false end + add_index "user_feedback_messages", ["journals_for_message_id"], :name => "index_user_feedback_messages_on_journals_for_message_id" + add_index "user_feedback_messages", ["user_id", "created_at"], :name => "index_user_feedback_messages_on_user_id_and_created_at" + create_table "user_grades", :force => true do |t| t.integer "user_id", :null => false t.integer "project_id", :null => false From e06695b56b5c4d40cb8905f91144934ce416cec7 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 21 Mar 2016 16:45:49 +0800 Subject: [PATCH 02/37] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=B4=BB=E8=B7=83?= =?UTF-8?q?=E5=BA=A6=E4=BB=A3=E7=A0=81=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/_course_activity_users.html.erb | 59 ++++++++++++++++ app/views/layouts/base_courses.html.erb | 67 +------------------ 2 files changed, 61 insertions(+), 65 deletions(-) create mode 100644 app/views/courses/_course_activity_users.html.erb diff --git a/app/views/courses/_course_activity_users.html.erb b/app/views/courses/_course_activity_users.html.erb new file mode 100644 index 000000000..a0cac45f7 --- /dev/null +++ b/app/views/courses/_course_activity_users.html.erb @@ -0,0 +1,59 @@ +<% unless contributor_course_scor(course.id).count == 0 %> + +<% end %> \ No newline at end of file diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 1df3caab2..00f197c7f 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -138,72 +138,9 @@ <% end %> - <%# 课程贡献榜 %> + <%# 课程活跃度 %>
- <% unless contributor_course_scor(@course.id).count == 0 %> - - <% end %> + <%= render :partial => 'courses/course_activity_users', :locals => {:course => @course} %> <% hero_homework_scores = hero_homework_score(@course, "desc") %> <% unless hero_homework_scores.map(&:score).detect{|s| s.to_i != 0}.nil? %> From 70d594659e9284ebe1193fc968421c421f776b50 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 21 Mar 2016 16:50:24 +0800 Subject: [PATCH 03/37] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=8B=B1=E9=9B=84?= =?UTF-8?q?=E6=A6=9C=E4=BB=A3=E7=A0=81=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_course_heroes.html.erb | 21 ++++++++++++++++++++ app/views/layouts/base_courses.html.erb | 24 ++--------------------- 2 files changed, 23 insertions(+), 22 deletions(-) create mode 100644 app/views/courses/_course_heroes.html.erb diff --git a/app/views/courses/_course_heroes.html.erb b/app/views/courses/_course_heroes.html.erb new file mode 100644 index 000000000..5e9851594 --- /dev/null +++ b/app/views/courses/_course_heroes.html.erb @@ -0,0 +1,21 @@ +<% hero_homework_scores = hero_homework_score(course, "desc") %> +<% unless hero_homework_scores.map(&:score).detect{|s| s.to_i != 0}.nil? %> + +<% end %> \ No newline at end of file diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 00f197c7f..ff7f20300 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -141,28 +141,8 @@ <%# 课程活跃度 %>
<%= render :partial => 'courses/course_activity_users', :locals => {:course => @course} %> - - <% hero_homework_scores = hero_homework_score(@course, "desc") %> - <% unless hero_homework_scores.map(&:score).detect{|s| s.to_i != 0}.nil? %> - - <% end %> + <%# 课程英雄榜 %> + <%= render :partial => 'courses/course_heroes', :locals => {:course => @course} %> <% if @course.description && !@course.description.blank? %>
From 44549e091d19741df725a4eb61f17f9f654bb94a Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 21 Mar 2016 16:54:12 +0800 Subject: [PATCH 04/37] =?UTF-8?q?message=5Fall=E8=A1=A8=E4=B8=AD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0type=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/migrate/20160321071740_add_index_to_message_alls.rb | 2 +- db/migrate/20160321085313_add_index_mtye_to_message_alls.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20160321085313_add_index_mtye_to_message_alls.rb diff --git a/db/migrate/20160321071740_add_index_to_message_alls.rb b/db/migrate/20160321071740_add_index_to_message_alls.rb index cb204d809..d3e095da5 100644 --- a/db/migrate/20160321071740_add_index_to_message_alls.rb +++ b/db/migrate/20160321071740_add_index_to_message_alls.rb @@ -1,5 +1,5 @@ class AddIndexToMessageAlls < ActiveRecord::Migration def change - add_index :message_alls, [:user_id, :message_id, :message_type, :created_at] + add_index :message_alls, [:user_id, :message_id, :created_at] end end diff --git a/db/migrate/20160321085313_add_index_mtye_to_message_alls.rb b/db/migrate/20160321085313_add_index_mtye_to_message_alls.rb new file mode 100644 index 000000000..8f5c734c4 --- /dev/null +++ b/db/migrate/20160321085313_add_index_mtye_to_message_alls.rb @@ -0,0 +1,5 @@ +class AddIndexMtyeToMessageAlls < ActiveRecord::Migration + def change + add_index :message_alls, [:message_type] + end +end From e20fe85ddff0a915bf5e6d5898f0dae9fd807760 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 21 Mar 2016 18:16:50 +0800 Subject: [PATCH 05/37] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=8E=BB=E6=8E=89tip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_at_message.html.erb | 7 - app/views/users/_user_message_course.html.erb | 320 +----------------- app/views/users/_user_message_forge.html.erb | 106 +----- app/views/users/_user_message_forum.html.erb | 14 - app/views/users/_user_message_system.html.erb | 8 - .../_user_message_userfeedaback.html.erb | 1 - 6 files changed, 16 insertions(+), 440 deletions(-) diff --git a/app/views/users/_user_at_message.html.erb b/app/views/users/_user_at_message.html.erb index 089171c3d..8f0c6acaf 100644 --- a/app/views/users/_user_at_message.html.erb +++ b/app/views/users/_user_at_message.html.erb @@ -21,13 +21,6 @@ <%= link_to ma.subject.html_safe, ma.url, :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}", :onmouseover =>"message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %> <% end %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> \ No newline at end of file diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index 7de1ce417..e042cd738 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -9,13 +9,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -29,13 +22,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -58,43 +44,6 @@ <% end %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -110,24 +59,6 @@ -
  •    截止时间快到啦
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -148,22 +79,6 @@ :onmouseover => "message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -179,22 +94,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -214,18 +113,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -240,9 +127,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -252,37 +136,13 @@
  • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>"> <%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %>
    • - <% if ma.course_message.parent_id.nil? %> -
  • - <%= link_to ma.course_message.subject, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id), - :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %> - - -
    • - - <% else %> -
  • - <%= link_to ma.course_message.content.html_safe, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id), - :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %> - - -
    • - - <% end %> +
  • + <%= link_to ma.course_message.subject, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id), + :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %> + + +
  • <%= time_tag(ma.created_at).html_safe %>
    • - <% end %> <% if ma.course_message_type == "StudentWorksScore" %> @@ -312,28 +172,9 @@ - <% end %> -
  • <%= time_tag(ma.created_at).html_safe %>
    • - +
  • <%= time_tag(ma.created_at).html_safe %>
    • + <% end %> <% if ma.course_message_type == "JournalsForMessage" %> <% if ma.course_message.jour_type == 'Course' %> @@ -352,9 +193,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -375,18 +213,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -406,20 +232,6 @@ -
  •   您成功提交了作品（但被标记为迟交啦）
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -440,23 +252,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -474,16 +269,6 @@ -
  • <% if ma.status == 0 || ma.status.nil?%> @@ -519,15 +304,6 @@
    • -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -548,20 +324,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -582,20 +344,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -616,21 +364,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -647,27 +380,6 @@ - -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -683,23 +395,7 @@ <%= link_to "测验题目：" + ma.course_message.exercise_name, exercise_path(:id => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %> - - -
  • 截止时间快到啦
  • <%= time_tag(ma.created_at).html_safe %>
    • diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb index 574411055..1fd981d73 100644 --- a/app/views/users/_user_message_forge.html.erb +++ b/app/views/users/_user_message_forge.html.erb @@ -15,9 +15,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -38,21 +35,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -74,21 +56,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -114,9 +81,6 @@ - <% unless User.current.member_of?(ma.project) %>
  • <%=link_to "同意加入", {:controller => 'projects', :action => 'member', :id => ma.project_id, :message_id =>ma.id, :key => ma.secret_key}, @@ -144,13 +108,6 @@
    • -
  •    截止时间快到了！
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -169,13 +126,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -197,11 +147,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -210,37 +155,14 @@
  • <%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %>
  • <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %> "><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %>
    • - <% if ma.forge_message.parent_id.nil? %> -
  • - <%= link_to ma.forge_message.subject, project_boards_path(ma.forge_message.project, - :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id, - :topic_id => ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %> - - -
    • - - <% else %> -
  • - <%= link_to ma.forge_message.subject, project_boards_path(ma.forge_message.project, - :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id, - :topic_id => ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %> - - -
    • - - <% end %> +
  • + <%= link_to ma.forge_message.subject, project_boards_path(ma.forge_message.project, + :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id, + :topic_id => ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %> + + + +
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -260,13 +182,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> @@ -281,11 +196,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> diff --git a/app/views/users/_user_message_forum.html.erb b/app/views/users/_user_message_forum.html.erb index d18292068..716fef349 100644 --- a/app/views/users/_user_message_forum.html.erb +++ b/app/views/users/_user_message_forum.html.erb @@ -15,13 +15,6 @@ - <% else %>
  • <%= link_to ma.memo.content.html_safe, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %> @@ -29,13 +22,6 @@
    • - <% end %>
  • <%= time_tag(ma.memo.created_at).html_safe %>
    • diff --git a/app/views/users/_user_message_system.html.erb b/app/views/users/_user_message_system.html.erb index a80d35bd4..72241636f 100644 --- a/app/views/users/_user_message_system.html.erb +++ b/app/views/users/_user_message_system.html.erb @@ -15,14 +15,6 @@ -
  • <%= time_tag(ma.created_at).html_safe %>
    • <%# end %> diff --git a/app/views/users/_user_message_userfeedaback.html.erb b/app/views/users/_user_message_userfeedaback.html.erb index 894eedbfc..1898090aa 100644 --- a/app/views/users/_user_message_userfeedaback.html.erb +++ b/app/views/users/_user_message_userfeedaback.html.erb @@ -24,7 +24,6 @@ <% end %>
  • <%= time_tag(ma.journals_for_message.created_on).html_safe %>
    • - <% end %> <% end %> \ No newline at end of file From 341308658da0423cac9e28400af07974c384ba7e Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 22 Mar 2016 10:48:37 +0800 Subject: [PATCH 06/37] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 2ced977be..f74350672 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -560,18 +560,9 @@ class ProjectsController < ApplicationController end def update_message_status(user, project) - project_invite_messages = ForgeMessage.where("user_id =? and project_id =? and forge_message_type =?", user, project, "ProjectInvite") - project_invite_messages.each do |project_invite_message| - project_invite_message.update_attribute(:viewed, true) - end - #更新被加入项目消息的viewed字段 - join_project_messages = ForgeMessage.where("user_id =? and project_id =? and forge_message_type=?", user, project, "JoinProject") - join_project_messages.each do |join_project| - join_project.update_attribute(:viewed, true) - end - #更新被移出项目消息的viewed字段 - remove_project_messages = ForgeMessage.where("user_id =? and project_id =? and forge_message_type=?", user, project, "RemoveFromProject") - remove_project_messages.update_all(:viewed => true) + # 更新加入项目消息 + project__messages = ForgeMessage.where("forge_message_type in ('ProjectInvite', 'JoinProject', 'RemoveFromProject') and user_id =? and project_id =? ", user, project) + project__messages.update_all(:viewed => true) unless project__messages.blank? end def message_invite(message_id, key) From 478311128d52613d4f78df7ab6a736818877ee83 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 22 Mar 2016 12:42:53 +0800 Subject: [PATCH 07/37] =?UTF-8?q?=E4=BC=98=E5=8C=96project=5Fcontroller=20?= =?UTF-8?q?show=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 2 +- app/controllers/projects_controller.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index dfa30915e..515b94392 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -852,7 +852,7 @@ class CoursesController < ApplicationController # return # end # 统计访问量 - @course.update_attribute(:visits, @course.visits.to_i + 1) + @course.update_column(:visits, @course.visits.to_i + 1) #更新创建课程消息状态 create_course_messages = @course.course_messages.where("user_id =? and course_message_type =? and course_id =? and viewed =?", User.current.id, 'Course', @course.id, 0) create_course_messages.update_all(:viewed => true) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index f74350672..fe7d4bbe5 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -295,11 +295,13 @@ class ProjectsController < ApplicationController def show # 更新消息为已读 update_message_status(User.current, @project) + # over if params[:jump] && redirect_to_project_menu_item(@project, params[:jump]) return end # 统计访问量 - @project.update_attribute(:visits, @project.visits.to_i + 1) + @project.update_column(:visits, @project.visits + 1) + # over @author = params[:user_id].blank? ? nil : User.active.find(params[:user_id]) @page = params[:page] ? params[:page].to_i + 1 : 0 # 根据私密性，取出符合条件的所有数据 @@ -321,8 +323,6 @@ class ProjectsController < ApplicationController = ? and forge_act_type != ? ",@project,1, "Document").order("created_at desc") .page(params['page'|| 1]).per(10); end - boards = @project.boards.includes(:last_message => :author).all - @topic_count = @project.boards.count # 根据对应的请求，返回对应的数据 respond_to do |format| format.html From 7967066b05db8bc4568f1a715ea1b0e086ec61a9 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 22 Mar 2016 15:06:54 +0800 Subject: [PATCH 08/37] =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=8F=91=E9=80=81=E6=96=B9=E5=BC=8F=E6=94=B9?= =?UTF-8?q?=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/files_controller.rb | 13 +++++++------ app/models/attachment.rb | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index 7ae1b85f8..69b356b5a 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -458,10 +458,16 @@ class FilesController < ApplicationController if params[:in_project_toolbar] @in_project_toolbar = params[:in_project_toolbar] end - # 发送邮件 attachments = Attachment.attach_filesex(@project, params[:attachments], params[:attachment_type]) if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added') + # 发送邮件 Mailer.run.attachments_added(attachments[:files]) + # 生成动态 + attachments[:files].each do |file| + ForgeActivity.create(:user_id => User.current.id, :project_id => @project.id, :forge_act_id => file.id, :forge_act_type => "Attachment") + end + # 更新资源总数, 根据上传的附件数累加 + @project.project_score.update_attribute(:attach_num, @project.project_score.attach_num + attachments[:files].count) unless @project.project_score.nil? end # end if params[:project_attachment_type] && params[:project_attachment_type].is_a?(Array) @@ -485,11 +491,6 @@ class FilesController < ApplicationController end end end - # 更新资源总数, 根据上传的附件数累加 - unless @project.project_score.nil? - @project.project_score.update_attribute(:attach_num, @project.project_score.attach_num + attachments[:files].count) - end - # end # TODO: 临时用 nyan sort_init 'created_on', 'desc' sort_update 'created_on' => "#{Attachment.table_name}.created_on", diff --git a/app/models/attachment.rb b/app/models/attachment.rb index 714da9920..881621c3a 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -90,7 +90,7 @@ class Attachment < ActiveRecord::Base @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails") before_save :files_to_final_location - after_save :act_as_course_activity,:act_as_forge_activity + after_save :act_as_course_activity after_create :office_conver, :be_user_score,:create_attachment_ealasticsearch_index after_update :office_conver, :be_user_score,:update_attachment_ealasticsearch_index after_destroy :delete_from_disk,:down_user_score,:delete_attachment_ealasticsearch_index, :decrease_attchments_count, :down_course_score From 9273e37a5b8c1effd20a1e5e7a3866606f3ce6ea Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Wed, 23 Mar 2016 00:04:53 +0800 Subject: [PATCH 09/37] =?UTF-8?q?=E4=BC=98=E5=8C=96SQL=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=9A1=EF=BC=8Cmembers=E4=B8=8Eusers=E8=A1=A8=E5=85=B3?= =?UTF-8?q?=E8=81=94=E6=9F=A5=E8=AF=A2=EF=BC=9B=202=EF=BC=8Cblogs=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 7 ++++++- app/helpers/issues_helper.rb | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index d85778e73..6802a2bd0 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1250,7 +1250,12 @@ class UsersController < ApplicationController end else # @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types})or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id})").order('updated_at desc').limit(10).offset(@page * 10) - blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")" + # blog_ids = "("+@user.blog.id.to_s+","+((User.watched_by(@user.id).count == 0 )? '0' :User.watched_by(@user.id).map{|u| u.blog.id}.join(','))+")" + # 减少数据库交互 + user_ids = "(" + @user.id.to_s + "," + User.watched_by(@user.id).map{|u| u.id }.join(',') + ")" + watched_user_blog_ids = Blog.select("id").where("author_id in #{user_ids}").map { |blog| blog.id}.join(",") + blog_ids = "(" + watched_user_blog_ids + ")" + @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types})" + "or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}) "+ "or (container_type = 'Principal' and act_type= '#{principal_types}' and container_id = #{@user.id}) " + diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 4ad3cb49d..1cd22558b 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -111,9 +111,9 @@ module IssuesHelper def principals_options_for_isuue_list(project) if User.current.member_of?(project) - project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["<< #{l(:label_me)} >>", User.current.id]).unshift(["指派给", 0]) + project.members.includes(:user).order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["<< #{l(:label_me)} >>", User.current.id]).unshift(["指派给", 0]) else - project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["指派给", 0]) + project.members.includes(:user).order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["指派给", 0]) end end From 13e265b7d2e99b87ca3810ade108c5f88509b5a0 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Wed, 23 Mar 2016 18:25:50 +0800 Subject: [PATCH 10/37] =?UTF-8?q?=E4=BC=98=E5=8C=96=20layouts/=5Fuser=5Fpr?= =?UTF-8?q?ojects=20=E5=92=8C=20layouts/=5Fuser=5Fcourses=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 2 +- app/views/layouts/new_base_user.html.erb | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 3a5cdb1a1..6432d83d8 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -764,7 +764,7 @@ module ApplicationHelper # 判断版本库是否初始为gitlab def rep_is_gitlab?(project) - rep = Repository.where("project_id =? and type =?", project, "Repository::Gitlab") + rep = project.repositories.where("type =?", "Repository::Gitlab") return rep.blank? ? true :false end diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index c90c69f75..c288b9402 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -204,7 +204,13 @@ <% end%> <% end%> - <% courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %> + <% course_order_ids = "(" + + CourseActivity.find_by_sql("SELECT c.course_id, updated_at FROM + (SELECT ca.course_id, MAX(ca.updated_at) AS updated_at FROM course_activities ca WHERE ca.course_id IN (" + @user.courses.visible.select('courses.id').map{|c| c.id}.join(',') + ") + GROUP BY ca.course_id) AS c + ORDER BY c.updated_at DESC limit 5").map {|c| c.course_id}.join(",") + ")"%> + <% courses = Course.where("id in #{course_order_ids}")%> + <%# courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %>
      <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %> @@ -217,7 +223,14 @@ <%=link_to "", new_project_path(:host=> Setting.host_name), :class => "homepageMenuSetting fr", :style => "margin-right:10px;", :title => "新建项目"%> <% end%>
    - <% projects = @user.projects.visible.select("projects.*,(SELECT MAX(created_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%> + <% project_order_ids = "(" + + ForgeActivity.find_by_sql("SELECT p.project_id, p.created_at FROM + (SELECT fa.project_id, MAX(fa.created_at) AS created_at FROM forge_activities fa WHERE fa.project_id IN (" + @user.projects.visible.select('projects.id').map{|p| p.id}.join(',') + ") + GROUP BY fa.project_id) AS p + ORDER BY p.created_at DESC limit 5").map {|p| p.project_id}.join(",") + ")"%> + <%# project_order_ids = "(" + ForgeActivity.select("DISTINCT project_id, max(created_at) as max_created_at").where("project_id in #{"(" + @user.projects.visible.select("projects.id").map{|p| p.id}.join(",") + ")"}").order("max_created_at desc").map {|p| p.project_id}.join(",") + ")"%> + <% projects = Project.joins(:repositories).where("projects.id in #{project_order_ids} and repositories.type='Repository::Gitlab'")%> + <%# projects = @user.projects.visible.select("projects.*, (SELECT MAX(created_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%>
      <%= render :partial => 'layouts/user_projects', :locals => {:projects => projects,:user => @user, :page => 0} %> From 185ad829cdb720382ffedcb6d0ae902ef623c6ba Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Mar 2016 09:36:46 +0800 Subject: [PATCH 11/37] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E9=80=9F=E5=BA=A6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 14 ++++++-------- app/controllers/users_controller.rb | 4 +--- app/helpers/issues_helper.rb | 4 ++-- app/models/user.rb | 16 +++++++++------- app/views/users/_project_issue_detail.html.erb | 8 ++++++++ 5 files changed, 26 insertions(+), 20 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index fe7d4bbe5..b2a828768 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -308,20 +308,18 @@ class ProjectsController < ApplicationController if User.current.member_of?(@project) || User.current.admin? case params[:type] when nil - @events_pages = ForgeActivity.where("project_id = ? and forge_act_type in ('Issue', 'Message','News', 'ProjectCreateInfo', 'Attachment')",@project).order("updated_at desc").limit(10).offset(@page * 10) + @events_pages = ForgeActivity.where("project_id = ? and forge_act_type in ('Issue', 'Message','News', 'ProjectCreateInfo', 'Attachment')", @project).includes(:forge_act).order("updated_at desc").limit(10).offset(@page * 10) when 'issue' - @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Issue'",@project).order("updated_at desc").limit(10).offset(@page * 10) + @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Issue'", @project).includes(:forge_act).order("updated_at desc").limit(10).offset(@page * 10) when 'news' - @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'News'",@project).order("updated_at desc").limit(10).offset(@page * 10) + @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'News'", @project).includes(:forge_act).order("updated_at desc").limit(10).offset(@page * 10) when 'message' - @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Message'",@project).order("updated_at desc").limit(10).offset(@page * 10) + @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Message'", @project).includes(:forge_act).order("updated_at desc").limit(10).offset(@page * 10) when 'attachment' - @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Attachment'",@project).order("updated_at desc").limit(10).offset(@page * 10) + @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Attachment'", @project).includes(:forge_act).order("updated_at desc").limit(10).offset(@page * 10) end else - @events_pages = ForgeActivity.includes(:project).where("forge_activities.project_id = ? and projects.is_public - = ? and forge_act_type != ? ",@project,1, "Document").order("created_at desc") - .page(params['page'|| 1]).per(10); + @events_pages = ForgeActivity.includes(:project).where("forge_activities.project_id = ? and projects.is_public = ? and forge_act_type != ? ",@project,1, "Document").order("created_at desc").page(params['page'|| 1]).per(10); end # 根据对应的请求，返回对应的数据 respond_to do |format| diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index d85778e73..658b44e40 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1206,9 +1206,7 @@ class UsersController < ApplicationController def show # 统计访问量 - unless User.current == @user - @user.update_attribute(:visits, @user.visits.to_i + 1) - end + @user.update_column(:visits, @user.visits.to_i + 1) unless User.current == @user #更新用户申请成为课程老师或教辅消息的状态 if params[:course_id] != nil join_course_messages = CourseMessage.where("course_id =? and course_message_type =? and user_id =? and course_message_id =? and viewed =?", diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 4ad3cb49d..1cd22558b 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -111,9 +111,9 @@ module IssuesHelper def principals_options_for_isuue_list(project) if User.current.member_of?(project) - project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["<< #{l(:label_me)} >>", User.current.id]).unshift(["指派给", 0]) + project.members.includes(:user).order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["<< #{l(:label_me)} >>", User.current.id]).unshift(["指派给", 0]) else - project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["指派给", 0]) + project.members.includes(:user).order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["指派给", 0]) end end diff --git a/app/models/user.rb b/app/models/user.rb index 78d823ea7..2a9a13c73 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -339,13 +339,15 @@ class User < Principal message_new_time.onclick_time = User.current.last_login_on.nil? ? Time.now : User.current.last_login_on message_new_time.save end - course_count = CourseMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count - forge_count = ForgeMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count - user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count - user_memo_count = MemoMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count - system_messages_count = SystemMessage.where("created_at >?", User.current.onclick_time.onclick_time).count - at_count = AtMessage.where("user_id =? and viewed =? and created_at >?", User.current.id, 0, User.current.onclick_time.onclick_time).count - org_count = OrgMessage.where("user_id=? and viewed =? and created_at >?", User.current.id,0, User.current.onclick_time.onclick_time).count + user = User.current + onclick_time = user.onclick_time.onclick_time + course_count = CourseMessage.where("user_id =? and viewed =? and created_at >?", user.id, 0, onclick_time).count + forge_count = ForgeMessage.where("user_id =? and viewed =? and created_at >?", user.id, 0, onclick_time).count + user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =? and created_at >?", user.id, 0, onclick_time).count + user_memo_count = MemoMessage.where("user_id =? and viewed =? and created_at >?", user.id, 0, onclick_time).count + system_messages_count = SystemMessage.where("created_at >?", onclick_time).count + at_count = AtMessage.where("user_id =? and viewed =? and created_at >?", user.id, 0, onclick_time).count + org_count = OrgMessage.where("user_id=? and viewed =? and created_at >?", user.id,0, onclick_time).count messages_count = course_count + forge_count + user_feedback_count + user_memo_count + system_messages_count + at_count + org_count end diff --git a/app/views/users/_project_issue_detail.html.erb b/app/views/users/_project_issue_detail.html.erb index 1235b4e53..95e297f49 100644 --- a/app/views/users/_project_issue_detail.html.erb +++ b/app/views/users/_project_issue_detail.html.erb @@ -54,6 +54,10 @@ <% end %>
      + + + + <%= form_tag({:controller => 'issues', :action => 'update', :id => activity.id, :issue_detail => true, :type => "assigned"},:remote=>'true', :method => :put, :id=>"issue_query_assign_form_#{activity.id}", :class => 'query_form') do %>

    •  指派  : 

      @@ -66,6 +70,10 @@
      • <% end %>
      + + + +
      <%= form_tag({:controller => 'issues', :action => 'update', :id => activity.id, :issue_detail => true, :type => "prior"},:remote=>'true', :method => :put, :id=>"issue_query_prior_form_#{activity.id}", :class => 'query_form') do %> From 0d049bbe1f0bf885697e3444748507b68fb224fc Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Thu, 24 Mar 2016 10:07:39 +0800 Subject: [PATCH 12/37] refactor new_base_user --- app/views/layouts/new_base_user.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index c288b9402..a613d8984 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -229,7 +229,7 @@ GROUP BY fa.project_id) AS p ORDER BY p.created_at DESC limit 5").map {|p| p.project_id}.join(",") + ")"%> <%# project_order_ids = "(" + ForgeActivity.select("DISTINCT project_id, max(created_at) as max_created_at").where("project_id in #{"(" + @user.projects.visible.select("projects.id").map{|p| p.id}.join(",") + ")"}").order("max_created_at desc").map {|p| p.project_id}.join(",") + ")"%> - <% projects = Project.joins(:repositories).where("projects.id in #{project_order_ids} and repositories.type='Repository::Gitlab'")%> + <% projects = Project.where("projects.id in #{project_order_ids}")%> <%# projects = @user.projects.visible.select("projects.*, (SELECT MAX(created_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%>
        From d6f81c89784a511feffb88b249d47ede86cf3980 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Mar 2016 10:41:08 +0800 Subject: [PATCH 13/37] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AE=A8=E8=AE=BA?= =?UTF-8?q?=E5=8C=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/boards_controller.rb | 31 +++++++--------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb index c8518e8a3..a77346d89 100644 --- a/app/controllers/boards_controller.rb +++ b/app/controllers/boards_controller.rb @@ -70,31 +70,16 @@ class BoardsController < ApplicationController def show # 讨论区消息状态更新（已读和未读） if @project - query_forge_messages = @board.messages - query_forge_messages.each do |query_forge_message| - query = query_forge_message.forge_messages - query.each do |forge_message| - if User.current.id == forge_message.user_id - forge_message.update_attributes(:viewed => true) - end - end - end + ForgeMessage.where("user_id =? and project_id =? and viewed =?", User.current.id, @project.id, 0).update_all(:viewed => true) # 更新@消息为已读 - @project.boards.each do |board| - board.messages.each do |m| - User.current.at_messages.unviewed('Message', m.id).each {|x| x.viewed!} - end - end + # 注释掉这句是因为和上面的方法代码重复，一个类型的消息，已经更新就不需要再更新 + # @project.boards.each do |board| + # board.messages.each do |m| + # User.current.at_messages.unviewed('Message', m.id).each {|x| x.viewed!} + # end + # end elsif @course - query_course_messages = @board.messages - query_course_messages.each do |query_course_message| - query = query_course_message.course_messages - query.each do |course_message| - if User.current.id == course_message.user_id - course_message.update_attributes(:viewed => true) - end - end - end + CourseMessage.where("user_id =? and course_id =? and viewed =?", User.current.id, @course.id, 0).update_all(:viewed => true) end sort_init 'updated_on', 'desc' From 1330f02db80cee79f1455ec813092aaf794fec8c Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Mar 2016 12:59:03 +0800 Subject: [PATCH 14/37] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E7=9A=84=E5=8A=A8=E6=80=81=E4=BB=A5=E5=A4=9A=E6=80=81=E5=BD=A2?= =?UTF-8?q?=E5=BC=8F=E5=AD=98=E5=85=A5forge=5Factivities?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 2 +- app/models/project.rb | 7 +++---- app/views/layouts/base_projects.html.erb | 16 ---------------- app/views/projects/_project_activities.html.erb | 2 +- 4 files changed, 5 insertions(+), 22 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index b2a828768..113e37af3 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -308,7 +308,7 @@ class ProjectsController < ApplicationController if User.current.member_of?(@project) || User.current.admin? case params[:type] when nil - @events_pages = ForgeActivity.where("project_id = ? and forge_act_type in ('Issue', 'Message','News', 'ProjectCreateInfo', 'Attachment')", @project).includes(:forge_act).order("updated_at desc").limit(10).offset(@page * 10) + @events_pages = ForgeActivity.where("project_id = ? and forge_act_type in ('Issue', 'Message','News', 'Project', 'Attachment')", @project).includes(:forge_act).order("updated_at desc").limit(10).offset(@page * 10) when 'issue' @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Issue'", @project).includes(:forge_act).order("updated_at desc").limit(10).offset(@page * 10) when 'news' diff --git a/app/models/project.rb b/app/models/project.rb index 32677143d..184b3c7af 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -108,7 +108,8 @@ class Project < ActiveRecord::Base has_many :tags, :through => :project_tags, :class_name => 'Tag' has_many :project_tags, :class_name => 'ProjectTags' # 动态级联删除 - has_many :forge_activities, :class_name => 'ForgeActivity', :dependent => :destroy + has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy + #has_many :forge_activities, :class_name => 'ForgeActivity', :as =>:forge_act, :dependent => :destroy # 关联虚拟表 has_many :forge_messages, :class_name =>'ForgeMessage', :as => :forge_message, :dependent => :destroy @@ -1212,9 +1213,7 @@ class Project < ActiveRecord::Base # Author lizanle # Description 新建项目要在ForgeActivities中加一条数据。 def acts_as_forge_activities - fa = ForgeActivity.new(:user_id => User.current.id,:project_id => self.id, - :forge_act_id => self.id,:forge_act_type => "ProjectCreateInfo") - fa.save! + self.forge_acts << ForgeActivity.new(:user_id => User.current.id, :project_id => self.id) end diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 5ad25d5bd..3af8f9212 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -44,8 +44,6 @@
        - - <%#= render :partial => 'layouts/new_header'%>
        @@ -104,20 +102,6 @@
        - <%# if User.current.member_of?(@project) %> - - - - - - - - - - <%# end %> - - <%#--project_new_type: 1为开发组；2为科研组；3为朋友圈子--%> -
        <% if @project.project_new_type == 1 || @project.project_new_type.nil? %> <%= render :partial => 'projects/development_group', :locals => {:project => @project} %> diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb index f9faa26d6..bc791d734 100644 --- a/app/views/projects/_project_activities.html.erb +++ b/app/views/projects/_project_activities.html.erb @@ -73,7 +73,7 @@ <% case activity.forge_act_type %> - <% when "ProjectCreateInfo" %> + <% when "Project" %> <%= render :partial => 'projects/project_create', :locals => {:activity => activity, :user_activity_id => activity.id} %> <% when "Issue" %> From a9ef2c28e21417df02f785729d859f3883b3a04a Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Mar 2016 13:57:52 +0800 Subject: [PATCH 15/37] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/_project_activities.html.erb | 1 - db/migrate/20160324052634_change_project_create_type.rb | 8 ++++++++ db/schema.rb | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20160324052634_change_project_create_type.rb diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb index bc791d734..536921c13 100644 --- a/app/views/projects/_project_activities.html.erb +++ b/app/views/projects/_project_activities.html.erb @@ -78,7 +78,6 @@ <% when "Issue" %> <%= render :partial => 'users/project_issue', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id, :project_id => activity.project_id} %> - <% when "Message" %> <%= render :partial => 'users/project_message', :locals => {:activity => activity.forge_act,:user_activity_id =>activity.id,:is_course=>1,:is_board=>0} %> diff --git a/db/migrate/20160324052634_change_project_create_type.rb b/db/migrate/20160324052634_change_project_create_type.rb new file mode 100644 index 000000000..8beca180d --- /dev/null +++ b/db/migrate/20160324052634_change_project_create_type.rb @@ -0,0 +1,8 @@ +class ChangeProjectCreateType < ActiveRecord::Migration + def up + execute("update forge_activities set forge_act_type = 'Project' where forge_act_type = 'ProjectCreateInfo'") + end + + def down + end +end diff --git a/db/schema.rb b/db/schema.rb index 5eb9edd36..361752fa7 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20160321080825) do +ActiveRecord::Schema.define(:version => 20160324052634) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -465,7 +465,6 @@ ActiveRecord::Schema.define(:version => 20160321080825) do t.integer "status" end - add_index "course_messages", ["course_message_id"], :name => "index_course_messages_on_course_message_id" add_index "course_messages", ["course_message_type"], :name => "index_course_messages_on_course_message_type" add_index "course_messages", ["user_id", "course_id", "created_at"], :name => "index_course_messages_on_user_id_and_course_id_and_created_at" @@ -1088,7 +1087,8 @@ ActiveRecord::Schema.define(:version => 20160321080825) do t.datetime "updated_at", :null => false end - add_index "message_alls", ["message_id", "message_type", "created_at"], :name => "index_message_alls_on_message_id_and_message_type_and_created_at" + add_index "message_alls", ["message_type"], :name => "index_message_alls_on_message_type" + add_index "message_alls", ["user_id", "message_id", "created_at"], :name => "index_message_alls_on_user_id_and_message_id_and_created_at" create_table "messages", :force => true do |t| t.integer "board_id", :null => false From 88185b1f3414779b78e7aac4f156ecb7155a034a Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Mar 2016 15:04:50 +0800 Subject: [PATCH 16/37] =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=BD=9C=E5=93=81?= =?UTF-8?q?=E6=B6=88=E6=81=AF=EF=BC=8C=E4=BD=9C=E5=93=81=E5=B1=95=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_work_controller.rb | 4 +- .../student_work/_student_work_list.html.erb | 72 ++++++++++--------- app/views/users/_user_message_course.html.erb | 4 +- 3 files changed, 41 insertions(+), 39 deletions(-) diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index a698823e5..71b23fdcf 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -230,12 +230,12 @@ class StudentWorkController < ApplicationController render_403 return end - @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").order("#{@order} #{@b_sort}"),@name).count end @score = @b_sort == "desc" ? "asc" : "desc" - + # 消息传过来的ID + @message_student_work_id = params[:student_work_id] respond_to do |format| format.js format.html diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb index f9f55456b..0badbb192 100644 --- a/app/views/student_work/_student_work_list.html.erb +++ b/app/views/student_work/_student_work_list.html.erb @@ -47,42 +47,44 @@ \ No newline at end of file diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index e042cd738..5c05474a0 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -167,7 +167,7 @@
      • <% unless ma.content.nil? %> - <%= link_to ma.content.html_safe, student_work_index_path(:homework => ma.course_message.student_work.homework_common_id), + <%= link_to ma.content.html_safe, student_work_index_path(:homework => ma.course_message.student_work.homework_common_id, :student_work_id => ma.course_message.student_work), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %> @@ -208,7 +208,7 @@ ">回复了作品评论：
      • - <%= link_to ma.course_message.notes, student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %> + <%= link_to ma.course_message.notes, student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id, :student_work_id => ma.course_message.jour.student_work), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" %> From 9cbe719c5e45f060206aefa57d2178a16ae2cb62 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Mar 2016 16:44:54 +0800 Subject: [PATCH 17/37] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_project_attachment.html.erb | 2 -- db/migrate/20160324074942_add_index_to_forge_activities.rb | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20160324074942_add_index_to_forge_activities.rb diff --git a/app/views/users/_project_attachment.html.erb b/app/views/users/_project_attachment.html.erb index deb0cb4c6..b3d904104 100644 --- a/app/views/users/_project_attachment.html.erb +++ b/app/views/users/_project_attachment.html.erb @@ -1,5 +1,3 @@ - -
        diff --git a/db/migrate/20160324074942_add_index_to_forge_activities.rb b/db/migrate/20160324074942_add_index_to_forge_activities.rb new file mode 100644 index 000000000..5623e8056 --- /dev/null +++ b/db/migrate/20160324074942_add_index_to_forge_activities.rb @@ -0,0 +1,5 @@ +class AddIndexToForgeActivities < ActiveRecord::Migration + def change + add_index :forge_activities, [:project_id, :forge_act_id, :created_at] + end +end From 7108e6d763d97be0aaba63088b890b60034900bc Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Fri, 25 Mar 2016 09:22:05 +0800 Subject: [PATCH 18/37] =?UTF-8?q?=E5=87=8F=E5=B0=91=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 123f1fc96..ed7dad53f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1213,8 +1213,8 @@ class UsersController < ApplicationController params[:course_id], 'JoinCourseRequest', User.current.id, @user.id, false) join_course_messages.update_all(:viewed => true) end - shield_project_ids = ShieldActivity.where("container_type='User' and container_id=#{@user.id} and shield_type='Project'").map(&:shield_id) - shield_course_ids = ShieldActivity.where("container_type='User' and container_id=#{@user.id} and shield_type='Course'").map(&:shield_id) + shield_project_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{@user.id} and shield_type='Project'").map(&:shield_id) + shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{@user.id} and shield_type='Course'").map(&:shield_id) @page = params[:page] ? params[:page].to_i + 1 : 0 user_project_ids = (@user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (@user.projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")" user_course_ids = (@user.courses.visible.map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (@user.courses.visible.map{|course| course.id}-shield_course_ids).join(",") + ")" From cb4b26762d222e4910b0c1b7e4c95592c64a5f97 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 25 Mar 2016 09:56:45 +0800 Subject: [PATCH 19/37] =?UTF-8?q?=E8=AF=BE=E7=A8=8Bbase=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/courses_helper.rb | 45 ++++++++-------------- app/views/courses/_recommendation.html.erb | 15 ++++---- app/views/layouts/_project_info.html.erb | 45 +--------------------- app/views/layouts/base_courses.html.erb | 5 ++- 4 files changed, 27 insertions(+), 83 deletions(-) diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 37c7deb4c..138f88d53 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -24,40 +24,20 @@ module CoursesHelper def find_excelletn_course keywords, current_course # 获取tag匹配结果ID a_tags = [] - # kc = keywords.to_a - Course.visible.where("is_excellent =? and is_public =?", 1, 1).each do |ec| + Course.where("is_excellent =? and is_public =?", 1, 1).includes(:tags).each do |ec| if ec.tags.any?{|value| current_course.name.include?(value.to_s)} a_tags << ec.id end end - # sql = "SELECT distinct c.* FROM `courses` c, tags t, taggings ts where t.id = ts.tag_id and ts.taggable_id = c.id and c.is_excellent = 1 and is_delete = 0 and - # ts.taggable_type = 'Course' and t.name like '%#{keywords}%'" - # a_tags = Course.find_by_sql(sql).select{|course| course.is_public ==1 unless User.current.member_of_course?(course)} - # 通过elastic结果获取精品课程 - a_courses = [] - #courses = Course.search(keywords) - #courses.each do |c| - # a_courses << c.id - #end - a_courses << a_tags unless a_tags.length == 0 # 课程本身不能搜索显示自己 - excellent_ids = a_courses.flatten.uniq.delete_if{|i| i == current_course.id} - limit = 5 - excellent_ids.length.to_i + excellent_ids = a_tags.uniq.delete_if{|i| i == current_course.id} sql = "SELECT distinct c.id FROM course_activities cs, courses c where cs.course_id = c.id - and c.is_excellent =1 and c.is_public = 1 and c.id != #{current_course.id} order by cs.updated_at desc;" - default_ecourse_ids = Course.find_by_sql(sql).flatten - # REDO:时间紧，待优化 - default_ids =[] - default_ecourse_ids.each do |de| - default_ids << de.id - end - default_ids = default_ids - excellent_ids - #default_ecourse = Course.where("id is not in (?)", ids).find_by_sql(sql).flatten.delete_if{|i| i == current_course.id}.flatten - arr_result = excellent_ids << default_ids - arr_result = arr_result.flatten.first(5) - return arr_result - # 过滤条件：精品课程、本身不在搜索范围 - #e_courses = Course.where("is_excellent =? and id in (?)",1, arr_result).where("id !=?", current_course.id) + and (c.is_excellent =1 or c.excellent_option =1) and c.is_public = 1 and c.id != #{current_course.id} order by cs.updated_at desc;" + default_ids = Course.find_by_sql(sql).flatten.map { |c| c.id } + excellent_ids << default_ids.flatten + arr_result = excellent_ids.flatten.uniq.first(5) + excellent_courses = Course.find(arr_result) + return excellent_courses end # 判断精品课程是否可见，非课程成员无法查看私有课程 @@ -258,7 +238,7 @@ module CoursesHelper # 学生人数计算 # add by nwb def studentCount course - course ? course.student.count.to_s : 0#course.student.count + course ? course.student.count.to_i : 0#course.student.count end #课程成员数计算 @@ -293,12 +273,17 @@ module CoursesHelper def searchTeacherAndAssistant project #searchPeopleByRoles(project, TeacherRoles) members = [] - project.members.each do |m| + project.members.includes(:user).each do |m| members << m if m && m.user && m.user.allowed_to?(:as_teacher,project) end members end + def TeacherAndAssistantCount course + students_count = course.student.count + number = course.members.count - students_count + end + def search_student_in_group(project, course_group_id) #searchPeopleByRoles(project, StudentRoles) members = [] diff --git a/app/views/courses/_recommendation.html.erb b/app/views/courses/_recommendation.html.erb index a0c659493..63803a5b9 100644 --- a/app/views/courses/_recommendation.html.erb +++ b/app/views/courses/_recommendation.html.erb @@ -1,22 +1,21 @@ -<% unless excellent_course_recommend(course).length == 0 %> +<% exc_course = excellent_course_recommend(course) %> +<% unless exc_course.length == 0 %>

          <%= l(:label_homework_recommendation) %>：

          - <% excellent_course_recommend(course).each do |e_course| %> - <% e_course = Course.find(e_course) %> - + <% exc_course.each do |e_course| %>
        • <%= image_tag(url_to_avatar(e_course), :width => "40", :height => "40", :class => "fl mr10 rankPortrait", :alt => "logo") %>

          <%=link_to e_course.name, course_path(e_course.id), :class => "hidden fl w170" %>

          - <% if visable_attachemnts_incourse(e_course).count > 0 %> - <%= l(:project_module_attachments) %>(<%= link_to visable_attachemnts_incourse(e_course).count, course_files_path(e_course), :class => "linkBlue2" %>) + <% if course_file_num > 0 %> + <%= l(:project_module_attachments) %>(<%= link_to course_file_num, course_files_path(e_course), :class => "linkBlue2" %>) <% end %> <% if e_course.homework_commons.where("publish_time <= '#{Date.today}'").count > 0 %> <%= l(:label_homework_commont) %>(<%= link_to e_course.homework_commons.where("publish_time <= '#{Date.today}'").count, homework_common_index_path(:course=>e_course.id), :class => "linkBlue2" %>) <% end %>

          -

          -
          +

          +
        • <% end %> diff --git a/app/views/layouts/_project_info.html.erb b/app/views/layouts/_project_info.html.erb index db9e24a36..461d2b6d9 100644 --- a/app/views/layouts/_project_info.html.erb +++ b/app/views/layouts/_project_info.html.erb @@ -1,12 +1,10 @@ <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %> -<% teacher_num = searchTeacherAndAssistant(@course).count %> +<% teacher_num = TeacherAndAssistantCount(@course) %> <% student_num = studentCount(@course) %> -<% course_file_num = visable_attachemnts_incourse(@course).count%>
        ID:<%= @course.id%><%= @course.is_public == 0 ? "（私有）" : "（公开）" %> @@ -16,55 +14,16 @@
        <% unless is_teacher %> - -
        <%= join_in_course_header(@course, User.current) %>
        +
        <%= join_in_course_header(@course, User.current) %>
        <% end %>
        -
        - - - - - - - - - - - - - - - - - - - -
        <%= @course.name %> - <%# if @course.is_public == 0%> - - - <%# end %> <%if User.current && @course.tea_id == User.current.id && (@course.outline == 0 || BlogComment.where(:id=>@course.outline).count == 0) %> diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index ff7f20300..7495b20db 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -55,7 +55,8 @@
        - <%=render :partial=>'layouts/project_info' %> + <% course_file_num = visable_attachemnts_incourse(@course).count %> + <%=render :partial=>'layouts/project_info', :locals => {:course_file_num => course_file_num} %>
          @@ -168,7 +169,7 @@
        - <%= render :partial => 'courses/recommendation', :locals => {:course => @course} %> + <%= render :partial => 'courses/recommendation', :locals => {:course => @course, :course_file_num => course_file_num} %>
        访问计数 <%= @course.visits.to_i %>
        From 04b4823ac21c15ec13719ed9b9ce328434941c1b Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Fri, 25 Mar 2016 10:27:28 +0800 Subject: [PATCH 20/37] =?UTF-8?q?user=5Factivities=20=E5=8A=A0cache?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_activities.html.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index eb73f9226..5061acbc1 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -56,6 +56,7 @@ <% unless user_activity.act_type == "ProjectCreateInfo" %> <% act= user_activity.act %> + <% cache (user_activity) do %> <% case user_activity.container_type.to_s %> <% when 'Course' %> <% if act %> @@ -100,9 +101,11 @@ <% end %> <% end %> <% end %> + <% end %> <% else %> <%= render :partial => 'project_create', :locals => {:activity => user_activity,:user_activity_id =>user_activity.id} %> <% end %> + <% end %> <% end %> From ff2340baf9c23ed33c2e490f86f7cd33f0d434fe Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 25 Mar 2016 10:42:26 +0800 Subject: [PATCH 21/37] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/courses_helper.rb | 2 +- app/views/layouts/_project_info.html.erb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 138f88d53..36eebe4f2 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -751,7 +751,7 @@ module CoursesHelper #加入课程、退出课程按钮 def join_in_course_header(course, user, options=[]) if user.logged? - joined = course.members.map{|member| member.user_id}.include? user.id + joined = course.members.includes(:user).map{|member| member.user_id}.include? user.id text = joined ? l(:label_course_exit_student) : l(:label_course_join_student) url = joined ? join_path(:object_id => course.id) : try_join_path(:object_id => course.id) method = joined ? 'delete' : 'post' diff --git a/app/views/layouts/_project_info.html.erb b/app/views/layouts/_project_info.html.erb index 461d2b6d9..1f40c24ad 100644 --- a/app/views/layouts/_project_info.html.erb +++ b/app/views/layouts/_project_info.html.erb @@ -1,13 +1,13 @@ <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %> -<% teacher_num = TeacherAndAssistantCount(@course) %> -<% student_num = studentCount(@course) %> +<% teacher_num = 0 %> +<% student_num = 0 %> -
        ID:<%= @course.id%><%= @course.is_public == 0 ? "（私有）" : "（公开）" %> +
        ID:<%= @course.id %><%= @course.is_public == 0 ? "（私有）" : "（公开）" %> <% if is_excellent_course(@course) %> 精品课程 <% end %> From bd5dd24164f67ac3265c631f6a6483333df28566 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Fri, 25 Mar 2016 10:55:08 +0800 Subject: [PATCH 22/37] add alias name to farge_activitiy index --- db/migrate/20160324074942_add_index_to_forge_activities.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20160324074942_add_index_to_forge_activities.rb b/db/migrate/20160324074942_add_index_to_forge_activities.rb index 5623e8056..b53c98c94 100644 --- a/db/migrate/20160324074942_add_index_to_forge_activities.rb +++ b/db/migrate/20160324074942_add_index_to_forge_activities.rb @@ -1,5 +1,5 @@ class AddIndexToForgeActivities < ActiveRecord::Migration def change - add_index :forge_activities, [:project_id, :forge_act_id, :created_at] + add_index :forge_activities, [:project_id, :forge_act_id, :created_at], :name => 'forge_cat_project_id' end end From 5fd3e7d3a29ef060c5825d2da092e28168638b08 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 25 Mar 2016 11:13:42 +0800 Subject: [PATCH 23/37] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/migrate/20160324074942_add_index_to_forge_activities.rb | 2 +- .../20160325030146_add_index_to_course_actiivities.rb | 5 +++++ db/migrate/20160325030423_add_index_to_user_activities.rb | 5 +++++ db/schema.rb | 7 ++++++- 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20160325030146_add_index_to_course_actiivities.rb create mode 100644 db/migrate/20160325030423_add_index_to_user_activities.rb diff --git a/db/migrate/20160324074942_add_index_to_forge_activities.rb b/db/migrate/20160324074942_add_index_to_forge_activities.rb index 5623e8056..e4e17ec44 100644 --- a/db/migrate/20160324074942_add_index_to_forge_activities.rb +++ b/db/migrate/20160324074942_add_index_to_forge_activities.rb @@ -1,5 +1,5 @@ class AddIndexToForgeActivities < ActiveRecord::Migration def change - add_index :forge_activities, [:project_id, :forge_act_id, :created_at] + add_index :forge_activities, [:project_id, :forge_act_id, :created_at, :forge_act_type], :name => "forge_act_index" end end diff --git a/db/migrate/20160325030146_add_index_to_course_actiivities.rb b/db/migrate/20160325030146_add_index_to_course_actiivities.rb new file mode 100644 index 000000000..3449ef6a1 --- /dev/null +++ b/db/migrate/20160325030146_add_index_to_course_actiivities.rb @@ -0,0 +1,5 @@ +class AddIndexToCourseActiivities < ActiveRecord::Migration + def change + add_index :course_activities, [:course_id, :course_act_id, :course_act_type, :created_at], :name => "course_act_index" + end +end diff --git a/db/migrate/20160325030423_add_index_to_user_activities.rb b/db/migrate/20160325030423_add_index_to_user_activities.rb new file mode 100644 index 000000000..f14f0d7ce --- /dev/null +++ b/db/migrate/20160325030423_add_index_to_user_activities.rb @@ -0,0 +1,5 @@ +class AddIndexToUserActivities < ActiveRecord::Migration + def change + add_index :user_activities, [:act_id, :act_type, :container_id, :created_at], :name => "user_act_index" + end +end diff --git a/db/schema.rb b/db/schema.rb index 361752fa7..aeabe0ae0 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20160324052634) do +ActiveRecord::Schema.define(:version => 20160325030423) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -405,6 +405,8 @@ ActiveRecord::Schema.define(:version => 20160324052634) do t.datetime "updated_at", :null => false end + add_index "course_activities", ["course_id", "course_act_id", "course_act_type", "created_at"], :name => "course_act_index" + create_table "course_attachments", :force => true do |t| t.string "filename" t.string "disk_filename" @@ -731,6 +733,7 @@ ActiveRecord::Schema.define(:version => 20160324052634) do end add_index "forge_activities", ["forge_act_id"], :name => "index_forge_activities_on_forge_act_id" + add_index "forge_activities", ["project_id", "forge_act_id", "created_at", "forge_act_type"], :name => "forge_act_index" create_table "forge_messages", :force => true do |t| t.integer "user_id" @@ -1812,6 +1815,8 @@ ActiveRecord::Schema.define(:version => 20160324052634) do t.integer "user_id" end + add_index "user_activities", ["act_id", "act_type", "container_id", "created_at"], :name => "user_act_index" + create_table "user_extensions", :force => true do |t| t.integer "user_id", :null => false t.date "birthday" From aeb694a68e3191012f154fc351c87fa62da24e22 Mon Sep 17 00:00:00 2001 From: alan <547533434@qq.com> Date: Fri, 25 Mar 2016 13:57:00 +0800 Subject: [PATCH 24/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E5=88=A0?= =?UTF-8?q?=E9=99=A4blog=5Fcomment=E6=97=B6=E5=88=A0=E9=99=A4user=5Factivi?= =?UTF-8?q?ties=E5=86=85=E5=AE=B9=E3=80=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/blog_comments_controller.rb | 8 ++++---- app/views/users/_user_activities.html.erb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/blog_comments_controller.rb b/app/controllers/blog_comments_controller.rb index 7220eec27..0224a587d 100644 --- a/app/controllers/blog_comments_controller.rb +++ b/app/controllers/blog_comments_controller.rb @@ -71,18 +71,18 @@ class BlogCommentsController < ApplicationController @course.save redirect_to course_path(:id=>params[:course_id]) else - @article.children.delete - @article.delete + @article.children.destroy + @article.destroy redirect_to user_blogs_path(:user_id=>User.current) end else#如果是回复被删， if params[:course_id] #如果带了course_id过来了，那么这是要跳到课程大纲去的 - @article.delete + @article.destroy redirect_to syllabus_course_path(:id=>params[:course_id]) else root = @article.root - @article.delete + @article.destroy redirect_to user_blog_blog_comment_path(:user_id=>root.author_id,:blog_id=>root.blog_id,:id=>root.id) end diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index 5061acbc1..6e590d293 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -56,7 +56,7 @@ <% unless user_activity.act_type == "ProjectCreateInfo" %> <% act= user_activity.act %> - <% cache (user_activity) do %> + <% cache (act) do %> <% case user_activity.container_type.to_s %> <% when 'Course' %> <% if act %> From 9549d695f62c3f4ed3f39ca3a3b2ec330ea9af87 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 25 Mar 2016 14:29:58 +0800 Subject: [PATCH 25/37] =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E5=B1=80?= =?UTF-8?q?=E9=83=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/messages_controller.rb | 19 --------------- app/views/boards/_course_show_detail.html.erb | 24 ++----------------- app/views/boards/show.html.erb | 2 -- app/views/layouts/_project_info.html.erb | 10 ++++---- app/views/users/_course_message.html.erb | 18 +++++++------- 5 files changed, 16 insertions(+), 57 deletions(-) diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 17111b3f3..b1d16debb 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -37,16 +37,6 @@ class MessagesController < ApplicationController # Show a topic and its replies def show -=begin - if @course - topic_id = params[:r]?params[:r]:params[:id] - parent_id = params[:id] - url = course_boards_path(@course,:topic_id => topic_id,:parent_id=>parent_id); - redirect_to url - return; - end -=end - @isReply = true page = params[:page] # Find the page of the requested reply @@ -54,16 +44,7 @@ class MessagesController < ApplicationController offset = @topic.children.count(:conditions => ["#{Message.table_name}.id < ?", params[:r].to_i]) page = 1 + offset / REPLIES_PER_PAGE end - @reply_count = @topic.children.count - # @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page - # @replies = @topic.children. - # includes(:author, :attachments, {:board => :project}). - # reorder("#{Message.table_name}.created_on DESC"). - # limit(@reply_pages.per_page). - # offset(@reply_pages.offset). - # all - @reply = Message.new(:subject => "RE: #{@message.subject}") if @course messages_replies = @topic.children. diff --git a/app/views/boards/_course_show_detail.html.erb b/app/views/boards/_course_show_detail.html.erb index bc7b9667e..d465571c5 100644 --- a/app/views/boards/_course_show_detail.html.erb +++ b/app/views/boards/_course_show_detail.html.erb @@ -2,20 +2,7 @@ <%= import_ke(enable_at: false, prettify: false) %> <%= javascript_include_tag "create_kindeditor" %> <% end %> - - -<% if topics%> +<% if topics %> <% topics.each do |topic| %> <% if topic %> - <%= render :partial => 'users/course_message', :locals => {:activity => topic, :user_activity_id => topic.id,:is_course=>1,:is_board=>1} %> + <%= render :partial => 'users/course_message', :locals => {:activity => topic, :user_activity_id => topic.id, :is_course => 1, :is_board=>1} %> <% end %> <% end %> <% if topics.count == 10 %> - <%= link_to "点击展开更多",boards_topic_path(@board, :course_id => @board.course.id ,:page => page),:id => "show_more_course_topic",:remote => "true",:class => "loadMore mt10 f_grey"%> <% end %> <% end%> - diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb index 9dd5c78ca..6cc755b61 100644 --- a/app/views/boards/show.html.erb +++ b/app/views/boards/show.html.erb @@ -192,6 +192,4 @@ function nh_init_board(params){ }); } } - - diff --git a/app/views/layouts/_project_info.html.erb b/app/views/layouts/_project_info.html.erb index 1f40c24ad..06d6304d2 100644 --- a/app/views/layouts/_project_info.html.erb +++ b/app/views/layouts/_project_info.html.erb @@ -25,15 +25,15 @@ <%= @course.name %> - <%if User.current && @course.tea_id == User.current.id && (@course.outline == 0 || BlogComment.where(:id=>@course.outline).count == 0) %> + <% if User.current && @course.tea_id == User.current.id && (@course.outline == 0 || BlogComment.where(:id=>@course.outline).count == 0) %> - <% elsif User.current && @course.tea_id == User.current.id && @course.outline != 0 && BlogComment.where(:id=>@course.outline).count != 0%> + <% elsif User.current && @course.tea_id == User.current.id && @course.outline != 0 && BlogComment.where(:id=>@course.outline).count != 0 %> - <% elsif User.current && @course.tea_id != User.current.id && !@course.is_public? && User.current.member_of_course?(@course) && @course.outline != 0%> + <% elsif User.current && @course.tea_id != User.current.id && !@course.is_public? && User.current.member_of_course?(@course) && @course.outline != 0 %> - <% elsif User.current && @course.tea_id != User.current.id && @course.is_public? && @course.outline != 0%> + <% elsif User.current && @course.tea_id != User.current.id && @course.is_public? && @course.outline != 0 %> - <%else%> + <%else %> <%end %>
        diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index aed741ce5..de49ba57a 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -2,14 +2,14 @@
        <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id,:host=>Setting.host_user), :alt => "用户头像" %> - <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %> + <%#= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
        <% if activity.try(:author).try(:realname) == ' ' %> - <%= link_to activity.try(:author), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %> + <%= link_to activity.try(:author), user_path(activity.author_id, :host=>Setting.host_user), :class => "newsBlue mr15" %> <% else %> - <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %> + <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id, :host=>Setting.host_user), :class => "newsBlue mr15" %> <% end %> TO <%= link_to activity.course.name.to_s+" | 课程问答区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%> @@ -18,15 +18,15 @@ <% if activity.parent_id.nil? %> <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "postGrey" %> <% else %> - <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "postGrey"%> + <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "postGrey" %> <% end %>
        - <% if activity.sticky == 1%> + <% if activity.sticky == 1 %> 置顶 <% end%> - <% if activity.locked%> + <% if activity.locked %>        - <% end%> + <% end %>
        发帖时间：<%= format_time(activity.created_on) %> @@ -36,9 +36,9 @@
        <% if activity.parent_id.nil? %> - <% content = activity.content%> + <% content = activity.content %> <% else %> - <% content = activity.parent.content%> + <% content = activity.parent.content %> <% end %> <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
        From c6361406b5b6b1cf0a83c348d5c7703746dc25b5 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 25 Mar 2016 14:43:51 +0800 Subject: [PATCH 26/37] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=AF=84=E6=B5=8B?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_work_controller.rb | 118 +++++++++++++++++- .../_programing_work_show.html.erb | 25 ++-- .../users/new_user_commit_homework.html.erb | 82 ++++++------ app/views/users/user_commit_homework.html.erb | 90 ++++++------- config/routes.rb | 2 +- db/schema.rb | 17 +-- public/javascripts/application.js | 4 +- public/javascripts/homework.js | 66 +++++++++- public/stylesheets/courses.css | 1 + public/stylesheets/public.css | 1 + 10 files changed, 292 insertions(+), 114 deletions(-) diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index aa77e2d51..dda3291a5 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -4,14 +4,14 @@ class StudentWorkController < ApplicationController include ApplicationHelper require 'bigdecimal' require "base64" - before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:set_score_rule,:forbidden_anonymous_comment,:delete_work,:new_student_work_project,:student_work_project,:cancel_relate_project,:search_course_students] + before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:program_test_ex,:set_score_rule,:forbidden_anonymous_comment,:delete_work,:new_student_work_project,:student_work_project,:cancel_relate_project,:search_course_students] before_filter :find_work, :only => [:edit, :update, :show, :destroy, :add_score, :praise_student_work,:retry_work,:revise_attachment] before_filter :member_of_course, :only => [:new, :create, :show, :add_score, :praise_student_work] before_filter :author_of_work, :only => [:edit, :update, :destroy] before_filter :teacher_of_course, :only => [:student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :set_score_rule, :forbidden_anonymous_comment] before_filter :is_logged, :only => [:index] - ### + ### def program_test is_test = params[:is_test] == 'true' resultObj = {status: 0, results: [], error_msg: '', time: Time.now.strftime('%Y-%m-%d %T')} @@ -48,13 +48,102 @@ class StudentWorkController < ApplicationController resultObj[:time] = student_work_test.created_at.to_s(:db) resultObj[:index] = student_work.student_work_tests.count end - end end render :json => resultObj end + $test_result = {} + $test_status = {} +#根据传入的tIndex确定是第几次测试 + def program_test_ex + is_test = params[:is_test] == 'true' + resultObj = {status: 0, results: [], error_msg: '', time: Time.now.strftime('%Y-%m-%d %T'),tseq:1,tcount:1} #保存每测试一次返回的结果 + + student_work = find_or_save_student_work(is_test) + + resultObj[:tcount] = @homework.homework_tests.size + + unless student_work + resultObj[:status] = 100 + else + if @homework.homework_type == 2 && @homework.homework_detail_programing + #找到第index个测试的输入输出 + index = params[:tIndex].to_i + resultObj[:tseq] = index + test = @homework.homework_tests[index - 1] + + #请求测试 + result = test_realtime_ex(test, params[:src]) + logger.debug result + + #-1 默认值 0全部正确并结束 2 超时 -2 编译错误 + resultObj[:status] = -1 + resultObj[:results] = result["results"][0] #本次测试结果 + resultObj[:error_msg] = result["error_msg"] #编译错误时的信息 + + if result["status"].to_i == -2 #编译错误 + resultObj[:status] = -2 + elsif result["results"][0]["status"].to_i == 2 + resultObj[:status] = 2 + end + + unless student_work.save + resultObj[:status] = 200 + else + + #索引 + work_id = student_work.id + + #测试第一个时初始化下全局变量 + if index == 1 + $test_result[work_id] = [] #保存本次测试的结果 输入输出 + $test_status[work_id] = 0 #保存本次测试的结果 正确还是错误 + end + + if result["status"].to_i == -2 + $test_result[work_id] = [result["error_msg"]] + $test_status[work_id] = -2 + else + #存下每次的结果 只有每次都为0才全部正确 + $test_status[work_id] = result["status"] != 0 ? result["status"]:$test_status[work_id] + $test_result[work_id][index - 1] = resultObj[:results] + end + + student_work.name = params[:title] + student_work.description = params[:src] + + if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d") + student_work.late_penalty = @homework.late_penalty + else + student_work.late_penalty = 0 + end + + #超时或编译错误则直接返回了并存入数据库 + if resultObj[:status] == 2 || resultObj[:status] == -2 || index == @homework.homework_tests.size + if $test_status[work_id] == 0 + resultObj[:status] = 0 + end + + student_work_test = student_work.student_work_tests.build(status: $test_status[work_id], + results: $test_result[work_id],src: params[:src]) + student_work.save + resultObj[:time] = student_work_test.created_at.to_s(:db) + resultObj[:index] = student_work.student_work_tests.count + + $test_result[work_id] = nil + $test_status[work_id] = nil + end + + #渲染返回结果 + render :json => resultObj + end + end + end + end + + def index # 作业消息状态更新 @homework.course_messages.each do |homework_message| @@ -986,7 +1075,6 @@ class StudentWorkController < ApplicationController student_work end - def test_realtime(student_work, src) url = "#{Redmine::Configuration['judge_server']}api/realtime_test.json" @@ -1010,6 +1098,28 @@ class StudentWorkController < ApplicationController JSON.parse(res.body) end + def test_realtime_ex(test, src) + url = "#{Redmine::Configuration['judge_server']}api/realtime_test.json" + + factor = [] + factor << {input: test.input, output: test.output} + + solutions = { + src:src, + language:@homework.homework_detail_programing.language, + factor: factor + } + uri = URI(url) + body = solutions.to_json + res = Net::HTTP.new(uri.host, uri.port).start do |client| + request = Net::HTTP::Post.new(uri.path) + request.body = body + request["Content-Type"] = "application/json" + client.request(request) + end + JSON.parse(res.body) + end + #成绩计算 def set_final_score homework,student_work if homework && homework.homework_detail_manual diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb index a343ae97a..241aa0c4c 100644 --- a/app/views/student_work/_programing_work_show.html.erb +++ b/app/views/student_work/_programing_work_show.html.erb @@ -53,27 +53,28 @@ <% else %>
          - <% test.results.each_with_index do |x, i| %> + <% test.results.reverse.each_with_index do |x, i| %>
        • - 测试<%=i+1%> + 测试<%=test.results.size-i%> <% if x["status"].to_i != 0 %> <% if x["status"].to_i == 2 %> - 超时！ + 超时！ <% else %> - 测试错误！ + 测试错误！ <% end %> - 测试错误！ - 　耗时： - 
          <%=x["time_used"]%>微秒
           您的输出： - 
          <%=x["result"]%>
           + 
          <%=x["result"]%>
          正确输出： - 
          <%=x["output"]%>
           + 
          <%=x["output"]%>
           + <% if x["status"].to_i == 2 %> + 耗时： + 
          <%=x["time_used"]%>毫秒
           + <% end %>
          <% else %> - 测试正确！ - 　耗时： - 
          <%=x["time_used"]%>微秒
           + 测试正确！ + +
          <% end %>
          • diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb index 5a75baf7e..06d63e7c6 100644 --- a/app/views/users/new_user_commit_homework.html.erb +++ b/app/views/users/new_user_commit_homework.html.erb @@ -11,46 +11,48 @@ }); + @@ -131,26 +133,28 @@ <% else %>
            - <% test.results.each_with_index do |x, i| %> -
          • 测试<%=i+1%> + <% test.results.reverse.each_with_index do |x, i| %> +
          • 测试<%=test.results.size-i%> <% if x["status"].to_i != 0 %> <% if x["status"].to_i == 2 %> - 超时！ + 超时！ <% else %> - 测试错误！ + 测试错误！ <% end %> - 　耗时： - 
            <%=x["time_used"]%>微秒
             您的输出： - 
            <%=x["result"]%>
             + 
            <%=x["result"]%>
            正确输出： - 
            <%= x["output"] %>
             + 
            <%= x["output"] %>
             + <% if x["status"].to_i == 2 %> + 　耗时： + 
            <%=x["time_used"]%>毫秒
             + <% end %>
            • <% else %> - 测试正确！ - 　耗时： - 
            <%=x["time_used"]%>微秒
             + 测试正确！ + +
            <% end %> diff --git a/app/views/users/user_commit_homework.html.erb b/app/views/users/user_commit_homework.html.erb index 90b22ad14..40fd9d241 100644 --- a/app/views/users/user_commit_homework.html.erb +++ b/app/views/users/user_commit_homework.html.erb @@ -2,44 +2,46 @@ @@ -98,26 +100,28 @@ <% else %>
              - <% test.results.each_with_index do |x, i| %> -
            • 测试<%=i+1%> + <% test.results.reverse.each_with_index do |x, i| %> +
            • 测试<%=test.results.size-i%> <% if x["status"].to_i != 0 %> <% if x["status"].to_i == 2 %> - 超时！ + 超时！ <% else %> - 测试错误！ + 测试错误！ <% end %> - 　耗时： - 
              <%=x["time_used"]%>微秒
               您的输出： - 
              <%=x["result"]%>
               + 
              <%=x["result"]%>
              正确输出： - 
              <%=x["output"]%>
               + 
              <%=x["output"]%>
               + <% if x["status"].to_i == 2 %> + 　耗时： + 
              <%=x["time_used"]%>毫秒
               + <% end %>
              • <% else %> - 测试正确！ - 　耗时： - 
              <%=x["time_used"]%>微秒
               + 测试正确！ + +
              <% end %> diff --git a/config/routes.rb b/config/routes.rb index bde12fa59..ee79bdb2a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -272,7 +272,7 @@ RedmineApp::Application.routes.draw do get 'absence_penalty_list' get 'evaluation_list' # post 'set_program_score' - post 'program_test' + post 'program_test_ex' post 'set_score_rule' end end diff --git a/db/schema.rb b/db/schema.rb index 2dad292f4..d738b90c4 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20160225031230) do +ActiveRecord::Schema.define(:version => 20160311072819) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -432,9 +432,11 @@ ActiveRecord::Schema.define(:version => 20160225031230) do 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.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.integer "total_score" + t.integer "homework_journal_num", :default => 0 + t.integer "news_num", :default => 0 end create_table "course_groups", :force => true do |t| @@ -506,6 +508,7 @@ ActiveRecord::Schema.define(:version => 20160225031230) do t.integer "is_excellent", :default => 0 t.integer "excellent_option", :default => 0 t.integer "is_copy", :default => 0 + t.integer "visits", :default => 0 end create_table "custom_fields", :force => true do |t| @@ -1282,6 +1285,7 @@ ActiveRecord::Schema.define(:version => 20160225031230) do t.datetime "created_at", :null => false t.datetime "updated_at", :null => false t.boolean "allow_guest_download", :default => true + t.integer "visits", :default => 0 end create_table "phone_app_versions", :force => true do |t| @@ -1441,6 +1445,7 @@ ActiveRecord::Schema.define(:version => 20160225031230) do t.integer "acts_count", :default => 0 t.integer "journals_count", :default => 0 t.integer "boards_reply_count", :default => 0 + t.integer "visits", :default => 0 end add_index "projects", ["lft"], :name => "index_projects_on_lft" @@ -1900,6 +1905,7 @@ ActiveRecord::Schema.define(:version => 20160225031230) do t.string "mail_notification", :default => "", :null => false t.string "salt", :limit => 64 t.integer "gid" + t.integer "visits", :default => 0 end add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id" @@ -2013,11 +2019,6 @@ ActiveRecord::Schema.define(:version => 20160225031230) do add_index "wikis", ["project_id"], :name => "wikis_project_id" - create_table "wlcs", :force => true do |t| - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - create_table "workflows", :force => true do |t| t.integer "tracker_id", :default => 0, :null => false t.integer "old_status_id", :default => 0, :null => false diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 55d3eefad..cd6ba1cdc 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1018,6 +1018,7 @@ function showNormalImage(id) { $(image).attr('src',_src); return; } + var element=$("").attr("href",image.attr('src')); image.wrap(element); $(image).parent().colorbox({rel:'nofollow', close: "关闭", returnFocus: false}); @@ -1173,5 +1174,4 @@ function getRootPath(){ // var projectName=pathName.substring(0,pathName.substr(1).indexOf('/')+1); var projectName=""; return(localhostPaht+projectName); -} - +} \ No newline at end of file diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js index 7dd416dec..ca120df2f 100644 --- a/public/javascripts/homework.js +++ b/public/javascripts/homework.js @@ -31,9 +31,9 @@ $(function(){ if(!valid_form()){ return; } - + /* $.post( - '/student_work/program_test', + '/student_work/program_test_ex', {homework: homework_id, student_work_id: student_work_id, src: src, title: title, is_test: is_test}, function(data,status){ tested = true; @@ -44,7 +44,6 @@ $(function(){ if (typeof cb == 'function') {cb(data); return;} - var html=bt('t:result-list',data); $('.ProResult').prepend(html); @@ -56,6 +55,47 @@ $(function(){ } } ); + */ + //先测试一次并返回测试集个数及结果再判断是否需要继续进行测试 + var test_post = function(i){ + $.post( + '/student_work/program_test_ex', + {homework: homework_id, student_work_id: student_work_id, src: src, title: title, is_test: is_test,tIndex:i}, + function(data,status){ + var tSeq = data.tseq; + var tCount = data.tcount; + console.log("tSeq="+tSeq); + console.log("tCount="+tCount); + tested = true; + console.log(data); + if(data.index <=0){ + data.index = $('.ProResultTop').length+1; + } + + var html=bt('t:result-list',data); + $('.ProResult').prepend(html); + + if (data.status==0 && is_test != 'true') { + if (typeof cb == 'function') {cb(data); return;} + var r=confirm("答题正确，是否立刻提交?"); + if (r) { + $(".HomeWorkCon form").submit(); + } + return; + } + + //2 超时 -2 编译错误 测试结束 + if (data.status == 2 || data.status == -2 || tSeq >= tCount ){ + if (typeof cb == 'function') {cb(data); return;} + return; + } + + test_post(i+1); + } + ); + }; + + test_post(1); }; $('#test-program-btn').on('click', test_program); @@ -373,6 +413,10 @@ $(function(){ var src = ''; if(language==4){ src = '\ +//注意\n\ + //1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时则接下来的测试集都不会测试了\n\ + //2:该程序每次运行使用的内存不能超过3200字节，否则会返回错误\n\ + //3:该程序每次运行输出的结果不能超过3200个字符(最多显示100个字符)，否则会返回错误\n\ import java.io.*;\n\ import java.util.*;\n\ \n\ @@ -392,8 +436,12 @@ class Main\n\ '; } else if(language==1){ - src = '#include \n\ -\n\ + src = '\ +//注意\n\ + //1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时则接下来的测试集都不会测试了\n\ + //2:该程序每次运行使用的内存不能超过3200字节，否则会返回错误\n\ + //3:该程序每次运行输出的结果不能超过3200个字符(最多显示100个字符)，否则会返回错误\n\ +#include \n\ int main()\n\ {\n\ //获取参数方式 scanf\n\ @@ -409,6 +457,10 @@ int main()\n\ '; } else if(language==2){ src = '\ +//注意\n\ + //1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时则接下来的测试集都不会测试了\n\ + //2:该程序每次运行使用的内存不能超过3200字节，否则会返回错误\n\ + //3:该程序每次运行输出的结果不能超过3200个字符(最多显示100个字符)，否则会返回错误\n\ #include \n\ using namespace std;\n\ \n\ @@ -426,6 +478,10 @@ int main()\n\ '; } else if(language==3){ src = '\ +#注意\n\ + #1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时则接下来的测试集都不会测试了\n\ + #2:该程序每次运行使用的内存不能超过3200字节，否则会返回错误\n\ + #3:该程序每次运行输出的结果不能超过3200个字符(最多显示100个字符)，否则会返回错误\n\ import sys \n\ \n\ #获取参数方式，使用raw_input\n\ diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 108f1cd2e..f45874e2d 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -442,6 +442,7 @@ a:hover.tijiao{ background:#0f99a9;} .members_left ul li span{ float:left; text-align:center; color:#484747;} .w150{ text-align:center; width:150px;min-height: 10px;} .width150{width:150px;min-height: 10px;} +.width120{width:120px;min-height: 10px;} .f_b{ font-weight: bold;} .members_right label{ margin-left:15px;} .N_search{ height:20px; border:1px solid #999;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 6bdd8d2e2..2a7e85aa5 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -146,6 +146,7 @@ h4{ font-size:14px; color:#3b3b3b;} .w90{ width:90px;} .w100{width: 100px;} .w125{width:125px;} +.w180{width:180px;} .w210{ width:210px;} .w150{ width:150px;} .w170{width:170px;} From 3af257eb77c794df27a5d90328e442688c7cba1a Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 25 Mar 2016 15:18:33 +0800 Subject: [PATCH 27/37] =?UTF-8?q?=E8=AF=84=E6=B5=8B=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E6=9C=89=E9=97=AE=E9=A2=98=E6=97=B6=E5=BE=97=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/homework.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js index ca120df2f..f488465ca 100644 --- a/public/javascripts/homework.js +++ b/public/javascripts/homework.js @@ -92,7 +92,14 @@ $(function(){ test_post(i+1); } - ); + ).fail(function(xhr, status){ + if(status == 'timeout'){ + alert("您的答案超时了, 请检查代码是否存在死循环的错误."); + } else { + alert("测试失败,服务器出错."); + return; + } + }); }; test_post(1); From 0fd164d2bb1aedcac157a4d18d52b3737b6ff123 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 25 Mar 2016 15:24:31 +0800 Subject: [PATCH 28/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E7=A8=8B?= =?UTF-8?q?=E7=9A=84=E5=87=A0=E4=B8=AA=E6=8F=90=E7=A4=BA=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/homework.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js index f488465ca..a932d3a70 100644 --- a/public/javascripts/homework.js +++ b/public/javascripts/homework.js @@ -421,7 +421,7 @@ $(function(){ if(language==4){ src = '\ //注意\n\ - //1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时则接下来的测试集都不会测试了\n\ + //1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时将不会测试剩余的测试集\n\ //2:该程序每次运行使用的内存不能超过3200字节，否则会返回错误\n\ //3:该程序每次运行输出的结果不能超过3200个字符(最多显示100个字符)，否则会返回错误\n\ import java.io.*;\n\ @@ -445,7 +445,7 @@ class Main\n\ else if(language==1){ src = '\ //注意\n\ - //1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时则接下来的测试集都不会测试了\n\ + //1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时将不会测试剩余的测试集\n\ //2:该程序每次运行使用的内存不能超过3200字节，否则会返回错误\n\ //3:该程序每次运行输出的结果不能超过3200个字符(最多显示100个字符)，否则会返回错误\n\ #include \n\ @@ -465,7 +465,7 @@ int main()\n\ } else if(language==2){ src = '\ //注意\n\ - //1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时则接下来的测试集都不会测试了\n\ + //1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时将不会测试剩余的测试集\n\ //2:该程序每次运行使用的内存不能超过3200字节，否则会返回错误\n\ //3:该程序每次运行输出的结果不能超过3200个字符(最多显示100个字符)，否则会返回错误\n\ #include \n\ @@ -486,7 +486,7 @@ int main()\n\ } else if(language==3){ src = '\ #注意\n\ - #1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时则接下来的测试集都不会测试了\n\ + #1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时将不会测试剩余的测试集\n\ #2:该程序每次运行使用的内存不能超过3200字节，否则会返回错误\n\ #3:该程序每次运行输出的结果不能超过3200个字符(最多显示100个字符)，否则会返回错误\n\ import sys \n\ From 1f9d2ceffb15511b83e7c3c742bbdcf698cfdc2b Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 25 Mar 2016 15:38:14 +0800 Subject: [PATCH 29/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E7=BC=96?= =?UTF-8?q?=E7=A8=8B=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/homework.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js index a932d3a70..4f06ffe53 100644 --- a/public/javascripts/homework.js +++ b/public/javascripts/homework.js @@ -422,8 +422,8 @@ $(function(){ src = '\ //注意\n\ //1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时将不会测试剩余的测试集\n\ - //2:该程序每次运行使用的内存不能超过3200字节，否则会返回错误\n\ - //3:该程序每次运行输出的结果不能超过3200个字符(最多显示100个字符)，否则会返回错误\n\ + //2:该程序每次运行使用的内存不能超过1M，否则会返回错误\n\ + //3:该程序每次运行输出的结果最多显示100个字符(多余的不显示)，否则会返回错误\n\ import java.io.*;\n\ import java.util.*;\n\ \n\ @@ -446,8 +446,8 @@ class Main\n\ src = '\ //注意\n\ //1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时将不会测试剩余的测试集\n\ - //2:该程序每次运行使用的内存不能超过3200字节，否则会返回错误\n\ - //3:该程序每次运行输出的结果不能超过3200个字符(最多显示100个字符)，否则会返回错误\n\ + //2:该程序每次运行使用的内存不能超过1M，否则会返回错误\n\ + //3:该程序每次运行输出的结果最多显示100个字符(多余的不显示)，否则会返回错误\n\ #include \n\ int main()\n\ {\n\ @@ -466,8 +466,8 @@ int main()\n\ src = '\ //注意\n\ //1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时将不会测试剩余的测试集\n\ - //2:该程序每次运行使用的内存不能超过3200字节，否则会返回错误\n\ - //3:该程序每次运行输出的结果不能超过3200个字符(最多显示100个字符)，否则会返回错误\n\ + //2:该程序每次运行使用的内存不能超过1M，否则会返回错误\n\ + //3:该程序每次运行输出的结果最多显示100个字符(多余的不显示)，否则会返回错误\n\ #include \n\ using namespace std;\n\ \n\ @@ -487,8 +487,8 @@ int main()\n\ src = '\ #注意\n\ #1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时将不会测试剩余的测试集\n\ - #2:该程序每次运行使用的内存不能超过3200字节，否则会返回错误\n\ - #3:该程序每次运行输出的结果不能超过3200个字符(最多显示100个字符)，否则会返回错误\n\ + #2:该程序每次运行使用的内存不能超过1M，否则会返回错误\n\ + #3:该程序每次运行输出的结果最多显示100个字符(多余的不显示)，否则会返回错误\n\ import sys \n\ \n\ #获取参数方式，使用raw_input\n\ From 3c1be19702a92beb552ccb15d914ff3bce27f33c Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 25 Mar 2016 15:41:14 +0800 Subject: [PATCH 30/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E7=A8=8B?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/homework.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js index 4f06ffe53..b03ddf1bf 100644 --- a/public/javascripts/homework.js +++ b/public/javascripts/homework.js @@ -423,7 +423,7 @@ $(function(){ //注意\n\ //1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时将不会测试剩余的测试集\n\ //2:该程序每次运行使用的内存不能超过1M，否则会返回错误\n\ - //3:该程序每次运行输出的结果最多显示100个字符(多余的不显示)，否则会返回错误\n\ + //3:该程序每次运行输出的结果最多显示100个字符(多余的不显示)\n\ import java.io.*;\n\ import java.util.*;\n\ \n\ @@ -447,7 +447,7 @@ class Main\n\ //注意\n\ //1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时将不会测试剩余的测试集\n\ //2:该程序每次运行使用的内存不能超过1M，否则会返回错误\n\ - //3:该程序每次运行输出的结果最多显示100个字符(多余的不显示)，否则会返回错误\n\ + //3:该程序每次运行输出的结果最多显示100个字符(多余的不显示)\n\ #include \n\ int main()\n\ {\n\ @@ -467,7 +467,7 @@ src = '\ //注意\n\ //1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时将不会测试剩余的测试集\n\ //2:该程序每次运行使用的内存不能超过1M，否则会返回错误\n\ - //3:该程序每次运行输出的结果最多显示100个字符(多余的不显示)，否则会返回错误\n\ + //3:该程序每次运行输出的结果最多显示100个字符(多余的不显示)\n\ #include \n\ using namespace std;\n\ \n\ @@ -488,7 +488,7 @@ src = '\ #注意\n\ #1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时将不会测试剩余的测试集\n\ #2:该程序每次运行使用的内存不能超过1M，否则会返回错误\n\ - #3:该程序每次运行输出的结果最多显示100个字符(多余的不显示)，否则会返回错误\n\ + #3:该程序每次运行输出的结果最多显示100个字符(多余的不显示)\n\ import sys \n\ \n\ #获取参数方式，使用raw_input\n\ From 9ce39d2f4a41ce9d938fbbcc20e3d33e4cc56773 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 25 Mar 2016 15:46:40 +0800 Subject: [PATCH 31/37] =?UTF-8?q?Issue=E6=A8=A1=E5=9D=97=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_logined_header.html.erb | 30 ------------------- app/views/layouts/base_projects.html.erb | 2 +- app/views/users/_project_issue.html.erb | 7 ++--- app/views/users/_project_issue_reply.html.erb | 4 +-- 4 files changed, 6 insertions(+), 37 deletions(-) diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index 315b1d300..c04081128 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -24,19 +24,6 @@
            + diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb index 5d472497d..008f08706 100644 --- a/app/views/users/_project_issue.html.erb +++ b/app/views/users/_project_issue.html.erb @@ -73,10 +73,9 @@
        - <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %> - - - + <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id => user_activity_id, :content => activity.description} %> + +
        <%# 局部刷新：修改xissue属性 %> <% if User.current.member_of?(activity.project) %> diff --git a/app/views/users/_project_issue_reply.html.erb b/app/views/users/_project_issue_reply.html.erb index 16d681dc9..5020f67d3 100644 --- a/app/views/users/_project_issue_reply.html.erb +++ b/app/views/users/_project_issue_reply.html.erb @@ -25,7 +25,7 @@ <% if count > 0 %>