hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
Homework
sw 11 years ago
parent caec663fe4 4f00e974e9
commit b625a857e9
10 changed files with 144 additions and 82 deletions
Show Stats Download Patch File Download Diff File

59
app/controllers/homework_attach_controller.rb
Unescape View File

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

15
app/helpers/homework_attach_helper.rb
Unescape View File

@ -90,4 +90,19 @@ module HomeworkAttachHelper
seems_rateable_rate = HomeworkAttach.find_by_sql("SELECT * FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = #{homework.id} AND rater_id = #{user.id}") seems_rateable_rate = HomeworkAttach.find_by_sql("SELECT * FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = #{homework.id} AND rater_id = #{user.id}")
seems_rateable_rate.nil? || seems_rateable_rate.count == 0 ? 0:seems_rateable_rate[0].stars seems_rateable_rate.nil? || seems_rateable_rate.count == 0 ? 0:seems_rateable_rate[0].stars
end end
def convert_array array
ary = "("
if array.nil? || array.count == 0
return "()"
end
array.each do |member|
if member == array.last
ary += member.id.to_s + ")"
else
ary += member.id.to_s + ","
end
end
ary
end
end end

25
app/views/homework_attach/_histoey_new.html.erb
Unescape View File

@ -0,0 +1,25 @@
<div class="ping_list">
<div id="ping_tb_" class="ping_tb_">
<ul>
<li id="ping_tb_4" class="ping_normaltab" onmouseover="i:HoverLi(4);">
<%= l(:label_teacher_comments) %>（<span class="c_red"><%= @comprehensive_evaluation.nil? ? 0 : @comprehensive_evaluation.count %></span>）</li>
<li id="ping_tb_5" class="ping_normaltab" onmouseover="i:HoverLi(5);">
<%= l(:label_anonymous_comments) %>（<span class="c_red"><%= @anonymous_comments.nil? ? 0 : @anonymous_comments.count %></span>）</li>
<li id="ping_tb_3" class="ping_hovertab" onmouseover="x:HoverLi(3);">
<%= l(:label_responses) %>（<span class="c_red"><%= @jours.nil? ? 0 : @jours.count %></span>）</li>
</ul>
</div>
<div class="cl"></div>
<div class="ping_ctt">
<div class="ping_dis" id="tbc_03">
<%= 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,: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,:is_jour => false} %>
</div>
</div>
</div><!---ping_list end--->

25
app/views/homework_attach/_jour.html.erb
Unescape View File

@ -1,11 +1,22 @@
<% jours.nil? || jours.count == 0 || jours.each do |jour| %>
<div class="ping_C"> <div class="ping_C">
<div class="ping_dispic"><a target="_blank" href="#"><%= image_tag(url_to_avatar(jour.user)) %></a></div> <div class="ping_dispic">
<% if show_name %>
<%= link_to image_tag(url_to_avatar(jour.user)) , user_path(jour.user), :target =>"_blank" %>
<% else %>
<a><%= image_tag(url_to_avatar(nil))%></a>
<a><%= l(:label_anonymous) %></a>
<% end %>
</div>
<div class="ping_discon"> <div class="ping_discon">
<div class="ping_distop"> <div class="ping_distop">
<span><%= link_to jour.user, user_path(jour.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%></span> <span><%= link_to jour.user, user_path(jour.user),:style => " font-weight:bold; color:#15bccf; margin-right:30px; background:none;", :target => "_blank"%></span>
<span style="color:#a6a6a6; margin-right:40px; margin-left:30px;"><%= jour.created_on %></span><span style="font-weight:bold; color:#a6a6a6; "> <span style="color:#a6a6a6; margin-right:40px; margin-left:30px;"><%= jour.created_on %></span>
<%= l(:label_work_rating) %>： <span style="font-weight:bold; color:#a6a6a6; ">
<%= render :partial => 'show_score', locals: {:stars => get_homework_score(jour.user,@homework ) } %> <% if show_score %>
<%= l(:label_work_rating) %>：
<%= render :partial => 'show_score', locals: {:stars => get_homework_score(jour.user,@homework ) } %>
<% end %>
</span> </span>
<div class="cl"></div> <div class="cl"></div>
<p><%= textilizable jour.notes%></p> <p><%= textilizable jour.notes%></p>
@ -25,4 +36,8 @@
</div> </div>
<div class="cl"></div> <div class="cl"></div>
</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 %>

55
app/views/homework_attach/_show.html.erb
Unescape View File

@ -50,23 +50,9 @@
</span> </span>
</p> </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>
<div class="cl"></div> <div class="cl"></div>
<%= render :partial => 'addjour', :locals => {:homework_attach => @homework, :sta => 0, :is_comprehensive_evaluation => @is_comprehensive_evaluation} %> <%= render :partial => 'addjour', :locals => {:homework_attach => @homework, :sta => 0, :is_comprehensive_evaluation => @is_comprehensive_evaluation} %>
@ -75,40 +61,7 @@
<div class="cl"></div> <div class="cl"></div>
</div><!---ping_con end---> </div><!---ping_con end--->
<div class="ping_list"> <%= render :partial => 'histoey_new' %>
<div id="ping_tb_" class="ping_tb_">
<ul>
<li id="ping_tb_4" class="ping_normaltab" onmouseover="i:HoverLi(4);">
<%= l(:label_teacher_comments) %>（<span class="c_red"><%= @comprehensive_evaluation.count == 0 ? 0:1 %></span>）</li>
<li id="ping_tb_5" class="ping_normaltab" onmouseover="i:HoverLi(5);">
<%= l(:label_anonymous_comments) %>（<span class="c_red"><%= @anonymous_comments.count %></span>）</li>
<li id="ping_tb_3" class="ping_hovertab" onmouseover="x:HoverLi(3);">
<%= l(:label_responses) %>（<span class="c_red"><%= @jours.count %></span>）</li>
</ul>
</div>
<div class="cl"></div>
<div class="ping_ctt">
<div class="ping_dis" id="tbc_03">
<% @jours.each do |jour| %>
<%= render :partial => 'homework_attach/jour',:locals => {:jour => jour} %>
<% end %>
</div><!--全部评论end-->
<div class="ping_undis" id="tbc_04">
<% if @comprehensive_evaluation.count > 0 %>
<%= render :partial => 'homework_attach/jour',:locals => {:jour => @comprehensive_evaluation.first} %>
<% end %>
</div>
<div class="ping_undis" id="tbc_05">
<%= @anonymous_comments.each do |jour| %>
<%= render :partial => 'homework_attach/jour',:locals => {:jour => jour} %>
<% end %>
</div>
</div>
</div> </div>
</div><!---ping_list end--->
</div> </div>

15
app/views/homework_attach/_show_star.html.erb
Unescape View File

@ -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 %>

24
app/views/homework_attach/addjours.js.erb
Unescape View File

@ -1,9 +1,19 @@
//教师评论
<% if @add_jour.is_comprehensive_evaluation == 1 %> <% 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 => @anonymous_comments,:show_score => true,:show_name => false,:is_jour => false})) %>')
//留言
<% else %> <% else %>
$('#message').html('<%= escape_javascript(render(:partial => 'showjour', :locals => {:jour =>@jour, :state => false,:homework => @homework} )) %>'); HoverLi(3);
$('#pre_show').html('<%= escape_javascript(render(:partial => 'pre_show', :locals => {:content => nil})) %>'); $('#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("");

2
app/views/homework_attach/show.js.erb
Unescape View File

@ -1,4 +1,4 @@
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'show',:locals => {:comprehensive_evaluation => @comprehensive_evaluation,:homework => @homework, :teaher_score => @teaher_score,:can_anonymous_comments => false}) %>'); $('#ajax-modal').html('<%= escape_javascript(render :partial => 'show',:locals => {:comprehensive_evaluation => @comprehensive_evaluation,:homework => @homework, :teaher_score => @teaher_score,:can_anonymous_comments => true}) %>');
showModal('ajax-modal', '503px'); showModal('ajax-modal', '503px');
$('#ajax-modal').css('height','569px'); $('#ajax-modal').css('height','569px');

3
config/locales/en.yml
Unescape View File

@ -1849,4 +1849,5 @@ en:
label_participation_person: The participation of personnel label_participation_person: The participation of personnel
label_homework_without_description: The homework without any description! label_homework_without_description: The homework without any description!
label_teacher_comments: Teacher comments label_teacher_comments: Teacher comments
label_anonymous_comments: Anonymous comments label_anonymous_comments: Anonymous comments
label_anonymous: Anonymous

3
config/locales/zh.yml
Unescape View File

@ -2181,4 +2181,5 @@ zh:
label_homework_without_description: 该作业无任何描述！ label_homework_without_description: 该作业无任何描述！
label_sure_exit_homework: 是否确认退出该作业 label_sure_exit_homework: 是否确认退出该作业
label_teacher_comments: 教师评论 label_teacher_comments: 教师评论
label_anonymous_comments: 匿评 label_anonymous_comments: 匿评
label_anonymous: 匿名
Write Preview
Loading…
Cancel
Save