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

app/controllers/home_controller.rb

@@ -29,7 +29,7 @@ class HomeController < ApplicationController
     @subjects = Subject.where(homepage_show: 1).includes(:shixuns, :repertoire).limit(8)
 
     @tea_users = User.where(homepage_teacher: 1).includes(:user_extension).limit(10).order("experience desc")
-    @stu_users = User.includes(:user_extension).where(user_extensions: {identity: 1}).limit(10).order("experience desc")
+    @stu_users = User.where(is_test: 0).includes(:user_extension).where(user_extensions: {identity: 1}).limit(10).order("experience desc")
   end
 
   def search

lib/tasks/excellent_course_exercise.rake

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

lib/tasks/public_message.rake

@@ -1,4 +1,4 @@
-# bundle exec rake sync:public_message args=149,2903
+# RAILS_ENV=production bundle exec rake sync:sigle_message args=3,-1,8848,48337,'2017-07-23','2017-10-31',1000
 namespace :sync do
   if ENV['args']
     subject_id = ENV['args'].split(",")[0] # 对应课程的id
@@ -33,7 +33,7 @@ namespace :sync do
     else
       shixun_ids = Shixun.find_by_sql("select shixun_id from stage_shixuns where stage_id in (select id from stages where
                                        subject_id=#{subject_id}) ").map(&:shixun_id)
-      discusses = Discuss.where("parent_id is null").where(dis_id: shixun_ids)
+      discusses = Discuss.where("parent_id is null and created_at between '#{start_time}' and '#{end_time}'").where(dis_id: shixun_ids)
     end
 
     discusses.each do |discuss|

lib/tasks/user_login.rake

@@ -0,0 +1,28 @@
+namespace :user do
+  task :update_login => :environment do
+    begin
+      user_count = ENV['args'].split(",")[0].to_i # 更新的用户数
+      status = ENV['args'].split(",")[1] # 测试用户类型
+      base_login = ENV['args'].split(",")[2] #  基本的用户参数
+
+      users = User.where(:is_test => status).limit(user_count)
+      users.each_with_index do |user, i|
+        puts i
+
+        no = sprintf("%04d", i)
+        login = "#{base_login}#{no}"
+        puts no
+        puts login
+
+        sql1 = "update users set login='#{login}' where id=#{user.id}"
+        sql2 = "update users set lastname='#{login}' where id=#{user.id}"
+        sql3 = "update users set nickname='#{login}' where id=#{user.id}"
+        ActiveRecord::Base.connection.execute(sql1)
+        ActiveRecord::Base.connection.execute(sql2)
+        ActiveRecord::Base.connection.execute(sql3)
+      end
+    rescue Exception => e
+      Rails.logger.error(e.message)
+    end
+  end
+end

public/react/src/modules/courses/exercise/Testpapersettinghomepage.js

@@ -200,19 +200,20 @@ class Testpapersettinghomepage extends Component{
                     })
                 }
             }else {
-							this.setState({ donwloading: true })
-							downloadFile({
-								url: urll,
-								successCallback: (url) => {
-									this.setState({ donwloading: false })
-									console.log('successCallback')
-								},
-								failCallback: (responseHtml, url) => {
-									this.setState({ donwloading: false })
-									console.log('failCallback')
-								}
-							})
-							this.props.showNotification(`正在下载中`);
+                this.props.slowDownload(urll)
+							// this.setState({ donwloading: true })
+							// downloadFile({
+							// 	url: urll,
+							// 	successCallback: (url) => {
+							// 		this.setState({ donwloading: false })
+							// 		console.log('successCallback')
+							// 	},
+							// 	failCallback: (responseHtml, url) => {
+							// 		this.setState({ donwloading: false })
+							// 		console.log('failCallback')
+							// 	}
+							// })
+							// this.props.showNotification(`正在下载中`);
 
 							// window.open("/api"+url+`?${queryString.stringify(params)}`+ '&export=true', '_blank');
             }
@@ -380,7 +381,8 @@ class Testpapersettinghomepage extends Component{
                                     导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
                                     <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
                                         <li><a onClick={()=>this.confirmysl(`/exercises/${this.props.match.params.Id}/exercise_lists.xlsx`,this.child)}>学生成绩</a></li>
-                                        <li><a onClick={()=>this.confpdf(`/api/exercises/${this.props.match.params.Id}/export_exercise`)} >空白试卷</a></li>
+                                        {/* <li><a onClick={()=>this.confpdf(`/api/exercises/${this.props.match.params.Id}/export_exercise`)} >空白试卷</a></li> */}
+                                        <li><a href={`/api/exercises/${this.props.match.params.Id}/export_exercise`} target="_blank">空白试卷</a></li>
                                         {/*<li><a onClick={()=>this.confirmysl(`/zip/export_exercises?exercise_id=${this.props.match.params.Id}${this.state.groupyslsval===null||this.state.groupyslsval===undefined?null:this.state.groupyslsval}`)}>学生答题试卷</a></li>*/}
                                     </ul>
                                 </li></Spin>:""}

public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js

@@ -359,7 +359,7 @@ class ShixunhomeWorkItem extends Component{
                 }
                 {
                   discussMessage && discussMessage.upper_category_name &&
-                  <ConditionToolTip title={discussMessage.upper_category_name} condition={ discussMessage.upper_category_name.title.length > 22 }>
+                  <ConditionToolTip title={discussMessage.upper_category_name} condition={ discussMessage.upper_category_name.length > 22 }>
                     { <span className="mr15 color-grey9 task-hide" style={{"maxWidth":"272px"}}>{discussMessage.upper_category_name}</span>}
                   </ConditionToolTip>
                 }