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

调整

Browse Source
PCqiandao
杨树林 5 years ago
parent ab15b118ec
commit fdbccae6c8
5 changed files with 120 additions and 94 deletions
Show Stats Download Patch File Download Diff File

4
public/react/src/modules/courses/coursesPublic/ModulationModal_exercise.js
Unescape View File

@ -42,8 +42,8 @@ class ModulationModal_exercise extends Component {
} }
componentDidMount = () => { componentDidMount = () => {
console.log("ModulationModal_exercise"); // console.log("ModulationModal_exercise");
console.log(this.props); // console.log(this.props);
this.setState({ this.setState({
subjective_score: this.props.subjective_score, subjective_score: this.props.subjective_score,
objective_score: this.props.objective_score, objective_score: this.props.objective_score,

17
public/react/src/modules/courses/exercise/ExerciseListItem.js
Unescape View File

@ -77,7 +77,6 @@ class ExerciseListItem extends Component{
const IsAdmin =this.props.isAdmin(); const IsAdmin =this.props.isAdmin();
const IsStudent =this.props.isStudent(); const IsStudent =this.props.isStudent();
// console.log(this.props.current_user.user_id)
return( return(
<div className="workList_Item" style={{cursor : IsAdmin ? "pointer" : "default",padding:"30px" }} onClick={() => window.$(`.exerciseitem${index} input`).click() }> <div className="workList_Item" style={{cursor : IsAdmin ? "pointer" : "default",padding:"30px" }} onClick={() => window.$(`.exerciseitem${index} input`).click() }>
{ {
@ -189,8 +188,24 @@ class ExerciseListItem extends Component{
{ IsAdmin &&<div className="homepagePostSetting" style={{"right":"-17px","top":"46px","display":"block","width":"200px"}}> { IsAdmin &&<div className="homepagePostSetting" style={{"right":"-17px","top":"46px","display":"block","width":"200px"}}>
{
item&&item.assistant_auth===true?
<a className="btn colorblue font-16 ml20" onClick={()=>this.toDetailPage(`/classrooms/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>查看详情</a> <a className="btn colorblue font-16 ml20" onClick={()=>this.toDetailPage(`/classrooms/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>查看详情</a>
:
<a className="btn colorblue font-16 " style={{
marginLeft: "73px"
}} onClick={()=>this.toDetailPage(`/classrooms/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>查看详情</a>
}
{
item&&item.assistant_auth===true?
<Link className="btn colorblue font-16 ml20" to={`/classrooms/${coursesId}/exercises/${item.id}/edit`}>编辑</Link> <Link className="btn colorblue font-16 ml20" to={`/classrooms/${coursesId}/exercises/${item.id}/edit`}>编辑</Link>
:
""
}
<Link className="btn colorblue ml20 font-16" to={`/classrooms/${coursesId}/exercises/${item.id}/student_exercise_list?tab=3`}>设置</Link> <Link className="btn colorblue ml20 font-16" to={`/classrooms/${coursesId}/exercises/${item.id}/student_exercise_list?tab=3`}>设置</Link>
</div> } </div> }

121
public/react/src/modules/courses/exercise/Exercisesetting.js
Unescape View File

@ -75,10 +75,11 @@ class Exercisesetting extends Component{
limit:10, limit:10,
searchtext:"", searchtext:"",
order: "end_at", order: "end_at",
assistant_auth:false
} }
console.log("Exercisesetting"); // console.log("Exercisesetting");
console.log("69"); // console.log("69");
console.log(props); // console.log(props);
} }
_getRequestParams() { _getRequestParams() {
const { order, exercise_group_id,searchtext, page ,limit} = this.state const { order, exercise_group_id,searchtext, page ,limit} = this.state
@ -92,6 +93,10 @@ class Exercisesetting extends Component{
} }
//加载 //加载
componentDidMount=()=>{ componentDidMount=()=>{
this.setState({
assistant_auth:this.props.assistant_auth,
})
this.getSettingInfo(); this.getSettingInfo();
// window.addEventListener('click', this.handleClick); // window.addEventListener('click', this.handleClick);
@ -113,6 +118,11 @@ class Exercisesetting extends Component{
if(prevProps.Commonheadofthetestpaper!= this.props.Commonheadofthetestpaper){ if(prevProps.Commonheadofthetestpaper!= this.props.Commonheadofthetestpaper){
this.editSetting() this.editSetting()
} }
if(prevProps.assistant_auth!= this.props.assistant_auth){
this.setState({
assistant_auth:this.props.assistant_auth,
})
}
} }
_getRequestParams() { _getRequestParams() {
@ -348,10 +358,16 @@ class Exercisesetting extends Component{
this.commitSetting((result)=>{ this.commitSetting((result)=>{
console.log(result) console.log(result)
if(result.status==200){ if(result.status===200){
this.props.showNotification(`${result.data.message}`); this.props.showNotification(`${result.data.message}`);
this.getSettingInfo(1); this.getSettingInfo(1);
this.cancelEdit(); this.cancelEdit();
try {
this.props.assistantauthoritys(this.state.assistant_auth);
}catch (e) {
}
} }
}) })
} }
@ -371,6 +387,12 @@ class Exercisesetting extends Component{
this.props.showNotification(`${result.data.message}`); this.props.showNotification(`${result.data.message}`);
this.cancelEdit(); this.cancelEdit();
this.getSettingInfo(1); this.getSettingInfo(1);
try {
this.props.assistantauthoritys(this.state.assistant_auth);
}catch (e) {
}
} }
}); });
@ -391,6 +413,7 @@ class Exercisesetting extends Component{
answer_open:this.state.answer_open, answer_open:this.state.answer_open,
question_random:this.state.question_random, question_random:this.state.question_random,
time:this.state.time, time:this.state.time,
assistant_auth:this.state.assistant_auth,
} }
}else{ }else{
let list=this.state.rules; let list=this.state.rules;
@ -403,7 +426,6 @@ class Exercisesetting extends Component{
} }
lists.push(newlist) lists.push(newlist)
}) })
params={ params={
unified_setting:this.state.unified_setting, unified_setting:this.state.unified_setting,
show_statistic:this.state.show_statistic, show_statistic:this.state.show_statistic,
@ -413,6 +435,7 @@ class Exercisesetting extends Component{
answer_open:this.state.answer_open, answer_open:this.state.answer_open,
publish_time_groups:lists, publish_time_groups:lists,
time:this.state.time, time:this.state.time,
assistant_auth:this.state.assistant_auth,
} }
} }
axios.post((url),params).then((result)=>{ axios.post((url),params).then((result)=>{
@ -491,6 +514,12 @@ class Exercisesetting extends Component{
}) })
} }
assistantauthority=(e)=>{
this.setState({
assistant_auth:e.target.checked
})
}
onChangeTimepublish=(date, dateString)=>{ onChangeTimepublish=(date, dateString)=>{
if(date===null){ if(date===null){
this.setState({ this.setState({
@ -608,6 +637,8 @@ class Exercisesetting extends Component{
// console.log("asdasdasda"); // console.log("asdasdasda");
// console.log(this.props); // console.log(this.props);
// console.log(this.props.Commonheadofthetestpaper); // console.log(this.props.Commonheadofthetestpaper);
return( return(
<div> <div>
<Modals <Modals
@ -769,7 +800,7 @@ class Exercisesetting extends Component{
<div className="padding20-30"> <div className="padding20-30">
<p className="mb30 clearfix font-16">公开设置</p> <p className="mb30 clearfix font-16">属性设置</p>
<div className="pl33"> <div className="pl33">
<p className="mb20"> <p className="mb20">
@ -790,7 +821,7 @@ class Exercisesetting extends Component{
</Form.Item> </Form.Item>
<span className="color-grey-c">(选中，则在试卷截止时间之后，已提交答题的学生可以查看试卷题目的答案，否则不能查看)</span> <span className="color-grey-c">(选中，则在试卷截止时间之后，已提交答题的学生可以查看试卷题目的答案，否则不能查看)</span>
</p> </p>
<p className="clearfix mb5"> <p className="clearfix mb20">
<Form.Item className="fl pollForm"> <Form.Item className="fl pollForm">
{getFieldDecorator('show_statistic') {getFieldDecorator('show_statistic')
( (
@ -799,6 +830,15 @@ class Exercisesetting extends Component{
</Form.Item> </Form.Item>
<span className="color-grey-c">(选中，则在试卷截止时间之后，已提交答题的学生可以查看答题统计，否则不能查看)</span> <span className="color-grey-c">(选中，则在试卷截止时间之后，已提交答题的学生可以查看答题统计，否则不能查看)</span>
</p> </p>
<p className="clearfix mb5">
<Form.Item className="fl pollForm">
{getFieldDecorator('assistantauthority')
(
<Checkbox disabled={this.props.isAdmin()===true?!flagPageEdit:true} className="mr15 font-16 color-grey-6" checked={this.state.assistant_auth} onChange={this.assistantauthority}>助教权限</Checkbox>
)}
</Form.Item>
<span className="color-grey-c">(勾选则允许助教查看答案)</span>
</p>
</div> </div>
</div> </div>
@ -820,70 +860,3 @@ const WrappedExercisesetting = Form.create({ name: 'exercisesetting' })(Exercise
export default WrappedExercisesetting; export default WrappedExercisesetting;
// //提交form表单
// handleSubmit = (e) => {
//
// let{unified_setting,answer_open}=this.state;
// e.preventDefault();
// let exercise_id=this.props.match.params.Id;
//
// this.props.form.validateFieldsAndScroll((err, values) => {
// debugger
// if(!err){
// // 第一次进行问卷设置或者勾选了统一设置
// if(unified_setting==true){
// if(this.state.p_flag == false && this.state.e_flag == true){
// // 选择了发布时间但截至时间没有选择
// this.setState({
// modalsType:true,
// modalsTopval:"请选择截止时间",
// loadtype:true,
// modalSave:this.cancelBox
// })
// return;
// }else if(this.state.p_flag == true && this.state.e_flag == true){
// // 如果两个时间都没有填写则弹出立即发布弹框
// let{publish_time,end_time}=this.state
// if(publish_time==undefined && end_time ==undefined){
//
// }else{
// // 否则就是选择的时间错误
// this.setState({
// modalsType:true,
// modalsTopval:"请选择正确的发布时间和截止时间",
// loadtype:true,
// modalSave:this.cancelBox
// })
// }
// return;
// }
// }
//
// let url=`/exercises/${exercise_id}/commit_setting.json`;
// let params=[];
// if(values.unitSet){
// params={
// unified_setting:values.unitSet,
// publish_time:this.state.publish_time,
// end_time:this.state.end_time,
// show_result:values.public,
// un_anonymous:values.real
// }
// }else{
// params={
// unified_setting:values.unitSet,
// show_result:values.public,
// un_anonymous:values.real,
// publish_time_groups:this.state.rules
// }
// }
// axios.post((url),{params}).then((result)=>{
// if(result.status==200){
// this.props.showNotification(`${result.data.message}`);
// }
// }).catch((error)=>{
// console.log(error);
// })
// }
// })
// }

38
public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
Unescape View File

@ -1158,8 +1158,19 @@ class Studentshavecompletedthelist extends Component {
<span> <span>
{ {
record.submitstate === "未提交"||record.commit_method===5? record.submitstate === "未提交"||record.commit_method===5?
(
this.props.assistant_auth&&this.props.assistant_auth===true?
(
this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status===3?
<a style={{textAlign: "center"}} className="color-blue"
target="_blank" onClick={() => this.Adjustment(record.user_id)}>评阅</a>
:
<span style={{textAlign: "center", color: '#999999'}}>--</span>
)
:
<a style={{textAlign: "center"}} className="color-blue" <a style={{textAlign: "center"}} className="color-blue"
target="_blank" onClick={() => this.Adjustment(record.user_id)}>评阅</a> target="_blank" onClick={() => this.Adjustment(record.user_id)}>评阅</a>
)
:record.submitstate === "已提交"? :record.submitstate === "已提交"?
<a style={{textAlign: "center"}} className="color-blue" <a style={{textAlign: "center"}} className="color-blue"
target="_blank" target="_blank"
@ -1376,8 +1387,19 @@ class Studentshavecompletedthelist extends Component {
<span> <span>
{ {
record.submitstate === "未提交"||record.commit_method===5? record.submitstate === "未提交"||record.commit_method===5?
(
this.props.assistant_auth&&this.props.assistant_auth===true?
(
this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status===3?
<a style={{textAlign: "center"}} className="color-blue"
target="_blank" onClick={() => this.Adjustment(record.user_id)}>评阅</a>
:
<span style={{textAlign: "center", color: '#999999'}}>--</span>
)
:
<a style={{textAlign: "center"}} className="color-blue" <a style={{textAlign: "center"}} className="color-blue"
target="_blank" onClick={() => this.Adjustment(record.user_id)}>评阅</a> target="_blank" onClick={() => this.Adjustment(record.user_id)}>评阅</a>
)
:record.submitstate === "已提交"? :record.submitstate === "已提交"?
<a style={{textAlign: "center"}} className="color-blue" <a style={{textAlign: "center"}} className="color-blue"
target="_blank" target="_blank"
@ -2772,8 +2794,16 @@ class Studentshavecompletedthelist extends Component {
} }
// 调分 // 调分
Adjustment = (e) => { Adjustment = (e) => {
console.log("Adjustment"); // console.log("Adjustment");
console.log(e); // console.log(e);
if(this.state.objective_score===0&&this.state.subjective_score===0){
this.props.showNotification('试卷题型分被限制为0分，不能调分，请到编辑试卷中修改题型分数');
return
}
this.setState({ this.setState({
testpapergradingboll: true, testpapergradingboll: true,
exeuserid: e, exeuserid: e,
@ -2828,8 +2858,8 @@ class Studentshavecompletedthelist extends Component {
// //console.log("this.props.Commonheadofthetestpaper.exercise_status"); // //console.log("this.props.Commonheadofthetestpaper.exercise_status");
// //console.log(this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status); // //console.log(this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status);
// //console.log(exercise_status); // //console.log(exercise_status);
console.log("Studentshavecompletedthelis123123t"); // console.log("Studentshavecompletedthelis123123t");
console.log(columnss); // console.log(columnss);
return ( return (
isAdmin === true ? isAdmin === true ?
( (

18
public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
Unescape View File

@ -35,6 +35,7 @@ class Testpapersettinghomepage extends Component{
DownloadMessageval:undefined, DownloadMessageval:undefined,
donwloading:false, donwloading:false,
exercise_status:3, exercise_status:3,
assistant_auth:false, //设置助教
} }
} }
//切换tab //切换tab
@ -72,6 +73,7 @@ class Testpapersettinghomepage extends Component{
Commonheadofthetestpaper:response.data, Commonheadofthetestpaper:response.data,
current_status:response.data.user_permission.current_status, current_status:response.data.user_permission.current_status,
exercise_status:response.data.exercise_status, exercise_status:response.data.exercise_status,
assistant_auth:response.data.assistant_auth,
}) })
// console.log(JSON.stringify(response.data.show_statistic)); // console.log(JSON.stringify(response.data.show_statistic));
@ -85,6 +87,12 @@ class Testpapersettinghomepage extends Component{
} }
assistantauthoritys=(bool)=>{
this.setState({
assistant_auth:bool,
})
}
Ecerciseacallagain=()=>{ Ecerciseacallagain=()=>{
this.setState({ this.setState({
visible:true visible:true
@ -287,7 +295,7 @@ class Testpapersettinghomepage extends Component{
this.props.history.goBack() this.props.history.goBack()
} }
render(){ render(){
let {tab,visible,Commonheadofthetestpaper,exercise_status}=this.state; let {tab,visible,Commonheadofthetestpaper,exercise_status,assistant_auth}=this.state;
const isAdmin =this.props.isAdmin(); const isAdmin =this.props.isAdmin();
const isStudent = this.props.isStudent(); const isStudent = this.props.isStudent();
// TODO // TODO
@ -461,22 +469,22 @@ class Testpapersettinghomepage extends Component{
/> />
{ {
// 教师列表 // 教师列表
parseInt(tab[0])==0 ? <Studentshavecompletedthelist {...this.props} {...this.state} triggerRef={this.bindRef} setcourse_groupysls={(value)=>this.setcourse_groupysls(value)} current_status = {this.state.current_status} Commonheadofthetestpaper={this.state.Commonheadofthetestpaper} yslstustate={[`${polls_status[Commonheadofthetestpaper && Commonheadofthetestpaper.exercise_status]}`]}></Studentshavecompletedthelist>:"" parseInt(tab[0])==0 ? <Studentshavecompletedthelist {...this.props} {...this.state} assistant_auth={assistant_auth} triggerRef={this.bindRef} setcourse_groupysls={(value)=>this.setcourse_groupysls(value)} current_status = {this.state.current_status} Commonheadofthetestpaper={this.state.Commonheadofthetestpaper} yslstustate={[`${polls_status[Commonheadofthetestpaper && Commonheadofthetestpaper.exercise_status]}`]}></Studentshavecompletedthelist>:""
} }
{/*统计结果*/} {/*统计结果*/}
{ {
parseInt(tab[0])==1 ? <Exercisestatisticalresult {...this.props} {...this.state} triggerRef={this.bindRef}></Exercisestatisticalresult>:"" parseInt(tab[0])==1 ? <Exercisestatisticalresult {...this.props} {...this.state} assistant_auth={assistant_auth} triggerRef={this.bindRef}></Exercisestatisticalresult>:""
} }
{ {
parseInt(tab[0])==2 ? <ExerciseDisplay {...this.props} {...this.state} triggerRef={this.bindRef}></ExerciseDisplay>:"" parseInt(tab[0])==2 ? <ExerciseDisplay {...this.props} {...this.state} assistant_auth={assistant_auth} triggerRef={this.bindRef}></ExerciseDisplay>:""
} }
{ {
parseInt(tab[0])==3 ? <WrappedExercisesetting Commonheadofthetestpaper={this.state.Commonheadofthetestpaper} {...this.props} {...this.state} triggerRef={this.bindRef} Commonheadofthetestpapers={this.Commonheadofthetestpaper}></WrappedExercisesetting>:"" parseInt(tab[0])==3 ? <WrappedExercisesetting Commonheadofthetestpaper={this.state.Commonheadofthetestpaper} {...this.props} {...this.state} assistant_auth={assistant_auth} triggerRef={this.bindRef} Commonheadofthetestpapers={this.Commonheadofthetestpaper} assistantauthoritys={(bool)=>this.assistantauthoritys(bool)}></WrappedExercisesetting>:""
} }
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save