From f20d8e8332f08b68a465f150da576193c9ea5012 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, 27 Sep 2019 16:05:25 +0800 Subject: [PATCH 1/8] =?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/graduation/tasks/GraduationTaskDetail.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js index abd40784a..0a7cf509d 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js @@ -451,9 +451,9 @@ class GraduationTaskDetail extends Component{ :""} {questionslist.work_status===undefined||questionslist.work_status===null||questionslist.work_status.length===0?"":questionslist.work_status.map((item,key)=>{ return( - - {item==="提交作品"?提交作品:""} - {item==="补交作品"?补交作品:""} + + {item==="提交作品"?提交作品:""} + {item==="补交作品"?补交作品:""} {item==="修改作品"?修改作品:""} {item==="查看作品"?查看作品 :""} {item==="创建项目"?创建项目:""} From 847d5ad3708b93455f8f967ed8857f563764c0c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 27 Sep 2019 16:12:14 +0800 Subject: [PATCH 2/8] =?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/message/js/MessagSub.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index 41fc89dbd..92c30a2d4 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -493,7 +493,7 @@ class MessagSub extends Component { //belong_container_id course的id return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.parent_container_id}`); default : - return window.open("/") + return } } From 094c15ac343b17cd05ea0dea103b94e24bbded7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 27 Sep 2019 16:15:22 +0800 Subject: [PATCH 3/8] =?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/message/js/MessagSub.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index 92c30a2d4..88613513c 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -575,7 +575,16 @@ class MessagSub extends Component { boolps = false; } } - + if (item.container_type === "DeleteCourse") { + if (item.tiding_type === "System") { + boolps = false; + } + } + if (item.container_type === "DeleteCourseMember") { + if (item.tiding_type === "System") { + boolps = false; + } + } return (
Date: Fri, 27 Sep 2019 16:28:15 +0800 Subject: [PATCH 4/8] =?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/coursesPublic/NewShixunModel.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js index 062390f1e..2d0271a23 100644 --- a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js +++ b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js @@ -536,7 +536,7 @@ class NewShixunModel extends Component{ className="fl task-hide edu-txt-left mt3" name="shixun_homework[]" > - @@ -588,13 +588,19 @@ class NewShixunModel extends Component{ } `} - + {this.props.type==='shixuns'? {item.author_name} {item.author_school_name} 难度系数：{item.level} 学习人数：{item.study_count} - - + : + + {item.author_name} + {item.author_school_name} + 学习人数：{item.myshixuns_count} + 章节：{item.stage_count} + 实训：{item.shixuns_count} + }
{item.subjects===undefined?"":item.subjects.length===0?"":this.ItsCourse(item.subjects)}> From 9ad96e39cb96cb402495bcec956caf0e45c073f9 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 27 Sep 2019 16:34:29 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/subject_search_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/subject_search_service.rb b/app/services/subject_search_service.rb index 2366cecc2..f69c56c88 100644 --- a/app/services/subject_search_service.rb +++ b/app/services/subject_search_service.rb @@ -12,7 +12,7 @@ class SubjectSearchService < ApplicationService type = params[:type] || "all" if type == "mine" - @subjects = User.current.shixuns.visible.unhidden + @subjects = User.current.subjects.visible.unhidden else @subjects = Subject.visible.unhidden end From fbb033a0a23d6f7e3c5a8256f9290b01135e5cda Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 27 Sep 2019 16:36:09 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/decorators/tiding_decorator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/decorators/tiding_decorator.rb b/app/decorators/tiding_decorator.rb index 4003ffb94..130e7f4b8 100644 --- a/app/decorators/tiding_decorator.rb +++ b/app/decorators/tiding_decorator.rb @@ -344,7 +344,7 @@ module TidingDecorator end def resubmit_student_work_content - I18n.t(locale_format) % container&.homework_common.try(:name) + I18n.t(locale_format) % parent_container.try(:name) end def student_works_score_content From acde3709b27bb9fa0d0f7c322012879be2b3060b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 27 Sep 2019 16:52:09 +0800 Subject: [PATCH 7/8] =?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/message/js/MessagSub.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index 88613513c..f9da5ea9d 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -488,7 +488,14 @@ class MessagSub extends Component { case "SubjectStartCourse": return window.open(`/paths/${item.container_id}`); case "ResubmitStudentWork": - return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}/appraise`); + if (item.homework_type === "normal") { + //普通作业 + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/${item.container_id}/appraise`); + } + if (item.homework_type === "group") { + //分组作业 + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/${item.container_id}/appraise`); + } case "AdjustScore": //belong_container_id course的id return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.parent_container_id}`); From ac07bb24aa7fbe2a754dfd32f8b635d673ad7e7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 27 Sep 2019 16:53:33 +0800 Subject: [PATCH 8/8] =?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/message/js/MessagSub.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index f9da5ea9d..f92ea71c4 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -498,7 +498,14 @@ class MessagSub extends Component { } case "AdjustScore": //belong_container_id course的id - return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.parent_container_id}`); + if (item.homework_type === "normal") { + //普通作业 + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}`); + } + if (item.homework_type === "group") { + //分组作业 + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}`); + } default : return }