From b140f7ef4bc5ff6f2775744fa5c46ede778c3d74 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Wed, 18 Dec 2019 10:32:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E5=93=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E6=9C=80=E6=96=B0=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=85=B3=E5=8D=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/homework_commons/works_list.json.jbuilder | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/homework_commons/works_list.json.jbuilder b/app/views/homework_commons/works_list.json.jbuilder index fcc3e7a7c..58fbfa596 100644 --- a/app/views/homework_commons/works_list.json.jbuilder +++ b/app/views/homework_commons/works_list.json.jbuilder @@ -34,6 +34,7 @@ elsif @user_course_identity == Course::STUDENT if @homework.homework_type == "practice" json.(@work, :id, :update_time, :ultimate_score) + myshixun = @work.myshixun || @shixun.find_by(user_id: @work.user_id) 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,7 +42,7 @@ 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.current_complete_count @work.myshixun.try(:passed_count) if @homework.end_or_late + json.current_complete_count 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).to_i json.work_status @work.compelete_status @@ -90,6 +91,7 @@ if @homework.homework_type == "practice" json.student_works @student_works.each do |work| json.(work, :id, :update_time, :ultimate_score, :myshixun_id) + myshixun = work.myshixun || @shixun.find_by(user_id: @work.user_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) @@ -98,7 +100,7 @@ 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.current_complete_count work.myshixun.try(:passed_count) if @homework.end_or_late + json.current_complete_count 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).to_i json.user_login work.user.try(:login) From de8ad42308e118142eb5dfae2b4bfd4f845d7b83 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Wed, 18 Dec 2019 10:33:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E5=93=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E6=9C=80=E6=96=B0=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=85=B3=E5=8D=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/homework_commons/works_list.json.jbuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/homework_commons/works_list.json.jbuilder b/app/views/homework_commons/works_list.json.jbuilder index 58fbfa596..93c105d15 100644 --- a/app/views/homework_commons/works_list.json.jbuilder +++ b/app/views/homework_commons/works_list.json.jbuilder @@ -91,7 +91,7 @@ if @homework.homework_type == "practice" json.student_works @student_works.each do |work| json.(work, :id, :update_time, :ultimate_score, :myshixun_id) - myshixun = work.myshixun || @shixun.find_by(user_id: @work.user_id) + myshixun = work.myshixun || @shixun.find_by(user_id: work.user_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) From fc89a45835a21add585ff10c994abee4dd216d9a Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Wed, 18 Dec 2019 10:33:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E5=93=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E6=9C=80=E6=96=B0=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=85=B3=E5=8D=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/homework_commons/works_list.json.jbuilder | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/homework_commons/works_list.json.jbuilder b/app/views/homework_commons/works_list.json.jbuilder index 93c105d15..41518d66a 100644 --- a/app/views/homework_commons/works_list.json.jbuilder +++ b/app/views/homework_commons/works_list.json.jbuilder @@ -34,7 +34,7 @@ elsif @user_course_identity == Course::STUDENT if @homework.homework_type == "practice" json.(@work, :id, :update_time, :ultimate_score) - myshixun = @work.myshixun || @shixun.find_by(user_id: @work.user_id) + myshixun = @work.myshixun || @shixun.myshixuns.find_by(user_id: @work.user_id) 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) @@ -91,7 +91,7 @@ if @homework.homework_type == "practice" json.student_works @student_works.each do |work| json.(work, :id, :update_time, :ultimate_score, :myshixun_id) - myshixun = work.myshixun || @shixun.find_by(user_id: work.user_id) + myshixun = work.myshixun || @shixun.myshixuns.find_by(user_id: work.user_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)