= <%= (project_score.changeset_num||0) * 4 %> + <%= project_score.issue_num * 4 + project_score.issue_journal_num %> + <%= project_score.attach_num * 5 %> - + <%= project_score.board_num * 2 + project_score.board_message_num + project_score.news_num %>
+ + <%= project_score.board_num * 2 + project_score.board_message_num %> <% end %> diff --git a/app/views/contestant_works/_contest_evaluation_un_group_work.html.erb b/app/views/contestant_works/_contest_evaluation_un_group_work.html.erb index b75319ae3..9a89110b3 100644 --- a/app/views/contestant_works/_contest_evaluation_un_group_work.html.erb +++ b/app/views/contestant_works/_contest_evaluation_un_group_work.html.erb @@ -37,7 +37,7 @@= <%= (project_score.changeset_num||0) * 4 %> + <%= project_score.issue_num * 4 + project_score.issue_journal_num %> + <%= project_score.attach_num * 5 %> - + <%= project_score.board_num * 2 + project_score.board_message_num + project_score.news_num %>
+ + <%= project_score.board_num * 2 + project_score.board_message_num %> <% end %> diff --git a/app/views/courses/_hero_table.html.erb b/app/views/courses/_hero_table.html.erb new file mode 100644 index 000000000..0e4ce2a8a --- /dev/null +++ b/app/views/courses/_hero_table.html.erb @@ -0,0 +1,92 @@ +<% if @members.count != 0 %> +没有数据可以显示！
+<% end %> \ No newline at end of file diff --git a/app/views/courses/_project_table.html.erb b/app/views/courses/_project_table.html.erb new file mode 100644 index 000000000..0ef569f64 --- /dev/null +++ b/app/views/courses/_project_table.html.erb @@ -0,0 +1,108 @@ +<% if @members.count != 0 %> +没有数据可以显示！
+<% end %> \ No newline at end of file diff --git a/app/views/courses/_tool_expand.html.erb b/app/views/courses/_tool_expand.html.erb index fccf7a6cf..5d758b29c 100644 --- a/app/views/courses/_tool_expand.html.erb +++ b/app/views/courses/_tool_expand.html.erb @@ -64,9 +64,4 @@
统计功能即将上线，届时我们一起享受教育大数据的红利吧！
- -= <%= (project_score.changeset_num||0) * 4 %> + <%= project_score.issue_num * 4 + project_score.issue_journal_num %> + <%= project_score.attach_num * 5 %> - + <%= project_score.board_num * 2 + project_score.board_message_num + project_score.news_num %>
+ + <%= project_score.board_num * 2 + project_score.board_message_num %> <% end %> diff --git a/db/migrate/20170209020934_create_course_homework_statistics.rb b/db/migrate/20170209020934_create_course_homework_statistics.rb new file mode 100644 index 000000000..6214d392c --- /dev/null +++ b/db/migrate/20170209020934_create_course_homework_statistics.rb @@ -0,0 +1,53 @@ +class CreateCourseHomeworkStatistics < ActiveRecord::Migration + def change + create_table :course_homework_statistics do |t| + t.references :user + t.references :course + t.integer :committed_work_num, :default => 0 + t.integer :un_commit_work_num, :default => 0 + t.integer :late_commit_work_num, :default => 0 + t.integer :absence_evaluation_work_num, :default => 0 + t.integer :un_evaluation_work_num, :default => 0 + t.integer :appeal_num, :default => 0 + t.float :average_score, :default => 0 + t.float :total_score, :default => 0 + + t.timestamps + end + + count =Course.all.count / 30 + 2 + transaction do + for i in 1 ... count do i + Course.page(i).per(30).each do |course| + hw_count = course.homework_commons.includes(:homework_detail_manual).where("homework_detail_manuals.comment_status > 0").count + homework_ids = course.homework_commons.empty? ? "(-1)" : "(" + course.homework_commons.map{|hw| hw.id}.join(",") + ")" + student_works = StudentWork.where("homework_common_id in #{homework_ids} and work_status !=0") + is_eva_homeworks = course.homework_commons.includes(:homework_detail_manual).where("homework_commons.anonymous_comment = 0 and homework_detail_manuals.comment_status = 2") + is_eva_student_works = StudentWork.where(:homework_common_id => is_eva_homeworks.map{|hw| hw.id}) + has_eva_homeworks = course.homework_commons.includes(:homework_detail_manual).where("homework_commons.anonymous_comment = 0 and homework_detail_manuals.comment_status = 3") + has_eva_student_works = StudentWork.where(:homework_common_id => has_eva_homeworks.map{|hw| hw.id}) + course.student.each do |student| + user = student.student + if user + committed_work_num = user.student_works.where("homework_common_id in #{homework_ids} and work_status != 0").count + un_commit_work_num = (hw_count - committed_work_num) < 0 ? 0 : (hw_count - committed_work_num) + late_commit_work_num = user.student_works.where("homework_common_id in #{homework_ids} and work_status = 2").count + absence_evaluation_work_num = user.student_works_evaluation_distributions.where(:student_work_id => has_eva_student_works.map(&:id)).count - + user.student_works_scores.where(:reviewer_role => 3, :student_work_id => has_eva_student_works.map(&:id)).group_by(&:student_work_id).count + absence_evaluation_work_num = absence_evaluation_work_num < 0 ? 0 : absence_evaluation_work_num + un_evaluation_work_num = user.student_works_evaluation_distributions.where(:student_work_id => is_eva_student_works.map(&:id)).count - + user.student_works_scores.where(:reviewer_role => 3, :student_work_id => is_eva_student_works.map(&:id)).group_by(&:student_work_id).count + un_evaluation_work_num = un_evaluation_work_num < 0 ? 0 : un_evaluation_work_num + appeal_num = user.student_works_scores.where(:student_work_id => student_works.map(&:id), :appeal_status => 3).count + average_score = user.student_works.where(:id => student_works.map(&:id)).select("AVG(student_works.work_score) as score").first ? user.student_works.where(:id => student_works.map(&:id)).select("AVG(student_works.work_score) as score").first.score : 0 + total_score = user.student_works.where(:id => student_works.map(&:id)).select("SUM(student_works.work_score) as score").first ? user.student_works.where(:id => student_works.map(&:id)).select("SUM(student_works.work_score) as score").first.score : 0 + CourseHomeworkStatistics.create(:course_id => course.id, :user_id => user.id, :committed_work_num => committed_work_num, :un_commit_work_num => un_commit_work_num, + :late_commit_work_num => late_commit_work_num, :absence_evaluation_work_num => absence_evaluation_work_num, :un_evaluation_work_num => un_evaluation_work_num, + :appeal_num => appeal_num, :average_score => average_score, :total_score => total_score) + end + end + end + end + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 31a5b17d7..96c27b9cc 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 => 20170207060207) do +ActiveRecord::Schema.define(:version => 20170209020934) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -350,16 +350,14 @@ ActiveRecord::Schema.define(:version => 20170207060207) do add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids" create_table "changesets", :force => true do |t| - t.integer "repository_id", :null => false - t.string "revision", :null => false + t.integer "repository_id", :null => false + t.string "revision", :null => false t.string "committer" - t.datetime "committed_on", :null => false + t.datetime "committed_on", :null => false t.text "comments" t.date "commit_date" t.string "scmid" t.integer "user_id" - t.integer "project_id" - t.integer "type", :default => 0 end add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on" @@ -521,13 +519,6 @@ ActiveRecord::Schema.define(:version => 20170207060207) do add_index "contest_messages", ["contest_id"], :name => "index_contest_messages_on_contest_id" add_index "contest_messages", ["user_id"], :name => "index_contest_messages_on_user_id" - create_table "contest_notifications", :force => true do |t| - t.text "title" - t.text "content" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - create_table "contestant_for_contests", :force => true do |t| t.integer "student_id" t.integer "contest_id" @@ -595,37 +586,6 @@ ActiveRecord::Schema.define(:version => 20170207060207) do add_index "contestant_works", ["user_id"], :name => "index_contestant_works_on_user_id" add_index "contestant_works", ["work_id"], :name => "index_contestant_works_on_work_id" - create_table "contesting_projects", :force => true do |t| - t.integer "project_id" - t.string "contest_id" - t.integer "user_id" - t.string "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "reward" - end - - create_table "contesting_softapplications", :force => true do |t| - t.integer "softapplication_id" - t.integer "contest_id" - t.integer "user_id" - t.string "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - t.string "reward" - end - - create_table "contestnotifications", :force => true do |t| - t.integer "contest_id" - t.string "title" - t.string "summary" - t.text "description" - t.integer "author_id" - t.integer "notificationcomments_count" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - create_table "contests", :force => true do |t| t.integer "user_id" t.string "name" @@ -668,6 +628,20 @@ ActiveRecord::Schema.define(:version => 20170207060207) do t.integer "container_id", :default => 0 end + create_table "course_class_post", :id => false, :force => true do |t| + t.integer "班级id", :default => 0, :null => false + t.string "班级名" + t.integer "帖子id", :default => 0, :null => false + t.integer "主贴id" + t.string "帖子标题", :default => "", :null => false + t.text "帖子内容" + t.integer "帖子用户id" + t.integer "帖子回复数", :default => 0, :null => false + t.integer "最后回帖id" + t.datetime "发帖时间", :null => false + t.datetime "帖子更新时间", :null => false + end + create_table "course_contributor_scores", :force => true do |t| t.integer "course_id" t.integer "user_id" @@ -695,6 +669,21 @@ ActiveRecord::Schema.define(:version => 20170207060207) do add_index "course_groups", ["course_id"], :name => "index_course_groups_on_course_id" + create_table "course_homework_statistics", :force => true do |t| + t.integer "user_id" + t.integer "course_id" + t.integer "committed_work_num", :default => 0 + t.integer "un_commit_work_num", :default => 0 + t.integer "late_commit_work_num", :default => 0 + t.integer "absence_evaluation_work_num", :default => 0 + t.integer "un_evaluation_work_num", :default => 0 + t.integer "appeal_num", :default => 0 + t.float "average_score", :default => 0.0 + t.float "total_score", :default => 0.0 + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "course_infos", :force => true do |t| t.integer "course_id" t.integer "user_id" @@ -843,21 +832,6 @@ ActiveRecord::Schema.define(:version => 20170207060207) do add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority" - create_table "delayed_jobs_20161218", :id => false, :force => true do |t| - t.integer "id", :default => 0, :null => false - t.integer "priority", :default => 0, :null => false - t.integer "attempts", :default => 0, :null => false - t.text "handler", :null => false - t.text "last_error" - t.datetime "run_at" - t.datetime "locked_at" - t.datetime "failed_at" - t.string "locked_by" - t.string "queue" - t.datetime "created_at" - t.datetime "updated_at" - end - create_table "discuss_demos", :force => true do |t| t.string "title" t.text "body" @@ -983,11 +957,13 @@ ActiveRecord::Schema.define(:version => 20170207060207) do t.integer "exercise_status" t.integer "user_id" t.integer "time" - 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.datetime "publish_time" t.datetime "end_time" t.integer "show_result" + t.integer "question_random", :default => 0 + t.integer "choice_random", :default => 0 end create_table "first_pages", :force => true do |t| @@ -1177,10 +1153,6 @@ ActiveRecord::Schema.define(:version => 20170207060207) do t.datetime "updated_at", :null => false end - create_table "innodb_monitor", :id => false, :force => true do |t| - t.integer "a" - end - create_table "invite_lists", :force => true do |t| t.integer "project_id" t.integer "user_id" diff --git a/lib/tasks/homework_evaluation.rake b/lib/tasks/homework_evaluation.rake index 3aba5235e..0525b6038 100644 --- a/lib/tasks/homework_evaluation.rake +++ b/lib/tasks/homework_evaluation.rake @@ -32,6 +32,10 @@ namespace :homework_evaluation do student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: pro_work.user_id, student_work_id: h.id) student_works_evaluation_distributions.save end + + #更新CourseHomeworkStatistics中该学生的待匿评数 + course_statistics = CourseHomeworkStatistics.find_by_course_id_and_user_id(homework_common.course_id, pro_work.user_id) + course_statistics.update_attribute('un_evaluation_work_num', course_statistics.un_evaluation_work_num + n) if course_statistics end else student_works.each_with_index do |work, index| @@ -43,6 +47,10 @@ namespace :homework_evaluation do student_works_evaluation_distributions = StudentWorksEvaluationDistribution.new(user_id: user.id, student_work_id: h.id) student_works_evaluation_distributions.save end + + #更新CourseHomeworkStatistics中该学生的待匿评数 + course_statistics = CourseHomeworkStatistics.find_by_course_id_and_user_id(homework_common.course_id, user.id) + course_statistics.update_attribute('un_evaluation_work_num', course_statistics.un_evaluation_work_num + n) if course_statistics end end homework_detail_manual.update_column('comment_status', 2) @@ -87,6 +95,11 @@ namespace :homework_evaluation do absence_penalty_count = student_work.user.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count - student_work.user.student_works_scores.where("student_work_id IN #{work_ids} and reviewer_role = 3").count student_work.absence_penalty = absence_penalty_count > 0 ? absence_penalty_count * homework_detail_manual.absence_penalty : 0 student_work.save + + #更新CourseHomeworkStatistics中该学生的待匿评数和缺评数 + course_statistics = CourseHomeworkStatistics.find_by_course_id_and_user_id(homework_common.course_id, student_work.user_id) + course_statistics.update_attribute('un_evaluation_work_num', (course_statistics.un_evaluation_work_num - absence_penalty_count) < 0 ? 0 : (course_statistics.un_evaluation_work_num - absence_penalty_count)) if course_statistics + course_statistics.update_attribute('absence_evaluation_work_num', course_statistics.absence_evaluation_work_num + absence_penalty_count) if course_statistics end # 未参与匿评 diff --git a/lib/tasks/homework_publishtime.rake b/lib/tasks/homework_publishtime.rake index 23aae2925..c3c75a147 100644 --- a/lib/tasks/homework_publishtime.rake +++ b/lib/tasks/homework_publishtime.rake @@ -26,6 +26,13 @@ namespace :homework_publishtime do ActiveRecord::Base.connection.execute sql end end + + #更新CourseHomeworkStatistics中每个学生的未交作品数 + homework.course.student.each do |student| + course_statistics = CourseHomeworkStatistics.find_by_course_id_and_user_id(homework.course_id, student.student_id) + course_statistics.update_attribute('un_commit_work_num', course_statistics.un_commit_work_num + 1) if course_statistics + end + course = homework.course course.members.each do |m| homework.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => nil) diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css index c6aa623dd..3c97ebc96 100644 --- a/public/stylesheets/css/courses.css +++ b/public/stylesheets/css/courses.css @@ -525,9 +525,11 @@ a.banner-course-notice {position: absolute; font-size: 12px; line-height: 20px; .game-setting-h3{ width: 100%; height: 40px; line-height: 40px; font-size: 14px; color: #666; font-weight: normal; background: #fff; border-bottom: 10px solid #eaebec;} .t-center{ text-align: center;} .table-td-w20{ width: 18%;} +.table-td-w9{ width: 9%;} .table-td-w10{ width: 10%;} +.table-td-w10-5{ width: 10.5%;} .table-td-w30{ width: 30%;} -.new_project_title_width {font-size: 14px;color: #666; max-width: 180px;font-weight: normal;white-space: nowrap;overflow: hidden; text-overflow: ellipsis;} +.new_project_title_width {font-size: 12px;color: #666; max-width: 170px;font-weight: normal;white-space: nowrap;overflow: hidden; text-overflow: ellipsis;} .syllabus_class_property { font-size: 12px; padding: 0 5px;border-radius: 3px;line-height: 14px;} .syllabus_class_private {color: #ff4a1b;border: 1px solid #ff4a1b;} .syllabus_class_open { color: #7dd26c; border: 1px solid #7dd26c;} diff --git a/spec/factories/course_homework_statistics.rb b/spec/factories/course_homework_statistics.rb new file mode 100644 index 000000000..9b22dd280 --- /dev/null +++ b/spec/factories/course_homework_statistics.rb @@ -0,0 +1,6 @@ +FactoryGirl.define do + factory :course_homework_statistic, :class => 'CourseHomeworkStatistics' do + + end + +end diff --git a/spec/models/course_homework_statistics_spec.rb b/spec/models/course_homework_statistics_spec.rb new file mode 100644 index 000000000..21388658c --- /dev/null +++ b/spec/models/course_homework_statistics_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe CourseHomeworkStatistics, :type => :model do + pending "add some examples to (or delete) #{__FILE__}" +end