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

Created basis edit UI for nested recipes (references #77)

Browse Source
This commit is contained in:
Bernd Bestel
2018-10-23 19:36:39 +02:00
parent 57a0864465
commit 12a2cb0bdf
7 changed files with 305 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
public/viewjs/recipeform.js
View File

@@ -35,15 +35,25 @@ var recipesPosTables = $('#recipes-pos-table').DataTable({
}
});
$("#search").on("keyup", function ()
{
var value = $(this).val();
if (value === "all")
var recipesIncludesTables = $('#recipes-includes-table').DataTable({
'paginate': false,
'order': [[1, 'asc']],
'columnDefs': [
{ 'orderable': false, 'targets': 0 }
],
'language': JSON.parse(L('datatables_localization')),
'scrollY': false,
'colReorder': true,
'stateSave': true,
'stateSaveParams': function (settings, data)
{
value = "";
}
data.search.search = "";
recipesPosTables.search(value).draw();
data.columns.forEach(column =>
{
column.search.search = "";
});
}
});
Grocy.FrontendHelpers.ValidateForm('recipe-form');
@@ -108,6 +118,43 @@ $(document).on('click', '.recipe-pos-delete-button', function(e)
});
});
$(document).on('click', '.recipe-inlcude-delete-button', function(e)
{
var objectName = $(e.currentTarget).attr('data-recipe-include-name');
var objectId = $(e.currentTarget).attr('data-recipe-include-id');
bootbox.confirm({
message: L('Are you sure to remove included recipe "#1"?', objectName),
buttons: {
confirm: {
label: L('Yes'),
className: 'btn-success'
},
cancel: {
label: L('No'),
className: 'btn-danger'
}
},
callback: function(result)
{
if (result === true)
{
Grocy.Api.Post('edit-object/recipes/' + Grocy.EditObjectId, $('#recipe-form').serializeJSON(), function() { }, function() { });
Grocy.Api.Get('delete-object/recipes_nestings/' + objectId,
function(result)
{
window.location.href = U('/recipe/' + Grocy.EditObjectId);
},
function(xhr)
{
console.error(xhr);
}
);
}
}
});
});
$(document).on('click', '.recipe-pos-order-missing-button', function(e)
{
var productName = $(e.currentTarget).attr('data-product-name');
@@ -156,6 +203,22 @@ $(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');
Grocy.Api.Post('edit-object/recipes/' + Grocy.EditObjectId, $('#recipe-form').serializeJSON(),
function(result)
{
window.location.href = U('/recipe/' + Grocy.EditObjectId + '/included_recipe/' + id);
},
function(xhr)
{
console.error(xhr);
}
);
});
$("#recipe-pos-add-button").on("click", function(e)
{
Grocy.Api.Post('edit-object/recipes/' + Grocy.EditObjectId, $('#recipe-form').serializeJSON(),
@@ -170,6 +233,20 @@ $("#recipe-pos-add-button").on("click", function(e)
);
});
$("#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');
},
function(xhr)
{
console.error(xhr);
}
);
});
$('#description').summernote({
minHeight: '300px',
lang: L('summernote_locale')

62
public/viewjs/recipeincludeform.js Normal file
View File

@@ -0,0 +1,62 @@
$('#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();
}
}
});