Skip to content

Commit 246f3c2

Browse files
authored
Merge pull request #640 from benderl/status-fixes
Status fixes
2 parents 8bcb8a1 + cc75d31 commit 246f3c2

File tree

4 files changed

+19
-14
lines changed

4 files changed

+19
-14
lines changed

src/components/status/ElectricityTariffCard.vue

+4-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ export default {
201201
price: value * 100000,
202202
});
203203
}
204-
// repeat last dataset with 59min 95sec offset
204+
// repeat last dataset with 59min 59sec offset
205205
const lastData = myData.slice(-1)[0];
206206
myData.push({
207207
timestamp: lastData.timestamp + (60 * 60 - 1) * 1000,
@@ -213,6 +213,9 @@ export default {
213213
return dataObject;
214214
},
215215
currentPrice() {
216+
if (this.chartDataObject.datasets[0].data === undefined || this.chartDataObject.datasets[0].data.length === 0) {
217+
return this.formatNumber(0, 2);
218+
}
216219
return this.formatNumber(this.chartDataObject.datasets[0].data[0].price || 0, 2);
217220
},
218221
baseTopic: {

src/components/status/StatusCard.vue

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<slot name="header-right"></slot>
1414
</div>
1515
<font-awesome-icon
16+
:class="state === 0 ? `text-${subtype}` : ''"
1617
class="ml-1"
1718
fixed-width
1819
:icon="stateIcon"

src/views/GeneralConfig.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,7 @@ export default {
841841
{ label: "openWB", options: [] },
842842
{ label: "Community", options: [] },
843843
];
844-
this.webThemeList.forEach((theme) => {
844+
this.webThemeList?.forEach((theme) => {
845845
if (theme.official === true) {
846846
groups[0].options.push(theme);
847847
} else {

src/views/Status.vue

+13-12
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,6 @@ export default {
7979
return {
8080
mqttTopicsToSubscribe: [
8181
"openWB/general/extern",
82-
// charge points total
83-
"openWB/chargepoint/get/power",
84-
"openWB/chargepoint/get/imported",
85-
"openWB/chargepoint/get/exported",
86-
"openWB/chargepoint/get/daily_imported",
87-
"openWB/chargepoint/get/daily_exported",
88-
// individual charge points
89-
"openWB/chargepoint/+/config",
90-
"openWB/chargepoint/+/get/+",
91-
"openWB/chargepoint/+/get/connected_vehicle/info",
92-
"openWB/chargepoint/+/set/+",
93-
"openWB/internal_chargepoint/+/data/phases_to_use",
9482
// components
9583
"openWB/system/device/+/component/+/config",
9684
// counter
@@ -104,6 +92,19 @@ export default {
10492
// vehicles
10593
"openWB/vehicle/+/name",
10694
"openWB/vehicle/+/get/+",
95+
// charge points total
96+
"openWB/chargepoint/get/power",
97+
"openWB/chargepoint/get/imported",
98+
"openWB/chargepoint/get/exported",
99+
"openWB/chargepoint/get/daily_imported",
100+
"openWB/chargepoint/get/daily_exported",
101+
// individual charge points
102+
// these topics must be subscribed at last to avoid a buffer overflow
103+
"openWB/chargepoint/+/config",
104+
"openWB/chargepoint/+/get/+",
105+
"openWB/chargepoint/+/get/connected_vehicle/info",
106+
"openWB/chargepoint/+/set/+",
107+
"openWB/internal_chargepoint/+/data/phases_to_use",
107108
],
108109
};
109110
},

0 commit comments

Comments
 (0)