-
<%= 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? %>
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/migrate/20141229025925_change_seems_rateable_rates.rb b/db/migrate/20141229025925_change_seems_rateable_rates.rb
new file mode 100644
index 000000000..7be2a81fe
--- /dev/null
+++ b/db/migrate/20141229025925_change_seems_rateable_rates.rb
@@ -0,0 +1,27 @@
+class ChangeSeemsRateableRates < ActiveRecord::Migration
+ def up
+ 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
+
+ def down
+ SeemsRateableRates.where("is_teacher_score = 1").each do |rate|
+ rate.is_teacher_score = 0
+ rate.save
+ end
+ end
+end
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..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 => 20141226074532) do
+ActiveRecord::Schema.define(:version => 20141229025925) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@@ -977,13 +977,14 @@ ActiveRecord::Schema.define(:version => 20141226074532) 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|
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
