From 405f1d40005f1f9f514256220d1484edd6ea6b57 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Sat, 14 Sep 2024 23:05:06 +0200 Subject: [PATCH] Add on/off toggles for surplus charging and awattar charging --- FlexibleEnergyTariffPage.qml | 25 ++++++++++-- GeneralOnOffSwitch.qml | 1 + PvSurplusPage.qml | 7 ++-- i18n/qml_de.ts | 74 ++++++++++++++++++++++++------------ 4 files changed, 76 insertions(+), 31 deletions(-) diff --git a/FlexibleEnergyTariffPage.qml b/FlexibleEnergyTariffPage.qml index 401c1c0..638cef3 100644 --- a/FlexibleEnergyTariffPage.qml +++ b/FlexibleEnergyTariffPage.qml @@ -1,13 +1,32 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts +import EVChargerApp NavigationPage { title: qsTr("Flexible energy tariff") - Text { - text: "TODO" + GeneralOnOffSwitch { + apiKey: "ful" + text: qsTr("Charge with flexible energy tariff") + } - Layout.fillHeight: true + GeneralOnOffSwitch { + apiKey: "awe" + text: qsTr("Charge with flexible energy tariff") + } + + NavigationItem { + ApiKeyValueHelper { + id: priceLimitHelper + deviceConnection: theDeviceConnection + apiKey: "awp" + } + + visible: logicMode.value == 4 + iconSource: "material-icons/grid_guides.svg" + title: qsTr("Price limit") + description: qsTr("%0 ct/kWh").arg(Qt.locale().toString(priceLimitHelper.value, 'f', 1)) + component: "SetPriceLimitPage.qml" } } diff --git a/GeneralOnOffSwitch.qml b/GeneralOnOffSwitch.qml index 029a82b..3821047 100644 --- a/GeneralOnOffSwitch.qml +++ b/GeneralOnOffSwitch.qml @@ -8,6 +8,7 @@ WhiteCheckDelegate { required property string apiKey property alias exists: valueHelper.exists + visible: exists Layout.fillWidth: true diff --git a/PvSurplusPage.qml b/PvSurplusPage.qml index 223523c..a778093 100644 --- a/PvSurplusPage.qml +++ b/PvSurplusPage.qml @@ -5,9 +5,8 @@ import QtQuick.Layouts NavigationPage { title: qsTr("PV Surplus") - Text { - text: "TODO" - - Layout.fillHeight: true + GeneralOnOffSwitch { + apiKey: "fup" + text: qsTr("Charging with PV surplus") } } diff --git a/i18n/qml_de.ts b/i18n/qml_de.ts index 88c62fd..ef1b107 100644 --- a/i18n/qml_de.ts +++ b/i18n/qml_de.ts @@ -412,19 +412,19 @@ Duration: %0 - + Dauer: %0 Speed: %0 - + Geschwindigkeit: %0 Amount: %0 - + Menge: %0 @@ -442,37 +442,37 @@ (api key doesnt exist) - + (api key existiert nicht) (api key is null) - + (api key is null) (api key is not an object) - + (api key ist kein Objekt) (api key does not contain a type) - + (api key beinhaltet keinen Typ) (api key has unknown type %0) - + (api key hat unbekannten Typ %0) %0 %1 %2 - + %0 %1 %2 @@ -482,13 +482,13 @@ %0 A - + %0 A %0 kWh - + %0 kWh @@ -524,7 +524,7 @@ %0 & %1 - + %0 & %1 @@ -861,7 +861,7 @@ Category - + Kategorie @@ -1110,7 +1110,7 @@ Devices - Geräte + Geräte @@ -1442,11 +1442,31 @@ FlexibleEnergyTariffPage - - + + Flexible energy tariff Flexibler Energietarif + + + + + + Charge with flexible energy tariff + Laden mit flexiblen Stromtarif + + + + + Price limit + Preisgrenze + + + + + %0 ct/kWh + %0 ct/kWh + FoundDevicesModel @@ -1458,20 +1478,20 @@ GeneralOnOffSwitch - - + + On An - - + + Off Aus - - + + Unknown Unbekannt @@ -2066,6 +2086,12 @@ PV Surplus PV-Überschuss + + + + Charging with PV surplus + Laden mit PV-Überschuss + RebootPage @@ -2627,13 +2653,13 @@ AM - + AM PM - + PM