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

public/react/public/js/readme.txt

@@ -20,3 +20,44 @@ codemirror merge.js
 修改过的地方：
 Raphaël 2.1.3
 Element= -> __Element=          Element=  替换成了 __Element=
+
+
+js_min_all的一些tpi的js
+1、
+code: TPI拖拽功能  begin
+tpi的上下和左右的拖拽
+2、
+code: window.__tpiOnResize
+onRepositoryViewExpand或window resize以后需要调用这个方法，重新计算命令行区域大小
+3、
+code: window.refresh_editor_monaco
+monaco重新layout，计算高宽
+4、
+code:   reply_to_dis、 $("#all_task_show").on("click", function(e){  、  $("#all_task_index").on("click", function(e){  、
+        $("#next_step").live("click", function(){  、 $("#prev_step").live("click", function(){  、
+        function open_answer(game, myshixun, choose){  、  function choice_answer(st, nThis){
+        function check_tab(allClassName,addClassName,item){   、  function toggle_test_case_choose(t_case, id){
+        function toggle_test_case(open, output, actual_output, id, power){    、  
+        CodeMirror_fromTextArea    、  function game_praise(obj_id, obj_type){      、  function game_tread(obj_id){
+        function setupAjaxIndicatorBase() {   、   function match_specific_symbol(str){
+        function code_evaluation(test_sets     、   function pop_box_new(value, Width, Height){
+        
+貌似没用到，基本上page目录或TPIContextProvider里搜索不到的代码，都是没用到的，可以优化去除掉。
+
+code: 
+        sure_box_redirect_btn   这些弹框的话，有的会有用到，有的没用到的可以尝试删除
+5、
+code： function tpi_html_show(newCode){   、   function is_cdn_link(contents){
+
+     html显示效果时用到的脚本
+
+
+6、
+code：  // 这里重新加一次事件监听，不在原有事件的基础上增加代码了
+      新加了一次拖拽事件
+
+7、
+code：
+function create_editorMD_4comment(id, width, high, placeholder, imageUrl, callback, otherOptions){
+    老的md编辑器初始化方法，考虑用心的TPMMDEditor代替
+

public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js

@@ -237,7 +237,7 @@ class OneSelfOrderModal extends Component{
 									})
 									return
 								}
-								arr.push(items.end_time)
+								arr.push(handleDateString(items.end_time))
 							}
 						}
 					 })
@@ -273,7 +273,7 @@ class OneSelfOrderModal extends Component{
 
 	render(){
 		let {group_ids,endtime,course_groups}=this.state;
-    console.log(this.props.modaltype)
+    // console.log(this.props.modaltype)
 		let course_groupstype=course_groups===undefined||course_groups.length===0;
 		// TODO course_groups为空时的处理
 		return(

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -1868,6 +1868,10 @@ class Listofworksstudentone extends Component {
 				if (item.title === "关卡得分") {
 					continue
 				}
+				if (item.key === "efficiencyscore") {
+					continue
+				}
+
 				if (item.title === "效率分") {
 					continue
 				}
@@ -1881,6 +1885,10 @@ class Listofworksstudentone extends Component {
 				}
 			} else {
 				if (work_efficiency === false) {
+					if (item.key === "efficiencyscore") {
+						continue
+					}
+
 					if (item.title === "关卡得分") {
 						continue
 					} else if (item.title === "效率分") {
@@ -1902,6 +1910,10 @@ class Listofworksstudentone extends Component {
 					if (item.title === "关卡得分") {
 						continue
 					}
+					if (item.key === "efficiencyscore") {
+						continue
+					}
+
 					if (item.title === "效率分") {
 						continue
 					}
@@ -1915,6 +1927,10 @@ class Listofworksstudentone extends Component {
 					}
 				} else {
 					if (work_efficiency === false) {
+						if (item.key === "efficiencyscore") {
+							continue
+						}
+
 						if (item.title === "关卡得分") {
 							continue
 						} else if (item.title === "效率分") {
@@ -2052,6 +2068,10 @@ class Listofworksstudentone extends Component {
 				if (item.title === "关卡得分") {
 					continue
 				}
+				if (item.key === "efficiencyscore") {
+					continue
+				}
+
 				if (item.title === "效率分") {
 					continue
 				}
@@ -2065,6 +2085,10 @@ class Listofworksstudentone extends Component {
 				}
 			} else {
 				if (this.state.work_efficiency === false) {
+					if (item.key === "efficiencyscore") {
+						continue
+					}
+
 					if (item.title === "关卡得分") {
 						continue
 					} else if (item.title === "效率分") {
@@ -2087,6 +2111,10 @@ class Listofworksstudentone extends Component {
 					if (item.title === "关卡得分") {
 						continue
 					}
+					if (item.key === "efficiencyscore") {
+						continue
+					}
+
 					if (item.title === "效率分") {
 						continue
 					}
@@ -2100,6 +2128,10 @@ class Listofworksstudentone extends Component {
 					}
 				} else {
 					if (this.state.work_efficiency === false) {
+						if (item.key === "efficiencyscore") {
+							continue
+						}
+
 						if (item.title === "关卡得分") {
 							continue
 						} else if (item.title === "效率分") {
@@ -2476,7 +2508,7 @@ class Listofworksstudentone extends Component {
 	}
 
 
-	// 设置数据
+	// 设置数据 老师列表数据处理
 	seacthdatat = (teacherdata, student_works, work_efficiency, course_group_info) => {
 
 		let {page, limit} = this.state;
@@ -2522,6 +2554,7 @@ class Listofworksstudentone extends Component {
 			// 	pageSize: 20,  //一页显示几条
 			// 	current: page,
 			// }
+
 			if (work_efficiency === false) {
 				if (JSON.stringify(course_group_info) === "[]" || course_group_info === undefined || course_group_info === null) {
 					//这里没有分班 没有 关卡得分 没有效率分
@@ -2534,9 +2567,15 @@ class Listofworksstudentone extends Component {
 							if (item.title === "关卡得分") {
 								continue
 							}
+
 							if (item.title === "效率分") {
 								continue
 							}
+							if (item.key === "efficiencyscore") {
+								continue
+							}
+
+
 							if (item.title === "当前成绩") {
 								continue
 							}
@@ -2552,6 +2591,10 @@ class Listofworksstudentone extends Component {
 							if (item.title === "关卡得分") {
 								continue
 							}
+							if (item.key === "efficiencyscore") {
+								continue
+							}
+
 							if (item.title === "效率分") {
 								continue
 							} else {
@@ -2575,6 +2618,10 @@ class Listofworksstudentone extends Component {
 								if (item.title === "效率分") {
 									continue
 								}
+								if (item.key === "efficiencyscore") {
+									continue
+								}
+
 								if (item.title === "当前成绩") {
 									continue
 								}
@@ -2590,6 +2637,10 @@ class Listofworksstudentone extends Component {
 								if (item.title === "关卡得分") {
 									continue
 								}
+								if (item.key === "efficiencyscore") {
+									continue
+								}
+
 								if (item.title === "效率分") {
 									continue
 								} else {
@@ -2608,6 +2659,10 @@ class Listofworksstudentone extends Component {
 								if (item.title === "关卡得分") {
 									continue
 								}
+								if (item.key === "efficiencyscore") {
+									continue
+								}
+
 								if (item.title === "效率分") {
 									continue
 								}
@@ -2623,6 +2678,10 @@ class Listofworksstudentone extends Component {
 								if (item.title === "关卡得分") {
 									continue
 								}
+								if (item.key === "efficiencyscore") {
+									continue
+								}
+
 								if (item.title === "效率分") {
 									continue
 								} else {
@@ -2645,6 +2704,10 @@ class Listofworksstudentone extends Component {
 							if (item.title === "关卡得分") {
 								continue
 							}
+							if (item.key === "efficiencyscore") {
+								continue
+							}
+
 							if (item.title === "效率分") {
 								continue
 							}
@@ -2677,6 +2740,10 @@ class Listofworksstudentone extends Component {
 								if (item.title === "关卡得分") {
 									continue
 								}
+								if (item.key === "efficiencyscore") {
+									continue
+								}
+
 								if (item.title === "效率分") {
 									continue
 								}

public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js

@@ -37,6 +37,7 @@ class ShixunWorkReport extends Component {
 			showAppraiseModaltype:false,
 			work_comment_hidden:undefined,
 			work_comment:undefined,
+			has_commit: false,
 		}
 
 	}
@@ -111,7 +112,8 @@ class ShixunWorkReport extends Component {
 					data:result.data,
 					work_comment_hidden:result.data.work_comment_hidden,
 					work_comment:result.data.work_comment,
-					spinning:false
+					spinning: false,
+					has_commit: result.data.has_commit
 				})
 			}
 
@@ -303,7 +305,7 @@ class ShixunWorkReport extends Component {
 
 	}
 	render() {
-		let{data,showAppraiseModaltype,work_comment_hidden,work_comment} =this.state;
+		let {data, showAppraiseModaltype, work_comment_hidden, work_comment, has_commit} = this.state;
 
 		let category_id=data===undefined?"":data.category===null?"":data.category.category_id;
 		let homework_common_id=data===undefined?"":data.homework_common_id;
@@ -557,7 +559,9 @@ class ShixunWorkReport extends Component {
 						showAppraiseModal={(type,id,show,hidden)=>this.showAppraiseModal(type,id,show,hidden)}
 					/>
 
-
+					{
+						has_commit === false ? "" :
+							<div>
 								<div className="stud-class-set bor-bottom-greyE mt17">
 									<div className="clearfix edu-back-white poll_list">
 										<div className="font-16 color-dark-21 shixunreporttitle ml20 pd20">图形统计</div>
@@ -602,7 +606,8 @@ class ShixunWorkReport extends Component {
 															/>
 														</div>
 
-											{item.st===0?item.passed_code===null?"":<div className="font-16 color-dark-21 ml20 mr20">
+														{item.st === 0 ? item.passed_code === null ? "" :
+															<div className="font-16 color-dark-21 ml20 mr20">
 																<div className="bor-grey-e mt15">
 																	<p className="clearfix pt5 pb5 pl15 pr15 back-f6-grey codebox">
 																		<span className="fl">最近通过的代码</span>
@@ -637,6 +642,9 @@ class ShixunWorkReport extends Component {
 										}
 									</div>
 								</div>
+							</div>
+					}
+
 
 				</div>
 			</div>

public/react/src/modules/osshackathon/Osshackathon.js

@@ -72,12 +72,17 @@ class Osshackathon extends Component {
 	}
 
 	PaginationTask=(pageNumber)=>{
+		let {hackathonedit}=this.state;
+		if(hackathonedit===true){
+			this.props.showNotification(`请先保存或者关闭编辑状态`);
+		}else {
 			this.setState({
 				page: pageNumber
 			})
 			let {page, limit, search} = this.state;
 			this.getosshackathon(pageNumber, limit, search)
 		}
+	}
 
 	hackathonedit=(id)=>{
 		//管理员编辑title
@@ -126,6 +131,10 @@ class Osshackathon extends Component {
 	}
 
 	editSignupentry=(id,name,description)=>{
+		let {hackathonedit}=this.state;
+		if(hackathonedit===true){
+			this.props.showNotification(`请先保存或者关闭编辑状态`);
+		}else{
 			//	管理员编辑项目
 			this.setState({
 				Osshackathonmodeltype:true
@@ -145,6 +154,8 @@ class Osshackathon extends Component {
 			}
 		}
 
+	}
+
 	hideeditSignupentry=(id)=>{
 		//	管理员取消项目
 		this.setState({
@@ -155,6 +166,10 @@ class Osshackathon extends Component {
 
 	delSignupentry=(id)=>{
 		//	管理员删除项目
+		let {hackathonedit}=this.state;
+		if(hackathonedit===true){
+			this.props.showNotification(`请先保存或者关闭编辑状态`);
+		}else {
 			this.props.confirm({
 				content: `是否确认删除该项目?`,
 				onOk: () => {
@@ -162,6 +177,7 @@ class Osshackathon extends Component {
 				}
 			})
 		}
+	}
 	delSignupentrys=(id)=>{
 		let url=`/osshackathon/${id}.json`;
 		axios.delete(url)
@@ -180,6 +196,10 @@ class Osshackathon extends Component {
 
 
 	onsearchvalue=(value)=>{
+		let {hackathonedit}=this.state;
+		if(hackathonedit===true){
+			this.props.showNotification(`请先保存或者关闭编辑状态`);
+		}else {
 			this.setState({
 				search:value
 			})
@@ -190,6 +210,8 @@ class Osshackathon extends Component {
 			this.getosshackathon(page,limit,value)
 		}
 
+	}
+
 	onsetsearchvalue=(e)=>{
 
 		this.setState({
@@ -240,7 +262,7 @@ class Osshackathon extends Component {
 
 						<Col span={3} className={"fr textright"}>
 								<div>
-									 报名整数：<span className={"color-red"}>{data&&data.hackathon.hackathon_users_count}</span> 个
+									报名总数：<span className={"color-red"}>{data&&data.hackathon.hackathon_users_count}</span> 个
 								</div>
 						</Col>
 

public/react/src/modules/osshackathon/Osshackathonmodel.js

@@ -197,7 +197,7 @@ class Osshackathonmodel extends Component{
 								placeholder={"请输入项目描述"}
 								onInput={(e)=>this.Textarea_comment(e)}
 								value={this.state.Textarea_comment}
-								maxlength={500}
+								maxlength={250}
 							/>
 
 							<li style={{height:"20px",lineHeight:"20px"}} className={textareavaltype===true?"color-red mt20 mb10":"none"}><span>评阅内容至少有一个不为空</span></li>