cpee 2.1.55 → 2.1.56

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/cockpit/js/instance.js +5 -5
  3. data/cockpit/templates/Worklist Vote.xml +95 -0
  4. data/cpee.gemspec +1 -1
  5. data/server/executionhandlers/ruby/connection.rb +4 -1
  6. metadata +3 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: acbdde24b745eb2500d3d97ebc420bf339e2d91b27112b218e89937ebd14f867
4
- data.tar.gz: 6803d51bab8de86ad7ee04f020322b449c15194ac8706b0e242ad70451278b24
3
+ metadata.gz: 2d77967638de8fff8f7c245c4913c4f49811645831bb8029a40515862ef0b65c
4
+ data.tar.gz: 32b6ab1f5ddc14fb1e8584ce2aacfcec2a44f988d7bb9ada9db844f7524409b0
5
5
  SHA512:
6
- metadata.gz: c17020b1920c7121a12b8118e325ae0828a4c39b9b3d72eb16db3a2c4b274b5a91523a5b4ace73c1395f89980403598381c7dc52068e4daecda933698efc9b6a
7
- data.tar.gz: 4dad3811a454bbe4ef660fbbd2e73e87e97b8dd058a36d3234a17dc27fb484f154a0486f4495b0de9c09055355e6044808335f38ebe6190131ada75b7626b7d5
6
+ metadata.gz: f6c79e249af879938e24817a2a943b35864280a95e6dd9153a8f7286c6f2160dcc282e0341a9d67569e906e3e04d6a5f1c6a6fc0309df451a79dff982edcb13c
7
+ data.tar.gz: 0b3d58a8a0cc37333d45e3f7681062ab8ab9abdddc5123c67c6b493a73ea7c844e8015ac3d219fdca69c664a2e785ce77a3963a189cae7aff476d58cb678ba89
data/cockpit/js/instance.js CHANGED
@@ -630,21 +630,21 @@ function adaptor_init(url,theme,dslx) { //{{{
630
630
  p.ymax = pos;
631
631
  }
632
632
 
633
- inner.append($X('<text xmlns="http://www.w3.org/2000/svg">' + k + '</text>'));
633
+ inner.append($X('<text xmlns="http://www.w3.org/2000/svg"></text>').text(k));
634
634
  tsvg.append(inner);
635
635
  }
636
636
 
637
637
  if (firstAssignFlag) {
638
638
  // Additional logic and construction of another polygon for orange triangle pointing left
639
639
  p.y0 -= (val.row-1) * dimensions.height;
640
- tsvg.append($X('<polygon xmlns="http://www.w3.org/2000/svg" points="' + (p.x + iconsize) + ',' + firstpos + ' ' + (p.x) + ',' + (firstpos + iconsize/2) + ' ' + (p.x) + ',' + (firstpos - iconsize/2) + '" class="resource-point write">' + '<text xmlns="http://www.w3.org/2000/svg">' + k + '</text></polygon>'));
640
+ tsvg.append($X('<polygon xmlns="http://www.w3.org/2000/svg" points="' + (p.x + iconsize) + ',' + firstpos + ' ' + (p.x) + ',' + (firstpos + iconsize/2) + ' ' + (p.x) + ',' + (firstpos - iconsize/2) + '" class="resource-point write"></polygon>').append($X('<text xmlns="http://www.w3.org/2000/svg"></text>').text(k)));
641
641
  }
642
642
  cx += iconsize + space;
643
643
  }
644
644
 
645
645
  tcolumnsvgs[col.column][val.row] = tsvg;
646
646
  } else {
647
- tsvg = $X('<text x="' + space + '" y="' + (dimensions.height * val.row - dimensions.height_shift) + '" xmlns="http://www.w3.org/2000/svg">' + col.value + '</text>');
647
+ tsvg = $X('<text x="' + space + '" y="' + (dimensions.height * val.row - dimensions.height_shift) + '" xmlns="http://www.w3.org/2000/svg"></text>').text(col.value);
648
648
  tcolumnsvgs[col.column][val.row] = tsvg;
649
649
  }
650
650
 
@@ -683,9 +683,9 @@ function adaptor_init(url,theme,dslx) { //{{{
683
683
  svgback.append($X('<rect xmlns="http://www.w3.org/2000/svg" element-row="' + i + '" class="border" x="0" y="' + (dimensions.height * i + dimensions.height_shift/2) + '" height="' + dimensions.height + '" width="1"></rect>'));
684
684
  }
685
685
  }
686
- if (tcolumntype[h] == "resource") {
686
+ if (tcolumntype[h] == 'resource' || tcolumntype[h] == 'bodsod') {
687
687
  for (const [k, p] of mapPoints) {
688
- svgback.append($X('<line xmlns="http://www.w3.org/2000/svg" x1="' + (p.x + iconsize/2) + '" y1="' + p.y0 + '" x2="' + (p.x + iconsize/2) + '" y2="' + p.ymax + '" class="resource-line" stroke-width="' + iconsize + '"><text>' + k + '</text></line>'));
688
+ svgback.append($X('<line xmlns="http://www.w3.org/2000/svg" x1="' + (p.x + iconsize/2) + '" y1="' + p.y0 + '" x2="' + (p.x + iconsize/2) + '" y2="' + p.ymax + '" class="' + tcolumntype[h] + '-line" stroke-width="' + iconsize + '"><text>' + k + '</text></line>'));
689
689
  }
690
690
  }
691
691
 
data/cockpit/templates/Worklist Vote.xml ADDED
@@ -0,0 +1,95 @@
1
+ <?xml version="1.0"?>
2
+ <testset xmlns="http://cpee.org/ns/properties/2.0">
3
+ <executionhandler>ruby</executionhandler>
4
+ <dataelements>
5
+ <res>[]</res>
6
+ <results>[{"user":"manglej6","raw":[{"name":"ok","value":"ok"}],"data":{"ok":"ok"}},{"user":"weissh9","raw":[{"name":"ok","value":"ok"}],"data":{"ok":"ok"}}]</results>
7
+ </dataelements>
8
+ <endpoints>
9
+ <worklist>https-post://cpee.org/worklist/server/</worklist>
10
+ </endpoints>
11
+ <attributes>
12
+ <info>Worklist Vote</info>
13
+ <modeltype>CPEE</modeltype>
14
+ <organisation1>http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
15
+ <theme>extended</theme>
16
+ <creator>Christine Ashcreek</creator>
17
+ <author>Christine Ashcreek</author>
18
+ <design_stage>development</design_stage>
19
+ <design_dir>Templates.dir/</design_dir>
20
+ </attributes>
21
+ <description>
22
+ <description xmlns="http://cpee.org/ns/description/1.0">
23
+ <loop mode="pre_test" condition="true">
24
+ <call id="a1" endpoint="worklist">
25
+ <parameters>
26
+ <label>OK OR NOT OK</label>
27
+ <arguments>
28
+ <orgmodel>https://cpee.org/~demo/orgviz/organisation_vote.xml</orgmodel>
29
+ <form>https://cpee.org/~demo/form/form-f.html</form>
30
+ <role>Assistant</role>
31
+ <priority>42</priority>
32
+ <handling rngui-nonfunctional="true">collect</handling>
33
+ <collect>2</collect>
34
+ <deadline>3 days</deadline>
35
+ <restrictions/>
36
+ <data>
37
+ <schaden>10000</schaden>
38
+ <text>destroyed</text>
39
+ </data>
40
+ </arguments>
41
+ </parameters>
42
+ <code>
43
+ <prepare/>
44
+ <finalize output="result">data.res = result</finalize>
45
+ <update output="result">data.results ||= []
46
+ data.results &lt;&lt; result unless result.empty?</update>
47
+ <rescue output="result"/>
48
+ </code>
49
+ <annotations>
50
+ <_generic/>
51
+ <_timing>
52
+ <_timing_weight/>
53
+ <_timing_avg/>
54
+ <explanations/>
55
+ </_timing>
56
+ <_shifting>
57
+ <_shifting_type>Duration</_shifting_type>
58
+ </_shifting>
59
+ <_context_data_analysis>
60
+ <probes/>
61
+ <ips/>
62
+ </_context_data_analysis>
63
+ <report>
64
+ <url/>
65
+ </report>
66
+ <_notes>
67
+ <_notes_general/>
68
+ </_notes>
69
+ </annotations>
70
+ <documentation>
71
+ <input/>
72
+ <output/>
73
+ <implementation>
74
+ <description/>
75
+ </implementation>
76
+ <code>
77
+ <description/>
78
+ </code>
79
+ </documentation>
80
+ </call>
81
+ <stop id="a2"/>
82
+ <_probability>
83
+ <_probability_min/>
84
+ <_probability_max/>
85
+ <_probability_avg/>
86
+ </_probability>
87
+ </loop>
88
+ </description>
89
+ </description>
90
+ <transformation>
91
+ <description type="copy"/>
92
+ <dataelements type="none"/>
93
+ <endpoints type="none"/>
94
+ </transformation>
95
+ </testset>
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.55"
3
+ s.version = "2.1.56"
4
4
  s.platform = Gem::Platform::RUBY
5
5
  s.license = "LGPL-3.0"
6
6
  s.summary = "Preliminary release of cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."
data/server/executionhandlers/ruby/connection.rb CHANGED
@@ -389,10 +389,13 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
389
389
 
390
390
  def callback(result=nil,options={})
391
391
  recv = structurize_result(result)
392
- @controller.notify("activity/receiving", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv, :annotations => @anno)
392
+ if result.length > 0
393
+ @controller.notify("activity/receiving", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv, :annotations => @anno)
394
+ end
393
395
  @guard_files += result
394
396
 
395
397
  @handler_returnValue = simplify_result(result)
398
+
396
399
  @handler_returnOptions = options
397
400
  if options['CPEE_INSTANTIATION']
398
401
  @controller.notify("task/instantiation", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(options['CPEE_INSTANTIATION']))
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.55
4
+ version: 2.1.56
5
5
  platform: ruby
6
6
  authors:
7
7
  - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: tools
12
12
  cert_chain: []
13
- date: 2024-03-20 00:00:00.000000000 Z
13
+ date: 2024-03-22 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: riddl
@@ -252,6 +252,7 @@ files:
252
252
  - cockpit/templates/UR-VUE 2020 Solution View.xml
253
253
  - cockpit/templates/UR-VUE 2020.xml
254
254
  - cockpit/templates/Wait.xml
255
+ - cockpit/templates/Worklist Vote.xml
255
256
  - cockpit/templates/Worklist.xml
256
257
  - cockpit/templates/instantiate.local/Take_Sub.xml
257
258
  - cockpit/templates/instantiate/Take_Perf.xml