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

app/controllers/challenges_controller.rb

@@ -178,6 +178,7 @@ class ChallengesController < ApplicationController
 
   # tab 0:过关任务的更新; 1:评测设置的更新; 2:表示参考答案的更新;
   def update
+    begin
       ActiveRecord::Base.transaction do
         tab = params[:tab].to_i
         @challenge.update_attributes(challenge_params)
@@ -236,6 +237,11 @@ class ChallengesController < ApplicationController
         end
 
       end
+    rescue => e
+      logger_error("##update_challenges: ##{e.message}")
+      tip_exception("更新失败！")
+    end
+
   end
 
   # 参考答案的'增,删,改'

app/helpers/export_helper.rb

@@ -163,9 +163,12 @@ module ExportHelper
     count_2 = common_homeworks.size
     count_3 = group_homeworks.size
     count_4 = tasks.size
+
+    all_user_ids = all_members.pluck(:user_id)
+
     #实训作业
     shixun_homeworks.each_with_index do |s,index|
-      all_student_works = s.score_student_works   #该实训题的全部用户回答
+      all_student_works = s.score_student_works.select{|work| all_user_ids.include?(work.user_id)}   #该实训题的全部用户回答
       title_no = index.to_i + 1
       student_work_to_xlsx(all_student_works,s)
       shixun_work_display_name = format_sheet_name (title_no.to_s + "." + s.name).strip.first(30)
@@ -175,7 +178,7 @@ module ExportHelper
 
     #普通作业
     common_homeworks.each_with_index do |c,index|
-      all_student_works = c.score_student_works   #当前用户的对该作业的回答
+      all_student_works = c.score_student_works.select{|work| all_user_ids.include?(work.user_id)}   #当前用户的对该作业的回答
       title_no = count_1 + index.to_i + 1
       student_work_to_xlsx(all_student_works,c)
 
@@ -187,7 +190,7 @@ module ExportHelper
 
     #分组作业
     group_homeworks.each_with_index do |c,index|
-      all_student_works = c.score_student_works   #当前用户的对该作业的回答
+      all_student_works = c.score_student_works.select{|work| all_user_ids.include?(work.user_id)}   #当前用户的对该作业的回答
       title_no = count_1 + count_2 + index.to_i + 1
       student_work_to_xlsx(all_student_works,c)
       work_name = format_sheet_name (title_no.to_s + "." + c.name).strip.first(30)
@@ -197,7 +200,7 @@ module ExportHelper
 
     #毕设任务
     tasks.each_with_index do |c,index|
-      all_student_works = c.score_graduation_works   #当前用户的对该作业的回答
+      all_student_works = c.score_graduation_works.select{|work| all_user_ids.include?(work.user_id)}   #当前用户的对该作业的回答
       title_no = count_1 + count_2 + count_3 + index.to_i + 1
       graduation_work_to_xlsx(all_student_works,c,current_user)
       work_name = format_sheet_name (title_no.to_s + "." + c.name).strip.first(30)
@@ -207,7 +210,7 @@ module ExportHelper
 
     #试卷的导出
     exercises.each_with_index do |c,index|
-      all_student_works = c.score_exercise_users   #当前用户的对该作业的回答
+      all_student_works = c.score_exercise_users.select{|work| all_user_ids.include?(work.user_id)}   #当前用户的对该作业的回答
       title_no = count_1 + count_2 + count_3 + count_4 + index.to_i + 1
       get_export_users(c,course,all_student_works)
       work_name = format_sheet_name (title_no.to_s + "." + c.exercise_name).strip.first(30)

app/jobs/sync_trustie_job.rb

@@ -17,10 +17,17 @@ class SyncTrustieJob < ApplicationJob
       "number": count
     }
     uri = URI.parse(url)
+    # http = Net::HTTP.new(uri.hostname, uri.port)
+
     if api_host
       http = Net::HTTP.new(uri.hostname, uri.port)
-      http.send_request('PUT', uri.path, sync_json.to_json, {'Content-Type' => 'application/json'})
-      Rails.logger.info("#######_________response__sync__end_____#########")
+
+      if api_host.include?("https://")
+        http.use_ssl = true
+      end
+
+      response = http.send_request('PUT', uri.path, sync_json.to_json, {'Content-Type' => 'application/json'})
+      Rails.logger.info("#######_________response__sync__end_____#########{response.body}")
     end
   end
 end

db/migrate/20191211073142_modify_type_for_test_sets.rb

@@ -0,0 +1,7 @@
+class ModifyTypeForTestSets < ActiveRecord::Migration[5.2]
+  def change
+    change_column :test_sets, :input, :longtext
+    change_column :test_sets, :output, :longtext
+
+  end
+end

public/react/src/AppConfig.js

@@ -52,6 +52,7 @@ export function initAxiosInterceptors(props) {
 			//proxy="http://47.96.87.25:48080"
 			proxy="https://pre-newweb.educoder.net"
 			proxy="https://test-newweb.educoder.net"
+	    proxy="https://test-jupyterweb.educoder.net"
 	     //proxy="http://192.168.2.63:3001"
 
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
@@ -88,7 +89,6 @@ export function initAxiosInterceptors(props) {
 									url = `${config.url}`;
 								}
 							}
-
             if(`${config[0]}`!=`true`){
                 if (window.location.port === "3007") {
                     // if (url.indexOf('.json') == -1) {

public/react/src/modules/page/VNCContainer.js

@@ -38,9 +38,9 @@ class VNCContainer extends Component {
 
 	}
 
-	shouldComponentUpdate () {
-		return false;
-	}
+	// shouldComponentUpdate () {
+	// 	return false;
+	// }
 
 	getSecondDrawerWidth = () => {
 		return $('#game_right_contents').width() - firstDrawerWidth
@@ -337,11 +337,11 @@ class VNCContainer extends Component {
 						width={firstDrawerWidth}
 						closable={false}
 						onClose={this.onBottomDrawerClose}
-						visible={this.state.bottomDrawer}
+						visible={this.state.bottomDrawer===undefined?false:this.state.bottomDrawer}
 						className={'codeEvaluateDrawer'}
 						placement="bottom"
 						getContainer={false}
-						style={{ position: 'absolute', bottom: '25px', zIndex: 1 }}
+						style={{ position: 'absolute', bottom: '-25px', zIndex: 1 }}
 						afterVisibleChange={(visible) => {
 							if (visible) {
 								const canvas = $('.vncDisply canvas')[0]

public/react/src/modules/tpm/TPMBanner.js

@@ -98,6 +98,7 @@ class TPMBanner extends Component {
       return -1;//不是ie浏览器
     }
   }
+
   componentDidMount() {
     let thiisie = this.IEVersion();
     if (thiisie != -1) {
@@ -110,6 +111,7 @@ class TPMBanner extends Component {
       })
     }
   }
+
   /*
   * Fork
   * */
@@ -192,7 +194,8 @@ class TPMBanner extends Component {
       params: {
         page: 1,
         limit: 10
-            }}).then((response) => {
+      }
+    }).then((response) => {
       this.setState({
         courses_count: response.data.courses_count,
         course_list: response.data.course_list
@@ -209,7 +212,8 @@ class TPMBanner extends Component {
       params: {
         page: 1,
         limit: 10
-            }}).then((response) => {
+      }
+    }).then((response) => {
       this.setState({
         courses_count: response.data.courses_count,
         course_list: response.data.course_list,
@@ -234,7 +238,8 @@ class TPMBanner extends Component {
       params: {
         page: pageNumber,
         limit: 10
-            }}).then((response) => {
+      }
+    }).then((response) => {
       this.setState({
         courses_count: response.data.courses_count,
         course_list: response.data.course_list,
@@ -379,7 +384,8 @@ class TPMBanner extends Component {
 
           // message.success('重置成功，正在进入实训！');
           // this.startshixunCombat();
-             }}
+        }
+      }
     ).catch((error) => {
       this.setState({
         startbtn: false,
@@ -394,6 +400,79 @@ class TPMBanner extends Component {
   //开始实战按钮
   startshixunCombat = (id, reset) => {
 
+    if(this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter===true){
+      if (this.props.checkIfLogin() === false) {
+        this.props.showLoginDialog()
+        return
+      }
+
+      if (this.props.checkIfProfileCompleted() === false) {
+        this.setState({
+          AccountProfiletype: true
+        })
+        return
+      }
+
+      // if(this.props.checkIfProfessionalCertification()===false){
+      // 	this.setState({
+      // 		AccountProfiletype:true
+      // 	})
+      // 	return
+      // }
+
+      let {shixunsDetails} = this.props
+      if (shixunsDetails.shixun_status > 1) {
+        this.setState({
+          startbtn: true,
+          hidestartshixunsreplacevalue: ""
+        })
+      } else {
+        this.setState({
+          hidestartshixunsreplacevalue: ""
+        })
+      }
+
+
+      let url = "/shixuns/" + id + "/jupyter_exec.json";
+      if (reset) {
+        url += '?reset=' + reset
+      }
+      axios.get(url).then((response) => {
+        if (response.status === 200) {
+          if (response.data.status === -2) {
+            // this.resetshixunCombat(response.data.message);
+            this.setState({
+              startbtn: false,
+              shixunsreplace: true,
+              hidestartshixunsreplacevalue: response.data.message + ".json"
+            })
+            // this.shixunexec(response.data.message+".json")
+          } else if (response.data.status === -1) {
+            console.log(response)
+          } else if (response.data.status === -3) {
+            this.setState({
+              shixunsmessage: response.data.message,
+              startshixunCombattype: true,
+              startbtn: false
+            })
+          } else {
+            // let path="/tasks/"+response.data.game_identifier;
+            // this.props.history.push(path);
+
+
+            // this.context.router.history.push(path);
+            if (response.data.status != 401) {
+              window.location.href = "/tasks/" + response.data.identifier+`/jupyter`;
+            }
+
+          }
+        }
+      }).catch((error) => {
+        this.setState({
+          startbtn: false
+        })
+      });
+    }else{
       if (this.props.checkIfLogin() === false) {
         this.props.showLoginDialog()
         return
@@ -467,6 +546,9 @@ class TPMBanner extends Component {
       });
     }
 
+
+  }
+
   tocertification = () => {
     let {certi_url} = this.state;
     this.setState({
@@ -532,7 +614,8 @@ class TPMBanner extends Component {
       hidestartshixunsreplacevalue,
       Forkvisibletype,
       AccountProfiletype,
-            isIE} = this.state;
+      isIE
+    } = this.state;
     let {shixunsDetails, shixunId, star_info, star_infos} = this.props;
     let challengeBtnTipText = '';
     let challengeBtnText = '模拟实战';
@@ -594,6 +677,9 @@ class TPMBanner extends Component {
 
       return <Rating {...rest} value={myValue}/>;
     };
+    //
+    // console.log(this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter)
+
     return (
 
       shixunsDetails === undefined ? "" :
@@ -663,12 +749,14 @@ class TPMBanner extends Component {
                   </li>
                 </ul>
 
-                <div className="pr fl" id="commentsStar" onMouseOver={()=>this.showonMouseOver()} onMouseOut={()=>this.hideonMouseOut()}>
+                <div className="pr fl" id="commentsStar" onMouseOver={() => this.showonMouseOver()}
+                     onMouseOut={() => this.hideonMouseOut()}>
                   <div className={"color-grey-c  ml15"} style={{color: "#Fff", textAlign: "center"}}>学员评分</div>
                   <div className="rateYo">
                     <MyRate allowHalf defaultValue={star_info[0]} disabled/>
                   </div>
-                    <div id="ratePanel" className="showratePanel" style={{"width":"530px"}} onMouseOut={()=>this.hideonMouseOut()}>
+                  <div id="ratePanel" className="showratePanel" style={{"width": "530px"}}
+                       onMouseOut={() => this.hideonMouseOut()}>
                     <div className="pr">
                       <span className="rateTrangle"></span>
                       <div className="pr clearfix ratePanelContent" style={{height: '177px'}}>
@@ -978,7 +1066,8 @@ class TPMBanner extends Component {
                 }
 
 
-							{this.props.identity < 8&&shixunsDetails.shixun_status != -1 ?<div className="fr user_default_btn user_blue_btn mr20"
+                {this.props.identity < 8 && shixunsDetails.shixun_status != -1 ?
+                  <div className="fr user_default_btn user_blue_btn mr20"
                        style={{display: shixunsDetails.can_copy === false || shixunsDetails.can_copy === null ? "none" : "flex"}}>
                     <Tooltip placement="bottom" title={"基于这个实训修改形成新的实训"}>
                        <span className="flex1 edu-txt-center fl font-18"
@@ -1046,7 +1135,8 @@ class TPMBanner extends Component {
           </div>
           <div className="alert alert-orange mb15 mt15 clearfix"
                style={{display: shixunsDetails.shixun_status === 1 ? "block" : "none"}}
-    >正在等待管理员的审核。在审核通过前，可以随时撤销发布</div>
+          >正在等待管理员的审核。在审核通过前，可以随时撤销发布
+          </div>
         </div>
 
     );

public/react/src/modules/tpm/TPMDataset.js

@@ -89,7 +89,7 @@ class TPMDataset extends Component {
 	}
 
 	mysonChange = (e) => {
-		console.log(`全选checked = ${e.target.checked}`);
+		// console.log(`全选checked = ${e.target.checked}`);
 		if (e.target.checked === true) {
 			let mydata=[];
 			let datas=[];

public/react/src/modules/tpm/TPMIndex.js

@@ -279,7 +279,7 @@ class TPMIndex extends Component {
 
         let url = window.location.href;
         let flag = url.indexOf("add_file")>-1;
-        console.log(this.state.is_jupyter);
+        // console.log(this.state.is_jupyter);
         return (
             <div className="newMain clearfix">
 							  {/*头部*/}

public/react/src/modules/tpm/TPMsettings/Shixuninformation.js

@@ -64,6 +64,7 @@ class Shixuninformation extends Component {
           choice_main_type:this.props.data.shixun.choice_main_type,
           choice_small_type:this.props.data.shixun.choice_small_type,
           choice_standard_scripts:this.props.data.shixun.choice_standard_scripts,
+          shixunmemoMDvalue:this.props.data.shixun.evaluate_script,
         })
 
         this.props.form.setFieldsValue({
@@ -316,7 +317,10 @@ class Shixuninformation extends Component {
     let operateauthority=this.props.identity===1?true:this.props.identity<5&&this.props.data.shixun.status==0?true:false;
      console.log(operateauthority)
     const {getFieldDecorator} = this.props.form;
-    const {newshixunlist, languagewrite, systemenvironment, testcoderunmode, fileList, choice_standard_scripts, postapplyvisible, shixunmemoMDvalue} = this.state;
+    const {languagewrite, systemenvironment, testcoderunmode, fileList, choice_standard_scripts, postapplyvisible, shixunmemoMDvalue} = this.state;
+
+    console.log("1222")
+    console.log(choice_standard_scripts)
     const {shixun_service_configs}=this.props;
     const uploadProps = {
       width: 600,
@@ -478,6 +482,7 @@ class Shixuninformation extends Component {
                 })(
                   <div className=" fl pr mr20">
                     <Select placeholder="请选择小类别"
+                            mode="multiple"
                             onChange={this.selectright}
                             value={this.state.choice_small_type.length===0||this.state.choice_small_type[0]===""||this.state.choice_small_type===[]?undefined:this.state.choice_small_type}
                             style={{width: 180,height:30}}

public/react/src/modules/tpm/TPMsettings/TPMsettings.js

@@ -99,7 +99,7 @@ export default class TPMsettings extends Component {
             }
           </style>
           <Tabs tabBarExtraContent={
-            <div className={"mb20"}>
+            <div className={"mb20 mr20"}>
               <Button type="primary" ghost className={"Permanentban"}>
                 永久关闭
               </Button>

public/react/src/modules/tpm/component/TPMNav.js

@@ -15,8 +15,8 @@ class TPMNav extends Component {
 		// console.log(this.props.propaedeutics)
 		const challengesPath = `/shixuns/${shixunId}/challenges`;
 		// console.log(match.path)
-			console.log("TPMNavTPMNavTPMNav");
-			console.log(is_jupyter);
+		// 	console.log("TPMNavTPMNavTPMNav");
+		// 	console.log(is_jupyter);
 	    return (
 	      	<div className="bor-bottom-greyE clearfix pl20 pr20 pt40 pb20 edu-back-white challengeNav">
 		        <Link

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

@@ -69,12 +69,22 @@ class Challengesjupyter extends Component {
 			 identifier:id,
 		 }
 		axios.get(ChallengesURL, {params: datas}).then((response) => {
-			if (response.status === 200) {
+			debugger
 				if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
 
 				}else{
-					console.log("componentDidMountChallengesjupyter");
-				  console.log(response.data);
+					// console.log("componentDidMountChallengesjupyter");
+				  // console.log(response.data);
+					debugger
+				  if(response.data.status===0){
+				  	this.setState({
+							jupyter_url:response.data.url,
+							jupyter_port:response.data.port,
+						})
+
+
+					}else{
+
 					}
 				}
 		}).catch((error) => {
@@ -136,18 +146,18 @@ class Challengesjupyter extends Component {
 
 	};
 
-	modifyjupyter=(propsysl)=>{
-		console.log("propsysl");
-		console.log(propsysl);
+	modifyjupyter=()=>{
+		// console.log("propsysl");
+		// console.log(propsysl);
 		let id=this.props.match.params.shixunId;
      var jupyter_port="";
 			 try{
-				 jupyter_port= parseInt(propsysl.shixunsDetails.jupyter_port);
+				 jupyter_port= parseInt(this.state.jupyter_port);
 			 }catch (e) {
-				 jupyter_port=propsysl.shixunsDetails.jupyter_port;
+				 jupyter_port=this.state.jupyter_port;
 
 			 }
-		const url=`/shixuns/${id}/update_jupyter.json`;
+		const url=`/jupyters/save_with_tpm.json`;
 		const data={
 			identifier:id,
 			jupyter_port:jupyter_port,
@@ -242,13 +252,22 @@ class Challengesjupyter extends Component {
 								`
 							}
 						</style>
-
+						{
+							this.state.jupyter_url === null || this.state.jupyter_url === undefined ?
+								""
+								:
 								<div className="sortinxdirection mt60">
 									<div className="renwuxiangssi sortinxdirection">
-								<div><p className="renwuxiangqdiv">任务详情</p></div> <div><p className="renwuxiangqdivtest ml24">示例</p></div>
+										<div><p className="renwuxiangqdiv">任务详情</p></div>
+										<div><p className="renwuxiangqdivtest ml24">（请将实训题目写在下方）</p></div>
+									</div>
+									<div className="renwuxiangssit xaxisreverseorder">
+										<div className="challenbaocun" onClick={() => this.modifyjupyter(this.state)}><p
+											className="challenbaocuntest">应用到实训</p></div>
 									</div>
-							<div  className="renwuxiangssit xaxisreverseorder"><div className="challenbaocun"  onClick={()=>this.modifyjupyter(this.props)}><p className="challenbaocuntest">应用到实训</p></div></div>
 								</div>
+						}
+
 						<style>
 							{
 								`
@@ -275,18 +294,13 @@ class Challengesjupyter extends Component {
 
 							<div className="pb47">
 								{
-									this.props.shixunsDetails===null || this.props.shixunsDetails===undefined||JSON.stringify(this.props.shixunsDetails)==="{}"?
+									this.state.jupyter_url===null || this.state.jupyter_url===undefined?
 										""
 										:
-										(
-											this.props&&this.props.shixunsDetails&&this.props.shixunsDetails.jupyter_url?
-												<iframe src={this.props.shixunsDetails.jupyter_url}
+												<iframe src={this.state.jupyter_url}
 																sandbox="allow-same-origin allow-scripts allow-top-navigation " scrolling="no" id="frame"
 																name="framename" width="100%" height="700" frameBorder="0"
 												></iframe>
-												:""
-										)
-
 								}
 							</div>
 						</div>

public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css

@@ -52,8 +52,6 @@
     width:32px;
     height:30px;
     font-size:16px;
-    font-family:MicrosoftYaHei;
-    color:#4CACFF;
     line-height:30px;
 }