kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 17:45:39 +00:00
Code Issues Projects Releases Wiki Activity

Fixed DateTimePicker2 contextual time

Browse Source
This commit is contained in:
Bernd Bestel 2020-11-10 20:57:49 +01:00
parent 0c17666cef
commit 3831cb37b3
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/viewjs/components/datetimepicker2.js
View File

@ -42,7 +42,7 @@ Grocy.Components.DateTimePicker2.Clear = function()
$("#datetimepicker2-shortcut").click(); $("#datetimepicker2-shortcut").click();
} }
$('#datetimepicker-timeago').text(''); $('#datetimepicker2-timeago').text('');
} }
Grocy.Components.DateTimePicker2.ChangeFormat = function(format) Grocy.Components.DateTimePicker2.ChangeFormat = function(format)
@ -266,8 +266,8 @@ Grocy.Components.DateTimePicker2.GetInputElement().on('keyup', function(e)
Grocy.Components.DateTimePicker2.GetInputElement().on('input', function(e) Grocy.Components.DateTimePicker2.GetInputElement().on('input', function(e)
{ {
$('#datetimepicker-timeago').attr("datetime", Grocy.Components.DateTimePicker2.GetValue()); $('#datetimepicker2-timeago').attr("datetime", Grocy.Components.DateTimePicker2.GetValue());
EmptyElementWhenMatches('#datetimepicker-timeago', __t('timeago_nan')); EmptyElementWhenMatches('#datetimepicker2-timeago', __t('timeago_nan'));
RefreshContextualTimeago("#datetimepicker2-wrapper"); RefreshContextualTimeago("#datetimepicker2-wrapper");
}); });

15
public/viewjs/purchase.js
View File

@ -370,6 +370,21 @@ if (Grocy.Components.DateTimePicker)
}); });
} }
if (Grocy.Components.DateTimePicker2)
{
Grocy.Components.DateTimePicker2.GetInputElement().on('change', function(e)
{
Grocy.FrontendHelpers.ValidateForm('purchase-form');
});
Grocy.Components.DateTimePicker2.GetInputElement().on('keypress', function(e)
{
Grocy.FrontendHelpers.ValidateForm('purchase-form');
});
Grocy.Components.DateTimePicker2.GetInputElement().trigger("input");
}
$('#price').on('change', function(e) $('#price').on('change', function(e)
{ {
refreshPriceHint(); refreshPriceHint();