Merge branch 'dev_cxt2' into dev_aliyun

app/controllers/exercise_answers_controller.rb

@@ -107,7 +107,7 @@ class ExerciseAnswersController < ApplicationController
       normal_status(-1,"已提交/已结束的试卷不允许修改！")
     else
       if (@exercise_user_status == Exercise::DEADLINE && @exercise_user.commit_status == 0) || (@exercise.time > 0 && @exercise_user.start_at.present? && ((@exercise_user.start_at + @exercise.time.to_i.minutes) < Time.now))
-        objective_score = calculate_student_score(@exercise,current_user)[:total_score]
+        objective_score = calculate_student_score(@exercise,current_user,Time.now)[:total_score]
         subjective_score = @exercise_user.subjective_score < 0.0 ? 0.0 : @exercise_user.subjective_score
         total_score = objective_score + subjective_score
         commit_option = {

app/controllers/exercises_controller.rb

@@ -886,7 +886,7 @@ class ExercisesController < ApplicationController
 
             ex_user_ids = exercise_users.pluck(:id)
 
-            EndExerciseCalculateJob.perform_later(ex_user_ids,exercise)
+            EndExerciseCalculateJob.perform_later(ex_user_ids,exercise,Time.now)
             # exercise_users.each do |user|
             #   if user.commit_status == 0 && user.start_at.present?
             #     objective_score = calculate_student_score(exercise,user.user)[:total_score]
@@ -1019,7 +1019,6 @@ class ExercisesController < ApplicationController
 
   #学生开始答题页面
   def start_answer
-    ActiveRecord::Base.transaction do
     begin
       ex_users_current = ExerciseUser.where(user_id:@exercise_current_user_id,exercise_id:@exercise.id)   #不能用@exercise.exercise_users，因为exercise_users删除时，只是状态改变，未删除
       @exercise_user_current = ex_users_current&.first
@@ -1073,7 +1072,6 @@ class ExercisesController < ApplicationController
       raise ActiveRecord::Rollback
     end
   end
-  end
 
   #提交试卷前的弹窗
   def begin_commit
@@ -1125,6 +1123,7 @@ class ExercisesController < ApplicationController
 
   # 学生提交试卷
   def commit_exercise
+    tip_exception(-1, "试卷已提交") if @answer_committed_user.commit_status == 1
     ActiveRecord::Base.transaction do
       begin
         can_commit_exercise = false
@@ -1140,7 +1139,7 @@ class ExercisesController < ApplicationController
             can_commit_exercise = true
           end
           if can_commit_exercise
-            objective_score = calculate_student_score(@exercise,current_user)[:total_score]
+            objective_score = calculate_student_score(@exercise,current_user,Time.now)[: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
@@ -1204,7 +1203,6 @@ class ExercisesController < ApplicationController
 
   #答题列表
   def exercise_lists
-    ActiveRecord::Base.transaction do
       begin
         @current_user_id = current_user.id
         exercise_ids = [@exercise.id]
@@ -1354,7 +1352,6 @@ class ExercisesController < ApplicationController
       raise ActiveRecord::Rollback
     end
   end
-  end
 
   #导出空白试卷
   def export_exercise
@@ -1391,7 +1388,6 @@ class ExercisesController < ApplicationController
 
   #学生的统计结果
   def exercise_result
-    ActiveRecord::Base.transaction do
     begin
       exercise_ids = [@exercise.id]
       @exercise_publish_count = get_user_permission_course(exercise_ids,Exercise::PUBLISHED).size #判断是否有已发布的分班
@@ -1487,7 +1483,6 @@ class ExercisesController < ApplicationController
       raise ActiveRecord::Rollback
     end
   end
-  end
 
   private
 

app/helpers/exercises_helper.rb

@@ -412,12 +412,13 @@ module ExercisesHelper
   end
 
   #计算试卷的总分和试卷的答题状态
-  def calculate_student_score(exercise,user)
+  def calculate_student_score(exercise,user,end_time)
     score1 = 0.0 #选择题/判断题
     score2 = 0.0 #填空题
     score5 = 0.0  #实训题
     ques_stand = []  #问题是否正确
-    exercise_questions = exercise.exercise_questions.includes(:exercise_answers,:exercise_shixun_answers,:exercise_standard_answers,:exercise_shixun_challenges)
+    exercise_end_time = end_time || Time.now
+    exercise_questions = exercise.exercise_questions.includes(:exercise_standard_answers,:exercise_shixun_challenges)
     exercise_questions&.each do |q|
       begin
         if q.question_type != 5
@@ -505,7 +506,7 @@ module ExercisesHelper
                 exercise_cha_score = 0.0
                 answer_status = 0
                 # if game.status == 2 && game.final_score >= 0
-                if game.final_score > 0
+                if game.final_score > 0 && game.end_time && game.end_time < exercise_end_time
                   exercise_cha_score = game.real_score(exercise_cha.question_score)
                   # exercise_cha_score = exercise_cha.question_score #每一关卡的得分
                   answer_status = 1

app/jobs/end_exercise_calculate_job.rb

@@ -5,11 +5,11 @@ class EndExerciseCalculateJob < ApplicationJob
 
   queue_as :default
 
-  def perform(ex_user_ids,exercise)
+  def perform(ex_user_ids,exercise,end_time)
     exercise_users = ExerciseUser.where(id: ex_user_ids)
     exercise_users.each do |user|
       if user.commit_status == 0 && user.start_at.present?
-        objective_score = calculate_student_score(exercise,user.user)[:total_score]
+        objective_score = calculate_student_score(exercise,user.user,end_time)[:total_score]
         user_sub_score = user.subjective_score
         subjective_score = user_sub_score < 0.0 ? 0.0 : user_sub_score
         total_score = objective_score + subjective_score

app/models/course.rb

@@ -376,7 +376,7 @@ class Course < ApplicationRecord
     case type
     when 'activity'        then '动态'
     when 'announcement'    then '公告栏'
-    when 'online_learning' then '在线学习'
+    when 'online_learning' then '课程学习'
     when 'shixun_homework' then '实训作业'
     when 'common_homework' then '普通作业'
     when 'group_homework'  then '分组作业'

app/models/exercise.rb

@@ -70,7 +70,7 @@ class Exercise < ApplicationRecord
     if unified_setting
       self&.end_time
     else
-      user_course_group = course.course_members.find_by(user_id: user_id)&.course_group_id
+      user_course_group = course.students.find_by(user_id: user_id)&.course_group_id
       exercise_group_settings.find_by(course_group_id:user_course_group)&.end_time
     end
   end

app/tasks/exercise_publish_task.rb

@@ -41,20 +41,21 @@ class ExercisePublishTask
     puts "--------------------------------exercise_publish end"
   end
 
+
   def end
     Rails.logger.info("log--------------------------------exercise_end start")
     puts "--------------------------------exercise_end start"
     # 1。统一设置的试卷
-    exercises = Exercise.includes(:exercise_users,:exercise_questions).where("exercise_status = 2 AND
-                                                               unified_setting = true AND end_time <= ?",Time.now + 900)
-    exercises&.each do |exercise|
+    exercises = Exercise.includes(:exercise_questions).where("exercise_status = 2 AND end_time <= ?",Time.now + 900)
+    exercises.each do |exercise|
+      Rails.logger.info("end_exercise_id: #{exercise.id}")
+      exercise.update_attributes!('exercise_status', 3)
+      if exercise.unified_setting
         ex_type = exercise.exercise_questions.pluck(:question_type).uniq
-      exercise.update_column('exercise_status', 3)
-      exercise.exercise_users&.each do |exercise_user|
+        exercise.exercise_users.where("commit_status = 0 and start_at is not null").each do |exercise_user|
           begin
             Rails.logger.info("true: user_id:#{exercise_user.user_id}--commit_status:#{exercise_user.commit_status}")
-          if (exercise_user&.commit_status == 0) && (exercise_user&.start_at.present?)
-            s_score = calculate_student_score(exercise, exercise_user.user)[:total_score]
+            s_score = calculate_student_score(exercise, exercise_user.user, exercise.end_time)[:total_score]
             if ex_type.include?(4)   #是否包含主观题
               subjective_score = exercise_user.subjective_score
             else
@@ -68,45 +69,37 @@ class ExercisePublishTask
             commit_option = {
               :status => 1,
               :commit_status => 1,
-                :end_at => Time.now,
+              :end_at => exercise.end_time,
               :objective_score => s_score,
               :score => total_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
           rescue Exception => e
             Rails.logger.info("rescue errors ___________________________#{e}")
             next
           end
-
+        end
       end
     end
 
-    # 2.非统一的试卷
-    all_exercises = Exercise.includes(:exercise_group_settings,:exercise_users,:exercise_questions).where("unified_setting = false AND exercise_status = 2 AND end_time > ?",Time.now + 900)
-    exercise_ids = all_exercises.blank? ? "(-1)" : "(" + all_exercises.map(&:id).join(",") + ")"
-    ex_group_settings = ExerciseGroupSetting.where("end_time <= '#{Time.now}' and exercise_id in #{exercise_ids}")
-    ex_group_settings&.each do |exercise_setting|
+    ExerciseGroupSetting.where("end_time < ? and end_time > ?", Time.now + 900, Time.now - 900).each do |exercise_setting|
       exercise = exercise_setting.exercise
-      if exercise.end_time <= Time.now
-        exercise.update_column('exercise_status', 3)
-      end
+      Rails.logger.info("exercise_group_setting: exercise_id:#{exercise.id}--group_settings_id:#{exercise_setting.id}")
 
+      users = exercise.course.course_members.where(:course_group_id => exercise_setting.course_group_id)
+      exercise_users = exercise.exercise_users.where(user_id: users.pluck(:user_id)).where("commit_status = 0 and start_at is not null")
       ex_types = exercise.exercise_questions.pluck(:question_type).uniq
-      users = exercise.course.students.where(:course_group_id => exercise_setting.course_group_id)
-      exercise_users = exercise.exercise_users.where(:user_id => users.pluck(:user_id))
-      exercise_users&.each do |exercise_user|
-        begin
+      exercise_users.each do |exercise_user|
         Rails.logger.info("false: user_id:#{exercise_user.user_id}--commit_status:#{exercise_user.commit_status}")
-          if exercise_user.commit_status == 0 && !exercise_user.start_at.nil?
+        begin
           if ex_types.include?(4)   #是否包含主观题
             subjective_score = exercise_user.subjective_score
           else
             subjective_score = -1.0
           end
-            s_score = calculate_student_score(exercise, exercise_user.user)[:total_score]
+          s_score = calculate_student_score(exercise, exercise_user.user, exercise_setting.end_time)[:total_score]
           total_score_subjective_score = subjective_score < 0.0 ? 0.0 : subjective_score
           total_score = s_score + total_score_subjective_score
           Rails.logger.info("false: user_id:#{exercise_user.user_id}--s_score:#{s_score}")
@@ -115,23 +108,20 @@ class ExercisePublishTask
           commit_option = {
             :status => 1,
             :commit_status => 1,
-                :end_at => Time.now,
+            :end_at => exercise_setting.end_time,
             :objective_score => s_score,
             :score => total_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
         rescue Exception => e
           Rails.logger.info("unified_setting_false_rescue errors ___________________________#{e}")
           next
         end
-
       end
     end
     Rails.logger.info("log--------------------------------exercise_end end")
     puts "--------------------------------exercise_end end"
   end
-
 end

lib/tasks/poll_publish.rake

@@ -110,7 +110,7 @@ namespace :poll_publish do
     #   # end
     # end
 
-    PollGroupSetting.where("end_time < ? and end_time > ?", Time.now + 1800, Time.now - 1800).each do |poll_setting|
+    PollGroupSetting.where("end_time < ? and end_time > ?", Time.now + 900, Time.now - 900).each do |poll_setting|
       poll = poll_setting.poll
       # poll.update_column('polls_status',3)