Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
commit
d1ecc7bc54
@ -1,8 +1,15 @@
|
|||||||
<ul class="hworkUl b_grey">
|
<ul class="hworkUl">
|
||||||
<li class="hworkList380 width625">
|
<li class="hworkList340 hworkH30 width505">
|
||||||
<span class="c_dark f14 fb fl ml10">作品信息</span>
|
<span class="HomeworkNameTitle f14 fb fl">作品名称</span>
|
||||||
|
<span class="HomeworkStuTitle f14 fb fl">姓名</span>
|
||||||
|
<span class="HomeworkStuTitle f14 fb fl">学号</span>
|
||||||
</li>
|
</li>
|
||||||
<li class="hworkList80 mr10" >
|
|
||||||
<span class="c_dark f14 fb fl ml10">我的评分</span>
|
<li class="hworkList130 hworkH30 fb ml10">
|
||||||
|
时间
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li class="hworkList50 hworkH30 fb mr10 ml10">
|
||||||
|
我的评分
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
@ -1,37 +1,51 @@
|
|||||||
<ul class="hworkUl b_grey">
|
<ul class="hworkUl">
|
||||||
<li class="hworkList380 <%= @homework.homework_type == 2 ? '' : 'width455'%>">
|
<li class="hworkList340 hworkH30 <%= @homework.homework_type == 2 ? '' : 'width385'%>">
|
||||||
<span class="c_dark f14 fb fl ml10">作品信息</span>
|
<span class="c_dark f14 fb fl <%= @homework.homework_type == 2 ? 'mr60 ml80' : 'mr95 ml100'%>">作品名称</span>
|
||||||
|
<span class="c_dark f14 fb fl mr50">姓名</span>
|
||||||
|
<span class="c_dark f14 fb fl">学号</span>
|
||||||
</li>
|
</li>
|
||||||
<li class="hworkList80" >
|
|
||||||
<%= link_to "教师评分",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10"%>
|
<li class="hworkList130 hworkH30">
|
||||||
|
<%= link_to "时间",@show_all ? student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml50" ,:remote => true%>
|
||||||
|
<% if @show_all && @order == "created_at"%>
|
||||||
|
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
|
||||||
|
<% end%>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li class="hworkList50 hworkH30" >
|
||||||
|
<%= link_to "教师",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10" ,:remote => true%>
|
||||||
<% if @show_all && @order == "teacher_score"%>
|
<% if @show_all && @order == "teacher_score"%>
|
||||||
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt19"%>
|
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%>
|
||||||
<% end%>
|
<% end%>
|
||||||
</li>
|
</li>
|
||||||
<li class="hworkList80">
|
|
||||||
<%= link_to "教辅评分",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10"%>
|
<li class="hworkList50 hworkH30">
|
||||||
|
<%= link_to "教辅",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
|
||||||
<% if @show_all && @order == "teaching_asistant_score"%>
|
<% if @show_all && @order == "teaching_asistant_score"%>
|
||||||
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt19"%>
|
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
|
||||||
<% end%>
|
<% end%>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<% if @homework.homework_type == 2%>
|
<% if @homework.homework_type == 2%>
|
||||||
<li class="hworkList80">
|
<li class="hworkList50 hworkH30">
|
||||||
<%= link_to "系统评分",@show_all ? student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10"%>
|
<%= link_to "系统",@show_all ? student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
|
||||||
<% if @show_all && @order == "system_score"%>
|
<% if @show_all && @order == "system_score"%>
|
||||||
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt19"%>
|
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "system_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
|
||||||
<% end%>
|
<% end%>
|
||||||
</li>
|
</li>
|
||||||
<% end%>
|
<% end%>
|
||||||
<li class="hworkList50">
|
|
||||||
<%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10"%>
|
<li class="hworkList50 hworkH30">
|
||||||
|
<%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
|
||||||
<% if @show_all && @order == "student_score"%>
|
<% if @show_all && @order == "student_score"%>
|
||||||
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt19"%>
|
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
|
||||||
<% end%>
|
<% end%>
|
||||||
</li>
|
</li>
|
||||||
<li class="hworkList50">
|
|
||||||
<%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10"%>
|
<li class="hworkList50 hworkH30">
|
||||||
|
<%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml10",:remote => true%>
|
||||||
<% if @show_all && @order == "score"%>
|
<% if @show_all && @order == "score"%>
|
||||||
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt19"%>
|
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10",:remote => true%>
|
||||||
<% end%>
|
<% end%>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
@ -1,51 +1,62 @@
|
|||||||
<!-- 匿评作品列表，显示某一个作品的信息 -->
|
<!-- 匿评作品列表，显示某一个作品的信息 -->
|
||||||
<ul class="hworkListRow" id="student_work_<%= student_work.id%>">
|
<ul class="hworkListRow" id="student_work_<%= student_work.id%>">
|
||||||
<% is_my_work = student_work.user == User.current%>
|
<% is_my_work = student_work.user == User.current%>
|
||||||
<li class="hworkList380 width620">
|
<li class="hworkList340 width525">
|
||||||
<ul>
|
<ul>
|
||||||
<li class="hworkName mt12 m_width620">
|
<% if is_my_work%>
|
||||||
<% if is_my_work%>
|
<li class="hworkPortrait mt15 mr10">
|
||||||
|
<%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40") %>
|
||||||
|
</li>
|
||||||
|
<li class="hworkName mt15 mr15 width285">
|
||||||
<% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
|
<% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
|
||||||
<%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14"%>
|
<div>
|
||||||
<% else%>
|
<%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
|
||||||
<%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14"%>
|
</div>
|
||||||
<% end%>
|
|
||||||
</li>
|
|
||||||
<div class="cl"></div>
|
|
||||||
<li>
|
|
||||||
<ul class="mt12">
|
|
||||||
<li class="hworkDetail mr15">
|
|
||||||
姓名：
|
|
||||||
<% if is_my_work%>
|
|
||||||
<%= student_work.user.show_name%>
|
|
||||||
<% else%>
|
|
||||||
匿名
|
|
||||||
<% end%>
|
|
||||||
</li>
|
</li>
|
||||||
<li class="hworkDetail mr15">
|
<li>
|
||||||
学号：
|
<ul class="mt10 fl">
|
||||||
<% if is_my_work%>
|
<li class="hworkStName mr10 mt16" title="姓名">
|
||||||
<span>
|
<%= student_work.user.show_name%>
|
||||||
|
</li>
|
||||||
|
<li class="hworkStID mt16" title="学号">
|
||||||
<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
|
<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
|
||||||
</span>
|
</li>
|
||||||
<% else%>
|
</ul>
|
||||||
--
|
|
||||||
<% end%>
|
|
||||||
</li>
|
</li>
|
||||||
<li class="hworkDate">
|
<% else%>
|
||||||
时间：
|
<li class="hworkPortrait mt15 mr10">
|
||||||
<% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
|
<%= image_tag(url_to_avatar(""),width:"40", height: "40") %>
|
||||||
<span class="c_red">迟交</span>
|
|
||||||
<% else%>
|
|
||||||
<%= format_time student_work.created_at%>
|
|
||||||
<% end %>
|
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
<li class="hworkName mt15 mr15 width285">
|
||||||
</li>
|
<div>
|
||||||
|
<%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<ul class="mt10 fl">
|
||||||
|
<li class="hworkStName mr10 mt16" title="姓名">
|
||||||
|
匿名
|
||||||
|
</li>
|
||||||
|
<li class="hworkStID mt16" title="学号">
|
||||||
|
--
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
<% end%>
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
|
<li class="hworkList130 c_grey">
|
||||||
|
<%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>
|
||||||
|
<% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
|
||||||
|
<span class="c_red">[迟交]</span>
|
||||||
|
<% end %>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<!-- 成绩 -->
|
||||||
<% my_score = student_work_score(student_work,User.current) %>
|
<% my_score = student_work_score(student_work,User.current) %>
|
||||||
<li class="hworkList80 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10">
|
<li class="hworkList50 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10">
|
||||||
<%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
|
<%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,2 @@
|
|||||||
|
$("#homework_student_work_list").html("<%= escape_javascript(render :partial => 'student_work/student_work_list') %>");
|
||||||
|
$("#export_student_work").replaceWith("<%= escape_javascript( link_to "导出作业成绩", student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :group => @group, :name => @name, :format => 'xls'),:class=>'hworkExport postTypeGrey', :id => 'export_student_work') %>");
|
||||||
Loading…
Reference in new issue