cpee 2.0.24 → 2.0.30

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

@@ -0,0 +1,8 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
+  <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
+  <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
+  <line x1="12.5" y1="15.5" x2="18.5" y2="15.5" class="stand"/>
+  <line x1="15.5" y1="12.5" x2="15.5" y2="18.5" class="stand"/>
+</svg>
+

data/cockpit/themes/default/theme.js

@@ -49,6 +49,16 @@ function WFAdaptorManifestation(adaptor) {
     });
     return svgid;
   }; //}}}
+  //{{{ Return the json for all marked tasks
+  this.marked_text = function(){
+    var nodes = [];
+    var markymark = _.uniq(self.marked());
+    $(markymark).each(function(key,svgid){
+      var node = self.adaptor.description.get_node_by_svg_id(svgid);
+      nodes.push($(node).serializePrettyXML());
+    });
+    return JSON.stringify(nodes);
+  }; //}}}
   //{{{ Render the details from rng (right hand side of graph tab)
   this.update_details = function(svgid){
     var tab  = $('#dat_details');
@@ -76,35 +86,46 @@ function WFAdaptorManifestation(adaptor) {
   }; //}}}
 
   function copyOrMove(menu,group,xml_node,mode) { //{{{
-    var markymark = _.uniq(self.marked());
+    var nodes = localStorage.getItem('marked');
+
+    if (typeof(nodes) != "string") { return; }
+
+    nodes = JSON.parse(nodes);
+    $(nodes).each(function(key,str) {
+      nodes[key] = $X(str);;
+    });
+
     var check1 = [];
     var check2 = [];
-    $(markymark).each(function(key,svgid){
-      var node = self.adaptor.description.get_node_by_svg_id(svgid);
+    $(nodes).each(function(key,node){
       check1.push($(node).attr('svg-type'));
     });
     $(group).each(function(key,value){
       check2.push(value.type);
     });
 
-    if (markymark.length > 0 && _.uniq(check1).length == _.intersection(check1,check2).length) {
-      var nodes = [];
-      $(markymark).each(function(key,svgid){
-        var node = self.adaptor.description.get_node_by_svg_id(svgid);
-        nodes.unshift(node);
-      });
-
+    if (nodes.length > 0 && _.uniq(check1).length == _.intersection(check1,check2).length) {
+      if (myid == localStorage.getItem('marked_from')) {
+        $(nodes).each(function(key,node){
+          nodes[key] = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
+        });
+      }
+      nodes.reverse();
       var iconm =  self.resources['arrow'].clone();
       var iconc =  self.resources['arrow'].clone();
       iconm.children('.rfill').addClass('menu');
+      if (myid == localStorage.getItem('marked_from')) {
+        menu.push(
+          {
+            'label': '<em>Move Marked Elements</em>',
+            'function_call': mode,
+            'menu_icon': iconm,
+            'type': undefined,
+            'params': [nodes, xml_node]
+          }
+        );
+      }
       menu.push(
-        {
-          'label': '<em>Move Marked Elements</em>',
-          'function_call': mode,
-          'menu_icon': iconm,
-          'type': undefined,
-          'params': [nodes, xml_node]
-        },
         {
           'label': '<em>Copy Marked Elements</em>',
           'function_call': mode,
@@ -223,10 +244,20 @@ function WFAdaptorManifestation(adaptor) {
           tab.empty();
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {
-        vtarget.parents('g.element[element-id]').toggleClass('marked');
+        var vt = vtarget.parents('g.element[element-id]');
+            vt.toggleClass('marked');
+        if (vt.hasClass('marked')) {
+          localStorage.setItem('marked',self.marked_text());
+          localStorage.setItem('marked_from',myid);
+        } else {
+          localStorage.removeItem('marked');
+          localStorage.removeItem('marked_from');
+        }
       }
     } else {
       self.adaptor.illustrator.get_elements().removeClass('marked');
+      localStorage.removeItem('marked');
+      localStorage.removeItem('marked_from');
 
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {
@@ -450,8 +481,12 @@ function WFAdaptorManifestation(adaptor) {
       'endnodes': 'this',
       'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
       'resolve_symbol': function(node) {
-        if($(node).attr('wait') == '-1') {
+        if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
           return 'parallel_simple';
+        } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
+          return 'parallel_event_all';
+        } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '1') {
+          return 'parallel_event_one';
         } else {
           return 'parallel_complex';
         }
@@ -818,7 +853,16 @@ function WFAdaptorManifestation(adaptor) {
       'col_shift': function(node) {
         return true;
       },
-      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
+      'resolve_symbol': function(node) {
+        if($(node).attr('cancel') == 'last') {
+          return 'parallel_start';
+        } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == 1) {
+          return 'parallel_eventbased_exclusive';
+        } else {
+          return 'parallel_eventbased_parallel';
+        }
+      },
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/parallel.rng',
     'permissible_children': function(node,mode) { //{{{
@@ -1245,6 +1289,24 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     },//}}}
   };  /*}}}*/
+  this.elements.parallel_start = { /*{{{*/
+    'parent': 'parallel',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
+    }//}}}
+  };  /*}}}*/
+  this.elements.parallel_eventbased_exclusive = { /*{{{*/
+    'parent': 'parallel',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+    }//}}}
+  }; /*}}}*/
+  this.elements.parallel_eventbased_parallel = { /*{{{*/
+    'parent': 'parallel',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
+    }//}}}
+  }; /*}}}*/
   this.elements.parallel_simple = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{
@@ -1257,6 +1319,18 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/complex.svg'
     },//}}}
   };  /*}}}*/
+  this.elements.parallel_event_all = { /*{{{*/
+    'parent': 'parallel_finish',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
+    }//}}}
+  }; /*}}}*/
+  this.elements.parallel_event_one = { /*{{{*/
+    'parent': 'parallel_finish',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+    }//}}}
+  }; /*}}}*/
   this.elements.parallel_branch_normal = { /*{{{*/
     'parent': 'parallel_branch',
     'illustrator': {//{{{

data/cockpit/themes/extended/rngs/call.rng

@@ -97,7 +97,7 @@
       </element>
 
     </element>
-    <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
+    <element name="report" rngui:header="Reporting" rngui:fold="closed">
       <element name="url" rngui:label='HTML Snippet'>
         <data type="string" rngui:label="url to report snippet"/>
       </element>
@@ -146,4 +146,29 @@
       </element>
     </element>
   </element>
+  <element name="input" rngui:header="Input Arguments Documentation" rngui:fold="closed">
+    <zeroOrMore rngui:label="Create Argument">
+      <element name="item" rngui:label="Description">
+        <attribute name="label" rngui:label="Name">
+          <data type="string"/>
+        </attribute>
+        <text rngui:wrap="true" rngui:label="What does it do?"/>
+      </element>
+    </zeroOrMore>
+  </element>
+  <element name="output" rngui:header="Output Elements Documentation" rngui:fold="closed">
+    <zeroOrMore rngui:label="Create Element">
+      <element name="item" rngui:label="Description">
+        <attribute name="label" rngui:label="Name">
+          <data type="string"/>
+        </attribute>
+        <text rngui:wrap="true" rngui:label="What does it do?"/>
+      </element>
+    </zeroOrMore>
+  </element>
+  <element name="implementation" rngui:header="Implementation Documentation" rngui:fold="closed">
+    <element name="description" rngui:label="Description">
+      <text rngui:wrap="true" rngui:label="What is supposed to happen?"/>
+    </element>
+  </element>
 </element>

data/cockpit/themes/extended/rngs/callmanipulate.rng

@@ -113,13 +113,13 @@
       </element>
 
     </element>
-    <element name="report" rngui:header="Reporting Annotation" rngui:fold="closed">
+    <element name="report" rngui:header="Reporting" rngui:fold="closed">
       <element name="url" rngui:label='HTML Snippet'>
         <data type="string" rngui:label="url to report snippet"/>
       </element>
     </element>
   </element>
-  <element name="code" rngui:header="Implementation">
+  <element name="code" rngui:header="Output Handling">
     <element name="prepare" rngui:header="Prepare" rngui:label="Code" rngui:fold="closed_conditional">
       <text rngui:label="Script that is executed, before a service call"/>
     </element>
@@ -185,4 +185,34 @@
       </element>
     </element>
   </element>
+  <element name="input" rngui:header="Input Arguments Documentation" rngui:fold="closed">
+    <zeroOrMore rngui:label="Create Argument">
+      <element name="item" rngui:label="Description">
+        <attribute name="label" rngui:label="Name">
+          <data type="string"/>
+        </attribute>
+        <text rngui:wrap="true" rngui:label="What does it do?"/>
+      </element>
+    </zeroOrMore>
+  </element>
+  <element name="output" rngui:header="Output Elements Documentation" rngui:fold="closed">
+    <zeroOrMore rngui:label="Create Element">
+      <element name="item" rngui:label="Description">
+        <attribute name="label" rngui:label="Name">
+          <data type="string"/>
+        </attribute>
+        <text rngui:wrap="true" rngui:label="What does it do?"/>
+      </element>
+    </zeroOrMore>
+  </element>
+  <element name="implementation" rngui:header="Implementation Documentation" rngui:fold="closed">
+    <element name="description" rngui:label="Description">
+      <text rngui:wrap="true" rngui:label="What is supposed to happen?"/>
+    </element>
+  </element>
+  <element name="code" rngui:header="Output Handling Documentation" rngui:fold="closed">
+    <element name="description" rngui:label="Description">
+      <text rngui:wrap="true" rngui:label="Which output elements are important? How to transform and save them?"/>
+    </element>
+  </element>
 </element>

data/cockpit/themes/extended/rngs/parallel.rng

@@ -2,6 +2,12 @@
   <attribute name="wait" rngui:label="Wait" rngui:default="-1" rngui:hint="-1 to wait for all branches.">
     <data type="integer"/>
   </attribute>
+  <attribute name="cancel" rngui:label="Cancel" rngui:default="last" rngui:hint="Set 'Wait' to 1 for standard Event-based Gateway.">
+    <choice>
+      <value id='last'>After Last Task in Branch</value>
+      <value id='first'>After First Task in Branch (Event-Based Gateway)</value>
+    </choice>
+  </attribute>
   <element rngui:ignore="true" name="parallel_branch">
     <attribute name="pass">
       <data type="string"/>

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

@@ -1,8 +1,8 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <rect x="1" y="3" width="24" height="24" rx="4" class="hfill rfill cline stand"/>
 
-  <circle cx="24" cy="15" r="10" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
-  <circle cx="24" cy="15" r="7" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
+  <circle cx="24" cy="15" r="9" class="cline rfill standthin" style="stroke-dasharray: 1,2"/>
+  <circle cx="24" cy="15" r="7" class="cline rfill standthin" style="stroke-dasharray: 1,2"/>
   <line x1="24" y1="11" x2="20" y2="18" class="stand"/>
   <line x1="20" y1="18" x2="28" y2="18" class="stand"/>
   <line x1="28" y1="18" x2="24" y2="11" class="stand"/>

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

@@ -0,0 +1,9 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
+  <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
+  <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
+  <path
+    d="m 15.500001,11.435193 3.825246,2.779205 -1.461114,4.496849 h -4.728265 l -1.461115,-4.496849 z"
+    class="stand"/>
+</svg>
+

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

@@ -0,0 +1,8 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
+  <circle cx="15.5" cy="15.5" r="8" class="standthin"/>
+  <circle cx="15.5" cy="15.5" r="6" class="standthin"/>
+  <line x1="12.5" y1="15.5" x2="18.5" y2="15.5" class="stand"/>
+  <line x1="15.5" y1="12.5" x2="15.5" y2="18.5" class="stand"/>
+</svg>
+

data/cockpit/themes/extended/theme.js

@@ -49,6 +49,16 @@ function WFAdaptorManifestation(adaptor) {
     });
     return svgid;
   }; //}}}
+  //{{{ Return the json for all marked tasks
+  this.marked_text = function(){
+    var nodes = [];
+    var markymark = _.uniq(self.marked());
+    $(markymark).each(function(key,svgid){
+      var node = self.adaptor.description.get_node_by_svg_id(svgid);
+      nodes.push($(node).serializePrettyXML());
+    });
+    return JSON.stringify(nodes);
+  }; //}}}
   //{{{ Render the details from rng (right hand side of graph tab)
   this.update_details = function(svgid){
     var tab  = $('#dat_details');
@@ -76,35 +86,46 @@ function WFAdaptorManifestation(adaptor) {
   }; //}}}
 
   function copyOrMove(menu,group,xml_node,mode) { //{{{
-    var markymark = _.uniq(self.marked());
+    var nodes = localStorage.getItem('marked');
+
+    if (typeof(nodes) != "string") { return; }
+
+    nodes = JSON.parse(nodes);
+    $(nodes).each(function(key,str) {
+      nodes[key] = $X(str);;
+    });
+
     var check1 = [];
     var check2 = [];
-    $(markymark).each(function(key,svgid){
-      var node = self.adaptor.description.get_node_by_svg_id(svgid);
+    $(nodes).each(function(key,node){
       check1.push($(node).attr('svg-type'));
     });
     $(group).each(function(key,value){
       check2.push(value.type);
     });
 
-    if (markymark.length > 0 && _.uniq(check1).length == _.intersection(check1,check2).length) {
-      var nodes = [];
-      $(markymark).each(function(key,svgid){
-        var node = self.adaptor.description.get_node_by_svg_id(svgid);
-        nodes.unshift(node);
-      });
-
+    if (nodes.length > 0 && _.uniq(check1).length == _.intersection(check1,check2).length) {
+      if (myid == localStorage.getItem('marked_from')) {
+        $(nodes).each(function(key,node){
+          nodes[key] = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
+        });
+      }
+      nodes.reverse();
       var iconm =  self.resources['arrow'].clone();
       var iconc =  self.resources['arrow'].clone();
       iconm.children('.rfill').addClass('menu');
+      if (myid == localStorage.getItem('marked_from')) {
+        menu.push(
+          {
+            'label': '<em>Move Marked Elements</em>',
+            'function_call': mode,
+            'menu_icon': iconm,
+            'type': undefined,
+            'params': [nodes, xml_node]
+          }
+        );
+      }
       menu.push(
-        {
-          'label': '<em>Move Marked Elements</em>',
-          'function_call': mode,
-          'menu_icon': iconm,
-          'type': undefined,
-          'params': [nodes, xml_node]
-        },
         {
           'label': '<em>Copy Marked Elements</em>',
           'function_call': mode,
@@ -217,16 +238,26 @@ function WFAdaptorManifestation(adaptor) {
     self.adaptor.illustrator.get_elements().removeClass('selected');
     self.adaptor.illustrator.get_labels().removeClass('selected');
 
-    if (e && e.ctrlKey) {
+    if (e && (e.ctrlKey || e.metaKey)) {
       if (save['state'] != "ready" && save['state'] != "stopped") { return false; }
       var tab = $('#dat_details');
           tab.empty();
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {
-        vtarget.parents('g.element[element-id]').toggleClass('marked');
+        var vt = vtarget.parents('g.element[element-id]');
+            vt.toggleClass('marked');
+        if (vt.hasClass('marked')) {
+          localStorage.setItem('marked',self.marked_text());
+          localStorage.setItem('marked_from',myid);
+        } else {
+          localStorage.removeItem('marked');
+          localStorage.removeItem('marked_from');
+        }
       }
     } else {
       self.adaptor.illustrator.get_elements().removeClass('marked');
+      localStorage.removeItem('marked');
+      localStorage.removeItem('marked_from');
 
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {
@@ -475,8 +506,12 @@ function WFAdaptorManifestation(adaptor) {
       'endnodes': 'this',
       'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
       'resolve_symbol': function(node) {
-        if($(node).attr('wait') == '-1') {
+        if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
           return 'parallel_simple';
+        } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
+          return 'parallel_event_all';
+        } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '1') {
+          return 'parallel_event_one';
         } else {
           return 'parallel_complex';
         }
@@ -851,7 +886,16 @@ function WFAdaptorManifestation(adaptor) {
       'col_shift': function(node) {
         return true;
       },
-      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
+      'resolve_symbol': function(node) {
+        if($(node).attr('cancel') == 'last') {
+          return 'parallel_start';
+        } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == 1) {
+          return 'parallel_eventbased_exclusive';
+        } else {
+          return 'parallel_eventbased_parallel';
+        }
+      },
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/parallel.rng',
     'permissible_children': function(node,mode) { //{{{
@@ -1283,6 +1327,24 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     },//}}}
   };  /*}}}*/
+  this.elements.parallel_start = { /*{{{*/
+    'parent': 'parallel',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
+    }//}}}
+  };  /*}}}*/
+  this.elements.parallel_eventbased_exclusive = { /*{{{*/
+    'parent': 'parallel',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+    }//}}}
+  }; /*}}}*/
+  this.elements.parallel_eventbased_parallel = { /*{{{*/
+    'parent': 'parallel',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
+    }//}}}
+  }; /*}}}*/
   this.elements.parallel_simple = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{
@@ -1295,6 +1357,18 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/complex.svg'
     },//}}}
   };  /*}}}*/
+  this.elements.parallel_event_all = { /*{{{*/
+    'parent': 'parallel_finish',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_parallel.svg'
+    }//}}}
+  }; /*}}}*/
+  this.elements.parallel_event_one = { /*{{{*/
+    'parent': 'parallel_finish',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+    }//}}}
+  }; /*}}}*/
   this.elements.parallel_branch_normal = { /*{{{*/
     'parent': 'parallel_branch',
     'illustrator': {//{{{