Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,6 @@
v-if="chargepoint.hasPriority"
class="me-1 fa-solid fa-xs fa-star ps-1"
/>
<span
v-if="chargepoint.etActive"
class="me-1 fa-solid fa-xs fa-coins ps-0"
/>
<span
v-if="chargepoint.timedCharging"
class="me-0 fa-solid fa-xs fa-clock ps-1"
Expand Down Expand Up @@ -463,10 +459,6 @@ const editPrice = ref(false)
color: var(--color-menu);
}

.fa-coins {
color: var(--color-battery);
}

.socEditor {
border: 1px solid var(--color-menu);
justify-self: stretch;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<template>
<div class="pt-2 d-flex flex-column">
<div class="heading ms-1">Eco-Laden:</div>
<PriceChart :chargepoint="cp as ChargePoint" />
<!-- Min+PV-Laden -->
<PriceChart v-if="etData.active" :chargepoint="cp as ChargePoint" />

<!-- Minimal current -->
<ConfigItem
v-if="etData.active"
title="Minimaler Ladestrom unter der Preisgrenze:"
icon="fa-bolt"
:fullwidth="true"
Expand All @@ -23,13 +25,26 @@
</div>
</ConfigItem>

<!-- Number of phases -->
<ConfigItem title="Anzahl Phasen" icon="fa-plug" :fullwidth="true">
<RadioInput2
v-model="cp.instantTargetPhases"
:options="[
['Eine', 1],
['Alle', 3],
['Auto', 0],
]"
/>
</ConfigItem>

<!-- Limit Mode -->
<ConfigItem title="Begrenzung" icon="fa-hand" :fullwidth="true">
<RadioInput2
v-model="cp.ecoChargeLimitMode"
:options="chargeLimitModes.map((e) => [e.name, e.id])"
/>
</ConfigItem>

<!-- Max SoC -->
<ConfigItem
v-if="cp.ecoChargeLimitMode == 'soc'"
Expand Down Expand Up @@ -69,6 +84,7 @@
<script setup lang="ts">
import { ref, computed } from 'vue'
import { type ChargePoint, chargeLimitModes } from '../model'
import { etData } from '@/components/priceChart/model'
import ConfigItem from '../../shared/ConfigItem.vue'
import RangeInput from '@/components/shared/RangeInput.vue'
//import SwitchInput from '@/components/shared/SwitchInput.vue'
Expand Down Expand Up @@ -96,7 +112,7 @@ const energyLimit = computed({
}

.heading {
color: var(--color-pv);
color: var(--color-devices);
font-size: var(--font-settings);
font-weight: bold;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,19 @@
/>
</ConfigItem>
<ConfigItem title="Anzahl Phasen" icon="fa-plug" :fullwidth="true">
<RadioInput
<RadioInput2
v-model="cp.instantTargetPhases"
:options="[
['Eine', 1],
['Alle', 3],
['Auto', 0],
]"
/>
</ConfigItem>
<hr v-if="cp.instantChargeLimitMode != 'none'" />
<!-- Limit Mode -->
<ConfigItem title="Begrenzung" icon="fa-hand" :fullwidth="true">
<RadioInput
<RadioInput2
v-model="cp.instantChargeLimitMode"
:options="chargeLimitModes.map((e) => [e.name, e.id])"
/>
Expand Down Expand Up @@ -72,7 +73,7 @@ import { computed, ref } from 'vue'
import { type ChargePoint, chargeLimitModes } from '../model'
import ConfigItem from '../../shared/ConfigItem.vue'
import RangeInput from '@/components/shared/RangeInput.vue'
import RadioInput from '@/components/shared/RadioInput.vue'
import RadioInput2 from '@/components/shared/RadioInput2.vue'
const props = defineProps<{
chargepoint: ChargePoint
}>()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
v-model="cp.pvTargetPhases"
:options="[
['1', 1],
['Maximum', 3],
['Automatik', 0],
['Alle', 3],
['Auto', 0],
]"
/>
</ConfigItem>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,10 @@ const nameY = computed(() => {
)
case 1:
index = graphData.data.length - 1
return Math.max (12, yScale.value(
graphData.data[index]['soc' + topVehicles.value[1]] + 2,
))
return Math.max(
12,
yScale.value(graphData.data[index]['soc' + topVehicles.value[1]] + 2),
)
case 2:
index = Math.round(graphData.data.length / 2)
return yScale.value(graphData.data[index].batSoc + 2)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ function getColors(index: number) {
const fg = props.options[index][2] || 'var(--color-fg)'
const bg = 'var(--color-bg)'
if (props.options[index][1] == v.value) {
return { color: fg, background: 'var(--color-menu)' }
return {
color: bg,
background: props.options[index][2] || 'var(--color-menu)',
}
} else {
return { color: fg, background: bg }
}
Expand Down

Large diffs are not rendered by default.

This file was deleted.

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/modules/web_themes/colors/web/index.html
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-C0V3o4mh.js"></script>
<script type="module" crossorigin src="/openWB/web/themes/colors/assets/index-5WLEKoXm.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-Dt5u90of.css">
<link rel="stylesheet" crossorigin href="/openWB/web/themes/colors/assets/index-CQ1x0KFk.css">
</head>

<body>
Expand Down