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

app/controllers/competitions/competitions_controller.rb

@@ -1,5 +1,6 @@
 class Competitions::CompetitionsController < Competitions::BaseController
   skip_before_action :require_login
+  before_action :allow_visit, except: [:index]
 
   def index
     # 已上架 或者 即将上架
@@ -24,10 +25,10 @@ class Competitions::CompetitionsController < Competitions::BaseController
   end
 
   def show
-    unless current_competition.published? || admin_or_business?
-      render_forbidden
-      return
-    end
+  end
+
+  def common_header
+
   end
 
   private
@@ -35,4 +36,11 @@ class Competitions::CompetitionsController < Competitions::BaseController
   def current_competition
     @_current_competition ||= Competition.find_by!(identifier: params[:id])
   end
+
+  def allow_visit
+    unless current_competition.published? || admin_or_business?
+      render_forbidden
+      return
+    end
+  end
 end

app/controllers/courses_controller.rb

@@ -583,6 +583,8 @@ class CoursesController < ApplicationController
 
       # 学生身份的处理
       student_member = course_members.where(role: %i[STUDENT]).take
+
+      # 不存在则创建学生身份
       if params[:roles].include?("STUDENT") && student_member.blank?
         correspond_teacher_exist = CourseMember.exists?(user_id: params[:user_id], is_active: 1, course_id: @course.id, role: %i[CREATOR PROFESSOR ASSISTANT_PROFESSOR])
         new_student = CourseMember.new(user_id: params[:user_id], course_id: @course.id, role: 4)
@@ -597,6 +599,9 @@ class CoursesController < ApplicationController
         student_member.destroy!
         CourseDeleteStudentDeleteWorksJob.perform_later(@course.id, [params[:user_id]])
         # CourseDeleteStudentNotifyJob.perform_later(@course.id, [params[:user_id]], current_user.id)
+      elsif params[:roles].include?("STUDENT") && student_member.present? && !params[:roles].include?("PROFESSOR") && !params[:roles].include?("ASSISTANT_PROFESSOR")
+        # 学生身份存在且学生没有教师身份时更新is_active
+        student_member.update_attributes!(is_active: 1)
       end
 
       normal_status(0, "修改成功")

app/helpers/exercises_helper.rb

@@ -112,45 +112,46 @@ 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
-
-      if ex.question_type != Exercise::MULTIPLE
+      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)  #正确率
-      else
-        multiple_score = 0
-        user_ids.each do |user_id|
-          ex_answer_score = ex_answers.select{|answer| answer.user_id == user_id}&.first&.score.to_f
-          multiple_score += ex_answer_score
-        end
-
-        percent = (ex_total_score == 0.0 ? 0.0 : (multiple_score / ex_total_score.to_f).round(3) * 100)  #正确率
 
       end
 
+      # if ex.question_type != Exercise::MULTIPLE
+      #   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)  #正确率
+      # else
+      #   multiple_score = 0
+      #   user_ids.each do |user_id|
+      #     ex_answer_score = ex_answers.select{|answer| answer.user_id == user_id}&.first&.score.to_f
+      #     multiple_score += ex_answer_score
+      #   end
+      #   percent = (ex_total_score == 0.0 ? 0.0 : (multiple_score / 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
-        # 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
+        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
+          # right_users_scores = right_users_count * ex&.question_score.to_f
+        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
+          # right_users_scores = right_users_count * ex&.question_score.to_f
+        end
+        # percent = (ex_total_score == 0.0 ? 0.0 : (right_users_scores / ex_total_score.to_f).round(3) * 100)  #正确率
 
-        # percent = commit_user_ids > 0 ? (right_users_count / commit_user_ids.to_f).round(3)*100 : 0.0
+        percent = commit_user_ids > 0 ? (right_users_count / commit_user_ids.to_f).round(3)*100 : 0.0
 
         #每个选项的正确率
         ex_choices.each do |c|
@@ -174,6 +175,7 @@ module ExercisesHelper
         null_stand_choice = null_standard_answer.pluck(:exercise_choice_id)  #一个exercise_choice_id可能对应多个answer_text
         null_stand_text = null_standard_answer.pluck(:answer_text)
         standard_answer_count = 0
+        each_null_score = null_stand_choice.size > 0 ? (ex&.question_score.to_f / null_stand_choice.uniq.size).round(3) : 0.0
         all_user_count = 0
         null_stand_choice.each_with_index do |s,index|
           user_count = 0
@@ -196,6 +198,9 @@ module ExercisesHelper
           all_user_count += user_count
           standard_answer_count += 1
         end
+        answer_user_score = all_user_count * each_null_score
+        percent = (ex_total_score == 0.0 ? 0.0 : (answer_user_score / ex_total_score.to_f).round(3) * 100)  #正确率
+
         # 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 )

app/views/competitions/competitions/index.json.jbuilder

@@ -1,7 +1,7 @@
 json.count @count
 json.competitions do
   json.array! @competitions.each do |competition|
-    json.extract! competition, :id, :identifier, :name, :sub_title
+    json.extract! competition, :id, :identifier, :name, :sub_title, :bonus, :description
 
     json.visits_count competition.visits
     member_count = @member_count_map&.fetch(competition.id, 0) || competition.team_members.count

config/initializers/wechat_init.rb

@@ -13,6 +13,7 @@ rescue => ex
   puts %Q{\033[33m [warning] wechat config or configuration.yml missing,
            please add it or execute 'cp config/configuration.yml.example config/configuration.yml' \033[0m}
   wechat_config = {}
+  weapp_config = {}
 end
 
 # 网站应用

config/routes.rb

@@ -790,6 +790,10 @@ Rails.application.routes.draw do
         end
         resources :teachers, only: [:index]
         resources :students, only: [:index]
+
+        member do
+          get :common_header
+        end
       end
     end
 

db/migrate/20191016070842_add_description_to_competitions.rb

@@ -0,0 +1,6 @@
+class AddDescriptionToCompetitions < ActiveRecord::Migration[5.2]
+  def change
+    add_column :competitions, :description, :text
+    add_column :competitions, :introduction, :text
+  end
+end