Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Added zero_nil to Ingredients filter formula

Browse Source 
Displaying formulas errors for Nutrients view
Substituted onblur for Ingredients filters with hidden submit
This commit is contained in:
cryptogopher
2020-03-22 01:02:37 +01:00
parent c3b783e942
commit 10325c9c39
6 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,14 +9,12 @@
<table class="filter">
<tr>
<td>
<%= text_field_tag 'filters[name]', session[:m_filters][:name], placeholder: 'name',
onblur: '$("#filters-form").submit(); return false;' %>
<%= text_field_tag 'name', session[:m_filters][:name], placeholder: 'name' %>
</td>
<td style="width:100%;">
<%= text_field_tag 'filters[formula][code]', session[:m_filters][:formula][:code],
<%= text_field_tag 'formula[code]', session[:m_filters][:formula][:code],
placeholder: 'conditional expression including readouts', size: 40,
style: 'box-sizing:border-box; width:100%;',
onblur: '$("#filters-form").submit(); return false;' %>
style: 'box-sizing:border-box; width:100%;' %>
</td>
<td>
<%= link_to l(:button_apply), '#', class: "icon icon-checked",
@@ -32,8 +30,7 @@
<td></td>
<td style="padding-top:4px;">
<%= label_tag do %>
<%= check_box_tag 'filters[formula][zero_nil]',
session[:m_filters][:formula][:zero_nil] %>
<%= check_box_tag 'formula[zero_nil]', session[:m_filters][:formula][:zero_nil] %>
<%= t 'quantities.form.zero_nil' %>
<% end %>
</td>
@@ -41,6 +38,7 @@
<td></td>
</tr>
</table>
<%= submit_tag '', style: 'display:none;' %>
<% end %>
</div>
</fieldset>