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

Fixed meal plan edit product entry initial amount

Browse Source
This commit is contained in:
Bernd Bestel 2022-01-23 12:53:21 +01:00
parent f6c750a1ea
commit 49f44d241b
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
public/viewjs/mealplan.js
View File

@ -1,6 +1,5 @@
var firstRender = true; var firstRender = true;
Grocy.IsMealPlanEntryEditAction = false; Grocy.IsMealPlanEntryEditAction = false;
Grocy.MealPlanEntryEditObjectId = -1;
var firstDay = null; var firstDay = null;
if (!Grocy.CalendarFirstDayOfWeek.isEmpty()) if (!Grocy.CalendarFirstDayOfWeek.isEmpty())
@ -417,7 +416,7 @@ $(document).on("click", ".edit-meal-plan-entry-button", function(e)
Grocy.FrontendHelpers.ValidateForm("add-note-form"); Grocy.FrontendHelpers.ValidateForm("add-note-form");
} }
Grocy.IsMealPlanEntryEditAction = true; Grocy.IsMealPlanEntryEditAction = true;
Grocy.MealPlanEntryEditObjectId = mealPlanEntry.id; Grocy.MealPlanEntryEditObject = mealPlanEntry;
}); });
$(document).on("click", ".copy-day-button", function(e) $(document).on("click", ".copy-day-button", function(e)
@ -488,7 +487,7 @@ $('#save-add-recipe-button').on('click', function(e)
if (Grocy.IsMealPlanEntryEditAction) if (Grocy.IsMealPlanEntryEditAction)
{ {
Grocy.Api.Put('objects/meal_plan/' + Grocy.MealPlanEntryEditObjectId.toString(), formData, Grocy.Api.Put('objects/meal_plan/' + Grocy.MealPlanEntryEditObject.id, formData,
function(result) function(result)
{ {
window.location.reload(); window.location.reload();
@ -535,7 +534,7 @@ $('#save-add-note-button').on('click', function(e)
if (Grocy.IsMealPlanEntryEditAction) if (Grocy.IsMealPlanEntryEditAction)
{ {
Grocy.Api.Put('objects/meal_plan/' + Grocy.MealPlanEntryEditObjectId.toString(), jsonData, Grocy.Api.Put('objects/meal_plan/' + Grocy.MealPlanEntryEditObject.id, jsonData,
function(result) function(result)
{ {
window.location.reload(); window.location.reload();
@ -588,7 +587,7 @@ $('#save-add-product-button').on('click', function(e)
if (Grocy.IsMealPlanEntryEditAction) if (Grocy.IsMealPlanEntryEditAction)
{ {
Grocy.Api.Put('objects/meal_plan/' + Grocy.MealPlanEntryEditObjectId.toString(), jsonData, Grocy.Api.Put('objects/meal_plan/' + Grocy.MealPlanEntryEditObject.id, jsonData,
function(result) function(result)
{ {
window.location.reload(); window.location.reload();
@ -1006,7 +1005,15 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
Grocy.Components.ProductAmountPicker.Reload(productDetails.product.id, productDetails.quantity_unit_stock.id); Grocy.Components.ProductAmountPicker.Reload(productDetails.product.id, productDetails.quantity_unit_stock.id);
Grocy.Components.ProductAmountPicker.SetQuantityUnit(productDetails.quantity_unit_stock.id); Grocy.Components.ProductAmountPicker.SetQuantityUnit(productDetails.quantity_unit_stock.id);
if (Grocy.IsMealPlanEntryEditAction)
{
$('#display_amount').val(Grocy.MealPlanEntryEditObject.product_amount);
}
else
{
$('#display_amount').val(1); $('#display_amount').val(1);
}
RefreshLocaleNumberInput(); RefreshLocaleNumberInput();
$('#display_amount').focus(); $('#display_amount').focus();
$('#display_amount').select(); $('#display_amount').select();