From 157010bdad537a61ec287481886d1e0c1190a866 Mon Sep 17 00:00:00 2001 From: z9hang Date: Mon, 3 Nov 2014 15:28:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BF=E8=AF=84=E3=80=81=E6=95=99=E5=B8=88?= =?UTF-8?q?=E8=AF=84=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_attach_controller.rb | 31 ++++++++++++++----- .../homework_attach/_histoey_new.html.erb | 6 ++-- app/views/homework_attach/_jour.html.erb | 3 ++ app/views/homework_attach/_show.html.erb | 20 ++---------- app/views/homework_attach/_show_star.html.erb | 15 +++++++++ app/views/homework_attach/addjours.js.erb | 18 +++++------ 6 files changed, 57 insertions(+), 36 deletions(-) create mode 100644 app/views/homework_attach/_show_star.html.erb diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb index 8757ded98..0fb4be400 100644 --- a/app/controllers/homework_attach_controller.rb +++ b/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 - @feedback_pages = Paginator.new @feedback_count, @limit, params['page'] - @offset ||= @feedback_pages.offset - @jour = @jours[@offset, @limit] + @jour = paginateHelper @jours,10 + #@feedback_count = @jours.count + #@feedback_pages = Paginator.new @feedback_count, @limit, params['page'] + #@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 diff --git a/app/views/homework_attach/_histoey_new.html.erb b/app/views/homework_attach/_histoey_new.html.erb index 3ae103040..273e8bd4c 100644 --- a/app/views/homework_attach/_histoey_new.html.erb +++ b/app/views/homework_attach/_histoey_new.html.erb @@ -12,14 +12,14 @@
- <%= 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} %>
- <%= 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} %>
- <%= 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} %>
\ No newline at end of file diff --git a/app/views/homework_attach/_jour.html.erb b/app/views/homework_attach/_jour.html.erb index 30c8b9026..a9872d357 100644 --- a/app/views/homework_attach/_jour.html.erb +++ b/app/views/homework_attach/_jour.html.erb @@ -37,4 +37,7 @@
+<% end %> +<% if is_jour%> + <% end %> \ No newline at end of file diff --git a/app/views/homework_attach/_show.html.erb b/app/views/homework_attach/_show.html.erb index 5de492f21..b44380ab9 100644 --- a/app/views/homework_attach/_show.html.erb +++ b/app/views/homework_attach/_show.html.erb @@ -50,23 +50,9 @@

-
- <% 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 %> - +
+ <%= render :partial => 'show_star',:locals => {:is_comprehensive_evaluation => @is_comprehensive_evaluation,:totle_score => @totle_score,:has_evaluation => @has_evaluation , + :can_anonymous_comments=>can_anonymous_comments,:homework => @homework} %>
<%= render :partial => 'addjour', :locals => {:homework_attach => @homework, :sta => 0, :is_comprehensive_evaluation => @is_comprehensive_evaluation} %> diff --git a/app/views/homework_attach/_show_star.html.erb b/app/views/homework_attach/_show_star.html.erb new file mode 100644 index 000000000..bf119dd95 --- /dev/null +++ b/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 %> \ No newline at end of file diff --git a/app/views/homework_attach/addjours.js.erb b/app/views/homework_attach/addjours.js.erb index ae95d2b6c..f843e1a1e 100644 --- a/app/views/homework_attach/addjours.js.erb +++ b/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', - :locals => {:comprehensive_evaluation => @comprehensive_evaluation,:homework => @homework,:teaher_score => @teaher_score} )) %>'); + //$('#comprehensive_evaluation').html('<#%= escape_javascript(render(:partial => 'comprehensive_evaluation', + //: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})) %>') - $('#new_form_user_message').val(""); - $('#new_form_reference_user_id').val(""); + $('#tbc_05').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @anonymous_comments,:show_score => true,:show_name => false,:is_jour => false})) %>') //留言 <% else %> HoverLi(3); - $('#tbc_03').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @jours,:show_score => false,:show_name => true})) %>') - $('#new_form_user_message').val(""); - $('#new_form_reference_user_id').val(""); -<% end %> \ No newline at end of file + $('#tbc_03').html('<%= escape_javascript(render(:partial => 'homework_attach/jour',:locals => {:jours => @jours,:show_score => false,:show_name => true,:is_jour => true})) %>') +<% end %> +$('#new_form_user_message').val(""); +$('#new_form_reference_user_id').val(""); \ No newline at end of file