From 349d55c43317dbdc4864ceb96fa3311a0aaed321 Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Fri, 23 Aug 2019 17:12:13 +0800
Subject: [PATCH 1/9] rechange 1936 scores
---
...cores.rb => 20190823090957_rechange_exercise_1936_scores.rb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename db/migrate/{20190823023738_change_exericse_1936_scores.rb => 20190823090957_rechange_exercise_1936_scores.rb} (93%)
diff --git a/db/migrate/20190823023738_change_exericse_1936_scores.rb b/db/migrate/20190823090957_rechange_exercise_1936_scores.rb
similarity index 93%
rename from db/migrate/20190823023738_change_exericse_1936_scores.rb
rename to db/migrate/20190823090957_rechange_exercise_1936_scores.rb
index ea3f66182..f089714ee 100644
--- a/db/migrate/20190823023738_change_exericse_1936_scores.rb
+++ b/db/migrate/20190823090957_rechange_exercise_1936_scores.rb
@@ -1,4 +1,4 @@
-class ChangeExericse1936Scores < ActiveRecord::Migration[5.2]
+class RechangeExercise1936Scores < ActiveRecord::Migration[5.2]
include ExercisesHelper
def change
#1936的试卷成绩有问题。
From a490f728f9ebaf0cf80d013fe404687d2f2ecf2a Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Fri, 23 Aug 2019 17:25:05 +0800
Subject: [PATCH 2/9] test repo_name change
---
app/views/exercises/_shixun_details.json.jbuilder | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/views/exercises/_shixun_details.json.jbuilder b/app/views/exercises/_shixun_details.json.jbuilder
index bd559d37d..7a6c858ee 100644
--- a/app/views/exercises/_shixun_details.json.jbuilder
+++ b/app/views/exercises/_shixun_details.json.jbuilder
@@ -32,7 +32,7 @@ json.shixun_detail do
if game.try(:lastest_code).blank?
cha_path = challenge_path(shixun_challenge.challenge&.path)
begin
- latest_code = git_fle_content(game.myshixun.repo_path,cha_path)
+ latest_code = git_fle_content(game.myshixun.repo_path+"11",cha_path)
rescue
latest_code = ""
end
From 381e187e063363bcabb43e98b8db970998a4ac8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 23 Aug 2019 17:29:59 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E5=AE=9E=E8=B7=B5=E8=B7=AF=E5=BE=84?=
=?UTF-8?q?=E7=AE=80=E4=BB=8B=E5=92=8C=E9=A1=BB=E7=9F=A5=E6=96=87=E5=AD=97?=
=?UTF-8?q?=E9=99=90=E5=88=B6=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/paths/PathNew.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/react/src/modules/paths/PathNew.js b/public/react/src/modules/paths/PathNew.js
index 4616660f0..6178ae82e 100644
--- a/public/react/src/modules/paths/PathNew.js
+++ b/public/react/src/modules/paths/PathNew.js
@@ -107,7 +107,7 @@ class PathNew extends Component{
window.location.href="#part_Des";
return;
}
- if (des.length > 5000) {
+ if (des.length > 8000) {
this.props.showSnackbar("实践课程的简介最大限制5000个字符");
window.location.href="#part_Des";
return;
@@ -118,7 +118,7 @@ class PathNew extends Component{
window.location.href="#part_point";
return;
}
- if(point.length > 500){
+ if(point.length > 2000){
this.props.showSnackbar("实践课程的学习须知最大限制500个字符");
window.location.href="#part_point";
return;
From 172c9dab0617988d5e71086f4ed1afc5215dcc90 Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Fri, 23 Aug 2019 17:30:26 +0800
Subject: [PATCH 4/9] fixubg
---
app/controllers/concerns/git_helper.rb | 1 +
app/views/exercises/_shixun_details.json.jbuilder | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/controllers/concerns/git_helper.rb b/app/controllers/concerns/git_helper.rb
index eeb4671a4..b154d32a5 100644
--- a/app/controllers/concerns/git_helper.rb
+++ b/app/controllers/concerns/git_helper.rb
@@ -9,6 +9,7 @@ module GitHelper
# 版本库文件内容，带转码
def git_fle_content(repo_path, path)
begin
+ raise Educoder::TipException.new("文档内容获取异常")
Rails.logger.info("git file content: repo_path is #{repo_path}, path is #{path}")
content = GitService.file_content(repo_path: repo_path, path: path)
diff --git a/app/views/exercises/_shixun_details.json.jbuilder b/app/views/exercises/_shixun_details.json.jbuilder
index 7a6c858ee..bd559d37d 100644
--- a/app/views/exercises/_shixun_details.json.jbuilder
+++ b/app/views/exercises/_shixun_details.json.jbuilder
@@ -32,7 +32,7 @@ json.shixun_detail do
if game.try(:lastest_code).blank?
cha_path = challenge_path(shixun_challenge.challenge&.path)
begin
- latest_code = git_fle_content(game.myshixun.repo_path+"11",cha_path)
+ latest_code = git_fle_content(game.myshixun.repo_path,cha_path)
rescue
latest_code = ""
end
From 16e8782613364da6bf8c503629a8a762f5051a80 Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Fri, 23 Aug 2019 17:33:40 +0800
Subject: [PATCH 5/9] return
---
app/controllers/concerns/git_helper.rb | 1 -
1 file changed, 1 deletion(-)
diff --git a/app/controllers/concerns/git_helper.rb b/app/controllers/concerns/git_helper.rb
index b154d32a5..eeb4671a4 100644
--- a/app/controllers/concerns/git_helper.rb
+++ b/app/controllers/concerns/git_helper.rb
@@ -9,7 +9,6 @@ module GitHelper
# 版本库文件内容，带转码
def git_fle_content(repo_path, path)
begin
- raise Educoder::TipException.new("文档内容获取异常")
Rails.logger.info("git file content: repo_path is #{repo_path}, path is #{path}")
content = GitService.file_content(repo_path: repo_path, path: path)
From 40539201f48199e8a34c0c1fd33bfb4cd6491e48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 23 Aug 2019 17:57:02 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/courses/shixunHomework/ShixunHomeworkPage.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index 9b78729a9..696ecb3eb 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -116,7 +116,7 @@ class ShixunHomeworkPage extends Component {
// console.log(this.props)
let {jobsettingsdatapage}=this.state
- this.props.history.replace(`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.mian === 1 ? "shixun_homeworks" :"shixun_homework"}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`);
+ this.props.history.replace(`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main === 1 ? "shixun_homeworks" :"shixun_homework"}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`);
}
render() {
let {tab, teacherdatapage, jobsettingsdatapage} = this.state;
@@ -138,7 +138,7 @@ class ShixunHomeworkPage extends Component {
<span className="color-grey-9 fl ml3 mr3">></span>
<a
className=" btn colorgrey fl hovercolorblue "
- href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.mian === 1 ? "shixun_homeworks" :"shixun_homework"}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_name}</a>
+ href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main === 1 ? "shixun_homeworks" :"shixun_homework"}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_name}</a>
<span className="color-grey-9 fl ml3 mr3">></span>
<WordsBtn className="fl">作业详情</WordsBtn>
</p>
@@ -238,14 +238,14 @@ class ShixunHomeworkPage extends Component {
<a className="fr color-blue font-16" onClick={(child)=>this.workshowmodels(this.child)}>代码查重</a>
: "" : ""}
{this.state.view_report === true ? <Link className="fr color-blue font-16" target={"_blank"}
- to={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.mian === 1 ? "shixun_homeworks" :"shixun_homework"}/${teacherdatapage&&teacherdatapage.work_id}/shixun_work_report`}>
+ to={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main === 1 ? "shixun_homeworks" :"shixun_homework"}/${teacherdatapage&&teacherdatapage.work_id}/shixun_work_report`}>
查看实训报告
</Link> : ""}
{
teacherdatapage === undefined ? ""
: teacherdatapage.commit_des === null || teacherdatapage.commit_des === undefined ? "" :
<a className="fr color-blue font-16"
- href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.mian === 1 ? "shixun_homeworks" :"shixun_homework"}/${teacherdatapage === undefined ? "" : teacherdatapage.id}/commitsummary/${this.props.match.params.homeworkid}`}>{teacherdatapage.commit_des}</a>
+ href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main === 1 ? "shixun_homeworks" :"shixun_homework"}/${teacherdatapage === undefined ? "" : teacherdatapage.id}/commitsummary/${this.props.match.params.homeworkid}`}>{teacherdatapage.commit_des}</a>
}
{teacherdatapage === undefined ? "" : <Startshixuntask
{...this.props}
From c2f96eab0ec1ddfdefd55aae560c0c6fd98ee866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 23 Aug 2019 18:07:49 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/courses/shixunHomework/ShixunHomeworkPage.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index 696ecb3eb..c31e167f4 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -134,7 +134,7 @@ class ShixunHomeworkPage extends Component {
<div className="educontent mb20">
<p className="clearfix mb20 mt10">
- <Link className="btn colorgrey fl hovercolorblue " to={this.props.current_user.first_category_url}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name}</Link>
+ <Link className="btn colorgrey fl hovercolorblue " to={this.props.current_user&&this.props.current_user.first_category_url}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name}</Link>
<span className="color-grey-9 fl ml3 mr3">></span>
<a
className=" btn colorgrey fl hovercolorblue "
From 10f8627f875fdbce8a566696b213f3a065528d9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 23 Aug 2019 18:17:05 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/courses/shixunHomework/ShixunHomeworkPage.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index c31e167f4..dddd39989 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -134,7 +134,7 @@ class ShixunHomeworkPage extends Component {
<div className="educontent mb20">
<p className="clearfix mb20 mt10">
- <Link className="btn colorgrey fl hovercolorblue " to={this.props.current_user&&this.props.current_user.first_category_url}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name}</Link>
+ <a className="btn colorgrey fl hovercolorblue " href={this.props.current_user&&this.props.current_user.first_category_url}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name}</a>
<span className="color-grey-9 fl ml3 mr3">></span>
<a
className=" btn colorgrey fl hovercolorblue "
From 284c03e7394dd2fc5fdf7fbb25d733ff035a336c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 24 Aug 2019 09:34:08 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=82=AC=E5=81=9C?=
=?UTF-8?q?=E5=B0=8F=E6=89=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/courses/shixunHomework/Listofworksstudentone.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index a37e58a92..64e2e6a99 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -369,9 +369,9 @@ class Listofworksstudentone extends Component {
{
record.submitstate === "未提交" ?<span style={{ color: '#9A9A9A'}}>--</span>
:
- <span style={{textAlign: "center"}}
+ <a style={{textAlign: "center"}}
className="color-blue"
- onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</span>
+ onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
}
</span>