From d54609075b81a62d47cb97a627bc6de362004a31 Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 5 Mar 2016 04:01:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=96=B0=E9=97=BB=E5=92=8C?= =?UTF-8?q?=E6=96=B0=E9=97=BB=E5=9B=9E=E5=A4=8D=E5=BE=97=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 2 +- app/models/comment.rb | 6 +---- app/models/news.rb | 8 ++++++- app/views/layouts/base_courses.html.erb | 9 +++++--- ...304154643_update_contributor_for_course.rb | 22 +++++++++++++------ db/schema.rb | 4 ++-- 6 files changed, 32 insertions(+), 19 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 48ee42234..22890fd9a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -166,7 +166,7 @@ module ApplicationHelper else score = course_contributor_score.news_num + 1 total_score = course_contributor_score.total_score + 1 - course_contributor_score.update_attributes(:news_num => score, :total_score => news_num) + course_contributor_score.update_attributes(:news_num => score, :total_score => total_score) end end end diff --git a/app/models/comment.rb b/app/models/comment.rb index 1125e168f..4d7af1d73 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -82,11 +82,7 @@ class Comment < ActiveRecord::Base # 课程成员得分（英雄榜） def act_as_student_score if self.commented.course - if self.author.allowed_to?(:as_teacher, self.commented.course) - course_member_score(self.commented.course.id, self.author_id, "NewReply") - else - course_member_score(self.commented.course.id, self.author_id, "News") - end + course_member_score(self.commented.course.id, self.author_id, "NewReply") end end diff --git a/app/models/news.rb b/app/models/news.rb index f31c6bcef..028b6d737 100644 --- a/app/models/news.rb +++ b/app/models/news.rb @@ -59,7 +59,7 @@ class News < ActiveRecord::Base :author_key => :author_id acts_as_watchable - after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity,:act_as_system_message, :add_author_as_watcher, :send_mail, :add_news_count + after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity,:act_as_system_message, :add_author_as_watcher, :send_mail, :add_news_count, :act_as_student_score after_update :update_activity after_destroy :delete_kindeditor_assets, :decrease_news_count, :delete_org_activities @@ -195,4 +195,10 @@ class News < ActiveRecord::Base OrgActivity.where("container_type='OrgSubfield' and org_act_type='News' and org_act_id=?", self.id).destroy_all end + def act_as_student_score + if self.course + course_member_score(self.course.id, self.author_id, "News") + end + end + 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 4940b60d6..ceb526f44 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -148,9 +148,10 @@ 资源得分：资源数 x 5
发帖得分：发帖数 x 2
回帖得分：回复数 x 1
+ 通知得分：通知数 x 1
课程留言得分：留言数 x 1
作业留言得分：留言数 x 1
- 通知得分：通知数 x 1
+ 通知回复得分：回复数 x 1
总得分为以上得分之和 @@ -162,7 +163,8 @@ <%=total_score = contributor_score.resource_num.to_i * 5 + contributor_score.message_num.to_i * 2 + contributor_score.message_reply_num.to_i * 1 + contributor_score.journal_num.to_i * 1 + - + contributor_score.homework_journal_num * 1 + contributor_score.news_reply_num.to_i * 1 %>

+ + contributor_score.homework_journal_num.to_i * 1 + contributor_score.news_reply_num.to_i * 1 + + contributor_score.news_num.to_i * 1 %>

diff --git a/db/migrate/20160304154643_update_contributor_for_course.rb b/db/migrate/20160304154643_update_contributor_for_course.rb index be9ed3126..47107dd55 100644 --- a/db/migrate/20160304154643_update_contributor_for_course.rb +++ b/db/migrate/20160304154643_update_contributor_for_course.rb @@ -12,11 +12,9 @@ class UpdateContributorForCourse < ActiveRecord::Migration # 回帖数 message_reply_count = Message.find_by_sql("select DISTINCT me.* from messages me, boards b where b.id = me.board_id and b.course_id = #{course.id} and b.project_id = '-1' and me.author_id = #{s.user_id} and me.parent_id is not null").count * 1 # 新闻回复 - if s.user.allowed_to?(:as_teacher, course) - common_reply_count = Comment.find_by_sql("select cm.* from comments cm, news n where cm.author_id = #{s.user_id} and n.course_id = #{course.id} and cm.commented_id = n.id and cm.commented_type ='News'").count * 1 - else - common_count = Comment.find_by_sql("select cm.* from comments cm, news n where cm.author_id = #{s.user_id} and n.course_id = #{course.id} and cm.commented_id = n.id and cm.commented_type ='News'").count * 1 - end + common_reply_count = Comment.find_by_sql("select cm.* from comments cm, news n where cm.author_id = #{s.user_id} and n.course_id = #{course.id} and cm.commented_id = n.id and cm.commented_type ='News'").count * 1 + # 通知 + common_count = New.find_by_sql("select n.* from news n where n.author_id = #{s.user_id} and n.course_id = #{course.id} ").count * 1 # attachment_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?", s.student_id, course.id, "Attachment").count * 5 # 附件数 attachment_count = Attachment.find_by_sql("SELECT * FROM `attachments` where container_id = #{course.id} and author_id = #{s.user_id} and container_type ='Course'").count * 5 @@ -27,10 +25,20 @@ class UpdateContributorForCourse < ActiveRecord::Migration # journal_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?", s.student_id, course.id, "JournalsForMessage").count * 1 # journal_reply_count = JournalsForMessage.where("user_id =? and jour_id =? and jour_type =? and status =?", s.student_id, course.id, "Course",1).count * 1 total = board_count + message_reply_count + common_reply_count + attachment_count + journal_count - if total !=0 - CourseContributorScore.create(:course_id => course.id, :user_id => s.student_id, :message_num => board_count, :message_reply_num => message_reply_count, + course_contributor = CourseContributorScore.where("course_id =? and user_id =?", course.id, s.user_id).first + if course_contributor.nil? + CourseContributorScore.create(:course_id => course.id, :user_id => s.user_id, :message_num => board_count, :message_reply_num => message_reply_count, :news_reply_num => common_reply_count, :news_num => common_count, :resource_num => attachment_count, :journal_num => journal_count, :homework_journal_num => journal_homework_count, :journal_reply_num => 0, :total_score => total) + else + course_contributor.message_num = board_count + course_contributor.message_reply_num = message_reply_count + course_contributor.news_reply_num = common_reply_count + course_contributor.news_num = common_count + course_contributor.resource_num = attachment_count + course_contributor.journal_num = journal_count + course_contributor.homework_journal_num = journal_homework_count + course_contributor.save end end diff --git a/db/schema.rb b/db/schema.rb index b7066c999..c21580c90 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -99,6 +99,8 @@ ActiveRecord::Schema.define(:version => 20160304154643) do t.integer "quotes" t.integer "version" t.integer "attachment_id" + t.integer "is_publish", :default => 1 + t.date "publish_time" end create_table "attachments", :force => true do |t| @@ -1278,7 +1280,6 @@ ActiveRecord::Schema.define(:version => 20160304154643) do t.text "description" t.integer "creator_id" t.integer "home_id" - t.string "domain" t.boolean "is_public" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false @@ -1386,7 +1387,6 @@ ActiveRecord::Schema.define(:version => 20160304154643) do t.integer "changeset_num", :default => 0 t.integer "board_message_num", :default => 0 t.integer "board_num", :default => 0 - t.integer "act_num", :default => 0 t.integer "attach_num", :default => 0 t.datetime "commit_time" end