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

app/controllers/courses_controller.rb

@@ -28,7 +28,7 @@ class CoursesController < ApplicationController
                                      :switch_to_teacher, :switch_to_assistant, :switch_to_student, :exit_course,
                                      :informs, :update_informs, :online_learning, :update_task_position, :tasks_list, :join_excellent_course]
   before_action :user_course_identity, except: [:join_excellent_course, :index, :create, :new, :apply_to_join_course,
-                                                :search_course_list, :get_historical_course_students, :mine, :search_slim]
+                                                :search_course_list, :get_historical_course_students, :mine, :search_slim, :board_list]
   before_action :teacher_allowed, only: [:update, :destroy, :settings, :search_teacher_candidate,
                                          :transfer_to_course_group, :delete_from_course,
                                          :search_users, :add_students_by_search, :get_historical_courses, :add_teacher_popup, :add_teacher]

app/helpers/exercises_helper.rb

@@ -86,7 +86,7 @@ module ExercisesHelper
   #试卷的统计结果页面计算各题的
   def exercise_commit_result(questions,user_ids)
     question_infos = []
-    percent = 0.0
+    # percent = 0.0
     questions.includes(:exercise_choices).each do |ex|
       ex_total_score = user_ids.count * ex&.question_score.to_f   #该试卷的已回答的总分
       # ex_answers = ex.exercise_answers
@@ -103,38 +103,42 @@ module ExercisesHelper
       end
 
       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::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)  #正确率
 
       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
+        # 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
+        #   # 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
 
         #每个选项的正确率
         ex_choices.each do |c|
@@ -180,7 +184,7 @@ 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 = effictive_users_count > 0 ? (all_user_count / effictive_users_count.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

app/models/attachment.rb

@@ -19,7 +19,7 @@ class Attachment < ApplicationRecord
   scope :contains_only_project,         -> { where(container_type: 'Project') }
   scope :contains_course_and_project,   -> { contains_only_course.or(contains_only_project) }
   scope :mine,                          -> (author_id) { where(author_id: author_id) }
-  scope :simple_columns,                -> { select(:id, :filename, :filesize, :created_on, :cloud_url, :author_id) }
+  scope :simple_columns,                -> { select(:id, :filename, :filesize, :created_on, :cloud_url, :author_id, :content_type) }
   scope :search_by_container,           -> (ids) {where(container_id: ids)}
 
   validates_length_of :description, maximum: 100

app/models/subject.rb

@@ -19,7 +19,7 @@ class Subject < ApplicationRecord
   has_many :stages, -> { order("stages.position ASC") }, dependent: :destroy
 
   # 开放课堂
-  has_many :courses, -> { where("is_delete = 0").order("courses.id ASC") }
+  has_many :courses, -> { where("is_delete = 0").order("courses.created_at ASC") }
 
   validates :name, length: { maximum: 60 }
   validates :description, length: { maximum: 5000 }

app/views/student_works/shixun_work.json.jbuilder

@@ -11,8 +11,8 @@ json.image_url url_to_avatar(@work_user)
 
 json.complete_count @myshixun.passed_count
 json.challenges_count @shixun.challenges_count
-json.efficiency number_with_precision @work.efficiency, precision: 2
-json.max_efficiency number_with_precision @homework.max_efficiency, precision: 2
+json.efficiency @homework.work_efficiency ? number_with_precision(@work.efficiency, precision: 2) : nil
+json.max_efficiency @homework.work_efficiency ? number_with_precision(@homework.max_efficiency, precision: 2) : nil
 json.passed_time @myshixun.passed_time
 json.total_spend_time @myshixun.total_spend_time
 json.user_score @myshixun.total_score

db/migrate/20190822022306_add_exercise_user_update.rb

@@ -1,20 +1,19 @@
 class AddExerciseUserUpdate < ActiveRecord::Migration[5.2]
   include ExercisesHelper
   def change
-    #2019,8,22添加
-    exs = Exercise.all.is_exercise_published.where("publish_time > ?",(Time.now - 2.months)).includes(:exercise_questions,:exercise_users)
-    exs.each do |ex|
-      ex_users = ex.exercise_users.exercise_user_committed.where("end_at is not null and end_at > ?",(Time.now - 2.months))
-      if ex_users.present?
-        ex_users.each do |ex_user|
-          calculate_score = calculate_student_score(ex,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
+    # exs = Exercise.all.is_exercise_published.where("publish_time > ?",(Time.now - 2.months)).includes(:exercise_questions,:exercise_users)
+    # exs.each do |ex|
+    #   ex_users = ex.exercise_users.exercise_user_committed.where("end_at is not null and end_at > ?",(Time.now - 2.months))
+    #   if ex_users.present?
+    #     ex_users.each do |ex_user|
+    #       calculate_score = calculate_student_score(ex,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
 end

lib/tasks/excellent_course_exercise.rake

@@ -14,16 +14,18 @@ namespace :excellent_course_exercise do
     course = Course.find_by(id: course_id)
 
     course.exercises.each_with_index do |exercise, index|
-      # 第一个试卷的参与人数和通过人数都是传的数据，后续的随机
-      if index == 0
-        members = course.students.order("id asc").limit(participant_count)
-        update_exercise_user(exercise, members, pass_count)
-      else
-        new_participant_count = rand((participant_count - 423)..participant_count)
-        new_pass_count = rand((new_participant_count - 113)..new_participant_count)
+      if exercise.exercise_users.where(commit_status: 1).count == 0
+        # 第一个试卷的参与人数和通过人数都是传的数据，后续的随机
+        if index == 0
+          members = course.students.order("id asc").limit(participant_count)
+          update_exercise_user(exercise, members, pass_count)
+        else
+          new_participant_count = rand((participant_count - 423)..participant_count)
+          new_pass_count = rand((new_participant_count - 113)..new_participant_count)
 
-        members = course.students.order("id asc").limit(new_participant_count)
-        update_exercise_user(exercise, members, new_pass_count)
+          members = course.students.order("id asc").limit(new_participant_count)
+          update_exercise_user(exercise, members, new_pass_count)
+        end
       end
     end
   end

lib/tasks/public_course.rake

@@ -88,6 +88,8 @@ namespace :public_course do
 
         homework.update_columns(publish_time: publish_time, end_time: end_time, created_at: created_at, updated_at: updated_at)
         homework.homework_detail_manual.update_columns(comment_status: 6, created_at: created_at, updated_at: updated_at)
+
+        homework.student_works.where("work_status !=0 and update_time > '#{end_time}'").update_all(update_time: end_time)
       end
     when 3
       # 试卷
@@ -110,6 +112,23 @@ namespace :public_course do
 
   end
 
+  task :create_homework_work => :environment do
+    course = Course.find(course_id)
+    course.practice_homeworks.each do |homework|
+      if homework.student_works.count == 0
+        str = ""
+        CourseMember.students(course).each do |student|
+          str += "," if str != ""
+          str += "(#{homework.id},#{student.user_id}, '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}', '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}')"
+        end
+        if str != ""
+          sql = "insert into student_works (homework_common_id, user_id, created_at, updated_at) values" + str
+          ActiveRecord::Base.connection.execute sql
+        end
+      end
+    end
+  end
+
   def min_swith(time)
     puts time
     return time < 9 ? "0#{time}" : time