kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 12:20:22 +00:00
Code Issues Projects Releases Wiki Activity

Return the battery object in endpoint /batteries (closes #2045)

Browse Source
This commit is contained in:
Bernd Bestel
2022-11-19 19:33:50 +01:00
parent eb370dad1e
commit 7d4a9602ab
2 changed files with 63 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/BatteriesService.php
View File

@@ -26,7 +26,14 @@ class BatteriesService extends BaseService
public function GetCurrent()
{
return $this->getDatabase()->batteries_current();
$batteries = $this->getDatabase()->batteries()->where('active = 1')->orderBy('name', 'COLLATE NOCASE');
$currentBatteries = $this->getDatabase()->batteries_current();
foreach ($currentBatteries as $currentBattery)
{
$currentBattery->battery = FindObjectInArrayByPropertyValue($batteries, 'id', $currentBattery->battery_id);
}
return $currentBatteries;
}
public function TrackChargeCycle(int $batteryId, string $trackedTime)