SGH / DEEP

Commit f5c7d60c3544e1109d4c8a5d2a542c9ae8454c09

Authored by mwasiluk
2 parents 85f2fa12 e2d8a521

Merge branch 'master' of http://service.routetopa.eu:7480/isislab/DEEP into master_sgh

Inline Side-by-side
Showing 4 changed files with 197 additions and 50 deletions
controllets.xml
  View file @f5c7d60
@@ -22,5 +22,8 @@ @@ -22,5 +22,8 @@
22 <component> 22 <component>
23 <name>data-sevc-controllet</name> 23 <name>data-sevc-controllet</name>
24 </component> 24 </component>
  25 + <component>
  26 + <name>datalets-modifier-controllet</name>
  27 + </component>
25 </components> 28 </components>
26 </handler_configuration> 29 </handler_configuration>
datalets.xml
  View file @f5c7d60
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
14 <input> 14 <input>
15 <name>Column</name> 15 <name>Column</name>
16 <description>ColumnDescription</description> 16 <description>ColumnDescription</description>
  17 + <type>TEXT</type>
17 <selection>+</selection> 18 <selection>+</selection>
18 </input> 19 </input>
19 <layouts> 20 <layouts>
@@ -31,21 +32,27 @@ @@ -31,21 +32,27 @@
31 <input> 32 <input>
32 <name>SliceLabels</name> 33 <name>SliceLabels</name>
33 <description>SliceLabelsDescription</description> 34 <description>SliceLabelsDescription</description>
  35 + <type>TEXT</type>
  36 + <selection>1</selection>
34 </input> 37 </input>
35 <input> 38 <input>
36 <name>SliceSizes</name> 39 <name>SliceSizes</name>
37 <description>SliceSizesDescription</description> 40 <description>SliceSizesDescription</description>
  41 + <type>NUMBER</type>
  42 + <selection>1</selection>
38 </input> 43 </input>
39 <layouts> 44 <layouts>
40 <input> 45 <input>
41 <name>suffix</name> 46 <name>suffix</name>
42 <description>suffixDescription</description> 47 <description>suffixDescription</description>
43 - <type>text</type> 48 + <type>TEXT</type>
  49 + <selection>1</selection>
44 </input> 50 </input>
45 <input> 51 <input>
46 <name>theme</name> 52 <name>theme</name>
47 <description>themeDescription</description> 53 <description>themeDescription</description>
48 - <type>list</type> 54 + <type>LIST</type>
  55 + <selection>1</selection>
49 <list> 56 <list>
50 <item>themeBase</item> 57 <item>themeBase</item>
51 <item>themeDarkUnika</item> 58 <item>themeDarkUnika</item>
@@ -57,7 +64,8 @@ @@ -57,7 +64,8 @@
57 <input> 64 <input>
58 <name>donut</name> 65 <name>donut</name>
59 <description>donutDescription</description> 66 <description>donutDescription</description>
60 - <type>list</type> 67 + <type>LIST</type>
  68 + <selection>1</selection>
61 <list> 69 <list>
62 <item>false</item> 70 <item>false</item>
63 <item>true</item> 71 <item>true</item>
@@ -73,37 +81,45 @@ @@ -73,37 +81,45 @@
73 <!--column--> 81 <!--column-->
74 <component> 82 <component>
75 <name>columnchart-datalet</name> 83 <name>columnchart-datalet</name>
76 - <type>multiseries</type> 84 + <type>multiseries2</type>
77 <idm> 85 <idm>
78 <inputs> 86 <inputs>
79 <input> 87 <input>
80 <name>XAxis</name> 88 <name>XAxis</name>
81 <description>XAxisDescription</description> 89 <description>XAxisDescription</description>
  90 + <type>TEXT</type>
  91 + <selection>1</selection>
82 </input> 92 </input>
83 <input> 93 <input>
84 <name>NumericYAxis</name> 94 <name>NumericYAxis</name>
85 <description>YAxisDescription</description> 95 <description>YAxisDescription</description>
  96 + <type>NUMBER</type>
  97 + <selection>*</selection>
86 </input> 98 </input>
87 <layouts> 99 <layouts>
88 <input> 100 <input>
89 <name>x-axis-label</name> 101 <name>x-axis-label</name>
90 <description>XAxisLabelDescription</description> 102 <description>XAxisLabelDescription</description>
91 - <type>text</type> 103 + <type>TEXT</type>
  104 + <selection>1</selection>
92 </input> 105 </input>
93 <input> 106 <input>
94 <name>y-axis-label</name> 107 <name>y-axis-label</name>
95 <description>YAxisLabelDescription</description> 108 <description>YAxisLabelDescription</description>
96 - <type>text</type> 109 + <type>TEXT</type>
  110 + <selection>1</selection>
97 </input> 111 </input>
98 <input> 112 <input>
99 <name>suffix</name> 113 <name>suffix</name>
100 <description>suffixDescription</description> 114 <description>suffixDescription</description>
101 - <type>text</type> 115 + <type>TEXT</type>
  116 + <selection>1</selection>
102 </input> 117 </input>
103 <input> 118 <input>
104 <name>theme</name> 119 <name>theme</name>
105 <description>themeDescription</description> 120 <description>themeDescription</description>
106 - <type>list</type> 121 + <type>LIST</type>
  122 + <selection>1</selection>
107 <list> 123 <list>
108 <item>themeBase</item> 124 <item>themeBase</item>
109 <item>themeDarkUnika</item> 125 <item>themeDarkUnika</item>
@@ -119,37 +135,45 @@ @@ -119,37 +135,45 @@
119 <!--bar--> 135 <!--bar-->
120 <component> 136 <component>
121 <name>barchart-datalet</name> 137 <name>barchart-datalet</name>
122 - <type>multiseries</type> 138 + <type>multiseries2</type>
123 <idm> 139 <idm>
124 <inputs> 140 <inputs>
125 <input> 141 <input>
126 <name>XAxis</name> 142 <name>XAxis</name>
127 <description>XAxisDescription</description> 143 <description>XAxisDescription</description>
  144 + <type>TEXT</type>
  145 + <selection>1</selection>
128 </input> 146 </input>
129 <input> 147 <input>
130 <name>NumericYAxis</name> 148 <name>NumericYAxis</name>
131 <description>YAxisDescription</description> 149 <description>YAxisDescription</description>
  150 + <type>NUMBER</type>
  151 + <selection>*</selection>
132 </input> 152 </input>
133 <layouts> 153 <layouts>
134 <input> 154 <input>
135 <name>x-axis-label</name> 155 <name>x-axis-label</name>
136 <description>XAxisLabelDescription</description> 156 <description>XAxisLabelDescription</description>
137 - <type>text</type> 157 + <type>TEXT</type>
  158 + <selection>1</selection>
138 </input> 159 </input>
139 <input> 160 <input>
140 <name>y-axis-label</name> 161 <name>y-axis-label</name>
141 <description>YAxisLabelDescription</description> 162 <description>YAxisLabelDescription</description>
142 - <type>text</type> 163 + <type>TEXT</type>
  164 + <selection>1</selection>
143 </input> 165 </input>
144 <input> 166 <input>
145 <name>suffix</name> 167 <name>suffix</name>
146 <description>suffixDescription</description> 168 <description>suffixDescription</description>
147 - <type>text</type> 169 + <type>TEXT</type>
  170 + <selection>1</selection>
148 </input> 171 </input>
149 <input> 172 <input>
150 <name>theme</name> 173 <name>theme</name>
151 <description>themeDescription</description> 174 <description>themeDescription</description>
152 - <type>list</type> 175 + <type>LIST</type>
  176 + <selection>1</selection>
153 <list> 177 <list>
154 <item>themeBase</item> 178 <item>themeBase</item>
155 <item>themeDarkUnika</item> 179 <item>themeDarkUnika</item>
@@ -165,37 +189,45 @@ @@ -165,37 +189,45 @@
165 <!--area--> 189 <!--area-->
166 <component> 190 <component>
167 <name>areachart-datalet</name> 191 <name>areachart-datalet</name>
168 - <type>multiseries</type> 192 + <type>multiseries2</type>
169 <idm> 193 <idm>
170 <inputs> 194 <inputs>
171 <input> 195 <input>
172 <name>XAxis</name> 196 <name>XAxis</name>
173 <description>XAxisDescription</description> 197 <description>XAxisDescription</description>
  198 + <type>TEXT</type>
  199 + <selection>1</selection>
174 </input> 200 </input>
175 <input> 201 <input>
176 <name>NumericYAxis</name> 202 <name>NumericYAxis</name>
177 <description>YAxisDescription</description> 203 <description>YAxisDescription</description>
  204 + <type>NUMBER</type>
  205 + <selection>*</selection>
178 </input> 206 </input>
179 <layouts> 207 <layouts>
180 <input> 208 <input>
181 <name>x-axis-label</name> 209 <name>x-axis-label</name>
182 <description>XAxisLabelDescription</description> 210 <description>XAxisLabelDescription</description>
183 - <type>text</type> 211 + <type>TEXT</type>
  212 + <selection>1</selection>
184 </input> 213 </input>
185 <input> 214 <input>
186 <name>y-axis-label</name> 215 <name>y-axis-label</name>
187 <description>YAxisLabelDescription</description> 216 <description>YAxisLabelDescription</description>
188 - <type>text</type> 217 + <type>TEXT</type>
  218 + <selection>1</selection>
189 </input> 219 </input>
190 <input> 220 <input>
191 <name>suffix</name> 221 <name>suffix</name>
192 <description>suffixDescription</description> 222 <description>suffixDescription</description>
193 - <type>text</type> 223 + <type>TEXT</type>
  224 + <selection>1</selection>
194 </input> 225 </input>
195 <input> 226 <input>
196 <name>theme</name> 227 <name>theme</name>
197 <description>themeDescription</description> 228 <description>themeDescription</description>
198 - <type>list</type> 229 + <type>LIST</type>
  230 + <selection>1</selection>
199 <list> 231 <list>
200 <item>themeBase</item> 232 <item>themeBase</item>
201 <item>themeDarkUnika</item> 233 <item>themeDarkUnika</item>
@@ -211,37 +243,45 @@ @@ -211,37 +243,45 @@
211 <!--line--> 243 <!--line-->
212 <component> 244 <component>
213 <name>linechart-datalet</name> 245 <name>linechart-datalet</name>
214 - <type>multiseries</type> 246 + <type>multiseries2</type>
215 <idm> 247 <idm>
216 <inputs> 248 <inputs>
217 <input> 249 <input>
218 <name>XAxis</name> 250 <name>XAxis</name>
219 <description>XAxisDescription</description> 251 <description>XAxisDescription</description>
  252 + <type>TEXT</type>
  253 + <selection>1</selection>
220 </input> 254 </input>
221 <input> 255 <input>
222 <name>NumericYAxis</name> 256 <name>NumericYAxis</name>
223 <description>YAxisDescription</description> 257 <description>YAxisDescription</description>
  258 + <type>NUMBER</type>
  259 + <selection>*</selection>
224 </input> 260 </input>
225 <layouts> 261 <layouts>
226 <input> 262 <input>
227 <name>x-axis-label</name> 263 <name>x-axis-label</name>
228 <description>XAxisLabelDescription</description> 264 <description>XAxisLabelDescription</description>
229 - <type>text</type> 265 + <type>TEXT</type>
  266 + <selection>1</selection>
230 </input> 267 </input>
231 <input> 268 <input>
232 <name>y-axis-label</name> 269 <name>y-axis-label</name>
233 <description>YAxisLabelDescription</description> 270 <description>YAxisLabelDescription</description>
234 - <type>text</type> 271 + <type>TEXT</type>
  272 + <selection>1</selection>
235 </input> 273 </input>
236 <input> 274 <input>
237 <name>suffix</name> 275 <name>suffix</name>
238 <description>suffixDescription</description> 276 <description>suffixDescription</description>
239 - <type>text</type> 277 + <type>TEXT</type>
  278 + <selection>1</selection>
240 </input> 279 </input>
241 <input> 280 <input>
242 <name>theme</name> 281 <name>theme</name>
243 <description>themeDescription</description> 282 <description>themeDescription</description>
244 - <type>list</type> 283 + <type>LIST</type>
  284 + <selection>1</selection>
245 <list> 285 <list>
246 <item>themeBase</item> 286 <item>themeBase</item>
247 <item>themeDarkUnika</item> 287 <item>themeDarkUnika</item>
@@ -257,37 +297,45 @@ @@ -257,37 +297,45 @@
257 <!--heatmap--> 297 <!--heatmap-->
258 <component> 298 <component>
259 <name>heatmap-datalet</name> 299 <name>heatmap-datalet</name>
260 - <type>multiseries</type> 300 + <type>multiseries2</type>
261 <idm> 301 <idm>
262 <inputs> 302 <inputs>
263 <input> 303 <input>
264 <name>XAxis</name> 304 <name>XAxis</name>
265 <description>XAxisDescription</description> 305 <description>XAxisDescription</description>
  306 + <type>TEXT</type>
  307 + <selection>1</selection>
266 </input> 308 </input>
267 <input> 309 <input>
268 <name>NumericYAxis</name> 310 <name>NumericYAxis</name>
269 <description>YAxisDescription</description> 311 <description>YAxisDescription</description>
  312 + <type>NUMBER</type>
  313 + <selection>*</selection>
270 </input> 314 </input>
271 <layouts> 315 <layouts>
272 <input> 316 <input>
273 <name>x-axis-label</name> 317 <name>x-axis-label</name>
274 <description>XAxisLabelDescription</description> 318 <description>XAxisLabelDescription</description>
275 - <type>text</type> 319 + <type>TEXT</type>
  320 + <selection>1</selection>
276 </input> 321 </input>
277 <input> 322 <input>
278 <name>y-axis-label</name> 323 <name>y-axis-label</name>
279 <description>YAxisLabelDescription</description> 324 <description>YAxisLabelDescription</description>
280 - <type>text</type> 325 + <type>TEXT</type>
  326 + <selection>1</selection>
281 </input> 327 </input>
282 <input> 328 <input>
283 <name>suffix</name> 329 <name>suffix</name>
284 <description>suffixDescription</description> 330 <description>suffixDescription</description>
285 - <type>text</type> 331 + <type>TEXT</type>
  332 + <selection>1</selection>
286 </input> 333 </input>
287 <input> 334 <input>
288 <name>theme</name> 335 <name>theme</name>
289 <description>themeDescription</description> 336 <description>themeDescription</description>
290 - <type>list</type> 337 + <type>LIST</type>
  338 + <selection>1</selection>
291 <list> 339 <list>
292 <item>themeBase</item> 340 <item>themeBase</item>
293 <item>themeDarkUnika</item> 341 <item>themeDarkUnika</item>
@@ -312,31 +360,39 @@ @@ -312,31 +360,39 @@
312 <input> 360 <input>
313 <name>XAxis</name> 361 <name>XAxis</name>
314 <description>XAxisDescription</description> 362 <description>XAxisDescription</description>
  363 + <type>TEXT</type>
  364 + <selection>1</selection>
315 </input> 365 </input>
316 <input> 366 <input>
317 <name>NumericYAxis</name> 367 <name>NumericYAxis</name>
318 <description>YAxisDescription</description> 368 <description>YAxisDescription</description>
  369 + <type>NUMBER</type>
  370 + <selection>1</selection>
319 </input> 371 </input>
320 <layouts> 372 <layouts>
321 <input> 373 <input>
322 <name>x-axis-label</name> 374 <name>x-axis-label</name>
323 <description>XAxisLabelDescription</description> 375 <description>XAxisLabelDescription</description>
324 - <type>text</type> 376 + <type>TEXT</type>
  377 + <selection>1</selection>
325 </input> 378 </input>
326 <input> 379 <input>
327 <name>y-axis-label</name> 380 <name>y-axis-label</name>
328 <description>YAxisLabelDescription</description> 381 <description>YAxisLabelDescription</description>
329 - <type>text</type> 382 + <type>TEXT</type>
  383 + <selection>1</selection>
330 </input> 384 </input>
331 <input> 385 <input>
332 <name>suffix</name> 386 <name>suffix</name>
333 <description>suffixDescription</description> 387 <description>suffixDescription</description>
334 - <type>text</type> 388 + <type>TEXT</type>
  389 + <selection>1</selection>
335 </input> 390 </input>
336 <input> 391 <input>
337 <name>theme</name> 392 <name>theme</name>
338 <description>themeDescription</description> 393 <description>themeDescription</description>
339 - <type>list</type> 394 + <type>LIST</type>
  395 + <selection>1</selection>
340 <list> 396 <list>
341 <item>themeBase</item> 397 <item>themeBase</item>
342 <item>themeDarkUnika</item> 398 <item>themeDarkUnika</item>
@@ -348,7 +404,8 @@ @@ -348,7 +404,8 @@
348 <input> 404 <input>
349 <name>stack</name> 405 <name>stack</name>
350 <description>stackDescription</description> 406 <description>stackDescription</description>
351 - <type>list</type> 407 + <type>LIST</type>
  408 + <selection>1</selection>
352 <list> 409 <list>
353 <item>normal</item> 410 <item>normal</item>
354 <item>percent</item> 411 <item>percent</item>
@@ -367,31 +424,39 @@ @@ -367,31 +424,39 @@
367 <input> 424 <input>
368 <name>XAxis</name> 425 <name>XAxis</name>
369 <description>XAxisDescription</description> 426 <description>XAxisDescription</description>
  427 + <type>TEXT</type>
  428 + <selection>1</selection>
370 </input> 429 </input>
371 <input> 430 <input>
372 <name>NumericYAxis</name> 431 <name>NumericYAxis</name>
373 <description>YAxisDescription</description> 432 <description>YAxisDescription</description>
  433 + <type>NUMBER</type>
  434 + <selection>1</selection>
374 </input> 435 </input>
375 <layouts> 436 <layouts>
376 <input> 437 <input>
377 <name>x-axis-label</name> 438 <name>x-axis-label</name>
378 <description>XAxisLabelDescription</description> 439 <description>XAxisLabelDescription</description>
379 - <type>text</type> 440 + <type>TEXT</type>
  441 + <selection>1</selection>
380 </input> 442 </input>
381 <input> 443 <input>
382 <name>y-axis-label</name> 444 <name>y-axis-label</name>
383 <description>YAxisLabelDescription</description> 445 <description>YAxisLabelDescription</description>
384 - <type>text</type> 446 + <type>TEXT</type>
  447 + <selection>1</selection>
385 </input> 448 </input>
386 <input> 449 <input>
387 <name>suffix</name> 450 <name>suffix</name>
388 <description>suffixDescription</description> 451 <description>suffixDescription</description>
389 - <type>text</type> 452 + <type>TEXT</type>
  453 + <selection>1</selection>
390 </input> 454 </input>
391 <input> 455 <input>
392 <name>theme</name> 456 <name>theme</name>
393 <description>themeDescription</description> 457 <description>themeDescription</description>
394 - <type>list</type> 458 + <type>LIST</type>
  459 + <selection>1</selection>
395 <list> 460 <list>
396 <item>themeBase</item> 461 <item>themeBase</item>
397 <item>themeDarkUnika</item> 462 <item>themeDarkUnika</item>
@@ -403,7 +468,8 @@ @@ -403,7 +468,8 @@
403 <input> 468 <input>
404 <name>stack</name> 469 <name>stack</name>
405 <description>stackDescription</description> 470 <description>stackDescription</description>
406 - <type>list</type> 471 + <type>LIST</type>
  472 + <selection>1</selection>
407 <list> 473 <list>
408 <item>normal</item> 474 <item>normal</item>
409 <item>percent</item> 475 <item>percent</item>
@@ -422,31 +488,39 @@ @@ -422,31 +488,39 @@
422 <input> 488 <input>
423 <name>XAxis</name> 489 <name>XAxis</name>
424 <description>XAxisDescription</description> 490 <description>XAxisDescription</description>
  491 + <type>TEXT</type>
  492 + <selection>1</selection>
425 </input> 493 </input>
426 <input> 494 <input>
427 <name>NumericYAxis</name> 495 <name>NumericYAxis</name>
428 <description>YAxisDescription</description> 496 <description>YAxisDescription</description>
  497 + <type>NUMBER</type>
  498 + <selection>1</selection>
429 </input> 499 </input>
430 <layouts> 500 <layouts>
431 <input> 501 <input>
432 <name>x-axis-label</name> 502 <name>x-axis-label</name>
433 <description>XAxisLabelDescription</description> 503 <description>XAxisLabelDescription</description>
434 - <type>text</type> 504 + <type>TEXT</type>
  505 + <selection>1</selection>
435 </input> 506 </input>
436 <input> 507 <input>
437 <name>y-axis-label</name> 508 <name>y-axis-label</name>
438 <description>YAxisLabelDescription</description> 509 <description>YAxisLabelDescription</description>
439 - <type>text</type> 510 + <type>TEXT</type>
  511 + <selection>1</selection>
440 </input> 512 </input>
441 <input> 513 <input>
442 <name>suffix</name> 514 <name>suffix</name>
443 <description>suffixDescription</description> 515 <description>suffixDescription</description>
444 - <type>text</type> 516 + <type>TEXT</type>
  517 + <selection>1</selection>
445 </input> 518 </input>
446 <input> 519 <input>
447 <name>theme</name> 520 <name>theme</name>
448 <description>themeDescription</description> 521 <description>themeDescription</description>
449 - <type>list</type> 522 + <type>LIST</type>
  523 + <selection>1</selection>
450 <list> 524 <list>
451 <item>themeBase</item> 525 <item>themeBase</item>
452 <item>themeDarkUnika</item> 526 <item>themeDarkUnika</item>
@@ -458,7 +532,8 @@ @@ -458,7 +532,8 @@
458 <input> 532 <input>
459 <name>stack</name> 533 <name>stack</name>
460 <description>stackDescription</description> 534 <description>stackDescription</description>
461 - <type>list</type> 535 + <type>LIST</type>
  536 + <selection>1</selection>
462 <list> 537 <list>
463 <item>normal</item> 538 <item>normal</item>
464 <item>percent</item> 539 <item>percent</item>
@@ -478,14 +553,45 @@ @@ -478,14 +553,45 @@
478 <input> 553 <input>
479 <name>Latitude</name> 554 <name>Latitude</name>
480 <description>LatitudeDescription</description> 555 <description>LatitudeDescription</description>
  556 + <!--<type>GEOGRAPHICAL COORDINATE</type>-->
  557 + <type>NUMBER</type>
  558 + <selection>1</selection>
481 </input> 559 </input>
482 <input> 560 <input>
483 <name>Longitude</name> 561 <name>Longitude</name>
484 <description>LongitudeDescription</description> 562 <description>LongitudeDescription</description>
  563 + <!--<type>GEOGRAPHICAL COORDINATE</type>-->
  564 + <type>NUMBER</type>
  565 + <selection>1</selection>
485 </input> 566 </input>
486 <input> 567 <input>
487 <name>BalloonContent</name> 568 <name>BalloonContent</name>
488 <description>BalloonContentDescription</description> 569 <description>BalloonContentDescription</description>
  570 + <type>TEXT</type>
  571 + <selection>*</selection>
  572 + </input>
  573 + <layouts>
  574 + </layouts>
  575 + </inputs>
  576 + </idm>
  577 + </component>
  578 +
  579 + <!--map-->
  580 + <component>
  581 + <name>leafletjs-geojson-datalet</name>
  582 + <type>map-geojson</type>
  583 + <idm>
  584 + <inputs>
  585 + <input>
  586 + <name>GEOJSON</name>
  587 + <description>GEOJSONDescription</description>
  588 + <type>GEOJSON</type>
  589 + <selection>1</selection>
  590 + </input>
  591 + <input>
  592 + <name>BalloonContent</name>
  593 + <description>BalloonContentDescription</description>
  594 + <type>TEXT</type>
489 <selection>*</selection> 595 <selection>*</selection>
490 </input> 596 </input>
491 <layouts> 597 <layouts>
@@ -503,31 +609,39 @@ @@ -503,31 +609,39 @@
503 <input> 609 <input>
504 <name>NumericXAxis</name> 610 <name>NumericXAxis</name>
505 <description>XAxisDescription</description> 611 <description>XAxisDescription</description>
  612 + <type>NUMBER</type>
  613 + <selection>1</selection>
506 </input> 614 </input>
507 <input> 615 <input>
508 <name>NumericYAxis</name> 616 <name>NumericYAxis</name>
509 <description>YAxisDescription</description> 617 <description>YAxisDescription</description>
  618 + <type>NUMBER</type>
  619 + <selection>1</selection>
510 </input> 620 </input>
511 <input> 621 <input>
512 <name>Categories</name> 622 <name>Categories</name>
513 <description>CategoriesDescription</description> 623 <description>CategoriesDescription</description>
  624 + <type>TEXT</type>
514 <selection>?</selection> 625 <selection>?</selection>
515 </input> 626 </input>
516 <layouts> 627 <layouts>
517 <input> 628 <input>
518 <name>x-axis-label</name> 629 <name>x-axis-label</name>
519 <description>XAxisLabelDescription</description> 630 <description>XAxisLabelDescription</description>
520 - <type>text</type> 631 + <type>TEXT</type>
  632 + <selection>1</selection>
521 </input> 633 </input>
522 <input> 634 <input>
523 <name>y-axis-label</name> 635 <name>y-axis-label</name>
524 <description>YAxisLabelDescription</description> 636 <description>YAxisLabelDescription</description>
525 - <type>text</type> 637 + <type>TEXT</type>
  638 + <selection>1</selection>
526 </input> 639 </input>
527 <input> 640 <input>
528 <name>theme</name> 641 <name>theme</name>
529 <description>themeDescription</description> 642 <description>themeDescription</description>
530 - <type>list</type> 643 + <type>LIST</type>
  644 + <selection>1</selection>
531 <list> 645 <list>
532 <item>themeBase</item> 646 <item>themeBase</item>
533 <item>themeDarkUnika</item> 647 <item>themeDarkUnika</item>
@@ -617,39 +731,51 @@ @@ -617,39 +731,51 @@
617 <input> 731 <input>
618 <name>NumericXAxis</name> 732 <name>NumericXAxis</name>
619 <description>XAxisDescription</description> 733 <description>XAxisDescription</description>
  734 + <type>NUMBER</type>
  735 + <selection>1</selection>
620 </input> 736 </input>
621 <input> 737 <input>
622 <name>NumericYAxis</name> 738 <name>NumericYAxis</name>
623 <description>YAxisDescription</description> 739 <description>YAxisDescription</description>
  740 + <type>NUMBER</type>
  741 + <selection>1</selection>
624 </input> 742 </input>
625 <input> 743 <input>
626 <name>BubbleSize</name> 744 <name>BubbleSize</name>
627 <description>BubbleSizeDescription</description> 745 <description>BubbleSizeDescription</description>
  746 + <type>NUMBER</type>
  747 + <selection>?</selection>
628 </input> 748 </input>
629 <input> 749 <input>
630 <name>BubbleContent</name> 750 <name>BubbleContent</name>
631 <description>BubbleContentDescription</description> 751 <description>BubbleContentDescription</description>
  752 + <type>TEXT</type>
  753 + <selection>?</selection>
632 </input> 754 </input>
633 <input> 755 <input>
634 <name>Categories</name> 756 <name>Categories</name>
635 <description>CategoriesDescription</description> 757 <description>CategoriesDescription</description>
  758 + <type>TEXT</type>
636 <selection>?</selection> 759 <selection>?</selection>
637 </input> 760 </input>
638 <layouts> 761 <layouts>
639 <input> 762 <input>
640 <name>x-axis-label</name> 763 <name>x-axis-label</name>
641 <description>XAxisLabelDescription</description> 764 <description>XAxisLabelDescription</description>
642 - <type>text</type> 765 + <type>TEXT</type>
  766 + <selection>1</selection>
643 </input> 767 </input>
644 <input> 768 <input>
645 <name>y-axis-label</name> 769 <name>y-axis-label</name>
646 <description>YAxisLabelDescription</description> 770 <description>YAxisLabelDescription</description>
647 - <type>text</type> 771 + <type>TEXT</type>
  772 + <selection>1</selection>
648 </input> 773 </input>
649 <input> 774 <input>
650 <name>theme</name> 775 <name>theme</name>
651 <description>themeDescription</description> 776 <description>themeDescription</description>
652 - <type>list</type> 777 + <type>LIST</type>
  778 + <selection>1</selection>
653 <list> 779 <list>
654 <item>themeBase</item> 780 <item>themeBase</item>
655 <item>themeDarkUnika</item> 781 <item>themeDarkUnika</item>
@@ -672,6 +798,7 @@ @@ -672,6 +798,7 @@
672 <input> 798 <input>
673 <name>Level</name> 799 <name>Level</name>
674 <description>LevelDescription</description> 800 <description>LevelDescription</description>
  801 + <type>TEXT</type>
675 <selection>+</selection> 802 <selection>+</selection>
676 </input> 803 </input>
677 <layouts> 804 <layouts>
@@ -689,10 +816,14 @@ @@ -689,10 +816,14 @@
689 <input> 816 <input>
690 <name>url</name> 817 <name>url</name>
691 <description></description> 818 <description></description>
  819 + <type>TEXT</type>
  820 + <selection>1</selection>
692 </input> 821 </input>
693 <input> 822 <input>
694 <name>data-url</name> 823 <name>data-url</name>
695 <description></description> 824 <description></description>
  825 + <type>TEXT</type>
  826 + <selection>1</selection>
696 </input> 827 </input>
697 <layouts> 828 <layouts>
698 </layouts> 829 </layouts>
datalets/datalets.dtd
  View file @f5c7d60
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <!ELEMENT idm (inputs*)> 4 <!ELEMENT idm (inputs*)>
5 <!ELEMENT inputs (input*, layouts)> 5 <!ELEMENT inputs (input*, layouts)>
6 <!ELEMENT layouts (input*)> 6 <!ELEMENT layouts (input*)>
7 -<!ELEMENT input (name, description?, selection?, type?, validator?, list?)> 7 +<!ELEMENT input (name, description?, type, selection, validator?, list?)>
8 <!ELEMENT list (item+)> 8 <!ELEMENT list (item+)>
9 <!ELEMENT item (#PCDATA)> 9 <!ELEMENT item (#PCDATA)>
10 <!ELEMENT name (#PCDATA)> 10 <!ELEMENT name (#PCDATA)>
export/deepexport.php
  View file @f5c7d60
@@ -56,15 +56,28 @@ class DeepExport @@ -56,15 +56,28 @@ class DeepExport
56 56
57 if(!empty($_REQUEST["description"])) 57 if(!empty($_REQUEST["description"]))
58 $sect->writeText("Dataset description : " . strip_tags($_REQUEST["description"]), new PHPRtfLite_Font(14), new PHPRtfLite_ParFormat('center')); 58 $sect->writeText("Dataset description : " . strip_tags($_REQUEST["description"]), new PHPRtfLite_Font(14), new PHPRtfLite_ParFormat('center'));
  59 +
59 if(!empty($_REQUEST["created"])) 60 if(!empty($_REQUEST["created"]))
60 $sect->writeText("Dataset creation date : " . strip_tags($_REQUEST["created"]), new PHPRtfLite_Font(14), new PHPRtfLite_ParFormat('center')); 61 $sect->writeText("Dataset creation date : " . strip_tags($_REQUEST["created"]), new PHPRtfLite_Font(14), new PHPRtfLite_ParFormat('center'));
  62 +
61 if(!empty($_REQUEST["format"])) 63 if(!empty($_REQUEST["format"]))
62 $sect->writeText("Dataset format : " . strip_tags($_REQUEST["format"]), new PHPRtfLite_Font(14), new PHPRtfLite_ParFormat('center')); 64 $sect->writeText("Dataset format : " . strip_tags($_REQUEST["format"]), new PHPRtfLite_Font(14), new PHPRtfLite_ParFormat('center'));
  65 +
63 if(!empty($_REQUEST["lastModified"])) 66 if(!empty($_REQUEST["lastModified"]))
64 $sect->writeText("Dataset last modified : " . strip_tags($_REQUEST["lastModified"]), new PHPRtfLite_Font(14), new PHPRtfLite_ParFormat('center')); 67 $sect->writeText("Dataset last modified : " . strip_tags($_REQUEST["lastModified"]), new PHPRtfLite_Font(14), new PHPRtfLite_ParFormat('center'));
65 68
66 if(!empty($_REQUEST["dataset"])) 69 if(!empty($_REQUEST["dataset"]))
67 $sect->writeText("Dataset link : " . strip_tags($_REQUEST["dataset"]), new PHPRtfLite_Font(14), new PHPRtfLite_ParFormat('center')); 70 $sect->writeText("Dataset link : " . strip_tags($_REQUEST["dataset"]), new PHPRtfLite_Font(14), new PHPRtfLite_ParFormat('center'));
  71 +
  72 + if(!empty($_REQUEST["timestamp"]))
  73 + $sect->writeText("Datalet added on : " . strip_tags($_REQUEST["timestamp"]), new PHPRtfLite_Font(14), new PHPRtfLite_ParFormat('center'));
  74 +
  75 + if(!empty($_REQUEST["user"]))
  76 + $sect->writeText("Datalet created by : " . strip_tags($_REQUEST["user"]), new PHPRtfLite_Font(14), new PHPRtfLite_ParFormat('center'));
  77 +
  78 + if(!empty($_REQUEST["comment"]))
  79 + $sect->writeText("Datalet comment : " . strip_tags($_REQUEST["comment"]), new PHPRtfLite_Font(14), new PHPRtfLite_ParFormat('center'));
  80 +
68 // save rtf document 81 // save rtf document
69 82
70 $rtf->sendRtf('datalet.rtf'); 83 $rtf->sendRtf('datalet.rtf');