From 7294c8b959d97367fdff14277c3690d96c264bad Mon Sep 17 00:00:00 2001
From: Michael Geers <michael@geers.tv>
Date: Tue, 6 May 2025 10:20:54 +0200
Subject: [PATCH] Plan: fix late for energy plans (#21080)

---
 assets/js/components/ChargingPlans/ChargingPlan.vue       | 2 +-
 assets/js/components/ChargingPlans/PlanStaticSettings.vue | 2 +-
 assets/js/components/ChargingPlans/PlansSettings.vue      | 4 +++-
 core/loadpoint_api.go                                     | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/assets/js/components/ChargingPlans/ChargingPlan.vue b/assets/js/components/ChargingPlans/ChargingPlan.vue
index d3e46a829..b66c70dec 100644
--- a/assets/js/components/ChargingPlans/ChargingPlan.vue
+++ b/assets/js/components/ChargingPlans/ChargingPlan.vue
@@ -314,7 +314,7 @@ export default defineComponent({
 		},
 		updateStaticPlan(plan: StaticPlan): void {
 			const timeISO = plan.time.toISOString();
-			const params = this.socBasedPlanning ? { precondition: plan.precondition } : undefined;
+			const params = plan.precondition ? { precondition: plan.precondition } : undefined;
 			if (this.socBasedPlanning) {
 				const p = plan as StaticSocPlan;
 				api.post(`${this.apiVehicle}plan/soc/${p.soc}/${timeISO}`, null, { params });
diff --git a/assets/js/components/ChargingPlans/PlanStaticSettings.vue b/assets/js/components/ChargingPlans/PlanStaticSettings.vue
index 2c362d257..23d7f2448 100644
--- a/assets/js/components/ChargingPlans/PlanStaticSettings.vue
+++ b/assets/js/components/ChargingPlans/PlanStaticSettings.vue
@@ -216,7 +216,7 @@ export default defineComponent({
 			selectedSoc: this.soc,
 			selectedEnergy: this.energy,
 			active: false,
-			selectedPrecondition: 0,
+			selectedPrecondition: this.precondition,
 		};
 	},
 	computed: {
diff --git a/assets/js/components/ChargingPlans/PlansSettings.vue b/assets/js/components/ChargingPlans/PlansSettings.vue
index 7e414b22a..ebfdcec67 100644
--- a/assets/js/components/ChargingPlans/PlansSettings.vue
+++ b/assets/js/components/ChargingPlans/PlansSettings.vue
@@ -255,8 +255,10 @@ export default defineComponent({
 		},
 		async fetchStaticPreviewEnergy(plan: StaticEnergyPlan): Promise<PlanResponse | undefined> {
 			const timeISO = plan.time.toISOString();
+			const params = plan.precondition ? { precondition: plan.precondition } : undefined;
 			return await this.apiFetchPlan(
-				`loadpoints/${this.id}/plan/static/preview/energy/${plan.energy}/${timeISO}`
+				`loadpoints/${this.id}/plan/static/preview/energy/${plan.energy}/${timeISO}`,
+				params
 			);
 		},
 		async apiFetchPlan(
diff --git a/core/loadpoint_api.go b/core/loadpoint_api.go
index 49d991dca..a2117777e 100644
--- a/core/loadpoint_api.go
+++ b/core/loadpoint_api.go
@@ -348,6 +348,7 @@ func (lp *Loadpoint) setPlanEnergy(finishAt time.Time, precondition time.Duratio
 	}
 
 	lp.planTime = finishAt
+	lp.planPrecondition = precondition
 	lp.publish(keys.PlanTime, finishAt)
 	lp.publish(keys.PlanPrecondition, precondition)
 	lp.settings.SetTime(keys.PlanTime, finishAt)