|
@@ -33,7 +33,9 @@
|
- <%= l(:label_user_location) %> :
+
+ <%= l(:label_user_location) %> :
+
|
-
-
- <%= form_tag( users_search_path, :method => :get, :id => 'search_user_form') do %>
-
-
- |
- <%= l(:label_software_user ) %>
- |
-
- <%= l(:label_user_location) %> :
- |
-
- |
-
-
-
- <%#= select "search_by", "id",
- { l(:label_search_by_login) => "0", l(:label_search_by_name) => "1", l(:label_search_by_email) => "2" },
- :size => 20 %>
- <%= text_field_tag 'name', params[:name], :size => 30 %>
-
- <%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
-
- |
-
-
- |
- <%=link_to l(:field_homepage), home_path %> >
- <%= l(:label_software_user)%>
- |
-
-
-
- <% if @users.size > 0 %>
- <%= render :partial => 'user_show' %>
-
-
- <% else %>
- <%= render :partial => "layouts/no_content"%>
- <% end %>
-
-
-<% html_title(l(:label_user_plural)) -%>
-
+
+
+
+ <%= form_tag( users_search_path, :method => :get, :id => 'search_user_form') do %>
+
+
+ |
+ <%= l(:label_software_user ) %>
+ |
+
+ <%= l(:label_user_location) %> :
+ |
+
+ |
+
+
+
+ <%= select_tag(:search_by,options_for_select([["鏄电О","0"],["濮撳悕","1"],["閭","2"]],@search_by), :onchange => "searchByChange();" ) %>
+ <%= text_field_tag 'name', params[:name], :size => 30 %>
+
+
+ <%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+
+ |
+
+
+ |
+ <%=link_to l(:field_homepage), home_path %> >
+ <%= l(:label_software_user)%>
+ |
+
+
+
+ <% if @users.size > 0 %>
+ <%= render :partial => 'user_show' %>
+
+
+ <% else %>
+ <%= render :partial => "layouts/no_content"%>
+ <% end %>
+
+
+<% html_title(l(:label_user_plural)) -%>
+
diff --git a/app/views/welcome/_search_project.html.erb b/app/views/welcome/_search_project.html.erb
index fda9dae7c..b86ff64f9 100644
--- a/app/views/welcome/_search_project.html.erb
+++ b/app/views/welcome/_search_project.html.erb
@@ -1,58 +1,99 @@
-<%
- select_option = []
- (select_option << ['椤圭洰', 'projects']) if project_type == Project::ProjectType_project
- (select_option << ['璇剧▼', 'courses']) if project_type == Project::ProjectType_course
- select_option << ['鐢ㄦ埛', 'users']
- #select_option << ['鏁欏笀', 'users_teacher'],
- #select_option << ['瀛︾敓', 'users_student']
-%>
-
-<%= form_tag({controller: :welcome, action: :search }, method: :get) do %>
-
-
- <%= text_field_tag :q, nil, placeholder:'璇疯緭鍏ヨ鎼滅储鐨勫叧閿瓧', :size => 27 %>
- <%= select_tag(:search_type, options_for_select(select_option) ) %>
-
- <%#= hidden_field_tag 'project_type', project_type %>
- <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
-
+
+ <%= text_field_tag :q, nil, placeholder:'璇疯緭鍏ヨ鎼滅储鐨勫叧閿瓧', :size => 27 %>
+
+ <%= select_tag(:search_type, options_for_select(select_option), :onchange => "searchTypeChange();" ) %>
+ <%= select_tag(:search_by,options_for_select([["鏄电О","0"],["濮撳悕","1"],["閭","2"]]), :onchange => "searchByChange();" ) %>
+
+ <%#= hidden_field_tag 'project_type', project_type %>
+ <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+
- <%= render :partial => "search_course", :locals => {:project_type => Project::ProjectType_course} %>
+ <%= render :partial => "search_project", :locals => {:project_type => Project::ProjectType_course} %>
@@ -77,7 +83,11 @@
- <%= 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/config/initializers/20-mime_types.rb b/config/initializers/20-mime_types.rb
index cfd35a3e9..d84c2472d 100644
--- a/config/initializers/20-mime_types.rb
+++ b/config/initializers/20-mime_types.rb
@@ -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
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 0ff27dad2..62f0e0bc4 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2090,7 +2090,24 @@ zh:
label_contest_delete: 鍒犻櫎绔炶禌
label_noawards_current: 鏆傛湭璇勫
-
+ excel_user_id: 瀛︾敓id
+ excel_user_name: 鐢ㄦ埛鍚
+ excel_nickname: 鏄电О
+ excel_student_id: 瀛﹀彿
+ excel_mail: 鐢靛瓙閭
+ excel_homework_name: 浣滃搧鍚
+ excel_t_score: 鏁欏笀璇勫垎
+ excel_n_score: 鍖垮悕璇勫垎
+ excel_commit_time: 鎻愪氦鏃堕棿
+ excel_homework_score: 浣滀笟绉垎
+ excel_class: "鐝骇:"
+ excel_member_with_out_class: "鏈姞鍏ョ彮绾х殑瀛︾敓"
+ excel_member_list: 鎴愬憳鍒楄〃
+ excel_homework_list: 浣滃搧鍒楄〃
+ excel_been_rated: 宸茶瘎
+ excel_not_rated: 鏈瘎
+ label_export_excel: 瀵煎嚭Excel
+
label_softapplication: 搴旂敤杞欢
label_attending_contest: 鍙傚姞绔炶禌
label_new_attendingcontest_work: 鏂板缓鍙傝禌浣滃搧
diff --git a/config/routes.rb b/config/routes.rb
index e2f207870..a350f5de3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -641,6 +641,7 @@ RedmineApp::Application.routes.draw do
get 'file', :action => 'file', :as => 'file'
get 'feedback', :action => 'feedback', :as => 'course_feedback'
get 'member', :controller => 'courses', :action => 'member', :as => 'member'
+ get 'export_course_member_excel',:controller => 'courses',:action => 'export_course_member_excel'
get 'member_score', :to => 'courses#member_score'
post 'finishcourse'
post 'restartcourse'
diff --git a/db/migrate/20141226074532_select_member_score.rb b/db/migrate/20141226074532_select_member_score.rb
new file mode 100644
index 000000000..2303c6235
--- /dev/null
+++ b/db/migrate/20141226074532_select_member_score.rb
@@ -0,0 +1,100 @@
+#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/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/migrate/20141229141201_create_pro_select_member_score.rb b/db/migrate/20141229141201_create_pro_select_member_score.rb
new file mode 100644
index 000000000..e7910a5ff
--- /dev/null
+++ b/db/migrate/20141229141201_create_pro_select_member_score.rb
@@ -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
diff --git a/db/migrate/20141230011546_create_new_select_member_score.rb b/db/migrate/20141230011546_create_new_select_member_score.rb
new file mode 100644
index 000000000..5d02a7465
--- /dev/null
+++ b/db/migrate/20141230011546_create_new_select_member_score.rb
@@ -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
diff --git a/db/migrate/20141230034253_create_select_member_score.rb b/db/migrate/20141230034253_create_select_member_score.rb
new file mode 100644
index 000000000..f45f609e8
--- /dev/null
+++ b/db/migrate/20141230034253_create_select_member_score.rb
@@ -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
diff --git a/db/migrate/20141230062844_create_pro_for_search_member.rb b/db/migrate/20141230062844_create_pro_for_search_member.rb
new file mode 100644
index 000000000..403e9d05f
--- /dev/null
+++ b/db/migrate/20141230062844_create_pro_for_search_member.rb
@@ -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
diff --git a/db/migrate/20141230081209_add_column_to_homeworkattaches.rb b/db/migrate/20141230081209_add_column_to_homeworkattaches.rb
new file mode 100644
index 000000000..68198dc05
--- /dev/null
+++ b/db/migrate/20141230081209_add_column_to_homeworkattaches.rb
@@ -0,0 +1,6 @@
+class AddColumnToHomeworkattaches < ActiveRecord::Migration
+ def change
+ add_column :homework_attaches, :score, :float, default: 0
+ add_column :homework_attaches, :is_teacher_score, :integer, :default => 0
+ end
+end
diff --git a/db/migrate/20141230081744_update_score_to_homeworkattaches.rb b/db/migrate/20141230081744_update_score_to_homeworkattaches.rb
new file mode 100644
index 000000000..c8b201778
--- /dev/null
+++ b/db/migrate/20141230081744_update_score_to_homeworkattaches.rb
@@ -0,0 +1,18 @@
+class UpdateScoreToHomeworkattaches < ActiveRecord::Migration
+ def up
+ sql = ("UPDATE homework_attaches set is_teacher_score = 1,
+ score = (SELECT AVG(seems_rateable_rates.stars) FROM seems_rateable_rates
+ WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id
+ AND is_teacher_score = 1 GROUP BY rateable_id);")
+ sql_student = ("UPDATE homework_attaches set is_teacher_score = 0,
+ score = (SELECT AVG(seems_rateable_rates.stars) FROM seems_rateable_rates
+ WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id
+ AND is_teacher_score = 0 GROUP BY rateable_id) WHERE homework_attaches.score = 0 OR homework_attaches.score is NULL
+")
+ execute(sql)
+ execute(sql_student)
+ end
+
+ def down
+ end
+end
diff --git a/db/migrate/20141231020031_add_data_to_student_for_course.rb b/db/migrate/20141231020031_add_data_to_student_for_course.rb
new file mode 100644
index 000000000..6d86efa65
--- /dev/null
+++ b/db/migrate/20141231020031_add_data_to_student_for_course.rb
@@ -0,0 +1,13 @@
+class AddDataToStudentForCourse < ActiveRecord::Migration
+ def change
+ Course.all.each do |course|
+
+ course.members.each do |m|
+ if m && m.user && m.user.allowed_to?(:student,course) && StudentsForCourse.find_by_student_id(m.user).nil?
+ StudentsForCourse.create(:student_id => m.user_id, :course_id => course.id)
+ end
+ end
+
+ end
+ end
+end
diff --git a/db/migrate/20141231085350_add_data_to_student_for_course_new.rb b/db/migrate/20141231085350_add_data_to_student_for_course_new.rb
new file mode 100644
index 000000000..76552aa13
--- /dev/null
+++ b/db/migrate/20141231085350_add_data_to_student_for_course_new.rb
@@ -0,0 +1,15 @@
+class AddDataToStudentForCourseNew < ActiveRecord::Migration
+ def change
+ Course.all.each do |course|
+
+ course.members.each do |m|
+ if m && m.user && m.user.allowed_to?(:as_student,course) &&
+ StudentsForCourse.where(:student_id => m.user_id, :course_id => course.id).first.nil?
+ student = StudentsForCourse.new(:student_id => m.user_id, :course_id => course.id)
+ student.save!
+ end
+
+ end
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a75c6eb29..04a2e54c8 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 => 20141231085350) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@@ -483,13 +483,15 @@ ActiveRecord::Schema.define(:version => 20141210070327) do
create_table "homework_attaches", :force => true do |t|
t.integer "bid_id"
t.integer "user_id"
- 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.string "reward"
t.string "name"
t.text "description"
t.integer "state"
- t.integer "project_id", :default => 0
+ t.integer "project_id", :default => 0
+ t.float "score", :default => 0.0
+ t.integer "is_teacher_score", :default => 0
end
create_table "homework_evaluations", :force => true do |t|
@@ -977,13 +979,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|
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
diff --git a/public/images/f_notice.jpg b/public/images/f_notice.jpg
new file mode 100644
index 000000000..38cf0a3e0
Binary files /dev/null and b/public/images/f_notice.jpg differ
diff --git a/public/images/icon_excel.gif b/public/images/icon_excel.gif
new file mode 100644
index 000000000..d2e309ef5
Binary files /dev/null and b/public/images/icon_excel.gif differ
diff --git a/public/stylesheets/course_group.css b/public/stylesheets/course_group.css
index cf1806819..71f870a9a 100644
--- a/public/stylesheets/course_group.css
+++ b/public/stylesheets/course_group.css
@@ -41,7 +41,16 @@ input.f_2 {
.st_search{ margin:10px 0;}
.st_search span{ font-size:14px; font-weight:bold; color:#606060; margin-right:35px;}
.st_search input{ border:1px solid #1c9ec7; height:20px; width:200px;}
+ a:hover.xls{ background: url('../images/icon_excel.gif') no-repeat scroll 1px 50% transparent !important;
+ padding: 2px 0px 3px 16px;
+ font-family:寰蒋闆呴粦 !important;
+ font-size: 12px !important;
+ color: #136b3b !important;
+ text-decoration: underline !important;
+ font-weight:normal !important;
+ }
.st_search a:hover{ background:#048fbb; text-decoration:none;}
+
/*.st_search input.f_2{ background:#1c9ec7; padding: 3px; margin-left: 3px; color:#fff;border:1px solid #1c9ec7; text-align:center; display:block; width:45px; height:28px; font-size:12px; }*/
.classbox{ border:1px solid #f8df8c; background:#fffce6; color:#0d90c3; padding:0 3px; float:left; margin-left:15px;}
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index fd23d7525..c532e7112 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -1431,3 +1431,12 @@ ul.contest-notification-list li span{
.softapplications-div table td{
word-break: break-all;
}
+
+.xls {
+ background: url('../images/icon_excel.gif') no-repeat scroll 1px 50% transparent;
+ padding: 2px 0px 3px 16px;
+ font-family:寰蒋闆呴粦 !important;
+ font-size: 12px !important;
+ color: #136b3b !important;
+ font-weight:normal !important;
+}
diff --git a/public/stylesheets/resource.css b/public/stylesheets/resource.css
index 39922d6f1..885423143 100644
--- a/public/stylesheets/resource.css
+++ b/public/stylesheets/resource.css
@@ -6,6 +6,7 @@ ul,li{ list-style-type:none}
.cl{ clear:both; overflow:hidden; }
#resource a{ text-decoration:none; text-align:center; }
a:hover{ text-decoration:underline;}
+
/**** 甯哥敤***/
.f_l{ float:left;}
.f_r{ float:right;}
|
");
+$('#ajax-modal').parent().removeClass("alert_praise");
+$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().addClass("alert_box");
diff --git a/app/views/courses/member.html.erb b/app/views/courses/member.html.erb
index 91d8badcc..313e50748 100644
--- a/app/views/courses/member.html.erb
+++ b/app/views/courses/member.html.erb
@@ -57,20 +57,10 @@
<%= stylesheet_link_tag 'course_group', :media => 'all' %>