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

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

@@ -89,7 +89,7 @@ class GraduationTasksSubmitnew extends Component{
 
       if(fileList.length === 0){
         this.setState({
-          tshixunsreplace:true,
+          shixunsreplace:true,
         })
         return
       }
@@ -355,8 +355,6 @@ class GraduationTasksSubmitnew extends Component{
     for(var list of fileList){
       listid.push(list.response.id)
     }
-
-    // e.preventDefault();
     if( GraduationTasksnewtype===true){
       this.props.form.validateFields((err, values) => {
         if (!err) {

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

@@ -27,6 +27,7 @@ class GraduationTasksedit extends Component{
       tasktype:undefined,
       name:"",
       description:undefined,
+      shixunsreplace:false,
     }
   }
 
@@ -73,74 +74,7 @@ class GraduationTasksedit extends Component{
   }
 
 
-  handleSubmit=(e)=>{
-
-    let {fileList}=this.state;
-    let listid=[]
-    let graduation_id=this.state.data.graduation_id;
-    for(var list of fileList){
-    	if(list.response!=undefined){
-				listid.push(list.response.id)
-			}else{
-				listid.push(list.uid)
-			}
-
-    }
-
-    // console.log(listid)
-    e.preventDefault();
-    if(GraduationTasksedittype===true){
-      this.props.form.validateFields((err, values) => {
 
-        if (!err) {
-
-          if(values.tasktype===undefined){
-            this.scrollToAnchors("tasktypes");
-            return
-          }
-
-          if(values.name===undefined){
-            this.scrollToAnchors("nametypes");
-            return
-          }
-
-          if(values.description===undefined){
-            this.scrollToAnchors("descriptiontypes");
-            return
-          }else if(values.description.length>5000){
-            this.scrollToAnchors("descriptiontypes");
-            return
-          }
-
-
-          console.log('Received values of form: ', values);
-          // console.log(fileList);
-          let tasksid=this.props.match.params.category_id;
-
-          let url="/graduation_tasks/"+tasksid+".json"
-          axios.put(url, {
-              task_type:parseInt(values.tasktype),
-              name:values.name,
-              description:values.description,
-              attachment_ids:listid,
-            }
-          ).then((response) => {
-            if(response.status===200) {
-              // console.log(response)
-              GraduationTasksedittype=false;
-              // window.location.href="/courses/"+course_id+"/graduation/"+graduationId+"/graduation_tasks/"+category_id+"/questions";
-              // this.goback()
-              this.props.history.push("/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+graduation_id+"/"+this.props.match.params.category_id +"/setting");
-            }
-          }).catch((error) => {
-            console.log(error)
-          })
-
-        }
-      });
-    }
-
-  }
 
   goback=()=>{
     // let courseId=this.props.match.params.coursesId;
@@ -239,10 +173,100 @@ class GraduationTasksedit extends Component{
       });
   }
 
+  Commoninterface=(fileList)=>{
+    let listid=[]
+    let graduation_id=this.state.data.graduation_id;
+    for(var list of fileList){
+      if(list.response!=undefined){
+        listid.push(list.response.id)
+      }else{
+        listid.push(list.uid)
+      }
+
+    }
+
+    // console.log(listid)
+    if(GraduationTasksedittype===true){
+      this.props.form.validateFields((err, values) => {
+
+        if (!err) {
+
+          if(values.tasktype===undefined){
+            this.scrollToAnchors("tasktypes");
+            return
+          }
+
+          if(values.name===undefined){
+            this.scrollToAnchors("nametypes");
+            return
+          }
+
+          if(values.description===undefined){
+            this.scrollToAnchors("descriptiontypes");
+            return
+          }else if(values.description.length>5000){
+            this.scrollToAnchors("descriptiontypes");
+            return
+          }
+
+
+          console.log('Received values of form: ', values);
+          // console.log(fileList);
+          let tasksid=this.props.match.params.category_id;
+
+          let url="/graduation_tasks/"+tasksid+".json"
+          axios.put(url, {
+              task_type:parseInt(values.tasktype),
+              name:values.name,
+              description:values.description,
+              attachment_ids:listid,
+            }
+          ).then((response) => {
+            if(response.status===200) {
+              // console.log(response)
+              GraduationTasksedittype=false;
+              // window.location.href="/courses/"+course_id+"/graduation/"+graduationId+"/graduation_tasks/"+category_id+"/questions";
+              // this.goback()
+              this.props.history.push("/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+graduation_id+"/"+this.props.match.params.category_id +"/setting");
+            }
+          }).catch((error) => {
+            console.log(error)
+          })
+
+        }
+      });
+    }
+  }
+  handleSubmit=(e)=>{
+
+    let {fileList}=this.state;
+    if(fileList.length===0){
+      this.setState({
+        shixunsreplace:true,
+      })
+      return
+    }
+
+     this.Commoninterface(fileList);
+  }
+   //确认
+  hidestartshixunsreplace = ()=>{
+    let {fileList}=this.state;
+
+    this.Commoninterface(fileList);
+
+
+  }
+   //取消
+  hidestartshixunsreplacetwo=()=>{
+     this.setState({
+       shixunsreplace:false,
+     })
+  }
   render(){
     const { getFieldDecorator } = this.props.form;
     let {title_num,pageType,name,description,Loadtype,
-      Modalstype,Modalstopval,ModalCancel,ModalSave} =this.state;
+      Modalstype,Modalstopval,ModalCancel,ModalSave,shixunsreplace} =this.state;
 
     let {coursedata}=this.props;
     let courseId=this.props.match.params.coursesId;
@@ -280,6 +304,24 @@ class GraduationTasksedit extends Component{
             modalSave={ModalSave}
             loadtype={Loadtype}
           />
+          <Modal
+            keyboard={false}
+            title="提示"
+            visible={shixunsreplace}
+            closable={false}
+            footer={null}
+          >
+            <div className="task-popup-content">
+              <p className="task-popup-text-center font-16 ">还未上传附件</p>
+              <p className="task-popup-text-center font-16 pb20">是否确认提交作品?</p>
+            </div>
+            <div className="task-popup-submit clearfix">
+              <a className="task-btn task-btn-orange fr "
+                 onClick={() => this.hidestartshixunsreplace()}>确认</a>
+              <a className="task-btn fr mr50"
+                 onClick={() => this.hidestartshixunsreplacetwo()}>取消</a>
+            </div>
+          </Modal>
           <div className="newMain clearfix">
             <div className={"educontent mb20"}>
 
@@ -302,7 +344,11 @@ class GraduationTasksedit extends Component{
                 <a className="color-grey-6 fr font-16 ml30 mt10 mr20" onClick={this.goback}>返回</a>
               </div>
 
-              {description===undefined?"":<Form labelCol={{ span: 5 }} wrapperCol={{ span: 12 }} onSubmit={this.handleSubmit} >
+              {description===undefined?"":
+                <div>
+                {/*<Form labelCol={{ span: 5 }} wrapperCol={{ span: 12 }}  >*/}
+                {/*  <Form labelCol={{ span: 5 }} wrapperCol={{ span: 12 }}  >*/}
+
                   {/*内容*/}
                 <div className="stud-class-set bor-bottom-greyE pt20 pl20 pr20 pb0 edu-back-white">
 
@@ -406,11 +452,13 @@ class GraduationTasksedit extends Component{
 
                 <Form.Item>
                   <div className="clearfix mt30 mb30">
-                    <Button type="primary" htmlType="submit"  className="defalutSubmitbtn fl mr20">提交</Button>
+                    <Button type="primary" htmlType="submit" onClick={()=>this.handleSubmit()} className="defalutSubmitbtn fl mr20">提交</Button>
                     <a onClick={this.goback} className="defalutCancelbtn fl">取消</a>
                   </div>
                 </Form.Item>
-              </Form>}
+              {/*</Form>*/}
+                </div>
+              }
 
             </div>
           </div>

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

@@ -23,7 +23,8 @@ class GraduationTasksnew extends Component {
 			title_value: "",
 			fileList: [],
 			contents: [{val: "", id: 1}],
-			type: true
+			type: true,
+			shixunsreplace:false,
 		}
 	}
 
@@ -47,15 +48,13 @@ class GraduationTasksnew extends Component {
 		})
 	}
 
+	Commoninterface =(fileList)=>{
 
-	handleSubmit = (e) => {
-		let {fileList} = this.state;
 		let listid = []
 
 		for (var list of fileList) {
 			listid.push(list.response.id)
 		}
-		e.preventDefault();
 		if (GraduationTasksnewtype === true) {
 			this.props.form.validateFields((err, values) => {
 				if (!err) {
@@ -100,9 +99,9 @@ class GraduationTasksnew extends Component {
 
 			});
 		}
+	}
 
 
-	}
 
 
 	goback = () => {
@@ -210,11 +209,38 @@ class GraduationTasksnew extends Component {
 		}
 	}
 
+	// 提交按钮
+	handleSubmit = (e) => {
+		let {fileList} = this.state;
+		if(fileList.length===0){
+			this.setState({
+				shixunsreplace:true,
+			})
+
+			return
+		}
+
+		this.Commoninterface(fileList);
+
+	}
+  //确认
+	hidestartshixunsreplace =()=>{
+		let {fileList} = this.state;
+
+		this.Commoninterface(fileList);
+	}
+	//取消
+	hidestartshixunsreplacetwo=()=>{
+		this.setState({
+			shixunsreplace:false,
+		})
+
+	}
 	render() {
 		const {getFieldDecorator} = this.props.form;
 		let {
 			coursename, coursesearch, title_num, title_value, pageType, fileList, contents, type,
-			Modalstype, Modalstopval, ModalCancel, ModalSave
+			Modalstype, Modalstopval, ModalCancel, ModalSave,shixunsreplace
 		} = this.state;
 
 		let {coursedata} = this.props;
@@ -254,6 +280,24 @@ class GraduationTasksnew extends Component {
 						modalCancel={ModalCancel}
 						modalSave={ModalSave}
 					/>
+					<Modal
+						keyboard={false}
+						title="提示"
+						visible={shixunsreplace}
+						closable={false}
+						footer={null}
+					>
+						<div className="task-popup-content">
+							<p className="task-popup-text-center font-16 ">还未上传附件</p>
+							<p className="task-popup-text-center font-16 pb20">是否确认提交作品?</p>
+						</div>
+						<div className="task-popup-submit clearfix">
+							<a className="task-btn task-btn-orange fr "
+								 onClick={() => this.hidestartshixunsreplace()}>确认</a>
+							<a className="task-btn fr mr50"
+								 onClick={() => this.hidestartshixunsreplacetwo()}>取消</a>
+						</div>
+					</Modal>
 					<div className="newMain clearfix">
 						<div className={"educontent mb20"}>
 
@@ -273,8 +317,8 @@ class GraduationTasksnew extends Component {
 							</div>
 
 
-							<Form labelCol={{span: 5}} wrapperCol={{span: 12}}
+							{/*<Form labelCol={{span: 5}} wrapperCol={{span: 12}}*/}
-										onSubmit={GraduationTasksnewtype === true ? this.handleSubmit : ""}>
+							{/*			onSubmit={GraduationTasksnewtype === true ? this.handleSubmit : ""}>*/}
 								<style>
 									{
 										`.ant-form-item-label{
@@ -369,11 +413,11 @@ class GraduationTasksnew extends Component {
 
 								<Form.Item>
 									<div className="clearfix mt30 mb30">
-										<Button type="primary" htmlType="submit" className="defalutSubmitbtn fl mr20">提交</Button>
+										<Button type="primary" htmlType="submit" onClick={GraduationTasksnewtype === true ? ()=>this.handleSubmit() : ""} className="defalutSubmitbtn fl mr20">提交</Button>
 										<a onClick={this.goback} className="defalutCancelbtn fl">取消</a>
 									</div>
 								</Form.Item>
-							</Form>
+							{/*</Form>*/}
 
 						</div>
 					</div>