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

Merge branches 'dev_aliyun', 'develop' and 'new_shixuns_repository' of https://bdgit.educoder.net/Hjqreturn/educoder into new_shixuns_repository

Browse Source
dev_static
杨树明 5 years ago
parent f3df121ec4 95254ce52f a10fd3abee
commit bd4235fce3
13 changed files with 170 additions and 92 deletions
Show Stats Download Patch File Download Diff File

11
app/controllers/graduation_topics_controller.rb
Unescape View File

@ -170,11 +170,12 @@ class GraduationTopicsController < ApplicationController
teacher_group = @course.teacher_course_groups.where(:user_id => @graduation_topic.tea_id, :id => params[:group_id]).first teacher_group = @course.teacher_course_groups.where(:user_id => @graduation_topic.tea_id, :id => params[:group_id]).first
unless teacher_group.present? unless teacher_group.present?
member = @course.course_members.where(:user_id => @graduation_topic.tea_id).first member = @course.course_members.where(:user_id => @graduation_topic.tea_id).first
tip_exception("分班名称不能为空") if params[:course_group_name].blank? if params[:course_group_name].present?
course_group = CourseGroup.find_or_create_by!(:name => params[:course_group_name], :course_id => @course.id) course_group = CourseGroup.find_or_create_by!(:name => params[:course_group_name], :course_id => @course.id)
teacher_group = TeacherCourseGroup.find_or_create_by!(:course_id => @course.id, :course_member_id => member.try(:id), teacher_group = TeacherCourseGroup.find_or_create_by!(:course_id => @course.id, :course_member_id => member.try(:id),
:user_id => @graduation_topic.tea_id, :user_id => @graduation_topic.tea_id,
:course_group_id => course_group.try(:id)) :course_group_id => course_group.try(:id))
end
end end
student_member = @course.course_members.where(:user_id => student_graduation_topic.user_id).first student_member = @course.course_members.where(:user_id => student_graduation_topic.user_id).first
student_member.update_attributes(:course_group_id => teacher_group.course_group_id) if student_member.present? student_member.update_attributes(:course_group_id => teacher_group.course_group_id) if student_member.present?

2
app/controllers/homework_commons_controller.rb
Unescape View File

@ -194,7 +194,7 @@ class HomeworkCommonsController < ApplicationController
# TODO user_extension 如果修改 请调整 # TODO user_extension 如果修改 请调整
unless params[:search].blank? unless params[:search].blank?
@student_works = @student_works.joins(user: :user_extension).where("concat(lastname, firstname) like ? @student_works = @student_works.joins(user: :user_extension).where("concat(lastname, firstname) like ?
or student_id like ?", "%#{params[:search]}%", "%#{params[:search]}%") or student_id like ?", "%#{params[:search].strip}%", "%#{params[:search].strip}%")
end end
@work_count = @student_works.size @work_count = @student_works.size

21
app/services/homeworks_service.rb
Unescape View File

@ -305,13 +305,20 @@ class HomeworksService
myshixun_endtime = games.select{|game| game.status == 2}.size == games.size ? games.map(&:end_time).max : nil myshixun_endtime = games.select{|game| game.status == 2}.size == games.size ? games.map(&:end_time).max : nil
if work.work_status == 0 is_complete = myshixun_endtime && (myshixun_endtime < setting_time.end_time)
is_complete = myshixun_endtime && (myshixun_endtime < setting_time.end_time)
if is_complete || (myshixun.created_at < setting_time.end_time && (!homework.allow_late || setting_time.end_time >= Time.now)) # if work.work_status == 0
work.work_status = 1 # if is_complete || (myshixun.created_at < setting_time.end_time && (!homework.allow_late || setting_time.end_time >= Time.now))
elsif homework.allow_late && myshixun.created_at < homework.late_time # work.work_status = 1
work.work_status = 2 # elsif homework.allow_late && myshixun.created_at < homework.late_time
end # work.work_status = 2
# end
# end
if !homework.allow_late || is_complete
work.work_status = 1
elsif myshixun.created_at < homework.late_time
work.work_status = 2
end end
if work.work_status != 0 if work.work_status != 0

6
app/views/homework_commons/works_list.json.jbuilder
Unescape View File

@ -43,7 +43,8 @@ elsif @user_course_identity == Course::STUDENT
json.efficiency work_score_format(@work.efficiency, true, @score_open) json.efficiency work_score_format(@work.efficiency, true, @score_open)
json.eff_score work_score_format(@work.eff_score, true, @score_open) json.eff_score work_score_format(@work.eff_score, true, @score_open)
json.current_complete_count myshixun.try(:passed_count) if @homework.end_or_late json.current_complete_count myshixun.try(:passed_count) if @homework.end_or_late
json.complete_count @work.myshixun&.time_passed_count(@homework.homework_group_setting(@work.user_id)&.end_time) end_time = @homework.allow_late ? @homework.late_time : @homework.homework_group_setting(@work.user_id)&.end_time
json.complete_count @work.myshixun&.time_passed_count(end_time)
json.view_answer_count @work.myshixun.try(:view_answer_count).to_i json.view_answer_count @work.myshixun.try(:view_answer_count).to_i
json.work_status @work.compelete_status json.work_status @work.compelete_status
else else
@ -101,7 +102,8 @@ if @homework.homework_type == "practice"
json.cost_time work.myshixun.try(:total_spend_time) json.cost_time work.myshixun.try(:total_spend_time)
json.current_complete_count myshixun.try(:passed_count) if @homework.end_or_late json.current_complete_count myshixun.try(:passed_count) if @homework.end_or_late
json.complete_count work.myshixun&.time_passed_count(@homework.homework_group_setting(work.user_id)&.end_time) end_time = @homework.allow_late ? @homework.late_time : @homework.homework_group_setting(work.user_id)&.end_time
json.complete_count work.myshixun&.time_passed_count(end_time)
json.view_answer_count work.myshixun.try(:view_answer_count).to_i json.view_answer_count work.myshixun.try(:view_answer_count).to_i
json.user_login work.user.try(:login) json.user_login work.user.try(:login)
json.user_name work.user.try(:real_name) json.user_name work.user.try(:real_name)

2
lib/tasks/homework_publishtime.rake
Unescape View File

@ -81,7 +81,7 @@ namespace :homework_publishtime do
end end
end end
student_works.joins(:myshixun).where("myshixuns.status != 1").update_all(late_penalty: homework.late_penalty) if student_works.present? student_works.joins(:myshixun).where("myshixuns.status != 1").update_all(late_penalty: homework.late_penalty, work_status: 2) if student_works.present?
else else
HomeworkEndUpdateScoreJob.perform_later(homework.id) HomeworkEndUpdateScoreJob.perform_later(homework.id)

17
public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
Unescape View File

@ -79,16 +79,15 @@ class GraduateTopicDetailTable extends Component{
}) })
} }
sureAgreeTopic=(count)=>{ sureAgreeTopic=(count)=>{
if(count > 0){ let{tableData}=this.props;
let{tableData}=this.props; let{operationId,classesId}=this.state
let{operationId,classesId}=this.state let courseId=this.props.match.params.course_id;
let courseId=this.props.match.params.course_id;
if(classesId!=undefined){
let name=tableData.group_list.filter(item=>item.group_id==classesId)[0].group_name; let name=tableData.group_list.filter(item=>item.group_id==classesId)[0].group_name;
this.agreeChoose(courseId,operationId,classesId,name); this.agreeChoose(courseId,operationId,classesId,name);
}else{ }else{
this.setState({ this.agreeChoose(courseId,operationId,classesId);
un_choose_notice:"请先添加分班"
})
} }
} }
@ -205,7 +204,7 @@ class GraduateTopicDetailTable extends Component{
> >
<div className="newupload_conbox"> <div className="newupload_conbox">
<p className="color-grey-9 mb15 edu-txt-center">确认同意学生的选题，将学生加入我的分班</p> <p className="color-grey-9 mb15 edu-txt-center">确认同意学生的选题，将学生加入我的分班</p>
<div className="df"> { tableData.group_list && tableData.group_list.length===0?"":<div className="df">
<span className="lineh-40 mr10">选择：</span> <span className="lineh-40 mr10">选择：</span>
<div className="flex1"> <div className="flex1">
<Select placeholder="请选择分班" style={{"width":"100%"}} value={classesId} onChange={this.changeClasses}> <Select placeholder="请选择分班" style={{"width":"100%"}} value={classesId} onChange={this.changeClasses}>
@ -220,7 +219,7 @@ class GraduateTopicDetailTable extends Component{
</Select> </Select>
<p style={{height:"20px",lineHeight:"20px"}}><span className="color-orange-tip">{un_choose_notice}</span></p> <p style={{height:"20px",lineHeight:"20px"}}><span className="color-orange-tip">{un_choose_notice}</span></p>
</div> </div>
</div> </div>}
<div className="mt20 clearfix edu-txt-center"> <div className="mt20 clearfix edu-txt-center">
<a onClick={this.hideAgreeTopic} className="pop_close task-btn mr30">取消</a> <a onClick={this.hideAgreeTopic} className="pop_close task-btn mr30">取消</a>
<a className="task-btn task-btn-orange" onClick={()=>this.sureAgreeTopic(tableData.group_list.length)}>确定</a> <a className="task-btn task-btn-orange" onClick={()=>this.sureAgreeTopic(tableData.group_list.length)}>确定</a>

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

@ -364,7 +364,7 @@ class Listofworksstudentone extends Component {
), ),
}, },
{ {
title: '截止前完成关卡', title: '结束前完成关卡',
dataIndex: 'completion', dataIndex: 'completion',
key: 'completion', key: 'completion',
align: "center", align: "center",
@ -758,7 +758,7 @@ class Listofworksstudentone extends Component {
), ),
}, },
{ {
title: '截止前完成关卡', title: '结束前完成关卡',
dataIndex: 'completion', dataIndex: 'completion',
key: 'completion', key: 'completion',
align: "center", align: "center",
@ -1111,7 +1111,7 @@ class Listofworksstudentone extends Component {
), ),
}, },
{ {
title: '截止前完成关卡', title: '结束前完成关卡',
dataIndex: 'completion', dataIndex: 'completion',
key: 'completion', key: 'completion',
align: 'center', align: 'center',
@ -1474,7 +1474,7 @@ class Listofworksstudentone extends Component {
), ),
}, },
{ {
title: '截止前完成关卡', title: '结束前完成关卡',
dataIndex: 'completion', dataIndex: 'completion',
key: 'completion', key: 'completion',
align: 'center', align: 'center',

27
public/react/src/modules/page/VNC.css
Unescape View File

@ -39,6 +39,7 @@
user-select: none; user-select: none;
} }
.btn_test_case, .btn_test_case,
.btn_test_case_active{ .btn_test_case_active{
display: inline-block; display: inline-block;
@ -80,6 +81,32 @@
bottom: 4px; bottom: 4px;
} }
.blacktab_con_abs{
position: absolute !important;
left: 150px;
right: 150px;
top: 0;
height: 34px;
background: gold;
}
.code_evalute_icon{
position: absolute;
top: 0;
width: 56px;
height: 28px;
left: 50%;
margin-left: -28px;
background: rgba(42,58,79,1);
z-index: 10;
border-bottom-left-radius: 100px;
border-bottom-right-radius: 100px;
color: #fff;
text-align: center;
cursor: pointer;
opacity: .4;
transition: all .3s;
}
@keyframes mymove @keyframes mymove
{ {
from {right:0px;} from {right:0px;}

24
public/react/src/modules/page/VNCContainer.js
Unescape View File

@ -224,6 +224,10 @@ class VNCContainer extends Component {
> >
<style>{` <style>{`
/* 评测结果 */ /* 评测结果 */
.codeEvaluateDrawer{
// position: absolute;
// bottom: 84px;
}
.codeEvaluateDrawer #game_test_set_results { .codeEvaluateDrawer #game_test_set_results {
height: 198px; height: 198px;
} }
@ -233,7 +237,10 @@ class VNCContainer extends Component {
.codeEvaluateDrawer .ant-drawer-content-wrapper, .codeEvaluateDrawer .ant-drawer-mask { .codeEvaluateDrawer .ant-drawer-content-wrapper, .codeEvaluateDrawer .ant-drawer-mask {
position: absolute; position: absolute;
} }
.codeEvaluateDrawer .ant-drawer-content-wrapper .ant-drawer-content{
height: 100%;
background: rgb(5, 16, 26) !important;
}
.codeEvaluateFloatButton { .codeEvaluateFloatButton {
bottom: 180px !important; bottom: 180px !important;
@ -345,7 +352,8 @@ class VNCContainer extends Component {
className={'codeEvaluateDrawer'} className={'codeEvaluateDrawer'}
placement="bottom" placement="bottom"
getContainer={false} getContainer={false}
style={{ position: 'absolute', bottom: '-25px', zIndex: 1 }} // style={{ position: 'absolute', bottom: '-25px', zIndex: 1 }}
style={{ position: 'absolute', bottom: '50px', zIndex: 1 }}
afterVisibleChange={(visible) => { afterVisibleChange={(visible) => {
if (visible) { if (visible) {
const canvas = $('.vncDisply canvas')[0] const canvas = $('.vncDisply canvas')[0]
@ -356,16 +364,16 @@ class VNCContainer extends Component {
> >
{ this.props.codeEvaluate } { this.props.codeEvaluate }
</Drawer> </Drawer>
{/* <FloatButton onClick={this.swtichBottomDrawer} <FloatButton onClick={this.swtichBottomDrawer}
className="codeEvaluateFloatButton" className="codeEvaluateFloatButton"
>测试集</FloatButton> */} >测试集</FloatButton>
<div {/* <div
className={_classCtx} className={_classCtx}
onClick={this.swtichBottomDrawer} onClick={this.swtichBottomDrawer}
> > */}
{/* <span className="iconfont icon-shangjiantou btn-arrow"></span> */} {/* <span className="iconfont icon-shangjiantou btn-arrow"></span> */}
<span className={_classes}></span> {/* <span className={_classes}></span> */}
</div> {/* </div> */}
</VNCDisplay> </VNCDisplay>

2
public/react/src/modules/page/main/ActionView.css
Unescape View File

@ -1,9 +1,11 @@
#actionView { #actionView {
position: relative;
background:rgba(5,16,26,1); background:rgba(5,16,26,1);
min-height: 49px; min-height: 49px;
/*box-shadow: inset 0 0 10px #27324c;*/ /*box-shadow: inset 0 0 10px #27324c;*/
z-index: 9; z-index: 9;
box-shadow: 0px -1px 4px 0px rgba(76,172,255,0.08); box-shadow: 0px -1px 4px 0px rgba(76,172,255,0.08);
z-index: 10001;
} }
#time-consuming span { #time-consuming span {
color: #747A7F; color: #747A7F;

62
public/react/src/modules/page/main/CodeEvaluateView.js
Unescape View File

@ -1,3 +1,4 @@
import '../VNC.css';
import React, { Component } from 'react'; import React, { Component } from 'react';
import IconButton from 'material-ui/IconButton'; import IconButton from 'material-ui/IconButton';
@ -302,34 +303,39 @@ class CodeEvaluateView extends Component {
return ( return (
<React.Fragment> <React.Fragment>
<ul id="blacktab_nav"> <ul id="blacktab_nav">
<li className="blacktab_con undis" > <li className="blacktab_con undis" >
</li> </li>
{ challenge.isHtml ? { challenge.isHtml ?
<li className={`blacktab_con ${ tabIndex === 0 ? 'tab_hover' : ''}`} onClick={() => this.tabIndexChange(0)}> <li className={`blacktab_con ${ tabIndex === 0 ? 'tab_hover' : ''}`} onClick={() => this.tabIndexChange(0)}>
<a href="javascript:void(0);" className="tab_type tab_color">效果显示</a> <a href="javascript:void(0);" className="tab_type tab_color">效果显示</a>
</li> : ''} </li> : ''}
<li className={`blacktab_con ${ tabIndex === 1 ? 'tab_hover' : ''}`} onClick={() => this.tabIndexChange(1)}> <li className={`blacktab_con ${ tabIndex === 1 ? 'tab_hover' : ''}`} onClick={() => this.tabIndexChange(1)}>
<a href="javascript:void(0);" className="tab_type tab_color">测试结果</a> <a href="javascript:void(0);" className="tab_type tab_color">测试结果</a>
</li> </li>
{/* <li className="blacktab_con_abs">
{this.props.inDrawer ? <Tooltip id="tooltip-icon-expand" title={ "收起" }> <span className="code_evalute_icon">
{/*TODO 按钮大小改造，css*/} <span className="iconfont icon-xiajiantou btn-arrow"></span>
{/* icon-guanbi */} </span>
<a className="iconButton fr mr15 mt4" onClick={this.props.hideCodeEvaluate} id="extend_and_zoom" > </li> */}
<i className={ "font-18 iconfont icon-guanbi" }></i>
</a> {this.props.inDrawer ? <Tooltip id="tooltip-icon-expand" title={ "收起" }>
{/*TODO 按钮大小改造，css*/}
</Tooltip> : <Tooltip id="tooltip-icon-expand" title={ evaluateViewExpanded ? "收起" : "展开"}> {/* icon-guanbi */}
{/*TODO 按钮大小改造，css*/} <a className="iconButton fr mr15 mt4" onClick={this.props.hideCodeEvaluate} id="extend_and_zoom" >
<i className={ "font-18 iconfont icon-guanbi" }></i>
<a className="iconButton fr mr15" onClick={this.onEvaluateViewExpand} id="extend_and_zoom" > </a>
<i className={ evaluateViewExpanded ? "font-18 iconfont icon-shousuo" : "iconfont icon-zhankai font-18" }></i>
</a> </Tooltip> : <Tooltip id="tooltip-icon-expand" title={ evaluateViewExpanded ? "收起" : "展开"}>
{/*TODO 按钮大小改造，css*/}
</Tooltip>}
<a className="iconButton fr mr15" onClick={this.onEvaluateViewExpand} id="extend_and_zoom" >
<div className="cl"></div> <i className={ evaluateViewExpanded ? "font-18 iconfont icon-shousuo" : "iconfont icon-zhankai font-18" }></i>
</ul> </a>
</Tooltip>}
<div className="cl"></div>
</ul>
<CircularProgress size={40} thickness={3} <CircularProgress size={40} thickness={3}

76
public/react/src/modules/page/main/CodeRepositoryViewContainer.js
Unescape View File

@ -296,32 +296,58 @@ class CodeRepositoryViewContainer extends Component {
render() { render() {
return ( return (
<React.Fragment> // <React.Fragment>
{this.props.isOnlyContainer == true ? // {this.props.isOnlyContainer == true ?
React.Children.map(this.props.children, child => { // React.Children.map(this.props.children, child => {
if(!child) { // if(!child) {
return '' // return ''
} // }
return React.cloneElement(child, Object.assign({...this.state}, { // return React.cloneElement(child, Object.assign({...this.state}, {
loadRepoFiles: this.loadRepoFiles, // loadRepoFiles: this.loadRepoFiles,
onTreeSelect: this.onTreeSelect, // onTreeSelect: this.onTreeSelect,
onLoadData: this.onLoadData, // onLoadData: this.onLoadData,
})) // }))
}) // })
: // :
<CodeRepositoryView {...this.props} // <CodeRepositoryView {...this.props}
{...this.state} // {...this.state}
showFilesDrawer={this.showFilesDrawer} // showFilesDrawer={this.showFilesDrawer}
loadRepoFiles={this.loadRepoFiles} // loadRepoFiles={this.loadRepoFiles}
onLoadData={this.onLoadData} // onLoadData={this.onLoadData}
onTreeSelect={ this.onTreeSelect } // onTreeSelect={ this.onTreeSelect }
onRepositoryViewExpand={this.onRepositoryViewExpand} // onRepositoryViewExpand={this.onRepositoryViewExpand}
tabIndexChange={this.tabIndexChange} // tabIndexChange={this.tabIndexChange}
showSettingDrawer={this.showSettingDrawer} // showSettingDrawer={this.showSettingDrawer}
></CodeRepositoryView> } // ></CodeRepositoryView> }
</React.Fragment> // </React.Fragment>
<React.Fragment>
{this.props.isOnlyContainer == true ?
React.Children.map(this.props.children, child => {
if(!child) {
return ''
}
return React.cloneElement(child, Object.assign({...this.state}, {
loadRepoFiles: this.loadRepoFiles,
onTreeSelect: this.onTreeSelect,
onLoadData: this.onLoadData,
}))
})
:
<CodeRepositoryView {...this.props}
{...this.state}
showFilesDrawer={this.showFilesDrawer}
loadRepoFiles={this.loadRepoFiles}
onLoadData={this.onLoadData}
onTreeSelect={ this.onTreeSelect }
onRepositoryViewExpand={this.onRepositoryViewExpand}
tabIndexChange={this.tabIndexChange}
showSettingDrawer={this.showSettingDrawer}
></CodeRepositoryView> }
</React.Fragment>
); );
} }
} }

4
public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js
Unescape View File

@ -278,7 +278,7 @@ class Challengesjupyter extends Component {
this.setState({ this.setState({
showtime:false showtime:false
}) })
}, 500) }, 800)
}else{ }else{
this.setState({ this.setState({
@ -292,7 +292,7 @@ class Challengesjupyter extends Component {
}) })
this.props.showNotification('实训保存失败!'); this.props.showNotification('实训保存失败!');
}) })
}, 500) }, 800)
} }

Write Preview
Loading…
Cancel
Save