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