From 2d0bc7f55a597d27e235420be6676f5de70de778 Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Mon, 4 Nov 2019 19:28:27 +0100
Subject: [PATCH] Restore more/old display text for "specific stock entry"

---
 public/viewjs/consume.js  | 12 +++++++++---
 public/viewjs/transfer.js | 10 ++++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/public/viewjs/consume.js b/public/viewjs/consume.js
index 75e32076..0400a682 100644
--- a/public/viewjs/consume.js
+++ b/public/viewjs/consume.js
@@ -197,13 +197,19 @@ $("#location_id").on('change', function(e)
                         function(stockEntries)
                         {
                                 stockEntries.forEach(stockEntry =>
-                                {
+								{
+									var openTxt = __t("Not opened");
+									if (stockEntry.open == 1)
+									{
+										openTxt = __t("Opened");
+									}
+									
                                         if (stockEntry.location_id == locationId)
                                         {
                                                 $("#specific_stock_entry").append($("<option>", {
                                                         value: stockEntry.stock_id,
                                                         amount: stockEntry.amount,
-                                                        text: __t("Amount remaining: %1$s, Best Before: %2$s", stockEntry.amount, stockEntry.best_before_date)
+														text: __t("Amount: %1$s; Expires on %2$s; Bought on %3$s", stockEntry.amount, moment(stockEntry.best_before_date).format("YYYY-MM-DD"), moment(stockEntry.purchased_date).format("YYYY-MM-DD")) + "; " + openTxt
                                                 }));
                                                 sumValue = sumValue + parseFloat(stockEntry.amount);
                                         }
@@ -213,7 +219,7 @@ $("#location_id").on('change', function(e)
                                                 $("#specific_stock_entry").append($("<option>", {
                                                         value: stockEntry.stock_id,
                                                         amount: stockEntry.amount,
-                                                        text: __t("Amount remaining: %1$s, Best Before: %2$s", stockEntry.amount, stockEntry.best_before_date)
+														text: __t("Amount: %1$s; Expires on %2$s; Bought on %3$s", stockEntry.amount, moment(stockEntry.best_before_date).format("YYYY-MM-DD"), moment(stockEntry.purchased_date).format("YYYY-MM-DD")) + "; " + openTxt
                                                 }));
                                                 sumValue = sumValue + parseFloat(stockEntry.amount);
                                         }
diff --git a/public/viewjs/transfer.js b/public/viewjs/transfer.js
index df54fa5c..80e229b5 100644
--- a/public/viewjs/transfer.js
+++ b/public/viewjs/transfer.js
@@ -241,12 +241,18 @@ $("#location_id_from").on('change', function(e)
 			{
 				stockEntries.forEach(stockEntry =>
 				{
+					var openTxt = __t("Not opened");
+					if (stockEntry.open == 1)
+					{
+						openTxt = __t("Opened");
+					}
+
 					if (stockEntry.location_id == locationId)
 					{
 						$("#specific_stock_entry").append($("<option>", {
 							value: stockEntry.stock_id,
 							amount: stockEntry.amount,
-							text: __t("Amount remaining: %1$s, Best Before: %2$s", stockEntry.amount, stockEntry.best_before_date)
+							text: __t("Amount: %1$s; Expires on %2$s; Bought on %3$s; Price: %4$s", stockEntry.amount, moment(stockEntry.best_before_date).format("YYYY-MM-DD"), moment(stockEntry.purchased_date).format("YYYY-MM-DD")) + "; " + openTxt
 						}));
 						sumValue = sumValue + parseFloat(stockEntry.amount);
 					}
@@ -256,7 +262,7 @@ $("#location_id_from").on('change', function(e)
 						$("#specific_stock_entry").append($("<option>", {
                                                         value: stockEntry.stock_id,
                                                         amount: stockEntry.amount,
-                                                        text: __t("Amount remaining: %1$s, Best Before: %2$s", stockEntry.amount, stockEntry.best_before_date)
+														text: __t("Amount: %1$s; Expires on %2$s; Bought on %3$s", stockEntry.amount, moment(stockEntry.best_before_date).format("YYYY-MM-DD"), moment(stockEntry.purchased_date).format("YYYY-MM-DD")) + "; " + openTxt
                                                 }));
                                                 sumValue = sumValue + parseFloat(stockEntry.amount);
 					}