From 6e4117526b7e226638e009d90f88c4d459bb2909 Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Sat, 21 Sep 2019 13:40:31 +0200 Subject: [PATCH] Improved productcard "never" date display --- public/js/grocy.js | 1 + public/viewjs/components/productcard.js | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/public/js/grocy.js b/public/js/grocy.js index a799077c..1ffe0549 100644 --- a/public/js/grocy.js +++ b/public/js/grocy.js @@ -307,6 +307,7 @@ RefreshContextualTimeago = function() if (isNever) { element.prev().text(__t("Never")); + element.text(""); } else if (isToday) { diff --git a/public/viewjs/components/productcard.js b/public/viewjs/components/productcard.js index 8343bf03..df50bc39 100644 --- a/public/viewjs/components/productcard.js +++ b/public/viewjs/components/productcard.js @@ -11,10 +11,10 @@ Grocy.Components.ProductCard.Refresh = function(productId) $('#productcard-product-description').html(productDetails.product.description); $('#productcard-product-stock-amount').text(stockAmount); $('#productcard-product-stock-qu-name').text(__n(stockAmount, productDetails.quantity_unit_stock.name, productDetails.quantity_unit_stock.name_plural)); - $('#productcard-product-last-purchased').text((productDetails.last_purchased || __t('never')).substring(0, 10)); - $('#productcard-product-last-purchased-timeago').attr("datetime", productDetails.last_purchased || ''); - $('#productcard-product-last-used').text((productDetails.last_used || __t('never')).substring(0, 10)); - $('#productcard-product-last-used-timeago').attr("datetime", productDetails.last_used || ''); + $('#productcard-product-last-purchased').text((productDetails.last_purchased || '2999-12-31').substring(0, 10)); + $('#productcard-product-last-purchased-timeago').attr("datetime", productDetails.last_purchased || '2999-12-31'); + $('#productcard-product-last-used').text((productDetails.last_used || '2999-12-31').substring(0, 10)); + $('#productcard-product-last-used-timeago').attr("datetime", productDetails.last_used || '2999-12-31'); $('#productcard-product-location').text(productDetails.location.name); $('#productcard-product-spoil-rate').text((parseFloat(productDetails.spoil_rate_percent) / 100).toLocaleString(undefined, { style: "percent" }));