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

public/react/src/modules/courses/busyWork/PublishRightnow.js

@@ -96,6 +96,7 @@ class PublishRightnow extends Component{
   }
 
   homeworkstartend=(arg_group_ids,endtime)=>{
+    debugger
     if (this.usingCheckBeforePost && this.props.checkBeforePost) {
       const goOn = this.props.checkBeforePost();
       if (!goOn) {
@@ -103,6 +104,7 @@ class PublishRightnow extends Component{
         return;
       }
     }
+    debugger
     const isPublish = this.props.isPublish;
     let group_ids = arg_group_ids
     if (this.usingCheckBeforePost) {
@@ -110,13 +112,16 @@ class PublishRightnow extends Component{
         return item.id
       })
     }
-    if (this.state.course_groups.length && (!group_ids || group_ids.length == 0)) {
+    debugger
-      this.props.showNotification('请至少选择一个分班');
+    if(this.state.course_groups.length>0){
-      return;
+      if (this.state.course_groups.length && (!group_ids || group_ids&&group_ids.length == 0)) {
+        this.props.showNotification('请至少选择一个分班');
+        return;
+      }
     }
 
 		let data={}
-		if(arg_group_ids.length===0){
+		if(arg_group_ids&&arg_group_ids.length===0){
 			data = {
 				homework_ids: this.props.checkBoxValues,
 				end_time: endtime==="Invalid date"?undefined:endtime,

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

@@ -41,7 +41,7 @@ class GraduationTasksSubmitedit extends Component{
 
   componentDidMount(){
 
-
+    this.props.form.validateFields();
     let workId=this.props.match.params.work_Id;
 
     let url = "/graduation_works/"+workId+"/edit.json";
@@ -367,7 +367,6 @@ class GraduationTasksSubmitedit extends Component{
 
     let {fileList,selectmemberslist,workslist}=this.state;
 
-
      this.Commoninterface(fileList,selectmemberslist,workslist);
     // setTimeout(function () {
     //   GraduationTasksnewtype=true
@@ -380,27 +379,37 @@ class GraduationTasksSubmitedit extends Component{
 		let workId=this.props.match.params.work_Id;
 
     let  userids=[];
+    // for(var list of selectmemberslist){
+    //   if(list.user_id!=undefined&&list.user_id!=null){
+		// 		userids.push(list.user_id)
+		// 	}
+    // }
+   if(selectmemberslist!=undefined&&selectmemberslist.length>0){
+     selectmemberslist.map((list,key)=>{
+       if(list.user_id!=undefined&&list.user_id!=null){
+         userids.push(list.user_id)
+       }
+     })
+   }
 
-    for(var list of selectmemberslist){
-      if(list.user_id!=undefined&&list.user_id!=null){
-				userids.push(list.user_id)
-			}
-    }
 
     let listid=[];
 
-    for(var list of fileList){
+    // for(var list of fileList){
-      listid.push(list.response == undefined ? list.id : list.response.id)
+    //   listid.push(list.response == undefined ? list.id : list.response.id)
+    // }
+    if(fileList!=undefined&&fileList.length>0){
+      fileList.map((list,key)=>{
+        listid.push(list.response == undefined ? list.id : list.response.id)
+      })
     }
 
-    console.log(userids)
-      this.props.form.validateFields((err, values) => {
 
+      this.props.form.validateFields((err, values) => {
 
           // console.log(fileList);
           if(values.description===undefined||values.description===""){
 						this.scrollToAnchor("valuestypes");
-						// debugger
             return
           }
 
@@ -593,7 +602,7 @@ class GraduationTasksSubmitedit extends Component{
 
               {description&&description?
                  <div>
-                {/*<Form  onSubmit={this.handleSubmit} >*/}
+                <Form>
                 <div className="stud-class-set pd20 coursenavbox edu-back-white" id={"valuestypes"}>
                   <style>{`
                 .uploadBtn.ant-btn {
@@ -831,13 +840,13 @@ class GraduationTasksSubmitedit extends Component{
 
 
 
-                <Form.Item>
+                {/*<Form.Item></Form.Item>*/}
                   <div className="clearfix mt30 mb30">
-                    <Button type="primary" htmlType="submit" onClick={()=>this.handleSubmit()} className="defalutSubmitbtn fl mr20">提交</Button>
+                    <Button type="primary" onClick={this.handleSubmit} className="defalutSubmitbtn fl mr20">提交</Button>
                     <a onClick={this.goback} className="defalutCancelbtn fl">取消</a>
                   </div>
-                </Form.Item>
+
-              {/*</Form>*/}
+              </Form>
                  </div>
                    :""}
 

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

@@ -382,24 +382,27 @@ class GraduationTasksSubmitnew extends Component{
   Commoninterface = (fileList,selectmemberslist,workslist)=>{
 		// debugger
     let  userids=[];
+    if(selectmemberslist!=undefined&&selectmemberslist.length>0){
+      for(var list of selectmemberslist){
+        if(list.user_id!=undefined&&list.user_id!=null){
+          userids.push(list.user_id)
+        }
 
-    for(var list of selectmemberslist){
-debugger
-      if(list.user_id!=undefined&&list.user_id!=null){
-        userids.push(list.user_id)
       }
-
     }
 
+
     if(workslist.task_type===1){
       userids=undefined
     }
 
     let listid=[];
-
+    if(fileList!=undefined&&fileList.length>0){
-    for(var list of fileList){
+      for(var list of fileList){
-      listid.push(list.response.id)
+        listid.push(list.response.id)
+      }
     }
+
     // if( GraduationTasksnewtype===true){
       this.props.form.validateFields((err, values) => {
 
@@ -836,7 +839,7 @@ render(){
 
         <Form.Item>
           <div className="clearfix mt30 mb30">
-            <Button type="primary" htmlType="submit"  onClick={()=>this.handleSubmit()} className="defalutSubmitbtn fl mr20">提交</Button>
+            <Button type="primary" onClick={this.handleSubmit} className="defalutSubmitbtn fl mr20">提交</Button>
             <a onClick={this.goback} className="defalutCancelbtn fl">取消</a>
           </div>
         </Form.Item>

public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js

@@ -382,6 +382,7 @@ class Challengesjupyter extends Component {
 				setTimeout(()=>{
 					this.setState({
 						jupyter_url :response.data.url,
+						jupyter_port:response.data.port,
 						booljupyterurls:true,
 					})
 				},500);

public/react/src/redux/actions/jupyter.js

@@ -204,7 +204,7 @@ export const saveJupyterTpi = () => {
         payload: false
       });
     });
-    }, 500)
+    }, 800)
 
   }
 }