From 80dac0dc9db08f5a7ac4ac943f1da6b0ef077372 Mon Sep 17 00:00:00 2001 From: cryptogopher Date: Sun, 12 Jan 2020 00:00:03 +0100 Subject: [PATCH] Updated energy formula to accept nils --- db/migrate/002_load_defaults.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/002_load_defaults.rb b/db/migrate/002_load_defaults.rb index 78d7eb3..b140860 100644 --- a/db/migrate/002_load_defaults.rb +++ b/db/migrate/002_load_defaults.rb @@ -138,7 +138,7 @@ class LoadDefaults < ActiveRecord::Migration # Calculated quantities go at the and to make sure dependencies exist e2 = Quantity.create project: nil, domain: :diet, parent: e1, name: "Calculated", description: "Total energy calculated from macronutrients", - formula: "4*Proteins + 9*Fats + 4*Carbohydrates" + formula: "4*(Proteins || 0) + 9*(Fats || 0) + 4*(Carbohydrates || 0)" Source.create project: nil, name: "nutrition label", description: "nutrition facts taken from package nutrition label"