raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-13 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Kilolitres instead of Megalitres. Megalitres are REALLY big!

Browse Source
This commit is contained in:
Rafael Schouten
2014-07-02 23:20:54 +01:00
parent 35bcebc823
commit e89b782787
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/admin/services/option_value_namer.js.coffee
View File

@@ -18,18 +18,18 @@ angular.module("ofn.admin").factory "optionValueNamer", ($resource) ->
if @variant.unit_value?
if @variant.product.variant_unit in ["weight", "volume"]
[value, unit_name] = @option_value_value_unit_scaled()
else
value = @variant.unit_value
unit_name = @variant.product.variant_unit_name
# TODO needs to add pluralize to line below
# unit_name = unit_name if value > 1
value = parseInt(value, 10) if value == parseInt(value, 10)
else
value = unit_name = null
[value, unit_name]
option_value_value_unit_scaled: ->
@@ -40,7 +40,7 @@ angular.module("ofn.admin").factory "optionValueNamer", ($resource) ->
[value, unit_name]
scale_for_unit_value: ->
units =
units =
'weight':
1.0: 'g'
1000.0: 'kg'
@@ -48,7 +48,7 @@ angular.module("ofn.admin").factory "optionValueNamer", ($resource) ->
'volume':
0.001: 'mL'
1.0: 'L'
1000000.0: 'ML'
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.
@@ -63,4 +63,4 @@ angular.module("ofn.admin").factory "optionValueNamer", ($resource) ->
if scale < unit[0] then [scale, unit_name] else unit
, [Infinity,""]
unit
unit