diff --git a/app/views/student_work/_evaluation_un_group.html.erb b/app/views/student_work/_evaluation_un_group.html.erb index 05cc7c5c1..e95251bfb 100644 --- a/app/views/student_work/_evaluation_un_group.html.erb +++ b/app/views/student_work/_evaluation_un_group.html.erb @@ -1,6 +1,6 @@
<% @stundet_works.each_with_index do |student_work, i| %> -
+
<%= render :partial => 'evaluation_un_group_work', :locals => {:student_work => student_work} %>
diff --git a/app/views/student_work/_evaluation_un_group_member_work.html.erb b/app/views/student_work/_evaluation_un_group_member_work.html.erb index 089365952..d373600a5 100644 --- a/app/views/student_work/_evaluation_un_group_member_work.html.erb +++ b/app/views/student_work/_evaluation_un_group_member_work.html.erb @@ -19,7 +19,7 @@ 学号:<%= st.user.user_extensions.nil? ? "--" : st.user.user_extensions.student_id%> <% end %> -
+
<%= st.teacher_score.nil? ? "--" : format("%.1f",st.teacher_score)%>
<%= st.teaching_asistant_score.nil? ? "--" : format("%.1f",st.teaching_asistant_score)%>
<% if @homework.anonymous_comment == 0 %> @@ -47,9 +47,6 @@
<% score = st.work_score %>
- <% if is_expand %> - 评分 - <% end %> <%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%> <% unless score.nil?%>
@@ -70,6 +67,9 @@
+ <% if is_expand %> +
评分
+ <% end %>
@@ -83,4 +83,11 @@ }).mouseleave(function(){ $("#work_click_<%= st.id%>").hide(); }).mouse; + + $(".syllabus_class_list").mouseenter(function(){ + $(this).css("background-color","#f6fafd"); + }); + $(".syllabus_class_list").mouseleave(function(){ + $(this).css("background-color","#fff"); + }); \ No newline at end of file diff --git a/app/views/student_work/_evaluation_un_group_work.html.erb b/app/views/student_work/_evaluation_un_group_work.html.erb index 25b42e5f6..bd3d71a28 100644 --- a/app/views/student_work/_evaluation_un_group_work.html.erb +++ b/app/views/student_work/_evaluation_un_group_work.html.erb @@ -1,7 +1,7 @@
- + <% if student_work.work_status%> <%=get_status student_work.work_status %> @@ -16,12 +16,11 @@ <% end %> <% end %> - 评分
提交时间:<%=format_date(student_work.commit_time) %> -
+
教师:<%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%>
助教:<%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
<% if @homework.anonymous_comment == 0 %> @@ -69,5 +68,6 @@
+ 评分
\ No newline at end of file diff --git a/app/views/student_work/_group_member_work.html.erb b/app/views/student_work/_group_member_work.html.erb index bfe25c982..a03a9fb93 100644 --- a/app/views/student_work/_group_member_work.html.erb +++ b/app/views/student_work/_group_member_work.html.erb @@ -2,7 +2,7 @@ <% student_work_groups = @homework.student_works.where("user_id in #{user_ids}").order("created_at asc") %> <% anon_count = student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count %> <% student_work_groups.each_with_index do |st, j| %> -
+
<%= render :partial => 'evaluation_un_group_member_work', :locals => {:st => st, :anon_count => anon_count} %>
<% if j != 0 %>