Skip to content

Commit a66fc55

Browse files
benderlbenderl
committed
fix visibility of options in secondary mode
1 parent 246f3c2 commit a66fc55

8 files changed

+500
-573
lines changed

‎src/views/ChargeLog.vue

+278-270
Large diffs are not rendered by default.

‎src/views/Chart.vue

+96-88
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,115 @@
11
<template>
22
<div class="chart">
3-
<form name="chartForm">
4-
<openwb-base-card
5-
title="Filter"
6-
:collapsible="true"
7-
:collapsed="false"
8-
>
9-
<openwb-base-select-input
10-
v-model="chartRange"
11-
title="Zeitraum"
12-
:options="[
13-
{ value: 'day', text: 'Tag' },
14-
{ value: 'month', text: 'Monat' },
15-
{ value: 'year', text: 'Jahr' },
16-
]"
17-
/>
18-
<openwb-base-text-input
19-
v-model="chartDate"
20-
:title="dateInput.title"
21-
:subtype="dateInput.type"
22-
:min="dateInput.min"
23-
:max="currentDate"
24-
:show-quick-buttons="true"
25-
@update:model-value="updateChart()"
26-
/>
27-
</openwb-base-card>
28-
<openwb-base-alert
29-
v-if="!chartDataRead"
30-
subtype="info"
31-
>
32-
Es wurden noch keine Daten abgerufen.
3+
<div v-if="$store.state.mqtt['openWB/general/extern'] === true">
4+
<openwb-base-alert subtype="info">
5+
Die Auswertungen sind nicht verfügbar, solange sich diese openWB im Steuerungsmodus "secondary" befindet. Du
6+
findest alle Auswertungen in der openWB, welche sich im Steuerungsmodus "primary" befindet.
337
</openwb-base-alert>
34-
<div v-else>
8+
</div>
9+
<div v-else>
10+
<form name="chartForm">
11+
<openwb-base-card
12+
title="Filter"
13+
:collapsible="true"
14+
:collapsed="false"
15+
>
16+
<openwb-base-select-input
17+
v-model="chartRange"
18+
title="Zeitraum"
19+
:options="[
20+
{ value: 'day', text: 'Tag' },
21+
{ value: 'month', text: 'Monat' },
22+
{ value: 'year', text: 'Jahr' },
23+
]"
24+
/>
25+
<openwb-base-text-input
26+
v-model="chartDate"
27+
:title="dateInput.title"
28+
:subtype="dateInput.type"
29+
:min="dateInput.min"
30+
:max="currentDate"
31+
:show-quick-buttons="true"
32+
@update:model-value="updateChart()"
33+
/>
34+
</openwb-base-card>
3535
<openwb-base-alert
36-
v-if="!chartDataHasEntries"
36+
v-if="!chartDataRead"
3737
subtype="info"
3838
>
39-
Es konnten keine Daten für diesen Zeitraum gefunden werden.
39+
Es wurden noch keine Daten abgerufen.
4040
</openwb-base-alert>
4141
<div v-else>
42-
<openwb-base-card
43-
title="Diagramm"
44-
:collapsible="true"
45-
:collapsed="false"
46-
>
47-
<div class="openwb-chart">
48-
<chartjs-line
49-
ref="myChart"
50-
:data="chartData"
51-
:options="chartOptions"
52-
@click="handleChartClick"
53-
/>
54-
</div>
55-
</openwb-base-card>
56-
<openwb-base-card
57-
title="Summen"
58-
:collapsible="true"
59-
:collapsed="true"
42+
<openwb-base-alert
43+
v-if="!chartDataHasEntries"
44+
subtype="info"
6045
>
61-
<div
62-
v-for="(group, groupKey) in chartTotals"
63-
:key="groupKey"
46+
Es konnten keine Daten für diesen Zeitraum gefunden werden.
47+
</openwb-base-alert>
48+
<div v-else>
49+
<openwb-base-card
50+
title="Diagramm"
51+
:collapsible="true"
52+
:collapsed="false"
53+
>
54+
<div class="openwb-chart">
55+
<chartjs-line
56+
ref="myChart"
57+
:data="chartData"
58+
:options="chartOptions"
59+
@click="handleChartClick"
60+
/>
61+
</div>
62+
</openwb-base-card>
63+
<openwb-base-card
64+
title="Summen"
65+
:collapsible="true"
66+
:collapsed="true"
6467
>
65-
<openwb-base-card
66-
v-if="Object.keys(group).length > 0"
67-
:collapsible="true"
68-
:collapsed="true"
69-
:subtype="getCardSubtype(groupKey)"
68+
<div
69+
v-for="(group, groupKey) in chartTotals"
70+
:key="groupKey"
7071
>
71-
<template #header>
72-
<font-awesome-icon
73-
fixed-width
74-
:icon="getCardIcon(groupKey)"
75-
/>
76-
{{ getTotalsLabel(groupKey) }}
77-
</template>
78-
<div
79-
v-for="(component, componentKey) in group"
80-
:key="componentKey"
72+
<openwb-base-card
73+
v-if="Object.keys(group).length > 0"
74+
:collapsible="true"
75+
:collapsed="true"
76+
:subtype="getCardSubtype(groupKey)"
8177
>
82-
<openwb-base-heading v-if="groupKey !== 'hc'">
83-
{{ getTotalsLabel(groupKey, componentKey) }}
84-
</openwb-base-heading>
78+
<template #header>
79+
<font-awesome-icon
80+
fixed-width
81+
:icon="getCardIcon(groupKey)"
82+
/>
83+
{{ getTotalsLabel(groupKey) }}
84+
</template>
8585
<div
86-
v-for="(measurement, measurementKey) in component"
87-
:key="measurementKey"
86+
v-for="(component, componentKey) in group"
87+
:key="componentKey"
8888
>
89-
<openwb-base-text-input
90-
:title="getTotalsLabel(groupKey, componentKey, measurementKey)"
91-
readonly
92-
class="text-right"
93-
unit="kWh"
94-
:model-value="formatNumber(measurement / 1000, 3)"
95-
/>
89+
<openwb-base-heading v-if="groupKey !== 'hc'">
90+
{{ getTotalsLabel(groupKey, componentKey) }}
91+
</openwb-base-heading>
92+
<div
93+
v-for="(measurement, measurementKey) in component"
94+
:key="measurementKey"
95+
>
96+
<openwb-base-text-input
97+
:title="getTotalsLabel(groupKey, componentKey, measurementKey)"
98+
readonly
99+
class="text-right"
100+
unit="kWh"
101+
:model-value="formatNumber(measurement / 1000, 3)"
102+
/>
103+
</div>
104+
<hr v-if="componentKey == 'all' && groupKey != 'hc'" />
96105
</div>
97-
<hr v-if="componentKey == 'all' && groupKey != 'hc'" />
98-
</div>
99-
</openwb-base-card>
100-
</div>
101-
</openwb-base-card>
106+
</openwb-base-card>
107+
</div>
108+
</openwb-base-card>
109+
</div>
102110
</div>
103-
</div>
104-
</form>
111+
</form>
112+
</div>
105113
</div>
106114
</template>
107115

‎src/views/CloudConfig.vue

+1-100
Original file line numberDiff line numberDiff line change
@@ -48,103 +48,7 @@
4848
</a>
4949
.
5050
</openwb-base-alert>
51-
<openwb-base-text-input
52-
v-model="newCloudData.username"
53-
title="Benutzername"
54-
required
55-
subtype="user"
56-
pattern="[a-zA-Z]+"
57-
disabled
58-
/>
59-
<openwb-base-text-input
60-
v-model="newCloudData.email"
61-
title="E-Mail"
62-
required
63-
subtype="email"
64-
disabled
65-
/>
66-
<openwb-base-button-group-input
67-
v-model="newCloudData.partner"
68-
disabled
69-
title="Zugang für Partner"
70-
:buttons="[
71-
{
72-
buttonValue: false,
73-
text: 'Aus',
74-
class: 'btn-outline-danger',
75-
},
76-
{
77-
buttonValue: true,
78-
text: 'An',
79-
class: 'btn-outline-success',
80-
},
81-
]"
82-
>
83-
<template #help>
84-
Wenn diese openWB über einen Partner erworben wurde, kann hier ein Support-Zugang für diesen freigegeben
85-
werden.
86-
</template>
87-
</openwb-base-button-group-input>
88-
<openwb-base-array-input
89-
v-if="newCloudData.partner"
90-
title="Gültige Partner-IDs"
91-
no-elements-message="Keine Partner-ID zugeordnet."
92-
:model-value="$store.state.mqtt['openWB/system/mqtt/valid_partner_ids']"
93-
@update:model-value="updateState('openWB/system/mqtt/valid_partner_ids', $event)"
94-
>
95-
<template #input-prefix>
96-
<font-awesome-icon
97-
fixed-width
98-
:icon="['fas', 'user-gear']"
99-
/>
100-
</template>
101-
<template #element-prefix>
102-
<font-awesome-icon
103-
fixed-width
104-
:icon="['fas', 'user-gear']"
105-
/>
106-
</template>
107-
<template #help>
108-
Die Partner-ID erhältst Du von Deinem Installateur. Ist hier keine Partner-ID eingetragen, dann kann auch
109-
niemand - trotz aktiviertem Zugang für Partner - über das Partner-Portal auf diese openWB zugreifen!
110-
</template>
111-
</openwb-base-array-input>
112-
<template
113-
v-if="
114-
$store.state.mqtt['openWB/general/extern'] === false &&
115-
$store.state.mqtt['openWB/system/dataprotection_acknowledged'] === true
116-
"
117-
#footer
118-
>
119-
<div class="row justify-content-center">
120-
<!-- <openwb-base-click-button
121-
class="col-4"
122-
:class="
123-
enableNewCloudButton
124-
? 'btn-success'
125-
: 'btn-outline-success'
126-
"
127-
:disabled="!enableNewCloudButton"
128-
@buttonClicked="createCloud"
129-
>
130-
Zugang erstellen
131-
</openwb-base-click-button> -->
132-
<openwb-base-click-button
133-
class="col-4 btn-outline-success"
134-
disabled
135-
>
136-
Zugang erstellen
137-
</openwb-base-click-button>
138-
</div>
139-
</template>
14051
</openwb-base-card>
141-
<openwb-base-alert
142-
v-if="!enableNewCloudButton"
143-
subtype="info"
144-
class="mb-2"
145-
>
146-
Der neue Zugang wird eingerichtet. Dieser Vorgang kann bis zu einer Minute dauern. Bitte warten.
147-
</openwb-base-alert>
14852
</form>
14953
<form
15054
v-if="!cloudBridgeKey"
@@ -209,10 +113,7 @@
209113
</template>
210114
</openwb-base-array-input>
211115
<template
212-
v-if="
213-
$store.state.mqtt['openWB/general/extern'] === false &&
214-
$store.state.mqtt['openWB/system/dataprotection_acknowledged'] === true
215-
"
116+
v-if="$store.state.mqtt['openWB/system/dataprotection_acknowledged'] === true"
216117
#footer
217118
>
218119
<div class="row justify-content-center">

‎src/views/DataManagement.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@
213213
</form>
214214
</openwb-base-card>
215215
<openwb-base-card
216-
v-if="!installAssistantActive"
216+
v-if="!installAssistantActive && !$store.state.mqtt['openWB/general/extern']"
217217
title="Datenübernahme"
218218
subtype="success"
219219
:collapsible="true"
@@ -450,6 +450,7 @@ export default {
450450
data() {
451451
return {
452452
mqttTopicsToSubscribe: [
453+
"openWB/general/extern",
453454
"openWB/system/configurable/backup_clouds",
454455
"openWB/system/configurable/monitoring",
455456
"openWB/system/backup_cloud/config",

0 commit comments

Comments
 (0)