Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/controllers/admins/shixun_settings_controller.rb

@@ -92,6 +92,6 @@ class Admins::ShixunSettingsController < Admins::BaseController
   end
 
   def setting_params
-    params.permit(:use_scope,:excute_time,:close,:status,:can_copy,:webssh,:hidden,:homepage_show,:task_pass,:code_hidden,:id,tag_repertoires:[])
+    params.permit(:use_scope,:excute_time,:close,:status,:can_copy,:webssh,:hidden,:homepage_show,:task_pass,:code_hidden,:page_no, :id,tag_repertoires:[])
   end
 end

app/controllers/exercises_controller.rb

@@ -1077,22 +1077,38 @@ class ExercisesController < ApplicationController
   def commit_exercise
     ActiveRecord::Base.transaction do
       begin
-        if @user_course_identity > Course::ASSISTANT_PROFESSOR   #为学生时
-          objective_score = calculate_student_score(@exercise,current_user)[:total_score]
-          subjective_score = @answer_committed_user.subjective_score
-          total_score_subjective_score = subjective_score < 0.0 ? 0.0 : subjective_score
-          total_score = objective_score + total_score_subjective_score
-          commit_option = {
+        can_commit_exercise = false
+        if (@user_course_identity > Course::ASSISTANT_PROFESSOR) && params[:commit_method].present?  #为学生时
+          if params[:commit_method].to_i == 2   #自动提交时
+            user_left_time = get_exercise_left_time(@exercise,current_user)
+            if user_left_time.to_i <= 0
+              can_commit_exercise = true
+            end
+          else
+            can_commit_exercise = true
+          end
+          if can_commit_exercise
+            objective_score = calculate_student_score(@exercise,current_user)[:total_score]
+            subjective_score = @answer_committed_user.subjective_score
+            total_score_subjective_score = subjective_score < 0.0 ? 0.0 : subjective_score
+            total_score = objective_score + total_score_subjective_score
+            commit_option = {
               :status => 1,
               :commit_status => 1,
               :end_at => Time.now,
               :objective_score => objective_score,
               :score => total_score,
-              :subjective_score => subjective_score
-          }
-          @answer_committed_user.update_attributes(commit_option)
-          CommitExercsieNotifyJobJob.perform_later(@exercise.id, current_user.id)
-          normal_status(0,"试卷提交成功！")
+              :subjective_score => subjective_score,
+              :commit_method => @answer_committed_user&.commit_method.to_i > 0 ? @answer_committed_user&.commit_method.to_i : params[:commit_method].to_i
+            }
+            @answer_committed_user.update_attributes(commit_option)
+            CommitExercsieNotifyJobJob.perform_later(@exercise.id, current_user.id)
+            normal_status(0,"试卷提交成功！")
+          else
+            normal_status(-1,"提交失败，请重试!")
+          end
+        else
+          normal_status(-1,"提交失败，请重试!")
         end
       rescue Exception => e
         uid_logger_error(e.message)

app/jobs/end_exercise_calculate_job.rb

@@ -19,7 +19,8 @@ class EndExerciseCalculateJob < ApplicationJob
           :end_at => Time.now,
           :objective_score => objective_score,
           :score => total_score,
-          :subjective_score => user_sub_score
+          :subjective_score => user_sub_score,
+          :commit_method => user&.commit_method.to_i > 0 ? user&.commit_method.to_i : 4
         }
         user.update_attributes(commit_option)
       end

app/models/exercise_user.rb

@@ -1,4 +1,5 @@
 class ExerciseUser < ApplicationRecord
+  # commit_method 0 为默认， 1为学生的手动提交，2为倒计时结束后自动提交，3为试卷定时截止的自动提交, 4为教师手动的立即截止
   belongs_to :user
   belongs_to :exercise
 

app/models/shixun.rb

@@ -1,5 +1,6 @@
 class Shixun < ApplicationRecord
   include Searchable::Shixun
+  attr_accessor :page_no  #管理员页面 实训配置更新状态时，需要接受page_no参数
 
   # status: 0：编辑   1：申请发布   2：正式发布  3：关闭  -1：软删除
   # hide_code： 隐藏代码窗口

app/tasks/exercise_publish_task.rb

@@ -66,7 +66,8 @@ class ExercisePublishTask
                 :end_at => Time.now,
                 :objective_score => s_score,
                 :score => total_score,
-                :subjective_score => subjective_score
+                :subjective_score => subjective_score,
+                :commit_method => exercise_user&.commit_method.to_i > 0 ? exercise_user&.commit_method.to_i : 3
             }
             exercise_user.update_attributes(commit_option)
           end
@@ -108,7 +109,8 @@ class ExercisePublishTask
                 :end_at => Time.now,
                 :objective_score => s_score,
                 :score => total_score,
-                :subjective_score => subjective_score
+                :subjective_score => subjective_score,
+                :commit_method => exercise_user&.commit_method.to_i > 0 ? exercise_user&.commit_method.to_i : 3
             }
             exercise_user.update_attributes(commit_option)
           end

app/views/exercises/_exercise_user.json.jbuilder

@@ -8,6 +8,7 @@ json.user_group_name ex_user_info[:user_group_name]
 json.student_id ex_user_info[:student_id]
 json.commit_status ex_user_info[:commit_status]
 json.end_at ex_user_info[:end_at]
+json.commit_method exercise_user&.commit_method.to_i
 if subjective_type == 1
   json.objective_score ex_user_info[:ex_object_score]
   json.subjective_score ex_user_info[:ex_subject_score]

app/views/exercises/_user_exercise_info.json.jbuilder

@@ -9,6 +9,7 @@ json.exercise_answer_user do
   json.user_id ex_answerer.id
   json.login ex_answerer.login
   if exercise_user.present?
+    json.commit_method exercise_user&.commit_method.to_i
     json.start_at exercise_user.start_at
     json.score exercise_user.score.present? ? exercise_user.score.round(1).to_s : "0.0"
   end

db/migrate/20191011030441_add_commit_method_to_exercise_user.rb

@@ -0,0 +1,5 @@
+class AddCommitMethodToExerciseUser < ActiveRecord::Migration[5.2]
+  def change
+    add_column :exercise_users, :commit_method, :integer, :default => 0
+  end
+end