diff --git a/assets/js/components/Loadpoint.stories.js b/assets/js/components/Loadpoint.stories.js
index e54cccf45..1158bb6dc 100644
--- a/assets/js/components/Loadpoint.stories.js
+++ b/assets/js/components/Loadpoint.stories.js
@@ -30,7 +30,7 @@ Base.args = {
enabled: true,
connected: true,
charging: true,
- vehicleSoc: 66,
+ vehicleSoC: 66,
targetSoC: 90,
};
@@ -45,6 +45,6 @@ Disabled.args = {
enabled: true,
connected: true,
charging: false,
- vehicleSoc: 66,
+ vehicleSoC: 66,
targetSoC: 100,
};
diff --git a/assets/js/components/Loadpoint.vue b/assets/js/components/Loadpoint.vue
index ea60e7070..c4e3d886c 100644
--- a/assets/js/components/Loadpoint.vue
+++ b/assets/js/components/Loadpoint.vue
@@ -52,6 +52,8 @@ export default {
enabled: Boolean,
vehicleTitle: String,
vehicleSoC: Number,
+ vehiclePresent: Boolean,
+ vehicleRange: Number,
minSoC: Number,
timerSet: Boolean,
timerActive: Boolean,
@@ -61,9 +63,7 @@ export default {
chargePower: Number,
chargedEnergy: Number,
// chargeDuration: Number,
- vehiclePresent: Boolean,
climater: String,
- range: Number,
chargeRemainingDuration: Number,
// other information
diff --git a/assets/js/components/LoadpointDetails.stories.js b/assets/js/components/LoadpointDetails.stories.js
index 5396ec845..2ec8d4c9d 100644
--- a/assets/js/components/LoadpointDetails.stories.js
+++ b/assets/js/components/LoadpointDetails.stories.js
@@ -41,7 +41,7 @@ VehicleRange.args = {
chargedEnergy: 11e3,
chargeDuration: 95 * 60,
vehiclePresent: true,
- range: 240.123,
+ vehicleRange: 240.123,
chargeRemainingDuration: 5 * 3600,
};
@@ -51,7 +51,7 @@ VehicleClimater.args = {
chargedEnergy: 11e3,
chargeDuration: 95 * 60,
vehiclePresent: true,
- range: 240.123,
+ vehicleRange: 240.123,
chargeRemainingDuration: 5 * 3600,
climater: "on",
};
@@ -62,7 +62,7 @@ VehicleTimer.args = {
chargedEnergy: 11e3,
chargeDuration: 95 * 60,
vehiclePresent: true,
- range: 240.123,
+ vehicleRange: 240.123,
chargeRemainingDuration: 5 * 3600,
timerSet: true,
timerActive: true,
diff --git a/assets/js/components/LoadpointDetails.vue b/assets/js/components/LoadpointDetails.vue
index 60061fab2..385283962 100644
--- a/assets/js/components/LoadpointDetails.vue
+++ b/assets/js/components/LoadpointDetails.vue
@@ -34,10 +34,10 @@
-
-
{{ $t("main.loadpointDetails.range") }}
+
+
{{ $t("main.loadpointDetails.vehicleRange") }}
- {{ Math.round(range) }}
+ {{ Math.round(vehicleRange) }}
km
@@ -76,7 +76,7 @@ export default {
chargePower: Number,
climater: String,
vehiclePresent: Boolean,
- range: Number,
+ vehicleRange: Number,
},
mixins: [formatter],
};
diff --git a/assets/js/components/Site.stories.js b/assets/js/components/Site.stories.js
index b6304485f..f1e8fa8e3 100644
--- a/assets/js/components/Site.stories.js
+++ b/assets/js/components/Site.stories.js
@@ -44,9 +44,9 @@ Single.args = {
connected: true,
vehiclePresent: true,
charging: true,
- vehicleSoc: 66,
+ vehicleSoC: 66,
+ vehicleRange: 344,
targetSoC: 90,
- range: 344,
chargeRemainingDuration: 999,
chargePower: 11232,
chargeDuration: 123982,
@@ -73,9 +73,9 @@ Multi.args = {
connected: true,
vehiclePresent: true,
charging: true,
- vehicleSoc: 66,
+ vehicleSoC: 66,
+ vehicleRange: 344,
targetSoC: 90,
- range: 344,
chargeRemainingDuration: 999,
chargePower: 11232,
chargeDuration: 123982,
@@ -84,18 +84,19 @@ Multi.args = {
{
title: "Ladepunkt 2",
mode: "pv",
+ vehicleTitle: "Mein anderes Auto",
},
{
title: "Ladepunkt 3",
mode: "now",
- socTitle: "Mein anderes Auto",
+ vehicleTitle: "Mein drittes Auto",
enabled: true,
connected: true,
hasVehicle: true,
charging: true,
- socCharge: 22,
+ vehicleSoC: 22,
+ vehicleRange: 34,
targetSoC: 100,
- range: 34,
chargeRemainingDuration: 22,
chargePower: 1423,
chargeDuration: 243,
diff --git a/assets/js/components/Vehicle.stories.js b/assets/js/components/Vehicle.stories.js
index 1937e118d..8a02163d8 100644
--- a/assets/js/components/Vehicle.stories.js
+++ b/assets/js/components/Vehicle.stories.js
@@ -20,7 +20,7 @@ Base.args = {
enabled: true,
connected: true,
vehiclePresent: true,
- vehicleSoc: 42,
+ vehicleSoC: 42,
targetSoC: 90,
id: 0,
};
@@ -32,7 +32,7 @@ Connected.args = {
connected: true,
vehiclePresent: true,
charging: false,
- vehicleSoc: 66,
+ vehicleSoC: 66,
targetSoC: 90,
id: 0,
};
@@ -44,7 +44,7 @@ ReadyToCharge.args = {
connected: true,
vehiclePresent: true,
charging: false,
- vehicleSoc: 66,
+ vehicleSoC: 66,
targetSoC: 90,
id: 0,
};
@@ -56,7 +56,7 @@ Charging.args = {
connected: true,
vehiclePresent: true,
charging: true,
- vehicleSoc: 66,
+ vehicleSoC: 66,
targetSoC: 90,
id: 0,
};
@@ -73,7 +73,7 @@ TargetChargePlanned.args = {
enabled: false,
connected: true,
vehiclePresent: true,
- vehicleSoc: 31,
+ vehicleSoC: 31,
minSoC: 20,
charging: false,
timerSet: true,
@@ -89,7 +89,7 @@ TargetChargeActive.args = {
enabled: true,
connected: true,
vehiclePresent: true,
- vehicleSoc: 66,
+ vehicleSoC: 66,
minSoC: 30,
charging: true,
timerSet: true,
@@ -105,7 +105,7 @@ MinCharge.args = {
enabled: true,
connected: true,
vehiclePresent: true,
- vehicleSoc: 17,
+ vehicleSoC: 17,
minSoC: 20,
charging: true,
targetSoC: 90,
@@ -155,7 +155,7 @@ DisconnectedKnownSoc.args = {
connected: false,
enabled: false,
vehiclePresent: true,
- vehicleSoc: 17,
+ vehicleSoC: 17,
targetSoC: 60,
id: 0,
};
diff --git a/assets/js/i18n/de.js b/assets/js/i18n/de.js
index 3f6f7f8d3..8fbbe62d3 100644
--- a/assets/js/i18n/de.js
+++ b/assets/js/i18n/de.js
@@ -88,7 +88,7 @@ export default {
},
loadpointDetails: {
power: "Leistung",
- range: "Reichweite",
+ vehicleRange: "Reichweite",
charged: "Geladen",
duration: "Dauer",
remaining: "Restzeit",
diff --git a/assets/js/i18n/en.js b/assets/js/i18n/en.js
index 889d27217..ee2d6dde5 100644
--- a/assets/js/i18n/en.js
+++ b/assets/js/i18n/en.js
@@ -88,7 +88,7 @@ export default {
},
loadpointDetails: {
power: "Power",
- range: "Range",
+ vehicleRange: "Range",
charged: "Charged",
duration: "Duration",
remaining: "Remaining",
diff --git a/assets/js/i18n/it.js b/assets/js/i18n/it.js
index 08ce8afa7..e7717c278 100644
--- a/assets/js/i18n/it.js
+++ b/assets/js/i18n/it.js
@@ -68,7 +68,7 @@ export default {
},
loadpointDetails: {
power: "Potenza",
- range: "Autonomia",
+ vehicleRange: "Autonomia",
charged: "Ricaricato",
duration: "Duarata",
remaining: "Rimanenti",
diff --git a/core/loadpoint.go b/core/loadpoint.go
index 8489f0651..00d7019d0 100644
--- a/core/loadpoint.go
+++ b/core/loadpoint.go
@@ -1190,7 +1190,7 @@ func (lp *LoadPoint) publishSoCAndRange() {
if vs, ok := lp.vehicle.(api.VehicleRange); ok {
if rng, err := vs.Range(); err == nil {
lp.log.DEBUG.Printf("vehicle range: %vkm", rng)
- lp.publish("range", rng)
+ lp.publish("vehicleRange", rng)
}
}
@@ -1203,7 +1203,7 @@ func (lp *LoadPoint) publishSoCAndRange() {
lp.publish("chargeRemainingDuration", time.Duration(-1))
// range
- lp.publish("range", -1)
+ lp.publish("vehicleRange", -1)
}
}
diff --git a/dist/index.html b/dist/index.html
index b7e3095bc..076784d7c 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -1,4 +1,4 @@
-
evcc
\ No newline at end of file
+ };