Skip to content

Build UI #2430

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 4 commits into from
Jun 3, 2025
Merged

Build UI #2430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
748c484
build settings
benderl Jun 3, 2025
94afa45
standard-legacy web theme fixes
benderl Jun 3, 2025
6c28162
cards display theme fixes
benderl Jun 3, 2025
a849d1a
cards display npm updates
benderl Jun 3, 2025
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
791 changes: 421 additions & 370 deletions packages/modules/display_themes/cards/source/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions packages/modules/display_themes/cards/source/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"mqtt": "^5.13.0",
"node-stdlib-browser": "^1.3.1",
"pinia": "^3.0.2",
"vue": "^3.5.14",
"vue": "^3.5.16",
"vue-chartjs": "^5.3.2",
"vue-router": "^4.5.1"
},
Expand All @@ -36,16 +36,16 @@
"@vitejs/plugin-vue": "^5.2.4",
"@vue/eslint-config-prettier": "^10.2.0",
"@vue/test-utils": "^2.4.6",
"eslint": "^9.27.0",
"eslint": "^9.28.0",
"eslint-plugin-vue": "^10.1.0",
"jsdom": "^26.1.0",
"postcss": "^8.5.3",
"postcss-preset-env": "^10.1.6",
"postcss": "^8.5.4",
"postcss-preset-env": "^10.2.0",
"prettier": "^3.5.3",
"rollup-plugin-polyfill-node": "^0.13.0",
"sass": "^1.89.0",
"sass": "^1.89.1",
"vite": "^5.4.19",
"vite-plugin-node-polyfills": "^0.23.0",
"vitest": "^3.1.4"
"vitest": "^3.2.0"
}
}
3 changes: 2 additions & 1 deletion packages/modules/display_themes/cards/source/src/views/ChargePointsView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,7 @@ export default {
name="tab-eco-charging"
>
<i-form>
<i-form-group>
<i-form-group v-if="mqttStore.getEtConfigured">
<i-form-label>Minimaler Dauerstrom unter Preisgrenze</i-form-label>
<extended-number-input
unit="A"
Expand Down Expand Up @@ -1260,6 +1260,7 @@ export default {
),
).length === 0
"
color="warning"
>
<template #icon>
<font-awesome-icon
Expand Down
100 changes: 51 additions & 49 deletions packages/modules/web_themes/standard_legacy/web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,52 +1013,71 @@ <h3 class="mb-0">Einstellungen für "Ziel"</h3>
<!-- Eco -->
<div class="chargemode-options chargemode-option-eco_charging">
<h3>Einstellungen für "Eco"</h3>
<div class="form-row vaRow mb-0">
<div class="col">
Minimaler Dauerstrom unter der Preisgrenze
</div>
<div class="col-md-8">
<div class="form-row form-group mb-1 vaRow">
<div class="et et-configured hide">
<div class="charge-point-charge-mode-options mb-0 hide">
<div class="form-row mb-1">
<div class="col">
<input type="range"
class="charge-point-eco-charge-current form-control-range rangeInput"
id="currentEcoChargeCpT"
data-topic="openWB/set/chargepoint/<cp>/set/charge_template"
data-object="chargeTemplate"
data-object-path="chargemode.eco_charging.current"
min="6" max="32" step="1">
<i class="fas fa-coins"></i>
Preisgrenze für strompreisbasiertes Laden
</div>
<div class="col-md-8 text-right">
<button type="button"
class="charge-point-eco-charge-max_price-button btn btn-sm btn-secondary btn-block"
data-max-price="">
<span class="charge-point-eco-charge-max_price">
--
</span>&nbsp;ct/kWh
</button>
</div>
<label for="currentEcoChargeCpT"
class="col-2 col-form-label valueLabel text-right" data-suffix="A">
-- A
</label>
</div>
</div>
</div>
<div class="dc-charging-configured hide">
<div class="form-row vaRow mb-0">
<div class="col">
Minimale Dauerleistung unter der Preisgrenze
Minimaler Dauerstrom unter der Preisgrenze
</div>
<div class="col-md-8">
<div class="form-row form-group mb-1 vaRow">
<div class="col">
<input type="range"
class="charge-point-eco-charge-dc-current form-control-range rangeInput"
id="dcCurrentEcoChargeCpT"
data-transformation='{ "in": "(<v> * 3 * 230) / 1000", "out": "(<v> * 1000) / 230 / 3" }'
class="charge-point-eco-charge-current form-control-range rangeInput"
id="currentEcoChargeCpT"
data-topic="openWB/set/chargepoint/<cp>/set/charge_template"
data-object="chargeTemplate"
data-object-path="chargemode.eco_charging.dc_current"
min="4" max="300" step="1">
data-object-path="chargemode.eco_charging.current"
min="6" max="32" step="1">
</div>
<label for="dcCurrentEcoChargeCpT"
class="col-2 col-form-label valueLabel text-right" data-suffix="kW">
-- kW
<label for="currentEcoChargeCpT"
class="col-2 col-form-label valueLabel text-right" data-suffix="A">
-- A
</label>
</div>
</div>
</div>
<div class="dc-charging-configured hide">
<div class="form-row vaRow mb-0">
<div class="col">
Minimale Dauerleistung unter der Preisgrenze
</div>
<div class="col-md-8">
<div class="form-row form-group mb-1 vaRow">
<div class="col">
<input type="range"
class="charge-point-eco-charge-dc-current form-control-range rangeInput"
id="dcCurrentEcoChargeCpT"
data-transformation='{ "in": "(<v> * 3 * 230) / 1000", "out": "(<v> * 1000) / 230 / 3" }'
data-topic="openWB/set/chargepoint/<cp>/set/charge_template"
data-object="chargeTemplate"
data-object-path="chargemode.eco_charging.dc_current"
min="4" max="300" step="1">
</div>
<label for="dcCurrentEcoChargeCpT"
class="col-2 col-form-label valueLabel text-right" data-suffix="kW">
-- kW
</label>
</div>
</div>
</div>
</div>
</div>
<div class="form-row vaRow mb-1">
<div class="col">
Expand Down Expand Up @@ -1148,25 +1167,6 @@ <h3>Einstellungen für "Eco"</h3>
</div>
</div>
</div>
<div class="et et-configured hide">
<div class="charge-point-charge-mode-options mb-0 hide">
<div class="form-row mb-1">
<div class="col">
<i class="fas fa-coins"></i>
Preisgrenze für strompreisbasiertes Laden
</div>
<div class="col-md-8 text-right">
<button type="button"
class="charge-point-eco-charge-max_price-button btn btn-sm btn-secondary btn-block"
data-max-price="">
<span class="charge-point-eco-charge-max_price">
--
</span>&nbsp;ct/kWh
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -1366,8 +1366,10 @@ <h4 class="modal-title">
submitPriceForm();
});

$('#electricityPriceChartCanvas').click(function (event) {
const points = window.electricityPricechart.getElementsAtEventForMode(event, 'index', { intersect: false }, true);
$('#electricityPriceChartCanvas').click((event) => {
console.log('click on electricity price chart', event);
// get the clicked point in the chart
const points = window.electricityPriceChart.getElementsAtEventForMode(event, 'index', { intersect: false }, true);
if (points.length > 0){
$('#maxPriceBox').val(Math.ceil(points[0].element.$context.raw.price * 100) / 100);
updatePriceChart();
Expand Down
Loading