Skip to content

Colors theme fix, car selection #2582

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 2 commits into from
Jul 21, 2025
Merged

Colors theme fix, car selection #2582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7cd90b
fix phase selection
cshagen Jul 19, 2025
50e22ed
add car selector to chargepoint
cshagen Jul 20, 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
28 changes: 27 additions & 1 deletion packages/modules/web_themes/colors/source/src/components/chargePointList/CPChargePoint.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,13 @@
<div
class="carTitleLine d-flex justify-content-between align-items-center"
>
<h3 @click="configmode = !configmode">
<h3 @click="changeCar = !changeCar">
<i class="fa-solid fa-sm fa-car me-2" />
{{ chargepoint.vehicleName }}
<span
class="fa-solid fa-xs me-2"
:class="changeCar ? 'fa-caret-up' : 'fa-caret-down'"
/>
<span
v-if="chargepoint.hasPriority"
class="me-1 fa-solid fa-xs fa-star ps-1"
Expand Down Expand Up @@ -97,6 +101,18 @@
/>
</WbBadge>
</div>
<div v-if="changeCar" class="carSelector p-4 m-2">
<span class="changeCarTitle mb-2">Fahrzeug wechseln:</span>
<RadioInput2
v-model.number="cp.connectedVehicle"
:options="
Object.values(vehicles)
.filter((v) => v.visible)
.map((v) => [v.name, v.id])
"
@update:model-value="changeCar = false"
/>
</div>
</div>
</div>
<div class="grid12">
Expand Down Expand Up @@ -303,6 +319,7 @@ import BatterySymbol from '@/components/shared/BatterySymbol.vue'
import FormatWatt from '@/components/shared/FormatWatt.vue'
import FormatWattH from '../shared/FormatWattH.vue'
import RadioBarInput from '@/components/shared/RadioBarInput.vue'
import RadioInput2 from '@/components/shared/RadioInput2.vue'
import WbWidgetFlex from '../shared/WbWidgetFlex.vue'
import WbBadge from '../shared/WbBadge.vue'
import { updateServer } from '@/assets/js/sendMessages'
Expand All @@ -316,6 +333,8 @@ const props = defineProps<{
fullWidth?: boolean
}>()
const cp = ref(props.chargepoint)
const changeCar = ref(false)

// computed
const chargeMode = computed({
get() {
Expand Down Expand Up @@ -511,4 +530,11 @@ const editPrice = ref(false)
grid-column: 11 / span 2;
font-size: var(--font-settings-button);
}
.carSelector {
border: 1px solid var(--color-menu);
font-size: var(--font-settings);
border-radius: 3px;
display: flex;
flex-direction: column;
}
</style>
4 changes: 2 additions & 2 deletions .../modules/web_themes/colors/source/src/components/chargePointList/cpConfig/CPConfigEco.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<!-- Number of phases -->
<ConfigItem title="Anzahl Phasen" icon="fa-plug" :fullwidth="true">
<RadioInput2
v-model="cp.instantTargetPhases"
v-model="cp.ecoTargetPhases"
:options="[
['1', 1],
['Maximum', 3],
Expand All @@ -54,7 +54,7 @@
>
<RangeInput
id="maxSoc"
v-model="cp.pvTargetSoc"
v-model="cp.ecoTargetSoc"
:min="0"
:max="100"
:step="1"
Expand Down
6 changes: 5 additions & 1 deletion packages/modules/web_themes/colors/source/src/components/shared/RadioInput2.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,11 @@ function setValue(event: Event) {
element = element.parentElement as HTMLButtonElement
}
if (element.value) {
v.value = element.value
if (typeof props.options[0][1] === 'number') {
v.value = Number(element.value)
} else {
v.value = element.value
}
}
}
</script>
Expand Down
6 changes: 0 additions & 6 deletions packages/modules/web_themes/colors/web/assets/index-24E0MHp8.js
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions packages/modules/web_themes/colors/web/assets/index-CkWKKaPO.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...emes/colors/web/assets/index-amqPjbg6.css → ...emes/colors/web/assets/index-sPhFg7OR.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/modules/web_themes/colors/web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
<link rel="apple-touch-icon" sizes="60x60" href="/openWB/web/img/favicons/apple-touch-icon-60x60.png">
<link rel="manifest" href="/openWB/web/manifest.json">
<title>openWB</title>
<script type="module" crossorigin src="/openWB/web/themes/colors/assets/index-24E0MHp8.js"></script>
<script type="module" crossorigin src="/openWB/web/themes/colors/assets/index-CkWKKaPO.js"></script>
<link rel="modulepreload" crossorigin href="/openWB/web/themes/colors/assets/vendor-CmSLe-Fc.js">
<link rel="stylesheet" crossorigin href="/openWB/web/themes/colors/assets/index-amqPjbg6.css">
<link rel="stylesheet" crossorigin href="/openWB/web/themes/colors/assets/index-sPhFg7OR.css">
</head>

<body>
Expand Down