Merge branches 'dev_aliyun' and 'dev_cxt' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_cxt

app/controllers/shixuns_controller.rb

@@ -67,15 +67,11 @@ class ShixunsController < ApplicationController
 
 		## 排序参数
 		bsort = params[:sort] || 'desc'
-		case params[:order_by] || 'publish_time'
-			when 'new'
-				@shixuns = @shixuns.order("shixuns.status = 2 desc, shixuns.created_at #{bsort}")
+		case params[:order_by] || 'new'
 			when 'hot'
-				@shixuns = @shixuns.order("shixuns.status = 2 desc, shixuns.myshixuns_count #{bsort}")
-      when 'mine'
-        @shixuns = @shixuns.order("shixuns.created_at #{bsort}")
+				@shixuns = @shixuns.order("shixuns.public = 2 desc, shixuns.myshixuns_count #{bsort}")
       else
-				@shixuns = @shixuns.order("shixuns.status = 2 desc, shixuns.publish_time #{bsort}")
+				@shixuns = @shixuns.order("shixuns.public = 2 desc, shixuns.publish_time #{bsort}")
 		end
 
 		# 用id计数会快10+MS左右,对于搜索的内容随着数据的增加，性能会提升一些。
@@ -265,7 +261,12 @@ class ShixunsController < ApplicationController
 				project_fork(@new_shixun, @repo_path, current_user.login)
 
 				ShixunMember.create!(:user_id => User.current.id, :shixun_id => @new_shixun.try(:id), :role => 1)
-
+				# 如果是jupyter，先创建一个目录,为了挂载(因为后续数据集，开启Pod后环境在没销毁前，你上传数据集是挂载不上目录的，因此要先创建目录，方便中间层挂载)
+				if @new_shixun.is_jupyter?
+					folder = EduSetting.get('shixun_folder')
+					path = "#{folder}/#{@new_shixun.identifier}"
+					FileUtils.mkdir_p(path, :mode => 0777) unless File.directory?(path)
+				end
 				# 同步复制关卡
 				if @shixun.challenges.present?
 					@shixun.challenges.each do |challenge|

app/services/jupyter_service.rb

@@ -20,15 +20,8 @@ module JupyterService
             logger.info "test_juypter: #{res}"
 
             @shixun_jupyter_port = res['port']
-            jupyter_service = edu_setting('jupyter_service')
-
-            url =
-                if false
-                    "https://#{jupyter_service}:#{res['port']}/notebooks/data/workspace/myshixun_#{tpiID}/01.ipynb"
-                else
-                    "https://#{res['port']}.#{jupyter_service}/notebooks/data/workspace/myshixun_#{tpiID}/01.ipynb"
-                end
-            return url
+
+            "#{jupyter_service(res['port'])}/notebooks/data/workspace/myshixun_#{tpiID}/01.ipynb"
         end
     end
 
@@ -55,7 +48,7 @@ module JupyterService
 
             tpiID = myshixun.id
             mount = myshixun.shixun.data_sets.present?
-            params = {tpiID: tpiID, identifier: shixun.identifier, needMount: mount,
+            params = {tpiID: tpiID, identifier: shixun.identifier, myshixunIdentifier: myshixun.identifier, needMount: mount,
                       :containers => "#{Base64.urlsafe_encode64(shixun_container_limit(shixun))}"}
             res = uri_post uri, params
 
@@ -69,14 +62,7 @@ module JupyterService
 
             repo_save_path = myshixun.repo_save_path
 
-            jupyter_service = edu_setting('jupyter_service')
-
-            if false
-                "https://#{jupyter_service}:#{res['port']}/notebooks/data/workspace/myshixun_#{tpiID}/#{repo_save_path}/01.ipynb"
-            else
-                "https://#{res['port']}.#{jupyter_service}/notebooks/data/workspace/myshixun_#{tpiID}/#{repo_save_path}/01.ipynb"
-            end
-
+            "#{jupyter_service(res['port'])}/notebooks/data/workspace/myshixun_#{tpiID}/#{repo_save_path}/01.ipynb"
         end
     end
 
@@ -99,14 +85,8 @@ module JupyterService
 
         tpiID = "tpm#{shixun.id}"
 
-        jupyter_service = edu_setting('jupyter_service')
-        src_url =
-            if false
-                "https://#{jupyter_service}:#{jupyter_port}/nbconvert/notebook/data/workspace/myshixun_#{tpiID}/01.ipynb?download=true"
-            else
-                "https://#{jupyter_port}.#{jupyter_service}/nbconvert/notebook/data/workspace/myshixun_#{tpiID}/01.ipynb?download=true"
-            end
-        #https://47526.jupyter.educoder.net/nbconvert/notebook/data/workspace/myshixun_570461/f2ef5p798r20191210163135/01.ipynb?download=true
+        src_url = "#{jupyter_service(jupyter_port)}/nbconvert/notebook/data/workspace/myshixun_#{tpiID}/01.ipynb?download=true"
+
         response = Faraday.get(src_url)
 
         if response.status.to_i != 200
@@ -133,15 +113,7 @@ module JupyterService
         tpiID = myshixun.id
 
         repo_save_path = myshixun.repo_save_path
-        jupyter_service = edu_setting('jupyter_service')
-
-        src_url =
-            if false
-                "https://#{jupyter_service}:#{jupyter_port}/nbconvert/notebook/data/workspace/myshixun_#{tpiID}/#{repo_save_path}/01.ipynb?download=true"
-            else
-                "https://#{jupyter_port}.#{jupyter_service}/nbconvert/notebook/data/workspace/myshixun_#{tpiID}/#{repo_save_path}/01.ipynb?download=true"
-            end
-
+        src_url = "#{jupyter_service(jupyter_port)}/nbconvert/notebook/data/workspace/myshixun_#{tpiID}/#{repo_save_path}/01.ipynb?download=true"
         response = Faraday.get(src_url)
 
         if response.status.to_i != 200
@@ -215,5 +187,9 @@ module JupyterService
         end
     end
 
+    def jupyter_service jupyter_port
+        edu_setting('jupyter_service').gsub("PORT", jupyter_port)
+    end
+
 
 end

app/services/shixuns/create_shixun_service.rb

@@ -44,9 +44,9 @@ class CreateShixunService < ApplicationService
         end
         # 如果是jupyter，先创建一个目录,为了挂载(因为后续数据集，开启Pod后环境在没销毁前，你上传数据集是挂载不上目录的，因此要先创建目录，方便中间层挂载)
         if shixun.is_jupyter?
-          folder = edu_setting('shixun_folder')
+          folder = EduSetting.get('shixun_folder')
           path = "#{folder}/#{identifier}"
-          FileUtils.mkdir_p(path, :mode => 0777) unless File.directory?(dir)
+          FileUtils.mkdir_p(path, :mode => 0777) unless File.directory?(path)
         end
         return shixun
       end

public/react/src/modules/courses/poll/PollNew.js

@@ -893,6 +893,7 @@ class PollNew extends Component {
 	//保存并继续
 	//保存并继续，即提交本题的新建并继续创建一个相同的题（该新题处于编辑模式，题目和选项不要清空）
 	Deleteadddomtwo = (indexo, object,bool) => {
+		debugger
 		var thiss = this;
 
 
@@ -1449,7 +1450,6 @@ class PollNew extends Component {
 	//object 单个数组数据
 	Deleteadddomthree = (indexo, object,bool) => {
     this.setState({
-			Newdisplay:false,
 			newoption: false,
 		})
 		// console.log("deleteadddom 349")
@@ -1477,6 +1477,7 @@ class PollNew extends Component {
 		}
 		if (newarr[indexo].question.question_title === "") {
 			this.props.showNotification('题目不能为空！');
+
 			return
 		}
 		if (max > 0) {
@@ -1866,6 +1867,7 @@ class PollNew extends Component {
 					};
 					question = {"question": questiontwo};
 					//插入多选题
+
 					if (uuk !== -1) {
 						// console.log("修改")
 						this.edittotheserver(object, 2, arrc, null, object.question.max_choices, object.question.min_choices,object.question.answers.length);
@@ -2014,7 +2016,11 @@ class PollNew extends Component {
 			if (result !== undefined) {
 				if (result.data.status === 0) {
 					this.props.showNotification(`已完成`);
+
 					thiss.thisinitializationdatanew();
+					this.setState({
+						Newdisplay:false,
+					})
 					// console.log("确认创建问题")
 					// console.log(result)
 					// try {

public/react/src/modules/courses/statistics/Statistics.js

@@ -99,7 +99,6 @@ class Statistics extends Component{
 	}
 
 	getwork_scoredata=(page,group_ids,sort,key)=>{
-
 		this.setState({
 			page:page,
 			sort:sort,
@@ -189,8 +188,45 @@ class Statistics extends Component{
 
 	}
 
+	//计算成绩
+	setComputeTimet = (homeworkid) => {
+		let url = `/courses/${homeworkid}/calculate_all_shixun_scores.json`;
+		try {
+			this.props.yslslowCheckresults();
+		} catch (e) {
+
+		}
+		axios.get(url).then((response) => {
+			if (response) {
+				if (response.data.status === 0) {
+					let{page,group_ids,sort}=this.state;
+					setTimeout(() => {
+						try {
+							this.props.showNotification(`${response.data.message}`);
+						} catch (e) {
+
+						}
+						try {
+							this.props.yslslowCheckresultsNo();
+						} catch (e) {
+
+						}
+						this.getwork_scoredata(page,group_ids,sort);
+					}, 2500);
+				}
+			}
+		}).catch((error) => {
+			try {
+				this.props.yslslowCheckresultsNo();
+			} catch (e) {
+
+			}
+			console.log(error)
+		});
+	};
+
 	render(){
-		let {nd1,nd2,nd3,data,bomdata,course_members}=this.state;
+		let {nd1,nd2,nd3,data,bomdata,course_members,activeKey}=this.state;
 
 		const columns = [
 			{
@@ -360,12 +396,26 @@ class Statistics extends Component{
 
 
 		const operations = <React.Fragment>
-			{course_grouptype===false||this.state.course_groups.length===0?"":<Dropdownbox
-				{...this.props}
-				{...this.state}
-				postwork_scoredata={(group_idss)=>this.getwork_scoredata(1,group_idss,'desc')}
-			/>}
+			{course_grouptype===false||this.state.course_groups.length===0?"":
+				this.state.activeKey==="1"?
+					<Dropdownbox
+						{...this.props}
+						{...this.state}
+						postwork_scoredata={(group_idss)=>this.getwork_scoredata(1,group_idss,'desc')
+						}
+					/>
+					:""
+			}
+			{
+				this.state.activeKey==="1"?
+					<a className={"ml20 ant-btn-link"} onClick={()=>this.setComputeTimet(this.props.match.params.coursesId)}>获取最新成绩</a>
+					:""
+			}
+			{
+				this.state.activeKey==="1"?
 			<a className={"ml20 ant-btn-link"} onClick={()=>this.derivefun(this.state.activeKey==="1"?`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`:`/courses/${this.props.match.params.coursesId}/export_member_act_score.xlsx`)}>导出</a>
+					:""
+			}
 		</React.Fragment>;
 		return(
 			<React.Fragment>

public/react/src/modules/message/js/MessagChat.js

@@ -554,6 +554,17 @@ class MessagChat extends Component{
 					{myuserl!==undefined?myuserl.name:""}与你的私信
 				</p>
 					{/*聊天页面*/}
+					<style>
+						{
+							`
+							.dialogPanel{
+							    padding: 0px 20px;
+									height: 400px !important;
+									overflow-y: auto;
+							}
+							`
+						}
+					</style>
 					<div className="dialogPanel"
 							 onScroll={this.contentViewScrolltop}
 							 ref={(div) => {
@@ -637,6 +648,18 @@ class MessagChat extends Component{
 				 {/*右边头部*/}
 				 <p className="pt30 pb30 pl30 edu-txt-left font-16 bor-bottom-greyE">私信列表</p>
 				 <Spin size="large" className="myw100baifenbi" spinning={isSpins}>
+					 <style>
+						 {
+						 	`
+						 	.private-list{
+						 	min-height: 680px !important;
+							max-height: 680px !important;
+							overflow-y: auto;
+							overflow-x: hidden;
+						 	}
+						 	`
+						 }
+					 </style>
 				 <div className="private-list"   onScroll={this.contentViewScrolledit}>
 					 {/*列表数据*/}
 					 {

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

@@ -366,7 +366,7 @@ class TPMBanner extends Component {
       Modalstype: true,
       Modalstopval: "是否确认撤销发布？",
       modalsMidval:"撤销发布后，学员将无法进行练习，若您新增关",
-      ModalsBottomval:"卡，学员需要重新体验课程",
+      ModalsBottomval:"卡，学员需要重新体验实训",
       ModalCancel: this.ModalCancel,
       ModalSave: this.ModalSave,
       modalstyles:"848282"
@@ -843,7 +843,7 @@ class TPMBanner extends Component {
                 <ul className="fl color-grey-c pathInfo">
                   <li>
                     <span>学习人数</span>
-                    <span className="mt10">{shixunsDetails.stu_num}</span>
+                    <span className="mt3">{shixunsDetails.stu_num}</span>
                   </li>
                   {/*<li>*/}
                   {/*<span>经验值</span>*/}
@@ -851,7 +851,7 @@ class TPMBanner extends Component {
                   {/*</li>*/}
                   <li>
                     <span>难度级别</span>
-                    <span className="shixunsdiffcult mt10">{shixunsDetails.diffcult}</span>
+                    <span className="shixunsdiffcult mt3">{shixunsDetails.diffcult}</span>
 
                   </li>
                 </ul>
@@ -1223,7 +1223,7 @@ class TPMBanner extends Component {
                 }
 
 
-                {this.props.identity < 5 && shixunsDetails.shixun_status != -1 && shixunsDetails.shixun_status != 0?
+                {this.props.identity < 8 && shixunsDetails.shixun_status != -1 && shixunsDetails.shixun_status != 0?
                   <div className="fr kaike kkbth mr20"
                        style={{display: shixunsDetails.can_copy === false || shixunsDetails.can_copy === null ? "none" : "flex"}}>
                     <Tooltip placement="bottom" title={"基于这个实训修改形成新的实训"}>

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

@@ -156,8 +156,10 @@ class TPMDataset extends Component {
 						selectedRowKeysdata:[],
 						selectedRowKeys: [],
 						checked:false,
+						page:1,
 					});
 
+
 				}
 
 			}
@@ -181,7 +183,7 @@ class TPMDataset extends Component {
 	getdatastwo = (page,limit) => {
 		let id=this.props.match.params.shixunId;
 
-		let collaborators=`/shixuns/${id}/jupyter_data_sets.json`;
+		let collaborators=`/shixuns/${id}/get_data_sets.json`;
 		axios.get(collaborators,{params:{
 				page:page,
 				limit:limit,
@@ -209,6 +211,7 @@ class TPMDataset extends Component {
 						selectedRowKeysdata:[],
 						selectedRowKeys: [],
 						checked:false,
+						page:page,
 					});
 				}
 
@@ -233,7 +236,7 @@ class TPMDataset extends Component {
 	getdatasthree = (page,limit) => {
 		let id=this.props.match.params.shixunId;
 
-		let collaborators=`/shixuns/${id}/jupyter_data_sets.json`;
+		let collaborators=`/shixuns/${id}/get_data_sets.json`;
 		axios.get(collaborators,{params:{
 				page:page,
 				limit:limit,
@@ -298,10 +301,19 @@ class TPMDataset extends Component {
 			this.setState({
 				fileList: appendFileSizeToUploadFileAll(fileList),
 			});
+
 			if(info.file.status === 'done'){
 				//done 成功就会调用这个方法
-				this.getdatas();
+				if(info.file.response){
+					if(info.file.response.status===-1||info.file.response.status==="-1"){
+
+					}else{
+						this.getdatas();
+
+					}
+				}
 			}
+
        if(info.file.response){
 				 if(info.file.response.status===-1||info.file.response.status==="-1"){
 					 // console.log("准备显示弹框了");
@@ -318,6 +330,8 @@ class TPMDataset extends Component {
 						 tittest:info.file.response.message,
 						 itemtypebool:itemtype>-1?true:itemtype<=-1?false:false,
 					 })
+				 }else{
+
 				 }
 			 }
 

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

@@ -72,11 +72,18 @@ export default class Shixuninformation extends Component {
   componentDidMount() {
     if (this.props.data) {
       if (this.props.data.shixun) {
+        let time =this.props.data && this.props.data.shixun.opening_time;
+        let timetype=false;
+        if(!time){
+          timetype=false;
+        }else{
+          timetype=true;
+        }
         this.setState({
           can_copy: this.props.data && this.props.data.shixun.can_copy === undefined ? false : this.props.data && this.props.data.shixun.can_copy,
           use_scope: this.props.data && this.props.data.shixun.use_scope,
           opening_time: this.props.data && this.props.data.shixun.opening_time,
-          opentime: !this.props.data && this.props.data.shixun.opening_time ? false : true,
+          opentime: timetype,
           oldscope_partment: this.props.data && this.props.data.shixun.scope_partment,
         })
       }
@@ -100,11 +107,18 @@ export default class Shixuninformation extends Component {
     if (prevProps.data != this.props.data) {
       if (this.props.data) {
         if (this.props.data.shixun) {
+          let time =this.props.data && this.props.data.shixun.opening_time;
+          let timetype=false;
+          if(!time){
+            timetype=false;
+          }else{
+            timetype=true;
+          }
           this.setState({
             can_copy: this.props.data && this.props.data.shixun.can_copy === undefined ? false : this.props.data && this.props.data.shixun.can_copy,
             use_scope: this.props.data && this.props.data.shixun.use_scope,
             opening_time: this.props.data && this.props.data.shixun.opening_time,
-            opentime: !this.props.data && this.props.data.shixun.opening_time ? false : true,
+            opentime: timetype,
             oldscope_partment: this.props.data && this.props.data.shixun.scope_partment,
           })
         }
@@ -257,9 +271,15 @@ export default class Shixuninformation extends Component {
   }
 
   setopentime = (e) => {
+    if(e.target.checked===false){
+      this.setState({
+        opening_time:null
+      })
+    }
     this.setState({
       opentime: e.target.checked
     })
+
   }
 
   render() {

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

@@ -57,14 +57,14 @@ export default class TPMsettings extends Component {
     });
 
     if(key==="3"&&this.props.shixunsDetails&&this.props.shixunsDetails.is_jupyter === true){
-      this.props.history.replace(`/shixuns/${this.props.match.params.shixunId}/challenges`);
+      window.location.href =`/shixuns/${this.props.match.params.shixunId}/challenges`;
     }else{
       if(key){
         this.setState({
           activeKeys:key
         })
       }else{
-        this.props.history.replace(`/shixuns/${this.props.match.params.shixunId}/challenges`);
+        window.location.href =`/shixuns/${this.props.match.params.shixunId}/challenges`;
       }
 
     }

public/react/src/modules/tpm/jupyter/leftPane/index.js

@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-12-12 10:34:03
  * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-13 21:19:30
+ * @LastEditTime: 2019-12-13 22:46:51
  */
 import './index.scss';
 import React, { useState, useEffect } from 'react';
@@ -71,7 +71,7 @@ function LeftPane (props) {
         {/* <span className="iconfont icon-java jupyter_data_icon"></span>数据集 */}
       </h2>
       { renderCtx }
-      <div className='jupyter_pagination' style={{ display: dataSets > 0 ? 'flex' : 'none'}}>
+      <div className='jupyter_pagination'>
         <Pagination 
           simple 
           current={pagination.page}

public/react/src/modules/tpm/newshixuns/Newshixuns.js

@@ -456,14 +456,14 @@ class Newshixuns extends Component {
               </div>
               <div className="padding10-20  color-grey-3 clearfix">
                 <Form>
-                  {this.props.user&&this.props.user.admin===true||this.props.user&&this.props.user.business===true?<Form.Item label="实训类型">
+              <Form.Item label="实训类型">
                     {getFieldDecorator('is_jupyter')(
-                      <Radio.Group onChange={this.RadiovalueonChange}>
+                      <Radio.Group onChange={this.RadiovalueonChange} value={this.state.Radiovalue}>
                         <Radio value="1">普通实训</Radio>
-                        <Radio value="2">Jupyter实训</Radio>
+                        {this.props.user&&this.props.user.admin===true||this.props.user&&this.props.user.business===true?<Radio value="2" >Jupyter实训</Radio>:""}
                       </Radio.Group>,
                     )}
-                  </Form.Item>:""}
+                  </Form.Item>
                   <Form.Item
                     label="名称"
                     className="mt15"

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

@@ -183,9 +183,18 @@ class Challengesjupyter extends Component {
 	render() {
 		let{ChallengesDataList,booljupyterurls}=this.state;
 		let id = this.props.match.params.shixunId;
+		//老师
 		const  is_teacher = this.props&&this.props.current_user&&this.props.current_user.is_teacher?this.props.current_user.is_teacher:false;
+		//运营人员
+		const  business  = this.props&&this.props.current_user&&this.props.current_user.business?this.props.current_user.business:false;
+		//管理员
+		const  admin = this.props&&this.props.current_user&&this.props.current_user.admin?this.props.current_user.admin:false;
+		let  mysidentity =false;
+		try {
+			mysidentity =this.props.identity < 5 &&ChallengesDataList&& ChallengesDataList.shixun_status< 3?true:false;
+		}catch (e) {
 
-
+		}
 
 		return (
 			<React.Fragment>
@@ -254,7 +263,7 @@ class Challengesjupyter extends Component {
 								""
 								:
 								(
-									is_teacher===true?
+									is_teacher===true||admin===true||business===true||mysidentity===true?
 										<div className="sortinxdirection mt60">
 											<div className="renwuxiangssi sortinxdirection">
 												<div><p className="renwuxiangqdiv">任务详情</p></div>
@@ -297,7 +306,7 @@ class Challengesjupyter extends Component {
 							}
 						</style>
 						{
-								is_teacher===true?
+								is_teacher===true||admin===true||business===true||mysidentity===true?
 									<div className="mt35">
 										<div className="pb47">
 											{

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

@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-12-12 09:01:30
  * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-13 21:02:48
+ * @LastEditTime: 2019-12-13 23:03:27
  */
 import types from "./actionTypes";
 import { message } from 'antd';
@@ -100,7 +100,12 @@ export const syncJupyterCode = (identifier, msg) => {
       if (res.data.status === 401) return;
       if (res.status === 200) {
         const {status} = res.data
-        if (status === 0) message.success(msg);
+        if (status === 0) {
+          message.success(msg);
+          setTimeout(() => {
+            window.location.reload();
+          }, 300);
+        }
       }
     })
   }