diff --git a/app/models/deliverable.rb b/app/models/deliverable.rb index 7cf35fb..ed0919d 100644 --- a/app/models/deliverable.rb +++ b/app/models/deliverable.rb @@ -8,4 +8,8 @@ class Deliverable < ActiveRecord::Base # Validations # Accessors + + def short_type + '' + end end diff --git a/app/models/fixed_deliverable.rb b/app/models/fixed_deliverable.rb index af69de7..708bdc4 100644 --- a/app/models/fixed_deliverable.rb +++ b/app/models/fixed_deliverable.rb @@ -6,4 +6,8 @@ class FixedDeliverable < Deliverable # Validations # Accessors + + def short_type + 'F' + end end diff --git a/app/views/contracts/show.html.erb b/app/views/contracts/show.html.erb index 7400e51..96c9f4c 100644 --- a/app/views/contracts/show.html.erb +++ b/app/views/contracts/show.html.erb @@ -17,3 +17,35 @@ <%= link_to(l(:button_update), edit_contract_path(@project, resource)) %> <%= link_to(l(:button_add_new), new_contract_deliverable_path(@project, resource), :id => 'new-deliverable') %> + +<% if resource.deliverables.empty? %> +
<%= l(:label_no_data) %>
+<% else %> +| <%= l(:field_end_date) %> | ++ | <%= l(:field_title) %> | + <%# TODO: Status %> +<%= l(:field_manager) %> | +<%= l(:field_labor) %> | +<%= l(:field_overhead) %> | +<%= l(:field_fixed) %> | + + + <% resource.deliverables.each do |deliverable| %> + <% content_tag_for(:tr, deliverable) do %> +<%= h format_date(deliverable.end_date) %> | +<%= h deliverable.short_type %> | +<%= h deliverable.title %> | + <%# TODO: Status %> +<%= h deliverable.manager.try(:name) %> | + <%# TODO: deliverable calculations %> +--- | +--- | +--- | + <% end %> + <% end %> + +
|---|