diff --git a/public/js/grocy.js b/public/js/grocy.js index 60e0c1de..03fd0bc3 100644 --- a/public/js/grocy.js +++ b/public/js/grocy.js @@ -301,7 +301,7 @@ RefreshContextualTimeago = function() var timestamp = element.attr("datetime"); var isNever = timestamp && timestamp.substring(0, 10) == "2999-12-31"; - var isToday = timestamp && timestamp.length == 10 && timestamp.substring(0, 10) == moment().format("YYYY-MM-DD"); + var isToday = timestamp && timestamp.substring(0, 10) == moment().format("YYYY-MM-DD"); var isDateWithoutTime = element.hasClass("timeago-date-only"); if (isNever) diff --git a/public/viewjs/choresoverview.js b/public/viewjs/choresoverview.js index eabcdcb5..e86fe10f 100644 --- a/public/viewjs/choresoverview.js +++ b/public/viewjs/choresoverview.js @@ -116,8 +116,13 @@ $(document).on('click', '.track-chore-button', function(e) Grocy.FrontendHelpers.EndUiBusy(); toastr.success(__t('Tracked execution of chore %1$s on %2$s', choreName, trackedTime)); - RefreshContextualTimeago(); RefreshStatistics(); + + // Delay due to delayed/animated set of new timestamps above + setTimeout(function() + { + RefreshContextualTimeago(); + }, 550); }, function(xhr) { diff --git a/public/viewjs/components/chorecard.js b/public/viewjs/components/chorecard.js index 90322ff8..f182d3c3 100644 --- a/public/viewjs/components/chorecard.js +++ b/public/viewjs/components/chorecard.js @@ -14,6 +14,15 @@ Grocy.Components.ChoreCard.Refresh = function(choreId) $('#chorecard-chore-edit-button').attr("href", U("/chore/" + choreDetails.chore.id.toString())); $('#chorecard-chore-edit-button').removeClass("disabled"); + if (choreDetails.chore.track_date_only == 1) + { + $("#chorecard-chore-last-tracked-timeago").addClass("timeago-date-only"); + } + else + { + $("#chorecard-chore-last-tracked-timeago").removeClass("timeago-date-only"); + } + EmptyElementWhenMatches('#chorecard-chore-last-tracked-timeago', __t('timeago_nan')); RefreshContextualTimeago(); },