diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb index f4ff47fba..17173dfd6 100644 --- a/app/controllers/bids_controller.rb +++ b/app/controllers/bids_controller.rb @@ -6,7 +6,7 @@ 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] + before_filter :find_bid, :only => [:show, :show_project, :create,:destroy,:more,:back,:add,:new,:show_results,:set_reward, :add_homework] before_filter :require_login,:only => [:set_reward] helper :watchers diff --git a/app/views/bids/_list_projects.html.erb b/app/views/bids/_list_projects.html.erb index 8fb2abd00..9a9f2ec70 100644 --- a/app/views/bids/_list_projects.html.erb +++ b/app/views/bids/_list_projects.html.erb @@ -21,25 +21,68 @@ - <%if @bid.reward_type == 2%> + <% if get_prize(b_project).nil? or get_prize(b_project) == "" %> - 未评奖 + <% if @bid.deadline < Date.today %> + 未评奖 + <% end %> <% else %> - <% case get_prize(b_project) %> - <% when '0' %> - <%= image_tag("/images/bid/first_reward.png")%> - <% when '1' %> - <%= image_tag("/images/bid/second_reward.png")%> - <% when '2' %> - <%= image_tag("/images/bid/qualified.png")%> - <%end%> + <% case @bid.reward_type %> + <% when 1 %> + <% case get_prize(b_project) %> + <% when '6' %> + <%= image_tag("/images/bid/win_bid.png")%> + <% when '7' %> + <%= image_tag("/images/bid/candidate.png")%> + <% when '8' %> + <%= image_tag("/images/bid/obsolete.png")%> + <% end %> + <% when 2 %> + <% case get_prize(b_project) %> + <% when '0' %> + <%= image_tag("/images/bid/first_reward.png")%> + <% when '1' %> + <%= image_tag("/images/bid/second_reward.png")%> + <% when '2' %> + <%= image_tag("/images/bid/third_reward.png")%> + <% when '3' %> + <%= image_tag("/images/bid/forth_reward.png")%> + <% when '4' %> + <%= image_tag("/images/bid/fifth_reward.png")%> + <% when '5' %> + <%= image_tag("/images/bid/qualified.png")%> + <% end %> + <% when 3 %> + <% case get_prize(b_project) %> + <% when '10' %> + <%= image_tag("/images/bid/A.jpg")%> + <% when '11' %> + <%= image_tag("/images/bid/B+.jpg")%> + <% when '12' %> + <%= image_tag("/images/bid/B.jpg")%> + <% when '13' %> + <%= image_tag("/images/bid/C+.jpg")%> + <% when '14' %> + <%= image_tag("/images/bid/C.jpg")%> + <% when '15' %> + <%= image_tag("/images/bid/D+.jpg")%> + <% when '16' %> + <%= image_tag("/images/bid/D.jpg")%> + <% when '17' %> + <%= image_tag("/images/bid/E+.png")%> + <% when '18' %> + <%= image_tag("/images/bid/E.png")%> + <% when '19' %> + <%= image_tag("/images/bid/F.jpg")%> + <% end %> + <% end %> <% end %> - <% end %> + - <% if User.current.id == @bid.author_id %> + <% if User.current.id == @bid.author_id && @bid.deadline > Date.today %> <%= toggle_link '评价', b_project.id.to_s %> @@ -47,9 +90,18 @@ <%= form_for "set_reward",:remote=>true,:url=>set_reward_path do |f| %> <%= f.text_field :b_id,:style => "display:none",:value => b_project.id,:size=>"0" %> - - <%= f.select :reward," " - .html_safe %> + <% case @bid.reward_type %> + <% when 1 %> + <%= f.select :reward," " + .html_safe %> + <% when 2 %> + <%= f.select :reward," " + .html_safe %> + <% when 3 %> + <%= f.select :reward," + " + .html_safe %> + <% end %> <%= f.submit "提交",:class=>"submit" %> <% end %> @@ -69,10 +121,6 @@ - - - -
diff --git a/app/views/bids/_project_list.html.erb b/app/views/bids/_project_list.html.erb index e6dda6cc3..d29326e63 100644 --- a/app/views/bids/_project_list.html.erb +++ b/app/views/bids/_project_list.html.erb @@ -1,13 +1,8 @@ <%= render_flash_messages %> -<% if @bid.deadline > Date.today %> - -
- <%if @bid.reward_type == 3 %> - - <% else %> - +<% if @bid.reward_type == 3 %> +
<%= l(:label_homework_project) %>(<%= @bidding_project.count%>)<%= l(:label_bidding_project) %>(<%= @bidding_project.count%>)
<% end %> <% if User.current.logged? %> <% end %>
@@ -20,65 +15,20 @@
- -<% @bidding_project.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) %> : <%= (b_project.user.user_extensions.student_id) %>
<%= l(:label_bidding_user_homework) %> : <%= link_to(b_project.user.lastname+b_project.user.firstname, user_path(b_project.user)) %>
<%= l(:label_bidding_reason_homewrok) %> : <%= b_project.description %>
-
-<% end %> - -<% else %> - - - - <% if User.current.logged? %> - + <% end %> +
<%= l(:label_bidding_project) %>(<%= @bidding_project.count%>) + <% else %> + + + <% if User.current.logged? %> + - <% end %> -
<%= l(:label_bidding_project) %>(<%= @bidding_project.count%>) +
- <%= toggle_link l(:label_bid_me), 'put-bid-form' %> + <%= toggle_link l(:button_bidding_homework), 'put-bid-form' %>
- - -
+ +
<% end %> <% unless @bid.reward_type == 3%> <%= render :partial=> "list_projects",:locals => {:bidding_project => @bidding_project,:bid => @bid }%> diff --git a/app/views/bids/set_reward.js.erb b/app/views/bids/set_reward.js.erb index e7c048e62..868de83be 100644 --- a/app/views/bids/set_reward.js.erb +++ b/app/views/bids/set_reward.js.erb @@ -1,20 +1,60 @@ $('#reward_result_<%= @biding_project_id %>').html('<%= j( - if get_prize(@b_p).nil? or get_prize(@b_p) == "" - puts '未评奖' - else - case get_prize(@b_p) - when '0' - image_tag("/images/bid/first_reward.png") - when '1' - image_tag("/images/bid/second_reward.png") - when '2' - image_tag("/images/bid/qualified.png") - else - '未评奖' - end - end - +if get_prize(@b_p).nil? or get_prize(@b_p) == "" + if @bid.deadline < Date.today + puts '未评奖' + end +else + case @bid.reward_type + when 1 + case get_prize(@b_p) + when '6' + image_tag("/images/bid/win_bid.png") + when '7' + image_tag("/images/bid/candidate.png") + when '8' + image_tag("/images/bid/obsolete.png") + end + when 2 + case get_prize(@b_p) + when '0' + image_tag("/images/bid/first_reward.png") + when '1' + image_tag("/images/bid/second_reward.png") + when '2' + image_tag("/images/bid/third_reward.png") + when '3' + image_tag("/images/bid/forth_reward.png") + when '4' + image_tag("/images/bid/fifth_reward.png") + when '5' + image_tag("/images/bid/qualified.png") + end + when 3 + case get_prize(@b_p) + when '10' + image_tag("/images/bid/A.jpg") + when '11' + image_tag("/images/bid/B+.jpg") + when '12' + image_tag("/images/bid/B.jpg") + when '13' + image_tag("/images/bid/C+.jpg") + when '14' + image_tag("/images/bid/C.jpg") + when '15' + image_tag("/images/bid/D+.jpg") + when '16' + image_tag("/images/bid/D.jpg") + when '17' + image_tag("/images/bid/E+.png") + when '18' + image_tag("/images/bid/E.png") + when '19' + image_tag("/images/bid/F.jpg") + end + end +end ) %>') diff --git a/db/migrate/20130929011921_add_reward_to_homework_attaches.rb b/db/migrate/20130929011921_add_reward_to_homework_attaches.rb new file mode 100644 index 000000000..3d7dd0f22 --- /dev/null +++ b/db/migrate/20130929011921_add_reward_to_homework_attaches.rb @@ -0,0 +1,5 @@ +class AddRewardToHomeworkAttaches < ActiveRecord::Migration + def change + add_column :homework_attaches, :reward, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 4659f0f01..595967ae9 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20130927011824) do +ActiveRecord::Schema.define(:version => 20130929011921) do create_table "a_user_watchers", :force => true do |t| t.string "name" @@ -77,11 +77,7 @@ ActiveRecord::Schema.define(:version => 20130927011824) do t.string "description" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false - - t.string "reward" - - end create_table "bids", :force => true do |t| @@ -273,6 +269,7 @@ ActiveRecord::Schema.define(:version => 20130927011824) do t.integer "user_id" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false + t.string "reward" end create_table "homework_for_courses", :force => true do |t| @@ -700,18 +697,12 @@ ActiveRecord::Schema.define(:version => 20130927011824) do t.integer "zip_code" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false -<<<<<<< .mine t.integer "identity" t.string "technical_title" t.integer "student_id" t.string "teacher_realname" t.string "student_realname" t.string "location_city" - t.integer "identity" - t.string "technical_title" - - - end create_table "user_preferences", :force => true do |t| diff --git a/public/images/bid/A.jpg b/public/images/bid/A.jpg new file mode 100644 index 000000000..22ddd2044 Binary files /dev/null and b/public/images/bid/A.jpg differ diff --git a/public/images/bid/B+.jpg b/public/images/bid/B+.jpg new file mode 100644 index 000000000..93c5a605f Binary files /dev/null and b/public/images/bid/B+.jpg differ diff --git a/public/images/bid/B.jpg b/public/images/bid/B.jpg new file mode 100644 index 000000000..318591acc Binary files /dev/null and b/public/images/bid/B.jpg differ diff --git a/public/images/bid/C+.jpg b/public/images/bid/C+.jpg new file mode 100644 index 000000000..2764d9ee3 Binary files /dev/null and b/public/images/bid/C+.jpg differ diff --git a/public/images/bid/C.jpg b/public/images/bid/C.jpg new file mode 100644 index 000000000..4627a2940 Binary files /dev/null and b/public/images/bid/C.jpg differ diff --git a/public/images/bid/D+.jpg b/public/images/bid/D+.jpg new file mode 100644 index 000000000..41064a55e Binary files /dev/null and b/public/images/bid/D+.jpg differ diff --git a/public/images/bid/D.jpg b/public/images/bid/D.jpg new file mode 100644 index 000000000..2c04b85c4 Binary files /dev/null and b/public/images/bid/D.jpg differ diff --git a/public/images/bid/E+.png b/public/images/bid/E+.png new file mode 100644 index 000000000..1dabdac97 Binary files /dev/null and b/public/images/bid/E+.png differ diff --git a/public/images/bid/E.png b/public/images/bid/E.png new file mode 100644 index 000000000..0da3aca35 Binary files /dev/null and b/public/images/bid/E.png differ diff --git a/public/images/bid/F.jpg b/public/images/bid/F.jpg new file mode 100644 index 000000000..3550db277 Binary files /dev/null and b/public/images/bid/F.jpg differ diff --git a/public/images/bid/fifth_reward.png b/public/images/bid/fifth_reward.png new file mode 100644 index 000000000..ae7b87718 Binary files /dev/null and b/public/images/bid/fifth_reward.png differ diff --git a/public/images/bid/forth_reward.png b/public/images/bid/forth_reward.png new file mode 100644 index 000000000..f6ffadd74 Binary files /dev/null and b/public/images/bid/forth_reward.png differ diff --git a/public/images/bid/third_reward.png b/public/images/bid/third_reward.png new file mode 100644 index 000000000..8dc6f37d2 Binary files /dev/null and b/public/images/bid/third_reward.png differ diff --git a/public/images/bid/win_bid.png b/public/images/bid/win_bid.png new file mode 100644 index 000000000..5cafbb88d Binary files /dev/null and b/public/images/bid/win_bid.png differ