Skip to content

Commit 3eea795

Browse files
dtimutdtimut
committed
SVY-20350 create a servoy-extra sample servoy application in the
servoy-extra repo fix collapse and dbtreeview
1 parent 5b56fd8 commit 3eea795

4 files changed

Lines changed: 28 additions & 17 deletions

File tree

‎servoyExtraComponentExample/forms/collapseForm.frm‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,14 @@
104104
"uuid":"2373CE1B-E182-4241-8FD4-62C38CC7EEBE"
105105
},
106106
{
107-
"cssPosition":"607,-1,-1,563,224,34",
107+
"cssPosition":"525,-1,-1,563,224,34",
108108
"json":{
109109
"cssPosition":{
110110
"bottom":"-1",
111111
"height":"34",
112112
"left":"563",
113113
"right":"-1",
114-
"top":"607",
114+
"top":"525",
115115
"width":"224"
116116
},
117117
"onActionMethodID":"9CBEBD2E-02A7-49C2-9F9B-BC1F3EA6472B",
@@ -130,14 +130,14 @@
130130
"uuid":"6BD6F64E-74C3-48A1-A575-99BC1C35C800"
131131
},
132132
{
133-
"cssPosition":"524,-1,-1,563,224,34",
133+
"cssPosition":"442,-1,-1,563,224,34",
134134
"json":{
135135
"cssPosition":{
136136
"bottom":"-1",
137137
"height":"34",
138138
"left":"563",
139139
"right":"-1",
140-
"top":"524",
140+
"top":"442",
141141
"width":"224"
142142
},
143143
"onActionMethodID":"F7DD9948-6E52-4B40-871C-02E529BD76BB",
@@ -150,14 +150,14 @@
150150
"uuid":"6D2E8920-5534-4D7D-A7B4-75A9054AB8A1"
151151
},
152152
{
153-
"cssPosition":"443,-1,-1,563,224,34",
153+
"cssPosition":"648,-1,-1,563,224,34",
154154
"json":{
155155
"cssPosition":{
156156
"bottom":"-1",
157157
"height":"34",
158158
"left":"563",
159159
"right":"-1",
160-
"top":"443",
160+
"top":"648",
161161
"width":"224"
162162
},
163163
"onActionMethodID":"C238294E-8A15-49F7-B99B-DF995BFF7F22",
@@ -190,14 +190,14 @@
190190
"uuid":"A8DAE730-1C55-4623-892B-0A84263FD871"
191191
},
192192
{
193-
"cssPosition":"565,-1,-1,563,224,34",
193+
"cssPosition":"483,-1,-1,563,224,34",
194194
"json":{
195195
"cssPosition":{
196196
"bottom":"-1",
197197
"height":"34",
198198
"left":"563",
199199
"right":"-1",
200-
"top":"565",
200+
"top":"483",
201201
"width":"224"
202202
},
203203
"onActionMethodID":"3367360F-93D4-41BE-AB61-8076DA40446E",
@@ -210,14 +210,14 @@
210210
"uuid":"ABDDEBE3-9A7F-466F-BE5C-BBF79F9CBB43"
211211
},
212212
{
213-
"cssPosition":"485,-1,-1,563,224,34",
213+
"cssPosition":"690,-1,-1,563,224,34",
214214
"json":{
215215
"cssPosition":{
216216
"bottom":"-1",
217217
"height":"34",
218218
"left":"563",
219219
"right":"-1",
220-
"top":"485",
220+
"top":"690",
221221
"width":"224"
222222
},
223223
"onActionMethodID":"6FD03E9E-3D7F-430F-B692-12D14107819F",
@@ -339,14 +339,14 @@
339339
"uuid":"D0B4052F-E71C-4366-8D7D-617C49CF24F0"
340340
},
341341
{
342-
"cssPosition":"689,-1,-1,563,224,34",
342+
"cssPosition":"607,-1,-1,563,224,34",
343343
"json":{
344344
"cssPosition":{
345345
"bottom":"-1",
346346
"height":"34",
347347
"left":"563",
348348
"right":"-1",
349-
"top":"689",
349+
"top":"607",
350350
"width":"224"
351351
},
352352
"onActionMethodID":"6296DB4C-4D04-4EA6-9334-1DBC50C315AE",
@@ -359,14 +359,14 @@
359359
"uuid":"E5E6640C-898B-4AEF-B46F-FCF85702AC99"
360360
},
361361
{
362-
"cssPosition":"649,-1,-1,563,224,34",
362+
"cssPosition":"567,-1,-1,563,224,34",
363363
"json":{
364364
"cssPosition":{
365365
"bottom":"-1",
366366
"height":"34",
367367
"left":"563",
368368
"right":"-1",
369-
"top":"649",
369+
"top":"567",
370370
"width":"224"
371371
},
372372
"onActionMethodID":"79E13854-94D3-452D-97A5-6F86C8B0F819",

‎servoyExtraComponentExample/forms/collapseForm.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ function onGetCard(event) {
117117
* @properties={typeid:24,uuid:"E5FB0704-1F7C-4B80-8FEF-C916A3BD6C0D"}
118118
*/
119119
function onGetCardByID(event) {
120-
elements.label_cardClicked.text = 'Get card by Id: ' + elements.collapse_7.getCardById('card 1');
120+
elements.label_cardClicked.text = 'Get card by Id: ' + elements.collapse_7.getCardById('card 1').cardId;
121121

122122
}
123123

‎servoyExtraComponentExample/forms/dbtreeviewForm.frm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@
413413
"top":"287",
414414
"width":"298"
415415
},
416+
"onActionMethodID":"ECA9FF94-DBFF-4A29-8CAA-1D90F6F82839",
416417
"text":"Set Checkbox Value Dataprovider",
417418
"variant":"BtnPrimary"
418419
},

‎servoyExtraComponentExample/forms/dbtreeviewForm.js‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ function onSetNodeLevelVisible(event) {
190190
* @properties={typeid:24,uuid:"1B9BEE00-DEB5-47A5-BA76-0ED7D1FCA1A5"}
191191
*/
192192
function onSetHasCheckBoxDataprovider(event) {
193-
elements.dbtreeview_1.setHasCheckBoxDataprovider(memOrderFS.getDataSource(), true);
193+
elements.dbtreeview_1.setHasCheckBoxDataprovider(memOrderFS.getDataSource(), 'enabled');
194194
// TODO: fix this call
195195
}
196196
/**
@@ -445,6 +445,16 @@ function onGetCheckBoxValues(event) {
445445
*/
446446
function onSetCheckBoxAutoselectsChildren(event) {
447447
elements.dbtreeview_1.setHasCheckBoxValue(memOrderFS.getDataSource(), [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25]);
448-
449448
elements.dbtreeview_1.setCheckBoxAutoselectsChildren(memOrderFS.getDataSource(), true);
450449
}
450+
451+
/**
452+
* Fired when the button is clicked.
453+
*
454+
* @param {JSEvent} event
455+
*
456+
* @properties={typeid:24,uuid:"ECA9FF94-DBFF-4A29-8CAA-1D90F6F82839"}
457+
*/
458+
function onSetCheckboxValueDataprovider(event) {
459+
elements.dbtreeview_1.setCheckBoxValueDataprovider(memUserFS.getDataSource(), 'enabled');
460+
}

0 commit comments

Comments
 (0)