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

Smart Grid Charging: use ≤ instead of < for limits (#10381)

Browse source
This commit is contained in:
Michael Geers 2023-10-18 22:45:59 +02:00 • committed by GitHub
parent a346c104e9
commit 2737de033d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
assets/js/components/GridSettingsModal.vue
View file

@ -146,7 +146,7 @@ export default {
}
values.sort((a, b) => a - b);
return values.map((value) => {
const name = `< ${
const name = `≤ ${
this.isCo2
? this.fmtCo2Medium(value)
: this.fmtPricePerKWh(value, this.currency)
@ -195,7 +195,7 @@ export default {
// TODO: handle multiple matching time slots
const price = this.findSlotInRange(start, end, rates)?.price;
const charging =
price < this.selectedSmartCostLimit && this.selectedSmartCostLimit !== 0;
price <= this.selectedSmartCostLimit && this.selectedSmartCostLimit !== 0;
const selectable = price !== undefined;
result.push({ day, price, startHour, endHour, charging, selectable });
}
@ -321,7 +321,7 @@ export default {
this.selectedSmartCostLimit = 0;
return;
}
const nextOption = this.costOptions.find(({ value }) => value > limit);
const nextOption = this.costOptions.find(({ value }) => value >= limit);
if (nextOption) {
this.selectedSmartCostLimit = nextOption.value;
}

4
i18n/de.toml
View file

@ -282,8 +282,8 @@ vehicleTarget = "Fahrzeuglimit: {soc}%"
[main.vehicleStatus]
charging = "Ladevorgang aktiv …"
cheapEnergyCharging = "Lade günstige Energie: {price} (Grenze < {limit})"
cleanEnergyCharging = "Lade saubere Energie: {co2} (Grenze < {limit})"
cheapEnergyCharging = "Lade günstige Energie: {price} (Grenze {limit})"
cleanEnergyCharging = "Lade saubere Energie: {co2} (Grenze {limit})"
climating = "Vorklimatisierung erkannt."
connected = "Verbunden."
disconnected = "Nicht verbunden."

4
i18n/en.toml
View file

@ -279,8 +279,8 @@ vehicleTarget = "Vehicle limit: {soc}%"
[main.vehicleStatus]
charging = "Charging…"
cheapEnergyCharging = "Charging cheap energy: {price} (limit < {limit})"
cleanEnergyCharging = "Charging clean energy: {co2} (limit < {limit})"
cheapEnergyCharging = "Charging cheap energy: {price} (limit {limit})"
cleanEnergyCharging = "Charging clean energy: {co2} (limit {limit})"
climating = "Pre-conditioning detected."
connected = "Connected."
disconnected = "Disconnected."

4
i18n/es.toml
View file

@ -286,8 +286,8 @@ vehicleTarget = "límite de vehículo: {soc}%"
[main.vehicleStatus]
charging = "Cargando ..."
cheapEnergyCharging = "Cargando con energía barata: {price} (limit < {limit})"
cleanEnergyCharging = "Cargando con energía limpia: {co2} (limit < {limit})"
cheapEnergyCharging = "Cargando con energía barata: {price} (limit {limit})"
cleanEnergyCharging = "Cargando con energía limpia: {co2} (limit {limit})"
climating = "Preacondicionamiento detectado."
connected = "Conectado."
disconnected = "Desconectado."

4
i18n/lt.toml
View file

@ -286,8 +286,8 @@ vehicleTarget = "Automobilyje nustatytas limitas: {soc}%"
[main.vehicleStatus]
charging = "Įkraunama..."
cheapEnergyCharging = "Įkraunama pigia energija: {price} (limit < {limit})"
cleanEnergyCharging = "Įkraunama švaria energija: {co2} (limit < {limit})"
cheapEnergyCharging = "Įkraunama pigia energija: {price} (limit {limit})"
cleanEnergyCharging = "Įkraunama švaria energija: {co2} (limit {limit})"
climating = "Aptiktas išankstinis kondicionavimas."
connected = "Prijungtas."
disconnected = "Neprijungtas."

4
i18n/pt.toml
View file

@ -286,8 +286,8 @@ vehicleTarget = "Limite de veículo: {soc}%"
[main.vehicleStatus]
charging = "Carregando..."
cheapEnergyCharging = "Carregando energia barata: {price} (limit < {limit})"
cleanEnergyCharging = "Carregando energia limpa: {co2} (limit < {limit})"
cheapEnergyCharging = "Carregando energia barata: {price} (limit {limit})"
cleanEnergyCharging = "Carregando energia limpa: {co2} (limit {limit})"
climating = "Pré-condicionamento detectado."
connected = "Ligado."
disconnected = "Não conectado."