Skip to content

Commit bd5a6d7

Browse files
golluroSICKAGgolluroSICKAG
committed
# Version 3.6.0
## Repository moved to GitHub organization
1 parent 5edfea7 commit bd5a6d7

21 files changed

Lines changed: 2873 additions & 23 deletions

‎CHANGELOG.md‎

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

4-
## Release 0.1.0
5-
- Initial commit
4+
## Release 3.6.0
65

7-
### New features
8-
- ...
6+
### Improvements
7+
- Using recursive helper functions to convert Container <-> Lua table
8+
9+
## Release 3.5.0
10+
11+
### Improvements
12+
- Update to EmmyLua annotations
13+
- Usage of lua diagnostics
14+
- Documentation updates
15+
16+
## Release 3.4.0
17+
18+
### Improvements
19+
- Using internal moduleName variable to be usable in merged apps instead of _APPNAME, as this did not work with PersistentData module in merged apps.
20+
21+
## Release 3.3.1
22+
23+
### Improvements
24+
- Naming of UI elements and adding some mouse over info texts
25+
- Appname added to log messages
26+
- Minor edits
27+
28+
### Bugfix
29+
- UI events notified after pageLoad after 300ms instead of 100ms to not miss
30+
31+
## Release 3.3.0
932

1033
### Improvements
11-
- ...
34+
- Per default use 'LuaLoadAllEngineAPI = true' to make it easier to start
35+
- Update of helper funcs
36+
- Hiding SOPAS Login
37+
- Added convertToList in converter.ts
38+
- Minor code edits / docu updates
39+
40+
## Release 3.2.1
1241

1342
### Bugfix
14-
- ...
43+
- checkAPIs script was not loaded in Model and minor edit in sample code
44+
45+
## Release 3.2.0
46+
47+
### Improvements
48+
- Loading only required APIs ('LuaLoadAllEngineAPI = false') -> less time for GC needed
49+
- Changed status type of user levels from string to bool (usable with CSK_Module_UserManagement since version 1.2.1)
50+
- Renamed page folder accordingly to module name
51+
52+
## Release 3.1.0
53+
54+
### New features
55+
- Integration of CSK_UserManagement functionality
56+
57+
## Release 3.0.0
58+
59+
### New features
60+
- Update handling of persistent data according to CSK_PersistentData module ver. 2.0.0
61+
62+
## Release 2.2.0
63+
64+
### Improvements
65+
- Setup of Parameter name (PersistentData) added to UI
66+
- Support of 2-dim tables within parameters to save in PersistentData CSK module
67+
68+
## Release 2.1.0
69+
70+
### New feature
71+
- Added "OnDataLoadedOnReboot" event
72+
73+
### Improvement
74+
75+
- PersistentData functions moved to _Controller.lua to be consistent to MultiInstanceTemplate
76+
- Added more manifest documentation and created html based on this
77+
78+
## Release 2.0.1
79+
80+
### Improvement
81+
- New function to load/save parameters with SubContainer
82+
83+
## Release 2.0.0
84+
85+
### Improvements
86+
- Added StepByStep instruction how to customize the template (see README.md)
87+
- By using the StepByStep instruction it becomes much more easier to customize the template
88+
- CSK_PersistentData module usage directly implemented incl. UI (PersistendData module needs to provide according parameters...)
89+
- Renamed files/variables from "Helper/Interface" to "Model/Controller" (MVC)
90+
91+
## Release 1.2.0
92+
93+
### Improvements
94+
- Optionally store to load parameters at app restart
95+
- Using unique local event names
96+
97+
## Release 1.1.0
98+
99+
### Improvements
100+
- Providing function to work with PersistentData module to load/save module parameters
101+
102+
## Release 1.0.0
103+
- Initial commit

‎CSK_Module_ModuleName/pages/assets/legacy/resources.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎CSK_Module_ModuleName/pages/assets/legacy/settings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"showLoginButton": false
3+
}

‎CSK_Module_ModuleName/pages/global.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/* Add project wide CSS settings here */

‎CSK_Module_ModuleName/pages/i18n/de.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
3+
}

‎CSK_Module_ModuleName/pages/i18n/en.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
3+
}

‎CSK_Module_ModuleName/pages/package.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"name": "CSK_Module_ModuleName",
3+
"version": "1.0.0",
4+
"description": "Generated",
5+
"components": [
6+
"@sick-davinci/basic-elements"
7+
],
8+
"dependencies": {
9+
"@sick-davinci/basic-elements": "^5.0.5"
10+
}
11+
}

‎CSK_Module_ModuleName/pages/pages/CSK_Module_ModuleName/CSK_Module_ModuleName.css‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.myCustomFrame_CSK_Module_ModuleName {
2+
border-style: solid;
3+
border-width: 1px;
4+
border-color: grey;
5+
margin: 6px;
6+
}
7+
8+
.myCustomCssClass_CSK_Module_ModuleName {
9+
}

‎CSK_Module_ModuleName/pages/pages/CSK_Module_ModuleName/CSK_Module_ModuleName.html‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
<layout-row id="RowLayout1">
2+
<layout-column id="ColumnLayout1" style="align-items:stretch">
3+
<stacked-view id="SV_Login">
4+
<stacked-pane id="SP_LoginOK" value="true">
5+
<layout-column id="Column_PersistentData"
6+
class="myCustomFrame_CSK_Module_ModuleName"
7+
style="align-items: stretch">
8+
<layout-row id="RowLayout4"
9+
style="justify-content: space-between; align-items: center">
10+
<layout-column id="ColumnLayout5" style="align-items: stretch">
11+
<davinci-value-display id="VD_ParameterName" value="Parameter name:"
12+
title="Name of the parameters within the CSK_PersistentData module to be uses for this module.">
13+
</davinci-value-display>
14+
</layout-column>
15+
<layout-column id="ColumnLayout6" style="align-items: stretch">
16+
<davinci-text-field id="TF_ParameterName" type="text"
17+
title="Name of the parameters within the CSK_PersistentData module to be uses for this module.">
18+
<crown-edpws-binding property="value"
19+
name="CSK_ModuleName/OnNewParameterName" update-on-resume>
20+
</crown-edpws-binding>
21+
<crown-binding event="change" name="CSK_ModuleName/setParameterName"
22+
path="param/args/name" auto-commit>
23+
</crown-binding>
24+
<crown-edpws-binding property="disabled"
25+
name="CSK_ModuleName/OnPersistentDataModuleAvailable"
26+
update-on-resume converter="function(value) {return !value;}">
27+
</crown-edpws-binding>
28+
</davinci-text-field>
29+
</layout-column>
30+
</layout-row>
31+
<layout-row id="RowLayout2"
32+
style="justify-content: space-between; align-items: center">
33+
<davinci-value-display id="VD_LoadConfig"
34+
value="Load config on app start:"
35+
title="Load configured parameters from CSK_PersistentData on app start.">
36+
</davinci-value-display>
37+
<davinci-checkbox id="CB_LoadConfig"
38+
title="Load configured parameters from CSK_PersistentData on app start.">
39+
<span></span>
40+
<crown-edpws-binding property="checked"
41+
name="CSK_ModuleName/OnNewStatusLoadParameterOnReboot"
42+
update-on-resume>
43+
</crown-edpws-binding>
44+
<crown-edpws-binding property="disabled"
45+
name="CSK_ModuleName/OnPersistentDataModuleAvailable"
46+
update-on-resume converter="function(value) {return !value;}">
47+
</crown-edpws-binding>
48+
<crown-binding event="change" name="CSK_ModuleName/setLoadOnReboot"
49+
path="param/args/status" auto-commit>
50+
</crown-binding>
51+
</davinci-checkbox>
52+
</layout-row>
53+
<layout-row id="RowLayout3">
54+
<layout-column id="ColumnLayout3" style="align-items: stretch">
55+
<davinci-button id="B_LoadConfig" type="primary"
56+
icon-position="append"
57+
title="Load configured parameters from CSK_PersistentData module.">
58+
<span>Load Config</span>
59+
<crown-binding event="submit" name="CSK_ModuleName/loadParameters"
60+
auto-commit>
61+
</crown-binding>
62+
<crown-edpws-binding property="disabled"
63+
name="CSK_ModuleName/OnPersistentDataModuleAvailable"
64+
update-on-resume converter="function(value) {return !value;}">
65+
</crown-edpws-binding>
66+
</davinci-button>
67+
</layout-column>
68+
<layout-column id="ColumnLayout4" style="align-items: stretch">
69+
<davinci-button id="B_SaveConfig" type="primary"
70+
icon-position="append"
71+
title="Save current configured parameters of this module within CSK_PersistentData module.">
72+
<span>Save Config</span>
73+
<crown-binding event="submit" name="CSK_ModuleName/sendParameters"
74+
auto-commit>
75+
</crown-binding>
76+
<crown-edpws-binding property="disabled"
77+
name="CSK_ModuleName/OnPersistentDataModuleAvailable"
78+
update-on-resume converter="function(value) {return !value;}">
79+
</crown-edpws-binding>
80+
</davinci-button>
81+
</layout-column>
82+
</layout-row>
83+
</layout-column>
84+
</stacked-pane>
85+
<stacked-pane id="SP_LoginNotOK" value="false">
86+
<davinci-callout id="Callout1" type="info">
87+
<span>
88+
Please log in via CSK_UserManagement module (at least via user level "Operator")
89+
</span>
90+
</davinci-callout>
91+
</stacked-pane>
92+
<crown-edpws-binding property="value"
93+
name="CSK_ModuleName/OnUserLevelOperatorActive" update-on-resume
94+
converter="function(value) {return value.toString();}">
95+
</crown-edpws-binding>
96+
</stacked-view>
97+
<stacked-view id="SV_PageCalled">
98+
<crown-binding property="value" name="CSK_ModuleName/pageCalled"
99+
path="result/data/empty" auto-update="0" update-on-resume>
100+
</crown-binding>
101+
</stacked-view>
102+
</layout-column>
103+
<layout-column id="ColumnLayout2" style="flex-grow:3">
104+
</layout-column>
105+
106+
</layout-row>

‎CSK_Module_ModuleName/pages/pages/navigation.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"version": "1.0",
3+
"pages": []
4+
}

0 commit comments

Comments
 (0)