From 7f571787c6a9c816a49f889a3002d783b6010e2f Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Thu, 2 Jan 2020 11:52:29 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/homeworks_service.rb | 21 ++++++++++++------- .../homework_commons/works_list.json.jbuilder | 3 ++- lib/tasks/homework_publishtime.rake | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/app/services/homeworks_service.rb b/app/services/homeworks_service.rb index 487a79bfe..c70535e17 100644 --- a/app/services/homeworks_service.rb +++ b/app/services/homeworks_service.rb @@ -305,13 +305,20 @@ class HomeworksService myshixun_endtime = games.select{|game| game.status == 2}.size == games.size ? games.map(&:end_time).max : nil - if work.work_status == 0 - is_complete = myshixun_endtime && (myshixun_endtime < setting_time.end_time) - if is_complete || (myshixun.created_at < setting_time.end_time && (!homework.allow_late || setting_time.end_time >= Time.now)) - work.work_status = 1 - elsif homework.allow_late && myshixun.created_at < homework.late_time - work.work_status = 2 - end + is_complete = myshixun_endtime && (myshixun_endtime < setting_time.end_time) + + # if work.work_status == 0 + # if is_complete || (myshixun.created_at < setting_time.end_time && (!homework.allow_late || setting_time.end_time >= Time.now)) + # work.work_status = 1 + # elsif homework.allow_late && myshixun.created_at < homework.late_time + # work.work_status = 2 + # end + # end + + if !homework.allow_late || is_complete + work.work_status = 1 + elsif myshixun.created_at < homework.late_time + work.work_status = 2 end if work.work_status != 0 diff --git a/app/views/homework_commons/works_list.json.jbuilder b/app/views/homework_commons/works_list.json.jbuilder index b8fa73b66..beaf644f7 100644 --- a/app/views/homework_commons/works_list.json.jbuilder +++ b/app/views/homework_commons/works_list.json.jbuilder @@ -43,7 +43,8 @@ elsif @user_course_identity == Course::STUDENT json.efficiency work_score_format(@work.efficiency, true, @score_open) json.eff_score work_score_format(@work.eff_score, true, @score_open) json.current_complete_count myshixun.try(:passed_count) if @homework.end_or_late - json.complete_count @work.myshixun&.time_passed_count(@homework.homework_group_setting(@work.user_id)&.end_time) + end_time = @homework.allow_late ? @homework.late_time : @homework.homework_group_setting(@work.user_id)&.end_time + json.complete_count @work.myshixun&.time_passed_count(end_time) json.view_answer_count @work.myshixun.try(:view_answer_count).to_i json.work_status @work.compelete_status else diff --git a/lib/tasks/homework_publishtime.rake b/lib/tasks/homework_publishtime.rake index 918e70a70..a57b97eab 100644 --- a/lib/tasks/homework_publishtime.rake +++ b/lib/tasks/homework_publishtime.rake @@ -81,7 +81,7 @@ namespace :homework_publishtime do end end - student_works.joins(:myshixun).where("myshixuns.status != 1").update_all(late_penalty: homework.late_penalty) if student_works.present? + student_works.joins(:myshixun).where("myshixuns.status != 1").update_all(late_penalty: homework.late_penalty, work_status: 2) if student_works.present? else HomeworkEndUpdateScoreJob.perform_later(homework.id) From 23f99d307f8b77c06dab195b4bf30ab8476eb966 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 12:02:25 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=89=8D=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=85=B3=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/shixunHomework/Listofworksstudentone.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index fee00d4eb..879508ea1 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -363,7 +363,7 @@ class Listofworksstudentone extends Component { ), }, { - title: '截止前完成关卡', + title: '结束前完成关卡', dataIndex: 'completion', key: 'completion', align: "center", @@ -757,7 +757,7 @@ class Listofworksstudentone extends Component { ), }, { - title: '截止前完成关卡', + title: '结束前完成关卡', dataIndex: 'completion', key: 'completion', align: "center", @@ -1110,7 +1110,7 @@ class Listofworksstudentone extends Component { ), }, { - title: '截止前完成关卡', + title: '结束前完成关卡', dataIndex: 'completion', key: 'completion', align: 'center', @@ -1473,7 +1473,7 @@ class Listofworksstudentone extends Component { ), }, { - title: '截止前完成关卡', + title: '结束前完成关卡', dataIndex: 'completion', key: 'completion', align: 'center', From cb7d6e40ec3443b587813eaf94a0915ebd1859bf Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 2 Jan 2020 13:46:11 +0800 Subject: [PATCH 3/6] 1 --- app/controllers/graduation_topics_controller.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/controllers/graduation_topics_controller.rb b/app/controllers/graduation_topics_controller.rb index de707d7c7..203f18b35 100644 --- a/app/controllers/graduation_topics_controller.rb +++ b/app/controllers/graduation_topics_controller.rb @@ -170,11 +170,12 @@ class GraduationTopicsController < ApplicationController teacher_group = @course.teacher_course_groups.where(:user_id => @graduation_topic.tea_id, :id => params[:group_id]).first unless teacher_group.present? member = @course.course_members.where(:user_id => @graduation_topic.tea_id).first - tip_exception("分班名称不能为空") if params[:course_group_name].blank? - course_group = CourseGroup.find_or_create_by!(:name => params[:course_group_name], :course_id => @course.id) - teacher_group = TeacherCourseGroup.find_or_create_by!(:course_id => @course.id, :course_member_id => member.try(:id), - :user_id => @graduation_topic.tea_id, - :course_group_id => course_group.try(:id)) + if params[:course_group_name].present? + course_group = CourseGroup.find_or_create_by!(:name => params[:course_group_name], :course_id => @course.id) + teacher_group = TeacherCourseGroup.find_or_create_by!(:course_id => @course.id, :course_member_id => member.try(:id), + :user_id => @graduation_topic.tea_id, + :course_group_id => course_group.try(:id)) + end end student_member = @course.course_members.where(:user_id => student_graduation_topic.user_id).first student_member.update_attributes(:course_group_id => teacher_group.course_group_id) if student_member.present? From 94921248b40a45f67cbff1bb321c677b6b811e49 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Thu, 2 Jan 2020 13:51:12 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/homework_commons/works_list.json.jbuilder | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/homework_commons/works_list.json.jbuilder b/app/views/homework_commons/works_list.json.jbuilder index beaf644f7..74c7f920c 100644 --- a/app/views/homework_commons/works_list.json.jbuilder +++ b/app/views/homework_commons/works_list.json.jbuilder @@ -102,7 +102,8 @@ if @homework.homework_type == "practice" json.cost_time work.myshixun.try(:total_spend_time) json.current_complete_count myshixun.try(:passed_count) if @homework.end_or_late - json.complete_count work.myshixun&.time_passed_count(@homework.homework_group_setting(work.user_id)&.end_time) + end_time = @homework.allow_late ? @homework.late_time : @homework.homework_group_setting(work.user_id)&.end_time + json.complete_count work.myshixun&.time_passed_count(end_time) json.view_answer_count work.myshixun.try(:view_answer_count).to_i json.user_login work.user.try(:login) json.user_name work.user.try(:real_name) From 24ced552978499121f9339f6d2573ab486a9b427 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 13:58:10 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../topics/GraduateTopicDetailTable.js | 17 ++++++++--------- .../shixunchild/Challenges/Challengesjupyter.js | 4 ++-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js index eae3fb43d..b0c65009d 100644 --- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js +++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js @@ -79,16 +79,15 @@ class GraduateTopicDetailTable extends Component{ }) } sureAgreeTopic=(count)=>{ - if(count > 0){ - let{tableData}=this.props; - let{operationId,classesId}=this.state - let courseId=this.props.match.params.course_id; + let{tableData}=this.props; + let{operationId,classesId}=this.state + let courseId=this.props.match.params.course_id; + + if(classesId!=undefined){ let name=tableData.group_list.filter(item=>item.group_id==classesId)[0].group_name; this.agreeChoose(courseId,operationId,classesId,name); }else{ - this.setState({ - un_choose_notice:"请先添加分班" - }) + this.agreeChoose(courseId,operationId,classesId); } } @@ -205,7 +204,7 @@ class GraduateTopicDetailTable extends Component{ >

确认同意学生的选题，将学生加入我的分班

-
+ { tableData.group_list && tableData.group_list.length===0?"":
选择：

{un_choose_notice}

-
+
}
取消 this.sureAgreeTopic(tableData.group_list.length)}>确定 diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js index 221f90764..de906ad43 100644 --- a/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js +++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js @@ -278,7 +278,7 @@ class Challengesjupyter extends Component { this.setState({ showtime:false }) - }, 500) + }, 800) }else{ this.setState({ @@ -292,7 +292,7 @@ class Challengesjupyter extends Component { }) this.props.showNotification('实训保存失败!'); }) - }, 500) + }, 800) } From 95254ce52f7283477e85c76db232c99f1a75317e Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Thu, 2 Jan 2020 14:14:46 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E6=90=9C=E7=B4=A2=E5=8E=BB=E6=8E=89=E5=89=8D=E5=90=8E?= =?UTF-8?q?=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_commons_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb index a4d34a1c8..f9931c370 100644 --- a/app/controllers/homework_commons_controller.rb +++ b/app/controllers/homework_commons_controller.rb @@ -194,7 +194,7 @@ class HomeworkCommonsController < ApplicationController # TODO user_extension 如果修改 请调整 unless params[:search].blank? @student_works = @student_works.joins(user: :user_extension).where("concat(lastname, firstname) like ? - or student_id like ?", "%#{params[:search]}%", "%#{params[:search]}%") + or student_id like ?", "%#{params[:search].strip}%", "%#{params[:search].strip}%") end @work_count = @student_works.size