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

Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
dev_hs
hjm 6 years ago
parent 1651aabe9c cca337b292
commit 89da7bc483
16 changed files with 290 additions and 207 deletions
Show Stats Download Patch File Download Diff File

2
app/controllers/application_controller.rb
Unescape View File

@ -451,7 +451,7 @@ class ApplicationController < ActionController::Base
cpu_limit = config.cpu_limit.presence || 1 cpu_limit = config.cpu_limit.presence || 1
cpu_request = config.lower_cpu_limit.presence || 0.1 cpu_request = config.lower_cpu_limit.presence || 0.1
memory_limit = config.memory_limit.presence || 1024 memory_limit = config.memory_limit.presence || 1024
request_limit = config.resource_limit.presence || 10 request_limit = config.request_limit.presence || 10
resource_limit = config.resource_limit.presence || 10000 resource_limit = config.resource_limit.presence || 10000
container << {:image => mirror.name, container << {:image => mirror.name,
:cpuLimit => cpu_limit, :cpuLimit => cpu_limit,

65
app/controllers/courses_controller.rb
Unescape View File

@ -41,7 +41,6 @@ class CoursesController < ApplicationController
before_action :find_board, only: :board_list before_action :find_board, only: :board_list
before_action :validate_page_size, only: :mine before_action :validate_page_size, only: :mine
before_action :course_tasks, only: [:tasks_list, :update_task_position] before_action :course_tasks, only: [:tasks_list, :update_task_position]
before_action :find_container, only: [:update_task_position]
if RUBY_PLATFORM =~ /linux/ if RUBY_PLATFORM =~ /linux/
require 'simple_xlsx_reader' require 'simple_xlsx_reader'
@ -62,6 +61,9 @@ class CoursesController < ApplicationController
@courses = Course.where(is_delete: 0, is_hidden: 0, is_end: 0) @courses = Course.where(is_delete: 0, is_hidden: 0, is_end: 0)
end end
# 金课未开课的不显示在首页
@courses = @courses.where("start_date is null or start_date <= '#{Date.today}'")
# 根据搜索关键字进一步筛选 # 根据搜索关键字进一步筛选
if params[:search].present? if params[:search].present?
# REDO:Extension # REDO:Extension
@ -1150,17 +1152,20 @@ class CoursesController < ApplicationController
end end
def update_task_position def update_task_position
tip_exception("缺少position参数") if params[:position].blank? Rails.logger.info("#######task_ids_length#{params[:task_ids].uniq.length}#########task_count:#{@tasks.count}")
unless params[:position].to_i == @task.position tip_exception("task_ids参数有误") if params[:task_ids].blank? || params[:task_ids].uniq.length != @tasks.count
if params[:position].to_i < @task.position ActiveRecord::Base.transaction do
@tasks.where("position < #{@task.position} and position >= ?", params[:position]).update_all("position = position + 1") begin
else @tasks.each do |task|
@tasks.where("position > #{@task.position} and position <= ?", params[:position]).update_all("position = position - 1") position = params[:task_ids].reverse.index(task.id).to_i + 1
task.update_attributes!(position: position)
end end
@task.update_attributes(position: params[:position])
normal_status(0, "移动成功") normal_status(0, "移动成功")
else rescue Exception => e
normal_status(-1, "位置没有变化") uid_logger(e.message)
tip_exception(e.message)
raise ActiveRecord::Rollback
end
end end
end end
@ -1199,8 +1204,8 @@ class CoursesController < ApplicationController
def validate_start_end_date def validate_start_end_date
prev_course = @subject.courses.where("id < #{@course.id}").last prev_course = @subject.courses.where("id < #{@course.id}").last
next_course = @subject.courses.where("id > #{@course.id}").first next_course = @subject.courses.where("id > #{@course.id}").first
tip_exception("开始时间和结束时间不能与其他期开课时间重叠") if prev_course && params[:start_date] <= strf_date(prev_course.end_date) tip_exception("开始时间不能与往期开课时间重叠") if prev_course && params[:start_date] <= strf_date(prev_course.end_date)
tip_exception("开始时间和结束时间不能与其他期开课时间重叠") if next_course && params[:end_date] >= strf_date(next_course.start_date) tip_exception("结束时间不能与后期开课时间重叠") if next_course && params[:end_date] >= strf_date(next_course.start_date)
end end
# 超级管理员和课堂管理员的权限判断 # 超级管理员和课堂管理员的权限判断
@ -1247,24 +1252,24 @@ class CoursesController < ApplicationController
end end
end end
def find_container # def find_container
case params[:container_type] # case params[:container_type]
when 'shixun_homework', 'common_homework', 'group_homework' # when 'shixun_homework', 'common_homework', 'group_homework'
@task = HomeworkCommon.find_by(id: params[:container_id]) # @task = HomeworkCommon.find_by(id: params[:container_id])
when 'exercise' # when 'exercise'
@task = Exercise.find_by(id: params[:container_id]) # @task = Exercise.find_by(id: params[:container_id])
when 'poll' # when 'poll'
@task = Poll.find_by(id: params[:container_id]) # @task = Poll.find_by(id: params[:container_id])
when 'graduation_topic' # when 'graduation_topic'
@task = GraduationTopic.find_by(id: params[:container_id]) # @task = GraduationTopic.find_by(id: params[:container_id])
when 'graduation_task' # when 'graduation_task'
@task = GraduationTask.find_by(id: params[:container_id]) # @task = GraduationTask.find_by(id: params[:container_id])
when 'attachment' # when 'attachment'
@task = Attachment.find_by(id: params[:container_id]) # @task = Attachment.find_by(id: params[:container_id])
else # else
tip_exception("container_type参数有误") # tip_exception("container_type参数有误")
end # end
end # end
def student_act_score group_id, search def student_act_score group_id, search
sql_select = %Q{SELECT cm.*,( sql_select = %Q{SELECT cm.*,(

1
app/services/homeworks_service.rb
Unescape View File

@ -9,6 +9,7 @@ class HomeworksService
homework_detail_manual = HomeworkDetailManual.new homework_detail_manual = HomeworkDetailManual.new
homework.homework_detail_manual = homework_detail_manual homework.homework_detail_manual = homework_detail_manual
homework.position = course.practice_homeworks.first&.position.to_i + 1
if homework.save! if homework.save!
homework_detail_manual.save! if homework_detail_manual homework_detail_manual.save! if homework_detail_manual

8
db/migrate/20190820021047_migrate_course_task_position.rb
Unescape View File

@ -1,13 +1,5 @@
class MigrateCourseTaskPosition < ActiveRecord::Migration[5.2] class MigrateCourseTaskPosition < ActiveRecord::Migration[5.2]
def change def change
add_column :homework_commons, :position, :integer, :default => 0 add_column :homework_commons, :position, :integer, :default => 0
Course.find_each do |course|
puts course.id
course.practice_homeworks.order("IF(ISNULL(homework_commons.publish_time),0,1), homework_commons.publish_time DESC,
homework_commons.created_at DESC").reverse.each_with_index do |homework, index|
homework.update_columns(position: index + 1)
end
end
end end
end end

11
db/migrate/20190821072722_migrate_course_shixun_homework_position.rb
Unescape View File

@ -0,0 +1,11 @@
class MigrateCourseShixunHomeworkPosition < ActiveRecord::Migration[5.2]
def change
Course.find_each do |course|
puts course.id
course.practice_homeworks.order("IF(ISNULL(homework_commons.publish_time),0,1), homework_commons.publish_time DESC,
homework_commons.created_at DESC").reverse.each_with_index do |homework, index|
homework.update_columns(position: index + 1)
end
end
end
end

3
public/react/src/App.js
Unescape View File

@ -19,7 +19,6 @@ import Trialapplicationysl from './modules/login/Trialapplicationysl';
import Trialapplicationreview from './modules/user/Trialapplicationreview'; import Trialapplicationreview from './modules/user/Trialapplicationreview';
import Addcourses from "./modules/courses/coursesPublic/Addcourses"; import Addcourses from "./modules/courses/coursesPublic/Addcourses";
import AccountProfile from "./modules/user/AccountProfile"; import AccountProfile from "./modules/user/AccountProfile";
import Certifiedprofessional from "./modules/modals/Certifiedprofessional"
import Trialapplication from './modules/login/Trialapplication' import Trialapplication from './modules/login/Trialapplication'
import NotFoundPage from './NotFoundPage' import NotFoundPage from './NotFoundPage'
@ -306,7 +305,7 @@ class App extends Component {
<Trialapplicationreview {...this.props} {...this.state}></Trialapplicationreview> <Trialapplicationreview {...this.props} {...this.state}></Trialapplicationreview>
<Addcourses {...this.props} {...this.state}/> <Addcourses {...this.props} {...this.state}/>
<AccountProfile {...this.props} {...this.state}/> <AccountProfile {...this.props} {...this.state}/>
<Certifiedprofessional {...this.props} {...this.state}/> {/*<Certifiedprofessional {...this.props} {...this.state}/>*/}
<Router> <Router>
<Switch> <Switch>

6
public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
Unescape View File

@ -307,11 +307,15 @@ class CommonWorkDetailIndex extends Component{
onClick={() => this.setState({moduleName: '参考答案'})} onClick={() => this.setState({moduleName: '参考答案'})}
className={`${childModuleName == '参考答案' ? 'active' : '' } `} className={`${childModuleName == '参考答案' ? 'active' : '' } `}
to={`/courses/${courseId}/${moduleEngName}/${workId}/answer`}>参考答案</Link>} to={`/courses/${courseId}/${moduleEngName}/${workId}/answer`}>参考答案</Link>}
{this.props.isAdmin() ?
<Link <Link
onClick={() => this.setState({moduleName: '设置'})} onClick={() => this.setState({moduleName: '设置'})}
className={`${childModuleName == '设置' ? 'active' : '' } `} className={`${childModuleName == '设置' ? 'active' : '' } `}
style={{paddingLeft:'38px'}} style={{paddingLeft:'38px'}}
to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>设置</Link> to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>设置</Link>:
""
}
{/* { this.props.tabRightComponents } */} {/* { this.props.tabRightComponents } */}

5
public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js
Unescape View File

@ -144,10 +144,13 @@ class WorkDetailPageHeader extends Component{
{view_answer == true && <Link {view_answer == true && <Link
className={`${childModuleName == '参考答案' ? 'active' : '' } `} className={`${childModuleName == '参考答案' ? 'active' : '' } `}
to={`/courses/${courseId}/${moduleEngName}/${workId}/answer`}>参考答案</Link>} to={`/courses/${courseId}/${moduleEngName}/${workId}/answer`}>参考答案</Link>}
{this.props.isAdmin()?
<Link <Link
className={`${childModuleName == '设置' ? 'active' : '' } `} className={`${childModuleName == '设置' ? 'active' : '' } `}
style={{paddingLeft:'38px'}} style={{paddingLeft:'38px'}}
to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>设置</Link> to={`/courses/${courseId}/${moduleEngName}/${workId}/setting`}>设置</Link>:
""
}
{ this.props.tabRightComponents } { this.props.tabRightComponents }

69
public/react/src/modules/courses/coursesDetail/CoursesBanner.js
Unescape View File

@ -12,6 +12,7 @@ import Guide from './CoursesGuide';
import AddStudentModal from '../members/modal/AddStudentModal' import AddStudentModal from '../members/modal/AddStudentModal'
import AddTeacherModal from '../members/modal/AddTeacherModal' import AddTeacherModal from '../members/modal/AddTeacherModal'
import Jointheclass from '../../modals/Jointheclass' import Jointheclass from '../../modals/Jointheclass'
import Certifiedprofessional from "../../modals/Certifiedprofessional";
// 点击按钮复制功能 // 点击按钮复制功能
// function jsCopy(){ // function jsCopy(){
// var e = document.getElementById("copy_invite_code"); // var e = document.getElementById("copy_invite_code");
@ -48,6 +49,8 @@ class CoursesBanner extends Component {
is_guide:false, is_guide:false,
excellent:false,//是否是精品课堂 excellent:false,//是否是精品课堂
yslJointhe:false, yslJointhe:false,
mydisplay:false
} }
} }
componentDidMount() { componentDidMount() {
@ -59,6 +62,19 @@ class CoursesBanner extends Component {
off('updatabanner', this.updatabanner) off('updatabanner', this.updatabanner)
} }
HideAddcoursestypess=(i)=>{
console.log("调用了");
this.setState({
Addcoursestypes:false,
mydisplay:true,
occupation:i,
})
};
ModalCancelsy=()=>{
this.setState({
mydisplay:false,
})
};
onloadupdatabanner=()=>{ onloadupdatabanner=()=>{
this.updatabanner() this.updatabanner()
@ -413,7 +429,9 @@ class CoursesBanner extends Component {
{Addcoursestypes === true ? <Addcourses {Addcoursestypes === true ? <Addcourses
Addcoursestype={Addcoursestypes} Addcoursestype={Addcoursestypes}
hideAddcoursestype={() => this.tojoinclass(2)} hideAddcoursestype={() => this.tojoinclass(2)}
HideAddcoursestypess={(i)=>this.HideAddcoursestypess(i)}
/> : ""} /> : ""}
<Certifiedprofessional {...this.props} {...this.state} ModalCancelsy={this.ModalCancelsy} />
<Modals <Modals
modalsType={modalsType} modalsType={modalsType}
modalsTopval={modalsTopval} modalsTopval={modalsTopval}
@ -500,7 +518,32 @@ class CoursesBanner extends Component {
</div> </div>
{excellent===false? {/*{excellent===false?*/}
{/* :*/}
{/* <div>*/}
{/* <style>*/}
{/* {*/}
{/* `*/}
{/* .user_white_btn{border: 1px solid #ffffff;color: #ffffff!important;}*/}
{/* */}
{/* `*/}
{/* }*/}
{/* </style>*/}
{/* /!*coursedata.course_identity === 6 是非课堂成员*!/*/}
{/* {coursedata.course_identity === 6&&coursedata.educoder_teacher===false?*/}
{/* <a className="fr user_default_btn user_white_btn mr20 font-18" style={{width:"130px"}}*/}
{/* onClick={() => this.myyslgradin()}>加入课堂</a>: ""}*/}
{/* {coursedata.course_identity === 6&&coursedata.educoder_teacher===true?*/}
{/* <a className="fr user_default_btn user_white_btn mr20 font-18" style={{width:"130px"}}*/}
{/* onClick={() => this.myyslgradin()}>加入课堂</a>: ""}*/}
{/* /!*{this.props.isStudent()?<a className="fr user_default_btn user_blue_btn mr20 font-18"*!/*/}
{/* /!* onClick={() => this.exitclass()}*!/*/}
{/* /!*> 退出课堂 </a>:""}*!/*/}
{/* </div>*/}
{/*}*/}
<div> <div>
{coursedata.switch_to_student === true ? {coursedata.switch_to_student === true ?
<Tooltip placement="bottom" title={ <Tooltip placement="bottom" title={
@ -548,31 +591,7 @@ class CoursesBanner extends Component {
> 退出课堂 </a>:""} > 退出课堂 </a>:""}
</div> </div>
:
<div>
<style>
{
`
.user_white_btn{border: 1px solid #ffffff;color: #ffffff!important;}
`
}
</style>
{/*coursedata.course_identity === 6 是非课堂成员*/}
{coursedata.course_identity === 6&&coursedata.educoder_teacher===false?
<a className="fr user_default_btn user_white_btn mr20 font-18" style={{width:"130px"}}
onClick={() => this.myyslgradin()}>加入课堂</a>: ""}
{coursedata.course_identity === 6&&coursedata.educoder_teacher===true?
<a className="fr user_default_btn user_white_btn mr20 font-18" style={{width:"130px"}}
onClick={() => this.myyslgradin()}>加入课堂</a>: ""}
{/*{this.props.isStudent()?<a className="fr user_default_btn user_blue_btn mr20 font-18"*/}
{/* onClick={() => this.exitclass()}*/}
{/*> 退出课堂 </a>:""}*/}
</div>
}
<style> <style>
{ {

94
public/react/src/modules/courses/coursesPublic/Addcourses.js
Unescape View File

@ -34,6 +34,7 @@ class Addcourses extends Component{
this.setState({ this.setState({
Addcoursestypes: true Addcoursestypes: true
}) })
return
} }
return response; return response;
@ -213,25 +214,42 @@ class Addcourses extends Component{
student:student student:student
} }
).then((response) => { ).then((response) => {
console.log("submittojoinclass");
console.log(response);
if(response === undefined){ if(response === undefined){
this.setState({ this.setState({
// Addcoursestype:false, // Addcoursestype:false,
isSpin:false isSpin:false
}); });
// try {
// this.props.HideAddcoursestypess(3);
// }catch (e) {
//
// }
return return
} }
if(response.data.status===0){ if(response.data.status===-2){
// course_id: 1545 this.setState({
// message: "成功" Addcoursestype:false,
// status: 0 isSpin:false
// this.setState({ });
// // loadtype:true, try {
// // modalsType:true, if(response.data.message==="该课堂要求成员完成实名认证"){
// // modalsTopval:response.data.message, this.props.HideAddcoursestypess(1);
// // modalSave:this.submitasyn, }
// course_id:response.data.course_id if(response.data.message==="该课堂要求成员完成职业认证"){
// }) this.props.HideAddcoursestypess(2);
}
if(response.data.message==="该课堂要求成员完成实名和职业认证"){
this.props.HideAddcoursestypess(3);
}
}catch (e) {
this.props.showNotification(response.data.message);
}
return;
}
if(response.data.status===0){
// https://www.trustie.net/issues/22365 // https://www.trustie.net/issues/22365
if (response.data.course_id == 2704) { if (response.data.course_id == 2704) {
this.props.history.push('/courses/2704/boards/8367/messages/42072') this.props.history.push('/courses/2704/boards/8367/messages/42072')
@ -263,14 +281,6 @@ class Addcourses extends Component{
this.props.hideAddcoursestype(); this.props.hideAddcoursestype();
} }
// this.setState({
// loadtype:true,
// modalsType:true,
// modalsTopval:response.data.message,
// modalSave:this.submitasyn,
// course_id:undefined
// })
} }
this.setState({ this.setState({
@ -285,52 +295,6 @@ class Addcourses extends Component{
}); });
}) })
// if(value===0){
// const form = new FormData();
// form.append('invite_code', tojoinclasstitle);
// form.append('role', pamst);
// form.append('type', 1);
// axios.post(url,form,[true]
// ).then((response) => {
// if( response.data.state===0){
// this.submitstatevalue(0,"加入成功",response.data.course_id)
// }else if( response.data.state===1){
// }else if( response.data.state===2){
// this.submitstatevalue( 0,"课堂已过期! 请联系课堂管理员重启课堂。(在配置课堂处)")
// }else if( response.data.state===3){
// this.submitstatevalue( 0,"您已是课堂成员)",response.data.course_id)
// }else if( response.data.state===4){
// this.submitstatevalue( 0,"您输入的邀请码错误)")
// }else if( response.data.state===5){
// this.submitstatevalue( 0,"您还未登录")
// }else if( response.data.state===6){
// this.submitstatevalue( 0,"申请已提交，请等待审核")
// }else if( response.data.state===7){
// this.submitstatevalue( 0," 您已经发送过申请了，请耐心等待")
// }else if( response.data.state===8){
// this.submitstatevalue( 0,"您已经是该课堂的教师了",response.data.course_id)
// }else if( response.data.state==9){
// this.submitstatevalue( 0,"您已经是该课堂的教辅了",response.data.course_id)
// }else if( response.data.state==10){
// this.submitstatevalue(0,"您已经是该课堂的管理员了",response.data.course_id)
// }else if( response.data.state==11){
// this.submitstatevalue(0," 该课堂已归档，请联系老师")
// }else if( response.data.state==12){
// this.submitstatevalue(0,"您已经发送过申请了，请耐心等待师")
// }else if( response.data.state==13){
// this.submitstatevalue(0,"您申请已提交，请等待审核")
// }else if( response.data.state==14){
// this.submitstatevalue("此邀请码已停用，请与老师联系")
// }else if( response.data.state==15){
// this.submitstatevalue(0,"您已是课堂成员! 加入分班请在课堂具体分班页面进行")
// }else {
// this.submitstatevalue(0," 未知错误，请稍后再试")
// }
// })
//
// }
} }
render(){ render(){

63
public/react/src/modules/courses/new/CoursesNew.js
Unescape View File

@ -43,9 +43,11 @@ class CoursesNew extends Component {
listvalue: undefined, listvalue: undefined,
fetching:false, fetching:false,
boolxinjian:false, boolxinjian:false,
checkboxgroup:undefined,
checkbofrup:["shixun_homework","common_homework","group_homework","exercise","attachment","course_group","graduation","poll","board"],
checkbofrups:[],
} }
} }
componentDidMount() { componentDidMount() {
@ -76,7 +78,32 @@ class CoursesNew extends Component {
is_public: data.is_public === 1 ? true : false, is_public: data.is_public === 1 ? true : false,
Realnamecertification: data.authentication, Realnamecertification: data.authentication,
Professionalcertification:data.professional_certification, Professionalcertification:data.professional_certification,
});
try {
var datasysl=[];
var dataysl2=[];
var dataysl3=[];
var checkbofrup =this.state.checkbofrup;
dataysl2=data.course_module_types;
datasysl=checkbofrup;
for (var k=0;k<datasysl.length;k++){
for (var i=0;i<data.course_module_types.length;i++){
if(datasysl[k]===data.course_module_type[i]){
datasysl.slice(k,1);
}
}
}
dataysl3 = dataysl2.concat(datasysl);
this.setState({
checkboxgroup: dataysl3,
}) })
}catch (e) {
this.setState({
checkboxgroup:this.state.checkbofrup,
})
}
this.handleSearchschool(data.school); this.handleSearchschool(data.school);
}).catch((error) => { }).catch((error) => {
console.log(error); console.log(error);
@ -442,7 +469,7 @@ class CoursesNew extends Component {
this.applyForAddOrgForm.setVisible(true) this.applyForAddOrgForm.setVisible(true)
} }
render() { render() {
let {datatime,school,searchlistscholl} = this.state; let {datatime,school,searchlistscholl,checkboxgroup} = this.state;
const {getFieldDecorator} = this.props.form; const {getFieldDecorator} = this.props.form;
const propsWithoutForm = Object.assign({}, this.props) const propsWithoutForm = Object.assign({}, this.props)
delete propsWithoutForm.form delete propsWithoutForm.form
@ -669,17 +696,49 @@ class CoursesNew extends Component {
"shixun_homework", "common_homework", "group_homework", "exercise", "attachment", "course_group", "shixun_homework", "common_homework", "group_homework", "exercise", "attachment", "course_group",
], ],
})( })(
this.props.match.params.coursesId != undefined?
<Checkbox.Group style={{width: "800px", marginTop: "10px"}}> <Checkbox.Group style={{width: "800px", marginTop: "10px"}}>
{
checkboxgroup===undefined?"":checkboxgroup.length===0?"":checkboxgroup.map((item,key)=>{
return(
item ==="shixun_homework"?
<Checkbox value={"shixun_homework"} className="fl">实训作业</Checkbox> <Checkbox value={"shixun_homework"} className="fl">实训作业</Checkbox>
:item ==="common_homework"?
<Checkbox value={"common_homework"} className="fl">普通作业</Checkbox> <Checkbox value={"common_homework"} className="fl">普通作业</Checkbox>
:item ==="group_homework"?
<Checkbox value={"group_homework"} className="fl">分组作业</Checkbox> <Checkbox value={"group_homework"} className="fl">分组作业</Checkbox>
:item ==="exercise"?
<Checkbox value={"exercise"} className="fl">试卷</Checkbox> <Checkbox value={"exercise"} className="fl">试卷</Checkbox>
:item ==="attachment"?
<Checkbox value={"attachment"} className="fl">资源</Checkbox> <Checkbox value={"attachment"} className="fl">资源</Checkbox>
:item ==="course_group"?
<Checkbox value={"course_group"} className="fl">分班</Checkbox> <Checkbox value={"course_group"} className="fl">分班</Checkbox>
:item ==="graduation"?
<Checkbox value={"graduation"} className="fl">毕业设计</Checkbox> <Checkbox value={"graduation"} className="fl">毕业设计</Checkbox>
:item ==="poll"?
<Checkbox value={"poll"} className="fl">问卷</Checkbox> <Checkbox value={"poll"} className="fl">问卷</Checkbox>
:item ==="board"?
<Checkbox value={"board"} className="fl">讨论</Checkbox> <Checkbox value={"board"} className="fl">讨论</Checkbox>
:""
)
})
}
</Checkbox.Group> </Checkbox.Group>
:
<Checkbox.Group style={{width: "800px", marginTop: "10px"}}>
<Checkbox value={"shixun_homework"} className="fl">实训作业</Checkbox>
<Checkbox value={"common_homework"} className="fl">普通作业</Checkbox>
<Checkbox value={"group_homework"} className="fl">分组作业</Checkbox>
<Checkbox value={"exercise"} className="fl">试卷</Checkbox>
<Checkbox value={"attachment"} className="fl">资源</Checkbox>
<Checkbox value={"course_group"} className="fl">分班</Checkbox>
<Checkbox value={"graduation"} className="fl">毕业设计</Checkbox>
<Checkbox value={"poll"} className="fl">问卷</Checkbox>
<Checkbox value={"board"} className="fl">讨论</Checkbox>
</Checkbox.Group>
)} )}
</Form.Item> </Form.Item>
</div> </div>

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

@ -186,9 +186,10 @@ class ShixunHomeworkPage extends Component {
` `
}</style> }</style>
:""} :""}
{this.props.isAdmin() ?
<a className={parseInt(tab) === 3 ? "active" : ""} <a className={parseInt(tab) === 3 ? "active" : ""}
onClick={(e) => this.ChangeTab(3)} onClick={(e) => this.ChangeTab(3)}
>设置</a> >设置</a>:""}
{/*{this.props.isAdmin() ? <a*/} {/*{this.props.isAdmin() ? <a*/}
{/* className="fr color-blue font-16"*/} {/* className="fr color-blue font-16"*/}
{/* href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xlsx`}*/} {/* href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xlsx`}*/}

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

@ -1313,28 +1313,28 @@ class Trainingjobsetting extends Component {
this.setState({ this.setState({
publish_time:moment(handleDateString(dateString)) publish_time:moment(handleDateString(dateString))
}) })
if(this.state.allowreplenishment === true) { // if(this.state.allowreplenishment === true) {
this.setState({ // this.setState({
end_time:moment(handleDateString(dateString)).add(1, 'months'), // end_time:moment(handleDateString(dateString)).add(1, 'months'),
deadline:moment(handleDateString(dateString)).add(1, 'months').format('YYYY-MM-DD HH:mm'), // deadline:moment(handleDateString(dateString)).add(1, 'months').format('YYYY-MM-DD HH:mm'),
late_time:moment(handleDateString(dateString)).add(2, 'months'), // late_time:moment(handleDateString(dateString)).add(2, 'months'),
late_times:moment(handleDateString(dateString)).add(2, 'months').format('YYYY-MM-DD HH:mm'), // late_times:moment(handleDateString(dateString)).add(2, 'months').format('YYYY-MM-DD HH:mm'),
}); // });
try { // try {
this.setState({ // this.setState({
unit_e_tip: "", // unit_e_tip: "",
p_flag: false, // p_flag: false,
borredss:undefined, // borredss:undefined,
}) // })
} catch (e) { // } catch (e) {
//
} // }
}else{ // }else{
this.setState({ // this.setState({
end_time:moment(handleDateString(dateString)).add(1, 'months'), // end_time:moment(handleDateString(dateString)).add(1, 'months'),
deadline:moment(handleDateString(dateString)).add(1, 'months').format('YYYY-MM-DD HH:mm'), // deadline:moment(handleDateString(dateString)).add(1, 'months').format('YYYY-MM-DD HH:mm'),
}); // });
} // }
} }
} }

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

@ -477,6 +477,8 @@ class MessagSub extends Component{
return window.open(`/users/${this.props.current_user.login}/videos`); return window.open(`/users/${this.props.current_user.login}/videos`);
} }
return ''; return '';
case "PublicCourseStart":
return window.open(`/courses/${item.container_id}/informs`);
default : default :
return window.open("/") return window.open("/")
} }

48
public/react/src/modules/modals/Certifiedprofessional.js
Unescape View File

@ -10,8 +10,8 @@ class Certifiedprofessional extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state={ this.state={
occupation:3, // occupation:3,
mydisplay:false, // mydisplay:false,
} }
} }
@ -21,37 +21,19 @@ class Certifiedprofessional extends Component {
} }
componentDidMount() { componentDidMount() {
axios.interceptors.response.use((response) => { // axios.interceptors.response.use((response) => {
if (response != undefined) // if (response != undefined)
if (response && response.data.status === -1) { // if (response && response.data.status === -1) {
if(response.data.message==="该课堂要求成员完成实名认证"){ //
this.setState({ // }
mydisplay:true, // return response;
occupation:1, // }, (error) => {
}) // //TODO 这里如果样式变了会出现css不加载的情况
//
}else if(response.data.message==="该课堂要求成员完成职业认证"){ // });
this.setState({
mydisplay:true,
occupation:2,
})
}else if(response.data.message==="该课堂要求成员完成实名和职业认证"){
this.setState({
mydisplay:true,
occupation:3,
})
}
}
return response;
}, (error) => {
//TODO 这里如果样式变了会出现css不加载的情况
});
} }
modalCancel=()=>{ modalCancel=()=>{
this.setState({ this.props.ModalCancelsy();
mydisplay:false,
})
}; };
setDownload=()=>{ setDownload=()=>{
@ -63,7 +45,7 @@ class Certifiedprofessional extends Component {
render() { render() {
// console.log("加入金品课堂2"); // console.log("加入金品课堂2");
// console.log(this.props); // console.log(this.props);
let{occupation} =this.state; let{occupation} =this.props;
return( return(
<Modal <Modal
keyboard={false} keyboard={false}
@ -72,7 +54,7 @@ class Certifiedprofessional extends Component {
destroyOnClose={true} destroyOnClose={true}
title="因为以下原因，您暂时不能进行操作" title="因为以下原因，您暂时不能进行操作"
centered={true} centered={true}
visible={this.state.mydisplay} visible={this.props.mydisplay}
width="600px" width="600px"
heigth="307px" heigth="307px"
> >

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

@ -3,6 +3,7 @@ import { BrowserRouter as Router, Route, Link } from "react-router-dom";
import { Redirect } from 'react-router'; import { Redirect } from 'react-router';
import AccountProfile from"../user/AccountProfile"; import AccountProfile from"../user/AccountProfile";
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import Certifiedprofessional from "../../modules/modals/Certifiedprofessional"
// import searchImg from '../../../../images/educoder/icon/search.svg' // import searchImg from '../../../../images/educoder/icon/search.svg'
@ -62,7 +63,9 @@ class NewHeader extends Component {
isRender:false, isRender:false,
showSearchOpentype:false, showSearchOpentype:false,
showTrial:false, showTrial:false,
setevaluatinghides:false setevaluatinghides:false,
occupation:0,
mydisplay:false
} }
// console.log("176") // console.log("176")
// console.log(props); // console.log(props);
@ -95,7 +98,29 @@ class NewHeader extends Component {
//获取游览器地址 //获取游览器地址
window.sessionStorage.setItem("yslgeturls",JSON.stringify(window.location.href)) window.sessionStorage.setItem("yslgeturls",JSON.stringify(window.location.href))
// axios.interceptors.response.use((response) => {
// if (response != undefined)
// if (response && response.data.status === -1) {
// if (response.data.message === "该课堂要求成员完成实名认证") {
//
// } else if (response.data.message === "该课堂要求成员完成职业认证") {
// console.log("该课堂要求成员完成职业认证");
// this.HideAddcoursestypess(2);
//
//
//
// return
// } else if (response.data.message === "该课堂要求成员完成实名和职业认证") {
// console.log("该课堂要求成员完成实名和职业认证");
// this.HideAddcoursestypess(3);
// return
//
// }
// }
// return response;
// }, (error) => {
//
// });
} }
componentDidUpdate = (prevProps) => { componentDidUpdate = (prevProps) => {
@ -326,7 +351,20 @@ class NewHeader extends Component {
this.setState({ this.setState({
Addcoursestypes:false Addcoursestypes:false
}) })
} };
HideAddcoursestypess=(i)=>{
console.log("调用了");
this.setState({
Addcoursestypes:false,
mydisplay:true,
occupation:i,
})
};
ModalCancelsy=()=>{
this.setState({
mydisplay:false,
})
};
hidetojoinclass=()=>{ hidetojoinclass=()=>{
@ -880,7 +918,10 @@ submittojoinclass=(value)=>{
{Addcoursestypes===true?<Addcourses {Addcoursestypes===true?<Addcourses
Addcoursestype={Addcoursestypes} Addcoursestype={Addcoursestypes}
hideAddcoursestype={this.hideAddcoursestypes} hideAddcoursestype={this.hideAddcoursestypes}
HideAddcoursestypess={(i)=>this.HideAddcoursestypess(i)}
/>:""} />:""}
<Certifiedprofessional {...this.props} {...this.state} ModalCancelsy={this.ModalCancelsy}/>
{/* /courses/join_course_multi_role */} {/* /courses/join_course_multi_role */}
<li> <li>

Write Preview
Loading…
Cancel
Save