cpee 2.1.93 → 2.1.96

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (77) hide show
  1. checksums.yaml +4 -4
  2. data/cockpit/css/{resources-label.css → extended_columns-label.css} +4 -0
  3. data/cockpit/css/ui.css +2 -1
  4. data/cockpit/css/wfadaptor.css +8 -11
  5. data/cockpit/david.html +292 -0
  6. data/cockpit/edit.html +16 -7
  7. data/cockpit/graph.html +3 -3
  8. data/cockpit/index.html +15 -7
  9. data/cockpit/js/details.js +2 -1
  10. data/cockpit/js/extended_columns.js +233 -0
  11. data/cockpit/js/instance.js +45 -161
  12. data/cockpit/js/ui.js +0 -27
  13. data/cockpit/js/wfadaptor.js +25 -14
  14. data/cockpit/llm.html +3 -3
  15. data/cockpit/llm_alternative.html +3 -3
  16. data/cockpit/model.html +2 -2
  17. data/cockpit/only_llm.html +16 -7
  18. data/cockpit/templates/Coopis 2010.xml +11 -4
  19. data/cockpit/templates/Frames.xml +78 -10
  20. data/cockpit/templates/Track Test.xml +1 -1
  21. data/cockpit/themes/base.js +11 -7
  22. data/cockpit/themes/control/rngs/call.rng +8 -0
  23. data/cockpit/themes/control/rngs/callmanipulate.rng +9 -1
  24. data/cockpit/themes/control/rngs/loop.rng +7 -0
  25. data/cockpit/themes/control/rngs/manipulate.rng +57 -2
  26. data/cockpit/themes/dataflow/rngs/call.rng +8 -0
  27. data/cockpit/themes/dataflow/rngs/callmanipulate.rng +9 -1
  28. data/cockpit/themes/dataflow/rngs/loop.rng +7 -0
  29. data/cockpit/themes/dataflow/rngs/manipulate.rng +57 -2
  30. data/cockpit/themes/dataflow/theme.js +4 -4
  31. data/cockpit/themes/default/rngs/call.rng +8 -0
  32. data/cockpit/themes/default/rngs/callmanipulate.rng +9 -1
  33. data/cockpit/themes/default/rngs/loop.rng +7 -0
  34. data/cockpit/themes/default/rngs/manipulate.rng +57 -2
  35. data/cockpit/themes/extended/rngs/call.rng +8 -0
  36. data/cockpit/themes/extended/rngs/callmanipulate.rng +9 -1
  37. data/cockpit/themes/extended/rngs/loop.rng +7 -0
  38. data/cockpit/themes/extended/rngs/manipulate.rng +57 -2
  39. data/cockpit/themes/packed/rngs/call.rng +8 -0
  40. data/cockpit/themes/packed/rngs/callmanipulate.rng +9 -1
  41. data/cockpit/themes/packed/rngs/loop.rng +7 -0
  42. data/cockpit/themes/packed/rngs/manipulate.rng +57 -2
  43. data/cockpit/themes/preset/rngs/call.rng +8 -0
  44. data/cockpit/themes/preset/rngs/callmanipulate.rng +9 -1
  45. data/cockpit/themes/preset/rngs/loop.rng +7 -0
  46. data/cockpit/themes/preset/rngs/manipulate.rng +57 -2
  47. data/cockpit/themes/presetaltid/rngs/call.rng +8 -0
  48. data/cockpit/themes/presetaltid/rngs/callmanipulate.rng +9 -1
  49. data/cockpit/themes/presetaltid/rngs/loop.rng +7 -0
  50. data/cockpit/themes/presetaltid/rngs/manipulate.rng +57 -2
  51. data/cockpit/themes/presetaltid/theme.js +27 -3
  52. data/cockpit/themes/presetid/rngs/call.rng +8 -0
  53. data/cockpit/themes/presetid/rngs/callmanipulate.rng +9 -1
  54. data/cockpit/themes/presetid/rngs/loop.rng +7 -0
  55. data/cockpit/themes/presetid/rngs/manipulate.rng +57 -2
  56. data/cockpit/themes/reduced/rngs/call.rng +8 -0
  57. data/cockpit/themes/reduced/rngs/callmanipulate.rng +9 -1
  58. data/cockpit/themes/reduced/rngs/loop.rng +7 -0
  59. data/cockpit/themes/reduced/rngs/manipulate.rng +57 -2
  60. data/cockpit/track.html +3 -3
  61. data/cpee.gemspec +1 -1
  62. data/lib/cpee/implementation.rb +25 -38
  63. data/server/executionhandlers/ruby/connection.rb +7 -3
  64. data/server/executionhandlers/ruby/dsl_to_dslx.xsl +2 -2
  65. data/server/routing/end.pid +1 -1
  66. data/server/routing/forward-events-00.pid +1 -1
  67. data/server/routing/forward-events-01.pid +1 -0
  68. data/server/routing/forward-events-02.pid +1 -0
  69. data/server/routing/forward-events-03.pid +1 -0
  70. data/server/routing/forward-events-04.pid +1 -0
  71. data/server/routing/forward-events-05.pid +1 -0
  72. data/server/routing/forward-events-06.pid +1 -0
  73. data/server/routing/forward-votes.pid +1 -1
  74. data/server/routing/persist.pid +1 -1
  75. metadata +11 -4
  76. data/cockpit/js/resources.js +0 -64
  77. /data/cockpit/css/{resources-svg.css → extended_columns-svg.css} +0 -0
data/cockpit/llm.html CHANGED
@@ -54,7 +54,7 @@
54
54
  <script type="text/javascript" src="js/instance.js"></script>
55
55
  <script type="text/javascript" src="js/details.js"></script>
56
56
  <script type="text/javascript" src="js/parameters.js"></script>
57
- <script type="text/javascript" src="js/resources.js"></script>
57
+ <script type="text/javascript" src="js/extended_columns.js"></script>
58
58
  <script type="text/javascript" src="js/modifiers.js"></script>
59
59
  <script type="text/javascript" src="themes/base.js"></script>
60
60
 
@@ -62,8 +62,8 @@
62
62
  <link rel="stylesheet" href="css/llm.css" type="text/css"/>
63
63
 
64
64
  <link rel="stylesheet" href="css/ui.css" type="text/css"/>
65
- <link rel="stylesheet" href="css/resources-label.css" type="text/css"/>
66
- <link rel="stylesheet" href="css/resources-svg.css" type="text/css" data-include-export="true"/>
65
+ <link rel="stylesheet" href="css/extended_columns-label.css" type="text/css"/>
66
+ <link rel="stylesheet" href="css/extended_columns-svg.css" type="text/css" data-include-export="true"/>
67
67
  <link rel="stylesheet" href="/global_ui/uicpee.css" type="text/css"/>
68
68
  <style>
69
69
  /* has to be fucking inline, because firefox and chrome disagree how to handle filter urls */
data/cockpit/llm_alternative.html CHANGED
@@ -58,14 +58,14 @@
58
58
  <script type="text/javascript" src="js/instance.js"></script>
59
59
  <script type="text/javascript" src="js/details.js"></script>
60
60
  <script type="text/javascript" src="js/parameters.js"></script>
61
- <script type="text/javascript" src="js/resources.js"></script>
61
+ <script type="text/javascript" src="js/extended_columns.js"></script>
62
62
  <script type="text/javascript" src="js/modifiers.js"></script>
63
63
  <script type="text/javascript" src="themes/base.js"></script>
64
64
 
65
65
 
66
66
  <link rel="stylesheet" href="css/ui.css" type="text/css"/>
67
- <link rel="stylesheet" href="css/resources-label.css" type="text/css"/>
68
- <link rel="stylesheet" href="css/resources-svg.css" type="text/css" data-include-export="true"/>
67
+ <link rel="stylesheet" href="css/extended_columns-label.css" type="text/css"/>
68
+ <link rel="stylesheet" href="css/extended_columns-svg.css" type="text/css" data-include-export="true"/>
69
69
  <link rel="stylesheet" href="/global_ui/uicpee.css" type="text/css"/>
70
70
  <style>
71
71
  /* has to be fucking inline, because firefox and chrome disagree how to handle filter urls */
data/cockpit/model.html CHANGED
@@ -59,8 +59,8 @@
59
59
  <script type="text/javascript" src="themes/base.js"></script>
60
60
  <link rel="stylesheet" href="css/ui.css" type="text/css"/>
61
61
  <link rel="stylesheet" href="css/model.css" type="text/css"/>
62
- <link rel="stylesheet" href="css/resources-label.css" type="text/css"/>
63
- <link rel="stylesheet" href="css/resources-svg.css" type="text/css" data-include-export="true"/>
62
+ <link rel="stylesheet" href="css/extended_columns-label.css" type="text/css"/>
63
+ <link rel="stylesheet" href="css/extended_columns-svg.css" type="text/css" data-include-export="true"/>
64
64
  <link rel="stylesheet" href="/global_ui/uicpee.css" type="text/css"/>
65
65
  <style>
66
66
  /* has to be fucking inline, because firefox and chrome disagree how to handle filter urls */
data/cockpit/only_llm.html CHANGED
@@ -19,6 +19,7 @@
19
19
  <head>
20
20
  <meta charset="utf-8"/>
21
21
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
22
+ <link rel="icon" type="image/png" href="/favicon.png">
22
23
  <title>CPEE Cockpit</title>
23
24
 
24
25
  <!-- libs, do not modify. When local than load local libs. -->
@@ -40,6 +41,8 @@
40
41
  <script type="text/javascript" src="/js_libs/uidash.js"></script>
41
42
  <script type="text/javascript" src="/js_libs/custommenu.js"></script>
42
43
 
44
+ <script type="text/javascript" src="/js_libs/build-bpmn.js"></script>
45
+
43
46
  <link rel="stylesheet" href="/js_libs/custommenu.css" type="text/css"/>
44
47
  <link rel="stylesheet" href="/js_libs/uidash.css" type="text/css"/>
45
48
 
@@ -54,7 +57,7 @@
54
57
  <script type="text/javascript" src="js/instance.js"></script>
55
58
  <script type="text/javascript" src="js/details.js"></script>
56
59
  <script type="text/javascript" src="js/parameters.js"></script>
57
- <script type="text/javascript" src="js/resources.js"></script>
60
+ <script type="text/javascript" src="js/extended_columns.js"></script>
58
61
  <script type="text/javascript" src="js/modifiers.js"></script>
59
62
  <script type="text/javascript" src="themes/base.js"></script>
60
63
 
@@ -62,8 +65,8 @@
62
65
  <link rel="stylesheet" href="css/llm.css" type="text/css"/>
63
66
 
64
67
  <link rel="stylesheet" href="css/ui.css" type="text/css"/>
65
- <link rel="stylesheet" href="css/resources-label.css" type="text/css"/>
66
- <link rel="stylesheet" href="css/resources-svg.css" type="text/css" data-include-export="true"/>
68
+ <link rel="stylesheet" href="css/extended_columns-label.css" type="text/css"/>
69
+ <link rel="stylesheet" href="css/extended_columns-svg.css" type="text/css" data-include-export="true"/>
67
70
  <link rel="stylesheet" href="/global_ui/uicpee.css" type="text/css"/>
68
71
  <style>
69
72
  /* has to be fucking inline, because firefox and chrome disagree how to handle filter urls */
@@ -178,10 +181,16 @@
178
181
  <button title='a standalone process model is only loadable if the currently loaded testset sucessfully prepared the current instance for the type of model' name="loadmodelfile">load model</button>
179
182
  </div>
180
183
  </div><div class='section'>
181
- <a id="savetestsetfile" href="" download=""></a>
182
- <a id="savesvgfile" href="" download=""></a>
183
- <button title='a testset includes various settings, subscriptions and a model' name="savetestsetfile">save<br>testset</button>
184
- <button title='a testset includes various settings, subscriptions and a model' name="savesvgfile">save svg<br>graph</button>
184
+ <div>
185
+ <a id="savetestsetfile" href="" download=""></a>
186
+ <a id="savesvgfile" href="" download=""></a>
187
+ <button title='a testset includes various settings, subscriptions and a model' name="savetestsetfile">save<br>testset</button>
188
+ <button title='the SVG contains the graphical repesentation of the CPEE tree as you see it on the screen' name="savesvgfile">save svg<br>graph</button>
189
+ </div>
190
+ <div>
191
+ <a id="savebpmnfile" href="" download=""></a>
192
+ <button title='the BPMN includes a graphical representation that can be loaded in Signavio and Camundal' name="savebpmnfile">save BPMN</button>
193
+ </div>
185
194
  </div><div class='section' id='modifiers'>
186
195
  <template id="item">
187
196
  <div>
data/cockpit/templates/Coopis 2010.xml CHANGED
@@ -22,15 +22,15 @@
22
22
  <receive>https-get://cpee.org/ing/correlators/message/receive/</receive>
23
23
  </endpoints>
24
24
  <attributes>
25
+ <guarded>none</guarded>
26
+ <modeltype>CPEE</modeltype>
25
27
  <theme>extended</theme>
28
+ <guarded_id/>
26
29
  <info>Coopis 2010</info>
27
30
  <creator>Christine Ashcreek</creator>
28
31
  <author>Christine Ashcreek</author>
29
- <modeltype>CPEE</modeltype>
30
32
  <design_stage>development</design_stage>
31
- <guarded>none</guarded>
32
- <design_dir>Experiments.dir/Twin Engine.dir</design_dir>
33
- <guarded_id/>
33
+ <design_dir>Templates.dir</design_dir>
34
34
  <model_uuid>a1cbb855-90e3-4d8c-b44b-d3ba7bff9f4e</model_uuid>
35
35
  <model_version/>
36
36
  <replay>https://cpee.org/replay/</replay>
@@ -194,4 +194,11 @@ data.costs += result.value('costs').to_f</finalize>
194
194
  <dataelements type="none"/>
195
195
  <endpoints type="none"/>
196
196
  </transformation>
197
+ <subscriptions xmlns="http://riddl.org/ns/common-patterns/notifications-producer/2.0">
198
+ <subscription id="_matze" url="https://lehre.bpm.in.tum.de/~mangler/a.php">
199
+ <topic id="state">
200
+ <event>change</event>
201
+ </topic>
202
+ </subscription>
203
+ </subscriptions>
197
204
  </testset>
data/cockpit/templates/Frames.xml CHANGED
@@ -2,7 +2,7 @@
2
2
  <testset xmlns="http://cpee.org/ns/properties/2.0">
3
3
  <executionhandler>ruby</executionhandler>
4
4
  <dataelements>
5
- <qid>simple</qid>
5
+ <res>{"select_0":"learned in class or from book","input_0":"sadff","select_1":"used on a class project","input_1":"asdfsaf","input_2":"sadfasdf"}</res>
6
6
  </dataelements>
7
7
  <endpoints>
8
8
  <frames_init>https-post://cpee.org/out/frames/</frames_init>
@@ -10,16 +10,17 @@
10
10
  </endpoints>
11
11
  <attributes>
12
12
  <guarded>none</guarded>
13
- <info>Frames</info>
14
13
  <modeltype>CPEE</modeltype>
15
14
  <theme>extended</theme>
16
- <creator>Christine Ashcreek</creator>
17
15
  <guarded_id/>
16
+ <info>Frames</info>
17
+ <creator>Christine Ashcreek</creator>
18
18
  <author>Christine Ashcreek</author>
19
19
  <model_uuid>5ed82f61-a382-49b5-a420-c63e01d5a9f5</model_uuid>
20
20
  <model_version/>
21
21
  <design_dir>Templates.dir</design_dir>
22
22
  <design_stage>development</design_stage>
23
+ <fid>gnd</fid>
23
24
  </attributes>
24
25
  <description>
25
26
  <description xmlns="http://cpee.org/ns/description/1.0">
@@ -38,8 +39,7 @@
38
39
  </parameters>
39
40
  <code>
40
41
  <signal/>
41
- <prepare>endpoints.frames_init += data.qid + '/'
42
- p endpoints.frames_init</prepare>
42
+ <prepare>endpoints.frames_init += attributes.fid</prepare>
43
43
  <finalize output="result"/>
44
44
  <update output="result"/>
45
45
  <rescue output="result"/>
@@ -94,7 +94,7 @@ p endpoints.frames_init</prepare>
94
94
  </parameters>
95
95
  <code>
96
96
  <signal/>
97
- <prepare>endpoints.frames_display += data.qid + '/'</prepare>
97
+ <prepare>endpoints.frames_display += attributes.fid</prepare>
98
98
  <finalize output="result"/>
99
99
  <update output="result"/>
100
100
  <rescue output="result"/>
@@ -154,7 +154,7 @@ p endpoints.frames_init</prepare>
154
154
  </parameters>
155
155
  <code>
156
156
  <signal/>
157
- <prepare>endpoints.frames_display += data.qid + '/'</prepare>
157
+ <prepare>endpoints.frames_display += attributes.fid</prepare>
158
158
  <finalize output="result"/>
159
159
  <update output="result"/>
160
160
  <rescue output="result"/>
@@ -214,7 +214,7 @@ p endpoints.frames_init</prepare>
214
214
  </parameters>
215
215
  <code>
216
216
  <signal/>
217
- <prepare>endpoints.frames_display += data.qid + '/'</prepare>
217
+ <prepare>endpoints.frames_display += attributes.fid</prepare>
218
218
  <finalize output="result"/>
219
219
  <update output="result"/>
220
220
  <rescue output="result"/>
@@ -280,7 +280,7 @@ p endpoints.frames_init</prepare>
280
280
  </parameters>
281
281
  <code>
282
282
  <signal/>
283
- <prepare>endpoints.frames_display += data.qid + '/'</prepare>
283
+ <prepare>endpoints.frames_display += attributes.fid</prepare>
284
284
  <finalize output="result"/>
285
285
  <update output="result"/>
286
286
  <rescue output="result"/>
@@ -317,6 +317,74 @@ p endpoints.frames_init</prepare>
317
317
  </code>
318
318
  </documentation>
319
319
  </call>
320
+ <call id="a8" endpoint="frames_display">
321
+ <parameters>
322
+ <label>Experience</label>
323
+ <color/>
324
+ <arguments>
325
+ <type>wait</type>
326
+ <lx>0</lx>
327
+ <ly>1</ly>
328
+ <x_amount>5</x_amount>
329
+ <y_amount>9</y_amount>
330
+ <button/>
331
+ <style/>
332
+ <urls>
333
+ <urls_item>
334
+ <lang>de-at</lang>
335
+ <url>https://cpee.org/quests/dataflow/questions.html</url>
336
+ </urls_item>
337
+ </urls>
338
+ <default>
339
+ <text_0>Please rate your **programming** experience with respect to the following 5-point levels:</text_0>
340
+ <select_0>no experience; learned in class or from book; used on a class project; used on one project in industry; used on multiple projects in industry</select_0>
341
+ <input_0>How many years of programming experience do you have?</input_0>
342
+ <text_1>Please rate your **modelling** experience with respect to the following 5-point levels:</text_1>
343
+ <select_1>no experience; learned in class or from book; used on a class project; used on one project in industry; used on multiple projects in industry</select_1>
344
+ <input_1>How many years of modelling experience do you have?</input_1>
345
+ <input_2>Which graphical modeling languages are you familiar with (e.g., UML, ER, etc.)?</input_2>
346
+ </default>
347
+ </arguments>
348
+ </parameters>
349
+ <code>
350
+ <signal/>
351
+ <prepare>endpoints.frames_display += attributes.fid</prepare>
352
+ <finalize output="result">data.res = result</finalize>
353
+ <update output="result"/>
354
+ <rescue output="result"/>
355
+ </code>
356
+ <annotations>
357
+ <_generic/>
358
+ <_timing>
359
+ <_timing_weight/>
360
+ <_timing_avg/>
361
+ <explanations/>
362
+ </_timing>
363
+ <_shifting>
364
+ <_shifting_type>Duration</_shifting_type>
365
+ </_shifting>
366
+ <_context_data_analysis>
367
+ <probes/>
368
+ <ips/>
369
+ </_context_data_analysis>
370
+ <report>
371
+ <url/>
372
+ </report>
373
+ <_notes>
374
+ <_notes_general/>
375
+ </_notes>
376
+ </annotations>
377
+ <documentation>
378
+ <input/>
379
+ <output/>
380
+ <implementation>
381
+ <description/>
382
+ </implementation>
383
+ <code>
384
+ <description/>
385
+ </code>
386
+ </documentation>
387
+ </call>
320
388
  <call id="a7" endpoint="frames_display">
321
389
  <parameters>
322
390
  <label>Clear Button</label>
@@ -335,7 +403,7 @@ p endpoints.frames_init</prepare>
335
403
  </parameters>
336
404
  <code>
337
405
  <signal/>
338
- <prepare>endpoints.frames_display += data.qid + '/'</prepare>
406
+ <prepare>endpoints.frames_display += attributes.fid</prepare>
339
407
  <finalize output="result"/>
340
408
  <update output="result"/>
341
409
  <rescue output="result"/>
data/cockpit/templates/Track Test.xml CHANGED
@@ -21,7 +21,7 @@
21
21
  <description>
22
22
  <description xmlns="http://cpee.org/ns/description/1.0">
23
23
  <loop mode="pre_test" condition="true">
24
- <parallel wait="-1">
24
+ <parallel wait="-1" cancel="last">
25
25
  <loop mode="pre_test" condition="data.i &lt; 4">
26
26
  <_probability>
27
27
  <_probability_min/>
data/cockpit/themes/base.js CHANGED
@@ -351,7 +351,7 @@ function WFAdaptorManifestationBase(adaptor) {
351
351
  $('.resource-row[element-row=' + er + '] .resource-point').each((_,e) => {
352
352
  let pos = e.getBoundingClientRect();
353
353
  let text = $('text',e).text();
354
- show_label(pos.x + 12, pos.y + 5, 60, text);
354
+ show_dataflow_label(pos.x + 12, pos.y + 5, 60, text);
355
355
  })
356
356
  self.adaptor.illustrator.svg.container.find('.tile[element-id = "' + svgid + '"]').css('display','block');
357
357
  self.adaptor.illustrator.svg.container.find('[element-id = "' + svgid + '"]').addClass('hover');
@@ -386,6 +386,8 @@ function WFAdaptorManifestationBase(adaptor) {
386
386
  let col = $('> parameters > color', node);
387
387
  if (col.length > 0 && col.text() != '') {
388
388
  sty['fill'] = col.text();
389
+ // sty['fill'] = "url(#custom-gradient)";
390
+ // sty['--custom-color'] = col.text();
389
391
  }
390
392
  return sty;
391
393
  },
@@ -1336,8 +1338,8 @@ function WFAdaptorManifestationBase(adaptor) {
1336
1338
  let alist = []
1337
1339
  let plist = []
1338
1340
 
1339
- var regassi = /data\.([a-zA-Z_][a-zA-Z0-9_]*)\s*(=[^=]|\+\=|\-\=|\*\=|\/\=|<<|>>)/g; // we do not have to check for &gt;/&lt; version of stuff as only conditions are in attributes, and conditions can not contain assignments
1340
- var reg_not_assi = /data\.([a-zA-Z_][a-zA-Z0-9_]*)\s*/g;
1341
+ var regassi = /data\.([a-z_][a-zA-Z0-9_]*)\s*(=[^=]|\+\=|\-\=|\*\=|\/\=|<<|>>|\|\|=)/g; // we do not have to check for &gt;/&lt; version of stuff as only conditions are in attributes, and conditions can not contain assignments
1342
+ var reg_not_assi = /data\.([a-z_][a-zA-Z0-9_]*)\s*/g;
1341
1343
 
1342
1344
  $('call, manipulate, loop[condition], alternative[condition]',node).each(function(i,n) {
1343
1345
  let item = '';
@@ -1350,16 +1352,18 @@ function WFAdaptorManifestationBase(adaptor) {
1350
1352
  if (n.nodeName == 'manipulate') { // css selector can not directly access manipulate
1351
1353
  item += n.textContent + '\n';
1352
1354
  }
1353
- $('call > parameters > arguments > *, call > code > finalize, call > code > update, call > code > rescue',n).each(function(j,m){
1355
+ $('call > parameters > arguments *',n).each(function(j,m){
1356
+ let x = m.textContent;
1357
+ if (x.charAt(0) == '!') { item += x + '\n'; }
1358
+ });
1359
+ $('call > code > finalize, call > code > update, call > code > rescue',n).each(function(j,m){
1354
1360
  let x = m.textContent;
1355
- if (m.parentNode.nodeName == 'arguments' && x.charAt(0) != '!' ) { return }
1356
1361
  item += x + '\n';
1357
1362
  });
1358
1363
  }
1359
1364
  if (item == '') { return; }
1360
1365
 
1361
1366
  let indices = [];
1362
-
1363
1367
  for (const match of item.matchAll(regassi)) {
1364
1368
  indices.push(match.index);
1365
1369
  alist.push(match[1]);
@@ -1369,7 +1373,7 @@ function WFAdaptorManifestationBase(adaptor) {
1369
1373
  const arg1 = match[1];
1370
1374
  if (indices.includes(match.index)) { continue; }
1371
1375
  if (!alist.includes(arg1)) {
1372
- if (match.index >= indices[0] || indices.length == 0) {
1376
+ if (indices.length == 0 || match.index < indices[0]) {
1373
1377
  plist.push(arg1);
1374
1378
  }
1375
1379
  }
data/cockpit/themes/control/rngs/call.rng CHANGED
@@ -52,6 +52,14 @@
52
52
  </element>
53
53
  </zeroOrMore>
54
54
  </element>
55
+ <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
56
+ <element name="_exclude" rngui:label="Exclude from log">
57
+ <data type="boolean" rngui:label="Exclude from log"/>
58
+ </element>
59
+ <element name="_include" rngui:label="Include nested events">
60
+ <data type="boolean" rngui:label="Include nested events"/>
61
+ </element>
62
+ </element>
55
63
  <element name="_timing" rngui:header="Timing" rngui:fold="closed">
56
64
  <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
57
65
  <data type="float" rngui:label="[0,1]"/>
data/cockpit/themes/control/rngs/callmanipulate.rng CHANGED
@@ -44,7 +44,7 @@
44
44
  </element>
45
45
  </element>
46
46
  <element name="code" rngui:header="Data Handling">
47
- <element name="signal" rngui:label="Signal after data manipulation (finalize/update)">
47
+ <element name="signal" rngui:label="Signal after finalize/update">
48
48
  <data type="boolean" rngui:label="A signal is sent every time the activity changes a data object"/>
49
49
  </element>
50
50
  <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
@@ -78,6 +78,14 @@
78
78
  </element>
79
79
  </zeroOrMore>
80
80
  </element>
81
+ <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
82
+ <element name="_exclude" rngui:label="Exclude from log">
83
+ <data type="boolean" rngui:label="Exclude from log"/>
84
+ </element>
85
+ <element name="_include" rngui:label="Include nested events">
86
+ <data type="boolean" rngui:label="Include nested events"/>
87
+ </element>
88
+ </element>
81
89
  <element name="_timing" rngui:header="Timing" rngui:fold="closed">
82
90
  <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
83
91
  <data type="float" rngui:label="[0,1]"/>
data/cockpit/themes/control/rngs/loop.rng CHANGED
@@ -19,4 +19,11 @@
19
19
  <data type="nonNegativeInteger" rngui:label="Times"/>
20
20
  </element>
21
21
  </element>
22
+ <element name="_annotations" rngui:header="Annotations">
23
+ <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
24
+ <element name="_iteration" rngui:label="Log per iteration">
25
+ <data type="boolean" rngui:label="Log per iteration"/>
26
+ </element>
27
+ </element>
28
+ </element>
22
29
  </element>
data/cockpit/themes/control/rngs/manipulate.rng CHANGED
@@ -1,4 +1,4 @@
1
- <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="manipulate" rngui:label="Script" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
1
+ <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="manipulate" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
2
2
  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
3
3
  <data type="string" rngui:readonly="true"/>
4
4
  </attribute>
@@ -19,5 +19,60 @@
19
19
  <value>#f57aa9</value>
20
20
  </choice>
21
21
  </attribute>
22
- <text rngui:label="Script that is executed"/>
22
+ <element name="code" rngui:label="Script" rngui:header="Code">
23
+ <text rngui:label="Script that is executed"/>
24
+ </element>
25
+ <element name="annotations" rngui:header="Annotations">
26
+ <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
27
+ <element name="_exclude" rngui:label="Exclude from log">
28
+ <data type="boolean" rngui:label="Exclude from log"/>
29
+ </element>
30
+ </element>
31
+ <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data objects (written in this task and otherwise) can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to start to define instance data probes.">
32
+
33
+ <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed_conditional">
34
+ <zeroOrMore rngui:label="Add Probe">
35
+ <element name="probe">
36
+ <element name="id" rngui:label="ID">
37
+ <data type="string" rngui:label="ID"/>
38
+ </element>
39
+ <element name="source" rngui:label="Source">
40
+ <data type="string" rngui:label="Where does the sensor value come from?"/>
41
+ </element>
42
+ <element name="extractor_type" rngui:label="Extractor Type">
43
+ <choice>
44
+ <value rngui:label='Intrinsic'>intrinsic</value>
45
+ </choice>
46
+ </element>
47
+ <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>
48
+ <text rngui:label="Code"/>
49
+ </element>
50
+ <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For separate data'>
51
+ <data type="string" rngui:label="Service Url"/>
52
+ </element>
53
+ <element name="extractor_params" rngui:label="Extractor Service Arguments:">
54
+ <zeroOrMore rngui:label="Create Argument Pairs">
55
+ <element rngui:label="Name">
56
+ <anyName/>
57
+ <data type="string" rngui:label="Value / Json"/>
58
+ </element>
59
+ </zeroOrMore>
60
+ </element>
61
+ <element name="visualizer_url" rngui:label="Visualizer Url">
62
+ <data type="string" rngui:label="Service Url"/>
63
+ </element>
64
+ <element name="visualizer_params" rngui:label="Visualizer Arguments">
65
+ <zeroOrMore rngui:label="Create Argument Pairs">
66
+ <element rngui:label="Name">
67
+ <anyName/>
68
+ <data type="string" rngui:label="Value / Json"/>
69
+ </element>
70
+ </zeroOrMore>
71
+ </element>
72
+ </element>
73
+ </zeroOrMore>
74
+ </element>
75
+
76
+ </element>
77
+ </element>
23
78
  </element>
data/cockpit/themes/dataflow/rngs/call.rng CHANGED
@@ -52,6 +52,14 @@
52
52
  </element>
53
53
  </zeroOrMore>
54
54
  </element>
55
+ <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
56
+ <element name="_exclude" rngui:label="Exclude from log">
57
+ <data type="boolean" rngui:label="Exclude from log"/>
58
+ </element>
59
+ <element name="_include" rngui:label="Include nested events">
60
+ <data type="boolean" rngui:label="Include nested events"/>
61
+ </element>
62
+ </element>
55
63
  <element name="_timing" rngui:header="Timing" rngui:fold="closed">
56
64
  <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
57
65
  <data type="float" rngui:label="[0,1]"/>
data/cockpit/themes/dataflow/rngs/callmanipulate.rng CHANGED
@@ -44,7 +44,7 @@
44
44
  </element>
45
45
  </element>
46
46
  <element name="code" rngui:header="Data Handling">
47
- <element name="signal" rngui:label="Signal after data manipulation (finalize/update)">
47
+ <element name="signal" rngui:label="Signal after finalize/update">
48
48
  <data type="boolean" rngui:label="A signal is sent every time the activity changes a data object"/>
49
49
  </element>
50
50
  <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
@@ -78,6 +78,14 @@
78
78
  </element>
79
79
  </zeroOrMore>
80
80
  </element>
81
+ <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
82
+ <element name="_exclude" rngui:label="Exclude from log">
83
+ <data type="boolean" rngui:label="Exclude from log"/>
84
+ </element>
85
+ <element name="_include" rngui:label="Include nested events">
86
+ <data type="boolean" rngui:label="Include nested events"/>
87
+ </element>
88
+ </element>
81
89
  <element name="_timing" rngui:header="Timing" rngui:fold="closed">
82
90
  <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
83
91
  <data type="float" rngui:label="[0,1]"/>
data/cockpit/themes/dataflow/rngs/loop.rng CHANGED
@@ -19,4 +19,11 @@
19
19
  <data type="nonNegativeInteger" rngui:label="Times"/>
20
20
  </element>
21
21
  </element>
22
+ <element name="_annotations" rngui:header="Annotations">
23
+ <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
24
+ <element name="_iteration" rngui:label="Log per iteration">
25
+ <data type="boolean" rngui:label="Log per iteration"/>
26
+ </element>
27
+ </element>
28
+ </element>
22
29
  </element>
data/cockpit/themes/dataflow/rngs/manipulate.rng CHANGED
@@ -1,4 +1,4 @@
1
- <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="manipulate" rngui:label="Script" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
1
+ <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="manipulate" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
2
2
  <attribute name="id" rngui:label="ID" rngui:default="javascript:get_free_id()">
3
3
  <data type="string" rngui:readonly="true"/>
4
4
  </attribute>
@@ -19,5 +19,60 @@
19
19
  <value>#f57aa9</value>
20
20
  </choice>
21
21
  </attribute>
22
- <text rngui:label="Script that is executed"/>
22
+ <element name="code" rngui:label="Script" rngui:header="Code">
23
+ <text rngui:label="Script that is executed"/>
24
+ </element>
25
+ <element name="annotations" rngui:header="Annotations">
26
+ <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
27
+ <element name="_exclude" rngui:label="Exclude from log">
28
+ <data type="boolean" rngui:label="Exclude from log"/>
29
+ </element>
30
+ </element>
31
+ <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data objects (written in this task and otherwise) can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to start to define instance data probes.">
32
+
33
+ <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed_conditional">
34
+ <zeroOrMore rngui:label="Add Probe">
35
+ <element name="probe">
36
+ <element name="id" rngui:label="ID">
37
+ <data type="string" rngui:label="ID"/>
38
+ </element>
39
+ <element name="source" rngui:label="Source">
40
+ <data type="string" rngui:label="Where does the sensor value come from?"/>
41
+ </element>
42
+ <element name="extractor_type" rngui:label="Extractor Type">
43
+ <choice>
44
+ <value rngui:label='Intrinsic'>intrinsic</value>
45
+ </choice>
46
+ </element>
47
+ <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>
48
+ <text rngui:label="Code"/>
49
+ </element>
50
+ <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For separate data'>
51
+ <data type="string" rngui:label="Service Url"/>
52
+ </element>
53
+ <element name="extractor_params" rngui:label="Extractor Service Arguments:">
54
+ <zeroOrMore rngui:label="Create Argument Pairs">
55
+ <element rngui:label="Name">
56
+ <anyName/>
57
+ <data type="string" rngui:label="Value / Json"/>
58
+ </element>
59
+ </zeroOrMore>
60
+ </element>
61
+ <element name="visualizer_url" rngui:label="Visualizer Url">
62
+ <data type="string" rngui:label="Service Url"/>
63
+ </element>
64
+ <element name="visualizer_params" rngui:label="Visualizer Arguments">
65
+ <zeroOrMore rngui:label="Create Argument Pairs">
66
+ <element rngui:label="Name">
67
+ <anyName/>
68
+ <data type="string" rngui:label="Value / Json"/>
69
+ </element>
70
+ </zeroOrMore>
71
+ </element>
72
+ </element>
73
+ </zeroOrMore>
74
+ </element>
75
+
76
+ </element>
77
+ </element>
23
78
  </element>