Skip to content

Colors theme: fix year graph #1645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benderl merged 1 commit into from
May 31, 2024
Merged

Colors theme: fix year graph #1645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 32 additions & 13 deletions ...s/modules/web_themes/colors/source/src/components/powerGraph/processMonthYearGraphData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,24 @@ import {
calculateMonthlyAutarchy,
} from './model'
import { historicSummary, resetHistoricSummary } from '@/assets/js/model'
import { itemNames } from './model'

let columnValues: { [key: string]: number } = {}
const consumerCategories = ['charging', 'house', 'batIn', 'devices']
const nonPvCategories = ['evuIn', 'pv', 'batIn', 'evuOut']
const nonPvCategories = ['evuIn', 'pv', 'batOut', 'evuOut']
let gridCounters: string[] = []

// methods:
// Process a new message with monthly graph data. A single message contains all data
export function processMonthGraphMessages(topic: string, message: string) {
const inputTable: RawDayGraphDataItem[] = JSON.parse(message).entries
const energyValues: RawDayGraphDataItem = JSON.parse(message).totals
//const inputTable: RawDayGraphDataItem[] = JSON.parse(message).entries
//const energyValues: RawDayGraphDataItem = JSON.parse(message).totals
const {
entries: inputTable,
names: itemNames2,
totals: energyValues,
} = JSON.parse(message)
itemNames.value = new Map(Object.entries(itemNames2))
resetHistoricSummary()
gridCounters = []
consumerCategories.forEach((cat) => {
Expand All @@ -33,15 +40,23 @@ export function processMonthGraphMessages(topic: string, message: string) {
// reloadMonthGraph(topic, message)
}
export function processYearGraphMessages(topic: string, message: string) {
const inputTable: RawDayGraphDataItem[] = JSON.parse(message).entries
const energyValues: RawDayGraphDataItem = JSON.parse(message).totals
//const inputTable: RawDayGraphDataItem[] = JSON.parse(message).entries
//const energyValues: RawDayGraphDataItem = JSON.parse(message).totals
const {
entries: inputTable,
names: itemNames2,
totals: energyValues,
} = JSON.parse(message)
itemNames.value = new Map(Object.entries(itemNames2))
resetHistoricSummary()
gridCounters = []
consumerCategories.forEach((cat) => {
historicSummary.items[cat].energyPv = 0
historicSummary.items[cat].energyBat = 0
})
setGraphData(transformDatatable(inputTable))
if (inputTable.length > 0) {
setGraphData(transformDatatable(inputTable))
}
updateEnergyValues(energyValues, gridCounters)
}
// transform the incoming format into the format used by the graph
Expand Down Expand Up @@ -158,13 +173,17 @@ function transformRow(inputRow: RawDayGraphDataItem): GraphDataItem {
0,
)
// House
outputRow.house =
outputRow.pv +
outputRow.evuIn +
outputRow.batOut -
outputRow.evuOut -
outputRow.batIn -
outputRow.charging
if (inputRow.hc && inputRow.hc.all) {
outputRow.house = inputRow.hc.all.energy_imported // (seems this is now centrally computed) - currentItem.devices
} else {
outputRow.house =
outputRow.pv +
outputRow.evuIn +
outputRow.batOut -
outputRow.evuOut -
outputRow.batIn -
outputRow.charging
}
// Self usage
outputRow.selfUsage = outputRow.pv - outputRow.evuOut
// Autarchy
Expand Down
6 changes: 3 additions & 3 deletions ...hemes/colors/web/assets/index-64509b9e.js → ...hemes/colors/web/assets/index-cfda3130.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/modules/web_themes/colors/web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<link rel="apple-touch-icon" sizes="57x57" href="/openWB/web/img/favicons/apple-touch-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="/openWB/web/img/favicons/apple-touch-icon-60x60.png">
<title>openWB</title>
<script type="module" crossorigin src="/openWB/web/themes/colors/assets/index-64509b9e.js"></script>
<script type="module" crossorigin src="/openWB/web/themes/colors/assets/index-cfda3130.js"></script>
<link rel="modulepreload" crossorigin href="/openWB/web/themes/colors/assets/vendor-978a58bb.js">
<link rel="stylesheet" href="/openWB/web/themes/colors/assets/index-a2141c90.css">
</head>
Expand Down