{coursedata.teacher_applies_count===undefined?"":coursedata.teacher_applies_count>0?
您有{coursedata.teacher_applies_count}条新的加入申请
- this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/teachers?tab=2")}>
+ this.setHistoryFun("/classrooms/"+this.props.match.params.coursesId+"/teachers?tab=2")}>
待审批
:""}}>
- this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/teachers")}>
+ this.setHistoryFun("/classrooms/"+this.props.match.params.coursesId+"/teachers")}>
教师
{coursedata.teacher_count}
@@ -763,7 +763,7 @@ background:rgba(204,204,204,0.2) !important;
共{exercises_counts && exercises_counts.exercises_total_counts}个试卷 已发布：{exercises_counts && exercises_counts.exercises_published_counts}个 - 未发布：{exercises_counts && exercises_counts.exercises_unpublish_counts}个 + 未发布：{exercises_counts && exercises_counts.exercises_unpublish_counts}个
- {/*{item.exercise_name}*/} + {/*{item.exercise_name}*/} { this.props.isAdmin()? this.toDetailPage(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>{item.exercise_name}:"" + onClick={()=>this.toDetailPage(`/classrooms/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>{item.exercise_name}:"" } { this.props.isStudent()? - this.toDetailPage(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>{item.exercise_name}:"" + this.toDetailPage(`/classrooms/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>{item.exercise_name}:"" } { this.props.isNotMember()? item.lock_status === 0 ? {item.exercise_name} - : this.toDetailPage(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>{item.exercise_name}:"" + : this.toDetailPage(`/classrooms/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>{item.exercise_name}:"" } { @@ -189,9 +189,9 @@ class ExerciseListItem extends Component{ { IsAdmin &&
- */}
- {/*
- 编辑 */} + {/*
- 编辑 */} {/*
- 设置 */} @@ -216,10 +216,10 @@ class ExerciseListItem extends Component{ { IsStudent &&
- this.toDetailPage(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>查看详情 - {item.current_status ===0&&item.exercise_status>1?
- 继续答题 : - item.current_status ===1&&item.exercise_status>1?
- 查看答题 : - item.current_status ===2&&item.exercise_status>1?
- this.setgameexercise(`/courses/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`)}>开始答题 :""} +
- this.toDetailPage(`/classrooms/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>查看详情 + {item.current_status ===0&&item.exercise_status>1?
- 继续答题 : + item.current_status ===1&&item.exercise_status>1?
- 查看答题 : + item.current_status ===2&&item.exercise_status>1?
- this.setgameexercise(`/classrooms/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`)}>开始答题 :""}
- this.toDetailPage(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>查看详情 +
- this.toDetailPage(`/classrooms/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>查看详情
{this.isEdit ? "编辑" : "新建"}试卷 - this.props.history.length == 1 ? : this.props.history.goBack() - onClick={() => this.props.history.push(`/courses/${courseId}/exercises/${left_banner_id}`)}> + onClick={() => this.props.history.push(`/classrooms/${courseId}/exercises/${left_banner_id}`)}> 返回
@@ -91,4 +91,4 @@ class ExerciceNew extends Component{ } } // RouteHOC() -export default (ExerciceNew); \ No newline at end of file +export default (ExerciceNew); diff --git a/public/react/src/modules/courses/exercise/ExerciseNewCommon.js b/public/react/src/modules/courses/exercise/ExerciseNewCommon.js index 6d7c72b13..736f44308 100644 --- a/public/react/src/modules/courses/exercise/ExerciseNewCommon.js +++ b/public/react/src/modules/courses/exercise/ExerciseNewCommon.js @@ -79,7 +79,7 @@ class ExerciseNewCommon extends Component{ } fetchExercise = () => { - const Id = this.props.match.params.Id + const Id = this.props.match.params.Id this.isEdit = this.props.isEdit || !!Id if (this.isEdit) { const url = this.props.exercise_url ? `/${this.props.exercise_url }/${Id}.json` : `/exercises/${Id}/edit.json` @@ -194,15 +194,15 @@ class ExerciseNewCommon extends Component{ } if (exercise_questions[index].question_id) { // 编辑 this.setState( - (prevState) => ({ + (prevState) => ({ exercise_questions : update(prevState.exercise_questions, {[index]: { isNew: {$set: false}}}) - // update(prevState.exercise_questions, {$splice: [[index, 1]]}) + // update(prevState.exercise_questions, {$splice: [[index, 1]]}) }) ) } else { // 新建 this.setState( - (prevState) => ({ - exercise_questions : update(prevState.exercise_questions, {$splice: [[index, 1]]}) + (prevState) => ({ + exercise_questions : update(prevState.exercise_questions, {$splice: [[index, 1]]}) }) ) } @@ -214,7 +214,7 @@ class ExerciseNewCommon extends Component{ } if (this._checkIsEditing()) { return; - } + } if (type == Q_TYPE_SHIXUN) { this.addShixun(question_id_to_insert_after) } else { @@ -237,7 +237,7 @@ class ExerciseNewCommon extends Component{ // TODO 弹框选择实训 if (this._checkIsEditing()) { return; - } + } this.refs.shixunChooseModal.setVisible(true) this.question_id_to_insert_after = question_id_to_insert_after; return; @@ -249,11 +249,11 @@ class ExerciseNewCommon extends Component{ editQestion = (index) => { if (this._checkIsEditing()) { return; - } + } this.editingId = `#question_${index}` this.setState( - (prevState) => ({ + (prevState) => ({ exercise_questions : update(prevState.exercise_questions, {[index]: { isNew: {$set: true}}}) }) ) @@ -261,8 +261,8 @@ class ExerciseNewCommon extends Component{ onSort = (index, question_id, isUp) => { if (this._checkIsEditing()) { return; - } - + } + const url = `/${this.props.exercise_url_questions || 'exercise_questions'}/${question_id}/up_down.json` axios.post(url, { opr: isUp ? 'up' : 'down'}) .then((response) => { @@ -305,16 +305,16 @@ class ExerciseNewCommon extends Component{ const _indexBefore = question_id_to_insert_after ? this.findIndexById(question_id_to_insert_after) : this.state.exercise_questions.length - 1 for (let i = _indexBefore; i >= 0; i--) { if(this.state.exercise_questions[i].question_type == question_type) { - init_question_score = this.state.exercise_questions[i].question_score + init_question_score = this.state.exercise_questions[i].question_score break; } } return init_question_score; } addEditingQuestion = (question_type, question_id_to_insert_after, otherAttributes) => { - + let init_question_score = this.getInitScore(question_type, question_id_to_insert_after) - + let questionObj = { question_type: question_type, // 需要这个通过类型判断 init_question_score: init_question_score, @@ -325,7 +325,7 @@ class ExerciseNewCommon extends Component{ const { exercise_questions } = this.state; let new_exercise_questions = exercise_questions.slice(0) let newIndex = new_exercise_questions.length; - + if (question_id_to_insert_after) { const _indexBefore = this.findIndexById(question_id_to_insert_after) new_exercise_questions.splice(_indexBefore + 1, 0, questionObj) @@ -347,7 +347,7 @@ class ExerciseNewCommon extends Component{ return i; } } - } + } onQestionDelete = (question_id) => { this.props.confirm({ content: `确认要删除这个问题吗？`, @@ -363,15 +363,15 @@ class ExerciseNewCommon extends Component{ // const index = this.findIndexById(question_id) // this.setState( - // (prevState) => ({ - // exercise_questions : update(prevState.exercise_questions, {$splice: [[index, 1]]}) + // (prevState) => ({ + // exercise_questions : update(prevState.exercise_questions, {$splice: [[index, 1]]}) // }) // ) } }) .catch(function (error) { console.log(error); - }); + }); } }) } @@ -382,14 +382,14 @@ class ExerciseNewCommon extends Component{ goToPreview = () => { const exercise_id = this.props.match.params.Id const courseId = this.props.match.params.coursesId - this.props.history.push(`/courses/${courseId}/exercises/${exercise_id}/student_exercise_list?tab=2`) + this.props.history.push(`/classrooms/${courseId}/exercises/${exercise_id}/student_exercise_list?tab=2`) } getAddQuestionUrl = () => { - const Id = this.props.match.params.Id + const Id = this.props.match.params.Id const url = this.props.exercise_url_questions ? `/${this.props.exercise_url_questions}.json` : `/exercises/${Id}/exercise_questions.json` return url; } - getEditQuestionUrl = (question_id) => { + getEditQuestionUrl = (question_id) => { const editUrl = this.props.exercise_url_questions ? `/${this.props.exercise_url_questions}/${question_id}.json` : `/exercise_questions/${question_id}.json` return editUrl; } @@ -400,7 +400,7 @@ class ExerciseNewCommon extends Component{ // return '' // } // const { getFieldDecorator } = this.props.form; - const { q_counts, q_scores, q_doubles, q_doubles_scores, q_judges, q_judges_scores, + const { q_counts, q_scores, q_doubles, q_doubles_scores, q_judges, q_judges_scores, q_mains, q_mains_scores, q_nulls, q_nulls_scores, q_shixuns, q_shixuns_scores, q_singles, q_singles_scores} = exercise_types; const formItemLayout = { labelCol: { @@ -458,7 +458,7 @@ class ExerciseNewCommon extends Component{ max-width: 1128px; } `} - + {!this.state.editMode &&
@@ -544,7 +544,7 @@ class ExerciseNewCommon extends Component{
{ !!q_shixuns && 实训题{q_shixuns}题，共{q_shixuns_scores}分 }
- { !!q_counts &&
+ { !!q_counts &&
合计 {q_counts} 题，
共 100 ? 'color-red font-bd' : 'color-orange'}`}>{q_scores} 分
@@ -582,7 +582,7 @@ class ExerciseNewCommon extends Component{
}
} else if (item.question_type == 5) {
if (item.isNew) {
- return
- {this.props.coursedata.name}
+ {this.props.coursedata.name}
>
- 试卷
+ 试卷
>
@@ -301,15 +301,15 @@ class GraduateTaskItem extends Component{
{
- this.props.isAdmin?this.toDetailPage("/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/list")}
+ this.props.isAdmin?this.toDetailPage("/classrooms/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/list")}
title={discussMessage.name}
className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}:""
}
{
- this.props.isStudent? this.toDetailPage("/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/list")}
+ this.props.isStudent? this.toDetailPage("/classrooms/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/list")}
title={discussMessage.name}
className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}:""
}
@@ -248,7 +248,7 @@ class GraduateTaskItem extends Component{
{
this.props.isNotMember===true?this.props.discussMessage.private_icon===true?
{discussMessage.name}
- :this.toDetailPage("/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/"+taskid+"/list")}
+ :this.toDetailPage("/classrooms/"+coursesId+"/graduation_tasks/"+categoryid+"/"+taskid+"/list")}
title={discussMessage.name}
className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}:""
}
@@ -267,7 +267,7 @@ class GraduateTaskItem extends Component{
{/* { !!discussMessage.sticky && 置顶 } */}
-
+