From 8ee467d2b9d5c9911fbaf6075fa6eb565eb843d4 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Thu, 23 Jul 2015 12:22:30 +1000 Subject: [PATCH] Split variant name into number and unit columns --- lib/open_food_network/option_value_namer.rb | 11 +++++++++++ .../reports/bulk_coop_supplier_report.rb | 6 ++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/open_food_network/option_value_namer.rb b/lib/open_food_network/option_value_namer.rb index 2c2383906d..6a77d9cb35 100644 --- a/lib/open_food_network/option_value_namer.rb +++ b/lib/open_food_network/option_value_namer.rb @@ -15,6 +15,17 @@ module OpenFoodNetwork name_fields.join ' ' end + def value + value, _ = option_value_value_unit + value + end + + def unit + _, unit = option_value_value_unit + unit + end + + private def value_scaled? diff --git a/lib/open_food_network/reports/bulk_coop_supplier_report.rb b/lib/open_food_network/reports/bulk_coop_supplier_report.rb index 078037e4b7..36c08c429f 100644 --- a/lib/open_food_network/reports/bulk_coop_supplier_report.rb +++ b/lib/open_food_network/reports/bulk_coop_supplier_report.rb @@ -2,7 +2,7 @@ require 'open_food_network/reports/report' module OpenFoodNetwork::Reports class BulkCoopSupplierReport < Report - header "Supplier", "Product", "Unit Size", "Variant", "Weight", "Sum Total", "Sum Max Total", "Units Required", "Remainder" + header "Supplier", "Product", "Unit Size", "Variant value", "Variant unit", "Weight", "Sum Total", "Sum Max Total", "Units Required", "Remainder" organise do group { |li| li.variant.product.supplier } @@ -18,6 +18,7 @@ module OpenFoodNetwork::Reports column { |lis| group_buy_unit_size_f(lis) } column { |lis| "" } column { |lis| "" } + column { |lis| "" } column { |lis| total_weight(lis) } column { |lis| total_max_quantity_weight(lis) } column { |lis| units_required(lis) } @@ -35,7 +36,8 @@ module OpenFoodNetwork::Reports column { |lis| supplier_name(lis) } column { |lis| product_name(lis) } column { |lis| group_buy_unit_size_f(lis) } - column { |lis| lis.first.variant.full_name } + column { |lis| OpenFoodNetwork::OptionValueNamer.new(lis.first.variant).value } + column { |lis| OpenFoodNetwork::OptionValueNamer.new(lis.first.variant).unit } column { |lis| lis.first.variant.weight || 0 } column { |lis| lis.sum(&:quantity) } column { |lis| lis.sum { |li| li.max_quantity || 0 } }