diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb index 9161287bf..77b5d4e56 100644 --- a/app/controllers/bids_controller.rb +++ b/app/controllers/bids_controller.rb @@ -337,6 +337,16 @@ class BidsController < ApplicationController if @bid.homework_type == 1 @homework = HomeworkAttach.new @homework_list = @bid.homeworks + if params[:student_id].present? + @temp = [] + @homework_list.each do |pro| + if /#{params[:student_id]}/ =~ pro.user.user_extensions.student_id + @temp << pro + end + @temp + end + @homework_list = @temp + end end respond_to do |format| diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb index 4ee1fcfc2..a9b88c32b 100644 --- a/app/views/account/login.html.erb +++ b/app/views/account/login.html.erb @@ -33,7 +33,7 @@ <% end %> - + diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb index 80a8d4f24..cc4672ea6 100644 --- a/app/views/bids/_homework_list.html.erb +++ b/app/views/bids/_homework_list.html.erb @@ -1,6 +1,22 @@ <%= render_flash_messages %> - +<%= form_tag(:controller => 'bids', :action => "show_project", :method => :get) do %> +
+ + + + + + + + +
<%= l(:label_task_plural)%> +
+
+<% end %> <% @homework_list.each do |homework|%> <% if homework.attachments.any?%> diff --git a/app/views/bids/contest.html.erb b/app/views/bids/contest.html.erb index e057933e2..34f3e71eb 100644 --- a/app/views/bids/contest.html.erb +++ b/app/views/bids/contest.html.erb @@ -20,7 +20,7 @@
diff --git a/app/views/bids/index.html.erb b/app/views/bids/index.html.erb index 5737acf29..52ee990ca 100644 --- a/app/views/bids/index.html.erb +++ b/app/views/bids/index.html.erb @@ -26,7 +26,7 @@ <%= hidden_field_tag 'reward_type', params[:reward_type] %> <%= hidden_field_tag 'project_type', params[:project_type] %> - <%= submit_tag l(:label_search), :class => "small", :name => nil %> + <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> diff --git a/app/views/projects/course.html.erb b/app/views/projects/course.html.erb index e3edcb8ab..7ba961abb 100644 --- a/app/views/projects/course.html.erb +++ b/app/views/projects/course.html.erb @@ -17,7 +17,7 @@ diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb index d24eba8c7..f487457b6 100644 --- a/app/views/projects/index.html.erb +++ b/app/views/projects/index.html.erb @@ -14,7 +14,7 @@ diff --git a/app/views/projects/search.html.erb b/app/views/projects/search.html.erb index 7363b63c0..3afafa4e6 100644 --- a/app/views/projects/search.html.erb +++ b/app/views/projects/search.html.erb @@ -24,7 +24,7 @@ diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 733d1b172..8488881e8 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -75,7 +75,7 @@