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

Fixed chore skip handling via /choresoverview (references #1830)

Browse Source
This commit is contained in:
Bernd Bestel 2022-03-23 18:22:50 +01:00
parent 5dc745f301
commit 9db66048d1
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
public/viewjs/choresoverview.js
View File

@ -94,13 +94,25 @@ $(document).on('click', '.track-chore-button', function(e)
var choreName = $(e.currentTarget).attr('data-chore-name'); var choreName = $(e.currentTarget).attr('data-chore-name');
var skipped = $(e.currentTarget).hasClass("skip"); var skipped = $(e.currentTarget).hasClass("skip");
Grocy.Api.Get('objects/chores/' + choreId, Grocy.Api.Get('chores/' + choreId,
function(chore) function(choreDetails)
{ {
var trackedTime = moment().format('YYYY-MM-DD HH:mm:ss'); 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 }, Grocy.Api.Post('chores/' + choreId + '/execute', { 'tracked_time': trackedTime, 'skipped': skipped },