Skip to content

Commit 79916a4

Browse files
golluroSICKAGgolluroSICKAG
authored
Release 1.0.2 (#3)
# Release 1.0.2 ## Bugfix - Legacy bindings of ValueDisplay elements within UI did not work if deployed with VS Code AppSpace SDK - UI differs if deployed via Appstudio or VS Code AppSpace SDK - Fullscreen icon of iFrame was visible - LuaLoadAllEngineAPI app key was set to true
1 parent 267908b commit 79916a4

File tree

8 files changed

+79
-53
lines changed

8 files changed

+79
-53
lines changed

‎CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
# Changelog
22
All notable changes to this project will be documented in this file.
33

4+
## Release 1.0.2
5+
6+
### Bugfix
7+
- Legacy bindings of ValueDisplay elements within UI did not work if deployed with VS Code AppSpace SDK
8+
- UI differs if deployed via Appstudio or VS Code AppSpace SDK
9+
- Fullscreen icon of iFrame was visible
10+
- LuaLoadAllEngineAPI app key was set to true
11+
412
## Release 1.0.1
513

614
### Bugfix

‎CSK_Module_RecipeManager/pages/pages/CSK_Module_RecipeManager/CSK_Module_RecipeManager.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,5 @@
8686

8787
.myCustomButton_CSK_Module_RecipeManager {
8888
border-radius: 30px;
89-
padding-right: 0px;
89+
padding: 11px;
9090
}

‎CSK_Module_RecipeManager/pages/pages/CSK_Module_RecipeManager/CSK_Module_RecipeManager.html

Lines changed: 50 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
<layout-row id="RowLayout6">
77
<layout-column id="ColumnLayout2" style="align-items: stretch">
88
<layout-row id="RowLayout7" style="align-items: baseline">
9-
<davinci-value-display id="VD_Title" class="myCustomLabel_CSK_Module_RecipeManager"
10-
value="Recipe Manager">
11-
</davinci-value-display>
9+
<h1 id="Heading_Title" class="myCustomLabel_CSK_Module_RecipeManager">
10+
Recipe Manager
11+
</h1>
1212
<davinci-value-display id="VD_Version">
13-
<crown-edpws-binding property="value" name="CSK_RecipeManager/OnNewStatusModuleVersion"
14-
update-on-resume>
15-
</crown-edpws-binding>
13+
<crown-on property="value" crown-event="CSK_RecipeManager/OnNewStatusModuleVersion">
14+
</crown-on>
1615
</davinci-value-display>
1716
</layout-row>
1817
</layout-column>
@@ -66,9 +65,10 @@
6665
style="justify-content: center; align-items: center">
6766
<davinci-button id="B_LoadConfig"
6867
class="myCustomButton_CSK_Module_RecipeManager"
69-
type="outline" icon-position="append"
70-
title="Load configured parameters from CSK_PersistentData module."
71-
icon="action/history">
68+
type="outline"
69+
title="Load configured parameters from CSK_PersistentData module.">
70+
<davinci-icon icon="action/history">
71+
</davinci-icon>
7272
<span></span>
7373
<crown-binding event="submit"
7474
name="CSK_RecipeManager/loadParameters"
@@ -82,9 +82,10 @@
8282
</davinci-button>
8383
<davinci-button id="B_SaveConfig"
8484
class="myCustomButton_CSK_Module_RecipeManager"
85-
type="outline" icon-position="append"
86-
title="Save current configured parameters of this module within CSK_PersistentData module."
87-
icon="content/save">
85+
type="outline"
86+
title="Save current configured parameters of this module within CSK_PersistentData module.">
87+
<davinci-icon icon="content/save">
88+
</davinci-icon>
8889
<span></span>
8990
<crown-binding event="submit"
9091
name="CSK_RecipeManager/sendParameters"
@@ -214,19 +215,19 @@
214215
</layout-row>
215216
<layout-row id="RowLayout8">
216217
<layout-column id="ColumnLayout7" style="align-items: stretch">
217-
<layout-row id="RowLayout20">
218-
<layout-column id="ColumnLayout10" style="align-items: stretch">
219-
<curie-callout id="DC_FlowConfigInfo1" type="info"
220-
value="FlowConfig priority active.">
221-
<crown-edpws-binding property="hidden"
222-
name="CSK_RecipeManager/OnNewStatusFlowConfigPriority"
223-
update-on-resume converter="function(value) {return !value;}">
224-
</crown-edpws-binding>
225-
</curie-callout>
226-
</layout-column>
227-
<layout-column id="ColumnLayout22" style="align-items: stretch">
228-
</layout-column>
229-
</layout-row>
218+
<layout-row id="RowLayout20">
219+
<layout-column id="ColumnLayout10" style="align-items: stretch">
220+
<curie-callout id="DC_FlowConfigInfo1" type="info"
221+
value="FlowConfig priority active.">
222+
<crown-edpws-binding property="hidden"
223+
name="CSK_RecipeManager/OnNewStatusFlowConfigPriority"
224+
update-on-resume converter="function(value) {return !value;}">
225+
</crown-edpws-binding>
226+
</curie-callout>
227+
</layout-column>
228+
<layout-column id="ColumnLayout22" style="align-items: stretch">
229+
</layout-column>
230+
</layout-row>
230231
<layout-row id="RowLayout18">
231232
<layout-column id="ColumnLayout4" style="align-items: stretch">
232233
<davinci-text-field id="TF_RegisteredEvent" type="text"
@@ -241,10 +242,10 @@
241242
name="CSK_RecipeManager/setRegisteredEvent"
242243
path="param/args/event" auto-commit>
243244
</crown-binding>
244-
<crown-edpws-binding property="disabled"
245-
name="CSK_RecipeManager/OnNewStatusFlowConfigPriority"
246-
update-on-resume>
247-
</crown-edpws-binding>
245+
<crown-edpws-binding property="disabled"
246+
name="CSK_RecipeManager/OnNewStatusFlowConfigPriority"
247+
update-on-resume>
248+
</crown-edpws-binding>
248249
</davinci-text-field>
249250
</layout-column>
250251
<layout-column id="ColumnLayout21" style="align-items: stretch">
@@ -280,16 +281,17 @@
280281
style="justify-content: flex-end; align-items: center">
281282
<davinci-button id="Button_AddRecipe"
282283
class="myCustomButton_CSK_Module_RecipeManager" type="outline"
283-
icon-position="append" icon="content/add" title="Add recipe">
284+
title="Add recipe">
285+
<davinci-icon icon="content/add"></davinci-icon>
284286
<span></span>
285287
<crown-binding event="submit"
286288
name="CSK_RecipeManager/addRecipeViaUI" auto-commit>
287289
</crown-binding>
288290
</davinci-button>
289291
<davinci-button id="Button_RemoveRecipe"
290292
class="myCustomButton_CSK_Module_RecipeManager" type="outline"
291-
icon-position="append" icon="action/delete"
292293
title="Delete recipe">
294+
<davinci-icon icon="action/delete"></davinci-icon>
293295
<span></span>
294296
<crown-binding event="submit"
295297
name="CSK_RecipeManager/deleteRecipeViaUI" auto-commit>
@@ -385,8 +387,9 @@
385387
style="justify-content: flex-end">
386388
<davinci-button id="Button_AddEditRow"
387389
class="myCustomButton_CSK_Module_RecipeManager"
388-
type="outline" icon-position="append"
389-
title="Add/Edit" icon="content/create">
390+
type="outline" title="Add/Edit">
391+
<davinci-icon icon="content/create">
392+
</davinci-icon>
390393
<span></span>
391394
<crown-binding event="submit"
392395
name="CSK_RecipeManager/updateRecipeConfig"
@@ -395,9 +398,10 @@
395398
</davinci-button>
396399
<davinci-button id="Button_RemoveRow"
397400
class="myCustomButton_CSK_Module_RecipeManager"
398-
type="outline" icon-position="append"
399-
title="Remove selected row of recipe."
400-
icon="action/delete">
401+
type="outline"
402+
title="Remove selected row of recipe.">
403+
<davinci-icon icon="action/delete">
404+
</davinci-icon>
401405
<span></span>
402406
<crown-binding event="submit"
403407
name="CSK_RecipeManager/deleteRecipeOrderIDViaUI"
@@ -431,9 +435,9 @@
431435
<layout-row id="RowLayout14">
432436
<davinci-button id="Button_SortUp"
433437
class="myCustomButton_CSK_Module_RecipeManager"
434-
type="outline" icon-position="append"
435-
icon="navigation/arrow_upward"
436-
title="Set up in order">
438+
type="outline" title="Set up in order">
439+
<davinci-icon icon="navigation/arrow_upward">
440+
</davinci-icon>
437441
<span></span>
438442
<crown-binding event="submit"
439443
name="CSK_RecipeManager/moveTableRowUp"
@@ -442,9 +446,9 @@
442446
</davinci-button>
443447
<davinci-button id="Button_SortDown"
444448
class="myCustomButton_CSK_Module_RecipeManager"
445-
type="outline" icon-position="append"
446-
icon="navigation/arrow_downward"
447-
title="Set down in order">
449+
type="outline" title="Set down in order">
450+
<davinci-icon icon="navigation/arrow_downward">
451+
</davinci-icon>
448452
<span></span>
449453
<crown-binding event="submit"
450454
name="CSK_RecipeManager/moveTableRowDown"
@@ -459,9 +463,10 @@
459463
style="justify-content: flex-end">
460464
<davinci-button id="Button_LoadRecipe"
461465
class="myCustomButton_CSK_Module_RecipeManager"
462-
type="primary" icon-position="append"
463-
title="Load recipe for all configured modules."
464-
icon="navigation/check">
466+
type="primary"
467+
title="Load recipe for all configured modules.">
468+
<davinci-icon icon="navigation/check">
469+
</davinci-icon>
465470
<span></span>
466471
<crown-binding event="submit"
467472
name="CSK_RecipeManager/loadRecipeViaUI"

‎CSK_Module_RecipeManager/pages/src/converter.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ export function convertToList(value) {
55
export function changeStyle(theme) {
66
const style: HTMLStyleElement = document.createElement('style');
77
style.id ='blub'
8+
9+
const toggleSW = document.querySelectorAll("davinci-toggle-switch")
10+
toggleSW.forEach((userItem) => {
11+
const shadowToggle = userItem.shadowRoot
12+
const finalToggleSW = shadowToggle?.querySelector('div')
13+
finalToggleSW?.classList.add('hasIcon')
14+
});
15+
816
if (theme == 'CSK_Style'){
917
var headerToolbar = `.sopasjs-ui-header-toolbar-wrapper { background-color: #FFFFFF; }`
1018
var uiHeader = `.sopasjs-ui-header>.app-logo { margin-right:0px; }`

‎CSK_Module_RecipeManager/pages/src/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ document.addEventListener('sopasjs-ready', () => {
1212
page_Setup.remove();
1313

1414
setTimeout(() => {
15+
const element = document.querySelector("div.sjs-wrapper > div > div.sjs-fullscreen-toggle")
16+
if(element) {
17+
element.parentElement.removeChild(element)
18+
}
1519
document.title = 'CSK_Module_RecipeManager'
1620
}, 500);
1721
})

‎CSK_Module_RecipeManager/project.mf.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,12 +281,12 @@ Beside of this, it is possible to load a recipe via an external event. To do so,
281281
</crown>
282282
</crown>
283283
<meta key="author">SICK AG</meta>
284-
<meta key="version">1.0.1</meta>
284+
<meta key="version">1.0.2</meta>
285285
<meta key="priority">low</meta>
286286
<meta key="copy-protected">false</meta>
287287
<meta key="read-protected">false</meta>
288288
<meta key="crown2-flow-engine">false</meta>
289-
<meta key="LuaLoadAllEngineAPI">true</meta>
289+
<meta key="LuaLoadAllEngineAPI">false</meta>
290290
<entry default="CSK_Module_RecipeManager.lua" path="scripts"/>
291291
</application>
292292
</manifest>

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Tested on
1616

1717
|Device|Firmware|Module version|
1818
|--|--|--|
19+
|SICK AppEngine|v1.7.0|v1.0.2|
1920
|SICK AppEngine|v1.7.0|v1.0.0|
2021
|SIM1012|v2.4.2|v1.0.0|
2122

‎docu/CSK_Module_RecipeManager.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<meta name="generator" content="Asciidoctor 2.0.12">
88
<meta name="author" content="SICK AG">
9-
<title>Documentation - CSK_Module_RecipeManager 1.0.1</title>
9+
<title>Documentation - CSK_Module_RecipeManager 1.0.2</title>
1010
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
1111
<style>
1212
/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
@@ -615,10 +615,10 @@
615615
</head>
616616
<body class="article toc2 toc-left">
617617
<div id="header">
618-
<h1>Documentation - CSK_Module_RecipeManager 1.0.1</h1>
618+
<h1>Documentation - CSK_Module_RecipeManager 1.0.2</h1>
619619
<div class="details">
620620
<span id="author" class="author">SICK AG</span><br>
621-
<span id="revnumber">version 1.0.1,</span>
621+
<span id="revnumber">version 1.0.2,</span>
622622
<span id="revdate">2024-12-11</span>
623623
</div>
624624
<div id="toc" class="toc2">
@@ -754,7 +754,7 @@ <h2 id="_document_metadata">Document metadata</h2>
754754
</tr>
755755
<tr>
756756
<th class="tableblock halign-left valign-top"><p class="tableblock">Version</p></th>
757-
<td class="tableblock halign-left valign-top"><p class="tableblock">1.0.1</p></td>
757+
<td class="tableblock halign-left valign-top"><p class="tableblock">1.0.2</p></td>
758758
</tr>
759759
<tr>
760760
<th class="tableblock halign-left valign-top"><p class="tableblock">Date</p></th>
@@ -3499,7 +3499,7 @@ <h6 id="_sample_auto_generated_57">Sample (auto-generated)</h6>
34993499
</div>
35003500
<div id="footer">
35013501
<div id="footer-text">
3502-
Version 1.0.1<br>
3502+
Version 1.0.2<br>
35033503
Last updated 2024-12-11 11:03:10 +0100
35043504
</div>
35053505
</div>

0 commit comments

Comments
 (0)