调整选择问题

dev_hs
杨树明 5 years ago
parent 824d6cdca9
commit e4c3050827

@ -241,6 +241,7 @@ class HomeworkModal extends Component{
className="task-hide edu-txt-left" className="task-hide edu-txt-left"
name="shixun_homework[]" name="shixun_homework[]"
value={item.id} value={item.id}
key={item.id}
> >
<span style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name">{item.name}</span> <span style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name">{item.name}</span>
</Checkbox> </Checkbox>

@ -351,6 +351,7 @@ class Selectresource extends Component{
<li className="fl" style={{width:'220px'}}> <li className="fl" style={{width:'220px'}}>
<Checkbox <Checkbox
value={item.id} value={item.id}
key={item.id}
className="fl task-hide edu-txt-left" className="fl task-hide edu-txt-left"
style={{"width":"220px"}} style={{"width":"220px"}}
name="shixun_homework[]" name="shixun_homework[]"

@ -198,7 +198,7 @@ class Sendtofilesmodal extends Component{
{ course_lists && course_lists.map( course => { { course_lists && course_lists.map( course => {
return ( return (
<p className="clearfix mb7" key={course.id}> <p className="clearfix mb7" key={course.id}>
<Checkbox className="fl" value={course.id} ></Checkbox> <Checkbox className="fl" value={course.id} key={course.id} ></Checkbox>
<span className="fl with45"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{course.name}</label></span> <span className="fl with45"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{course.name}</label></span>
</p> </p>
) )

@ -208,7 +208,7 @@ class CheckCodeModal extends Component{
{ candidates && candidates.map( candidate => { { candidates && candidates.map( candidate => {
return ( return (
<p className="clearfix mb7" key={candidate.id}> <p className="clearfix mb7" key={candidate.id}>
<Checkbox className="fl" value={candidate.id} ></Checkbox> <Checkbox className="fl" value={candidate.id} key={candidate.id}></Checkbox>
<span className="fl with25"> <span className="fl with25">
<ConditionToolTip title={candidate.name} condition={candidate.name && candidate.name.length > 12 }> <ConditionToolTip title={candidate.name} condition={candidate.name && candidate.name.length > 12 }>
<label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.name}</label> <label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.name}</label>

@ -1,209 +1,209 @@
import React, { Component } from "react"; import React, { Component } from "react";
import { Modal, Checkbox, Input, Spin} from "antd"; import { Modal, Checkbox, Input, Spin} from "antd";
import axios from 'axios' import axios from 'axios'
import ModalWrapper from "../../common/ModalWrapper" import ModalWrapper from "../../common/ModalWrapper"
import InfiniteScroll from 'react-infinite-scroller'; import InfiniteScroll from 'react-infinite-scroller';
const Search = Input.Search const Search = Input.Search
const pageCount = 15; const pageCount = 15;
class SendToCourseModal extends Component{ class SendToCourseModal extends Component{
constructor(props){ constructor(props){
super(props); super(props);
this.state={ this.state={
checkBoxValues: [], checkBoxValues: [],
course_lists: [], course_lists: [],
course_lists_after_filter: [], course_lists_after_filter: [],
searchValue: '', searchValue: '',
hasMore: true, hasMore: true,
loading: false, loading: false,
page: 1 page: 1
} }
} }
fetchCourseList = (arg_page) => { fetchCourseList = (arg_page) => {
const page = arg_page || this.state.page; const page = arg_page || this.state.page;
// search=''& // search=''&
let url = `/courses/mine.json?page=${page}&page_size=${pageCount}` let url = `/courses/mine.json?page=${page}&page_size=${pageCount}`
const searchValue = this.state.searchValue.trim() const searchValue = this.state.searchValue.trim()
if (searchValue) { if (searchValue) {
url += `&search=${searchValue}` url += `&search=${searchValue}`
} }
this.setState({ loading: true }) this.setState({ loading: true })
axios.get(url, { axios.get(url, {
}) })
.then((response) => { .then((response) => {
if (!response.data.data || response.data.data.length == 0) { if (!response.data.data || response.data.data.length == 0) {
this.setState({ this.setState({
course_lists: page == 1 ? [] : this.state.course_lists, course_lists: page == 1 ? [] : this.state.course_lists,
page, page,
loading: false, loading: false,
hasMore: false, hasMore: false,
}) })
} else { } else {
this.setState({ this.setState({
course_lists: page == 1 ? response.data.data : this.state.course_lists.concat(response.data.data), course_lists: page == 1 ? response.data.data : this.state.course_lists.concat(response.data.data),
course_lists_after_filter: response.data.data, course_lists_after_filter: response.data.data,
page, page,
loading: false, loading: false,
hasMore: response.data.data.length == pageCount hasMore: response.data.data.length == pageCount
}) })
} }
}) })
.catch(function (error) { .catch(function (error) {
console.log(error); console.log(error);
}); });
} }
componentDidMount() { componentDidMount() {
setTimeout(() => { setTimeout(() => {
this.fetchCourseList() this.fetchCourseList()
}, 500) }, 500)
} }
setVisible = (visible) => { setVisible = (visible) => {
this.refs.modalWrapper.setVisible(visible) this.refs.modalWrapper.setVisible(visible)
if (visible == false) { if (visible == false) {
this.setState({ this.setState({
checkBoxValues: [] checkBoxValues: []
}) })
} }
} }
onSendOk = () => { onSendOk = () => {
if (!this.state.checkBoxValues || this.state.checkBoxValues.length == 0) { if (!this.state.checkBoxValues || this.state.checkBoxValues.length == 0) {
this.props.showNotification('请先选择要发送至的课堂') this.props.showNotification('请先选择要发送至的课堂')
return; return;
} }
if(this.props.url==="/files/bulk_send.json"){ if(this.props.url==="/files/bulk_send.json"){
axios.post("/files/bulk_send.json", { axios.post("/files/bulk_send.json", {
course_id:this.props.match.params.coursesId, course_id:this.props.match.params.coursesId,
ids: this.props.selectedMessageIds, ids: this.props.selectedMessageIds,
to_course_ids: this.state.checkBoxValues to_course_ids: this.state.checkBoxValues
}) })
.then((response) => { .then((response) => {
if (response.data.status == 0) { if (response.data.status == 0) {
this.setVisible(false) this.setVisible(false)
this.props.gobackonSend(response.data.message) this.props.gobackonSend(response.data.message)
} }
}) })
.catch(function (error) { .catch(function (error) {
console.log(error); console.log(error);
}); });
}else{ }else{
const bid = this.props.match.params.boardId const bid = this.props.match.params.boardId
const url = `/boards/${bid}/messages/bulk_send.json` const url = `/boards/${bid}/messages/bulk_send.json`
axios.post(url, { axios.post(url, {
ids: this.props.selectedMessageIds, ids: this.props.selectedMessageIds,
to_course_ids: this.state.checkBoxValues to_course_ids: this.state.checkBoxValues
}) })
.then((response) => { .then((response) => {
if (response.data.status == 0) { if (response.data.status == 0) {
this.setVisible(false) this.setVisible(false)
this.props.showNotification('发送成功') this.props.showNotification('发送成功')
} }
}) })
.catch(function (error) { .catch(function (error) {
console.log(error); console.log(error);
}); });
} }
} }
onOk = () => { onOk = () => {
const { course_lists, checkBoxValues } = this.state const { course_lists, checkBoxValues } = this.state
this.onSendOk() this.onSendOk()
// this.props.onOk && this.props.onOk(checkBoxValues) // this.props.onOk && this.props.onOk(checkBoxValues)
// this.refs.modalWrapper.setVisible(false) // this.refs.modalWrapper.setVisible(false)
} }
onCheckBoxChange = (checkBoxValues) => { onCheckBoxChange = (checkBoxValues) => {
this.setState({ this.setState({
checkBoxValues: checkBoxValues checkBoxValues: checkBoxValues
}) })
} }
onSearchChange = (e) => { onSearchChange = (e) => {
this.setState({ this.setState({
searchValue: e.target.value searchValue: e.target.value
}) })
} }
handleInfiniteOnLoad = () => { handleInfiniteOnLoad = () => {
console.log('loadmore...') console.log('loadmore...')
this.fetchCourseList(this.state.page + 1) this.fetchCourseList(this.state.page + 1)
} }
onSearch = () => { onSearch = () => {
// const course_lists_after_filter = this.state.course_lists.filter( item => item.name.indexOf(this.state.searchValue) != -1 ) // const course_lists_after_filter = this.state.course_lists.filter( item => item.name.indexOf(this.state.searchValue) != -1 )
// this.setState({ course_lists_after_filter }) // this.setState({ course_lists_after_filter })
this.fetchCourseList(1) this.fetchCourseList(1)
} }
render(){ render(){
const { course_lists, checkBoxValues, searchValue, loading, hasMore } = this.state const { course_lists, checkBoxValues, searchValue, loading, hasMore } = this.state
const { moduleName } = this.props const { moduleName } = this.props
return( return(
<ModalWrapper <ModalWrapper
ref="modalWrapper" ref="modalWrapper"
title={`发送${moduleName}`} title={`发送${moduleName}`}
{...this.props } {...this.props }
onOk={this.onOk} onOk={this.onOk}
> >
<style> <style>
{` {`
.demo-loading-container { .demo-loading-container {
position: absolute; position: absolute;
bottom: 93px; bottom: 93px;
width: 82%; width: 82%;
text-align: center; text-align: center;
}`} }`}
</style> </style>
<p className="color-grey-6 mb20 edu-txt-center" style={{ fontWeight: "bold" }} >选择的{moduleName}发送到<span className="color-orange-tip">指定课堂</span></p> <p className="color-grey-6 mb20 edu-txt-center" style={{ fontWeight: "bold" }} >选择的{moduleName}发送到<span className="color-orange-tip">指定课堂</span></p>
<Search <Search
className="mb14" className="mb14"
value={searchValue} value={searchValue}
placeholder="请输入课堂名称进行搜索" placeholder="请输入课堂名称进行搜索"
onChange={this.onSearchChange} onChange={this.onSearchChange}
onSearch={this.onSearch} onSearch={this.onSearch}
></Search> ></Search>
<div> <div>
{/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */} {/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
<div className="edu-back-skyblue padding15" style={{"height":"300px", overflowY: "scroll", overflowAnchor: 'none' }}> <div className="edu-back-skyblue padding15" style={{"height":"300px", overflowY: "scroll", overflowAnchor: 'none' }}>
<InfiniteScroll <InfiniteScroll
threshold={10} threshold={10}
initialLoad={false} initialLoad={false}
pageStart={0} pageStart={0}
loadMore={this.handleInfiniteOnLoad} loadMore={this.handleInfiniteOnLoad}
hasMore={!loading && hasMore} hasMore={!loading && hasMore}
useWindow={false} useWindow={false}
> >
<Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}> <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
{ course_lists && course_lists.map( course => { { course_lists && course_lists.map( course => {
return ( return (
<p className="clearfix mb7" key={course.id}> <p className="clearfix mb7" key={course.id}>
<Checkbox className="fl" value={course.id} ></Checkbox> <Checkbox className="fl" value={course.id} key={course.id}></Checkbox>
<span className="fl with45"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{course.name}</label></span> <span className="fl with45"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{course.name}</label></span>
</p> </p>
) )
}) } }) }
</Checkbox.Group> </Checkbox.Group>
{loading && hasMore && ( {loading && hasMore && (
<div className="demo-loading-container"> <div className="demo-loading-container">
<Spin /> <Spin />
</div> </div>
)} )}
{/* TODO */} {/* TODO */}
{/* { {/* {
!hasMore && <div>没有更多了</div> !hasMore && <div>没有更多了</div>
} */} } */}
</InfiniteScroll> </InfiniteScroll>
</div> </div>
</div> </div>
</ModalWrapper> </ModalWrapper>
) )
} }
} }
export default SendToCourseModal; export default SendToCourseModal;

@ -286,7 +286,9 @@ class ShixunModal extends Component{
<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}> <div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
<li className="fl with40 edu-txt-left task-hide paddingl5 newtaskhide"> <li className="fl with40 edu-txt-left task-hide paddingl5 newtaskhide">
<Checkbox <Checkbox
id={"shixun_input_"+item.shixun_id} value={item.shixun_id} id={"shixun_input_"+item.shixun_id}
value={item.shixun_id}
key={item.shixun_id}
className=" task-hide edu-txt-left newtaskhide" className=" task-hide edu-txt-left newtaskhide"
style={{"width":"280px"}} style={{"width":"280px"}}
name="shixun_homework[]" name="shixun_homework[]"

@ -51,7 +51,7 @@ class Multiple extends Component{
return( return(
<p className="clearfix mb15 df"> <p className="clearfix mb15 df">
<Checkbox className="fl lineh-15 df mr8 mt2" value={item.choice_id}>{prefix}</Checkbox> <Checkbox className="fl lineh-15 df mr8 mt2" value={item.choice_id} key={item.choice_id}>{prefix}</Checkbox>
{/* <span class="fl lineh-20 mt1"></span> */} {/* <span class="fl lineh-20 mt1"></span> */}
{/* <span style={{display:"inline-block"}} className="markdown-body " dangerouslySetInnerHTML={{__html: markdownToHTML1(item.choice_text)}}></span> */} {/* <span style={{display:"inline-block"}} className="markdown-body " dangerouslySetInnerHTML={{__html: markdownToHTML1(item.choice_text)}}></span> */}
<MarkdownToHtml content={item.choice_text} selector={'multiple_' + (this.props.index + 1) + (key + 1)} <MarkdownToHtml content={item.choice_text} selector={'multiple_' + (this.props.index + 1) + (key + 1)}

@ -1,288 +1,288 @@
import React, { Component } from "react"; import React, { Component } from "react";
import { Modal, Checkbox, Input, Spin, Select, Divider } from "antd"; import { Modal, Checkbox, Input, Spin, Select, Divider } from "antd";
import axios from 'axios' import axios from 'axios'
import ModalWrapper from "../../common/ModalWrapper" import ModalWrapper from "../../common/ModalWrapper"
import InfiniteScroll from 'react-infinite-scroller'; import InfiniteScroll from 'react-infinite-scroller';
import { ROLE_TEACHER_NUM, ROLE_ASSISTANT_NUM } from '../common' import { ROLE_TEACHER_NUM, ROLE_ASSISTANT_NUM } from '../common'
import NoneData from '../../coursesPublic/NoneData' import NoneData from '../../coursesPublic/NoneData'
import { ConditionToolTip, ThemeContext } from 'educoder' import { ConditionToolTip, ThemeContext } from 'educoder'
import SchoolSelect from '../../coursesPublic/form/SchoolSelect' import SchoolSelect from '../../coursesPublic/form/SchoolSelect'
const Option = Select.Option; const Option = Select.Option;
const pageCount = 15; const pageCount = 15;
class AddStudentModal extends Component{ class AddStudentModal extends Component{
constructor(props){ constructor(props){
super(props); super(props);
this.state={ this.state={
checkBoxValues: [], checkBoxValues: [],
users: [], users: [],
hasMore: true, hasMore: true,
loading: false, loading: false,
courseGroup: '', courseGroup: '',
page: 1, page: 1,
isSpin:false isSpin:false
} }
} }
fetchMemberList = (arg_page) => { fetchMemberList = (arg_page) => {
const courseId = this.props.match.params.coursesId const courseId = this.props.match.params.coursesId
const page = arg_page || this.state.page; const page = arg_page || this.state.page;
const { name, school_name } = this.state const { name, school_name } = this.state
let url = `/courses/${courseId}/search_users.json?page=${page}&limit=${pageCount}&school_name=${school_name || ''}&name=${name || ''}` let url = `/courses/${courseId}/search_users.json?page=${page}&limit=${pageCount}&school_name=${school_name || ''}&name=${name || ''}`
this.setState({ loading: true }) this.setState({ loading: true })
axios.get(url) axios.get(url)
.then((response) => { .then((response) => {
if (!response.data.users || response.data.users.length == 0) { if (!response.data.users || response.data.users.length == 0) {
this.setState({ this.setState({
users: page == 1 ? response.data.users : this.state.users, users: page == 1 ? response.data.users : this.state.users,
page, page,
loading: false, loading: false,
hasMore: false, hasMore: false,
}) })
} else { } else {
this.setState({ this.setState({
users: page == 1 ? response.data.users : this.state.users.concat(response.data.users), users: page == 1 ? response.data.users : this.state.users.concat(response.data.users),
page, page,
loading: false, loading: false,
hasMore: response.data.users.length == pageCount hasMore: response.data.users.length == pageCount
}) })
} }
}) })
.catch(function (error) { .catch(function (error) {
console.log(error); console.log(error);
}); });
} }
componentDidMount() { componentDidMount() {
} }
fetchOptions = () => { fetchOptions = () => {
// add_teacher_popup // add_teacher_popup
const courseId = this.props.match.params.coursesId const courseId = this.props.match.params.coursesId
let url = `/courses/${courseId}/all_course_groups.json` let url = `/courses/${courseId}/all_course_groups.json`
axios.get(url, { axios.get(url, {
}) })
.then((response) => { .then((response) => {
if (response.data.course_groups && response.data.course_groups.length) { if (response.data.course_groups && response.data.course_groups.length) {
this.setState({ this.setState({
course_groups: response.data.course_groups, course_groups: response.data.course_groups,
courseGroup: response.data.course_groups[0].id courseGroup: response.data.course_groups[0].id
}) })
} else { } else {
// showNotification('') // showNotification('')
} }
}) })
.catch(function (error) { .catch(function (error) {
console.log(error); console.log(error);
}); });
} }
setVisible = (visible) => { setVisible = (visible) => {
if (visible) { if (visible) {
this.setState({school_name: this.props.user.user_school}) this.setState({school_name: this.props.user.user_school})
this.fetchMemberList() this.fetchMemberList()
this.fetchOptions() this.fetchOptions()
} }
this.refs.modalWrapper.setVisible(visible) this.refs.modalWrapper.setVisible(visible)
if (visible == false) { if (visible == false) {
this.setState({ this.setState({
checkBoxValues: [] checkBoxValues: []
}) })
} }
} }
onSendOk = () => { onSendOk = () => {
if(!this.state.checkBoxValues || this.state.checkBoxValues.length == 0) { if(!this.state.checkBoxValues || this.state.checkBoxValues.length == 0) {
this.props.showNotification('请从列表中先选择用户。') this.props.showNotification('请从列表中先选择用户。')
return; return;
} }
this.setState({ this.setState({
isSpin:true isSpin:true
}) })
const courseId = this.props.match.params.coursesId const courseId = this.props.match.params.coursesId
const url = `/courses/${courseId}/add_students_by_search.json` const url = `/courses/${courseId}/add_students_by_search.json`
const params = { const params = {
"user_ids": this.state.checkBoxValues "user_ids": this.state.checkBoxValues
} }
const { courseGroup } = this.state const { courseGroup } = this.state
if (courseGroup) { if (courseGroup) {
params.course_group_id = courseGroup params.course_group_id = courseGroup
} }
axios.post(url, params) axios.post(url, params)
.then((response) => { .then((response) => {
if (response.data.status == 0) { if (response.data.status == 0) {
this.setVisible(false) this.setVisible(false)
this.props.showNotification('添加成功') this.props.showNotification('添加成功')
this.props.addStudentSuccess && this.props.addStudentSuccess(params) this.props.addStudentSuccess && this.props.addStudentSuccess(params)
this.setState({ this.setState({
isSpin:false isSpin:false
}) })
} }
}) })
.catch(function (error) { .catch(function (error) {
console.log(error); console.log(error);
}); });
} }
onOk = () => { onOk = () => {
this.onSendOk() this.onSendOk()
} }
onCheckBoxChange = (checkBoxValues) => { onCheckBoxChange = (checkBoxValues) => {
this.setState({ this.setState({
checkBoxValues: checkBoxValues checkBoxValues: checkBoxValues
}) })
} }
handleInfiniteOnLoad = () => { handleInfiniteOnLoad = () => {
this.fetchMemberList(this.state.page + 1) this.fetchMemberList(this.state.page + 1)
} }
onSearch = () => { onSearch = () => {
this.fetchMemberList(1) this.fetchMemberList(1)
} }
handleCourseGroupChange = (value) => { handleCourseGroupChange = (value) => {
this.setState({ this.setState({
courseGroup: value courseGroup: value
}) })
} }
render(){ render(){
const { users, checkBoxValues, loading, hasMore, name, school_name const { users, checkBoxValues, loading, hasMore, name, school_name
, courseGroup, course_groups,isSpin } = this.state , courseGroup, course_groups,isSpin } = this.state
const { moduleName } = this.props const { moduleName } = this.props
let theme = this.context; let theme = this.context;
return( return(
<ModalWrapper <ModalWrapper
ref="modalWrapper" ref="modalWrapper"
width="700px" width="700px"
title={`添加${moduleName}`} title={`添加${moduleName}`}
{...this.props } {...this.props }
onOk={this.onOk} onOk={this.onOk}
className="addStudentModal courseForm" className="addStudentModal courseForm"
> >
<style> <style>
{` {`
.demo-loading-container { .demo-loading-container {
position: absolute; position: absolute;
bottom: 93px; bottom: 93px;
width: 82%; width: 82%;
text-align: center; text-align: center;
} }
.df { .df {
display: flex; display: flex;
align-items: baseline; align-items: baseline;
margin: 12px 0; margin: 12px 0;
} }
.firstLabel { .firstLabel {
flex: 0 0 60px; flex: 0 0 60px;
} }
.df span.label { .df span.label {
margin-right: 8px; margin-right: 8px;
text-align: right; text-align: right;
margin-left: 12px; margin-left: 12px;
} }
.df .ant-input-affix-wrapper { .df .ant-input-affix-wrapper {
width: 32%; width: 32%;
} }
.addTeacherModal label.task-hide { .addTeacherModal label.task-hide {
width: 100%; width: 100%;
} }
`} `}
</style> </style>
<div className="df"> <div className="df">
<span className="mr10">姓名:</span> <span className="mr10">姓名:</span>
<Input allowClear placeholder="请输入真实姓名" value={name} onChange={(e) => {this.setState({name: e.target.value})}} <Input allowClear placeholder="请输入真实姓名" value={name} onChange={(e) => {this.setState({name: e.target.value})}}
style={{ width: '221px'}} style={{ width: '221px'}}
></Input> ></Input>
<span className="label" style={{ minWidth: '36px' }}>单位:</span> <span className="label" style={{ minWidth: '36px' }}>单位:</span>
{/* <Input allowClear placeholder="" value={school_name} onChange={(e) => {this.setState({school_name: e.target.value})}} {/* <Input allowClear placeholder="" value={school_name} onChange={(e) => {this.setState({school_name: e.target.value})}}
style={{ width: '200px'}}> style={{ width: '200px'}}>
</Input> */} </Input> */}
<SchoolSelect <SchoolSelect
value={school_name} value={school_name}
onChange={(value) => {this.setState({school_name: value})}} onChange={(value) => {this.setState({school_name: value})}}
></SchoolSelect> ></SchoolSelect>
<a className="task-btn task-btn-orange" onClick={() => this.fetchMemberList(1)} <a className="task-btn task-btn-orange" onClick={() => this.fetchMemberList(1)}
style={{ height: '30px', lineHeight: '30px', marginLeft: '10px', width: '70px'}} style={{ height: '30px', lineHeight: '30px', marginLeft: '10px', width: '70px'}}
>搜索</a> >搜索</a>
</div> </div>
{/* <Divider /> */} {/* <Divider /> */}
<p className="clearfix mb2" style={{ margin: '0px 15px 6px' }}> <p className="clearfix mb2" style={{ margin: '0px 15px 6px' }}>
<Checkbox className="fl" style={{ visibility: 'hidden' }} ></Checkbox> <Checkbox className="fl" style={{ visibility: 'hidden' }} ></Checkbox>
<span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'姓名'}</label></span> <span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'姓名'}</label></span>
<span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'学号'}</label></span> <span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'学号'}</label></span>
<span className="fl with35"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'单位'}</label></span> <span className="fl with35"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'单位'}</label></span>
<span className="fl with10"><label className="task-hide fl" style={{"maxWidth":"48px;"}}>{''}</label></span> <span className="fl with10"><label className="task-hide fl" style={{"maxWidth":"48px;"}}>{''}</label></span>
</p> </p>
<Spin size="large" spinning={isSpin}> <Spin size="large" spinning={isSpin}>
{ loading || users.length ? <div> { loading || users.length ? <div>
{/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */} {/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
<div className="edu-back-skyblue padding10-15" style={{"height":"300px", overflowY: "scroll", overflowAnchor: 'none' }}> <div className="edu-back-skyblue padding10-15" style={{"height":"300px", overflowY: "scroll", overflowAnchor: 'none' }}>
<InfiniteScroll <InfiniteScroll
threshold={10} threshold={10}
initialLoad={false} initialLoad={false}
pageStart={0} pageStart={0}
loadMore={this.handleInfiniteOnLoad} loadMore={this.handleInfiniteOnLoad}
hasMore={!loading && hasMore} hasMore={!loading && hasMore}
useWindow={false} useWindow={false}
> >
<Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}> <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
{ users.map( candidate => { { users.map( candidate => {
return ( return (
<p className="clearfix mb7" key={candidate.id}> <p className="clearfix mb7" key={candidate.id}>
<Checkbox className="fl" value={candidate.id} disabled={candidate.added}></Checkbox> <Checkbox className="fl" value={candidate.id} key={candidate.id} disabled={candidate.added}></Checkbox>
<span className="fl with25"> <span className="fl with25">
<ConditionToolTip title={candidate.name} condition={candidate.name && candidate.name.length > 12 }> <ConditionToolTip title={candidate.name} condition={candidate.name && candidate.name.length > 12 }>
<label className="task-hide fl" style={{"maxWidth":"208px;"}}> <label className="task-hide fl" style={{"maxWidth":"208px;"}}>
{ candidate.name ? { candidate.name ?
<a href={`/users/${candidate.login}`} target="_blank" style={{"maxWidth":"208px;"}}> <a href={`/users/${candidate.login}`} target="_blank" style={{"maxWidth":"208px;"}}>
{ candidate.name } { candidate.name }
</a> : <span> </span> } </a> : <span> </span> }
</label> </label>
</ConditionToolTip> </ConditionToolTip>
</span> </span>
<span className="fl with25"> <span className="fl with25">
<ConditionToolTip title={candidate.student_id} condition={candidate.student_id && candidate.student_id.length > 12 }> <ConditionToolTip title={candidate.student_id} condition={candidate.student_id && candidate.student_id.length > 12 }>
<label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.student_id || ' '}</label> <label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.student_id || ' '}</label>
</ConditionToolTip> </ConditionToolTip>
</span> </span>
<span className="fl with35"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.school_name}</label></span> <span className="fl with35"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.school_name}</label></span>
<span className="fl with10"><label className="task-hide fl" <span className="fl with10"><label className="task-hide fl"
style={{"maxWidth":"48px", color: theme.foreground_select }}>{candidate.added ? '已加入' : ''}</label></span> style={{"maxWidth":"48px", color: theme.foreground_select }}>{candidate.added ? '已加入' : ''}</label></span>
</p> </p>
) )
}) } }) }
</Checkbox.Group> </Checkbox.Group>
{loading && hasMore && ( {loading && hasMore && (
<div className="demo-loading-container"> <div className="demo-loading-container">
<Spin /> <Spin />
</div> </div>
)} )}
</InfiniteScroll> </InfiniteScroll>
</div> </div>
{course_groups && course_groups.length && <div className="df" style={{ marginTop: '12px' }} > {course_groups && course_groups.length && <div className="df" style={{ marginTop: '12px' }} >
<span className="mr10" style={{ width: '148px' }}>所选学生分班至(选填):</span> <span className="mr10" style={{ width: '148px' }}>所选学生分班至(选填):</span>
<Select style={{ width: 236 }} onChange={this.handleCourseGroupChange} value={courseGroup}> <Select style={{ width: 236 }} onChange={this.handleCourseGroupChange} value={courseGroup}>
{ course_groups.map((item) => { { course_groups.map((item) => {
return <Option value={item.id}>{item.name}</Option> return <Option value={item.id}>{item.name}</Option>
})} })}
</Select> </Select>
</div>} </div>}
</div> : <NoneData></NoneData> } </div> : <NoneData></NoneData> }
</Spin> </Spin>
</ModalWrapper> </ModalWrapper>
) )
} }
} }
AddStudentModal.contextType = ThemeContext; AddStudentModal.contextType = ThemeContext;
export default AddStudentModal; export default AddStudentModal;

@ -1,355 +1,355 @@
import React, { Component } from "react"; import React, { Component } from "react";
import { Modal, Checkbox, Input, Spin, Select, Divider, Icon } from "antd"; import { Modal, Checkbox, Input, Spin, Select, Divider, Icon } from "antd";
import axios from 'axios' import axios from 'axios'
import ModalWrapper from "../../common/ModalWrapper" import ModalWrapper from "../../common/ModalWrapper"
import InfiniteScroll from 'react-infinite-scroller'; import InfiniteScroll from 'react-infinite-scroller';
import { ROLE_TEACHER_NUM, ROLE_ASSISTANT_NUM } from '../common' import { ROLE_TEACHER_NUM, ROLE_ASSISTANT_NUM } from '../common'
import { ConditionToolTip, ActionBtn } from 'educoder' import { ConditionToolTip, ActionBtn } from 'educoder'
import NoneData from '../../coursesPublic/NoneData' import NoneData from '../../coursesPublic/NoneData'
import AddGraduationGroupModal from './AddGraduationGroupModal' import AddGraduationGroupModal from './AddGraduationGroupModal'
import SchoolSelect from '../../coursesPublic/form/SchoolSelect' import SchoolSelect from '../../coursesPublic/form/SchoolSelect'
const Option = Select.Option; const Option = Select.Option;
const pageCount = 15; const pageCount = 15;
let timeout, currentValue let timeout, currentValue
class AddTeacherModal extends Component{ class AddTeacherModal extends Component{
constructor(props){ constructor(props){
super(props); super(props);
this.state={ this.state={
school_names: [], school_names: [],
checkBoxValues: [], checkBoxValues: [],
candidates: [], candidates: [],
hasMore: true, hasMore: true,
loading: false, loading: false,
page: 1 page: 1
} }
} }
fetchMemberList = (arg_page) => { fetchMemberList = (arg_page) => {
const courseId = this.props.match.params.coursesId const courseId = this.props.match.params.coursesId
const page = arg_page || this.state.page; const page = arg_page || this.state.page;
const { name, school_name } = this.state const { name, school_name } = this.state
let url = `/courses/${courseId}/search_teacher_candidate.json` let url = `/courses/${courseId}/search_teacher_candidate.json`
this.setState({ loading: true }) this.setState({ loading: true })
axios.post(url, { axios.post(url, {
page: page, page: page,
limit: pageCount, limit: pageCount,
school_name: school_name || '', school_name: school_name || '',
name: name || '' name: name || ''
}) })
.then((response) => { .then((response) => {
if (!response.data.candidates || response.data.candidates.length == 0) { if (!response.data.candidates || response.data.candidates.length == 0) {
this.setState({ this.setState({
candidates: page == 1 ? response.data.candidates : this.state.candidates, candidates: page == 1 ? response.data.candidates : this.state.candidates,
page, page,
loading: false, loading: false,
hasMore: false, hasMore: false,
}) })
} else { } else {
this.setState({ this.setState({
candidates: page == 1 ? response.data.candidates : this.state.candidates.concat(response.data.candidates), candidates: page == 1 ? response.data.candidates : this.state.candidates.concat(response.data.candidates),
page, page,
loading: false, loading: false,
hasMore: response.data.candidates.length == pageCount hasMore: response.data.candidates.length == pageCount
}) })
} }
}) })
.catch(function (error) { .catch(function (error) {
console.log(error); console.log(error);
}); });
} }
componentDidMount() { componentDidMount() {
} }
onAddGraduationGroupOk = () => { onAddGraduationGroupOk = () => {
this.fetchOptions() this.fetchOptions()
} }
fetchOptions = () => { fetchOptions = () => {
// add_teacher_popup // add_teacher_popup
const courseId = this.props.match.params.coursesId const courseId = this.props.match.params.coursesId
let url = `/courses/${courseId}/add_teacher_popup.json` let url = `/courses/${courseId}/add_teacher_popup.json`
axios.get(url, { axios.get(url, {
}) })
.then((response) => { .then((response) => {
if (response.data.school_name) { if (response.data.school_name) {
this.setState({ this.setState({
school_name: response.data.school_name school_name: response.data.school_name
}, () => this.fetchMemberList()) }, () => this.fetchMemberList())
} else { } else {
this.fetchMemberList() this.fetchMemberList()
} }
if (response.data.graduation_groups) { if (response.data.graduation_groups) {
this.setState({ this.setState({
graduation_groups: response.data.graduation_groups graduation_groups: response.data.graduation_groups
}) })
} }
if (response.data.course_groups) { if (response.data.course_groups) {
this.setState({ this.setState({
course_groups: response.data.course_groups course_groups: response.data.course_groups
}) })
} }
}) })
.catch(function (error) { .catch(function (error) {
console.log(error); console.log(error);
}); });
} }
setVisible = (visible) => { setVisible = (visible) => {
if (visible) { if (visible) {
this.fetchOptions() this.fetchOptions()
} }
this.refs.modalWrapper.setVisible(visible) this.refs.modalWrapper.setVisible(visible)
if (visible == false) { if (visible == false) {
this.setState({ this.setState({
checkBoxValues: [] checkBoxValues: []
}) })
} }
} }
onSendOk = () => { onSendOk = () => {
const courseId = this.props.match.params.coursesId const courseId = this.props.match.params.coursesId
const url = `/courses/${courseId}/add_teacher.json` const url = `/courses/${courseId}/add_teacher.json`
if (this.state.checkBoxValues.length == 0) { if (this.state.checkBoxValues.length == 0) {
this.props.showNotification('请先在下面列表中选择要添加教师的成员') this.props.showNotification('请先在下面列表中选择要添加教师的成员')
return return
} }
const params = { const params = {
"user_list": this.state.checkBoxValues.map (item => { return { 'user_id': item }}) , "user_list": this.state.checkBoxValues.map (item => { return { 'user_id': item }}) ,
// "graduation_group_id": "2", // "graduation_group_id": "2",
// "course_group_id": "820", // "course_group_id": "820",
"role": this.props.isTeacher ? ROLE_TEACHER_NUM : ROLE_ASSISTANT_NUM "role": this.props.isTeacher ? ROLE_TEACHER_NUM : ROLE_ASSISTANT_NUM
} }
const { graduationGroup, courseGroup } = this.state const { graduationGroup, courseGroup } = this.state
if (graduationGroup) { if (graduationGroup) {
params.graduation_group_id = graduationGroup params.graduation_group_id = graduationGroup
} }
if (courseGroup) { if (courseGroup) {
params.course_group_id = courseGroup params.course_group_id = courseGroup
} }
axios.post(url, params) axios.post(url, params)
.then((response) => { .then((response) => {
if (response.data.status == 0) { if (response.data.status == 0) {
this.setVisible(false) this.setVisible(false)
this.props.showNotification('添加成功') this.props.showNotification('添加成功')
this.props.addTeacherSuccess && this.props.addTeacherSuccess(params) this.props.addTeacherSuccess && this.props.addTeacherSuccess(params)
} }
}) })
.catch(function (error) { .catch(function (error) {
console.log(error); console.log(error);
}); });
} }
onOk = () => { onOk = () => {
this.onSendOk() this.onSendOk()
} }
onCheckBoxChange = (checkBoxValues) => { onCheckBoxChange = (checkBoxValues) => {
this.setState({ this.setState({
checkBoxValues: checkBoxValues checkBoxValues: checkBoxValues
}) })
} }
handleInfiniteOnLoad = () => { handleInfiniteOnLoad = () => {
this.fetchMemberList(this.state.page + 1) this.fetchMemberList(this.state.page + 1)
} }
onSearch = () => { onSearch = () => {
this.fetchMemberList(1) this.fetchMemberList(1)
} }
handleGradationGroupChange = (value) => { handleGradationGroupChange = (value) => {
this.setState({ this.setState({
graduationGroup: value graduationGroup: value
}) })
} }
handleCourseGroupChange = (value) => { handleCourseGroupChange = (value) => {
this.setState({ this.setState({
courseGroup: value courseGroup: value
}) })
} }
onOrgNameChange = (value) => { onOrgNameChange = (value) => {
// console.log('school_name: ', value) // console.log('school_name: ', value)
this.setState({ school_name: value }) this.setState({ school_name: value })
} }
hasGraduationModule = () => { hasGraduationModule = () => {
const { course_modules } = this.props; const { course_modules } = this.props;
const result = course_modules && course_modules.filter( item => { const result = course_modules && course_modules.filter( item => {
return item.type == 'graduation' return item.type == 'graduation'
}) })
return result && result.length > 0 return result && result.length > 0
} }
render(){ render(){
const { candidates, checkBoxValues, loading, hasMore, name, school_name, school_names const { candidates, checkBoxValues, loading, hasMore, name, school_name, school_names
, graduationGroup, graduation_groups, courseGroup, course_groups } = this.state , graduationGroup, graduation_groups, courseGroup, course_groups } = this.state
const { moduleName } = this.props const { moduleName } = this.props
return( return(
<ModalWrapper <ModalWrapper
ref="modalWrapper" ref="modalWrapper"
width="700px" width="700px"
title={`添加${moduleName}`} title={`添加${moduleName}`}
{...this.props } {...this.props }
onOk={this.onOk} onOk={this.onOk}
className="addTeacherModal courseForm" className="addTeacherModal courseForm"
> >
<AddGraduationGroupModal ref="addGraduationGroupModal" <AddGraduationGroupModal ref="addGraduationGroupModal"
{...this.props} onOk={this.onAddGraduationGroupOk} {...this.props} onOk={this.onAddGraduationGroupOk}
></AddGraduationGroupModal> ></AddGraduationGroupModal>
<style> <style>
{` {`
.demo-loading-container { .demo-loading-container {
position: absolute; position: absolute;
bottom: 210px; bottom: 210px;
width: 82%; width: 82%;
text-align: center; text-align: center;
} }
.df { .df {
display: flex; display: flex;
align-items: baseline; align-items: baseline;
margin: 12px 0; margin: 12px 0;
} }
.firstLabel { .firstLabel {
flex: 0 0 60px; flex: 0 0 60px;
} }
.df span.label { .df span.label {
margin-right: 8px; margin-right: 8px;
text-align: left; text-align: left;
} }
.df .ant-input-affix-wrapper { .df .ant-input-affix-wrapper {
width: 32%; width: 32%;
} }
.addTeacherModal label.task-hide { .addTeacherModal label.task-hide {
width: 100%; width: 100%;
} }
`} `}
</style> </style>
<div className="df"> <div className="df">
<span className="firstLabel label" style={{ flex: '0 0 40px' }}>姓名:</span> <span className="firstLabel label" style={{ flex: '0 0 40px' }}>姓名:</span>
<Input allowClear placeholder="请输入真实姓名" value={name} onChange={(e) => {this.setState({name: e.target.value})}} <Input allowClear placeholder="请输入真实姓名" value={name} onChange={(e) => {this.setState({name: e.target.value})}}
style={{ width: '200px', marginRight: '18px' }}> style={{ width: '200px', marginRight: '18px' }}>
</Input> </Input>
<span className="label" style={{ minWidth: '36px', flex: '0 0 40px' }}>单位:</span> <span className="label" style={{ minWidth: '36px', flex: '0 0 40px' }}>单位:</span>
<SchoolSelect <SchoolSelect
value={school_name} value={school_name}
onChange={this.onOrgNameChange} onChange={this.onOrgNameChange}
></SchoolSelect> ></SchoolSelect>
{/* <Select allowClear placeholder="" value={school_name} {/* <Select allowClear placeholder="" value={school_name}
style={{ width: '200px'}} showArrow={false} style={{ width: '200px'}} showArrow={false}
filterOption={false} onSearch={this.onOrgNameSearch} filterOption={false} onSearch={this.onOrgNameSearch}
onChange={this.onOrgNameChange} notFoundContent={null} onChange={this.onOrgNameChange} notFoundContent={null}
showSearch defaultActiveFirstOption={false} showSearch defaultActiveFirstOption={false}
> >
{ school_names && school_names.map((item, index) => { { school_names && school_names.map((item, index) => {
return <Option value={item} key={index}>{item}</Option> return <Option value={item} key={index}>{item}</Option>
})} })}
</Select> */} </Select> */}
<a className="task-btn task-btn-orange" onClick={() => this.fetchMemberList(1)} <a className="task-btn task-btn-orange" onClick={() => this.fetchMemberList(1)}
style={{ height: '30px', lineHeight: '30px', marginLeft: '10px', width: '70px'}} style={{ height: '30px', lineHeight: '30px', marginLeft: '10px', width: '70px'}}
>搜索</a> >搜索</a>
</div> </div>
{/* graduation_groups && !!graduation_groups.length */} {/* graduation_groups && !!graduation_groups.length */}
<p className="clearfix mb2" style={{ margin: '0px 15px 6px' }}> <p className="clearfix mb2" style={{ margin: '0px 15px 6px' }}>
<Checkbox className="fl" style={{ visibility: 'hidden' }} ></Checkbox> <Checkbox className="fl" style={{ visibility: 'hidden' }} ></Checkbox>
<span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'姓名'}</label></span> <span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'姓名'}</label></span>
<span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'昵称'}</label></span> <span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'昵称'}</label></span>
<span className="fl with35"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'单位'}</label></span> <span className="fl with35"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'单位'}</label></span>
<span className="fl with10"><label className="task-hide fl" style={{"maxWidth":"48px"}}>{''}</label></span> <span className="fl with10"><label className="task-hide fl" style={{"maxWidth":"48px"}}>{''}</label></span>
</p> </p>
{ loading || candidates.length ? <div> { loading || candidates.length ? <div>
{/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */} {/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
<div className="edu-back-skyblue padding10-15" style={{"height":"300px", overflowY: "scroll", overflowAnchor: 'none' }}> <div className="edu-back-skyblue padding10-15" style={{"height":"300px", overflowY: "scroll", overflowAnchor: 'none' }}>
<InfiniteScroll <InfiniteScroll
threshold={10} threshold={10}
initialLoad={false} initialLoad={false}
pageStart={0} pageStart={0}
loadMore={this.handleInfiniteOnLoad} loadMore={this.handleInfiniteOnLoad}
hasMore={!loading && hasMore} hasMore={!loading && hasMore}
useWindow={false} useWindow={false}
> >
<Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}> <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
{ candidates && candidates.map( candidate => { { candidates && candidates.map( candidate => {
return ( return (
<p className="clearfix mb7" key={candidate.id}> <p className="clearfix mb7" key={candidate.id}>
<Checkbox className="fl" value={candidate.id} ></Checkbox> <Checkbox className="fl" value={candidate.id} key={candidate.id}></Checkbox>
<span className="fl with25"> <span className="fl with25">
{/* "color":"#4c4c4c" */} {/* "color":"#4c4c4c" */}
<ConditionToolTip title={candidate.name} condition={candidate.name && candidate.name.length > 12 }> <ConditionToolTip title={candidate.name} condition={candidate.name && candidate.name.length > 12 }>
<label className="task-hide fl" style={{"maxWidth":"208px;"}} <label className="task-hide fl" style={{"maxWidth":"208px;"}}
> >
<a href={`/users/${candidate.login}`} target="_blank" <a href={`/users/${candidate.login}`} target="_blank"
style={{}} style={{}}
>{candidate.name}</a> >{candidate.name}</a>
</label> </label>
</ConditionToolTip> </ConditionToolTip>
</span> </span>
<span className="fl with25"> <span className="fl with25">
<ConditionToolTip title={candidate.nickname} condition={candidate.nickname && candidate.nickname.length > 12 }> <ConditionToolTip title={candidate.nickname} condition={candidate.nickname && candidate.nickname.length > 12 }>
<label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.nickname || ' '}</label> <label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.nickname || ' '}</label>
</ConditionToolTip> </ConditionToolTip>
</span> </span>
<span className="fl with35"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.school_name}</label></span> <span className="fl with35"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.school_name}</label></span>
<span className="fl with10"><label className="task-hide fl" style={{"maxWidth":"48px;"}}>{candidate.added ? '已加入' : ''}</label></span> <span className="fl with10"><label className="task-hide fl" style={{"maxWidth":"48px;"}}>{candidate.added ? '已加入' : ''}</label></span>
</p> </p>
) )
}) } }) }
</Checkbox.Group> </Checkbox.Group>
{loading && hasMore && ( {loading && hasMore && (
<div className="demo-loading-container"> <div className="demo-loading-container">
<Spin /> <Spin />
</div> </div>
)} )}
</InfiniteScroll> </InfiniteScroll>
</div> </div>
</div> : <NoneData></NoneData> } </div> : <NoneData></NoneData> }
<div className="df"> <div className="df">
{ this.hasGraduationModule() && <div className="df" style={{ marginTop: '24px' }} > { this.hasGraduationModule() && <div className="df" style={{ marginTop: '24px' }} >
<span className="firstLabel label" style={{ flex: '0 0 96px' }}>添加至答辩组:</span> <span className="firstLabel label" style={{ flex: '0 0 96px' }}>添加至答辩组:</span>
<Select style={{ width: 218, marginRight: '18px' }} onChange={this.handleGradationGroupChange} value={graduationGroup} <Select style={{ width: 218, marginRight: '18px' }} onChange={this.handleGradationGroupChange} value={graduationGroup}
dropdownRender={menu => ( dropdownRender={menu => (
<div> <div>
{menu} {menu}
<Divider style={{ margin: '4px 0' }} /> <Divider style={{ margin: '4px 0' }} />
{/* <ActionBtn {/* <ActionBtn
onMouseDown={() => { debugger; this.refs['addGraduationGroupModal'].setVisible(true) }} onMouseDown={() => { debugger; this.refs['addGraduationGroupModal'].setVisible(true) }}
>添加答辩组</ActionBtn> */} >添加答辩组</ActionBtn> */}
<div style={{ padding: '8px', cursor: 'pointer' }} <div style={{ padding: '8px', cursor: 'pointer' }}
onMouseDown={() => { debugger; this.refs['addGraduationGroupModal'].setVisible(true) }} onMouseDown={() => { debugger; this.refs['addGraduationGroupModal'].setVisible(true) }}
> >
<Icon type="plus" /> 添加答辩组 <Icon type="plus" /> 添加答辩组
</div> </div>
</div> </div>
)} )}
> >
{ graduation_groups && graduation_groups.map((item) => { { graduation_groups && graduation_groups.map((item) => {
return <Option value={item.id}>{item.name}</Option> return <Option value={item.id}>{item.name}</Option>
})} })}
</Select> </Select>
</div>} </div>}
{ course_groups && !!course_groups.length && <div className="df"> { course_groups && !!course_groups.length && <div className="df">
<span className="firstLabel label">管理权限:</span> <span className="firstLabel label">管理权限:</span>
<Select style={{ width: 218 }} onChange={this.handleCourseGroupChange} value={courseGroup}> <Select style={{ width: 218 }} onChange={this.handleCourseGroupChange} value={courseGroup}>
{ course_groups && course_groups.map((item) => { { course_groups && course_groups.map((item) => {
return <Option value={item.id}>{item.name}</Option> return <Option value={item.id}>{item.name}</Option>
})} })}
</Select> </Select>
</div> } </div> }
</div> </div>
</ModalWrapper> </ModalWrapper>
) )
} }
} }
export default AddTeacherModal; export default AddTeacherModal;

@ -108,8 +108,8 @@ class PollDetailTabThird extends Component{
{ {
item.question.answers.map((index,k)=>{ item.question.answers.map((index,k)=>{
return( return(
<li className="df"> <li className="df" key={k}>
<Checkbox className="fl mr8" value={index.answer_id}></Checkbox> <Checkbox className="fl mr8" value={index.answer_id} key={index.answer_id}></Checkbox>
<span className={index.answer_text=="其他"?"break-word":"break-word flex1"}>{index.answer_text}</span> <span className={index.answer_text=="其他"?"break-word":"break-word flex1"}>{index.answer_text}</span>
{ {
index.answer_text=="其他" ? <p className="textLine"></p>:"" index.answer_text=="其他" ? <p className="textLine"></p>:""

@ -445,7 +445,7 @@ class PollInfo extends Component{
item.question.answers && item.question.answers.map((i,k)=>{ item.question.answers && item.question.answers.map((i,k)=>{
return( return(
<li className={i.answer_text=="其他"?"df clearfix":"clearfix"}> <li className={i.answer_text=="其他"?"df clearfix":"clearfix"}>
<Checkbox className="fl mr8" value={i.answer_id}></Checkbox> <Checkbox className="fl mr8" value={i.answer_id} key={i.answer_id}></Checkbox>
<span className="break-word fl" style={{maxWidth:"1116px"}}>{i.answer_text}</span> <span className="break-word fl" style={{maxWidth:"1116px"}}>{i.answer_text}</span>
{ {
i.answer_text=="其他"? i.answer_text=="其他"?

@ -288,6 +288,7 @@ class ShixunWorkModal extends Component{
className="fl task-hide edu-txt-left" className="fl task-hide edu-txt-left"
name="shixun_homework[]" name="shixun_homework[]"
value={item=== undefined?"":item.id} value={item=== undefined?"":item.id}
key={item=== undefined?"":item.id}
> >
<label style={{"textAlign": "left", "color": "#05101A"}} <label style={{"textAlign": "left", "color": "#05101A"}}
className="task-hide color-grey-name" title="frerere">{item===undefined?"":item.name}</label> className="task-hide color-grey-name" title="frerere">{item===undefined?"":item.name}</label>

@ -1161,7 +1161,7 @@ class ShixunHomework extends Component{
isStudent={this.props.isStudent()} isStudent={this.props.isStudent()}
isNotMember={this.props.isNotMember()} isNotMember={this.props.isNotMember()}
isClassManagement={this.props.isClassManagement()} isClassManagement={this.props.isClassManagement()}
checkBox={this.props.isAdmin()?<Checkbox value={item.homework_id}></Checkbox>:""} checkBox={this.props.isAdmin()?<Checkbox value={item.homework_id} key={item.homework_id}></Checkbox>:""}
match={this.props.match} match={this.props.match}
coursedata={this.props.coursedata} coursedata={this.props.coursedata}
coursupdata={()=>this.homeworkupdatalist(Coursename,page,order)} coursupdata={()=>this.homeworkupdatalist(Coursename,page,order)}

@ -1,249 +1,249 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import {Pagination,Spin,Checkbox,Modal} from 'antd'; import {Pagination,Spin,Checkbox,Modal} from 'antd';
import moment from 'moment'; import moment from 'moment';
import axios from 'axios'; import axios from 'axios';
import NoneData from '../../courses/coursesPublic/NoneData' import NoneData from '../../courses/coursesPublic/NoneData'
import {getImageUrl} from 'educoder'; import {getImageUrl} from 'educoder';
import "./usersInfo.css" import "./usersInfo.css"
import Modals from '../../modals/Modals' import Modals from '../../modals/Modals'
const dateFormat ="YYYY-MM-DD HH:mm" const dateFormat ="YYYY-MM-DD HH:mm"
class InfosBank extends Component{ class InfosBank extends Component{
constructor(props){ constructor(props){
super(props); super(props);
this.state={ this.state={
category:"common", category:"common",
type:"publicly", type:"publicly",
page:1, page:1,
per_page:16, per_page:16,
sort_by:"updated_at", sort_by:"updated_at",
CoursesId:undefined, CoursesId:undefined,
totalCount:undefined, totalCount:undefined,
data:undefined, data:undefined,
isSpin:false, isSpin:false,
dialogOpen:false, dialogOpen:false,
modalsTopval:undefined, modalsTopval:undefined,
modalsBottomval:undefined, modalsBottomval:undefined,
modalSave:undefined modalSave:undefined
} }
} }
componentDidMount=()=>{ componentDidMount=()=>{
this.setState({ this.setState({
isSpin:true isSpin:true
}) })
let{category,type,page,sort_by,CoursesId}=this.state; let{category,type,page,sort_by,CoursesId}=this.state;
this.getCourses(category,type,page,sort_by,CoursesId); this.getCourses(category,type,page,sort_by,CoursesId);
} }
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`; let url=`/users/${this.props.match.params.username}/question_banks.json`;
axios.get((url),{params:{ axios.get((url),{params:{
category, category,
type, type,
page, page,
sort_by, sort_by,
per_page:category && page ==1?17:16, per_page:category && page ==1?17:16,
course_list_id:CoursesId course_list_id:CoursesId
}}).then((result)=>{ }}).then((result)=>{
if(result){ if(result){
this.setState({ this.setState({
totalCount:result.data.count, totalCount:result.data.count,
data:result.data, data:result.data,
isSpin:false isSpin:false
}) })
} }
}).catch((error)=>{ }).catch((error)=>{
console.log(error); console.log(error);
}) })
} }
//切换种类 //切换种类
changeCategory=(cate)=>{ changeCategory=(cate)=>{
this.setState({ this.setState({
category:cate, category:cate,
page:1, page:1,
isSpin:true isSpin:true
}) })
let{type,sort_by,CoursesId}=this.state; let{type,sort_by,CoursesId}=this.state;
this.getCourses(cate,type,1,sort_by,CoursesId); this.getCourses(cate,type,1,sort_by,CoursesId);
} }
//切换状态 //切换状态
changeType=(type)=>{ changeType=(type)=>{
this.setState({ this.setState({
type:type, type:type,
page:1, page:1,
isSpin:true isSpin:true
}) })
let{category,sort_by,CoursesId}=this.state; let{category,sort_by,CoursesId}=this.state;
this.getCourses(category,type,1,sort_by,CoursesId); this.getCourses(category,type,1,sort_by,CoursesId);
} }
//切换页数 //切换页数
changePage=(page)=>{ changePage=(page)=>{
this.setState({ this.setState({
page, page,
isSpin:true isSpin:true
}) })
let{category,type,sort_by,CoursesId}=this.state; let{category,type,sort_by,CoursesId}=this.state;
this.getCourses(category,type,page,sort_by,CoursesId); this.getCourses(category,type,page,sort_by,CoursesId);
} }
// 进入课堂 // 进入课堂
turnToCourses=(url)=>{ turnToCourses=(url)=>{
this.props.history.push(url); this.props.history.push(url);
} }
// 切换排序方式 // 切换排序方式
changeOrder= (sort)=>{ changeOrder= (sort)=>{
this.setState({ this.setState({
sort_by:sort, sort_by:sort,
isSpin:true isSpin:true
}) })
let{category,type,page,CoursesId}=this.state; let{category,type,page,CoursesId}=this.state;
this.getCourses(category,type,page,sort,CoursesId); this.getCourses(category,type,page,sort,CoursesId);
} }
changeCourseListId =(CoursesId)=>{ changeCourseListId =(CoursesId)=>{
this.setState({ this.setState({
CoursesId, CoursesId,
isSpin:true isSpin:true
}) })
let{category,type,sort,page}=this.state; let{category,type,sort,page}=this.state;
this.getCourses(category,type,page,sort,CoursesId); this.getCourses(category,type,page,sort,CoursesId);
} }
//设为公开/删除 //设为公开/删除
setPublic=(index)=>{ setPublic=(index)=>{
this.setState({ this.setState({
dialogOpen:true, dialogOpen:true,
modalsTopval:index==1?"您确定要公开吗?":"确定要删除该题吗?", modalsTopval:index==1?"您确定要公开吗?":"确定要删除该题吗?",
modalsBottomval:index==1?"公开后不能重设为私有":"", modalsBottomval:index==1?"公开后不能重设为私有":"",
modalSave:()=>this.sureOperation(index) modalSave:()=>this.sureOperation(index)
}) })
} }
// 确定--设为公开/删除 // 确定--设为公开/删除
sureOperation=()=>{ sureOperation=()=>{
} }
//弹框隐藏 //弹框隐藏
handleDialogClose=()=>{ handleDialogClose=()=>{
this.setState({ this.setState({
dialogOpen:false dialogOpen:false
}) })
} }
render(){ render(){
let{ let{
category, category,
type, type,
page, page,
data, data,
totalCount, totalCount,
sort_by, sort_by,
isSpin, isSpin,
CoursesId, CoursesId,
dialogOpen, dialogOpen,
modalsTopval, modalsTopval,
modalsBottomval,modalSave modalsBottomval,modalSave
} = this.state; } = this.state;
let isStudent = this.props.isStudent(); let isStudent = this.props.isStudent();
let is_current=this.props.is_current; let is_current=this.props.is_current;
return( return(
<div className="educontent"> <div className="educontent">
<Modals <Modals
modalsType={dialogOpen} modalsType={dialogOpen}
modalsTopval={modalsTopval} modalsTopval={modalsTopval}
modalsBottomval={modalsBottomval} modalsBottomval={modalsBottomval}
modalCancel={this.handleDialogClose} modalCancel={this.handleDialogClose}
modalSave={modalSave} modalSave={modalSave}
></Modals> ></Modals>
<Spin size="large" spinning={isSpin}> <Spin size="large" spinning={isSpin}>
<div className="white-panel edu-back-white pt20 pb20 clearfix "> <div className="white-panel edu-back-white pt20 pb20 clearfix ">
<li className={type=="publicly" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeType("publicly")}>{is_current ? "我":"TA"}的题库</a></li> <li className={type=="publicly" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeType("publicly")}>{is_current ? "我":"TA"}的题库</a></li>
<li className={type=="personal" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeType("personal")}>公共题库</a></li> <li className={type=="personal" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeType("personal")}>公共题库</a></li>
</div> </div>
<div className="edu-back-white padding20-30 bor-top-greyE"> <div className="edu-back-white padding20-30 bor-top-greyE">
<ul className="clearfix secondNav"> <ul className="clearfix secondNav">
<li className={category=="common" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("common")}>普通作业</a></li> <li className={category=="common" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("common")}>普通作业</a></li>
<li className={category=="group" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("group")}>分组作业</a></li> <li className={category=="group" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("group")}>分组作业</a></li>
<li className={category=="exercise" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("exercise")}>试卷</a></li> <li className={category=="exercise" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("exercise")}>试卷</a></li>
<li className={category=="poll" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("poll")}>问卷</a></li> <li className={category=="poll" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeCategory("poll")}>问卷</a></li>
</ul> </ul>
<div className="edu-txt-left mt10 bankTag"> <div className="edu-txt-left mt10 bankTag">
<ul className="inline" id="sourceTag"> <ul className="inline" id="sourceTag">
<li className={ CoursesId ? "" : "active" } onClick={()=>this.changeCourseListId()}> <li className={ CoursesId ? "" : "active" } onClick={()=>this.changeCourseListId()}>
<a href="javascript:void(0)">全部</a> <a href="javascript:void(0)">全部</a>
</li> </li>
{ {
data && data.course_list && data.course_list.map((item,key)=>{ data && data.course_list && data.course_list.map((item,key)=>{
return( return(
<li className={CoursesId==item.id?"active":""} key={key} onClick={()=>this.changeCourseListId(`${item.id}`)}> <li className={CoursesId==item.id?"active":""} key={key} onClick={()=>this.changeCourseListId(`${item.id}`)}>
<a href="javascript:void(0)">{item.name}</a> <a href="javascript:void(0)">{item.name}</a>
</li> </li>
) )
}) })
} }
</ul> </ul>
</div> </div>
</div> </div>
<p className="pl25 pr25 clearfix font-12 mb20 mt20"> <p className="pl25 pr25 clearfix font-12 mb20 mt20">
<span className="fl color-grey-9">共参与{totalCount}个题库</span> <span className="fl color-grey-9">共参与{totalCount}个题库</span>
<div className="fr"> <div className="fr">
<li className="drop_down"> <li className="drop_down">
<span className="color-grey-9 font-12">{sort_by=="updated_at"?"时间最新":sort_by=="name"?"作业名称":"贡献者"}</span><i className="iconfont icon-xiajiantou font-12 ml2 color-grey-6"></i> <span className="color-grey-9 font-12">{sort_by=="updated_at"?"时间最新":sort_by=="name"?"作业名称":"贡献者"}</span><i className="iconfont icon-xiajiantou font-12 ml2 color-grey-6"></i>
<ul className="drop_down_normal"> <ul className="drop_down_normal">
<li onClick={()=>this.changeOrder("updated_at")}>时间最新</li> <li onClick={()=>this.changeOrder("updated_at")}>时间最新</li>
<li onClick={()=>this.changeOrder("name")}>作业名称</li> <li onClick={()=>this.changeOrder("name")}>作业名称</li>
<li onClick={()=>this.changeOrder("contributor")}>贡献者</li> <li onClick={()=>this.changeOrder("contributor")}>贡献者</li>
</ul> </ul>
</li> </li>
</div> </div>
</p> </p>
<div className="dataBank_list edu-back-white educontent"> <div className="dataBank_list edu-back-white educontent">
{ {
!data || data.question_banks.length==0 && <NoneData></NoneData> !data || data.question_banks.length==0 && <NoneData></NoneData>
} }
{ {
data && data.question_banks && data.question_banks.map((item,key)=>{ data && data.question_banks && data.question_banks.map((item,key)=>{
return( return(
<div className="dataBank_Item clearfix" key={key}> <div className="dataBank_Item clearfix" key={key}>
<div className="fl dataItemLeft"> <div className="fl dataItemLeft">
<Checkbox value={item.id}></Checkbox> <Checkbox value={item.id} key={item.id}></Checkbox>
</div> </div>
<div className="fr dataItemRight bank_item"> <div className="fr dataItemRight bank_item">
<p className="mb10 clearfix"> <p className="mb10 clearfix">
<span className="dataTitle fl mr80">{item.name}</span> <span className="dataTitle fl mr80">{item.name}</span>
<a href="javascript:void(0)" data-object="2599" className="bank_send fr">发送</a> <a href="javascript:void(0)" data-object="2599" className="bank_send fr">发送</a>
{ {
item.is_public ==false ? item.is_public ==false ?
<a href="javascript:void(0)" onClick={()=>this.setPublic(1)} className="bank_public color-blue_4C fr mr60">设为公开</a>:"" <a href="javascript:void(0)" onClick={()=>this.setPublic(1)} className="bank_public color-blue_4C fr mr60">设为公开</a>:""
} }
</p> </p>
<p className="itembottom clearfix"> <p className="itembottom clearfix">
<span className="fl bottomspan color-grey-9">{item.quotes_count}次引用</span> <span className="fl bottomspan color-grey-9">{item.quotes_count}次引用</span>
<span className="fl bottomspan color-grey-9">{item.solve_count}次答题</span> <span className="fl bottomspan color-grey-9">{item.solve_count}次答题</span>
<span className="fl bottomspan color-grey-9">{moment(item.updated_at).format('YYYY-MM-DD HH:mm')}</span> <span className="fl bottomspan color-grey-9">{moment(item.updated_at).format('YYYY-MM-DD HH:mm')}</span>
<span className="fr"><a href="javascript:void(0)" className="bank_delete color-grey-9" onClick={()=>this.setPublic(2)}>删除</a></span> <span className="fr"><a href="javascript:void(0)" className="bank_delete color-grey-9" onClick={()=>this.setPublic(2)}>删除</a></span>
<span className="bank_list_Tag">{item.course_list_name}</span> <span className="bank_list_Tag">{item.course_list_name}</span>
</p> </p>
</div> </div>
</div> </div>
) )
}) })
} }
</div> </div>
{ {
totalCount > 15 && totalCount > 15 &&
<div className="mt30 mb50 edu-txt-center"> <div className="mt30 mb50 edu-txt-center">
<Pagination showQuickJumper total={totalCount} onChange={this.changePage} pageSize={16} current={page}/> <Pagination showQuickJumper total={totalCount} onChange={this.changePage} pageSize={16} current={page}/>
</div> </div>
} }
</Spin> </Spin>
</div> </div>
) )
} }
} }
export default InfosBank; export default InfosBank;
Loading…
Cancel
Save