From f98da128311af45dae9c5df328c648f8eb0b7d37 Mon Sep 17 00:00:00 2001 From: andig Date: Wed, 9 Dec 2020 12:15:57 +0100 Subject: [PATCH] Fix battery soc not displayed --- assets/js/app.js | 2 + assets/js/components/LoadpointDetails.vue | 6 +- assets/js/components/MessageToast.vue | 4 +- assets/js/components/SiteDetails.vue | 23 +- assets/js/components/Version.vue | 6 +- server/assets.go | 14521 ++++++++++---------- 6 files changed, 7283 insertions(+), 7279 deletions(-) diff --git a/assets/js/app.js b/assets/js/app.js index 53fdb6454..1ec710644 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -6,6 +6,7 @@ import { library } from "@fortawesome/fontawesome-svg-core"; import { faSun } from "@fortawesome/free-solid-svg-icons/faSun"; import { faArrowUp } from "@fortawesome/free-solid-svg-icons/faArrowUp"; import { faArrowDown } from "@fortawesome/free-solid-svg-icons/faArrowDown"; +import { faBatteryThreeQuarters } from "@fortawesome/free-solid-svg-icons/faBatteryThreeQuarters"; import { faTemperatureLow } from "@fortawesome/free-solid-svg-icons/faTemperatureLow"; import { faTemperatureHigh } from "@fortawesome/free-solid-svg-icons/faTemperatureHigh"; import { faThermometerHalf } from "@fortawesome/free-solid-svg-icons/faThermometerHalf"; @@ -23,6 +24,7 @@ library.add( faSun, faArrowUp, faArrowDown, + faBatteryThreeQuarters, faTemperatureLow, faTemperatureHigh, faThermometerHalf, diff --git a/assets/js/components/LoadpointDetails.vue b/assets/js/components/LoadpointDetails.vue index d75dbfa1d..d464ec172 100644 --- a/assets/js/components/LoadpointDetails.vue +++ b/assets/js/components/LoadpointDetails.vue @@ -7,17 +7,17 @@ class="text-primary ml-1" icon="temperature-low" v-if="state.climater == 'heating'" - /> + > + > + >

{{ fmt(state.chargePower) }} diff --git a/assets/js/components/MessageToast.vue b/assets/js/components/MessageToast.vue index 6c59e07d5..56626a301 100644 --- a/assets/js/components/MessageToast.vue +++ b/assets/js/components/MessageToast.vue @@ -2,10 +2,10 @@
Error Error + > Warning HTTP {{ item.status }} diff --git a/assets/js/components/SiteDetails.vue b/assets/js/components/SiteDetails.vue index a14933987..a5adc40f9 100644 --- a/assets/js/components/SiteDetails.vue +++ b/assets/js/components/SiteDetails.vue @@ -2,10 +2,10 @@
- Bezug + Bezug
- Einspeisung + Einspeisung

{{ fmt(state.gridPower) }} @@ -21,49 +21,44 @@ 'text-primary': state.pvPower < 0, 'text-muted': state.pvPower >= 0, }" - /> + >

{{ fmt(state.pvPower) }} {{ fmtUnit(state.pvPower) }}W

-
+
Batterie + > + >

{{ fmt(state.batteryPower) }} {{ fmtUnit(state.batteryPower) }}W

-
+
SoC + >
-

{{ state.batterySoC }} %

+

{{ state.batterySoC || 0 }} %

diff --git a/assets/js/components/Version.vue b/assets/js/components/Version.vue index 014e167f2..fd336a36d 100644 --- a/assets/js/components/Version.vue +++ b/assets/js/components/Version.vue @@ -12,8 +12,8 @@ > Release notes - - + + @@ -23,7 +23,7 @@ " class="text-body" > - Download + Download