Skip to content

Commit cf66ed9

Browse files
authored
own section for Identification (openWB#745)
* own page for rfid * own page for rfid * fix * remove unused functions * add vehicle list * adjust vehicle layout * remove unused functions; remove disable_after_unplug Buttons * improve UI * improve helptexts * deactivate CP identification * Add helptexts and cleanup code * adjust helptexts; rename page * change export name * fix errors * unterminated string * fix * fix * fix * improve helptext * remove IDs * add comment * package * remove openwb-base-array * remove unused import
1 parent dab2fea commit cf66ed9

File tree

7 files changed

+418
-136
lines changed

7 files changed

+418
-136
lines changed

src/components/OpenwbBaseArrayInput.vue

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
<slot name="help" />
1313
</template>
1414
<template #default>
15-
<div class="w-100">
15+
<div
16+
v-if="!noInput"
17+
class="w-100"
18+
>
1619
<div class="input-group">
1720
<div class="input-group-prepend">
1821
<div class="input-group-text">
@@ -60,6 +63,7 @@
6063
</slot>
6164
{{ tag }}
6265
<font-awesome-icon
66+
v-if="!noInput"
6367
class="clickable remove-element"
6468
:icon="['fas', 'times-circle']"
6569
@click="removeTag(index)"
@@ -105,6 +109,12 @@ export default {
105109
return "Keine Elemente zugeordnet.";
106110
},
107111
},
112+
noInput: {
113+
type: Boolean,
114+
default: () => {
115+
return false;
116+
},
117+
},
108118
},
109119
emits: ["update:modelValue"],
110120
data() {

src/components/OpenwbPageNavbar.vue

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,14 @@
8686
class="dropdown-item"
8787
active-class="active disabled"
8888
>
89-
Optionale Hardware
89+
Display
90+
</router-link>
91+
<router-link
92+
to="/IdentificationConfig"
93+
class="dropdown-item"
94+
active-class="active disabled"
95+
>
96+
Identifikation
9097
</router-link>
9198
</div>
9299
</li>

src/router/index.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,19 @@ const routes = [
3838
},
3939
component: () => import("../views/GeneralConfig.vue"),
4040
},
41+
{
42+
path: "/IdentificationConfig",
43+
name: "IdentificationConfig",
44+
meta: {
45+
heading: "Einstellungen - Identifikation",
46+
},
47+
component: () => import("../views/IdentificationConfig.vue"),
48+
},
4149
{
4250
path: "/OptionalComponents",
4351
name: "OptionalComponents",
4452
meta: {
45-
heading: "Einstellungen - Optionale Hardware",
53+
heading: "Einstellungen - Display",
4654
},
4755
component: () => import("../views/OptionalComponents.vue"),
4856
},

src/views/ChargePointInstallation.vue

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -287,37 +287,35 @@
287287
/>
288288
<hr />
289289
<openwb-base-heading> Zugangskontrolle </openwb-base-heading>
290-
<openwb-base-button-group-input
291-
title="Sperre nach Abstecken"
292-
:buttons="[
293-
{
294-
buttonValue: false,
295-
text: 'Nein',
296-
class: 'btn-outline-danger',
297-
},
298-
{
299-
buttonValue: true,
300-
text: 'Ja',
301-
class: 'btn-outline-success',
302-
},
303-
]"
304-
:model-value="chargePointTemplate.disable_after_unplug"
305-
@update:model-value="updateState(chargePointTemplateKey, $event, 'disable_after_unplug')"
306-
>
307-
<template #help> Sperrt den Ladepunkt nach Abstecken eines Fahrzeuges. </template>
308-
</openwb-base-button-group-input>
309-
<div v-if="$store.state.mqtt['openWB/optional/rfid/active'] === true && !installAssistantActive">
290+
<div v-if="chargePointTemplate.valid_tags.length > 0">
291+
<openwb-base-alert subtype="info">
292+
Einstellungen zur Zugangskontrolle finden sich unter
293+
<router-link to="/IdentificationConfig"> Einstellungen - Identifikation </router-link>.
294+
<div
295+
v-if="
296+
$store.state.mqtt['openWB/optional/rfid/active'] === true &&
297+
chargePointTemplate.disable_after_unplug
298+
"
299+
>
300+
Die Option ist aktiv. Ladepunkte denen dieses Ladepunkt-Profil zugeordnet ist müssen per ID-Tag
301+
entsperrt werden.
302+
</div>
303+
<div v-else>Aktuell ist die Option in den Einstellungen deaktiviert.</div>
304+
Dem Ladepunkt-Profil sind folgende ID-Tags zum Entsperren zugeordnet:
305+
</openwb-base-alert>
310306
<openwb-base-array-input
311-
v-if="chargePointTemplate.disable_after_unplug"
312307
title="Zugeordnete ID-Tags"
313-
no-elements-message="Keine ID-Tags zugeordnet."
308+
no-elements-message="Keine keine ID-Tags zugeordnet."
309+
no-input="true"
314310
:model-value="chargePointTemplate.valid_tags"
315-
@update:model-value="updateState(chargePointTemplateKey, $event, 'valid_tags')"
316-
>
317-
<template #help>
318-
Die hier eingetragenen ID-Tags dienen ausschließlich zum Entsperren des Ladepunktes.
319-
</template>
320-
</openwb-base-array-input>
311+
/>
312+
</div>
313+
<div v-else>
314+
<openwb-base-alert subtype="info">
315+
Einstellungen zur Zugangskontrolle finden sich unter
316+
<router-link to="/IdentificationConfig"> Einstellungen - Identifikation </router-link>.<br />
317+
Dem Ladepunkt-Profil sind aktuell keine ID-Tags zum Entsperren zugeordnet.
318+
</openwb-base-alert>
321319
</div>
322320
<hr />
323321
<openwb-base-heading> Angaben zum konfigurierten Ladestrom der openWB </openwb-base-heading>

0 commit comments

Comments
 (0)