From 7f3fcb7d019fb74907cf91aa94b45cc5af0d71bb Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 15 Apr 2016 14:54:17 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E7=B2=BE=E5=93=81=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E7=9A=84=E5=85=A8=E9=83=A8=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E5=8F=AF=E7=82=B9=E5=87=BB=E5=8A=A8=E6=80=81=E6=95=B0?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admin_controller.rb | 15 ++++++++++++--- app/views/admin/excellent_all_courses.html.erb | 4 ++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 81407d95d..99732fc6b 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -65,9 +65,18 @@ class AdminController < ApplicationController #精品课程下的全部课程 def excellent_all_courses - @name = params[:name] - @courses = Course.like(@name).order('created_at desc') - @courses = paginateHelper @courses,30 + name = params[:name] + @order = "" + if params[:order] == 'asc' + courses = Course.find_by_sql("SELECT c.*,count(c.id) FROM courses c,course_activities ca WHERE c.id = ca.course_id AND c.name like '%#{name}%' GROUP BY c.id ORDER BY count(c.id) asc, c.id desc") + @order = params[:order] + elsif params[:order] == 'desc' + courses = Course.find_by_sql("SELECT c.*,count(c.id) FROM courses c,course_activities ca WHERE c.id = ca.course_id AND c.name like '%#{name}%' GROUP BY c.id ORDER BY count(c.id) DESC, c.id desc") + @order = params[:order] + else + courses = Course.like(name).order('created_at desc') + end + @courses = paginateHelper courses,30 @page = (params['page'] || 1).to_i - 1 respond_to do |format| format.html diff --git a/app/views/admin/excellent_all_courses.html.erb b/app/views/admin/excellent_all_courses.html.erb index 7554885a9..86e4556f9 100644 --- a/app/views/admin/excellent_all_courses.html.erb +++ b/app/views/admin/excellent_all_courses.html.erb @@ -48,8 +48,8 @@ 帖子数 - - 动态数 + + <%=link_to '动态数', excellent_all_courses_path(:order=> @order == "desc" ? 'asc' : 'desc') %> From 4c4afb7a94eca657e8d705932ebb807fb790434d Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 15 Apr 2016 15:57:49 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=9C=A8=E6=96=B0=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E4=B8=AD=E6=89=93=E5=BC=80=E4=BD=9C=E4=B8=9A=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E7=9A=84=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/homework_common/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb index e4b63a536..e34cf0736 100644 --- a/app/views/homework_common/index.html.erb +++ b/app/views/homework_common/index.html.erb @@ -47,7 +47,7 @@ From eeecc5ad08a6a659786eb909dbfeaa520bc041e4 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 15 Apr 2016 17:06:45 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=8C=BF=E8=AF=84?= =?UTF-8?q?=E7=9A=84=E4=BD=9C=E4=B8=9A=E7=82=B9=E5=87=BB=E8=AF=84=E5=88=86?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=97=B6=E4=B8=8D=E5=BA=94=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E7=BC=BA=E8=AF=84=E6=89=A3=E5=88=86=E7=9A=84=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_work_controller.rb | 2 +- app/views/student_work/_set_score_rule_detail.html.erb | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index 36a48f2a3..cd7aa39bc 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -775,7 +775,7 @@ class StudentWorkController < ApplicationController @homework.save end - unless homework_detail_manual.absence_penalty.to_s == params[:absence_penalty].to_s + if params[:absence_penalty] && homework_detail_manual.absence_penalty.to_s != params[:absence_penalty].to_s homework_detail_manual.absence_penalty = params[:absence_penalty] if homework_detail_manual.comment_status == 3 #当前作业处于匿评结束状态，修改缺评扣分才会修改每个作品应扣分的值 work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")" diff --git a/app/views/student_work/_set_score_rule_detail.html.erb b/app/views/student_work/_set_score_rule_detail.html.erb index c8451e478..28ca9e785 100644 --- a/app/views/student_work/_set_score_rule_detail.html.erb +++ b/app/views/student_work/_set_score_rule_detail.html.erb @@ -4,10 +4,12 @@ 迟交扣分 -
- 缺评扣分 - -
+ <% if homework.anonymous_comment == 0 %> +
+ 缺评扣分 + +
+ <% end %> <% if homework.homework_type == 2%>
From 764dffd95e57474f238d650cb0d0f672ee923740 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 15 Apr 2016 17:07:38 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=8A=A8=E6=80=81=E9=87=8C=E9=9D=A2?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E4=BB=A3=E7=A0=81=E6=9F=A5=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_work_controller.rb | 13 +- .../courses/_compare_code_tips_1.html.erb | 19 +-- app/views/courses/_show_compare_code.html.erb | 2 +- app/views/courses/code_repeat.html.erb | 2 +- .../student_work/_student_work_list.html.erb | 2 +- app/views/student_work/work_canrepeat.js.erb | 101 ++++++++++++ app/views/users/_course_homework.html.erb | 151 +----------------- config/routes.rb | 2 + public/stylesheets/courses.css | 2 +- public/stylesheets/new_user.css | 10 ++ 10 files changed, 142 insertions(+), 162 deletions(-) create mode 100644 app/views/student_work/work_canrepeat.js.erb diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index 6383a0d24..2849bdf90 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -5,7 +5,7 @@ class StudentWorkController < ApplicationController include ApplicationHelper require 'bigdecimal' require "base64" - before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:program_test_ex,:code_repeattest,:set_score_rule,:forbidden_anonymous_comment,:delete_work,:new_student_work_project,:student_work_project,:cancel_relate_project,:search_course_students] + before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:program_test_ex,:code_repeattest,:work_canrepeat,:set_score_rule,:forbidden_anonymous_comment,:delete_work,:new_student_work_project,:student_work_project,:cancel_relate_project,:search_course_students] before_filter :find_work, :only => [:edit, :update, :show, :destroy, :add_score, :praise_student_work,:retry_work,:revise_attachment] before_filter :member_of_course, :only => [:new, :create, :show, :add_score, :praise_student_work] before_filter :author_of_work, :only => [:edit, :update, :destroy] @@ -188,7 +188,7 @@ class StudentWorkController < ApplicationController #找出该作业的所有提交作业 def find_all_student_work_by_homeid() - all_studentwork = StudentWork.where("homework_common_id =?", @homework.id) + all_studentwork = StudentWork.where("homework_common_id =#{@homework.id} and is_test = 0 ") all_studentwork end @@ -222,6 +222,15 @@ class StudentWorkController < ApplicationController JSON.parse(res.body) end + def work_canrepeat + @homework_id = params[:homework] + @course_id = params[:course_id] + + all_studentwork = find_all_student_work_by_homeid() + + @work_count = all_studentwork.count + end + #代码查重 status: 0完成 -2不需要查重 -1查重失败不支持该语言 def code_repeattest tStarttime = Time.now diff --git a/app/views/courses/_compare_code_tips_1.html.erb b/app/views/courses/_compare_code_tips_1.html.erb index 4dc073797..a2230bd46 100644 --- a/app/views/courses/_compare_code_tips_1.html.erb +++ b/app/views/courses/_compare_code_tips_1.html.erb @@ -37,11 +37,12 @@ console.log(data); if (data.status == 0) { - $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"查重完成,是否立即查看结果?",:status=>1, :homework=> homework,:courseid=> courseid})%>'); + $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"查重完成，是否立即查看结果？",:status=>1, :homework=> homework,:courseid=> courseid})%>'); showModal('ajax-modal', '580px'); $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before(""); - $('#ajax-modal').parent().css("top","40%").css("left","50%"); + $('#ajax-modal').before(""); + //$('#ajax-modal').parent().css("top","40%").css("left","50%"); + $('#ajax-modal').parent().css("top","30%").css("left","50%").css("padding-top","10px").css("position","fixed"); $('#ajax-modal').parent().addClass("resourceUploadPopup"); $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); @@ -54,8 +55,8 @@ $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起目前只支持java/c/c++的代码查重!",:status=>0, :homework=> homework,:courseid=> courseid})%>'); showModal('ajax-modal', '580px'); $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before(""); - $('#ajax-modal').parent().css("top","40%").css("left","50%"); + $('#ajax-modal').before(""); + $('#ajax-modal').parent().css("top","30%").css("left","50%").css("padding-top","10px").css("position","fixed"); $('#ajax-modal').parent().addClass("resourceUploadPopup"); $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); @@ -69,8 +70,8 @@ $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起该作业的作品过少不能查重!",:status=>0, :homework=> homework,:courseid=> courseid})%>'); showModal('ajax-modal', '580px'); $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before(""); - $('#ajax-modal').parent().css("top","40%").css("left","50%"); + $('#ajax-modal').before(""); + $('#ajax-modal').parent().css("top","30%").css("left","50%").css("padding-top","10px").css("position","fixed"); $('#ajax-modal').parent().addClass("resourceUploadPopup"); $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); @@ -85,8 +86,8 @@ $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起,服务器繁忙请稍后再试!",:status=>0, :homework=> homework,:courseid=> courseid})%>'); showModal('ajax-modal', '580px'); $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before(""); - $('#ajax-modal').parent().css("top","40%").css("left","50%"); + $('#ajax-modal').before(""); + $('#ajax-modal').parent().css("top","30%").css("left","50%").css("padding-top","10px").css("position","fixed"); $('#ajax-modal').parent().addClass("resourceUploadPopup"); $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); diff --git a/app/views/courses/_show_compare_code.html.erb b/app/views/courses/_show_compare_code.html.erb index 00bea362e..0d5dd36ec 100644 --- a/app/views/courses/_show_compare_code.html.erb +++ b/app/views/courses/_show_compare_code.html.erb @@ -12,7 +12,7 @@ <% if @simi_value.to_i >= 90 %>
相似度<%=@simi_value.to_i%>%
<% else %> -
相似度<%=@simi_valu.to_i%>%
+
相似度<%=@simi_value.to_i%>%
<% end %>

<%=dst_name%>

diff --git a/app/views/courses/code_repeat.html.erb b/app/views/courses/code_repeat.html.erb index ccca72a20..0748dc30f 100644 --- a/app/views/courses/code_repeat.html.erb +++ b/app/views/courses/code_repeat.html.erb @@ -48,7 +48,7 @@ <%= link_to("查看", show_comparecode_course_path(:homework_id => @homework.id,:src_id => student_work.id,:dst_id => student_work.simi_id.to_i),:class => "cha-btn",:remote => true ) %> <%else%> -
  • 无
    • +
  • --
  • --
  • --
  • --
    • diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb index f6d310269..213bf267a 100644 --- a/app/views/student_work/_student_work_list.html.erb +++ b/app/views/student_work/_student_work_list.html.erb @@ -19,7 +19,7 @@
    <%if @homework.homework_type == 2 %> - 代码查重 + <%= link_to "代码查重", work_canrepeat_student_work_index_path(homework:@homework.id, course_id:@course.id), class: 'BlueCirBtn fr',:remote => true %> <% end %> <%= select_tag(:student_work_in_group,options_for_select(course_group_list(@course),@group), {:class => "classSplit"}) unless course_group_list(@course).empty? %> <% end%> diff --git a/app/views/student_work/work_canrepeat.js.erb b/app/views/student_work/work_canrepeat.js.erb new file mode 100644 index 000000000..d4efd470e --- /dev/null +++ b/app/views/student_work/work_canrepeat.js.erb @@ -0,0 +1,101 @@ +//代码查重 +var homework_id = <%=@homework.id%>; +<% if @work_count <= 1 %> + //弹框 + $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起该作业的作品过少不能查重!",:status=>0, :homework=> @homework,:courseid=> @course_id})%>'); + showModal('ajax-modal', '580px'); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before(""); + $('#ajax-modal').parent().css("top", "30%").css("left", "50%").css("padding-top", "10px").css("position", "fixed"); + $('#ajax-modal').parent().addClass("resourceUploadPopup"); + $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); + + function closeModal() { + hideModal($(".blue-border-box")); + } +<% else %> + <% if !@homework.simi_time %> + test_repeat(); + <% else%> + $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_1',:locals => {:homework=> @homework,:courseid=>@course_id })%>'); + $('#compare-tips-1').html('您上次查重的时间为<%= Time.parse(@homework.simi_time.to_s).strftime("%Y-%m-%d %H-%M-%S")%>'); + showModal('ajax-modal', '580px'); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before(""); + $('#ajax-modal').parent().css("top", "30%").css("left", "50%").css("padding-top", "10px").css("position", "fixed"); + $('#ajax-modal').parent().addClass("resourceUploadPopup"); + $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); + + function closeModal() { + hideModal($(".blue-border-box")); + } + <% end %> + + //请求查重 + var test_repeat = function () { + $.post( + '/student_work/code_repeattest', + {homework: homework_id}, + function (data, status) { + if (data.status == 0) { + $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"查重完成是否立即查看结果?",:status=>1, :homework=> @homework,:courseid=> @course_id})%>'); + showModal('ajax-modal', '580px'); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before(""); + $('#ajax-modal').parent().css("top", "30%").css("left", "50%").css("padding-top", "10px").css("position", "fixed"); + $('#ajax-modal').parent().addClass("resourceUploadPopup"); + $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); + + function closeModal() { + hideModal($(".blue-border-box")); + } + } + else if (data.status == -1) { + // confirm("对不起只支持java/c/c++的代码查重!"); + $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起目前只支持java/c/c++的代码查重!",:status=>0, :homework=> @homework,:courseid=> @course_id})%>'); + showModal('ajax-modal', '580px'); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before(""); + $('#ajax-modal').parent().css("top", "30%").css("left", "50%").css("padding-top", "10px").css("position", "fixed"); + $('#ajax-modal').parent().addClass("resourceUploadPopup"); + $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); + + function closeModal() { + hideModal($(".blue-border-box")); + } + + } + else if (data.status == -2) { + // confirm("对不起该作业的作品过少不能查重!"); + $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起该作业的作品过少不能查重!",:status=>0, :homework=> @homework,:courseid=> @course_id})%>'); + showModal('ajax-modal', '580px'); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before(""); + $('#ajax-modal').parent().css("top", "30%").css("left", "50%").css("padding-top", "10px").css("position", "fixed"); + $('#ajax-modal').parent().addClass("resourceUploadPopup"); + $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); + + function closeModal() { + hideModal($(".blue-border-box")); + } + } + } + ).fail(function (xhr, status) { + // confirm("对不起,服务器繁忙请稍后再试!"); + $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起,服务器繁忙请稍后再试!",:status=>0, :homework=> @homework,:courseid=> @course_id})%>'); + showModal('ajax-modal', '580px'); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before(""); + $('#ajax-modal').parent().css("top", "30%").css("left", "50%").css("padding-top", "10px").css("position", "fixed"); + $('#ajax-modal').parent().addClass("resourceUploadPopup"); + $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); + + function closeModal() { + hideModal($(".blue-border-box")); + } + }); + }; +<% end %> + + + diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index 07a7194a7..351001bb8 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -46,10 +46,6 @@ <% end%> <% end%> - <% if is_teacher && activity.homework_type == 2 %> - 代码查重 - <% end %> -
    <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1%> 系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"linkBlue",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！ @@ -80,7 +76,10 @@
    <%= link_to "模拟答题", new_user_commit_homework_users_path(homework_id: activity.id, is_test: true), class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>
    - <% end %> +
    + <%= link_to "代码查重", work_canrepeat_student_work_index_path(homework: activity.id, course_id: activity.course.id), class: 'c_blue test-program-btn',:remote => true %> +
    + <% end %> <% if activity.homework_type == 2%>
    语言： @@ -382,146 +381,4 @@ $("#relatePWrap_<%=user_activity_id %>").toggleClass('relatePWrap'); $("#moreProject_<%=user_activity_id %>").show(); }); - - //代码查重 - function code_repeat(){ - - var homework_id = <%=@homework.id%>; - var course_id = <%=@course.id%>; - - console.log("course_id=",course_id); - console.log("homework_id=",homework_id); - - if(<%= @stundet_works.count <=1 %>) - { - //弹框 - $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起该作业的作品过少不能查重!",:status=>0, :homework=> @homework,:courseid=> @course.id})%>'); - showModal('ajax-modal', '580px'); - $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before(""); - $('#ajax-modal').parent().css("top","40%").css("left","50%"); - $('#ajax-modal').parent().addClass("resourceUploadPopup"); - $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); - - function closeModal(){ - hideModal($(".blue-border-box")); - } - return; - } - - //先请求下上次查询的时间 - $.post( - '/student_work/last_codecomparetime', - {homework: homework_id}, - function(data,status){ - if (data.status == 0) { - var homework_simi_time = data.comparetime; - - if (homework_simi_time == 0){ - //没进行过代码查重则直接查重 - test_repeat(); - } - else{ - $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_1',:locals => {:homework=> @homework,:courseid=> @course.id })%>'); - $('#compare-tips-1').html('您上次查重的时间为'+homework_simi_time); - showModal('ajax-modal', '580px'); - $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before(""); - $('#ajax-modal').parent().css("top","40%").css("left","50%"); - $('#ajax-modal').parent().addClass("resourceUploadPopup"); - $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); - console.log(homework_simi_time); - - function closeModal(){ - hideModal($(".blue-border-box")); - } - } - } - } - ).fail(function(xhr, status){ -// confirm("对不起,服务器繁忙请稍后再试!"); - $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起,服务器繁忙请稍后再试!",:status=>0, :homework=> @homework,:courseid=> @course.id})%>'); - showModal('ajax-modal', '580px'); - $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before(""); - $('#ajax-modal').parent().css("top","40%").css("left","50%"); - $('#ajax-modal').parent().addClass("resourceUploadPopup"); - $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); - - function closeModal(){ - hideModal($(".blue-border-box")); - } - return; - }); - - //请求查重 - var test_repeat = function(){ - $.post( - '/student_work/code_repeattest', - {homework: homework_id}, - function(data,status){ - console.log("result = "); - console.log(data); - - if (data.status == 0) { - $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"查重完成是否立即查看结果?",:status=>1, :homework=> @homework,:courseid=> @course.id})%>'); - showModal('ajax-modal', '580px'); - $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before(""); - $('#ajax-modal').parent().css("top","40%").css("left","50%"); - $('#ajax-modal').parent().addClass("resourceUploadPopup"); - $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); - - function closeModal(){ - hideModal($(".blue-border-box")); - } - } - else if (data.status == -1){ -// confirm("对不起只支持java/c/c++的代码查重!"); - $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起目前只支持java/c/c++的代码查重!",:status=>0, :homework=> @homework,:courseid=> @course.id})%>'); - showModal('ajax-modal', '580px'); - $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before(""); - $('#ajax-modal').parent().css("top","40%").css("left","50%"); - $('#ajax-modal').parent().addClass("resourceUploadPopup"); - $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); - - function closeModal(){ - hideModal($(".blue-border-box")); - } - - } - else if (data.status == -2){ -// confirm("对不起该作业的作品过少不能查重!"); - $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起该作业的作品过少不能查重!",:status=>0, :homework=> @homework,:courseid=> @course.id})%>'); - showModal('ajax-modal', '580px'); - $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before(""); - $('#ajax-modal').parent().css("top","40%").css("left","50%"); - $('#ajax-modal').parent().addClass("resourceUploadPopup"); - $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); - - function closeModal(){ - hideModal($(".blue-border-box")); - } - } - return; - } - ).fail(function(xhr, status){ -// confirm("对不起,服务器繁忙请稍后再试!"); - $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起,服务器繁忙请稍后再试!",:status=>0, :homework=> @homework,:courseid=> @course.id})%>'); - showModal('ajax-modal', '580px'); - $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before(""); - $('#ajax-modal').parent().css("top","40%").css("left","50%"); - $('#ajax-modal').parent().addClass("resourceUploadPopup"); - $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px"); - - function closeModal(){ - hideModal($(".blue-border-box")); - } - return; - }); - }; - } diff --git a/config/routes.rb b/config/routes.rb index 3e2a7485b..fd7546749 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -268,6 +268,7 @@ RedmineApp::Application.routes.draw do get 'retry_work' get 'praise_student_work' get 'forbidden_anonymous_comment' + get 'work_canrepeat' end collection do post 'add_score_reply' @@ -286,6 +287,7 @@ RedmineApp::Application.routes.draw do post 'code_repeattest' post 'last_codecomparetime' post 'set_score_rule' + get 'work_canrepeat' end end diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 21d6f9e92..d58d951d0 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1296,7 +1296,7 @@ a.contributor_course{float: right; color: #888; font-size: 12px; font-weight: no /*20160310分班样式*/ .select-class-option {width:125px;} -/* 弹框 */ +/* 代码查重弹框 */ a.Blue-btn{ display:block; margin-right:15px;width:65px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle; text-align:center; border:1px solid #3598db; color:#3598db; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} a:hover.Blue-btn{ background:#3598db; color:#fff;} .fl{ float:left;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 4558437a2..6bd386f9f 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1487,3 +1487,13 @@ a.choose-active {background-color:#269ac9; color:#ffffff;} a.st_up{ display: block; width:8px; float:left; height:13px; background:url(../images/pic_up.png) 0 0 no-repeat; margin-top:5px; margin-left:3px;} a.st_down{ display: block; width:8px; float:left; height:13px; background:url(../images/pic_up.png) 0 -22px no-repeat; margin-top:5px; margin-left:3px;} a.st_img { display:block;width:32px; height:32px; border:1px solid #CCC; padding:1px;} + +/* 代码查重弹框 */ +a.Blue-btn{ display:block; margin-right:15px;width:65px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle; text-align:center; border:1px solid #3598db; color:#3598db; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} +a:hover.Blue-btn{ background:#3598db; color:#fff;} +.fl{ float:left;} +.fr{ float:right;} +.blue-border-box{ width:500px; padding:20px; margin:0 auto; background:#fff;} +.box-con h4{ font-size:14px; font-weight: bold; width:450px; text-align:center;} +.box-con{ width:450px; margin:0 auto; text-align:center;} +.box-con-a{ width:170px; margin:0 auto; margin-top:10px;} From 8611fbbdec41fc0cda238e17b499d12adf129445 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 15 Apr 2016 17:10:44 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=B8=AD=E5=85=B3=E4=BA=8E=E5=AD=A6=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E8=BE=93=E5=85=A5=E6=8F=90=E7=A4=BA=E4=B8=8D=E5=90=88?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E6=8F=90=E7=A4=BA=E4=B8=BA=E5=8F=AA=E8=83=BD?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=95=B0=E5=AD=97=EF=BC=8C=E4=BD=86=E6=98=AF?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E8=B4=9F=E6=95=B0=E6=88=96=E5=B0=8F=E6=95=B0?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E8=83=BD=E6=89=A7=E8=A1=8C=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=EF=BC=8C=E5=BA=94=E8=AF=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=8F=AA=E8=83=BD=E8=BE=93=E5=85=A5=E6=AD=A3=E6=95=B4?= =?UTF-8?q?=E6=95=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/course.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/javascripts/course.js b/public/javascripts/course.js index b5255f786..4e698e6f2 100644 --- a/public/javascripts/course.js +++ b/public/javascripts/course.js @@ -114,7 +114,7 @@ function regex_course_class_period() } else { - $("#course_class_period_notice").html("学时总数必须为数字"); + $("#course_class_period_notice").html("学时总数必须为正整数"); $("#course_class_period_notice").show(); return false; } From 19a95dfc9c61cb7eb204e142f8481ec5030c9922 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 15 Apr 2016 17:36:23 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E4=BB=A3=E7=A0=81=E6=9F=A5=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_homework_detail.html.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index 780b1c6eb..e483f3daf 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -74,6 +74,9 @@
    <%= link_to "模拟答题", new_user_commit_homework_users_path(homework_id: homework_common.id, is_test: true), class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>
    +
    + <%= link_to "代码查重", work_canrepeat_student_work_index_path(homework: homework_common.id, course_id: homework_common.course_id), class: 'c_blue test-program-btn',:remote => true %> +
    <% end %> <% if homework_common.homework_type == 2%>
    From 5aba3fb11bfd0cedfb530892bc85e6e60697fb54 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 15 Apr 2016 18:48:39 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E9=87=8D?= =?UTF-8?q?=E6=9C=89=E6=97=B6=E5=80=99=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 1 + app/views/student_work/work_canrepeat.js.erb | 126 +++++++++---------- config/routes.rb | 1 - 3 files changed, 63 insertions(+), 65 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 89f4dd3b0..e40e11ddb 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -956,6 +956,7 @@ class CoursesController < ApplicationController @student_works.each do |tmpwork| @works_hash[tmpwork.id] = tmpwork + puts tmpwork.id end #respond_to do |format| diff --git a/app/views/student_work/work_canrepeat.js.erb b/app/views/student_work/work_canrepeat.js.erb index d4efd470e..090f63fd2 100644 --- a/app/views/student_work/work_canrepeat.js.erb +++ b/app/views/student_work/work_canrepeat.js.erb @@ -1,5 +1,4 @@ //代码查重 -var homework_id = <%=@homework.id%>; <% if @work_count <= 1 %> //弹框 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起该作业的作品过少不能查重!",:status=>0, :homework=> @homework,:courseid=> @course_id})%>'); @@ -14,60 +13,59 @@ var homework_id = <%=@homework.id%>; hideModal($(".blue-border-box")); } <% else %> - <% if !@homework.simi_time %> - test_repeat(); - <% else%> - $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_1',:locals => {:homework=> @homework,:courseid=>@course_id })%>'); - $('#compare-tips-1').html('您上次查重的时间为<%= Time.parse(@homework.simi_time.to_s).strftime("%Y-%m-%d %H-%M-%S")%>'); - showModal('ajax-modal', '580px'); - $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before(""); - $('#ajax-modal').parent().css("top", "30%").css("left", "50%").css("padding-top", "10px").css("position", "fixed"); - $('#ajax-modal').parent().addClass("resourceUploadPopup"); - $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); + <% if !@homework.simi_time %> + //请求查重 + var test_repeat = function () { + $.post( + '/student_work/code_repeattest', + {homework: <%=@homework.id%>}, + function (data, status) { + if (data.status == 0) { + $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"查重完成是否立即查看结果?",:status=>1, :homework=> @homework,:courseid=> @course_id})%>'); + showModal('ajax-modal', '580px'); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before(""); + $('#ajax-modal').parent().css("top", "30%").css("left", "50%").css("padding-top", "10px").css("position", "fixed"); + $('#ajax-modal').parent().addClass("resourceUploadPopup"); + $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); - function closeModal() { - hideModal($(".blue-border-box")); - } - <% end %> + function closeModal() { + hideModal($(".blue-border-box")); + } + } + else if (data.status == -1) { + // confirm("对不起只支持java/c/c++的代码查重!"); + $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起目前只支持java/c/c++的代码查重!",:status=>0, :homework=> @homework,:courseid=> @course_id})%>'); + showModal('ajax-modal', '580px'); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before(""); + $('#ajax-modal').parent().css("top", "30%").css("left", "50%").css("padding-top", "10px").css("position", "fixed"); + $('#ajax-modal').parent().addClass("resourceUploadPopup"); + $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); - //请求查重 - var test_repeat = function () { - $.post( - '/student_work/code_repeattest', - {homework: homework_id}, - function (data, status) { - if (data.status == 0) { - $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"查重完成是否立即查看结果?",:status=>1, :homework=> @homework,:courseid=> @course_id})%>'); - showModal('ajax-modal', '580px'); - $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before(""); - $('#ajax-modal').parent().css("top", "30%").css("left", "50%").css("padding-top", "10px").css("position", "fixed"); - $('#ajax-modal').parent().addClass("resourceUploadPopup"); - $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); + function closeModal() { + hideModal($(".blue-border-box")); + } - function closeModal() { - hideModal($(".blue-border-box")); } - } - else if (data.status == -1) { - // confirm("对不起只支持java/c/c++的代码查重!"); - $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起目前只支持java/c/c++的代码查重!",:status=>0, :homework=> @homework,:courseid=> @course_id})%>'); - showModal('ajax-modal', '580px'); - $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before(""); - $('#ajax-modal').parent().css("top", "30%").css("left", "50%").css("padding-top", "10px").css("position", "fixed"); - $('#ajax-modal').parent().addClass("resourceUploadPopup"); - $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); + else if (data.status == -2) { + // confirm("对不起该作业的作品过少不能查重!"); + $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起该作业的作品过少不能查重!",:status=>0, :homework=> @homework,:courseid=> @course_id})%>'); + showModal('ajax-modal', '580px'); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before(""); + $('#ajax-modal').parent().css("top", "30%").css("left", "50%").css("padding-top", "10px").css("position", "fixed"); + $('#ajax-modal').parent().addClass("resourceUploadPopup"); + $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); - function closeModal() { - hideModal($(".blue-border-box")); + function closeModal() { + hideModal($(".blue-border-box")); + } } - } - else if (data.status == -2) { - // confirm("对不起该作业的作品过少不能查重!"); - $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起该作业的作品过少不能查重!",:status=>0, :homework=> @homework,:courseid=> @course_id})%>'); + ).fail(function (xhr, status) { + // confirm("对不起,服务器繁忙请稍后再试!"); + $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起,服务器繁忙请稍后再试!",:status=>0, :homework=> @homework,:courseid=> @course_id})%>'); showModal('ajax-modal', '580px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before(""); @@ -78,23 +76,23 @@ var homework_id = <%=@homework.id%>; function closeModal() { hideModal($(".blue-border-box")); } - } - } - ).fail(function (xhr, status) { - // confirm("对不起,服务器繁忙请稍后再试!"); - $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起,服务器繁忙请稍后再试!",:status=>0, :homework=> @homework,:courseid=> @course_id})%>'); - showModal('ajax-modal', '580px'); - $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before(""); - $('#ajax-modal').parent().css("top", "30%").css("left", "50%").css("padding-top", "10px").css("position", "fixed"); - $('#ajax-modal').parent().addClass("resourceUploadPopup"); - $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); + }); + }; + test_repeat(); + <% else%> + $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_1',:locals => {:homework=> @homework,:courseid=>@course_id })%>'); + $('#compare-tips-1').html('您上次查重的时间为<%= Time.parse(@homework.simi_time.to_s).strftime("%Y-%m-%d %H-%M-%S")%>'); + showModal('ajax-modal', '580px'); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before(""); + $('#ajax-modal').parent().css("top", "30%").css("left", "50%").css("padding-top", "10px").css("position", "fixed"); + $('#ajax-modal').parent().addClass("resourceUploadPopup"); + $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); - function closeModal() { - hideModal($(".blue-border-box")); - } - }); - }; + function closeModal() { + hideModal($(".blue-border-box")); + } + <% end %> <% end %> diff --git a/config/routes.rb b/config/routes.rb index b2645f02a..6cb7a1c7b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -268,7 +268,6 @@ RedmineApp::Application.routes.draw do get 'retry_work' get 'praise_student_work' get 'forbidden_anonymous_comment' - get 'work_canrepeat' end collection do post 'add_score_reply' From 3136191de86ecb13235ec428326564531a618229 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 15 Apr 2016 18:51:31 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=9F=A5=E9=87=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/work_canrepeat.js.erb | 124 +++++++++---------- 1 file changed, 61 insertions(+), 63 deletions(-) diff --git a/app/views/student_work/work_canrepeat.js.erb b/app/views/student_work/work_canrepeat.js.erb index d4efd470e..353a150cf 100644 --- a/app/views/student_work/work_canrepeat.js.erb +++ b/app/views/student_work/work_canrepeat.js.erb @@ -1,5 +1,4 @@ //代码查重 -var homework_id = <%=@homework.id%>; <% if @work_count <= 1 %> //弹框 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起该作业的作品过少不能查重!",:status=>0, :homework=> @homework,:courseid=> @course_id})%>'); @@ -15,59 +14,58 @@ var homework_id = <%=@homework.id%>; } <% else %> <% if !@homework.simi_time %> - test_repeat(); - <% else%> - $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_1',:locals => {:homework=> @homework,:courseid=>@course_id })%>'); - $('#compare-tips-1').html('您上次查重的时间为<%= Time.parse(@homework.simi_time.to_s).strftime("%Y-%m-%d %H-%M-%S")%>'); - showModal('ajax-modal', '580px'); - $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before(""); - $('#ajax-modal').parent().css("top", "30%").css("left", "50%").css("padding-top", "10px").css("position", "fixed"); - $('#ajax-modal').parent().addClass("resourceUploadPopup"); - $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); + //请求查重 + var test_repeat = function () { + $.post( + '/student_work/code_repeattest', + {homework: <%=@homework.id%>}, + function (data, status) { + if (data.status == 0) { + $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"查重完成是否立即查看结果?",:status=>1, :homework=> @homework,:courseid=> @course_id})%>'); + showModal('ajax-modal', '580px'); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before(""); + $('#ajax-modal').parent().css("top", "30%").css("left", "50%").css("padding-top", "10px").css("position", "fixed"); + $('#ajax-modal').parent().addClass("resourceUploadPopup"); + $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); - function closeModal() { - hideModal($(".blue-border-box")); - } - <% end %> + function closeModal() { + hideModal($(".blue-border-box")); + } + } + else if (data.status == -1) { + // confirm("对不起只支持java/c/c++的代码查重!"); + $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起目前只支持java/c/c++的代码查重!",:status=>0, :homework=> @homework,:courseid=> @course_id})%>'); + showModal('ajax-modal', '580px'); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before(""); + $('#ajax-modal').parent().css("top", "30%").css("left", "50%").css("padding-top", "10px").css("position", "fixed"); + $('#ajax-modal').parent().addClass("resourceUploadPopup"); + $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); - //请求查重 - var test_repeat = function () { - $.post( - '/student_work/code_repeattest', - {homework: homework_id}, - function (data, status) { - if (data.status == 0) { - $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"查重完成是否立即查看结果?",:status=>1, :homework=> @homework,:courseid=> @course_id})%>'); - showModal('ajax-modal', '580px'); - $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before(""); - $('#ajax-modal').parent().css("top", "30%").css("left", "50%").css("padding-top", "10px").css("position", "fixed"); - $('#ajax-modal').parent().addClass("resourceUploadPopup"); - $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); + function closeModal() { + hideModal($(".blue-border-box")); + } - function closeModal() { - hideModal($(".blue-border-box")); } - } - else if (data.status == -1) { - // confirm("对不起只支持java/c/c++的代码查重!"); - $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起目前只支持java/c/c++的代码查重!",:status=>0, :homework=> @homework,:courseid=> @course_id})%>'); - showModal('ajax-modal', '580px'); - $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before(""); - $('#ajax-modal').parent().css("top", "30%").css("left", "50%").css("padding-top", "10px").css("position", "fixed"); - $('#ajax-modal').parent().addClass("resourceUploadPopup"); - $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); + else if (data.status == -2) { + // confirm("对不起该作业的作品过少不能查重!"); + $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起该作业的作品过少不能查重!",:status=>0, :homework=> @homework,:courseid=> @course_id})%>'); + showModal('ajax-modal', '580px'); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before(""); + $('#ajax-modal').parent().css("top", "30%").css("left", "50%").css("padding-top", "10px").css("position", "fixed"); + $('#ajax-modal').parent().addClass("resourceUploadPopup"); + $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); - function closeModal() { - hideModal($(".blue-border-box")); + function closeModal() { + hideModal($(".blue-border-box")); + } } - } - else if (data.status == -2) { - // confirm("对不起该作业的作品过少不能查重!"); - $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起该作业的作品过少不能查重!",:status=>0, :homework=> @homework,:courseid=> @course_id})%>'); + ).fail(function (xhr, status) { + // confirm("对不起,服务器繁忙请稍后再试!"); + $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起,服务器繁忙请稍后再试!",:status=>0, :homework=> @homework,:courseid=> @course_id})%>'); showModal('ajax-modal', '580px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before(""); @@ -78,23 +76,23 @@ var homework_id = <%=@homework.id%>; function closeModal() { hideModal($(".blue-border-box")); } - } - } - ).fail(function (xhr, status) { - // confirm("对不起,服务器繁忙请稍后再试!"); - $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_2',:locals => {:des=>"对不起,服务器繁忙请稍后再试!",:status=>0, :homework=> @homework,:courseid=> @course_id})%>'); - showModal('ajax-modal', '580px'); - $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before(""); - $('#ajax-modal').parent().css("top", "30%").css("left", "50%").css("padding-top", "10px").css("position", "fixed"); - $('#ajax-modal').parent().addClass("resourceUploadPopup"); - $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); + }); + }; + test_repeat(); + <% else%> + $("#ajax-modal").html('<%= escape_javascript( render :partial => 'courses/compare_code_tips_1',:locals => {:homework=> @homework,:courseid=>@course_id })%>'); + $('#compare-tips-1').html('您上次查重的时间为<%= Time.parse(@homework.simi_time.to_s).strftime("%Y-%m-%d %H-%M-%S")%>'); + showModal('ajax-modal', '580px'); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before(""); + $('#ajax-modal').parent().css("top", "30%").css("left", "50%").css("padding-top", "10px").css("position", "fixed"); + $('#ajax-modal').parent().addClass("resourceUploadPopup"); + $('#ajax-modal').css("padding-left", "16px").css("padding-bottom", "16px"); - function closeModal() { - hideModal($(".blue-border-box")); - } - }); - }; + function closeModal() { + hideModal($(".blue-border-box")); + } + <% end %> <% end %> From c1c20fda3b26b9fd6e22da02da1b4bc7ee8c78a6 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 15 Apr 2016 18:59:47 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E4=B9=9F=E8=83=BD=E7=9C=8B=E5=88=B0=E4=BB=A3=E7=A0=81=E6=9F=A5?= =?UTF-8?q?=E9=87=8D=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_student_work_list.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb index 213bf267a..ac06d900e 100644 --- a/app/views/student_work/_student_work_list.html.erb +++ b/app/views/student_work/_student_work_list.html.erb @@ -18,7 +18,7 @@
    - <%if @homework.homework_type == 2 %> + <%if @homework.homework_type == 2 && @is_teacher %> <%= link_to "代码查重", work_canrepeat_student_work_index_path(homework:@homework.id, course_id:@course.id), class: 'BlueCirBtn fr',:remote => true %> <% end %> <%= select_tag(:student_work_in_group,options_for_select(course_group_list(@course),@group), {:class => "classSplit"}) unless course_group_list(@course).empty? %> From fcfd17c8c919fee15f4bfc5d0e4761bd5a86fbb9 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 15 Apr 2016 19:20:24 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=AF=84=E6=B5=8B=E7=9A=84=E4=B8=80=E4=B8=AABUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_work_controller.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index 2849bdf90..89ee77053 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -141,11 +141,12 @@ class StudentWorkController < ApplicationController if result["status"].to_i != -2 result["results"].first['user_wait'] = tUsedtime - end - if result["results"][0]["status"].to_i == 2 - result["status"] = 2 + if result["results"][0]["status"].to_i == 2 + result["status"] = 2 + end end + status = result["status"] if index == 1 student_work_test = student_work.student_work_tests.build(status: status, From 73b89cdde5eba28d4aa3f210a20b7293aa2b4deb Mon Sep 17 00:00:00 2001 From: txz Date: Mon, 18 Apr 2016 11:19:13 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=BE=B9=E6=A1=86?= =?UTF-8?q?=EF=BC=8C=E5=9B=9E=E5=A4=8D=E7=82=B9=E8=B5=9E=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/schema.rb | 5 ++- public/assets/wechat/activities.html | 42 +++++++++---------- public/assets/wechat/blog_detail.html | 6 +-- public/assets/wechat/course_discussion.html | 6 +-- public/assets/wechat/course_notice.html | 6 +-- public/assets/wechat/homework_detail.html | 6 +-- public/assets/wechat/issue_detail.html | 6 +-- public/assets/wechat/jour_message_detail.html | 6 +-- public/assets/wechat/project_discussion.html | 6 +-- public/javascripts/wechat/app.js | 2 +- public/stylesheets/weui/weixin.css | 13 +++--- 11 files changed, 53 insertions(+), 51 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 2fd7fd91d..f9eafe2d8 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20160408074854) do +ActiveRecord::Schema.define(:version => 20160414055511) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -809,6 +809,7 @@ ActiveRecord::Schema.define(:version => 20160408074854) do t.integer "anonymous_comment", :default => 0 t.integer "quotes", :default => 0 t.integer "is_open", :default => 0 + t.datetime "simi_time" end add_index "homework_commons", ["course_id", "id"], :name => "index_homework_commons_on_course_id_and_id" @@ -1685,6 +1686,8 @@ ActiveRecord::Schema.define(:version => 20160408074854) do t.integer "absence_penalty", :default => 0 t.float "system_score", :default => 0.0 t.boolean "is_test", :default => false + t.integer "simi_id" + t.integer "simi_value" end add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id" diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html index f5eded3ee..7494b7033 100644 --- a/public/assets/wechat/activities.html +++ b/public/assets/wechat/activities.html @@ -26,9 +26,9 @@
    -
    回复 ({{act.reply_count}})
    -
    赞 ({{act.praise_count}})
    -
    已赞 ({{act.praise_count}})
    +
    回复 ({{act.reply_count}})
    +
    赞 ({{act.praise_count}})
    +
    已赞 ({{act.praise_count}})
    @@ -51,9 +51,9 @@
    -
    回复 ({{act.reply_count}})
    -
    赞 ({{act.praise_count}})
    -
    已赞 ({{act.praise_count}})
    +
    回复 ({{act.reply_count}})
    +
    赞 ({{act.praise_count}})
    +
    已赞 ({{act.praise_count}})
    @@ -76,9 +76,9 @@
    -
    回复 ({{act.reply_count}})
    -
    赞 ({{act.praise_count}})
    -
    已赞 ({{act.praise_count}})
    +
    回复 ({{act.reply_count}})
    +
    赞 ({{act.praise_count}})
    +
    已赞 ({{act.praise_count}})
    @@ -119,9 +119,9 @@
    -
    回复 ({{act.reply_count}})
    -
    赞 ({{act.praise_count}})
    -
    已赞 ({{act.praise_count}})
    +
    回复 ({{act.reply_count}})
    +
    赞 ({{act.praise_count}})
    +
    已赞 ({{act.praise_count}})
    @@ -145,9 +145,9 @@
    -
    回复 ({{act.reply_count}})
    -
    赞 ({{act.praise_count}})
    -
    已赞 ({{act.praise_count}})
    +
    回复 ({{act.reply_count}})
    +
    赞 ({{act.praise_count}})
    +
    已赞 ({{act.praise_count}})
    @@ -183,9 +183,9 @@
    -
    回复 ({{act.reply_count}})
    -
    赞 ({{act.praise_count}})
    -
    已赞 ({{act.praise_count}})
    +
    回复 ({{act.reply_count}})
    +
    赞 ({{act.praise_count}})
    +
    已赞 ({{act.praise_count}})
    @@ -209,9 +209,9 @@
    -
    回复 ({{act.reply_count}})
    -
    赞 ({{act.praise_count}})
    -
    已赞 ({{act.praise_count}})
    +
    回复 ({{act.reply_count}})
    +
    赞 ({{act.praise_count}})
    +
    已赞 ({{act.praise_count}})
    diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html index b3b97f047..c1133f955 100644 --- a/public/assets/wechat/blog_detail.html +++ b/public/assets/wechat/blog_detail.html @@ -14,9 +14,9 @@
    -
    回复 ({{blog.comment_count}})
    -
    已赞 ({{blog.praise_count}})
    -
    赞 ({{blog.praise_count}})
    +
    回复 ({{blog.comment_count}})
    +
    已赞 ({{blog.praise_count}})
    +
    赞 ({{blog.praise_count}})
    diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html index 9c70dfcfc..3f095ab62 100644 --- a/public/assets/wechat/course_discussion.html +++ b/public/assets/wechat/course_discussion.html @@ -20,9 +20,9 @@
    -
    回复 ({{discussion.replies_count}})
    -
    已赞 ({{discussion.praise_count}})
    -
    赞 ({{discussion.praise_count}})
    +
    回复 ({{discussion.replies_count}})
    +
    已赞 ({{discussion.praise_count}})
    +
    赞 ({{discussion.praise_count}})
    diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html index 750543e03..3b7965733 100644 --- a/public/assets/wechat/course_notice.html +++ b/public/assets/wechat/course_notice.html @@ -20,9 +20,9 @@
    -
    回复 ({{news.comments_count}})
    -
    已赞 ({{news.praise_count}})
    -
    赞 ({{news.praise_count}})
    +
    回复 ({{news.comments_count}})
    +
    已赞 ({{news.praise_count}})
    +
    赞 ({{news.praise_count}})
    diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html index 776ecb4ce..fec0c4cff 100644 --- a/public/assets/wechat/homework_detail.html +++ b/public/assets/wechat/homework_detail.html @@ -26,9 +26,9 @@
    -
    回复 ({{homework.whomework_journal_count}})
    -
    已赞 ({{homework.praise_count}})
    -
    赞 ({{homework.praise_count}})
    +
    回复 ({{homework.whomework_journal_count}})
    +
    已赞 ({{homework.praise_count}})
    +
    赞 ({{homework.praise_count}})
    diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html index 38f732e6f..f61d803dd 100644 --- a/public/assets/wechat/issue_detail.html +++ b/public/assets/wechat/issue_detail.html @@ -24,9 +24,9 @@
    -
    回复 ({{issue.journals_count}})
    -
    已赞 ({{issue.praise_count}})
    -
    赞 ({{issue.praise_count}})
    +
    回复 ({{issue.journals_count}})
    +
    已赞 ({{issue.praise_count}})
    +
    赞 ({{issue.praise_count}})
    diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html index 7ce14e4a8..0bc87214b 100644 --- a/public/assets/wechat/jour_message_detail.html +++ b/public/assets/wechat/jour_message_detail.html @@ -11,9 +11,9 @@
    -
    回复 ({{message.reply_count}})
    -
    已赞 ({{message.praise_count}})
    -
    赞 ({{message.praise_count}})
    +
    回复 ({{message.reply_count}})
    +
    已赞 ({{message.praise_count}})
    +
    赞 ({{message.praise_count}})
    diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html index 185d06784..890b47a73 100644 --- a/public/assets/wechat/project_discussion.html +++ b/public/assets/wechat/project_discussion.html @@ -20,9 +20,9 @@
    -
    回复 ({{discussion.replies_count}})
    -
    已赞 ({{discussion.praise_count}})
    -
    赞 ({{discussion.praise_count}})
    +
    回复 ({{discussion.replies_count}})
    +
    已赞 ({{discussion.praise_count}})
    +
    赞 ({{discussion.praise_count}})
    diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js index bedd79ed4..35d2a1b3d 100644 --- a/public/javascripts/wechat/app.js +++ b/public/javascripts/wechat/app.js @@ -3,7 +3,7 @@ var apiUrl = '/api/v1/'; var debug = false; //调试标志,如果在本地请置为true if(debug===true){ - apiUrl = 'https://www.trustie.net/api/v1/'; + apiUrl = 'http://localhost:3000/api/v1/'; } app.factory('auth', function($http,$routeParams, $cookies, $q){ diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css index 3872bb649..f164b80e3 100644 --- a/public/stylesheets/weui/weixin.css +++ b/public/stylesheets/weui/weixin.css @@ -23,6 +23,7 @@ h1,h2,h3,h4,h5,p {padding:0px; margin:0px;} .c-grey3 {color:#555555;} a {color:#707070;} a.c-grey {color:#707070;} +a.c-grey2 {color:#9a9a9a;} a:link,a:visited{text-decoration:none;} a:hover,a:active{cursor:pointer;} a.link-blue {color:#269ac9;} @@ -38,7 +39,7 @@ a.underline {text-decoration:underline;} /*动态样式*/ .post-container {width:100%;} -.post-wrapper {width:98%; border:1px solid #e6e6e6; border-radius:3px; background-color:#ffffff; margin:15px auto;} +.post-wrapper {width:98%; border-radius:3px; box-shadow:0px 0px 8px rgba(146, 153, 169, 0.5); background-color:#ffffff; margin:15px auto;} .post-main {padding:10px; color:#9a9a9a;} .post-avatar {width:45px; height:45px; margin-right:10px;} .post-title {font-size:13px; text-align:left;} @@ -48,20 +49,18 @@ a.underline {text-decoration:underline;} .cl {clear:both; overflow:hidden;} .post-content {width:100%; font-size:13px; line-height:18px; height:90px; overflow:hidden; word-break:break-all; word-wrap:break-word;} .post-interactive {width:100%; height:35px; line-height:35px; vertical-align:middle; border-top:1px solid #e6e6e6; background-color:#f8f9fb;} -.post-interactive-column {width:50%; text-align:center; float:left; font-size:13px;} -.post-interactive-reply {width:50%; text-align:center; float:left; font-size:13px;} +.post-interactive-column, +.post-interactive-reply, .post-interactive-praise {width:50%; text-align:center; float:left; font-size:13px;} .more-wrap {width:100%;} .more-events {width:98%; font-size:13px; text-align:center; margin:0 auto; padding: 5px 0; border:1px solid #e6e6e6; border-radius:3px; background-color:#f8f9fb; } .border-bottom {border-bottom:1px solid #e6e6e6;} -.post-reply-wrap {width:100%; line-height:18px; background-color:#f8f9fb;} -.post-input-wrap {width:100%; line-height:18px; background-color:#f8f9fb;} +.post-reply-wrap, .post-input-wrap {width:100%; line-height:18px; background-color:#f8f9fb;} .post-reply-row {padding:10px; color:#9a9a9a;} .post-reply-avatar {width:45px; height:30px; text-align:center; margin-right:10px;} .post-reply-user {font-size:13px; text-align:left; margin-bottom:10px;} .post-reply-content {font-size:13px; text-align:left; word-break:break-all; word-wrap:break-word; overflow:hidden;} -.post-reply-date {font-size:13px;} -.post-reply-trigger {font-size:13px;} +.post-reply-date, .post-reply-trigger {font-size:13px;} .post-input-container {padding-right:2px;} .post-reply-input {width:100%; height:28px; line-height:28px; border:1px solid #e6e6e6; outline:none; padding:0; margin:0; border-radius:3px;} .post-reply-submit {font-size:13px; padding:3px 8px; color:#fff; background-color:#269ac9; outline:none; border:none; display:inline-block;} \ No newline at end of file