cpee 2.1.46 → 2.1.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2eead695fb08a7abafe739b3f8744a414dc6db340f432ab35eca7984124cc1c7
-  data.tar.gz: 0afa114ac90eeb460bf2cda3a2f9788b67641b3b0c8112650ffd0b7cd43002a2
+  metadata.gz: 1b8c1c8a4054ec0936d19a7684030ed6bb751a2ddfd59efd2fd1428403ec9124
+  data.tar.gz: b54813a2d1f3f00157837ba221a0b8171b80349450dfd78a5f8757da7e92f3bb
 SHA512:
-  metadata.gz: ebfdc65763faf75217fc7babb78e1e2cc6578ddecf095ad47f1e337e0a53f368a8aa7cf01be04020c3920a0ffc1c66c91a20e5487a6eb3f33c556600484943b8
-  data.tar.gz: 6d46ee33cfc3ee322c923fbcc5616c703055d5add20e7bc92d86ef7475a9bb67bb412025d5e67bf54dad8c7aeff8fc7b8f3e96507604fb827159d5870271ff46
+  metadata.gz: 9350a27caf326ef86d6241b26f1237cd80be325179d414b0bd44ca483a9c20c5e19d6c84879742e5353bbeea5c071adb4f029fdad849fbffcace2bd10c731115
+  data.tar.gz: d1a8de2949484f76bc4b59da67e7c7d71e43a5d11559a4193bfd049707f50c682c5e3f04e8550d4089ff6d1ca51ac5957884e93d05236e272eeffaca1f7e0c24

data/Rakefile

@@ -28,6 +28,6 @@ end
 desc "Clean instances"
 task :clean do
   Dir.glob("server/instances/*").collect{ |i| i if i =~ /\/\d+$/ }.compact.each do |i|
-    rm_rf i if File.exists?(i)
+    rm_rf i if File.exist?(i)
   end
 end

data/cockpit/index.html

@@ -243,7 +243,7 @@
         <ui-behind                                                 ><a style='display:none' target='_blank' id='current-track'>T</a><a style='display:none' target='_blank' id='current-graph'>G</a></ui-behind>
       </ui-tabbar>
       <ui-content>
-        <ui-area data-belongs-to-tab="details" id='graphcolumn'>
+        <ui-area data-belongs-to-tab="details" id='graphcolumn' oncontextmenu='return false'>
           <div id='graphgrid'>
             <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' width='1' height='1'></svg>
           </div>

data/cockpit/js/instance.js

@@ -17,6 +17,7 @@ function global_init() {
   loading = false;
   subscription = undefined;
   subscription_state = 'less';
+  save['states']= {};
   save['state']= undefined;
   save['dsl'] = undefined;
   save['activity_red_states'] = {}
@@ -292,6 +293,7 @@ function sse() { //{{{
             }
             break;
           case 'state':
+            save['states'][data['content']['state']] = Date.parse(data.timestamp);
             monitor_instance_state_change(data['content']['state']);
             break;
           case 'position':
@@ -408,7 +410,11 @@ function monitor_instance_values(type,vals) {// {{{
         }
       } else {
         let ele = $X('<' + key + ' xmlns="http://cpee.org/ns/properties/2.0"/>')
-        $(ele).text(value)
+        if (typeof value === 'string' || typeof value === 'boolean' || typeof value === 'number') {
+          $(ele).text(value)
+        } else {
+          $(ele).text(JSON.stringify(value))
+        }
         $(de).find(' > dataelements').append(ele)
       }
     });
@@ -544,24 +550,24 @@ function adaptor_init(url,theme,dslx) { //{{{
         });
         $('#graphgrid').css({
           'grid-template-rows': (shift/2) + 'px repeat(' + max.row + ', 1fr) ' + (shift/2) + 'px',
-          'grid-template-columns': 'max-content' + (tcolumns.length > 0 ? ' repeat(' + tcolumns.length.toString() + ',max-content)' : '') +  ' auto'
+          'grid-template-columns': 'max-content' + (tcolumns.length > 0 ? ' repeat(' + tcolumns.length.toString() + ',max-content)' : '') + ' auto'
         });
         for (var i = 0; i < max.row; i++) {
-          for (var j =0; j < tcolumns.length; j++) {
+          for (var j = 0; j < tcolumns.length; j++) {
             if (tlabels[i+1] != undefined && tlabels[i+1][j] != undefined && tlabels[i+1][j].label != undefined && tlabels[i+1][j].label != '') {
               var col = tlabels[i+1][j];
-              var ele = $('<div class="graphlabel ' + (i % 2 == 0 ? 'odd' : 'even') + '" element-type="' + col.type + '" element-id="' + col.id + '" style="grid-column: ' + (j+2) + '; grid-row: ' + (i+2) + '"><span>' + col.label + '</span></div>');
-              graphrealization.illustrator.draw.bind_event(ele,col.type,false);
+              var ele = $('<div element-row="' + i + '" class="graphlabel ' + (i % 2 == 0 ? 'odd' : 'even') + '" element-type="' + col.type + '" element-id="' + col.id + '" style="grid-column: ' + (j+2) + '; grid-row: ' + (i+2) + '"><span>' + col.label + '</span></div>');
+              graphrealization.illustrator.draw.bind_event(ele, col.type, false);
               $('#graphgrid').append(ele);
             } else {
               if (tcolumncount[tcolumns[j]] != 0) {
-                var ele = $('<div class="graphempty ' + (i % 2 == 0 ? 'odd' : 'even') + '" style="grid-column: ' + (j+2) + '; grid-row: ' + (i+2) + '; padding-bottom: ' + shift + 'px">&#032;</div>');
+                var ele = $('<div element-row="' + i + '" class="graphempty ' + (i % 2 == 0 ? 'odd' : 'even') + '" style="grid-column: ' + (j+2) + '; grid-row: ' + (i+2) + '; padding-bottom: ' + shift + 'px">&#032;</div>');
                 $('#graphgrid').append(ele);
               }
             }
           }
           var j = tcolumns.length;
-          var ele = $('<div class="graphlast ' + (i % 2 == 0 ? 'odd' : 'even') + '" style="grid-column: ' + (j+2) + '; grid-row: ' + (i+2) + '; padding-bottom: ' + shift + 'px">&#032;</div>');
+          var ele = $('<div element-row="' + i + '" class="graphlast ' + (i % 2 == 0 ? 'odd' : 'even') + '" style="grid-column: ' + (j+2) + '; grid-row: ' + (i+2) + '; padding-bottom: ' + shift + 'px">&#032;</div>');
           $('#graphgrid').append(ele);
         }
       };
@@ -734,6 +740,13 @@ function monitor_instance_pos_change(content) {// {{{
 
 
 function monitor_instance_state_change(notification) { //{{{
+  // sometimes, out of sheer network routingness, stopping comes after stopped, which fucks the UI hard
+  // thus, we are having none of it
+  if (notification == 'stopping' && save['states']['stopping'] - save['states']['stopped'] < 10)
+    notification = 'stopped';
+  if (notification == 'stopping' && save['state'] == 'stopped')
+    return;
+
   if ($('#trackcolumn').length > 0) {
     if (notification == "finished" || notification == "abandoned") {
       parent.closeIFrame(window.location.search);
@@ -743,19 +756,15 @@ function monitor_instance_state_change(notification) { //{{{
     $("#state button").removeAttr('disabled');
   }
 
-  // sometimes, out of sheer network routingness, stopping comes after stopped, which fucks the UI hard
-  // thus, we are having none of it
-  if (notification == 'stopping' && save['state'] == 'stopped')
-    return;
   if (notification != save['state']) {
     save['state'] = notification;
 
     if (notification == "stopped") {
       monitor_instance_pos();
     }
-    if (notification == "running") {
-      format_visual_clear();
-    }
+    // if (notification == "running") {
+    //   format_visual_clear();
+    // }
 
     var but = "";
     if (notification == "ready" || notification == "stopped") {
@@ -1454,7 +1463,7 @@ function ui_pos(e,bl) {
 }
 function del_ui_pos(e) {
   ui_pos(e,function(coll){
-    coll.splice(coll.indexOf($(e).attr('id')),1);
+    coll.splice(coll.findIndex((ele)=>ele[0] == $(e).attr('id')),1);
     return coll;
   });
 }

data/cockpit/js/wfadaptor.js

@@ -217,9 +217,13 @@ function WfIllustrator(wf_adaptor) { // View  {{{
   } // }}}
   // }}}
   // Helper Functions {{{
+  var get_y = this.draw.get_y = function (row) { // {{{
+    return { y: row * self.height - self.height, height_shift: self.height_shift};
+  } // }}}
+
   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>');
+    var g = $X('<rect element-row="' + row + '" 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;
   } // }}}
@@ -366,16 +370,16 @@ 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.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) {
+      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.compact == false) {
       if (labels.length > 0) {
         _.each(labels,function(a,key) {
@@ -402,9 +406,9 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
     labels = [];
     illustrator.clear();
     var graph = parse(description.children('description').get(0), {'row':0,'col':0,final:false,wide:false});
-    self.set_labels(graph);
-    // set labels
     illustrator.set_svg(graph);
+    // set labels
+    self.set_labels(graph);
   } // }}}
   var gd = this.get_description = function() { //  public {{{
     var serxml = $(description.get(0).documentElement).clone(true);
@@ -454,9 +458,9 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
     labels = [];
     illustrator.clear();
     var graph = parse(description.children('description').get(0), {'row':0,'col':0});
-    self.set_labels(graph);
-    // set labels
     illustrator.set_svg(graph);
+    // set labels
+    self.set_labels(graph);
     doit(self);
   }
   var update = this.update = function(svgid) { // {{{
@@ -465,8 +469,8 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
       labels = [];
       illustrator.clear();
       var graph = parse(description.children('description').get(0), {'row':0,'col':0});
-      self.set_labels(graph);
       illustrator.set_svg(graph);
+      self.set_labels(graph);
     }
 
     var newn = $('*[new=true]',description);
@@ -563,7 +567,8 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
       $(root).attr('svg-subtype','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)});
+        // javascript object spread syntax is my new weird crush - the JS designers must be serious people
+        labels.push({...{row: pos.row, element_id: 'start', tname: 'start', label: illustrator.elements[sname].label(root)},...illustrator.draw.get_y(pos.row)});
       }
       illustrator.draw.draw_symbol(sname, 'description', 'START', pos.row, pos.col, group);
     } // }}}
@@ -675,7 +680,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
       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});
+      labels.push({...{row: pos.row, element_id: $(context).attr('svg-id'), tname: tname, label: lab},...illustrator.draw.get_y(pos.row)});
     }
   } //}}}
   var draw_position = function(tname,pos,prev,block,group,endnodes,context,second) { // private {{{