匿评、教师评论

app/controllers/homework_attach_controller.rb

@@ -365,13 +365,14 @@ class HomeworkAttachController < ApplicationController
       @has_evaluation = stars_reates.where("rater_id = ?",User.current).count > 0
       #是否开启互评功能
       @is_evaluation = @homework.bid.is_evaluation == 1 || @homework.bid.is_evaluation == nil
-      @limit =  10
+      #@limit =  10
       #@jours留言 is null条件用以兼容历史数据
       @jours = @homework.journals_for_messages.where("is_comprehensive_evaluation = 3 or is_comprehensive_evaluation is null").order("created_on DESC")
-      @feedback_count = @jours.count
+      @jour = paginateHelper @jours,10
-      @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
+      #@feedback_count = @jours.count
-      @offset ||= @feedback_pages.offset
+      #@feedback_pages = Paginator.new @feedback_count, @limit, params['page']
-      @jour = @jours[@offset, @limit]
+      #@offset ||= @feedback_pages.offset
+      #@jour = @jours[@offset, @limit]
       #@comprehensive_evaluation教师评论
       #@comprehensive_evaluation = @homework.journals_for_messages.where("is_comprehensive_evaluation = 1").order("created_on DESC")
       teachers = searchTeacherAndAssistant @course
@@ -426,13 +427,29 @@ class HomeworkAttachController < ApplicationController
   def addjours
     @homework = HomeworkAttach.find(params[:jour_id])
     @add_jour = @homework.addjours User.current.id, params[:new_form][:user_message],0,params[:is_comprehensive_evaluation]
-    @jours = @homework.journals_for_messages.where("is_comprehensive_evaluation = 3 or is_comprehensive_evaluation is null").order("created_on DESC")
+    if @add_jour.is_comprehensive_evaluation == 3
+      @jours = @homework.journals_for_messages.where("is_comprehensive_evaluation = 3 or is_comprehensive_evaluation is null").order("created_on DESC")
+    elsif @add_jour.is_comprehensive_evaluation == 2
+      annymous_users = @homework.homework_evaluations.map(&:user)
+      unless annymous_users.nil? || annymous_users.count == 0
+        @anonymous_comments = @homework.journals_for_messages.where("is_comprehensive_evaluation = 2 and user_id in #{convert_array(annymous_users)}").order("created_on DESC")
+      end
+    elsif @add_jour.is_comprehensive_evaluation == 1
+      teachers = searchTeacherAndAssistant @course
+      @comprehensive_evaluation = []
+      teachers.each do|teacher|
+        temp = @homework.journals_for_messages.where("is_comprehensive_evaluation = 1 and user_id = #{teacher.user_id}").order("created_on DESC").first
+        @comprehensive_evaluation << temp if temp
+      end
+    end
+
+
     #@limit =  10
     #@feedback_count = @jours.count
     #@feedback_pages = Paginator.new @feedback_count, @limit, params['page']
     #@offset ||= @feedback_pages.offset
     #@jour = @jours[@offset, @limit]
-    @comprehensive_evaluation = @homework.journals_for_messages.where("is_comprehensive_evaluation is not null").order("created_on DESC")
+    #@comprehensive_evaluation = @homework.journals_for_messages.where("is_comprehensive_evaluation is not null").order("created_on DESC")
 
     @totle_score = score_for_homework @homework
     @teaher_score = teacher_score_for_homework @homework

app/views/homework_attach/_histoey_new.html.erb

@@ -12,14 +12,14 @@
   <div class="cl"></div>
   <div class="ping_ctt">
     <div class="ping_dis" id="tbc_03">
-      <%= render :partial => 'homework_attach/jour',:locals => {:jours => @jours,:show_score => false,:show_name => true} %>
+      <%= render :partial => 'homework_attach/jour',:locals => {:jours => @jour,:show_score => false,:show_name => true,:is_jour => true} %>
     </div>
 
     <div class="ping_undis" id="tbc_04">
-      <%= render :partial => 'homework_attach/jour',:locals => {:jours => @comprehensive_evaluation,:show_score => true,:show_name => true} %>
+      <%= render :partial => 'homework_attach/jour',:locals => {:jours => @comprehensive_evaluation,:show_score => true,:show_name => true,:is_jour => false} %>
     </div>
     <div class="ping_undis" id="tbc_05">
-          <%= render :partial => 'homework_attach/jour',:locals => {:jours => @anonymous_comments,:show_score => true,:show_name => false} %>
+          <%= render :partial => 'homework_attach/jour',:locals => {:jours => @anonymous_comments,:show_score => true,:show_name => false,:is_jour => false} %>
     </div>
   </div>
 </div><!---ping_list end--->

app/views/homework_attach/_jour.html.erb

@@ -37,4 +37,7 @@
   </div>
   <div class="cl"></div>
 </div>
+<% end %>
+<% if is_jour%>
+    <ul class="wlist"><%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => true, :flag => true%></ul>
 <% end %>

app/views/homework_attach/_show.html.erb

@@ -50,23 +50,9 @@
       </span>
     </p>
 
-    <div class="ping_star">
+    <div class="ping_star" id="star_score">
-      <% if @is_comprehensive_evaluation == 3 %>
+      <%= render :partial => 'show_star',:locals => {:is_comprehensive_evaluation => @is_comprehensive_evaluation,:totle_score => @totle_score,:has_evaluation => @has_evaluation ,
-          <%= l(:label_work_rating) %>：
+                                                     :can_anonymous_comments=>can_anonymous_comments,:homework => @homework} %>
-          <%= render :partial => 'show_score', locals: {:stars => @totle_score}  %>
-      <% elsif  @is_comprehensive_evaluation == 2 %>
-          <%= l(:label_work_rating) %>：
-          <% if @has_evaluation || !can_anonymous_comments %>
-              <%= render :partial => 'show_score', locals: {:stars => @totle_score}  %>
-          <% else %>
-              <%= rating_for @homework, dimension: :quality, class: 'rateable div_inline' %>
-          <% end %>
-
-      <% elsif @is_comprehensive_evaluation == 1%>
-          <%= l(:label_work_rating) %>：
-          <%= rating_for @homework, dimension: :quality, class: 'rateable div_inline' %>
-      <% end %>
-
     </div>
     <div class="cl"></div>
     <%= render :partial => 'addjour', :locals => {:homework_attach => @homework, :sta => 0, :is_comprehensive_evaluation => @is_comprehensive_evaluation} %>

app/views/homework_attach/_show_star.html.erb

@@ -0,0 +1,15 @@
+<% if is_comprehensive_evaluation == 3 %>
+    <%= l(:label_work_rating) %>：
+    <%= render :partial => 'show_score', locals: {:stars => totle_score}  %>
+<% elsif  is_comprehensive_evaluation == 2 %>
+    <%= l(:label_work_rating) %>：
+    <% if has_evaluation || !can_anonymous_comments %>
+        <%= render :partial => 'show_score', locals: {:stars => totle_score}  %>
+    <% else %>
+        <%= rating_for homework, dimension: :quality, class: 'rateable div_inline' %>
+    <% end %>
+
+<% elsif @is_comprehensive_evaluation == 1%>
+    <%= l(:label_work_rating) %>：
+    <%= rating_for homework, dimension: :quality, class: 'rateable div_inline' %>
+<% end %>

app/views/homework_attach/addjours.js.erb

@@ -1,19 +1,19 @@
 //教师评论
 <% if @add_jour.is_comprehensive_evaluation == 1 %>
-    $('#comprehensive_evaluation').html('<%= escape_javascript(render(:partial => 'comprehensive_evaluation',
+    //$('#comprehensive_evaluation').html('<#%= escape_javascript(render(:partial => 'comprehensive_evaluation',
-    :locals => {:comprehensive_evaluation => @comprehensive_evaluation,:homework => @homework,:teaher_score => @teaher_score} )) %>');
+    //:locals => {:comprehensive_evaluation => @comprehensive_evaluation,:homework => @homework,:teaher_score => @teaher_score} )) %>');
+  HoverLi(4);
+  $('#tbc_04').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @comprehensive_evaluation,:show_score => true,:show_name => true,:is_jour => false})) %>')
 //匿评
 <% elsif @add_jour.is_comprehensive_evaluation == 2  %>
 //    $('#message').html('<#%= escape_javascript(render(:partial => 'showjour', :locals => {:jour =>@jour, :state => false,:homework => @homework} )) %>');
 //    $('#pre_show').html('<#%= escape_javascript(render(:partial => 'pre_show', :locals => {:content => nil})) %>');
   HoverLi(5);
-  $('#tbc_05').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @jours,:show_score => false,:show_name => true})) %>')
+  $('#tbc_05').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @anonymous_comments,:show_score => true,:show_name => false,:is_jour => false})) %>')
-  $('#new_form_user_message').val("");
-  $('#new_form_reference_user_id').val("");
 //留言
 <% else %>
   HoverLi(3);
-  $('#tbc_03').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @jours,:show_score => false,:show_name => true})) %>')
+  $('#tbc_03').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @jours,:show_score => false,:show_name => true,:is_jour => true})) %>')
-  $('#new_form_user_message').val("");
+<% end %>
-  $('#new_form_reference_user_id').val("");
+$('#new_form_user_message').val("");
-<% end %>
+$('#new_form_reference_user_id').val("");