#1345 修改老师综评价界面

This commit is contained in:
sw 2014-10-10 15:43:18 +08:00
parent 794f607b66
commit 379e721191
3 changed files with 39 additions and 53 deletions

View File

@ -1,55 +1,31 @@
<% is_teacher = is_course_teacher User.current,homework.bid.courses.first %>
<% if comprehensive_evaluation != nil && comprehensive_evaluation.count > 0 %>
<div style="height: <%= is_teacher ? 250 : 100%>px; padding-bottom: 10px">
<div style="font-size: 15px">
<strong>作业综评:</strong>
<% if teaher_score != "0.00" %>
<%= render :partial => 'show_score', locals: {:stars => teaher_score} %>
<% end %>
</div>
<div style="font-size: 14px;">
<div style="margin-left: 20px;margin-bottom: 10px;margin-top: 10px;"> <%= comprehensive_evaluation.first.notes%> </div>
</div>
<% if is_teacher %>
<%= render :partial => 'evaluation', :locals => {:homework => homework} %>
<div>
<%= render :partial => 'evaluation_add_jour',
:locals => {:homework_attach => homework,
:sta => 0,
:is_comprehensive_evaluation => 1,
:comprehensive_evaluation => comprehensive_evaluation.first.notes} %>
</div>
<% end %>
</div>
<% else %>
<% if is_teacher %>
<div style="height: 200px; padding-bottom: 10px">
<div style="font-size: 15px">
<strong>作业综评:</strong>
<% if teaher_score != "0.00" %>
<%= render :partial => 'show_score', locals: {:stars => teaher_score} %>
<% end %>
</div>
<%= render :partial => 'evaluation', :locals => {:homework => homework} %>
<div>
<%= render :partial => 'evaluation_add_jour',
:locals => {:homework_attach => homework,
:sta => 0,
:is_comprehensive_evaluation => 1,
:comprehensive_evaluation => nil} %>
</div>
</div>
<% else %>
<div style="height: 80px; padding-bottom: 10px">
<div style="font-size: 15px">
<strong>作业综评:</strong>
<% if teaher_score != "0.00" %>
<%= render :partial => 'show_score', locals: {:stars => teaher_score} %>
<% end %>
</div>
<% if teaher_score == "0.00" %>
<div style="text-align: center;font-size: 15px;color: #15BCCC;vertical-align:middle;padding-top: 15px; "><strong>老师还未进行评价!</strong></div>
<% end %>
</div>
<div style="padding-bottom: 10px">
<div style="font-size: 15px">
<strong><%= l(:lable_teacher_evaluation)%></strong>
<% if teaher_score != "0.00" %>
<%= render :partial => 'show_score', locals: {:stars => teaher_score} %>
<% end %>
<% end %>
<div style="font-size: 14px;">
<div style="margin-left: 20px;margin-bottom: 10px;margin-top: 10px;">
<%= comprehensive_evaluation.first.notes if !comprehensive_evaluation.nil? && comprehensive_evaluation.count > 0%>
</div>
</div>
<% if(teaher_score == "0.00" && !(!comprehensive_evaluation.nil? && comprehensive_evaluation.count > 0))%>
<% if is_teacher %>
<%#= render :partial => 'teacher_evaluation',
:locals => {:homework => homework, :comprehensive_evaluation => comprehensive_evaluation} %>
<% else %>
<div style="text-align: center;font-size: 15px;color: #15BCCC;vertical-align:middle;padding-top: 15px; ">
<strong><%= l(:lable_teacher_evaluation_no) %></strong>
</div>
<% end %>
<% end %>
</div>
</div>
<div>
<% if is_teacher %>
<%= render :partial => 'teacher_evaluation',:locals => {:homework => homework} %>
<% end %>
</div>

View File

@ -0,0 +1,8 @@
<%= render :partial => 'evaluation', :locals => {:homework => homework} %>
<div>
<%= render :partial => 'evaluation_add_jour',
:locals => {:homework_attach => homework,
:sta => 0,
:is_comprehensive_evaluation => 1,
:comprehensive_evaluation => l(:label_leave_a_message)} %>
</div>

View File

@ -2146,3 +2146,5 @@ zh:
lable_input_class: 在此输入课时
lable_input_class_vilidate: 学时只能为整数
lable_school_list: 学校列表
lable_teacher_evaluation_no: 老师还未进行评价
lable_teacher_evaluation: 作业综评