diff --git a/webapp/src/components/InverterTotalInfo.vue b/webapp/src/components/InverterTotalInfo.vue index 5952c24cd..678312d54 100644 --- a/webapp/src/components/InverterTotalInfo.vue +++ b/webapp/src/components/InverterTotalInfo.vue @@ -1,57 +1,123 @@ \ No newline at end of file diff --git a/webapp/src/locales/de.json b/webapp/src/locales/de.json index 9377c087e..b8b72b768 100644 --- a/webapp/src/locales/de.json +++ b/webapp/src/locales/de.json @@ -325,9 +325,13 @@ "Unit": "Einheit" }, "invertertotalinfo": { - "TotalYieldTotal": "Gesamtertrag Insgesamt", - "TotalYieldDay": "Gesamtertrag Heute", - "TotalPower": "Gesamtleistung" + "InverterTotalYieldTotal": "Inverter Gesamtertrag Insgesamt", + "InverterTotalYieldDay": "Inverter Gesamtertrag Heute", + "InverterTotalPower": "Inverter Gesamtleistung", + "MpptTotalYieldTotal": "MPPT Gesamtertrag Insgesamt", + "MpptTotalYieldDay": "MPPT Gesamtertrag Heute", + "MpptTotalPower": "MPPT Gesamtleistung", + "BatterySoc": "Ladezustand" }, "inverterchannelproperty": { "Power": "Leistung", diff --git a/webapp/src/locales/en.json b/webapp/src/locales/en.json index 4f3edef9f..eb711ff20 100644 --- a/webapp/src/locales/en.json +++ b/webapp/src/locales/en.json @@ -325,9 +325,13 @@ "Unit": "Unit" }, "invertertotalinfo": { - "TotalYieldTotal": "Total Yield Total", - "TotalYieldDay": "Total Yield Day", - "TotalPower": "Total Power" + "InverterTotalYieldTotal": "Inverter Total Yield Total", + "InverterTotalYieldDay": "Inverter Total Yield Day", + "InverterTotalPower": "Inverter Total Power", + "MpptTotalYieldTotal": "MPPT Total Yield Total", + "MpptTotalYieldDay": "MPPT Total Yield Day", + "MpptTotalPower": "MPPT Total Power", + "BatterySoc": "State of charge" }, "inverterchannelproperty": { "Power": "Power", diff --git a/webapp/src/locales/fr.json b/webapp/src/locales/fr.json index b69ab2cc1..ee91327c4 100644 --- a/webapp/src/locales/fr.json +++ b/webapp/src/locales/fr.json @@ -324,9 +324,13 @@ "Unit": "Unité" }, "invertertotalinfo": { - "TotalYieldTotal": "Rendement total", - "TotalYieldDay": "Rendement du jour", - "TotalPower": "Puissance de l'installation" + "InverterTotalYieldTotal": "Onduleurs rendement total", + "InverterTotalYieldDay": "Onduleurs rendement du jour", + "InverterTotalPower": "Onduleurs puissance de l'installation", + "MpptTotalYieldTotal": "MPPT rendement total", + "MpptTotalYieldDay": "MPPT rendement du jour", + "MpptTotalPower": "MPPT puissance de l'installation", + "BatterySoc": "State of charge" }, "inverterchannelproperty": { "Power": "Puissance", diff --git a/webapp/src/types/LiveDataStatus.ts b/webapp/src/types/LiveDataStatus.ts index 9501b34b4..d2bff5078 100644 --- a/webapp/src/types/LiveDataStatus.ts +++ b/webapp/src/types/LiveDataStatus.ts @@ -48,6 +48,7 @@ export interface Hints { export interface Vedirect { enabled: boolean; + total: Total; } export interface Huawei { @@ -56,6 +57,7 @@ export interface Huawei { export interface Battery { enabled: boolean; + soc: ValueObject; } export interface LiveData { diff --git a/webapp/src/views/HomeView.vue b/webapp/src/views/HomeView.vue index 28546f0be..a1ca47101 100644 --- a/webapp/src/views/HomeView.vue +++ b/webapp/src/views/HomeView.vue @@ -1,7 +1,7 @@