From d36a95d90c0b8cfb2f2b11ad327f47fbd9763634 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 11 Sep 2017 10:36:12 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E7=9A=84=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E8=AF=BE=E7=A8=8B=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/shixuns_controller.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index b3d7ad491..6600516e2 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -562,11 +562,14 @@ class ShixunsController < ApplicationController # end # @shixun.major_id = params[:major_id] @shixun.shixun_major_courses.destroy_all - if CourseList.where(:name => params[:course_list].strip).count > 0 - @shixun.shixun_major_courses << ShixunMajorCourse.new(:major_id => -1, :course_list_id => CourseList.where(:name => params[:course_list].strip).first.id) - else - course_list = CourseList.create(:name => params[:course_list].strip, :user_id => User.current.id, :is_admin => 0) - @shixun.shixun_major_courses << ShixunMajorCourse.new(:major_id => -1, :course_list_id => course_list.id) + course_lists = params[:course_list].strip.split(",") + course_lists.each do |course| + if CourseList.where(:name => course).count > 0 + @shixun.shixun_major_courses << ShixunMajorCourse.new(:major_id => -1, :course_list_id => CourseList.where(:name => course.strip).first.id) + else + course_list = CourseList.create(:name => course.strip, :user_id => User.current.id, :is_admin => 0) + @shixun.shixun_major_courses << ShixunMajorCourse.new(:major_id => -1, :course_list_id => course_list.id) + end end params[:shixun][:is_public] == "on" ? @shixun.is_public = 1 : @shixun.is_public = 0 ActiveRecord::Base.transaction do From 8ed3696f6faeb9c06ac4348d6530b133e1d292c8 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 11 Sep 2017 14:42:27 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E5=90=8E=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_work_controller.rb | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index a5ed47268..8e4492720 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -377,11 +377,11 @@ class StudentWorkController < ApplicationController end #开放作品 || 老师 || 超级管理员 || 禁用匿评&&作业截止&&已提交作品 显示所有列表 - if (@homework.is_open == 1 && User.current.member_of_course?(@course) && @homework.homework_detail_manual.comment_status == 6) || @is_teacher || User.current.admin? + if (@homework.work_public && User.current.member_of_course?(@course) && @homework.homework_detail_manual.comment_status == 6) || @is_teacher || User.current.admin? @stundet_works = @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}") @show_all = true elsif User.current.member_of_course?(@course) - if @homework.homework_detail_manual.comment_status == 1 || @homework.homework_detail_manual.comment_status == 2 #学生 && 未开启匿评 只看到自己的 + if @homework.homework_detail_manual.comment_status == 1 || @homework.homework_detail_manual.comment_status == 2 || @homework.homework_detail_manual.comment_status == 5 || @homework.homework_detail_manual.comment_status == 6 #学生 && 未开启匿评 只看到自己的 if @homework.homework_type == 3 my_work = @homework.student_works.where(:user_id => User.current.id) @stundet_works = !my_work.balnk? ? (my_work.first.group_id != 0 ? @homework.student_works.select("student_works.*,student_works.work_score as score").where(:group_id => my_work.first.group_id) : my_work) : [] @@ -391,14 +391,14 @@ class StudentWorkController < ApplicationController elsif @homework.homework_detail_manual.comment_status == 3 || @homework.homework_detail_manual.comment_status == 4 #学生 && 开启匿评 看到匿评列表 my_work = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id).first @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id} - elsif @homework.homework_detail_manual.comment_status == 5 #学生 && 关闭匿评 未提交作品之前列表为空，提交了作品看到所有的 - my_work = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id).first - if !my_work || my_work.status == 0 - @stundet_works = [] - else - @stundet_works = @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}") - @show_all = true - end + # elsif @homework.homework_detail_manual.comment_status == 5 || @homework.homework_detail_manual.comment_status == 6 #学生 && 关闭匿评 未提交作品之前列表为空，提交了作品看到所有的 + # my_work = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id).first + # if !my_work || my_work.status == 0 + # @stundet_works = [] + # else + # @stundet_works = @homework.student_works.select("student_works.*,student_works.work_score as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}") + # @show_all = true + # end else @stundet_works = [] end @@ -408,11 +408,11 @@ class StudentWorkController < ApplicationController end else - if (@homework.is_open == 1 && User.current.member_of_course?(@course) && @homework.homework_detail_manual.comment_status == 6) || @is_teacher || User.current.admin? + if (@homework.work_public && User.current.member_of_course?(@course) && @homework.homework_detail_manual.comment_status == 6) || @is_teacher || User.current.admin? @stundet_works = @homework.student_works.select("student_works.*,student_works.work_score as score").includes(:user => {:user_extensions => []}, :project => {}, :student_works_scores => {}).order("#{@order} #{@b_sort}") @show_all = true elsif User.current.member_of_course?(@course) - if @homework.homework_detail_manual.comment_status == 1 || @homework.homework_detail_manual.comment_status == 2 #学生 && 未开启匿评 只看到自己的 + if @homework.homework_detail_manual.comment_status == 1 || @homework.homework_detail_manual.comment_status == 2 || @homework.homework_detail_manual.comment_status == 5 || @homework.homework_detail_manual.comment_status == 6 #学生 && 未开启匿评 只看到自己的 if @homework.homework_type == 3 my_work = @homework.student_works.where(:user_id => User.current.id) @stundet_works = !my_work.blank? ? (my_work.first.group_id != 0 ? @homework.student_works.select("student_works.*,student_works.work_score as score").where(:group_id => my_work.first.group_id) : my_work) : [] From 4c7eb01bbfa04fc4a32a1e44b1d6a434a38aed8b Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 11 Sep 2017 15:14:19 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E5=AE=9E=E8=AE=ADtpm=E7=9A=84=E5=8F=91?= =?UTF-8?q?=E9=80=81=E8=87=B3=E7=9A=84=E5=BC=B9=E6=A1=86=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B0=91=E4=BA=86=E6=96=B0=E5=BB=BA=E8=AF=BE?= =?UTF-8?q?=E5=A0=82=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/shixuns_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 6600516e2..e209cd9b1 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -689,9 +689,9 @@ class ShixunsController < ApplicationController @user = User.current if !params[:search].nil? search = "%#{params[:search].to_s.strip.downcase}%" - @courses = @user.courses.not_deleted_not_end.where("#{Course.table_name}.name like :p",:p=>search).select{|course| @user.allowed_to?(:as_teacher,course)} + @courses = @user.courses.not_deleted_not_end.where("#{Course.table_name}.name like :p",:p=>search).select{|course| @user.has_teacher_role(course)} else - @courses = @user.courses.not_deleted_not_end.select{|course| @user.allowed_to?(:as_teacher,course)} + @courses = @user.courses.not_deleted_not_end.select{|course| @user.has_teacher_role(course)} end @pages = Paginator.new @courses.count, 8, params['page'] || 1 @offset ||= @pages.offset From 4adb8cbab6d5c1798dbc446221d8a77c024629f2 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 11 Sep 2017 15:48:02 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=9A=84=E8=AF=84=E5=88=86=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_common_controller.rb | 1 - app/helpers/application_helper.rb | 6 +++--- lib/tasks/homework_publishtime.rake | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb index 4019e1110..dd498eff8 100644 --- a/app/controllers/homework_common_controller.rb +++ b/app/controllers/homework_common_controller.rb @@ -338,7 +338,6 @@ class HomeworkCommonController < ApplicationController if @homework.end_time < Time.now @homework.student_works.each do |student_work| set_shixun_final_score @homework, student_work, @homework_detail_manual.answer_open_evaluation - student_work.save end end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 03d1cd5d9..49599ed48 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -283,7 +283,7 @@ module ApplicationHelper if myshixun.nil? 0 else - myshixun.games.select{|game| game.status == 2 && game.answer_open == 0}.count + myshixun.games.select{|game| game.status == 2 && !game.answer_open}.count end end @@ -5224,9 +5224,9 @@ def set_shixun_final_score homework, student_work, answer_open_evaluation shixun = homework.homework_commons_shixuns.shixun passed_count = answer_open_evaluation ? had_passed_changllenge_num(shixun, student_work.user) : had_passed_no_ans_changllenge_num(shixun, student_work.user) final_score =(passed_count.to_f / shixun.challenges.count) * 100 - student_work.final_score = format("%.2f",final_score.to_f) + student_work.update_column("final_score", format("%.2f",final_score.to_f)) score = student_work.final_score - student_work.late_penalty - student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score + student_work.update_column("work_score", format("%.2f",(score < 0 ? 0 : score).to_f)) if score end end diff --git a/lib/tasks/homework_publishtime.rake b/lib/tasks/homework_publishtime.rake index 36cff6723..0a24b1503 100644 --- a/lib/tasks/homework_publishtime.rake +++ b/lib/tasks/homework_publishtime.rake @@ -86,10 +86,10 @@ namespace :homework_publishtime do homework.student_works.where("work_status != 0").each do |student_work| passed_count = homework.homework_detail_manual.answer_open_evaluation ? had_passed_changllenge_num_rake(student_work.myshixun) : had_passed_no_ans_changllenge_num_rake(student_work.myshixun) final_score =(passed_count.to_f / shixun.challenges.count) * 100 - student_work.final_score = format("%.2f",final_score.to_f) + student_work.update_column("final_score", format("%.2f",final_score.to_f)) score = student_work.final_score - student_work.late_penalty student_work.work_score = format("%.2f",(score < 0 ? 0 : score).to_f) if score - student_work.save + student_work.update_column("work_score", format("%.2f",(score < 0 ? 0 : score).to_f)) end end end From 14e8474bad3f1a9796728b9869adf3d886e6e1f7 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 11 Sep 2017 15:59:36 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=9A=84=E6=9F=A5=E7=9C=8B=E5=BC=B9=E6=A1=86=EF=BC=8C=E8=80=97?= =?UTF-8?q?=E6=97=B6=E6=98=BE=E7=A4=BA=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 49599ed48..7780270ae 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -358,18 +358,23 @@ module ApplicationHelper day = time / 86400 hour = time % (24*60*60) / (60*60) min = time % (24*60*60) % (60*60) / 60 + sec = time % (24*60*60) % (60*60) % 60 if day < 1 if hour < 1 - if time < 1 - time = time == 0 ? "--" : "小于1分钟" + if min < 1 + if sec < 1 + time = "--" + else + time = "#{sec}秒" + end else - time = "#{min} 分钟" + time = "#{min}分钟 #{sec}秒" end else - time = "#{hour}小时 : #{min}分" + time = "#{hour}小时 #{min}分钟 #{sec}秒" end else - time = "#{day}天 #{hour}小时 #{min}分" + time = "#{day}天 #{hour}小时 #{min}分钟 #{sec}秒" end return time end From 9ab1b6d61f9280e01cdb003d0842ac83125f0211 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 12 Sep 2017 16:26:13 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=97=B6=E6=9C=89=E5=8C=BF=E8=AF=84=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=EF=BC=8C=E5=86=8D=E4=BF=AE=E6=94=B9=E6=99=AE=E9=80=9A=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E7=9A=84=E8=AE=BE=E7=BD=AE=E6=97=B6=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=8C=BF=E8=AF=84=E5=90=8E=E8=BF=9B=E8=A1=8C=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_common_controller.rb | 2 +- app/controllers/student_work_controller.rb | 16 ++-- public/javascripts/edu/base_edu.js | 79 ++++++++++--------- 3 files changed, 51 insertions(+), 46 deletions(-) diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb index dd498eff8..b94f6fb8f 100644 --- a/app/controllers/homework_common_controller.rb +++ b/app/controllers/homework_common_controller.rb @@ -251,7 +251,7 @@ class HomeworkCommonController < ApplicationController @homework_detail_programing.ta_proportion = 0 if @homework_detail_programing end if @homework_detail_manual.comment_status < 4 - if params[:homework_anonymous_appeal] + if params[:homework_anonymous_comment] && params[:homework_anonymous_appeal] @homework.anonymous_appeal = 1 @homework_detail_manual.appeal_time = params[:homework_appeal_time] if params[:homework_appeal_time] @homework_detail_manual.appeal_penalty = params[:homework_appeal_penalty] if params[:homework_appeal_penalty] diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index 8e4492720..c498af4a9 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -422,14 +422,14 @@ class StudentWorkController < ApplicationController elsif @homework.homework_detail_manual.comment_status == 3 || @homework.homework_detail_manual.comment_status == 4 #学生 && 开启匿评 看到匿评列表 my_work = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id).first @stundet_works = my_work + User.current.student_works_evaluation_distributions.map(&:student_work).select { |work| work.homework_common_id == @homework.id} - elsif @homework.homework_detail_manual.comment_status == 5 #学生 && 关闭匿评 未提交作品之前列表为空，提交了作品看到所有的 - my_work = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id).first - if !my_work || my_work.status == 0 - @stundet_works = [] - else - @stundet_works = @homework.student_works.select("student_works.*,student_works.work_score as score").order("#{@order} #{@b_sort}") - @show_all = true - end + # elsif @homework.homework_detail_manual.comment_status == 5 #学生 && 关闭匿评 未提交作品之前列表为空，提交了作品看到所有的 + # my_work = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:user_id => User.current.id).first + # if !my_work || my_work.work_status == 0 + # @stundet_works = [] + # else + # @stundet_works = @homework.student_works.select("student_works.*,student_works.work_score as score").order("#{@order} #{@b_sort}") + # @show_all = true + # end else @stundet_works = [] end diff --git a/public/javascripts/edu/base_edu.js b/public/javascripts/edu/base_edu.js index 48ea8ac4b..e56955e6d 100644 --- a/public/javascripts/edu/base_edu.js +++ b/public/javascripts/edu/base_edu.js @@ -275,11 +275,13 @@ $(function(){ $(this).parent().parent('ul').find('input[type="text"]').removeAttr('disabled'); $(this).parent().parent('ul').find('input[type="text"]').removeClass('disabled-bg'); $("#anon_relate_setting_ul").show(); - var my_date = new Date(); - var end_date = new Date(Date.parse($("input[name='homework_end_time']").val().replace(/-/g, "/"))); - var max_date = my_date > end_date ? my_date : end_date; - $("input[name='homework_evaluation_start']").val(formate_time(new Date(max_date.setDate(max_date.getDate()+7)))); - $("input[name='homework_evaluation_end']").val(formate_time(new Date(max_date.setDate(max_date.getDate()+14)))); + if($("input[name='homework_end_time']").val().trim() != ""){ + var my_date = new Date(); + var end_date = new Date(Date.parse($("input[name='homework_end_time']").val().replace(/-/g, "/"))); + var max_date = my_date > end_date ? my_date : end_date; + $("input[name='homework_evaluation_start']").val(formate_time(new Date(max_date.setDate(max_date.getDate()+7)))); + $("input[name='homework_evaluation_end']").val(formate_time(new Date(max_date.setDate(max_date.getDate()+14)))); + } $("input[name='homework_evaluation_num']").val("3"); $("input[name='homework_absence_penalty']").val("2"); $("select[name='st_proportion']").removeAttr('disabled').removeClass('disabled-bg'); @@ -305,10 +307,12 @@ $(function(){ if($(this).is(':checked')){ $(this).parent().parent('ul').find('input[type="text"]').removeAttr('disabled'); $(this).parent().parent('ul').find('input[type="text"]').removeClass('disabled-bg'); - var my_date = new Date(); - var end_date = new Date(Date.parse($("input[name='homework_evaluation_end']").val().replace(/-/g, "/"))); - var max_date = my_date > end_date ? my_date : end_date; - $("input[name='homework_appeal_time']").val(formate_time(new Date(max_date.setDate(max_date.getDate()+2)))); + if($("input[name='homework_evaluation_end']").val().trim() != ""){ + var my_date = new Date(); + var end_date = new Date(Date.parse($("input[name='homework_evaluation_end']").val().replace(/-/g, "/"))); + var max_date = my_date > end_date ? my_date : end_date; + $("input[name='homework_appeal_time']").val(formate_time(new Date(max_date.setDate(max_date.getDate()+2)))); + } $("input[name='homework_appeal_penalty']").val("2"); } else{ $(this).parent().parent('ul').find('input[type="text"]').attr('disabled', 'disabled'); @@ -435,36 +439,37 @@ $(function(){ $("#homework_absence_penalty_notice").hide(); } } - } - if($("input[name='homework_anonymous_appeal']").is(':checked')){ - if($.trim($("input[name='homework_appeal_time']").val()) == ""){ - $("#homework_appeal_time_notice").html("申诉结束时间不能为空").show(); - result = false; - } else{ - var archive_time = Date.parse($("input[name='homework_archive_time']").val()); - var eva_end = Date.parse($("input[name='homework_evaluation_end']").val()); - var appeal_time = Date.parse($("input[name='homework_appeal_time']").val()); - if(eva_end >= appeal_time){ - $("#homework_appeal_time_notice").html("申诉结束时间应晚于匿评结束时间").show(); + + if($("input[name='homework_anonymous_appeal']").is(':checked')){ + if($.trim($("input[name='homework_appeal_time']").val()) == ""){ + $("#homework_appeal_time_notice").html("申诉结束时间不能为空").show(); result = false; - } else if(archive_time <= appeal_time){ - $("#homework_appeal_time_notice").html("申诉结束时间应早于作业结束时间").show(); - result = false; - } else { - $("#homework_appeal_time_notice").hide(); - } - } - if($.trim($("input[name='homework_appeal_penalty']").val()) == ""){ - result = false; - $("#homework_appeal_penalty_notice").html("违规匿评扣分不能为空").show(); - } else{ - var str = $.trim($("input[name='homework_appeal_penalty']").val()); - var regex = /^\d+$/; - if(!regex.test(str) || parseInt(str) < 0 || parseInt(str) > 50) { - result = false; - $("#homework_appeal_penalty_notice").html("请输入0-50之间的正整数").show(); } else{ - $("#homework_appeal_penalty_notice").hide(); + var archive_time = Date.parse($("input[name='homework_archive_time']").val()); + var eva_end = Date.parse($("input[name='homework_evaluation_end']").val()); + var appeal_time = Date.parse($("input[name='homework_appeal_time']").val()); + if(eva_end >= appeal_time){ + $("#homework_appeal_time_notice").html("申诉结束时间应晚于匿评结束时间").show(); + result = false; + } else if(archive_time <= appeal_time){ + $("#homework_appeal_time_notice").html("申诉结束时间应早于作业结束时间").show(); + result = false; + } else { + $("#homework_appeal_time_notice").hide(); + } + } + if($.trim($("input[name='homework_appeal_penalty']").val()) == ""){ + result = false; + $("#homework_appeal_penalty_notice").html("违规匿评扣分不能为空").show(); + } else{ + var str = $.trim($("input[name='homework_appeal_penalty']").val()); + var regex = /^\d+$/; + if(!regex.test(str) || parseInt(str) < 0 || parseInt(str) > 50) { + result = false; + $("#homework_appeal_penalty_notice").html("请输入0-50之间的正整数").show(); + } else{ + $("#homework_appeal_penalty_notice").hide(); + } } } } From d458bca09c700889df2cf4b3d9d8491eb4ee16ce Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 12 Sep 2017 16:31:56 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E7=9A=84=E8=AF=BE=E5=A0=82=E5=88=97=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index d293de2d5..b04334ee0 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -678,7 +678,7 @@ end @courses = @courses.where(:homepage_show => params[:homepage_show].to_i) end - if params[:course_list] + if params[:course_list] && params[:course_list] != '' @courses = @courses.where(:course_list_id => courselist) end if params[:status] && params[:status]!='' From 847a78620fa674b3fcd4948823f935e3c2c5af71 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 12 Sep 2017 17:05:21 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=8F=91=E9=80=81?= =?UTF-8?q?=E8=87=B3=E6=8A=A5500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/shixuns_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index e209cd9b1..5158687b5 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -724,8 +724,8 @@ class ShixunsController < ApplicationController if homework.save homework_detail_manual.save if homework_detail_manual HomeworkCommonsShixuns.create(:homework_common_id => homework.id, :shixun_id => @shixun.id) + redirect_to setting_homework_common_path(homework, :is_new => 1) end - redirect_to setting_homework_common_path(homework, :is_new => 1) end private # REDO: 新增类型copy的时候 From 4a678d84f8c64ea9b5d3e3ac9a8e079b440374e8 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 12 Sep 2017 17:05:55 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=98=B6=E6=AE=B5=E6=97=B6=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=AE=9E=E8=AE=AD=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/subjects/show.html.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/subjects/show.html.erb b/app/views/subjects/show.html.erb index 7573904ed..c00effaa7 100644 --- a/app/views/subjects/show.html.erb +++ b/app/views/subjects/show.html.erb @@ -309,12 +309,12 @@ } else{ $("#stage_name_notice").hide(); } - if($("input[name='shixun_id[]']").length == 0){ - status = false; - $("#sx_none_notice").show(); - } else{ - $("#sx_none_notice").hide(); - } +// if($("input[name='shixun_id[]']").length == 0){ +// status = false; +// $("#sx_none_notice").show(); +// } else{ +// $("#sx_none_notice").hide(); +// } if(status && flag){ flag = false; $("#new_stage_form").submit(); From e87bc406a6b2636a6af42b46e3e132a44a554659 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 12 Sep 2017 17:32:50 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/shixuns_controller.rb | 2 +- app/helpers/application_helper.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 5158687b5..feea9d22c 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -721,7 +721,7 @@ class ShixunsController < ApplicationController homework_detail_manual.evaluation_num = 0 homework_detail_manual.absence_penalty = 0 homework.homework_detail_manual = homework_detail_manual - if homework.save + if homework.save! homework_detail_manual.save if homework_detail_manual HomeworkCommonsShixuns.create(:homework_common_id => homework.id, :shixun_id => @shixun.id) redirect_to setting_homework_common_path(homework, :is_new => 1) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 7780270ae..1a400312b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -4741,6 +4741,7 @@ end def get_hw_index(hw,is_teacher,type=0) homework_commons = hw.course.homework_commons + Rails.logger.info("----------------------------------------------"+hw.course) if is_teacher if type != 0 homeworks = homework_commons.where("homework_commons.homework_type = #{type}").order("created_at asc") @@ -4754,7 +4755,8 @@ def get_hw_index(hw,is_teacher,type=0) homeworks = homework_commons.where("publish_time <= '#{Time.now}'").order("created_at asc") end end - hw_ids = homeworks.map{|hw| hw.id} if !homeworks.empty? + Rails.logger.info("----------------------------------------------"+homeworks.count.to_s) + hw_ids = homeworks.map{|hw| hw.id} if !homeworks.blank? index = hw_ids.index(hw.id) return index end From 0a774e793f06fbdc9cc895337f5d5be5643d3300 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 12 Sep 2017 17:37:53 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 1a400312b..1df371b9b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -4741,7 +4741,7 @@ end def get_hw_index(hw,is_teacher,type=0) homework_commons = hw.course.homework_commons - Rails.logger.info("----------------------------------------------"+hw.course) + Rails.logger.info("----------------------------------------------"+hw.course.to_s) if is_teacher if type != 0 homeworks = homework_commons.where("homework_commons.homework_type = #{type}").order("created_at asc") From a50209362348e1c1f3dcf287fe15a5e7dc59f74c Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 13 Sep 2017 16:24:26 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9TPM=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=BA=93=E7=9A=84tip=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/shixun_show.html.erb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/views/repositories/shixun_show.html.erb b/app/views/repositories/shixun_show.html.erb index 287b74392..39423fdb3 100644 --- a/app/views/repositories/shixun_show.html.erb +++ b/app/views/repositories/shixun_show.html.erb @@ -3,9 +3,14 @@

- 使用Git提交代码时，请在Git客户端填写如下信息：
- * 用户名：请使用您绑定的邮箱
- * 口令：请使用您的登录口令
+ 提交代码的方法：
+ 1、在你自己的电脑安装Git tortoise客户端，
+ 或者其他你熟悉的Git客户端；
+ 2、在Git客户端向左侧的地址提交代码。
+ 注意：
+ 请务必在Git客户端填写如下信息：
+ * 用户名：使用您在本平台绑定的邮箱
+ * 口令：使用您在本平台的登录口令

From 91f141d9b83ad3c9df1f248740a31aea79504535 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 13 Sep 2017 16:30:36 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E2=80=9C=E6=88=91=E7=9A=84=E5=AE=9E=E8=AE=AD=E2=80=9D=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E4=B8=8D=E6=89=93=E5=BC=80=E6=96=B0=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E8=AF=B7=E7=9B=B4=E6=8E=A5=E5=88=B7=E6=96=B0=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index b3ffa379e..4567d408d 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -223,7 +223,7 @@ <% if User.current.mail.blank? %>
  • + 新建
    • <% else %> -
  • <%= link_to "+ 新建", new_shixun_path, :target => "_blank", :class => "color-light-green fr font-14 mr20", :style => "line-height:56px" %>
    • +
  • <%= link_to "+ 新建", new_shixun_path, :class => "color-light-green fr font-14 mr20", :style => "line-height:56px" %>
    • <% end %>
    From 44d1e1dfcc7f81aafcf58a046a2de0bba30692d6 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 13 Sep 2017 16:42:47 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E6=8F=90=E4=BA=A4=E5=8E=86=E5=8F=B2=E9=A1=B5?= =?UTF-8?q?=E5=92=8C=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=8C=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E4=B8=8E=E5=AF=BC=E8=88=AA=E9=87=8D=E5=8F=A0=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/commits.html.erb | 2 +- app/views/repositories/shixun_commit_diff.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/repositories/commits.html.erb b/app/views/repositories/commits.html.erb index 0502b6235..0103552db 100644 --- a/app/views/repositories/commits.html.erb +++ b/app/views/repositories/commits.html.erb @@ -1,4 +1,4 @@ -
    +
      <%= render :partial => 'shixun_navigation' %> diff --git a/app/views/repositories/shixun_commit_diff.html.erb b/app/views/repositories/shixun_commit_diff.html.erb index 1570978b9..bd56d8878 100644 --- a/app/views/repositories/shixun_commit_diff.html.erb +++ b/app/views/repositories/shixun_commit_diff.html.erb @@ -1,4 +1,4 @@ -
      +
      <%=link_to "返回提交历史".html_safe,