From 8eca359538515d1af54ea9b3566cc194ea104542 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 2 Jan 2020 15:22:12 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=88=86=E7=8F=AD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/course.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/course.rb b/app/models/course.rb index 2f561bba7..0ac879905 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -146,7 +146,7 @@ class Course < ApplicationRecord def teacher_group(user_id) data = if teacher_course_groups.exists?(user_id: user_id) - teacher_course_groups.joins(:course_group).where(user_id: user_id) + teacher_course_groups.joins(:course_group).where(user_id: user_id).distinct .pluck('course_groups.id', 'course_groups.name') else course_groups.pluck(:id, :name) From 5b17f2f7dc7841971862300730160095b5d79bb0 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 2 Jan 2020 15:27:01 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/course.rb | 2 +- db/migrate/20200102030946_modify_course_group_for_courses.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/course.rb b/app/models/course.rb index 0ac879905..2f561bba7 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -146,7 +146,7 @@ class Course < ApplicationRecord def teacher_group(user_id) data = if teacher_course_groups.exists?(user_id: user_id) - teacher_course_groups.joins(:course_group).where(user_id: user_id).distinct + teacher_course_groups.joins(:course_group).where(user_id: user_id) .pluck('course_groups.id', 'course_groups.name') else course_groups.pluck(:id, :name) diff --git a/db/migrate/20200102030946_modify_course_group_for_courses.rb b/db/migrate/20200102030946_modify_course_group_for_courses.rb index 8df0943b3..e4a5d62ee 100644 --- a/db/migrate/20200102030946_modify_course_group_for_courses.rb +++ b/db/migrate/20200102030946_modify_course_group_for_courses.rb @@ -11,7 +11,7 @@ class ModifyCourseGroupForCourses < ActiveRecord::Migration[5.2] cg.attachment_group_settings.update_all(course_group_id: g.id) cg.homework_group_reviews.update_all(course_group_id: g.id) cg.homework_group_settings.update_all(course_group_id: g.id) - cg.teacher_course_groups.update_all(course_group_id: g.id) + #cg.teacher_course_groups.update_all(course_group_id: g.id) cg.destroy! end end From d5e032e72133101c937685eda9216fff06b71919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 2 Jan 2020 16:28:10 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=AF=95=E8=AE=BE?= =?UTF-8?q?=E5=92=8C=E6=97=A0=E5=88=86=E7=8F=AD=E7=9A=84=E7=AB=8B=E5=8D=B3?= =?UTF-8?q?=E6=88=AA=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/busyWork/PublishRightnow.js | 13 ++++-- .../tasks/GraduationTasksSubmitedit.js | 43 +++++++++++-------- .../tasks/GraduationTasksSubmitnew.js | 21 +++++---- 3 files changed, 47 insertions(+), 30 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/PublishRightnow.js b/public/react/src/modules/courses/busyWork/PublishRightnow.js index cd1b72633..1b9c8b0f1 100644 --- a/public/react/src/modules/courses/busyWork/PublishRightnow.js +++ b/public/react/src/modules/courses/busyWork/PublishRightnow.js @@ -96,6 +96,7 @@ class PublishRightnow extends Component{ } homeworkstartend=(arg_group_ids,endtime)=>{ + debugger if (this.usingCheckBeforePost && this.props.checkBeforePost) { const goOn = this.props.checkBeforePost(); if (!goOn) { @@ -103,6 +104,7 @@ class PublishRightnow extends Component{ return; } } + debugger const isPublish = this.props.isPublish; let group_ids = arg_group_ids if (this.usingCheckBeforePost) { @@ -110,13 +112,16 @@ class PublishRightnow extends Component{ return item.id }) } - if (this.state.course_groups.length && (!group_ids || group_ids.length == 0)) { - this.props.showNotification('请至少选择一个分班'); - return; + debugger + if(this.state.course_groups.length>0){ + if (this.state.course_groups.length && (!group_ids || group_ids&&group_ids.length == 0)) { + this.props.showNotification('请至少选择一个分班'); + return; + } } let data={} - if(arg_group_ids.length===0){ + if(arg_group_ids&&arg_group_ids.length===0){ data = { homework_ids: this.props.checkBoxValues, end_time: endtime==="Invalid date"?undefined:endtime, diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js index f535c01bb..65fcf4d19 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js @@ -41,7 +41,7 @@ class GraduationTasksSubmitedit extends Component{ componentDidMount(){ - + this.props.form.validateFields(); let workId=this.props.match.params.work_Id; let url = "/graduation_works/"+workId+"/edit.json"; @@ -367,7 +367,6 @@ class GraduationTasksSubmitedit extends Component{ let {fileList,selectmemberslist,workslist}=this.state; - this.Commoninterface(fileList,selectmemberslist,workslist); // setTimeout(function () { // GraduationTasksnewtype=true @@ -380,27 +379,37 @@ class GraduationTasksSubmitedit extends Component{ let workId=this.props.match.params.work_Id; let userids=[]; + // for(var list of selectmemberslist){ + // if(list.user_id!=undefined&&list.user_id!=null){ + // userids.push(list.user_id) + // } + // } + if(selectmemberslist!=undefined&&selectmemberslist.length>0){ + selectmemberslist.map((list,key)=>{ + if(list.user_id!=undefined&&list.user_id!=null){ + userids.push(list.user_id) + } + }) + } - for(var list of selectmemberslist){ - if(list.user_id!=undefined&&list.user_id!=null){ - userids.push(list.user_id) - } - } let listid=[]; - for(var list of fileList){ - listid.push(list.response == undefined ? list.id : list.response.id) + // for(var list of fileList){ + // listid.push(list.response == undefined ? list.id : list.response.id) + // } + if(fileList!=undefined&&fileList.length>0){ + fileList.map((list,key)=>{ + listid.push(list.response == undefined ? list.id : list.response.id) + }) } - console.log(userids) - this.props.form.validateFields((err, values) => { + this.props.form.validateFields((err, values) => { // console.log(fileList); if(values.description===undefined||values.description===""){ this.scrollToAnchor("valuestypes"); - // debugger return } @@ -593,7 +602,7 @@ class GraduationTasksSubmitedit extends Component{ {description&&description?
- {/*
*/} +
-
+
{/*内容*/}
-

+ { objectsingle.item_type==="JUDGMENT"? - objectsingle === undefined ||objectsingle === null? "" : objectsingle.choices.map((object, index) => { - return ( -

- - {object.choice_text} - -

- ) - }) +

+ { + objectsingle === undefined ||objectsingle === null? "" : objectsingle.choices.map((object, index) => { + return ( +

+ + {object.choice_text} + +

+ ) + }) + } +

: - objectsingle === undefined ||objectsingle === null? "" : objectsingle.choices.map((object, index) => { - return ( -

- {tagArray[index]} -

+ objectsingle.item_type==="PROGRAM"? +

+

+

- ) - }) +

+ : +

+ { + objectsingle === undefined ||objectsingle === null? "" : objectsingle.choices.map((object, index) => { + return ( +

+ {tagArray[index]} +

+

+ ) + }) + } +

} -

+
-
+ + + + +
) } diff --git a/public/react/src/modules/question/component/Listjihe.js b/public/react/src/modules/question/component/Listjihe.js index 69d31f0e8..f592ffb16 100644 --- a/public/react/src/modules/question/component/Listjihe.js +++ b/public/react/src/modules/question/component/Listjihe.js @@ -128,6 +128,8 @@ class Listjihe extends Component {

} + +

难度：{items.difficulty===1?"简单":items.difficulty===2?"适中":items.difficulty===3?"困难":""}

题型：{items.item_type==="SINGLE"?"单选题":items.item_type==="MULTIPLE"?"多选题":items.item_type==="JUDGMENT"?"判断题":items.item_type==="PROGRAM"?"编程题":""}