window.$(`.sourceitem${index} input`).click() }>
this.eventStop(event)}>
@@ -248,6 +251,29 @@ class Fileslistitem extends Component{
:""
}
{discussMessage.is_publish===false?
- {discussMessage.course_groups.length===0?"":
-
- this.settingList()}>设置
-
-
- this.onDelete(discussMessage.id)}>删除
-
-
- :""}
-
-
-
-
-
@@ -918,6 +965,7 @@ class Fileslists extends Component{
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)}>删除
+
+
+ :""}
- {discussMessage.course_groups.length===0?"":
- - {discussMessage.course_groups.map((item,key)=>{ - return( -
- {item.course_group_name}
- 将发布于 { moment(item.course_group_publish_time).format('YYYY-MM-DD HH:mm')}
-
- )
- })}
-
- }
+ {/*资源分班*/}
+ {/*{discussMessage.course_groups.length===0?"":*/}
+ {/**/} + {/*{discussMessage.course_groups.map((item,key)=>{*/} + {/*return(*/} + {/*
*/}
+ {/*{item.course_group_name}*/}
+ {/*将发布于 { moment(item.course_group_publish_time).format('YYYY-MM-DD HH:mm')}*/}
+ {/*
*/}
+ {/*)*/}
+ {/*})}*/}
+
+ {/*}*/}
{discussMessage.author.name}
大小 {discussMessage.filesize}
下载 {discussMessage.downloads_count}
- 引用 {discussMessage.quotes}
+ {/*引用 {discussMessage.quotes}*/}
{/*{moment(discussMessage.publish_time).format('YYYY-MM-DD HH:mm:ss')}*/}
{/*{moment(discussMessage.publish_time).fromNow()}*/}
@@ -302,33 +329,14 @@ class Fileslistitem extends Component{
{ discussMessage.publish_time===null?"":discussMessage.is_publish===true?moment(discussMessage.publish_time).fromNow():moment(discussMessage.publish_time).format('YYYY-MM-DD HH:mm')}
- {this.props.isAdmin?
- this.eventStop(event)}>
-
所属目录：{discussMessage&&discussMessage.category_name}
+
:""}
+
- {this.props.isStudent===true&&this.props.current_user.login===discussMessage.author.login?
- this.eventStop(event)}>
- +
}
- this.addDir()}>添加目录
+ this.addDir()}>新建目录
- {/*className={sorttype === 'created_on'?"none":""} className={sorttype === 'quotes'?"none":""} className={sorttype === 'downloads'?"none":""} */}
-
+
+ {this.props.isAdmin()||this.props.isStudent()?
this.refs['addDirModal'].open()}>
-
}
diff --git a/public/react/src/modules/courses/boards/TopicDetail.js b/public/react/src/modules/courses/boards/TopicDetail.js
index 8ecc85565..d42b68c17 100644
--- a/public/react/src/modules/courses/boards/TopicDetail.js
+++ b/public/react/src/modules/courses/boards/TopicDetail.js
@@ -526,8 +526,10 @@ class TopicDetail extends Component {
const isAdmin = this.props.isAdmin()
// TODO 图片上传地址
const courseId=this.props.match.params.coursesId;
- const boardId = this.props.match.params.boardId
- const isCourseEnd = this.props.isCourseEnd()
+ const boardId = this.props.match.params.boardId;
+ const isCourseEnd = this.props.isCourseEnd();
+
+ document.title=this.props.coursedata&&this.props.coursedata.name;
return (
{/* fl with100 */}
:""
+ }
+ {
+ this.props.OneSelftype===true?
+ :""}
+
+ )
+ }
+}
+export default OneSelfOrderModal;
\ No newline at end of file
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.props.usingCheckBeforePost ?
+
+ :
+
+ }
+
+
+ {this.props.starttime===undefined||
+ this.props.starttime===""?""
+ :
+ + 发布设置均可修改， + + 点击修改 + +
++ 此设置将对所有分班生效 +
++ {this.props.Topval} + {this.props.Topvalright} +
++ {this.props.Botvalleft===undefined?"":"{this.props.Botvalleft}"} + {this.props.Botval} +
+
+
+ 发布时间:
+ {this.props.starttime}
+ {this.props.modaltype===undefined||this.props.modaltype===2?
+ {/*{this.props.endtime}*/}
+ 截止时间:
+ {this.state.endtimetypevalue}:""}
+ :""}
+
+
+ 分班名称
+
+ 截止时间
+
+
}
+ {this.props.modaltype===undefined||this.props.modaltype===2
+ || this.props.usingCheckBeforePost ?"":-
+
+ {
-
+
+ {item.name} + ++
+
+
+
+ )
+ })
+ }
+
{/*提示*/}
@@ -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/css/Courses.css b/public/react/src/modules/courses/css/Courses.css
index 12c4e8d3e..160104920 100644
--- a/public/react/src/modules/courses/css/Courses.css
+++ b/public/react/src/modules/courses/css/Courses.css
@@ -1701,4 +1701,47 @@ input.ant-input-number-input:focus {
/*}*/
.yslinputcourput .ant-form-explain{
padding-left: 0px !important;
+}
+.wechatloginfont{
+ font-size: 14px;
+ font-family: PingFangSC-Regular,PingFangSC;
+ font-weight: 400;
+ color: #555555;
+ line-height: 20px;
+ margin-top: 10px;
+}
+
+.wechatdiv{
+ margin-top: 40px !important;
+ width: 800px !important;
+}
+
+.wechatContent{
+ padding: 0px 50px;
+}
+
+.wechatpass{
+ width: 300px;
+ height: 46px;
+}
+
+.wechatnewchat{
+ width: 62px;
+ height: 62px;
+ background: rgba(255,170,170,1);
+ border-radius: 50%;
+ text-align: center;
+ line-height: 62px;
+ color: #fff;
+ margin: 0 auto;
+}
+.wechatweoldchat{
+ width: 62px;
+ height: 62px;
+ background:rgba(164,211,255,1);
+ border-radius: 50%;
+ text-align: center;
+ line-height: 62px;
+ color: #fff;
+ margin: 0 auto;
}
\ No newline at end of file
diff --git a/public/react/src/modules/courses/exercise/ExerciseNew.js b/public/react/src/modules/courses/exercise/ExerciseNew.js
index 80f837686..0c2542569 100644
--- a/public/react/src/modules/courses/exercise/ExerciseNew.js
+++ b/public/react/src/modules/courses/exercise/ExerciseNew.js
@@ -57,8 +57,9 @@ class ExerciceNew extends Component{
const courseId=this.props.match.params.coursesId;
- const isEdit = this.isEdit
-
+ const isEdit = this.isEdit;
+
+ document.title=this.props.coursedata&&this.props.coursedata.name;
return(
diff --git a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
index 75da4f2fe..2eaf03b92 100644
--- a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
+++ b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
@@ -612,6 +612,7 @@ class ExerciseReviewAndAnswer extends Component{
let isStudent =this.props.isStudent();
const { current_user } = this.props
// console.log(data&&data.exercise.user_name)
+ document.title=courseName&&courseName.name;
return(
diff --git a/public/react/src/modules/courses/exercise/Exercisesetting.js b/public/react/src/modules/courses/exercise/Exercisesetting.js
index 7b3732c9f..42cafc2d6 100644
--- a/public/react/src/modules/courses/exercise/Exercisesetting.js
+++ b/public/react/src/modules/courses/exercise/Exercisesetting.js
@@ -350,6 +350,7 @@ class Exercisesetting extends Component{
this.commitSetting((result)=>{
+ console.log(result)
if(result.status==200){
this.props.showNotification(`${result.data.message}`);
this.getSettingInfo();
@@ -369,6 +370,7 @@ class Exercisesetting extends Component{
}
this.commitSetting((result)=>{
+ console.log(result)
if(result.status==200){
this.props.showNotification(`${result.data.message}`);
this.cancelEdit();
@@ -702,7 +704,9 @@ class Exercisesetting extends Component{
:
div > .ant-spin .ant-spin-dot {
top: 72%;}
}
+ .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 {
+ padding: 9px;
+ }
+ mysjysltable2 .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
+ padding: 9px;
+ }
`}
-
是否确认删除?
{ rule.class_flag && rule.class_flag!=""?{rule.class_flag}:"" @@ -413,7 +420,9 @@ class PollDetailTabForthRules extends Component{
-
+
{/**/}
diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js
index 5aa7f8f72..10a9b00c7 100644
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@@ -2765,6 +2765,7 @@ class PollNew extends Component {
// console.log(this.state.projects===undefined?"":this.state.projects.poll_questions)
var displaymysave = (mysave === true) ? "" : "display:none;";
+ document.title=this.props.coursedata&&this.props.coursedata.name;
return (
{/*提示*/}
diff --git a/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js b/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js
index c7585a390..9644acfde 100644
--- a/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js
+++ b/public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js
@@ -89,6 +89,7 @@ class Immediatelypublish extends Component{
Cancel:this.homeworkhide,
Saves:this.homeworkstartend,
})
+
}
}).catch((error) => {
console.log(error)
@@ -135,7 +136,8 @@ class Immediatelypublish extends Component{
}
- }
+ }
+
}
//取消提示弹框
@@ -189,7 +191,18 @@ class Immediatelypublish extends Component{
this.homeworkhide();
// 调用父级公共头部的接口刷新
- this.props.action()
+ try {
+ this.props.action();
+ }catch (e) {
+
+ }
+ // 调用父级刷新数据的接口刷新
+ try {
+ this.props.getsetdata()
+ }catch (e) {
+
+ }
+
}
}).catch((error)=>{
console.log(error);
@@ -274,7 +287,7 @@ class Immediatelypublish extends Component{
modalSave={this.modalCancel}
>
- 立即发布
+ this.homeworkstart()}>立即发布
)
}
diff --git a/public/react/src/modules/courses/publicNav/listNav.js b/public/react/src/modules/courses/publicNav/listNav.js
index dba39b37c..c980e693f 100644
--- a/public/react/src/modules/courses/publicNav/listNav.js
+++ b/public/react/src/modules/courses/publicNav/listNav.js
@@ -74,7 +74,7 @@ class ListNav extends Component{
- 添加目录
+ 新建目录
导入资源
上传资源
diff --git a/public/react/src/modules/courses/shixunHomework/CommitSummary.js b/public/react/src/modules/courses/shixunHomework/CommitSummary.js
index 129e020e9..5d48f11d9 100644
--- a/public/react/src/modules/courses/shixunHomework/CommitSummary.js
+++ b/public/react/src/modules/courses/shixunHomework/CommitSummary.js
@@ -121,6 +121,7 @@ class CommitSummary extends Component{
const {getFieldDecorator} = this.props.form;
let {contents,data}=this.state;
// console.log(this.props);
+ document.title=data === undefined ? "" :data.course_name===undefined?"": data.course_name;
return (
资源列表
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 5eed392d5..03f0dea64 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -80,6 +80,7 @@ class Listofworksstudentone extends Component {
teacherdata: undefined,
task_status: [],
visibles: false,
+ starttimesend:undefined,
course_group_info: [],
styletable: {
"display": "none"
@@ -459,7 +460,7 @@ class Listofworksstudentone extends Component {
),
},
],
- orders: "",
+ orders: "update_time",
columnsstu2: [
{
title: '序号',
@@ -2238,9 +2239,9 @@ class Listofworksstudentone extends Component {
var homeworkid = this.props.match.params.homeworkid;
let urll = `/homework_commons/${homeworkid}/works_list.json?`;
var order = "asc";
- // if (ordervlue === "update_time") {
- // order = "desc";
- // }
+ if (ordervlue === "update_time") {
+ order = "desc";
+ }
var checkedValuesines = checkedValuesine;
var checkedValuesineinfos = checkedValuesineinfo;
var searchtexts = searchtext
@@ -2652,15 +2653,15 @@ class Listofworksstudentone extends Component {
}
//排序
funordert = (e) => {
- // if (e === "update_time") {
- // // 时间
- // // 时间排序是从小到大
- // this.setState({
- // orders: "update_time",
- // loadingstate: true,
- // })
- // this.Startsortingt("update_time", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
- // }
+ if (e === "update_time") {
+ // 时间
+ // 时间排序是从小到大
+ this.setState({
+ orders: "update_time",
+ loadingstate: true,
+ })
+ this.Startsortingt("update_time", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
+ }
if (e === "work_score") {
// 成绩
@@ -2789,6 +2790,7 @@ class Listofworksstudentone extends Component {
axios.get(url).then((response) => {
if (response.status === 200) {
+ const dataformat = 'YYYY-MM-DD HH:mm';
let starttime = this.props.getNowFormatDates(1);
let endtime = this.props.getNowFormatDates(2);
this.setState({
@@ -2801,6 +2803,7 @@ class Listofworksstudentone extends Component {
starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
endtime: "截止时间：" + endtime,
starttimes:starttime,
+ starttimesend:response.data.end_time===undefined||response.data.end_time===null||response.data.end_time===""?undefined:response.data.end_time,
typs:"start",
Cancelname: "暂不发布",
Savesname: "立即发布",
@@ -2949,6 +2952,7 @@ class Listofworksstudentone extends Component {
course_groupyslstwo: undefined,
typs:undefined,
starttimes:undefined,
+ starttimesend:undefined,
})
}
@@ -3170,6 +3174,7 @@ class Listofworksstudentone extends Component {
course_groups={this.state.course_groups}
getcourse_groupslist={(id) => this.getcourse_groupslist(id)}
starttimes={this.state.starttimes}
+ starttimesend={this.state.starttimesend}
typs={this.state.typs}
/>
{
@@ -3357,10 +3362,10 @@ class Listofworksstudentone extends Component {
-
- {orders === "work_score" ? "成绩" : orders === "student_id" ? "学号" : ""}排序
+ {orders === "update_time" ? "时间" :orders === "work_score" ? "成绩" : orders === "student_id" ? "学号" : ""}排序
-
- {/*
- this.funordert("update_time")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>更新时间 */} +
- this.funordert("update_time")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>更新时间
- this.funordert("work_score")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>最终成绩
- this.funordert("student_id")} data-remote="true" className=" font-12" style={{textAlign: "center"}}>学生学号
{ if(response.status===200){ + const dataformat = 'YYYY-MM-DD HH:mm'; let starttime= this.props.getNowFormatDates(1); let endtime=this.props.getNowFormatDates(2); this.setState({ @@ -432,6 +434,7 @@ class ShixunStudentWork extends Component { Saves:this.homeworkstartend, course_groups:response.data.course_groups, starttimes:starttime, + starttimesend:response.data.end_time===undefined||response.data.end_time===null||response.data.end_time===""?undefined:response.data.end_time, typs:"start", }) } @@ -754,6 +757,7 @@ class ShixunStudentWork extends Component { course_groups={this.state.course_groups} getcourse_groupslist={(id)=>this.getcourse_groupslist(id)} starttimes={this.state.starttimes} + starttimesend={this.state.starttimesend} typs={this.state.typs} /> diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js index 8254b148e..7cdab81a6 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js @@ -95,6 +95,7 @@ class ShixunWorkDetails extends Component { } render() { let{data}=this.state; + document.title=data&&data.course_name; return (diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js index 2667f1dd9..88682c5a6 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js @@ -310,7 +310,7 @@ class ShixunWorkReport extends Component { // let showAppraiseModals=this.props&&this.props.isAdminOrTeacher()===true?work_comment===null||work_comment===undefined?false:true:work_comment===null||work_comment===undefined?false:true; let showAppraiseModals=work_comment===null||work_comment===undefined?false:true; - + document.title=data&&data.course_name; return ( data===undefined?"":diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js index 88d143011..4a985a2b6 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js @@ -304,8 +304,8 @@ class ShixunhomeWorkItem extends Component{ + {this.props.isAdmin?this.stopPro(event)} className={this.props.isAdminOrCreator()?"homepagePostSetting homepagePostSettingname":"homepagePostSetting homepagePostSettingbox"} style={{"right":"-2px","top":"6px","display":"block"}}> + 实训详情 + {this.props.isAdminOrCreator()?this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"btn colorblue ml20 font-16"}>重命名:""} + {/*diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index da1408d4a..2556a910b 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -120,7 +120,7 @@ class Trainingjobsetting extends Component { showmodel:false, code_review:false, testscripttiptype:false, - + starttimesend:undefined, end_timebool:false, late_timesbool:false, work_efficiencys:false, @@ -1016,14 +1016,14 @@ class Trainingjobsetting extends Component { this.setState({ completionefficiencyscore: e.target.checked, work_efficiencys:e.target.checked, - latedeductiontwo: 0, + latedeductiontwo: 20, }) //均分比例 if(this.state.proportion==="均分比例"){ - this.Equalproportion(0); + this.Equalproportion(20); }else if(this.state.proportion==="经验值比例"){ - this.Empiricalvalueratio(0); + this.Empiricalvalueratio(20); } @@ -1525,6 +1525,7 @@ class Trainingjobsetting extends Component { axios.get(url).then((response) => { if (response.status === 200) { + const dataformat = 'YYYY-MM-DD HH:mm'; let starttime = this.props.getNowFormatDates(1); let endtime = this.props.getNowFormatDates(2); this.setState({ @@ -1536,7 +1537,8 @@ class Trainingjobsetting extends Component { Botval:`本操作只对"未发布"的分班有效`, starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), starttimes:starttime, - typs:"start", + starttimesend:response.data.end_time===undefined||response.data.end_time===null||response.data.end_time===""?undefined:response.data.end_time, + typs:"start", endtime: "截止时间：" + endtime, Cancelname: "暂不发布", Savesname: "立即发布", @@ -1668,6 +1670,7 @@ class Trainingjobsetting extends Component { addnametab: undefined, typs:undefined, starttimes:undefined, + starttimesend:undefined, }) } cancelBox=()=>{ @@ -1688,6 +1691,7 @@ class Trainingjobsetting extends Component { modalSave: this.cancelBox }) } else { + var releasetime =true; var deadline = true; var endtime =true; @@ -1721,7 +1725,7 @@ class Trainingjobsetting extends Component { flagPageEditstwo:releasetime, flagPageEditsthrees:deadline, flagPageEditsfor:endtime, - completionefficiencyscore:true, + completionefficiencyscore:false, work_efficiencys:this.state.work_efficiencys, unifiedsetting:this.state.unifiedsetting, latedeductiontwo:this.state.latedeductiontwo, @@ -1837,7 +1841,7 @@ class Trainingjobsetting extends Component { flagPageEditstwo:releasetime, flagPageEditsthrees:deadline, flagPageEditsfor:endtime, - completionefficiencyscore:false, + completionefficiencyscore:datas.data.work_efficiency===true?true:false, work_efficiencys:datas.data.work_efficiency, unifiedsetting:datas.data.unified_setting, latedeductiontwo:datas.data.eff_score, @@ -2077,7 +2081,7 @@ class Trainingjobsetting extends Component { // console.log(this.props.isAdmin()) // console.log(this.state.code_review===false) // console.log("引入的分值"); - console.log(this.state.work_efficiencys); + // console.log(this.state.work_efficiencys); @@ -2120,7 +2124,8 @@ class Trainingjobsetting extends Component { course_groups={this.state.course_groups} getcourse_groupslist={(id) => this.getcourse_groupslist(id)} starttimes={this.state.starttimes} - typs={this.state.typs} + starttimesend={this.state.starttimesend} + typs={this.state.typs} />设置 */} +设置 + :""} + + + {this.props.isStudent===true?this.props.course_identity===5? ++ {startbtn===false? + (discussMessage.task_operation[0] == '继续挑战' || discussMessage.task_operation[0] == '查看实战' ? + + {discussMessage.task_operation[0]} + + : + this.taskoperationId(discussMessage.task_operation[1])}> + {discussMessage.task_operation[0]} + ):开启中} + :"":"" + } -- +
+ {/* {discussMessage.author.name} */} { discussMessage.author && {discussMessage.author} } {discussMessage.commit_count===undefined?"":已开始做题 {discussMessage.commit_count}人} @@ -381,7 +414,7 @@ class ShixunhomeWorkItem extends Component{ { discussMessage && discussMessage.upper_category_name &&
- - {this.props.isAdmin?22 }> - { {discussMessage.upper_category_name}} + { } @@ -396,39 +429,6 @@ class ShixunhomeWorkItem extends Component{所属目录：{discussMessage.upper_category_name}}this.stopPro(event)} className={this.props.isAdminOrCreator()?"homepagePostSetting homepagePostSettingname":"homepagePostSetting homepagePostSettingbox"} style={{"right":"-2px","top":"46px","display":"block"}}> - 实训详情 - {this.props.isAdminOrCreator()?this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"btn colorblue ml20 font-16"}>重命名:""} - {/*:""} - - - {this.props.isStudent===true?this.props.course_identity===5? -设置 */} -设置 -- {startbtn===false? - (discussMessage.task_operation[0] == '继续挑战' || discussMessage.task_operation[0] == '查看实战' ? - - {discussMessage.task_operation[0]} - - : - this.taskoperationId(discussMessage.task_operation[1])}> - {discussMessage.task_operation[0]} - ):开启中} - :"":"" - }{ if (response.status === 200) { + const dataformat = 'YYYY-MM-DD HH:mm'; let starttime = this.props.getNowFormatDates(1); let endtime = this.props.getNowFormatDates(2); this.setState({ @@ -173,6 +175,7 @@ class Workquestionandanswer extends Component { Saves: this.homeworkstartend, course_groups: response.data.course_groups, starttimes: starttime, + starttimesend:response.data.end_time===undefined||response.data.end_time===null||response.data.end_time===""?undefined:response.data.end_time, typs: "start", }) } @@ -441,6 +444,7 @@ class Workquestionandanswer extends Component { course_groups={this.state.course_groups} getcourse_groupslist={(id) => this.getcourse_groupslist(id)} starttimes={this.state.starttimes} + starttimesend={this.state.starttimesend} typs={this.state.typs} /> diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js index 8e68a7398..415b283f6 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js +++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js @@ -4,6 +4,7 @@ import { WordsBtn,on, off, trigger } from 'educoder'; import {BrowserRouter as Router,Route,Switch,Link} from 'react-router-dom'; import axios from'axios'; import HomeworkModal from "../coursesPublic/HomeworkModal"; +import OneSelfOrderModal from "../coursesPublic/OneSelfOrderModal"; import ShixunModal from "../coursesPublic/ShixunModal"; import PathModal from "../coursesPublic/PathModal"; import NewShixunModel from '../coursesPublic/NewShixunModel'; @@ -132,10 +133,16 @@ class ShixunHomework extends Component{ category:id } }).then((result)=>{ - this.setState({ - isSpin:false, - datas:result.data, - }) + if(result!=undefined){ + this.setState({ + isSpin:false, + datas:result.data, + }) + }else{ + this.setState({ + isSpin:false, + }) + } }).catch((error)=>{ console.log(error); }) @@ -187,19 +194,18 @@ class ShixunHomework extends Component{ category: category_id===undefined?undefined:category_id } }).then((result)=>{ - if(result.status===200){ - // if(checkedtype===true&&page>1){ - // for(var value of result.data.homeworks){ - // checkBoxValues.push(value.homework_id) - // } - // } - this.setState({ - datas:result.data, - isSpin:false - }) - - - } + if(result!=undefined){ + if(result.status===200){ + this.setState({ + datas:result.data, + isSpin:false + }) + } + }else{ + this.setState({ + isSpin:false + }) + } }).catch((error)=>{ console.log(error); }) @@ -227,10 +233,11 @@ class ShixunHomework extends Component{ addnametab:undefined, typs:undefined, starttimes:undefined, + OneSelftype:false }) + this.cancelmodel() + this.homeworkupdatalist(Coursename,page,order); this.props.updataleftNavfun() - this.homeworkupdatalist(Coursename,page,order); - this.cancelmodel() } @@ -272,6 +279,48 @@ class ShixunHomework extends Component{ }); } + + + //立即发布 + homeworkOneSelfstart=()=>{ + let selectnum= this.testonSelect(); + if(selectnum===true){ + this.noSelect(); + return + } + let coursesId=this.props.match.params.coursesId; + let url="/courses/"+coursesId+"/all_course_groups.json"; + + axios.get(url).then((response) => { + + if(response.status===200){ + let starttime= this.props.getNowFormatDates(1); + let endtime=this.props.getNowFormatDates(2); + this.setState({ + modalname:"立即发布", + modaltype:response.data.course_groups===null||response.data.course_groups.length===0?2:1, + OneSelftype:true, + typs:"start", + Topval:"学生将立即收到作业", + // Botvalleft:"暂不发布", + Botval:`本操作只对"未发布"的分班有效`, + starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"), + starttimes:starttime, + endtime:"截止时间："+endtime, + Cancelname:"暂不发布", + Savesname:"立即发布", + Cancel:this.homeworkhide, + Saves:this.homeworkstartend, + course_groups:response.data.course_groups, + }) + } + }).catch((error) => { + console.log(error) + }); + + } + + cancelmodels=()=>{ this.setState({ Modalstype:false, @@ -316,10 +365,12 @@ class ShixunHomework extends Component{ }) } - this.props.showNotification(result.data.message) + + this.homeworkupdatalist(Coursename,page,order); + this.cancelmodel() + this.props.showNotification(result.data.message) this.props.updataleftNavfun() - this.homeworkupdatalist(Coursename,page,order); - this.cancelmodel() + } }).catch((error)=>{ console.log(error); @@ -414,11 +465,11 @@ class ShixunHomework extends Component{ Loadtype:false, course_groups:[] }) - + this.homeworkupdatalist(Coursename,page,order); + this.cancelmodel() this.props.showNotification(response.data.message) this.props.updataleftNavfun() - this.homeworkupdatalist(Coursename,page,order); - this.cancelmodel() + } }) .catch(function (error) { @@ -722,8 +773,8 @@ class ShixunHomework extends Component{ checkedtype:false, antIcon:false }) + this.homeworkupdatalist(Coursename,page,order); this.props.showNotification(response.data.message) - this.homeworkupdatalist(Coursename,page,order); this.props.updataleftNavfun() }else{ this.setState({ @@ -782,6 +833,7 @@ class ShixunHomework extends Component{ this.setState({ Modalstype:false, + OneSelftype:false, Loadtype:false, visible:false, Modalstopval:"", @@ -834,9 +886,10 @@ class ShixunHomework extends Component{ Loadtype:false, checkBoxValues:[] }) + this.homeworkupdatalist(Coursename,page,order); this.props.showNotification(response.data.message) - this.homeworkupdatalist(Coursename,page,order); + } }) .catch(function (error) { @@ -886,9 +939,10 @@ class ShixunHomework extends Component{ checkBoxValues:[], checkAllValue:false }) + this.homeworkupdatalist(Coursename,page,order); this.props.showNotification('已完成') this.props.updataleftNavfun() - this.homeworkupdatalist(Coursename,page,order); + } }) } @@ -1022,7 +1076,7 @@ class ShixunHomework extends Component{ loadtype={this.state.Loadtype} antIcon={this.state.antIcon} />:""} - {/*立即发布*/} + {/*批量立即发布*/} {visible===true?this.getcourse_groupslist(id)} />:""} - + {/*{单个立即发布}*/} + {/* - {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} + 作业列表 + } +
- {datas===undefined?"":datas.homeworks && datas.homeworks.length>1?this.props.isAdminOrCreator()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null? @@ -1082,7 +1184,7 @@ class ShixunHomework extends Component{ {this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null? -
this.addDir()} className={"mr30 font-16"}>添加目录 +this.addDir()} className={"mr30 font-16"}>新建目录 {/*this.editname(datas&&datas.main_category_name)} className={"mr30"}>目录重命名 */} :this.editDir(datas&&datas.category_name)} className={"mr30 font-16"}>目录重命名 :""} @@ -1128,7 +1230,9 @@ class ShixunHomework extends Component{已选 {checkBoxValues&&checkBoxValues.length} 个 （不支持跨页勾选） - 删除
-- 立即发布
+ {/*{checkBoxValues&&checkBoxValues.length>1?- 立即发布
*/} + {/*:- 单个立即发布
}*/} +- 立即发布
{/*onClick={this.homeworkstart}*/}- 立即截止
- @@ -1180,7 +1284,7 @@ class ShixunHomework extends Component{ {this.props.isAdmin()?datas&&datas.category_name===undefined||datas&&datas.category_name===null?
- this.addDir()}>添加目录... + this.addDir()}>新建目录...
:"":""} diff --git a/public/react/src/modules/forums/MemoDetail.js b/public/react/src/modules/forums/MemoDetail.js index d3007c433..cc206713b 100644 --- a/public/react/src/modules/forums/MemoDetail.js +++ b/public/react/src/modules/forums/MemoDetail.js @@ -27,6 +27,7 @@ import { Tooltip } from 'antd' // import CBreadcrumb from '../courses/common/CBreadcrumb' import { typeNameMap2 } from './MemoNew' +import CaseDetail from "../moop_cases/CaseDetail"; const $ = window.$ function urlStringify(params) { let noParams = true; @@ -673,7 +674,7 @@ class MemoDetail extends Component { const { match, history } = this.props const { memo, recommend_shixun, current_user,author_info } = this.props; const { comments, hasMoreComments, goldRewardDialogOpen } = this.state; - + document.title = memo&&memo.subject!=undefined?memo&&memo.subject:"交流问答"; if (!memo || this.state.memoLoading) { return } diff --git a/public/react/src/modules/forums/MemoNew.js b/public/react/src/modules/forums/MemoNew.js index 962e74f22..fbbd88044 100644 --- a/public/react/src/modules/forums/MemoNew.js +++ b/public/react/src/modules/forums/MemoNew.js @@ -18,6 +18,7 @@ import 'antd/lib/select/style/index.css' import TPMMDEditor from '../tpm/challengesnew/TPMMDEditor' import { getUrl, getUploadActionUrl, appendFileSizeToUploadFileAll, appendFileSizeToUploadFile } from 'educoder' +import CaseDetail from "../moop_cases/CaseDetail"; const Option = Select.Option; const $ = window.$; @@ -316,7 +317,8 @@ class MemoNew extends Component { const repertoires = []; const repertoiresTagMap = {} if ( data.tag_list ) { - // data.tag_list.forEach((item, index)=>{ + document.title = "交流问答"; + // data.tag_list.forEach((item, index)=>{ // const tagArray = []; // item.tag.forEach( (tag, index) => { // tagArray.push(tag.name) @@ -362,6 +364,8 @@ class MemoNew extends Component { const tag_list = response.data.tag_list if (tag_list) { // this.setState({...response.data}) + + document.title = response.data.subject; const { content, forum_id, id, repertoire_name, subject, current_user, tag_list, attachments_url, memo_tags, attachments } = response.data; this.initMD(content); diff --git a/public/react/src/modules/forums/MemoTechShare.js b/public/react/src/modules/forums/MemoTechShare.js index de6ba074c..d32bd2e2f 100644 --- a/public/react/src/modules/forums/MemoTechShare.js +++ b/public/react/src/modules/forums/MemoTechShare.js @@ -1,116 +1,116 @@ -import React, { Component } from 'react'; -import { Redirect } from 'react-router'; - -import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom"; - -import PropTypes from 'prop-types'; - -import classNames from 'classnames' - -import Pagination from 'rc-pagination'; - -import { postPaginationHOC } from './PostPaginationHOC' - -import PostItem from './PostItem' - -import ForumsNavTab from './ForumsNavTab' - -// import queryString from 'query-string' -import { queryString } from 'educoder' - -import MemoList from './MemoList' - - -class MemoTechShare extends Component { - constructor(props) { - super(props) - - this.handleLocationChange = this.handleLocationChange.bind(this); - - this.state = { - - } - } - - onPaginationChange(pageNum, pageSize) { - this.props.onPaginationChange(pageNum, pageSize) - } - - componentDidMount() { - // this.handleLocationChange(this.props.history.location); - // this.unlisten = this.props.history.listen(this.handleLocationChange); - } - - componentWillUnmount() { - // this.unlisten(); - } - componentDidUpdate(prevProps) { - if(this.props.match.params.memoType !== prevProps.match.params.memoType) { - // do something - console.log(`memoType changed`) - this.props.fetchMemos(); - } - } - - componentWillReceiveProps(newProps, newContext) { - if (newProps.match.url === this.props.match.url) { - const oldParsed = queryString.parse(this.props.location.search); - const newParsed = queryString.parse(newProps.location.search); - if (!newParsed.page && oldParsed.page || - (oldParsed.order && newParsed.order && oldParsed.order != newParsed.order)) { - this.props.fetchMemos(); - } - console.log('componentWillReceiveProps...') - } - } - - handleLocationChange(location) { - console.log(`- - - location: '${location.pathname}'`); - if (location.pathname) { - if (location.pathname.indexOf('/forums/categories/all') != -1 - && this.props.location.search && this.props.location.search.indexOf('order=') != -1 - && location.search.indexOf('order=') != -1) { - const oldParsed = queryString.parse(this.props.location.search); - const newParsed = queryString.parse(location.search); - if (oldParsed.order != newParsed.order) { // 只有在热门和最新间跳转时，才需要处理 - this.props.fetchMemos(); - } - } - } - } - - renderMemoList() { - - - // const { memo_list, user } = this.props; - // if (!memo_list) { - // return '' - // } - // return memo_list.map( (item, index) => { - - // return ( - //this.setTop(memo)} - // setDown={(memo)=>this.setDown(memo)} memo={item} - // > - // ) - // }) - return this.props.renderMemoList(); - } - - render() { - const { match, history, currentPage, memo_count ,memo_list } = this.props - - return ( -- - ); - } -} - -export default postPaginationHOC() ( MemoTechShare ); +import React, { Component } from 'react'; +import { Redirect } from 'react-router'; + +import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom"; + +import PropTypes from 'prop-types'; + +import classNames from 'classnames' + +import Pagination from 'rc-pagination'; + +import { postPaginationHOC } from './PostPaginationHOC' + +import PostItem from './PostItem' + +import ForumsNavTab from './ForumsNavTab' + +// import queryString from 'query-string' +import { queryString } from 'educoder' + +import MemoList from './MemoList' + + +class MemoTechShare extends Component { + constructor(props) { + super(props) + + this.handleLocationChange = this.handleLocationChange.bind(this); + + this.state = { + + } + } + + onPaginationChange(pageNum, pageSize) { + this.props.onPaginationChange(pageNum, pageSize) + } + + componentDidMount() { + // this.handleLocationChange(this.props.history.location); + // this.unlisten = this.props.history.listen(this.handleLocationChange); + } + + componentWillUnmount() { + // this.unlisten(); + } + componentDidUpdate(prevProps) { + if(this.props.match.params.memoType !== prevProps.match.params.memoType) { + // do something + console.log(`memoType changed`) + this.props.fetchMemos(); + } + } + + componentWillReceiveProps(newProps, newContext) { + if (newProps.match.url === this.props.match.url) { + const oldParsed = queryString.parse(this.props.location.search); + const newParsed = queryString.parse(newProps.location.search); + if (!newParsed.page && oldParsed.page || + (oldParsed.order && newParsed.order && oldParsed.order != newParsed.order)) { + this.props.fetchMemos(); + } + // console.log('componentWillReceiveProps...') + } + } + + handleLocationChange(location) { + console.log(`- - - location: '${location.pathname}'`); + if (location.pathname) { + if (location.pathname.indexOf('/forums/categories/all') != -1 + && this.props.location.search && this.props.location.search.indexOf('order=') != -1 + && location.search.indexOf('order=') != -1) { + const oldParsed = queryString.parse(this.props.location.search); + const newParsed = queryString.parse(location.search); + if (oldParsed.order != newParsed.order) { // 只有在热门和最新间跳转时，才需要处理 + this.props.fetchMemos(); + } + } + } + } + + renderMemoList() { + + + // const { memo_list, user } = this.props; + // if (!memo_list) { + // return '' + // } + // return memo_list.map( (item, index) => { + + // return ( + //- this.renderMemoList()} - onPaginationChange={ (pageNum, pageSize) => this.props.onPaginationChange(pageNum, pageSize) } - > - -this.setTop(memo)} + // setDown={(memo)=>this.setDown(memo)} memo={item} + // > + // ) + // }) + return this.props.renderMemoList(); + } + + render() { + const { match, history, currentPage, memo_count ,memo_list } = this.props + + return ( ++ + ); + } +} + +export default postPaginationHOC() ( MemoTechShare ); diff --git a/public/react/src/modules/login/EducoderInteresse.js b/public/react/src/modules/login/EducoderInteresse.js index c69b2195d..75f2c7059 100644 --- a/public/react/src/modules/login/EducoderInteresse.js +++ b/public/react/src/modules/login/EducoderInteresse.js @@ -20,10 +20,8 @@ var newContainer={ top: "0px", bottom: "0px", minHeight: "100%", - overflow:"hidden", - - } +//兴趣页面 class EducoderInteresse extends Component { constructor(props) { super(props); diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js index eed3a9add..680c4bbc7 100644 --- a/public/react/src/modules/login/EducoderLogin.js +++ b/public/react/src/modules/login/EducoderLogin.js @@ -19,6 +19,8 @@ import { notification } from "antd"; import {Link, Switch, Route, Redirect} from 'react-router-dom'; +import { SnackbarHOC,getImageUrl } from 'educoder'; +import { TPMIndexHOC } from '../tpm/TPMIndexHOC'; import '../courses/css/members.css'; import "../courses/common/formCommon.css" import '../courses/css/Courses.css'; @@ -60,7 +62,6 @@ var newContainer={ top: "0px", bottom: "0px", minHeight: "100%", - overflow:"hidden", paddingTop: "40px", } @@ -109,7 +110,8 @@ class EducoderLogin extends Component { } componentDidMount() { - + // console.log("EducoderLogin"); + // console.log(this.props); } Setlogins=(i)=>{ @@ -138,6 +140,9 @@ class EducoderLogin extends Component { render() { let {showbool,loginstatus,logini} = this.state; + console.log("EducoderLogingetHelmetapi"); + console.log(this.props); + // console.log(this.props.mygetHelmetapi); return (+ this.renderMemoList()} + onPaginationChange={ (pageNum, pageSize) => this.props.onPaginationChange(pageNum, pageSize) } + > + +@@ -149,7 +154,13 @@ class EducoderLogin extends Component { "width": "100%" }}>-@@ -197,8 +208,7 @@ class EducoderLogin extends Component { } } - -export default EducoderLogin; +export default EducoderLogin ; // showbool === 2 ? //this.gohome()} src={educodernet}/> + { + this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.login_logo_url===null|| this.props.mygetHelmetapi.login_logo_url===undefined? +
this.gohome()} src={educodernet}/> + : +
this.gohome()} src={getImageUrl(this.props.mygetHelmetapi.login_logo_url)}/> + } +
{ + var userAgentInfo = navigator.userAgent; + var Agents = ["Android", "iPhone", + "SymbianOS", "Windows Phone", + "iPad", "iPod"]; + var flag = true; + for (var v = 0; v < Agents.length; v++) { + if (userAgentInfo.indexOf(Agents[v]) > 0) { + flag = false; + break; + } + } + return flag; + } componentDidMount() { + let flag = this.IsPC(); //true为PC端，false为手机端 + this.setState({ + isphone:flag + }) if(this.props.isRender!=undefined){ this.setState({ @@ -506,14 +524,24 @@ class LoginDialog extends Component { getloginurl=(url)=>{ window.location.href = url; }; + openweixinlogin=()=>{ + this.setState({ + weixinlogin:true + }) + } + hideweixinlogin=()=>{ + this.setState({ + weixinlogin:false + }) + } render() { let{open,login,speedy,loginValue,regular,isGoing,isGoingValue,disabled,bottonclass,Phonenumberisnotco, - dialogBox,shortcutnum,disabledType,gaincode,authCodeType,authCodeclass, isRender}=this.state; + dialogBox,shortcutnum,disabledType,gaincode,authCodeType,authCodeclass, isRender,weixinlogin}=this.state; if (isRender === undefined) { isRender = false } - + // console.log(this.props) return (