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

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

Browse Source 
# Conflicts:
#	public/react/src/modules/courses/Resource/Fileslistitem.js
#	public/react/src/modules/courses/busyWork/CommonWorkItem.js
#	public/react/src/modules/courses/exercise/ExerciseListItem.js
#	public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
#	public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
#	public/react/src/modules/courses/poll/PollListItem.js
#	public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
#	public/react/src/modules/login/LoginDialog.js
dev_newshixunModel
杨树明 5 years ago
parent 8df6fd8607 f4dbd10d0c
commit 94721dca44
23 changed files with 347 additions and 453 deletions
Show Stats Download Patch File Download Diff File

2
app/controllers/ecs/reach_criteria_controller.rb
Unescape View File

@ -1,4 +1,4 @@
class ReachCriteriaController < Ecs::BaseController class Ecs::ReachCriteriaController < Ecs::BaseController
before_action :check_major_manager_permission!, only: [:create] before_action :check_major_manager_permission!, only: [:create]
def create def create

1
app/controllers/games_controller.rb
Unescape View File

@ -431,6 +431,7 @@ class GamesController < ApplicationController
# params[:status] 1: 目录树点击的请求 0：正常自动加载 # params[:status] 1: 目录树点击的请求 0：正常自动加载
# 返回参数status ： -1 系统统一报错提示；-3 需要轮训重试，带retry参数；-4 立即重试 # 返回参数status ： -1 系统统一报错提示；-3 需要轮训重试，带retry参数；-4 立即重试
def rep_content def rep_content
raise("666")
challenge_path = @game.challenge.try(:path) challenge_path = @game.challenge.try(:path)
if challenge_path.blank? if challenge_path.blank?
tip_exception("代码获取异常，请检查实训模板的评测设置是否正确") tip_exception("代码获取异常，请检查实训模板的评测设置是否正确")

23
public/react/src/modules/courses/Resource/Fileslistitem.js
Unescape View File

@ -28,6 +28,16 @@ class Fileslistitem extends Component{
} }
showfiles=(list)=>{ showfiles=(list)=>{
if(this.props.checkIfLogin()===false){
this.props.showLoginDialog()
return
}
if(this.props.checkIfProfileCompleted()===false){
this.props.showProfileCompleteDialog()
return
}
if(list.is_history_file===false){ if(list.is_history_file===false){
// this.props.DownloadFileA(list.title,list.url) // this.props.DownloadFileA(list.title,list.url)
//window.location.href=list.url; //window.location.href=list.url;
@ -194,9 +204,6 @@ class Fileslistitem extends Component{
text-overflow:ellipsis; text-overflow:ellipsis;
white-space:nowrap white-space:nowrap
} }
.fileslistitemsA{
}
`}</style> `}</style>
<div className="clearfix ds pr contentSection" style={{cursor : this.props.isAdmin ? "pointer" : "default"}} onClick={() => window.$(`.sourceitem${index} input`).click() }> <div className="clearfix ds pr contentSection" style={{cursor : this.props.isAdmin ? "pointer" : "default"}} onClick={() => window.$(`.sourceitem${index} input`).click() }>
<h6 onClick={(event)=>this.eventStop(event)}> <h6 onClick={(event)=>this.eventStop(event)}>
@ -208,23 +215,25 @@ class Fileslistitem extends Component{
// href={"/courses/" + coursesId + "/graduation/graduation_tasks/" + categoryid + "/" + taskid + "/list"} // href={"/courses/" + coursesId + "/graduation/graduation_tasks/" + categoryid + "/" + taskid + "/list"}
onClick={()=>this.showfiles(discussMessage)} onClick={()=>this.showfiles(discussMessage)}
title={discussMessage.title} title={discussMessage.title}
className=" fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a> : "" className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a> : ""
} }
{ {
this.props.isStudent? <a this.props.isStudent? <a
onClick={()=>this.showfiles(discussMessage)} onClick={()=>this.showfiles(discussMessage)}
title={discussMessage.title} title={discussMessage.title}
className=" fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a> :"" className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a> :""
} }
{ {
this.props.isNotMember===true? this.props.isNotMember===true?
discussMessage.is_lock === true ? discussMessage.is_lock === true ?
<span className=" fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</span> <Tooltip title={"私有属性，非课堂成员不能访问"} placement="bottom">
<span className="fl mt3 font-16 font-bd color-dark maxwidth580 pointer">{discussMessage.title}</span>
</Tooltip>
:<a :<a
onClick={()=>this.showfiles(discussMessage)} onClick={()=>this.showfiles(discussMessage)}
title={discussMessage.title} title={discussMessage.title}
className=" fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a>:"" className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a>:""
} }

47
public/react/src/modules/courses/Resource/index.js
Unescape View File

@ -113,31 +113,36 @@ class Fileslists extends Component{
updadatalist=(id)=>{ updadatalist=(id)=>{
// this.seactall(id) // this.seactall(id)
let coursesId=this.props.match.params.coursesId; if(this.props.user&&this.props.user.login=== ""||this.props.user&&this.props.user.login=== null||this.props.user&&this.props.user.login=== undefined){
let url="/courses/"+coursesId+"/attahcment_category_list.json";
axios.get(url, { }else{
}).then((response) => { let coursesId=this.props.match.params.coursesId;
if(response!=undefined){ let url="/courses/"+coursesId+"/attahcment_category_list.json";
axios.get(url, {
if(response.data&&response.data) { }).then((response) => {
if (response.data.status != 401) { if(response!=undefined){
let list = response.data.course_modules;
let course_second_categoriess; if(response.data&&response.data) {
list.map((item, key) => { if (response.data.status != 401) {
course_second_categoriess = item.course_second_categories let list = response.data.course_modules;
}) let course_second_categoriess;
list.map((item, key) => {
this.setState({ course_second_categoriess = item.course_second_categories
course_modules: response.data, })
has_course_groups: response.data.has_course_groups,
course_second_categories: course_second_categoriess this.setState({
}) course_modules: response.data,
has_course_groups: response.data.has_course_groups,
course_second_categories: course_second_categoriess
})
}
} }
} }
} })
}
})
} }
updatafiled=()=>{ updatafiled=()=>{
if(this.props.match.params.main_id){ if(this.props.match.params.main_id){

23
public/react/src/modules/courses/boards/BoardsListItem.js
Unescape View File

@ -10,6 +10,16 @@ class BoardsListItem extends Component{
} }
} }
onTitleClick = (discussMessage) => { onTitleClick = (discussMessage) => {
if(this.props.checkIfLogin()===false){
this.props.showLoginDialog()
return
}
if(this.props.checkIfProfileCompleted()===false){
this.props.showProfileCompleteDialog()
return
}
const isAdminOrStudent = this.props.isAdminOrStudent(); const isAdminOrStudent = this.props.isAdminOrStudent();
if (!isAdminOrStudent && discussMessage.is_public == false) { if (!isAdminOrStudent && discussMessage.is_public == false) {
// 没有权限访问 // 没有权限访问
@ -47,15 +57,16 @@ class BoardsListItem extends Component{
</a> </a>
<div className="clearfix ds pr pt5 contentSection" onClick={() => onItemClick(discussMessage)}> <div className="clearfix ds pr pt5 contentSection" onClick={() => onItemClick(discussMessage)}>
<h6> <h6>
<a href="javascript:void(0)" className="panel-list-title hide fl mt5 color-dark font-bd" <Tooltip title={canNotLink?"私有属性，非课堂成员不能访问":`${discussMessage.subject.length > 40 ? discussMessage.subject : ''}`} placement="bottom">
style={{ fontWeight: 'bold', cursor: (canNotLink ? 'default' : 'poninter'), maxWidth: '700px' }} <a className="panel-list-title hide fl mt5 color-dark font-bd pointer"
onClick={canNotLink ? () => {} : () => this.onTitleClick(discussMessage)} style={{ fontWeight: 'bold', cursor: (canNotLink ? 'poninter' : 'poninter'), maxWidth: '700px' }}
title={`${discussMessage.subject.length > 40 ? discussMessage.subject : ''}`} onClick={canNotLink ? () => {} : () => this.onTitleClick(discussMessage)}
>{discussMessage.subject}</a> >{discussMessage.subject}</a>
</Tooltip>
{ !!discussMessage.sticky && <span className="btn-cir btn-cir-red fl mt5 ml5">置顶</span> } { !!discussMessage.sticky && <span className="btn-cir btn-cir-red fl mt5 ml5">置顶</span> }
{ {
discussMessage.is_public == false ? (<Tooltip title={`${isAdminOrStudent ? '私有属性' : '私有属性，非课堂成员不能访问'}`}> discussMessage.is_public == false ? (<Tooltip title={`${isAdminOrStudent ? '私有属性' : '私有属性，非课堂成员不能访问'}`} placement="bottom">
<i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i> <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
</Tooltip>) : "" </Tooltip>) : ""
} }

68
public/react/src/modules/courses/busyWork/CommonWorkItem.js
Unescape View File

@ -7,41 +7,33 @@ import CoursesListType from '../coursesPublic/CoursesListType'
import { WordsBtn } from 'educoder' import { WordsBtn } from 'educoder'
import AccessoryModal2 from '../coursesPublic/AccessoryModal2' import AccessoryModal2 from '../coursesPublic/AccessoryModal2'
import AccessoryModal from '../coursesPublic/AccessoryModal' import AccessoryModal from '../coursesPublic/AccessoryModal'
import LoginDialog from '../../login/LoginDialog';
import axios from 'axios' import axios from 'axios'
class CommonWorkItem extends Component{ class CommonWorkItem extends Component{
constructor(props){ constructor(props){
super(props); super(props);
this.state = { this.state = {
aModalVisible: false, aModalVisible: false
isRender:false,
} }
} }
onItemClick = (item) => { onItemClick = (item) => {
// console.log("onItemClick");
// console.log(this.props); if(this.props.checkIfLogin()===false){
try { this.props.showLoginDialog()
if(this.props.current_user.username==="游客"){ return
this.setState({ }
isRender:true,
match:"", if(this.props.checkIfProfileCompleted()===false){
}); this.props.showProfileCompleteDialog()
return return
} }
}catch (e) {
} const isStudent = this.props.isStudent()
const isStudent = this.props.isStudent()
if (isStudent) { if (isStudent) {
this.props.toWorkQuestionPage(this.props.match.params, item.homework_id) this.props.toWorkQuestionPage(this.props.match.params, item.homework_id)
} else { } else {
this.props.toWorkListPage(this.props.match.params, item.homework_id) this.props.toWorkListPage(this.props.match.params, item.homework_id)
} }
}; }
Modifyloginvalue=()=>{
this.setState({
isRender:false,
})
};
sendMoreAttachment = (item) => { sendMoreAttachment = (item) => {
this.handleItem = item; this.handleItem = item;
const url = `/student_works/${item.work_id}/supply_attachments.json` const url = `/student_works/${item.work_id}/supply_attachments.json`
@ -123,7 +115,7 @@ class CommonWorkItem extends Component{
render(){ render(){
let { mainList,workType }=this.props; let { mainList,workType }=this.props;
const { aModalVisible, fileList, revise_reason,isRender } = this.state const { aModalVisible, fileList, revise_reason } = this.state
let coursesId = this.props.match.params.coursesId; let coursesId = this.props.match.params.coursesId;
const isStudent = this.props.isStudent() const isStudent = this.props.isStudent()
@ -138,11 +130,6 @@ class CommonWorkItem extends Component{
fileList={fileList} fileList={fileList}
description={revise_reason} description={revise_reason}
></AccessoryModal2> */} ></AccessoryModal2> */}
{isRender===true?<LoginDialog
Modifyloginvalue={()=>this.Modifyloginvalue()}
{...this.props}
{...this.state}
/>:""}
<style> <style>
{ {
` `
@ -152,9 +139,6 @@ class CommonWorkItem extends Component{
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.commonworkitemA{
}
` `
} }
</style> </style>
@ -171,23 +155,15 @@ class CommonWorkItem extends Component{
} }
<div className="flex1" onClick={() => this.props.onItemClick(Object.assign({}, item, {id: item.homework_id})) }> <div className="flex1" onClick={() => this.props.onItemClick(Object.assign({}, item, {id: item.homework_id})) }>
<p className="clearfix mb20"> <p className="clearfix mb20">
<style> <Tooltip title={ canNotLink ? "私有属性，非课堂成员不能访问" : item.name} placement="bottom" >
{ <span className="fl font-16 font-bd mt2 comnonwidth580 pointer" style={{cursor: canNotLink ? 'poninter' : 'poninter'}}
` onClick={ canNotLink ? () => {} : () => this.onItemClick(item)}
.commonworkitemA{ >{item.name}</span>
} </Tooltip>
`
}
</style>
<a title={item.name}
className="fl font-16 font-bd mt2 comnonwidth580" style={{cursor: canNotLink ? 'default' : 'poninter'}}
onClick={ canNotLink ? () => {} : () => this.onItemClick(item)}
>{item.name}</a>
{/* 只有非课堂成员且作业是私有的情况下才会为true */} {/* 只有非课堂成员且作业是私有的情况下才会为true */}
{ {
item.private_icon===true ? item.private_icon===true ?
(<Tooltip title={ isAdminOrStudent ? "私有属性" : "私有属性，非课堂成员不能访问"}> (<Tooltip title={ isAdminOrStudent ? "私有属性" : "私有属性，非课堂成员不能访问"} placement="bottom" >
<i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl"></i> <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl"></i>
</Tooltip>) : "" </Tooltip>) : ""
} }
@ -217,7 +193,7 @@ class CommonWorkItem extends Component{
{item.uncommit_count===undefined?"":<span className="mr20 fl">{item.uncommit_count} 未交</span>} {item.uncommit_count===undefined?"":<span className="mr20 fl">{item.uncommit_count} 未交</span>}
{ {
item.status_time!="" && item.status_time!="" &&
<Tooltip title={ item.status.indexOf('提交中') != -1 ? '提交剩余时间' : <Tooltip placement="bottom" title={ item.status.indexOf('提交中') != -1 ? '提交剩余时间' :
item.status.indexOf('补交中') != -1 ? '补交剩余时间' : item.status.indexOf('补交中') != -1 ? '补交剩余时间' :
item.status.indexOf('申诉中') != -1 ? '申诉剩余时间' : item.status.indexOf('申诉中') != -1 ? '申诉剩余时间' :
item.status.indexOf('匿评中') != -1 ? '匿评剩余时间' : item.status.indexOf('匿评中') != -1 ? '匿评剩余时间' :

2
public/react/src/modules/courses/busyWork/CommonWorkList.js
Unescape View File

@ -641,7 +641,7 @@ class CommonWorkList extends Component{
timeMsg = '申诉剩余时间' timeMsg = '申诉剩余时间'
} }
const hasData = student_works && !!student_works.length && page == 1 const hasData = this.state.homework_status && this.state.homework_status.indexOf("未发布") == -1 // student_works && !!student_works.length && page == 1 &&
// console.log(StudentData) // console.log(StudentData)
// console.log(student_works) // console.log(student_works)

5
public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
Unescape View File

@ -1045,10 +1045,7 @@ class Coursesleftnav extends Component{
}) })
: course_modules===undefined?"":course_modules.map((item,key)=>{ : course_modules===undefined?"":course_modules.map((item,key)=>{
if(key===this.props.indexs){
console.log(key)
console.log(this.props.indexs)
}
return( return(
<div key={key}> <div key={key}>
{/*<Tooltip placement="bottom" title={"点击空白处展开二级菜单，点击模块名字跳转到对应模块"}>*/} {/*<Tooltip placement="bottom" title={"点击空白处展开二级菜单，点击模块名字跳转到对应模块"}>*/}

66
public/react/src/modules/courses/exercise/ExerciseListItem.js
Unescape View File

@ -10,15 +10,14 @@ import { formatDuring ,handleDateString} from 'educoder';
import '../css/members.css'; import '../css/members.css';
import '../css/busyWork.css'; import '../css/busyWork.css';
import CourseLayoutcomponent from "./Exercise"; import CourseLayoutcomponent from "./Exercise";
import LoginDialog from '../../login/LoginDialog';
const dataformat="YYYY-MM-DD HH:mm"; const dataformat="YYYY-MM-DD HH:mm";
const polls_status={1:"未发布",2:"提交中",3:"已截止",4:"已结束"} const polls_status={1:"未发布",2:"提交中",3:"已截止",4:"已结束"}
class ExerciseListItem extends Component{ class ExerciseListItem extends Component{
constructor(props){ constructor(props){
super(props); super(props);
this.state={ this.state={
Modalstype:false, Modalstype:false
isRender:false,
} }
} }
@ -41,30 +40,7 @@ class ExerciseListItem extends Component{
}) })
} }
};
Modifyloginvalue=()=>{
this.setState({
isRender:false,
})
};
showfiles =(url)=>{
// console.log("ShixunhomeWorkItemshowfiles");
// console.log( this.props.current_user.username);
try {
if(this.props.current_user.username==="游客"){
this.setState({
isRender:true,
match:"",
});
return
}
}catch (e) {
} }
this.props.history.push(url);
// this.props.current_user
};
cancelmodel=()=>{ cancelmodel=()=>{
this.setState({ this.setState({
@ -75,8 +51,22 @@ class ExerciseListItem extends Component{
Loadtype:false Loadtype:false
}) })
} }
toDetailPage=(url)=>{
if(this.props.checkIfLogin()===false){
this.props.showLoginDialog()
return
}
if(this.props.checkIfProfileCompleted()===false){
this.props.showProfileCompleteDialog()
return
}
this.props.history.push(url);
}
render(){ render(){
let {isRender}=this.state;
let{item,checkBox,index}=this.props; let{item,checkBox,index}=this.props;
let {coursesId,Id}=this.props.match.params let {coursesId,Id}=this.props.match.params
const IsAdmin =this.props.isAdmin(); const IsAdmin =this.props.isAdmin();
@ -101,11 +91,6 @@ class ExerciseListItem extends Component{
modalSave={this.state.ModalSave} modalSave={this.state.ModalSave}
antIcon={this.state.Modalstypeloding} antIcon={this.state.Modalstypeloding}
></Modals>:""} ></Modals>:""}
{isRender===true?<LoginDialog
Modifyloginvalue={()=>this.Modifyloginvalue()}
{...this.props}
{...this.state}
/>:""}
<style> <style>
{ {
` `
@ -126,25 +111,22 @@ class ExerciseListItem extends Component{
{/*<Link to={`/courses/${coursesId}/exercises/${item.id}/exercises/student_exercise_list?tab=0`} className="fl font-16 font-bd mt2 color-grey-3 task-hide" style={{"maxWidth":"600px"}}>{item.exercise_name}</Link>*/} {/*<Link to={`/courses/${coursesId}/exercises/${item.id}/exercises/student_exercise_list?tab=0`} className="fl font-16 font-bd mt2 color-grey-3 task-hide" style={{"maxWidth":"600px"}}>{item.exercise_name}</Link>*/}
{ {
this.props.isAdmin()? <a onClick={()=>this.showfiles(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)} this.props.isAdmin()? <a className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580 pointer"
className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580"
title={item.exercise_name} title={item.exercise_name}
>{item.exercise_name}</a>:"" onClick={()=>this.toDetailPage(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>{item.exercise_name}</a>:""
} }
{ {
this.props.isStudent()? this.props.isStudent()?
<a className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580" title={item.exercise_name} <a className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580 pointer" title={item.exercise_name} onClick={()=>this.toDetailPage(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>{item.exercise_name}</a>:""
onClick={()=>this.showfiles(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}
>{item.exercise_name}</a>:""
} }
{ {
this.props.isNotMember()? item.lock_status === 0 ? this.props.isNotMember()? item.lock_status === 0 ?
<span className="fl mt3 font-16 font-bd color-dark comnonwidth580" title={item.exercise_name}>{item.exercise_name}</span> <Tooltip title={"私有属性，非课堂成员不能访问"} placement="bottom">
: <a className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580" title={item.exercise_name} <span className="fl mt3 font-16 font-bd color-dark comnonwidth580 pointer" title={item.exercise_name}>{item.exercise_name}</span>
onClick={()=>this.showfiles(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)} </Tooltip>
>{item.exercise_name}</a>:"" : <a className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580 pointer" title={item.exercise_name} onClick={()=>this.toDetailPage(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>{item.exercise_name}</a>:""
} }
{ {

71
public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
Unescape View File

@ -7,15 +7,14 @@ import axios from 'axios';
import Modals from '../../../modals/Modals'; import Modals from '../../../modals/Modals';
import Associationmodel from '../../coursesPublic/Associationmodel'; import Associationmodel from '../../coursesPublic/Associationmodel';
import AccessoryModal from "../../coursesPublic/AccessoryModal"; import AccessoryModal from "../../coursesPublic/AccessoryModal";
import LoginDialog from "../../../login/LoginDialog";
class GraduateTaskItem extends Component{ class GraduateTaskItem extends Component{
constructor(props){ constructor(props){
super(props); super(props);
this.state = { this.state = {
modalname:"关联项目", modalname:"关联项目",
visible:false, visible:false
isRender:false,
} }
} }
@ -33,11 +32,6 @@ class GraduateTaskItem extends Component{
// isrelate:is_relate // isrelate:is_relate
// }) // })
} }
Modifyloginvalue=()=>{
this.setState({
isRender:false,
})
};
cannelAssociation=()=>{ cannelAssociation=()=>{
@ -138,24 +132,22 @@ class GraduateTaskItem extends Component{
setupdate=()=>{ setupdate=()=>{
this.props.funlist this.props.funlist
}; }
showfiles =(url)=>{
// console.log("ShixunhomeWorkItemshowfiles"); toDetailPage=(url)=>{
// console.log( this.props.current_user.username);
try { if(this.props.checkIfLogin()===false){
if(this.props.current_user.username==="游客"){ this.props.showLoginDialog()
this.setState({ return
isRender:true, }
match:"",
}); if(this.props.checkIfProfileCompleted()===false){
return this.props.showProfileCompleteDialog()
} return
}catch (e) { }
}
this.props.history.push(url);
// this.props.current_user
}; this.props.history.push(url);
}
render(){ render(){
let { let {
Modalstype, Modalstype,
@ -165,8 +157,7 @@ class GraduateTaskItem extends Component{
cardsModalsavetype, cardsModalsavetype,
loadtype, loadtype,
modalname, modalname,
visible, visible
isRender
} = this.state; } = this.state;
const { checkBox, const { checkBox,
@ -189,11 +180,7 @@ class GraduateTaskItem extends Component{
modalSave={cardsModalsavetype} modalSave={cardsModalsavetype}
loadtype={loadtype} loadtype={loadtype}
/> />
{isRender===true?<LoginDialog
Modifyloginvalue={()=>this.Modifyloginvalue()}
{...this.props}
{...this.state}
/>:""}
{visible===true?<Associationmodel {visible===true?<Associationmodel
modalname={modalname} modalname={modalname}
visible={visible} visible={visible}
@ -239,30 +226,28 @@ class GraduateTaskItem extends Component{
text-overflow:ellipsis; text-overflow:ellipsis;
white-space:nowrap white-space:nowrap
} }
.graduatetaskitemA{
}
`}</style> `}</style>
<h6> <h6>
{ {
this.props.isAdmin?<Link this.props.isAdmin?<a onClick={()=>this.toDetailPage("/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/list")}
onClick={()=>this.showfiles("/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/list")}
title={discussMessage.name} title={discussMessage.name}
className=" fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:"" className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
} }
{ {
this.props.isStudent? <Link this.props.isStudent? <a onClick={()=>this.toDetailPage("/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/list")}
onClick={()=>this.showfiles("/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/detail/"+taskid+"/list")}
title={discussMessage.name} title={discussMessage.name}
className=" fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:"" className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
} }
{ {
this.props.isNotMember===true?this.props.discussMessage.private_icon===true? this.props.isNotMember===true?this.props.discussMessage.private_icon===true?
<span className=" fl mt3 font-16 font-bd color-dark maxwidth580" title={discussMessage.name}>{discussMessage.name}</span> <Tooltip title={"私有属性，非课堂成员不能访问"} placement="bottom">
:<a onClick={()=>this.showfiles("/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/"+taskid+"/list")} <span className="fl mt3 font-16 font-bd color-dark maxwidth580 pointer" >{discussMessage.name}</span>
</Tooltip>
:<a onClick={()=>this.toDetailPage("/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/"+taskid+"/list")}
title={discussMessage.name} title={discussMessage.name}
className=" fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:"" className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
} }

60
public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js
Unescape View File

@ -4,50 +4,37 @@ import CoursesListType from '../../coursesPublic/CoursesListType';
import { WordsBtn } from 'educoder' import { WordsBtn } from 'educoder'
import {Tooltip} from 'antd' import {Tooltip} from 'antd'
import axios from 'axios' import axios from 'axios'
import LoginDialog from "../../../login/LoginDialog";
const map={0:"待选中",1:"待确认",2:"已确认"} const map={0:"待选中",1:"待确认",2:"已确认"}
class GraduateTopicItem extends Component{ class GraduateTopicItem extends Component{
constructor(props){ constructor(props){
super(props); super(props);
this.state = {
isRender:false,
}
} }
editTopic=(topicId)=>{ editTopic=(topicId)=>{
let courseId=this.props.match.params.coursesId; let courseId=this.props.match.params.coursesId;
this.props.history.push(`/courses/${courseId}/graduation_topics/${topicId}/edit`); this.props.history.push(`/courses/${courseId}/graduation_topics/${topicId}/edit`);
} }
toDetailPage=(topicId)=>{ toDetailPage=(topicId)=>{
// console.log("toDetailPage");
// console.log(this.props); if(this.props.checkIfLogin()===false){
try { this.props.showLoginDialog()
if(this.props.current_user.username==="游客"){ return
this.setState({ }
isRender:true,
match:"", if(this.props.checkIfProfileCompleted()===false){
}); this.props.showProfileCompleteDialog()
return return
} }
}catch (e) {
}
let courseId=this.props.match.params.coursesId; let courseId=this.props.match.params.coursesId;
this.props.history.push(`/courses/${courseId}/graduation_topics/${topicId}/detail`); this.props.history.push(`/courses/${courseId}/graduation_topics/${topicId}/detail`);
}; }
Modifyloginvalue=()=>{
this.setState({
isRender:false,
})
};
render(){ render(){
const { checkBox, discussMessage, index,chooseTopic, const { checkBox, discussMessage, index,chooseTopic,
data, data,
courseId courseId
} = this.props; } = this.props;
const {
isRender
}=this.state;
const isAdmin = this.props.isAdmin(); const isAdmin = this.props.isAdmin();
const isStudent=this.props.isStudent(); const isStudent=this.props.isStudent();
const isNotMember=this.props.isNotMember(); const isNotMember=this.props.isNotMember();
@ -56,11 +43,6 @@ class GraduateTopicItem extends Component{
} }
return( return(
<div> <div>
{isRender===true?<LoginDialog
Modifyloginvalue={()=>this.Modifyloginvalue()}
{...this.props}
{...this.state}
/>:""}
<style> <style>
{ {
` `
@ -96,25 +78,21 @@ class GraduateTopicItem extends Component{
text-overflow:ellipsis; text-overflow:ellipsis;
white-space:nowrap white-space:nowrap
} }
.GraduateTopicItemA {
}
`}</style> `}</style>
<h6> <h6>
{ {
isNotMember? isNotMember?
<a <Tooltip title={ discussMessage.private_icon===true?"私有属性，非课堂成员不能访问":discussMessage.name} placement="bottom">
onClick={() => this.toDetailPage(`${discussMessage.id}`)} <span className="fl mt3 font-16 font-bd color-dark maxwidth580 pointer">{discussMessage.name}</span>
className=" fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:"" </Tooltip>:""
} }
{ {
isStudent?<a isStudent?<a onClick={() => this.toDetailPage(`${discussMessage.id}`)}
onClick={() => this.toDetailPage(`${discussMessage.id}`)} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
className=" fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
} }
{ {
isAdmin?<a isAdmin?<a onClick={() => this.toDetailPage(`${discussMessage.id}`)} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
onClick={() => this.toDetailPage(`${discussMessage.id}`)} className=" fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
} }
{ {
discussMessage.private_icon===true? discussMessage.private_icon===true?

58
public/react/src/modules/courses/poll/PollListItem.js
Unescape View File

@ -1,12 +1,11 @@
import React,{ Component } from "react"; import React,{ Component } from "react";
import Tooltip from 'material-ui/Tooltip'; import {Tooltip} from 'antd';
import {Link} from 'react-router-dom'; import {Link} from 'react-router-dom';
import moment from 'moment'; import moment from 'moment';
import CoursesListType from '../coursesPublic/CoursesListType'; import CoursesListType from '../coursesPublic/CoursesListType';
import { WordsBtn,formatDuring } from 'educoder'; import { WordsBtn,formatDuring } from 'educoder';
import '../css/members.css'; import '../css/members.css';
import '../css/busyWork.css'; import '../css/busyWork.css';
import LoginDialog from '../../login/LoginDialog';
const polls_status={1:"未发布",2:"提交中",3:"已截止",4:"已结束"} const polls_status={1:"未发布",2:"提交中",3:"已截止",4:"已结束"}
@ -15,34 +14,22 @@ const dataformat="YYYY-MM-DD HH:mm";
class PollListItem extends Component{ class PollListItem extends Component{
constructor(props){ constructor(props){
super(props); super(props);
this.state={
isRender:false,
}
} }
Modifyloginvalue=()=>{ toDetailPage=(url)=>{
this.setState({
isRender:false,
})
};
showfiles =(url)=>{
// console.log("ShixunhomeWorkItemshowfiles");
// console.log( this.props.current_user.username);
try {
if(this.props.current_user.username==="游客"){
this.setState({
isRender:true,
match:"",
});
return
}
}catch (e) {
}
this.props.history.push(url);
// this.props.current_user
}; if(this.props.checkIfLogin()===false){
this.props.showLoginDialog()
return
}
if(this.props.checkIfProfileCompleted()===false){
this.props.showProfileCompleteDialog()
return
}
this.props.history.push(url);
}
render(){ render(){
let{isRender}=this.state;
let{item,checkBox,courseType,index}=this.props; let{item,checkBox,courseType,index}=this.props;
let {coursesId}=this.props.match.params; let {coursesId}=this.props.match.params;
@ -62,21 +49,18 @@ class PollListItem extends Component{
{checkBox} {checkBox}
</span> </span>
} }
{isRender===true?<LoginDialog
Modifyloginvalue={()=>this.Modifyloginvalue()}
{...this.props}
{...this.state}
/>:""}
<div className="flex1 pr"> <div className="flex1 pr">
<p className="clearfix mb30"> <p className="clearfix mb30">
{ canNotLink ? <a className="fl font-16 font-bd mt2 color-grey-3 task-hide" onClick={()=>this.showfiles(`/courses/${coursesId}/polls/${item.id}/detail`)} style={{"maxWidth":"600px", "cursor": "default"}} title={item.polls_name}>{item.polls_name}</a> : { canNotLink ?
<a <Tooltip title={courseType.user_permission == 0?"私有属性，非课堂成员不能访问":item.polls_name} placement="bottom">
onClick={()=>this.showfiles(`/courses/${coursesId}/polls/${item.id}/detail`)} <span className="fl font-16 font-bd mt2 color-grey-3 task-hide pointer" style={{"maxWidth":"600px"}} >{item.polls_name}</span>
className="fl font-16 font-bd mt2 color-grey-3 task-hide" style={{"maxWidth":"600px"}} title={item.polls_name}>{item.polls_name}</a> </Tooltip>
:
<a onClick={()=>this.toDetailPage(`/courses/${coursesId}/polls/${item.id}/detail`)} className="fl font-16 font-bd mt2 color-grey-3 task-hide pointer" style={{"maxWidth":"600px"}} title={item.polls_name}>{item.polls_name}</a>
} }
{ {
item.lock_status === 0 ? item.lock_status === 0 ?
<Tooltip title={`${courseType.user_permission == 0 ? "私有属性,非课堂成员不能访问" : "私有属性"}`}> <Tooltip title={`${courseType.user_permission == 0 ? "私有属性,非课堂成员不能访问" : "私有属性"}`} placement="bottom">
<i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl"></i> <i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl"></i>
</Tooltip> </Tooltip>
:"" :""

69
public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
Unescape View File

@ -7,7 +7,6 @@ import axios from 'axios';
import Modals from '../../modals/Modals'; import Modals from '../../modals/Modals';
import Associationmodel from '../coursesPublic/Associationmodel'; import Associationmodel from '../coursesPublic/Associationmodel';
import ModalsRename from '../coursesPublic/ModalsRename'; import ModalsRename from '../coursesPublic/ModalsRename';
import LoginDialog from '../../login/LoginDialog';
// import '../../css/members.css' // import '../../css/members.css'
import './style.css' import './style.css'
@ -20,8 +19,7 @@ class ShixunhomeWorkItem extends Component{
modalname:"关联项目", modalname:"关联项目",
visible:false, visible:false,
startbtn:false, startbtn:false,
code_review:false, code_review:false
isRender:false,
} }
// console.log("获取到this.propssssssssssss") // console.log("获取到this.propssssssssssss")
// console.log(this.props) // console.log(this.props)
@ -144,29 +142,23 @@ class ShixunhomeWorkItem extends Component{
this.setState({ this.setState({
ModalsRenametype:false, ModalsRenametype:false,
}) })
}; }
Modifyloginvalue=()=>{
this.setState({ hrefjumpskip=(url)=>{
isRender:false,
})
};
showfiles =(url)=>{
// console.log("ShixunhomeWorkItemshowfiles");
// console.log( this.props.current_user.username);
try {
if(this.props.current_user.username==="游客"){
this.setState({
isRender:true,
match:"",
});
return
}
}catch (e) {
}
this.props.history.push(url);
// this.props.current_user
}; if(this.props.checkIfLogin()===false){
this.props.showLoginDialog()
return
}
if(this.props.checkIfProfileCompleted()===false){
this.props.showProfileCompleteDialog()
return
}
this.props.history.push(url);
}
render(){ render(){
let { let {
Modalstype, Modalstype,
@ -182,7 +174,7 @@ class ShixunhomeWorkItem extends Component{
startshixunCombattype, startshixunCombattype,
shixunsmessage, shixunsmessage,
startbtn, startbtn,
isRender,
} = this.state; } = this.state;
const { checkBox, const { checkBox,
@ -203,12 +195,6 @@ class ShixunhomeWorkItem extends Component{
cannerNavmoda={()=>this.cannerNavmoda()} cannerNavmoda={()=>this.cannerNavmoda()}
/> />
:""} :""}
{isRender===true?<LoginDialog
Modifyloginvalue={()=>this.Modifyloginvalue()}
{...this.props}
{...this.state}
/>:""}
<Modals <Modals
modalsType={Modalstype} modalsType={Modalstype}
modalsTopval={Modalstopval} modalsTopval={Modalstopval}
@ -319,29 +305,28 @@ class ShixunhomeWorkItem extends Component{
text-overflow:ellipsis; text-overflow:ellipsis;
white-space:nowrap white-space:nowrap
} }
.ShixunhomeWorkItemA{
}
`}</style> `}</style>
<h6> <h6>
{/*to={`/courses/${this.props.match.params.coursesId}/${discussMessage.homework_id}/jobsettings`}*/} {/*to={`/courses/${this.props.match.params.coursesId}/${discussMessage.homework_id}/jobsettings`}*/}
{ {
this.props.isAdmin?<a onClick={()=>this.showfiles("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")} this.props.isAdmin?<a onClick={()=>this.hrefjumpskip("/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0")}
title={discussMessage.name} title={discussMessage.name}
className=" fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:"" className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
} }
{ {
this.props.isStudent? <a onClick={()=>this.showfiles(`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`)} this.props.isStudent? <a onClick={()=>this.hrefjumpskip(`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`)}
title={discussMessage.name} title={discussMessage.name}
className=" fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:"" className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
} }
{ {
this.props.isNotMember===true? this.props.discussMessage.private_icon===true? this.props.isNotMember===true? this.props.discussMessage.private_icon===true?
<span <Tooltip title={"私有属性，非课堂成员不能访问"} placement="bottom">
className=" fl mt3 font-16 font-bd color-dark maxwidth580" title={discussMessage.name}>{discussMessage.name}</span> <span className="fl mt3 font-16 font-bd color-dark maxwidth580 pointer">{discussMessage.name}</span>
: <a onClick={()=>this.showfiles(`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`)} </Tooltip>
: <a onClick={()=>this.hrefjumpskip(`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`)}
title={discussMessage.name} title={discussMessage.name}
className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:"" className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
} }

8
public/react/src/modules/courses/shixunHomework/shixunHomework.js
Unescape View File

@ -84,7 +84,8 @@ class ShixunHomework extends Component{
} }
componentDidMount() { componentDidMount() {
this.setState({ this.setState({
isSpin:true isSpin:true,
}) })
if(this.props.match.params.main_id){ if(this.props.match.params.main_id){
this.setState({ this.setState({
@ -108,7 +109,8 @@ class ShixunHomework extends Component{
} }
seactall=(id)=>{ seactall=(id)=>{
this.setState({ this.setState({
isSpin:true isSpin:true,
checkBoxValues:[]
}) })
let coursesId=this.props.match.params.coursesId; let coursesId=this.props.match.params.coursesId;
let url="/courses/"+coursesId+"/homework_commons.json?type=4"; let url="/courses/"+coursesId+"/homework_commons.json?type=4";
@ -1080,7 +1082,7 @@ class ShixunHomework extends Component{
</span>: </span>:
<WordsBtn style="blue" onClick={()=>this.editDir(datas&&datas.category_name)} className={"mr30 font-16"}>目录重命名</WordsBtn>:""} <WordsBtn style="blue" onClick={()=>this.editDir(datas&&datas.category_name)} className={"mr30 font-16"}>目录重命名</WordsBtn>:""}
{this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?<WordsBtn style="blue" className="mr30 font-16" onClick={this.createCommonpath}>选用实践课程</WordsBtn>:"":""} {this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?<WordsBtn style="blue" className="mr30 font-16" onClick={this.createCommonpath}>选用实践课程</WordsBtn>:"":""}
{this.props.isAdmin()===true?<a className={"btn colorblue font-16"} onClick={()=>this.showNewShixunModelType()}>选用实训</a>:""} {this.props.isAdmin()===true?<a className={"btn colorblue font-16"} onClick={()=>this.showNewShixunModelType()}>选用实训项目</a>:""}
</li> </li>
</p> </p>

14
public/react/src/modules/login/LoginDialog.js
Unescape View File

@ -398,13 +398,15 @@ class LoginDialog extends Component {
}); });
} }
handleDialogClose = () => { handleDialogClose = () => {
// this.setState({
// isRender:true, console.log(this.props.match)
// match:"", debugger
// });
// 上头像上面传个""就不是undefined了 就会不隐藏了
if(this.props.match===undefined){ if(this.props.match===undefined){
window.location.href="/"; window.location.href="/";
// this.setState({
// isRender: false
// })
// this.props.Modifyloginvalue();
}else{ }else{
this.setState({ this.setState({
isRender: false isRender: false

20
public/react/src/modules/paths/PathDetail/DetailCards.js
Unescape View File

@ -3,7 +3,6 @@ import {getImageUrl} from 'educoder';
import {Tooltip,Modal,Icon,Spin,message} from 'antd'; import {Tooltip,Modal,Icon,Spin,message} from 'antd';
import DetailCardsEditAndAdd from './DetailCardsEditAndAdd'; import DetailCardsEditAndAdd from './DetailCardsEditAndAdd';
import DetailCardsEditAndEdit from './DetailCardsEditAndEdit'; import DetailCardsEditAndEdit from './DetailCardsEditAndEdit';
import AccountProfile from"../../user/AccountProfile";
import { BrowserRouter as Router, Route, Link } from "react-router-dom"; import { BrowserRouter as Router, Route, Link } from "react-router-dom";
import axios from 'axios'; import axios from 'axios';
import { DragDropContext , Draggable, Droppable} from 'react-beautiful-dnd'; import { DragDropContext , Draggable, Droppable} from 'react-beautiful-dnd';
@ -201,10 +200,8 @@ class DetailCards extends Component{
return return
} }
if(this.props.current_user&&this.props.current_user.profile_completed===false){ if(this.props.checkIfProfileCompleted()===false){
this.setState({ this.props.showProfileCompleteDialog()
AccountProfiletype:true
})
return return
} }
@ -308,16 +305,11 @@ class DetailCards extends Component{
startshixunCombattype:false startshixunCombattype:false
}) })
} }
hideAccountProfile=()=>{
this.setState({
AccountProfiletype:false
})
}
render(){ render(){
let { pathCardsList, let { pathCardsList,
dropid, dropid,
AccountProfiletype,
idsum, idsum,
pathCardsedittype, pathCardsedittype,
pathlistedit, pathlistedit,
@ -339,11 +331,7 @@ class DetailCards extends Component{
// console.log("zzz"+this.props.MenuItemsindextype) // console.log("zzz"+this.props.MenuItemsindextype)
return( return(
<div> <div>
{AccountProfiletype===true?<AccountProfile
hideAccountProfile={()=>this.hideAccountProfile()}
{...this.props}
{...this.state}
/>:""}
<Modals <Modals
modalsType={Modalstype} modalsType={Modalstype}

2
public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
Unescape View File

@ -374,7 +374,7 @@ class DetailCardsEditAndAdd extends Component{
<p className="clearfix mb30"> <p className="clearfix mb30">
<a onClick={this.AddShixunBox} className="fl defalutGreyBorder color-grey-6 ml37"> <a onClick={this.AddShixunBox} className="fl defalutGreyBorder color-grey-6 ml37">
<i className="iconfont icon-tianjiafangda fl mr5"></i> <i className="iconfont icon-tianjiafangda fl mr5"></i>
选择实训</a> 选用实训项目</a>
<span id="sx_notice" className="fl ml20 color-grey-9 mt5">选择下面实训后，可以通过拖拽进行排序调整</span> <span id="sx_notice" className="fl ml20 color-grey-9 mt5">选择下面实训后，可以通过拖拽进行排序调整</span>
</p> </p>

2
public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
Unescape View File

@ -378,7 +378,7 @@ class DetailCardsEditAndEdit extends Component{
</div> </div>
<p className="clearfix mb30"> <p className="clearfix mb30">
<a onClick={this.AddShixunBox} className="fl defalutGreyBorder color-grey-6 ml37"> <a onClick={this.AddShixunBox} className="fl defalutGreyBorder color-grey-6 ml37">
<i className="iconfont icon-tianjiafangda fl mr5"></i>选择实训 <i className="iconfont icon-tianjiafangda fl mr5"></i>选用实训项目
</a> </a>
<span id="sx_notice" className="fl ml20 color-grey-9 mt5">选择下面实训后，可以通过拖拽进行排序调整</span> <span id="sx_notice" className="fl ml20 color-grey-9 mt5">选择下面实训后，可以通过拖拽进行排序调整</span>
</p> </p>

25
public/react/src/modules/paths/PathDetail/DetailTop.js
Unescape View File

@ -5,7 +5,6 @@ import SendPanel from "./sendPanel.js";
import { getImageUrl } from 'educoder'; import { getImageUrl } from 'educoder';
import axios from 'axios'; import axios from 'axios';
import Modals from '../../modals/Modals'; import Modals from '../../modals/Modals';
import AccountProfile from"../../user/AccountProfile";
import OpenCourse from './OpenCourse'; import OpenCourse from './OpenCourse';
import Jointheclass from '../../modals/Jointheclass'; import Jointheclass from '../../modals/Jointheclass';
import './DetailTop.css'; import './DetailTop.css';
@ -30,7 +29,7 @@ class DetailTop extends Component{
Pathcourseid:undefined, Pathcourseid:undefined,
OpenCourseTypes:false, OpenCourseTypes:false,
putappointmenttype:false, putappointmenttype:false,
getappointmenttype:false getappointmenttype:false,
} }
} }
componentDidMount(){ componentDidMount(){
@ -250,7 +249,7 @@ class DetailTop extends Component{
return return
} }
if(this.props.current_user&&this.props.current_user.profile_completed===false){ if(this.props.checkIfProfileCompleted()===false){
this.props.showProfileCompleteDialog() this.props.showProfileCompleteDialog()
return return
} }
@ -269,10 +268,8 @@ class DetailTop extends Component{
return return
} }
if(this.props.current_user&&this.props.current_user.profile_completed===false){ if(this.props.checkIfProfileCompleted()===false){
this.setState({ this.props.showProfileCompleteDialog()
AccountProfiletype:true
})
return return
} }
@ -336,14 +333,10 @@ class DetailTop extends Component{
}) })
} }
hideAccountProfile=()=>{
this.setState({
AccountProfiletype:false
})
}
render(){ render(){
let{detailInfoList}=this.props; let{detailInfoList}=this.props;
let{Modalstype,Modalstopval,cardsModalcancel,putappointmenttype,Modalsbottomval,cardsModalsavetype,loadtype,getappointmenttype,AccountProfiletype}=this.state; let{Modalstype,Modalstopval,cardsModalcancel,putappointmenttype,Modalsbottomval,cardsModalsavetype,loadtype,getappointmenttype}=this.state;
const radioStyle = { const radioStyle = {
display: 'block', display: 'block',
height: '30px', height: '30px',
@ -373,11 +366,7 @@ class DetailTop extends Component{
return( return(
<div className={this.props.courses===undefined?"subhead":this.props.courses.length===0?applypath===true?"subhead mb100":"subhead":applypath===false?detailInfoList.name.length>40?"subhead mb100":"subhead mb70":this.state.MenuItemskey===this.props.courses.length?"subhead mb120":detailInfoList.name.length>40?"subhead mb100":"subhead mb80"}> <div className={this.props.courses===undefined?"subhead":this.props.courses.length===0?applypath===true?"subhead mb100":"subhead":applypath===false?detailInfoList.name.length>40?"subhead mb100":"subhead mb70":this.state.MenuItemskey===this.props.courses.length?"subhead mb120":detailInfoList.name.length>40?"subhead mb100":"subhead mb80"}>
{AccountProfiletype===true?<AccountProfile
hideAccountProfile={()=>this.hideAccountProfile()}
{...this.props}
{...this.state}
/>:""}
<Modals <Modals
modalsType={Modalstype} modalsType={Modalstype}

4
public/react/src/modules/tpm/TPMBanner.js
Unescape View File

@ -167,7 +167,7 @@ class TPMBanner extends Component {
this.props.showLoginDialog() this.props.showLoginDialog()
return return
} }
if(this.props.current_user&&this.props.current_user.profile_completed===false){ if(this.props.checkIfProfileCompleted()===false){
this.setState({ this.setState({
AccountProfiletype:true AccountProfiletype:true
}) })
@ -390,7 +390,7 @@ class TPMBanner extends Component {
return return
} }
if(this.props.current_user&&this.props.current_user.profile_completed===false){ if(this.props.checkIfProfileCompleted()===false){
this.setState({ this.setState({
AccountProfiletype:true AccountProfiletype:true
}) })

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

@ -52,7 +52,7 @@ export default class TPMUpdatepropaede extends Component {
updatepropaedeuticsvalue=()=>{ updatepropaedeuticsvalue=()=>{
let id = this.props.match.params.shixunId; let id = this.props.match.params.shixunId;
let url="/shixuns/"+id+"/update_propaedeutics.json"; let url="/shixuns/"+id+"/update_propaedeutics.json";
const update_propaedeuticsvalue = this.editanswersRef.current.getValue().trim(); const update_propaedeuticsvalue = this.neweditanswerRef.current.getValue().trim();
axios.post(url,{ axios.post(url,{
content:update_propaedeuticsvalue content:update_propaedeuticsvalue
} }

2
public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
Unescape View File

@ -228,7 +228,7 @@ class Challenges extends Component {
} }
if(this.props.current_user&&this.props.current_user.profile_completed===false){ if(this.props.checkIfProfileCompleted()===false){
this.setState({ this.setState({
AccountProfiletype:true AccountProfiletype:true
}) })

8
public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
Unescape View File

@ -34,7 +34,7 @@ class Collaborators extends Component {
Collaboratorsvisibleadmin: false, Collaboratorsvisibleadmin: false,
value: 1, value: 1,
page: 1, page: 1,
Searchadmin: [], Searchadmin: undefined,
allChangechecked: false, allChangechecked: false,
Collaboratorslist: [], Collaboratorslist: [],
Collaboratorslisttype: false, Collaboratorslisttype: false,
@ -434,10 +434,10 @@ class Collaborators extends Component {
height: '30px', height: '30px',
lineHeight: '30px', lineHeight: '30px',
}; };
// console.log(collaboratorList)
const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />; const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
console.log(Searchadmin)
return ( return (
<React.Fragment> <React.Fragment>
<p className="clearfix mt30" <p className="clearfix mt30"
@ -533,9 +533,9 @@ class Collaborators extends Component {
<Spin indicator={antIcon} spinning={this.state.spinnings}> <Spin indicator={antIcon} spinning={this.state.spinnings}>
<div className="clearfix"> <div className="clearfix">
<ul className="upload_select_box fl" id="search_not_teachers_list" onScroll={this.contentViewScrolledit}> <ul className="upload_select_box fl" id="search_not_teachers_list" onScroll={this.contentViewScrolledit}>
{Searchadmin.length === 0 ? <li style={{textAlign: 'center'}}> {Searchadmin === undefined ? <li style={{textAlign: 'center'}}>
<span>请试试搜索一下</span> <span>请试试搜索一下</span>
</li> : Searchadmin.map((item, key) => { </li>:Searchadmin.length === 0 ? "": Searchadmin.map((item, key) => {
return ( return (
<li key={key} style={{display: item.identify === "专业人士" ? "none" : "block"}}> <li key={key} style={{display: item.identify === "专业人士" ? "none" : "block"}}>
<Checkbox className="fl mr20" checked={item.checked} <Checkbox className="fl mr20" checked={item.checked}

Write Preview
Loading…
Cancel
Save