From 3fcede0b7c58c2b09d553d15ab39eb7c35ca2757 Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Sat, 6 Jul 2019 13:32:40 +0200 Subject: [PATCH] Fix that "Track date only" cannot be tracked <> today (fixes #300) --- controllers/ChoresApiController.php | 2 +- public/viewjs/components/datetimepicker.js | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/controllers/ChoresApiController.php b/controllers/ChoresApiController.php index 9805a107..7b4c28bc 100644 --- a/controllers/ChoresApiController.php +++ b/controllers/ChoresApiController.php @@ -21,7 +21,7 @@ class ChoresApiController extends BaseApiController try { $trackedTime = date('Y-m-d H:i:s'); - if (array_key_exists('tracked_time', $requestBody) && IsIsoDateTime($requestBody['tracked_time'])) + if (array_key_exists('tracked_time', $requestBody) && (IsIsoDateTime($requestBody['tracked_time']) || IsIsoDate($requestBody['tracked_time']))) { $trackedTime = $requestBody['tracked_time']; } diff --git a/public/viewjs/components/datetimepicker.js b/public/viewjs/components/datetimepicker.js index c6fc63a6..6b220478 100644 --- a/public/viewjs/components/datetimepicker.js +++ b/public/viewjs/components/datetimepicker.js @@ -48,6 +48,15 @@ Grocy.Components.DateTimePicker.ChangeFormat = function(format) $(".datetimepicker").datetimepicker("destroy"); Grocy.Components.DateTimePicker.GetInputElement().data("format", format); Grocy.Components.DateTimePicker.Init(); + + if (format == "YYYY-MM-DD") + { + Grocy.Components.DateTimePicker.GetInputElement().addClass("date-only-datetimepicker"); + } + else + { + Grocy.Components.DateTimePicker.GetInputElement().removeClass("date-only-datetimepicker"); + } } var startDate = null;