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 1/2] =?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("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 565px; margin-top:-10px;' class='resourceClose'></a>");
-        $('#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("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 565px; margin-top:-10px;' class='resourceClose'></a>");
+                            $('#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("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 565px; margin-top:-10px;' class='resourceClose'></a>");
+                            $('#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("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 565px; margin-top:-10px;' class='resourceClose'></a>");
-                        $('#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("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 565px; margin-top:-10px;' class='resourceClose'></a>");
-                        $('#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("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 565px; margin-top:-10px;' class='resourceClose'></a>");
+                            $('#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("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 565px; margin-top:-10px;' class='resourceClose'></a>");
@@ -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("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 565px; margin-top:-10px;' class='resourceClose'></a>");
-                    $('#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("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 565px; margin-top:-10px;' class='resourceClose'></a>");
+        $('#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 2/2] =?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 @@
         <input type="text" id="course_student_name" value="<%= @name%>" placeholder="姓名、学号、邮箱" class="hworkSearchInput" onkeypress="SearchByName('<%= student_work_index_path(:homework => @homework.id)%>',event);"/>
         <a class="hworkSearchIcon" id="search_in_student_work" onclick="SearchByName_1('<%= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)"></a>
       </div>
-      <%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?  %>