作业动态的重构

app/controllers/homework_common_controller.rb

@@ -58,10 +58,9 @@ class HomeworkCommonController < ApplicationController
 
   def edit
     @user = User.current
-    @is_in_course = params[:is_in_course]
+    @hw_status = params[:hw_status].to_i
     @is_manage = params[:is_manage]
-    @course_activity = params[:course_activity].to_i
-    if @is_in_course.to_i == 1 || @course_activity == 1
+    if @hw_status != 1
       @left_nav_type = 3
       respond_to do |format|
         format.html{render :layout => 'base_courses'}
@@ -160,18 +159,17 @@ class HomeworkCommonController < ApplicationController
           create_works_list @homework
         end
 
+        @hw_status = params[:hw_status].to_i
         if params[:is_manage] == "1"
           redirect_to manage_or_receive_homeworks_user_path(User.current.id)
         elsif params[:is_manage] == "2"
           redirect_to my_homeworks_user_path(User.current.id)
-        elsif params[:is_in_course] == "1"
-          redirect_to homework_common_index_path(:course => @course.id)
-        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"
+        elsif @hw_status == 1
           redirect_to user_path(User.current.id)
-        elsif params[:is_in_course] == "-1" && params[:course_activity] == "1"
+        elsif @hw_status == 2
           redirect_to course_path(@course.id)
+        else
+          redirect_to homework_common_index_path(:course => @course.id)
         end
       end
     end
@@ -181,14 +179,13 @@ class HomeworkCommonController < ApplicationController
     if @homework.destroy
       respond_to do |format|
         format.html {
-          if params[:is_in_course] == "1"
-            redirect_to homework_common_index_path(:course => @course.id)
-          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)
+          @hw_status = params[:hw_status].to_i
+          if @hw_status == 1
+          redirect_to user_path(User.current.id)
+          elsif @hw_status == 2
+          redirect_to course_path(@course.id)
+          else
+          redirect_to homework_common_index_path(:course => @course.id)
           end
         }
       end
@@ -246,8 +243,7 @@ class HomeworkCommonController < ApplicationController
       @statue = 3
     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
+    @hw_status = params[:hw_status].to_i
   end
 
   #关闭匿评
@@ -265,8 +261,7 @@ class HomeworkCommonController < ApplicationController
     send_message_anonymous_comment(@homework, m_status = 3)
     Mailer.send_mail_anonymous_comment_close(@homework).deliver
     @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
+    @hw_status = params[:hw_status].to_i
     respond_to do |format|
       format.js
     end
@@ -294,8 +289,7 @@ class HomeworkCommonController < ApplicationController
     end
     @percent = format("%.2f",(@cur_size.to_f / ( @totle_size == 0 ? 1 : @totle_size)) * 100)
     @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
+    @hw_status = params[:hw_status].to_i
     respond_to do |format|
       format.js
     end
@@ -307,8 +301,7 @@ class HomeworkCommonController < ApplicationController
     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]
+    @hw_status = params[:hw_status].to_i
     respond_to do |format|
       format.js
     end
@@ -321,8 +314,7 @@ class HomeworkCommonController < ApplicationController
       @homework.update_column('is_open', 0)
     end
     @user_activity_id = params[:user_activity_id]
-    @is_in_course = params[:is_in_course] if params[:is_in_course]
-    @course_activity = params[:course_activity] if params[:course_Activity]
+    @hw_status = params[:hw_status].to_i
   end
 
   def alert_open_student_works
@@ -331,8 +323,7 @@ class HomeworkCommonController < ApplicationController
     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]
+    @hw_status = params[:hw_status].to_i
     respond_to do |format|
       format.js
     end
@@ -363,8 +354,7 @@ class HomeworkCommonController < ApplicationController
     else
       @user_activity_id = -1
     end
-    @is_in_course = params[:is_in_course]
-    @course_activity = params[:course_activity].to_i
+    @hw_status = params[:hw_status].to_i
   end
 
   #设置匿评参数
@@ -381,8 +371,7 @@ class HomeworkCommonController < ApplicationController
       @homework_detail_manual.evaluation_num = params[:evaluation_num]
       @homework_detail_manual.save
       @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
+      @hw_status = params[:hw_status].to_i
     end
   end
 
@@ -393,8 +382,7 @@ class HomeworkCommonController < ApplicationController
     else
       @user_activity_id = -1
     end
-    @is_in_course = params[:is_in_course]
-    @course_activity = params[:course_activity].to_i
+    @hw_status = params[:hw_status].to_i
   end
 
   private

app/controllers/student_work_controller.rb

@@ -1012,8 +1012,7 @@ class StudentWorkController < ApplicationController
       redirect_to student_work_index_url(:homework => @homework.id)
     else
       @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
+      @hw_status = params[:hw_status].to_i
       respond_to do |format|
         format.js
       end
@@ -1035,8 +1034,7 @@ class StudentWorkController < ApplicationController
       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
+    @hw_status = params[:hw_status].to_i
   end
 
   def revise_attachment
@@ -1058,8 +1056,7 @@ class StudentWorkController < ApplicationController
 
   def new_student_work_project
     @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
+    @hw_status = params[:hw_status].to_i
     respond_to do |format|
       format.js
     end
@@ -1078,8 +1075,7 @@ class StudentWorkController < ApplicationController
     @project.is_leader = 1
     if @project.save
       @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
+      @hw_status = params[:hw_status].to_i
       respond_to do |format|
         format.js
       end
@@ -1129,8 +1125,7 @@ class StudentWorkController < ApplicationController
     relate_pro = StudentWorkProject.where("user_id = #{User.current.id} and homework_common_id = #{@homework.id}").first
     if relate_pro.destroy
       @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
+      @hw_status = params[:hw_status].to_i
       respond_to do |format|
         format.js
       end

app/controllers/users_controller.rb

@@ -115,8 +115,7 @@ class UsersController < ApplicationController
         else
           @user_activity_id = -1
         end
-        @is_in_course = params[:is_in_course].to_i
-        @course_activity = params[:course_activity].to_i
+        @hw_status = params[:hw_status].to_i
       when 'JournalsForMessage'
         @reply = JournalsForMessage.find params[:reply_id]
         @user_activity_id = params[:user_activity_id]
@@ -1123,11 +1122,8 @@ class UsersController < ApplicationController
             quotes_homework = HomeworkCommon.find params[:quotes].to_i
             quotes_homework.update_column(:quotes, quotes_homework.quotes+1)
           end
-          if params[:is_in_course] == "1"
-            redirect_to homework_common_index_path(:course => homework.course_id)
-          else
-            redirect_to user_homeworks_user_path(User.current.id)
-          end
+
+          redirect_to homework_common_index_path(:course => homework.course_id)
         end
       end
     else
@@ -3573,8 +3569,7 @@ class UsersController < ApplicationController
           obj = HomeworkCommon.where('id = ?', params[:id].to_i).first
           @type = 'HomeworkCommon'
           @journals = obj.journals_for_messages.reorder("created_on desc")
-          @is_in_course = params[:is_in_course].to_i if params[:is_in_course]
-          @course_activity = params[:course_activity].to_i if params[:course_activity]
+          @hw_status = params[:hw_status].to_i if params[:hw_status]
           @is_teacher = User.current.allowed_to?(:as_teacher,obj.course)
           @user_activity_id = params[:user_activity_id].to_i if params[:user_activity_id]
       end

app/controllers/words_controller.rb

@@ -110,8 +110,7 @@ class WordsController < ApplicationController
         else
           @user_activity_id = -1
         end
-        @is_in_course = params[:is_in_course].to_i
-        @course_activity = params[:course_activity].to_i
+        @hw_status = params[:hw_status].to_i
       elsif @journal_destroyed.jour_type == 'Syllabus'
         @syllabus = Syllabus.find @journal_destroyed.jour_id
         @count = @syllabus.journals_for_messages.count
@@ -308,9 +307,8 @@ class WordsController < ApplicationController
           update_org_activity(@homework_common.class,@homework_common.id)
           respond_to do |format|
             format.js{
-              @user_activity_id = params[:user_activity_id]
-              @is_in_course = params[:is_in_course]
-              @course_activity = params[:course_activity]
+              @user_activity_id = params[:user_activity_id].to_i
+              @hw_status = params[:hw_status].to_i
               @homework_common_id = params[:homework_common_id]
             }
           end
@@ -344,8 +342,7 @@ class WordsController < ApplicationController
           respond_to do |format|
             format.js{
               @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
+              @hw_status = params[:hw_status].to_i
             }
           end
         else

app/helpers/application_helper.rb

@@ -2689,15 +2689,15 @@ module ApplicationHelper
   end
 
   #获取匿评相关连接代码
-  def homework_anonymous_comment (homework, is_in_course, user_activity_id = -1, course_activity = -1)
+  def homework_anonymous_comment (homework, hw_status, user_activity_id = -1)
     if homework.homework_detail_manual.comment_status == 0 ||Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
       link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "作业截止日期之前不可以启动匿评"
     elsif homework.student_works.has_committed.count >= 2 && homework.homework_detail_manual#作业份数大于2
       case homework.homework_detail_manual.comment_status
       when 1
-        link = link_to '启动匿评', Setting.protocol + "://" + Setting.host_name + "/homework_common/" + homework.id.to_s + "/alert_anonymous_comment?is_in_course=" + is_in_course.to_s + "&user_activity_id=" + user_activity_id.to_s + "&course_activity=" + course_activity.to_s, id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'postOptionLink'
+        link = link_to '启动匿评', Setting.protocol + "://" + Setting.host_name + "/homework_common/" + homework.id.to_s + "/alert_anonymous_comment?hw_status=" + hw_status.to_s + "&user_activity_id=" + user_activity_id.to_s, id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'postOptionLink'
       when 2
-        link = link_to '关闭匿评', Setting.protocol + "://" + Setting.host_name + "/homework_common/" + homework.id.to_s + "/alert_anonymous_comment?is_in_course=" + is_in_course.to_s + "&user_activity_id=" + user_activity_id.to_s + "&course_activity=" + course_activity.to_s, id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'postOptionLink'
+        link = link_to '关闭匿评', Setting.protocol + "://" + Setting.host_name + "/homework_common/" + homework.id.to_s + "/alert_anonymous_comment?hw_status=" + hw_status.to_s + "&user_activity_id=" + user_activity_id.to_s, id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'postOptionLink'
       when 3
         # link = link_to "匿评结束","javascript:void(0)", :class => "postOptionLink", :title => "匿评结束"
       end

app/helpers/homework_common_helper.rb

@@ -57,12 +57,12 @@ module HomeworkCommonHelper
   end
 
   #根据传入作业确定跳转到开启匿评还是关闭匿评功能
-  def alert_anonyoms_path homework,homework_detail_manual,user_activity_id,is_in_course,course_activity
+  def alert_anonyoms_path homework,homework_detail_manual,user_activity_id,hw_status
     link = ""
     if homework_detail_manual.comment_status == 1
-      link = start_anonymous_comment_homework_common_url homework.id,:user_activity_id=>user_activity_id,:is_in_course=>is_in_course,:course_activity=>course_activity
+      link = start_anonymous_comment_homework_common_url homework.id,:user_activity_id=>user_activity_id,:hw_status=>hw_status
     elsif homework_detail_manual.comment_status == 2
-      link = stop_anonymous_comment_homework_common_url homework.id,:user_activity_id=>user_activity_id,:is_in_course=>is_in_course,:course_activity=>course_activity
+      link = stop_anonymous_comment_homework_common_url homework.id,:user_activity_id=>user_activity_id,:hw_status=>hw_status
     end
     link
   end

app/views/courses/_course_activity.html.erb

@@ -60,7 +60,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, :course_activity => 1} %>
+                    <%= render :partial => 'users/course_homework', :locals => {:activity => act, :user_activity_id => activity.id, :hw_status => 2} %>
                 <% when 'News' %>
                     <%= render :partial => 'users/course_news', :locals => {:activity => act, :user_activity_id => activity.id} %>
                 <% when 'Message' %>

app/views/courses/_user_homework_search_list.html.erb

@@ -26,7 +26,7 @@
               }
           }
       </script>
-      <%= render :partial => 'users/user_homework_detail', :locals => {:homework_common => homework_common,:is_in_course => is_in_course} %>
+      <%= render :partial => 'users/course_homework', :locals => {:activity => homework_common,:user_activity_id => homework_common.id, :hw_status => 3} %>
   <% end%>
   <% if homework_commons.count == 10%>
       <%= link_to "点击展开更多",homework_search_course_path(course_id,:page => page,:search=>search),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>

app/views/courses/homework_search.js.erb

@@ -1,5 +1,5 @@
 <% if @page == 0 %>
-    $("#user_homework_list").replaceWith("<%= escape_javascript( render :partial =>  'courses/user_homework_search_list',:locals => {:homework_commons => @homeworks, :page => @page, :is_in_course => 1,:course_id => @course.id,:search=>@search} )%>");
+    $("#user_homework_list").replaceWith("<%= escape_javascript( render :partial =>  'courses/user_homework_search_list',:locals => {:homework_commons => @homeworks, :page => @page, :course_id => @course.id,:search=>@search} )%>");
 <% else %>
-    $("#user_show_more_homework").replaceWith("<%= escape_javascript( render :partial =>  'courses/user_homework_search_list',:locals => {:homework_commons => @homeworks, :page => @page, :is_in_course => 1,:course_id => @course.id,:search=>@search} )%>");
+    $("#user_show_more_homework").replaceWith("<%= escape_javascript( render :partial =>  'courses/user_homework_search_list',:locals => {:homework_commons => @homeworks, :page => @page, :course_id => @course.id,:search=>@search} )%>");
 <% end %>

app/views/homework_common/_alert_anonyoms.html.erb

@@ -32,7 +32,7 @@
         </p>
     <% end %>
     <div class="ni_btn">
-      <a href="javascript:" class="tijiao" onclick="clickOK('<%= alert_anonyoms_path @homework,@homework_detail_manual,@user_activity_id,@is_in_course,@course_activity%>');" style="margin-bottom: 20px;" >
+      <a href="javascript:" class="tijiao" onclick="clickOK('<%= alert_anonyoms_path @homework,@homework_detail_manual,@user_activity_id,@hw_status%>');" style="margin-bottom: 20px;" >
         确&nbsp;&nbsp;定
       </a>
       <a href="javascript:" class="tijiao" onclick="clickCanel();" style="margin-bottom: 20px;">

app/views/homework_common/_alert_open_student_works.html.erb

@@ -22,7 +22,7 @@
         </p>
     <% end %>
     <div class="ni_btn">
-      <a href="javascript:" class="tijiao" onclick="clickOK('<%= open_student_works_homework_common_path(@homework, :user_activity_id => @user_activity_id,:is_in_course=>@is_in_course, :course_activity => @course_activity)%>');" style="margin-bottom: 20px;" >
+      <a href="javascript:" class="tijiao" onclick="clickOK('<%= open_student_works_homework_common_path(@homework, :user_activity_id => @user_activity_id,:hw_status=>@hw_status)%>');" style="margin-bottom: 20px;" >
         确&nbsp;&nbsp;定
       </a>
       <a href="javascript:" class="tijiao" onclick="clickCanel();" style="margin-bottom: 20px;">

app/views/homework_common/_homework_index_list.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => homework_commons,:page => 0,:is_in_course => 1,:course_id => course_id} %>
+<%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => homework_commons,:page => 0,:course_id => course_id} %>
 
 <div style="width:210px; text-align:center; margin:0 auto;">
   <ul class="wlist" style=" border:none; display:inline-block; float:none; margin-top:10px;">

app/views/homework_common/_set_evalutation_att.html.erb

@@ -1,5 +1,5 @@
 <div class="markPopup" id="popbox02">
-  <%= form_for('new_form',:url =>  {:controller => 'homework_common',:action => 'set_evaluation_attr',:homework => @homework.id,:user_activity_id=>user_activity_id,:is_in_course=>is_in_course,:course_activity=>course_activity},:method => "post",:remote => true) do |f|%>
+  <%= form_for('new_form',:url =>  {:controller => 'homework_common',:action => 'set_evaluation_attr',:homework => @homework.id,:user_activity_id=>user_activity_id,:hw_status=>hw_status},:method => "post",:remote => true) do |f|%>
       <span class="uploadText">匿评设置</span>
       <div class="cl"></div>
 

app/views/homework_common/alert_forbidden_anonymous_comment.js.erb

@@ -1,4 +1,4 @@
-$('#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}) %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/alert_forbidden_anonymous', :locals => {:user_activity_id => @user_activity_id,:hw_status => @hw_status}) %>');
 showModal('ajax-modal', '500px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +

app/views/homework_common/edit.html.erb

@@ -1,5 +1,5 @@
 <script type="text/javascript">
-  <% if @is_in_course.to_i == 1 || @course_activity == 1 %>
+  <% if @hw_status != 1 %>
     $(function(){
         $("#RSide").removeAttr("id");
         $("#Container").css("width","1000px");
@@ -23,18 +23,16 @@
             window.location.href='<%=manage_or_receive_homeworks_user_path(User.current.id) %>';
         <% elsif @is_manage.to_i == 2 %>
             window.location.href='<%=my_homeworks_user_path(User.current.id) %>';
-        <% elsif @is_in_course.to_i == 1 %>
+        <% elsif @hw_status == 3 %>
             window.location.href='<%=homework_common_index_path(:course => @course.id) %>';
-        <% elsif @is_in_course.to_i == 0 %>
-            window.location.href='<%=user_homeworks_user_path(User.current.id) %>';
-        <% elsif @is_in_course.to_i == -1 && @course_activity == 0 %>
+        <% elsif @hw_status == 1 %>
             window.location.href='<%=user_path(User.current.id) %>';
-        <% elsif @is_in_course.to_i == -1 && @course_activity == 1 %>
+        <% elsif @hw_status == 2 %>
             window.location.href='<%=course_path(@course.id) %>';
         <% end %>
     }
 </script>
-<div class="homepageRightBanner mb10 <%= (@is_in_course == 1 || @course_activity == 1) ? 'ml10' : '' %>">
+<div class="homepageRightBanner mb10 <%= (@hw_status == 2 || @hw_status == 3 || @hw_status == 5) ? 'ml10' : '' %>">
   <div class="NewsBannerName">编辑作业</div>
 </div>
 <div class="cl"></div>
@@ -56,8 +54,7 @@
   <% end %>
 
   <%= 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%>"/>
+      <input type="text" name="hw_status" class="none" value="<%= @hw_status%>"/>
       <input type="text" name="is_manage" class="none" value="<%= @is_manage%>"/>
       <div id="HomeWorkCon">
         <%= render :partial => 'users/user_homework_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %>

app/views/homework_common/open_student_works.js.erb

@@ -1,7 +1,6 @@
-<% if @user_activity_id.to_i == -1 %>
-$("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>");
-sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>");
-<% 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}) %>");
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:hw_status=>@hw_status}) %>");
+<% if @user_activity_id != @homework.id %>
 sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
+<% else %>
+sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>");
 <% end %>

app/views/homework_common/score_rule_set.js.erb

@@ -1,4 +1,4 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/set_score_rule',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:is_in_course => @is_in_course,:course_activity =>@course_activity,:remote=>true}) %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/set_score_rule',:locals => {:homework => @homework, :student_path => false, :user_activity_id => @user_activity_id,:hw_status => @hw_status,:remote=>true}) %>');
 showModal('ajax-modal', '350px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +

app/views/homework_common/set_evaluation_attr.js.erb

@@ -1,8 +1,7 @@
 clickCanel();
-<% if @user_activity_id != -1 %>
-$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@courae_activity}) %>");
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:hw_status=>@hw_status}) %>");
+<% if @user_activity_id != @homework.id %>
 sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
 <% else %>
-$("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework,:is_in_course => @is_in_course}) %>");
 sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>");
 <% end %>

app/views/homework_common/start_anonymous_comment.js.erb

@@ -1,13 +1,11 @@
 <% if @statue == 1%>
     alert('启动成功');
-    <% 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})%>");
-        $("#evaluation_start_time_<%=@homework.id %>").html("匿评开启时间：<%=format_time(Time.now) %>");
-        sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>");
-    <% 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}) %>");
-        $("#evaluation_start_time_<%=@user_activity_id %>").html("匿评开启时间：<%=format_time(Time.now) %>");
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:hw_status=>@hw_status}) %>");
+    $("#evaluation_start_time_<%=@user_activity_id %>").html("匿评开启时间：<%=format_time(Time.now) %>");
+    <% if @user_activity_id != @homework.id %>
         sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
+    <% else %>
+        sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>");
     <% end %>
 /*$("#<%#= @homework.id %>_start_anonymous_comment").replaceWith('<%#= escape_javascript(link_to "关闭匿评", alert_anonymous_comment_homework_common_path(@homework), remote: true, id:"#{@homework.id}_stop_anonymous_comment",:class => "postOptionLink")%>');*/
 <% elsif @statue == 2 %>

app/views/homework_common/start_evaluation_set.js.erb

@@ -1,4 +1,4 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'homework_common/set_evalutation_att',:locals => {:user_activity_id => @user_activity_id,:is_in_course => @is_in_course,:course_activity =>@course_activity,:remote=>true}) %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'homework_common/set_evalutation_att',:locals => {:user_activity_id => @user_activity_id,:hw_status => @hw_status,:remote=>true}) %>');
 var datepickerOptions={dateFormat: 'yy-mm-dd', firstDay: 0, showOn: 'button', buttonImageOnly: true, buttonImage: '/images/public_icon.png', showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true};
 showModal('ajax-modal', '350px');
 $('#ajax-modal').siblings().remove();

app/views/homework_common/stop_anonymous_comment.js.erb

@@ -1,12 +1,10 @@
 alert('关闭成功');
-<% 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})%>");
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:hw_status=>@hw_status}) %>");
 $("#evaluation_end_time_<%=@homework.id %>").html("匿评关闭时间：<%=format_time(Time.now) %>");
-sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>");
+<% if @user_activity_id != @homework.id %>
+sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
 <% 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}) %>");
-$("#evaluation_end_time_<%=@user_activity_id %>").html("匿评关闭时间：<%=format_time(Time.now) %>");
-sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", 'UserActivity');
+sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>");
 <% end %>
 /*
 $("#<%#= @homework.id %>_stop_anonymous_comment").replaceWith('');*/

app/views/organizations/_org_activities.html.erb

@@ -63,7 +63,7 @@
         <% if act.container_type ==  'Course' %>
             <% case act.org_act_type.to_s %>
             <% when 'HomeworkCommon' %>
-                <%= render :partial => 'users/course_homework', :locals => {:activity => HomeworkCommon.find(act.org_act_id),:user_activity_id =>act.id,:course_activity => 0} %>
+                <%= render :partial => 'users/course_homework', :locals => {:activity => HomeworkCommon.find(act.org_act_id),:user_activity_id =>act.id, :hw_status => 4} %>
             <% when 'News' %>
                 <%= render :partial => 'users/course_news', :locals => {:activity => News.find(act.org_act_id),:user_activity_id =>act.id} %>
             <% when 'Message'%>

app/views/student_work/_alert_forbidden_anonymous.html.erb

@@ -5,7 +5,7 @@
       禁用匿评后学生将不能对作品进行互评，且匿评不能再开启，是否确定禁用匿评？
     </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;" >
+      <a href="javascript:" class="tijiao" onclick="clickOK('<%= forbidden_anonymous_comment_student_work_path(:homework=>@homework, :user_activity_id => user_activity_id, :hw_status => hw_status)%>');" style="margin-bottom: 20px;" >
         确&nbsp;&nbsp;定
       </a>
       <a href="javascript:" class="tijiao" onclick="clickCanel();" style="margin-bottom: 20px;">

app/views/student_work/_relate_project.html.erb

@@ -1,7 +1,7 @@
 <div id="popbox02" style="">
   <span class="f16 fontBlue">关联项目</span>
   <a href="javascript:void(0);" class="popClose" onclick="clickCanel();"></a>
-  <%=form_tag url_for(:controller=>'student_work',:action=>'student_work_project',:homework=>@homework.id,:user_activity_id=>@user_activity_id,:is_in_course=>@is_in_course,:course_activity =>@course_activity),:id =>'student_work_relate_project',:class=>'resourcesSearchBox',:remote => true do %>
+  <%=form_tag url_for(:controller=>'student_work',:action=>'student_work_project',:homework=>@homework.id,:user_activity_id=>@user_activity_id,:hw_status =>@hw_status),:id =>'student_work_relate_project',:class=>'resourcesSearchBox',:remote => true do %>
       <input type="text" name="project" placeholder="输入项目名称进行搜索" class="searchResourcePopup mb10" />
       <div class="cl"></div>
       <p id="no_search_result" class="c_red" style="width:220px;display: none">您当前尚未创建任何项目，请先创建项目再关联。</p>

app/views/student_work/_set_score_rule.html.erb

@@ -3,7 +3,7 @@
         <% render :partial => 'student_work/set_score_rule_detail', :locals => {:homework => homework, :f => f}%>
     <% end%>
 <% else %>
-    <%= form_for('new_form',:url =>  {:controller => 'student_work',:action => 'set_score_rule',:homework => homework.id,:user_activity_id=>user_activity_id,:is_in_course=>is_in_course,:course_activity=>course_activity},:method => "post",:remote => true) do |f|%>
+    <%= form_for('new_form',:url =>  {:controller => 'student_work',:action => 'set_score_rule',:homework => homework.id,:user_activity_id=>user_activity_id,:hw_status=>hw_status},:method => "post",:remote => true) do |f|%>
         <% render :partial => 'student_work/set_score_rule_detail', :locals => {:homework => homework, :f => f}%>
     <% end%>
 <% end %>