m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
dev_cs_new
hjm 6 years ago
parent 498ebaa506 91f75c7d38
commit 10fccf5ca1
13 changed files with 309 additions and 280 deletions
Show Stats Download Patch File Download Diff File

4
app/controllers/accounts_controller.rb
Unescape View File

@ -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

1
app/controllers/homework_commons_controller.rb
Unescape View File

@ -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

4
app/views/homework_commons/group_list.json.jbuilder
Unescape View File

@ -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) ||
(@page.to_i == 1 && @course_groups.count == 0)
if (@course_groups.count != 0 && @course_groups.count < @limit.to_i) ||
((@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

4
public/react/public/css/edu-all.css
Unescape View File

@ -96,7 +96,9 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
/*块状列表*/
.square-list{width: 100%;box-sizing: border-box;margin-top:20px}
.square-Item{position: relative;width:280px;margin-right: 26px;margin-bottom: 26px;float: left;border-radius: 6px;background-color:#fff;box-shadow: 0px 0px 12px rgba(0,0,0,0.1); }
.square-Item:hover{bottom: 3px; box-shadow: 0px 0px 12px rgba(0,0,0,0.3);}
.square-Item:hover{
/*bottom: 3px;*/
box-shadow: 0px 0px 12px rgba(0,0,0,0.3);}
.square-Item:hover .closeSquare{display: block}
.square-Item:nth-child(4n+0){margin-right: 0px;}
.square-Item .square-img{display: block;width: 100%}

22
public/react/src/modules/courses/ListPageIndex.js
Unescape View File

@ -104,17 +104,17 @@ class ListPageIndex extends Component{
{/*头部banner*/}
<CoursesBanner {...this.props}></CoursesBanner>
{yslGuideone===null||yslGuideone===undefined||yslGuideone===false?
(
this.props.isAdmin()===true?
<Guide
setwindowlocal={(b)=>this.setwindowlocal(b)}
>
</Guide>
:""
)
:""
}
{/*{yslGuideone===null||yslGuideone===undefined||yslGuideone===false?*/}
{/* (*/}
{/* this.props.isAdmin()===true?*/}
{/* <Guide*/}
{/* setwindowlocal={(b)=>this.setwindowlocal(b)}*/}
{/* >*/}
{/* </Guide>*/}
{/* :""*/}
{/* )*/}
{/* :""*/}
{/*}*/}
<div className="educontent clearfix" style={{flex: "1 0 auto"}}>

2
public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
Unescape View File

@ -2492,7 +2492,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>
{
`

1
public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
Unescape View File

@ -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">

4
public/react/src/modules/tpm/NewHeader.js
Unescape View File

@ -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>

6
public/react/src/modules/tpm/TPMIndexHOC.js
Unescape View File

@ -35,14 +35,14 @@ if (!window['indexHOCLoaded']) {
// $('head').append($('<link rel="stylesheet" type="text/css" />')
// .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`));
$('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/css/edu-common.css?8`));
.attr('href', `${_url_origin}/stylesheets/css/edu-common.css?6`));
$('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?8`));
.attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?6`));
// index.html有加载
$('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?8`));
.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?6`));
// $('head').append($('<link rel="stylesheet" type="text/css" />')

2
public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js
Unescape View File

@ -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)
});

31
public/react/src/modules/tpm/challengesnew/TPMevaluation.js
Unescape View File

@ -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">

10
public/react/src/modules/tpm/shixuns/ShixunCardList.js
Unescape View File

@ -176,14 +176,16 @@ class ShixunCardList extends Component {
</div>
<div className="fl mr20 font-16 bestChoose shixun_repertoire"
id="hot"
onClick={(e)=>this.latestHot(e,3)}>最热
</div>
<div className="fl font-16 bestChoose shixun_repertoire"
id="new"
onClick={(e)=>this.latestHot(e,4)}>最新
</div>
<div className="fl font-16 bestChoose shixun_repertoire"
id="hot"
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")}

4
public/stylesheets/educoder/edu-all.css
Unescape View File

@ -98,7 +98,9 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
/*块状列表*/
.square-list{width: 100%;box-sizing: border-box;margin-top:20px}
.square-Item{position: relative;width:280px;margin-right: 26px;margin-bottom: 26px;float: left;border-radius: 6px;background-color:#fff;box-shadow: 0px 0px 12px rgba(0,0,0,0.1); }
.square-Item:hover{bottom: 3px; box-shadow: 0px 0px 12px rgba(0,0,0,0.3);}
.square-Item:hover{
/*bottom: 3px; */
box-shadow: 0px 0px 12px rgba(0,0,0,0.3);}
.square-Item:hover .closeSquare{display: block}
.square-Item:nth-child(4n+0){margin-right: 0px;}
.square-Item .square-img{display: block;width: 100%}

Write Preview
Loading…
Cancel
Save