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

app/controllers/accounts_controller.rb

@@ -81,8 +81,6 @@ class AccountsController < ApplicationController
       return normal_status(-2, "错误的账号或密码")
     end
 
-    @user.update_column(:last_login_on, Time.now)
-
     successful_authentication(@user)
 
     session[:user_id] = @user.id
@@ -124,7 +122,7 @@ class AccountsController < ApplicationController
 
     set_autologin_cookie(user)
     UserAction.create(:action_id => user.try(:id), :action_type => "Login", :user_id => user.try(:id), :ip => request.remote_ip)
-
+    user.update_column(:last_login_on, Time.now)
     # 注册完成后有一天的试用申请(先去掉)
     # UserDayCertification.create(user_id: user.id, status: 1)
   end

app/controllers/homework_commons_controller.rb

@@ -1347,6 +1347,7 @@ class HomeworkCommonsController < ApplicationController
   def group_list
     @page = params[:page] || 1
     @limit = params[:limit] || 10
+    @course_member_count = @course.course_groups.count
     @course_groups = @course.course_groups.page(@page).per(@limit)
     @ungroup_user_ids = @course.course_members.ungroup_students.pluck(:user_id)
   end

app/views/homework_commons/group_list.json.jbuilder

@@ -7,8 +7,8 @@ json.group_list do
   end
 end
 # 未分班展示情况放在最后
-if (@course_groups.count != (@page.to_i - 1)*@limit.to_i && @course_groups.count < @limit.to_i) ||
+if (@course_groups.count != 0 && @course_groups.count < @limit.to_i) ||
-    (@page.to_i == 1 && @course_groups.count == 0)
+    ((@page.to_i - 1)*@limit.to_i == @course_member_count && @course_groups.count == 0)
   ungroup_work_count = homework_ungroup_works_count(@homework, @ungroup_user_ids)
   if ungroup_work_count > 0
     json.ungroup_list do

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

@@ -2496,7 +2496,7 @@ class Listofworksstudentone extends Component {
 
 								<div className="clearfix">
                                 <span className="fl color-grey-6 font-12"><span
-																	className="color-orange-tip">{teacherdata === undefined ? "" :teacherdata.student_works&&teacherdata.student_works.length}</span>个检索结果（{teacherdata === undefined ? "" : teacherdata.all_member_count}学生） </span>
+																	className="color-orange-tip">{teacherdata === undefined ? "" : teacherdata.all_member_count}</span>个检索结果（{teacherdata === undefined ? "" : teacherdata.all_member_count}学生） </span>
 									<style>
 										{
 											`

public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js

@@ -308,6 +308,7 @@ class ShixunWorkModal extends Component{
 						}
 						<div className={"clearfix"}>
 							<Checkbox checked={onChangetype} onChange={this.onChange} className={"ml10"}>{onChangetype===true?"清除":"全选"}</Checkbox>
+							<span>有效作品都为0</span>
 						</div>
 
 						<div className="clearfix mt30 edu-txt-center mb10">

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

@@ -806,11 +806,11 @@ submittojoinclass=(value)=>{
 			      	<%= link_to '注册', user_join_path, :className => "ml5" %>
 			    </span>*/}
           { user===undefined?
-            <span className="font-15 fr mt17 ml10 mr25">
+            <span className="font-15 fr mt17 ml5 mr25">
                 <a onClick={()=>this.educoderlogin()}  className="mr5 color-white">登录</a>
                 <em className="vertical-line"></em>
                 <a href={"/register"} className="mr5 color-white">注册</a>
-            </span> :user.login===""?<span className="font-15 fr mt17 ml20 mr25">
+            </span> :user.login===""?<span className="font-15 fr mt17 ml5 mr25">
                 <a onClick={()=>this.educoderlogin()}  className="mr5 color-white">登录</a>
                 <em className="vertical-line"></em>
                 <a href={"/register"} className="mr5 color-white">注册</a>

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

@@ -250,7 +250,7 @@ export default class TPMchallengesnew extends Component {
 							// })
 
             }
-					this.props.showSnackbar(response.data.messages);
+					// this.props.showSnackbar(response.data.messages);
         }).catch((error) => {
             console.log(error)
         });

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

@@ -124,7 +124,8 @@ export default class TPMevaluation extends Component {
 			handpathopt:false,
 			scorevalue:false,
 			markvalue:true,
-			scoretype:undefined
+			scoretype:undefined,
+			web_route:null
 		}
 	}
 
@@ -215,6 +216,7 @@ export default class TPMevaluation extends Component {
 				position: response.data.position,	//int	关卡位置，导航栏中的第几关
 				scorevalue:response.data.test_set_score,
 				markvalue:response.data.test_set_average,
+				web_route:response.data.web_route
 			})
 			this.evaluationoninputvalueonload();
 			if(response.data.power===false){
@@ -579,7 +581,7 @@ export default class TPMevaluation extends Component {
 		$('textarea[autoHeight]').autoHeight();
 	}
 	submitarbitrationevaluation=()=>{
-		let{evaluationlist,shixunfilepath,shixunfilepathplay,shixunfileexpectpicturepath,shixunfilestandardpicturepath,shixunfilepicturepath,pathoptionvalue,scorevalue,markvalue}=this.state;
+		let{evaluationlist,shixunfilepath,shixunfilepathplay,shixunfileexpectpicturepath,shixunfilestandardpicturepath,shixunfilepicturepath,pathoptionvalue,scorevalue,markvalue,web_route}=this.state;
 
 
 		let newscorevalue;
@@ -647,7 +649,8 @@ export default class TPMevaluation extends Component {
 					expect_picture_path:shixunfilestandardpicturepath,
 					picture_path:shixunfilepicturepath,
 					test_set_score:newscorevalue,
-					test_set_average:markvalue
+					test_set_average:markvalue,
+					web_route:web_route===null?undefined:web_route
 				},
 				test_set:evaluationlist
 			}
@@ -741,6 +744,12 @@ export default class TPMevaluation extends Component {
 		});
 
 	}
+
+	updatewebroute=(e)=>{
+		this.setState({
+			web_route:e.target.value
+		})
+	}
 	render() {
 
 		let {
@@ -768,7 +777,7 @@ export default class TPMevaluation extends Component {
 			next_challenge,
 			StudentTaskPapers,
 			StudentTaskDocs,
-			handpathopt,
+			web_route,
 			scorevalue,
 			markvalue,
 			scoretype
@@ -978,6 +987,20 @@ export default class TPMevaluation extends Component {
 						</div>
 					</div>
 
+					{pathoptionvalue===4&&web_route!=null?<div className="edu-back-white mb10 clearfix">
+						<div className="padding40-20">
+							<p className="color-grey-6 font-16 mb20">Web路由</p>
+							<div className="df">
+								<div className="flex1 mr20">
+									<input type="text" className="input-100-45 change" autoComplete="off"
+												 id="shixun_file_picture_path" name="challenge[picture_path]"
+												 value={web_route}
+												 onInput={(e)=>this.updatewebroute(e)}
+												 placeholder="网站类型实训，请填写Web路由地址。例：java/mypage"/>
+								</div>
+							</div>
+						</div>
+					</div>:""}
 
 					{pathoptionvalue===1||pathoptionvalue===5||pathoptionvalue===6?<div className="edu-back-white mb10 clearfix">
 						<div className="padding40-20">

public/react/src/modules/tpm/shixuns/ShixunCardList.js

@@ -176,14 +176,16 @@ class ShixunCardList extends Component {
 					</div>
 
 					<div className="fl mr20 font-16 bestChoose shixun_repertoire"
-						 id="hot"
+							 id="new"
-						 onClick={(e)=>this.latestHot(e,3)}>最热
+							 onClick={(e)=>this.latestHot(e,4)}>最新
 					</div>
+
 					<div className="fl font-16 bestChoose shixun_repertoire"
-						 id="new"
+						 id="hot"
-						 onClick={(e)=>this.latestHot(e,4)}>最新
+						 onClick={(e)=>this.latestHot(e,3)}>最热
 					</div>
 
+
 					<div className="fl font-16 bestChoose shixun_repertoire ml20 mt1"
 					    style={{display:upcircle===true?"block":"none"}}
 						 // onClick={()=>this.upcircles("asc")}