kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-17 11:06:36 +00:00
Code Issues Projects Releases Wiki Activity

Make it possible to track any information on chore execution (by using Userfields, closes #825)

Browse Source
This commit is contained in:
Bernd Bestel
2021-07-11 19:44:06 +02:00
parent 27b46e1abf
commit 198216f38b
7 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
controllers/ChoresController.php
View File

@@ -62,7 +62,9 @@ class ChoresController extends BaseController
return $this->renderPage($response, 'choresjournal', [
'choresLog' => $this->getDatabase()->chores_log()->orderBy('tracked_time', 'DESC'),
'chores' => $this->getDatabase()->chores()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
'users' => $this->getDatabase()->users()->orderBy('username')
'users' => $this->getDatabase()->users()->orderBy('username'),
'userfields' => $this->getUserfieldsService()->GetFields('chores_log'),
'userfieldValues' => $this->getUserfieldsService()->GetAllValues('chores_log')
]);
}
@@ -85,7 +87,8 @@ class ChoresController extends BaseController
{
return $this->renderPage($response, 'choretracking', [
'chores' => $this->getDatabase()->chores()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
'users' => $this->getDatabase()->users()->orderBy('username')
'users' => $this->getDatabase()->users()->orderBy('username'),
'userfields' => $this->getUserfieldsService()->GetFields('chores_log'),
]);
}