raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split variant name into number and unit columns

Browse Source
This commit is contained in:
Rohan Mitchell
2015-07-23 12:22:30 +10:00
parent 5874ecbbef
commit 8ee467d2b9
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/open_food_network/option_value_namer.rb
View File

@@ -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?

6
lib/open_food_network/reports/bulk_coop_supplier_report.rb
View File

@@ -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 } }