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

app/helpers/application_helper.rb

@@ -128,7 +128,7 @@ module ApplicationHelper
       if source.class.to_s == 'User'
         File.join(relative_path, ["#{source.class}", "#{source.id}"])
       else
-        File.join("/images/avatars", ["#{source.class}", "#{source.id}"])
+        File.join("images/avatars", ["#{source.class}", "#{source.id}"])
       end
     elsif source.class.to_s == 'User'
       str = source.user_extension.try(:gender).to_i == 0 ? "b" : "g"
@@ -146,7 +146,7 @@ module ApplicationHelper
 
   def shixun_url_to_avatar(shixun)
     if File.exist?(disk_filename(shixun.class, shixun.id))
-      File.join("/images/#{relative_path}", "#{shixun.class}", "#{shixun.id}")
+      File.join("images/#{relative_path}", "#{shixun.class}", "#{shixun.id}")
     else
       File.join("educoder", "index", "shixun", "shixun#{rand(23)}.jpg")
     end

app/helpers/exercises_helper.rb

@@ -355,9 +355,9 @@ module ExercisesHelper
     exercise_questions = exercise.exercise_questions.includes(:exercise_answers,:exercise_shixun_answers,:exercise_standard_answers,:exercise_shixun_challenges)
     exercise_questions.each do |q|
       if q.question_type != 5
-        answers_content = q.exercise_answers.search_answer_users("user_id",user.id)  #学生的答案
+        answers_content = q.exercise_answers.where(user_id: user.id)  #学生的答案
       else
-        answers_content = q.exercise_shixun_answers.search_shixun_answers("user_id",user.id)  #学生的答案
+        answers_content = q.exercise_shixun_answers.where(user_id: user.id)  #学生的答案
       end
       if q.question_type <= 2  #为选择题或判断题时
         if answers_content.present?   #学生有回答时
@@ -369,7 +369,7 @@ module ExercisesHelper
           standard_answer = q.exercise_standard_answers.pluck(:exercise_choice_id).sort  #该问题的标准答案，可能有多个
           if user_answer_content == standard_answer  #答案一致,多选或单选才给分，答案不对不给分
             if standard_answer.count > 0
-              q_score_1 = (q.question_score / standard_answer.count)   #当多选答案正确时，每个answer的分数均摊。
+              q_score_1 = (q.question_score.to_f / standard_answer.count)   #当多选答案正确时，每个answer的分数均摊。
             else
               q_score_1 = 0.0
             end
@@ -424,7 +424,7 @@ module ExercisesHelper
             end
             ex_shixun_answer_content = answers_content&.where(exercise_shixun_challenge_id: exercise_cha.id)
             if ex_shixun_answer_content.blank?  #把关卡的答案存入试卷的实训里
-              cha_path = challenge_path exercise_cha.challenge&.path
+              cha_path = challenge_path(exercise_cha.challenge&.path)
               game_challenge = game.game_codes.search_challenge_path(cha_path)&.first
               if game_challenge.present?
                 game_code = game_challenge
@@ -461,13 +461,13 @@ module ExercisesHelper
           "q_type":q.question_type,
           "q_position":q.question_number, #该问题的位置
           "stand_status":stand_answer,  #该问题是否正确,1为正确，0为错误
-          "user_score":user_scores  #每个问题的总得分
+          "user_score":user_scores.round(1)  #每个问题的总得分
       }
       ques_stand.push(ques_option)
     end
     total_score = score1 + score2 + score5
     {
-        "total_score":total_score,
+        "total_score":total_score.round(1),
         "stand_status":ques_stand
     }
   end
@@ -687,7 +687,7 @@ module ExercisesHelper
       exercise_user = exercise.exercise_users.find_by(user_id:user.id)
       time_mill = ex_time * 60   #转为秒
       exercise_end_time = exercise.end_time.present? ? exercise.end_time.to_i : 0
-      exercise_user_start = exercise_user.present? ? exercise_user.start_at.to_i : 0
+      exercise_user_start = exercise_user&.start_at.present? ? exercise_user.start_at.to_i : 0
       #用户未开始答题时，即exercise_user_start为0
       if exercise_user_start == 0
         if (exercise_end_time - time_now_i) > time_mill

app/helpers/export_helper.rb

@@ -89,11 +89,12 @@ module ExportHelper
         if teacher_comments.present?
           w_18 = ""
           teacher_comments.each do |t|
-            user_name = t.user.real_name
+            user_name = t.user&.real_name
             user_time = format_time(t.updated_at)
-            user_score = t.score
-            user_comment = t.comment
-            w_18 = w_18 + ("教师:" + user_name + "\n" + "时间:" + user_time.to_s + "\n" + "分数:" + user_score.to_s + "分" + "\n" + "评语:" + user_comment + "\n\n")
+            user_score = t&.score
+            user_comment = t.comment.present? ? t.comment : "--"
+            comment_title = "教师:#{user_name}\n时间:#{user_time.to_s}\n分数:#{user_score.to_s}分\n评语:#{user_comment}\n\n"
+            w_18 = w_18 + comment_title
           end
         else
           w_18 = "--"
@@ -160,11 +161,13 @@ module ExportHelper
         if teacher_comments.present?
           w_18 = ""
           teacher_comments.each do |t|
-            user_name = t.user.real_name
+            user_name = t.user&.real_name
             user_time = format_time(t.updated_at)
-            user_score = t.score
-            user_comment = t.comment
-            w_18 = w_18 + ("教师:" + user_name + "\n" + "时间:" + user_time.to_s + "\n" + "分数:" + user_score.to_s + "分" + "\n" + "评语:" + user_comment + "\n\n")
+            user_score = t&.score
+            user_comment = t.comment.present? ? t.comment : "--"
+            comment_title = "教师:#{user_name}\n时间:#{user_time.to_s}\n分数:#{user_score.to_s}分\n评语:#{user_comment}\n\n"
+            # ("教师:" + user_name + "\n" + "时间:" + user_time.to_s + "\n" + "分数:" + user_score.to_s + "分" + "\n" + "评语:" + user_comment + "\n\n")
+            w_18 = w_18 + comment_title
           end
         else
           w_18 = "--"

app/services/homeworks_service.rb

@@ -111,7 +111,7 @@ class HomeworksService
         if homework.work_efficiency
           if homework.max_efficiency < student_work.efficiency
             # homework.max_efficiency = student_work.efficiency
-            homework.update_column("max_efficiency", homework.max_efficiency)
+            homework.update_column("max_efficiency", student_work.efficiency)
           end
           # eff_score = homework.max_efficiency == 0 ? 0 : student_work.efficiency / homework.max_efficiency * homework.eff_score
           # student_work.eff_score = format("%.2f", eff_score)
@@ -200,7 +200,7 @@ class HomeworksService
 
               # 如果作业的最大效率值有变更则更新所有作品的效率分
               if homework.work_efficiency && homework.max_efficiency < work.efficiency
-                homework.update_column("max_efficiency", homework.max_efficiency)
+                homework.update_column("max_efficiency", work.efficiency)
               end
             end
 

app/views/exercises/index.json.jbuilder

@@ -23,7 +23,8 @@ if @exercises_count > 0
       ex_index = exercise_index_show(exercise,@course,@is_teacher_or,@current_user_)
       json.extract! exercise, :id, :exercise_name,:is_public,:created_at
       if @is_teacher_or == 2
-        json.time get_exercise_left_time(exercise,@current_user_)
+        second_left = get_exercise_left_time(exercise,@current_user_)
+        json.time second_left.present? ? (second_left / 60) : nil
       end
 
       json.exercise_status ex_index[:ex_status]

app/views/student_works/shixun_work.json.jbuilder

@@ -15,6 +15,7 @@ json.efficiency number_with_precision @work.efficiency, precision: 2
 json.max_efficiency number_with_precision @homework.max_efficiency, precision: 2
 json.passed_time @myshixun.passed_time
 json.total_spend_time @myshixun.total_spend_time
+json.user_score @myshixun.total_score
 
 # 关卡完成情况
 index = 1