From fd02f1b7615e37120d94695f042039f344d9bbc1 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Mon, 28 Feb 2022 19:14:20 +1100
Subject: [PATCH] Add option for display of "time" in addition to date

---
 InvenTree/templates/js/dynamic/calendar.js | 6 +++++-
 InvenTree/templates/js/translated/stock.js | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/InvenTree/templates/js/dynamic/calendar.js b/InvenTree/templates/js/dynamic/calendar.js
index c730446bfb..0b0ccc2915 100644
--- a/InvenTree/templates/js/dynamic/calendar.js
+++ b/InvenTree/templates/js/dynamic/calendar.js
@@ -42,7 +42,7 @@ function clearEvents(calendar) {
  * The user-configured setting DATE_DISPLAY_FORMAT determines how the date should be displayed.
  */
 
-function renderDate(date) {
+function renderDate(date, options={}) {
 
     if (!date) {
         return null;
@@ -50,6 +50,10 @@ function renderDate(date) {
 
     var fmt = user_settings.DATE_DISPLAY_FORMAT || 'YYYY-MM-DD';
 
+    if (options.showTime) {
+        fmt += ' HH:mm';
+    }
+
     var m = moment(date);
 
     if (m.isValid()) {
diff --git a/InvenTree/templates/js/translated/stock.js b/InvenTree/templates/js/translated/stock.js
index 327dd0ab71..cf2538c1e5 100644
--- a/InvenTree/templates/js/translated/stock.js
+++ b/InvenTree/templates/js/translated/stock.js
@@ -2658,7 +2658,7 @@ function loadStockTrackingTable(table, options) {
         title: '{% trans "Date" %}',
         sortable: true,
         formatter: function(value) {
-            return renderDate(value);
+            return renderDate(value, {showTime: true});
         }
     });