diff --git a/api/api.go b/api/api.go
index aa299e34b..c6f5f8827 100644
--- a/api/api.go
+++ b/api/api.go
@@ -221,3 +221,9 @@ type AuthProvider interface {
LoginHandler() http.HandlerFunc
LogoutHandler() http.HandlerFunc
}
+
+// FeatureDescriber optionally provides a list of supported non-api features
+type FeatureDescriber interface {
+ Features() []Feature
+ Has(Feature) bool
+}
diff --git a/api/feature.go b/api/feature.go
new file mode 100644
index 000000000..9d615d73a
--- /dev/null
+++ b/api/feature.go
@@ -0,0 +1,17 @@
+package api
+
+type Feature int
+
+func (f *Feature) UnmarshalText(text []byte) error {
+ feat, err := FeatureString(string(text))
+ if err == nil {
+ *f = feat
+ }
+ return err
+}
+
+//go:generate enumer -type Feature
+const (
+ _ Feature = iota
+ Offline
+)
diff --git a/api/feature_enumer.go b/api/feature_enumer.go
new file mode 100644
index 000000000..55293ab84
--- /dev/null
+++ b/api/feature_enumer.go
@@ -0,0 +1,75 @@
+// Code generated by "enumer -type Feature"; DO NOT EDIT.
+
+package api
+
+import (
+ "fmt"
+ "strings"
+)
+
+const _FeatureName = "Offline"
+
+var _FeatureIndex = [...]uint8{0, 7}
+
+const _FeatureLowerName = "offline"
+
+func (i Feature) String() string {
+ i -= 1
+ if i < 0 || i >= Feature(len(_FeatureIndex)-1) {
+ return fmt.Sprintf("Feature(%d)", i+1)
+ }
+ return _FeatureName[_FeatureIndex[i]:_FeatureIndex[i+1]]
+}
+
+// An "invalid array index" compiler error signifies that the constant values have changed.
+// Re-run the stringer command to generate them again.
+func _FeatureNoOp() {
+ var x [1]struct{}
+ _ = x[Offline-(1)]
+}
+
+var _FeatureValues = []Feature{Offline}
+
+var _FeatureNameToValueMap = map[string]Feature{
+ _FeatureName[0:7]: Offline,
+ _FeatureLowerName[0:7]: Offline,
+}
+
+var _FeatureNames = []string{
+ _FeatureName[0:7],
+}
+
+// FeatureString retrieves an enum value from the enum constants string name.
+// Throws an error if the param is not part of the enum.
+func FeatureString(s string) (Feature, error) {
+ if val, ok := _FeatureNameToValueMap[s]; ok {
+ return val, nil
+ }
+
+ if val, ok := _FeatureNameToValueMap[strings.ToLower(s)]; ok {
+ return val, nil
+ }
+ return 0, fmt.Errorf("%s does not belong to Feature values", s)
+}
+
+// FeatureValues returns all values of the enum
+func FeatureValues() []Feature {
+ return _FeatureValues
+}
+
+// FeatureStrings returns a slice of all String values of the enum
+func FeatureStrings() []string {
+ strs := make([]string, len(_FeatureNames))
+ copy(strs, _FeatureNames)
+ return strs
+}
+
+// IsAFeature returns "true" if the value is listed in the enum definition. "false" otherwise
+func (i Feature) IsAFeature() bool {
+ for _, v := range _FeatureValues {
+ if i == v {
+ return true
+ }
+ }
+ return false
+}
diff --git a/assets/js/components/AnimatedNumber.vue b/assets/js/components/AnimatedNumber.vue
index 96f7e4242..3879062da 100644
--- a/assets/js/components/AnimatedNumber.vue
+++ b/assets/js/components/AnimatedNumber.vue
@@ -1,5 +1,5 @@
-
+
+
+
diff --git a/assets/js/components/Vehicle.stories.js b/assets/js/components/Vehicle.stories.js
index e9613d93f..0cf6fc77b 100644
--- a/assets/js/components/Vehicle.stories.js
+++ b/assets/js/components/Vehicle.stories.js
@@ -24,6 +24,7 @@ Base.args = {
vehicleSoC: 42,
vehicleRange: 231,
targetSoC: 90,
+ socBasedCharging: true,
id: 0,
};
@@ -36,6 +37,7 @@ Connected.args = {
charging: false,
vehicleSoC: 66,
targetSoC: 90,
+ socBasedCharging: true,
id: 0,
};
@@ -48,6 +50,7 @@ ReadyToCharge.args = {
charging: false,
vehicleSoC: 66,
targetSoC: 90,
+ socBasedCharging: true,
id: 0,
};
@@ -60,6 +63,7 @@ Charging.args = {
charging: true,
vehicleSoC: 66,
targetSoC: 90,
+ socBasedCharging: true,
id: 0,
};
@@ -81,6 +85,7 @@ TargetChargePlanned.args = {
targetTimeActive: false,
targetSoC: 45,
targetTime: hoursFromNow(14),
+ socBasedCharging: true,
id: 0,
};
@@ -96,6 +101,7 @@ TargetChargeActive.args = {
targetTimeActive: true,
targetSoC: 80,
targetTime: hoursFromNow(2),
+ socBasedCharging: true,
id: 0,
};
@@ -109,6 +115,21 @@ MinCharge.args = {
minSoC: 20,
charging: true,
targetSoC: 90,
+ socBasedCharging: true,
+ id: 0,
+};
+
+export const VehicleTargetSoc = Template.bind({});
+VehicleTargetSoc.args = {
+ vehicleTitle: "Mein Auto",
+ enabled: true,
+ connected: true,
+ vehiclePresent: true,
+ vehicleTargetSoC: 80,
+ vehicleSoC: 66,
+ charging: true,
+ targetSoC: 90,
+ socBasedCharging: true,
id: 0,
};
@@ -125,6 +146,7 @@ TimerPvEnable.args = {
phaseRemainingInterpolated: 0,
pvAction: "enable",
pvRemainingInterpolated: 32,
+ socBasedCharging: true,
id: 0,
};
@@ -141,16 +163,17 @@ TimerPvDisable.args = {
phaseRemainingInterpolated: 0,
pvAction: "disable",
pvRemainingInterpolated: 155,
+ socBasedCharging: true,
id: 0,
};
export const UnknownVehicleConnected = Template.bind({});
UnknownVehicleConnected.args = {
- vehicleTitle: "Mein Auto",
enabled: false,
connected: true,
vehiclePresent: false,
targetSoC: 90,
+ socBasedCharging: false,
id: 0,
};
@@ -162,6 +185,7 @@ UnknownVehicleReadyToCharge.args = {
vehiclePresent: false,
charging: false,
targetSoC: 100,
+ socBasedCharging: false,
id: 0,
};
@@ -173,6 +197,37 @@ UnknownVehicleCharging.args = {
vehiclePresent: false,
charging: true,
targetSoC: 90,
+ socBasedCharging: false,
+ id: 0,
+};
+
+export const OfflineVehicleCharging = Template.bind({});
+OfflineVehicleCharging.args = {
+ vehicleTitle: "Polestar 2",
+ enabled: true,
+ connected: true,
+ vehiclePresent: true,
+ vehicleFeatureOffline: true,
+ vehicleCapacity: 72,
+ chargedEnergy: 14123,
+ charging: true,
+ targetSoC: 90,
+ socBasedCharging: false,
+ id: 0,
+};
+
+export const OfflineVehicleTargetEnergy = Template.bind({});
+OfflineVehicleTargetEnergy.args = {
+ vehicleTitle: "Polestar 2",
+ enabled: true,
+ connected: true,
+ vehiclePresent: true,
+ vehicleFeatureOffline: true,
+ vehicleCapacity: 72,
+ chargedEnergy: 14123,
+ targetEnergy: 30,
+ charging: true,
+ socBasedCharging: false,
id: 0,
};
diff --git a/assets/js/components/Vehicle.vue b/assets/js/components/Vehicle.vue
index f17701b14..d34fbe19e 100644
--- a/assets/js/components/Vehicle.vue
+++ b/assets/js/components/Vehicle.vue
@@ -12,44 +12,65 @@
@target-soc-updated="targetSocUpdated"
@target-soc-drag="targetSocDrag"
/>
-
-
-
-
-
-
-
- vor 5 Stunden
-
+
+
+
+
+
+
+
+
+
+ vor 5 Stunden