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

app/helpers/subjects_helper.rb

@@ -13,13 +13,8 @@ module SubjectsHelper
 
   # 实训路径的所有用户获得的标签
   def user_shixun_tags challenge_ids, user_id
-    logger.info("#####################")
     ChallengeTag.joins("join games on challenge_tags.challenge_id = games.challenge_id").
       where(challenge_id: challenge_ids, games: {status: 2, user_id: user_id}).pluck("challenge_tags.name").uniq
-    logger.info("#####################")
-    pass_challenge_ids = Game.where(status: 2, user_id: user_id, challenge_ids: challenge_ids).pluck(:challenge_id)
-    ChallengeTag.where(challenge_id: pass_challenge_ids).pluck(:name).uniq
-    logger.info("#####################")
   end
 
   # 金课的课堂状态 0：未开课，1：进行中，2：已结束

app/models/subject.rb

@@ -82,16 +82,9 @@ class Subject < ApplicationRecord
   end
 
   def my_subject_progress
-    logger.info("#-----------")
     my_challenge_count = Game.joins(:challenge).where(user_id: User.current.id, status: 2, challenges: {shixun_id: shixuns.published_closed}).
         pluck(:challenge_id).uniq.size
-    logger.info("#-----------")
+    count = self.subject_challenge_count == 0 ? 0 : ((my_challenge_count.to_f / self.subject_challenge_count).round(2) * 100).to_i
-    new_challenge_count = Challenge.left_joins(:games)
-                              .where(games: {user_id: current_user.id, status: 2}, shixun_id: shixuns.published_closed)
-                              .uniq.count
-    logger.info("#-----------")
-    subject_challenge_count = shixuns.challenges_count
-    subject_challenge_count == 0 ? 0 : ((my_challenge_count.to_f / subject_challenge_count).round(2) * 100).to_i
   end
 
   def my_consume_time

app/views/exercise_questions/_exercise_questions.json.jbuilder

@@ -36,6 +36,14 @@ if question.question_type <= 2  #当为选择题或判断题时，只显示选
 
   if exercise_type == 1 || exercise_type == 4   #1为老师，4为试卷截止且答案公开的情况
     json.standard_answer standard_answers_array
+    if question.question_type == 2   #返回答案的文字
+      standard_text = standard_answers_array.first.to_i == 1 ? "正确" : "错误"
+    else
+      array_text_answer = []
+      standard_answers_array.each{|a| array_text_answer.push((a+64).chr)}
+      standard_text = array_text_answer.join("")
+    end
+    json.standard_answer_show  standard_text
   end
   if exercise_type == 3 || exercise_type == 4
     json.user_answer user_answer

config/environments/development.rb

@@ -50,12 +50,11 @@ Rails.application.configure do
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
-  config.assets.debug = false
+  config.assets.debug = true
 
   # Suppress logger output for asset requests.
   config.assets.quiet = true
 
-  config.assets.compile = true
   # config.assets.prefix = '/dev-assets'
 
   # Raises error for missing translations

public/react/public/css/edu-all.css

@@ -446,8 +446,8 @@ table.text-file{}
 
 /*-------------------------------实训路径-------------------------------*/
 .path-head{width: 100%;height: 300px;background-image: url("/images/educoder/path.png");
-    background-color: #081C4B;
+    background-color: #131b39;
-    background-size: cover;
+    /*background-size: cover;*/
     background-position: center;
     background-repeat: no-repeat;
 }

public/react/public/js/js_min_all.js

@@ -236,8 +236,7 @@ $(function(){
         if(dragging) {
             clickX = e.pageX || e.originalEvent.touches[0].pageX;;
             if(clickX > leftOffset+0&&clickX<leftOffset+1600) {
-                console.log('resize')
+                // console.log('resize')
-                //console.log(1);
                 lab.css('left', clickX - 7 - leftOffset + 'px');
                 $("#game_left_contents").width( clickX-leftOffset + 'px');
                 nextW2 = clickX-leftOffset;
@@ -314,10 +313,16 @@ $(function(){
 		window.top.__updateWebsshRows && window.top.__updateWebsshRows(rows)
     }
     window.refresh_editor_monaco = function(height) {
+        console.log('refresh_editor_monaco')
         if (window.editor_monaco) {
             height && $('#codetab_con_1').height(height)
             window.editor_monaco.layout();
         } 
+        // if ($('#game_operate_action').width() < 720) {
+        //     $('#game_operate_action .time_limit').hide()
+        // } else {
+        //     $('#game_operate_action .time_limit').show()
+        // }
     }
     // end;
    //解決IE瀏覽器大小改變時webssh佈局變亂。

public/react/scripts/build.js

@@ -203,12 +203,12 @@ function generateNewIndexJsp() {
       <script>
          (function() {
             var _host = '/react/build/'
-            /*
+            /**/
             if (window.location.host == 'pre-newweb.educoder.net') {
                 _host = 'https://testali-cdn.educoder.net/react/build/'
             } else if (window.location.host == 'www.educoder.net') {
                 _host = 'https://ali-newweb.educoder.net/react/build/'
-            }*/
+            }
             document.write('<script type="text/javascript" src="' + _host + 'js/js_min_all.js"><\\/script>');
             document.write('<script type="text/javascript" src="' + _host + 'static/js/main.${matchResult[1]}.js"><\\/script>');
          })()

public/react/src/modules/courses/members/studentsList.js

@@ -35,6 +35,7 @@ const buildColumns = (that) => {
     dataIndex: 'login',
     key: 'login',
     align:'center',
+    width:"10%",
     className:"color-grey-6",
     render: (login, record) => {
       return <span className="color-dark overflowHidden1" style={{maxWidth: '160px'}}
@@ -57,9 +58,10 @@ const buildColumns = (that) => {
     dataIndex: 'student_id',
     key: 'student_id',
     align:'center',
+    width:"10%",
     className:"color-grey-6",
     render: (student_id, record) => {
-      return <span className="color-dark overflowHidden1 "title={student_id && student_id.length > 10 ? student_id : ''}
+      return <span className="color-dark overflowHidden1 " title={student_id && student_id.length > 10 ? student_id : ''}
           style={{maxWidth: '160px'}} >{student_id}</span>
     }
   }];
@@ -69,7 +71,7 @@ const buildColumns = (that) => {
       dataIndex: 'course_group_name',
       key: 'course_group_name',
       align:'center',
-      width:"50%",
+      width:"40%",
       className:"color-grey-6"
     })
   }

public/react/src/modules/page/main/ActionView.js

@@ -52,9 +52,16 @@ class ActionView extends Component {
 	componentDidMount() {
 		// request
 		window._tpiWidthResize = () => {
-			if (window.$('#actionView').width() < 580) {
+			const _w = window.$('#actionView').width();
+			if (_w < 446) {
+				window.$('#time-consuming').hide()
+				// window.$('#time-consuming').hide()
+			} else if (_w < 746) {
+				// 文字放出来之前是 580
+				window.$('#time-consuming').show()
 				window.$('.time_limit').hide()
 			} else {
+				window.$('#time-consuming').show()
 				window.$('.time_limit').show()
 			}
  		}
@@ -71,16 +78,27 @@ class ActionView extends Component {
 	      	<div className="-flex -layout-h" id="game_operate_action">
 			  	<style>{`
 				  .time_limit {
-					  margin-right: 16px;
+					  margin-right: 0px;
+				  }
+				  .spliter {
+						border-right: 1px solid;
+						padding-right: 8px;
+						margin-right: 8px;
+						height: 14px;
+						display: inline-block;
+						position: relative;
+						top: 3px;
 				  }
 				  `}</style>
 	      		<span className="mt10 -flex c_grey ml15" id="time-consuming">
 				  	{!!time_limit && 
-					  <span className="time_limit">{`本关最大执行时间：${real_time_limit}秒`}</span>} 
+					  <span className="time_limit">{`本关最大执行时间：${real_time_limit}秒`}
+					  	<span className="spliter"></span>
+					  </span>} 
 	      			{!gameBuilding && record ? 
-	      				<Tooltip title={ "本次评测耗时(编译、运行总时间)" }>
+	      				// <Tooltip title={ "本次评测耗时(编译、运行总时间)" }></Tooltip>
-	      					<span>{ record } 秒</span>
+	      					<span>本次评测耗时(编译、运行总时间)：{ record } 秒</span>
-	      				</Tooltip>
+	      				
 	      			: ""}
 	      		</span>
 

public/react/src/modules/page/tpiPageForMobile.css

@@ -14,13 +14,16 @@
 		min-width: 280px;
 	}
 
-	#time-consuming .time_limit {
+	
-		display: none;
-	}
 	.actionViewfirstButton {
 		display: none !important;
 	}
 }
+@media (max-width: 800px) {
+	#time-consuming .time_limit {
+		display: none;
+	}
+}
 @media (max-width: 628px) {
 	.-header-right { display: none }	
 	.exitBtn span { display: none }

public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js

@@ -297,8 +297,13 @@ class DetailCardsEditAndAdd extends Component{
 
 
   contentViewScrolladd=(e)=>{
+  	const {ChooseShixunList}=this.state;
     //滑动到底判断
     if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
+
+       if(ChooseShixunList.shixun_list.length===0){
+       	return
+			 }else{
 				 // console.log("到达底部");
 				 this.setState({
 					 hometypepvisible:true
@@ -334,6 +339,7 @@ class DetailCardsEditAndAdd extends Component{
 					 console.log(error);
 				 })
 
+			 }
 
     }
 

public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js

@@ -338,8 +338,12 @@ class DetailCardsEditAndEdit extends Component{
 
   contentViewScrolledit=(e)=>{
     //滑动到底判断
-
+		const {ChooseShixunList}=this.state;
     if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
+
+			if(ChooseShixunList.shixun_list.length===0){
+				return
+			}else{
 				this.setState({
 					hometypepvisible:true
 				})
@@ -383,6 +387,11 @@ class DetailCardsEditAndEdit extends Component{
 					console.log(error);
 				})
 
+
+			}
+
+
+
     }
 
   }

public/react/src/modules/tpm/challengesnew/TPMevaluation.js

@@ -475,7 +475,10 @@ export default class TPMevaluation extends Component {
 	}
 	handpathoptionvalue=(value)=>{
 		this.setState({
-			pathoptionvalue:value
+			pathoptionvalue:value,
+			shixunfileexpectpicturepath:undefined,
+			shixunfilestandardpicturepath:undefined,
+			shixunfilepicturepath:undefined
 		})
 	}
 	showrepositoryurltip=(type)=>{
@@ -640,19 +643,20 @@ export default class TPMevaluation extends Component {
 		let id = this.props.match.params.shixunId;
 		let{checkpointId}=this.state;
 		let url = "/shixuns/"+id+"/challenges/"+checkpointId+".json";
-		axios.put(url,{
+		let newchallenge={
-				tab:1,
-				challenge:{
 			path:shixunfilepath,
 			exec_path:shixunfilepathplay,
-					show_type:pathoptionvalue,
+			show_type:pathoptionvalue===-1?undefined:pathoptionvalue,
-					original_picture_path:shixunfileexpectpicturepath,
+			original_picture_path:pathoptionvalue===-1?undefined:shixunfileexpectpicturepath===undefined?null:shixunfileexpectpicturepath,
-					expect_picture_path:shixunfilestandardpicturepath,
+			expect_picture_path:pathoptionvalue===-1?undefined:shixunfilestandardpicturepath===undefined?null:shixunfilestandardpicturepath,
-					picture_path:shixunfilepicturepath,
+			picture_path:pathoptionvalue===-1?undefined:shixunfilepicturepath===undefined?null:shixunfilepicturepath,
 			test_set_score:newscorevalue,
 			test_set_average:markvalue,
 			web_route:web_route===null?undefined:web_route
-				},
+		}
+		axios.put(url,{
+				tab:1,
+				challenge:newchallenge,
 				test_set:evaluationlist
 			}
 		).then((response) => {

public/react/src/public-path.js

@@ -1,6 +1,6 @@
 /*global __webpack_public_path__ */
-if (window._enableCDN && window.location.host == 'pre-newweb.educoder.net') {
+if ( window.location.host == 'pre-newweb.educoder.net') {
-    __webpack_public_path__ = 'http://testali-cdn.educoder.net/react/build/'
+    __webpack_public_path__ = 'https://testali-cdn.educoder.net/react/build/'
-} else if (window._enableCDN && window.location.host == 'www.educoder.net') {
+} else if ( window.location.host == 'www.educoder.net') {
     __webpack_public_path__ = 'https://ali-newweb.educoder.net/react/build/'
 }

public/stylesheets/educoder/edu-all.css

@@ -448,8 +448,8 @@ table.text-file{}
 
 /*-------------------------------实训路径-------------------------------*/
 .path-head{width: 100%;height: 300px;background-image: url("/images/educoder/path.png");
-    background-color: #081C4B;
+    background-color: #131b39;
-    background-size: cover;
+    /*background-size: cover;*/
     background-position: center;
     background-repeat: no-repeat;
 }