window.$(`.sourceitem${index} input`).click() }>
this.eventStop(event)}>
@@ -248,6 +251,29 @@ class Fileslistitem extends Component{
:""
}
{discussMessage.is_publish===false?
}
{ firstRowRight }
diff --git a/public/react/src/modules/courses/coursesPublic/SelectResource.js b/public/react/src/modules/courses/coursesPublic/SelectResource.js
index c323d1bae..0e76059c8 100644
--- a/public/react/src/modules/courses/coursesPublic/SelectResource.js
+++ b/public/react/src/modules/courses/coursesPublic/SelectResource.js
@@ -1,17 +1,34 @@
import React,{ Component } from "react";
-import { Modal,Checkbox,Select,Input,Spin,Icon} from "antd";
+import { Modal,Checkbox,Select,Input,Spin,Icon,Radio,DatePicker} from "antd";
+import locale from 'antd/lib/date-picker/locale/zh_CN';
import axios from'axios';
+import {handleDateString} from 'educoder';
import NoneData from "../coursesPublic/NoneData";
import Modals from '../../modals/Modals';
-
+import moment from 'moment';
const Option = Select.Option;
const Search = Input.Search;
-
+const dateFormat ="YYYY-MM-DD HH:mm"
function formatDate(date) {
var dateee = new Date(date).toJSON();
return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '')
}
-
+function range(start, end) {
+ const result = [];
+ for (let i = start; i < end; i++) {
+ result.push(i);
+ }
+ return result;
+}
+function disabledDateTime() {
+ return {
+ disabledMinutes: () => range(1, 30).concat(range(31, 60)),
+ // disabledSeconds: () => range(1,60)
+ }
+}
+function disabledDate(current) {
+ return current && current < moment().endOf('day').subtract(1, 'days');
+}
class Selectresource extends Component{
constructor(props){
super(props);
@@ -23,7 +40,9 @@ class Selectresource extends Component{
Resourcelist:undefined,
hometypepvisible:true,
getallfiles:false,
- searchtype:'getallfiles'
+ searchtype:'getallfiles',
+ Radiovalue:0,
+ datatime:undefined
}
}
componentDidMount() {
@@ -32,11 +51,7 @@ class Selectresource extends Component{
componentDidUpdate = (prevProps) => {
- let {getallfiles}=this.state;
-
- if ( prevProps.visible != this.props.visible ) {
- }
}
@@ -197,7 +212,7 @@ class Selectresource extends Component{
savecouseShixunModal=()=>{
- let {patheditarry}=this.state;
+ let {patheditarry,datatime,Radiovalue}=this.state;
let {coursesId,attachmentId}=this.props;
let url="/files/import.json";
@@ -212,19 +227,28 @@ class Selectresource extends Component{
})
}
+ if(this.state.Radiovalue===1){
+ if(datatime===undefined||datatime===null||datatime=== ""){
+ this.setState({
+ Radiovaluetype:true
+ })
+ return
+ }else{
+ this.setState({
+ Radiovaluetype:false
+ })
+ }
+ }
+
axios.post(url, {
course_id:coursesId,
attachment_ids:patheditarry,
course_second_category_id:this.props.coursesidtype===undefined||this.props.coursesidtype==="node"?0:attachmentId,
+ delay_publish:Radiovalue,
+ publish_time:Radiovalue===1?datatime:undefined
}
).then((response) => {
if(response.data.status===0){
- // this.setState({
- // Modalstype:true,
- // Modalstopval:response.data.message,
- // ModalSave:this.ModalCancelModalCancel,
- // loadtype:true
- // })
this.ModalCancelModalCancel();
this.props.updataleftNavfun();
this.props.showNotification("选用资源成功");
@@ -236,15 +260,33 @@ class Selectresource extends Component{
}
- selectCloseList=(value)=>{
+ RadioonChange=(e)=>{
+ if(e.target.value===0){
+ this.setState({
+ datatime:undefined
+ })
+ }
this.setState({
- category_id:value
+ Radiovalue: e.target.value,
+ });
+ }
+
+ onChangeTimepublish= (date, dateString) => {
+
+ this.setState({
+ datatime:handleDateString(dateString),
})
+
}
render(){
- let {Searchvalue,type,category_id,Resourcelist,hometypepvisible,patheditarry}=this.state;
- let {visible,shixunmodallist}=this.props;
+ let {Searchvalue,type,Resourcelist,hometypepvisible,patheditarry,datatime}=this.state;
+ let {visible}=this.props;
const antIcon =
this.eventStop(event)}>
@@ -248,6 +251,29 @@ class Fileslistitem extends Component{
:""
}
{discussMessage.is_publish===false?:""}
+
+ {this.props.isAdmin?
+ this.eventStop(event)}>
+
+ this.settingList()}>设置
+
+ :""}
+
+ {this.props.isStudent===true&&this.props.current_user.login===discussMessage.author.login?
+ this.eventStop(event)}>
+
+
+ this.settingList()}>设置
+
+
+
+ this.onDelete(discussMessage.id)}>删除
+
+
+ :""}
}
- {title} + {title}
{/*提示*/}
@@ -373,10 +415,36 @@ class Selectresource extends Component{
}
-
+
+ 发布设置：
+
+
+ 立即发布
+
+
+ 延迟发布
+ this.onChangeTimepublish(e,index,undefined,1)}
+ disabledTime={disabledDateTime}
+ disabledDate={disabledDate}
+ disabled={this.state.Radiovalue===1?false:true}
+ />
+
+ (按照设置的时间定时发布)
+
+
{this.state.patheditarrytype===true?请选择资源
:""} - + {this.state.Radiovaluetype===true?发布时间不能为空
:""}
取消
确定
diff --git a/public/react/src/modules/courses/coursesPublic/SelectSetting.js b/public/react/src/modules/courses/coursesPublic/SelectSetting.js
index 37b22c205..ff5751cc6 100644
--- a/public/react/src/modules/courses/coursesPublic/SelectSetting.js
+++ b/public/react/src/modules/courses/coursesPublic/SelectSetting.js
@@ -1,5 +1,5 @@
import React,{ Component } from "react";
-import { Modal,Checkbox,Select,Input,Upload,Button,Icon,message,DatePicker,Tooltip} from "antd";
+import { Modal,Checkbox,Select,Input,Upload,Button,Icon,message,DatePicker,Tooltip,Radio} from "antd";
import axios from'axios';
import {getUrl,handleDateString,appendFileSizeToUploadFileAll} from 'educoder';
import locale from 'antd/lib/date-picker/locale/zh_CN';
@@ -36,9 +36,10 @@ class Selectsetting extends Component{
course_groups:undefined,
attachment_histories:undefined,
datatime:undefined,
- unified_setting:true,
fileList:[],
- fileListtype:false
+ fileListtype:false,
+ is_public:false,
+ Radiovaluetype:false
}
}
@@ -54,53 +55,13 @@ class Selectsetting extends Component{
})
.then((response) => {
if(response.status===200){
-
- let newcourse_groups=[];
- let list =response.data.course_groups;
-
- // let list=[
- // {
- // "course_group_id": 820,
- // "course_group_name": "示例A班",
- // "course_group_publish_time": "2019-04-18T17:00:00.000+08:00"
- // },
- // {
- // "course_group_id": 821,
- // "course_group_name": "示例B班",
- // "course_group_publish_time": "2019-04-19T19:00:00.000+08:00"
- // },
- // {
- // "course_group_id": 822,
- // "course_group_name": "示例C班",
- // "course_group_publish_time": "2019-04-10T19:00:00.000+08:00"
- // }
- // ]
-
- if(list.length!=0){
- list.forEach((item,key)=>{
- newcourse_groups.push ({
- course_group_id:item.course_group_id,
- course_group_name:item.course_group_id,
- publish_time:moment(item.course_group_publish_time).format(dateFormat)
- })
- })
- }else{
- newcourse_groups.push ({
- course_group_id:undefined,
- course_group_name:undefined,
- publish_time:""
- })
- }
-
this.setState({
datalist:response.data,
description: response.data.description,
- is_public: response.data.is_public,
- unified_setting: response.data.unified_setting,
+ is_public:response.data.is_public,
datatime:response.data.publish_time,
- // is_public:response.data.course_groups,
+ Radiovalue:response.data.delay_publish==false?0:1,
//attachment_histories:response.data.attachment_histories
- course_groups:newcourse_groups
})
}
@@ -110,23 +71,6 @@ class Selectsetting extends Component{
});
- let coursesId=this.props.match.params.coursesId;
- if(this.props.isAdmin()){
- let url = `/courses/${coursesId}/all_course_groups.json`
-
- axios.get(url, {
- })
- .then((response) => {
- this.setState({
- course_groupss: response.data.course_groups,
- })
- })
- .catch(function (error) {
- console.log(error);
- });
- }
-
-
}
@@ -145,21 +89,6 @@ class Selectsetting extends Component{
this.getalldata()
}
- }
- onChangepublics=(e)=>{
- console.log(e.target.checked)
- this.setState({
- is_public:e.target.checked
- })
-
- }
-
- onChangesettings=(e)=>{
- console.log(e.target.checked)
- this.setState({
- unified_setting:e.target.checked
- })
-
}
settextarea=(e)=>{
@@ -180,13 +109,26 @@ class Selectsetting extends Component{
}
savecouseShixunModal=()=>{
- let {fileList,is_public,unified_setting,description,datatime,course_groups}=this.state;
+ let {fileList,is_public,description,datatime,Radiovalue}=this.state;
let newfileList=[];
for(var list of fileList){
newfileList.push(list.response.id)
}
+ if(this.state.Radiovalue===1){
+ if(datatime===undefined||datatime===null||datatime=== ""){
+ this.setState({
+ Radiovaluetype:true
+ })
+ return
+ }else{
+ this.setState({
+ Radiovaluetype:false
+ })
+ }
+ }
+
if(description===undefined||description===null){
}else if(description.length>100){
@@ -196,29 +138,6 @@ class Selectsetting extends Component{
return
}
- // course_groups.forEach((item,key)=>{
- // if(item.course_group_id===undefined||item.publish_time===undefined){
- // this.setState({
- // course_group_publish_timestype:true
- // })
- // return
- // }
- // })
-
- // if(unified_setting===false){
- //
- // course_groups.forEach((item,key)=>{
- // if(item.course_group_id===undefined){
- // this.setState({
- // course_group_idtypes:true
- // })
- // return
- // }
- // })
- //
- // }
-
-
let coursesId=this.props.match.params.coursesId;
let attachmentId=this.props.attachmentId;
let url="/files/"+this.props.discussMessageid+".json";
@@ -226,14 +145,12 @@ class Selectsetting extends Component{
axios.put(url,{
course_id:coursesId,
new_attachment_id:newfileList.length===0?undefined:newfileList,
- course_second_category_id:this.props.coursesidtype===undefined||this.props.coursesidtype==="node"?0:attachmentId,
+ course_second_category_id:this.props.coursesidtype===undefined||this.props.coursesidtype==="node"?0:attachmentId,
is_public:is_public,
- is_unified_setting:unified_setting,
- publish_time:unified_setting===true?datatime===undefined?moment(new Date()).format('YYYY-MM-DD HH'):datatime:undefined,
+ publish_time:Radiovalue===0?undefined:datatime===undefined?moment(new Date(),dateFormat):datatime,
description:description,
- course_group_publish_times:unified_setting===false?course_groups:undefined
+ delay_publish:Radiovalue
}).then((result)=>{
-
if(result.data.status===0){
this.props.setupdate(attachmentId)
this.props.showNotification("设置资源成功");
@@ -244,7 +161,6 @@ class Selectsetting extends Component{
}
onChangeTimepublish= (date, dateString) => {
- // console.log('startValue', dateString);
this.setState({
datatime:handleDateString(dateString),
})
@@ -268,31 +184,6 @@ class Selectsetting extends Component{
}
}
- // onAttachmentRemove = (file) => {
- // // confirm({
- // // title: '确定要删除这个附件吗?',
- // // okText: '确定',
- // // cancelText: '取消',
- // // // content: 'Some descriptions',
- // // onOk: () => {
- // // this.deleteAttachment(file)
- // // },
- // // onCancel() {
- // // console.log('Cancel');
- // // },
- // // });
- // // return false;
- //
- // // this.setState({
- // // Modalstype:true,
- // // Modalstopval:'确定要删除这个附件吗?',
- // // ModalSave: ()=>this.deleteAttachment(file),
- // // ModalCancel:this.cancelAttachment
- // // })
- // // return false;
- //
- // this.deleteAttachment(file);
- // }
onAttachmentRemove = (file) => {
@@ -309,14 +200,7 @@ class Selectsetting extends Component{
fileListtype:false,
fileList:[]
})
- // this.setState((state) => {
- // const index = state.fileList.indexOf(file);
- // const newFileList = state.fileList.slice();
- // newFileList.splice(index, 1);
- // return {
- // fileList: newFileList,
- // };
- // });
+
}
}
})
@@ -332,63 +216,28 @@ class Selectsetting extends Component{
fileList:[]
})
}
- // const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
-
}
- onChangeTimepublishs= (date, dateString,key) => {
- let {course_groups}=this.state;
- let newgroup_publish=course_groups;
- for(var i=0; i{
this.setState({
- course_groups:newgroup_publish,
+ is_public:e.target.checked
})
}
-
-
- selectassigngroups=(e,index,key)=>{
- let {course_groups}=this.state;
- let newgroup_publish=course_groups;
- for(var i=0; i{
+ if(e.target.value===0){
+ this.setState({
+ datatime:undefined
+ })
}
this.setState({
- course_groups:newgroup_publish,
- })
- }
- deletegrouppublish=(key)=>{
- let newlist=this.state.course_groups;
- newlist.splice(key,1);
- this.setState({
- course_groups:newlist
- })
- }
-
- addgrouppublish=()=>{
- let newlist=this.state.course_groups;
- newlist.push( {
- course_group_id : undefined,
- publish_time :""
- // moment(new Date()).format('YYYY-MM-DD HH:mm')
- })
- this.setState({
- course_groups:newlist
- })
+ Radiovalue: e.target.value,
+ });
}
render(){
- let {is_public,unified_setting,course_groups,datatime,description,datalist,course_group_publish_timestype}=this.state;
+ let {datatime,description,datalist}=this.state;
const uploadProps = {
width: 600,
- // https://github.com/ant-design/ant-design/issues/15505
- // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
- // showUploadList: false,
action: `${getUrl()}/api/attachments.json`,
onChange: this.handleChange,
onRemove: this.onAttachmentRemove,
@@ -401,9 +250,13 @@ class Selectsetting extends Component{
return isLt150M;
},
};
+ const radioStyle = {
+ display: 'block',
+ height: '30px',
+ lineHeight: '30px',
+ };
-
- // console.log(this.props.has_course_groups)
+ console.log(this.state.Radiovalue)
return(
-
-
- 资源名称 +
- 资源名称
- 下载 -
- 引用 + {/*
- 引用 */}
- 版本号
-
+
{datalist&&datalist.title}
{datalist&&datalist.attachment_histories.length===0?"":当前版本}
@@ -505,13 +358,13 @@ class Selectsetting extends Component{
{datalist&&datalist.attachment_histories.map((item,key)=>{
return(
-
+
{item.title}
{/*当前版本*/}
{item.downloads_count}
- {item.quotes}
+ {/* {item.quotes} */}
{moment(item.created_on).format('YYYY-MM-DD HH:mm')==="Invalid date"?"":moment(item.created_on).format('YYYY-MM-DD HH:mm')}
@@ -607,61 +460,15 @@ class Selectsetting extends Component{
- {/**/}
- {/*{this.state.fileList.length===0?"":this.state.fileList.map((item,key)=>{*/}
- {/*return(*/}
- {/*
- 统一设置(选中则所有分班使用相同的发布设置，否则各个单独设置)
- :""}
-
-
-
- {/*this.props.has_course_groups&&this.props.has_course_groups===true?:""*/}
-
*/} - {/**/} - {/**/} - {/**/} - {/**/} - {/*{item.name}*/} - {/**/} - {/**/} - {/*{item.response===undefined?"":isNaN(bytesToSize(item.filesize))?"123":bytesToSize(item.filesize)}*/} - {/**/} - {/*this.onAttachmentRemove(item.response===undefined?"":item.response.id&&item.response.id)}>*/} - {/*
*/} - {/*)*/} - {/*})}*/} - {this.state.newfileListtypes===true?请先上传资源
:""} -+
- - {/*
*/}
- {/**/}
- {/*勾选后所有用户可见，否则仅课堂成员可见*/}
- {/**/}
- {/*
*/}
- {/*{this.props.has_course_groups&&this.props.has_course_groups===true?:""}*/}
- {this.state.course_groupss&&this.state.course_groupss.length>0?
- {unified_setting===false?
- this.state.course_groups&&this.state.course_groups.map((item,key)=>{
- return(
-
-
+ {this.props.course_is_public===true?
-
-
-
-
-
- this.onChangeTimepublishs(e,index,key)}
- // onChange={ this.onChangeTimepublish }
- disabledTime={disabledDateTime}
- disabledDate={disabledDate}
- />
-
- {key!=0?this.deletegrouppublish(key)}>:""}
- {key===course_groups.length-1?:""}
-
- )
- }):""}
-
+ 公开：this.onChangepublic(e)}>
+ 选中，所有用户可见，否则课堂成员可见
+
+
:""}
- {unified_setting===true?
-
-
-
请选择分班
:""}*/} - - {/*{course_group_publish_timestype===true?请填写完整
:""}*/} + +
+ 发布设置：
+ this.RadioonChange(e)} value={this.state.Radiovalue} style={{'width': '460px'}}>
+
+ 立即发布
+
+
+ 延迟发布
+
+ (按照设置的时间定时发布)
+
+
+
{this.state.descriptiontypes===true?描述不能超过最大限制：100个字符
:""} + {this.state.Radiovaluetype===true?发布时间不能为空
:""}
diff --git a/public/react/src/modules/courses/coursesPublic/SendToFilesModal.js b/public/react/src/modules/courses/coursesPublic/SendToFilesModal.js
index d14d5d267..c3f2db8c5 100644
--- a/public/react/src/modules/courses/coursesPublic/SendToFilesModal.js
+++ b/public/react/src/modules/courses/coursesPublic/SendToFilesModal.js
@@ -1,9 +1,11 @@
import React, { Component } from "react";
import { Modal, Checkbox, Input, Spin} from "antd";
-import axios from 'axios'
+import axios from 'axios';
+import moment from 'moment';
import ModalWrapper from "../common/ModalWrapper";
import InfiniteScroll from 'react-infinite-scroller';
+const dateFormat ="YYYY-MM-DD HH:mm"
const Search = Input.Search
const pageCount = 15;
class Sendtofilesmodal extends Component{
@@ -170,7 +172,12 @@ class Sendtofilesmodal extends Component{
bottom: 93px;
width: 82%;
text-align: center;
- }`}
+ }
+ .ModalWrappertitle{
+ background: #D0E8FC;
+ padding: 10px;
+ }
+ `}
选择的{moduleName}发送到指定课堂
@@ -183,7 +190,12 @@ class Sendtofilesmodal extends Component{ >
- {/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
+
+
diff --git a/public/react/src/modules/courses/coursesPublic/sendResource.js b/public/react/src/modules/courses/coursesPublic/sendResource.js
index fbc2ebeb2..48677a8e1 100644
--- a/public/react/src/modules/courses/coursesPublic/sendResource.js
+++ b/public/react/src/modules/courses/coursesPublic/sendResource.js
@@ -1,5 +1,5 @@
import React,{ Component } from "react";
-import { Modal,Checkbox,Upload,Button,Icon,message,DatePicker,Select,Tooltip} from "antd";
+import { Modal,Checkbox,Upload,Button,Icon,message,DatePicker,Select,Tooltip,Radio} from "antd";
import axios from 'axios';
import Modals from '../../modals/Modals';
import {getUrl,handleDateString,bytesToSize,appendFileSizeToUploadFileAll} from 'educoder';
@@ -40,7 +40,6 @@ class Sendresource extends Component{
ModalSave:"",
fileListtype:false,
loadtype:false,
- is_unified_setting:true,
is_public:false,
datatime:undefined,
// moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
@@ -50,30 +49,15 @@ class Sendresource extends Component{
publish_time :""
}],
course_groups:undefined,
- course_groups_count:undefined
+ course_groups_count:undefined,
+ Radiovalue:0,
+ Radiovaluetype:false
}
}
componentDidMount() {
- let coursesId=this.props.match.params.coursesId;
- if(this.props.isAdmin()){
- let url = `/courses/${coursesId}/all_course_groups.json`
-
- axios.get(url, {
- })
- .then((response) => {
- this.setState({
- course_groups: response.data.course_groups,
- course_groups_count:response.data.course_groups_count
- })
- })
- .catch(function (error) {
- console.log(error);
- });
- }
-
}
//勾选实训
@@ -101,37 +85,6 @@ class Sendresource extends Component{
}
}
- // onAttachmentRemove = (file) => {
- //
- // this.setState({
- // fileListtype:false,
- // })
- // // confirm({
- // // title: '确定要删除这个附件吗?',
- // // okText: '确定',
- // // cancelText: '取消',
- // // // content: 'Some descriptions',
- // // onOk: () => {
- // // this.deleteAttachment(file)
- // // },
- // // onCancel() {
- // // console.log('Cancel');
- // // },
- // // });
- // // return false;
- //
- // // this.setState({
- // // Modalstype:true,
- // // Modalstopval:'确定要删除这个附件吗?',
- // // ModalSave: ()=>this.deleteAttachment(file),
- // // ModalCancel:this.cancelAttachment
- // // })
- // // return false;
- //
- // this.deleteAttachment(file);
- // }
-
-
onAttachmentRemove = (file) => {
if(!file.percent || file.percent == 100){
const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
@@ -174,8 +127,7 @@ class Sendresource extends Component{
}
Saves=()=>{
- let id=this.props.categoryid;
- let {fileList,description,is_public,is_unified_setting,datatime,course_group_publish_times} =this.state;
+ let {fileList,description,is_public,datatime,Radiovalue} =this.state;
let newfileList=[];
for(var list of fileList){
@@ -188,17 +140,19 @@ class Sendresource extends Component{
})
return
}
- // if(is_unified_setting===false){
- // course_group_publish_times.forEach((item,key)=>{
- // if(item.course_group_id===undefined||item.publish_time===undefined){
- // this.setState({
- // course_group_publish_timestype:true
- // })
- // return
- // }
- // })
- //
- // }
+
+ if(this.state.Radiovalue===1){
+ if(datatime===undefined||datatime===null||datatime=== ""){
+ this.setState({
+ Radiovaluetype:true
+ })
+ return
+ }else{
+ this.setState({
+ Radiovaluetype:false
+ })
+ }
+ }
@@ -222,22 +176,14 @@ class Sendresource extends Component{
course_second_category_id:this.props.coursesidtype===undefined||this.props.coursesidtype==="node"?0:attachmentId,
attachment_ids:newfileList,
is_public:is_public,
- is_unified_setting:is_unified_setting,
- publish_time:is_unified_setting===true?datatime===undefined? moment(new Date()).format('YYYY-MM-DD HH:mm'):datatime:undefined,
+ publish_time:Radiovalue===1?datatime===undefined? undefined:datatime:undefined,
description:description,
- course_group_publish_times:is_unified_setting===false?course_group_publish_times:undefined
+ delay_publish:Radiovalue,
}).then((result)=>{
if(result.data.status===0){
- // this.setState({
- // Modalstype:true,
- // Modalstopval:result.data.message,
- // ModalSave:this.ModalCancelModalCancel,
- // loadtype:true
- // })
this.ModalCancelModalCancel();
this.props.updataleftNavfun();
- // this.props.showNotification(result.data.message);
this.props.showNotification("上传资源成功");
this.props.setupdate(this.props.attachmentId)
}
@@ -253,14 +199,6 @@ class Sendresource extends Component{
})
}
- onChangesetting=(e)=>{
-
- this.setState({
- is_unified_setting:e.target.checked
- })
-
- }
-
onChangepublic=(e)=>{
this.setState({
@@ -289,50 +227,20 @@ class Sendresource extends Component{
}
- selectassigngroups=(e,index,key)=>{
- let {course_group_publish_times}=this.state;
- let newgroup_publish=course_group_publish_times;
- for(var i=0; i{
+ if(e.target.value===0){
+ this.setState({
+ datatime:undefined
+ })
}
this.setState({
- course_group_publish_times:newgroup_publish,
- })
+ Radiovalue: e.target.value,
+ });
}
-
- deletegrouppublish=(key)=>{
- let newlist=this.state.course_group_publish_times;
- newlist.splice(key,1);
- this.setState({
- course_group_publish_times:newlist
- })
- }
-
- addgrouppublish=()=>{
- let newlist=this.state.course_group_publish_times;
- newlist.push( {
- course_group_id : undefined,
- publish_time :undefined
- })
- this.setState({
- course_group_publish_times:newlist
- })
- }
-
render(){
- let {settextarea,newfileListtype,descriptiontype,
- course_group_publish_timestype,
- Modalstopval,
- ModalCancel,
- ModalSave,
- loadtype,
- is_unified_setting,
+ let { newfileListtype,descriptiontype,
is_public,
datatime,
- course_group_publish_times,
- course_groups
}=this.state;
const uploadProps = {
@@ -350,7 +258,11 @@ class Sendresource extends Component{
return isLt150M;
},
};
-
+ const radioStyle = {
+ display: 'block',
+ height: '30px',
+ lineHeight: '30px',
+ };
return(
+
课堂名称
+ 创建时间
+ 结束时间
+
{course.name}
+ {moment(course.created_at).format('YYYY-MM-DD')}
+ {course.end_date}
)
}) }
- {loading && hasMore && (
-
-
- )}
- {/* TODO */}
- {/* {
- !hasMore && 没有更多了。。
- } */}
+
{/*提示*/}
@@ -389,6 +301,7 @@ class Sendresource extends Component{
margin-right: 5px;
}
.ant-upload-list-item:hover .ant-upload-list-item-info{
+ padding: 0 12px 0 0px;
background-color:#fff;
}
.upload_1 .ant-upload-list {
@@ -437,42 +350,12 @@ class Sendresource extends Component{
- (单个文件最大150M)
+ (单个文件最大150M)
:""}
- {/**/}
- {/*{this.state.fileList.length===0?"":this.state.fileList.map((item,key)=>{*/}
- {/*debugger*/}
- {/*return(*/}
- {/**/}
- {/*勾选后所有用户可见，否则仅课堂成员可见*/}
- {/* */}
+ {this.props.course_is_public===true?
- 统一设置(选中则所有分班使用相同的发布设置，否则各个单独设置)
- :""}
-
*/} - {/**/} - {/**/} - {/**/} - {/**/} - {/*{item.name}*/} - {/**/} - {/**/} - {/*{item.response===undefined?"":isNaN(bytesToSize(item.filesize))?"":bytesToSize(item.filesize)}*/} - {/**/} - {/*this.onAttachmentRemove(item.response===undefined?"":item.response.id&&item.response.id)}>*/} - {/*
*/} - {/*)*/} - {/*})}*/} + {newfileListtype===true&&this.state.fileListtype===false?请先上传资源
:""} @@ -484,13 +367,12 @@ class Sendresource extends Component{ } `} - {/*
+ 公开：
+ 选中，所有用户可见，否则课堂成员可见
+
+
:""}
- {this.state.course_groups_count&&this.state.course_groups_count>0?
- {is_unified_setting===false?
- course_group_publish_times.map((item,key)=>{
- return(
-
-
- {is_unified_setting===true?
-
-
-
- this.onChangeTimepublish(e,index,key,2)}
- // onChange={ this.onChangeTimepublish }
- disabledTime={disabledDateTime}
- disabledDate={disabledDate}
- />
- {key!=0?this.deletegrouppublish(key)}>:""}
- {key===course_group_publish_times.length-1&&key:""}
-
- )
- })
-
- :""}
-
-
-
+ 发布设置：
+
+
+ 立即发布
+
+
+ 延迟发布
+ this.onChangeTimepublish(e,index,undefined,1)}
+ disabledTime={disabledDateTime}
+ disabledDate={disabledDate}
+ disabled={this.state.Radiovalue===1?false:true}
+ />
+
+ (按照设置的时间定时发布)
+
+
+
{/*{course_group_publish_timestype===true?请填写完整
:""}*/} {descriptiontype===true?请输入资源描述，最大限制100个字符
:""} + {this.state.Radiovaluetype===true?发布时间不能为空
:""}
{this.props.Cancelname}
this.Saves()}>{this.props.Savesname}
diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index e1a1f17f9..ae5a50e6d 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -2666,8 +2666,11 @@ class Studentshavecompletedthelist extends Component {
.ysltableows2 .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
padding: 9px;
}
+ mysjysltable1 .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
+ padding: 9px;
+ }
`}
-
+
{data === undefined ? "" : div > .ant-spin .ant-spin-dot {
top: 72%;}
}
- .ysltableows2 .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
+ .ysltableows2 .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
+ padding: 9px;
+ }
+ mysjysltable2 .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
padding: 9px;
}
`}
@@ -2823,7 +2829,10 @@ class Studentshavecompletedthelist extends Component {
.ysltableows .ant-table-tbody > tr > td{
height: 58px;
}
- .ysltableows .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
+ .ysltableows .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
+ padding: 9px;
+ }
+ mysjysltable3 .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
padding: 9px;
}
`
@@ -2834,7 +2843,7 @@ class Studentshavecompletedthelist extends Component {
{data === undefined ? "" : tr > th, .ant-table-tbody > tr > td {
padding: 9px;
}
+ mysjysltable4 .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
+ padding: 9px;
+ }
`}
}/)
湘公网安备43019002000962号
- ![高校智能化教学与实训平台]({getImageUrl("images/educoder/headNavLogo.png?1526520218")})
-
+ ![]({getImageUrl("images/educoder/hot-h.png")})
*/}
+ {/* */}
+ {/*}*/})
*/}
+ {/*})
-