kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-09-16 09:51:30 +00:00
Code Issues Projects Releases Wiki Activity

Add userfields to battery charge cycle tracking (#2490)

Browse Source 
Co-authored-by: Manuel Worschech <mw@abot.xyz>
This commit is contained in:
TheDodger
2024-03-10 18:12:02 +01:00
committed by GitHub
parent e01e0f3abe
commit 477f333466
6 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
controllers/BatteriesController.php
View File

@@ -73,7 +73,9 @@ class BatteriesController extends BaseController
return $this->renderPage($response, 'batteriesjournal', [
'chargeCycles' => $this->getDatabase()->battery_charge_cycles()->where($where)->orderBy('tracked_time', 'DESC'),
'batteries' => $this->getDatabase()->batteries()->where('active = 1')->orderBy('name', 'COLLATE NOCASE')
'batteries' => $this->getDatabase()->batteries()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
'userfields' => $this->getUserfieldsService()->GetFields('battery_charge_cycles'),
'userfieldValues' => $this->getUserfieldsService()->GetAllValues('battery_charge_cycles')
]);
}
@@ -115,7 +117,8 @@ class BatteriesController extends BaseController
public function TrackChargeCycle(Request $request, Response $response, array $args)
{
return $this->renderPage($response, 'batterytracking', [
'batteries' => $this->getDatabase()->batteries()->where('active = 1')->orderBy('name', 'COLLATE NOCASE')
'batteries' => $this->getDatabase()->batteries()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
'userfields' => $this->getUserfieldsService()->GetFields('battery_charge_cycles')
]);
}