From 7de484969a146683e2ab6d9acc70f4ce6caf9577 Mon Sep 17 00:00:00 2001 From: Michael Geers Date: Wed, 2 Aug 2023 15:43:00 +0200 Subject: [PATCH] Persist targetSoc/Energy, minSoc, targetTime per vehicle, add minSoc to UI (#8115) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Plugins: make javascript return values more permissive * Persist targetSoc/Energy, minSoc and target time, remove experimental from minSoc UI * go generate * Fix tests * Update minSoc description * Store settings by index. Show plan outside pv mode. Add help texts. * remove slug * go mock * lint * chore: simplify templates (#8304) * Add e2e tests with playwright (#8123) * Revert "1p3p: let charger handle session stop/restart (#7723)" This reverts commit dd787ce52fe07e617a73061fbb31393335f381dd. * mazda2mqtt: document vin required (#8319) * FoxESS: split H1/H3 devices (#7376) Co-authored-by: premultiply <4681172+premultiply@users.noreply.github.com> * Translations update from Hosted Weblate (#8124) * Translated using Weblate (Czech) Currently translated at 37.3% (99 of 265 strings) Co-authored-by: Dusan Suja Translate-URL: https://hosted.weblate.org/projects/evcc/evcc/cs/ Translation: evcc/evcc * Translated using Weblate (Finnish) Currently translated at 100.0% (265 of 265 strings) Co-authored-by: Arna Lepikkö Translate-URL: https://hosted.weblate.org/projects/evcc/evcc/fi/ Translation: evcc/evcc * Translated using Weblate (German) Currently translated at 100.0% (265 of 265 strings) Co-authored-by: ThinkEV Translate-URL: https://hosted.weblate.org/projects/evcc/evcc/de/ Translation: evcc/evcc * Translated using Weblate (Croatian) Currently translated at 100.0% (265 of 265 strings) Translated using Weblate (Slovenian) Currently translated at 100.0% (265 of 265 strings) Co-authored-by: Žiga Deisinger Translate-URL: https://hosted.weblate.org/projects/evcc/evcc/hr/ Translate-URL: https://hosted.weblate.org/projects/evcc/evcc/sl/ Translation: evcc/evcc * Translated using Weblate (Catalan) Currently translated at 100.0% (265 of 265 strings) Co-authored-by: Norbert Poch Translate-URL: https://hosted.weblate.org/projects/evcc/evcc/ca/ Translation: evcc/evcc * Translated using Weblate (Dutch) Currently translated at 76.6% (203 of 265 strings) Translated using Weblate (Dutch) Currently translated at 74.3% (197 of 265 strings) Co-authored-by: Ruben Van Boxem Translate-URL: https://hosted.weblate.org/projects/evcc/evcc/nl/ Translation: evcc/evcc * fix toml --------- Co-authored-by: Dusan Suja Co-authored-by: Arna Lepikkö Co-authored-by: ThinkEV Co-authored-by: Žiga Deisinger Co-authored-by: Norbert Poch Co-authored-by: Ruben Van Boxem Co-authored-by: premultiply <4681172+premultiply@users.noreply.github.com> * Add OBO Betterman Ion (#8321) Also aligns heartbeat implementations * Enphase: add token auth (firmware D7.x.xxx) and grid (#8247) * Mqtt: fix smartCostLimit topic case (#8328) * Add ISO15118 vehicle template (#8302) * Mqtt: simplify setters * Mqtt: disable message ordering to improve performance * chore: simplify random state generation * Porsche: remove deprecated mobile api (#8349) * Porsche: remove remaining mobile api types * Cupra: add odometer (#8340) * chore: refactor go-stylish * chore: fix stale handler * mazda2mqtt: longer timeout (#8364) * chore: pre-process toml * chore: prevent toml double quotes * Audi: temporarily switch to etron (#8374) * Fix nightly build (#8384) * Update SunSpec templates (#8270) * Revert "Fix nightly build (#8384)" This reverts commit 536dbc936c7ced16f8bd00409a8cc00e5e807e57. * Revert "Add e2e tests with playwright (#8123)" This reverts commit 0df815729b5471bc7c448857d60137684b926611. * Easee: update Observation IDs (#8391) * Easee: handle smartCharging errors (#8389) * TWC: add non-Tesla vehicle warning (#8329) * TWC: allow loadpoint to wakeup vehicle (#8284) * chore: use gridx consts * Fix ISO15118 vehicle (#8402) Such vehicles would be reported as `(Offline)` previously, as no Soc can be fetched and thus needs to behave as the `offline` template. The SoC is fetched via the charger, so hardcode it to 0 in here * Modbus: add coils (#8385) * OpenEVSE: fix api (#8415) * chore: refactor offline vehicles (#8404) * Easee: wait for api confirmation (#8307) * Revert "Easee: wait for api confirmation (#8307)" This reverts commit ce0e4277aa9b9f7b58c12d7bf0958ae7f632c729. * automatically switch session log energy unit (#8371) Show the charged energy in the session log table and details in Wh for values below 1 kWh and in kWh for larger values * Fix nightly/release + integration workflow (#8450) * Revert "Add e2e tests with playwright (#8123)" This reverts commit 0df815729b5471bc7c448857d60137684b926611. * Revert "Revert "Add e2e tests with playwright (#8123)"" This reverts commit 2299306954045dfe62541d5520a66b5ab7ec4971. * fix nightly/release * fix nightly/release * fix nightly/release --------- Co-authored-by: andig * chore: no integration on nightly * chore: no integration on nightly * chore: no integration on nightly * Sessions: filter, monthly sums, paging (#8278) * fmt * Update i18n/en.toml Co-authored-by: Simon Riepl <43091717+savus4@users.noreply.github.com> * Use exp/slices * Use mux consistently * add integration tests --------- Co-authored-by: andig Co-authored-by: C64Axel <33828760+C64Axel@users.noreply.github.com> Co-authored-by: premultiply <4681172+premultiply@users.noreply.github.com> Co-authored-by: Weblate (bot) Co-authored-by: Dusan Suja Co-authored-by: Arna Lepikkö Co-authored-by: ThinkEV Co-authored-by: Žiga Deisinger Co-authored-by: Norbert Poch Co-authored-by: Ruben Van Boxem Co-authored-by: salz3n <79696598+salz3n@users.noreply.github.com> Co-authored-by: Daniel Paschke Co-authored-by: Andreas Linde <42185+DerAndereAndi@users.noreply.github.com> Co-authored-by: lex777777 <84906358+lex777777@users.noreply.github.com> Co-authored-by: Oscar Co-authored-by: Michael Heß Co-authored-by: RTTTC <94727758+RTTTC@users.noreply.github.com> Co-authored-by: kscholty <47229207+kscholty@users.noreply.github.com> Co-authored-by: Jan Alexander Co-authored-by: Simon Riepl <43091717+savus4@users.noreply.github.com> --- assets/js/components/ChargingPlan.vue | 18 +- assets/js/components/ChargingPlanArrival.vue | 52 +++--- assets/js/components/TargetCharge.vue | 30 +++- assets/js/components/TargetEnergySelect.vue | 8 +- assets/js/components/TargetSocSelect.vue | 9 +- assets/js/components/VehicleStatus.vue | 2 +- assets/js/components/VehicleTitle.vue | 2 +- core/coordinator/adapter.go | 5 + core/coordinator/api.go | 1 + core/coordinator/coordinator.go | 1 + core/coordinator/dummy.go | 4 + core/loadpoint_api.go | 4 + core/loadpoint_vehicle.go | 37 +++++ i18n/de.toml | 4 +- i18n/en.toml | 4 +- tests/evcc.js | 35 +++- .../persist-target-minsoc-connected.evcc.yaml | 58 +++++++ ...rsist-target-minsoc-disconnected.evcc.yaml | 58 +++++++ tests/persist-target-minsoc.spec.js | 157 ++++++++++++++++++ 19 files changed, 437 insertions(+), 52 deletions(-) create mode 100755 tests/persist-target-minsoc-connected.evcc.yaml create mode 100755 tests/persist-target-minsoc-disconnected.evcc.yaml create mode 100644 tests/persist-target-minsoc.spec.js diff --git a/assets/js/components/ChargingPlan.vue b/assets/js/components/ChargingPlan.vue index 59b799220..1df976102 100644 --- a/assets/js/components/ChargingPlan.vue +++ b/assets/js/components/ChargingPlan.vue @@ -3,13 +3,13 @@

-
    + @@ -113,6 +113,7 @@ export default { smartCostLimit: Number, smartCostType: String, currency: String, + mode: String, }, emits: ["target-time-updated", "target-time-removed", "minsoc-updated"], data: function () { @@ -145,7 +146,7 @@ export default { return this.$t("main.chargingPlan.title"); }, minSocEnabled: function () { - return this.minSoc >= this.vehicleSoc && this.$hiddenFeatures(); + return this.minSoc > this.vehicleSoc; }, departureTabActive: function () { return this.activeTab === "departure"; @@ -159,9 +160,6 @@ export default { chargingPlanArrival: function () { return this.collectProps(ChargingPlanArrival); }, - showTabs: function () { - return this.$hiddenFeatures(); - }, }, mounted() { this.modal = Modal.getOrCreateInstance(this.$refs.modal); @@ -180,12 +178,10 @@ export default { this.isModalVisible = false; }, openModal() { + this.showDeatureTab(); if (this.minSocEnabled) { this.showArrivalTab(); } - if (this.targetChargeEnabled) { - this.showDeatureTab(); - } this.modal.show(); }, // not computed because it needs to update over time diff --git a/assets/js/components/ChargingPlanArrival.vue b/assets/js/components/ChargingPlanArrival.vue index f2a1a74d4..59fab2950 100644 --- a/assets/js/components/ChargingPlanArrival.vue +++ b/assets/js/components/ChargingPlanArrival.vue @@ -1,27 +1,34 @@ @@ -32,6 +39,7 @@ export default { id: [String, Number], minSoc: Number, vehicleName: String, + socBasedCharging: Boolean, }, emits: ["minsoc-updated"], data: function () { @@ -54,7 +62,7 @@ export default {