Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Added quantity filtering by domain

Browse Source
This commit is contained in:
cryptogopher
2019-11-21 01:28:03 +01:00
parent d3ba8579d6
commit 2ebbe9a306
12 changed files with 99 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/views/ingredients/_filters.html.erb
View File

@@ -7,28 +7,29 @@
<table class="filter">
<tr>
<td>
<%= text_field_tag 'filters[name]', session[:filters][:name], placeholder: 'name',
:onblur => '$("#filters_form").submit(); return false;' %>
<%= text_field_tag 'filters[name]', session[:i_filters][:name], placeholder: 'name',
onblur: '$("#filters_form").submit(); return false;' %>
</td>
<td>
<%= select_tag 'filters[visibility]',
visibility_options(session[:filters][:visibility]),
:onchange => '$("#filters_form").submit(); return false;' %>
visibility_options(session[:i_filters][:visibility]),
prompt: t('.visibility_prompt'),
onchange: '$("#filters_form").submit(); return false;' %>
</td>
<td style="width:100%;">
<%= text_field_tag 'filters[nutrients]', session[:filters][:nutrients],
<%= text_field_tag 'filters[nutrients]', session[:i_filters][:nutrients],
placeholder: 'conditional expression including nutrients', size: 40,
:style => 'box-sizing:border-box; width:100%;',
:onblur => '$("#filters_form").submit(); return false;' %>
style: 'box-sizing:border-box; width:100%;',
onblur: '$("#filters_form").submit(); return false;' %>
</td>
<td>
<%= link_to l(:button_apply), '#', :class => "icon icon-checked",
:onclick => '$("#filters_form").submit(); return false;' %>
<%= link_to l(:button_apply), '#', class: "icon icon-checked",
onclick: '$("#filters_form").submit(); return false;' %>
</td>
<td>
<%= link_to l(:button_clear), '#', :class => "icon icon-reload",
:onclick => '$("#filters_form input, #filters_form select").val("");
$("#filters_form").submit(); return false;' %>
<%= link_to l(:button_clear), '#', class: "icon icon-reload",
onclick: '$("#filters_form input, #filters_form select").val("");
$("#filters_form").submit(); return false;' %>
</td>
</tr>
</table>

27
app/views/quantities/_filters.html.erb Normal file
View File

@@ -0,0 +1,27 @@
<fieldset id="filters" class="collapsible">
<legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
<div>
<%= form_tag url, id: 'filters_form', method: :get, remote: true do %>
<table class="filter">
<tr>
<td style="width:100%;">
</td>
<td>
<%= select_tag 'filters[domain]', domain_options_tag(session[:q_filters][:domain]),
prompt: t('.domain_prompt'),
onchange: '$("#filters_form").submit(); return false;' %>
</td>
<td>
<%= link_to l(:button_apply), '#', class: "icon icon-checked",
onclick: '$("#filters_form").submit(); return false;' %>
</td>
<td>
<%= link_to l(:button_clear), '#', class: "icon icon-reload",
onclick: '$("#filters_form input, #filters_form select").val("");
$("#filters_form").submit(); return false;' %>
</td>
</tr>
</table>
<% end %>
</div>
</fieldset>

3
app/views/quantities/_list.html.erb
View File

@@ -1,3 +1,6 @@
<%= render :partial => 'quantities/filters',
:locals => {:url => filter_project_quantities_path(@project)} %>
<% if @quantities.any? { |q| q.persisted? } %>
<table class="list">
<thead>