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

Unified form validation handling

Browse Source
This commit is contained in:
Bernd Bestel 2022-03-30 18:00:28 +02:00
parent 77d75d16df
commit fbb84277bf
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
29 changed files with 72 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/viewjs/barcodescannertesting.js
View File

@ -8,7 +8,7 @@ $("#scanned_barcode").on("blur", function(e)
$("#scanned_barcode").keydown(function(event) $("#scanned_barcode").keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
OnBarcodeScanned($("#scanned_barcode").val()); OnBarcodeScanned($("#scanned_barcode").val());

4
public/viewjs/batteryform.js
View File

@ -73,11 +73,11 @@ $('#battery-form input').keyup(function(event)
$('#battery-form input').keydown(function(event) $('#battery-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('battery-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('battery-form'))
{ {
return false; return false;
} }

4
public/viewjs/batterytracking.js
View File

@ -87,11 +87,11 @@ $('#batterytracking-form input').keyup(function(event)
$('#batterytracking-form input').keydown(function(event) $('#batterytracking-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('batterytracking-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('batterytracking-form'))
{ {
return false; return false;
} }

4
public/viewjs/choreform.js
View File

@ -86,11 +86,11 @@ $('#chore-form input').keyup(function(event)
$('#chore-form input').keydown(function(event) $('#chore-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('chore-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('chore-form'))
{ {
return false; return false;
} }

4
public/viewjs/choretracking.js
View File

@ -123,11 +123,11 @@ $('#choretracking-form input').keyup(function(event)
$('#choretracking-form input').keydown(function(event) $('#choretracking-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('choretracking-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('choretracking-form'))
{ {
return false; return false;
} }

7
public/viewjs/consume.js
View File

@ -506,11 +506,11 @@ $('#consume-form select').change(function(event)
$('#consume-form input').keydown(function(event) $('#consume-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('consume-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('consume-form'))
{ {
return false; return false;
} }
@ -707,8 +707,7 @@ function ScanModeSubmit(singleUnit = true)
$(".input-group-productamountpicker").trigger("change"); $(".input-group-productamountpicker").trigger("change");
} }
Grocy.FrontendHelpers.ValidateForm("consume-form"); if (Grocy.FrontendHelpers.ValidateForm('consume-form'))
if (document.getElementById("consume-form").checkValidity() === true)
{ {
$('#save-consume-button').click(); $('#save-consume-button').click();
} }

4
public/viewjs/equipmentform.js
View File

@ -119,11 +119,11 @@ $('#equipment-form input').keyup(function(event)
$('#equipment-form input').keydown(function(event) $('#equipment-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('equipment-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('equipment-form'))
{ {
return false; return false;
} }

4
public/viewjs/inventory.js
View File

@ -339,11 +339,11 @@ $('#inventory-form input').keyup(function(event)
$('#inventory-form input').keydown(function(event) $('#inventory-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('inventory-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('inventory-form'))
{ {
return false; return false;
} }

4
public/viewjs/locationform.js
View File

@ -73,11 +73,11 @@ $('#location-form input').keyup(function(event)
$('#location-form input').keydown(function(event) $('#location-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('location-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('location-form'))
{ {
return false; return false;
} }

20
public/viewjs/mealplan.js
View File

@ -507,7 +507,7 @@ $('#save-add-recipe-button').on('click', function(e)
return; return;
} }
if (document.getElementById("add-recipe-form").checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('add-recipe-form'))
{ {
return false; return false;
} }
@ -558,7 +558,7 @@ $('#save-add-note-button').on('click', function(e)
return; return;
} }
if (document.getElementById("add-note-form").checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('add-note-form'))
{ {
return false; return false;
} }
@ -611,7 +611,7 @@ $('#save-add-product-button').on('click', function(e)
return; return;
} }
if (document.getElementById("add-product-form").checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('add-product-form'))
{ {
return false; return false;
} }
@ -665,7 +665,7 @@ $('#save-copy-day-button').on('click', function(e)
return; return;
} }
if (document.getElementById("copy-day-form").checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('copy-day-form'))
{ {
return false; return false;
} }
@ -713,11 +713,11 @@ $('#save-copy-day-button').on('click', function(e)
$('#add-recipe-form input').keydown(function(event) $('#add-recipe-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById("add-recipe-form").checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('add-recipe-form'))
{ {
return false; return false;
} }
@ -730,11 +730,11 @@ $('#add-recipe-form input').keydown(function(event)
$('#add-product-form input').keydown(function(event) $('#add-product-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById("add-product-form").checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('add-product-form'))
{ {
return false; return false;
} }
@ -747,11 +747,11 @@ $('#add-product-form input').keydown(function(event)
$(document).on("keydown", "#servings", function(e) $(document).on("keydown", "#servings", function(e)
{ {
if (e.keyCode === 13) //Enter if (e.keyCode === 13) // Enter
{ {
e.preventDefault(); e.preventDefault();
if (document.getElementById("add-recipe-form").checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('add-recipe-form'))
{ {
return false; return false;
} }

4
public/viewjs/mealplansectionform.js
View File

@ -61,11 +61,11 @@ $('#mealplansection-form input').keyup(function(event)
$('#mealplansection-form input').keydown(function(event) $('#mealplansection-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('mealplansection-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('mealplansection-form'))
{ {
return false; return false;
} }

4
public/viewjs/productbarcodeform.js
View File

@ -72,11 +72,11 @@ $('#display_amount').on('keyup', function(e)
$('#barcode-form input').keydown(function(event) $('#barcode-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('barcode-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('barcode-form'))
{ {
return false; return false;
} }

12
public/viewjs/productform.js
View File

@ -217,19 +217,15 @@ $('#product-form input').keyup(function(event)
$(".input-group-qu").trigger("change"); $(".input-group-qu").trigger("change");
$("#product-form select").trigger("select"); $("#product-form select").trigger("select");
if (document.getElementById('product-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('product-form'))
{ {
$("#qu-conversion-add-button").addClass("disabled"); $("#qu-conversion-add-button").addClass("disabled");
$("#barcode-add-button").addClass("disabled");
} }
else else
{ {
$("#qu-conversion-add-button").removeClass("disabled"); $("#qu-conversion-add-button").removeClass("disabled");
} }
if (document.getElementById('product-form').checkValidity() === false) //There is at least one validation error
{
$("#barcode-add-button").addClass("disabled");
}
}); });
$('#location_id').change(function(event) $('#location_id').change(function(event)
@ -239,11 +235,11 @@ $('#location_id').change(function(event)
$('#product-form input').keydown(function(event) $('#product-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('product-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('product-form'))
{ {
return false; return false;
} }

4
public/viewjs/productgroupform.js
View File

@ -59,11 +59,11 @@ $('#product-group-form input').keyup(function(event)
$('#product-group-form input').keydown(function(event) $('#product-group-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('product-group-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('product-group-form'))
{ {
return false; return false;
} }

8
public/viewjs/purchase.js
View File

@ -342,7 +342,7 @@ if (Grocy.Components.ProductPicker !== undefined)
$("#display_amount").focus(); $("#display_amount").focus();
Grocy.FrontendHelpers.ValidateForm('purchase-form'); Grocy.FrontendHelpers.ValidateForm('purchase-form');
if (GetUriParam("flow") === "shoppinglistitemtostock" && BoolVal(Grocy.UserSettings.shopping_list_to_stock_workflow_auto_submit_when_prefilled) && document.getElementById("purchase-form").checkValidity() === true) if (GetUriParam("flow") === "shoppinglistitemtostock" && BoolVal(Grocy.UserSettings.shopping_list_to_stock_workflow_auto_submit_when_prefilled) && Grocy.FrontendHelpers.ValidateForm("purchase-form"))
{ {
$("#save-purchase-button").click(); $("#save-purchase-button").click();
} }
@ -515,11 +515,11 @@ $('#purchase-form input').keyup(function(event)
$('#purchase-form input').keydown(function(event) $('#purchase-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('purchase-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('purchase-form'))
{ {
return false; return false;
} }
@ -701,7 +701,7 @@ function ScanModeSubmit(singleUnit = true)
} }
Grocy.FrontendHelpers.ValidateForm("purchase-form"); Grocy.FrontendHelpers.ValidateForm("purchase-form");
if (document.getElementById("purchase-form").checkValidity() === true) if (Grocy.FrontendHelpers.ValidateForm('purchase-form'))
{ {
$('#save-purchase-button').click(); $('#save-purchase-button').click();
} }

4
public/viewjs/quantityunitconversionform.js
View File

@ -137,11 +137,11 @@ $('#quconversion-form input').keyup(function(event)
$('#quconversion-form input').keydown(function(event) $('#quconversion-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('quconversion-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('quconversion-form'))
{ {
return false; return false;
} }

6
public/viewjs/quantityunitform.js
View File

@ -110,7 +110,7 @@ $('#quantityunit-form input').keyup(function(event)
$("#qu-conversion-headline-info").text(""); $("#qu-conversion-headline-info").text("");
} }
if (document.getElementById('quantityunit-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('quantityunit-form'))
{ {
$("#qu-conversion-add-button").addClass("disabled"); $("#qu-conversion-add-button").addClass("disabled");
} }
@ -124,11 +124,11 @@ $('#quantityunit-form input').keyup(function(event)
$('#quantityunit-form input').keydown(function(event) $('#quantityunit-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('quantityunit-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('quantityunit-form'))
{ {
return false; return false;
} }

11
public/viewjs/recipeform.js
View File

@ -116,11 +116,11 @@ $('#recipe-form input').keyup(function(event)
$('#recipe-form input').keydown(function(event) $('#recipe-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('recipe-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('recipe-form'))
{ {
return false; return false;
} }
@ -308,7 +308,7 @@ $('#save-recipe-include-button').on('click', function(e)
if (!Grocy.FrontendHelpers.ValidateForm("recipe-include-form", true)) if (!Grocy.FrontendHelpers.ValidateForm("recipe-include-form", true))
{ {
return; return false;
} }
if ($(".combobox-menu-visible").length) if ($(".combobox-menu-visible").length)
@ -316,11 +316,6 @@ $('#save-recipe-include-button').on('click', function(e)
return; return;
} }
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 nestingId = $("#recipe-include-form").data("recipe-nesting-id");
var editMode = $("#recipe-include-form").data("edit-mode"); var editMode = $("#recipe-include-form").data("edit-mode");

4
public/viewjs/recipeposform.js
View File

@ -131,11 +131,11 @@ $('#qu_id').change(function(event)
$('#recipe-pos-form input').keydown(function(event) $('#recipe-pos-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('recipe-pos-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('recipe-pos-form'))
{ {
return false; return false;
} }

4
public/viewjs/shoppinglistform.js
View File

@ -63,11 +63,11 @@ $('#shopping-list-form input').keyup(function(event)
$('#shopping-list-form input').keydown(function(event) $('#shopping-list-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('shopping-list-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('shopping-list-form'))
{ {
return false; return false;
} }

4
public/viewjs/shoppinglistitemform.js
View File

@ -241,11 +241,11 @@ $('#shoppinglist-form input').keyup(function(event)
$('#shoppinglist-form input').keydown(function(event) $('#shoppinglist-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('shoppinglist-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('shoppinglist-form'))
{ {
return false; return false;
} }

4
public/viewjs/shoppinglocationform.js
View File

@ -73,11 +73,11 @@ $('#shoppinglocation-form input').keyup(function(event)
$('#shoppinglocation-form input').keydown(function(event) $('#shoppinglocation-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('shoppinglocation-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('shoppinglocation-form'))
{ {
return false; return false;
} }

4
public/viewjs/stockentryform.js
View File

@ -68,11 +68,11 @@ $('#stockentry-form input').keyup(function(event)
$('#stockentry-form input').keydown(function(event) $('#stockentry-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('stockentry-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('stockentry-form'))
{ {
return false; return false;
} }

4
public/viewjs/taskcategoryform.js
View File

@ -73,11 +73,11 @@ $('#task-category-form input').keyup(function(event)
$('#task-category-form input').keydown(function(event) $('#task-category-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('task-category-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('task-category-form'))
{ {
return false; return false;
} }

4
public/viewjs/taskform.js
View File

@ -93,11 +93,11 @@ $('#task-form input').keyup(function(event)
$('#task-form input').keydown(function(event) $('#task-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('task-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('task-form'))
{ {
return false; return false;
} }

4
public/viewjs/transfer.js
View File

@ -383,11 +383,11 @@ $('#transfer-form select').change(function(event)
$('#transfer-form input').keydown(function(event) $('#transfer-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('transfer-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('transfer-form'))
{ {
return false; return false;
} }

4
public/viewjs/userentityform.js
View File

@ -73,11 +73,11 @@ $('#userentity-form select').change(function(event)
$('#userentity-form input').keydown(function(event) $('#userentity-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('userentity-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('userentity-form'))
{ {
return false; return false;
} }

4
public/viewjs/userfieldform.js
View File

@ -77,11 +77,11 @@ $('#userfield-form select').change(function(event)
$('#userfield-form input').keydown(function(event) $('#userfield-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('userfield-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('userfield-form'))
{ {
return false; return false;
} }

4
public/viewjs/userform.js
View File

@ -105,11 +105,11 @@ $('#user-form input').keyup(function(event)
$('#user-form input').keydown(function(event) $('#user-form input').keydown(function(event)
{ {
if (event.keyCode === 13) //Enter if (event.keyCode === 13) // Enter
{ {
event.preventDefault(); event.preventDefault();
if (document.getElementById('user-form').checkValidity() === false) //There is at least one validation error if (!Grocy.FrontendHelpers.ValidateForm('user-form'))
{ {
return false; return false;
} }