Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Added zero_nil to Measurement filter formula

Browse Source
This commit is contained in:
cryptogopher 2020-02-22 22:14:21 +01:00
parent b1e7236460
commit 0f8f74ffec
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/measurements_controller.rb
View File

@ -80,7 +80,7 @@ class MeasurementsController < ApplicationController
private private
def init_session_filters def init_session_filters
session[:m_filters] ||= {} session[:m_filters] ||= {formula: {}}
end end
def measurement_params def measurement_params

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

@ -13,11 +13,16 @@
onblur: '$("#filters-form").submit(); return false;' %> onblur: '$("#filters-form").submit(); return false;' %>
</td> </td>
<td style="width:100%;"> <td style="width:100%;">
<%= text_field_tag 'filters[formula]', session[:m_filters][:formula], <%= text_field_tag 'filters[formula][code]', session[:m_filters][:formula][:code],
placeholder: 'conditional expression including readouts', size: 40, placeholder: 'conditional expression including readouts', size: 40,
style: 'box-sizing:border-box; width:100%;', style: 'box-sizing:border-box; width:100%;',
onblur: '$("#filters-form").submit(); return false;' %> onblur: '$("#filters-form").submit(); return false;' %>
</td> </td>
<td>
<%= check_box_tag 'filters[formula][zero_nil]',
session[:m_filters][:formula][:zero_nil] %>
<%= t '.zero_nil' %>
</td>
<td> <td>
<%= link_to l(:button_apply), '#', class: "icon icon-checked", <%= link_to l(:button_apply), '#', class: "icon icon-checked",
onclick: '$("#filters-form").submit(); return false;' %> onclick: '$("#filters-form").submit(); return false;' %>

2
config/locales/en.yml
View File

@ -62,6 +62,8 @@ en:
measurements: measurements:
contextual: contextual:
link_new_measurement: 'New measurement' link_new_measurement: 'New measurement'
filters:
zero_nil: 'missing -> 0?'
form: form:
button_new_readout: 'Add readout' button_new_readout: 'Add readout'
button_delete_readout: 'Delete' button_delete_readout: 'Delete'