cpee 2.0.24 → 2.0.25

data/cockpit/themes/model/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,
@@ -193,16 +214,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) {
@@ -241,7 +272,7 @@ function WFAdaptorManifestation(adaptor) {
       'label': function(node){
         var ret;
         if ($('> url',$(node).children('parameters').children('arguments')).length > 0) {
-          ret = [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + ' <a target="_blank" href="' + $('> url',$(node).children('parameters').children('arguments')).text() + '"></a>' } ];
+          ret = [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + ' <a target="_blank" href="' + $('> url',$(node).children('parameters').children('arguments')).text() + '/open"></a>' } ];
         } else {
           ret = [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') } ];
         }

data/cockpit/themes/packed/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/packed/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/packed/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) {

data/cockpit/themes/preset/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/preset/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/preset/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) {