cpee 2.1.95 → 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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 98ec380ca615921ed8c2652802995ab97de7b8a34f34c6a503f60b8f5758dfb9
4
- data.tar.gz: b761b0623adf0bb79ccc6506ad5b26c7993b39b4585a88c8311a41172cab8ccb
3
+ metadata.gz: 0a097cddb7f745bb78a2e0eafa05dd7177df0fe54fa455d6e5773e7d27767261
4
+ data.tar.gz: c055f8852db8dd548e7ba96a492bd15b3ac102923bb3638e4f82f5109ce6df63
5
5
  SHA512:
6
- metadata.gz: be8645a1acd70db7c3089eefc5208aaf0dda70818f74b10a4ac6a58d2ee77e26755d8952379b533a8d953f2664d130f11469759d640e0d0fe2e3d2feb6a37223
7
- data.tar.gz: 9952f614f80c02377ee78942725d292f4956849e6edfa6b669f784a735e13301874bffc756539436a885b7d69a5bc9d0d26865703428f41084a9fcccc918103d
6
+ metadata.gz: 4380d3deb2ed29747a4b078d119fe5d2824105d3468ce82de6436da40a9381f71af186c8a6de22a3ad9c44ea88571e182cf0301d529ab62bae8890e2a9376f01
7
+ data.tar.gz: f4938bedc3aa359bcaf78ac98b75da28355d2e1cf4eb330b09a1a9e136d17b00588470de24788ef0debaeec7d3f2ab119fcd381b629515c9e226325f9b25c1fe
@@ -7,7 +7,8 @@ $(document).ready(function() {
7
7
  clearTimeout(timer);
8
8
  timer = setTimeout(do_main_save, 5000);
9
9
  });
10
- $(document).on('keypress','#dat_details [contenteditable]',function(e){
10
+ // only for contenteditable divs
11
+ $(document).on('keypress','#dat_details div[contenteditable]',function(e){
11
12
  if (e.keyCode == 13) {
12
13
  document.execCommand('insertLineBreak')
13
14
  e.preventDefault()
@@ -1084,6 +1084,18 @@ async function set_testset(testset,exec) {// {{{
1084
1084
  var promises;
1085
1085
 
1086
1086
  var tset = $X('<properties xmlns="http://cpee.org/ns/properties/2.0"/>');
1087
+
1088
+ // load old testsets. remove 12/2026
1089
+ $("testset > description manipulate",testset).each((_,t) => {
1090
+ if ($('code',t).length == 0) {
1091
+ let st = $(t).text();
1092
+ $(t).text();
1093
+ let c = $X('<code xmlns="http://cpee.org/ns/description/1.0"/>');
1094
+ c.text(st);
1095
+ $(t).append(c);
1096
+ }
1097
+ });
1098
+
1087
1099
  tset.append($("testset > executionhandler",testset));
1088
1100
  tset.append($("testset > positions",testset));
1089
1101
  tset.append($("testset > dataelements",testset));
data/cockpit/js/ui.js CHANGED
@@ -76,33 +76,6 @@ $(document).ready(function() {
76
76
  }
77
77
  });
78
78
 
79
- $(document).on('copy', '[contenteditable]', function (e) {
80
- e = e.originalEvent;
81
- var selectedText = window.getSelection();
82
- var range = selectedText.getRangeAt(0);
83
- var selectedTextReplacement = range.toString()
84
- e.clipboardData.setData('text/plain', selectedTextReplacement);
85
- e.preventDefault(); // default behaviour is to copy any selected text
86
- });
87
-
88
- // Paste fix for contenteditable
89
- $(document).on('paste', '[contenteditable]', function (e) {
90
- e.preventDefault();
91
-
92
- if (window.clipboardData) {
93
- content = window.clipboardData.getData('Text');
94
- if (window.getSelection) {
95
- var selObj = window.getSelection();
96
- var selRange = selObj.getRangeAt(0);
97
- selRange.deleteContents();
98
- selRange.insertNode(document.createTextNode(content));
99
- }
100
- } else if (e.originalEvent.clipboardData) {
101
- content = (e.originalEvent || e).clipboardData.getData('text/plain');
102
- document.execCommand('insertText', false, content);
103
- }
104
- });
105
-
106
79
  // unmark if storage changes. shit has potentially been copied or marked in other tabs.
107
80
  $(window).bind('storage', function (e) {
108
81
  if (localStorage.getItem('marked_from') != myid) {
@@ -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,12 +19,60 @@
19
19
  <value>#f57aa9</value>
20
20
  </choice>
21
21
  </attribute>
22
- <text rngui:label="Script that is executed"/>
23
- <element name="_annotations" rngui:header="Annotations">
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">
24
26
  <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
25
27
  <element name="_exclude" rngui:label="Exclude from log">
26
28
  <data type="boolean" rngui:label="Exclude from log"/>
27
29
  </element>
28
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>
29
77
  </element>
30
78
  </element>
@@ -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,12 +19,60 @@
19
19
  <value>#f57aa9</value>
20
20
  </choice>
21
21
  </attribute>
22
- <text rngui:label="Script that is executed"/>
23
- <element name="_annotations" rngui:header="Annotations">
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">
24
26
  <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
25
27
  <element name="_exclude" rngui:label="Exclude from log">
26
28
  <data type="boolean" rngui:label="Exclude from log"/>
27
29
  </element>
28
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>
29
77
  </element>
30
78
  </element>
@@ -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,12 +19,60 @@
19
19
  <value>#f57aa9</value>
20
20
  </choice>
21
21
  </attribute>
22
- <text rngui:label="Script that is executed"/>
23
- <element name="_annotations" rngui:header="Annotations">
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">
24
26
  <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
25
27
  <element name="_exclude" rngui:label="Exclude from log">
26
28
  <data type="boolean" rngui:label="Exclude from log"/>
27
29
  </element>
28
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>
29
77
  </element>
30
78
  </element>
@@ -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,12 +19,60 @@
19
19
  <value>#f57aa9</value>
20
20
  </choice>
21
21
  </attribute>
22
- <text rngui:label="Script that is executed"/>
23
- <element name="_annotations" rngui:header="Annotations">
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">
24
26
  <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
25
27
  <element name="_exclude" rngui:label="Exclude from log">
26
28
  <data type="boolean" rngui:label="Exclude from log"/>
27
29
  </element>
28
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>
29
77
  </element>
30
78
  </element>
@@ -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,12 +19,60 @@
19
19
  <value>#f57aa9</value>
20
20
  </choice>
21
21
  </attribute>
22
- <text rngui:label="Script that is executed"/>
23
- <element name="_annotations" rngui:header="Annotations">
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">
24
26
  <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
25
27
  <element name="_exclude" rngui:label="Exclude from log">
26
28
  <data type="boolean" rngui:label="Exclude from log"/>
27
29
  </element>
28
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>
29
77
  </element>
30
78
  </element>
@@ -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,12 +19,60 @@
19
19
  <value>#f57aa9</value>
20
20
  </choice>
21
21
  </attribute>
22
- <text rngui:label="Script that is executed"/>
23
- <element name="_annotations" rngui:header="Annotations">
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">
24
26
  <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
25
27
  <element name="_exclude" rngui:label="Exclude from log">
26
28
  <data type="boolean" rngui:label="Exclude from log"/>
27
29
  </element>
28
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>
29
77
  </element>
30
78
  </element>
@@ -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,12 +19,60 @@
19
19
  <value>#f57aa9</value>
20
20
  </choice>
21
21
  </attribute>
22
- <text rngui:label="Script that is executed"/>
23
- <element name="_annotations" rngui:header="Annotations">
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">
24
26
  <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
25
27
  <element name="_exclude" rngui:label="Exclude from log">
26
28
  <data type="boolean" rngui:label="Exclude from log"/>
27
29
  </element>
28
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>
29
77
  </element>
30
78
  </element>
@@ -6,11 +6,35 @@ WFAdaptorManifestation = class extends WFAdaptorManifestationBase {
6
6
  this.elements.call.illustrator.label = function(node) { //{{{
7
7
  return [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + ' (' + $(node).attr('a:alt_id') + ')' } ];
8
8
  }; //}}}
9
+ this.elements.call.illustrator.info = function(node) { //{{{
10
+ return { 'element-endpoint': $(node).attr('endpoint'), 'element-alt_id': $(node).attr('a:alt_id') };
11
+ }; //}}}
12
+ this.elements.callmanipulate.illustrator.label = function(node) { //{{{
13
+ return [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + ' (' + $(node).attr('a:alt_id') + ')' } ];
14
+ }; //}}}
15
+ this.elements.callmanipulate.illustrator.info = function(node) { //{{{
16
+ return { 'element-endpoint': $(node).attr('endpoint'), 'element-alt_id': $(node).attr('a:alt_id') };
17
+ }; //}}}
9
18
  this.elements.stop.illustrator.label = function(node) { //{{{
10
19
  return [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + ' (' + $(node).attr('a:alt_id') + ')' } ];
11
20
  }; //}}}
21
+ this.elements.stop.illustrator.info = function(node) { //{{{
22
+ return { 'element-alt_id': $(node).attr('a:alt_id') };
23
+ }; //}}}
12
24
  this.elements.wait_for_signal.illustrator.label = function(node) { //{{{
13
25
  return [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + ' (' + $(node).attr('a:alt_id') + ')' } ];
14
26
  }; //}}}
27
+ this.elements.wait_for_signal.illustrator.info = function(node) { //{{{
28
+ return { 'element-alt_id': $(node).attr('a:alt_id') };
29
+ }; //}}}
30
+ this.elements.choose.illustrator.info = function(node) { //{{{
31
+ return { 'element-alt_id': $(node).attr('a:alt_id') };
32
+ }; //}}}
33
+ this.elements.loop.illustrator.info = function(node) { //{{{
34
+ return { 'element-alt_id': $(node).attr('a:alt_id') };
35
+ }; //}}}
36
+ this.elements.parallel.illustrator.info = function(node) { //{{{
37
+ return { 'element-alt_id': $(node).attr('a:alt_id') };
38
+ }; //}}}
15
39
  }
16
40
  }
@@ -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,12 +19,60 @@
19
19
  <value>#f57aa9</value>
20
20
  </choice>
21
21
  </attribute>
22
- <text rngui:label="Script that is executed"/>
23
- <element name="_annotations" rngui:header="Annotations">
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">
24
26
  <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
25
27
  <element name="_exclude" rngui:label="Exclude from log">
26
28
  <data type="boolean" rngui:label="Exclude from log"/>
27
29
  </element>
28
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>
29
77
  </element>
30
78
  </element>
@@ -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,12 +19,60 @@
19
19
  <value>#f57aa9</value>
20
20
  </choice>
21
21
  </attribute>
22
- <text rngui:label="Script that is executed"/>
23
- <element name="_annotations" rngui:header="Annotations">
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">
24
26
  <element name="_logging_behavior" rngui:header="Logging Behavior" rngui:fold="closed">
25
27
  <element name="_exclude" rngui:label="Exclude from log">
26
28
  <data type="boolean" rngui:label="Exclude from log"/>
27
29
  </element>
28
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>
29
77
  </element>
30
78
  </element>
data/cpee.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "cpee"
3
- s.version = "2.1.95"
3
+ s.version = "2.1.96"
4
4
  s.platform = Gem::Platform::RUBY
5
5
  s.license = "LGPL-3.0-or-later"
6
6
  s.summary = "The cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."
@@ -272,7 +272,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
272
272
  end # }}}
273
273
  def inform_manipulate_change(status,changed_dataelements,changed_endpoints,dataelements,endpoints) # {{{
274
274
  unless status.nil?
275
- @controller.notify("status/change", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :id => status.id, :message => status.message)
275
+ @controller.notify("status/change", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :data => { :id => status.id, :message => status.message } )
276
276
  end
277
277
  unless changed_dataelements.nil? || changed_dataelements.empty?
278
278
  de = dataelements.slice(*changed_dataelements).transform_values { |v| enc = CPEE::EvalRuby::Translation::detect_encoding(v); (enc == 'OTHER' ? v : (v.encode('UTF-8',enc) rescue CPEE::EvalRuby::Translation::convert_to_base64(v))) }
@@ -718,7 +718,7 @@
718
718
  </xsl:template>
719
719
  <xsl:template name="print-mcontent">
720
720
  <xsl:param name="myspace"/>
721
- <xsl:if test="text()">
721
+ <xsl:if test="d:code/text()">
722
722
  <xsl:choose>
723
723
  <xsl:when test="@language='application/x-ruby'">
724
724
  <xsl:text> do </xsl:text>
@@ -732,7 +732,7 @@
732
732
  <xsl:text>, &lt;&lt;-END</xsl:text>
733
733
  </xsl:otherwise>
734
734
  </xsl:choose>
735
- <xsl:for-each select="str:tokenize(text(), '&#x0A;')">
735
+ <xsl:for-each select="str:tokenize(d:code/text(), '&#x0A;')">
736
736
  <xsl:value-of select="concat('&#x0A;',concat(str:padding($myspace+$myspacemultiplier+$myspacemultiplier),str:replace(str:replace(str:replace(string(.),'\','\\'),'&quot;','\&quot;'),'#','\#')))" />
737
737
  </xsl:for-each>
738
738
  <xsl:call-template name="print-newline"/>
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cpee
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.95
4
+ version: 2.1.96
5
5
  platform: ruby
6
6
  authors:
7
7
  - Juergen eTM Mangler