jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改需求列表

This commit is contained in:
baiyu 2013-08-20 22:05:11 +08:00
parent 6670ddcf9d
commit 96dfe0a6da
5 changed files with 95 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/bid.rb
View File

@ -19,6 +19,7 @@ class Bid < ActiveRecord::Base
# validates_format_of :deadline, :with => # validates_format_of :deadline, :with =>
validates_format_of :deadline, :with => /^[\d]{4}[-][\d]{1,2}[-][\d]{1,2}$/ validates_format_of :deadline, :with => /^[\d]{4}[-][\d]{1,2}[-][\d]{1,2}$/
validates_format_of :budget, :with => /^(\d+)$|^(\d+).([0-9]{2})|^(\d+).([0-9]{1})$/, :if => Proc.new { |p| p.reward_type == 1 } validates_format_of :budget, :with => /^(\d+)$|^(\d+).([0-9]{2})|^(\d+).([0-9]{1})$/, :if => Proc.new { |p| p.reward_type == 1 }
validates_format_of :budget, :with => /^(\d+)$|^(\d+).([0-9]{1})$/, :if => Proc.new { |p| p.reward_type == 3 }
validate :validate_user validate :validate_user
validate :validate_reward_type validate :validate_reward_type
after_create :act_as_activity after_create :act_as_activity

144
app/views/bids/_bid_show.html.erb
View File

@ -1,42 +1,94 @@
<!-- fq --> <!-- fq -->
<!-- <% bids.each do |bid|%> <!-- <% bids.each do |bid|%>
<table width="95%" border="0" style="padding-left: 10px; padding-top: 10px;"> <table width="95%" border="0" style="padding-left: 10px; padding-top: 10px;">
<tr>
<td colspan="2" valign="top" width="50" ><%= link_to(image_tag(url_to_avatar(bid.author), :class => 'avatar'), user_path(bid.author), :class => "avatar") %></td>
<td>
<table width="100%" border="0">
<tr>
<td colspan="2" valign="top"><strong><%= link_to(bid.author, user_path(bid.author), :class => 'bid_user') %>: &nbsp;<%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %></strong></td>
</tr>
<tr>
<td width="500">
<table border="0">
<tr>
<% if bid.reward_type.nil? or bid.reward_type == 1%>
<td style="color: rgb(255, 0, 0);"><strong><%= l(:label_price) %><%= l(:label_RMB_sign) %><%= bid.budget%></strong></td>
<% elsif bid.reward_type == 2%>
<td style="color: #15bccf;"><strong><%= l(:label_reward) %><%= bid.budget%></strong></td>
<% else %>
<td style="color: rgb(60, 180, 30);"><strong><%= l(:label_grade) %><%= bid.budget%></strong></td>
<% end %>
<td class="font_lighter">(<%= link_to bid.biding_projects.count, project_for_bid_path(bid)%>)<%= l(:label_biding_project) %></td>
<td class="font_lighter">(<%= link_to bid.commit, respond_path(bid)%>)<%= l(:label_responses) %></td>
<td class="font_lighter">(<%= link_to bid.watcher_users.count, respond_path(bid)%>)<%= l(:label_followers) %></td>
</tr>
</table></td>
<td width="200" align="right" class="a"><span class="font_lighter"> <%= format_time bid.created_on %></span></td>
</tr>
<tr>
<td>
<div class="bid-description" style="border-left: 1px solid rgb(225, 225, 225); border-bottom: 1px solid rgb(225, 225, 225); padding-left: 20px; padding-bottom: 10px; margin-bottom: 20px;">
<table width="100%">
<tr>
<td> <%= bid.description%> </td>
</tr>
</table>
</div></td>
</tr>
</table></td>
</tr>
</table>
<% end %>
<div class="pagination">
<ul>
<%= pagination_links_full bid_pages %>
<ul>
</div> -->
<!--new-->
<% bids.each do |bid|%>
<table width="98%" border="0" style="padding-left: 20px; padding-top: 10px;">
<tr> <tr>
<td colspan="2" valign="top" width="50" ><%= link_to(image_tag(url_to_avatar(bid.author), :class => 'avatar'), user_path(bid.author), :class => "avatar") %></td> <td valign="top" width="50px"><%= link_to(image_tag(url_to_avatar(bid.author), :class => 'avatar'), user_path(bid.author), :class => "avatar") %></td>
<td> <td>
<table width="100%" border="0"> <table width="100%" border="0" class="font_description">
<tr> <tr>
<td colspan="2" valign="top"><strong><%= link_to(bid.author, user_path(bid.author), :class => 'bid_user') %>: &nbsp;<%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %></strong></td> <td><strong><%= link_to(bid.author, user_path(bid.author)) %></strong>
<spanclass="font_lighter">
<%= l(:label_bid_publish) %></span> <strong><%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %></strong>
</td>
</tr> </tr>
<tr> <tr>
<td width="500">
<table border="0"> <% if bid.reward_type.nil? or bid.reward_type == 1%>
<tr> <td><strong>奖励方式：<span style="color: rgb(255, 0, 0);font-family: 14px; font-family: 微软雅黑">奖金&nbsp;<%= bid.budget%><%= l(:label_RMB_sign) %></span></strong></td>
<% if bid.reward_type.nil? or bid.reward_type == 1%> <% elsif bid.reward_type == 2%>
<td style="color: rgb(255, 0, 0);"><strong><%= l(:label_price) %><%= l(:label_RMB_sign) %><%= bid.budget%></strong></td> <td><strong>奖励方式：<span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong></td>
<% elsif bid.reward_type == 2%> <% else %>
<td style="color: #15bccf;"><strong><%= l(:label_reward) %><%= bid.budget%></strong></td> <td><strong>奖励方式：<span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑">学分&nbsp;<%= bid.budget%>分</span></strong></td>
<% else %> <% end %>
<td style="color: rgb(60, 180, 30);"><strong><%= l(:label_grade) %><%= bid.budget%></strong></td>
<% end %>
<td class="font_lighter">(<%= link_to bid.biding_projects.count, project_for_bid_path(bid)%>)<%= l(:label_biding_project) %></td>
<td class="font_lighter">(<%= link_to bid.commit, respond_path(bid)%>)<%= l(:label_responses) %></td>
<td class="font_lighter">(<%= link_to bid.watcher_users.count, respond_path(bid)%>)<%= l(:label_followers) %></td>
</tr>
</table></td>
<td width="200" align="right" class="a"><span class="font_lighter"> <%= format_time bid.created_on %></span></td>
</tr> </tr>
<tr> <tr>
<td> <td style="border-left: 1px solid rgb(225, 225, 225); border-bottom: 1px solid rgb(225, 225, 225); padding-left: 20px; padding-bottom: 20px; margin-bottom: 20px;"> <%= bid.description%> </td>
<div class="bid-description" style="border-left: 1px solid rgb(225, 225, 225); border-bottom: 1px solid rgb(225, 225, 225); padding-left: 20px; padding-bottom: 10px; margin-bottom: 20px;"> </tr>
<table width="100%">
<tr> </table></td>
<td> <%= bid.description%> </td> <td width="200px" valign="bottom" style="padding-bottom: 5px">
</tr> <table>
</table> <tr>
</div></td> <td style="float: right"><span><%= l(:label_bid_project) %>(<%= link_to bid.biding_projects.count, project_for_bid_path(bid),:class=> "bids_user" %>)</span></td>
</tr>
<tr>
<td style="float: right"><span><%= l(:label_responses) %>(<%= link_to bid.commit, respond_path(bid),:class=> "bids_user" %>)</span></td>
</tr>
<tr>
<td style="float: right"><span><%= l(:label_followers) %>(<%= link_to bid.watcher_users.count, respond_path(bid),:class=> "bids_user" %>)</span></td>
</tr>
<tr>
<td><span style="float: right"><%= l(:field_deadline) %><span class="font_lighter" ><%= format_time bid.created_on %></span></span></td>
</tr> </tr>
</table></td> </table></td>
</tr> </tr>
@ -46,38 +98,4 @@
<ul> <ul>
<%= pagination_links_full bid_pages %> <%= pagination_links_full bid_pages %>
<ul> <ul>
</div> --> </div>
<!--new-->
<% bids.each do |bid|%>
<table width="98%" border="0" style="padding-left: 20px; padding-top: 10px;">
<tr>
<td valign="top" width="50px"><%= link_to(image_tag(url_to_avatar(bid.author), :class => 'avatar'), user_path(bid.author), :class => "avatar") %></td>
<td><table width="100%" border="0" class="font_description">
<tr>
<td><strong><%= link_to(bid.author, user_path(bid.author)) %></strong> <spanclass="font_lighter"><%= l(:label_bid_publish) %></span> <strong><%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %></strong></td>
</tr>
<tr>
<td style="font-family: 14px; font-family: 微软雅黑"><strong><%= l(:label_price) %></strong><span style="color: rgb(255, 0, 0);"><%= l(:label_RMB_sign) %><%= bid.budget%></span></td>
</tr>
<tr>
<td style="border-left: 1px solid rgb(225, 225, 225); border-bottom: 1px solid rgb(225, 225, 225); padding-left: 20px; padding-bottom: 20px; margin-bottom: 20px;">
<%= bid.description%>
</td>
</tr>
</table></td>
<td width="200px" valign="bottom" style="padding-bottom: 5px"><table>
<tr><td style="float: right"><span><%= l(:label_bid_project) %>(<%= link_to bid.biding_projects.count, project_for_bid_path(bid),:class=> "bids_user" %>)</span></td></tr>
<tr><td style="float: right"><span><%= l(:label_responses) %>(<%= link_to bid.commit, respond_path(bid),:class=> "bids_user" %>)</span></td></tr>
<tr><td style="float: right"><span><%= l(:label_followers) %>(<%= link_to bid.watcher_users.count, respond_path(bid),:class=> "bids_user" %>)</span> </td></tr>
<tr><td><span style="float: right"><%= l(:field_deadline) %><span class="font_lighter" ><%= format_time bid.created_on %></span></span></td></tr>
</table></td>
</tr>
</table>
<% end %>
<div class="pagination">
<ul>
<%= pagination_links_full bid_pages %>
<ul>

2
app/views/bids/_form.html.erb
View File

@ -11,7 +11,7 @@
text_t.attr("placeholder", "输入奖励金额，如500， 2.5等"); text_t.attr("placeholder", "输入奖励金额，如500， 2.5等");
} }
if (text.val() == 3) { if (text.val() == 3) {
text_t.attr("placeholder", "输入奖励的学分，如3分， 2.5分"); text_t.attr("placeholder", "输入奖励的学分，如3， 2.5");
} }
if (text.val() == 2) { if (text.val() == 2) {
text_t.attr("placeholder", "输入奖励的内容，可以是奖项，物品等"); text_t.attr("placeholder", "输入奖励的内容，可以是奖项，物品等");

12
app/views/bids/show.html.erb
View File

@ -8,12 +8,12 @@
</tr> </tr>
<tr> <tr>
<% if @bid.reward_type.nil? or @bid.reward_type == 1%> <% if @bid.reward_type.nil? or @bid.reward_type == 1%>
<td class="font_lighter"><%= l(:label_price) %><%= l(:label_RMB_sign) %><%= @bid.budget%></td> <td><strong>奖励方式：<span style="color: rgb(255, 0, 0);font-family: 14px; font-family: 微软雅黑">奖金&nbsp;<%= @bid.budget%><%= l(:label_RMB_sign) %></span></strong></td>
<% elsif @bid.reward_type == 2%> <% elsif @bid.reward_type == 2%>
<td class="font_lighter"><%= l(:label_reward) %><%= @bid.budget%></td> <td><strong>奖励方式：<span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= @bid.budget%></span></strong></td>
<% else %> <% else %>
<td class="font_lighter"><%= l(:label_grade) %><%= @bid.budget%></td> <td><strong>奖励方式：<span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑">学分&nbsp;<%= @bid.budget%>分</span></strong></td>
<% end %> <% end %>
</tr> </tr>
</table></td> </table></td>
</tr> </tr>

12
app/views/layouts/base_bids.html.erb
View File

@ -49,12 +49,12 @@
</tr> </tr>
<tr> <tr>
<% if @bid.reward_type.nil? or @bid.reward_type == 1%> <% if @bid.reward_type.nil? or @bid.reward_type == 1%>
<td><%= l(:label_price) %><%= l(:label_RMB_sign) %><%= @bid.budget%></td> <td>奖励方式：奖金&nbsp;<%= @bid.budget%><%= l(:label_RMB_sign) %></td>
<% elsif @bid.reward_type == 2%> <% elsif @bid.reward_type == 2%>
<td><%= l(:label_reward) %><%= @bid.budget%></td> <td>奖励方式：<%= @bid.budget%></td>
<% else %> <% else %>
<td><%= l(:label_grade) %><%= @bid.budget%></td> <td>奖励方式：学分&nbsp;<%= @bid.budget%>分</td>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
<td><%= l(:label_investment_time_limit) %><%= @bid.deadline%></td> <td><%= l(:label_investment_time_limit) %><%= @bid.deadline%></td>