Renamed: formula_q -> filter_q

Added Meal related associations to Project

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

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

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

app/views/foods/_filters.html.erb

@@ -1,7 +1,7 @@
 <fieldset id="filters" class="collapsible">
   <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
   <div>
-    <%= error_messages_for @formula_q %>
+    <%= error_messages_for @filter_q %>
 
     <%= form_tag url, id: 'filters-form', name: 'filters-form',
       method: :get, remote: true do %>
@@ -37,7 +37,7 @@
           <%= label_tag do %>
             <%= hidden_field_tag 'formula[zero_nil]', 0 %>
             <%= check_box_tag 'formula[zero_nil]', 1,
-              @formula_q ? @formula_q.formula.zero_nil : Formula.new.zero_nil %>
+              @filter_q ? @filter_q.formula.zero_nil : Formula.new.zero_nil %>
             <%= t 'quantities.form.zero_nil' %>
           <% end %>
         </td>

app/views/foods/_index.html.erb

@@ -2,7 +2,7 @@
   locals: {url: filter_project_foods_path(@project, view: :index)} %>
 
 <% if @foods.any? { |f| f.persisted? } %>
-  <%= error_messages_for @formula_q.formula if @formula_q %>
+  <%= error_messages_for @filter_q.formula if @filter_q %>
 
   <table class="list">
     <thead>

app/views/foods/_nutrients.html.erb

@@ -5,7 +5,7 @@
   <%= render partial: 'foods/options' %>
 
   <% formulas = @quantities.map { |q| q.formula } %>
-  <% formulas.unshift(@formula_q.formula) if @formula_q %>
+  <% formulas.unshift(@filter_q.formula) if @filter_q %>
   <%= error_messages_for *formulas %>
 
   <table class="nutrients list odd-even">

app/views/measurements/_filters.html.erb

@@ -1,7 +1,7 @@
 <fieldset id="filters" class="collapsible">
   <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
   <div>
-    <%= error_messages_for @formula_q %>
+    <%= error_messages_for @filter_q %>
 
     <%= form_tag url, id: 'filters-form', name: 'filters-form',
       method: :get, remote: true do %>
@@ -32,7 +32,7 @@
           <%= label_tag do %>
             <%= hidden_field_tag 'formula[zero_nil]', 0 %>
             <%= check_box_tag 'formula[zero_nil]', 1,
-              @formula_q ? @formula_q.formula.zero_nil : Formula.new.zero_nil %>
+              @filter_q ? @filter_q.formula.zero_nil : Formula.new.zero_nil %>
             <%= t 'quantities.form.zero_nil' %>
           <% end %>
         </td>

app/views/measurements/_index.html.erb

@@ -2,7 +2,7 @@
   locals: {url: filter_project_measurements_path(@project, view: :index)} %>
 
 <% if @measurements.any? { |m| m.persisted? } %>
-  <%= error_messages_for @formula_q.formula if @formula_q %>
+  <%= error_messages_for @filter_q.formula if @filter_q %>
 
   <table class="list">
     <thead>

app/views/measurements/_readouts.html.erb

@@ -5,7 +5,7 @@
   <%= render partial: 'measurements/options' %>
 
   <% formulas = @quantities.map { |q| q.formula } %>
-  <% formulas.unshift(@formula_q.formula) if @formula_q %>
+  <% formulas.unshift(@filter_q.formula) if @filter_q %>
   <%= error_messages_for *formulas %>
 
   <table class="readouts list odd-even">