From 9db66048d1f1aa5d4165c41e4c5011d18b281fa0 Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Wed, 23 Mar 2022 18:22:50 +0100 Subject: [PATCH] Fixed chore skip handling via /choresoverview (references #1830) --- public/viewjs/choresoverview.js | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/public/viewjs/choresoverview.js b/public/viewjs/choresoverview.js index a8ec4740..d9dd783c 100644 --- a/public/viewjs/choresoverview.js +++ b/public/viewjs/choresoverview.js @@ -94,13 +94,25 @@ $(document).on('click', '.track-chore-button', function(e) var choreName = $(e.currentTarget).attr('data-chore-name'); var skipped = $(e.currentTarget).hasClass("skip"); - Grocy.Api.Get('objects/chores/' + choreId, - function(chore) + Grocy.Api.Get('chores/' + choreId, + function(choreDetails) { var trackedTime = moment().format('YYYY-MM-DD HH:mm:ss'); - if (chore.track_date_only == 1) + if (skipped) { - trackedTime = moment().format('YYYY-MM-DD'); + trackedTime = moment(choreDetails.next_estimated_execution_time).format('YYYY-MM-DD HH:mm:ss'); + } + + if (choreDetails.chore.track_date_only == 1) + { + if (skipped) + { + trackedTime = moment(choreDetails.next_estimated_execution_time).format('YYYY-MM-DD'); + } + else + { + trackedTime = moment().format('YYYY-MM-DD'); + } } Grocy.Api.Post('chores/' + choreId + '/execute', { 'tracked_time': trackedTime, 'skipped': skipped },