From 31062cfa5fad76849f6ac80da6b37128e149884f Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Mon, 6 Jan 2020 13:57:13 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E6=8A=A5=E5=91=8A?=
=?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=9A=84=E6=96=87=E4=BB=B6=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/student_works_controller.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/controllers/student_works_controller.rb b/app/controllers/student_works_controller.rb
index d71ca8037..0b7874299 100644
--- a/app/controllers/student_works_controller.rb
+++ b/app/controllers/student_works_controller.rb
@@ -529,7 +529,7 @@ class StudentWorksController < ApplicationController
@echart_data = student_efficiency(@homework, @work)
@myself_eff = @echart_data[:efficiency_list].find { |item| item.last == @user.id }
@myself_consume = @echart_data[:consume_list].find { |item| item.last == @user.id }
- filename_ = "#{@user&.student_id}_#{@user&.real_name}_#{@shixun&.name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}.pdf"
+ filename_ = "#{@homework.course&.user_group_name(@work.user_id)}_#{@user&.student_id}_#{@user&.real_name}_#{@shixun&.name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}.pdf"
filename = filename_.strip.tr("+/", "-_")
stylesheets = %w(shixun_work/shixun_work.css shared/codemirror.css)
if params[:export].present? && params[:export]
From 185d4c63f3652961e07c2a511e2df21b5ec1660e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 6 Jan 2020 14:02:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=AF=BE=E5=A0=82=20=E6=97=A0=E6=9D=83?=
=?UTF-8?q?=E9=99=90=E4=BA=BA=E5=91=98=E4=B8=8D=E8=83=BD=E6=9F=A5=E7=9C=8B?=
=?UTF-8?q?=E6=95=99=E5=B8=88=E5=92=8C=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../react/src/modules/courses/coursesDetail/CoursesBanner.js | 4 ++--
public/react/src/modules/tpm/TPMIndexHOC.js | 4 +---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
index 8a11b217c..923819970 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
@@ -734,7 +734,7 @@ background:rgba(204,204,204,0.2) !important;
}
`}
-
+ {this.props.isAdminOrStudent()===true?
trigger.parentNode} visible={coursedata.teacher_applies_count===undefined?false:coursedata.teacher_applies_count>0?true:false}
@@ -766,7 +766,7 @@ background:rgba(204,204,204,0.2) !important;
学分 {coursedata.credit}
}
-
+ :""}
{/**/}
{/**/}
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 4116aef3a..f46835959 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -375,9 +375,7 @@ export function TPMIndexHOC(WrappedComponent) {
});
}
- /**
- 课堂权限相关方法，暂时写这里了 ----------------------------------------END
- */
+
fetchUser = () => {
let url = `/users/get_user_info.json`
let courseId;
From f5790dd45f10aacb38e3874d6f597337e327f741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 6 Jan 2020 14:08:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../react/src/modules/courses/coursesDetail/CoursesBanner.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
index 923819970..3727b88a2 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js
@@ -734,7 +734,7 @@ background:rgba(204,204,204,0.2) !important;
}
`}
- {this.props.isAdminOrStudent()===true?
+ { excellent===true&&this.props.isAdminOrStudent()===false?"":
trigger.parentNode} visible={coursedata.teacher_applies_count===undefined?false:coursedata.teacher_applies_count>0?true:false}
@@ -766,7 +766,7 @@ background:rgba(204,204,204,0.2) !important;
学分 {coursedata.credit}
}
- :""}
+ }
{/**/}
{/**/}