kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 04:12:59 +00:00
Code Issues Projects Releases Wiki Activity

Optimized tracking button handling on /choresoverview (closes #2186)

Browse Source
This commit is contained in:
Bernd Bestel
2023-03-31 20:12:06 +02:00
parent 3d01854fa1
commit 98469248eb
5 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/viewjs/choresoverview.js
View File

@@ -93,19 +93,20 @@ $(document).on('click', '.track-chore-button', function(e)
var choreId = $(e.currentTarget).attr('data-chore-id');
var choreName = $(e.currentTarget).attr('data-chore-name');
var skipped = $(e.currentTarget).hasClass("skip");
var now = $(e.currentTarget).hasClass("now");
Grocy.Api.Get('chores/' + choreId,
function(choreDetails)
{
var trackedTime = moment().format('YYYY-MM-DD HH:mm:ss');
if (skipped)
if ((skipped || !now) && choreDetails.next_estimated_execution_time != null)
{
trackedTime = moment(choreDetails.next_estimated_execution_time).format('YYYY-MM-DD HH:mm:ss');
}
if (choreDetails.chore.track_date_only == 1)
{
if (skipped)
if ((skipped || !now) && choreDetails.next_estimated_execution_time != null)
{
trackedTime = moment(choreDetails.next_estimated_execution_time).format('YYYY-MM-DD');
}