Skip to content

Commit 628829a

Browse files
golluroSICKAGgolluroSICKAG
committed
# Version 1.5.0
## Repository moved to GitHub organization
1 parent 7a4910a commit 628829a

22 files changed

Lines changed: 4253 additions & 23 deletions

‎CHANGELOG.md‎

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,41 @@
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 1.5.0
5+
6+
### Improvements
7+
- "Wrong password" info in StackView to hide per default (before the message was shown for some ms)
8+
- Using recursive helper functions to convert Container <-> Lua table
9+
- Update to EmmyLua annotations
10+
- Usage of lua diagnostics
11+
- Documentation updates
12+
13+
## Release 1.4.0
14+
15+
### Improvements
16+
- Using internal moduleName variable to be usable in merged apps instead of _APPNAME, as this did not work with PersistentData module in merged apps.
17+
18+
## Release 1.3.0
619

720
### New features
8-
- ...
21+
- Hide parameter setup if not logged in
922

1023
### Improvements
11-
- ...
24+
- Loading only required APIs ('LuaLoadAllEngineAPI = false') -> less time for GC needed
25+
- Update of helper funcs to support 4-dim tables for PersistentData
26+
- Minor code edits / docu updates
27+
28+
## Release 1.2.0
29+
30+
### Improvements
31+
- Changed status type of user levels from string to bool, so it is more consistent for other modules to handle the status (e.g. to disable UI elements)
32+
- Renamed page folder accordingly to module name
33+
- Updated documentation
34+
35+
## Release 1.1.0
36+
37+
### New features
38+
- User "Admin" cannot be deleted
1239

13-
### Bugfix
14-
- ...
40+
## Release 1.0.0
41+
- Initial commit

‎CSK_Module_UserManagement/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_UserManagement/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_UserManagement/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_UserManagement/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_UserManagement/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_UserManagement/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_UserManagement",
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_UserManagement/pages/pages/CSK_Module_UserManagement/CSK_Module_UserManagement.css‎

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

‎CSK_Module_UserManagement/pages/pages/CSK_Module_UserManagement/CSK_Module_UserManagement.html‎

Lines changed: 253 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,253 @@
1+
<layout-row id="RowLayout1">
2+
<layout-column id="ColumnLayout1" style="align-items:stretch">
3+
<layout-row id="RowLayout5"
4+
class="myCustomFrame_CSK_Module_UserManagement">
5+
<layout-column id="ColumnLayout7" style="align-items: stretch">
6+
<curie-callout id="DC_LoggedUser">
7+
<crown-edpws-binding property="value"
8+
name="CSK_UserManagement/OnNewLoggedInUser" update-on-resume>
9+
</crown-edpws-binding>
10+
</curie-callout>
11+
<davinci-drop-down id="DD_User" label="User:">
12+
<crown-edpws-binding property="data"
13+
name="CSK_UserManagement/OnNewUserList" update-on-resume
14+
converter="convertToList">
15+
</crown-edpws-binding>
16+
<crown-edpws-binding property="value"
17+
name="CSK_UserManagement/OnNewUserToLogIn" update-on-resume>
18+
</crown-edpws-binding>
19+
<crown-binding event="change" name="CSK_UserManagement/setLoginUser"
20+
path="param/args/user" auto-commit>
21+
</crown-binding>
22+
</davinci-drop-down>
23+
<davinci-text-field id="TF_Password" type="password"
24+
label="Password:">
25+
<crown-binding event="change"
26+
name="CSK_UserManagement/setLoginPassword"
27+
path="param/args/password" auto-commit>
28+
</crown-binding>
29+
<crown-edpws-binding property="value"
30+
name="CSK_UserManagement/OnNewLogInPassword" update-on-resume>
31+
</crown-edpws-binding>
32+
</davinci-text-field>
33+
<layout-row id="RowLayout7" style="justify-content: space-between">
34+
<davinci-button id="B_Login" type="primary" icon-position="append">
35+
<span>Login</span>
36+
<crown-binding event="submit" name="CSK_UserManagement/login"
37+
auto-commit>
38+
</crown-binding>
39+
</davinci-button>
40+
<davinci-button id="B_Logout" type="primary" icon-position="append">
41+
<span>Logout</span>
42+
<crown-binding event="submit" name="CSK_UserManagement/logout"
43+
auto-commit>
44+
</crown-binding>
45+
</davinci-button>
46+
</layout-row>
47+
<stacked-view id="SV_WrongPassword">
48+
<stacked-pane id="SP_ShowInfoWrongPassword" value="false">
49+
<davinci-callout id="Callout1" type="error">
50+
<span>Wrong password</span>
51+
</davinci-callout>
52+
</stacked-pane>
53+
<stacked-pane id="SP_NoPasswordInfo" value="true"></stacked-pane>
54+
<crown-edpws-binding property="value"
55+
name="CSK_UserManagement/OnNewHideWrongPassword" update-on-resume
56+
converter="function(value) {return value.toString();}">
57+
</crown-edpws-binding>
58+
</stacked-view>
59+
</layout-column>
60+
</layout-row>
61+
<stacked-view id="SV_LoginAdmin">
62+
<stacked-pane id="SP_AdminActive" value="true">
63+
<layout-row id="RowLayout6"
64+
class="myCustomFrame_CSK_Module_UserManagement">
65+
<layout-column id="ColumnLayout8" style="align-items: stretch">
66+
<davinci-value-display id="VD_AdminFeatures" label="Admin features:">
67+
</davinci-value-display>
68+
<davinci-text-field id="TF_NewUser" type="text" label="New username">
69+
<crown-binding event="change" name="CSK_UserManagement/setNewUsername"
70+
path="param/args/name" auto-commit>
71+
</crown-binding>
72+
</davinci-text-field>
73+
<davinci-button id="B_AddUser" type="primary" icon-position="append">
74+
<span>Add User</span>
75+
<crown-binding event="submit" name="CSK_UserManagement/addUser"
76+
auto-commit>
77+
</crown-binding>
78+
</davinci-button>
79+
<curie-table id="DT_UserList" selectable select-mode="highlight_row">
80+
<curie-table-column id="User" header="User" title="User">
81+
</curie-table-column>
82+
<crown-edpws-binding property="data"
83+
name="CSK_UserManagement/OnNewUserTableList" update-on-resume>
84+
</crown-edpws-binding>
85+
<crown-binding event="row-selected"
86+
name="CSK_UserManagement/selectedUserViaTable"
87+
path="param/args/selection" auto-commit>
88+
</crown-binding>
89+
</curie-table>
90+
<davinci-value-display id="VD_SelectUser" value=""
91+
label="Selected user to update:">
92+
<crown-edpws-binding property="value"
93+
name="CSK_UserManagement/OnNewUserToUpdate" update-on-resume>
94+
</crown-edpws-binding>
95+
</davinci-value-display>
96+
<davinci-text-field id="TF_NewPassword" type="password"
97+
label="New Password:">
98+
<crown-binding event="change" name="CSK_UserManagement/setNewPassword"
99+
path="param/args/password" auto-commit>
100+
</crown-binding>
101+
<crown-edpws-binding property="value"
102+
name="CSK_UserManagement/OnNewPasswordToUpdate" update-on-resume>
103+
</crown-edpws-binding>
104+
</davinci-text-field>
105+
<davinci-callout id="CO_PasswordUpdated" type="success">
106+
<span>New password active.</span>
107+
<crown-edpws-binding property="hidden"
108+
name="CSK_UserManagement/OnNewHidePasswordInfo" update-on-resume>
109+
</crown-edpws-binding>
110+
</davinci-callout>
111+
<davinci-drop-down id="DD_UserLevel" label="User level">
112+
<davinci-option id="Option1" value="Operator">
113+
<span>Operator</span>
114+
</davinci-option>
115+
<davinci-option id="Option2" value="Maintenance">
116+
<span>Maintenance</span>
117+
</davinci-option>
118+
<davinci-option id="Option3" value="Service">
119+
<span>Service</span>
120+
</davinci-option>
121+
<davinci-option id="Option4" value="Admin">
122+
<span>Admin</span>
123+
</davinci-option>
124+
<crown-binding event="change"
125+
name="CSK_UserManagement/setNewUserLevel" path="param/args/level"
126+
auto-commit>
127+
</crown-binding>
128+
<crown-edpws-binding property="value"
129+
name="CSK_UserManagement/OnNewUserLevelToUpdate" update-on-resume>
130+
</crown-edpws-binding>
131+
</davinci-drop-down>
132+
<davinci-button id="B_RemoveUser" type="primary"
133+
icon-position="append">
134+
<span>Remove</span>
135+
<crown-binding event="submit" name="CSK_UserManagement/removeUser"
136+
auto-commit>
137+
</crown-binding>
138+
</davinci-button>
139+
</layout-column>
140+
</layout-row>
141+
</stacked-pane>
142+
<stacked-pane id="SP_NoAdmin" value="false"></stacked-pane>
143+
<crown-edpws-binding property="value"
144+
name="CSK_UserManagement/OnUserLevelAdminActive" update-on-resume
145+
converter="function(value) {return value.toString();}">
146+
</crown-edpws-binding>
147+
</stacked-view>
148+
</layout-column>
149+
<layout-column id="ColumnLayout2" style="flex-grow: 3">
150+
<stacked-view id="SV_Login">
151+
<stacked-pane id="SP_LoginOK" value="true">
152+
<layout-column id="Column_PersistentData"
153+
class="myCustomFrame_CSK_Module_UserManagement"
154+
style="align-items: stretch">
155+
<layout-row id="RowLayout4"
156+
style="justify-content: space-between; align-items: center">
157+
<layout-column id="ColumnLayout5" style="align-items: stretch">
158+
<davinci-value-display id="VD_ParameterName" value="Parameter name:"
159+
title="Name of the parameters within the CSK_PersistentData module to be uses for this module.">
160+
</davinci-value-display>
161+
</layout-column>
162+
<layout-column id="ColumnLayout6" style="align-items: stretch">
163+
<davinci-text-field id="TF_ParameterName" type="text"
164+
title="Name of the parameters within the CSK_PersistentData module to be uses for this module.">
165+
<crown-edpws-binding property="value"
166+
name="CSK_UserManagement/OnNewParameterName" update-on-resume>
167+
</crown-edpws-binding>
168+
<crown-binding event="change"
169+
name="CSK_UserManagement/setParameterName" path="param/args/name"
170+
auto-commit>
171+
</crown-binding>
172+
<crown-edpws-binding property="disabled"
173+
name="CSK_UserManagement/OnPersistentDataModuleAvailable"
174+
update-on-resume converter="function(value) {return !value;}">
175+
</crown-edpws-binding>
176+
</davinci-text-field>
177+
</layout-column>
178+
</layout-row>
179+
<layout-row id="RowLayout2"
180+
style="justify-content: space-between; align-items: center">
181+
<davinci-value-display id="VD_LoadConfig"
182+
value="Load config on app start:"
183+
title="Load configured parameters from CSK_PersistentData on app start.">
184+
</davinci-value-display>
185+
<davinci-checkbox id="CB_LoadConfig"
186+
title="Load configured parameters from CSK_PersistentData on app start.">
187+
<span></span>
188+
<crown-edpws-binding property="checked"
189+
name="CSK_UserManagement/OnNewStatusLoadParameterOnReboot"
190+
update-on-resume>
191+
</crown-edpws-binding>
192+
<crown-edpws-binding property="disabled"
193+
name="CSK_UserManagement/OnPersistentDataModuleAvailable"
194+
update-on-resume converter="function(value) {return !value;}">
195+
</crown-edpws-binding>
196+
<crown-binding event="change"
197+
name="CSK_UserManagement/setLoadOnReboot" path="param/args/status"
198+
auto-commit>
199+
</crown-binding>
200+
</davinci-checkbox>
201+
</layout-row>
202+
<layout-row id="RowLayout3">
203+
<layout-column id="ColumnLayout3" style="align-items: stretch">
204+
<davinci-button id="B_LoadConfig" type="primary"
205+
icon-position="append"
206+
title="Load configured parameters from CSK_PersistentData module.">
207+
<span>Load Config</span>
208+
<crown-binding event="submit" name="CSK_UserManagement/loadParameters"
209+
auto-commit>
210+
</crown-binding>
211+
<crown-edpws-binding property="disabled"
212+
name="CSK_UserManagement/OnPersistentDataModuleAvailable"
213+
update-on-resume converter="function(value) {return !value;}">
214+
</crown-edpws-binding>
215+
</davinci-button>
216+
</layout-column>
217+
<layout-column id="ColumnLayout4" style="align-items: stretch">
218+
<davinci-button id="B_SaveConfig" type="primary"
219+
icon-position="append">
220+
<span>Save Config</span>
221+
<crown-binding event="submit" name="CSK_UserManagement/sendParameters"
222+
auto-commit>
223+
</crown-binding>
224+
<crown-edpws-binding property="disabled"
225+
name="CSK_UserManagement/OnPersistentDataModuleAvailable"
226+
update-on-resume converter="function(value) {return !value;}">
227+
</crown-edpws-binding>
228+
</davinci-button>
229+
</layout-column>
230+
</layout-row>
231+
</layout-column>
232+
</stacked-pane>
233+
<stacked-pane id="SP_NotLoggedIn" value="false">
234+
<davinci-callout id="Callout3" type="info">
235+
<span>
236+
Please login with minimun user level 'Maintenance' to setup parameter config.
237+
</span>
238+
</davinci-callout>
239+
</stacked-pane>
240+
<crown-edpws-binding property="value"
241+
name="CSK_UserManagement/OnUserLevelMaintenanceActive"
242+
update-on-resume
243+
converter="function(value) {return value.toString();}">
244+
</crown-edpws-binding>
245+
</stacked-view>
246+
<stacked-view id="SV_PageCalled">
247+
<crown-binding property="value" name="CSK_UserManagement/pageCalled"
248+
path="result/data/empty" auto-update="0" update-on-resume>
249+
</crown-binding>
250+
</stacked-view>
251+
</layout-column>
252+
253+
</layout-row>

‎CSK_Module_UserManagement/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)