diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb index d9cac4b58..8f3b184e0 100644 --- a/app/controllers/bids_controller.rb +++ b/app/controllers/bids_controller.rb @@ -6,7 +6,8 @@ class BidsController < ApplicationController menu_item :homework_respond, :only => :homework_respond menu_item :homework_statistics, :only => :homework_statistics #Ended by young - before_filter :find_bid, :only => [:show, :show_project, :create,:destroy,:more,:back,:add,:new,:show_results,:set_reward, :add_homework, :fork, :create_fork, :show_course] + before_filter :find_bid, :only => [:show, :show_project, :create,:destroy,:more,:back,:add,:new,:show_results,:set_reward, :add_homework, :fork, :create_fork, + :show_course, :show_bid_project, :show_bid_user] before_filter :require_login,:only => [:set_reward] helper :watchers @@ -234,6 +235,60 @@ class BidsController < ApplicationController end end + + def show_bid_project + bids = Bid.where('parent_id = ?', @bid.id) + @projects = [] + for bid in bids + @projects += bid.biding_projects + end + + respond_to do |format| + if @bid.reward_type == 3 + format.html { + render :layout => 'base_homework' + } + elsif @bid.reward_type == 1 + format.html { + render :layout => 'base_bids' + } + else + format.html { + render :layout => 'base_contest' + } + end + format.api + + end + end + + def show_bid_user + bids = Bid.where('parent_id = ?', @bid.id) + @users = [] + for bid in bids + for project in bid.projects + @users += project.users + end + end + + respond_to do |format| + if @bid.reward_type == 3 + format.html { + render :layout => 'base_homework' + } + elsif @bid.reward_type == 1 + format.html { + render :layout => 'base_bids' + } + else + format.html { + render :layout => 'base_contest' + } + end + format.api + + end + end def show_project # flash[:notice] = "" diff --git a/app/helpers/bids_helper.rb b/app/helpers/bids_helper.rb index 3c7528fe9..9e82fa1af 100644 --- a/app/helpers/bids_helper.rb +++ b/app/helpers/bids_helper.rb @@ -105,4 +105,24 @@ module BidsHelper def get_prize(b_project) b_project.get_reward end + + def count_bid_project + bids = Bid.where('parent_id = ?', @bid.id) + @projects = [] + for bid in bids + @projects += bid.biding_projects + end + @projects.count + end + + def count_bid_user + bids = Bid.where('parent_id = ?', @bid.id) + @users = [] + for bid in bids + for project in bid.projects + @users += project.users + end + end + @users.count + end end \ No newline at end of file diff --git a/app/models/bid.rb b/app/models/bid.rb index 0c8a4d371..0205df548 100644 --- a/app/models/bid.rb +++ b/app/models/bid.rb @@ -7,11 +7,14 @@ class Bid < ActiveRecord::Base belongs_to :course has_many :biding_projects, :dependent => :destroy has_many :projects, :through => :biding_projects + has_many :projects_member, :class_name => 'User', :through => :projects has_many :journals_for_messages, :as => :jour, :dependent => :destroy has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy has_many :homework_for_courses, :dependent => :destroy has_many :courses, :through => :homework_for_courses, :source => :project has_many :homeworks, :class_name => 'HomeworkAttach', :dependent => :destroy + # has_many :fork_homework, :class_name => 'Bid', :conditions => "#{Bid.table_name}.parent_id = #{id}" + acts_as_attachable diff --git a/app/views/bids/_project_list.html.erb b/app/views/bids/_project_list.html.erb index 302b57547..5c99fdce1 100644 --- a/app/views/bids/_project_list.html.erb +++ b/app/views/bids/_project_list.html.erb @@ -8,7 +8,7 @@ <% end %> - +
<%= l(:label_homework_project) %>(<%= @bidding_project.count%>)<%= l(:label_homework_project) %>(<%= bidding_project.count%>) <% if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.roles&Role.where('id = ? or id = ?', 5, 7)).size >0) %> @@ -18,7 +18,7 @@ <% end %>
- <% end %> -<%= render :partial=> "list_projects",:locals => {:bidding_project => @bidding_project,:bid => @bid }%> +<%= render :partial=> "list_projects",:locals => {:bidding_project => bidding_project,:bid => @bid }%> diff --git a/app/views/bids/show_bid_project.html.erb b/app/views/bids/show_bid_project.html.erb new file mode 100644 index 000000000..616ab7bd9 --- /dev/null +++ b/app/views/bids/show_bid_project.html.erb @@ -0,0 +1,42 @@ +<% @projects.each do |b_project|%> + + + + +
+ + + + + + +
+
+ <%= link_to image_tag(url_to_avatar(b_project.project), :class => 'avatar3'), :class => "avatar" %> +
+ + + + + + + + + + + +
<%= link_to(b_project.project.name, project_path(b_project.project)) %><%= l(:label_jion_bidding_homework)%>
<%= b_project.project.description %>
<%=format_time(b_project.created_at) %>
 +
+ + + + + + + + + + +
<%= l(:label_bidding_user_studentcode) %> : <%= @user.user_extensions.student_id %>
<%= l(:label_bidding_user_homework) %> : <%= link_to(b_project.user.name, user_path(b_project.user)) %>
<%= l(:label_bidding_reason_homewrok) %> : <%= b_project.description %>
+
+<% end %> diff --git a/app/views/bids/show_bid_user.html.erb b/app/views/bids/show_bid_user.html.erb new file mode 100644 index 000000000..5ac14ee69 --- /dev/null +++ b/app/views/bids/show_bid_user.html.erb @@ -0,0 +1,30 @@ +
+ <% for user in @users %> + +<% end %> +
\ No newline at end of file diff --git a/app/views/layouts/base_bids.html.erb b/app/views/layouts/base_bids.html.erb index c584e80b7..9d5f2d042 100644 --- a/app/views/layouts/base_bids.html.erb +++ b/app/views/layouts/base_bids.html.erb @@ -72,6 +72,13 @@
<%= l(:label_has_been)%> <%= link_to(Bid.where('parent_id = ?', @bid.id).count, show_course_path(@bid), :class => 'reference') %>  <%= l(:label_course_userd_by)%>
+ +
有 <%= link_to(count_bid_project, show_bid_project_path(@bid), :class => 'reference') %>  + 个项目正在应标需求
+ +
有 <%= link_to(count_bid_user, show_bid_user_path(@bid), :class => 'reference') %>  + 个用户正在努力完成此需求
+
<%= link_to l(:label_x_followers, :count => @bid.watcher_users.count)+"("+@bid.watcher_users.count.to_s+")", respond_path(@bid) %>   diff --git a/config/routes.rb b/config/routes.rb index bf98b2858..e9b12c866 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -456,6 +456,8 @@ RedmineApp::Application.routes.draw do match 'project/enterprise_course', :to => 'projects#enterprise_course' match 'project/course_enterprise', :to => 'projects#course_enterprise' match 'calls/:id/show_course', :to => 'bids#show_course', :as => 'show_course' + match 'calls/:id/show_bid_project', :to => 'bids#show_bid_project', :as => 'show_bid_project' + match 'calls/:id/show_bid_user', :to => 'bids#show_bid_user', :as => 'show_bid_user' post 'join_in/join', :to => 'courses#join', :as => 'join' delete 'join_in/join', :to => 'courses#unjoin'