kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-30 10:05:45 +00:00
Code Issues Projects Releases Wiki Activity

Don't remove products from stock overview on consuming all and the product has a min. stock amount & show it again on undo

Browse Source
This commit is contained in:
Bernd Bestel 2019-09-26 13:55:42 +02:00
parent a2b6d9ae39
commit b8f9d09afc
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/js/grocy.js
View File

@ -298,8 +298,21 @@ RefreshContextualTimeago = function()
$("time.timeago").each(function() $("time.timeago").each(function()
{ {
var element = $(this); var element = $(this);
if (!element.hasAttr("datetime"))
{
element.text("")
return
}
var timestamp = element.attr("datetime"); var timestamp = element.attr("datetime");
if (timestamp.isEmpty())
{
element.text("")
return
}
var isNever = timestamp && timestamp.substring(0, 10) == "2999-12-31"; var isNever = timestamp && timestamp.substring(0, 10) == "2999-12-31";
var isToday = timestamp && timestamp.substring(0, 10) == moment().format("YYYY-MM-DD"); var isToday = timestamp && timestamp.substring(0, 10) == moment().format("YYYY-MM-DD");
var isDateWithoutTime = element.hasClass("timeago-date-only"); var isDateWithoutTime = element.hasClass("timeago-date-only");

12
public/viewjs/stockoverview.js
View File

@ -319,6 +319,9 @@ function RefreshProductRow(productId)
productRow.removeClass("table-warning"); productRow.removeClass("table-warning");
productRow.removeClass("table-danger"); productRow.removeClass("table-danger");
productRow.removeClass("table-info");
productRow.removeClass("d-none");
productRow.removeAttr("style");
if (now.isAfter(nextBestBeforeDate)) if (now.isAfter(nextBestBeforeDate))
{ {
productRow.addClass("table-danger"); productRow.addClass("table-danger");
@ -328,12 +331,12 @@ function RefreshProductRow(productId)
productRow.addClass("table-warning"); productRow.addClass("table-warning");
} }
if (result.stock_amount <= 0) if (result.stock_amount == 0 && result.product.min_stock_amount == 0)
{ {
$('#product-' + productId + '-row').fadeOut(500, function() $('#product-' + productId + '-row').fadeOut(500, function()
{ {
$(this).tooltip("hide"); $(this).tooltip("hide");
$(this).remove(); $(this).addClass("d-none");
}); });
} }
else else
@ -366,6 +369,11 @@ function RefreshProductRow(productId)
$(this).text("").fadeIn(500); $(this).text("").fadeIn(500);
} }
}); });
if (result.stock_amount == 0 && result.product.min_stock_amount > 0)
{
productRow.addClass("table-info");
}
} }
$('#product-' + productId + '-next-best-before-date').parent().effect('highlight', {}, 500); $('#product-' + productId + '-next-best-before-date').parent().effect('highlight', {}, 500);