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

Finish first version of nested recipes feature (references #77)

Browse Source
This commit is contained in:
Bernd Bestel
2018-10-25 20:36:29 +02:00
parent 12a2cb0bdf
commit fc3a4c6899
10 changed files with 172 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
public/viewjs/recipeform.js
View File

@@ -118,7 +118,7 @@ $(document).on('click', '.recipe-pos-delete-button', function(e)
});
});
$(document).on('click', '.recipe-inlcude-delete-button', function(e)
$(document).on('click', '.recipe-include-delete-button', function(e)
{
var objectName = $(e.currentTarget).attr('data-recipe-include-name');
var objectId = $(e.currentTarget).attr('data-recipe-include-id');
@@ -206,11 +206,17 @@ $(document).on('click', '.recipe-pos-edit-button', function (e)
$(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);
Grocy.Api.Post('edit-object/recipes/' + Grocy.EditObjectId, $('#recipe-form').serializeJSON(),
function(result)
{
window.location.href = U('/recipe/' + Grocy.EditObjectId + '/included_recipe/' + id);
$("#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);
$("#recipe-include-editform-modal").modal("show");
Grocy.FrontendHelpers.ValidateForm("recipe-include-form");
},
function(xhr)
{
@@ -238,7 +244,11 @@ $("#recipe-include-add-button").on("click", function(e)
Grocy.Api.Post('edit-object/recipes/' + Grocy.EditObjectId, $('#recipe-form').serializeJSON(),
function(result)
{
window.location.href = U('/recipe/' + Grocy.EditObjectId + '/included_recipe/new');
$("#recipe-include-editform-title").text(L("Add included recipe"));
$("#recipe-include-form").data("edit-mode", "create");
$("#includes_recipe_id").val("");
$("#recipe-include-editform-modal").modal("show");
Grocy.FrontendHelpers.ValidateForm("recipe-include-form");
},
function(xhr)
{
@@ -247,6 +257,44 @@ $("#recipe-include-add-button").on("click", function(e)
);
});
$('#save-recipe-include-button').on('click', function(e)
{
e.preventDefault();
var nestingId = $("#recipe-include-form").data("recipe-nesting-id");
var editMode = $("#recipe-include-form").data("edit-mode");
var jsonData = $('#recipe-include-form').serializeJSON();
jsonData.recipe_id = Grocy.EditObjectId;
if (editMode === 'create')
{
Grocy.Api.Post('add-object/recipes_nestings', jsonData,
function(result)
{
window.location.href = U('/recipe/' + Grocy.EditObjectId);
},
function(xhr)
{
Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response)
}
);
}
else
{
Grocy.Api.Post('edit-object/recipes_nestings/' + nestingId, jsonData,
function(result)
{
window.location.href = U('/recipe/' + Grocy.EditObjectId);
},
function(xhr)
{
Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response)
}
);
}
});
$('#description').summernote({
minHeight: '300px',
lang: L('summernote_locale')

62
public/viewjs/recipeincludeform.js
View File

@@ -1,62 +0,0 @@
$('#save-recipe-include-button').on('click', function(e)
{
e.preventDefault();
var jsonData = $('#recipe-include-form').serializeJSON();
jsonData.recipe_id = Grocy.EditObjectParentId;
if (Grocy.EditMode === 'create')
{
Grocy.Api.Post('add-object/recipes_nestings', jsonData,
function(result)
{
window.location.href = U('/recipe/' + Grocy.EditObjectParentId);
},
function(xhr)
{
Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response)
}
);
}
else
{
Grocy.Api.Post('edit-object/recipes_nestings/' + Grocy.EditObjectId, jsonData,
function(result)
{
window.location.href = U('/recipe/' + Grocy.EditObjectParentId);
},
function(xhr)
{
Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response)
}
);
}
});
Grocy.FrontendHelpers.ValidateForm('recipe-include-form');
$('#recipe-include-form input').keyup(function(event)
{
Grocy.FrontendHelpers.ValidateForm('recipe-include-form');
});
$('#recipe-include-form select').change(function(event)
{
Grocy.FrontendHelpers.ValidateForm('recipe-include-form');
});
$('#recipe-include-form input').keydown(function(event)
{
if (event.keyCode === 13) //Enter
{
event.preventDefault();
if (document.getElementById('recipe-include-form').checkValidity() === false) //There is at least one validation error
{
return false;
}
else
{
$('#save-include-include-button').click();
}
}
});