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

app/helpers/exercises_helper.rb

@@ -83,12 +83,13 @@ module ExercisesHelper
     @ex_sub_array = @ex_sub_array.sort_by {|k| k[:q_position]}
   end
 
-  #试卷的统计结果页面计算各题的
+  #试卷的统计结果页面计算各题的。选择题和判断题原来是按：已回答了本题的人数来计算的。现需要按已提交试卷的人数来计算。2019-8-23
   def exercise_commit_result(questions,user_ids)
     question_infos = []
-    # percent = 0.0
+    percent = 0.0
+    commit_user_ids = user_ids.size
     questions.includes(:exercise_choices).each do |ex|
-      ex_total_score = user_ids.count * ex&.question_score.to_f   #该试卷的已回答的总分
+      ex_total_score = commit_user_ids * ex&.question_score.to_f   #该试卷的已回答的总分
       # ex_answers = ex.exercise_answers
       if ex.question_type != Exercise::PRACTICAL
         ques_title = ex.question_title
@@ -104,41 +105,30 @@ module ExercisesHelper
 
       effictive_users_count = effictive_users.size #有效回答数，可能有重复的用户id，这里仅统计是否回答这个问题的全部人数
       #
-      # if ex.question_type > Exercise::COMPLETION  #当为主观题和实训题时，
-      #   ex_answered_scores = effictive_users.score_reviewed.pluck(:score).sum  #该问题的全部得分
-      #   percent = (ex_total_score == 0.0 ? 0.0 : (ex_answered_scores / ex_total_score.to_f).round(3) * 100)  #正确率
-      # end
-
-      #全部题型按已提交学生的分数来计算
-      ex_answered_scores = effictive_users.score_reviewed.pluck(:score).sum  #该问题的全部得分
-      percent = (ex_total_score == 0.0 ? 0.0 : (ex_answered_scores / ex_total_score.to_f).round(3) * 100)  #正确率
+      if ex.question_type > Exercise::COMPLETION  #当为主观题和实训题时，
+        ex_answered_scores = effictive_users.score_reviewed.pluck(:score).sum  #该问题的全部得分
+        percent = (ex_total_score == 0.0 ? 0.0 : (ex_answered_scores / ex_total_score.to_f).round(3) * 100)  #正确率
+      end
 
       question_answer_infos = []
       if ex.question_type <= Exercise::JUDGMENT  #选择题和判断题
         ex_choices = ex.exercise_choices
         standard_answer = ex.exercise_standard_answers.pluck(:exercise_choice_id).sort   #标准答案的位置
         # right_users_count = 0
-        #该问题的正确率
-        # if ex.question_type == Exercise::MULTIPLE  #多选题
-        #   right_user_ids = user_ids
-        #   standard_answer.each do |choice_position|
-        #     standard_answer_choice_id = ex_choices.select{|ec| ec.choice_position == choice_position}.first&.id
-        #     right_user_ids = right_user_ids & effictive_users.select{|answer| answer.exercise_choice_id == standard_answer_choice_id}.pluck(:user_id)
-        #   end
-        #   right_users_count = right_user_ids.size
-        #   # user_ids.each do |user_id|
-        #   #   ex_choice_ids = effictive_users.map{|e| e.exercise_choice_id if e.user_id == user_id}.reject(&:blank?).uniq
-        #   #   answer_choice_array = ex_choices.map{|a| a.choice_position if ex_choice_ids.include?(a.id)}.reject(&:blank?).uniq
-        #   #   if answer_choice_array.sort == standard_answer
-        #   #     right_users_count += 1
-        #   #   end
-        #   # end
-        # else  #单选题和判断题
-        #   standard_answer_choice_id = ex_choices.select{|ec| ec.choice_position == standard_answer.first}.first&.id
-        #   right_users_count = effictive_users.select{|answer| answer.exercise_choice_id == standard_answer_choice_id}.size
-        # end
-
-        # percent = effictive_users_count > 0 ? (right_users_count / effictive_users_count.to_f).round(3)*100 : 0.0
+        # 该问题的正确率
+        if ex.question_type == Exercise::MULTIPLE  #多选题
+          right_user_ids = user_ids
+          standard_answer.each do |choice_position|
+            standard_answer_choice_id = ex_choices.select{|ec| ec.choice_position == choice_position}.first&.id
+            right_user_ids = right_user_ids & effictive_users.select{|answer| answer.exercise_choice_id == standard_answer_choice_id}.pluck(:user_id)
+          end
+          right_users_count = right_user_ids.size
+        else  #单选题和判断题
+          standard_answer_choice_id = ex_choices.select{|ec| ec.choice_position == standard_answer.first}.first&.id
+          right_users_count = effictive_users.select{|answer| answer.exercise_choice_id == standard_answer_choice_id}.size
+        end
+
+        percent = commit_user_ids > 0 ? (right_users_count / commit_user_ids.to_f).round(3)*100 : 0.0
 
         #每个选项的正确率
         ex_choices.each do |c|
@@ -184,7 +174,8 @@ module ExercisesHelper
           all_user_count += user_count
           standard_answer_count += 1
         end
-        # percent = effictive_users_count > 0 ? (all_user_count / effictive_users_count.to_f).round(3)*100 : 0.0
+        percent = commit_user_ids > 0 ? (all_user_count / commit_user_ids.to_f).round(3)*100 : 0.0
+
         user_wrong_count = (effictive_users_count - all_user_count )
 
         if effictive_users_count > 0 && user_wrong_count >= 0

config/initializers/aliyun_vod_init.rb

@@ -10,6 +10,7 @@ rescue => ex
 
   puts %Q{\033[33m [warning] aliyun vod config or configuration.yml missing,
            please add it or execute 'cp config/configuration.yml.example config/configuration.yml' \033[0m}
+  aliyun_vod_config = {}
 end
 
 AliyunVod.access_key_id     = aliyun_vod_config['access_key_id']

db/migrate/20190823015610_add_message_count_for_boards.rb

@@ -0,0 +1,9 @@
+class AddMessageCountForBoards < ActiveRecord::Migration[5.2]
+  def change
+    boards = Board.where(:parent_id => 0)
+    Board.reset_column_information
+    boards.find_each do |board|
+      Board.reset_counters board.id, :messages
+    end
+  end
+end

db/migrate/20190823023738_change_exericse_1936_scores.rb

@@ -0,0 +1,18 @@
+class ChangeExericse1936Scores < ActiveRecord::Migration[5.2]
+  def change
+    #1936的试卷成绩有问题。
+    # #https://www.educoder.net/courses/2935/exercises/1936/users/pizfnr5ts
+    ex_special = Exercise.find_by_id(1936)
+    ex_special_users = ex_special.exercise_users.exercise_user_committed.where("end_at is not null and end_at > ?",Time.now - 2.months)
+    if ex_special.present? && ex_special_users.exists?
+      ex_special_users.each do |ex_user|
+        calculate_score = calculate_student_score(ex_special,ex_user.user)[:total_score]
+        subjective_score = ex_user.subjective_score
+        total_score_subjective_score = subjective_score < 0.0 ? 0.0 : subjective_score
+        total_score = calculate_score + total_score_subjective_score
+        ex_user.update_attributes(score:total_score,objective_score:calculate_score)
+        puts ex_user.id
+      end
+    end
+  end
+end