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/views/foods/_filters.html.erb
View File

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

2
app/views/foods/_index.html.erb
View File

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

2
app/views/foods/_nutrients.html.erb
View File

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

4
app/views/measurements/_filters.html.erb
View File

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

2
app/views/measurements/_index.html.erb
View File

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

2
app/views/measurements/_readouts.html.erb
View File

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