cpee 2.1.43 → 2.1.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efe2b979ffa5688e94ddc6d344f22a000ec05ee8431829a540a1e029eb6447e0
-  data.tar.gz: e806711116591e7cbf37132ca4950d6b824b90b85fe9806b8d0a2aa2186fe43d
+  metadata.gz: 310a80c81a71084a7728c434c6e6e94f87f6af6f5f335385d7ed894bac4ae969
+  data.tar.gz: 8f154ce48422441b0cb2fe74e6a4c3f49ca55e650bef9d9e5f89b3b0b01becef
 SHA512:
-  metadata.gz: 7216bbfcc02ef6e23c085bdbe521f8f84d39c752415bc2e46498fcd658b88eed491e1387bbd85147b1defd9cc49b8872ff82d22ceabe9e4dd4d4035c25c53bf5
-  data.tar.gz: 25de4d62af41f018535725dbd93b493c0e12161553c070f6c1db6dcadcca4dac9621d442eabdb8c9cfc33783e7e622cc7c8e76682a13542c262bcb6d0f0c9ddd
+  metadata.gz: f839d65b84a85fce540360accafd66641a39481354e237e874d18e43d1c7b2193b644430f7f481ea49bf101886768e2b3d732b644d17d359d030d380a6f37d40
+  data.tar.gz: d13397de40eb2e07287e760399b9d9107bdf2ee4cdc290a222f027e5fd4c2c68e8b09bd170aa1c7d76f4a353da9196666f329addc68410e7c95462c2308553ce

data/cockpit/css/wfadaptor.css

@@ -27,7 +27,7 @@
   --wfadaptor-selected: #f57900;
   --wfadaptor-stripe: #e9e9e9;
   --wfadaptor-background: #ffffff;
-  --wfadaptor-background-menu: #ff7f7f;
+  --wfadaptor-menu: #ef2929;
   --wfadaptor-border: #a1a1a1;
 }
 
@@ -73,7 +73,11 @@ svg g.vote .rline {
 }
 
 svg .rfill.menu {
-  fill: var(--wfadaptor-background-menu);
+  fill: var(--wfadaptor-menu);
+  fill-opacity:1;
+}
+svg .hfill.menu {
+  fill: var(--wfadaptor-menu);
   fill-opacity:1;
 }
 
@@ -130,6 +134,9 @@ svg .standfat {
   stroke-opacity:1;
   stroke-dasharray:none;
 }
+svg .standfat.menu {
+  stroke: var(--wfadaptor-menu);
+}
 svg .normal {
   fill: var(--wfadaptor-base);
   fill-opacity:1;

data/cockpit/js/instance.js

@@ -19,7 +19,8 @@ function global_init() {
   subscription_state = 'less';
   save['state']= undefined;
   save['dsl'] = undefined;
-  save['activity_states'] = {}
+  save['activity_red_states'] = {}
+  save['activity_blue_states'] = {}
   save['graph'] = undefined;
   save['graph_theme'] = undefined;
   save['graph_adaptor'] = undefined;
@@ -682,25 +683,56 @@ function monitor_instance_pos() {// {{{
 }// }}}
 
 function monitor_instance_running(content,event) {// {{{
-  if (save['state'] == "stopping") return;
   if (event == "calling") {
-    if (!save['activity_states'][content['activity-uuid']]) {
-      save['activity_states'][content['activity-uuid']] = true
+    if (!save['activity_red_states'][content['activity-uuid']]) {
+      save['activity_red_states'][content['activity-uuid']] = true
       format_visual_add(content.activity,"active")
     }
   } else if (event == "manipulating") {
-    if (!save['activity_states'][content['activity-uuid']]) {
-      save['activity_states'][content['activity-uuid']] = true
+    if (!save['activity_red_states'][content['activity-uuid']]) {
+      save['activity_red_states'][content['activity-uuid']] = true
       format_visual_add(content.activity,"active")
     }
   } else if (event == "done") {
-    if (save['activity_states'][content['activity-uuid']]) {
-      save['activity_states'][content['activity-uuid']] = true
-      format_visual_remove(content.activity,"active")
-      setTimeout(() => {delete save['activity_states'][content['activity-uuid']]},5000);
+    if (save['activity_red_states'][content['activity-uuid']]) {
+      format_visual_remove(content.activity,"active");
     }
+    save['activity_red_states'][content['activity-uuid']] = true
+    setTimeout(() => {delete save['activity_red_states'][content['activity-uuid']]},5000);
   }
 } // }}}
+function monitor_instance_pos_change(content) {// {{{
+  if (content['at']) {
+    $.each(content['at'],function(a,b){
+      if (!save['activity_blue_states'][b.uuid]) {
+        save['activity_blue_states'][b.uuid] = true
+        format_visual_add(b.position,"passive");
+      }
+    });
+  }
+  if (content['after']) {
+    $.each(content['after'],function(a,b){
+      if (!save['activity_blue_states'][b.uuid]) {
+        save['activity_blue_states'][b.uuid] = true
+        format_visual_add(b.position,"passive");
+      }
+    });
+  }
+  if (content['unmark']) {
+    $.each(content['unmark'],function(a,b){
+      if (save['activity_blue_states'][b.uuid]) {
+        format_visual_remove(b.position,"passive")
+      }
+      save['activity_blue_states'][b.uuid] = true
+      setTimeout(() => {delete save['activity_blue_states'][b.uuid]},5000);
+    });
+  }
+  if (!content['at'] && !content['unmark'] && !content['after'] && !content['wait']) {
+    monitor_instance_pos();
+  }
+} // }}}
+
+
 function monitor_instance_state_change(notification) { //{{{
   if ($('#trackcolumn').length > 0) {
     if (notification == "finished" || notification == "abandoned") {
@@ -763,22 +795,6 @@ function monitor_instance_state_change(notification) { //{{{
     $("#state_text").text(notification);
   }
 }   //}}}
-function monitor_instance_pos_change(content) {// {{{
-  if (content['unmark']) {
-    $.each(content['unmark'],function(a,b){
-      format_visual_remove(b.position,"passive")
-    });
-  }
-  if (content['at']) {
-    $.each(content['at'],function(a,b){
-      format_visual_add(b.position,"passive");
-    });
-  }
-  if (!content['at'] && !content['unmark'] && !content['after'] && !content['wait']) {
-    monitor_instance_pos();
-  }
-} // }}}
-
 function monitor_instance_vote_add(parts) {// {{{
   var ctv = $("#votes");
 
@@ -1415,12 +1431,12 @@ function ui_pos(e,bl) {
   var url = $('body').attr('current-instance');
   var coll = [];
   $('g.element.primitive > g.activities.active, g.element.primitive > g.activities.passive').each(function(a,b){
-    coll.push($(b).parent().attr('element-id'));
+    coll.push([$(b).parent().attr('element-id'), $(b).parent().attr('element-type') == 'stop' ? 'after' : 'at']);
   });
   coll = bl(coll);
   var vals = "";
   $(coll).each(function(k,ele){
-    vals += "<" + ele + ">at</"  + ele + ">";
+    vals += "<" + ele[0] + ">" + ele[1] + "</"  + ele[0] + ">";
   });
   vals = "<positions xmlns='http://cpee.org/ns/properties/2.0'>" + vals + "</positions>";
   $.ajax({
@@ -1444,7 +1460,7 @@ function del_ui_pos(e) {
 }
 function add_ui_pos(e) {
   ui_pos(e,function(coll){
-    coll.push($(e).attr('id'));
+    coll.push([$(e).attr('id'), e.nodeName == 'stop' ? 'after' : 'at']);
     return coll;
   });
 }

data/cockpit/templates/Coopis 2010.xml

@@ -4,7 +4,7 @@
   <dataelements>
     <persons>3</persons>
     <card>Visa_12345</card>
-    <airline>null</airline>
+    <airline/>
     <hotels>[]</hotels>
     <from>Vienna</from>
     <to>Prague</to>
@@ -37,9 +37,9 @@
           <label>Book Airline 1</label>
           <method>:post</method>
           <arguments>
-            <from>data.from</from>
-            <to>data.to</to>
-            <persons>data.persons</persons>
+            <from>!data.from</from>
+            <to>!data.to</to>
+            <persons>!data.persons</persons>
           </arguments>
         </parameters>
         <code>
@@ -56,6 +56,9 @@ status.update 1, 'Hotel'</finalize>
             <_timing_avg/>
             <explanations/>
           </_timing>
+          <_shifting>
+            <_shifting_type>Duration</_shifting_type>
+          </_shifting>
           <_context_data_analysis>
             <probes/>
             <ips/>
@@ -86,15 +89,46 @@ status.update 1, 'Hotel'</finalize>
                 <label>Book Hotel</label>
                 <method>:post</method>
                 <arguments>
-                  <to>data.to</to>
+                  <to>!data.to</to>
                 </arguments>
               </parameters>
               <code>
+                <prepare/>
                 <finalize output="result">data.hotels &lt;&lt; result.value('id')
 data.costs += result.value('costs').to_f</finalize>
+                <update output="result"/>
+                <rescue output="result"/>
               </code>
-              <annotations/>
-              <documentation/>
+              <annotations>
+                <_timing>
+                  <_timing_weight/>
+                  <_timing_avg/>
+                  <explanations/>
+                </_timing>
+                <_shifting>
+                  <_shifting_type>Duration</_shifting_type>
+                </_shifting>
+                <_context_data_analysis>
+                  <probes/>
+                  <ips/>
+                </_context_data_analysis>
+                <report>
+                  <url/>
+                </report>
+                <_notes>
+                  <_notes_general/>
+                </_notes>
+              </annotations>
+              <documentation>
+                <input/>
+                <output/>
+                <implementation>
+                  <description/>
+                </implementation>
+                <code>
+                  <description/>
+                </code>
+              </documentation>
             </call>
           </parallel_branch>
           <manipulate id="a3">data.persons -= 1</manipulate>
@@ -107,11 +141,36 @@ data.costs += result.value('costs').to_f</finalize>
               <label>Approve Hotel</label>
               <method>:post</method>
               <arguments>
-                <costs>data.costs</costs>
+                <costs>!data.costs</costs>
               </arguments>
             </parameters>
-            <annotations/>
-            <documentation/>
+            <annotations>
+              <_timing>
+                <_timing_weight/>
+                <_timing_avg/>
+                <explanations/>
+              </_timing>
+              <_shifting>
+                <_shifting_type>Duration</_shifting_type>
+              </_shifting>
+              <_context_data_analysis>
+                <probes/>
+                <ips/>
+              </_context_data_analysis>
+              <report>
+                <url/>
+              </report>
+              <_notes>
+                <_notes_general/>
+              </_notes>
+            </annotations>
+            <documentation>
+              <input/>
+              <output/>
+              <implementation>
+                <description/>
+              </implementation>
+            </documentation>
           </call>
         </alternative>
       </choose>

data/cockpit/themes/compact/symbols/delete.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <line x1="8.5" y1="22.5" x2="22.5" y2="8.5" class="standfat"/>
+  <line x1="8.5" y1="8.5" x2="22.5" y2="22.5" class="standfat"/>
+</svg>

data/cockpit/themes/compact/theme.js

@@ -93,7 +93,7 @@ function WFAdaptorManifestation(adaptor) {
 
     nodes = JSON.parse(nodes);
     $(nodes).each(function(key,str) {
-      nodes[key] = $X(str);;
+      nodes[key] = $X(str);
     });
 
     var check1 = [];
@@ -176,14 +176,40 @@ function WFAdaptorManifestation(adaptor) {
 
     if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete) {
       var icon =  self.elements[xml_node.get(0).tagName].illustrator.svg.clone();
-      icon.children('.rfill').addClass('menu');
+      icon.find('.rfill').addClass('menu');
+      icon.find('.hfill').addClass('menu');
       menu['Delete'] = [{
         'label': 'Remove Element',
-        'function_call': function(selector,target,selected){ self.adaptor.description.remove(selector,target); self.adaptor.illustrator.get_label_by_svg_id(selected).addClass('selected'); },
+        'function_call': function(selector,target,selected){
+          del_ui_pos(target)
+          self.adaptor.description.remove(selector,target);
+        },
         'menu_icon': icon,
         'type': undefined,
         'params': [null, xml_node, self.selected()]
       }];
+      var nodes = localStorage.getItem('marked');
+      nodes = JSON.parse(nodes);
+      if (nodes && nodes.length > 0) {
+        var icond =  self.resources['delete'].clone();
+        icond.children('.standfat').addClass('menu');
+        menu['Delete'].push({
+          'label': 'Remove Marked Elements',
+          'function_call': function(){
+            $(nodes).each(function(key,str) {
+              nodes[key] = $X(str);
+            });
+            $(nodes).each(function(key,node){
+              var target = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
+              del_ui_pos(target)
+              self.adaptor.description.remove(null,target);
+            });
+          },
+          'menu_icon': icond,
+          'type': undefined,
+          'params': []
+        })
+      }
     }
     if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
       var icon =  self.elements.callmanipulate.illustrator.svg.clone();
@@ -198,7 +224,7 @@ function WFAdaptorManifestation(adaptor) {
     }
     if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate" || xml_node.get(0).tagName == "stop") {
       var icon =  self.elements.call.illustrator.svg.clone();
-      icon.children('g.replace').addClass('active');
+      icon.children('g.replace').addClass('passive');
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {
         if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
@@ -299,6 +325,7 @@ function WFAdaptorManifestation(adaptor) {
 
   // other resources
   this.resources.arrow =  self.adaptor.theme_dir + 'symbols/arrow.svg';
+  this.resources.delete =  self.adaptor.theme_dir + 'symbols/delete.svg';
 
   // Primitive Elements
   this.elements.call = { /*{{{*/

data/cockpit/themes/control/symbols/delete.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <line x1="8.5" y1="22.5" x2="22.5" y2="8.5" class="standfat"/>
+  <line x1="8.5" y1="8.5" x2="22.5" y2="22.5" class="standfat"/>
+</svg>

data/cockpit/themes/control/theme.js

@@ -93,7 +93,7 @@ function WFAdaptorManifestation(adaptor) {
 
     nodes = JSON.parse(nodes);
     $(nodes).each(function(key,str) {
-      nodes[key] = $X(str);;
+      nodes[key] = $X(str);
     });
 
     var check1 = [];
@@ -176,14 +176,40 @@ function WFAdaptorManifestation(adaptor) {
 
     if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete) {
       var icon =  self.elements[xml_node.get(0).tagName].illustrator.svg.clone();
-      icon.children('.rfill').addClass('menu');
+      icon.find('.rfill').addClass('menu');
+      icon.find('.hfill').addClass('menu');
       menu['Delete'] = [{
         'label': 'Remove Element',
-        'function_call': function(selector,target,selected){ self.adaptor.description.remove(selector,target); self.adaptor.illustrator.get_label_by_svg_id(selected).addClass('selected'); },
+        'function_call': function(selector,target,selected){
+          del_ui_pos(target)
+          self.adaptor.description.remove(selector,target);
+        },
         'menu_icon': icon,
         'type': undefined,
         'params': [null, xml_node, self.selected()]
       }];
+      var nodes = localStorage.getItem('marked');
+      nodes = JSON.parse(nodes);
+      if (nodes && nodes.length > 0) {
+        var icond =  self.resources['delete'].clone();
+        icond.children('.standfat').addClass('menu');
+        menu['Delete'].push({
+          'label': 'Remove Marked Elements',
+          'function_call': function(){
+            $(nodes).each(function(key,str) {
+              nodes[key] = $X(str);
+            });
+            $(nodes).each(function(key,node){
+              var target = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
+              del_ui_pos(target)
+              self.adaptor.description.remove(null,target);
+            });
+          },
+          'menu_icon': icond,
+          'type': undefined,
+          'params': []
+        })
+      }
     }
     if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
       var icon =  self.elements.callmanipulate.illustrator.svg.clone();
@@ -198,7 +224,7 @@ function WFAdaptorManifestation(adaptor) {
     }
     if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate" || xml_node.get(0).tagName == "stop") {
       var icon =  self.elements.call.illustrator.svg.clone();
-      icon.children('g.replace').addClass('active');
+      icon.children('g.replace').addClass('passive');
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {
         if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
@@ -299,6 +325,7 @@ function WFAdaptorManifestation(adaptor) {
 
   // other resources
   this.resources.arrow =  self.adaptor.theme_dir + 'symbols/arrow.svg';
+  this.resources.delete =  self.adaptor.theme_dir + 'symbols/delete.svg';
 
   // Primitive Elements
   this.elements.call = { /*{{{*/

data/cockpit/themes/default/symbols/delete.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <line x1="8.5" y1="22.5" x2="22.5" y2="8.5" class="standfat"/>
+  <line x1="8.5" y1="8.5" x2="22.5" y2="22.5" class="standfat"/>
+</svg>

data/cockpit/themes/default/theme.js

@@ -93,7 +93,7 @@ function WFAdaptorManifestation(adaptor) {
 
     nodes = JSON.parse(nodes);
     $(nodes).each(function(key,str) {
-      nodes[key] = $X(str);;
+      nodes[key] = $X(str);
     });
 
     var check1 = [];
@@ -176,14 +176,40 @@ function WFAdaptorManifestation(adaptor) {
 
     if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete) {
       var icon =  self.elements[xml_node.get(0).tagName].illustrator.svg.clone();
-      icon.children('.rfill').addClass('menu');
+      icon.find('.rfill').addClass('menu');
+      icon.find('.hfill').addClass('menu');
       menu['Delete'] = [{
         'label': 'Remove Element',
-        'function_call': function(selector,target,selected){ self.adaptor.description.remove(selector,target); self.adaptor.illustrator.get_label_by_svg_id(selected).addClass('selected'); },
+        'function_call': function(selector,target,selected){
+          del_ui_pos(target)
+          self.adaptor.description.remove(selector,target);
+        },
         'menu_icon': icon,
         'type': undefined,
         'params': [null, xml_node, self.selected()]
       }];
+      var nodes = localStorage.getItem('marked');
+      nodes = JSON.parse(nodes);
+      if (nodes && nodes.length > 0) {
+        var icond =  self.resources['delete'].clone();
+        icond.children('.standfat').addClass('menu');
+        menu['Delete'].push({
+          'label': 'Remove Marked Elements',
+          'function_call': function(){
+            $(nodes).each(function(key,str) {
+              nodes[key] = $X(str);
+            });
+            $(nodes).each(function(key,node){
+              var target = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
+              del_ui_pos(target)
+              self.adaptor.description.remove(null,target);
+            });
+          },
+          'menu_icon': icond,
+          'type': undefined,
+          'params': []
+        })
+      }
     }
     if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
       var icon =  self.elements.callmanipulate.illustrator.svg.clone();
@@ -198,7 +224,7 @@ function WFAdaptorManifestation(adaptor) {
     }
     if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate" || xml_node.get(0).tagName == "stop") {
       var icon =  self.elements.call.illustrator.svg.clone();
-      icon.children('g.replace').addClass('active');
+      icon.children('g.replace').addClass('passive');
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {
         if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
@@ -299,6 +325,7 @@ function WFAdaptorManifestation(adaptor) {
 
   // other resources
   this.resources.arrow =  self.adaptor.theme_dir + 'symbols/arrow.svg';
+  this.resources.delete =  self.adaptor.theme_dir + 'symbols/delete.svg';
 
   // Primitive Elements
   this.elements.call = { /*{{{*/

data/cockpit/themes/extended/symbols/delete.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <line x1="8.5" y1="22.5" x2="22.5" y2="8.5" class="standfat"/>
+  <line x1="8.5" y1="8.5" x2="22.5" y2="22.5" class="standfat"/>
+</svg>

data/cockpit/themes/extended/theme.js

@@ -93,7 +93,7 @@ function WFAdaptorManifestation(adaptor) {
 
     nodes = JSON.parse(nodes);
     $(nodes).each(function(key,str) {
-      nodes[key] = $X(str);;
+      nodes[key] = $X(str);
     });
 
     var check1 = [];
@@ -176,14 +176,40 @@ function WFAdaptorManifestation(adaptor) {
 
     if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete) {
       var icon =  self.elements[xml_node.get(0).tagName].illustrator.svg.clone();
-      icon.children('.rfill').addClass('menu');
+      icon.find('.rfill').addClass('menu');
+      icon.find('.hfill').addClass('menu');
       menu['Delete'] = [{
         'label': 'Remove Element',
-        'function_call': function(selector,target,selected){ self.adaptor.description.remove(selector,target); self.adaptor.illustrator.get_label_by_svg_id(selected).addClass('selected'); },
+        'function_call': function(selector,target,selected){
+          del_ui_pos(target)
+          self.adaptor.description.remove(selector,target);
+        },
         'menu_icon': icon,
         'type': undefined,
         'params': [null, xml_node, self.selected()]
       }];
+      var nodes = localStorage.getItem('marked');
+      nodes = JSON.parse(nodes);
+      if (nodes && nodes.length > 0) {
+        var icond =  self.resources['delete'].clone();
+        icond.children('.standfat').addClass('menu');
+        menu['Delete'].push({
+          'label': 'Remove Marked Elements',
+          'function_call': function(){
+            $(nodes).each(function(key,str) {
+              nodes[key] = $X(str);
+            });
+            $(nodes).each(function(key,node){
+              var target = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
+              del_ui_pos(target)
+              self.adaptor.description.remove(null,target);
+            });
+          },
+          'menu_icon': icond,
+          'type': undefined,
+          'params': []
+        })
+      }
     }
     if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
       var icon =  self.elements.callmanipulate.illustrator.svg.clone();
@@ -198,7 +224,7 @@ function WFAdaptorManifestation(adaptor) {
     }
     if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate" || xml_node.get(0).tagName == "stop") {
       var icon =  self.elements.call.illustrator.svg.clone();
-      icon.children('g.replace').addClass('active');
+      icon.children('g.replace').addClass('passive');
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {
         if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
@@ -299,6 +325,7 @@ function WFAdaptorManifestation(adaptor) {
 
   // other resources
   this.resources.arrow =  self.adaptor.theme_dir + 'symbols/arrow.svg';
+  this.resources.delete =  self.adaptor.theme_dir + 'symbols/delete.svg';
 
   // Primitive Elements
   this.elements.call = { /*{{{*/

data/cockpit/themes/model/symbols/delete.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <line x1="8.5" y1="22.5" x2="22.5" y2="8.5" class="standfat"/>
+  <line x1="8.5" y1="8.5" x2="22.5" y2="22.5" class="standfat"/>
+</svg>

data/cockpit/themes/model/theme.js

@@ -93,7 +93,7 @@ function WFAdaptorManifestation(adaptor) {
 
     nodes = JSON.parse(nodes);
     $(nodes).each(function(key,str) {
-      nodes[key] = $X(str);;
+      nodes[key] = $X(str);
     });
 
     var check1 = [];
@@ -176,14 +176,40 @@ function WFAdaptorManifestation(adaptor) {
 
     if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete) {
       var icon =  self.elements[xml_node.get(0).tagName].illustrator.svg.clone();
-      icon.children('.rfill').addClass('menu');
+      icon.find('.rfill').addClass('menu');
+      icon.find('.hfill').addClass('menu');
       menu['Delete'] = [{
         'label': 'Remove Element',
-        'function_call': function(selector,target,selected){ self.adaptor.description.remove(selector,target); self.adaptor.illustrator.get_label_by_svg_id(selected).addClass('selected'); },
+        'function_call': function(selector,target,selected){
+          del_ui_pos(target)
+          self.adaptor.description.remove(selector,target);
+        },
         'menu_icon': icon,
         'type': undefined,
         'params': [null, xml_node, self.selected()]
       }];
+      var nodes = localStorage.getItem('marked');
+      nodes = JSON.parse(nodes);
+      if (nodes && nodes.length > 0) {
+        var icond =  self.resources['delete'].clone();
+        icond.children('.standfat').addClass('menu');
+        menu['Delete'].push({
+          'label': 'Remove Marked Elements',
+          'function_call': function(){
+            $(nodes).each(function(key,str) {
+              nodes[key] = $X(str);
+            });
+            $(nodes).each(function(key,node){
+              var target = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
+              del_ui_pos(target)
+              self.adaptor.description.remove(null,target);
+            });
+          },
+          'menu_icon': icond,
+          'type': undefined,
+          'params': []
+        })
+      }
     }
     if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
       var icon =  self.elements.callmanipulate.illustrator.svg.clone();
@@ -275,6 +301,7 @@ function WFAdaptorManifestation(adaptor) {
 
   // other resources
   this.resources.arrow =  self.adaptor.theme_dir + 'symbols/arrow.svg';
+  this.resources.delete =  self.adaptor.theme_dir + 'symbols/delete.svg';
 
   // Primitive Elements
   this.elements.call = { /*{{{*/

data/cockpit/themes/packed/symbols/delete.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <line x1="8.5" y1="22.5" x2="22.5" y2="8.5" class="standfat"/>
+  <line x1="8.5" y1="8.5" x2="22.5" y2="22.5" class="standfat"/>
+</svg>

data/cockpit/themes/packed/theme.js

@@ -93,7 +93,7 @@ function WFAdaptorManifestation(adaptor) {
 
     nodes = JSON.parse(nodes);
     $(nodes).each(function(key,str) {
-      nodes[key] = $X(str);;
+      nodes[key] = $X(str);
     });
 
     var check1 = [];
@@ -176,14 +176,40 @@ function WFAdaptorManifestation(adaptor) {
 
     if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete) {
       var icon =  self.elements[xml_node.get(0).tagName].illustrator.svg.clone();
-      icon.children('.rfill').addClass('menu');
+      icon.find('.rfill').addClass('menu');
+      icon.find('.hfill').addClass('menu');
       menu['Delete'] = [{
         'label': 'Remove Element',
-        'function_call': function(selector,target,selected){ self.adaptor.description.remove(selector,target); self.adaptor.illustrator.get_label_by_svg_id(selected).addClass('selected'); },
+        'function_call': function(selector,target,selected){
+          del_ui_pos(target)
+          self.adaptor.description.remove(selector,target);
+        },
         'menu_icon': icon,
         'type': undefined,
         'params': [null, xml_node, self.selected()]
       }];
+      var nodes = localStorage.getItem('marked');
+      nodes = JSON.parse(nodes);
+      if (nodes && nodes.length > 0) {
+        var icond =  self.resources['delete'].clone();
+        icond.children('.standfat').addClass('menu');
+        menu['Delete'].push({
+          'label': 'Remove Marked Elements',
+          'function_call': function(){
+            $(nodes).each(function(key,str) {
+              nodes[key] = $X(str);
+            });
+            $(nodes).each(function(key,node){
+              var target = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
+              del_ui_pos(target)
+              self.adaptor.description.remove(null,target);
+            });
+          },
+          'menu_icon': icond,
+          'type': undefined,
+          'params': []
+        })
+      }
     }
     if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
       var icon =  self.elements.callmanipulate.illustrator.svg.clone();
@@ -198,7 +224,7 @@ function WFAdaptorManifestation(adaptor) {
     }
     if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate" || xml_node.get(0).tagName == "stop") {
       var icon =  self.elements.call.illustrator.svg.clone();
-      icon.children('g.replace').addClass('active');
+      icon.children('g.replace').addClass('passive');
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {
         if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
@@ -299,6 +325,7 @@ function WFAdaptorManifestation(adaptor) {
 
   // other resources
   this.resources.arrow =  self.adaptor.theme_dir + 'symbols/arrow.svg';
+  this.resources.delete =  self.adaptor.theme_dir + 'symbols/delete.svg';
 
   // Primitive Elements
   this.elements.call = { /*{{{*/

data/cockpit/themes/preset/symbols/delete.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <line x1="8.5" y1="22.5" x2="22.5" y2="8.5" class="standfat"/>
+  <line x1="8.5" y1="8.5" x2="22.5" y2="22.5" class="standfat"/>
+</svg>

data/cockpit/themes/preset/theme.js

@@ -93,7 +93,7 @@ function WFAdaptorManifestation(adaptor) {
 
     nodes = JSON.parse(nodes);
     $(nodes).each(function(key,str) {
-      nodes[key] = $X(str);;
+      nodes[key] = $X(str);
     });
 
     var check1 = [];
@@ -176,14 +176,40 @@ function WFAdaptorManifestation(adaptor) {
 
     if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete) {
       var icon =  self.elements[xml_node.get(0).tagName].illustrator.svg.clone();
-      icon.children('.rfill').addClass('menu');
+      icon.find('.rfill').addClass('menu');
+      icon.find('.hfill').addClass('menu');
       menu['Delete'] = [{
         'label': 'Remove Element',
-        'function_call': function(selector,target,selected){ self.adaptor.description.remove(selector,target); self.adaptor.illustrator.get_label_by_svg_id(selected).addClass('selected'); },
+        'function_call': function(selector,target,selected){
+          del_ui_pos(target)
+          self.adaptor.description.remove(selector,target);
+        },
         'menu_icon': icon,
         'type': undefined,
         'params': [null, xml_node, self.selected()]
       }];
+      var nodes = localStorage.getItem('marked');
+      nodes = JSON.parse(nodes);
+      if (nodes && nodes.length > 0) {
+        var icond =  self.resources['delete'].clone();
+        icond.children('.standfat').addClass('menu');
+        menu['Delete'].push({
+          'label': 'Remove Marked Elements',
+          'function_call': function(){
+            $(nodes).each(function(key,str) {
+              nodes[key] = $X(str);
+            });
+            $(nodes).each(function(key,node){
+              var target = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
+              del_ui_pos(target)
+              self.adaptor.description.remove(null,target);
+            });
+          },
+          'menu_icon': icond,
+          'type': undefined,
+          'params': []
+        })
+      }
     }
     if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
       var icon =  self.elements.callmanipulate.illustrator.svg.clone();
@@ -198,7 +224,7 @@ function WFAdaptorManifestation(adaptor) {
     }
     if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate" || xml_node.get(0).tagName == "stop") {
       var icon =  self.elements.call.illustrator.svg.clone();
-      icon.children('g.replace').addClass('active');
+      icon.children('g.replace').addClass('passive');
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {
         if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
@@ -299,6 +325,7 @@ function WFAdaptorManifestation(adaptor) {
 
   // other resources
   this.resources.arrow =  self.adaptor.theme_dir + 'symbols/arrow.svg';
+  this.resources.delete =  self.adaptor.theme_dir + 'symbols/delete.svg';
 
   // Primitive Elements
   this.elements.call = { /*{{{*/

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.43"
+  s.version          = "2.1.45"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   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/backend/instance.template

@@ -11,7 +11,7 @@ class Instance < WEEL
 <% end -%>
 
 <% unless positions.nil? || positions.empty? -%>
-  search <% positions.each_with_index { |de,i| %><%= (i > 0 ? ', ' : '') %>Position.new(:<%= de[0] %>, :<%=de[1] %>, <%= de[2].nil? || de[2].strip.empty? ? 'nil' : '"' + de[2] + '"' %>)<% } %>
+  search <% positions.each_with_index { |de,i| %><%= (i > 0 ? ', ' : '') %>Position.new(:<%= de[0] %>, 0, :<%=de[1] %>, <%= de[2].nil? || de[2].strip.empty? ? 'nil' : '"' + de[2] + '"' %>)<% } %>
 <% end -%>
 
   <%= dsl.strip.gsub(/\n/,"\n  ") %>

data/server/executionhandlers/ruby/connection.rb

@@ -200,6 +200,10 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     true
   end # }}}
 
+  def activity_uuid
+    @handler_activity_uuid
+  end
+
   def inform_activity_done # {{{
     @controller.notify("activity/done", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
     @controller.notify("status/resource_utilization", :mib => GetProcessMem.new.mb, **Process.times.to_h)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.43
+  version: 2.1.45
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2023-03-03 00:00:00.000000000 Z
+date: 2023-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -293,6 +293,7 @@ files:
 - cockpit/themes/compact/symbols/closed_loop_measuring.svg
 - cockpit/themes/compact/symbols/complex.svg
 - cockpit/themes/compact/symbols/critical.svg
+- cockpit/themes/compact/symbols/delete.svg
 - cockpit/themes/compact/symbols/end.svg
 - cockpit/themes/compact/symbols/escape.svg
 - cockpit/themes/compact/symbols/event_end.svg
@@ -348,6 +349,7 @@ files:
 - cockpit/themes/control/symbols/closed_loop_measuring.svg
 - cockpit/themes/control/symbols/complex.svg
 - cockpit/themes/control/symbols/critical.svg
+- cockpit/themes/control/symbols/delete.svg
 - cockpit/themes/control/symbols/end.svg
 - cockpit/themes/control/symbols/escape.svg
 - cockpit/themes/control/symbols/event_end.svg
@@ -403,6 +405,7 @@ files:
 - cockpit/themes/default/symbols/closed_loop_measuring.svg
 - cockpit/themes/default/symbols/complex.svg
 - cockpit/themes/default/symbols/critical.svg
+- cockpit/themes/default/symbols/delete.svg
 - cockpit/themes/default/symbols/end.svg
 - cockpit/themes/default/symbols/escape.svg
 - cockpit/themes/default/symbols/event_end.svg
@@ -458,6 +461,7 @@ files:
 - cockpit/themes/extended/symbols/closed_loop_measuring.svg
 - cockpit/themes/extended/symbols/complex.svg
 - cockpit/themes/extended/symbols/critical.svg
+- cockpit/themes/extended/symbols/delete.svg
 - cockpit/themes/extended/symbols/end.svg
 - cockpit/themes/extended/symbols/escape.svg
 - cockpit/themes/extended/symbols/event_end.svg
@@ -508,6 +512,7 @@ files:
 - cockpit/themes/model/symbols/closed_loop_measuring.svg
 - cockpit/themes/model/symbols/complex.svg
 - cockpit/themes/model/symbols/critical.svg
+- cockpit/themes/model/symbols/delete.svg
 - cockpit/themes/model/symbols/end.svg
 - cockpit/themes/model/symbols/escape.svg
 - cockpit/themes/model/symbols/event_end.svg
@@ -563,6 +568,7 @@ files:
 - cockpit/themes/packed/symbols/closed_loop_measuring.svg
 - cockpit/themes/packed/symbols/complex.svg
 - cockpit/themes/packed/symbols/critical.svg
+- cockpit/themes/packed/symbols/delete.svg
 - cockpit/themes/packed/symbols/end.svg
 - cockpit/themes/packed/symbols/escape.svg
 - cockpit/themes/packed/symbols/event_end.svg
@@ -618,6 +624,7 @@ files:
 - cockpit/themes/preset/symbols/closed_loop_measuring.svg
 - cockpit/themes/preset/symbols/complex.svg
 - cockpit/themes/preset/symbols/critical.svg
+- cockpit/themes/preset/symbols/delete.svg
 - cockpit/themes/preset/symbols/end.svg
 - cockpit/themes/preset/symbols/escape.svg
 - cockpit/themes/preset/symbols/event_end.svg
@@ -708,6 +715,7 @@ files:
 - server/resources/topics.xml
 - server/resources/transformation.xml
 - server/routing/end.rb
+- server/routing/forward-events.lock
 - server/routing/forward-events.rb
 - server/routing/forward-votes.rb
 - server/routing/persist.rb