Skip to content

Commit 7d4cc2e

Browse files
ticakiticaki
ticaki
and
ticaki
authored
Added cardQR && convert configuration at start with fall back (#132)
* page qr in work * update Readme * work most done cardQR * finally cardQR - convert config at adapter start * remove unused property * #133 * Feature zum Screensaver (Rotation ohne Wetter) #135 * Add some comments --------- Co-authored-by: ticaki <ticaki@renopoint.de>
1 parent 42c4637 commit 7d4cc2e

37 files changed

+2462
-1411
lines changed

‎.github/workflows/autoassign.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Auto Assign Issues/PRs
2+
on:
3+
issues:
4+
types: [opened, edited, labeled, unlabeled]
5+
pull_request_target:
6+
types: [opened, edited, ready_for_review]
7+
jobs:
8+
run:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: wow-actions/auto-assign@v3.0.2
12+
with:
13+
GITHUB_TOKEN: ${{ secrets.AUTO_ASSIGN }}
14+
# using the `org/team_slug` or `/team_slug` syntax to add git team as reviewers
15+
reviewers: |
16+
tt-tom17
17+
Armilar
18+
ticaki
19+
skipKeywords: wip, draft
20+
numberOfReviewers: 1

‎.github/workflows/setLabels.yml

-34
This file was deleted.

‎README.md

+9-1
Original file line numberDiff line numberDiff line change
@@ -305,11 +305,19 @@ Sind natürlich alles Dataitems
305305
Placeholder for the next version (at the beginning of the line):
306306
### **WORK IN PROGRESS**
307307
-->
308+
### **WORK IN PROGRESS**
309+
- (ticaki) fixes [#135](https://github.com/ticaki/ioBroker.nspanel-lovelace-ui/issues/135)
310+
- (ticaki) fixes #133
311+
- (ticaki) Configuration is reconfigured at every start. If this fails, the saved conversion is used.
312+
- (ticaki) The raw version and a converted version are saved when the configuration is transferred.
313+
- (ticaki) parent added to navigation
314+
- (ticaki) cardQR added
315+
308316
### 0.1.4 (2025-03-03)
309317
- (ticaki) fixes #131
310318

319+
311320
### 0.1.3 (2025-03-02)
312-
- (ticaki) fixes #130
313321
- (ticaki) Data point generation changed
314322
- (ticaki) Dimming mode (data points) completed
315323
- (ticaki) Screensaver double-click added

‎admin/jsonConfig.json

+112-53
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"i18n": true,
33
"type": "tabs",
4-
"items": {
4+
"items": {
55
"general": {
66
"type": "panel",
77
"label": "general",
@@ -232,77 +232,136 @@
232232
"type": "panel",
233233
"label": "+",
234234
"items": {
235-
"pageQRselType": {
236-
"type": "select",
237-
"label": "QR Typ",
238-
"options": [
235+
"pageQRdata": {
236+
"type": "table",
237+
"label": "pageQRdata",
238+
"sm": 12,
239+
"md": 12,
240+
"lg": 12,
241+
"xl": 12,
242+
"uniqueColumns": [
243+
"pageName"
244+
],
245+
"items": [
239246
{
240-
"label": "none",
241-
"value": 0
247+
"attr": "pageName",
248+
"type": "text",
249+
"label": "pageName",
250+
"width": "10%",
251+
"default": "Unique Name"
242252
},
243253
{
244-
"label": "Wifi",
245-
"value": 1
254+
"attr": "headline",
255+
"type": "text",
256+
"label": "Headline",
257+
"width": "10%",
258+
"default": ""
246259
},
247260
{
248-
"label": "URL",
249-
"value": 2
250-
}
251-
],
252-
"xs": 12,
253-
"sm": 12,
254-
"md": 6,
255-
"lg": 4,
256-
"xl": 4
257-
},
258-
"pageQRwlantype": {
259-
"type": "text",
260-
"label": "Verschlüssselung",
261-
"hidden": "data.pageQRselType !== 1",
262-
"newLine": true,
263-
"xs": 12,
264-
"sm": 12,
265-
"md": 6,
266-
"lg": 4,
267-
"xl": 4
268-
},
269-
"pageQRssid": {
270-
"type": "text",
271-
"label": "SSID",
272-
"hidden": "data.pageQRselType !== 1",
273-
"xs": 12,
274-
"sm": 12,
275-
"md": 6,
276-
"lg": 4,
277-
"xl": 4
261+
"attr": "SSIDURLTEL",
262+
"type": "text",
263+
"label": "SSIDURLTEL",
264+
"width": "40%",
265+
"default": ""
266+
},
267+
{
268+
"attr": "selType",
269+
"type": "select",
270+
"label": "pageQRselType",
271+
"default": 0,
272+
"options": [
273+
{
274+
"label": "FREE",
275+
"value": 0
276+
},
277+
{
278+
"label": "Wifi",
279+
"value": 1
280+
},
281+
{
282+
"label": "URL",
283+
"value": 2
284+
}
285+
,
286+
{
287+
"label": "TEL",
288+
"value": 3
289+
}
290+
]
291+
},
292+
{
293+
"type": "select",
294+
"label": "wlantype",
295+
"disabled": "data.selType !== 1",
296+
"attr": "wlantype",
297+
"options": [
298+
{"label": "nopass", "value": "nopass"},
299+
{"label": "WPA", "value": "WPA"},
300+
{"label": "WPA2", "value": "WPA2"},
301+
{"label": "WPA3", "value": "WPA3"},
302+
{"label": "WEP", "value": "WEP"}
303+
]
304+
},
305+
{
306+
"attr": "qrPass",
307+
"type": "select",
308+
"label": "qrPass",
309+
"disabled": "data.selType !== 1",
310+
"options": [
311+
{
312+
"label": "none",
313+
"value": 0
314+
},
315+
{
316+
"label": "Password1",
317+
"value": 1
318+
},
319+
{
320+
"label": "Password2",
321+
"value": 2
322+
},
323+
{
324+
"label": "Password3",
325+
"value": 2
326+
}
327+
]
328+
},
329+
{
330+
"attr": "wlanhidden",
331+
"type": "checkbox",
332+
"label": "wlanhidden",
333+
"disabled": "data.selType !== 1",
334+
"default": false
335+
},
336+
{
337+
"attr": "setState",
338+
"type": "objectId",
339+
"label": "Switch",
340+
"filterFunc": "return obj.common.type === 'boolean' && obj.common.role === 'switch' && obj.common.write"
341+
}
342+
]
278343
},
279-
"pageQRpwd": {
344+
"pageQRpwd1": {
280345
"type": "password",
281-
"label": "Password",
282-
"hidden": "data.pageQRselType !== 1",
346+
"label": "Password1",
283347
"xs": 12,
284348
"sm": 12,
285349
"md": 6,
286350
"lg": 4,
287351
"xl": 4
288352
},
289-
"pageQRwlanhidden": {
290-
"type": "checkbox",
291-
"label": "verstecktes Wlan",
292-
"hidden": "data.pageQRselType !== 1",
293-
"default": false,
353+
"pageQRpwd2": {
354+
"type": "password",
355+
"label": "Password2",
294356
"xs": 12,
295357
"sm": 12,
296358
"md": 6,
297359
"lg": 4,
298360
"xl": 4
299361
},
300-
"pageQRurl": {
301-
"type": "text",
302-
"label": "URL",
303-
"default": "https://",
304-
"hidden": "data.pageQRselType !== 2",
305-
"newLine": true,
362+
"pageQRpwd3": {
363+
"type": "password",
364+
"label": "Password3",
306365
"xs": 12,
307366
"sm": 12,
308367
"md": 6,

0 commit comments

Comments
 (0)