github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-05 04:16:16 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add N {unit} expression to due date field

Browse Source 
Uses the moments unit parsing logic to support "N {unit}" expressions in the field

Examples:

1 year

30 days

5 m

5 months

See:
https://momentjs.com/docs/#/utilities/normalize-units/

Also fixes bug where any four characters would trigger MMDD case.
This commit is contained in:
Ryan Schaefer 2025-09-13 16:19:40 -04:00
parent 7de98db143
commit 805b3bb283
No known key found for this signature in database
GPG Key ID: 915C8ABF9C244E66
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/viewjs/components/datetimepicker.js
View File

@ -1,3 +1,4 @@
Grocy.Components.DateTimePicker = {}; Grocy.Components.DateTimePicker = {};
Grocy.Components.DateTimePicker.GetInputElement = function() Grocy.Components.DateTimePicker.GetInputElement = function()
@ -7,6 +8,7 @@ Grocy.Components.DateTimePicker.GetInputElement = function()
Grocy.Components.DateTimePicker.GetValue = function() Grocy.Components.DateTimePicker.GetValue = function()
{ {
return Grocy.Components.DateTimePicker.GetInputElement().val(); return Grocy.Components.DateTimePicker.GetInputElement().val();
} }
@ -138,19 +140,25 @@ Grocy.Components.DateTimePicker.GetInputElement().on('keyup', function(e)
var centuryEnd = Number.parseInt(now.getFullYear().toString().substring(0, 2) + '99'); var centuryEnd = Number.parseInt(now.getFullYear().toString().substring(0, 2) + '99');
var format = inputElement.data('format'); var format = inputElement.data('format');
var nextInputElement = $(inputElement.data('next-input-selector')); var nextInputElement = $(inputElement.data('next-input-selector'));
// If input is empty and any arrow key is pressed, set date to today // If input is empty and any arrow key is pressed, set date to today
if (value.length === 0 && (e.keyCode === 38 || e.keyCode === 40 || e.keyCode === 37 || e.keyCode === 39)) if (value.length === 0 && (e.keyCode === 38 || e.keyCode === 40 || e.keyCode === 37 || e.keyCode === 39))
{ {
Grocy.Components.DateTimePicker.SetValue(moment(new Date(), format, true).format(format), inputElement); Grocy.Components.DateTimePicker.SetValue(moment(new Date(), format, true).format(format), inputElement);
nextInputElement.focus(); nextInputElement.focus();
} }
else if (value.split(" ").length == 3 && !isNaN(parseInt(value.split(" ")[0])) && moment.normalizeUnits(value.split(" ")[1]) != undefined)
{
let parts = value.split(" ")
let n = parseInt(parts[0]);
let unit = moment.normalizeUnits(parts[1]);
Grocy.Components.DateTimePicker.SetValue(moment().add(n, unit).format(format));
}
else if (value === 'x' || value === 'X') // Shorthand for never overdue else if (value === 'x' || value === 'X') // Shorthand for never overdue
{ {
Grocy.Components.DateTimePicker.SetValue(moment('2999-12-31 23:59:59').format(format), inputElement); Grocy.Components.DateTimePicker.SetValue(moment('2999-12-31 23:59:59').format(format), inputElement);
nextInputElement.focus(); nextInputElement.focus();
} }
else if (value.length === 4 && !(Number.parseInt(value) > centuryStart && Number.parseInt(value) < centuryEnd)) // Shorthand for MMDD else if (/[0-9]{4}/.test(value) && !(Number.parseInt(value) > centuryStart && Number.parseInt(value) < centuryEnd)) // Shorthand for MMDD
{ {
var date = moment((new Date()).getFullYear().toString() + value); var date = moment((new Date()).getFullYear().toString() + value);
if (date.isBefore(moment())) if (date.isBefore(moment()))