mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-04 05:39:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

normalized ingredients

Browse Source
This commit is contained in:
vabene1111
2020-02-16 23:22:44 +01:00
parent f77aa7c8f0
commit 7d4630e3af
6 changed files with 58 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cookbook/templates/forms/edit_internal_recipe.html
View File

@@ -49,7 +49,15 @@
<script>
let select2Editor = function (cell, onRendered, success, cancel, editorParams) {
let select2UnitEditor = function (cell, onRendered, success, cancel, editorParams) {
return select2Editor(cell, onRendered, success, cancel, editorParams, '{% url 'dal_unit' %}')
};
let select2IngredientEditor = function (cell, onRendered, success, cancel, editorParams) {
return select2Editor(cell, onRendered, success, cancel, editorParams, '{% url 'dal_ingredient' %}')
};
let select2Editor = function (cell, onRendered, success, cancel, editorParams, url) {
let editor = document.createElement("select");
editor.setAttribute("class", "form-control");
@@ -61,7 +69,7 @@
select_2.select2({
tags: true,
ajax: {
url: '{% url 'dal_unit' %}',
url: url,
dataType: 'json'
}
});
@@ -79,7 +87,6 @@
});
});
//add editor to cell
return editor;
};
@@ -133,12 +140,12 @@
},
{
title: "{% trans 'Ingredient' %}",
field: "name",
field: "ingredient__name",
validator: "required",
editor: "input"
editor: select2IngredientEditor
},
{title: "{% trans 'Amount' %}", field: "amount", validator: "required", editor: "input"},
{title: "{% trans 'Unit' %}", field: "unit__name", validator: "required", editor: select2Editor},
{title: "{% trans 'Unit' %}", field: "unit__name", validator: "required", editor: select2UnitEditor},
{
formatter: function (cell, formatterParams) {
return "<span style='color:red'><i class=\"fas fa-trash-alt\"></i></span>"
@@ -176,7 +183,7 @@
document.getElementById("new_empty").addEventListener("click", function () {
data.push({
name: "{% trans 'Ingredient' %}",
ingredient__name: "{% trans 'Ingredient' %}",
amount: "100",
unit__name: "g",
id: Math.floor(Math.random() * 10000000),