From 5e43f534b5bfffaf5329af1d261c80212db75008 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Mon, 16 Dec 2019 15:08:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=88=90=E7=BB=A9?= =?UTF-8?q?=E8=B7=B3=E8=BF=87=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/homeworks_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/homeworks_service.rb b/app/services/homeworks_service.rb index 0dc814c89..1c57b7f12 100644 --- a/app/services/homeworks_service.rb +++ b/app/services/homeworks_service.rb @@ -346,7 +346,7 @@ class HomeworksService work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) unless work.ultimate_score #logger.info("#############work_score: #{score}") work.calculation_time = Time.now - work.save! + work.save(validate: false) end end end \ No newline at end of file From c321745d88b4ab1c02205e5abd2fc161c18ae179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 16 Dec 2019 15:15:47 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/component/TPMNav.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/public/react/src/modules/tpm/component/TPMNav.js b/public/react/src/modules/tpm/component/TPMNav.js index ac5128f26..677c6bb83 100644 --- a/public/react/src/modules/tpm/component/TPMNav.js +++ b/public/react/src/modules/tpm/component/TPMNav.js @@ -53,13 +53,8 @@ class TPMNav extends Component { {/*jupyter*/} { this.props.is_jupyter===true? - ( - is_teacher===true? 数据集 - :"" - ) - :"" } @@ -80,12 +75,8 @@ class TPMNav extends Component { 审核情况 : - is_teacher===true? 审核情况 - : - "" - ) From 98fdcf4bbb758888c0edf906de0d38be482f845f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 16 Dec 2019 15:31:55 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/statistics/Statistics.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/public/react/src/modules/courses/statistics/Statistics.js b/public/react/src/modules/courses/statistics/Statistics.js index 21041a59c..20427a1fa 100644 --- a/public/react/src/modules/courses/statistics/Statistics.js +++ b/public/react/src/modules/courses/statistics/Statistics.js @@ -397,25 +397,19 @@ class Statistics extends Component{ const operations = {course_grouptype===false||this.state.course_groups.length===0?"": - this.state.activeKey==="1"? this.getwork_scoredata(1,group_idss,'desc') } /> - :"" } { this.state.activeKey==="1"? this.setComputeTimet(this.props.match.params.coursesId)}>获取最新成绩 :"" } - { - this.state.activeKey==="1"? this.derivefun(this.state.activeKey==="1"?`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`:`/courses/${this.props.match.params.coursesId}/export_member_act_score.xlsx`)}>导出 - :"" - } ; return( From 42e47bd447beb083dd922f37f881ec26c776a6cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 16 Dec 2019 16:50:37 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/AppConfig.js | 1 - .../shixunHomework/Listofworksstudentone.js | 8 +++---- .../modules/courses/statistics/Statistics.js | 24 ++++++++++++++----- .../Challenges/Challengesjupyter.js | 1 + 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index acd18e6c3..95b08ecb4 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -52,7 +52,6 @@ export function initAxiosInterceptors(props) { //proxy="http://47.96.87.25:48080" proxy="https://pre-newweb.educoder.net" proxy="https://test-newweb.educoder.net" - proxy="https://test-jupyterweb.educoder.net" //proxy="http://192.168.2.63:3001" // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求； diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index ab75b6c89..9c1d2146c 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -269,7 +269,7 @@ class Listofworksstudentone extends Component { ), }, { - title: '提交状态', + title: '作品状态', dataIndex: 'submitstate', key: 'submitstate', align: "center", @@ -638,7 +638,7 @@ class Listofworksstudentone extends Component { ), }, { - title: '提交状态', + title: '作品状态', dataIndex: 'submitstate', key: 'submitstate', align: "center", @@ -967,7 +967,7 @@ class Listofworksstudentone extends Component { ) }, { - title: '提交状态', + title: '作品状态', dataIndex: 'submitstate', key: 'submitstate', align: 'center', @@ -1315,7 +1315,7 @@ class Listofworksstudentone extends Component { ) }, { - title: '提交状态', + title: '作品状态', dataIndex: 'submitstate', key: 'submitstate', align: 'center', diff --git a/public/react/src/modules/courses/statistics/Statistics.js b/public/react/src/modules/courses/statistics/Statistics.js index 20427a1fa..d8647870e 100644 --- a/public/react/src/modules/courses/statistics/Statistics.js +++ b/public/react/src/modules/courses/statistics/Statistics.js @@ -392,24 +392,36 @@ class Statistics extends Component{ ) } - // console.log(this.props.isAdmin) + // console.log("Statistics"); + // console.log(this.props.user.course_is_end) - - const operations = + const course_is_endismy=this.props&&this.props.user&&this.props.user.course_is_end; + const operations = {course_grouptype===false||this.state.course_groups.length===0?"": + this.props.isAdmin()===true? this.getwork_scoredata(1,group_idss,'desc') } /> + :"" } { this.state.activeKey==="1"? - this.setComputeTimet(this.props.match.params.coursesId)}>获取最新成绩 + ( + course_is_endismy===false? + this.setComputeTimet(this.props.match.params.coursesId)}>获取最新成绩 + : + "" + ) + :"" + } + { + this.props.isAdmin()===true? + this.derivefun(this.state.activeKey==="1"?`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`:`/courses/${this.props.match.params.coursesId}/export_member_act_score.xlsx`)}>导出 :"" } - this.derivefun(this.state.activeKey==="1"?`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`:`/courses/${this.props.match.params.coursesId}/export_member_act_score.xlsx`)}>导出 ; return( @@ -586,7 +598,7 @@ class Statistics extends Component{ } ` } - + {bomdata===undefined||bomdata===null?"":bomdata.length===0?: Date: Mon, 16 Dec 2019 17:49:51 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/shixunHomework/Listofworksstudentone.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 9c1d2146c..855f860ef 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -269,7 +269,7 @@ class Listofworksstudentone extends Component { ), }, { - title: '作品状态', + title: '提交状态', dataIndex: 'submitstate', key: 'submitstate', align: "center", @@ -638,7 +638,7 @@ class Listofworksstudentone extends Component { ), }, { - title: '作品状态', + title: '提交状态', dataIndex: 'submitstate', key: 'submitstate', align: "center", @@ -967,7 +967,7 @@ class Listofworksstudentone extends Component { ) }, { - title: '作品状态', + title: '提交状态', dataIndex: 'submitstate', key: 'submitstate', align: 'center', @@ -1315,7 +1315,7 @@ class Listofworksstudentone extends Component { ) }, { - title: '作品状态', + title: '提交状态', dataIndex: 'submitstate', key: 'submitstate', align: 'center', @@ -4005,7 +4005,7 @@ class Listofworksstudentone extends Component { height: 58px; } .ysltableows .ant-table-thead > tr > th, .ant-table-tbody > tr > td { - padding: 9px; + padding: 9px; } ` }