Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Sending Food id from autocomplete on Meal create

Browse Source
This commit is contained in:
cryptogopher 2020-04-16 19:09:24 +02:00
parent e78803e474
commit eb939a1be5
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/foods/autocomplete.json.erb
View File

@ -1 +1 @@
<%= raw @foods.map { |f| {id: f.id, label: f.name, value: f.name} }.to_json %> <%= raw @foods.map { |f| {label: f.name, value: f.id} }.to_json %>

27
app/views/meals/_form.html.erb
View File

@ -9,10 +9,11 @@
<td style="width:90%;"> <td style="width:90%;">
<p> <p>
<%= ff.hidden_field :id %> <%= ff.hidden_field :id %>
<%= ff.text_field :food_id, {class: "autocomplete food-autocomplete", <%= ff.hidden_field :food_id, {class: "autocomplete-value"} %>
style: "width: 80%;", <%= label_tag :food_name, index > 0 ? '' : t(:field_ingredients) %>
required: true, <%= text_field_tag :food_name, nil, {class: "autocomplete autocomplete-label",
label: (index > 0 ? '' : :field_ingredients)} %> style: "width: 80%;",
required: true} %>
<%= ff.number_field :amount, {style: "width: 8%", step: :any, label: ''} %> <%= ff.number_field :amount, {style: "width: 8%", step: :any, label: ''} %>
<%= i.food.ref_unit.shortname if i.food %> <%= i.food.ref_unit.shortname if i.food %>
<%= ff.hidden_field :_destroy %> <%= ff.hidden_field :_destroy %>
@ -37,15 +38,24 @@
<%= javascript_tag do %> <%= javascript_tag do %>
function autocompleteFood($row) { function autocompleteFood($row) {
$row.find('.food-autocomplete').autocomplete({ $row.find('.autocomplete-label').autocomplete({
source: '<%= j autocomplete_project_foods_path(@project) %>', source: '<%= j autocomplete_project_foods_path(@project) %>',
minLength: 2, minLength: 2,
position: {collision: 'flipfit'}, position: {collision: 'flipfit'},
search: function(event){ search: function(event){
$(event.target).closest('.food-autocomplete').addClass('ajax-loading'); $(event.target).addClass('ajax-loading');
}, },
response: function(event){ response: function(event){
$(event.target).closest('.food-autocomplete').removeClass('ajax-loading'); $(event.target).removeClass('ajax-loading');
},
select: function(event, ui) {
$(event.target).val(ui.item.label);
$(event.target).siblings('.autocomplete-value').val(ui.item.value)
return false;
},
focus: function(event, ui) {
$(event.target).val(ui.item.label);
return false;
} }
}); });
} }
@ -55,8 +65,7 @@
var form = $(event.target).closest('form'); var form = $(event.target).closest('form');
var row = form.find('tr.ingredient:visible:last'); var row = form.find('tr.ingredient:visible:last');
var new_row = row.clone().insertAfter(row); var new_row = row.clone().insertAfter(row);
new_row.find('input[id$=__id], input[id$=__amount], input[id$=__food_id]').val(''); new_row.find('input:not([id$=__destroy])').val('');
new_row.find('input[id$=__destroy]').val('');
new_row.find('label:first').hide(); new_row.find('label:first').hide();
form.find('tr.ingredient:visible a.icon-del').show(); form.find('tr.ingredient:visible a.icon-del').show();
autocompleteFood(new_row); autocompleteFood(new_row);