Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Plan UI: handle plan not found (#19245)

Browse source
This commit is contained in:
Michael Geers 2025-02-27 20:34:11 +01:00 • committed by GitHub
parent 714438d058
commit 737e2f6425
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
assets/js/components/ChargingPlansSettings.vue
View file

@ -207,7 +207,7 @@ export default {
},
fetchActivePlan: async function () {
try {
const res = await api.get(`loadpoints/${this.id}/plan`);
const res = await this.apiFetchPlan(`loadpoints/${this.id}/plan`);
this.plan = res.data.result;
this.nextPlanId = this.plan.planId;
} catch (e) {
@ -217,19 +217,34 @@ export default {
},
fetchStaticPreviewSoc: async function (soc, time) {
const timeISO = time.toISOString();
return await api.get(`loadpoints/${this.id}/plan/static/preview/soc/${soc}/${timeISO}`);
return await this.apiFetchPlan(
`loadpoints/${this.id}/plan/static/preview/soc/${soc}/${timeISO}`
);
},
fetchRepeatingPreview: async function (weekdays, soc, time, tz) {
return await api.get(
return await this.apiFetchPlan(
`loadpoints/${this.id}/plan/repeating/preview/${soc}/${weekdays}/${time}/${encodeURIComponent(tz)}`
);
},
fetchStaticPreviewEnergy: async function (energy, time) {
const timeISO = time.toISOString();
return await api.get(
return await this.apiFetchPlan(
`loadpoints/${this.id}/plan/static/preview/energy/${energy}/${timeISO}`
);
},
apiFetchPlan: async function (url) {
try {
const res = await api.get(url, {
validateStatus: (code) => [200, 404].includes(code),
});
if (res.status === 404) {
return { data: { result: {} } };
}
return res;
} catch (e) {
console.error(e);
}
},
fetchPreviewPlan: async function () {
// only show preview of no plan is active
if (!this.noActivePlan) return;

6
server/http_loadpoint_handler.go
View file

@ -52,7 +52,7 @@ func planHandler(lp loadpoint.API) http.HandlerFunc {
requiredDuration := lp.GetPlanRequiredDuration(goal, maxPower)
plan := lp.GetPlan(planTime, requiredDuration)
if plan == nil {
w.WriteHeader(http.StatusBadRequest)
w.WriteHeader(http.StatusNotFound)
return
}
@ -111,7 +111,7 @@ func staticPlanPreviewHandler(lp loadpoint.API) http.HandlerFunc {
requiredDuration := lp.GetPlanRequiredDuration(goal, maxPower)
plan := lp.GetPlan(planTime, requiredDuration)
if plan == nil {
w.WriteHeader(http.StatusBadRequest)
w.WriteHeader(http.StatusNotFound)
return
}
@ -164,7 +164,7 @@ func repeatingPlanPreviewHandler(lp loadpoint.API) http.HandlerFunc {
requiredDuration := lp.GetPlanRequiredDuration(soc, maxPower)
plan := lp.GetPlan(planTime, requiredDuration)
if plan == nil {
w.WriteHeader(http.StatusBadRequest)
w.WriteHeader(http.StatusNotFound)
return
}