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] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E9=87=8D=E6=9C=89?=
=?UTF-8?q?=E6=97=B6=E5=80=99=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=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'