cpee 2.0.9 → 2.0.11
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 +4 -4
- data/cockpit/config.json +3 -0
- data/cockpit/css/track.css +17 -6
- data/cockpit/css/ui.css +6 -2
- data/cockpit/css/wfadaptor.css +1 -1
- data/cockpit/edit.html +1 -0
- data/cockpit/index.html +2 -2
- data/cockpit/js/instance.js +75 -55
- data/cockpit/js/track.js +10 -0
- data/cockpit/js/ui.js +47 -16
- data/cockpit/templates/Track Test Local.xml +82 -0
- data/cockpit/templates/Track Test.xml +82 -0
- data/cockpit/templates/instantiate.local/Take_Sub.xml +61 -0
- data/cockpit/templates/instantiate/Take_Perf.xml +46 -0
- data/cockpit/templates/instantiate/Take_Sub.xml +57 -0
- data/cockpit/templates/instantiate/Take_X.xml +48 -0
- data/cockpit/themes/compact/rngs/call.rng +5 -0
- data/cockpit/themes/compact/rngs/callmanipulate.rng +6 -1
- data/cockpit/themes/default/rngs/call.rng +5 -0
- data/cockpit/themes/default/rngs/callmanipulate.rng +6 -1
- data/cockpit/themes/extended/rngs/call.rng +5 -0
- data/cockpit/themes/extended/rngs/callmanipulate.rng +6 -1
- data/cockpit/themes/packed/rngs/call.rng +5 -0
- data/cockpit/themes/packed/rngs/callmanipulate.rng +6 -1
- data/cockpit/themes/preset/rngs/call.rng +5 -0
- data/cockpit/themes/preset/rngs/callmanipulate.rng +6 -1
- data/cockpit/track.html +37 -8
- data/cpee.gemspec +2 -2
- data/lib/cpee/implementation.rb +13 -4
- data/lib/cpee/implementation_notifications.rb +95 -62
- data/lib/cpee/persistence.rb +3 -0
- data/server/routing/end.pid +1 -0
- data/server/routing/forward-events.pid +1 -0
- data/server/routing/forward-events.rb +2 -1
- data/server/routing/forward-votes.pid +1 -0
- data/server/routing/forward-votes.rb +1 -1
- data/server/routing/persist.pid +1 -0
- data/server/server.conf +4 -0
- data/server/server.pid +1 -0
- data/tools/cpee +6 -7
- metadata +18 -6
- data/cockpit/templates/convert_cpee2.rb +0 -15
- data/cockpit/themes/convert_cpee2.rb +0 -8
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
<testset xmlns="http://cpee.org/ns/properties/2.0">
|
|
2
|
+
<dataelements>
|
|
3
|
+
<i>0</i>
|
|
4
|
+
</dataelements>
|
|
5
|
+
<handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
|
|
6
|
+
<endpoints>
|
|
7
|
+
<start_url>https://cpee.org/flow/start/url/</start_url>
|
|
8
|
+
</endpoints>
|
|
9
|
+
<positions/>
|
|
10
|
+
<description>
|
|
11
|
+
<description xmlns="http://cpee.org/ns/description/1.0">
|
|
12
|
+
<loop mode="pre_test" condition="true">
|
|
13
|
+
<parallel wait="-1">
|
|
14
|
+
<loop mode="pre_test" condition="data.i < 4">
|
|
15
|
+
<_probability>
|
|
16
|
+
<_probability_min/>
|
|
17
|
+
<_probability_max/>
|
|
18
|
+
<_probability_avg/>
|
|
19
|
+
</_probability>
|
|
20
|
+
<parallel_branch pass="" local="">
|
|
21
|
+
<call id="a1" endpoint="start_url">
|
|
22
|
+
<parameters>
|
|
23
|
+
<label>Start</label>
|
|
24
|
+
<method>:post</method>
|
|
25
|
+
<arguments>
|
|
26
|
+
<behavior>wait_running</behavior>
|
|
27
|
+
<url>http://localhost/flow/templates/instantiate.local/Take_Sub.xml</url>
|
|
28
|
+
<init>
|
|
29
|
+
<time>4</time>
|
|
30
|
+
</init>
|
|
31
|
+
<endpoints/>
|
|
32
|
+
<stream/>
|
|
33
|
+
</arguments>
|
|
34
|
+
<stream>
|
|
35
|
+
<sensors/>
|
|
36
|
+
<aggregators/>
|
|
37
|
+
<costs/>
|
|
38
|
+
</stream>
|
|
39
|
+
<report>
|
|
40
|
+
<url/>
|
|
41
|
+
</report>
|
|
42
|
+
</parameters>
|
|
43
|
+
<annotations>
|
|
44
|
+
<_timing>
|
|
45
|
+
<_timing_wait/>
|
|
46
|
+
<_timing_threshold/>
|
|
47
|
+
<_timing_min/>
|
|
48
|
+
<_timing_max/>
|
|
49
|
+
<_timing_avg/>
|
|
50
|
+
</_timing>
|
|
51
|
+
<_notes>
|
|
52
|
+
<_notes_general/>
|
|
53
|
+
</_notes>
|
|
54
|
+
</annotations>
|
|
55
|
+
</call>
|
|
56
|
+
</parallel_branch>
|
|
57
|
+
<manipulate id="a4" label="">data.i += 1</manipulate>
|
|
58
|
+
</loop>
|
|
59
|
+
</parallel>
|
|
60
|
+
<manipulate id="a3" label="">data.i = 0</manipulate>
|
|
61
|
+
<_probability>
|
|
62
|
+
<_probability_min/>
|
|
63
|
+
<_probability_max/>
|
|
64
|
+
<_probability_avg/>
|
|
65
|
+
</_probability>
|
|
66
|
+
<stop id="a2"/>
|
|
67
|
+
</loop>
|
|
68
|
+
</description>
|
|
69
|
+
</description>
|
|
70
|
+
<transformation>
|
|
71
|
+
<description type="copy"/>
|
|
72
|
+
<dataelements type="none"/>
|
|
73
|
+
<endpoints type="none"/>
|
|
74
|
+
</transformation>
|
|
75
|
+
<attributes>
|
|
76
|
+
<info>Track Test</info>
|
|
77
|
+
<modeltype>CPEE</modeltype>
|
|
78
|
+
<theme>default</theme>
|
|
79
|
+
<customer>pilotfabrik</customer>
|
|
80
|
+
<status>development</status>
|
|
81
|
+
</attributes>
|
|
82
|
+
</testset>
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
<testset xmlns="http://cpee.org/ns/properties/2.0">
|
|
2
|
+
<dataelements>
|
|
3
|
+
<time>5</time>
|
|
4
|
+
</dataelements>
|
|
5
|
+
<handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
|
|
6
|
+
<endpoints>
|
|
7
|
+
<start_url>http://localhost:9296/url/</start_url>
|
|
8
|
+
</endpoints>
|
|
9
|
+
<positions/>
|
|
10
|
+
<description>
|
|
11
|
+
<description xmlns="http://cpee.org/ns/description/1.0">
|
|
12
|
+
<call id="a1" endpoint="start_url">
|
|
13
|
+
<parameters>
|
|
14
|
+
<label>Start</label>
|
|
15
|
+
<method>:post</method>
|
|
16
|
+
<arguments>
|
|
17
|
+
<behavior>wait_running</behavior>
|
|
18
|
+
<url>http://localhost/flow/templates/instantiate/Take_Perf.xml</url>
|
|
19
|
+
<init>
|
|
20
|
+
<time>!data.time</time>
|
|
21
|
+
</init>
|
|
22
|
+
<endpoints/>
|
|
23
|
+
<stream/>
|
|
24
|
+
</arguments>
|
|
25
|
+
<stream>
|
|
26
|
+
<sensors/>
|
|
27
|
+
<aggregators/>
|
|
28
|
+
<costs/>
|
|
29
|
+
</stream>
|
|
30
|
+
<report>
|
|
31
|
+
<url/>
|
|
32
|
+
</report>
|
|
33
|
+
</parameters>
|
|
34
|
+
<annotations>
|
|
35
|
+
<_timing>
|
|
36
|
+
<_timing_wait/>
|
|
37
|
+
<_timing_threshold/>
|
|
38
|
+
<_timing_min/>
|
|
39
|
+
<_timing_max/>
|
|
40
|
+
<_timing_avg/>
|
|
41
|
+
</_timing>
|
|
42
|
+
<_notes>
|
|
43
|
+
<_notes_general/>
|
|
44
|
+
</_notes>
|
|
45
|
+
</annotations>
|
|
46
|
+
</call>
|
|
47
|
+
</description>
|
|
48
|
+
</description>
|
|
49
|
+
<transformation>
|
|
50
|
+
<description type="copy"/>
|
|
51
|
+
<dataelements type="none"/>
|
|
52
|
+
<endpoints type="none"/>
|
|
53
|
+
</transformation>
|
|
54
|
+
<attributes>
|
|
55
|
+
<info/>
|
|
56
|
+
<modeltype>CPEE</modeltype>
|
|
57
|
+
<theme>default</theme>
|
|
58
|
+
<customer>pilotfabrik</customer>
|
|
59
|
+
<status>development</status>
|
|
60
|
+
</attributes>
|
|
61
|
+
</testset>
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
<testset xmlns="http://cpee.org/ns/properties/2.0">
|
|
2
|
+
<dataelements>
|
|
3
|
+
<time>5</time>
|
|
4
|
+
</dataelements>
|
|
5
|
+
<handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
|
|
6
|
+
<endpoints>
|
|
7
|
+
<fetch>https://cpee.org/perf</fetch>
|
|
8
|
+
</endpoints>
|
|
9
|
+
<positions/>
|
|
10
|
+
<description>
|
|
11
|
+
<description xmlns="http://cpee.org/ns/description/1.0">
|
|
12
|
+
<call id="a1" endpoint="fetch">
|
|
13
|
+
<parameters>
|
|
14
|
+
<label/>
|
|
15
|
+
<method>:get</method>
|
|
16
|
+
<arguments/>
|
|
17
|
+
</parameters>
|
|
18
|
+
<_timing>
|
|
19
|
+
<_timing_min/>
|
|
20
|
+
<_timing_max/>
|
|
21
|
+
<_timing_avg/>
|
|
22
|
+
</_timing>
|
|
23
|
+
<_notes>
|
|
24
|
+
<_notes_general/>
|
|
25
|
+
<_attachments/>
|
|
26
|
+
</_notes>
|
|
27
|
+
<code>
|
|
28
|
+
<finalize output="result"/>
|
|
29
|
+
<update output="result"/>
|
|
30
|
+
</code>
|
|
31
|
+
</call>
|
|
32
|
+
</description>
|
|
33
|
+
</description>
|
|
34
|
+
<transformation>
|
|
35
|
+
<description type="copy"/>
|
|
36
|
+
<dataelements type="none"/>
|
|
37
|
+
<endpoints type="none"/>
|
|
38
|
+
</transformation>
|
|
39
|
+
<attributes>
|
|
40
|
+
<info/>
|
|
41
|
+
<modeltype>CPEE</modeltype>
|
|
42
|
+
<theme>default</theme>
|
|
43
|
+
<customer>pilotfabrik</customer>
|
|
44
|
+
<status>development</status>
|
|
45
|
+
</attributes>
|
|
46
|
+
</testset>
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
<testset xmlns="http://cpee.org/ns/properties/2.0">
|
|
2
|
+
<dataelements/>
|
|
3
|
+
<handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
|
|
4
|
+
<endpoints>
|
|
5
|
+
<start_url>https://cpee.org/flow/start/url/</start_url>
|
|
6
|
+
</endpoints>
|
|
7
|
+
<positions/>
|
|
8
|
+
<description>
|
|
9
|
+
<description xmlns="http://cpee.org/ns/description/1.0">
|
|
10
|
+
<call id="a1" endpoint="start_url">
|
|
11
|
+
<parameters>
|
|
12
|
+
<label>Start</label>
|
|
13
|
+
<method>:post</method>
|
|
14
|
+
<arguments>
|
|
15
|
+
<behavior>wait_running</behavior>
|
|
16
|
+
<url>https://cpee.org/flow/templates/instantiate/Take_Perf.xml</url>
|
|
17
|
+
<init/>
|
|
18
|
+
<endpoints/>
|
|
19
|
+
<stream/>
|
|
20
|
+
</arguments>
|
|
21
|
+
<stream>
|
|
22
|
+
<sensors/>
|
|
23
|
+
<aggregators/>
|
|
24
|
+
<costs/>
|
|
25
|
+
</stream>
|
|
26
|
+
<report>
|
|
27
|
+
<url/>
|
|
28
|
+
</report>
|
|
29
|
+
</parameters>
|
|
30
|
+
<annotations>
|
|
31
|
+
<_timing>
|
|
32
|
+
<_timing_wait/>
|
|
33
|
+
<_timing_threshold/>
|
|
34
|
+
<_timing_min/>
|
|
35
|
+
<_timing_max/>
|
|
36
|
+
<_timing_avg/>
|
|
37
|
+
</_timing>
|
|
38
|
+
<_notes>
|
|
39
|
+
<_notes_general/>
|
|
40
|
+
</_notes>
|
|
41
|
+
</annotations>
|
|
42
|
+
</call>
|
|
43
|
+
</description>
|
|
44
|
+
</description>
|
|
45
|
+
<transformation>
|
|
46
|
+
<description type="copy"/>
|
|
47
|
+
<dataelements type="none"/>
|
|
48
|
+
<endpoints type="none"/>
|
|
49
|
+
</transformation>
|
|
50
|
+
<attributes>
|
|
51
|
+
<info/>
|
|
52
|
+
<modeltype>CPEE</modeltype>
|
|
53
|
+
<theme>default</theme>
|
|
54
|
+
<customer>pilotfabrik</customer>
|
|
55
|
+
<status>development</status>
|
|
56
|
+
</attributes>
|
|
57
|
+
</testset>
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
<testset xmlns="http://cpee.org/ns/properties/2.0">
|
|
2
|
+
<dataelements>
|
|
3
|
+
<time>5</time>
|
|
4
|
+
</dataelements>
|
|
5
|
+
<handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
|
|
6
|
+
<endpoints>
|
|
7
|
+
<timeout>https://cpee.org/services/timeout.php</timeout>
|
|
8
|
+
</endpoints>
|
|
9
|
+
<positions/>
|
|
10
|
+
<description>
|
|
11
|
+
<description xmlns="http://cpee.org/ns/description/1.0">
|
|
12
|
+
<call id="a1" endpoint="timeout">
|
|
13
|
+
<parameters>
|
|
14
|
+
<label/>
|
|
15
|
+
<method>:get</method>
|
|
16
|
+
<arguments>
|
|
17
|
+
<timeout>!data.time</timeout>
|
|
18
|
+
</arguments>
|
|
19
|
+
</parameters>
|
|
20
|
+
<_timing>
|
|
21
|
+
<_timing_min/>
|
|
22
|
+
<_timing_max/>
|
|
23
|
+
<_timing_avg/>
|
|
24
|
+
</_timing>
|
|
25
|
+
<_notes>
|
|
26
|
+
<_notes_general/>
|
|
27
|
+
<_attachments/>
|
|
28
|
+
</_notes>
|
|
29
|
+
<code>
|
|
30
|
+
<finalize output="result">data.duration = data.time</finalize>
|
|
31
|
+
<update output="result"/>
|
|
32
|
+
</code>
|
|
33
|
+
</call>
|
|
34
|
+
</description>
|
|
35
|
+
</description>
|
|
36
|
+
<transformation>
|
|
37
|
+
<description type="copy"/>
|
|
38
|
+
<dataelements type="none"/>
|
|
39
|
+
<endpoints type="none"/>
|
|
40
|
+
</transformation>
|
|
41
|
+
<attributes>
|
|
42
|
+
<info/>
|
|
43
|
+
<modeltype>CPEE</modeltype>
|
|
44
|
+
<theme>default</theme>
|
|
45
|
+
<customer>pilotfabrik</customer>
|
|
46
|
+
<status>development</status>
|
|
47
|
+
</attributes>
|
|
48
|
+
</testset>
|
|
@@ -89,6 +89,11 @@
|
|
|
89
89
|
</zeroOrMore>
|
|
90
90
|
</element>
|
|
91
91
|
</element>
|
|
92
|
+
<element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
|
|
93
|
+
<element name="url" rngui:label='HTML Snippet'>
|
|
94
|
+
<data type="string" rngui:label="url to report snippet"/>
|
|
95
|
+
</element>
|
|
96
|
+
</element>
|
|
92
97
|
</element>
|
|
93
98
|
<element name="annotations" rngui:header="Annotations">
|
|
94
99
|
<element name="_timing" rngui:header="Timing" rngui:fold="closed">
|
|
@@ -89,6 +89,11 @@
|
|
|
89
89
|
</zeroOrMore>
|
|
90
90
|
</element>
|
|
91
91
|
</element>
|
|
92
|
+
<element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
|
|
93
|
+
<element name="url" rngui:label='HTML Snippet'>
|
|
94
|
+
<data type="string" rngui:label="url to report snippet"/>
|
|
95
|
+
</element>
|
|
96
|
+
</element>
|
|
92
97
|
</element>
|
|
93
98
|
<element name="code" rngui:header="Implementation">
|
|
94
99
|
<element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
|
|
@@ -137,4 +142,4 @@
|
|
|
137
142
|
</element>
|
|
138
143
|
</element>
|
|
139
144
|
</element>
|
|
140
|
-
</element>
|
|
145
|
+
</element>
|
|
@@ -89,6 +89,11 @@
|
|
|
89
89
|
</zeroOrMore>
|
|
90
90
|
</element>
|
|
91
91
|
</element>
|
|
92
|
+
<element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
|
|
93
|
+
<element name="url" rngui:label='HTML Snippet'>
|
|
94
|
+
<data type="string" rngui:label="url to report snippet"/>
|
|
95
|
+
</element>
|
|
96
|
+
</element>
|
|
92
97
|
</element>
|
|
93
98
|
<element name="annotations" rngui:header="Annotations">
|
|
94
99
|
<element name="_timing" rngui:header="Timing" rngui:fold="closed">
|
|
@@ -89,6 +89,11 @@
|
|
|
89
89
|
</zeroOrMore>
|
|
90
90
|
</element>
|
|
91
91
|
</element>
|
|
92
|
+
<element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
|
|
93
|
+
<element name="url" rngui:label='HTML Snippet'>
|
|
94
|
+
<data type="string" rngui:label="url to report snippet"/>
|
|
95
|
+
</element>
|
|
96
|
+
</element>
|
|
92
97
|
</element>
|
|
93
98
|
<element name="code" rngui:header="Implementation">
|
|
94
99
|
<element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
|
|
@@ -137,4 +142,4 @@
|
|
|
137
142
|
</element>
|
|
138
143
|
</element>
|
|
139
144
|
</element>
|
|
140
|
-
</element>
|
|
145
|
+
</element>
|
|
@@ -89,6 +89,11 @@
|
|
|
89
89
|
</zeroOrMore>
|
|
90
90
|
</element>
|
|
91
91
|
</element>
|
|
92
|
+
<element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
|
|
93
|
+
<element name="url" rngui:label='HTML Snippet'>
|
|
94
|
+
<data type="string" rngui:label="url to report snippet"/>
|
|
95
|
+
</element>
|
|
96
|
+
</element>
|
|
92
97
|
</element>
|
|
93
98
|
<element name="annotations" rngui:header="Annotations">
|
|
94
99
|
<element name="_timing" rngui:header="Timing" rngui:fold="closed">
|
|
@@ -89,6 +89,11 @@
|
|
|
89
89
|
</zeroOrMore>
|
|
90
90
|
</element>
|
|
91
91
|
</element>
|
|
92
|
+
<element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
|
|
93
|
+
<element name="url" rngui:label='HTML Snippet'>
|
|
94
|
+
<data type="string" rngui:label="url to report snippet"/>
|
|
95
|
+
</element>
|
|
96
|
+
</element>
|
|
92
97
|
</element>
|
|
93
98
|
<element name="code" rngui:header="Implementation">
|
|
94
99
|
<element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
|
|
@@ -137,4 +142,4 @@
|
|
|
137
142
|
</element>
|
|
138
143
|
</element>
|
|
139
144
|
</element>
|
|
140
|
-
</element>
|
|
145
|
+
</element>
|
|
@@ -89,6 +89,11 @@
|
|
|
89
89
|
</zeroOrMore>
|
|
90
90
|
</element>
|
|
91
91
|
</element>
|
|
92
|
+
<element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
|
|
93
|
+
<element name="url" rngui:label='HTML Snippet'>
|
|
94
|
+
<data type="string" rngui:label="url to report snippet"/>
|
|
95
|
+
</element>
|
|
96
|
+
</element>
|
|
92
97
|
</element>
|
|
93
98
|
<element name="annotations" rngui:header="Annotations">
|
|
94
99
|
<element name="_timing" rngui:header="Timing" rngui:fold="closed">
|
|
@@ -89,6 +89,11 @@
|
|
|
89
89
|
</zeroOrMore>
|
|
90
90
|
</element>
|
|
91
91
|
</element>
|
|
92
|
+
<element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
|
|
93
|
+
<element name="url" rngui:label='HTML Snippet'>
|
|
94
|
+
<data type="string" rngui:label="url to report snippet"/>
|
|
95
|
+
</element>
|
|
96
|
+
</element>
|
|
92
97
|
</element>
|
|
93
98
|
<element name="code" rngui:header="Implementation">
|
|
94
99
|
<element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
|
|
@@ -137,4 +142,4 @@
|
|
|
137
142
|
</element>
|
|
138
143
|
</element>
|
|
139
144
|
</element>
|
|
140
|
-
</element>
|
|
145
|
+
</element>
|
|
@@ -89,6 +89,11 @@
|
|
|
89
89
|
</zeroOrMore>
|
|
90
90
|
</element>
|
|
91
91
|
</element>
|
|
92
|
+
<element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
|
|
93
|
+
<element name="url" rngui:label='HTML Snippet'>
|
|
94
|
+
<data type="string" rngui:label="url to report snippet"/>
|
|
95
|
+
</element>
|
|
96
|
+
</element>
|
|
92
97
|
</element>
|
|
93
98
|
<element name="annotations" rngui:header="Annotations">
|
|
94
99
|
<element name="_timing" rngui:header="Timing" rngui:fold="closed">
|
|
@@ -89,6 +89,11 @@
|
|
|
89
89
|
</zeroOrMore>
|
|
90
90
|
</element>
|
|
91
91
|
</element>
|
|
92
|
+
<element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
|
|
93
|
+
<element name="url" rngui:label='HTML Snippet'>
|
|
94
|
+
<data type="string" rngui:label="url to report snippet"/>
|
|
95
|
+
</element>
|
|
96
|
+
</element>
|
|
92
97
|
</element>
|
|
93
98
|
<element name="code" rngui:header="Implementation">
|
|
94
99
|
<element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
|
|
@@ -137,4 +142,4 @@
|
|
|
137
142
|
</element>
|
|
138
143
|
</element>
|
|
139
144
|
</element>
|
|
140
|
-
</element>
|
|
145
|
+
</element>
|