dinislage/redmine-budget-plugin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#2403] [#2404] Added a Total Budget column to the Deliverable row.

Browse Source
This commit is contained in:
Eric Davis
2009-04-27 15:07:30 -07:00
parent d88fce97f8
commit 833c2877af
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/deliverables/_deliverable.html.erb
View File

@@ -7,6 +7,7 @@
<%= content_tag(:td, deliverable.id) %> <%= content_tag(:td, deliverable.id) %>
<%= content_tag(:td, h(deliverable.score.to_i), :class => 'score') if allowed_management? %> <%= content_tag(:td, h(deliverable.score.to_i), :class => 'score') if allowed_management? %>
<%= content_tag(:td, h(deliverable.subject), :class => 'subject') %> <%= content_tag(:td, h(deliverable.subject), :class => 'subject') %>
<%= content_tag(:td, number_to_currency(deliverable.budget || 0.0, :precision => 0), :class => 'budget') if allowed_management? %>
<%= content_tag(:td, number_to_currency(deliverable.labor_budget || 0.0, :precision => 0), :class => 'budget') if allowed_management? %> <%= content_tag(:td, number_to_currency(deliverable.labor_budget || 0.0, :precision => 0), :class => 'budget') if allowed_management? %>
<%= content_tag(:td, number_to_currency(deliverable.spent, :precision => 0), :class => 'spent') if allowed_management? %> <%= content_tag(:td, number_to_currency(deliverable.spent, :precision => 0), :class => 'spent') if allowed_management? %>
<%= content_tag(:td, format_date(deliverable.due), :class => 'due_date') %> <%= content_tag(:td, format_date(deliverable.due), :class => 'due_date') %>
@@ -66,7 +67,7 @@
</table> </table>
</td> </td>
<td colspan="2"> <td colspan="3">
<table class="issue-totals"> <table class="issue-totals">
<%= row_with_data(l(:label_issue_plural), deliverable.issues.size, 'issue-totals') -%> <%= row_with_data(l(:label_issue_plural), deliverable.issues.size, 'issue-totals') -%>
@@ -77,7 +78,7 @@
</td> </td>
</tr> </tr>
<tr id="deliverable-description-<%= deliverable.id %>" class="deliverable deliverable-details <%= css %>" style="display:none;"> <tr id="deliverable-description-<%= deliverable.id %>" class="deliverable deliverable-details <%= css %>" style="display:none;">
<td colspan="8" style="text-align: left;"> <td colspan="9" style="text-align: left;">
<%= l(:field_description) %>: <%= textilizable deliverable.description %> <%= l(:field_description) %>: <%= textilizable deliverable.description %>
</td> </td>
</tr> </tr>

3
app/views/deliverables/_list.html.erb
View File

@@ -4,7 +4,8 @@
<%= sort_header_tag("#{Deliverable.table_name}.id", :caption => '#', :default_order => 'desc') %> <%= sort_header_tag("#{Deliverable.table_name}.id", :caption => '#', :default_order => 'desc') %>
<%= sort_header_tag("score", :caption => l(:caption_score), :default_order => 'desc') if allowed_management? %> <%= sort_header_tag("score", :caption => l(:caption_score), :default_order => 'desc') if allowed_management? %>
<%= sort_header_tag("#{Deliverable.table_name}.subject", :caption => l(:caption_subject)) %> <%= sort_header_tag("#{Deliverable.table_name}.subject", :caption => l(:caption_subject)) %>
<%= sort_header_tag("labor_budget", :caption => l(:caption_budget)) if allowed_management? %> <%= sort_header_tag("total_budget", :caption => l(:caption_budget)) if allowed_management? %>
<%= sort_header_tag("labor_budget", :caption => l(:caption_labor_budget)) if allowed_management? %>
<%= sort_header_tag("spent", :caption => l(:caption_spent)) if allowed_management? %> <%= sort_header_tag("spent", :caption => l(:caption_spent)) if allowed_management? %>
<%= sort_header_tag("#{Deliverable.table_name}.due", :caption => l(:caption_due)) %> <%= sort_header_tag("#{Deliverable.table_name}.due", :caption => l(:caption_due)) %>
<%= sort_header_tag("progress", :caption => l(:caption_progress)) %> <%= sort_header_tag("progress", :caption => l(:caption_progress)) %>

1
config/locales/en.yml
View File

@@ -28,6 +28,7 @@ en:
caption_subject: Subject caption_subject: Subject
caption_score: Score caption_score: Score
caption_budget: Budget caption_budget: Budget
caption_labor_budget: Labor Budget
caption_spent: Spent caption_spent: Spent
label_update_deliverable: Update Deliverable label_update_deliverable: Update Deliverable
label_labor_budget: "Labor Budget: " label_labor_budget: "Labor Budget: "

1
lang/en.yml
View File

@@ -27,6 +27,7 @@ caption_progress: Progress
caption_subject: Subject caption_subject: Subject
caption_score: Score caption_score: Score
caption_budget: Budget caption_budget: Budget
caption_labor_budget: Labor Budget
caption_spent: Spent caption_spent: Spent
label_update_deliverable: Update Deliverable label_update_deliverable: Update Deliverable
label_labor_budget: "Labor Budget: " label_labor_budget: "Labor Budget: "