@@ -149,6 +142,7 @@ import Mode from "./Mode";
import Vehicle from "./Vehicle";
import LoadpointDetails from "./LoadpointDetails";
import formatter from "../mixins/formatter";
+import collector from "../mixins/collector";
export default {
name: "Loadpoint",
@@ -186,7 +180,7 @@ export default {
chargeEstimate: Number,
},
components: { LoadpointDetails, Soc, Mode, Vehicle },
- mixins: [formatter],
+ mixins: [formatter, collector],
data: function () {
return {
tickerHandle: null,
@@ -195,18 +189,10 @@ export default {
},
computed: {
details: function () {
- return {
- connected: this.connected,
- minSoC: this.minSoC,
- hasVehicle: this.hasVehicle,
- socCharge: this.socCharge,
- climater: this.climater,
- chargePower: this.chargePower,
- chargedEnergy: this.chargedEnergy,
- range: this.range,
- chargeDuration: this.chargeDurationDisplayed,
- chargeEstimate: this.chargeEstimate,
- };
+ return this.collectProps(LoadpointDetails);
+ },
+ vehicle: function () {
+ return this.collectProps(Vehicle);
},
hasTargetSoC: function () {
return this.socLevels != null && this.socLevels.length > 0;
diff --git a/assets/js/components/LoadpointDetails.vue b/assets/js/components/LoadpointDetails.vue
index d6bb8e743..ee1856aea 100644
--- a/assets/js/components/LoadpointDetails.vue
+++ b/assets/js/components/LoadpointDetails.vue
@@ -68,15 +68,15 @@ import formatter from "../mixins/formatter";
export default {
name: "LoadpointDetails",
props: {
- chargePower: Number,
chargedEnergy: Number,
chargeDuration: Number,
+ chargeEstimate: Number,
+ chargePower: Number,
+ climater: String,
hasVehicle: Boolean,
+ range: Number,
socTimerActive: Boolean,
socTimerSet: Boolean,
- climater: String,
- range: Number,
- chargeEstimate: Number,
},
mixins: [formatter],
};
diff --git a/assets/js/components/Site.vue b/assets/js/components/Site.vue
index d5364a393..44226566a 100644
--- a/assets/js/components/Site.vue
+++ b/assets/js/components/Site.vue
@@ -5,15 +5,7 @@
{{ title || "Home" }}