@@ -7,6 +7,7 @@ <%= content_tag(:td, deliverable.id) %> <%= content_tag(:td, h(deliverable.score.to_i), :class => 'score') if allowed_management? %> <%= 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.spent, :precision => 0), :class => 'spent') if allowed_management? %> <%= content_tag(:td, format_date(deliverable.due), :class => 'due_date') %> @@ -66,7 +67,7 @@ </table> </td> - <td colspan="2"> + <td colspan="3"> <table class="issue-totals"> <%= row_with_data(l(:label_issue_plural), deliverable.issues.size, 'issue-totals') -%> @@ -77,7 +78,7 @@ </td> </tr> <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 %> </td> </tr> app/views/deliverables/_deliverable.html.erb @@ -4,7 +4,8 @@ <%= 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("#{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("#{Deliverable.table_name}.due", :caption => l(:caption_due)) %> <%= sort_header_tag("progress", :caption => l(:caption_progress)) %> app/views/deliverables/_list.html.erb @@ -28,6 +28,7 @@ en: caption_subject: Subject caption_score: Score caption_budget: Budget + caption_labor_budget: Labor Budget caption_spent: Spent label_update_deliverable: Update Deliverable label_labor_budget: "Labor Budget: " config/locales/en.yml @@ -27,6 +27,7 @@ caption_progress: Progress caption_subject: Subject caption_score: Score caption_budget: Budget +caption_labor_budget: Labor Budget caption_spent: Spent label_update_deliverable: Update Deliverable label_labor_budget: "Labor Budget: " lang/en.yml d88fce97f8983b20a32c945b1dde278b9ea9575c Eric Davis edavis@littlestreamsoftware.com http://github.com/edavis10/redmine-budget-plugin/commit/833c2877af0ec75bd8d7e7af0f2286716d1c9a07 833c2877af0ec75bd8d7e7af0f2286716d1c9a07 2009-04-27T15:07:30-07:00 2009-04-27T15:07:30-07:00 [#2403] [#2404] Added a Total Budget column to the Deliverable row. 42eb48b0546ff8439ddb20436d12f94c30a3281b Eric Davis edavis@littlestreamsoftware.com