diff --git a/app/controllers/foods_controller.rb b/app/controllers/foods_controller.rb
index e8bd51d..d2cba5e 100644
--- a/app/controllers/foods_controller.rb
+++ b/app/controllers/foods_controller.rb
@@ -209,14 +209,14 @@ class FoodsController < ApplicationController
end
def prepare_foods
- @foods, @formula_q = @project.foods
+ @foods, @filter_q = @project.foods
.includes(:ref_unit, :source)
.filter(session[:f_filters])
end
def prepare_nutrients
@quantities = @project.nutrient_quantities.includes(:formula)
- @foods, @requested_n, @extra_n, @formula_q = @project.foods
+ @foods, @requested_n, @extra_n, @filter_q = @project.foods
.filter(session[:f_filters], @quantities)
end
end
diff --git a/app/controllers/meals_controller.rb b/app/controllers/meals_controller.rb
index 105a9f5..fb3849e 100644
--- a/app/controllers/meals_controller.rb
+++ b/app/controllers/meals_controller.rb
@@ -81,6 +81,7 @@ class MealsController < ApplicationController
end
def prepare_meals
- @meals = @project.meals.includes(:foods)
+ @quantities = @project.meal_quantities.includes(:formula)
+ @foods, @requested_n, * = @project.meal_foods.compute_quantities(@quantities)
end
end
diff --git a/app/controllers/measurements_controller.rb b/app/controllers/measurements_controller.rb
index 6e1e9cb..5951a1e 100644
--- a/app/controllers/measurements_controller.rb
+++ b/app/controllers/measurements_controller.rb
@@ -130,14 +130,14 @@ class MeasurementsController < ApplicationController
end
def prepare_measurements
- @measurements, @formula_q = @project.measurements
+ @measurements, @filter_q = @project.measurements
.includes(:routine, :source, :readouts)
.filter(session[:m_filters])
end
def prepare_readouts
@quantities = @routine.quantities.includes(:formula)
- @measurements, @requested_r, @extra_r, @formula_q = @routine.measurements
+ @measurements, @requested_r, @extra_r, @filter_q = @routine.measurements
.includes(:routine, :source)
.filter(session[:m_filters], @quantities)
end
diff --git a/app/views/foods/_filters.html.erb b/app/views/foods/_filters.html.erb
index dd6348b..38e4f8a 100644
--- a/app/views/foods/_filters.html.erb
+++ b/app/views/foods/_filters.html.erb
@@ -1,7 +1,7 @@