-
<%= l(:lable_hot_course)%>
+
+
+ <%= l(:lable_hot_course)%>
+
+
<% month_now = Time.now.strftime("%m").to_i %>
<% year_now = Time.new.strftime("%Y") %>
@@ -86,7 +96,9 @@
<% @school_id.nil? ? cur_school_course = [] : cur_school_course = find_miracle_course(10,7,@school_id, year_now, course_term) %>
<% if cur_school_course.count == 0 %>
-
<%= render :partial => 'more_course', :locals => {:school_id => nil}%>
+
+ <%= render :partial => 'more_course', :locals => {:school_id => nil}%>
+
<% if User.current.logged? %>
From fa36e6d2b0565c76a22fb29a7728f79a54692cb1 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 29 Dec 2014 10:58:45 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?=
=?UTF-8?q?=E8=AF=84=E5=88=86=E6=98=AF=E4=B8=8D=E6=98=AF=E8=80=81=E5=B8=88?=
=?UTF-8?q?=E8=AF=84=E5=88=86=E7=9A=84=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...0141229025519_add_colum_to_seems_rateable_rates.rb | 5 +++++
db/schema.rb | 11 ++++++-----
2 files changed, 11 insertions(+), 5 deletions(-)
create mode 100644 db/migrate/20141229025519_add_colum_to_seems_rateable_rates.rb
diff --git a/db/migrate/20141229025519_add_colum_to_seems_rateable_rates.rb b/db/migrate/20141229025519_add_colum_to_seems_rateable_rates.rb
new file mode 100644
index 000000000..29a9a671c
--- /dev/null
+++ b/db/migrate/20141229025519_add_colum_to_seems_rateable_rates.rb
@@ -0,0 +1,5 @@
+class AddColumToSeemsRateableRates < ActiveRecord::Migration
+ def change
+ add_column :seems_rateable_rates, :is_teacher_score, :integer, default: 0
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a75c6eb29..e109212cc 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 => 20141210070327) do
+ActiveRecord::Schema.define(:version => 20141229025519) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@@ -977,13 +977,14 @@ ActiveRecord::Schema.define(:version => 20141210070327) do
end
create_table "seems_rateable_rates", :force => true do |t|
- t.integer "rater_id", :limit => 8
+ t.integer "rater_id", :limit => 8
t.integer "rateable_id"
t.string "rateable_type"
- t.float "stars", :null => false
+ t.float "stars", :null => false
t.string "dimension"
- 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 "is_teacher_score", :default => 0
end
create_table "settings", :force => true do |t|
From 259799eb89366bcb3f89d3e8badb91f202363b95 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 29 Dec 2014 11:38:35 +0800
Subject: [PATCH 4/9] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E8=AF=84=E5=88=86?=
=?UTF-8?q?=E7=9A=84model=202.=E4=BF=AE=E6=94=B9=E8=AF=84=E5=88=86?=
=?UTF-8?q?=E8=A1=A8=E4=B8=AD=E4=B8=BA=E6=95=99=E5=B8=88=E8=AF=84=E5=88=86?=
=?UTF-8?q?=E7=9A=84=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E7=9A=84is=5Fteac?=
=?UTF-8?q?her=5Fscore=E7=9A=84=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/models/seems_rateable_rates.rb | 3 +++
...41229025925_change_seems_rateable_rates.rb | 23 +++++++++++++++++++
db/schema.rb | 2 +-
3 files changed, 27 insertions(+), 1 deletion(-)
create mode 100644 app/models/seems_rateable_rates.rb
create mode 100644 db/migrate/20141229025925_change_seems_rateable_rates.rb
diff --git a/app/models/seems_rateable_rates.rb b/app/models/seems_rateable_rates.rb
new file mode 100644
index 000000000..664f987ba
--- /dev/null
+++ b/app/models/seems_rateable_rates.rb
@@ -0,0 +1,3 @@
+class SeemsRateableRates < ActiveRecord::Base
+ attr_accessible :rater_id, :rateable_id, :rateable_type, :stars, :dimension, :is_teacher_score
+end
diff --git a/db/migrate/20141229025925_change_seems_rateable_rates.rb b/db/migrate/20141229025925_change_seems_rateable_rates.rb
new file mode 100644
index 000000000..9ea75e68e
--- /dev/null
+++ b/db/migrate/20141229025925_change_seems_rateable_rates.rb
@@ -0,0 +1,23 @@
+class ChangeSeemsRateableRates < ActiveRecord::Migration
+ def up
+ SeemsRateableRates.where("rateable_type = 'HomeworkAttach'").each do |rate|
+ homework = HomeworkAttach.find_by_id rate.rateable_id
+ if homework
+ course = homework.bid.courses.first
+ if course
+ teachers = []
+ course.members.each do |m|
+ teachers << m.user_id if m && m.user && m.user.allowed_to?(:as_teacher,course)
+ end
+ if teachers.include?(rate.rater_id)
+ rate.is_teacher_score = 1
+ rate.save
+ end
+ end
+ end
+ end
+ end
+
+ def down
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e109212cc..5725d8221 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 => 20141229025519) do
+ActiveRecord::Schema.define(:version => 20141229025925) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
From 0a58fce2515cf0e1f10efcd7d7c03c1bd2295a8a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 29 Dec 2014 11:53:26 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=95=88=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...41229025925_change_seems_rateable_rates.rb | 30 +++++++++++--------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/db/migrate/20141229025925_change_seems_rateable_rates.rb b/db/migrate/20141229025925_change_seems_rateable_rates.rb
index 9ea75e68e..7be2a81fe 100644
--- a/db/migrate/20141229025925_change_seems_rateable_rates.rb
+++ b/db/migrate/20141229025925_change_seems_rateable_rates.rb
@@ -1,23 +1,27 @@
class ChangeSeemsRateableRates < ActiveRecord::Migration
def up
- SeemsRateableRates.where("rateable_type = 'HomeworkAttach'").each do |rate|
- homework = HomeworkAttach.find_by_id rate.rateable_id
- if homework
- course = homework.bid.courses.first
- if course
- teachers = []
- course.members.each do |m|
- teachers << m.user_id if m && m.user && m.user.allowed_to?(:as_teacher,course)
- end
- if teachers.include?(rate.rater_id)
- rate.is_teacher_score = 1
- rate.save
+ Course.all.each do |course|
+ teachers = []
+ course.members.each do |m|
+ teachers << m.user_id if m && m.user && m.user.allowed_to?(:as_teacher,course)
+ end
+ course.homeworks.each do |bid|
+ bid.homeworks.each do |homework|
+ SeemsRateableRates.where("rateable_type = 'HomeworkAttach' and rateable_id = #{homework.id}").each do |rate|
+ if teachers.include?(rate.rater_id)
+ rate.is_teacher_score = 1
+ rate.save
+ end
+ end
end
end
end
- end
end
def down
+ SeemsRateableRates.where("is_teacher_score = 1").each do |rate|
+ rate.is_teacher_score = 0
+ rate.save
+ end
end
end
From aa06251fd3969ed3bec3af0a26d3e17bff6449d5 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 29 Dec 2014 16:03:21 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=93=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E8=A7=92=E8=89=B2=E6=94=B9=E5=8F=98=E6=97=B6=EF=BC=8C?=
=?UTF-8?q?=E8=AF=A5=E7=94=A8=E6=88=B7=E8=AF=84=E5=88=86=E6=89=80=E5=B1=9E?=
=?UTF-8?q?=E8=A7=92=E8=89=B2=E4=B9=9F=E8=B7=9F=E7=9D=80=E6=94=B9=E5=8F=98?=
=?UTF-8?q?=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/bids_controller.rb | 28 ++-----
app/controllers/homework_attach_controller.rb | 74 +++++++++----------
2 files changed, 42 insertions(+), 60 deletions(-)
diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index 2997f4205..eaeca0e46 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -492,26 +492,17 @@ class BidsController < ApplicationController
if @bid.homework_type
@homework = HomeworkAttach.new
@is_teacher = is_course_teacher(User.current,@bid.courses.first)
- teachers = "("
- teacher_members = searchTeacherAndAssistant(@bid.courses.first)
- teacher_members.each do |member|
- if member == teacher_members.last
- teachers += member.user_id.to_s + ")"
- else
- teachers += member.user_id.to_s + ","
- end
- end
if @is_teacher
all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT * FROM (SELECT homework_attaches.*,
- (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id IN #{teachers}) AS t_score,
- (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id NOT IN #{teachers}) AS s_score
+ (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1) AS t_score,
+ (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
FROM homework_attaches WHERE bid_id = #{@bid.id} ORDER BY s_score DESC,created_at ASC) AS table1
WHERE table1.t_score IS NULL")
@cur_type = 1
else
all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT homework_attaches.*,
- (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id IN #{teachers}) AS t_score,
- (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id NOT IN #{teachers}) AS s_score,
+ (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1) AS t_score,
+ (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score,
(SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id = #{User.current.id}) AS m_score
FROM homework_attaches
INNER JOIN homework_evaluations ON homework_evaluations.homework_attach_id = homework_attaches.id
@@ -1056,17 +1047,8 @@ class BidsController < ApplicationController
elsif @bid.comment_status == 1
@totle_size = 0
@bid.homeworks.map { |homework| @totle_size += homework.homework_evaluations.count}
- teachers = "("
- teacher_members = searchTeacherAndAssistant(@course)
- teacher_members.each do |member|
- if member == teacher_members.last
- teachers += member.user_id.to_s + ")"
- else
- teachers += member.user_id.to_s + ","
- end
- end
@cur_size = 0
- @bid.homeworks.map { |homework| @cur_size += homework.rates(:quality).where("seems_rateable_rates.rater_id not in #{teachers}").count}
+ @bid.homeworks.map { |homework| @cur_size += homework.rates(:quality).where("seems_rateable_rates.rater_id is_teacher_score = 0").count}
end
@percent = format("%.2f",(@cur_size.to_f / ( @totle_size == 0 ? 1 : @totle_size)) * 100)
respond_to do |format|
diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb
index 5c4542944..fedc99030 100644
--- a/app/controllers/homework_attach_controller.rb
+++ b/app/controllers/homework_attach_controller.rb
@@ -22,8 +22,7 @@ class HomeworkAttachController < ApplicationController
#获取未批作业列表
def get_not_batch_homework
sort, direction = params[:sort] || "s_socre", params[:direction] || "desc"
- teachers = find_course_teachers @course
- get_not_batch_homework_list sort,direction,teachers, @bid.id
+ get_not_batch_homework_list sort,direction, @bid.id
@cur_page = params[:page] || 1
@cur_type = 1
@direction = direction == 'asc'? 'desc' : 'asc'
@@ -42,10 +41,9 @@ class HomeworkAttachController < ApplicationController
elsif sort == 'time'
order_by = "created_at #{direction}"
end
- teachers = find_course_teachers @course
all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT * FROM (SELECT homework_attaches.*,
- (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id IN (#{teachers}) and stars IS NOT NULL) AS t_score,
- (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id NOT IN (#{teachers})) AS s_score
+ (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 and stars IS NOT NULL) AS t_score,
+ (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
FROM homework_attaches WHERE bid_id = #{@bid.id}
ORDER BY #{order_by}) AS table1
WHERE table1.t_score IS NOT NULL")
@@ -68,10 +66,9 @@ class HomeworkAttachController < ApplicationController
elsif sort == 'time'
order_by = "created_at #{direction}"
end
- teachers = find_course_teachers @course
all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT homework_attaches.*,
- (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id in (#{teachers})) AS t_score,
- (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id not in (#{teachers})) AS s_score
+ (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1) AS t_score,
+ (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
FROM homework_attaches WHERE bid_id = #{@bid.id}
ORDER BY #{order_by}")
@cur_page = params[:page] || 1
@@ -86,10 +83,9 @@ class HomeworkAttachController < ApplicationController
#获取学生匿评列表
def get_student_batch_homework
@is_student_batch_homework = true
- teachers = find_course_teachers @course
all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT homework_attaches.*,
- (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id IN (#{teachers})) AS t_score,
- (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id NOT IN (#{teachers})) AS s_score,
+ (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1) AS t_score,
+ (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score,
(SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id = #{User.current.id}) AS m_score
FROM homework_attaches
INNER JOIN homework_evaluations ON homework_evaluations.homework_attach_id = homework_attaches.id
@@ -105,17 +101,16 @@ class HomeworkAttachController < ApplicationController
#获取我的作业
def get_my_homework
@is_my_homework = true
- teachers = find_course_teachers @course
all_homework_list = HomeworkAttach.find_by_sql("SELECT homework_attaches.*,
- (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id IN (#{teachers})) AS t_score,
- (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id NOT IN (#{teachers})) AS s_score
+ (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1) AS t_score,
+ (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
FROM homework_attaches
WHERE homework_attaches.bid_id = #{@bid.id} AND homework_attaches.user_id = #{User.current.id}")
#如果我没有创建过作业，就检索我是否参与了某个作业
if all_homework_list.empty?
all_homework_list = HomeworkAttach.find_by_sql("SELECT homework_attaches.*,
- (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id IN (#{teachers})) AS t_score,
- (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id NOT IN (#{teachers})) AS s_score
+ (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1) AS t_score,
+ (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
FROM homework_attaches
INNER JOIN homework_users ON homework_users.homework_attach_id = homework_attaches.id
WHERE homework_attaches.bid_id = #{@bid.id} AND homework_users.user_id = #{User.current.id}")
@@ -360,9 +355,8 @@ class HomeworkAttachController < ApplicationController
#我的评分
@has_evaluation = @stars_reates.where("rater_id = #{User.current.id}").first
@m_score = @has_evaluation.nil? ? 0 : @has_evaluation.stars
- teachers = find_course_teachers(@course)
- @teacher_stars = @stars_reates.where("rater_id in (#{teachers})") #老师评分列表
- @student_stars = @stars_reates.where("rater_id not in (#{teachers})") #学生评分列表
+ @teacher_stars = @stars_reates.where("is_teacher_score = 1") #老师评分列表
+ @student_stars = @stars_reates.where("is_teacher_score = 0") #学生评分列表
@is_teacher = is_course_teacher User.current,@course
@is_anonymous_comments = @bid.comment_status == 1 && !@homework.users.include?(User.current) && @homework.user != User.current && !@is_teacher #判断是不是匿评(开启匿评，当前用户不是作业的创建者或者参与者，不是老师)
jours = @homework.journals_for_messages.where("is_comprehensive_evaluation = 3 or is_comprehensive_evaluation is null").order("created_on DESC")#jours留言 is null条件用以兼容历史数据
@@ -385,10 +379,9 @@ class HomeworkAttachController < ApplicationController
@journal_destroyed = JournalsForMessage.find(params[:object_id])
if @journal_destroyed.is_comprehensive_evaluation == 3 && @journal_destroyed.destroy
render_403 unless User.current == @journal_destroyed.user || User.current.admin?
- teachers = find_course_teachers(@homework.bid.courses.first)
@stars_reates = @homework.rates(:quality)
- @teacher_stars = @stars_reates.where("rater_id in (#{teachers})") #老师评分列表
- @student_stars = @stars_reates.where("rater_id not in (#{teachers})") #学生评分列表
+ @teacher_stars = @stars_reates.where("is_teacher_score = 1)") #老师评分列表
+ @student_stars = @stars_reates.where("is_teacher_score = 0") #学生评分列表
jours = @homework.journals_for_messages.where("is_comprehensive_evaluation = 3 or is_comprehensive_evaluation is null").order("created_on DESC")#jours留言 is null条件用以兼容历史数据
@jour = paginateHelper jours,5 #留言
else
@@ -426,39 +419,46 @@ class HomeworkAttachController < ApplicationController
@cur_page,@cur_type = params[:cur_page] || 1,params[:cur_type] || 5
@homework = HomeworkAttach.find(params[:homework_id])
- #保存评分
- @homework.rate(@m_score.to_i,User.current.id,:quality) if @m_score
+ #保存评分@homework.rate(@m_score.to_i,User.current.id,:quality, (@is_teacher ? 1 : 0))
+ if @m_score
+ if @homework.has_rated?(User.current, :quality)
+ rate = @homework.rates(:quality).where(:rater_id => User.current.id).first
+ rate.stars = @m_score
+ rate.save!
+ else
+ @homework.rates(:quality).new(:stars => @m_score, :rater_id => User.current.id, :is_teacher_score => (@is_teacher ? 1 : 0)).save!
+ end
+ end
#保存评论
@is_comprehensive_evaluation = @is_teacher ? 1 : (@is_anonymous_comments ? 2 : 3) #判断当前评论是老师评论？匿评？留言
if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != "" #有没有留言
@homework.addjours User.current.id, params[:new_form][:user_message],0,@is_comprehensive_evaluation
end
- teachers = find_course_teachers(@homework.bid.courses.first)
@stars_reates = @homework.rates(:quality)
- @teacher_stars = @stars_reates.where("rater_id in (#{teachers})") #老师评分列表
- @student_stars = @stars_reates.where("rater_id not in (#{teachers})") #学生评分列表
+ @teacher_stars = @stars_reates.where("is_teacher_score = 1") #老师评分列表
+ @student_stars = @stars_reates.where("is_teacher_score = 0") #学生评分列表
jours = @homework.journals_for_messages.where("is_comprehensive_evaluation = 3 or is_comprehensive_evaluation is null").order("created_on DESC")#jours留言 is null条件用以兼容历史数据
@jour = paginateHelper jours,5 #留言
if @cur_type == "1" #如果当前是老师未批列表，需要刷新整个作业列表界面
@bid = @homework.bid
- get_not_batch_homework_list "s_socre","desc",teachers,@homework.bid_id
+ get_not_batch_homework_list "s_socre","desc",@homework.bid_id
elsif @cur_type == "2" #老师已批列表
@result_homework = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT homework_attaches.*,
- (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id IN (#{teachers}) and stars IS NOT NULL) AS t_score,
- (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id NOT IN (#{teachers})) AS s_score
+ (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 and stars IS NOT NULL) AS t_score,
+ (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
FROM homework_attaches WHERE id = #{@homework.id}").first
elsif @cur_type == "3" #全部作业列表
@result_homework = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT homework_attaches.*,
- (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id in (#{teachers})) AS t_score,
- (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id not in (#{teachers})) AS s_score
+ (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1) AS t_score,
+ (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
FROM homework_attaches WHERE id = #{@homework.id}").first
elsif @cur_type == "4" #匿评作业列表
@is_student_batch_homework = true
@result_homework = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT homework_attaches.*,
- (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id IN (#{teachers})) AS t_score,
- (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id NOT IN (#{teachers})) AS s_score,
+ (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1) AS t_score,
+ (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score,
(SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id = #{User.current.id}) AS m_score
FROM homework_attaches
WHERE homework_attaches.id = #{@homework.id}").first
@@ -552,7 +552,7 @@ class HomeworkAttachController < ApplicationController
teacher_proportion
end
- def get_not_batch_homework_list sort,direction,teachers,bid_id
+ def get_not_batch_homework_list sort,direction,bid_id
if sort == 't_socre'
order_by = "t_score #{direction}"
elsif sort == 's_socre'
@@ -561,8 +561,8 @@ class HomeworkAttachController < ApplicationController
order_by = "created_at #{direction}"
end
all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT * FROM (SELECT homework_attaches.*,
- (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id IN (#{teachers})) AS t_score,
- (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id NOT IN (#{teachers})) AS s_score
+ (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1) AS t_score,
+ (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
FROM homework_attaches WHERE bid_id = #{bid_id}
ORDER BY #{order_by}) AS table1
WHERE table1.t_score IS NULL")
From 8dc9b223b1f27379512145e8a4dc72c357e2bf5a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 29 Dec 2014 16:03:51 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=9E=E8=B5=9B?=
=?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=8C=E9=87=8D=E5=A4=8D=E8=AF=84=E5=88=86?=
=?UTF-8?q?=E4=B8=8D=E4=BC=9A=E4=BB=A5=E6=9C=80=E5=90=8E=E4=B8=80=E6=AC=A1?=
=?UTF-8?q?=E8=AF=84=E5=88=86=E4=B8=BA=E5=87=86=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/seems_rateable/lib/seems_rateable/model.rb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/seems_rateable/lib/seems_rateable/model.rb b/lib/seems_rateable/lib/seems_rateable/model.rb
index 83d37d555..b4ebbb196 100644
--- a/lib/seems_rateable/lib/seems_rateable/model.rb
+++ b/lib/seems_rateable/lib/seems_rateable/model.rb
@@ -37,9 +37,9 @@ module SeemsRateable
def update_users_rating(stars, user_id, dimension=nil)
obj = rates(dimension).where(:rater_id => user_id).first
- #current_record = average(dimension)
- #current_record.avg = (current_record.avg*current_record.cnt - obj.stars + stars) / (current_record.cnt)
- #current_record.save!
+ current_record = average(dimension)
+ current_record.avg = (current_record.avg*current_record.cnt - obj.stars + stars) / (current_record.cnt)
+ current_record.save!
obj.stars = stars
obj.save!
end
From fb398904b606b2f84a2975a4f3a11da4ad797eda Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 29 Dec 2014 16:57:31 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=8A=E5=AD=A6?=
=?UTF-8?q?=E7=94=9F=E5=88=97=E8=A1=A8=E3=80=8B=E5=88=86=E9=A1=B5=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=20Signed-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/application_controller.rb | 12 +++
app/controllers/courses_controller.rb | 85 ++++++++-------
app/views/courses/member.js.erb | 1 +
db/migrate/20141229081716_pro_member_score.rb | 100 ++++++++++++++++++
db/schema.rb | 2 +-
5 files changed, 158 insertions(+), 42 deletions(-)
create mode 100644 app/views/courses/member.js.erb
create mode 100644 db/migrate/20141229081716_pro_member_score.rb
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 35e034603..2721c57c7 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -759,6 +759,18 @@ class ApplicationController < ActionController::Base
end
end
+ def paginateHelper_for_members obj, pre_size=10
+ @obj_count = StudentsForCourse.find_by_sql("select count(id) as mem_count from students_for_courses where course_id = #{@course.id}")[0][:mem_count].to_s.to_i
+ @obj_pages = Paginator.new @obj_count, pre_size, params['page']
+ if obj.kind_of? ActiveRecord::Base or obj.kind_of? ActiveRecord::Relation
+ obj.limit(@obj_pages.per_page).offset(0)
+ elsif obj.kind_of? Array
+ obj[0, @obj_pages.per_page]
+ else
+ logger.error "[ApplicationController] Error : application_controller#paginateHelper ===> unknow category: #{obj.class}"
+ raise RuntimeError, 'unknow type, Please input you type into this helper.'
+ end
+ end
#查找首页相关信息
def find_first_page
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 61bce8b36..21199f6f9 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -23,7 +23,7 @@ class CoursesController < ApplicationController
before_filter :require_login, :only => [:join, :unjoin]
#before_filter :allow_join, :only => [:join]
- @@result = nil
+
def join
if User.current.logged?
course = Course.find_by_id params[:object_id]
@@ -213,10 +213,11 @@ class CoursesController < ApplicationController
q = "#{params[:name].strip}"
#(redirect_to stores_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
if params[:incourse]
- @results = searchmember_by_name(student_homework_score, q)
+ @results = searchmember_by_name(student_homework_score(0,0,0), q)
+
elsif params[:ingroup]
@group = CourseGroup.find(params[:search_group_id])
- @results =searchgroupmember_by_name(student_homework_score, @group, q)
+ @results = searchmember_by_name(student_homework_score(@group.id,0,0), q)
end
@is_remote = true
@result_count = @results.count
@@ -285,9 +286,9 @@ class CoursesController < ApplicationController
member.course_group_id = group.id
member.save
@group = group
- @members = student_homework_score
+
@course_groups = @course.course_groups
- @membercount = @members.count
+
search_group_members group
end
def unjoin_group
@@ -298,8 +299,7 @@ class CoursesController < ApplicationController
member.save
@group = group
@course_groups = @course.course_groups
- @members = student_homework_score
- @membercount = @members.count
+
search_group_members group
end
def searchgroupmembers
@@ -309,15 +309,19 @@ class CoursesController < ApplicationController
@is_remote = true
if params[:group_id] && params[:group_id] != "0"
@group = CourseGroup.find(params[:group_id])
- @results = student_homework_score.find_all {|mem| mem.course_group_id == @group.id}
+
+ @results = student_homework_score(@group.id,0, 0)
+ @results = paginateHelper @results, 10
+
+
else
- @results = student_homework_score
+ page_from = params[:page].nil? ? 0 : (params[:page].to_i - 1)
+ @results = student_homework_score(0,page_from, 10)
+ @results = paginateHelper_for_members @results, 10
end
- @members = searchStudent(@course)
- @membercount = @members.count
- @results = paginateHelper @results
+
end
@@ -325,31 +329,36 @@ class CoursesController < ApplicationController
## 有角色参数的才是课程，没有的就是项目
if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
@render_file = 'member_list'
- @teachers= searchTeacherAndAssistant(@course)
+
@canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
- @role = params[:role]
- @is_remote = false
+ @role = params[:role].nil? ? '2':params[:role]
+ @is_remote = true
@course_groups = @course.course_groups if @course.course_groups
@show_serch = params[:role] == '2'
- case params[:role]
+ case @role
when '1'
@subPage_title = l :label_teacher_list
- @members = @teachers
+ @members = searchTeacherAndAssistant(@course)
+ @members = paginateHelper @members, 10
when '2'
@subPage_title = l :label_student_list
- @members = student_homework_score
+ page = params[:page].nil? ? 0 : (params['page'].to_i - 1)
+ @members = student_homework_score(0,page, 10)
- # @member_scores = @@member_scores
- # @members = searchStudent_sort(@course, 'desc', @@member_scores)
- @membercount = @members.count
+ @members = paginateHelper_for_members @members, 10
+
+ end
+ respond_to do |format|
+ if params[:page]
+ format.js
else
- @subPage_title = ''
- @members = @course.member_principals.includes(:roles, :principal).all.sort
+ format.html {render :layout => 'base_courses'}
+ end
+
end
- @members = paginateHelper @members
- render :layout => 'base_courses'
+ # render :layout => 'base_courses'
else
render_403
end
@@ -378,17 +387,9 @@ class CoursesController < ApplicationController
respond_to do |format|
format.html {render :layout => 'course_base'}
format.js
- end
- end
-
- #判断指定用户是否为课程教师
- def isCourseTeacher(id)
- result = false
- if @teachers.find_by_user_id(id) != nil
- result = true
end
- result
+
end
def handle_course courses, activities
@@ -881,11 +882,13 @@ class CoursesController < ApplicationController
end
end
- def student_homework_score
+ def student_homework_score(groupid,start_from, nums)
#teachers = find_course_teachers(@course)
+ start_from = start_from * nums
sql = ActiveRecord::Base.connection()
+
+ homework_scores = Member.find_by_sql("call member_score(#{@course.id},#{groupid},#{start_from},#{nums})")
- homework_scores = Member.find_by_sql("call member_score(#{@course.id})")
sql.close()
homework_scores
end
@@ -901,10 +904,10 @@ class CoursesController < ApplicationController
@canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
@is_remote = true
- @members = searchStudent(@course)
- @membercount = @members.count
- @results = student_homework_score.find_all {|mem| mem.course_group_id == group.id}
- @@result = @results
- @results = paginateHelper @results
+
+ page_from = params[:page].nil? ? 0 : (params[:page].to_i - 1)
+ @results = student_homework_score(group.id,0,0)
+ @results = paginateHelper @results, 10
+
end
end
diff --git a/app/views/courses/member.js.erb b/app/views/courses/member.js.erb
new file mode 100644
index 000000000..4d8c22de6
--- /dev/null
+++ b/app/views/courses/member.js.erb
@@ -0,0 +1 @@
+$("#member_content").html("<%= escape_javascript( render :partial => @render_file, :locals => {:members => @members})%>");
\ No newline at end of file
diff --git a/db/migrate/20141229081716_pro_member_score.rb b/db/migrate/20141229081716_pro_member_score.rb
new file mode 100644
index 000000000..ef262421e
--- /dev/null
+++ b/db/migrate/20141229081716_pro_member_score.rb
@@ -0,0 +1,100 @@
+class ProMemberScore < ActiveRecord::Migration
+ def up
+ sql_delete = ("DROP PROCEDURE IF EXISTS `member_score`;")
+ sql = ("
+CREATE PROCEDURE `member_score`(IN courseid INT, IN groupid INT,IN start_from INT, IN nums INT)
+BEGIN
+
+ CREATE TEMPORARY TABLE IF NOT EXISTS course_teachers (
+ id INT
+
+ );
+ TRUNCATE TABLE course_teachers;
+
+ CREATE TEMPORARY TABLE IF NOT EXISTS mems (
+ id INT ,
+ user_id INT,
+ course_id INT,
+ created_on DATETIME,
+ course_group_id INT,
+ score FLOAT DEFAULT 0
+ );
+ TRUNCATE TABLE mems;
+
+ CREATE TEMPORARY TABLE IF NOT EXISTS mem_home (
+ id INT,
+ user_id INT,
+ course_id INT,
+ created_on DATETIME,
+ course_group_id INT,
+ home_id INT,
+ score FLOAT DEFAULT 0
+ );
+ TRUNCATE TABLE mem_home;
+
+ CREATE TEMPORARY TABLE IF NOT EXISTS t_scores (
+
+ home_id INT,
+ score FLOAT
+ );
+ TRUNCATE TABLE t_scores;
+
+ CREATE TEMPORARY TABLE IF NOT EXISTS s_scores (
+
+ home_id INT,
+ score FLOAT
+ );
+ TRUNCATE TABLE s_scores;
+
+ CREATE TEMPORARY TABLE IF NOT EXISTS scores (
+
+ user_id INT,
+ score FLOAT
+ );
+ TRUNCATE TABLE scores;
+
+ INSERT INTO course_teachers (SELECT members.user_id FROM members WHERE members.user_id NOT IN (SELECT student_id FROM students_for_courses WHERE course_id = courseid));
+
+
+
+ INSERT INTO mems (id, user_id, course_id, created_on, course_group_id)
+ (SELECT members.id, members.user_id, members.course_id, members.created_on, members.course_group_id
+ FROM members WHERE course_id = courseid AND members.user_id NOT IN (SELECT id FROM course_teachers));
+
+ INSERT INTO mem_home (id, user_id, course_id, created_on, course_group_id,home_id)
+ (SELECT members.id, members.user_id, members.course_id, members.created_on, members.course_group_id, homework_attaches.id
+ FROM members, homework_attaches WHERE course_id = courseid
+ AND members.user_id = homework_attaches.user_id AND members.user_id NOT IN (SELECT id FROM course_teachers)
+ AND homework_attaches.bid_id IN (SELECT bid_id FROM homework_for_courses WHERE course_id = courseid ));
+
+ INSERT INTO t_scores (home_id, score) (SELECT rateable_id,AVG(seems_rateable_rates.stars)
+ FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id IN (SELECT mem_home.home_id FROM mem_home)
+ AND rater_id IN (SELECT id FROM course_teachers)
+ GROUP BY rateable_id);
+
+ INSERT INTO s_scores (home_id, score) (SELECT rateable_id,AVG(seems_rateable_rates.stars)
+ FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id IN (SELECT mem_home.home_id FROM mem_home)
+ AND rater_id NOT IN (SELECT id FROM course_teachers)
+ GROUP BY rateable_id) ;
+
+ UPDATE mem_home, t_scores SET mem_home.score = t_scores.score WHERE mem_home.home_id = t_scores.home_id ;
+
+ UPDATE mem_home, s_scores SET mem_home.score = s_scores.score WHERE mem_home.home_id = s_scores.home_id AND mem_home.score = 0;
+
+ INSERT INTO scores (user_id, score) (SELECT user_id, SUM(score) FROM mem_home GROUP BY user_id);
+ UPDATE mems, scores SET mems.score = scores.score WHERE mems.user_id = scores.user_id;
+ IF nums <> 0 THEN
+ SELECT * FROM mems ORDER BY score DESC LIMIT start_from, nums;
+ ELSE
+ SELECT * FROM mems WHERE course_group_id = groupid ORDER BY score DESC;
+ END IF;
+ END;
+
+")
+ execute(sql_delete)
+ execute(sql)
+ end
+
+ def down
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f850e759e..50fddceb4 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 => 20141226074532) do
+ActiveRecord::Schema.define(:version => 20141229081716) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
From 70083789cb82078c776b4f58745fad9a70fb203e Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 29 Dec 2014 16:59:22 +0800
Subject: [PATCH 9/9] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=8C=BF=E8=AF=84?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=9C=89=E9=94=99=202.?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E8=BA=AB=E4=BB=BD=E6=94=B9=E5=8F=98?=
=?UTF-8?q?=E6=97=B6=E4=BF=AE=E6=94=B9=E5=88=86=E6=95=B0=E5=88=9D=E5=A7=8B?=
=?UTF-8?q?=E5=88=86=E6=95=B0=E4=B8=BA=E4=B9=8B=E5=89=8D=E8=BA=AB=E4=BB=BD?=
=?UTF-8?q?=E7=9A=84=E8=AF=84=E5=88=86=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=B8=BA?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B9=8B=E5=89=8D=E8=BA=AB=E4=BB=BD=E7=9A=84?=
=?UTF-8?q?=E8=AF=84=E5=88=86=E7=9A=84BUG=203.=E6=98=AF=E5=90=A6=E5=B7=B2?=
=?UTF-8?q?=E7=BB=8F=E8=AF=84=E5=88=86=E5=88=A4=E6=96=AD=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E5=9C=A8=E5=BD=93=E5=89=8D=E8=A7=92=E8=89=B2=E4=B8=8B=E6=98=AF?=
=?UTF-8?q?=E5=90=A6=E5=B7=B2=E7=BB=8F=E8=AF=84=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/bids_controller.rb | 6 ++---
app/controllers/homework_attach_controller.rb | 22 +++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index eaeca0e46..e3b8b9a66 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -493,17 +493,17 @@ class BidsController < ApplicationController
@homework = HomeworkAttach.new
@is_teacher = is_course_teacher(User.current,@bid.courses.first)
if @is_teacher
- all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT * FROM (SELECT homework_attaches.*,
+ all_homework_list = HomeworkAttach.find_by_sql("SELECT * FROM (SELECT homework_attaches.*,
(SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1) AS t_score,
(SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
FROM homework_attaches WHERE bid_id = #{@bid.id} ORDER BY s_score DESC,created_at ASC) AS table1
WHERE table1.t_score IS NULL")
@cur_type = 1
else
- all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT homework_attaches.*,
+ all_homework_list = HomeworkAttach.find_by_sql("SELECT homework_attaches.*,
(SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1) AS t_score,
(SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score,
- (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id = #{User.current.id}) AS m_score
+ (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id = #{User.current.id} AND is_teacher_score = #{@is_teacher ? 1 : 0}) AS m_score
FROM homework_attaches
INNER JOIN homework_evaluations ON homework_evaluations.homework_attach_id = homework_attaches.id
WHERE homework_attaches.bid_id = #{@bid.id} AND homework_evaluations.user_id = #{User.current.id} ORDER BY s_score DESC")
diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb
index fedc99030..9ca47afdd 100644
--- a/app/controllers/homework_attach_controller.rb
+++ b/app/controllers/homework_attach_controller.rb
@@ -86,7 +86,7 @@ class HomeworkAttachController < ApplicationController
all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT homework_attaches.*,
(SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1) AS t_score,
(SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score,
- (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id = #{User.current.id}) AS m_score
+ (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id = #{User.current.id} AND is_teacher_score = 0) AS m_score
FROM homework_attaches
INNER JOIN homework_evaluations ON homework_evaluations.homework_attach_id = homework_attaches.id
WHERE homework_attaches.bid_id = #{@bid.id} AND homework_evaluations.user_id = #{User.current.id} ORDER BY m_score DESC")
@@ -353,11 +353,11 @@ class HomeworkAttachController < ApplicationController
# 作业打分列表
@stars_reates = @homework.rates(:quality)
#我的评分
- @has_evaluation = @stars_reates.where("rater_id = #{User.current.id}").first
+ @is_teacher = is_course_teacher User.current,@course
+ @has_evaluation = @stars_reates.where("rater_id = #{User.current.id} and is_teacher_score=#{@is_teacher ? 1 : 0}").first
@m_score = @has_evaluation.nil? ? 0 : @has_evaluation.stars
@teacher_stars = @stars_reates.where("is_teacher_score = 1") #老师评分列表
@student_stars = @stars_reates.where("is_teacher_score = 0") #学生评分列表
- @is_teacher = is_course_teacher User.current,@course
@is_anonymous_comments = @bid.comment_status == 1 && !@homework.users.include?(User.current) && @homework.user != User.current && !@is_teacher #判断是不是匿评(开启匿评，当前用户不是作业的创建者或者参与者，不是老师)
jours = @homework.journals_for_messages.where("is_comprehensive_evaluation = 3 or is_comprehensive_evaluation is null").order("created_on DESC")#jours留言 is null条件用以兼容历史数据
@jour = paginateHelper jours,5 #留言
@@ -418,15 +418,15 @@ class HomeworkAttachController < ApplicationController
@is_teacher,@is_anonymous_comments,@m_score = params[:is_teacher]=="true",params[:is_anonymous_comments]=="true",params[:stars_value]
@cur_page,@cur_type = params[:cur_page] || 1,params[:cur_type] || 5
@homework = HomeworkAttach.find(params[:homework_id])
-
+ is_teacher = @is_teacher ? 1 : 0
#保存评分@homework.rate(@m_score.to_i,User.current.id,:quality, (@is_teacher ? 1 : 0))
if @m_score
- if @homework.has_rated?(User.current, :quality)
- rate = @homework.rates(:quality).where(:rater_id => User.current.id).first
+ rate = @homework.rates(:quality).where(:rater_id => User.current.id, :is_teacher_score => is_teacher).first
+ if rate
rate.stars = @m_score
rate.save!
else
- @homework.rates(:quality).new(:stars => @m_score, :rater_id => User.current.id, :is_teacher_score => (@is_teacher ? 1 : 0)).save!
+ @homework.rates(:quality).new(:stars => @m_score, :rater_id => User.current.id, :is_teacher_score => is_teacher).save!
end
end
#保存评论
@@ -445,21 +445,21 @@ class HomeworkAttachController < ApplicationController
@bid = @homework.bid
get_not_batch_homework_list "s_socre","desc",@homework.bid_id
elsif @cur_type == "2" #老师已批列表
- @result_homework = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT homework_attaches.*,
+ @result_homework = HomeworkAttach.find_by_sql("SELECT homework_attaches.*,
(SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 and stars IS NOT NULL) AS t_score,
(SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
FROM homework_attaches WHERE id = #{@homework.id}").first
elsif @cur_type == "3" #全部作业列表
- @result_homework = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT homework_attaches.*,
+ @result_homework = HomeworkAttach.find_by_sql("SELECT homework_attaches.*,
(SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1) AS t_score,
(SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
FROM homework_attaches WHERE id = #{@homework.id}").first
elsif @cur_type == "4" #匿评作业列表
@is_student_batch_homework = true
- @result_homework = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT homework_attaches.*,
+ @result_homework = HomeworkAttach.find_by_sql("SELECT homework_attaches.*,
(SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1) AS t_score,
(SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score,
- (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id = #{User.current.id}) AS m_score
+ (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id = #{User.current.id} AND is_teacher_score = #{is_teacher}) AS m_score
FROM homework_attaches
WHERE homework_attaches.id = #{@homework.id}").first
else #其他的不用管
