Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Query optimizations

Browse Source
This commit is contained in:
cryptogopher 2020-03-24 22:16:27 +01:00
parent 63370ccc1a
commit 08860cbfab
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/ingredients_controller.rb
View File

@ -217,7 +217,7 @@ class IngredientsController < BodyTrackingPluginController
end end
def prepare_nutrients def prepare_nutrients
@quantities = @project.nutrients_column_view.quantities @quantities = @project.nutrients_column_view.quantities.includes(:formula)
@ingredients, @requested_n, @extra_n, @formula_q = @project.ingredients @ingredients, @requested_n, @extra_n, @formula_q = @project.ingredients
.filter(session[:i_filters], @quantities) .filter(session[:i_filters], @quantities)
end end

2
app/controllers/measurements_controller.rb
View File

@ -112,7 +112,7 @@ class MeasurementsController < BodyTrackingPluginController
def prepare_readouts def prepare_readouts
@scoping_measurement = @project.measurements.where(session[:m_filters][:scope]).first! @scoping_measurement = @project.measurements.where(session[:m_filters][:scope]).first!
@quantities = @scoping_measurement.column_view.quantities @quantities = @scoping_measurement.column_view.quantities.includes(:formula)
@measurements, @requested_r, @extra_r, @formula_q = @project.measurements @measurements, @requested_r, @extra_r, @formula_q = @project.measurements
.includes(:source) .includes(:source)
.filter(session[:m_filters], @quantities) .filter(session[:m_filters], @quantities)

3
app/models/formula.rb
View File

@ -43,8 +43,7 @@ class Formula < ActiveRecord::Base
errors = parser.errors errors = parser.errors
quantities = Quantity.where(project: self.quantity.project, name: identifiers) quantities = Quantity.where(project: self.quantity.project, name: identifiers)
quantities_names = quantities.pluck(:name) (identifiers - quantities.map(&:name)).each do |q|
(identifiers - quantities_names).each do |q|
errors << [:unknown_quantity, {quantity: q}] errors << [:unknown_quantity, {quantity: q}]
end end