cpee 2.1.47 → 2.1.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 866400320b8fcaae94111a6102ed63848b81e73821a9c80c3486cd0f6c6c2cf1
-  data.tar.gz: 652db3c2fd8ccfc07674faf956a5fadba3160a15a14a942b1055dc8fb6934784
+  metadata.gz: 1b8c1c8a4054ec0936d19a7684030ed6bb751a2ddfd59efd2fd1428403ec9124
+  data.tar.gz: b54813a2d1f3f00157837ba221a0b8171b80349450dfd78a5f8757da7e92f3bb
 SHA512:
-  metadata.gz: 18a0cb7870437abfbb4b6d4265d742684fb2925e47ddfae61ae1795a07f5cda9c35d74ec7f468951fe820949ee25ba28be86a08d0bbd6aafb958965a76e11a73
-  data.tar.gz: 1e7697a8db9a8c57b14abc6cb466e4d6f7c52719284dcf048918341e942f590e0a27c5ab7caf5929b68cf9c91a72b2ea7cd172793c86394078f3220e041e277d
+  metadata.gz: 9350a27caf326ef86d6241b26f1237cd80be325179d414b0bd44ca483a9c20c5e19d6c84879742e5353bbeea5c071adb4f029fdad849fbffcace2bd10c731115
+  data.tar.gz: d1a8de2949484f76bc4b59da67e7c7d71e43a5d11559a4193bfd049707f50c682c5e3f04e8550d4089ff6d1ca51ac5957884e93d05236e272eeffaca1f7e0c24

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

@@ -410,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)
       }
     });
@@ -546,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);
         }
       };
@@ -758,9 +762,9 @@ function monitor_instance_state_change(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") {
@@ -1459,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 {{{

data/cockpit/templates/Subprocess.xml

@@ -3,17 +3,8 @@
   <executionhandler>ruby</executionhandler>
   <dataelements/>
   <endpoints>
-    <machine>machine</machine>
-    <timeout>https://cpee.org/services/timeout.php</timeout>
-    <sensor>sensor</sensor>
     <subprocess>https-post://cpee.org/flow/start/url/</subprocess>
-    <human>human</human>
-    <plc>plc</plc>
-    <robot>robot</robot>
-    <robot_subprocess>robot_subprocess</robot_subprocess>
-    <send>send</send>
-    <receive>receive</receive>
-    <wait>wait</wait>
+    <timeout>https://cpee.org/services/timeout.php</timeout>
   </endpoints>
   <attributes>
     <info>Subprocess</info>
@@ -30,278 +21,24 @@
   </attributes>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <manipulate id="a2" label="initialize values">data.new_records = rand(0..1)
-data.new_returns = rand(0..1)
-data.advised = rand(0..1)
-data.completed = rand(0..1)
-data.hour = rand(0..24)</manipulate>
-      <call id="a1" endpoint="timeout">
-        <parameters>
-          <label>weekday morning</label>
-          <method>:post</method>
-          <arguments>
-            <timeout/>
-          </arguments>
-        </parameters>
-        <annotations>
-          <_timing>
-            <_timing_weight/>
-            <_timing_avg/>
-            <explanations/>
-          </_timing>
-          <_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>
-      <call id="a3" endpoint="timeout">
-        <parameters>
-          <label>back-up database</label>
-          <method>:post</method>
-          <arguments>
-            <timeout/>
-          </arguments>
-        </parameters>
-        <annotations>
-          <_timing>
-            <_timing_weight/>
-            <_timing_avg/>
-            <explanations/>
-          </_timing>
-          <_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>
-      <choose mode="exclusive">
-        <alternative condition="data.new_records == 1">
-          <_probability>
-            <_probability_min/>
-            <_probability_max/>
-            <_probability_avg/>
-          </_probability>
-        </alternative>
-        <otherwise>
-          <terminate/>
-        </otherwise>
-      </choose>
-      <choose mode="exclusive">
-        <alternative condition="data.new_returns == 1">
-          <_probability>
-            <_probability_min/>
-            <_probability_max/>
-            <_probability_avg/>
-          </_probability>
-          <call id="a4" endpoint="timeout">
-            <parameters>
-              <label>register defaulting accounts and customers</label>
-              <method>:post</method>
-              <arguments>
-                <timeout/>
-              </arguments>
-            </parameters>
-            <annotations>
-              <_timing>
-                <_timing_weight/>
-                <_timing_avg/>
-                <explanations/>
-              </_timing>
-              <_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>
-          <choose mode="exclusive">
-            <alternative condition="data.advised == 0">
-              <call id="a12" endpoint="timeout">
-                <parameters>
-                  <label>produce table of defaulting accounts</label>
-                  <method>:post</method>
-                  <arguments>
-                    <timeout/>
-                  </arguments>
-                </parameters>
-                <annotations>
-                  <_timing>
-                    <_timing_weight/>
-                    <_timing_avg/>
-                    <explanations/>
-                  </_timing>
-                  <_context_data_analysis>
-                    <probes/>
-                    <ips/>
-                  </_context_data_analysis>
-                  <report>
-                    <url/>
-                  </report>
-                  <_notes>
-                    <_notes_general/>
-                  </_notes>
-                </annotations>
-                <documentation>
-                  <input/>
-                  <output/>
-                  <implementation>
-                    <description/>
-                  </implementation>
-                </documentation>
-              </call>
-              <call id="a13" endpoint="timeout">
-                <parameters>
-                  <label>send to account management</label>
-                  <method>:post</method>
-                  <arguments>
-                    <timeout/>
-                  </arguments>
-                </parameters>
-                <annotations>
-                  <_timing>
-                    <_timing_weight/>
-                    <_timing_avg/>
-                    <explanations/>
-                  </_timing>
-                  <_context_data_analysis>
-                    <probes/>
-                    <ips/>
-                  </_context_data_analysis>
-                  <report>
-                    <url/>
-                  </report>
-                  <_notes>
-                    <_notes_general/>
-                  </_notes>
-                </annotations>
-                <documentation>
-                  <input/>
-                  <output/>
-                  <implementation>
-                    <description/>
-                  </implementation>
-                </documentation>
-              </call>
-              <_probability>
-                <_probability_min/>
-                <_probability_max/>
-                <_probability_avg/>
-              </_probability>
-            </alternative>
-            <otherwise/>
-          </choose>
-        </alternative>
-        <otherwise/>
-      </choose>
-      <choose mode="exclusive">
-        <alternative condition="data.completed == 1 &amp;&amp; data.hour &lt; 14:30">
-          <_probability>
-            <_probability_min/>
-            <_probability_max/>
-            <_probability_avg/>
-          </_probability>
-        </alternative>
-        <otherwise>
-          <call id="a7" endpoint="timeout">
-            <parameters>
-              <label>send alert to supervisor</label>
-              <method>:post</method>
-              <arguments>
-                <timeout/>
-              </arguments>
-            </parameters>
-            <annotations>
-              <_timing>
-                <_timing_weight/>
-                <_timing_avg/>
-                <explanations/>
-              </_timing>
-              <_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>
-        </otherwise>
-      </choose>
-      <call id="a8" endpoint="timeout">
+      <call id="a2" endpoint="timeout">
         <parameters>
-          <label>new defaulting account report completed</label>
+          <label>Wait</label>
           <method>:post</method>
           <arguments>
-            <timeout/>
+            <timeout>2</timeout>
           </arguments>
         </parameters>
         <annotations>
+          <_generic/>
           <_timing>
             <_timing_weight/>
             <_timing_avg/>
             <explanations/>
           </_timing>
+          <_shifting>
+            <_shifting_type>Duration</_shifting_type>
+          </_shifting>
           <_context_data_analysis>
             <probes/>
             <ips/>
@@ -319,25 +56,38 @@ data.hour = rand(0..24)</manipulate>
           <implementation>
             <description/>
           </implementation>
-          <code>
-            <description/>
-          </code>
         </documentation>
       </call>
-      <call id="a9" endpoint="timeout">
+      <call id="a1" endpoint="subprocess">
         <parameters>
-          <label>check the CRM system</label>
-          <method>:post</method>
+          <label>Create Sub</label>
           <arguments>
-            <timeout/>
+            <behavior>wait_running</behavior>
+            <url>https://cpee.org/hub/server/Templates.dir/Wait.xml</url>
+            <init>
+              <b>!rand(1..17)</b>
+            </init>
+            <endpoints/>
+            <attributes/>
+            <customization/>
           </arguments>
         </parameters>
+        <code>
+          <prepare/>
+          <finalize output="result">data.res = result</finalize>
+          <update output="result"/>
+          <rescue output="result"/>
+        </code>
         <annotations>
+          <_generic/>
           <_timing>
             <_timing_weight/>
             <_timing_avg/>
             <explanations/>
           </_timing>
+          <_shifting>
+            <_shifting_type>Duration</_shifting_type>
+          </_shifting>
           <_context_data_analysis>
             <probes/>
             <ips/>
@@ -360,99 +110,6 @@ data.hour = rand(0..24)</manipulate>
           </code>
         </documentation>
       </call>
-      <choose mode="exclusive">
-        <alternative condition="data.new_returns == 1">
-          <_probability>
-            <_probability_min/>
-            <_probability_max/>
-            <_probability_avg/>
-          </_probability>
-          <call id="a10" endpoint="timeout">
-            <parameters>
-              <label>reconcile with existing account defulters table</label>
-              <method>:post</method>
-              <arguments>
-                <timeout/>
-              </arguments>
-            </parameters>
-            <annotations>
-              <_timing>
-                <_timing_weight/>
-                <_timing_avg/>
-                <explanations/>
-              </_timing>
-              <_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>
-        </alternative>
-        <otherwise/>
-      </choose>
-      <choose mode="exclusive">
-        <alternative condition="data.hour &lt; 16">
-          <_probability>
-            <_probability_min/>
-            <_probability_max/>
-            <_probability_avg/>
-          </_probability>
-        </alternative>
-        <otherwise>
-          <call id="a11" endpoint="timeout">
-            <parameters>
-              <label>supervisor sends message</label>
-              <method>:post</method>
-              <arguments>
-                <timeout/>
-              </arguments>
-            </parameters>
-            <annotations>
-              <_timing>
-                <_timing_weight/>
-                <_timing_avg/>
-                <explanations/>
-              </_timing>
-              <_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>
-        </otherwise>
-      </choose>
     </description>
   </description>
   <transformation>
@@ -460,4 +117,11 @@ data.hour = rand(0..24)</manipulate>
     <dataelements type="none"/>
     <endpoints type="none"/>
   </transformation>
+  <subscriptions xmlns="http://riddl.org/ns/common-patterns/notifications-producer/2.0">
+    <subscription id="_karo" url="https://lehre.bpm.in.tum.de/ports/8000/">
+      <topic id="activity">
+        <event>calling</event>
+      </topic>
+    </subscription>
+  </subscriptions>
 </testset>