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

app/controllers/users/banks_controller.rb

@@ -1,8 +1,40 @@
 class Users::BanksController < Users::BaseController
+  before_action :params_filter
   def index
-
+    order = params[:order] || "updated_at"
+    sort = params[:sort] || "desc"
+    @banks = @object_type.classify.constantize.where(@object_filter)
+    @course_lists = CourseList.where(id: @banks.pluck(:course_list_id))
+    @banks = @banks.where(course_list_id: params[:tag_id]) unless params[:tag_id].blank?
+    @banks = @banks.order("#{order} #{sort}")
+    @banks_count = @banks.size
   end
 
   private
 
+  def params_filter
+    type = ["normal", "group", "poll", "exercise", "gtask", "gtopic"]
+    tip_exception("object_type类型不正确") unless type.include?(params[:object_type])
+    # HomeworkBank 普通、分组作业题库；ExerciseBank试卷、问卷题库；GtaskBank毕设选题题库；GtopicBank毕设任务题库；
+    case params[:object_type]
+    when 'normal'
+      @object_type = "HomeworkBank"
+      @object_filter = "homework_type = 1" # 普通作业
+    when 'group'
+      @object_type = "HomeworkBank"
+      @object_filter = "homework_type = 3" # 分组作业
+    when 'poll'
+      @object_type = "ExerciseBank"
+      @object_filter = "container_type = 'Poll'" # 问卷
+    when 'exercise'
+      @object_type = "ExerciseBank"
+      @object_filter = "container_type = 'Exercise'" # 试卷
+    when 'gtask'
+      @object_type = "GtaskBank"
+      @object_filter = nil
+    when 'gtopic'
+      @object_type = "GtopicBank"
+      @object_filter = nil
+    end
+  end
 end

app/controllers/users/private_message_details_controller.rb

@@ -1,4 +1,5 @@
 class Users::PrivateMessageDetailsController < Users::BaseController
+  before_action :require_login
   before_action :private_user_resources!
 
   after_action :update_message_status, only: [:show]

app/controllers/users/private_messages_controller.rb

@@ -1,4 +1,5 @@
 class Users::PrivateMessagesController < Users::BaseController
+  before_action :require_login
   before_action :private_user_resources!
   after_action :update_onclick_time!, only: [:index]
 

app/views/users/get_navigation_info.json.jbuilder

@@ -1,20 +1,20 @@
 json.top do
   json.shixun_url "/shixuns"
-  json.shixun_paths_url "#{@old_domain}/paths"
+  json.shixun_paths_url "/paths"
-  json.course_url "#{@old_domain}/courses"
+  json.course_url "/courses"
   json.competitions_url "#{@old_domain}/competitions"
-  json.topic_url "#{@old_domain}/forums"
+  json.topic_url "/forums"
-  json.new_course_url "#{@old_domain}/courses/new"
+  json.new_course_url "/courses/new"
-  json.new_shixun_url "#{@old_domain}/shixuns/new"
+  json.new_shixun_url "/shixuns/new"
-  json.new_shixun_path_url "#{@old_domain}/paths/new"
+  json.new_shixun_path_url "/paths/new"
   json.new_project_url "#{@old_domain}/projects/new"
-  json.join_course_url "#{@old_domain}/courses/join_course_multi_role"
+  json.join_course_url "/courses/join_course_multi_role"
   json.join_project_url "#{@old_domain}/applied_project/applied_project_info"
-  json.message_url "#{@old_domain}#{@user_url}/user_tidings"
+  json.message_url "#{@user_url}/user_tidings"
   json.new_message @new_message
 
   json.moop_cases_url "#{@old_domain}/moop_cases"
-  json.crowdsourcing_url "#{@old_domain}/crowdsourcing"
+  json.crowdsourcing_url "/crowdsourcing"
 
   json.career_url do
     json.array! @career.to_a do |c|

db/migrate/20190805061306_add_exec_time_to_evaluate_records.rb

@@ -1,7 +1,7 @@
 class AddExecTimeToEvaluateRecords < ActiveRecord::Migration[5.2]
   def change
-    remove_columns :evaluate_records, :exec_time if User.first.attributes.include?("exec_time")
+    # remove_columns :evaluate_records, :exec_time if EvaluateRecord.first.attributes.include?("exec_time")
-
+    #
-    add_column :evaluate_records, :exec_time, :integer
+    # add_column :evaluate_records, :exec_time, :integer
   end
 end

lib/tasks/check_reponame.rake

@@ -6,10 +6,22 @@ namespace :myshixun do
       shixun = myshixun.shixun
       challenges = shixun.challenges
       # 不是纯选择题的情况
-      if challenges.count != challenges.select{|challenge| challenge.st == 1}
+      if challenges.select{|challenge| challenge.st.to_i == 0}.size > 0
         puts myshixun.games.first.try(:identifier)
       end
     end
   end
+
+  task choose_repo: :environment do
+    myshixuns = Myshixun.where("repo_name is null and created_at > '2019-07-20 00:00:00'")
+    myshixuns.each do |myshixun|
+      shixun = myshixun.shixun
+      challenges = shixun.challenges
+      # 如果是选择题，则把myshixuns表的repo_name改成-1
+      if challenges.select{|challenge| challenge.st.to_i == 1}.size == challenges.count
+        myshixun.update_attributes(:repo_name => "-1")
+      end
+    end
+  end
 end