diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index ffdd51762..d5ebb4c05 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -285,7 +285,7 @@ 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 @@ -298,7 +298,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 @@ -309,12 +309,12 @@ 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.find_all {|mem| mem.course_group_id == @group.id} else @results = student_homework_score end @@result = @results - + @members = searchStudent(@course) @membercount = @members.count @results = paginateHelper @results diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 867c2a302..ce899eff5 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -129,7 +129,7 @@ class MembersController < ApplicationController member = Member.new(:role_ids => params[:membership][:role_ids], :user_id => user_id) role = Role.find_by_id(params[:membership][:role_ids]) # 这里的判断只能通过角色名，可以弄成常量 - if role.name == "学生" + if role.name == "学生" || role.name == "Student" StudentsForCourse.create(:student_id => user_id, :course_id =>@course.id) end members << member @@ -210,7 +210,7 @@ class MembersController < ApplicationController if (params[:membership][:role_ids]) role = Role.find(params[:membership][:role_ids][0]) # 这里的判断只能通过角色名，可以弄成常量 - if role.name == "学生" + if role.name == "学生" || role.name == "Student" StudentsForCourse.create(:student_id => @member.user_id, :course_id =>@course.id) else joined = StudentsForCourse.where('student_id = ? and course_id = ?', @member.user_id,@course.id) diff --git a/data/member_score.sql b/db/migrate/20141226074532_select_member_score.rb similarity index 59% rename from data/member_score.sql rename to db/migrate/20141226074532_select_member_score.rb index 13858ccce..2303c6235 100644 --- a/data/member_score.sql +++ b/db/migrate/20141226074532_select_member_score.rb @@ -1,97 +1,100 @@ - -DELIMITER $$ - -CREATE - /*[DEFINER = { user | CURRENT_USER }]*/ - PROCEDURE `member_score`(IN courseid INT) - /*LANGUAGE SQL - | [NOT] DETERMINISTIC - | { CONTAINS SQL | NO SQL | READS SQL DATA | MODIFIES SQL DATA } - | SQL SECURITY { DEFINER | INVOKER } - | COMMENT 'string'*/ - 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; - - SELECT * FROM mems ORDER BY score DESC; - END$$ - -DELIMITER ; \ No newline at end of file +#encoding=UTF-8 +class SelectMemberScore < ActiveRecord::Migration + def up + sql = (" + +CREATE + + PROCEDURE `member_score`(IN courseid 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; + + SELECT * FROM mems ORDER BY score DESC; + END; + + ") + execute(sql) + end + + def down + end +end diff --git a/db/schema.rb b/db/schema.rb index a75c6eb29..f850e759e 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 => 20141226074532) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false