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

app/controllers/application_controller.rb

@@ -23,7 +23,7 @@ class ApplicationController < ActionController::Base
 
 	# 所有请求必须合法签名
 	def check_sign
-		if !Rails.env.development?
+		if !Rails.env.development? && EduSetting.get("host_name") != "https://test-newweb.educoder.net"
 			Rails.logger.info("66666  #{params}")
 			# suffix = request.url.split(".").last.split("?").first
 			# suffix_arr = ["xls", "xlsx", "pdf", "zip"] # excel文件先注释

app/controllers/memos_controller.rb

@@ -1,6 +1,6 @@
 class MemosController < ApplicationController
   before_action :require_login, except: [:show, :index]
-  before_action :check_account, only: [:new, :create]
+  before_action :check_account, only: [:new, :create, :reply]
   before_action :set_memo, only: [:show, :edit, :update, :destroy, :sticky_or_cancel, :hidden, :more_reply]
   before_action :validate_memo_params, only: [:create, :update]
   before_action :owner_or_admin, only: [:edit, :update, :destroy]

db/migrate/20200111024736_add_index_for_subject_records.rb

@@ -1,6 +1,6 @@
 class AddIndexForSubjectRecords < ActiveRecord::Migration[5.2]
   def change
-    remove_index :subject_records, :subject_id
+    # remove_index :subject_records, :subject_id
     add_index :subject_records, :subject_id, unique: true
   end
 end

db/migrate/20200112030419_migrate_3176_exercise_score.rb

@@ -18,7 +18,7 @@ class Migrate3176ExerciseScore < ActiveRecord::Migration[5.2]
               answer_status = 1
             end
             ex_shixun_answer_content = exercise_cha.exercise_shixun_answers.find_by(user_id:user.id,exercise_question_id:q.id)
-            if ex_shixun_answer_content.present? && !ex_shixun_answer_content.score >0  #把关卡的答案存入试卷的实训里
+            if ex_shixun_answer_content.present? && !(ex_shixun_answer_content.score >0)  #把关卡的答案存入试卷的实训里
               ex_shixun_answer_content.update_attributes!(score:exercise_cha_score.round(1),status:answer_status)
             end
             score5 += exercise_cha_score

db/migrate/20200112035304_migrate_3517_exercise_score.rb

@@ -0,0 +1,49 @@
+class Migrate3517ExerciseScore < ActiveRecord::Migration[5.2]
+  def calculate_student_score(exercise,user)
+    score5 = 0.0  #实训题
+    exercise_end_time = exercise.end_time
+    exercise_questions = exercise.exercise_questions.includes(:exercise_standard_answers,:exercise_shixun_challenges)
+    exercise_questions.each do |q|
+      if q.question_type == 5
+        q.exercise_shixun_challenges.each do |exercise_cha|
+          game = Game.user_games(user.id,exercise_cha.challenge_id)&.first  #当前用户的关卡
+          if game.present?
+            exercise_cha_score = 0.0
+            answer_status = 0
+            # if game.status == 2 && game.final_score >= 0
+            if game.final_score > 0 && (game.end_time.nil? || 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
+            end
+            ex_shixun_answer_content = exercise_cha.exercise_shixun_answers.find_by(user_id:user.id,exercise_question_id:q.id)
+            if ex_shixun_answer_content.present? && !(ex_shixun_answer_content.score >0)  #把关卡的答案存入试卷的实训里
+              ex_shixun_answer_content.update_attributes!(score:exercise_cha_score.round(1),status:answer_status)
+            end
+            score5 += exercise_cha_score
+          else
+            score5 += 0.0
+          end
+        end
+      end
+    end
+    score5
+  end
+
+  def change
+    exercise = Exercise.find_by(id: 3517)
+    if exercise
+      exercise_users = exercise.exercise_users.where("start_at is not null")
+      exercise_users.each do |exercise_user|
+        calculate_score = calculate_student_score(exercise, exercise_user.user)
+        subjective_score = exercise_user.subjective_score
+        total_score_subjective_score = subjective_score < 0.0 ? 0.0 : subjective_score
+        total_score = calculate_score + total_score_subjective_score
+        if exercise_user.end_at.present?
+          exercise_user.update_attributes!(score:total_score,objective_score:calculate_score)
+        end
+        puts exercise_user.id
+      end
+    end
+  end
+end