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

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

Browse Source
yutao
huang 10 years ago
parent be2b3a78d6 1b4e2b2953
commit 4f5b4c65d2
8 changed files with 181 additions and 59 deletions
Show Stats Download Patch File Download Diff File

16
app/views/homework_common/index.html.erb
Unescape View File

@ -56,7 +56,23 @@
</div> </div>
<% end%> <% end%>
</div> </div>
<div class="cl"></div>
<div class="mt5">
<span class="tit_fb" style="width: auto;"> 扣分标准：</span>
<div class="fl mb5 c_red">
迟交扣
<%= homework.late_penalty%>
分
<% if homework.homework_type == 1%>
,缺评一个作品扣
<%= homework.homework_detail_manual.absence_penalty%>
分
<% else%>
。
<% end%>
</div>
</div>
<div class="cl"></div> <div class="cl"></div>
<span class="fl"><%= l(:label_end_time)%>：<%= homework.end_time%></span> <span class="fl"><%= l(:label_end_time)%>：<%= homework.end_time%></span>

58
app/views/student_work/_evaluation_student_work.html.erb
Unescape View File

@ -0,0 +1,58 @@
<!-- 作品列表，显示某一个作品的信息 -->
<ul class="hwork_ul <%= cycle("b_grey", "") %>" id="student_work_<%= student_work.id%>">
<li class="hwork_num">
<span>
<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
</span>
</li>
<li class=" hwork_name ">
<%= link_to student_work.user.show_name,user_path(student_work.user),:title => student_work.user.show_name, :class => "c_blue02"%>
</li>
<li class=" hwork_tit">
<%= link_to student_work.name, student_work_path(student_work),:remote => true,:title => student_work.name, :class => "c_blue02"%>
</li>
<li class=" hwork_time_c">
<% 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>
<% else%>
<%= student_work.created_at.strftime("%m-%d").to_s%>
<% end %>
</li>
<li class=" hwork_score <%= score_color student_work.teacher_score%>">
<%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%>
</li>
<li class=" hwork_score <%= score_color student_work.teaching_asistant_score%>">
<%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
</li>
<li class=" hwork_code02 <%= score_color student_work.student_score%> student_score_info" >
<%= student_work.student_score.nil? ? "--" : format("%.1f",student_work.student_score)%>
<% unless student_work.student_score.nil?%>
<span class="">
(<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>)
</span>
<div class="info_ni">
现共有
<span class="c_red">&nbsp;<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>&nbsp;</span>
名学生进行了匿评，平均分为
<span class="c_red">&nbsp;<%= format("%.1f",student_work.student_score)%>&nbsp;</span>分。
</div>
<% end%>
</li>
<% score = student_work.respond_to?("score") ? student_work.score : student_work.final_score - student_work.absence_penalty - student_work.late_penalty%>
<li class=" hwork_score <%= score_color score%> student_final_scor_info">
<%= score.nil? ? "--" : format("%.1f",score)%>
<% unless score.nil?%>
<div class="info_ni">
作品最终评分为
<span class="c_red">&nbsp;<%= student_work.final_score%>&nbsp;</span>分。
迟交扣分
<span class="c_red">&nbsp;<%= student_work.late_penalty%>&nbsp;</span>分，
缺评扣分
<span class="c_red">&nbsp;<%= student_work.absence_penalty%>&nbsp;</span>分，
最终成绩为
<span class="c_red">&nbsp;<%= format("%.1f",score)%>&nbsp;</span>分。
</div>
<% end%>
</li>
<div class="cl"></div>
</ul><!---hwork_ul end-->

43
app/views/student_work/_evaluation_student_work_title.html.erb
Unescape View File

@ -0,0 +1,43 @@
<li class="hwork_num ">
<span class="c_dark f14 fb fl">学号</span>
</li>
<li class=" hwork_name f14 fb c_dark">
<%= link_to "姓名",@show_all ? student_work_index_path(:homework => @homework.id,:order => "name", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
<% if @show_all && @order == "name"%>
<a href="javascript:void(0);" class="<%= @score == 'desc' ? 'st_up' : 'st_down'%>" ></a>
<% end%>
</li>
<li class="hwork_tit">
<span class="c_dark f14 fb fl">作品名称</span>
</li>
<li class=" hwork_time f14 fb c_dark">
<%= link_to "时间",@show_all ? student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
<% if @show_all && @order == "created_at"%>
<%= link_to "",student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
<% end%>
</li>
<li class="mr5 w40 ml15">
<%= link_to "教师",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
<% if @show_all && @order == "teacher_score"%>
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
<% end%>
</li>
<li class="mr5 w40 ml20">
<%= link_to "教辅",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
<% if @show_all && @order == "teaching_asistant_score"%>
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
<% end%>
</li>
<li class="mr5 ml10 w40">
<%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
<% if @show_all && @order == "student_score"%>
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
<% end%>
</li>
<li class="ml20">
<%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
<% if @show_all && @order == "score"%>
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
<% end%>
</li>

50
app/views/student_work/_student_work.html.erb
Unescape View File

@ -8,7 +8,7 @@
<li class=" hwork_name "> <li class=" hwork_name ">
<%= link_to student_work.user.show_name,user_path(student_work.user),:title => student_work.user.show_name, :class => "c_blue02"%> <%= link_to student_work.user.show_name,user_path(student_work.user),:title => student_work.user.show_name, :class => "c_blue02"%>
</li> </li>
<li class=" hwork_tit"> <li class=" hwork_tit_une">
<%= link_to student_work.name, student_work_path(student_work),:remote => true,:title => student_work.name, :class => "c_blue02"%> <%= link_to student_work.name, student_work_path(student_work),:remote => true,:title => student_work.name, :class => "c_blue02"%>
</li> </li>
<li class=" hwork_time_c"> <li class=" hwork_time_c">
@ -24,47 +24,19 @@
<li class=" hwork_score <%= score_color student_work.teaching_asistant_score%>"> <li class=" hwork_score <%= score_color student_work.teaching_asistant_score%>">
<%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%> <%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
</li> </li>
<li class=" hwork_code02 <%= score_color student_work.student_score%> student_score_info" >
<%= student_work.student_score.nil? ? "--" : format("%.1f",student_work.student_score)%>
<% unless student_work.student_score.nil?%>
<span class="">
(<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>)
</span>
<div class="info_ni">
现共有
<span class="c_red">&nbsp;<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>&nbsp;</span>
名学生进行了匿评，平均分为
<span class="c_red">&nbsp;<%= format("%.1f",student_work.student_score)%>&nbsp;</span>分。
</div>
<% end%>
</li>
<% score = student_work.respond_to?("score") ? student_work.score : student_work.final_score - student_work.absence_penalty - student_work.late_penalty%> <% score = student_work.respond_to?("score") ? student_work.score : student_work.final_score - student_work.absence_penalty - student_work.late_penalty%>
<li class=" hwork_score <%= score_color score%> student_final_scor_info"> <li class=" hwork_score <%= score_color score%> student_final_scor_info ml4">
<%= score.nil? ? "--" : format("%.1f",score)%> <%= score.nil? ? "--" : format("%.1f",score)%>
<% unless score.nil?%> <% unless score.nil?%>
<% if @homework.homework_type == 1%> <!-- 非匿评作品不显示缺评扣分 -->
<!-- 匿评作品显示缺评扣分 --> <div class="info_ni">
<div class="info_ni"> 作品最终评分为
作品最终评分为 <span class="c_red">&nbsp;<%= student_work.final_score%>&nbsp;</span>分。
<span class="c_red">&nbsp;<%= student_work.final_score%>&nbsp;</span>分。 迟交扣分
迟交扣分 <span class="c_red">&nbsp;<%= student_work.late_penalty%>&nbsp;</span>分，
<span class="c_red">&nbsp;<%= student_work.late_penalty%>&nbsp;</span>分， 最终成绩为
缺评扣分 <span class="c_red">&nbsp;<%= format("%.1f",score)%>&nbsp;</span>分。
<span class="c_red">&nbsp;<%= student_work.absence_penalty%>&nbsp;</span>分， </div>
最终成绩为
<span class="c_red">&nbsp;<%= format("%.1f",score)%>&nbsp;</span>分。
</div>
<% else%>
<!-- 非匿评作品不显示缺评扣分 -->
<div class="info_ni">
作品最终评分为
<span class="c_red">&nbsp;<%= student_work.final_score%>&nbsp;</span>分。
迟交扣分
<span class="c_red">&nbsp;<%= student_work.late_penalty%>&nbsp;</span>分，
最终成绩为
<span class="c_red">&nbsp;<%= format("%.1f",score)%>&nbsp;</span>分。
</div>
<% end%>
<% end%> <% end%>
</li> </li>
<div class="cl"></div> <div class="cl"></div>

8
app/views/student_work/_student_work_title.html.erb
Unescape View File

@ -7,7 +7,7 @@
<a href="javascript:void(0);" class="<%= @score == 'desc' ? 'st_up' : 'st_down'%>" ></a> <a href="javascript:void(0);" class="<%= @score == 'desc' ? 'st_up' : 'st_down'%>" ></a>
<% end%> <% end%>
</li> </li>
<li class="hwork_tit"> <li class="hwork_tit_une">
<span class="c_dark f14 fb fl">作品名称</span> <span class="c_dark f14 fb fl">作品名称</span>
</li> </li>
<li class=" hwork_time f14 fb c_dark"> <li class=" hwork_time f14 fb c_dark">
@ -29,12 +29,6 @@
<% end%> <% end%>
</li> </li>
<li class="mr5 ml10 w40">
<%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
<% if @show_all && @order == "student_score"%>
<%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name) ,:class => @score == 'desc' ? 'st_up' : 'st_down'%>
<% end%>
</li>
<li class="ml20"> <li class="ml20">
<%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%> <%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
<% if @show_all && @order == "score"%> <% if @show_all && @order == "score"%>

61
app/views/student_work/index.html.erb
Unescape View File

@ -69,28 +69,46 @@
<span class="c_red">winrar</span> <span class="c_red">winrar</span>
工具进行解压 工具进行解压
</div> </div>
<%= link_to "匿评", evaluation_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'down_btn fr'%> <%= link_to("匿评", evaluation_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'down_btn fr') if @homework.homework_type == 1%>
<%= link_to "缺评", absence_penalty_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'down_btn fr'%> <%= link_to("缺评", absence_penalty_list_student_work_index_path(:homework => @homework.id, :format => 'xls'),:class=>'down_btn fr') if @homework.homework_type == 1%>
<%= link_to l(:label_list), student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :name => @name, :format => 'xls'),:class=>'down_btn fr'%> <%= link_to l(:label_list), student_work_index_path(:homework => @homework.id,:order => @order, :sort => @b_sort, :name => @name, :format => 'xls'),:class=>'down_btn fr'%>
<span class="mt3 fr " style="color:#136b3b;">导出全部：</span> <span class="mt3 fr " style="color:#136b3b;">导出全部：</span>
</div> </div>
<% end%> <% end%>
<div class="cl"></div> <div class="cl"></div>
</div><!---code_list end---> </div><!---code_list end--->
<ul class="hwork_ul">
<% if @is_evaluation.nil?%>
<%= render :partial => 'student_work_title'%>
<% else%>
<%= render :partial => 'evaluation_work_title'%>
<% end%>
</ul><!---hwork_ul end-->
<div class="cl"></div> <div class="cl"></div>
<% @stundet_works.each do |student_work|%> <% if @is_evaluation%>
<%= render :partial => (@is_evaluation ? 'evaluation_work' :'student_work'),:locals => {:student_work => student_work}%> <ul class="hwork_ul">
<div id="about_hwork_<%= student_work.id%>" ></div> <%= render :partial => 'evaluation_work_title'%>
</ul><!---hwork_ul end-->
<div class="cl"></div>
<% @stundet_works.each do |student_work|%>
<%= render :partial => "evaluation_work",:locals => {:student_work => student_work}%>
<div id="about_hwork_<%= student_work.id%>" ></div>
<% end%>
<% else %>
<% if @homework.homework_type == 1%>
<ul class="hwork_ul">
<%= render :partial => 'evaluation_student_work_title'%>
</ul><!---hwork_ul end-->
<div class="cl"></div>
<% @stundet_works.each do |student_work|%>
<%= render :partial => "evaluation_student_work",:locals => {:student_work => student_work}%>
<div id="about_hwork_<%= student_work.id%>" ></div>
<% end%>
<% else%>
<ul class="hwork_ul">
<%= render :partial => 'student_work_title'%>
</ul><!---hwork_ul end-->
<div class="cl"></div>
<% @stundet_works.each do |student_work|%>
<%= render :partial => "student_work",:locals => {:student_work => student_work}%>
<div id="about_hwork_<%= student_work.id%>" ></div>
<% end%>
<% end%>
<% end%> <% end%>
<div class="cl"></div> <div class="cl"></div>
</div><!---tbc_01 end--> </div><!---tbc_01 end-->
@ -123,6 +141,23 @@
</div> </div>
<% end%> <% end%>
</div> </div>
<div class="cl"></div>
<div class="mt5">
<span class="tit_fb" style="width: auto;"> 扣分标准：</span>
<div class="fl mb5 c_red">
迟交扣
<%= @homework.late_penalty%>
分
<% if @homework.homework_type == 1%>
,缺评一个作品扣
<%= @homework.homework_detail_manual.absence_penalty%>
分
<% else%>
。
<% end%>
</div>
</div>
<div class="cl"></div> <div class="cl"></div>
<span class="fl">截止时间：<%= @homework.end_time%></span> <span class="fl">截止时间：<%= @homework.end_time%></span>

2
public/stylesheets/courses.css
Unescape View File

@ -626,6 +626,8 @@ a:hover.icon_add{background:url(images/icons.png) -20px -310px no-repeat;}
.hwork_tit{ width:210px; float:left; } .hwork_tit{ width:210px; float:left; }
.hwork_tit a{ width:205px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; } .hwork_tit a{ width:205px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
.hwork_tit_une{ width:270px; float:left; }
.hwork_tit_une a{ width:265px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
.hwork_code{ width:56px; text-align:center; } .hwork_code{ width:56px; text-align:center; }
.hwork_code02{ width:60px; text-align:center; } .hwork_code02{ width:60px; text-align:center; }
.hwork_tit_e{ width:420px; float:left; } .hwork_tit_e{ width:420px; float:left; }

2
public/stylesheets/public.css
Unescape View File

@ -98,6 +98,8 @@ h4{ font-size:14px; color:#3b3b3b;}
.w210{ width:210px;} .w210{ width:210px;}
.w150{ width:150px;} .w150{ width:150px;}
.w280{ width:280px;} .w280{ width:280px;}
.w265{ width: 265px;}
.w270{ width: 270px;}
.w430{ width:470px;} .w430{ width:470px;}
.w520{ width:520px;} .w520{ width:520px;}
.w543{ width:543px;} .w543{ width:543px;}

Write Preview
Loading…
Cancel
Save