From 02f60c83a97f67335fac230f26d2f1d3dc5fa9b3 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 13 Dec 2019 18:57:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A=E7=9A=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../homework_commons_controller.rb | 5 +++-- app/helpers/homework_commons_helper.rb | 12 ++++++++--- app/models/myshixun.rb | 5 +++++ app/models/student_work.rb | 20 +++++++++++++++++++ .../homework_commons/works_list.json.jbuilder | 12 +++++++---- ...3_migrate_student_work_compelete_status.rb | 5 +++++ 6 files changed, 50 insertions(+), 9 deletions(-) create mode 100644 db/migrate/20191213101853_migrate_student_work_compelete_status.rb diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb index e11fefea1..66a01ea6e 100644 --- a/app/controllers/homework_commons_controller.rb +++ b/app/controllers/homework_commons_controller.rb @@ -78,7 +78,7 @@ class HomeworkCommonsController < ApplicationController when '4' sql_str = %Q((homework_detail_manuals.comment_status = #{order} and homework_detail_manuals.appeal_time > '#{Time.now}')) when '5' - sql_str = %Q((homework_detail_manuals.comment_status = #{order} or (anonymous_comment = 0 and homework_commons.end_time <= '#{Time.now}'))) + sql_str = %Q((homework_detail_manuals.comment_status = #{order} or (anonymous_comment = 0 and ((allow_late= 0 and homework_commons.end_time <= '#{Time.now}') or (allow_late= 1 and late_time <= '#{Time.now}'))))) else sql_str = %Q(homework_detail_manuals.comment_status = #{order}) end @@ -168,7 +168,8 @@ class HomeworkCommonsController < ApplicationController params_work_status = params[:work_status] work_status = params_work_status.map{|status| status.to_i} all_student_works = @student_works.left_joins(:myshixun) - @student_works = all_student_works.where(work_status: work_status) + @student_works = all_student_works.where(work_status: work_status) if work_status.include?(0) + @student_works = @student_works.or(all_student_works.where(work_status: 0)).or(all_student_works.where(myshixuns: {status: 0})) if work_status.include?(1) @student_works = @student_works.or(all_student_works.where(work_status: 0)).or(all_student_works.where(myshixuns: {status: 0})) if work_status.include?(3) @student_works = @student_works.or(all_student_works.where(myshixuns: {status: 1})) if work_status.include?(4) diff --git a/app/helpers/homework_commons_helper.rb b/app/helpers/homework_commons_helper.rb index 7a474526c..7ad55e2ae 100644 --- a/app/helpers/homework_commons_helper.rb +++ b/app/helpers/homework_commons_helper.rb @@ -34,6 +34,12 @@ module HomeworkCommonsHelper # 作业状态大于“提交”状态时，不用考虑分班权限 if ho_detail_manual.comment_status > 1 case ho_detail_manual.comment_status + when 2 + unless homework_common.allow_late + status << "已截止" + time = course.end_date.present? ? ("评阅剩余时间：" + how_much_time(course.end_date.end_of_day)) : "" + time_status = 5 + end when 3 if ho_detail_manual.evaluation_end && ho_detail_manual.evaluation_end > Time.now status << "匿评中" @@ -46,8 +52,8 @@ module HomeworkCommonsHelper time = "申诉剩余时间：" + how_much_time(ho_detail_manual.appeal_time) time_status = 4 end - when 2, 5, 6 - status << "评阅中" + when 5, 6 + status << "已截止" time = course.end_date.present? ? ("评阅剩余时间：" + how_much_time(course.end_date.end_of_day)) : "" time_status = 5 end @@ -77,12 +83,12 @@ module HomeworkCommonsHelper time = "提交剩余时间：" + how_much_time(homework_common.end_time) time_status = 1 elsif homework_common.end_time && homework_common.end_time < Time.now - time_status = 5 if homework_common.allow_late && (homework_common.late_time.nil? || homework_common.late_time >= Time.now) time = "补交剩余时间：" + how_much_time(homework_common.late_time) time_status = 2 else status << "已截止" + time_status = 5 end end end diff --git a/app/models/myshixun.rb b/app/models/myshixun.rb index 9b824c0d8..d510d880a 100644 --- a/app/models/myshixun.rb +++ b/app/models/myshixun.rb @@ -83,6 +83,11 @@ class Myshixun < ApplicationRecord self.games.select{|game| game.status == 2}.size end + # 指定时间前完成的关卡数 + def time_passed_count time + time.present? ? self.games.select{|game| game.status == 2 && game.end_time < time}.size : 0 + end + # 查看答案的关卡数，只统计通关前看的关卡 def view_answer_count answer_ids = user.grades.joins("join games on grades.container_id = games.id").where("container_type = 'Answer' and games.status=2 and games.end_time > grades.created_at").pluck(:container_id) diff --git a/app/models/student_work.rb b/app/models/student_work.rb index d4f372823..4da23a30f 100644 --- a/app/models/student_work.rb +++ b/app/models/student_work.rb @@ -123,6 +123,26 @@ class StudentWork < ApplicationRecord end end + # 实训作业的作品状态 0：未提交，1：未通关，2：按时通关(提交截止前通关)，3：迟交通关（提交截止-补交截止间通关） + def real_work_status + status = work_status + if status > 0 && myshixun + if myshixun.status != 1 + status = 1 + else + homework_end_time = homework_common.homework_group_setting(user_id)&.end_time + if homework_end_time.present? && homework_end_time > myshixun.passed_time + status = 2 + elsif homework_end_time.present? && homework_common.allow_late && homework_common.late_time > myshixun.passed_time + status = 3 + else + status = 1 + end + end + end + status + end + # 更新作品成绩 def set_work_score if work_status > 0 && homework_common && !self.ultimate_score diff --git a/app/views/homework_commons/works_list.json.jbuilder b/app/views/homework_commons/works_list.json.jbuilder index 34123e829..b0007954f 100644 --- a/app/views/homework_commons/works_list.json.jbuilder +++ b/app/views/homework_commons/works_list.json.jbuilder @@ -33,7 +33,7 @@ elsif @user_course_identity == Course::STUDENT json.left_time left_time @homework, @current_user.id if @homework.homework_type == "practice" - json.(@work, :id, :work_status, :update_time, :ultimate_score) + json.(@work, :id, :update_time, :ultimate_score) json.calculation_time @work.calculation_time json.late_penalty @work.late_penalty if @homework.allow_late json.cost_time @work.myshixun.try(:total_spend_time) @@ -41,8 +41,10 @@ elsif @user_course_identity == Course::STUDENT json.final_score work_score_format(@work.final_score, true, @score_open) json.efficiency work_score_format(@work.efficiency, true, @score_open) json.eff_score work_score_format(@work.eff_score, true, @score_open) - json.complete_count @work.myshixun.try(:passed_count) + json.current_complete_count @work.myshixun.try(:passed_count) if @homework.end_or_late + json.complete_count @work.myshixun&.time_passed_count(@homework.homework_group_setting(@work.user_id)&.end_time) json.view_answer_count @work.myshixun.try(:view_answer_count) + json.work_status @work.real_work_status else json.(@work, :id, :work_status, :update_time, :ultimate_score) @@ -87,7 +89,7 @@ if @homework.homework_type == "practice" json.work_efficiency @homework.work_efficiency json.student_works @student_works.each do |work| - json.(work, :id, :work_status, :update_time, :ultimate_score, :myshixun_id) + json.(work, :id, :update_time, :ultimate_score, :myshixun_id) json.late_penalty work.late_penalty if @homework.allow_late json.work_score work_score_format(work.work_score, @current_user == work.user, @score_open) @@ -96,12 +98,14 @@ if @homework.homework_type == "practice" json.eff_score work_score_format(work.eff_score, @current_user == work.user, @score_open) json.cost_time work.myshixun.try(:total_spend_time) - json.complete_count work.myshixun.try(:passed_count) + json.current_complete_count work.myshixun.try(:passed_count) if @homework.end_or_late + json.complete_count work.myshixun&.time_passed_count(@homework.homework_group_setting(work.user_id)&.end_time) json.view_answer_count work.myshixun.try(:view_answer_count) json.user_login work.user.try(:login) json.user_name work.user.try(:real_name) json.student_id work.user.try(:student_id) json.group_name @students.select{|student| student.user_id == work.user_id}.first.try(:course_group_name) + json.work_status work.real_work_status end elsif @homework.homework_type == "group" || @homework.homework_type == "normal" json.anonymous_comment @homework.anonymous_comment diff --git a/db/migrate/20191213101853_migrate_student_work_compelete_status.rb b/db/migrate/20191213101853_migrate_student_work_compelete_status.rb new file mode 100644 index 000000000..865114914 --- /dev/null +++ b/db/migrate/20191213101853_migrate_student_work_compelete_status.rb @@ -0,0 +1,5 @@ +class MigrateStudentWorkCompeleteStatus < ActiveRecord::Migration[5.2] + def change + + end +end