diff --git a/.travis.yml b/.travis.yml index d8a20e3fc2..93d28d4675 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,6 +61,20 @@ env: - "TEST_SUITE=plugins:spec DB=mysql" - "TEST_SUITE=plugins:cucumber DB=mysql" + - "TEST_SUITE=npm" + + - "TEST_SUITE=spec_legacy DB=mysql GROUP_SIZE=2 GROUP=1" + - "TEST_SUITE=spec_legacy DB=mysql GROUP_SIZE=2 GROUP=2" + - "TEST_SUITE=cucumber DB=mysql GROUP_SIZE=3 GROUP=1" + - "TEST_SUITE=cucumber DB=mysql GROUP_SIZE=3 GROUP=2" + - "TEST_SUITE=cucumber DB=mysql GROUP_SIZE=3 GROUP=3" + - "TEST_SUITE=rspec DB=mysql GROUP_SIZE=6 GROUP=1" + - "TEST_SUITE=rspec DB=mysql GROUP_SIZE=6 GROUP=2" + - "TEST_SUITE=rspec DB=mysql GROUP_SIZE=6 GROUP=3" + - "TEST_SUITE=rspec DB=mysql GROUP_SIZE=6 GROUP=4" + - "TEST_SUITE=rspec DB=mysql GROUP_SIZE=6 GROUP=5" + - "TEST_SUITE=rspec DB=mysql GROUP_SIZE=6 GROUP=6" + before_install: # Custom plugin instructions follow. @@ -74,7 +88,7 @@ before_install: - git init - git remote add openproject https://github.com/opf/openproject.git - git fetch --depth=1 openproject - - git checkout openproject/dev + - git checkout openproject/$TRAVIS_BRANCH # End of custom plugin instructions. @@ -96,16 +110,6 @@ before_script: script: - sh script/ci_runner.sh $TEST_SUITE $GROUP_SIZE $GROUP -notifications: - email: false - slack: - secure: "a+I0uMgXgrDd3aitr2yhXrh7g/UOUTwoDVElunY7gYdrM+gpZ6RE1AP4/Q++hERBCs7rUBzmb//zxGTcc8Nw4nGqZOmPOMIsAoD49UupGLUzHbxzKlpwdBcwh77fq3rYwkjZjE/H1qiElPT7v6qyWMSdNGlj/bAB74eD7Zl3S5cMRvZ1whbSg2GA2v6ZqtXaKfrSFrPRzsIOBXs99OxWNWAsUGpEwTYac7wb6rdMJkBbzosp4gP99mGvQArEzo0nrIQgRH8W4Q6iLnrpX0g5uKccWl1u/G2bmH8L4F50ce4uuUE+TtHO/nfNFnb2KuDR4QyoccQQbGHXL/jaaAZXG/gzs5Hmru2Thaym43fSwxos80xmZs1vqB/rXE+Rg9qXcCKyyX31zjSI/iW4wS015fz8MKVX6qDg49epaw1ovn0AOYrvTd94GV6RX6eJ3/l+KJJHSKaaLP/713h11LWx/S27tiB40fboXQ68YzIQCuahRUEHUfhU3P10Wf9y2fdDsthtHHSrOJMQ3Ii/Jm3KQm6bE5RWORdHvc/sF2WLfLmJ627j9JhWYYi5mDKJ9AeMWtZNHreU0mM27OUgfhiW11ItKgpwQPEiiicrlYRrMmK+9hc9cym+8tRM+wEth1xhIkfgQFtngONKjv361Wt3JifxM79+bn0IyF72vAVNy8k=" - addons: - firefox: "38.0esr" - postgresql: "9.3" - -# Disabling coverage reporting until CodeClimate supports merging results from multiple partial tests -# code_climate: -# repo_token: -# secure: "W/lyd8Ud18GRASuVShsIKa2MRHhxjh8WICMQ4WKr68qt0X0Tlp7Bclv4ReiEgiQeKsIoJJy5FfJfINdAT8A4sy2JbrLeISShcIU7Kqpfh6DSLNoRAuLz5P7EXMNFns1gBKCmrSzcB+9ksuTLyTCKkjUcj1NbJzGqpB4jSTecAdg=" + firefox: "45.0esr" + postgresql: "9.3" \ No newline at end of file diff --git a/app/assets/stylesheets/costs/costs_legacy.css b/app/assets/stylesheets/costs/costs_legacy.css index 439d5e96c6..f76c52a29d 100644 --- a/app/assets/stylesheets/costs/costs_legacy.css +++ b/app/assets/stylesheets/costs/costs_legacy.css @@ -31,8 +31,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. background-position: 20px 40%; } -.filter_values select { - width: 200px; +.simple-filters--filter .simple-filters--filter-name.-small { + max-width: 25%; + flex-basis: 25%; } table.material_budget_items, diff --git a/app/views/cost_objects/_show_variable_cost_object.html.erb b/app/views/cost_objects/_show_variable_cost_object.html.erb index 7b6c1d9841..0ac1cdcbee 100644 --- a/app/views/cost_objects/_show_variable_cost_object.html.erb +++ b/app/views/cost_objects/_show_variable_cost_object.html.erb @@ -18,27 +18,108 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++#%> -

<%= t(:caption_materials) %>

-
-
-

<%= VariableCostObject.human_attribute_name(:material_budget) %>

-
-
-
- - - - - - - - +
+ + + + + + + + + + + + + + + + <% @cost_object.material_budget_items.each do |material_budget_item| %> + + + + + + + <% end %> + + <% if User.current.allowed_to?(:view_cost_rates, @project) %> + + + + + + <% end %> +
+
+
+ + <%= MaterialBudgetItem.human_attribute_name(:units) %> + +
+
+ 		+
+
+ + <%= MaterialBudgetItem.human_attribute_name(:cost_type) %> + +
+
+ 		+
+
+ + <%= MaterialBudgetItem.human_attribute_name(:comment) %> + +
+
+ 		+
+
+ + <%= MaterialBudgetItem.human_attribute_name(:budget) %> + +
+
+
<%=h pluralize(material_budget_item.units, material_budget_item.cost_type.unit, material_budget_item.cost_type.unit_plural) %><%=h material_budget_item.cost_type.name %><%=h material_budget_item.comments %><%= material_budget_item.costs_visible_by?(User.current) ? number_to_currency(material_budget_item.costs) : "" %>
+
+ <%= number_to_currency(@cost_object.material_budget) %> +
+
+
+
+
+
+
+
+
+

<%= t(:caption_material_costs) %>

+
+
+
+ + + + + + + + - - - <% @cost_object.material_budget_items.each do |material_budget_item| %> - - - - - - - <% end %> - - <% if User.current.allowed_to?(:view_cost_rates, @project) %> - - - - - - <% end %> -
- <%= MaterialBudgetItem.human_attribute_name(:units) %> + <%= MaterialBudgetItem.human_attribute_name(:units)%>
@@ -71,310 +152,232 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<%=h pluralize(material_budget_item.units, material_budget_item.cost_type.unit, material_budget_item.cost_type.unit_plural) %><%=h material_budget_item.cost_type.name %><%=h material_budget_item.comments %><%= material_budget_item.costs_visible_by?(User.current) ? number_to_currency(material_budget_item.costs) : "" %>
-
- <%= number_to_currency(@cost_object.material_budget) %> -
-
-
-
-
-
-
-
-
-

<%= t(:caption_material_costs) %>

-
-
-
- - - - - - - - - - - - - - - - - <% @cost_object.cost_entries.visible(User.current, @project).includes(:cost_type).group_by(&:work_package).each do |work_package, cost_entries| - entries = cost_entries.inject(Hash.new) do |results, entry| - result = results[entry.cost_type.id.to_s] - unless result - result = CostEntry.new(cost_type: entry.cost_type, overridden_costs: 0.0, units: 0) - results[entry.cost_type.id.to_s] = result - end - result.overridden_costs += entry.real_costs - result.units += entry.units - results - end.values - entries.each do |c| - %> + + + <% @cost_object.cost_entries.visible(User.current, @project).includes(:cost_type).group_by(&:work_package).each do |work_package, cost_entries| + entries = cost_entries.inject(Hash.new) do |results, entry| + result = results[entry.cost_type.id.to_s] + unless result + result = CostEntry.new(cost_type: entry.cost_type, overridden_costs: 0.0, units: 0) + results[entry.cost_type.id.to_s] = result + end + result.overridden_costs += entry.real_costs + result.units += entry.units + results + end.values + entries.each do |c| + %> + + + + + + + <% end %> + <% end %> + + <% if User.current.allowed_to?(:view_cost_rates, @project) %> + - - - - + + <% end %> - <% end %> - - <% if User.current.allowed_to?(:view_cost_rates, @project) %> - - - - - - <% end %> -
-
-
- - <%= MaterialBudgetItem.human_attribute_name(:units)%> - -
-
- 		-
-
- - <%= MaterialBudgetItem.human_attribute_name(:cost_type) %> - -
-
- 		-
-
- - <%= MaterialBudgetItem.human_attribute_name(:comment) %> - -
-
- 		-
-
- - <%= MaterialBudgetItem.human_attribute_name(:budget) %> - -
-
-
<%= link_to_work_package work_package %><%= link_to pluralize(c.units, c.cost_type.unit, c.cost_type.unit_plural), {:controller => "/costlog", :action => "index", :cost_type_id => c.cost_type, :work_package_id => work_package} %><%= c.cost_type %><%= c.costs_visible_by?(User.current) ? number_to_currency(c.real_costs) : "" %>
<%= link_to_work_package work_package %><%= link_to pluralize(c.units, c.cost_type.unit, c.cost_type.unit_plural), {:controller => "/costlog", :action => "index", :cost_type_id => c.cost_type, :work_package_id => work_package} %><%= c.cost_type %><%= c.costs_visible_by?(User.current) ? number_to_currency(c.real_costs) : "" %> +
+ <%= number_to_currency(@cost_object.spent_material) %> +
+
-
- <%= number_to_currency(@cost_object.spent_material) %> -
-
-
-
+ +
+
+
- + -

<%= t(:caption_labor) %>

-
-
-

<%= VariableCostObject.human_attribute_name(:labor_budget)%>

-
-
-
- - - - - - - - - -
-
-
- - <%= LaborBudgetItem.human_attribute_name(:hours) %> - +
+
+
+
-
-
-

<%= t(:caption_labor_costs) %>

-
-
-
- - - - - - - - - -
-
-
- - <%= TimeEntry.human_attribute_name(:work_package) %> - +
+

<%= t(:caption_labor_costs) %>

+
+
+
+ + + + + + + + + + - + - + - + - - - - <% @cost_object.time_entries.visible(User.current, @project).group_by(&:work_package).each do |work_package, time_entries| - entries = time_entries.inject(Hash.new) do |results, entry| - result = results[entry.user.id.to_s] - unless result - result = TimeEntry.new(:user => entry.user, :overridden_costs => 0) - result.hours = 0 - results[entry.user.id.to_s] = result - end + + + + + <% @cost_object.time_entries.visible(User.current, @project).group_by(&:work_package).each do |work_package, time_entries| + entries = time_entries.inject(Hash.new) do |results, entry| + result = results[entry.user.id.to_s] + unless result + result = TimeEntry.new(:user => entry.user, :overridden_costs => 0) + result.hours = 0 + results[entry.user.id.to_s] = result + end - result.overridden_costs += entry.real_costs - result.hours += entry.hours - results - end.values + result.overridden_costs += entry.real_costs + result.hours += entry.hours + results + end.values - entries.each do |t| - %> + entries.each do |t| + %> + + + + + + + <% end %> + <% end %> + + - - - - + - <% end %> - <% end %> - - - - - - -
+
+
+ + <%= TimeEntry.human_attribute_name(:work_package) %> + +
- - 		-
-
- - <%= TimeEntry.human_attribute_name(:hours) %> - +
+
+
+ + <%= TimeEntry.human_attribute_name(:hours) %> + +
- - 		-
-
- - <%= TimeEntry.human_attribute_name(:user) %> - +
+
+
+ + <%= TimeEntry.human_attribute_name(:user) %> + +
- - 		-
-
- - <%= TimeEntry.human_attribute_name(:costs) %> - +
+
+
+ + <%= TimeEntry.human_attribute_name(:costs) %> + +
- -
<%= link_to_work_package work_package %><%= link_to "#{t.hours}h", {:controller => "/timelog", :action => "index", :work_package_id => work_package} %><%=h t.user.name %><%= number_to_currency(t.real_costs) %>
<%= link_to_work_package work_package %><%= link_to "#{t.hours}h", {:controller => "/timelog", :action => "index", :work_package_id => work_package} %><%=h t.user.name %><%= number_to_currency(t.real_costs) %> +
+ <%= number_to_currency(@cost_object.spent_labor) %> +
+
-
- <%= number_to_currency(@cost_object.spent_labor) %> -
-
-
-
+ +
+
+
+
- diff --git a/app/views/cost_types/index.html.erb b/app/views/cost_types/index.html.erb index 15d1c01459..52876b4593 100644 --- a/app/views/cost_types/index.html.erb +++ b/app/views/cost_types/index.html.erb @@ -30,30 +30,37 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <% end %> <%= styled_form_tag(cost_types_path, { :method => :get, :id => 'query_form' }) do %> -
+
<%= t(:label_filter_plural) %> -
- <%= styled_label_tag :fixed_date, t(:label_fixed_date) %> - <%= styled_text_field_tag :fixed_date, @fixed_date %> - <%= calendar_for :fixed_date %> -
-
- <%= styled_label_tag :include_deleted, t(:caption_show_locked) %> - <%= styled_check_box_tag :include_deleted, "1", @include_deleted, :autocomplete => "off" %> -
-
-
-<%= link_to_remote t(:button_apply), + +
<% end %>