Skip to content

Eco graph fix #3331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benderl merged 3 commits into from
Apr 28, 2026
Merged

Eco graph fix #3331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3715611
Koala Eco settings buttons visibility
Brett-S-OWB Apr 27, 2026
d319879
remove chart animation to allow correct chart rendering
Brett-S-OWB Apr 27, 2026
1b6e85e
Refactor component - Eco settings
Brett-S-OWB Apr 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 22 additions & 25 deletions packages/modules/web_themes/koala/source/src/components/ChargePointEcoSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
:max="16"
:step="1"
unit="A"
v-model="current.value"
v-model="current"
class="q-mt-md"
/>

Expand All @@ -30,11 +30,11 @@
<q-btn
v-for="option in phaseOptions"
:key="option.value"
:color="numPhases.value === option.value ? 'primary' : 'grey'"
:color="numPhases === option.value ? 'primary' : 'grey'"
:label="option.label"
size="sm"
class="col"
@click="numPhases.value = option.value"
@click="numPhases = option.value"
/>
</q-btn-group>
</div>
Expand All @@ -46,75 +46,69 @@
<div class="row no-wrap items-center justify-between q-mb-xs q-gutter-x-xs">
<div class="col-auto">
<q-btn
v-if="maxPrice.value"
class="col-auto q-mr-xs disable-zoom"
label="-1,00"
color="grey"
size="sm"
dense
@click="maxPrice.value = maxPrice.value - 1"
@click="modifyMaxPrice(-1)"
/>
<q-btn
v-if="maxPrice.value"
class="col-auto q-mr-xs disable-zoom"
label="-0,10"
color="grey"
size="sm"
dense
@click="maxPrice.value = maxPrice.value - 0.1"
@click="modifyMaxPrice(-0.1)"
/>
<q-btn
v-if="maxPrice.value"
class="col-auto disable-zoom"
label="-0,01"
color="grey"
size="sm"
dense
@click="maxPrice.value = maxPrice.value - 0.01"
@click="modifyMaxPrice(-0.01)"
/>
</div>
<div class="col-auto q-mx-sm">
{{
maxPrice.value?.toLocaleString(undefined, {
maxPrice?.toLocaleString(undefined, {
minimumFractionDigits: 2,
maximumFractionDigits: 2,
}) + ' ct/kWh'
}}
</div>
<div class="col-auto">
<q-btn
v-if="maxPrice.value"
class="col-auto q-mr-xs disable-zoom"
label="+0,01"
color="grey"
size="sm"
dense
@click="maxPrice.value = maxPrice.value + 0.01"
@click="modifyMaxPrice(0.01)"
/>
<q-btn
v-if="maxPrice.value"
class="col-auto q-mr-xs disable-zoom"
label="+0,10"
color="grey"
size="sm"
dense
@click="maxPrice.value = maxPrice.value + 0.1"
@click="modifyMaxPrice(0.1)"
/>
<q-btn
v-if="maxPrice.value"
class="col-auto disable-zoom"
label="+1,00"
color="grey"
size="sm"
dense
@click="maxPrice.value = maxPrice.value + 1"
@click="modifyMaxPrice(1)"
/>
</div>
</div>
<q-field filled class="q-mt-sm">
<ElectricityTariffChart
:modelValue="maxPrice.value"
@update:modelValue="maxPrice.value = $event"
:modelValue="maxPrice"
@update:modelValue="maxPrice = $event"
/>
</q-field>
</div>
Expand All @@ -132,15 +126,14 @@ const props = defineProps<{

const mqttStore = useMqttStore();


const phaseOptions = [
{ value: 1, label: '1' },
{ value: 3, label: 'Maximum' },
{ value: 0, label: 'Automatik' },
];

const current = computed(() =>
mqttStore.chargePointConnectedVehicleEcoChargeCurrent(props.chargePointId),
const current = mqttStore.chargePointConnectedVehicleEcoChargeCurrent(
props.chargePointId,
);

const dcChargingEnabled = computed(
Expand All @@ -155,15 +148,19 @@ const dcPower = computed(() =>
mqttStore.chargePointConnectedVehicleEcoChargeDcPower(props.chargePointId),
);

const numPhases = computed(() =>
mqttStore.chargePointConnectedVehicleEcoChargePhases(props.chargePointId),
const numPhases = mqttStore.chargePointConnectedVehicleEcoChargePhases(
props.chargePointId,
);

const etConfigured = computed(() => mqttStore.etProviderConfigured);

const maxPrice = computed(() =>
mqttStore.chargePointConnectedVehicleEcoChargeMaxPrice(props.chargePointId),
const maxPrice = mqttStore.chargePointConnectedVehicleEcoChargeMaxPrice(
props.chargePointId,
);

const modifyMaxPrice = (delta: number) => {
maxPrice.value = (maxPrice.value || 0) + delta;
};
</script>

<style scoped>
Expand Down
1 change: 1 addition & 0 deletions packages/modules/web_themes/koala/source/src/components/ElectricityTariffChart.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ const myChartOptions = computed<ChartOptions<'line'>>(() => {
mode: 'index',
intersect: false,
},
animation: false,
scales: {
x: {
type: 'time',
Expand Down
2 changes: 1 addition & 1 deletion packages/modules/web_themes/koala/source/src/stores/mqtt-store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1984,7 +1984,7 @@ export const useMqttStore = defineStore('mqtt', () => {
/**
* Get or set the charge point connected vehicle eco charging max price identified by the charge point id
* @param chargePointId charge point id
* @returns string | undefined
* @returns number | undefined
*/
const chargePointConnectedVehicleEcoChargeMaxPrice = (
chargePointId: number,
Expand Down
Loading