Skip to content

Commit 4e09824

Browse files
golluroSICKAGgolluroSICKAG
committed
# Version 4.0.0
## Repository moved to GitHub organization
1 parent 63833f6 commit 4e09824

23 files changed

+4151
-21
lines changed

‎CHANGELOG.md

Lines changed: 108 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,117 @@
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 4.0.0
5+
6+
### Improvements
7+
- Renamed abbreviations ('removeParameterViaUi' to 'removeParameterViaUI')
8+
- Using recursive helper functions to convert Container <-> Lua table
9+
10+
## Release 3.5.0
11+
12+
### Improvements
13+
- Update to EmmyLua annotations
14+
- Usage of lua diagnostics
15+
- Documentation updates
16+
17+
## Release 3.4.1
18+
19+
### Bugfix
20+
- Adding missing docu
21+
- Removed internal docu of functions if manifest docu is available in parallel
22+
23+
## Release 3.4.0
24+
25+
### Improvements
26+
- Checking if a variable is named with "Password"/"password" to hide its content in UI list
27+
28+
## Release 3.3.0
29+
30+
### Improvements
31+
- Check within "getVersion" function if module was merged, so the app version is not related to this module...
32+
- Using internal moduleName variable to be usable in merged apps instead of _APPNAME
33+
34+
## Release 3.2.1
35+
36+
### Improvements
37+
- Naming of UI elements and adding some mouse over info texts
38+
- Appname added to log messages
39+
- Added ENUM
40+
- Minor edits, docu, logs
41+
42+
### Bugfix
43+
- UI events notified after pageLoad after 300ms instead of 100ms to not miss
44+
45+
## Release 3.2.0
646

747
### New features
8-
- ...
48+
- Optionally hide content related to CSK_UserManagement
49+
50+
### Improvements
51+
- Loading only required APIs ('LuaLoadAllEngineAPI = false') -> less time for GC needed
52+
- Minor code edits / docu updates
53+
54+
## Release 3.1.2
55+
56+
### Bugfix
57+
- Fix deadlock in combination with UserManagement module
58+
59+
## Release 3.1.1
60+
61+
### Bugfix
62+
- Prevent infinity loop by getting data from UserManagement module
63+
64+
## Release 3.1.0
965

1066
### Improvements
11-
- ...
67+
- Supports now 4-dim tables for params
68+
- Do not show passwords within parameters in UI
69+
- Increase size for parameter name to 500 (was 50 before)
70+
- Prepared for all CSK_UserManagement user levels: Operator, Maintenance, Service, Admin (no influence yet)
71+
- Renamed page folder accordingly to module name
72+
- Updated documentation
1273

1374
### Bugfix
14-
- ...
75+
- Fixed problems with showing unknown parameter content in UI and switching after that to other parameters (there was a problem with from CSK_Module_UserManagement parameters
76+
77+
## Release 3.0.0
78+
79+
### New features
80+
- Amount of instances of each 'MulitInstance'-module is now saved within parameter binary file instead of single entry within CID parameters for all 'MultiInstance' modules. MultiInstance module needs to be adapted to this.
81+
82+
### Improvements
83+
- Periodical check of tempFile changed
84+
85+
## 2.0.0
86+
87+
### New features
88+
- Show parameters of datasets on UI
89+
- Store info of parameter used for other modules (incl. "loadOnReboot") within binary file instead of AppSpace parameters (no need to adapt the Parameter file for every module)
90+
INFO: Make sure to update CSK modules to work with this (already implemented into latest CSK template versions)
91+
- Removing parameter datasets via UI
92+
93+
### Improvements
94+
- Update UI if parameters were edited
95+
96+
## 1.3.0
97+
98+
### New feature
99+
- New function to load/save parameters with SubContainer
100+
101+
### Improvements
102+
- Renamed files/variables from "Helper/Interface" to "Model/Controller" (MVC)
103+
104+
## 1.2.0
105+
106+
### New features
107+
- Module will notify "CSK_PersistentData.OnInitialDataLoaded"-event so that other modules can register on that event to load their specific parameters as soon as they are available
108+
109+
## 1.1.0
110+
111+
### Improvements
112+
- Auto load latest DataSet during app start
113+
- Using unique local event names
114+
- Better parameter structure
115+
116+
## 1.0.0
117+
- Initial commit

‎CSK_Module_PersistentData/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_PersistentData/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_PersistentData/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_PersistentData/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_PersistentData/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_PersistentData/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_PersistentData",
3+
"version": "1.0.0",
4+
"description": "Generated",
5+
"components": [
6+
"@sick-davinci/basic-elements"
7+
],
8+
"dependencies": {
9+
"@sick-davinci/basic-elements": "^5.3.2"
10+
}
11+
}

‎CSK_Module_PersistentData/pages/pages/CSK_Module_PersistentData/CSK_Module_PersistentData.css

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

‎CSK_Module_PersistentData/pages/pages/CSK_Module_PersistentData/CSK_Module_PersistentData.html

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
<layout-row id="RowLayout1">
2+
<layout-column id="ColumnLayout5" style="align-items: stretch">
3+
<stacked-view id="SV_Login">
4+
<stacked-pane id="SP_LoggedIn" value="true">
5+
<layout-row id="RowLayout2" style="justify-content: space-between">
6+
<layout-column id="ColumnLayout1" style="align-items: stretch">
7+
<stacked-view id="SV_Feedback">
8+
<stacked-pane id="SP_Empty" value="EMPTY"></stacked-pane>
9+
<stacked-pane id="SP_OK" value="OK">
10+
<davinci-callout id="CO_Ok" type="info">
11+
<span>Worked</span>
12+
</davinci-callout>
13+
</stacked-pane>
14+
<stacked-pane id="SP_Err" value="ERR">
15+
<davinci-callout id="CO_Error" type="warning">
16+
<span>Error</span>
17+
</davinci-callout>
18+
</stacked-pane>
19+
<crown-edpws-binding property="value"
20+
name="CSK_PersistentData/OnNewFeedbackStatus" update-on-resume>
21+
</crown-edpws-binding>
22+
</stacked-view>
23+
<davinci-text-field id="TF_ParameterPath" type="text"
24+
label="Set Parameter path:">
25+
<crown-binding event="change" name="CSK_PersistentData/setPath"
26+
path="param/args/path" auto-commit>
27+
</crown-binding>
28+
<crown-edpws-binding property="value"
29+
name="CSK_PersistentData/OnNewDataPath" update-on-resume>
30+
</crown-edpws-binding>
31+
</davinci-text-field>
32+
<davinci-text-area id="TA_ContentList" multiline readonly
33+
label="Content list:">
34+
<crown-edpws-binding property="value"
35+
name="CSK_PersistentData/OnNewContent" update-on-resume>
36+
</crown-edpws-binding>
37+
</davinci-text-area>
38+
<davinci-button id="B_LoadData" type="primary" icon-position="append">
39+
<span>Load Data</span>
40+
<crown-binding event="submit" name="CSK_PersistentData/loadContent"
41+
auto-commit>
42+
</crown-binding>
43+
</davinci-button>
44+
<davinci-button id="B_SaveData" type="primary" icon-position="append">
45+
<span>Save Persistend Data</span>
46+
<crown-binding event="submit" name="CSK_PersistentData/saveData"
47+
auto-commit>
48+
</crown-binding>
49+
</davinci-button>
50+
<appspace-file-download-button id="FDB_DownloadData" type="primary"
51+
icon-position="append"
52+
downloaded-filename="CSK_PersistentData.bin">
53+
<span>Download Persistent Data</span>
54+
<crown-on property="file-path"
55+
crown-event="CSK_PersistentData/OnNewDataPath">
56+
</crown-on>
57+
</appspace-file-download-button>
58+
<appspace-file-upload-button id="FUB_UploadData" button-type="primary"
59+
is-file path="/ram/CSK_PersistentData_Temp.bin"
60+
title="Temporarily upload parameter dataset to optionally overwrite existing data.">
61+
<span>Upload Persistent Data</span>
62+
<crown-set event="finished"
63+
crown-function="CSK_PersistentData/fileUploadFinished"
64+
protocol="crownMSGPACK" crown-path="status">
65+
</crown-set>
66+
</appspace-file-upload-button>
67+
<davinci-button id="B_OverwriteData" type="primary"
68+
icon-position="append"
69+
title="Overwrite current persistent data file with uploaded one.">
70+
<span>Overwrite Persistent Data</span>
71+
<crown-edpws-binding property="disabled"
72+
name="CSK_PersistentData/OnNewStatusTempFileAvailable"
73+
update-on-resume converter="function(value) {return !value;}">
74+
</crown-edpws-binding>
75+
<crown-binding event="submit" name="CSK_PersistentData/overwriteData"
76+
auto-commit>
77+
</crown-binding>
78+
</davinci-button>
79+
</layout-column>
80+
<layout-column id="ColumnLayout2" style="align-items: stretch">
81+
<davinci-drop-down id="DD_Parameter">
82+
<crown-edpws-binding property="data"
83+
name="CSK_PersistentData/OnNewDatasetList" update-on-resume
84+
converter="convertToList">
85+
</crown-edpws-binding>
86+
<crown-binding event="change"
87+
name="CSK_PersistentData/setSelectedParameterName"
88+
path="param/args/selection" auto-commit>
89+
</crown-binding>
90+
<crown-edpws-binding property="value"
91+
name="CSK_PersistentData/OnNewParameterSelection"
92+
update-on-resume>
93+
</crown-edpws-binding>
94+
</davinci-drop-down>
95+
<davinci-button id="B_RemoveDataEntry" type="primary"
96+
icon-position="append">
97+
<span>REMOVE</span>
98+
<crown-binding event="submit"
99+
name="CSK_PersistentData/removeParameterViaUI" auto-commit>
100+
</crown-binding>
101+
</davinci-button>
102+
<curie-table id="DT_ParameterContent" selectable
103+
select-mode="highlight_row">
104+
<curie-table-column id="ParameterName" header="ParameterName">
105+
</curie-table-column>
106+
<curie-table-column id="Value" header="Value">
107+
</curie-table-column>
108+
<crown-edpws-binding property="data"
109+
name="CSK_PersistentData/OnNewParameterTableInfo"
110+
update-on-resume>
111+
</crown-edpws-binding>
112+
</curie-table>
113+
</layout-column>
114+
<layout-column id="ColumnLayout3" style="align-items: stretch">
115+
<stacked-view id="SV_PageCalled">
116+
<crown-binding property="value" name="CSK_PersistentData/pageCalled"
117+
path="result/data/empty" auto-update="0" update-on-resume>
118+
</crown-binding>
119+
</stacked-view>
120+
</layout-column>
121+
</layout-row>
122+
</stacked-pane>
123+
<stacked-pane id="SP_NotLoggedIn" value="false">
124+
<davinci-callout id="Callout3" type="info">
125+
<span>
126+
Please login via UserManagement to see parameter setup options (minimum "Maintenance"-user level).
127+
</span>
128+
</davinci-callout>
129+
</stacked-pane>
130+
<crown-edpws-binding property="value"
131+
name="CSK_PersistentData/OnUserLevelMaintenanceActive"
132+
update-on-resume
133+
converter="function(value) {return value.toString();}">
134+
</crown-edpws-binding>
135+
</stacked-view>
136+
</layout-column>
137+
138+
</layout-row>

‎CSK_Module_PersistentData/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+
}

‎CSK_Module_PersistentData/pages/src/converter.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export function convertToList(value) {
2+
return JSON.parse(value)
3+
}

‎CSK_Module_PersistentData/pages/src/index.ts

Whitespace-only changes.

‎CSK_Module_PersistentData/parameters/PersistentData.cid.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Device xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="..\..\..\..\Docu\Parameter.cid.xsd">
3+
<UserLevel/>
4+
<IFD>
5+
<CID>
6+
<Block Name="CSK_Module_PersistentData">
7+
<Group Description="Parameters to store persistently." Name="PersistentData">
8+
<Variable Description="Path to the persistend data file (which can include all relevant parameter sets for used modules)" Name="DataFilePath" VirtualMemoryRef="ApplicationParameters">
9+
<BasicType>
10+
<String FixedLength="False" Length="500" DefaultValue="/public/CSK_PersistentData.bin"/>
11+
</BasicType>
12+
</Variable>
13+
<Variable Description="Amount of instances [DEPRECATED]" Name="InstanceAmount" VirtualMemoryRef="ApplicationParameters">
14+
<BasicType>
15+
<USInt DefaultValue="1"/>
16+
</BasicType>
17+
</Variable>
18+
</Group>
19+
</Block>
20+
</CID>
21+
</IFD>
22+
<Hardware>
23+
<VirtualMemory Name="ApplicationParameters"/>
24+
</Hardware>
25+
</Device>

0 commit comments

Comments
 (0)