From 989a14fa376a7daa6176a9b3ab2d04430d67b3cd Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Thu, 17 Jul 2014 16:16:08 +1000 Subject: [PATCH] Change KL to kL, update specs for ML to kL change --- app/assets/javascripts/admin/bulk_order_management.js.coffee | 2 +- app/assets/javascripts/admin/bulk_product_update.js.coffee | 2 +- .../javascripts/admin/products/units_controller.js.coffee | 2 +- .../javascripts/admin/services/option_value_namer.js.coffee | 2 +- lib/open_food_network/option_value_namer.rb | 2 +- .../unit/admin/services/option_value_namer_spec.js.coffee | 2 +- spec/javascripts/unit/bulk_order_management_spec.js.coffee | 4 ++-- spec/lib/open_food_network/option_value_namer_spec.rb | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/admin/bulk_order_management.js.coffee b/app/assets/javascripts/admin/bulk_order_management.js.coffee index a874944b4f..55672b6113 100644 --- a/app/assets/javascripts/admin/bulk_order_management.js.coffee +++ b/app/assets/javascripts/admin/bulk_order_management.js.coffee @@ -150,7 +150,7 @@ angular.module("ofn.admin").controller "AdminOrderMgmtCtrl", [ $scope.getUnitName = (scale, unitType) -> unitNames = 'weight': {1.0: 'g', 1000.0: 'kg', 1000000.0: 'T'} - 'volume': {0.001: 'mL', 1.0: 'L', 1000.0: 'KL'} + 'volume': {0.001: 'mL', 1.0: 'L', 1000.0: 'kL'} unitNames[unitType][scale] $scope.formattedValueWithUnitName = (value, unitsProduct, unitsVariant) -> diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee index 9fd3b62f21..941e74bb8c 100644 --- a/app/assets/javascripts/admin/bulk_product_update.js.coffee +++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee @@ -20,7 +20,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", [ ["Weight (T)", "weight_1000000"], ["Volume (mL)", "volume_0.001"], ["Volume (L)", "volume_1"], - ["Volume (KL)", "volume_1000"], + ["Volume (kL)", "volume_1000"], ["Items", "items"] ] diff --git a/app/assets/javascripts/admin/products/units_controller.js.coffee b/app/assets/javascripts/admin/products/units_controller.js.coffee index 28f82b8da7..3664950772 100644 --- a/app/assets/javascripts/admin/products/units_controller.js.coffee +++ b/app/assets/javascripts/admin/products/units_controller.js.coffee @@ -32,7 +32,7 @@ angular.module("admin.products") ["Weight (T)", "weight_1000000"], ["Volume (mL)", "volume_0.001"], ["Volume (L)", "volume_1"], - ["Volume (KL)", "volume_1000"], + ["Volume (kL)", "volume_1000"], ["Items", "items"] ] diff --git a/app/assets/javascripts/admin/services/option_value_namer.js.coffee b/app/assets/javascripts/admin/services/option_value_namer.js.coffee index 1c9d061415..6a14dbd324 100644 --- a/app/assets/javascripts/admin/services/option_value_namer.js.coffee +++ b/app/assets/javascripts/admin/services/option_value_namer.js.coffee @@ -48,7 +48,7 @@ angular.module("admin.products").factory "optionValueNamer", -> 'volume': 0.001: 'mL' 1.0: 'L' - 1000.0: 'KL' + 1000.0: 'kL' # Find the largest available unit where unit_value comes to >= 1 when expressed in it. # If there is none available where this is true, use the smallest available unit. diff --git a/lib/open_food_network/option_value_namer.rb b/lib/open_food_network/option_value_namer.rb index 3eb280691b..101fae427c 100644 --- a/lib/open_food_network/option_value_namer.rb +++ b/lib/open_food_network/option_value_namer.rb @@ -44,7 +44,7 @@ module OpenFoodNetwork def scale_for_unit_value units = {'weight' => {1.0 => 'g', 1000.0 => 'kg', 1000000.0 => 'T'}, - 'volume' => {0.001 => 'mL', 1.0 => 'L', 1000.0 => 'KL'}} + 'volume' => {0.001 => 'mL', 1.0 => 'L', 1000.0 => 'kL'}} # Find the largest available unit where unit_value comes to >= 1 when expressed in it. # If there is none available where this is true, use the smallest available unit. diff --git a/spec/javascripts/unit/admin/services/option_value_namer_spec.js.coffee b/spec/javascripts/unit/admin/services/option_value_namer_spec.js.coffee index f58061ae27..5a764f3bbe 100644 --- a/spec/javascripts/unit/admin/services/option_value_namer_spec.js.coffee +++ b/spec/javascripts/unit/admin/services/option_value_namer_spec.js.coffee @@ -87,7 +87,7 @@ describe "Option Value Namer", -> expect(namer.option_value_value_unit()).toEqual [100, unit] it "generates values for all volume scales", -> - for units in [[0.001, 'mL'], [1.0, 'L'], [1000000.0, 'ML']] + for units in [[0.001, 'mL'], [1.0, 'L'], [1000.0, 'kL']] [scale, unit] = units p.variant_unit = 'volume' p.variant_unit_scale = scale diff --git a/spec/javascripts/unit/bulk_order_management_spec.js.coffee b/spec/javascripts/unit/bulk_order_management_spec.js.coffee index 4a189c7563..c07415852f 100644 --- a/spec/javascripts/unit/bulk_order_management_spec.js.coffee +++ b/spec/javascripts/unit/bulk_order_management_spec.js.coffee @@ -352,7 +352,7 @@ describe "AdminOrderMgmtCtrl", -> expect(scope.getScale(1.2,"weight")).toEqual 1.0 expect(scope.getScale(1000,"weight")).toEqual 1000.0 expect(scope.getScale(0.0012,"volume")).toEqual 0.001 - expect(scope.getScale(1001,"volume")).toEqual 1.0 + expect(scope.getScale(1001,"volume")).toEqual 1000.0 it "returns the smallest unit available when value is smaller", -> expect(scope.getScale(0.4,"weight")).toEqual 1 @@ -365,7 +365,7 @@ describe "AdminOrderMgmtCtrl", -> expect(scope.getUnitName(1000000,"weight")).toEqual "T" expect(scope.getUnitName(0.001,"volume")).toEqual "mL" expect(scope.getUnitName(1,"volume")).toEqual "L" - expect(scope.getUnitName(1000000,"volume")).toEqual "ML" + expect(scope.getUnitName(1000,"volume")).toEqual "kL" describe "managing pending changes", -> dataSubmitter = pendingChangesService = null diff --git a/spec/lib/open_food_network/option_value_namer_spec.rb b/spec/lib/open_food_network/option_value_namer_spec.rb index c0758d2a37..b16574ba4c 100644 --- a/spec/lib/open_food_network/option_value_namer_spec.rb +++ b/spec/lib/open_food_network/option_value_namer_spec.rb @@ -94,7 +94,7 @@ module OpenFoodNetwork end it "generates values for all volume scales" do - [[0.001, 'mL'], [1.0, 'L'], [1000000.0, 'ML']].each do |scale, unit| + [[0.001, 'mL'], [1.0, 'L'], [1000.0, 'kL']].each do |scale, unit| p = double(:product, variant_unit: 'volume', variant_unit_scale: scale) v.stub(:product) { p } v.stub(:unit_value) { 100 * scale } @@ -133,4 +133,4 @@ module OpenFoodNetwork end end end -end \ No newline at end of file +end