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

Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
huang 2018-06-27 14:41:58 +08:00
parent 2b320ec592 8b8f581219
commit c5bbe1e786
4 changed files with 69 additions and 750 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/versions/_issue_statistics.html.erb
View File

@ -6,6 +6,8 @@
<th>完成</th>
<th>关闭</th>
<th>待完成</th>
<th>总工时</th>
<th>工时债务</th>
</tr>
</thead>
<tbody>
@ -15,6 +17,8 @@
<td><%= Issue.where(:fixed_version_id => @version.id, :status_id => 3).count %></td>
<td><%= Issue.where(:fixed_version_id => @version.id, :status_id => 5).count %></td>
<td><%= Issue.where(fixed_version_id: @version.id, status_id: [1,2,4]).count %></td>
<td><%= l_hours(Issue.where(fixed_version_id: @version.id).sum(:estimated_hours)) %></td>
<td><%= l_hours(Issue.where(fixed_version_id: @version.id, status_id: [1,2,4]).sum(:estimated_hours)) %></td>
</tr>
<% @version_issue_assigned_name.each do | assigned | %>
<tr>
@ -23,7 +27,10 @@
<td><%= Issue.where(:fixed_version_id => @version.id, :assigned_to_id => assigned[0], :status_id => 3).count %></td>
<td><%= Issue.where(:fixed_version_id => @version.id, :assigned_to_id => assigned[0], :status_id => 5).count %></td>
<td><%= Issue.where(fixed_version_id: @version.id, assigned_to_id: assigned[0], status_id: [1,2,4]).count %></td>
<td><%= l_hours(Issue.where(fixed_version_id: @version.id, assigned_to_id: assigned[0]).sum(:estimated_hours)) %></td>
<td><%= l_hours(Issue.where(fixed_version_id: @version.id, assigned_to_id: assigned[0], status_id: [1,2,4]).sum(:estimated_hours)) %></td>
</tr>
<% end %>
</tbody>
</table>

2
app/views/versions/show.html.erb
View File

@ -58,6 +58,7 @@
<tr>
<th>ID</th>
<th>标题</th>
<th>工时</th>
<th>类型</th>
<th>指派给</th>
<th>更新时间</th>
@ -70,6 +71,7 @@
<tr>
<td>#<%= issue.id %></td>
<td><a href="<%= issue_path(issue) %>" class="new_roadmap_info_title" title="<%= issue.subject %>" target="_blank"><%= issue.subject %></a> </td>
<td><%= l_hours(issue.estimated_hours) %></td>
<td> <%= issue.tracker %> </td>
<td><a href="<%= issue.assigned_to_id.nil? ? "" : user_path(issue.assigned_to) %>" class="new_roadmap_info_name" target="_blank">
<%= User.find(issue.try(:assigned_to_id)).nil? ? "" : User.find(issue.try(:assigned_to_id)).show_name %></a>

808
db/schema.rb
View File

File diff suppressed because it is too large Load Diff

2
public/stylesheets/css/project.css
View File

@ -511,7 +511,7 @@ select.new_roadmap_select{border:1px solid #dbdbdb; color: #666;}
.new_roadmap_info_top{border-bottom:1px solid #dbdbdb; padding:10px 15px;}
.new_roadmap_icons_back{ background: url(/images/new_project/icons_issue.png) 0 -247px no-repeat; display: inline-block; width: 16px; height: 12px;}
.pd15box{ padding:0 15px;}
.new_roadmap_info_title{ display: block; margin-left: 10px; text-align: left;max-width:520px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
.new_roadmap_info_title{ display: block; margin-left: 10px; text-align: left;max-width:400px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
.new_roadmap_info_name{ display: block; margin-left: 10px; text-align: left;max-width:80px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
.pages{margin:10px auto 10px;}
/*表格*/