m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
schedule_job
杨树明 5 years ago
parent e62d39094a b8c6913f5d
commit 4caad4af6d
9 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File

2
public/react/src/common/util/ShareUtil.js
Unescape View File

@ -110,7 +110,7 @@ export function configShareForCourses () {
var shareData = {
title: 'EduCoder - 教学课堂',
desc: '自动评测实训任务，支持技能统计，提供教学活动分析报告，减轻教师和助教的辅导压力，免去作业发布和批改的困扰，实时了解学生学习情况，全面提升教师施教效率和水平。',
link: `${host}/courses`,
link: `${host}/classrooms`,
imgUrl: window.__testImageUrl
|| host + '/react/build/images/share_logo_icon.jpg'
};

2
public/react/src/modules/courses/poll/PollNewQuestbank.js
Unescape View File

@ -2763,7 +2763,7 @@ class PollNewQuestbank extends Component {
//
// let courseId=this.props.match.params.coursesId;
// if(courseId===undefined){
// this.props.history.push("/courses");
// this.props.history.push("/classrooms");
// }else{
// this.props.history.push(this.props.current_user.first_category_url);
// }

26
public/react/src/modules/courses/signin/component/Teacherentry.js
Unescape View File

@ -125,6 +125,15 @@ class Teacherentry extends Component {
</div>
</div>
<style>
{
`
.initials{
cursor: initial !important;
}
`
}
</style>
<div className="ws20s sortinxdirection">
{
isAdmin === true ?
@ -154,13 +163,16 @@ class Teacherentry extends Component {
{
item.attendance_status?
(
item.attendance_status==="ABSENCE"?
item.attendance_status==="ABSENCE"&&item.attendance_mode!="TEACHER"?
<div className="qiandaobutton xiaoshou" onClick={(e)=>{e.stopPropagation();this.props.Signin(item.mode,item.id,item.attendance_code)}}>
签到
</div>
:
item.attendance_status==="NORMAL"?
<div className="qiandaobutton" >
: item.attendance_status === "LEAVE" ?
<div className="qjqiandao initials">
请假
</div>
: item.attendance_status==="NORMAL"?
<div className="zcqiandao initials">
正常签到
</div>
:""
@ -175,15 +187,15 @@ class Teacherentry extends Component {
{
item.attendance_status?
item.attendance_status === "NORMAL" ?
<div className="zcqiandao xiaoshou">
<div className="zcqiandao initials">
正常签到
</div>
: item.attendance_status === "LEAVE" ?
<div className="qjqiandao xiaoshou">
<div className="qjqiandao initials">
请假
</div>
: item.attendance_status === "ABSENCE" ?
<div className="kkqiandao xiaoshou">
<div className="kkqiandao initials">
旷课
</div>
:

4
public/react/src/modules/message/js/MessagSub.js
Unescape View File

@ -272,13 +272,13 @@ class MessagSub extends Component {
return window.open(`/forums/`);
case "Watcher" :
// 用户个人中心页 :id = item.trigger_user.login
return window.open(`/users/${item.trigger_user.login}/courses`)
return window.open(`/users/${item.trigger_user.login}/classrooms`)
case "PraiseTread" :
// 这块太复杂 不好处理
return '';
case "Grade" :
//个人中心页 :id = item.trigger_user.login
// return window.open(`/users/${item.trigger_user.login}/courses`;
// return window.open(`/users/${item.trigger_user.login}/classrooms`;
return "";
case "JoinProject" :
//项目详情-申请加入项目审核页 :id = container_id

6
public/react/src/modules/tpm/NewHeader.js
Unescape View File

@ -1123,15 +1123,15 @@ class NewHeader extends Component {
<a href={"/register"} className="mr5 color-white">注册</a>
</span> :
<div className="fr edu-menu-panel mr25" style={{ height: '60px' }}>
<a href={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/courses`} className="fl ml15">
<a href={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/classrooms`} className="fl ml15">
<img alt="头像" className="radius mt13" height="34" id="nh_user_logo" name="avatar_image"
src={getImageUrl(`images/` + user.image_url)} width="34">
</img>
</a>
<ul className="edu-menu-list" style={{ top: '60px' }}>
{/*<span className="bor-bottom-greyE currentName task-hide">{user.username}</span>*/}
<li><Link to={`/users/${this.props.current_user.login}/courses`}>我的个人主页</Link></li>
{coursestypes === true ? "" : <li><Link to={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/courses`}>{this.props.user && this.props.user.main_site === false ? "我的课堂" : "我的教学课堂"}</Link></li>}
<li><Link to={`/users/${this.props.current_user.login}/classrooms`}>我的个人主页</Link></li>
{coursestypes === true ? "" : <li><Link to={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/classrooms`}>{this.props.user && this.props.user.main_site === false ? "我的课堂" : "我的教学课堂"}</Link></li>}
{/* p 老师 l 学生 */}
{shixuntype === true ? "" : <li><Link to={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/shixuns`}>我的实训项目</Link></li>}
{pathstype === true ? "" : <li><Link to={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/paths`}>{this.props.user && this.props.user.main_site === false ? "我的课程" : "我的实践课程"}</Link></li>}

2
public/react/src/modules/tpm/component/TPMRightSection.js
Unescape View File

@ -86,7 +86,7 @@ class TPMRightSection extends Component {
<p className="font-16 mb20"><i className={"iconfont icon-chuangjianzhe1 audit_situationactive font-14"}></i> 创建者</p>
<div className="df">
<a
href={TPMRightSectionData === undefined ? "" : TPMRightSectionData.creator === undefined ? "" : `/users/${TPMRightSectionData.creator.login}/courses`}>
href={TPMRightSectionData === undefined ? "" : TPMRightSectionData.creator === undefined ? "" : `/users/${TPMRightSectionData.creator.login}/classrooms`}>
<img alt="头像" className="radius mr10" height="36"
src={getImageUrl(TPMRightSectionData === undefined ? "" : TPMRightSectionData.creator === undefined ? "" : 'images/' + TPMRightSectionData.creator.image_url + "?1532489442")}
width="36"/>

2
public/react/src/modules/user/usersInfo/Infos.js
Unescape View File

@ -274,7 +274,7 @@ class Infos extends Component{
{/* 课堂 */}
{/* http://localhost:3007/courses/1309/homework/9300/setting */}
<Route exact path="/users/:username/courses"
<Route exact path="/users/:username/classrooms"
render={
(props) => (<InfosCourse {...this.props} {...props} {...this.state} {..._commonProps}/>)
}

2
public/react/src/modules/user/usersInfo/InfosBanner.js
Unescape View File

@ -120,7 +120,7 @@ class InfosBanner extends Component{
{coursestypes===true?"":<li className={`${moduleName == 'classrooms' ||moduleName == undefined ? 'active' : '' }`}>
<Link
onClick={() => this.setState({moduleName: 'classrooms'})}
to={`/users/${username}/courses`}>教学课堂</Link>
to={`/users/${username}/classrooms`}>教学课堂</Link>
</li>}
{shixuntype===true?"":<li className={`${moduleName == 'shixuns' ? 'active' : '' }`}>
<Link

2
public/react/src/modules/user/usersInfo/banner_out.js
Unescape View File

@ -153,7 +153,7 @@ class banner_out extends Component{
<li className={`${moduleName == 'classrooms' ||moduleName == undefined ? 'active' : '' }`}>
<Link
onClick={() => this.setState({moduleName: 'classrooms'})}
to={`/users/${username}/courses`}>课堂</Link>
to={`/users/${username}/classrooms`}>课堂</Link>
</li>
<li className={`${moduleName == 'shixuns' ? 'active' : '' }`}>
<Link

Write Preview
Loading…
Cancel
Save