From b0efdefa7d2e9f9f9872b3ff3691faed10c722fc Mon Sep 17 00:00:00 2001 From: yanxd Date: Tue, 17 Dec 2013 16:01:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E5=8F=B7=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/bids_helper.rb | 10 ++ app/views/bids/_list_projects.html.erb | 12 ++- app/views/bids/show_participator.html.erb | 109 ++++++++++++---------- 3 files changed, 78 insertions(+), 53 deletions(-) diff --git a/app/helpers/bids_helper.rb b/app/helpers/bids_helper.rb index 274775a53..103dbccfa 100644 --- a/app/helpers/bids_helper.rb +++ b/app/helpers/bids_helper.rb @@ -125,4 +125,14 @@ module BidsHelper end @users.count 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 \ No newline at end of file diff --git a/app/views/bids/_list_projects.html.erb b/app/views/bids/_list_projects.html.erb index e1b8815b0..6947f8ceb 100644 --- a/app/views/bids/_list_projects.html.erb +++ b/app/views/bids/_list_projects.html.erb @@ -152,7 +152,11 @@ <% if @bid.reward_type == 3 %> - + diff --git a/app/views/bids/show_participator.html.erb b/app/views/bids/show_participator.html.erb index 4a2bcab45..e19340ee2 100644 --- a/app/views/bids/show_participator.html.erb +++ b/app/views/bids/show_participator.html.erb @@ -3,56 +3,63 @@
<% for temp in @bid.join_in_contests %> <% user = temp.user %> -
<%= l(:label_bidding_user_studentcode) %> : <%= b_project.user.user_extensions.student_id %> + <% 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 %> +
<%= l(:label_bidding_user_homework) %> : @@ -171,7 +175,11 @@ <%= b_project.user.lastname %><%= b_project.user.firstname %> <% end %> -

<%= l(:label_bidding_user_studentcode) %> ：<%= b_project.user.user_extensions.student_id%>

+

+ <% 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 %> +

- - - - +
<%= link_to image_tag(url_to_avatar(user), :class => "avatar"), - user_path(user), - :title => "#{user.show_name}" %> - - - - - - - -
<%= content_tag "div", link_to(user.show_name, user_path(user)), :class => "project_avatar_name" , - :title => "#{user.show_name}" %> - - - <%= l(:label_bidding_user_studentcode) %> ：<%= user.user_extensions.student_id%> -

- <% 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 %> -

- - -

- <% unless user.memberships.empty? %> - <% cond = Project.visible_condition(User.current) + "AND projects.project_type = 1" %> - <% memberships = user.memberships.all(:conditions => cond) %> - <%= l(:label_x_course_contribute_to, :count => memberships.count) %> - <% for member in memberships %> - <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %> - <% end %> - <% end %> -

+
    +
  • + + + + + - - - - - - -
    + <%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.show_name}" %> + + + + + + + + + + + + + + +
    <%= content_tag "div", link_to(user.show_name, user_path(user)), :class => "project_avatar_name" , :title => "#{user.show_name}" %> + + <% 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 %> +
    +

    + <% 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 %> +

    + + +

    + <% unless user.memberships.empty? %> + <% cond = Project.visible_condition(User.current) + "AND projects.project_type = 1" %> + <% memberships = user.memberships.all(:conditions => cond) %> + <%= l(:label_x_course_contribute_to, :count => memberships.count) %> + <% for member in memberships %> + <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %> + <% end %> + <% end %> +

    +
    + <%= l(:label_user_joinin) %><%= format_date(user.created_on) %> +
    <%= l(:label_user_joinin) %><%= format_date(user.created_on) %> -
-<% end %> +
+ + + <% end %> \ No newline at end of file