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

Fix that "Track date only" cannot be tracked <> today (fixes #300)

Browse Source
This commit is contained in:
Bernd Bestel 2019-07-06 13:32:40 +02:00
parent 0c0e8c6957
commit 3fcede0b7c
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/ChoresApiController.php
View File

@ -21,7 +21,7 @@ class ChoresApiController extends BaseApiController
try try
{ {
$trackedTime = date('Y-m-d H:i:s'); $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']; $trackedTime = $requestBody['tracked_time'];
} }

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

@ -48,6 +48,15 @@ Grocy.Components.DateTimePicker.ChangeFormat = function(format)
$(".datetimepicker").datetimepicker("destroy"); $(".datetimepicker").datetimepicker("destroy");
Grocy.Components.DateTimePicker.GetInputElement().data("format", format); Grocy.Components.DateTimePicker.GetInputElement().data("format", format);
Grocy.Components.DateTimePicker.Init(); 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; var startDate = null;