Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/homework_common_controller.rb

@@ -6,8 +6,8 @@ class HomeworkCommonController < ApplicationController
 
   include StudentWorkHelper
   before_filter :find_course, :only => [:index,:new,:create]
-  before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy,:start_evaluation_set,:set_evaluation_attr,:score_rule_set]
+  before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy,:start_evaluation_set,:set_evaluation_attr,:score_rule_set,:alert_forbidden_anonymous_comment]
-  before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment,:start_evaluation_set,:set_evaluation_attr,:score_rule_set]
+  before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment,:start_evaluation_set,:set_evaluation_attr,:score_rule_set,:alert_forbidden_anonymous_comment]
   before_filter :member_of_course, :only => [:index]
 
   def index
@@ -38,6 +38,7 @@ class HomeworkCommonController < ApplicationController
   def edit
     @user = User.current
     @is_in_course = params[:is_in_course].to_i
+    @course_activity = params[:course_activity].to_i
     respond_to do |format|
       format.html{render :layout => 'new_base_user'}
     end
@@ -88,8 +89,12 @@ class HomeworkCommonController < ApplicationController
         @homework_detail_programing.save if @homework_detail_programing
         if params[:is_in_course] == "1"
           redirect_to homework_common_index_path(:course => @course.id)
-        else
+        elsif params[:is_in_course] == "0"
           redirect_to user_homeworks_user_path(User.current.id)
+        elsif params[:is_in_course] == "-1" && params[:course_activity] == "0"
+          redirect_to user_path(User.current.id)
+        elsif params[:is_in_course] == "-1" && params[:course_activity] == "1"
+          redirect_to course_path(@course.id)
         end
       end
     end
@@ -101,8 +106,12 @@ class HomeworkCommonController < ApplicationController
         format.html {
           if params[:is_in_course] == "1"
             redirect_to homework_common_index_path(:course => @course.id)
-          else
+          elsif params[:is_in_course] == "0"
             redirect_to user_homeworks_user_path(User.current.id)
+          elsif params[:is_in_course] == "-1" && params[:course_activity] == "0"
+            redirect_to user_path(User.current.id)
+          elsif params[:is_in_course] == "-1" && params[:course_activity] == "1"
+            redirect_to course_path(@course.id)
           end
         }
       end
@@ -184,6 +193,19 @@ class HomeworkCommonController < ApplicationController
     end
   end
 
+  def alert_forbidden_anonymous_comment
+    if params[:user_activity_id]
+      @user_activity_id = params[:user_activity_id]
+    else
+      @user_activity_id = -1
+    end
+    @is_in_course = params[:is_in_course] if params[:is_in_course]
+    @course_activity = params[:course_activity] if params[:course_Activity]
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def programing_test
     test = {language:params[:language],src:Base64.encode64(params[:src]),input:[params[:input]],output:[params[:output]]}
     @index = params[:index]

app/controllers/student_work_controller.rb

@@ -3,11 +3,11 @@ class StudentWorkController < ApplicationController
   include StudentWorkHelper
   require 'bigdecimal'
   require "base64"
-  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:set_score_rule]
+  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:set_score_rule,:forbidden_anonymous_comment]
   before_filter :find_work, :only => [:edit, :update, :show, :destroy, :add_score, :praise_student_work]
   before_filter :member_of_course, :only => [:index, :new, :create, :show, :add_score, :praise_student_work]
   before_filter :author_of_work, :only => [:edit, :update, :destroy]
-  before_filter :teacher_of_course, :only => [:student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :set_score_rule]
+  before_filter :teacher_of_course, :only => [:student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :set_score_rule, :forbidden_anonymous_comment]
 
   ### 
   def program_test
@@ -469,6 +469,25 @@ class StudentWorkController < ApplicationController
     end
   end
 
+  def forbidden_anonymous_comment
+    @homework.update_column('anonymous_comment', 1)
+    homework_detail_manual = @homework.homework_detail_manual
+    homework_detail_programing = @homework.homework_detail_programing
+    if homework_detail_programing
+      homework_detail_manual.update_column('ta_proportion', 0.4)
+      homework_detail_programing.update_column('ta_proportion', 0.6)
+    else
+      homework_detail_manual.update_column('ta_proportion', 1.0)
+    end
+    @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
+    @is_in_course = params[:is_in_course].to_i
+    @course_activity = params[:course_activity].to_i
+  end
+
   private
   #获取作业
   def find_homework

app/views/blog_comments/reply.js.erb

@@ -2,6 +2,6 @@
     $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_blog', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>");
     init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
 <% else%>
-$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'blogs/article', :locals => {:activity => @article,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'blogs/article', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>");
 init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
 <% end %>

app/views/comments/create.js.erb

@@ -1,3 +1,3 @@
-$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
 
 init_activity_KindEditor_data('<%= @user_activity_id%>',"","87%");

app/views/courses/_course_activity.html.erb

@@ -92,7 +92,7 @@
                 <% act = activity.course_act %>
                 <% case activity.course_act_type.to_s %>
                 <% when 'HomeworkCommon' %>
-                    <%= render :partial => 'users/course_homework', :locals => {:activity => act, :user_activity_id => activity.id} %>
+                    <%= render :partial => 'users/course_homework', :locals => {:activity => act, :user_activity_id => activity.id, :course_activity => 1} %>
                 <% when 'News' %>
                     <%= render :partial => 'users/course_news', :locals => {:activity => act, :user_activity_id => activity.id} %>
                 <% when 'Message' %>

app/views/forums/show.html.erb

@@ -58,15 +58,15 @@
         if(!check_memo_name()){
             return;
         }
-        if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().trim() != "" ){
+        if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() ){
             memo_content.sync();
             $("#new_memo").submit();
-        }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() == ""){
+        }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.isEmpty()){
             $("#error").html("主题和内容不能为空").show();
         }
-        else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() != "" ){
+        else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){
             $("#error").html("主题不能为空").show();
-        }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().val().trim() == ""){
+        }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.isEmpty()){
             $("#error").html("内容不能为空").show();
         }
     }

app/views/homework_common/alert_forbidden_anonymous_comment.js.erb

@@ -0,0 +1,6 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/alert_forbidden_anonymous', :locals => {:user_activity_id => @user_activity_id,:is_in_course => @is_in_course,:course_activity => @course_activity}) %>');
+showModal('ajax-modal', '500px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+        "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed");

app/views/homework_common/edit.html.erb

@@ -8,6 +8,17 @@
         homework_description_editor.html("");
         $("#homework_editor").toggle();
     }
+    function cancel_edit(){
+        <% if @is_in_course == 1 %>
+            window.location.href='<%=homework_common_index_path(:course => @course.id) %>';
+        <% elsif @is_in_course == 0 %>
+            window.location.href='<%=user_homeworks_user_path(User.current.id) %>';
+        <% elsif @is_in_course == -1 && @course_activity == 0 %>
+            window.location.href='<%=user_path(User.current.id) %>';
+        <% elsif @is_in_course == -1 && @course_activity == 1 %>
+            window.location.href='<%=course_path(@course.id) %>';
+        <% end %>
+    }
 </script>
 <div class="homepageRightBanner mb10">
   <div class="NewsBannerName">编辑作业</div>
@@ -18,6 +29,7 @@
 <div class="HomeWork mb10">
   <%= form_for @homework do |f| %>
       <input type="text" name="is_in_course" class="none" value="<%= @is_in_course%>"/>
+      <input type="text" name="course_activity" class="none" value="<%= @course_activity%>"/>
       <div id="HomeWorkCon">
         <%= render :partial => 'users/user_homework_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %>
       </div>

app/views/issues/add_journal.js.erb

@@ -1,3 +1,3 @@
-$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>");
 
 init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");

app/views/memos/edit.html.erb

@@ -2,7 +2,7 @@
 <script>
 
   function check_and_submit(){
-      if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().trim() != "" ){
+      if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() ){
           if($("textarea[name='memo[subject]']").val().trim().length > 50 ){
               $("#error").html('主题不能超过50个字符').show();
               return;
@@ -13,11 +13,11 @@
 //          }
           memo_content.sync();
           $("#edit_memo").submit();
-      }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() != "" ){
+      }else if($("textarea[name='memo[subject]']").val().trim() == "" && !memo_content.isEmpty() ){
           $("#error").html("主题不能为空").show();
-      }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.html().trim() == ""){
+      }else if($("textarea[name='memo[subject]']").val().trim() != "" && memo_content.isEmpty()){
           $("#error").html("内容不能为空").show();
-      }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.html().trim() == ""){
+      }else if($("textarea[name='memo[subject]']").val().trim() == "" && memo_content.isEmpty()){
           $("#error").html("主题和内容不能为空").show();
       }
   }

app/views/messages/reply.js.erb

@@ -1,6 +1,6 @@
 <%if @project%>
-    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
 <%elsif @course%>
-    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
 <%end%>
 init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");

app/views/student_work/_alert_forbidden_anonymous.html.erb

@@ -0,0 +1,16 @@
+<div id="popbox02">
+  <div class="ni_con">
+    <h2>禁用匿评</h2>
+    <p>
+      禁用匿评后学生将不能对作品进行互评，且匿评不能再开启，是否确定禁用匿评？
+    </p>
+    <div class="ni_btn">
+      <a href="javascript:" class="tijiao" onclick="clickOK('<%= forbidden_anonymous_comment_student_work_path(:homework=>@homework, :user_activity_id => user_activity_id, :course_activity => course_activity)%>');" style="margin-bottom: 20px;" >
+        确&nbsp;&nbsp;定
+      </a>
+      <a href="javascript:" class="tijiao" onclick="clickCanel();" style="margin-bottom: 20px;">
+        取&nbsp;&nbsp;消
+      </a>
+    </div>
+  </div>
+</div>

app/views/student_work/_evaluation_un_title.html.erb

@@ -35,12 +35,14 @@
       </li>
   <% end%>
 
+  <% if @homework.anonymous_comment == 0%>
       <li class="hworkList50 hworkH30">
         <%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
         <% if @show_all && @order == "student_score"%>
             <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
         <% end%>
       </li>
+  <% end %>
 
   <li class="hworkList50 hworkH30">
     <%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>

app/views/student_work/_evaluation_un_work.html.erb

@@ -47,6 +47,7 @@
       </li>
   <% end%>
 
+  <% if @homework.anonymous_comment == 0%>
     <li class="hworkList50 <%= score_color student_work.student_score%> student_score_info">
     <%= student_work.student_score.nil? ? "--" : format("%.1f",student_work.student_score)%>
     <% unless student_work.student_score.nil?%>
@@ -61,7 +62,7 @@
         </div>
     <% end%>
   </li>
-
+  <% end %>
   <!-- 成绩 -->
   <% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty%>
   <li class="hworkList50 <%= score_color score%> student_final_scor_info">

app/views/student_work/_set_score_rule_detail.html.erb

@@ -40,10 +40,12 @@
     <span class="f14 fontGrey3 mr10">教辅评分</span>
     <%= select_tag :ta_proportion,options_for_select(ta_proportion_option_to(100-(homework.homework_detail_programing ? homework.homework_detail_programing.ta_proportion * 100 : 0).to_i),homework.homework_detail_manual.ta_proportion), {:class => "markPercentage"}  %>
   </div>
+  <% if homework.anonymous_comment == 0 %>
       <div>
         <span class="f14 fontGrey3 mr10">学生匿评</span>
         <input type="text" id="student_proportion" value="<%= (100 - homework.homework_detail_manual.ta_proportion * 100).to_i - (homework.homework_detail_programing ? homework.homework_detail_programing.ta_proportion * 100 : 0).to_i%>%" class="markPercentage" readonly>
       </div>
+  <% end %>
   <div class="mb20">
     <span class="f14 fontGrey3 mr10">教师优先</span>
     <input type="checkbox" name="teacher_priority" <%= homework.teacher_priority == 1 ? 'checked' : ''%>/>
@@ -51,7 +53,7 @@
   </div>
   <div>
     <div class="courseSendSubmit">
-      <a href="javascript:void(0);" class="sendSourceText" onclick="$('#ajax-modal').find('form').submit();">确定</a>
+      <a href="javascript:void(0);" class="sendSourceText" onclick="$('#ajax-modal').find('form').submit();clickCanel();">确定</a>
     </div>
     <div class="courseSendCancel">
       <a href="javascript:void(0);" class="sendSourceText linkGrey6" onclick="clickCanel();">取消</a>

app/views/student_work/forbidden_anonymous_comment.js.erb

@@ -0,0 +1,7 @@
+<% if @user_activity_id == -1 %>
+$("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>");
+init_activity_KindEditor_data(<%= @homework.id%>,"","87%");
+<% else %>
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+<% end %>

app/views/student_work/index.html.erb

@@ -144,7 +144,7 @@
           <div class="cl"></div>
         </div>
         <div class="mt5">
-          <div class="fontGrey2 db fl">截止时间：<%= @homework.end_time %></div>
+          <div class="fontGrey2 db fl">截止时间：<%= @homework.end_time %>&nbsp;23:59</div>
           <% if @homework.homework_detail_manual%>
               <% if @homework.homework_detail_manual.comment_status == 1%>
                   <% end_time = @homework.end_time.to_time.to_i + 24*60*60 - 1 %>

app/views/users/_course_homework.html.erb

@@ -13,15 +13,26 @@
         <% end %> TO <!--+"(课程名称)" -->
         <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
       </div>
-      <div class="homepagePostTitle hidden m_w530 fl"> <!--+"(作业名称)"-->
+      <div class="homepagePostTitle hidden m_w480 fl"> <!--+"(作业名称)"-->
         <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id,:host=> Setting.host_course), :class => "postGrey"%>
       </div>
+      <% if activity.homework_detail_manual%>
           <% if activity.homework_detail_manual.comment_status == 1%>
-          <span class="grey_btn_cir ml10">未开启匿评</span>
+              <% if activity.anonymous_comment == 0%>
+                  <span class="grey_btn_cir ml5">未开启匿评</span>
+              <% end %>
+              <span class="green_btn_cir ml5">作品提交中</span>
           <% elsif activity.homework_detail_manual.comment_status == 2%>
-          <span class="green_btn_cir ml10">匿评中</span>
+              <% if activity.anonymous_comment == 0%>
+                  <span class="green_btn_cir ml5">匿评中</span>
+              <% end %>
+              <span class="green_btn_cir ml5">教师教辅评阅中</span>
           <% elsif activity.homework_detail_manual.comment_status == 3%>
-          <span class="grey_btn_cir ml10">匿评已结束</span>
+              <% if activity.anonymous_comment == 0%>
+                  <span class="grey_btn_cir ml5">匿评已结束</span>
+              <% end %>
+              <span class="green_btn_cir ml5">教师教辅评阅中</span>
+          <% end%>
       <% end%>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostSubmit">
@@ -57,25 +68,33 @@
         <div class="cl"></div>
       </div>
       <% if is_teacher%>
+          <% comment_status = activity.homework_detail_manual.comment_status %>
           <div class="homepagePostSetting">
             <ul>
               <li class="homepagePostSettingIcon">
                 <ul class="homepagePostSettiongText">
                   <li>
-                    <%= link_to l(:button_edit),edit_homework_common_path(activity,:is_in_course => 0), :class => "postOptionLink"%>
+                    <%= link_to l(:button_edit),edit_homework_common_path(activity,:is_in_course => -1,:course_activity=>course_activity), :class => "postOptionLink"%>
                   </li>
                   <li>
-                    <%= link_to(l(:label_bid_respond_delete), homework_common_path(activity,:is_in_course => 0),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
+                    <%= link_to(l(:label_bid_respond_delete), homework_common_path(activity,:is_in_course => -1,:course_activity=>course_activity),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
                   </li>
                   <li>
                     <%= link_to("评分设置", score_rule_set_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => 0),:class => "postOptionLink", :remote => true) %>
                   </li>
+                  <% if activity.anonymous_comment == 0 %>
                       <li>
                         <%= link_to("匿评设置", start_evaluation_set_homework_common_path(activity),:class => "postOptionLink", :remote => true) if activity.homework_detail_manual.comment_status == 1%>
                       </li>
                       <li>
                         <%= homework_anonymous_comment activity %>
                       </li>
+                  <% end %>
+                  <% if activity.anonymous_comment == 0 && (comment_status == 0 || comment_status == 1)%>
+                      <li>
+                        <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%>
+                      </li>
+                  <% end %>
                 </ul>
               </li>
             </ul>

app/views/users/_user_activities.html.erb

@@ -11,7 +11,6 @@
     .ke-inline-block{display: none;}
     div.ke-container{float:left;}
 </style>
-<% first_user_activity = user_activities.first.id unless user_activities.first.nil? %>
 <% user_activities.each do |user_activity|
   if user_activities %>
         <script>
@@ -63,13 +62,13 @@
             <% if act  %>
                 <% case user_activity.act_type.to_s %>
                 <% when 'HomeworkCommon' %>
-                    <%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
+                    <%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity_id =>user_activity.id,:course_activity => 0} %>
                 <% when 'News' %>
-                    <%= render :partial => 'course_news', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
+                    <%= render :partial => 'course_news', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
                 <% when 'Message'%>
-                    <%= render :partial => 'course_message', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
+                    <%= render :partial => 'course_message', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
                 <% when 'Poll' %>
-                    <%= render :partial => 'course_poll', :locals => {:activity => act, :user_activity_id => user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
+                    <%= render :partial => 'course_poll', :locals => {:activity => act, :user_activity_id => user_activity.id} %>
                 <% when 'Course'%>
                     <%= render :partial => 'users/course_create', :locals => {:activity => act, :user_activity_id => act.id} %>
                 <% end %>
@@ -78,11 +77,11 @@
             <% if act  %>
                 <% case user_activity.act_type.to_s %>
                 <% when 'Issue' %>
-                    <%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
+                    <%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
                 <% when 'Message' %>
-                    <%= render :partial => 'project_message', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
+                    <%= render :partial => 'project_message', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
                 <% when 'ProjectCreateInfo'%>
-                    <%= render :partial => 'project_create', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
+                    <%= render :partial => 'project_create', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
                 <% end %>
             <% end %>
         <% when 'Principal' %>
@@ -101,7 +100,7 @@
              <% end %>
         <% end %>
         <% else %>
-            <%= render :partial => 'project_create', :locals => {:activity => user_activity,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
+            <%= render :partial => 'project_create', :locals => {:activity => user_activity,:user_activity_id =>user_activity.id} %>
         <% end %>
     <% end %>
 <% end %>

app/views/users/_user_homework_detail.html.erb

@@ -10,19 +10,28 @@
         TO
         <%= link_to homework_common.course.name, course_path(homework_common.course_id), :class => "newsBlue ml15"%>
       </div>
-          <span class="homepagePostTitle hidden m_w530 fl">
+          <span class="homepagePostTitle hidden m_w480 fl">
             <%= link_to homework_common.name,student_work_index_path(:homework => homework_common.id),:class => "postGrey"%>
           </span>
 
       <% if homework_common.homework_detail_manual%>
           <% if homework_common.homework_detail_manual.comment_status == 0 %>
-              <span class="grey_btn_cir ml10">未发布</span>
+              <span class="grey_btn_cir ml5">未发布</span>
           <% elsif homework_common.homework_detail_manual.comment_status == 1%>
-              <span class="grey_btn_cir ml10">未开启匿评</span>
+              <% if homework_common.anonymous_comment == 0%>
+                    <span class="grey_btn_cir ml5">未开启匿评</span>
+              <% end %>
+              <span class="green_btn_cir ml5">作品提交中</span>
           <% elsif homework_common.homework_detail_manual.comment_status == 2%>
-              <span class="green_btn_cir ml10">匿评中</span>
+              <% if homework_common.anonymous_comment == 0%>
+                  <span class="green_btn_cir ml5">匿评中</span>
+              <% end %>
+              <span class="green_btn_cir ml5">教师教辅评阅中</span>
           <% elsif homework_common.homework_detail_manual.comment_status == 3%>
-              <span class="grey_btn_cir ml10">匿评已结束</span>
+              <% if homework_common.anonymous_comment == 0%>
+                  <span class="grey_btn_cir ml5">匿评已结束</span>
+              <% end %>
+              <span class="green_btn_cir ml5">教师教辅评阅中</span>
           <% end%>
       <% end%>
 
@@ -64,28 +73,35 @@
         <div class="cl"></div>
       </div>
       <% if is_teacher%>
-          <%# if false%>
+          <% comment_status = homework_common.homework_detail_manual.comment_status%>
           <div class="homepagePostSetting">
             <ul>
               <li class="homepagePostSettingIcon">
                 <ul class="homepagePostSettiongText">
                   <li>
-                    <%= link_to l(:button_edit),edit_homework_common_path(homework_common,:is_in_course => is_in_course), :class => "postOptionLink"%>
+                    <%= link_to l(:button_edit),edit_homework_common_path(homework_common,:is_in_course => is_in_course,:course_activity=>-1), :class => "postOptionLink"%>
                   </li>
                   <li>
-                    <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework_common,:is_in_course => is_in_course),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
+                    <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework_common,:is_in_course => is_in_course,:course_activity=>-1),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink")  %>
                   </li>
                   <li>
                     <%= link_to("评分设置", score_rule_set_homework_common_path(homework_common, :is_in_course => is_in_course),:class => "postOptionLink", :remote => true) %>
                   </li>
+                  <% if homework_common.anonymous_comment == 0 &&(comment_status == 0 || comment_status == 1)%>
                     <li>
-                    <% if homework_common.homework_detail_manual.comment_status == 0 || homework_common.homework_detail_manual.comment_status == 1%>
                         <%= link_to("匿评设置", start_evaluation_set_homework_common_path(homework_common),:class => "postOptionLink", :remote => true)%>
-                    <% end %>
                     </li>
+                  <% end %>
+                  <% if homework_common.anonymous_comment == 0 &&(comment_status == 0 || comment_status == 1)%>
                     <li>
                         <%= homework_anonymous_comment homework_common %>
                     </li>
+                  <% end %>
+                  <% if homework_common.anonymous_comment == 0 && (comment_status == 0 || comment_status == 1)%>
+                      <li>
+                        <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(homework_common,:is_in_course => is_in_course),:class => "postOptionLink", :remote => true)%>
+                      </li>
+                  <% end %>
                 </ul>
               </li>
             </ul>

app/views/users/_user_homework_form.html.erb

@@ -56,7 +56,8 @@
       <% if edit_mode %>
           <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_homework('edit_homework_common_<%= homework.id%>');">确定</a>
           <span class="fr mr10 mt3">或</span>
-          <%= link_to "取消",user_homeworks_user_path(User.current.id),:class => "fr mr10 mt3"%>
+          <%#= link_to "取消",user_homeworks_user_path(User.current.id),:class => "fr mr10 mt3"%>
+          <a href="javascript:void(0);" class="fr mr10 mt3" onclick="cancel_edit();">取消</a>
     <% else %>
           <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submit_homework('new_homework_common');">发送</a>
           <span class="fr mr10 mt3">或</span>

config/routes.rb

@@ -101,10 +101,12 @@ RedmineApp::Application.routes.draw do
       get 'start_anonymous_comment'
       get 'stop_anonymous_comment'
       get 'alert_anonymous_comment'
+      get 'alert_forbidden_anonymous_comment'
       get 'start_evaluation_set'
       get 'score_rule_set'
       post 'set_evaluation_attr'
     end
+
     collection do
       post 'next_step'
       post 'programing_test'
@@ -115,6 +117,7 @@ RedmineApp::Application.routes.draw do
     member do
       post 'add_score'
       get 'praise_student_work'
+      get 'forbidden_anonymous_comment'
     end
     collection do
       post 'add_score_reply'

db/migrate/20151102085318_add_anonymous_comment_to_homework_common.rb

@@ -0,0 +1,5 @@
+class AddAnonymousCommentToHomeworkCommon < ActiveRecord::Migration
+  def change
+    add_column :homework_commons, :anonymous_comment, :integer, :default => 0
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20151029030006) do
+ActiveRecord::Schema.define(:version => 20151102085318) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -658,6 +658,7 @@ ActiveRecord::Schema.define(:version => 20151029030006) do
     t.datetime "created_at",                       :null => false
     t.datetime "updated_at",                       :null => false
     t.integer  "teacher_priority",  :default => 1
+    t.integer  "anonymous_comment", :default => 0
   end
 
   create_table "homework_detail_manuals", :force => true do |t|

lib/tasks/homework_evaluation.rake

@@ -11,7 +11,7 @@ namespace :homework_evaluation do
     homework_detail_manuals = HomeworkDetailManual.where("evaluation_start = '#{Date.today}'")
     homework_detail_manuals.each do |homework_detail_manual|
       homework_common = homework_detail_manual.homework_common
-      if homework_detail_manual.comment_status == 1  #新建状态才可开启匿评
+      if homework_common.anonymous_comment == 0 && homework_detail_manual.comment_status == 1  #新建状态才可开启匿评
         student_works = homework_common.student_works
         if student_works && student_works.size >= 2
           student_works.each_with_index do |work, index|
@@ -55,7 +55,7 @@ namespace :homework_evaluation do
     homework_detail_manuals = HomeworkDetailManual.where("evaluation_end = '#{Date.today}'")
     homework_detail_manuals.each do |homework_detail_manual|
       homework_common = homework_detail_manual.homework_common
-      if homework_detail_manual.comment_status == 2 #开启匿评状态才可关闭匿评
+      if homework_common.anonymous_comment == 0 && homework_detail_manual.comment_status == 2 #开启匿评状态才可关闭匿评
         #计算缺评扣分
         work_ids = "(" + homework_common.student_works.map(&:id).join(",") + ")"
         homework_common.student_works.each do |student_work|

public/javascripts/course.js

@@ -176,7 +176,7 @@ function regexTopicSubject() {
 function regexTopicDescription()
 {
     var name = message_content_editor.html();
-    if(name.length ==0)
+    if(message_content_editor.isEmpty())
     {
         $("#message_content_span").text("描述不能为空");
         $("#message_content_span").css('color','#ff0000');
@@ -282,7 +282,7 @@ function regexTitle()
 function regexDescription()
 {
     var name = news_description_editor.html();
-    if(name.length ==0)
+    if(news_description_editor.isEmpty())
     {
         $("#description_notice_span").text("描述不能为空");
         $("#description_notice_span").css('color','#ff0000');
@@ -327,7 +327,7 @@ function submitComment()
 
 function newsReplyVerify() {
     var content = comment_editor.html();
-    if(content.length == 0) {
+    if(comment_editor.isEmpty()) {
         $("#add_reply_news").text("评论不能为空");
         $("#add_reply_news").css('color', '#ff0000');
         return false;
@@ -356,7 +356,7 @@ function course_board_canel_message_replay()
 
 function MessageReplayVevify() {
     var content = message_content_editor.html();//$.trim($("#message_content").val());
-    if (content.length == 0) {
+    if (message_content_editor.isEmpty()) {
         $("#message_content_span").text("回复不能为空");
         $("#message_content_span").css('color', '#ff0000');
         return  false;

public/stylesheets/courses.css

@@ -178,8 +178,8 @@ a.f_grey:hover {color:#000000;}
 /*.upbtn{ margin:42px 0 0 10px; border:none; color:#999; width:150px;}*/
 .red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
-.grey_btn_cir{ background:#b2b2b2; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
+.grey_btn_cir{ background:#b2b2b2; padding:1px 3px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
-.blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.blue_btn_cir{ background:#3498db; padding:1px 3px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
 .sticky_btn_cir{ background:#269ac9; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
 .locked_btn_cir{background: url("../images/locked.png") 0 0 no-repeat; cursor: default;}
@@ -966,8 +966,9 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r
 .ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; }
 .W50{ width:50px;}
 .W200{ width:200px;}
-.m_w530{max-width: 530px;}
+.m_w480{max-width: 480px;}
 .m_w500{max-width: 500px;}
+.m_w530{max-width: 530px;}
 .ProResultTable{ color:#888888;}
 .T_C{ text-align:center;}
 .SearchIcon{background:url(../images/homepage_icon2.png) 676px -393px no-repeat; }

public/stylesheets/new_user.css

@@ -293,8 +293,8 @@ a:hover.bgreen_n_btn{background:#08a384;}
 .more_btn{-moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #9DCEFF; color:#9DCEFF;  border-radius:3px; padding:0px 3px;}
 .upbtn{ margin:42px 0 0 10px; border:none; color:#999; width:150px;}
 .red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
-.green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.green_btn_cir{ background:#28be6c; padding:1px 3px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
-.grey_btn_cir{ background:#b2b2b2; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
+.grey_btn_cir{ background:#b2b2b2; padding:1px 3px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
 .blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
 .sticky_btn_cir{ background:#269ac9; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
@@ -1073,6 +1073,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r
 .ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; }
 .W50{ width:50px;}
 .W200{ width:200px;}
+.m_w480{max-width: 480px;}
 .m_w530{max-width: 530px;}
 .ProResultTable{ color:#888888;}
 .T_C{ text-align:center;}