diff --git a/assets/js/components/ChargingPlans/PlansSettings.vue b/assets/js/components/ChargingPlans/PlansSettings.vue index 5b7964469..fc14630b0 100644 --- a/assets/js/components/ChargingPlans/PlansSettings.vue +++ b/assets/js/components/ChargingPlans/PlansSettings.vue @@ -79,7 +79,6 @@ import formatter from "@/mixins/formatter"; import collector from "@/mixins/collector"; import api from "@/api"; import deepEqual from "@/utils/deepEqual"; -import convertRates from "@/utils/convertRates"; import { debounceLeading } from "@/utils/debounceLeading"; import { defineComponent, type PropType } from "vue"; import type { Vehicle, CURRENCY, Forecast } from "@/types/evcc"; @@ -153,8 +152,11 @@ export default defineComponent({ return this.collectProps(Warnings); }, chargingPlanPreviewProps(): any { - const forecastSlots = this.forecast?.planner || []; - const rates = convertRates(forecastSlots); + const rates = (this.forecast?.planner || []).map(({ start, end, value }) => ({ + start: new Date(start), + end: new Date(end), + value, + })); const { duration, plan, power, planTime } = this.plan; const targetTime = planTime ? new Date(planTime) : null; const { currency, smartCostType } = this; diff --git a/assets/js/components/Forecast/ActiveSlot.vue b/assets/js/components/Forecast/ActiveSlot.vue deleted file mode 100644 index efe5d96a2..000000000 --- a/assets/js/components/Forecast/ActiveSlot.vue +++ /dev/null @@ -1,47 +0,0 @@ - - - {{ day }} {{ start }}{{ " " }}– {{ end }} - - - {{ time }} - - - - diff --git a/assets/js/components/Forecast/Details.vue b/assets/js/components/Forecast/Details.vue deleted file mode 100644 index f0aadb229..000000000 --- a/assets/js/components/Forecast/Details.vue +++ /dev/null @@ -1,226 +0,0 @@ - - - - {{ label("today") }} - - - - - {{ label("remaining") }} - - - - {{ label("tomorrow") }} - - - - - - {{ label("partly") }} - - - - - {{ label("dayAfterTomorrow") }} - - - - - - {{ label("partly") }} - - - - - - - {{ label("constant") }} - - {{ constantValue }} - - - - - - {{ label("range") }} - - {{ priceRange }} - - - - {{ label("average") }} - - {{ averagePrice }} - - - - {{ label("lowestHour") }} - - {{ lowestPriceHour }} - - - - - - - - diff --git a/assets/js/components/Forecast/TypeSelect.vue b/assets/js/components/Forecast/TypeSelect.vue deleted file mode 100644 index 769134f1c..000000000 --- a/assets/js/components/Forecast/TypeSelect.vue +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - diff --git a/assets/js/components/Optimize/CopyButton.vue b/assets/js/components/Optimize/CopyButton.vue index 268183313..e1281fac7 100644 --- a/assets/js/components/Optimize/CopyButton.vue +++ b/assets/js/components/Optimize/CopyButton.vue @@ -12,6 +12,7 @@