From 12087f40c7fcb88d938a4e615f8285fe3cf93902 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 26 Jun 2014 11:22:48 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=BD=93=E4=BD=9C=E4=B8=9A=E6=9C=AA=E9=80=89?= =?UTF-8?q?=E5=AE=9A=E9=A1=B9=E7=9B=AE=E6=97=B6=EF=BC=8C=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BE=97=E5=88=86=E4=B8=BA=E7=81=B0=E8=89=B2=E7=9A=84N/A?= =?UTF-8?q?=EF=BC=8C=E9=80=89=E5=AE=9A=E4=BA=86=E9=A1=B9=E7=9B=AE=EF=BC=8C?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BE=97=E5=88=86=E4=B8=BA=E6=A9=98=E8=89=B2?= =?UTF-8?q?=E7=9A=84=E5=88=86=E6=95=B0=202.=E5=BD=93=E6=97=A0=E4=BA=BA?= =?UTF-8?q?=E5=AF=B9=E4=BD=9C=E4=B8=9A=E8=BF=9B=E8=A1=8C=E4=BA=92=E8=AF=84?= =?UTF-8?q?=E3=80=81=E7=BB=BC=E8=AF=84=E6=97=B6=EF=BC=8C=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=9A=84=E4=BA=92=E8=AF=84=E3=80=81=E7=BB=BC=E8=AF=84=E5=BE=97?= =?UTF-8?q?=E5=88=86=E4=B8=BA=E7=81=B0=E8=89=B2=E7=9A=84N/A=EF=BC=8C?= =?UTF-8?q?=E6=9C=89=E4=BA=BA=E8=BF=9B=E8=A1=8C=E8=AF=84=E5=88=86=E5=88=99?= =?UTF-8?q?=E4=B8=BA=E6=A9=98=E8=89=B2=E7=9A=84=E5=88=86=E6=95=B0=203.?= =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_homework_list.html.erb | 163 +++++++++++++------------ 1 file changed, 83 insertions(+), 80 deletions(-) diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb index c1de9629d..705040579 100644 --- a/app/views/bids/_homework_list.html.erb +++ b/app/views/bids/_homework_list.html.erb @@ -58,90 +58,93 @@ - - - - - + + + + + - - - - - - - - - + + + + + + + + - + <% if is_evaluation || is_teacher%> + <%= render :partial => 'app_link', :locals => {:attachments => homework.attachments} %> + <% end %> + +
- 作品名称:  - <% if homework.name == nil || homework.name == "" %> - <% homework_filename = homework.user.name + "提交的作业" %> - <% else %> - <% homework_filename = homework.name %> - <% end %> - - <%= link_to homework_filename , homework_attach_path(homework)%> - - - 合作成员:  - <% homework_users = homework_user_of_homework(homework,is_teacher) %> - <% if homework.users.count == 0 %> - 无 - <% else %> - <%= homework_users %> - <% end %> - - <% if Time.parse(@bid.deadline.to_s) < Time.parse(homework.created_at.to_s) %> - 迟交 - <% end %> -
+ 作品名称:  + <% if homework.name == nil || homework.name == "" %> + <% homework_filename = homework.user.name + "提交的作业" %> + <% else %> + <% homework_filename = homework.name %> + <% end %> + + <%= link_to homework_filename , homework_attach_path(homework)%> + + + 合作成员:  + <% homework_users = homework_user_of_homework(homework,is_teacher) %> + <% if homework.users.count == 0 %> + 无 + <% else %> + <%= homework_users %> + <% end %> + + <% if Time.parse(@bid.deadline.to_s) < Time.parse(homework.created_at.to_s) %> + 迟交 + <% end %> +
- 开发项目:  - <% if homework.project != nil %> - <%= link_to homework.project.name,project_path(homework.project.id)%> - <% else %> - 暂无 - <% end %> - - 项目得分:  - - <% if homework.project != nil %> - <%= project_score homework.project %> - <% else %> - 0.00 - <% end %> - - -
- 提交文件:  - <% if is_evaluation || is_teacher%> - <%= link_to "打包下载", :controller => "zipdown", :action => "download_user_homework",:homework => homework%> - <% else %> - 未开启互评功能作业不允许下载 - <% end %> - - - 互评得分:  - <%= student_score_for_homework(homework) %>   - <% if is_evaluation && is_student && (!users_for_homework(homework).include? User.current)%> - <%= link_to "学生互评>>",homework_attach_path(homework) %> - <% end %> - -
+ 开发项目:  + <% if homework.project != nil %> + <%= link_to homework.project.name,project_path(homework.project.id)%> + <% else %> + 暂无 + <% end %> + + 项目得分:  + ;"> + <%= homework.project.nil? ? "N/A" : project_score(homework.project) %> + + +
+ 提交文件:  + <% if is_evaluation || is_teacher%> + <%= link_to "打包下载", :controller => "zipdown", :action => "download_user_homework",:homework => homework%> + <% else %> + 未开启互评功能作业不允许下载 + <% end %> + + + 互评得分:  + <% student_homework_score = student_score_for_homework(homework) %> + ;"> + <% score = student_homework_score == "0.00"? "N/A" : student_homework_score %> + <%= score %> +    + <% if is_evaluation && is_student && (!users_for_homework(homework).include? User.current)%> + <%= link_to "学生互评>>",homework_attach_path(homework) %> + <% end %> + +
- <% if is_evaluation || is_teacher%> - <%= render :partial => 'app_link', :locals => {:attachments => homework.attachments} %> - <% end %> - - 终评得分:  - <%= score_for_homework homework %>   - <% if is_teacher %> - <%= link_to "教师评分>>",homework_attach_path(homework) %> - <% end %> - - + 终评得分:  + <% totle_homework_score = score_for_homework(homework) %> + ;"> + <% score = totle_homework_score == "0.00"? "N/A" : totle_homework_score %> + <%= score %> +    + <% if is_teacher %> + <%= link_to "教师评分>>",homework_attach_path(homework) %> + <% end %> + +