From 0141735db4b0e3adc87f2e605ee0f96058e7bedd Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 6 Mar 2017 11:03:33 +0800
Subject: [PATCH 01/15] =?UTF-8?q?=E9=97=AE=E5=90=A7=E5=B8=96=E5=AD=90?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E5=9B=9E=E5=A4=8D=E7=9A=84Url=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=B0=83=E6=95=B4=E4=B8=BA=E8=B6=85=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/_comment_reply_detail.html.erb         | 8 +++++++-
 app/views/projects/_project_comment_reply_detail.html.erb | 8 +++++++-
 .../_project_issue_comments_reply_detail.html.erb         | 8 +++++++-
 app/views/users/_comment_reply_detail.html.erb            | 8 +++++++-
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/app/views/projects/_comment_reply_detail.html.erb b/app/views/projects/_comment_reply_detail.html.erb
index 9c29a8ae9..c85bfbdc1 100644
--- a/app/views/projects/_comment_reply_detail.html.erb
+++ b/app/views/projects/_comment_reply_detail.html.erb
@@ -1,10 +1,16 @@
 <div class="orig_user fl">
   <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %>
 </div>
+<script type="text/javascript">
+    $(function(){
+        showNormalImage('reply_content_<%= comment.id %>');
+        autoUrl('reply_content_<%= comment.id %>');
+    });
+</script>
 <div class="orig_right fl" style="width: 93%;" onmouseout="$(this).find('.reply-right').hide();" onmouseover="$(this).find('.reply-right').show();">
   <%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %>
   <span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
-  <div class="orig_content ">
+  <div class="orig_content" id="reply_content_<%= comment.id %>">
     <% if comment.class == Journal %>
         <% if comment.details.any? %>
             <% details_to_strings(comment.details).each do |string| %>
diff --git a/app/views/projects/_project_comment_reply_detail.html.erb b/app/views/projects/_project_comment_reply_detail.html.erb
index 70082dae4..590f62470 100644
--- a/app/views/projects/_project_comment_reply_detail.html.erb
+++ b/app/views/projects/_project_comment_reply_detail.html.erb
@@ -1,10 +1,16 @@
 <div class="orig_user fl">
   <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %>
 </div>
+<script type="text/javascript">
+    $(function(){
+        showNormalImage('reply_content_<%= comment.id %>');
+        autoUrl('reply_content_<%= comment.id %>');
+    });
+</script>
 <div class="orig_right fl">
   <%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %>
   <span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
-  <div class="orig_content ">
+  <div class="orig_content" id="reply_content_<%= comment.id %>">
     <% if comment.class == Journal %>
         <% if comment.details.any? %>
             <% details_to_strings(comment.details).each do |string| %>
diff --git a/app/views/projects/_project_issue_comments_reply_detail.html.erb b/app/views/projects/_project_issue_comments_reply_detail.html.erb
index e3a675fc5..49ce59ce9 100644
--- a/app/views/projects/_project_issue_comments_reply_detail.html.erb
+++ b/app/views/projects/_project_issue_comments_reply_detail.html.erb
@@ -1,10 +1,16 @@
 <div class="orig_user fl">
   <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %>
 </div>
+<script type="text/javascript">
+    $(function(){
+        showNormalImage('reply_content_<%= comment.id %>');
+        autoUrl('reply_content_<%= comment.id %>');
+    });
+</script>
 <div class="orig_right fl" style="width: 93%;" onmouseout="$(this).find('.reply-right').hide();" onmouseover="$(this).find('.reply-right').show();">
   <%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %>
   <span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
-  <div class="orig_content ">
+  <div class="orig_content" id="reply_content_<%= comment.id %>">
     <% if comment.class == Journal %>
         <% if comment.details.any? %>
             <% details_to_strings(comment.details).each do |string| %>
diff --git a/app/views/users/_comment_reply_detail.html.erb b/app/views/users/_comment_reply_detail.html.erb
index d36ad498c..e7cd7e0b0 100644
--- a/app/views/users/_comment_reply_detail.html.erb
+++ b/app/views/users/_comment_reply_detail.html.erb
@@ -1,10 +1,16 @@
 <div class="orig_user fl">
 <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user), :alt => "用户头像" %>
 </div>
+<script type="text/javascript">
+    $(function(){
+        showNormalImage('reply_content_<%= comment.id %>');
+        autoUrl('reply_content_<%= comment.id %>');
+    });
+</script>
 <div class="<%= type == 'TrainingTask' ? 'new_orig_right fl' : 'orig_right fl'  %>" onmouseout="$(this).find('.reply-right').hide();" onmouseover="$(this).find('.reply-right').show();">
   <%= link_to comment.creator_user.show_name, user_path(comment.creator_user), :class => "content-username" %>
   <span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
-  <div class="orig_content">
+  <div class="orig_content" id="reply_content_<%= comment.id %>">
     <% if comment.class == Journal %>
         <% if comment.details.any? %>
             <% details_to_strings(comment.details).each do |string| %>

From dd0cb87d4f4d89255cf7d46d3d9cc018021a9b26 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 6 Mar 2017 11:19:51 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E5=8C=BA=E7=9A=84=E5=8A=A9=E6=95=99=E6=B2=A1=E6=9C=89=E5=B8=96?=
 =?UTF-8?q?=E5=AD=90=E7=BD=AE=E9=A1=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_course_new.html.erb  | 18 ++++++++----------
 app/views/boards/_course_show.html.erb |  6 ++++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/views/boards/_course_new.html.erb b/app/views/boards/_course_new.html.erb
index 774d1c100..3ffc4f9b0 100644
--- a/app/views/boards/_course_new.html.erb
+++ b/app/views/boards/_course_new.html.erb
@@ -126,16 +126,14 @@
         <p id="subjectmsg"></p>
       </div>
       <div id="topic_editor" style="display: none;">
-        <%if User.current.member_of_course?(course) %>
-            <div class="mt10">
-          <% if User.current.id == course.tea_id %>
-              <%= f.check_box :sticky, :value => topic.sticky %>
-              <%= label_tag 'message_sticky', l(:label_board_sticky) %>
-          <%= f.check_box :locked, :value => topic.locked %>
-          <%= label_tag 'message_locked', l(:label_board_locked) %>
-          <% end %>
-          <div class="cl"></div>
-        </div>
+        <%if User.current.allowed_to?(:as_teacher, course) %>
+          <div class="mt10">
+            <%= f.check_box :sticky, :value => topic.sticky %>
+            <%= label_tag 'message_sticky', l(:label_board_sticky) %>
+            <%= f.check_box :locked, :value => topic.locked %>
+            <%= label_tag 'message_locked', l(:label_board_locked) %>
+            <div class="cl"></div>
+          </div>
         <% end %>
         <div class="mt10">
           <div id="message_quote" class="wiki" style="width: 92%;word-break: break-all;word-wrap: break-word;margin-left: 40px;"></div>
diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index 2e401c19a..c41a8d254 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -6,8 +6,10 @@
     function reset_topic(){
         $("#message_subject").val("");
         $("#subjectmsg").text("");
-        document.getElementById("message_sticky").checked=false;
-        document.getElementById("message_locked").checked=false;
+        if(document.getElementById("message_sticky") && document.getElementById("message_locked")){
+            document.getElementById("message_sticky").checked=false;
+            document.getElementById("message_locked").checked=false;
+        }
         $("#topic_attachments").html("<%= escape_javascript(render :partial => 'attachments/form_course', :locals => {:container => Message.new, :isReply => @isReply})%>");
         message_content_editor.html("");
         $("#topic_editor").toggle();

From 54c16753cb2f8ec797a763a70e9647f0fc85b0fb Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 6 Mar 2017 14:13:59 +0800
Subject: [PATCH 03/15] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E5=8C=BA=EF=BC=8C=E9=9D=9E=E5=88=9B=E5=BB=BA=E8=80=85=E7=9A=84?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=94=A8=E6=88=B7=EF=BC=8C=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=B8=96=E5=AD=90=E7=BD=AE=E9=A1=B6=E7=9A=84=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_contest_new.html.erb | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/views/boards/_contest_new.html.erb b/app/views/boards/_contest_new.html.erb
index e2d89b835..fcc6b1c5d 100644
--- a/app/views/boards/_contest_new.html.erb
+++ b/app/views/boards/_contest_new.html.erb
@@ -126,14 +126,12 @@
         <p id="subjectmsg"></p>
       </div>
       <div id="topic_editor" style="display: none;">
-        <%if User.current.member_of_contest?(contest) %>
+        <%if User.current.admin_of_contest?(contest) %>
             <div class="mt10">
-              <% if User.current.id == contest.user_id %>
-                  <%= f.check_box :sticky, :value => topic.sticky %>
-                  <%= label_tag 'message_sticky', l(:label_board_sticky) %>
-                  <%= f.check_box :locked, :value => topic.locked %>
-                  <%= label_tag 'message_locked', l(:label_board_locked) %>
-              <% end %>
+              <%= f.check_box :sticky, :value => topic.sticky %>
+              <%= label_tag 'message_sticky', l(:label_board_sticky) %>
+              <%= f.check_box :locked, :value => topic.locked %>
+              <%= label_tag 'message_locked', l(:label_board_locked) %>
               <div class="cl"></div>
             </div>
         <% end %>

From 686cf8b92621b2966fa1b0f545e8a2571a4f0d35 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 6 Mar 2017 14:40:16 +0800
Subject: [PATCH 04/15] =?UTF-8?q?=E6=9C=80=E8=BF=91=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E4=B8=AD=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E6=98=BE=E7=A4=BA=E5=8D=95=E4=BD=8D=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/admin/latest_login_users.html.erb | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/views/admin/latest_login_users.html.erb b/app/views/admin/latest_login_users.html.erb
index a9e8e2feb..23a619389 100644
--- a/app/views/admin/latest_login_users.html.erb
+++ b/app/views/admin/latest_login_users.html.erb
@@ -92,15 +92,7 @@
                 <% end%>
               </td>
               <td align="center">
-                <% unless user.user_extensions.nil? %>
-                    <% if user.user_extensions.identity.to_i == 0 %>
-                    <!--优先取school中校名，如果校名不存在就取occupation-->
-                        <% occupation = user.user_extensions.school_id.nil? ? "" : (School.where("id =?", user.user_extensions.school_id)).first.try(:name) %>
-                        <%= occupation.blank? ? user.user_extensions.occupation : occupation %>
-                    <% else %>
-                        <%= user.user_extensions.occupation %>
-                    <% end %>
-                <% end %>
+                <%= user.user_extensions.school_id.nil? ? "" : (School.find user.user_extensions.school_id).try(:name) %>
               </td>
             </tr>
         <% end %>

From f0b7846453758152eff78333d226dcd51c2b666d Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 6 Mar 2017 15:45:25 +0800
Subject: [PATCH 05/15] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=BB=B6=E6=9C=9F=E5=8F=91=E5=B8=83=E7=9A=84=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=E4=B8=8D=E5=BA=94=E8=AF=A5=E5=85=81=E8=AE=B8=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=89=8B=E5=8A=A8=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_hidden_file.html.erb        | 22 +++++++++++++++-----
 app/views/files/_upload_course_files.erb     | 13 +++++++++++-
 app/views/files/file_hidden.js.erb           |  2 +-
 app/views/users/_user_homework_form.html.erb | 13 ++++++++++--
 4 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/app/views/files/_hidden_file.html.erb b/app/views/files/_hidden_file.html.erb
index c8de6586f..6d8d861d5 100644
--- a/app/views/files/_hidden_file.html.erb
+++ b/app/views/files/_hidden_file.html.erb
@@ -1,23 +1,24 @@
 <script src="/javascripts/jquery.datetimepicker.js" type="text/javascript"></script>
-<div id="muban_popup_box" style="width:300px;">
+<div id="muban_popup_box" style="width:340px;">
   <div class="muban_popup_top">
     <h3 class="fl">发布设置</h3>
     <a href="javascript:void(0);" class="muban_icons_close fr" onclick="$('#datetimepicker_mask').datetimepicker('destroy');"></a>
     <div class="cl"></div>
   </div>
 
-  <div class="muban_popup_con clear mt15" style="margin-left: 47px;">
+  <div class="muban_popup_con clear mt15" style="margin-left: 37px;">
     <%= form_tag(republish_file_course_file_path(@course,@file), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
         <div class="mb10">
           <label class="fl c_dark f14" style="margin-top: 4px;">延期发布：</label>
           <div class="calendar_div fl">
-            <input type="text" name="publish_time" id="datetimepicker_mask" placeholder="发布时间" style="width: 130px;" class="InputBox fl calendar_input" value="<%=format_time(@file.publish_time) %>">
+            <input type="text" name="publish_time" id="datetimepicker_mask" readonly="readonly" placeholder="发布时间" style="width: 130px;" class="InputBox fl calendar_input" value="<%=format_time(@file.publish_time) %>">
             <%#= calendar_for('attachment_publish_time')%>
           </div>
+          <a href="javascript:void(0)" id="reset_time" class="fl sy_btn_grey ml10" style="display: none;" onclick="reset_publish_time();">清空</a>
           <span class="fl c_red" style="margin-top: 4px;" id="publish_time_notice"></span>
           <div class="cl"></div>
         </div>
-        <a href="javascript:void(0);" class="fr sy_btn_blue" style="margin-right: 95px;" id="submit_file" onclick="submit_republish_file();">确定</a>
+        <a href="javascript:void(0);" class="fr sy_btn_blue" style="margin-right: 115px;" id="submit_file" onclick="submit_republish_file();">确定</a>
         <a href="javascript:void(0);" class="fr sy_btn_grey mr5" onclick="$('#datetimepicker_mask').datetimepicker('destroy');hideModal();">取消</a>
     <% end %>
   </div>
@@ -51,6 +52,11 @@
             $('#submit_file').parent().submit();
         }
     }
+
+    function reset_publish_time(){
+        $("#datetimepicker_mask").val('');
+        $("#reset_time").hide();
+    }
     $(function(){
         $('#datetimepicker_mask').datetimepicker({
             allowBlank:true,
@@ -58,7 +64,13 @@
             format:'Y-m-d H:i',
             formatTime:'H:i',
             formatDate:'Y-m-d',
-            validateOnBlur:false
+            validateOnBlur:false,
+            onSelectDate:function() {
+                $("#reset_time").show();
+            },
+            onSelectTime:function() {
+                $("#reset_time").show();
+            }
         });
     });
 </script>
\ No newline at end of file
diff --git a/app/views/files/_upload_course_files.erb b/app/views/files/_upload_course_files.erb
index 80cdd0cda..b396fbbab 100644
--- a/app/views/files/_upload_course_files.erb
+++ b/app/views/files/_upload_course_files.erb
@@ -52,6 +52,7 @@
                 <div class="calendar_div fl ml10">
                   <input type="text" name="publish_time" id="datetimepicker_mask" placeholder="发布时间(可选)"  style="width: 130px;" class="InputBox fl calendar_input" readonly="readonly">
                 </div>
+                <a href="javascript:void(0)" id="reset_time" class="fl sy_btn_grey ml10" style="display: none;" onclick="reset_publish_time();">清空</a>
                 <div class="cl"></div>
                 <span class="c_red f12" style="margin-top: 4px;" id="publish_time_notice"></span>
                 <div class="cl"></div>
@@ -109,6 +110,10 @@
             $('#submit_resource').parent().submit();
         <% end %>
     }
+    function reset_publish_time(){
+        $("#datetimepicker_mask").val('');
+        $("#reset_time").hide();
+    }
     $(function(){
         $('#datetimepicker_mask').datetimepicker({
             allowBlank:true,
@@ -116,7 +121,13 @@
             format:'Y-m-d H:i',
             formatTime:'H:i',
             formatDate:'Y-m-d',
-            validateOnBlur:false
+            validateOnBlur:false,
+            onSelectDate:function() {
+                $("#reset_time").show();
+            },
+            onSelectTime:function() {
+                $("#reset_time").show();
+            }
         });
     });
 </script>
\ No newline at end of file
diff --git a/app/views/files/file_hidden.js.erb b/app/views/files/file_hidden.js.erb
index 38c61660f..f8d66c854 100644
--- a/app/views/files/file_hidden.js.erb
+++ b/app/views/files/file_hidden.js.erb
@@ -1,2 +1,2 @@
 var htmlvalue = '<%= escape_javascript(render :partial => 'files/hidden_file',:locals => {:course => @course,:course_attachment_type => 1}) %>';
-pop_box_new(htmlvalue, 300, 140);
\ No newline at end of file
+pop_box_new(htmlvalue, 340, 140);
\ No newline at end of file
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index fb0f08a90..1ac38638d 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -68,7 +68,15 @@
               format:'Y-m-d H:i',
               formatTime:'H:i',
               formatDate:'Y-m-d',
-              validateOnBlur:false
+              validateOnBlur:false,
+              onSelectDate:function() {
+                  $("#reset_time").show();
+                  $("#homework_publish_time_div").show();
+              },
+              onSelectTime:function() {
+                  $("#reset_time").show();
+                  $("#homework_publish_time_div").show();
+              }
           });
           <% end %>
           <% allow_edit = homework.student_works.has_committed.count == 0 && homework.student_work_projects.count ==0 %>
@@ -94,6 +102,7 @@
       function reset_end_time(){
           $("#homework_end_time").val('');
           $("#homework_publish_time").val('');
+          $("#reset_time").hide();
           $("#homework_publish_time_div").hide();
       }
 
@@ -280,7 +289,7 @@
         <%# end %>
       </div>
       <% if !edit_mode || (edit_mode && homework.homework_detail_manual.comment_status.to_i < 1) %>
-      <a href="javascript:void(0)" id="reset_time" class="fl sy_btn_grey ml10" onclick="reset_end_time();">清空</a>
+      <a href="javascript:void(0)" id="reset_time" class="fl sy_btn_grey ml10" style="display: none;" onclick="reset_end_time();">清空</a>
       <% end %>
       <div class="fl <%= homework.publish_time.nil? ? 'none' : '' %> ml50" id="homework_publish_time_div">
         <label class="fl c_grey f14 mt5" style="margin-top: 4px;">发布时间（可选）：</label>

From 70a50757d5d951f4031d2c488820ea37d8e3980e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 6 Mar 2017 23:20:44 +0800
Subject: [PATCH 06/15] =?UTF-8?q?=E6=96=B0=E7=9A=84=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=EF=BC=8C=E5=9C=A8=E7=82=B9=E5=87=BB=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E6=9D=A5=E7=9A=84=E5=88=9D=E5=A7=8B=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E9=80=89=E6=8B=A9=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=9C=80=E8=A6=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/jquery.datetimepicker.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/javascripts/jquery.datetimepicker.js b/public/javascripts/jquery.datetimepicker.js
index 95785ec13..995890f6b 100644
--- a/public/javascripts/jquery.datetimepicker.js
+++ b/public/javascripts/jquery.datetimepicker.js
@@ -573,10 +573,12 @@
 					var _this = this;
 					_this.now = function() {
 						var d = new Date();
+
 						if( options.yearOffset )
 							d.setFullYear(d.getFullYear()+options.yearOffset);
                         d.setMinutes(0);
                         d.setSeconds(0);
+                        d.setHours(d.getHours() + 1);
 						return d;
 					};
 

From 6f3f54b1a862626b623e8c6499b62f30abe1c36c Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 6 Mar 2017 17:25:05 +0800
Subject: [PATCH 07/15] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=9F=BA=E4=BA=8E?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=9A=84=E5=9B=A2=E9=98=9F=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E5=88=9B=E5=BB=BA=E9=A1=B9=E7=9B=AE=E6=97=B6?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8F=96=E6=B6=88=EF=BC=8C=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E5=9B=9E=E5=88=B0=E4=BD=9C=E4=B8=9A=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb               | 6 ++++++
 app/views/contestant_works/_work_post_brief.html.erb | 2 +-
 app/views/projects/new.html.erb                      | 8 +++++++-
 app/views/student_work/_homework_post_brief.html.erb | 2 +-
 app/views/users/_contest_work.html.erb               | 2 +-
 app/views/users/_course_homework.html.erb            | 2 +-
 public/javascripts/course.js                         | 4 ++--
 7 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 453c2c3f6..2bae4296f 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -211,6 +211,12 @@ class ProjectsController < ApplicationController
       @trackers = Tracker.sorted.all
       @project = Project.new
       @project.safe_attributes = params[:project]
+      if params[:course_id]
+        @course = Course.find params[:course_id]
+      elsif params[:contest_id]
+        @contest = Contest.find params[:contest_id]
+      end
+
       render :layout => 'new_base'
     else
       redirect_to signin_url
diff --git a/app/views/contestant_works/_work_post_brief.html.erb b/app/views/contestant_works/_work_post_brief.html.erb
index 5f216b4fe..59d923a3c 100644
--- a/app/views/contestant_works/_work_post_brief.html.erb
+++ b/app/views/contestant_works/_work_post_brief.html.erb
@@ -12,7 +12,7 @@
   <%=get_cw_status(homework).html_safe %>
   <div class="cl"></div>
   <% if homework.work_type == 3 && homework.work_detail_group.base_on_project %>
-      <span class="c_red">系统提示：该题目要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"linkBlue",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
+      <span class="c_red">系统提示：该题目要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name, :contest_id => homework.contest_id),:target => "_blank",:class=>"linkBlue",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
   <% elsif homework.work_type == 3 && !homework.work_detail_group.base_on_project%>
       <span class="c_red">系统提示：该题目要求各组长提交作品，提交作品时请添加组成员。谢谢配合！</span>
   <% end %>
diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb
index 682a1b2a8..ce6a29e22 100644
--- a/app/views/projects/new.html.erb
+++ b/app/views/projects/new.html.erb
@@ -57,7 +57,13 @@
         </li>
         <li class=" ml90" >
           <a href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_new_project();" >提交</a>
-          <%= link_to "取消",user_activities_path(User.current.id),:class => "grey_btn fl c_white ml10"%>
+          <% if @course %>
+              <%= link_to "取消",homework_common_index_path(:course => @course.id),:class => "grey_btn fl c_white ml10"%>
+          <% elsif @contest %>
+              <%= link_to "取消",works_path(:contest => @contest.id),:class => "grey_btn fl c_white ml10"%>
+          <% else %>
+              <%= link_to "取消",user_activities_path(User.current.id),:class => "grey_btn fl c_white ml10"%>
+          <% end %>
           <div class="cl"></div>
         </li>
     <% end%>
diff --git a/app/views/student_work/_homework_post_brief.html.erb b/app/views/student_work/_homework_post_brief.html.erb
index 1d1397ab9..27c5c8444 100644
--- a/app/views/student_work/_homework_post_brief.html.erb
+++ b/app/views/student_work/_homework_post_brief.html.erb
@@ -11,7 +11,7 @@
 </div>
 <div class="cl"></div>
 <% if homework.homework_type == 3 && homework.homework_detail_group.base_on_project == 1%>
-    <span class="c_red">系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"linkBlue",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
+    <span class="c_red">系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name, :course_id => homework.course_id),:class=>"linkBlue",:target => "_blank",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
 <% elsif homework.homework_type == 3 && homework.homework_detail_group.base_on_project == 0%>
     <span class="c_red">系统提示：该作业要求各组长提交作品，提交作品时请添加组成员。谢谢配合！</span>
 <% end %>
diff --git a/app/views/users/_contest_work.html.erb b/app/views/users/_contest_work.html.erb
index d4bca6c3f..95e1786bf 100644
--- a/app/views/users/_contest_work.html.erb
+++ b/app/views/users/_contest_work.html.erb
@@ -29,7 +29,7 @@
 
       <div class="cl"></div>
       <% if activity.work_type == 3 && activity.work_detail_group.base_on_project %>
-          <span class="c_red">系统提示：该题目要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"linkBlue",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
+          <span class="c_red">系统提示：该题目要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name, :contest_id => activity.contest_id),:target => "_blank",:class=>"linkBlue",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
       <% elsif activity.work_type == 3 && !activity.work_detail_group.base_on_project%>
           <span class="c_red">系统提示：该题目要求各组长提交作品，提交作品时请添加组成员。谢谢配合！</span>
       <% end %>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 2385fac80..6aff3f743 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -27,7 +27,7 @@
 
       <div class="cl"></div>
       <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1%>
-          <span class="c_red">系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name),:class=>"linkBlue",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
+          <span class="c_red">系统提示：该作业要求各组长<%=link_to "创建项目", new_project_path(:host=>Setting.host_name, :course_id => activity.course_id),:target => "_blank",:class=>"linkBlue",:title=>"新建项目",:style=>"text-decoration:underline;"%>，组成员加入项目，然后由组长关联项目。谢谢配合！</span>
       <% elsif activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 0%>
           <span class="c_red">系统提示：该作业要求各组长提交作品，提交作品时请添加组成员。谢谢配合！</span>
       <% end %>
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 080e80dc1..547a82a56 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -796,7 +796,7 @@ function regex_homework_end_publish_time()
         var myDate = new Date();
         if($.trim($("#homework_publish_time").val()) == "")
         {
-            $("#homework_publish_time").val(formate_date(myDate));
+            $("#homework_publish_time").val(formate_time(myDate));
         }
         var publish_time = Date.parse($("#homework_publish_time").val());
         var end_time = Date.parse($("#homework_end_time").val());
@@ -836,7 +836,7 @@ function regex_work_end_publish_time()
     var myDate = new Date();
     if($.trim($("#homework_publish_time").val()) == "")
     {
-        $("#homework_publish_time").val(formate_time(myDate));
+        $("#homework_publish_time").val(formate_date(myDate));
     }
     var publish_time = Date.parse($("#homework_publish_time").val());
     var end_time = Date.parse($("#homework_end_time").val());

From 8f856da5686d80a04c0e78b5f28dcb33e86ab26e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 7 Mar 2017 10:17:14 +0800
Subject: [PATCH 08/15] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E8=AF=95=E5=8D=B7=E4=BF=9D=E5=AD=98=E5=90=8E=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_exercise.html.erb         | 10 +++++++++-
 app/views/exercise/_exercise_teacher.html.erb |  6 ++++--
 app/views/exercise/publish_exercise.js.erb    |  2 +-
 app/views/exercise/republish_exercise.js.erb  |  4 ++--
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/views/exercise/_exercise.html.erb b/app/views/exercise/_exercise.html.erb
index ac19d1908..b5ec08a39 100644
--- a/app/views/exercise/_exercise.html.erb
+++ b/app/views/exercise/_exercise.html.erb
@@ -23,6 +23,7 @@
                   <li><a href="<%= edit_exercise_path(exercise.id) %>" class="postOptionLink" title="编辑试卷">编&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;辑</a></li>
               <% end%>
               <li><a href="<%= exercise_path(exercise.id) %>" class="postOptionLink" title="查看试卷">查&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;看</a></li>
+              <li><a href="javascript:void(0)" onclick="send_exercise_to_course();" class="postOptionLink" title="发送到班级">发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送</a></li>
               <% if exercise.exercise_status == 1 %>
                   <% end_time_status = exercise.end_time.nil? ? 1 : (exercise.end_time <= Time.now ? 2 : 3) %>
                   <li><a href="javascript:" class="postOptionLink" onclick="exercise_submit(<%=end_time_status %>,<%= exercise.id%>,<%= exercise.exercise_name.length %>,<%=index.to_i %>);">发布试卷</a></li>
@@ -101,4 +102,11 @@
         </div>
     <% end%>
 
-<% end%>
\ No newline at end of file
+<% end%>
+
+<script>
+    function send_exercise_to_course(){
+        var htmlvalue = "<%= escape_javascript(render :partial => 'exercise/send_to_course', :locals => {:exercise => exercise}) %>";
+        pop_box_new(htmlvalue, 450, 325);
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/exercise/_exercise_teacher.html.erb b/app/views/exercise/_exercise_teacher.html.erb
index 1c52ecd79..3ff82243a 100644
--- a/app/views/exercise/_exercise_teacher.html.erb
+++ b/app/views/exercise/_exercise_teacher.html.erb
@@ -153,12 +153,14 @@
       <%= render :partial => 'exercise/total_questions_score', :locals => {:exercise => exercise, :current_score => current_score} %>
     </div>
 
-    <div class="ur_buttons" style="width: 220px;">
+    <div class="ur_buttons" style="width: 297px;">
       <%= link_to "返回", exercise_index_path(:course_id => @course.id),:class => "btn_grey_64_width" %>
       <a href="javascript:void(0)" onclick="send_exercise_to_course();" class="btn_green_64_width ml10 mr10">发送</a>
       <% if exercise.exercise_status == 1 %>
-        <%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "btn_blue_64_width" %>
+          <a class="btn_green_64_width mr10" onclick="$.get('<%= publish_exercise_exercise_path(@exercise) %>');">立即发布</a>
+          <%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "btn_blue_64_width" %>
       <% else %>
+        <span class="btn_grey_64_width mr10" title="测验已发布">立即发布</span>
         <span class="btn_grey_64_width" title="测验已发布，不可再编辑">编辑</span>
       <% end %>
     </div>
diff --git a/app/views/exercise/publish_exercise.js.erb b/app/views/exercise/publish_exercise.js.erb
index 71b32b194..4f739214f 100644
--- a/app/views/exercise/publish_exercise.js.erb
+++ b/app/views/exercise/publish_exercise.js.erb
@@ -2,5 +2,5 @@
 $("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise,:index =>@index}) %>");
 notice_box("发布成功");
 <% else %>
-    notice_box_redirect('<%= exercise_url(@exercise) %>', '发布成功');
+    notice_box_redirect('<%= exercise_index_path(:course_id => @course.id) %>', '发布成功');
 <% end %>
\ No newline at end of file
diff --git a/app/views/exercise/republish_exercise.js.erb b/app/views/exercise/republish_exercise.js.erb
index 372cd08dc..f33f0eb97 100644
--- a/app/views/exercise/republish_exercise.js.erb
+++ b/app/views/exercise/republish_exercise.js.erb
@@ -1,5 +1,5 @@
 $("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise,:index => @index}) %>");
-var htmlvalue = '<div id="muban_popup_box" style="width:400px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
+var htmlvalue = '<div id="muban_popup_box" style="width:300px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
         '<div class="clear muban_popup_con"><div class="newupload_conbox newupload_tishi"><p>取消成功</p>' +
         '<a href="javascript:void(0);" class="btn btn-blue  mt10" onclick="hideModal();">知道了</a></div></div></div>';
-pop_box_new(htmlvalue, 400, 152);
\ No newline at end of file
+pop_box_new(htmlvalue, 300, 152);
\ No newline at end of file

From 69e3c8e89346f3db70fb322746ead091f4f62bde Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 7 Mar 2017 11:14:47 +0800
Subject: [PATCH 09/15] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=BE=97=E5=88=86=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E5=88=86=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercise_controller.rb     | 4 ++++
 app/views/exercise/_student_table.html.erb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index adab61b01..c6b028639 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -654,6 +654,10 @@ class ExerciseController < ApplicationController
       # 更新提交状态
       cur_exercise_user = ExerciseUser.where("user_id =? and exercise_id=?", User.current, @exercise.id).first
       cur_exercise_user.update_attributes(:status => 1, :commit_status => 1)
+      if @exercise.time && @exercise.time != -1
+        score = calculate_student_score(@exercise, User.current)
+        cur_exercise_user.update_attributes(:score => score)
+      end
       # 答题过程中需要统计完成量
       #@uncomplete_question = get_uncomplete_question(@exercise, User.current)
       # 获取改学生的考试得分
diff --git a/app/views/exercise/_student_table.html.erb b/app/views/exercise/_student_table.html.erb
index 93744b661..a5b804671 100644
--- a/app/views/exercise/_student_table.html.erb
+++ b/app/views/exercise/_student_table.html.erb
@@ -47,7 +47,7 @@
 
       <script type="text/javascript">
           $(function(){
-              <% if Time.parse(h(@exercise.end_time)).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S") %>
+              <% if (!@exercise.time.nil? && @exercise.time != -1) || Time.parse(h(@exercise.end_time)).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S") %>
               $(".student_work_<%= exercise.id%>").mouseenter(function(){
                   $("#work_click_<%= exercise.id%>").show();
               }).mouseleave(function(){

From b8856f845ae26096a512c9a1fa5985d88e9e6254 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 7 Mar 2017 15:39:37 +0800
Subject: [PATCH 10/15] =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=A3=80=E7=B4=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercise_controller.rb        | 64 +++++++++++++++++--
 app/views/exercise/_student_exercise.html.erb | 14 ++--
 .../exercise/student_exercise_list.html.erb   |  2 +-
 .../exercise/student_exercise_list.js.erb     |  2 +
 4 files changed, 67 insertions(+), 15 deletions(-)
 create mode 100644 app/views/exercise/student_exercise_list.js.erb

diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index c6b028639..5d968dc47 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -483,6 +483,7 @@ class ExerciseController < ApplicationController
       end
     end
 =end
+    @name,@select_group = params[:name].to_s.strip || "",params[:group]
     @is_teacher = User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
     if @is_teacher
       @all_exercises = @course.exercises.order("created_at desc")
@@ -490,17 +491,53 @@ class ExerciseController < ApplicationController
       @all_exercises = @course.exercises.where("exercise_status > 1").order("created_at desc")
     end
     student_id = @course.student.blank? ? "(-1)" : "(" + @course.student.map{|student| student.student_id}.join(",") + ")"
-    @exercise_count = @exercise.exercise_users.where("commit_status = 1 and user_id in #{student_id}").count
-    if @is_teacher || (!@exercise.exercise_users.where("user_id = #{User.current.id} and user_id in #{student_id}").empty? && @exercise.end_time <= Time.now)
-      @exercise_users_list = @exercise.exercise_users.where("user_id in #{student_id}")
-      @show_all = true;
-    elsif !@exercise.exercise_users.where("user_id = #{User.current.id} and user_id in #{student_id}").empty? && @exercise.end_time > Time.now
-      @exercise_users_list = @exercise.exercise_users.where("user_id = ? and user_id in #{student_id}",User.current.id)
+    if @select_group
+      if @select_group == "0"
+        none_group_students = @course.members.select{ |member| member.course_group_id == 0 }
+        if none_group_students.empty?
+          student_in_group = '(0)'
+        else
+          student_in_group = '(' + none_group_students.map{ |member| member.user_id }.join(',')  + ')'
+        end
+      elsif @select_group == "-1"
+        all_group_students = @course.members.select{ |member| member.course_group_id }
+        if all_group_students.empty?
+          student_in_group = '(0)'
+        else
+          student_in_group = '(' + all_group_students.map{ |member| member.user_id }.join(',')  + ')'
+        end
+      else
+        course_group = CourseGroup.find_by_id(@select_group)
+        group_students = course_group.users
+        if group_students.empty?
+          student_in_group = '(0)'
+        else
+          student_in_group = '(' + group_students.map{ |user| user.id }.join(',')  + ')'
+        end
+      end
+      if @is_teacher || (!@exercise.exercise_users.where("user_id = #{User.current.id}").empty? && @exercise.end_time <= Time.now)
+        @exercise_users_list = search_exercise_member @exercise.exercise_users.where("user_id in #{student_id} and user_id in #{student_in_group}"), @name
+        @show_all = true;
+      elsif !@exercise.exercise_users.where("user_id = #{User.current.id}").empty? && @exercise.end_time > Time.now
+        @exercise_users_list = search_exercise_member @exercise.exercise_users.where("user_id = ? and user_id in #{student_id} and user_id in #{student_in_group}",User.current.id), @name
+      else
+        @exercise_users_list = []
+      end
+
     else
-      @exercise_users_list = []
+      if @is_teacher || (!@exercise.exercise_users.where("user_id = #{User.current.id}").empty? && @exercise.end_time <= Time.now)
+        @exercise_users_list = search_exercise_member @exercise.exercise_users.where("user_id in #{student_id}"), @name
+        @show_all = true;
+      elsif !@exercise.exercise_users.where("user_id = #{User.current.id}").empty? && @exercise.end_time > Time.now
+        @exercise_users_list = search_exercise_member @exercise.exercise_users.where("user_id = ? and user_id in #{student_id}",User.current.id), @name
+      else
+        @exercise_users_list = []
+      end
     end
+    @exercise_count = @exercise.exercise_users.where("commit_status = 1 and user_id in #{student_id}").count
     @left_nav_type = 8
     respond_to do |format|
+      format.js
       format.html
       format.xls {
         filename = "#{@course.teacher.lastname.to_s + @course.teacher.firstname}_#{@course.name}_#{@course.time.to_s + @course.term}_#{@exercise.exercise_name}#{l(:excel_exercise_list)}.xls"
@@ -893,6 +930,19 @@ class ExerciseController < ApplicationController
     xls_report.string
   end
 
+  #根据条件过滤作业结果
+  def search_exercise_member exercises,name
+    if name == ""
+      select_exercises = exercises
+    else
+      name = name.downcase
+      select_exercises = exercises.select{ |exercise|
+        exercise.user[:login].to_s.downcase.include?(name) || exercise.user.user_extensions[:student_id].to_s.downcase.include?(name) || (exercise.user[:lastname].to_s.downcase + exercise.user[:firstname].to_s.downcase).include?(name)
+      }
+    end
+    select_exercises
+  end
+
   # ExerciseUser记录用户是否已提交问卷有对应的记录则已提交，没有则新建一个
   def get_exercise_user exercise_id,user_id
     eu = ExerciseUser.find_by_exercise_id_and_user_id(exercise_id,user_id)
diff --git a/app/views/exercise/_student_exercise.html.erb b/app/views/exercise/_student_exercise.html.erb
index 522b842ad..04d874000 100644
--- a/app/views/exercise/_student_exercise.html.erb
+++ b/app/views/exercise/_student_exercise.html.erb
@@ -5,13 +5,13 @@
         (<%= @exercise_count%>人已答)
       </font>
   </span>
-  <%#if @is_teacher || @exercise.exercise_status == 3%>
-      <!--<div class="hworkSearchBox">
-        <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>-->
-      <%#= select_tag(:student_work_in_group,options_for_select(course_group_list(@course),@group), {:class => "classSplit"}) unless course_group_list(@course).empty?  %>
-  <%# end%>
+  <%if @is_teacher || @exercise.exercise_status == 3%>
+      <div class="hworkSearchBox">
+        <input type="text" id="course_student_name" value="<%= @name%>" placeholder="姓名、学号、邮箱" class="hworkSearchInput" onkeypress="SearchByName('<%= student_exercise_list_exercise_path(@exercise)%>',event);"/>
+        <a class="hworkSearchIcon" id="search_in_student_work" onclick="SearchByName_1('<%= student_exercise_list_exercise_path(@exercise)%>');" href="javascript:void(0)"></a>
+      </div>
+      <%= select_tag(:student_work_in_group,options_for_select(course_group_list(@course),@select_group), {:class => "classSplit"}) unless course_group_list(@course).empty?  %>
+  <% end %>
   <span class="fr c_grey"> <a href="javascript:void(0);" class="linkGrey2" id="homework_info_show" onclick="show_or_hide_info();" style="display: none">[ 显示测验信息 ]</a> </span>
 
   <div class="group_work_tip_box fontGrey2">
diff --git a/app/views/exercise/student_exercise_list.html.erb b/app/views/exercise/student_exercise_list.html.erb
index 1f2feba9e..10ba57ff3 100644
--- a/app/views/exercise/student_exercise_list.html.erb
+++ b/app/views/exercise/student_exercise_list.html.erb
@@ -114,7 +114,7 @@
 
     <div class="hworkListContainer">
       <div class="ctt2">
-        <div class="dis" id="homework_student_work_list">
+        <div class="dis" id="exercise_student_work_list">
           <%= render :partial => "exercise/student_exercise"%>
         </div>
       </div>
diff --git a/app/views/exercise/student_exercise_list.js.erb b/app/views/exercise/student_exercise_list.js.erb
new file mode 100644
index 000000000..dd9aa50c3
--- /dev/null
+++ b/app/views/exercise/student_exercise_list.js.erb
@@ -0,0 +1,2 @@
+$("#exercise_student_work_list").html("<%= escape_javascript(render :partial => 'exercise/student_exercise') %>");
+$("#export_student_work").replaceWith("<%= escape_javascript( link_to "导出成绩", student_exercise_list_exercise_path(@exercise.id,:course_id => @course.id, :group => @select_group, :name => @name, :format => 'xls'),:class=>'linkBlue', :id => 'export_student_work') %>");
\ No newline at end of file

From 7de40ac88b89449b19a059a5910239396ed31c8d Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 8 Mar 2017 09:54:15 +0800
Subject: [PATCH 11/15] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=EF=BC=88=E5=BE=AE=E4=BF=A1=E7=BE=A4=EF=BC=89-=E8=AF=84?=
 =?UTF-8?q?=E5=88=86=E4=BD=9C=E5=93=81=E8=A2=AB=E4=BF=AE=E6=94=B9=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb    |   4 +
 app/helpers/application_helper.rb             |   3 +-
 app/helpers/student_work_helper.rb            |  20 +-
 app/models/student_work.rb                    |   2 +-
 .../_contest_evaluation_group_work.html.erb   |   2 +-
 ..._contest_evaluation_un_group_work.html.erb |   2 +-
 .../_evaluation_un_group_work.html.erb        |   2 +-
 .../student_work/_evaluation_un_work.html.erb |   2 +-
 .../student_work/_evaluation_work.html.erb    |   2 +-
 ...07082304_add_re_commit_to_student_works.rb |   5 +
 db/schema.rb                                  | 176 ++++++++++++++----
 11 files changed, 168 insertions(+), 52 deletions(-)
 create mode 100644 db/migrate/20170307082304_add_re_commit_to_student_works.rb

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index cd433a450..d54774333 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -954,6 +954,9 @@ class StudentWorkController < ApplicationController
     render_attachment_warning_if_needed(@new_score)
 
     if @new_score.save
+      if @work.re_commit && @new_score.reviewer_role != 3
+        @work.re_commit = 0
+      end
       if @homework.homework_type == 3
         @is_group_leader = !@work.student_work_projects.empty?
       end
@@ -1351,6 +1354,7 @@ class StudentWorkController < ApplicationController
       student_work = StudentWork.find attachment.container_id
       CourseMessage.create(:user_id => student_work.homework_common.user_id, :course_id => student_work.homework_common.course_id, :viewed => false,:course_message_id=>attachment.container_id,:course_message_type=>'StudentWork',:status=>2)
     end
+    @work.update_attributes(:re_commit => 1)
     respond_to do |format|
       format.js
     end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0ddca7032..05565a9f2 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2566,7 +2566,8 @@ module ApplicationHelper
   #如果学生作品被打分后修改，应该给老师提示
   def send_message_to_teacher student_work
     if StudentWork === student_work
-      if student_work.student_works_scores.any?
+      if student_work.student_works_scores.where("reviewer_role != 3").any?
+        student_work.update_column('re_commit', 1)
         course = student_work.homework_common.course
         course.members.map(&:user_id).uniq.each do|user_id|
           if User.find(user_id).allowed_to?(:as_teacher, course)
diff --git a/app/helpers/student_work_helper.rb b/app/helpers/student_work_helper.rb
index afe16497b..89a9455f5 100644
--- a/app/helpers/student_work_helper.rb
+++ b/app/helpers/student_work_helper.rb
@@ -56,15 +56,19 @@ module StudentWorkHelper
     result
   end
 
-  def get_status status
+  def get_status status, re_commit
     str = ""
-    case status
-      when 0
-        str = "未提交"
-      when 1
-        str = "已提交"
-      when 2
-        str = "迟交"
+    if re_commit
+      str = "重新提交"
+    else
+      case status
+        when 0
+          str = "未提交"
+        when 1
+          str = "已提交"
+        when 2
+          str = "迟交"
+      end
     end
     str
   end
diff --git a/app/models/student_work.rb b/app/models/student_work.rb
index ffc369af0..9ea0e75eb 100644
--- a/app/models/student_work.rb
+++ b/app/models/student_work.rb
@@ -1,6 +1,6 @@
 #学生提交作品表 #work_status :0 未提交  1 已提交  2 迟交  3 分组作品复制的组员作品
 class StudentWork < ActiveRecord::Base
-  attr_accessible :name, :description, :homework_common_id, :user_id, :final_score, :teacher_score, :student_score, :teaching_asistant_score, :system_score, :work_score, :project_id, :is_test, :simi_id, :simi_value, :work_status, :commit_time, :late_penalty, :absence_penalty
+  attr_accessible :name, :description, :homework_common_id, :user_id, :final_score, :teacher_score, :student_score, :teaching_asistant_score, :system_score, :work_score, :project_id, :is_test, :simi_id, :simi_value, :work_status, :commit_time, :late_penalty, :absence_penalty, :re_commit
 
   belongs_to :homework_common
   belongs_to :user
diff --git a/app/views/contestant_works/_contest_evaluation_group_work.html.erb b/app/views/contestant_works/_contest_evaluation_group_work.html.erb
index dcbfa06ac..366b4ff92 100644
--- a/app/views/contestant_works/_contest_evaluation_group_work.html.erb
+++ b/app/views/contestant_works/_contest_evaluation_group_work.html.erb
@@ -4,7 +4,7 @@
       <span class="hidden fl" style="max-width:220px;"><%= student_work.name %></span>
       <span class="fontGrey2 ml5 fl">
         <% if student_work.work_status %>
-          <%= get_status student_work.work_status %>
+          <%= get_status student_work.work_status, student_work.re_commit %>
         <% end %>
       </span>
     </span>
diff --git a/app/views/contestant_works/_contest_evaluation_un_group_work.html.erb b/app/views/contestant_works/_contest_evaluation_un_group_work.html.erb
index 9a89110b3..caacd0e3f 100644
--- a/app/views/contestant_works/_contest_evaluation_un_group_work.html.erb
+++ b/app/views/contestant_works/_contest_evaluation_un_group_work.html.erb
@@ -4,7 +4,7 @@
       <span class="hidden fl" style="max-width:220px;"><%= student_work.name %></span>
       <span class="fontGrey2 ml5 fl">
         <% if student_work.work_status %>
-          <%= get_status student_work.work_status %>
+          <%= get_status student_work.work_status, student_work.re_commit %>
         <% end %>
       </span>
     </span>
diff --git a/app/views/student_work/_evaluation_un_group_work.html.erb b/app/views/student_work/_evaluation_un_group_work.html.erb
index 78c026bad..57c201620 100644
--- a/app/views/student_work/_evaluation_un_group_work.html.erb
+++ b/app/views/student_work/_evaluation_un_group_work.html.erb
@@ -5,7 +5,7 @@
     <span class="hidden fl" style="max-width:220px;"><%= student_work.name %></span>
     <span class="fontGrey2 ml5 fl">
       <% if student_work.work_status %>
-        <%= get_status student_work.work_status %>
+          <%= get_status student_work.work_status, student_work.re_commit %>
       <% end %>
     </span>
   </span>
diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index 04e48bf7d..18c42ba68 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -48,7 +48,7 @@
   <% end %>
   <td class="<%= @homework.homework_type ==2 ? 'hworkList110' : 'hworkList130' %> c_grey student_work_<%= student_work.id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
     <% if student_work.work_status%>
-        <%=get_status student_work.work_status %>
+        <%= get_status student_work.work_status, student_work.re_commit %>
     <% end %>
   </td>
   <td class="hworkList70 <%= score_color (!score_open || student_work.teacher_score.nil? ? nil : student_work.teacher_score)%>">
diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index 9d7d4dbb7..0432b83d1 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -72,7 +72,7 @@
   <% end%>
   <td class="hworkList130 pl10 c_grey student_work_<%= student_work.id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
     <% if student_work.work_status%>
-        <%=get_status student_work.work_status %>
+        <%= get_status student_work.work_status, student_work.re_commit %>
     <% end %>
   </td>
 
diff --git a/db/migrate/20170307082304_add_re_commit_to_student_works.rb b/db/migrate/20170307082304_add_re_commit_to_student_works.rb
new file mode 100644
index 000000000..2e189fff5
--- /dev/null
+++ b/db/migrate/20170307082304_add_re_commit_to_student_works.rb
@@ -0,0 +1,5 @@
+class AddReCommitToStudentWorks < ActiveRecord::Migration
+  def change
+    add_column :student_works, :re_commit, :boolean, :default => false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9e58e8485..bdbcd0a5e 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 => 20170210082105) do
+ActiveRecord::Schema.define(:version => 20170307082304) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -350,14 +350,16 @@ ActiveRecord::Schema.define(:version => 20170210082105) do
   add_index "changeset_parents", ["parent_id"], :name => "changeset_parents_parent_ids"
 
   create_table "changesets", :force => true do |t|
-    t.integer  "repository_id", :null => false
-    t.string   "revision",      :null => false
+    t.integer  "repository_id",                :null => false
+    t.string   "revision",                     :null => false
     t.string   "committer"
-    t.datetime "committed_on",  :null => false
+    t.datetime "committed_on",                 :null => false
     t.text     "comments"
     t.date     "commit_date"
     t.string   "scmid"
     t.integer  "user_id"
+    t.integer  "project_id"
+    t.integer  "type",          :default => 0
   end
 
   add_index "changesets", ["committed_on"], :name => "index_changesets_on_committed_on"
@@ -519,6 +521,13 @@ ActiveRecord::Schema.define(:version => 20170210082105) do
   add_index "contest_messages", ["contest_id"], :name => "index_contest_messages_on_contest_id"
   add_index "contest_messages", ["user_id"], :name => "index_contest_messages_on_user_id"
 
+  create_table "contest_notifications", :force => true do |t|
+    t.text     "title"
+    t.text     "content"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "contestant_for_contests", :force => true do |t|
     t.integer  "student_id"
     t.integer  "contest_id"
@@ -586,6 +595,37 @@ ActiveRecord::Schema.define(:version => 20170210082105) do
   add_index "contestant_works", ["user_id"], :name => "index_contestant_works_on_user_id"
   add_index "contestant_works", ["work_id"], :name => "index_contestant_works_on_work_id"
 
+  create_table "contesting_projects", :force => true do |t|
+    t.integer  "project_id"
+    t.string   "contest_id"
+    t.integer  "user_id"
+    t.string   "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+    t.string   "reward"
+  end
+
+  create_table "contesting_softapplications", :force => true do |t|
+    t.integer  "softapplication_id"
+    t.integer  "contest_id"
+    t.integer  "user_id"
+    t.string   "description"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+    t.string   "reward"
+  end
+
+  create_table "contestnotifications", :force => true do |t|
+    t.integer  "contest_id"
+    t.string   "title"
+    t.string   "summary"
+    t.text     "description"
+    t.integer  "author_id"
+    t.integer  "notificationcomments_count"
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
+  end
+
   create_table "contests", :force => true do |t|
     t.integer  "user_id"
     t.string   "name"
@@ -628,20 +668,6 @@ ActiveRecord::Schema.define(:version => 20170210082105) do
     t.integer  "container_id",   :default => 0
   end
 
-  create_table "course_class_post", :id => false, :force => true do |t|
-    t.integer  "班级id",   :default => 0,  :null => false
-    t.string   "班级名"
-    t.integer  "帖子id",   :default => 0,  :null => false
-    t.integer  "主贴id"
-    t.string   "帖子标题",   :default => "", :null => false
-    t.text     "帖子内容"
-    t.integer  "帖子用户id"
-    t.integer  "帖子回复数",  :default => 0,  :null => false
-    t.integer  "最后回帖id"
-    t.datetime "发帖时间",                   :null => false
-    t.datetime "帖子更新时间",                 :null => false
-  end
-
   create_table "course_contributor_scores", :force => true do |t|
     t.integer  "course_id"
     t.integer  "user_id"
@@ -832,6 +858,21 @@ ActiveRecord::Schema.define(:version => 20170210082105) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
+  create_table "delayed_jobs_20161218", :id => false, :force => true do |t|
+    t.integer  "id",         :default => 0, :null => false
+    t.integer  "priority",   :default => 0, :null => false
+    t.integer  "attempts",   :default => 0, :null => false
+    t.text     "handler",                   :null => false
+    t.text     "last_error"
+    t.datetime "run_at"
+    t.datetime "locked_at"
+    t.datetime "failed_at"
+    t.string   "locked_by"
+    t.string   "queue"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "discuss_demos", :force => true do |t|
     t.string   "title"
     t.text     "body"
@@ -944,11 +985,13 @@ ActiveRecord::Schema.define(:version => 20170210082105) do
     t.integer  "exercise_id"
     t.integer  "score"
     t.datetime "start_at"
-    t.datetime "created_at",                   :null => false
-    t.datetime "updated_at",                   :null => false
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
     t.datetime "end_at"
     t.integer  "status"
-    t.integer  "commit_status", :default => 0
+    t.integer  "commit_status",    :default => 0
+    t.integer  "objective_score",  :default => -1
+    t.integer  "subjective_score", :default => -1
   end
 
   create_table "exercises", :force => true do |t|
@@ -1064,17 +1107,44 @@ ActiveRecord::Schema.define(:version => 20170210082105) do
 
   add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id"
 
+  create_table "homework_bank_tests", :force => true do |t|
+    t.text     "input"
+    t.text     "output"
+    t.boolean  "test_type"
+    t.integer  "homework_bank_id"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  create_table "homework_banks", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "name"
+    t.text     "description"
+    t.integer  "homework_type"
+    t.integer  "quotes",                                    :default => 0
+    t.boolean  "is_public"
+    t.string   "language"
+    t.text     "standard_code",       :limit => 2147483647
+    t.integer  "min_num"
+    t.integer  "max_num"
+    t.boolean  "base_on_project"
+    t.string   "applicable_syllabus"
+    t.integer  "homework_common_id"
+    t.datetime "created_at",                                               :null => false
+    t.datetime "updated_at",                                               :null => false
+  end
+
   create_table "homework_commons", :force => true do |t|
     t.string   "name"
     t.integer  "user_id"
     t.text     "description"
-    t.date     "publish_time"
-    t.date     "end_time"
+    t.datetime "publish_time"
+    t.datetime "end_time"
     t.integer  "homework_type",     :default => 1
     t.string   "late_penalty"
     t.integer  "course_id"
-    t.datetime "created_at",                       :null => false
-    t.datetime "updated_at",                       :null => false
+    t.datetime "created_at",                           :null => false
+    t.datetime "updated_at",                           :null => false
     t.integer  "teacher_priority",  :default => 1
     t.integer  "anonymous_comment", :default => 0
     t.integer  "quotes",            :default => 0
@@ -1082,6 +1152,8 @@ ActiveRecord::Schema.define(:version => 20170210082105) do
     t.datetime "simi_time"
     t.integer  "score_open",        :default => 1
     t.integer  "anonymous_appeal",  :default => 0
+    t.integer  "homework_bank_id"
+    t.boolean  "is_update",         :default => false
   end
 
   add_index "homework_commons", ["course_id", "id"], :name => "index_homework_commons_on_course_id_and_id"
@@ -1137,6 +1209,16 @@ ActiveRecord::Schema.define(:version => 20170210082105) do
   add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id"
   add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id"
 
+  create_table "homework_samples", :force => true do |t|
+    t.text     "input"
+    t.text     "output"
+    t.integer  "homework_common_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  add_index "homework_samples", ["homework_common_id"], :name => "index_homework_samples_on_homework_common_id"
+
   create_table "homework_tests", :force => true do |t|
     t.text     "input"
     t.text     "output"
@@ -1154,6 +1236,10 @@ ActiveRecord::Schema.define(:version => 20170210082105) do
     t.datetime "updated_at",         :null => false
   end
 
+  create_table "innodb_monitor", :id => false, :force => true do |t|
+    t.integer "a"
+  end
+
   create_table "invite_lists", :force => true do |t|
     t.integer  "project_id"
     t.integer  "user_id"
@@ -1735,35 +1821,37 @@ ActiveRecord::Schema.define(:version => 20170210082105) do
   end
 
   create_table "projects", :force => true do |t|
-    t.string   "name",                   :default => "",    :null => false
+    t.string   "name",                                :default => "",    :null => false
     t.text     "description"
-    t.string   "homepage",               :default => ""
-    t.boolean  "is_public",              :default => true,  :null => false
+    t.string   "homepage",                            :default => ""
+    t.boolean  "is_public",                           :default => true,  :null => false
     t.integer  "parent_id"
     t.datetime "created_on"
     t.datetime "updated_on"
     t.string   "identifier"
-    t.integer  "status",                 :default => 1,     :null => false
+    t.integer  "status",                              :default => 1,     :null => false
     t.integer  "lft"
     t.integer  "rgt"
-    t.boolean  "inherit_members",        :default => false, :null => false
+    t.boolean  "inherit_members",                     :default => false, :null => false
     t.integer  "project_type"
-    t.boolean  "hidden_repo",            :default => false, :null => false
-    t.integer  "attachmenttype",         :default => 1
+    t.boolean  "hidden_repo",                         :default => false, :null => false
+    t.integer  "attachmenttype",                      :default => 1
     t.integer  "user_id"
-    t.integer  "dts_test",               :default => 0
+    t.integer  "dts_test",                            :default => 0
     t.string   "enterprise_name"
     t.integer  "organization_id"
     t.integer  "project_new_type"
     t.integer  "gpid"
     t.integer  "forked_from_project_id"
     t.integer  "forked_count"
-    t.integer  "publish_resource",       :default => 0
-    t.integer  "visits",                 :default => 0
-    t.integer  "hot",                    :default => 0
+    t.integer  "publish_resource",                    :default => 0
+    t.integer  "visits",                              :default => 0
+    t.integer  "hot",                                 :default => 0
     t.string   "invite_code"
     t.string   "qrcode"
-    t.integer  "qrcode_expiretime",      :default => 0
+    t.integer  "qrcode_expiretime",                   :default => 0
+    t.text     "script"
+    t.integer  "training_status",        :limit => 1, :default => 0
   end
 
   add_index "projects", ["lft"], :name => "index_projects_on_lft"
@@ -2064,6 +2152,7 @@ ActiveRecord::Schema.define(:version => 20170210082105) do
     t.datetime "commit_time"
     t.integer  "is_delete",                                     :default => 0
     t.integer  "appeal_penalty",                                :default => 0
+    t.boolean  "re_commit",                                     :default => false
   end
 
   add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id"
@@ -2249,6 +2338,19 @@ ActiveRecord::Schema.define(:version => 20170210082105) do
     t.integer "fields_bits",                 :default => 0
   end
 
+  create_table "training_tasks", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "tracker_id"
+    t.string   "subject"
+    t.text     "description"
+    t.datetime "created_at",                              :null => false
+    t.datetime "updated_at",                              :null => false
+    t.integer  "author_id"
+    t.integer  "status",      :limit => 1, :default => 0
+    t.integer  "position",    :limit => 1, :default => 0
+    t.integer  "result",                   :default => 0
+  end
+
   create_table "user_actions", :force => true do |t|
     t.integer  "user_id"
     t.string   "action_type"

From b83299772c11269f84d5f8ef959abef38d72b814 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 8 Mar 2017 10:22:05 +0800
Subject: [PATCH 12/15] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=B8=96=E5=AD=90?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=82=B9=E5=87=BB=E4=B9=8B=E5=90=8E=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=8F=98=E6=88=90=E5=B7=B2?=
 =?UTF-8?q?=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/messages_controller.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 4cdd82d72..2709db011 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -71,6 +71,9 @@ class MessagesController < ApplicationController
       end
       #render :action => "show", :layout => "base_courses"#by young
     elsif @project
+      #帖子消息状态更新
+      project_messages = ForgeMessage.where("user_id =? and forge_message_type =? and project_id =? and viewed =?", User.current.id, 'Message', @project.id, 0)
+      project_messages.update_all(:viewed => true)
       #@reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page
       # @replies =  @topic.children.
       #     includes(:author, :attachments, {:board => :project}).
@@ -83,6 +86,9 @@ class MessagesController < ApplicationController
         format.html {render :layout => 'base_projects'}
       end
     elsif @contest
+      #帖子消息状态更新
+      contest_messages = ContestMessage.where("user_id =? and contest_message_type =? and contest_id =? and viewed =?", User.current.id, 'Message', @contest.id, 0)
+      contest_messages.update_all(:viewed => true)
       @left_nav_type = 4
       respond_to do |format|
         format.js

From 42ab2496518b0fcefb2252522baf92f2ba827976 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 9 Mar 2017 10:58:46 +0800
Subject: [PATCH 13/15] =?UTF-8?q?=E5=B0=8F=E9=93=83=E9=93=9B=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E6=A0=87=E8=AF=86=E5=92=8C=E4=BA=8B=E6=83=85?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E6=9C=89=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/messages_controller.rb        |  3 +++
 app/models/news.rb                            | 18 ++++++++---------
 app/models/user.rb                            |  3 ++-
 .../layouts/_show_messages_list.html.erb      |  4 +++-
 .../users/_user_message_contest.html.erb      | 20 ++++++++++++++++++-
 app/views/users/_user_message_course.html.erb |  2 +-
 .../20170309024921_delete_contest_messages.rb |  8 ++++++++
 db/schema.rb                                  | 19 +++++++++++++++++-
 8 files changed, 63 insertions(+), 14 deletions(-)
 create mode 100644 db/migrate/20170309024921_delete_contest_messages.rb

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 2709db011..611ff3150 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -57,6 +57,9 @@ class MessagesController < ApplicationController
     @replies = @replies[@page * @limit..@page * @limit + 9]
     @reply = Message.new(:subject => "RE: #{@message.subject}")
     if @course
+      #帖子消息状态更新
+      course_messages = CourseMessage.where("user_id =? and course_message_type =? and course_id =? and viewed =?", User.current.id, 'Message', @course.id, 0)
+      course_messages.update_all(:viewed => true)
       #@replies =  @topic.children.
           #includes(:author, :attachments, :praise_tread_cache, {:board => :project}).
           #reorder("#{Message.table_name}.created_on DESC").
diff --git a/app/models/news.rb b/app/models/news.rb
index 1b091cf0d..21f663271 100644
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -69,7 +69,7 @@ class News < ActiveRecord::Base
                             :author_key => :author_id
   acts_as_watchable
 
-  after_create :act_as_course_activity, :add_author_as_watcher, :add_news_count, :act_as_student_score,:delay_news_wechat_send, :delay_news_send, :act_as_contest_message
+  after_create :act_as_course_activity, :add_author_as_watcher, :add_news_count, :act_as_student_score,:delay_news_wechat_send, :delay_news_send
   after_update :update_activity
   after_destroy :delete_kindeditor_assets, :decrease_news_count, :delete_org_activities, :down_course_score
 
@@ -230,13 +230,13 @@ class News < ActiveRecord::Base
   end
 
   def act_as_contest_message
-    if self.contest_id
-      self.contest.contest_members.each do | m|
-        if m.user_id != self.author_id
-          self.contest_messages << ContestMessage.new(:user_id => m.user_id, :contest_id => self.contest_id, :viewed => false)
-        end
-      end
-    end
+    # if self.contest_id
+    #   self.contest.contest_members.each do | m|
+    #     if m.user_id != self.author_id
+    #       self.contest_messages << ContestMessage.new(:user_id => m.user_id, :contest_id => self.contest_id, :viewed => false)
+    #     end
+    #   end
+    # end
   end
 
   def delay_news_send
@@ -265,7 +265,7 @@ class News < ActiveRecord::Base
       vs = []
       self.contest.contest_members.each do | m|
         if m.user_id != self.author_id
-          vs << {contest_message_type:'Contest',contest_message_id:self.id, :user_id => m.user_id,
+          vs << {contest_message_type:'News',contest_message_id:self.id, :user_id => m.user_id,
                  :contest_id => self.contest_id, :viewed => false}
 
           if vs.size >= 30
diff --git a/app/models/user.rb b/app/models/user.rb
index 0d2295ee8..74d7aeb26 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -402,7 +402,8 @@ class User < Principal
     end
     user = User.current
     onclick_time = user.onclick_time.onclick_time
-    course_count = CourseMessage.where("user_id =? and viewed =? and created_at >?", user.id, 0, onclick_time).count
+    delete_courses = Course.where(:is_delete => 1).blank? ? "(-1)" : "(" + Course.where(:is_delete => 1).map(&:id).join(",") + ")"
+    course_count = CourseMessage.where("user_id =? and viewed =? and created_at >? and course_id not in #{delete_courses}", user.id, 0, onclick_time).count
     contest_count = ContestMessage.where("user_id =? and viewed =? and created_at >?", user.id, 0, onclick_time).count
     forge_count = ForgeMessage.where("user_id =? and viewed =? and created_at >?", user.id, 0, onclick_time).count
     user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =? and created_at >?", user.id, 0, onclick_time).count
diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb
index d51f5e9e1..962a68774 100644
--- a/app/views/layouts/_show_messages_list.html.erb
+++ b/app/views/layouts/_show_messages_list.html.erb
@@ -59,7 +59,7 @@
           <% if ma.course_message.jour_type == 'Course' %>
               <li><a href="<%= course_feedback_path(ma.course_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> 在班级中留言了：<%= message_content(ma.course_message.notes)%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span>在班级中留言了：<%= message_content(ma.course_message.notes)%></a></li>
           <% elsif ma.course_message.jour_type == 'HomeworkCommon' %>
-              <li><a href="<%= homework_common_index_url_in_org(ma.course_id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> <%=ma.course_message.m_parent_id.nil? ? '回复了您的作业：' : '在作业中回复了您：' %><%= message_content(ma.course_message.notes)%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span><%=ma.course_message.m_parent_id.nil? ? '回复了您的作业：' : '在作业中回复了您：' %><%= message_content(ma.course_message.notes)%></a></li>
+              <li><a href="<%= student_work_index_path(:homework => ma.course_message.jour.id) %>" target="_blank" title="<%=ma.course_message.user.show_name %> <%=ma.course_message.m_parent_id.nil? ? '回复了您的作业：' : '在作业中回复了您：' %><%= message_content(ma.course_message.notes)%>"><span class="shadowbox_news_user"><%=ma.course_message.user.show_name %> </span><%=ma.course_message.m_parent_id.nil? ? '回复了您的作业：' : '在作业中回复了您：' %><%= message_content(ma.course_message.notes)%></a></li>
           <% else %>
               <% show_name = ma.course_message.jour.reviewer_role != 3 || ma.course_message.user.allowed_to?(:as_teacher, ma.course) %>
               <li><a href="<%= student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id,:show_work_id => ma.course_message.jour.student_work_id) %>" target="_blank" title="<%=show_name ? ma.course_message.user.show_name + "#{ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"同学"}" : "匿名用户" %> 回复了作品评论：<%= message_content(ma.course_message.notes)%>"><span class="shadowbox_news_user"><%=show_name ? ma.course_message.user.show_name + "#{ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"同学"}" : "匿名用户" %> </span>回复了作品评论：<%= message_content(ma.course_message.notes)%></a></li>
@@ -106,6 +106,8 @@
           <li><a href="<%= contestant_works_path(:work => ma.contest_message.id) %>" target="_blank" title="<%=ma.contest_message.user.show_name %> 发布的竞赛题：<%= ma.contest_message.name%>的截止日期快到了"><span class="shadowbox_news_user"><%=ma.contest_message.user.show_name %> </span>发布的竞赛题：<%= ma.contest_message.name%>的截止时间快到啦</a></li>
       <% elsif ma.contest_message_type == "Work" && ma.status == 2 %>
           <li><a href="<%= contestant_works_path(:work => ma.contest_message.id) %>" target="_blank" title="<%=ma.contest_message.user.show_name %> 启动了在线评审：<%= ma.contest_message.name%>"><span class="shadowbox_news_user"><%=ma.contest_message.user.show_name %> </span>启动了在线评审：<%= ma.contest_message.name%></a></li>
+      <% elsif ma.contest_message_type == "Work" && ma.status == 3 %>
+          <li><a href="<%= contestant_works_path(:work => ma.contest_message.id) %>" target="_blank" title="<%=ma.contest_message.user.show_name %> 关闭了在线评审：<%= ma.contest_message.name%>"><span class="shadowbox_news_user"><%=ma.contest_message.user.show_name %> </span>关闭了在线评审：<%= ma.contest_message.name%></a></li>
       <% elsif ma.contest_message_type == "Work" && ma.status == 4 %>
           <li><a href="<%= contestant_works_path(:work => ma.contest_message.id) %>" target="_blank" title="<%=ma.contest_message.user.show_name %> 在线评审启动失败(评委数为0或作品数为0)：<%= ma.contest_message.name%>"><span class="shadowbox_news_user"><%=ma.contest_message.user.show_name %> </span>在线评审启动失败(评委数为0或作品数为0)：<%= ma.contest_message.name%></a></li>
       <% elsif ma.contest_message_type == "Work" && ma.status == 5 %>
diff --git a/app/views/users/_user_message_contest.html.erb b/app/views/users/_user_message_contest.html.erb
index 04b83d09c..ad5656cc8 100644
--- a/app/views/users/_user_message_contest.html.erb
+++ b/app/views/users/_user_message_contest.html.erb
@@ -176,6 +176,24 @@
           <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
 
+    <!--关闭在线评审-->
+    <% elsif ma.contest_message_type == "Work" && ma.status == 3 && ma.contest_message %>
+      <ul class="homepageNewsList fl">
+        <div class="longMessageWidth">
+          <li class="homepageNewsPortrait fl">
+            <%= link_to image_tag(url_to_avatar(ma.contest_message.user), :width => "30", :height => "30"), user_path(ma.contest_message.user), :target => '_blank' %>
+          </li>
+          <li class="homepageNewsPubType fl">
+            <%= link_to ma.contest_message.user.show_name, user_path(ma.contest_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+            <span class="homepageNewsType fl">关闭了在线评审：</span>
+          </li>
+          <li class="messageInformationContents">
+            <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => "_blank"%>
+          </li>
+        </div>
+        <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+      </ul>
+
     <!--在线评审启动失败-->
     <% elsif ma.contest_message_type == "Work" && ma.status == 4 && ma.contest_message %>
         <ul class="homepageNewsList fl">
@@ -188,7 +206,7 @@
               <span class="homepageNewsType fl">在线评审启动失败<font class="c_red">(评委数为0或作品数为0)：</font></span>
             </li>
             <li class="messageInformationContents">
-              <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}"%>
+              <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => "_blank" %>
             </li>
           </div>
           <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index d9d9d756a..dd334d362 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -490,7 +490,7 @@
                     </span>
             </li>
             <li class="messageInformationContents">
-              <%= link_to message_content(ma.course_message.notes), homework_common_index_url_in_org( ma.course_id),
+              <%= link_to message_content(ma.course_message.notes), student_work_index_path(:homework => ma.course_message.jour.id),
                           :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
               <!--:onmouseover => "message_titile_show($(this),event)",-->
               <!--:onmouseout => "message_titile_hide($(this))" %>-->
diff --git a/db/migrate/20170309024921_delete_contest_messages.rb b/db/migrate/20170309024921_delete_contest_messages.rb
new file mode 100644
index 000000000..7e62be50e
--- /dev/null
+++ b/db/migrate/20170309024921_delete_contest_messages.rb
@@ -0,0 +1,8 @@
+class DeleteContestMessages < ActiveRecord::Migration
+  def up
+    ContestMessage.where("contest_message_type = 'Contest'").delete_all
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index bdbcd0a5e..990bb4f00 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 => 20170307082304) do
+ActiveRecord::Schema.define(:version => 20170309024921) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1456,6 +1456,23 @@ ActiveRecord::Schema.define(:version => 20170307082304) do
 
   add_index "memos", ["root_id"], :name => "index_memos_on_root_id"
 
+  create_table "mess", :id => false, :force => true do |t|
+    t.string   "课程名"
+    t.integer  "课程ID",                    :default => 0,  :null => false
+    t.string   "教师姓",                     :default => "", :null => false
+    t.string   "教师名",       :limit => 30, :default => "", :null => false
+    t.string   "主贴名",                     :default => "", :null => false
+    t.integer  "主贴或回帖ID",                 :default => 0,  :null => false
+    t.integer  "回帖对应主贴ID"
+    t.integer  "帖子点赞数"
+    t.integer  "主贴回复数",                   :default => 0,  :null => false
+    t.text     "主贴或回帖内容"
+    t.datetime "发帖时间",                                    :null => false
+    t.integer  "发帖或回帖用户ID",               :default => 0,  :null => false
+    t.string   "发帖或回帖用户姓",                :default => "", :null => false
+    t.string   "发帖或回帖用户名",  :limit => 30, :default => "", :null => false
+  end
+
   create_table "message_alls", :force => true do |t|
     t.integer  "user_id"
     t.integer  "message_id"

From 42b22ddb83d6b6985631a0e5ae64467632529678 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 9 Mar 2017 15:45:08 +0800
Subject: [PATCH 14/15] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=B0=8F=E9=BD=BF?=
 =?UTF-8?q?=E8=BD=AE=E4=B8=AD=E7=9A=84=E2=80=9C=E5=90=AF=E7=94=A8/?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=8C=BF=E8=AF=84=E2=80=9D=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E7=9A=84=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb    | 50 ++++++++++++-------
 .../forbidden_anonymous_comment.js.erb        | 23 ++++++---
 app/views/users/_homework_base_info.html.erb  |  8 +--
 3 files changed, 51 insertions(+), 30 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index d54774333..954667817 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -1317,29 +1317,43 @@ class StudentWorkController < ApplicationController
   end
 
   def forbidden_anonymous_comment
-    @homework.update_column('anonymous_comment', @homework.anonymous_comment == 0 ? 1 : 0)
     homework_detail_manual = @homework.homework_detail_manual
-    homework_detail_programing = @homework.homework_detail_programing
-    if @homework.anonymous_comment == 1
-      homework_detail_manual.ta_proportion = @homework.homework_type == 2 ? 0.4 : 1.0
-    else
-      homework_detail_manual.ta_proportion = @homework.homework_type == 2 ? 0.3 : 0.6
-    end
-    if @homework.homework_type == 2 && homework_detail_programing
+    if homework_detail_manual.comment_status != 0
+      @homework.update_column('anonymous_comment', @homework.anonymous_comment == 0 ? 1 : 0)
+      homework_detail_programing = @homework.homework_detail_programing
       if @homework.anonymous_comment == 1
-        homework_detail_programing.ta_proportion = 0.6
+        homework_detail_manual.ta_proportion = @homework.homework_type == 2 ? 0.4 : 1.0
+        @status = 1
       else
-        homework_detail_programing.ta_proportion = 0.5
+        if @homework.end_time < Time.now
+          homework_detail_manual.evaluation_start = (Time.now + 7*24*60*60).strftime("%Y-%m-%d")
+          homework_detail_manual.evaluation_end = homework_detail_manual.evaluation_start + 7
+          @status = 2
+        else
+          homework_detail_manual.evaluation_start = (@homework.end_time + 7*24*60*60).strftime("%Y-%m-%d")
+          homework_detail_manual.evaluation_end = homework_detail_manual.evaluation_start + 7
+          @status = 3
+        end
+        homework_detail_manual.ta_proportion = @homework.homework_type == 2 ? 0.3 : 0.6
       end
+      if @homework.homework_type == 2 && homework_detail_programing
+        if @homework.anonymous_comment == 1
+          homework_detail_programing.ta_proportion = 0.6
+        else
+          homework_detail_programing.ta_proportion = 0.5
+        end
+      end
+      homework_detail_manual.save
+      homework_detail_programing.save if homework_detail_programing
+      @homework.student_works.each do |student_work|
+        set_final_score @homework,student_work
+        student_work.save
+      end
+      @user_activity_id = params[:user_activity_id].to_i
+      @hw_status = params[:hw_status].to_i
+    else
+      @status = 0
     end
-    homework_detail_manual.save
-    homework_detail_programing.save if homework_detail_programing
-    @homework.student_works.each do |student_work|
-      set_final_score @homework,student_work
-      student_work.save
-    end
-    @user_activity_id = params[:user_activity_id].to_i
-    @hw_status = params[:hw_status].to_i
   end
 
   def revise_attachment
diff --git a/app/views/student_work/forbidden_anonymous_comment.js.erb b/app/views/student_work/forbidden_anonymous_comment.js.erb
index 729776685..47d7bca68 100644
--- a/app/views/student_work/forbidden_anonymous_comment.js.erb
+++ b/app/views/student_work/forbidden_anonymous_comment.js.erb
@@ -4,11 +4,18 @@ sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
 <% else %>
 sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>");
 <% end %>
-<% if @homework.anonymous_comment == 0 %>
-    var htmlvalue = '<div id="muban_popup_box" style="width:400px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
-        '<div class="muban_popup_con ml30 mr30 mt20 mb10 clear"><p class="mb10 f14 text_c">将于7天后自动启动该作业的匿评</p><p class="mb10 f14 text_c">您可以在匿评设置中进行修改</p>' +
-        '<a href="javascript:void(0);" class="btn btn-blue mt10" style="margin-left: 142px;" onclick="hideModal();">知道啦</a></div></div>';
-    pop_box_new(htmlvalue, 400, 178);
-<% else %>
-    hideModal();
-<% end %>
\ No newline at end of file
+var str = "";
+<% case @status %>
+    <% when 0 %>
+        str = "请于作业发布后再进行操作";
+    <% when 1 %>
+        str = "作业已禁用匿评";
+    <% when 2 %>
+        str = "将于7天后自动启动该作业的匿评<br/>您可以在匿评设置中进行修改";
+    <% when 3 %>
+        str = "将于作业截止7天后自动启动该作业的匿评<br/>您可以在匿评设置中进行修改";
+<% end %>
+var htmlvalue = '<div id="muban_popup_box" style="width:400px;"><div class="muban_popup_top"><h3 class="fl">提示</h3><a href="javascript:void(0);" class="muban_icons_close fr"></a></div>'+
+    '<div class="muban_popup_con ml30 mr30 mt20 mb10 clear"><p class="mb10 f14 text_c">' + str + '</p>' +
+    '<a href="javascript:void(0);" class="btn btn-blue mt10" style="margin-left: 142px;" onclick="hideModal();">知道啦</a></div></div>';
+pop_box_new(htmlvalue, 400, 178);
diff --git a/app/views/users/_homework_base_info.html.erb b/app/views/users/_homework_base_info.html.erb
index ab5a9fb84..32c4787c3 100644
--- a/app/views/users/_homework_base_info.html.erb
+++ b/app/views/users/_homework_base_info.html.erb
@@ -4,7 +4,7 @@
   </div>
   <% if activity.anonymous_comment == 0%>
       <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_start_time_<%=user_activity_id %>">
-        匿评开启时间：<%= activity.homework_detail_manual.evaluation_start%>&nbsp;00:00
+        匿评开启时间：<%= activity.homework_detail_manual.evaluation_start.nil? ? '--' : (activity.homework_detail_manual.evaluation_start.to_s+" 00:00") %>
       </div>
   <% end %>
 </div>
@@ -15,7 +15,7 @@
         缺评扣分：<%= activity.homework_detail_manual.absence_penalty%>分/作品
       </div>
       <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_end_time_<%=user_activity_id %>">
-        匿评关闭时间：<%= activity.homework_detail_manual.evaluation_end%>&nbsp;23:59
+        匿评关闭时间：<%= activity.homework_detail_manual.evaluation_end.nil? ? '--' : (activity.homework_detail_manual.evaluation_end.to_s+" 00:00") %>
       </div>
   <% end %>
 </div>
@@ -111,12 +111,12 @@
                   <%= homework_anonymous_comment activity,hw_status,user_activity_id %>
                 </li>
             <% end %>
-            <% if activity.anonymous_comment == 0 && (comment_status == 0 || comment_status == 1)%>
+            <% if activity.anonymous_comment == 0 && comment_status == 1 %>
                 <li>
                   <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id),:class => "wpostOptionLink",
                               :title => "匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品", :remote => true)%>
                 </li>
-            <% elsif activity.anonymous_comment == 1 %>
+            <% elsif activity.anonymous_comment == 1 && comment_status > 0 %>
                 <li>
                   <%= link_to("启用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id),:class => "wpostOptionLink",
                               :title => "匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品", :remote => true)%>

From f4f0363b40db8b45452913a2c129047168807c40 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 9 Mar 2017 15:45:53 +0800
Subject: [PATCH 15/15] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=AF=84=E5=88=86?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=9A=84=E5=BC=B9=E6=A1=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/homework_common/_set_score_rule_non_pro.html.erb | 2 +-
 app/views/homework_common/_set_score_rule_pro.html.erb     | 2 +-
 app/views/homework_common/score_rule_set.js.erb            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/homework_common/_set_score_rule_non_pro.html.erb b/app/views/homework_common/_set_score_rule_non_pro.html.erb
index 1ffe0d13f..cdcee01f1 100644
--- a/app/views/homework_common/_set_score_rule_non_pro.html.erb
+++ b/app/views/homework_common/_set_score_rule_non_pro.html.erb
@@ -7,7 +7,7 @@
   <%= form_for('new_form',:url =>{:controller => 'student_work',:action => 'set_score_rule',:homework => homework.id,:student_path => student_path,:user_activity_id=>user_activity_id,:hw_status=>hw_status},:method => "post", :remote => !student_path) do |f|%>
       <div class="muban_popup_con clear">
         <div class="clear mt15 ml20">
-          <ul class="pro_newsetting_con fl">
+          <ul class="pro_newsetting_con fl" style="max-height: 440px; overflow: auto;">
             <li class="mb10 fl">
               <label class="pop_box_label fl">迟交扣分&nbsp;&nbsp;:&nbsp;</label>
               <input type="text" name="late_penalty" id="late_penalty_num" placeholder="0-50" class="fl w180" value="<%= homework.late_penalty%>" onkeyup="check_late_penalty('late_penalty_num')"/>
diff --git a/app/views/homework_common/_set_score_rule_pro.html.erb b/app/views/homework_common/_set_score_rule_pro.html.erb
index c7235d581..725eca62e 100644
--- a/app/views/homework_common/_set_score_rule_pro.html.erb
+++ b/app/views/homework_common/_set_score_rule_pro.html.erb
@@ -7,7 +7,7 @@
   <%= form_for('new_form',:url =>{:controller => 'student_work',:action => 'set_score_rule',:homework => homework.id,:student_path => student_path,:user_activity_id=>user_activity_id,:hw_status=>hw_status},:method => "post", :remote => !student_path) do |f|%>
       <div class="muban_popup_con clear">
         <div class="clear mt15 ml20">
-          <ul class="pro_newsetting_con fl">
+          <ul class="pro_newsetting_con fl" style="max-height: 440px; overflow: auto;">
             <li class="mb10 fl">
               <label class="pop_box_label fl">迟交扣分&nbsp;&nbsp;:&nbsp;</label>
               <input type="text" name="late_penalty" id="late_penalty_num" placeholder="0-50" class="fl w180"  value="<%= homework.late_penalty%>" onkeyup="check_late_penalty('late_penalty_num')"/>
diff --git a/app/views/homework_common/score_rule_set.js.erb b/app/views/homework_common/score_rule_set.js.erb
index c6adaf5bd..6d54c2bea 100644
--- a/app/views/homework_common/score_rule_set.js.erb
+++ b/app/views/homework_common/score_rule_set.js.erb
@@ -1,7 +1,7 @@
 <% if @homework.homework_type == 2 %>
     <% if @homework.anonymous_comment == 0 %>
         var htmlvalue = "<%= escape_javascript(render :partial => 'homework_common/set_score_rule_pro',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>";
-        pop_box_new(htmlvalue, 630, 772);
+        pop_box_new(htmlvalue, 630, 500);
     <% else %>
         var htmlvalue = "<%= escape_javascript(render :partial => 'homework_common/set_score_rule_pro_anon',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>";
         pop_box_new(htmlvalue, 530, 404);
@@ -9,7 +9,7 @@
 <% else %>
     <% if @homework.anonymous_comment == 0 %>
         var htmlvalue = "<%= escape_javascript(render :partial => 'homework_common/set_score_rule_non_pro',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>";
-        pop_box_new(htmlvalue, 630, 742);
+        pop_box_new(htmlvalue, 630, 500);
     <% else %>
         var htmlvalue = "<%= escape_javascript(render :partial => 'homework_common/set_score_rule_none_pro_anon',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>";
         pop_box_new(htmlvalue, 530, 332);