feat: configurable loadpoint priority strategy (soc/deficit) with hysteresis

api/prioritystrategy.go

@@ -0,0 +1,22 @@
+package api
+
+// PriorityStrategy determines how a loadpoint is ranked against other loadpoints
+// of the same priority when distributing surplus power.
+type PriorityStrategy int
+
+//go:generate go tool enumer -type PriorityStrategy -trimprefix Priority -transform=lower -text
+const (
+	PriorityNone    PriorityStrategy = iota // no sub-ordering (default)
+	PrioritySoc                             // prefer the lower vehicle soc
+	PriorityDeficit                         // prefer the larger gap to limit soc
+)
+
+// PriorityBasis determines whether a priority strategy ranks loadpoints by soc
+// percentage or by absolute energy (kWh).
+type PriorityBasis int
+
+//go:generate go tool enumer -type PriorityBasis -trimprefix PriorityBasis -transform=lower -text
+const (
+	PriorityBasisPercent PriorityBasis = iota // rank by soc-% (default)
+	PriorityBasisEnergy                       // rank by absolute energy (kWh)
+)

assets/js/components/Config/LoadpointModal.vue

@@ -300,6 +300,57 @@
 							/>
 						</FormRow>
 
+						<FormRow
+							v-if="showPriority"
+							id="loadpointParamPriorityStrategy"
+							:label="$t('config.loadpoint.priorityStrategyLabel')"
+							:help="$t('config.loadpoint.priorityStrategyHelp')"
+						>
+							<PropertyField
+								id="loadpointParamPriorityStrategy"
+								v-model="priorityStrategy"
+								type="Choice"
+								size="w-100"
+								class="me-2"
+								required
+								:choice="priorityStrategyOptions"
+							/>
+						</FormRow>
+
+						<FormRow
+							v-if="showPriority && priorityHysteresisAvailable"
+							id="loadpointParamPriorityBasis"
+							:label="$t('config.loadpoint.priorityBasisLabel')"
+							:help="$t('config.loadpoint.priorityBasisHelp')"
+						>
+							<PropertyField
+								id="loadpointParamPriorityBasis"
+								v-model="priorityBasis"
+								type="Choice"
+								size="w-100"
+								class="me-2"
+								required
+								:choice="priorityBasisOptions"
+							/>
+						</FormRow>
+
+						<FormRow
+							v-if="showPriority && priorityHysteresisAvailable"
+							id="loadpointParamPriorityHysteresis"
+							:label="$t('config.loadpoint.priorityHysteresisLabel')"
+							:help="$t('config.loadpoint.priorityHysteresisHelp')"
+						>
+							<PropertyField
+								id="loadpointParamPriorityHysteresis"
+								v-model="values.priorityHysteresis"
+								type="Float"
+								:unit="priorityHysteresisUnit"
+								size="w-25 w-min-200"
+								class="me-2"
+								required
+							/>
+						</FormRow>
+
 						<h6 v-if="!chargerIsSwitchDevice">
 							{{ $t("config.loadpoint.electricalTitle") }}
 							<small class="text-muted">{{
@@ -634,6 +685,8 @@ import { getModal, openModal, replaceModal, closeModal } from "@/configModal";
 import {
 	CHARGE_MODE,
 	LOADPOINT_TYPE,
+	PRIORITY_STRATEGY,
+	PRIORITY_BASIS,
 	type DeviceType,
 	type LoadpointType,
 	type ConfigCharger,
@@ -654,6 +707,9 @@ const defaultValues = {
 	minCurrent: 6,
 	maxCurrent: 16,
 	priority: 0,
+	priorityStrategy: PRIORITY_STRATEGY.NONE,
+	priorityBasis: PRIORITY_BASIS.PERCENT,
+	priorityHysteresis: 0,
 	defaultMode: "",
 	thresholds: {
 		enable: { delay: 1 * nsPerMin, threshold: 0 },
@@ -795,6 +851,58 @@ export default {
 			result[10]!.name = "10 (highest)";
 			return result;
 		},
+		priorityStrategy: {
+			// fall back to the none (default) strategy
+			get(): PRIORITY_STRATEGY {
+				return this.values.priorityStrategy || PRIORITY_STRATEGY.NONE;
+			},
+			set(value: PRIORITY_STRATEGY) {
+				this.values.priorityStrategy = value;
+			},
+		},
+		priorityStrategyOptions(): { key: PRIORITY_STRATEGY; name: string }[] {
+			return [
+				{
+					key: PRIORITY_STRATEGY.NONE,
+					name: this.$t("config.loadpoint.priorityStrategyNone"),
+				},
+				{
+					key: PRIORITY_STRATEGY.SOC,
+					name: this.$t("config.loadpoint.priorityStrategySoc"),
+				},
+				{
+					key: PRIORITY_STRATEGY.DEFICIT,
+					name: this.$t("config.loadpoint.priorityStrategyDeficit"),
+				},
+			];
+		},
+		priorityBasis: {
+			// backend returns "" for the percent basis; map to/from the explicit "percent" choice
+			get(): PRIORITY_BASIS {
+				return this.values.priorityBasis || PRIORITY_BASIS.PERCENT;
+			},
+			set(value: PRIORITY_BASIS) {
+				this.values.priorityBasis = value;
+			},
+		},
+		priorityBasisOptions(): { key: PRIORITY_BASIS; name: string }[] {
+			return [
+				{
+					key: PRIORITY_BASIS.PERCENT,
+					name: this.$t("config.loadpoint.priorityBasisPercent"),
+				},
+				{
+					key: PRIORITY_BASIS.ENERGY,
+					name: this.$t("config.loadpoint.priorityBasisEnergy"),
+				},
+			];
+		},
+		priorityHysteresisAvailable(): boolean {
+			return this.priorityStrategy !== PRIORITY_STRATEGY.NONE;
+		},
+		priorityHysteresisUnit(): string {
+			return this.priorityBasis === PRIORITY_BASIS.ENERGY ? "kWh" : "%";
+		},
 		phasesOptions() {
 			return [
 				{ value: 1, name: this.$t("config.loadpoint.phases1p") },