Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/exercise_questions_controller.rb

@@ -347,36 +347,20 @@ class ExerciseQuestionsController < ApplicationController
 
         #当试卷已发布时（试卷的总状态),当标准答案修改时，如有已提交的学生，需重新计算分数.
 
-        # if @exercise.exercise_status == 2
-        #   ex_users_committed = @exercise.exercise_users.exercise_user_committed
-        #   if ex_users_committed.size > 0
-        #     ex_users_committed.each do |ex_user|
-        #       user = ex_user.user
-        #       objective_score = calculate_student_score(@exercise,user)[:total_score]
-        #       subjective_score = ex_user.subjective_score
-        #       total_score_subjective_score = subjective_score < 0.0 ? 0.0 : subjective_score
-        #       total_score = objective_score + total_score_subjective_score
-        #       ex_user.update_attributes(objective_score:objective_score,score:total_score)
-        #     end
-        #   end
-        # end
-        ex_users_committed = @exercise.exercise_users.exercise_user_committed
-        if ex_users_committed.size > 0
-          ex_users_committed.each do |ex_user|
-            user = ex_user.user
-            objective_score = calculate_student_score(@exercise,user)[:total_score]
-            subjective_score = ex_user.subjective_score
-            total_score_subjective_score = subjective_score < 0.0 ? 0.0 : subjective_score
-            total_score = objective_score + total_score_subjective_score
-            ex_user.update_attributes(objective_score:objective_score,score:total_score)
+        if @exercise.exercise_status == 2
+          ex_users_committed = @exercise.exercise_users.exercise_user_committed
+          if ex_users_committed.size > 0
+            ex_users_committed.each do |ex_user|
+              user = ex_user.user
+              objective_score = calculate_student_score(@exercise,user)[:total_score]
+              subjective_score = ex_user.subjective_score
+              total_score_subjective_score = subjective_score < 0.0 ? 0.0 : subjective_score
+              total_score = objective_score + total_score_subjective_score
+              ex_user.update_attributes(objective_score:objective_score,score:total_score)
+            end
           end
         end
-
-        if @exercise_question.save
-          normal_status(0,"试卷更新成功！")
-        else
-          normal_status(-1,"试卷更新失败！")
-        end
+        normal_status(0,"试卷更新成功！")
       rescue Exception => e
         uid_logger_error(e.message)
         tip_exception("页面调用失败！")

app/controllers/homework_commons_controller.rb

@@ -106,9 +106,11 @@ class HomeworkCommonsController < ApplicationController
 
     student_works = @homework.all_works
     @all_member_count = student_works.size
+    logger.info("##########__________@homework.publish_time______________#############{@homework.publish_time}")
     if @homework.publish_time.blank? || (@homework.publish_time > Time.now)
       @student_works = []
       if params[:format] == "xlsx" || params[:format] == "zip"
+        logger.info("##########__________params[:format]______________#############{params[:format]}")
         normal_status(-1,"作业未发布")
       end
     else

app/controllers/myshixuns_controller.rb

@@ -15,7 +15,6 @@ class MyshixunsController < ApplicationController
 
   # For Admin
   # 强制重置实训
-  # REDO等删除是否可以做成异步
   # 前段需要按照操作过程提示
   def reset_my_game
     unless current_user.admin?
@@ -275,7 +274,7 @@ class MyshixunsController < ApplicationController
                                             message: message,
                                             content: content,
                                             author_name: author_name,
-                                            author_email: "53246666@qq.com")
+                                            author_email: author_email)
         end
       end
 

app/helpers/exercises_helper.rb

@@ -382,6 +382,9 @@ module ExercisesHelper
               end
               answers_content.update_all(:score => q_score_1)
               score1 = score1 + q.question_score
+            else
+              answers_content.update_all(:score => -1.0)
+              score1 += 0.0
             end
           else
             score1 += 0.0
@@ -403,6 +406,9 @@ module ExercisesHelper
                 if i_standard_answer.include?(u.answer_text.downcase)  #该空的标准答案包含用户的答案才有分数
                   u.update_column('score',q_score_2)
                   score2 = score2 + q_score_2
+                else
+                  u.update_column('score',-1.0)
+                  score2 += 0.0
                 end
               end
             else
@@ -413,6 +419,9 @@ module ExercisesHelper
                   u.update_column("score",q_score_2)
                   score2 = score2 + q_score_2
                   st_answer_text.delete(u_answer_text)
+                else
+                  u.update_column('score',-1.0)
+                  score2 += 0.0
                 end
               end
             end