Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts: db/schema.rbdev_chuangbin v20141230_02
commit
a07bb18dcb
@ -1,4 +1,4 @@
|
||||
/**
|
||||
* Created by Administrator on 2014/12/3.
|
||||
*/
|
||||
$("#list_detail").html("<%= escape_javascript( render :partial => 'member_list_detail', :locals => {:members => @results})%>");
|
||||
$("#member_content").html("<%= escape_javascript( render :partial => @render_file, :locals => {:members => @results})%>");
|
||||
@ -1,4 +1,4 @@
|
||||
$('#tbc_01').html('<%= escape_javascript(render(:partial => 'homeworks_list',
|
||||
:locals => {:homeworks => @homework_list, :homework_count => @obj_count, :bid => @bid, :remote => true} )) %>');
|
||||
:locals => {:homeworks => @homework_list, :homework_count => @obj_count, :bid => @bid, :remote => true,:is_batch_homeworks => @is_batch_homeworks} )) %>');
|
||||
for(var i=1;i<=4;i++){$("#tb_"+i).removeClass().addClass("normaltab");}
|
||||
$("#tb_2").removeClass().addClass("hovertab");
|
||||
@ -1,4 +1,4 @@
|
||||
$('#tbc_01').html('<%= escape_javascript(render(:partial => 'homeworks_list',
|
||||
:locals => {:homeworks => @homework_list, :homework_count => @obj_count, :bid => @bid, :remote => true} )) %>');
|
||||
:locals => {:homeworks => @homework_list, :homework_count => @obj_count, :bid => @bid, :remote => true,:not_batch_homework => @not_batch_homework} )) %>');
|
||||
for(var i=1;i<=4;i++){$("#tb_"+i).removeClass().addClass("normaltab");}
|
||||
$("#tb_1").removeClass().addClass("hovertab");
|
||||
@ -1,4 +1,5 @@
|
||||
# Add new mime types for use in respond_to blocks:
|
||||
|
||||
Mime::SET << Mime::CSV unless Mime::SET.include?(Mime::CSV)
|
||||
Mime::Type.register "text/excel", :xls
|
||||
|
||||
|
||||
@ -0,0 +1,108 @@
|
||||
class CreateProSelectMemberScore < 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, IN sort_by VARCHAR(10))
|
||||
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 sort_by = '' OR sort_by = 'desc' THEN
|
||||
IF groupid <> 0 THEN
|
||||
SELECT * FROM mems WHERE course_group_id = groupid ORDER BY score DESC ;
|
||||
ELSE
|
||||
SELECT * FROM mems ORDER BY score DESC LIMIT start_from, nums;
|
||||
END IF;
|
||||
ELSE
|
||||
IF groupid <> 0 THEN
|
||||
SELECT * FROM mems WHERE course_group_id = groupid ORDER BY score ASC ;
|
||||
ELSE
|
||||
SELECT * FROM mems ORDER BY score ASC LIMIT start_from, nums;
|
||||
END IF;
|
||||
END IF;
|
||||
END;
|
||||
|
||||
")
|
||||
execute(sql_delete)
|
||||
execute(sql)
|
||||
end
|
||||
|
||||
def down
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,104 @@
|
||||
class CreateNewSelectMemberScore < 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, IN sort_by VARCHAR(10))
|
||||
BEGIN
|
||||
|
||||
|
||||
|
||||
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 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,students_for_courses WHERE members.course_id = courseid
|
||||
AND members.course_id = students_for_courses.course_id AND members.user_id =students_for_courses.student_id);
|
||||
|
||||
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 IN (SELECT student_id FROM students_for_courses WHERE course_id = courseid)
|
||||
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 is_teacher_score = 1
|
||||
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 is_teacher_score = 0
|
||||
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 sort_by = '' OR sort_by = 'desc' THEN
|
||||
IF groupid <> 0 THEN
|
||||
SELECT * FROM mems WHERE course_group_id = groupid ORDER BY score;
|
||||
ELSE
|
||||
SELECT * FROM mems ORDER BY score DESC ;
|
||||
END IF;
|
||||
ELSE
|
||||
IF groupid <> 0 THEN
|
||||
SELECT * FROM mems WHERE course_group_id = groupid ORDER BY score ASC LIMIT start_from, nums;
|
||||
ELSE
|
||||
SELECT * FROM mems ORDER BY score ASC;
|
||||
END IF;
|
||||
END IF;
|
||||
END;
|
||||
|
||||
")
|
||||
execute(sql_delete)
|
||||
execute(sql)
|
||||
end
|
||||
|
||||
|
||||
def down
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,102 @@
|
||||
class CreateSelectMemberScore < 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, IN sort_by VARCHAR(10))
|
||||
BEGIN
|
||||
|
||||
|
||||
|
||||
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 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,students_for_courses WHERE members.course_id = courseid
|
||||
AND members.course_id = students_for_courses.course_id AND members.user_id =students_for_courses.student_id);
|
||||
|
||||
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 IN (SELECT student_id FROM students_for_courses WHERE course_id = courseid)
|
||||
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 is_teacher_score = 1
|
||||
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 is_teacher_score = 0
|
||||
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 sort_by = '' OR sort_by = 'desc' THEN
|
||||
IF groupid <> 0 THEN
|
||||
SELECT * FROM mems WHERE course_group_id = groupid ORDER BY score ;
|
||||
ELSE
|
||||
SELECT * FROM mems ORDER BY score DESC LIMIT start_from, nums ;
|
||||
END IF;
|
||||
ELSE
|
||||
IF groupid <> 0 THEN
|
||||
SELECT * FROM mems WHERE course_group_id = groupid ORDER BY score ASC ;
|
||||
ELSE
|
||||
SELECT * FROM mems ORDER BY score ASC LIMIT start_from, nums;
|
||||
END IF;
|
||||
END IF;
|
||||
END;
|
||||
|
||||
")
|
||||
execute(sql_delete)
|
||||
execute(sql)
|
||||
end
|
||||
|
||||
def down
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,110 @@
|
||||
class CreateProForSearchMember < 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, IN sort_by VARCHAR(10))
|
||||
BEGIN
|
||||
|
||||
|
||||
|
||||
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 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,students_for_courses WHERE members.course_id = courseid
|
||||
AND members.course_id = students_for_courses.course_id AND members.user_id =students_for_courses.student_id);
|
||||
|
||||
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 IN (SELECT student_id FROM students_for_courses WHERE course_id = courseid)
|
||||
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 is_teacher_score = 1
|
||||
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 is_teacher_score = 0
|
||||
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 sort_by = '' OR sort_by = 'desc' THEN
|
||||
IF groupid <> 0 THEN
|
||||
SELECT * FROM mems WHERE course_group_id = groupid ORDER BY score DESC;
|
||||
ELSE
|
||||
IF nums <> 0 THEN
|
||||
SELECT * FROM mems ORDER BY score DESC LIMIT start_from, nums;
|
||||
ELSE
|
||||
SELECT * FROM mems ORDER BY score DESC;
|
||||
end IF;
|
||||
END if;
|
||||
ELSE
|
||||
IF groupid <> 0 THEN
|
||||
SELECT * FROM mems WHERE course_group_id = groupid ORDER BY score ASC ;
|
||||
ELSE
|
||||
IF nums <> 0 THEN
|
||||
SELECT * FROM mems ORDER BY score ASC LIMIT start_from, nums;
|
||||
ELSE
|
||||
SELECT * FROM mems ORDER BY score ASC;
|
||||
end IF;
|
||||
END IF;
|
||||
END IF;
|
||||
END;
|
||||
")
|
||||
execute(sql_delete)
|
||||
execute(sql)
|
||||
end
|
||||
|
||||
def down
|
||||
end
|
||||
end
|
||||
Binary file not shown.
Binary file not shown.
Loading…
Reference in new issue