Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add option for display of "time" in addition to date

Browse Source
This commit is contained in:
Oliver 2022-02-28 19:14:20 +11:00
parent b00ae67d68
commit fd02f1b761
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
InvenTree/templates/js/dynamic/calendar.js
View File

@ -42,7 +42,7 @@ function clearEvents(calendar) {
* The user-configured setting DATE_DISPLAY_FORMAT determines how the date should be displayed. * The user-configured setting DATE_DISPLAY_FORMAT determines how the date should be displayed.
*/ */
function renderDate(date) { function renderDate(date, options={}) {
if (!date) { if (!date) {
return null; return null;
@ -50,6 +50,10 @@ function renderDate(date) {
var fmt = user_settings.DATE_DISPLAY_FORMAT || 'YYYY-MM-DD'; var fmt = user_settings.DATE_DISPLAY_FORMAT || 'YYYY-MM-DD';
if (options.showTime) {
fmt += ' HH:mm';
}
var m = moment(date); var m = moment(date);
if (m.isValid()) { if (m.isValid()) {

2
InvenTree/templates/js/translated/stock.js
View File

@ -2658,7 +2658,7 @@ function loadStockTrackingTable(table, options) {
title: '{% trans "Date" %}', title: '{% trans "Date" %}',
sortable: true, sortable: true,
formatter: function(value) { formatter: function(value) {
return renderDate(value); return renderDate(value, {showTime: true});
} }
}); });