github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-09 05:56:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Recalculate chore assignments when undoing an execution (fixes #2278)

Browse Source
This commit is contained in:
Bernd Bestel 2023-07-29 13:49:14 +02:00
parent 78e4e918c6
commit f6d6e933e3
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/70_UNRELEASED_xxxx.xx.xx.md
View File

@ -71,6 +71,7 @@
- The green button now tracks an execution of the corresponding chore on the next scheduled time, rather than for now/today - The green button now tracks an execution of the corresponding chore on the next scheduled time, rather than for now/today
- New context-/more menu option "Track chore execution now" to track an execution for now/today (so the same what the green button did before) - New context-/more menu option "Track chore execution now" to track an execution for now/today (so the same what the green button did before)
- Removed the limitation on the chore tracking page that the tracked time couldn't be in the future - Removed the limitation on the chore tracking page that the tracked time couldn't be in the future
- Fixed that "assidgned to" was not recalculated when undoing chores
### Calendar ### Calendar

2
services/ChoresService.php
View File

@ -243,6 +243,8 @@ class ChoresService extends BaseService
'undone' => 1, 'undone' => 1,
'undone_timestamp' => date('Y-m-d H:i:s') 'undone_timestamp' => date('Y-m-d H:i:s')
]); ]);
$this->CalculateNextExecutionAssignment($logRow->chore_id);
} }
public function MergeChores(int $choreIdToKeep, int $choreIdToRemove) public function MergeChores(int $choreIdToKeep, int $choreIdToRemove)