cpee 1.4.31 → 1.4.32

data/cockpit/js/wfadaptor.js

@@ -48,13 +48,13 @@ function WfAdaptor(theme_base,doit) { // Controller {{{
   } // }}}
   this.notify = function() { // public {{{
   } // }}}
-  this.draw_labels = function(max,labels){ // public {{{
+  this.draw_labels = function(max,labels,height_shift,striped){ // public {{{
   } // }}}
   this.set_svg_container = function (container) { // {{{
     illustrator.set_svg_container(container); // TODO: shadowing the container element
   } // }}}
-  this.set_css_container = function(container) { // {{{
-    illustrator.set_css_container(container);
+  this.set_label_container = function(container) { // {{{
+    illustrator.set_label_container(container);
   } // }}}
 
   // initialize
@@ -66,6 +66,7 @@ function WfAdaptor(theme_base,doit) { // Controller {{{
   $.getScript(theme_base, function() {
     manifestation = new WFAdaptorManifestation(self);
     illustrator.compact = manifestation.compact == true ? true : false;
+    illustrator.striped = manifestation.striped == true ? true : false;
     description.source = manifestation.source;
     var deferreds = [];
     // copy parent stuff
@@ -158,18 +159,20 @@ function WfIllustrator(wf_adaptor) { // View  {{{
     // public
     this.height = 40;
     this.width = 40;
-    this.shift = this.height * 0.26;
+    this.height_shift = this.height * 0.26;
+    this.width_shift = this.width * 0.39;
     this.elements = {}; // the svgs
     this.svg = {};
     this.draw = {};
     this.compact = true;
+    this.striped = true;
     // private
     var self = this;
     var adaptor = null;
   // }}}
   // Generic Functions {{{
-  this.set_css_container = function(con) { // {{{
-    self.svg.css = con;
+  this.set_label_container = function(con) { // {{{
+    self.svg.label_container = con;
   } // }}}
   this.set_svg_container = function(con) { // {{{
     self.svg.container = con;
@@ -196,20 +199,33 @@ function WfIllustrator(wf_adaptor) { // View  {{{
   this.set_svg = function(graph) { // {{{
     if(graph.max.row < 1) graph.max.row = 1;
     if(graph.max.col < 1) graph.max.col = 1;
-    self.svg.container.attr('height',   (graph.max.row) * self.height + self.shift);
+    self.svg.container.attr('height',   (graph.max.row) * self.height + self.height_shift);
     self.svg.container.attr('width',    (graph.max.col+0.55) * self.width );
     self.svg.container.append(graph.svg);
   } // }}}
   this.get_node_by_svg_id = function(svg_id) { // {{{
     return $('[element-id = \'' + svg_id + '\'] g.activities', self.svg.container);
   } // }}}
+  this.get_label_by_svg_id = function(svg_id) { // {{{
+    return $('[element-id = \'' + svg_id + '\']', self.svg.label_container);
+  } // }}}
   this.get_elements = function() { // {{{
     return $('g.element', self.svg.container);
   } // }}}
+  this.get_labels = function() { // {{{
+    return $('[element-id]', self.svg.label_container);
+  } // }}}
   // }}}
   // Helper Functions {{{
+  var draw_stripe = this.draw.draw_stripe = function (row, maxcol) { // {{{
+    if (maxcol < 1) maxcol = 1;
+    var g = $X('<rect class="stripe ' + (row % 2 == 0 ? 'even' : 'odd') + '" x="0" y="' + String(row*self.height+self.height_shift/2) + '" width="' + (self.width * maxcol + self.width - self.width_shift) + '" height="' + (self.height) + '" xmlns="http://www.w3.org/2000/svg"></rect>');
+    self.svg.container.prepend(g);
+    return g;
+  } // }}}
+
   var draw_label = this.draw.draw_label = function (tname, id, label, row, col, group) { // {{{
-    var g = $X('<text class="label" transform="translate(' + String((col*self.width)-((self.width*0.39))) + ',' + String(row*self.height+20-((self.height*0.74))) + ')" xmlns="http://www.w3.org/2000/svg"></text>');
+    var g = $X('<text class="label" transform="translate(' + String(col*self.width-self.width_shift) + ',' + String(row*self.height+20-(self.height-self.height_shift)) + ')" xmlns="http://www.w3.org/2000/svg"></text>');
     var spli = $(label.split(/\n/));
     spli.each(function(k,v) {
       var tspan = $X('<tspan x="0" dy="' + (spli.length > 1 ? '-7' : '0') + '" xmlns="http://www.w3.org/2000/svg"></tspan>');
@@ -222,20 +238,19 @@ function WfIllustrator(wf_adaptor) { // View  {{{
       }
       g.append(tspan);
     });
-    bind_event(g,tname);
     if(group) { group.find('g.element[element-id=' + id + ']').append(g); }
-    else {self.svg.container.children('g:first').append(g);}
+    else {self.svg.container.append(g);}
     return g;
   } // }}}
   var draw_symbol = this.draw.draw_symbol = function (sname, id, title, row, col, group, addition) { // {{{
     if(self.elements[sname] == undefined || self.elements[sname].svg == undefined) sname = 'unknown';
     if (addition) {
       var g = $X('<g class="element" element-type="' + sname + '" element-id="' + id  + '" xmlns="http://www.w3.org/2000/svg">' +
-                    '<g transform="translate(' + String((col*self.width)-((self.width*0.39))) + ',' + String(row*self.height-((self.height*0.74))) + ')"></g>' +
+                    '<g transform="translate(' + String(col*self.width-self.width_shift) + ',' + String(row*self.height-(self.height-self.height_shift)) + ')"></g>' +
                  '</g>');
     } else {
       var g = $X('<g class="element" element-type="' + sname + '" element-id="' + id  + '" xmlns="http://www.w3.org/2000/svg">' +
-                    '<g transform="translate(' + String((col*self.width)-((self.width*0.39))) + ',' + String(row*self.height-((self.height*0.74))) + ')">' +
+                    '<g transform="translate(' + String(col*self.width-self.width_shift) + ',' + String(row*self.height-(self.height-self.height_shift)) + ')">' +
                       '<text class="super" transform="translate(30,8.4)">' +
                         '<tspan class="active">0</tspan>' +
                         '<tspan class="colon">,</tspan>' +
@@ -252,15 +267,15 @@ function WfIllustrator(wf_adaptor) { // View  {{{
     $(g[0].childNodes[0]).append(sym);
 
     // Binding events for symbol
-    bind_event(sym,sname);
+    bind_event(g,sname,true);
 
     if(group) {group.append(g);}
     else {self.svg.container.children('g:first').append(g);}
     return g;
   } // }}}
-  var bind_event = this.draw.bind_event = function(sym,tname) { //{{{
+  var bind_event = this.draw.bind_event = function(sym,tname,context) { //{{{
     for(event_name in adaptor.elements[tname]) {
-      sym.bind(event_name, {'function_call':adaptor.elements[tname][event_name]}, function(e) { e.data.function_call($(this).parents('.element:first').attr('element-id'),e)});
+      sym.bind(event_name, {'function_call':adaptor.elements[tname][event_name]}, function(e) { e.data.function_call($(this).attr('element-id'),e)});
       if(event_name == 'mousedown') sym.bind('contextmenu', false);
     }
   } //}}}
@@ -272,10 +287,10 @@ function WfIllustrator(wf_adaptor) { // View  {{{
         'class="block" rx="15" ry="15" xmlns="http://www.w3.org/2000/svg"/>'));
   } // }}}
   var draw_tile = this.draw.draw_tile = function(id, p1, p2, group) { // {{{
-    group.prepend($X('<rect element-id="' + id + '" x="' + (p1.col-0.50)*self.width + '" ' +
-        'y="' + (p1.row-0.80)*self.height + '" ' +
-        'width="' + ((p2.col+1.00)-p1.col)*self.width + '" ' +
-        'height="' + ((p2.row+1.00)-p1.row)*self.height +'" ' +
+    group.prepend($X('<rect element-id="' + id + '" x="' + ((p1.col-1)*self.width + 1.3 * self.width_shift) + '" ' +
+        'y="' + ((p1.row-1)*self.height+self.height_shift/2) + '" ' +
+        'width="' + ((p2.col+1)-p1.col)*self.width + '" ' +
+        'height="' + ((p2.row+1)-p1.row)*self.height +'" ' +
         'class="tile" rx="15" ry="15" xmlns="http://www.w3.org/2000/svg"/>'));
   } // }}}
   var draw_connection = this.draw.draw_connection = function(group, start, end, max_line, num_lines, arrow) { // {{{
@@ -352,16 +367,24 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
   // Set Labels //{{{
   this.set_labels = function(graph) {
     if (illustrator.compact == false) {
-      adaptor.draw_labels(graph.max,labels,illustrator.shift);
+      adaptor.draw_labels(graph.max,labels,illustrator.height_shift,illustrator.striped == true ? true : false);
+    } else {
+      adaptor.draw_labels(graph.max,[],illustrator.height_shift,false);
+    }
+    if (illustrator.striped == true && illustrator.compact == false) {
+      for (var i=0; i < graph.max.row; i++) {
+        illustrator.draw.draw_stripe(i,graph.max.col);
+      }
+    }
+    if (illustrator.compact == false) {
+      if (labels.length > 0) {
+        _.each(labels,function(a,key) {
+          if (a.label && a.label[0] && a.label[0].column == 'Label' && a.label[0].value) {
+            illustrator.draw.draw_label(a.tname, a.element_id, a.label[0].value, a.row, graph.max.col + 1, graph.svg);
+          }
+        });
+      }
     }
-    // if (illustrator.compact == false) {
-    //   if (labels.length > 0) {
-    //     var csscol = 0;
-    //     _.each(labels,function(a,key) {
-    //       // illustrator.draw.draw_label(a.tname, a.element_id, a.label, a.row, graph.max.col + 1, graph.svg);
-    //     });
-    //   }
-    // }
   } //}}}
 
   // Generic Functions {{{
@@ -537,6 +560,9 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
       pos.row++;
       $(root).attr('svg-id','description');
       group.attr('element-id','group-description');
+      if (illustrator.elements[sname].label) {
+        labels.push({row: pos.row, element_id: 'start', tname: 'start', label: illustrator.elements[sname].label(root)});
+      }
       illustrator.draw.draw_symbol('start', 'description', 'START', pos.row, pos.col, group);
     } // }}}
 
@@ -574,22 +600,9 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
         }
       }
       // }}}
-      // Set SVG-ID and labels {{{
-      if($(context).attr('id') == undefined) {
-        if(id_counter[tname] == undefined) id_counter[tname] = -1;
-        $(context).attr('svg-id', tname + '_' + (++id_counter[tname]));
-      } else {
-        $(context).attr('svg-id',  $(context).attr('id'));
-      }
-      if (illustrator.elements[sname].label) {
-        var lab = illustrator.elements[sname].label(context);
-        $(context).attr('svg-label', lab);
-        labels.push({row: pos.row, element_id: $(context).attr('svg-id'), tname: tname, label: lab});
-      } else {
-        $(context).attr('svg-label', '');
-      } // }}}
 
       var g;
+      set_details(tname,sname,pos,context);
       [g, endnodes] = draw_position(tname,pos,prev,block,group,endnodes,context);
 
       // Prepare next iteration {{{
@@ -642,6 +655,21 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
     else                                                                     {sname = tname;}
     return sname;
   } //}}}
+  var set_details = function(tname,sname,pos,context) { //{{{
+    if($(context).attr('id') == undefined) {
+      if(id_counter[tname] == undefined) id_counter[tname] = -1;
+      $(context).attr('svg-id', tname + '_' + (++id_counter[tname]));
+    } else {
+      $(context).attr('svg-id',  $(context).attr('id'));
+    }
+    if (illustrator.elements[sname].label) {
+      var lab = illustrator.elements[sname].label(context);
+      if (lab && lab[0] && lab[0].value && lab[0].column == 'Label' && lab[0].value != '') {
+        $(context).attr('svg-label', lab[0].value);
+      }
+      labels.push({row: pos.row, element_id: $(context).attr('svg-id'), tname: tname, label: lab});
+    }
+  } //}}}
   var draw_position = function(tname,pos,prev,block,group,endnodes,context,second) { // private {{{
     var sname = sym_name(tname,context);
     // Draw Symbol {{{

data/cockpit/themes/compact/theme.js

@@ -5,7 +5,8 @@ function WFAdaptorManifestation(adaptor) {
   this.resources = {};
   this.elements = {};
   this.events = {};
-  this.compact = true;
+  this.compact = false;
+  this.striped = false;
   this.endpoints = {};
 
   //{{{ transform the details data to description parts based on rng
@@ -32,11 +33,11 @@ function WFAdaptorManifestation(adaptor) {
       return base;
     }
   }; //}}}
-  //{{{ Return the svgid for the clicked task
-  this.clicked = function(){
+  //{{{ Return the svgid for the selected task
+  this.selected = function(){
     var svgid = 'unknown';
     _.each(self.adaptor.illustrator.get_elements(),function(value,key) {
-      if ($(value).hasClass('clicked')) {
+      if ($(value).hasClass('selected')) {
         svgid = $(value).attr('element-id');
       }
     });
@@ -64,6 +65,9 @@ function WFAdaptorManifestation(adaptor) {
         var schema = save['endpoints_cache'][$(node).attr('endpoint')].schema.documentElement;
         $(rng).find(' > element[name="parameters"] > element[name="arguments"]').replaceWith($(schema).clone());
       }
+      if (save['endpoints_list'][$(node).attr('endpoint')] && !save['endpoints_list'][$(node).attr('endpoint')].startsWith('http')) {
+        $(rng).find(' > element[name="parameters"] > element[name="method"]').remove();
+      }
       save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval,true);
       save['details'].content(node);
       format_visual_forms();
@@ -195,7 +199,8 @@ function WFAdaptorManifestation(adaptor) {
       return;
     }
 
-    self.adaptor.illustrator.get_elements().removeClass('clicked');
+    self.adaptor.illustrator.get_elements().removeClass('selected');
+    self.adaptor.illustrator.get_labels().removeClass('selected');
 
     if (e && e.ctrlKey) {
       if (save['state'] != "ready" && save['state'] != "stopped") { return false; }
@@ -210,8 +215,9 @@ function WFAdaptorManifestation(adaptor) {
 
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {
-        vtarget.parents('g.element[element-id]').addClass('clicked');
+        vtarget.parents('g.element[element-id]').addClass('selected');
       }
+      self.adaptor.illustrator.get_label_by_svg_id(svgid).addClass('selected');
 
       self.update_details(svgid);
     }
@@ -219,11 +225,15 @@ function WFAdaptorManifestation(adaptor) {
   this.events.dblclick = function(svgid, e) { // {{{
   } // }}}
   this.events.mouseover = function(svgid, e) { // {{{
-    $('.tile[element-id = "' + svgid + '"]').css('display','block');
+    self.adaptor.illustrator.svg.container.find('.tile[element-id = "' + svgid + '"]').css('display','block');
+    self.adaptor.illustrator.svg.container.find('[element-id = "' + svgid + '"]').addClass('hover');
+    self.adaptor.illustrator.svg.label_container.find('[element-id = "' + svgid + '"]').addClass('hover');
     return false;
   } // }}}
   this.events.mouseout = function(svgid, e) { // {{{
-    $('.tile[element-id = "' + svgid + '"]').css('display','none');
+    self.adaptor.illustrator.svg.container.find('.tile[element-id = "' + svgid + '"]').css('display','none');
+    self.adaptor.illustrator.svg.container.find('[element-id = "' + svgid + '"]').removeClass('hover');
+    self.adaptor.illustrator.svg.label_container.find('[element-id = "' + svgid + '"]').removeClass('hover');
     return false;
   } // }}}
   this.events.dragstart = function (svgid, e) { //{{{
@@ -238,20 +248,8 @@ function WFAdaptorManifestation(adaptor) {
     'illustrator': {//{{{
       'endnodes': 'this',
       'label': function(node){
-        var ep = self.endpoints[$(node).attr('endpoint')];
-        var eplen = 1;
-        if (ep != undefined && ep[0] == '[') {
-          try {
-            eplen = JSON.parse(ep).length;
-          } catch(e) {
-            eplen = 1;
-          }
-        } else {
-          eplen = 1;
-        }
-        var avg = $('> _timing_avg',$(node).children('_timing')).text();
-        var lnd = $(node).attr('endpoint');
-        return $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + (lnd == '' ? '' : ' (Resource ' + lnd + (eplen > 1 ? ' - ' + (eplen) + ' Alternatives': ' - 1 Alternative') + ')') + (avg == '' ? '' : ' (Avg. Duration ' + avg + ' Min)');
+        var ret = [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') } ];
+        return ret;
       },
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'resolve_symbol': function(node) {
@@ -275,11 +273,13 @@ function WFAdaptorManifestation(adaptor) {
         ];
       return [];
     }, //}}}
-  'adaptor': {//{{{
-    'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
-    'click': self.events.click,
-    'dragstart': self.events.dragstart,
-   }//}}}
+    'adaptor': {//{{{
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'click': self.events.click,
+      'dragstart': self.events.dragstart,
+      'mouseover': self.events.mouseover,
+      'mouseout': self.events.mouseout
+    }//}}}
   }; /*}}}*/
   this.elements.manipulate = { /*{{{*/
     'type': 'primitive',
@@ -288,9 +288,9 @@ function WFAdaptorManifestation(adaptor) {
       'label': function(node){
         var lab = $(node).attr('label');
         if (lab) {
-          return lab.replace(/^['"]/,'').replace(/['"]$/,'');
+          return [ { column: 'Label', value: lab.replace(/^['"]/,'').replace(/['"]$/,'') } ];
         }  else {
-          return "";
+          return [];
         }
       },
       'svg': self.adaptor.theme_dir + 'symbols/manipulate.svg'
@@ -299,10 +299,12 @@ function WFAdaptorManifestation(adaptor) {
     'permissible_children': function(node,mode) { //{{{
       return [];
     }, //}}}
-  'adaptor': {//{{{
-    'mousedown': function (node,e) { self.events.mousedown(node,e,false,true); },
-    'click': self.events.click,
-   }//}}}
+    'adaptor': {//{{{
+      'mousedown': function (node,e) { self.events.mousedown(node,e,false,true); },
+      'click': self.events.click,
+      'mouseover': self.events.mouseover,
+      'mouseout': self.events.mouseout
+    }//}}}
   }; /*}}}*/
   this.elements.escape = { /*{{{*/
     'type': 'primitive',
@@ -317,6 +319,8 @@ function WFAdaptorManifestation(adaptor) {
     'adaptor': {//{{{
       'mousedown': function (node,e) { self.events.mousedown(node,e,false,true); },
       'click': self.events.click,
+      'mouseover': self.events.mouseover,
+      'mouseout': self.events.mouseout
     }//}}}
   }; /*}}}*/
   this.elements.stop = { /*{{{*/
@@ -332,6 +336,8 @@ function WFAdaptorManifestation(adaptor) {
     'adaptor': {//{{{
       'mousedown': function (node,e) { self.events.mousedown(node,e,false,true); },
       'click': self.events.click,
+      'mouseover': self.events.mouseover,
+      'mouseout': self.events.mouseout
     }//}}}
   }; /*}}}*/
   this.elements.terminate = { /*{{{*/
@@ -347,6 +353,8 @@ function WFAdaptorManifestation(adaptor) {
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) { self.events.mousedown(node,e,false,false); },
+      'mouseover': self.events.mouseover,
+      'mouseout': self.events.mouseout
     }//}}}
   }; /*}}}*/
   this.elements.end = { /*{{{*/
@@ -428,10 +436,9 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.choose = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'label': function(node){return $(node).attr('mode') == 'exclusive' ? 'exclusive' : 'inclusive' },
+      'label': function(node){ return [ { column: 'Label', value: $(node).attr('mode') == 'exclusive' ? 'exclusive' : 'inclusive' } ]; },
       'endnodes': 'aggregate',
       'closeblock': false,
-      'closing_symbol': 'choose_finish',
       'expansion': function(node) {
         return 'horizontal';
       },
@@ -485,16 +492,12 @@ function WFAdaptorManifestation(adaptor) {
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
-      'mouseout': self.events.mouseout,
+      'mouseout': self.events.mouseout
     }//}}}
   };  /*}}}*/
   this.elements.otherwise = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'label': function(node){
-        var avg = $('> _probability_avg',$(node).children('_probability')).text();
-        return (avg == '' ? '' : ' (Avg. Probability ' + avg + '%)');
-      },
       'endnodes': 'passthrough',
       'closeblock': false,
       'noarrow': true,
@@ -575,8 +578,8 @@ function WFAdaptorManifestation(adaptor) {
     'type': 'complex',
     'illustrator': {//{{{
       'label': function(node){
-        var avg = $('> _probability_avg',$(node).children('_probability')).text();
-        return $(node).attr('condition') + (avg == '' ? '' : ' (Avg. Probability ' + avg + '%)');
+        var ret = [ { column: 'Label', value: $(node).attr('condition') } ];
+        return ret;
       },
       'endnodes': 'passthrough',
       'noarrow': true,
@@ -662,8 +665,8 @@ function WFAdaptorManifestation(adaptor) {
     'type': 'complex',
     'illustrator': {//{{{
       'label': function(node){
-        var avg = $('> _probability_avg',$(node).children('_probability')).text();
-        return $(node).attr('condition') + ($(node).attr('mode') == 'pre_test' ? ' (⭱)' : ' (⭳)') + (avg == '' ? '' : ' (Avg. ' + avg + ' Times)');
+        var ret = [ { column: 'Label', value: $(node).attr('condition') + ($(node).attr('mode') == 'pre_test' ? ' (⭱)' : ' (⭳)') } ];
+        return ret;
       },
       'endnodes': 'this',
       'closeblock': true,
@@ -831,7 +834,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'resolve_symbol': function(node,shift) {
         if(shift == true) {
-          return 'parallel_branch_event';
+          return 'parallel_branch_compact';
         } else {
           return 'parallel_branch_normal';
         }
@@ -1115,7 +1118,6 @@ function WFAdaptorManifestation(adaptor) {
     'parent': 'call',
     'description': self.adaptor.theme_dir + 'rngs/callmanipulate.rng',
     'illustrator': {//{{{
-      'label': function(node){return $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'')},
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'svg': self.adaptor.theme_dir + 'symbols/callmanipulate.svg'
     },//}}}
@@ -1173,6 +1175,13 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/parallel_branch_event.svg'
     }//}}}
   };  /*}}}*/
+  this.elements.parallel_branch_compact = { /*{{{*/
+    'parent': 'parallel_branch',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_branch_compact.svg'
+    }//}}}
+  };  /*}}}*/
   this.elements.scripts = { /*{{{*/
     'description': [self.adaptor.theme_dir + 'rngs/update.rng',self.adaptor.theme_dir + 'rngs/finalize.rng']
   }; /*}}}*/