kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-18 19:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Implemented that included recipes can have a serving amount (closes #163 and references #127)

Browse Source
This commit is contained in:
Bernd Bestel
2019-03-05 23:45:04 +01:00
parent 45db9ff90c
commit 2d8ad24887
7 changed files with 174 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
public/viewjs/recipeform.js
View File

@@ -235,14 +235,16 @@ $(document).on('click', '.recipe-include-edit-button', function (e)
{
var id = $(e.currentTarget).attr('data-recipe-include-id');
var recipeId = $(e.currentTarget).attr('data-recipe-included-recipe-id');
console.log(recipeId);
var recipeServings = $(e.currentTarget).attr('data-recipe-included-recipe-servings');
Grocy.Api.Put('objects/recipes/' + Grocy.EditObjectId, $('#recipe-form').serializeJSON(),
function(result)
{
$("#recipe-include-editform-title").text(L("Edit included recipe"));
$("#recipe-include-form").data("edit-mode", "edit");
$("#recipe-include-form").data("recipe-nesting-id", id);
$("#includes_recipe_id").val(recipeId);
Grocy.Components.RecipePicker.SetId(recipeId);
$("#includes_servings").val(recipeServings);
$("#recipe-include-editform-modal").modal("show");
Grocy.FrontendHelpers.ValidateForm("recipe-include-form");
},
@@ -274,7 +276,7 @@ $("#recipe-include-add-button").on("click", function(e)
{
$("#recipe-include-editform-title").text(L("Add included recipe"));
$("#recipe-include-form").data("edit-mode", "create");
$("#includes_recipe_id").val("");
Grocy.Components.RecipePicker.Clear();
$("#recipe-include-editform-modal").modal("show");
Grocy.FrontendHelpers.ValidateForm("recipe-include-form");
},
@@ -289,10 +291,17 @@ $('#save-recipe-include-button').on('click', function(e)
{
e.preventDefault();
if (document.getElementById("recipe-include-form").checkValidity() === false) //There is at least one validation error
{
return false;
}
var nestingId = $("#recipe-include-form").data("recipe-nesting-id");
var editMode = $("#recipe-include-form").data("edit-mode");
var jsonData = $('#recipe-include-form').serializeJSON();
var jsonData = {};
jsonData.includes_recipe_id = Grocy.Components.RecipePicker.GetValue();
jsonData.servings = $("#includes_servings").val();
jsonData.recipe_id = Grocy.EditObjectId;
if (editMode === 'create')