From 857110d537a324db91e1f75db9db6db3a6a3d592 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 19 Jun 2015 11:54:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=EF=BC=8C=E7=9B=B8?=
=?UTF-8?q?=E5=BA=94=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/student_work/_student_work.html.erb | 21 +++++++++++--------
.../student_work/_student_work_title.html.erb | 17 ++++++++-------
public/stylesheets/courses.css | 4 +++-
public/stylesheets/public.css | 2 ++
4 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/app/views/student_work/_student_work.html.erb b/app/views/student_work/_student_work.html.erb
index e39cb130d..22df921ec 100644
--- a/app/views/student_work/_student_work.html.erb
+++ b/app/views/student_work/_student_work.html.erb
@@ -11,14 +11,17 @@
<%= link_to student_work.name, student_work_path(student_work),:remote => true,:title => student_work.name, :class => "c_blue02"%>
-
- <%= student_work.teacher_score.nil? ? "--" : format("%.2f",student_work.teacher_score)%>
+
+ 06-01
-
- <%= student_work.teaching_asistant_score.nil? ? "--" : format("%.2f",student_work.teaching_asistant_score)%>
+
+ <%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%>
-
- <%= student_work.student_score.nil? ? "--" : format("%.2f",student_work.student_score)%>
+
+ <%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%>
+
+
+ <%= student_work.student_score.nil? ? "--" : format("%.1f",student_work.student_score)%>
<% unless student_work.student_score.nil?%>
(<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>)
@@ -27,12 +30,12 @@
现共有
<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>
名学生进行了匿评，平均分为
- <%= format("%.2f",student_work.student_score)%> 分。
+ <%= format("%.1f",student_work.student_score)%> 分。
<% end%>
-
- <%= student_work.final_score.nil? ? "--" : format("%.2f",student_work.final_score)%>
+
+ <%= student_work.final_score.nil? ? "--" : format("%.1f",student_work.final_score)%>
\ No newline at end of file
diff --git a/app/views/student_work/_student_work_title.html.erb b/app/views/student_work/_student_work_title.html.erb
index 6fb7e248b..982eb34d8 100644
--- a/app/views/student_work/_student_work_title.html.erb
+++ b/app/views/student_work/_student_work_title.html.erb
@@ -2,30 +2,33 @@
学号
- 学生姓名
+ 姓名
作品名称
-
- <%= 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 hwork_code"%>
+
+ 时间
+
+
+ <%= 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"%>
<% end%>
-
- <%= 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 hwork_code"%>
+
+ <%= 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"%>
<% end%>
-
+
<%= 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"%>
<% end%>
-
+
<%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "final_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
<% if @show_all && @order == "final_score"%>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index b2e68085a..bb5baedd6 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -100,7 +100,6 @@ a:hover.grey_btn{ background:#717171; color:#fff;}
.f_14{ font-size:14px;}
.c_dblue{ color:#3e6d8e;}
.w90{width:90px;}
-.w40{width:40px;}
.ml10{margin-left:10px;}
.resource{ width:670px;}
.re_top{width:660px; height:40px; background:#eaeaea; padding:5px;}
@@ -661,6 +660,9 @@ a:hover.down_btn{ background:#14ad5a; color:#fff; border:1px solid #14ad5a;}
.to_top{width: 19px;height: 74px;position: fixed;top: 50px;right: 1px;color: white;background: #15bccf; line-height: 1.2; padding-top: 10px;padding-left: 5px;font-size: 14px;cursor: pointer;}
.hwork_num_ab{ width:120px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
.hwork_name_ab{ display:block;width:340px; overflow: hidden;white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
+.hwork_time{ display:block;width:40px; overflow: hidden;white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
+.hwork_time_c{width:40px;color: #6d6d6d}
+.hwork_score{ width:62px; text-align:center; }
.absence{width: 50px;text-align: center;}
/* 评分插件 */
input#score{ width:40px;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index cdcde2559..b688b495f 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -58,6 +58,7 @@ h4{ font-size:14px; color:#3b3b3b;}
.ml8{ margin-left:8px;}
.ml10{ margin-left:10px;}
.ml15{ margin-left:15px;}
+.ml16{ margin-left: 16px;}
.ml20{ margin-left:20px;}
.ml35{margin-left: 35px;}
.ml40{ margin-left:40px;}
@@ -90,6 +91,7 @@ h4{ font-size:14px; color:#3b3b3b;}
.w20{ width:20px;}
.w40{width: 40px;}
.w45{ width: 45px;}
+.w50{ width:50px;}
.w60{ width:60px;}
.w70{ width:70px;}
.w90{ width:90px;}