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

学号显示问题

Browse Source
exceptionHandle
yanxd 12 years ago
parent cca2e6c0fa
commit b0efdefa7d
3 changed files with 78 additions and 53 deletions
Show Stats Download Patch File Download Diff File

10
app/helpers/bids_helper.rb
Unescape View File

@ -125,4 +125,14 @@ module BidsHelper
end end
@users.count @users.count
end end
def im_watching_student_id? bid
people = []
people << bid.author
bid.join_in_contests.each do |jic|
people << jic.user
end
people.include?(User.current)
end
end end

12
app/views/bids/_list_projects.html.erb
Unescape View File

@ -152,7 +152,11 @@
<table width="100%"> <table width="100%">
<% if @bid.reward_type == 3 %> <% if @bid.reward_type == 3 %>
<tr> <tr>
<td><%= l(:label_bidding_user_studentcode) %> : <%= b_project.user.user_extensions.student_id %></td> <td>
<% if (im_watching_student_id? @bid) && user.user_extensions.identity.to_i.eql?(1) %>
<%= l(:label_bidding_user_studentcode) %> : <%= b_project.user.user_extensions.student_id %>
<% end %>
</td>
</tr> </tr>
<tr> <tr>
<td><%= l(:label_bidding_user_homework) %> : <td><%= l(:label_bidding_user_homework) %> :
@ -171,7 +175,11 @@
<%= b_project.user.lastname %><%= b_project.user.firstname %> <%= b_project.user.lastname %><%= b_project.user.firstname %>
<% end %></strong> <% end %></strong>
<!-- added by bai 加入学号 --> <!-- added by bai 加入学号 -->
<p><strong><%= l(:label_bidding_user_studentcode) %> ：<%= b_project.user.user_extensions.student_id%></strong></p> <p><strong>
<% if (im_watching_student_id? @bid) && b_project.user.user_extensions.identity.to_i.eql?(1) %>
<%= l(:label_bidding_user_studentcode) %> : <%= b_project.user.user_extensions.student_id %>
<% end %>
</strong></p>
</td> </td>
<!-- end --> <!-- end -->

105
app/views/bids/show_participator.html.erb
Unescape View File

@ -3,56 +3,63 @@
<div class="inf_user_image"> <div class="inf_user_image">
<% for temp in @bid.join_in_contests %> <% for temp in @bid.join_in_contests %>
<% user = temp.user %> <% user = temp.user %>
<ul class="list_watch"><li> <ul class="list_watch">
<table width="660px" border="0" align="center"> <li>
<tr> <table width="660px" border="0" align="center">
<!-- modified by bai 显示人名全称--> <tr>
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(user), :class => "avatar"), <!-- modified by bai 显示人名全称-->
user_path(user), <td colspan="2" valign="top" width="50" >
:title => "#{user.show_name}" %></td> <%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.show_name}" %>
<td><table width="580px" border="0"> </td>
<tr> <td>
<td colspan="2" valign="top"><strong><%= content_tag "div", link_to(user.show_name, user_path(user)), :class => "project_avatar_name" , <table width="580px" border="0">
:title => "#{user.show_name}" %> <tr>
<td colspan="2" valign="top"><%= content_tag "div", link_to(user.show_name, user_path(user)), :class => "project_avatar_name" , :title => "#{user.show_name}" %>
<!-- added by bai 增加了学员的学号 -->
<% if (im_watching_student_id? @bid) && user.user_extensions.identity.to_i.eql?(1) %>
<%= l(:label_bidding_user_studentcode) %> ：<%= user.user_extensions.student_id%>
<% end %>
</td>
</tr>
<tr>
<!-- modified by bai 区分课程与项目-->
<td colspan="2" width="580px" >
<p class="font_description">
<% unless user.memberships.empty? %>
<% cond = Project.visible_condition(User.current) + "AND projects.project_type <> 1" %>
<% memberships = user.memberships.all(:conditions => cond) %>
<%= l(:label_x_contribute_to, :count => memberships.count) %>
<% for member in memberships %>
<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
<% end %>
<% end %>
</p>
<!-- added by bai 增加了学员的学号 --> <!-- added by bai -->
<%= l(:label_bidding_user_studentcode) %> ：<%= user.user_extensions.student_id%> <p class="font_description">
</td> <% unless user.memberships.empty? %>
</tr> <% cond = Project.visible_condition(User.current) + "AND projects.project_type = 1" %>
<tr> <% memberships = user.memberships.all(:conditions => cond) %>
<!-- modified by bai 区分课程与项目--> <%= l(:label_x_course_contribute_to, :count => memberships.count) %>
<td colspan="2" width="580px" ><p class="font_description"> <% for member in memberships %>
<% unless user.memberships.empty? %> <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
<% cond = Project.visible_condition(User.current) + "AND projects.project_type <> 1" %> <% end %>
<% memberships = user.memberships.all(:conditions => cond) %> <% end %>
<%= l(:label_x_contribute_to, :count => memberships.count) %> </p>
<% for member in memberships %> </td>
<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %> </tr>
<% end %> <!-- end -->
<% end %>
</p>
<!-- added by bai --> <tr>
<p class="font_description"> <td width="200" align="right" class="font_lighter">
<% unless user.memberships.empty? %> <%= l(:label_user_joinin) %><%= format_date(user.created_on) %>
<% cond = Project.visible_condition(User.current) + "AND projects.project_type = 1" %> </td>
<% memberships = user.memberships.all(:conditions => cond) %> </tr>
<%= l(:label_x_course_contribute_to, :count => memberships.count) %> </table>
<% for member in memberships %>
<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
<% end %>
<% end %>
</p>
</td> </td>
</tr> </tr>
<!-- end --> </table>
</li>
<tr> </ul>
<td width="200" align="right" class="font_lighter"><%= l(:label_user_joinin) %><%= format_date(user.created_on) %> <% end %>
</td>
</tr>
</table></td>
</tr>
</table></li></ul>
<% end %>
</div> </div>
Write Preview
Loading…
Cancel
Save