Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Renamed: formula_q -> filter_q

Browse Source 
Added Meal related associations to Project
This commit is contained in:
cryptogopher
2020-04-25 22:49:48 +02:00
parent c029ba59c2
commit c24bdd6f45
11 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/foods_controller.rb
View File

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

3
app/controllers/meals_controller.rb
View File

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

4
app/controllers/measurements_controller.rb
View File

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