From b0d4d5cbd01621ec074b33942851b3d0071c107c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 24 Sep 2019 10:54:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shixunHomework/Trainingjobsetting.js | 125 +++++++++++++++++- 1 file changed, 122 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index 366f239d0..fbd7ab3b4 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -293,6 +293,12 @@ class Trainingjobsetting extends Component { code_review:result.data.code_review }) this.props.Getdataback(result,result.data); + if(this.props.isAdmin()!== undefined){ + if(this.props.isAdmin()===true){ + this.editSettings(result); + } + } + } }) @@ -1738,7 +1744,6 @@ class Trainingjobsetting extends Component { flagPageEditstwo:releasetime, flagPageEditsthrees:deadline, flagPageEditsfor:endtime, - unifiedsetting:this.state.unifiedsetting, }); if(this.state.work_efficiencys===true){ @@ -1784,7 +1789,121 @@ class Trainingjobsetting extends Component { } catch (e) { } + }; + //一进来就是老师要用的编辑页面 + editSettings=(datas)=>{ + console.log("编辑页面"); + console.log(datas); + try { + if (datas.data.is_end === true) { + this.setState({ + modalsType: true, + modalsTopval: "课堂已结束不能再修改!", + loadtype: true, + modalSave: this.cancelBox + }) + } else { + var releasetime =true; + var deadline = true; + var endtime =true; + var whethertopays =true; + //发布时间 + + if(moment(datas.data.publish_time,"YYYY-MM-DD HH:mm")<=moment()){ + releasetime=false; + } + //截止时间 + if(moment(datas.data.end_time,"YYYY-MM-DD HH:mm")<=moment()){ + deadline=false; + } + //结束时间 + if(moment(datas.data.late_time,"YYYY-MM-DD HH:mm")<=moment()){ + endtime=false; + } + if(datas.data.allowreplenishment === false){ + whethertopays=false; + } + try { + if(datas.data&& datas.data.homework_status[0]==="未发布"){ + this.setState({ + flagPageEditsbox:true, + flagPageEdit: true, + whethertopay:whethertopays, + flagPageEditstwo:releasetime, + flagPageEditsthrees:deadline, + flagPageEditsfor:endtime, + completionefficiencyscore:true, + work_efficiencys:true, + unifiedsetting:datas.data.unifiedsetting, + latedeductiontwo:20, + }); + //均分比例 + try { + if(datas.data.proportion==="均分比例"){ + this.Equalproportion(20); + + }else if(datas.data.proportion==="经验值比例"){ + this.Empiricalvalueratio(20); + + } + }catch (e) { + + } + + }else { + this.setState({ + flagPageEditsbox:true, + flagPageEdit: true, + whethertopay:whethertopays, + flagPageEditstwo:releasetime, + flagPageEditsthrees:deadline, + flagPageEditsfor:endtime, + unifiedsetting:datas.data.unifiedsetting, + }); + if(datas.data.work_efficiencys===true){ + this.setState({ + completionefficiencyscore:true, + }) + }else{ + this.setState({ + completionefficiencyscore:false, + }) + } + } + }catch (e) { + this.setState({ + flagPageEditsbox:true, + flagPageEdit: true, + whethertopay:whethertopays, + flagPageEditstwo:releasetime, + flagPageEditsthrees:deadline, + flagPageEditsfor:endtime, + unifiedsetting:datas.data.unifiedsetting, + }); + if(datas.data.work_efficiencys===true){ + this.setState({ + completionefficiencyscore:true, + }) + }else{ + this.setState({ + completionefficiencyscore:false, + }) + } + } + + if(datas.data.proportion === "自定义分值"){ + this.setState({ + boolUnitetwoname:"自定义分值", + boolUnitetwo: false, + flagPageEdits:true, + }) + } + + } + } catch (e) { + + } } //取消编辑 cancelEdit = () => { @@ -1919,8 +2038,8 @@ class Trainingjobsetting extends Component { const dataformat = 'YYYY-MM-DD HH:mm'; let {flagPageEdit,testscripttiptype,publish_timebool,end_timebool,late_timesbool,work_efficiencys,flagPageEdits,flagPageEditstwo,flagPageEditsbox,whethertopay,handclass,flagPageEditsthrees, flagPageEditsfor,rules,rulest,unifiedsetting,group_settings, course_group,unit_e_tip, borreds,borredss,unit_p_tip, end_time, late_time, score_open, publish_time, starttimetype, modalsType, modalsTopval, loadtype, modalSave, endtimetype, latetimetype, allowlate, latepenaltytype, jobsettingsdata, endOpen, mystyle, mystyles} = this.state; - console.log(publish_timebool); - console.log(!flagPageEditstwo); + // console.log(publish_timebool); + // console.log(!flagPageEditstwo); const radioStyle = { display: 'block', height: '30px', From 45d5af095207e4e0939f8e9fc19794a5facb71ce Mon Sep 17 00:00:00 2001 From: p31729568 Date: Tue, 24 Sep 2019 10:56:09 +0800 Subject: [PATCH 2/2] add visits to user course list api --- app/views/users/courses/shared/_course.json.jbuilder | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/users/courses/shared/_course.json.jbuilder b/app/views/users/courses/shared/_course.json.jbuilder index e917033da..8da80f372 100644 --- a/app/views/users/courses/shared/_course.json.jbuilder +++ b/app/views/users/courses/shared/_course.json.jbuilder @@ -5,6 +5,7 @@ json.members_count course.course_members_count # json.homework_commons_count course.homework_commons_count json.homework_commons_count get_tasks_count course json.attachments_count course.attachments.count +json.visits course.visits json.first_category_url module_url(course.course_modules.where(hidden: 0).order(position: :desc).first, course)