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

app/controllers/games_controller.rb

@@ -498,7 +498,6 @@ class GamesController < ApplicationController
     rescue Exception => e
       # 思路： 异常首先应该考虑去恢复
       # retry为1表示已经轮训完成后还没有解决问题，这个时候需要检测异常
-      if params[:retry].to_i == 1
       begin
         # 如果模板没有问题，则通过中间层检测实训仓库是否异常
         # 监测版本库HEAD是否存在，不存在则取最新的HEAD
@@ -534,8 +533,6 @@ class GamesController < ApplicationController
           tip_exception(-3, "#{e.message}")
         end
       end
-      end
-      # 有异常，版本库获取不到代码，前端轮训15S后，调用retry == 1
       tip_exception(0, e.message)
     end
   end

lib/tasks/public_course.rake

@@ -0,0 +1,99 @@
+#coding=utf-8
+# 执行示例  bundle exec rake public_course:student args=149,2903
+# args 第一个参数是subject_id，第二个参数是课程course_id
+# 第一期时间：2018-12-16 至2019-03-31
+# 第二期时间：2019-04-07 至2019-07-28
+#
+# 这次学习很有收获，感谢老师提供这么好的资源和细心的服务🎉🎉🎉
+#
+
+desc "同步精品课数据"
+namespace :public_course do
+  subject_id = ENV['args'].split(",")[0] # 对应课程的id
+  course_id = ENV['args'].split(",")[1] # 对应课堂的id
+  status = ENV['args'].split(",")[2] # 表示相应的期数
+  type = ENV['args'].split(",")[3] # 表示课程模块
+
+  if status.to_i == 1
+    start_time = '2018-12-16'
+    end_time = '2019-04-01'
+  elsif status.to_i == 2
+    start_time = '2019-04-07'
+    end_time = '2019-07-28'
+  else
+    # 这种情况是取所有的
+    start_time = '2015-01-01'
+    end_time = '2022-07-28'
+  end
+
+  task :student => :environment do
+    puts "subject_id is #{subject_id}"
+    puts "course_id is #{course_id}"
+
+    user_ids = Myshixun.find_by_sql("select distinct(user_id) from myshixuns where shixun_id in (select shixun_id from stage_shixuns
+                                     where stage_id in (select id from stages where subject_id=#{subject_id}))").map(&:user_id)
+    puts user_ids
+    if user_ids.present?
+      user_ids.each do |user_id|
+        puts user_id
+        begin
+          CourseMember.create!(course_id: course_id, user_id: user_id, role: 4)
+        rescue Exception => e
+          Rails.logger()
+        end
+      end
+    end
+  end
+
+  #
+  task :message => :environment do
+    discusses = Discuss.find_by_sql("select content, user_id, created_on, updated_on from discusses where dis_id in (select shixun_id from stage_shixuns where
+                                   stage_id in (select id from stages where subject_id=#{subject_id})) and created_at > #{start_time} and
+                                   created_at<#{end_time}")
+    discusses.find_each do |discuss|
+      puts discuss.user_id
+      puts discuss.content
+      # 回复帖子
+      # 讨论区发布帖子
+      # Message.create!(board: @message.board, root_id: @message.root_id || @message.id,
+      #                 author: current_user, parent: @message,
+      #                 message_detail_attributes: {
+      #                     content: params[:content]
+      #                 })
+    end
+  end
+
+
+  # 更新某个课程的某类时间
+  # 执行示例  bundle exec rake public_course:student tiems=149,2903
+  task :time => :environment do
+    course_id = ENV['args'].split(",")[0] # 对应课堂的id
+    satus = ENV['args'].split(",")[1]
+
+    course = Course.find(course_id)
+
+    hour = (6..24).to_a.sample(1).first
+    min = rand(60)
+    sec = rand(60)
+
+    start_time = Date.parse(start_time)
+    end_time = Date.parse(end_time)
+    date = (start_time..end_time).to_a.sample(1).first
+
+    time = "#{date} #{min_swith(hour)}:#{min_swith(min)}:#{min_swith(sec)}"
+
+    puts time
+    case type
+    when 1
+      # 讨论区
+
+    end
+
+  end
+
+  def min_swith(time)
+    puts time
+    return time < 9 ? "0#{time}" : time
+  end
+end
+

lib/tasks/publick_course.rake

@@ -1,25 +0,0 @@
-#coding=utf-8
-# 执行示例  bundle exec rake public_course:student args=149,2903
-# args 第一个参数是subject_id，第二个参数是课程course_id
-
-desc "同步精品课数据"
-namespace :public_course do
-  task :student => :environment do
-
-
-    subject_id = ENV['args'].split(",").first
-    course_id = ENV['args'].split(",").last
-    puts "subject_id is #{subject_id}"
-    puts "course_id is #{course_id}"
-
-    user_ids = Myshixun.find_by_sql("select distinct(user_id) from myshixuns where shixun_id in (select shixun_id from stage_shixuns
-                                     where stage_id in (select id from stages where subject_id=#{subject_id}))").map(&:user_id)
-    puts user_ids
-    if user_ids.present?
-      user_ids.each do |user_id|
-        puts user_id
-        CourseMember.create!(course_id: course_id, user_id: user_id, role: 4)
-      end
-    end
-  end
-end

public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js

@@ -496,6 +496,15 @@ class Coursesleftnav extends Component{
   saveNavmoda=()=>{
     let {Navmodaltypename,setnavid,NavmodalValue}=this.state;
     let id =setnavid;
+
+		if(Navmodaltypename===5&&NavmodalValue==="未分班"||Navmodaltypename===2&&NavmodalValue==="未分班"){
+			this.setState({
+				NavmodalValuetype:true,
+				NavmodalValues:"名称不能和未分班一样"
+			})
+			return
+		}
+
     if(NavmodalValue===""){
       this.setState({
         NavmodalValuetype:true,
@@ -639,6 +648,7 @@ class Coursesleftnav extends Component{
   }
 
   onDragEnd=(result)=>{
+  	debugger
     // console.log(result)
     // let {course_modules}=this.props;
     // let newcourse_modules=course_modules;
@@ -681,10 +691,10 @@ class Coursesleftnav extends Component{
      this.droppablepost(url,result.destination.index+1)
 
    }else if(result.source.droppableId==="course_group"){
-
+			if(result.draggableId!=1){
 				let url ="/course_groups/"+result.draggableId+"/move_category.json"
 				this.droppablepost(url,result.destination.index+1)
-
+			}
    }
 
   }
@@ -820,8 +830,16 @@ class Coursesleftnav extends Component{
                     onInput={this.setNavmodalValue}
                 />
              </div>
-             
+						 <style>
-             {this.state.NavmodalValuetype===true?<span className={"color-red"}>
+							 {
+							 	`
+							 	.ml70{
+    							margin-left: 70px;
+							 	}
+							 	`
+							 }
+						 </style>
+             {this.state.NavmodalValuetype===true?<span className={"ml70 color-red"}>
                  {this.state.NavmodalValues}
              </span>:""}
              <div className={this.state.NavmodalValuetype===true?"clearfix mt20 edu-txt-center":"clearfix mt50 edu-txt-center"}>
@@ -928,9 +946,9 @@ class Coursesleftnav extends Component{
 
                                                                 <a className="fl pl46 pd0  Draggablelichild">
                                                                   <span className={this.props.location.pathname===iem.second_category_url?"color-blue fl ml38 maxwidth155 task-hide  Draggablelichild":"fl ml38 maxwidth155 task-hide  Draggablelichild"}>{iem.category_name}</span>
-                                                                  <span className={twosandiantype===undefined?this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue Draggablelichild font-14":"fr mr20 color999  Draggablelichild font-14":item.type===twosandiantypes&&twosandiantype===index&&iem.category_name!="未分班"?"none":this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue Draggablelichild font-14":"fr mr20 color999  Draggablelichild font-14"} >{iem.category_count===0?"":iem.category_count}</span>
+                                                                  <span className={twosandiantype===undefined?this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue Draggablelichild font-14":"fr mr20 color999  Draggablelichild font-14":item.type===twosandiantypes&&twosandiantype===index&&iem.category_id!=0?"none":this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue Draggablelichild font-14":"fr mr20 color999  Draggablelichild font-14"} >{iem.category_count===0?"":iem.category_count}</span>
                                                                   {item.type===twosandiantypes&&twosandiantype===index?
-																																		iem.category_name==="未分班"?"":
+																																		iem.category_id===0?"":
                                                                     iem.category_type==="graduation_topics"||iem.category_type==="graduation_tasks"?
                                                                       <span className={"fr mr20 color999  Draggablelichild font-14"} >{iem.category_count===0?"":iem.category_count}</span>
                                                                       :<Popover placement="right" content={this.content(item,iem,index)} trigger="hover" key={index}>

public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js

@@ -760,6 +760,7 @@ class GraduationTasksSubmitedit extends Component{
                               height: '30px'
                             }}>
                               <Checkbox value={item.user_id}
+																				key={item.user_id}
 																				checked={
 																					task_status.map((item,key)=>{
 																						return  parseInt(task_status[key])===item.user_id?true:false

public/react/src/modules/paths/PathDetail/addCollaborators.js

@@ -187,8 +187,8 @@ class addCollaborators extends Component{
               {
                 partnerList && partnerList.map((item,key)=>{
                   return(
-                        <li className="clearfix">
+                        <li className="clearfix" key={key}>
-                          <Checkbox value={item.user_id} key={key} className="fl"></Checkbox>
+                          <Checkbox value={item.user_id} key={item.user_id} className="fl"></Checkbox>
                           <a target="_blank" className="task-hide color-grey3 fl span1 edu-txt-w80">{item.user_name}</a>
                           <span className="task-hide fl color-grey edu-txt-w80 span2">{item.nickname}</span>
                           <span className="task-hide fl color-grey edu-txt-w80 span2">{item.identity}</span>

public/react/src/search/SearchPage.js

@@ -183,14 +183,14 @@ class SearchPage extends Component{
 										return (
 											<a key={key}
 											  href={
-													item.type==="shixun"?`/shixuns/${item.identifier}/challenges`:item.type==="course"?`/courses/${item.id}/students`:item.type==="subject"?`/paths/${item.id}`:item.type==="memo"?`/forums/${item.id}`:""
+													item.type==="shixun"?`/shixuns/${item.identifier}/challenges`:item.type==="course"?`${item.first_category_url}`:item.type==="subject"?`/paths/${item.id}`:item.type==="memo"?`/forums/${item.id}`:""
 												}
 												 target="_blank"
 											>
 
 											<div className="project-package-item">
 
-												<div className={"font-16 color-dark fl "} >
+												<div className={"font-16 color-dark fl "} style={{width:"100%"}} >
 													{/*标题*/}
 													<span className={"markdown-body fonttext"}
 															 dangerouslySetInnerHTML={{__html:item.title}}/>