window.$(`.topicItem${index} input`).click() }>
- { isAdmin ? checkBox : ""}
+ { isAdmin ?
-
- {/*
*/}
-
-
-
-
-
-
-
-
-
-
-
- { loading || users.length ?
- {/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
-
-
-
-
- { users.map( candidate => {
- return (
-
-
-
- 12 }>
-
-
-
-
- 12 }>
-
-
-
-
-
-
-
- )
- }) }
-
- {loading && hasMore && (
-
-
-
- )}
-
-
-
- {course_groups && course_groups.length &&
- 所选学生分班至(选填):
-
-
}
-
-
- )
- }
-}
-
-AddStudentModal.contextType = ThemeContext;
-export default AddStudentModal;
+import React, { Component } from "react";
+import { Modal, Checkbox, Input, Spin, Select, Divider } from "antd";
+import axios from 'axios'
+import ModalWrapper from "../../common/ModalWrapper"
+import InfiniteScroll from 'react-infinite-scroller';
+import { ROLE_TEACHER_NUM, ROLE_ASSISTANT_NUM } from '../common'
+import NoneData from '../../coursesPublic/NoneData'
+import { ConditionToolTip, ThemeContext } from 'educoder'
+import SchoolSelect from '../../coursesPublic/form/SchoolSelect'
+
+const Option = Select.Option;
+const pageCount = 15;
+class AddStudentModal extends Component{
+ constructor(props){
+ super(props);
+ this.state={
+ checkBoxValues: [],
+ users: [],
+ hasMore: true,
+ loading: false,
+ courseGroup: '',
+ page: 1,
+ isSpin:false
+ }
+ }
+ fetchMemberList = (arg_page) => {
+ const courseId = this.props.match.params.coursesId
+ const page = arg_page || this.state.page;
+ const { name, school_name } = this.state
+ let url = `/courses/${courseId}/search_users.json?page=${page}&limit=${pageCount}&school_name=${school_name || ''}&name=${name || ''}`
+ this.setState({ loading: true })
+ axios.get(url)
+ .then((response) => {
+ if (!response.data.users || response.data.users.length == 0) {
+ this.setState({
+ users: page == 1 ? response.data.users : this.state.users,
+ page,
+ loading: false,
+ hasMore: false,
+ })
+ } else {
+ this.setState({
+ users: page == 1 ? response.data.users : this.state.users.concat(response.data.users),
+ page,
+ loading: false,
+ hasMore: response.data.users.length == pageCount
+ })
+ }
+
+ })
+ .catch(function (error) {
+ console.log(error);
+ });
+ }
+ componentDidMount() {
+
+
+ }
+ fetchOptions = () => {
+ // add_teacher_popup
+ const courseId = this.props.match.params.coursesId
+
+ let url = `/courses/${courseId}/all_course_groups.json`
+
+ axios.get(url, {
+ })
+ .then((response) => {
+ if (response.data.course_groups && response.data.course_groups.length) {
+ this.setState({
+ course_groups: response.data.course_groups,
+ courseGroup: response.data.course_groups[0].id
+ })
+ } else {
+ // showNotification('')
+ }
+ })
+ .catch(function (error) {
+ console.log(error);
+ });
+ }
+ setVisible = (visible) => {
+ if (visible) {
+ this.setState({school_name: this.props.user.user_school})
+ this.fetchMemberList()
+ this.fetchOptions()
+ }
+ this.refs.modalWrapper.setVisible(visible)
+ if (visible == false) {
+ this.setState({
+ checkBoxValues: []
+ })
+ }
+ }
+
+ onSendOk = () => {
+
+ if(!this.state.checkBoxValues || this.state.checkBoxValues.length == 0) {
+ this.props.showNotification('请从列表中先选择用户。')
+ return;
+ }
+ this.setState({
+ isSpin:true
+ })
+ const courseId = this.props.match.params.coursesId
+ const url = `/courses/${courseId}/add_students_by_search.json`
+ const params = {
+ "user_ids": this.state.checkBoxValues
+ }
+ const { courseGroup } = this.state
+ if (courseGroup) {
+ params.course_group_id = courseGroup
+ }
+ axios.post(url, params)
+ .then((response) => {
+ if (response.data.status == 0) {
+ this.setVisible(false)
+ this.props.showNotification('添加成功')
+ this.props.addStudentSuccess && this.props.addStudentSuccess(params)
+ this.setState({
+ isSpin:false
+ })
+ }
+ })
+ .catch(function (error) {
+ console.log(error);
+ });
+ }
+
+ onOk = () => {
+ this.onSendOk()
+ }
+
+ onCheckBoxChange = (checkBoxValues) => {
+ this.setState({
+ checkBoxValues: checkBoxValues
+ })
+ }
+
+ handleInfiniteOnLoad = () => {
+ this.fetchMemberList(this.state.page + 1)
+ }
+
+ onSearch = () => {
+ this.fetchMemberList(1)
+ }
+ handleCourseGroupChange = (value) => {
+ this.setState({
+ courseGroup: value
+ })
+ }
+ render(){
+ const { users, checkBoxValues, loading, hasMore, name, school_name
+ , courseGroup, course_groups,isSpin } = this.state
+ const { moduleName } = this.props
+ let theme = this.context;
+ return(
+
+
+
+ {/* */}
+
+
+
+
+
+
+
+
+
+
+
+ { loading || users.length ?
+ {/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
+
+
+
+
+ { users.map( candidate => {
+ return (
+
+
+
+ 12 }>
+
+
+
+
+ 12 }>
+
+
+
+
+
+
+
+ )
+ }) }
+
+ {loading && hasMore && (
+
+
+
+ )}
+
+
+
+ {course_groups && course_groups.length &&
+ 所选学生分班至(选填):
+
+
}
+
+ )
+ }
+}
+
+AddStudentModal.contextType = ThemeContext;
+export default AddStudentModal;
diff --git a/public/react/src/modules/courses/members/modal/AddTeacherModal.js b/public/react/src/modules/courses/members/modal/AddTeacherModal.js
index 21902a782..b397f7838 100644
--- a/public/react/src/modules/courses/members/modal/AddTeacherModal.js
+++ b/public/react/src/modules/courses/members/modal/AddTeacherModal.js
@@ -1,355 +1,355 @@
-import React, { Component } from "react";
-import { Modal, Checkbox, Input, Spin, Select, Divider, Icon } from "antd";
-import axios from 'axios'
-import ModalWrapper from "../../common/ModalWrapper"
-import InfiniteScroll from 'react-infinite-scroller';
-import { ROLE_TEACHER_NUM, ROLE_ASSISTANT_NUM } from '../common'
-import { ConditionToolTip, ActionBtn } from 'educoder'
-import NoneData from '../../coursesPublic/NoneData'
-import AddGraduationGroupModal from './AddGraduationGroupModal'
-import SchoolSelect from '../../coursesPublic/form/SchoolSelect'
-
-const Option = Select.Option;
-const pageCount = 15;
-let timeout, currentValue
-class AddTeacherModal extends Component{
- constructor(props){
- super(props);
- this.state={
- school_names: [],
- checkBoxValues: [],
- candidates: [],
- hasMore: true,
- loading: false,
- page: 1
- }
- }
- fetchMemberList = (arg_page) => {
- const courseId = this.props.match.params.coursesId
- const page = arg_page || this.state.page;
- const { name, school_name } = this.state
- let url = `/courses/${courseId}/search_teacher_candidate.json`
- this.setState({ loading: true })
- axios.post(url, {
- page: page,
- limit: pageCount,
- school_name: school_name || '',
- name: name || ''
- })
- .then((response) => {
- if (!response.data.candidates || response.data.candidates.length == 0) {
- this.setState({
- candidates: page == 1 ? response.data.candidates : this.state.candidates,
- page,
- loading: false,
- hasMore: false,
- })
- } else {
- this.setState({
- candidates: page == 1 ? response.data.candidates : this.state.candidates.concat(response.data.candidates),
- page,
- loading: false,
- hasMore: response.data.candidates.length == pageCount
- })
- }
-
- })
- .catch(function (error) {
- console.log(error);
- });
- }
- componentDidMount() {
-
-
- }
- onAddGraduationGroupOk = () => {
- this.fetchOptions()
- }
- fetchOptions = () => {
- // add_teacher_popup
- const courseId = this.props.match.params.coursesId
-
- let url = `/courses/${courseId}/add_teacher_popup.json`
-
- axios.get(url, {
- })
- .then((response) => {
-
- if (response.data.school_name) {
- this.setState({
- school_name: response.data.school_name
- }, () => this.fetchMemberList())
- } else {
- this.fetchMemberList()
-
- }
- if (response.data.graduation_groups) {
- this.setState({
- graduation_groups: response.data.graduation_groups
- })
- }
- if (response.data.course_groups) {
- this.setState({
- course_groups: response.data.course_groups
- })
- }
-
- })
- .catch(function (error) {
- console.log(error);
- });
- }
- setVisible = (visible) => {
- if (visible) {
- this.fetchOptions()
- }
- this.refs.modalWrapper.setVisible(visible)
- if (visible == false) {
- this.setState({
- checkBoxValues: []
- })
- }
- }
-
- onSendOk = () => {
- const courseId = this.props.match.params.coursesId
- const url = `/courses/${courseId}/add_teacher.json`
- if (this.state.checkBoxValues.length == 0) {
- this.props.showNotification('请先在下面列表中选择要添加教师的成员')
- return
- }
- const params = {
- "user_list": this.state.checkBoxValues.map (item => { return { 'user_id': item }}) ,
- // "graduation_group_id": "2",
- // "course_group_id": "820",
- "role": this.props.isTeacher ? ROLE_TEACHER_NUM : ROLE_ASSISTANT_NUM
- }
- const { graduationGroup, courseGroup } = this.state
- if (graduationGroup) {
- params.graduation_group_id = graduationGroup
- }
- if (courseGroup) {
- params.course_group_id = courseGroup
- }
- axios.post(url, params)
- .then((response) => {
- if (response.data.status == 0) {
- this.setVisible(false)
- this.props.showNotification('添加成功')
- this.props.addTeacherSuccess && this.props.addTeacherSuccess(params)
- }
- })
- .catch(function (error) {
- console.log(error);
- });
- }
-
- onOk = () => {
- this.onSendOk()
- }
-
- onCheckBoxChange = (checkBoxValues) => {
- this.setState({
- checkBoxValues: checkBoxValues
- })
- }
-
- handleInfiniteOnLoad = () => {
- this.fetchMemberList(this.state.page + 1)
- }
-
- onSearch = () => {
- this.fetchMemberList(1)
- }
- handleGradationGroupChange = (value) => {
- this.setState({
- graduationGroup: value
- })
- }
- handleCourseGroupChange = (value) => {
- this.setState({
- courseGroup: value
- })
- }
- onOrgNameChange = (value) => {
- // console.log('school_name: ', value)
- this.setState({ school_name: value })
- }
-
- hasGraduationModule = () => {
- const { course_modules } = this.props;
- const result = course_modules && course_modules.filter( item => {
- return item.type == 'graduation'
- })
- return result && result.length > 0
- }
-
- render(){
- const { candidates, checkBoxValues, loading, hasMore, name, school_name, school_names
- , graduationGroup, graduation_groups, courseGroup, course_groups } = this.state
- const { moduleName } = this.props
-
- return(
-
-
-
-
- {/* graduation_groups && !!graduation_groups.length */}
-
-
-
-
-
-
-
-
-
-
- { loading || candidates.length ?
- {/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
-
-
-
-
- { candidates && candidates.map( candidate => {
- return (
-
-
-
- {/* "color":"#4c4c4c" */}
- 12 }>
-
-
-
-
- 12 }>
-
-
-
-
-
-
-
- )
- }) }
-
- {loading && hasMore && (
-
-
-
- )}
-
-
-
-
- { this.hasGraduationModule() &&
-
添加至答辩组:
-
-
}
-
- { course_groups && !!course_groups.length &&
- 管理权限:
-
-
}
-
- )
- }
-}
-export default AddTeacherModal;
+import React, { Component } from "react";
+import { Modal, Checkbox, Input, Spin, Select, Divider, Icon } from "antd";
+import axios from 'axios'
+import ModalWrapper from "../../common/ModalWrapper"
+import InfiniteScroll from 'react-infinite-scroller';
+import { ROLE_TEACHER_NUM, ROLE_ASSISTANT_NUM } from '../common'
+import { ConditionToolTip, ActionBtn } from 'educoder'
+import NoneData from '../../coursesPublic/NoneData'
+import AddGraduationGroupModal from './AddGraduationGroupModal'
+import SchoolSelect from '../../coursesPublic/form/SchoolSelect'
+
+const Option = Select.Option;
+const pageCount = 15;
+let timeout, currentValue
+class AddTeacherModal extends Component{
+ constructor(props){
+ super(props);
+ this.state={
+ school_names: [],
+ checkBoxValues: [],
+ candidates: [],
+ hasMore: true,
+ loading: false,
+ page: 1
+ }
+ }
+ fetchMemberList = (arg_page) => {
+ const courseId = this.props.match.params.coursesId
+ const page = arg_page || this.state.page;
+ const { name, school_name } = this.state
+ let url = `/courses/${courseId}/search_teacher_candidate.json`
+ this.setState({ loading: true })
+ axios.post(url, {
+ page: page,
+ limit: pageCount,
+ school_name: school_name || '',
+ name: name || ''
+ })
+ .then((response) => {
+ if (!response.data.candidates || response.data.candidates.length == 0) {
+ this.setState({
+ candidates: page == 1 ? response.data.candidates : this.state.candidates,
+ page,
+ loading: false,
+ hasMore: false,
+ })
+ } else {
+ this.setState({
+ candidates: page == 1 ? response.data.candidates : this.state.candidates.concat(response.data.candidates),
+ page,
+ loading: false,
+ hasMore: response.data.candidates.length == pageCount
+ })
+ }
+
+ })
+ .catch(function (error) {
+ console.log(error);
+ });
+ }
+ componentDidMount() {
+
+
+ }
+ onAddGraduationGroupOk = () => {
+ this.fetchOptions()
+ }
+ fetchOptions = () => {
+ // add_teacher_popup
+ const courseId = this.props.match.params.coursesId
+
+ let url = `/courses/${courseId}/add_teacher_popup.json`
+
+ axios.get(url, {
+ })
+ .then((response) => {
+
+ if (response.data.school_name) {
+ this.setState({
+ school_name: response.data.school_name
+ }, () => this.fetchMemberList())
+ } else {
+ this.fetchMemberList()
+
+ }
+ if (response.data.graduation_groups) {
+ this.setState({
+ graduation_groups: response.data.graduation_groups
+ })
+ }
+ if (response.data.course_groups) {
+ this.setState({
+ course_groups: response.data.course_groups
+ })
+ }
+
+ })
+ .catch(function (error) {
+ console.log(error);
+ });
+ }
+ setVisible = (visible) => {
+ if (visible) {
+ this.fetchOptions()
+ }
+ this.refs.modalWrapper.setVisible(visible)
+ if (visible == false) {
+ this.setState({
+ checkBoxValues: []
+ })
+ }
+ }
+
+ onSendOk = () => {
+ const courseId = this.props.match.params.coursesId
+ const url = `/courses/${courseId}/add_teacher.json`
+ if (this.state.checkBoxValues.length == 0) {
+ this.props.showNotification('请先在下面列表中选择要添加教师的成员')
+ return
+ }
+ const params = {
+ "user_list": this.state.checkBoxValues.map (item => { return { 'user_id': item }}) ,
+ // "graduation_group_id": "2",
+ // "course_group_id": "820",
+ "role": this.props.isTeacher ? ROLE_TEACHER_NUM : ROLE_ASSISTANT_NUM
+ }
+ const { graduationGroup, courseGroup } = this.state
+ if (graduationGroup) {
+ params.graduation_group_id = graduationGroup
+ }
+ if (courseGroup) {
+ params.course_group_id = courseGroup
+ }
+ axios.post(url, params)
+ .then((response) => {
+ if (response.data.status == 0) {
+ this.setVisible(false)
+ this.props.showNotification('添加成功')
+ this.props.addTeacherSuccess && this.props.addTeacherSuccess(params)
+ }
+ })
+ .catch(function (error) {
+ console.log(error);
+ });
+ }
+
+ onOk = () => {
+ this.onSendOk()
+ }
+
+ onCheckBoxChange = (checkBoxValues) => {
+ this.setState({
+ checkBoxValues: checkBoxValues
+ })
+ }
+
+ handleInfiniteOnLoad = () => {
+ this.fetchMemberList(this.state.page + 1)
+ }
+
+ onSearch = () => {
+ this.fetchMemberList(1)
+ }
+ handleGradationGroupChange = (value) => {
+ this.setState({
+ graduationGroup: value
+ })
+ }
+ handleCourseGroupChange = (value) => {
+ this.setState({
+ courseGroup: value
+ })
+ }
+ onOrgNameChange = (value) => {
+ // console.log('school_name: ', value)
+ this.setState({ school_name: value })
+ }
+
+ hasGraduationModule = () => {
+ const { course_modules } = this.props;
+ const result = course_modules && course_modules.filter( item => {
+ return item.type == 'graduation'
+ })
+ return result && result.length > 0
+ }
+
+ render(){
+ const { candidates, checkBoxValues, loading, hasMore, name, school_name, school_names
+ , graduationGroup, graduation_groups, courseGroup, course_groups } = this.state
+ const { moduleName } = this.props
+
+ return(
+
+
+
+
+ {/* graduation_groups && !!graduation_groups.length */}
+
+
+
+
+
+
+
+
+
+
+ { loading || candidates.length ?
+ {/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
+
+
+
+
+ { candidates && candidates.map( candidate => {
+ return (
+
+
+
+ {/* "color":"#4c4c4c" */}
+ 12 }>
+
+
+
+
+ 12 }>
+
+
+
+
+
+
+
+ )
+ }) }
+
+ {loading && hasMore && (
+
+
+
+ )}
+
+
+
+
+ { this.hasGraduationModule() &&
+
添加至答辩组:
+
+
}
+
+ { course_groups && !!course_groups.length &&
+ 管理权限:
+
+
}
+
+ )
+ }
+}
+export default AddTeacherModal;
diff --git a/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js b/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js
index 54c0df912..d5e77da9d 100644
--- a/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js
+++ b/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js
@@ -13,12 +13,15 @@ class CreateGroupByImportModal extends Component{
constructor(props){
super(props);
this.state={
- errorTip:undefined
}
}
-
+ fetchMemberList = (arg_page) => {
+ }
+ componentDidMount() {
+
+
+ }
onSendOk = () => {
-
const courseId = this.props.match.params.coursesId
let url = `/courses/${courseId}/create_group_by_importing_file.json`
@@ -109,7 +112,7 @@ class CreateGroupByImportModal extends Component{
render(){
const { candidates, checkBoxValues, loading, hasMore, name, school_name, school_names
- , graduationGroup, graduation_groups, courseGroup, course_groups , fileList , errorTip } = this.state
+ , graduationGroup, graduation_groups, courseGroup, course_groups , fileList } = this.state
const { moduleName } = this.props
const props = {
@@ -129,18 +132,15 @@ class CreateGroupByImportModal extends Component{
onOk={this.onOk}
className="createGroupByImport"
>
-
-
-
-
- 点击或拖拽文件到这里上传
-
- 单个文件最大150MB
-
-
-
- {errorTip}
-
+
+
+
+
+ 点击或拖拽文件到这里上传
+
+ 单个文件最大150MB
+
+
)
}
diff --git a/public/react/src/modules/courses/poll/Poll.js b/public/react/src/modules/courses/poll/Poll.js
index 07be2196c..b064c289b 100644
--- a/public/react/src/modules/courses/poll/Poll.js
+++ b/public/react/src/modules/courses/poll/Poll.js
@@ -288,6 +288,7 @@ class Poll extends Component{
})
let{type,StudentList_value}=this.state
this.InitList(type,StudentList_value,1);
+ this.props.updataleftNavfun();
}
}).catch((error)=>{
console.log(error);
@@ -595,7 +596,7 @@ class Poll extends Component{
{...this.state}
courseType={course_types}
item={item}
- key={key}
+ index={key}
checkBox={
this.onItemClick(item)}>}
>
)
diff --git a/public/react/src/modules/courses/poll/PollListItem.js b/public/react/src/modules/courses/poll/PollListItem.js
index 50c471e76..c4f1c8209 100644
--- a/public/react/src/modules/courses/poll/PollListItem.js
+++ b/public/react/src/modules/courses/poll/PollListItem.js
@@ -16,7 +16,7 @@ class PollListItem extends Component{
super(props);
}
render(){
- let{item,checkBox,courseType}=this.props;
+ let{item,checkBox,courseType,index}=this.props;
let {coursesId}=this.props.match.params;
const IsAdmin =this.props.isAdmin();
@@ -28,10 +28,10 @@ class PollListItem extends Component{
let canNotLink = !isAdminOrStudent && item.lock_status == 0
return(
-
+
window.$(`.pollitem${index} input`).click() }>
{
IsAdmin &&
-
+
{checkBox}
}
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index 38ab63a4f..942c06800 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -124,13 +124,19 @@ class ShixunhomeWorkItem extends Component{
})
}
- editname = (name,id) => {
+ // 实训详情，阻止冒泡
+ stopPro = (event) => {
+ event.stopPropagation()
+ }
+
+ editname = (name,id,event) => {
this.setState({
ModalsRenametype:true,
NavmodalValue:name,
Navmodalname:"重命名",
url:`/homework_commons/${id}/alter_name.json`
})
+ event.stopPropagation()
}
cannerNavmoda=()=>{
this.setState({
@@ -157,88 +163,74 @@ class ShixunhomeWorkItem extends Component{
const { checkBox,
discussMessage,
- taskid,
+ taskid,index
} = this.props;
- //
-
- // allow_late: true //是否开启补交
-
- // homework_id: 9250
-
- // shixun_identifier: "25ykhpvl"
-
- //
- // console.log("this.props.isAdmin");
-
-
return(
-
- {this.state.ModalsRenametype===true?
-
this.cannerNavmoda()}
- />
- :""}
-
-
-
- {visible===true?:""}
-
-
-
-
-
-
-
-
-
本实训的开启时间：{shixunsmessage}
开启时间之前不能挑战
-
-
*/}
- {/*知道了*/}
- {/*
*/}
-
-
+
+ {
+ this.state.ModalsRenametype===true?
+ this.cannerNavmoda()}
+ />
+ :""}
+
+ {visible===true?:""}
+
+
+
+
+
+
+
+
本实训的开启时间：{shixunsmessage}
开启时间之前不能挑战
+
+
*/}
+ {/*知道了*/}
+ {/*
*/}
+
+ window.$(`.shixunitem${index} input`).click() } >
- {this.props.isAdmin?checkBox:""}
+ {this.props.isAdmin?
+
{checkBox}
+ :
+ ""
+ }
+
)
}
}
diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
index 74d142129..cdbac6760 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
@@ -587,6 +587,8 @@ class ShixunHomework extends Component{
let {Coursename,page}=this.state;
this.setState({
order: e.key,
+ checkBoxValues:[],
+ checkedtype:false,
isSpin:true
});
let newkey=e.key;
@@ -1019,8 +1021,8 @@ class ShixunHomework extends Component{
- {datas&&datas.category_name===undefined||datas&&datas.category_name===null?datas&&datas.main_category_name:datas&&datas.category_name+" 作业列表"}
- {/* 实训作业*/}
+ {/*{datas&&datas.category_name===undefined||datas&&datas.category_name===null?datas&&datas.main_category_name:datas&&datas.category_name+" 作业列表"}*/}
+ 实训作业
{this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?
@@ -1161,8 +1163,9 @@ class ShixunHomework extends Component{
isStudent={this.props.isStudent()}
isNotMember={this.props.isNotMember()}
isClassManagement={this.props.isClassManagement()}
- checkBox={this.props.isAdmin()?:""}
+ checkBox={this.props.isAdmin()?:""}
match={this.props.match}
+ index={index}
coursedata={this.props.coursedata}
coursupdata={()=>this.homeworkupdatalist(Coursename,page,order)}
course_identity={datas.course_identity}
diff --git a/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css b/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css
index f3c4a30da..4470aaec1 100644
--- a/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css
+++ b/public/react/src/modules/tpm/shixuns/shixunCss/shixunCard.css
@@ -1,45 +1,45 @@
-.ml350 {
- margin-left: 40%;
-}
-
-.ml32 {
- margin-left: 32%;
-}
-
-.square-Item{
- /*min-height: 324px;*/
-}
-.square-img{
- min-height: 210px;
-}
-.task-hide{
- margin-bottom: 0em;
-}
-.backFAFAFA{
- background:#FAFAFA;
-}
-
-.demo {
- width: 500px;
- background-color: #0dcecb;
- text-align: center;
- padding:50px;
-}
-.next-loading {
- margin-bottom: 5px;
- width:100%;
-}
-
-.next-rating-overlay .next-icon{
- color: #FFA800!important;
-}
-
-.custom-pagination {
- display: inline-block;
- margin-left: 10px;
-}
-
-.ml425{
- margin-left:42.5%;
- margin-top:20px;
+.ml350 {
+ margin-left: 40%;
+}
+
+.ml32 {
+ margin-left: 32%;
+}
+
+.square-Item{
+ /*min-height: 324px;*/
+}
+.square-img{
+ min-height: 210px;
+}
+.task-hide{
+ margin-bottom: 0em;
+}
+.backFAFAFA{
+ background:#FAFAFA;
+}
+
+.demo {
+ width: 500px;
+ background-color: #0dcecb;
+ text-align: center;
+ padding:50px;
+}
+.next-loading {
+ margin-bottom: 5px;
+ width:100%;
+}
+
+.next-rating-overlay .next-icon{
+ color: #FFA800!important;
+}
+
+.custom-pagination {
+ display: inline-block;
+ margin-left: 10px;
+}
+
+.ml425{
+ margin-left:42.5%;
+ margin-top:20px;
}
\ No newline at end of file
diff --git a/public/react/src/modules/user/usersInfo/InfosBank.js b/public/react/src/modules/user/usersInfo/InfosBank.js
index 8adc7ba50..2abc15220 100644
--- a/public/react/src/modules/user/usersInfo/InfosBank.js
+++ b/public/react/src/modules/user/usersInfo/InfosBank.js
@@ -1,249 +1,249 @@
-import React, { Component } from 'react';
-import {Pagination,Spin,Checkbox,Modal} from 'antd';
-import moment from 'moment';
-import axios from 'axios';
-import NoneData from '../../courses/coursesPublic/NoneData'
-import {getImageUrl} from 'educoder';
-import "./usersInfo.css"
-import Modals from '../../modals/Modals'
-
-const dateFormat ="YYYY-MM-DD HH:mm"
-class InfosBank extends Component{
- constructor(props){
- super(props);
- this.state={
- category:"common",
- type:"publicly",
- page:1,
- per_page:16,
- sort_by:"updated_at",
- CoursesId:undefined,
-
- totalCount:undefined,
- data:undefined,
- isSpin:false,
-
- dialogOpen:false,
- modalsTopval:undefined,
- modalsBottomval:undefined,
- modalSave:undefined
- }
- }
-
- componentDidMount=()=>{
- this.setState({
- isSpin:true
- })
- let{category,type,page,sort_by,CoursesId}=this.state;
- this.getCourses(category,type,page,sort_by,CoursesId);
- }
-
- getCourses=(category,type,page,sort_by,CoursesId)=>{
- let url=`/users/${this.props.match.params.username}/question_banks.json`;
- axios.get((url),{params:{
- category,
- type,
- page,
- sort_by,
- per_page:category && page ==1?17:16,
- course_list_id:CoursesId
- }}).then((result)=>{
- if(result){
- this.setState({
- totalCount:result.data.count,
- data:result.data,
- isSpin:false
- })
- }
- }).catch((error)=>{
- console.log(error);
- })
- }
-
- //切换种类
- changeCategory=(cate)=>{
- this.setState({
- category:cate,
- page:1,
- isSpin:true
- })
- let{type,sort_by,CoursesId}=this.state;
- this.getCourses(cate,type,1,sort_by,CoursesId);
- }
- //切换状态
- changeType=(type)=>{
- this.setState({
- type:type,
- page:1,
- isSpin:true
- })
- let{category,sort_by,CoursesId}=this.state;
- this.getCourses(category,type,1,sort_by,CoursesId);
- }
- //切换页数
- changePage=(page)=>{
- this.setState({
- page,
- isSpin:true
- })
- let{category,type,sort_by,CoursesId}=this.state;
- this.getCourses(category,type,page,sort_by,CoursesId);
- }
-
- // 进入课堂
- turnToCourses=(url)=>{
- this.props.history.push(url);
- }
-
- // 切换排序方式
- changeOrder= (sort)=>{
- this.setState({
- sort_by:sort,
- isSpin:true
- })
- let{category,type,page,CoursesId}=this.state;
- this.getCourses(category,type,page,sort,CoursesId);
- }
-
- changeCourseListId =(CoursesId)=>{
- this.setState({
- CoursesId,
- isSpin:true
- })
- let{category,type,sort,page}=this.state;
- this.getCourses(category,type,page,sort,CoursesId);
- }
-
- //设为公开/删除
- setPublic=(index)=>{
- this.setState({
- dialogOpen:true,
- modalsTopval:index==1?"您确定要公开吗？":"确定要删除该题吗？",
- modalsBottomval:index==1?"公开后不能重设为私有":"",
- modalSave:()=>this.sureOperation(index)
- })
- }
- // 确定--设为公开/删除
- sureOperation=()=>{
-
- }
-
- //弹框隐藏
- handleDialogClose=()=>{
- this.setState({
- dialogOpen:false
- })
- }
-
- render(){
- let{
- category,
- type,
- page,
- data,
- totalCount,
- sort_by,
- isSpin,
- CoursesId,
- dialogOpen,
- modalsTopval,
- modalsBottomval,modalSave
- } = this.state;
- let isStudent = this.props.isStudent();
- let is_current=this.props.is_current;
- return(
-
-
-
-
-
-
-
-
- - this.changeCourseListId()}>
- 全部
-
- {
- data && data.course_list && data.course_list.map((item,key)=>{
- return(
- - this.changeCourseListId(`${item.id}`)}>
- {item.name}
-
- )
- })
- }
-
-
-
- 共参与{totalCount}个题库
-
-
- {sort_by=="updated_at"?"时间最新":sort_by=="name"?"作业名称":"贡献者"}
-
- - this.changeOrder("updated_at")}>时间最新
- - this.changeOrder("name")}>作业名称
- - this.changeOrder("contributor")}>贡献者
-
-
-
- {
- !data || data.question_banks.length==0 &&
- }
- {
- data && data.question_banks && data.question_banks.map((item,key)=>{
- return(
-
- )
- })
- }
-
-
+
+
+
+
+
+
+
+ - this.changeCourseListId()}>
+ 全部
+
+ {
+ data && data.course_list && data.course_list.map((item,key)=>{
+ return(
+ - this.changeCourseListId(`${item.id}`)}>
+ {item.name}
+
+ )
+ })
+ }
+
+
+
+ 共参与{totalCount}个题库
+
+
+ {sort_by=="updated_at"?"时间最新":sort_by=="name"?"作业名称":"贡献者"}
+
+ - this.changeOrder("updated_at")}>时间最新
+ - this.changeOrder("name")}>作业名称
+ - this.changeOrder("contributor")}>贡献者
+
+
+
+ {
+ !data || data.question_banks.length==0 &&
+ }
+ {
+ data && data.question_banks && data.question_banks.map((item,key)=>{
+ return(
+
+ )
+ })
+ }
+
+
-
-
-
-
-
- {data && data.name}
- {
- data && is_current == false && data.identity =="学生" ? "" :
-
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
- {
- is_current ?
-
- {
- data && data.attendance_signed ?
- 已签到
- :
- 签到
- }
-
- :
-
- 私信
-
- }
-
-
-
-
- this.setState({moduleName: 'courses'})}
- to={`/users/${username}/courses`}>翻转课堂
-
-
- this.setState({moduleName: 'shixuns'})}
- to={`/users/${username}/shixuns`}>实训项目
-
-
- this.setState({moduleName: 'paths'})}
- to={`/users/${username}/paths`}>实践课程
-
-
- this.setState({moduleName: 'projects'})}
- to={`/users/${username}/projects`}>开发项目
-
-
- this.setState({moduleName: 'package'})}
- to={`/users/${username}/package`}>众包
-
- {((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
- &&
- this.setState({moduleName: 'videos'})}
- to={`/users/${username}/videos`}>视频
- }
-
-
-
+
+
+
+
+
+ {data && data.name}
+ {
+ data && is_current == false && data.identity =="学生" ? "" :
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {
+ is_current ?
+
+ {
+ data && data.attendance_signed ?
+ 已签到
+ :
+ 签到
+ }
+
+ :
+
+
+ 私信
+
+
+ }
+
+
+
+
+ this.setState({moduleName: 'courses'})}
+ to={`/users/${username}/courses`}>翻转课堂
+
+
+ this.setState({moduleName: 'shixuns'})}
+ to={`/users/${username}/shixuns`}>开发社区
+
+
+ this.setState({moduleName: 'paths'})}
+ to={`/users/${username}/paths`}>实践课程
+
+
+ this.setState({moduleName: 'projects'})}
+ to={`/users/${username}/projects`}>项目
+
+
+ this.setState({moduleName: 'package'})}
+ to={`/users/${username}/package`}>众包
+
+ {((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
+ &&
+ this.setState({moduleName: 'videos'})}
+ to={`/users/${username}/videos`}>视频
+ }
+
+
+
@@ -157,20 +154,18 @@ class InfosShixun extends Component{
{
- page == 1 && is_current && !category && this.props.current_user && this.props.current_user.user_identity != "学生" ?
+ page == 1 && is_current && !category && this.props.current_user && this.props.current_user.user_identity != "学生" ?
:""
}
{
- (!data || data.shixuns.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) &&
+ (!data || (data && data.shixuns.length==0)) && category &&
}
{
data && data.shixuns && data.shixuns.map((item,key)=>{
return(
+ ![]({getImageUrl("images/educoder/nodata.png")}/)
+
+ ![]({getUrl("/images/educoder/nodata.png")}/)
![]({setImagesUrl("images/educoder/tag2.png")}/)
*/}
-