ETM-Schurig
/
nymea-app
mirror of https://github.com/nymea/nymea-app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix energy return in chart when there are no producers

pull/949/head
Michael Zanetti 2023-01-14 00:05:36 +01:00
parent 6ed42e12b7
commit 1fe1ab426c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nymea-app/ui/mainviews/energy/PowerBalanceHistory.qml
View File

@ -335,7 +335,7 @@ Item {
function calculateValue(entry) {
return Math.max(0, -entry.production) - Math.max(0, -entry.acquisition) - Math.max(0, entry.storage)
return Math.max(0, Math.max(0, -entry.production) - Math.max(0, -entry.acquisition) - Math.max(0, entry.storage))
}
function addEntry(entry) {
@ -354,7 +354,7 @@ Item {
borderWidth: 0
borderColor: color
opacity: d.selectedSeries == null || d.selectedSeries == toStorageSeries ? 1 : 0.3
visible: root.batteries.count > 0
// visible: root.batteries.count > 0
name: qsTr("To battery")
onClicked: d.selectSeries(toStorageSeries)
@ -393,9 +393,11 @@ Item {
return toStorageSeries.calculateValue(entry) + Math.max(0, -entry.acquisition)
}
function addEntry(entry) {
print("Adding return entry:", calculateValue(entry))
returnUpperSeries.append(entry.timestamp.getTime(), calculateValue(entry))
}
function insertEntry(index, entry) {
print("Adding return entry:", entry.acquisition, Math.max(0, -entry.acquisition), toStorageSeries.calculateValue(entry), calculateValue(entry))
returnUpperSeries.insert(index, entry.timestamp.getTime(), calculateValue(entry))
}