Rename vehicle properties (evcc-io#1380)

clephie · Aug 23, 2021 · 6a260d9 · 6a260d9
1 parent f603582
commit 6a260d9
Show file tree

Hide file tree

Showing 24 changed files with 128 additions and 128 deletions.
diff --git a/assets/js/components/Loadpoint.stories.js b/assets/js/components/Loadpoint.stories.js
@@ -25,12 +25,12 @@ Base.args = {
   chargePower: 2800,
   chargedEnergy: 11e3,
   chargeDuration: 95 * 60,
-  hasVehicle: true,
-  socTitle: "Mein Auto",
+  vehiclePresent: true,
+  vehicleTitle: "Mein Auto",
   enabled: true,
   connected: true,
   charging: true,
-  socCharge: 66,
+  vehicleSoc: 66,
   targetSoC: 90,
 };
 
@@ -40,11 +40,11 @@ Disabled.args = {
   pvConfigured: true,
   remoteDisabled: "soft",
   remoteDisabledSource: "Sunny Home Manager",
-  hasVehicle: true,
-  socTitle: "Mein Auto",
+  vehiclePresent: true,
+  vehicleTitle: "Mein Auto",
   enabled: true,
   connected: true,
   charging: false,
-  socCharge: 66,
+  vehicleSoc: 66,
   targetSoC: 100,
 };
diff --git a/assets/js/components/Loadpoint.vue b/assets/js/components/Loadpoint.vue
@@ -49,8 +49,8 @@ export default {
 		connected: Boolean,
 		// charging: Boolean,
 		enabled: Boolean,
-		socTitle: String,
-		socCharge: Number,
+		vehicleTitle: String,
+		vehicleSoc: Number,
 		minSoC: Number,
 		timerSet: Boolean,
 		timerActive: Boolean,
@@ -60,7 +60,7 @@ export default {
 		chargePower: Number,
 		chargedEnergy: Number,
 		// chargeDuration: Number,
-		hasVehicle: Boolean,
+		vehiclePresent: Boolean,
 		climater: String,
 		range: Number,
 		chargeEstimate: Number,
@@ -71,7 +71,7 @@ export default {
 		maxCurrent: Number,
 		activePhases: Number,
 		chargeCurrent: Number,
-		socCapacity: Number,
+		vehicleCapacity: Number,
 		connectedDuration: Number,
 		chargeCurrents: Array,
 		chargeConfigured: Boolean,

diff --git a/assets/js/components/LoadpointDetails.stories.js b/assets/js/components/LoadpointDetails.stories.js
@@ -31,7 +31,7 @@ Vehicle.args = {
   chargePower: 2800,
   chargedEnergy: 11e3,
   chargeDuration: 95 * 60,
-  hasVehicle: true,
+  vehiclePresent: true,
   chargeEstimate: 5 * 3600,
 };
 
@@ -40,7 +40,7 @@ VehicleRange.args = {
   chargePower: 2800,
   chargedEnergy: 11e3,
   chargeDuration: 95 * 60,
-  hasVehicle: true,
+  vehiclePresent: true,
   range: 240.123,
   chargeEstimate: 5 * 3600,
 };
@@ -50,7 +50,7 @@ VehicleClimater.args = {
   chargePower: 2800,
   chargedEnergy: 11e3,
   chargeDuration: 95 * 60,
-  hasVehicle: true,
+  vehiclePresent: true,
   range: 240.123,
   chargeEstimate: 5 * 3600,
   climater: "on",
@@ -61,7 +61,7 @@ VehicleTimer.args = {
   chargePower: 2800,
   chargedEnergy: 11e3,
   chargeDuration: 95 * 60,
-  hasVehicle: true,
+  vehiclePresent: true,
   range: 240.123,
   chargeEstimate: 5 * 3600,
   timerSet: true,

diff --git a/assets/js/components/LoadpointDetails.vue b/assets/js/components/LoadpointDetails.vue
@@ -50,7 +50,7 @@
 				</h3>
 			</div>
 
-			<div class="col-6 col-sm-3 col-lg-2 mt-3" v-if="hasVehicle">
+			<div class="col-6 col-sm-3 col-lg-2 mt-3" v-if="vehiclePresent">
 				<div class="mb-2 value">{{ $t("main.loadpointDetails.remaining") }}</div>
 				<h3 class="value">
 					{{ fmtShortDuration(chargeEstimate) }}
@@ -73,7 +73,7 @@ export default {
 		chargeEstimate: Number,
 		chargePower: Number,
 		climater: String,
-		hasVehicle: Boolean,
+		vehiclePresent: Boolean,
 		range: Number,
 	},
 	mixins: [formatter],

diff --git a/assets/js/components/Site.stories.js b/assets/js/components/Site.stories.js
@@ -39,12 +39,12 @@ Single.args = {
     {
       title: "Ladepunkt 1",
       mode: "now",
-      socTitle: "Mein Auto",
+      vehicleTitle: "Mein Auto",
       enabled: true,
       connected: true,
-      hasVehicle: true,
+      vehiclePresent: true,
       charging: true,
-      socCharge: 66,
+      vehicleSoc: 66,
       targetSoC: 90,
       range: 344,
       chargeEstimate: 999,
@@ -68,12 +68,12 @@ Multi.args = {
     {
       title: "Ladepunkt 1",
       mode: "now",
-      socTitle: "Mein Auto",
+      vehicleTitle: "Mein Auto",
       enabled: true,
       connected: true,
-      hasVehicle: true,
+      vehiclePresent: true,
       charging: true,
-      socCharge: 66,
+      vehicleSoc: 66,
       targetSoC: 90,
       range: 344,
       chargeEstimate: 999,

diff --git a/assets/js/components/Vehicle.stories.js b/assets/js/components/Vehicle.stories.js
@@ -16,44 +16,44 @@ const Template = (args, { argTypes }) => ({
 
 export const Base = Template.bind({});
 Base.args = {
-  socTitle: "Mein Auto",
+  vehicleTitle: "Mein Auto",
   enabled: true,
   connected: true,
-  hasVehicle: true,
-  socCharge: 42,
+  vehiclePresent: true,
+  vehicleSoc: 42,
   targetSoC: 90,
 };
 
 export const Connected = Template.bind({});
 Connected.args = {
-  socTitle: "Mein Auto",
+  vehicleTitle: "Mein Auto",
   enabled: false,
   connected: true,
-  hasVehicle: true,
+  vehiclePresent: true,
   charging: false,
-  socCharge: 66,
+  vehicleSoc: 66,
   targetSoC: 90,
 };
 
 export const ReadyToCharge = Template.bind({});
 ReadyToCharge.args = {
-  socTitle: "Mein Auto",
+  vehicleTitle: "Mein Auto",
   enabled: true,
   connected: true,
-  hasVehicle: true,
+  vehiclePresent: true,
   charging: false,
-  socCharge: 66,
+  vehicleSoc: 66,
   targetSoC: 90,
 };
 
 export const Charging = Template.bind({});
 Charging.args = {
-  socTitle: "Mein Auto",
+  vehicleTitle: "Mein Auto",
   enabled: true,
   connected: true,
-  hasVehicle: true,
+  vehiclePresent: true,
   charging: true,
-  socCharge: 66,
+  vehicleSoc: 66,
   targetSoC: 90,
 };
 
@@ -65,11 +65,11 @@ const hoursFromNow = function (hours) {
 
 export const TargetChargePlanned = Template.bind({});
 TargetChargePlanned.args = {
-  socTitle: "Mein Auto",
+  vehicleTitle: "Mein Auto",
   enabled: false,
   connected: true,
-  hasVehicle: true,
-  socCharge: 31,
+  vehiclePresent: true,
+  vehicleSoc: 31,
   minSoC: 20,
   charging: false,
   timerSet: true,
@@ -80,11 +80,11 @@ TargetChargePlanned.args = {
 
 export const TargetChargeActive = Template.bind({});
 TargetChargeActive.args = {
-  socTitle: "Mein Auto",
+  vehicleTitle: "Mein Auto",
   enabled: true,
   connected: true,
-  hasVehicle: true,
-  socCharge: 66,
+  vehiclePresent: true,
+  vehicleSoc: 66,
   minSoC: 30,
   charging: true,
   timerSet: true,
@@ -95,55 +95,55 @@ TargetChargeActive.args = {
 
 export const MinCharge = Template.bind({});
 MinCharge.args = {
-  socTitle: "Mein Auto",
+  vehicleTitle: "Mein Auto",
   enabled: true,
   connected: true,
-  hasVehicle: true,
-  socCharge: 17,
+  vehiclePresent: true,
+  vehicleSoc: 17,
   minSoC: 20,
   charging: true,
   targetSoC: 90,
 };
 
 export const UnknownVehicleConnected = Template.bind({});
 UnknownVehicleConnected.args = {
-  socTitle: "Mein Auto",
+  vehicleTitle: "Mein Auto",
   enabled: false,
   connected: true,
-  hasVehicle: false,
+  vehiclePresent: false,
 };
 
 export const UnknownVehicleReadyToCharge = Template.bind({});
 UnknownVehicleReadyToCharge.args = {
-  socTitle: "Mein Auto",
+  vehicleTitle: "Mein Auto",
   enabled: true,
   connected: true,
-  hasVehicle: false,
+  vehiclePresent: false,
   charging: false,
 };
 
 export const UnknownVehicleCharging = Template.bind({});
 UnknownVehicleCharging.args = {
-  socTitle: "Mein Auto",
+  vehicleTitle: "Mein Auto",
   enabled: true,
   connected: true,
-  hasVehicle: false,
+  vehiclePresent: false,
   charging: true,
 };
 
 export const Disconnected = Template.bind({});
 Disconnected.args = {
-  socTitle: "Mein Auto",
+  vehicleTitle: "Mein Auto",
   connected: false,
-  hasVehicle: false,
+  vehiclePresent: false,
 };
 
 export const DisconnectedKnownSoc = Template.bind({});
 DisconnectedKnownSoc.args = {
-  socTitle: "Mein Auto",
+  vehicleTitle: "Mein Auto",
   connected: false,
   enabled: false,
-  hasVehicle: true,
-  socCharge: 17,
+  vehiclePresent: true,
+  vehicleSoc: 17,
   targetSoC: 60,
 };
diff --git a/assets/js/components/Vehicle.vue b/assets/js/components/Vehicle.vue
@@ -1,9 +1,9 @@
 <template>
 	<div>
 		<div class="mb-3">
-			{{ socTitle || $t("main.vehicle.fallbackName") }}
+			{{ vehicleTitle || $t("main.vehicle.fallbackName") }}
 		</div>
-		<VehicleSoc v-bind="vehicleSoc" @target-soc-updated="targetSocUpdated" />
+		<VehicleSoc v-bind="vehicleSocProps" @target-soc-updated="targetSocUpdated" />
 		<VehicleSubline v-bind="vehicleSubline" class="my-1" />
 	</div>
 </template>
@@ -19,19 +19,19 @@ export default {
 	components: { VehicleSoc, VehicleSubline },
 	props: {
 		connected: Boolean,
-		hasVehicle: Boolean,
-		socCharge: Number,
+		vehiclePresent: Boolean,
+		vehicleSoc: Number,
 		enabled: Boolean,
 		charging: Boolean,
 		minSoC: Number,
-		socTitle: String,
+		vehicleTitle: String,
 		timerActive: Boolean,
 		timerSet: Boolean,
 		targetTime: String,
 		targetSoC: Number,
 	},
 	computed: {
-		vehicleSoc: function () {
+		vehicleSocProps: function () {
 			return this.collectProps(VehicleSoc);
 		},
 		vehicleSubline: function () {