From c6b43be1a1686ffbba973401f56985f61f414384 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 8 Nov 2019 09:27:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=99=AE=E9=80=9A/=E5=88=86=E7=BB=84?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A/=E6=AF=95=E8=AE=BE=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=9A=84=E8=B0=83=E5=88=86=E5=BC=B9=E6=A1=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/graduation_works_controller.rb | 5 +++-- app/controllers/student_works_controller.rb | 7 +++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/graduation_works_controller.rb b/app/controllers/graduation_works_controller.rb index d50885313..67f21e85c 100644 --- a/app/controllers/graduation_works_controller.rb +++ b/app/controllers/graduation_works_controller.rb @@ -379,8 +379,9 @@ class GraduationWorksController < ApplicationController end def adjust_score - tip_exception("分数不能为空") if params[:score].blank? - tip_exception("分数不能超过0-100") if params[:score].to_f < 0 || params[:score].to_f > 100 + tip_exception("成绩不能为空") if params[:score].blank? + tip_exception("成绩不能小于零") if params[:score].to_f < 0 + tip_exception("成绩不能大于100") if params[:score].to_f.round(1) > 100 ActiveRecord::Base.transaction do begin # 分数不为空的历史评阅都置为失效 diff --git a/app/controllers/student_works_controller.rb b/app/controllers/student_works_controller.rb index c45bca268..de764992b 100644 --- a/app/controllers/student_works_controller.rb +++ b/app/controllers/student_works_controller.rb @@ -533,10 +533,9 @@ class StudentWorksController < ApplicationController # 作品调分 def adjust_score - tip_exception("分数不能为空") if params[:score].blank? - tip_exception("分数不能超过0-100") if @homework.homework_type != "practice" && (params[:score].to_f < 0 || params[:score].to_f.round(1) > 100.round(1)) - tip_exception("已提交的作品请去评阅页进行调分") if @homework.homework_type == "practice" && @work.work_status > 0 - tip_exception("分数不能超过总分值#{@homework.total_score}") if @homework.homework_type == "practice" && (params[:score].to_f < 0 || params[:score].to_f.round(1) > @homework.total_score.round(1)) + tip_exception("成绩不能为空") if params[:score].blank? + tip_exception("成绩不能小于零") if params[:score].to_f < 0 + tip_exception("成绩不能大于100") if params[:score].to_f.round(1) > 100 ActiveRecord::Base.transaction do begin # 分数不为空的历史评阅都置为失效 From 6f49104fe51bc3698f3a31b31467808dc5487c58 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 8 Nov 2019 09:42:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_commons_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb index 6d627df33..2b7b489f1 100644 --- a/app/controllers/homework_commons_controller.rb +++ b/app/controllers/homework_commons_controller.rb @@ -160,7 +160,7 @@ class HomeworkCommonsController < ApplicationController # 作品状态 0： 未提交， 1 按时提交， 2 延迟提交 if params[:work_status].present? - params_work_status = request.get? ? params[:work_status].split(",") : params[:work_status] + 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) @@ -171,7 +171,7 @@ class HomeworkCommonsController < ApplicationController # 分班情况 unless params[:course_group].blank? - group_ids = request.get? ? params[:course_group].split(",") : params[:course_group] + group_ids = params[:course_group] group_user_ids = @course.students.where(course_group_id: group_ids).pluck(:user_id) # 有分组只可能是老师身份查看列表 @student_works = @student_works.where(user_id: group_user_ids) From 68028156c9fbec2554a98e618ddcd1f5767b84a2 Mon Sep 17 00:00:00 2001 From: SylorHuang Date: Fri, 8 Nov 2019 09:59:13 +0800 Subject: [PATCH 3/3] graduation_tasks export xlsx add fileDownload --- app/controllers/graduation_tasks_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/graduation_tasks_controller.rb b/app/controllers/graduation_tasks_controller.rb index 864eac3f5..e8ad221be 100644 --- a/app/controllers/graduation_tasks_controller.rb +++ b/app/controllers/graduation_tasks_controller.rb @@ -149,6 +149,7 @@ class GraduationTasksController < ApplicationController else respond_to do |format| format.xlsx{ + set_export_cookies graduation_work_to_xlsx(@work_excel,@task,current_user) task_export_name_ = "#{current_user.real_name}_#{@course.name}_#{@task.name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}" render xlsx: "#{task_export_name_.strip}",template: "graduation_tasks/tasks_list.xlsx.axlsx",locals: {table_columns:@head_cells_column, task_users:@task_cells_column}